1698 files changed, 115732 insertions, 35606 deletions

diff --git a/src/3rdparty/VulkanMemoryAllocator.pri b/src/3rdparty/VulkanMemoryAllocator.pri
new file mode 100644
index 0000000000..7466200dfc
--- /dev/null
+++ b/src/3rdparty/VulkanMemoryAllocator.pri
@@ -0,0 +1 @@
+INCLUDEPATH += $$PWD/VulkanMemoryAllocator
diff --git a/src/3rdparty/VulkanMemoryAllocator/LICENSE.txt b/src/3rdparty/VulkanMemoryAllocator/LICENSE.txt
new file mode 100644
index 0000000000..dbfe253391
--- /dev/null
+++ b/src/3rdparty/VulkanMemoryAllocator/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/3rdparty/VulkanMemoryAllocator/patches/0001-Avoid-compiler-warnings.patch b/src/3rdparty/VulkanMemoryAllocator/patches/0001-Avoid-compiler-warnings.patch
new file mode 100644
index 0000000000..f459db6c7a
--- /dev/null
+++ b/src/3rdparty/VulkanMemoryAllocator/patches/0001-Avoid-compiler-warnings.patch
@@ -0,0 +1,402 @@
+diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
+index a2f7a1b..fbe6f9e 100644
+--- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
++++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
+@@ -3661,7 +3661,7 @@ static void VmaWriteMagicValue(void* pData, VkDeviceSize offset)
+ {
+     uint32_t* pDst = (uint32_t*)((char*)pData + offset);
+     const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t);
+-    for(size_t i = 0; i < numberCount; ++i, ++pDst)
++    for(size_t i = 0; i != numberCount; ++i, ++pDst)
+     {
+         *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE;
+     }
+@@ -3671,7 +3671,7 @@ static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset)
+ {
+     const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset);
+     const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t);
+-    for(size_t i = 0; i < numberCount; ++i, ++pSrc)
++    for(size_t i = 0; i != numberCount; ++i, ++pSrc)
+     {
+         if(*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE)
+         {
+@@ -3866,7 +3866,7 @@ public:
+     template<typename U> VmaStlAllocator(const VmaStlAllocator<U>& src) : m_pCallbacks(src.m_pCallbacks) { }
+ 
+     T* allocate(size_t n) { return VmaAllocateArray<T>(m_pCallbacks, n); }
+-    void deallocate(T* p, size_t n) { VmaFree(m_pCallbacks, p); }
++    void deallocate(T* p, size_t /*n*/) { VmaFree(m_pCallbacks, p); }
+ 
+     template<typename U>
+     bool operator==(const VmaStlAllocator<U>& rhs) const
+@@ -5214,7 +5214,7 @@ public:
+     virtual void FreeAtOffset(VkDeviceSize offset) = 0;
+ 
+     // Tries to resize (grow or shrink) space for given allocation, in place.
+-    virtual bool ResizeAllocation(const VmaAllocation alloc, VkDeviceSize newSize) { return false; }
++    virtual bool ResizeAllocation(const VmaAllocation /*alloc*/, VkDeviceSize /*newSize*/) { return false; }
+ 
+ protected:
+     const VkAllocationCallbacks* GetAllocationCallbacks() const { return m_pAllocationCallbacks; }
+@@ -5574,7 +5574,7 @@ public:
+ 
+     virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+ 
+-    virtual VkResult CheckCorruption(const void* pBlockData) { return VK_ERROR_FEATURE_NOT_PRESENT; }
++    virtual VkResult CheckCorruption(const void* /*pBlockData*/) { return VK_ERROR_FEATURE_NOT_PRESENT; }
+ 
+     virtual void Alloc(
+         const VmaAllocationRequest& request,
+@@ -6133,7 +6133,7 @@ public:
+         bool overlappingMoveSupported);
+     virtual ~VmaDefragmentationAlgorithm_Fast();
+ 
+-    virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) { ++m_AllocationCount; }
++    virtual void AddAllocation(VmaAllocation /*hAlloc*/, VkBool32* /*pChanged*/) { ++m_AllocationCount; }
+     virtual void AddAll() { m_AllAllocations = true; }
+ 
+     virtual VkResult Defragment(
+@@ -6318,7 +6318,7 @@ private:
+     // Redundant, for convenience not to fetch from m_hCustomPool->m_BlockVector or m_hAllocator->m_pBlockVectors.
+     VmaBlockVector* const m_pBlockVector;
+     const uint32_t m_CurrFrameIndex;
+-    const uint32_t m_AlgorithmFlags;
++    /*const uint32_t m_AlgorithmFlags;*/
+     // Owner of this object.
+     VmaDefragmentationAlgorithm* m_pAlgorithm;
+ 
+@@ -7073,6 +7073,7 @@ void VmaJsonWriter::BeginValue(bool isString)
+         if(currItem.type == COLLECTION_TYPE_OBJECT &&
+             currItem.valueCount % 2 == 0)
+         {
++            (void) isString;
+             VMA_ASSERT(isString);
+         }
+ 
+@@ -7660,7 +7661,9 @@ bool VmaBlockMetadata_Generic::Validate() const
+             }
+ 
+             // Margin required between allocations - every free space must be at least that large.
++#if VMA_DEBUG_MARGIN
+             VMA_VALIDATE(subAlloc.size >= VMA_DEBUG_MARGIN);
++#endif
+         }
+         else
+         {
+@@ -7806,6 +7809,7 @@ bool VmaBlockMetadata_Generic::CreateAllocationRequest(
+ {
+     VMA_ASSERT(allocSize > 0);
+     VMA_ASSERT(!upperAddress);
++    (void) upperAddress;
+     VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);
+     VMA_ASSERT(pAllocationRequest != VMA_NULL);
+     VMA_HEAVY_ASSERT(Validate());
+@@ -8033,6 +8037,7 @@ void VmaBlockMetadata_Generic::Alloc(
+     VmaAllocation hAllocation)
+ {
+     VMA_ASSERT(!upperAddress);
++    (void) upperAddress;
+     VMA_ASSERT(request.item != m_Suballocations.end());
+     VmaSuballocation& suballoc = *request.item;
+     // Given suballocation is a free block.
+@@ -9609,7 +9614,7 @@ bool VmaBlockMetadata_Linear::CreateAllocationRequest(
+     bool upperAddress,
+     VmaSuballocationType allocType,
+     bool canMakeOtherLost,
+-    uint32_t strategy,
++    uint32_t /*strategy*/,
+     VmaAllocationRequest* pAllocationRequest)
+ {
+     VMA_ASSERT(allocSize > 0);
+@@ -9651,10 +9656,12 @@ bool VmaBlockMetadata_Linear::CreateAllocationRequest(
+         // Apply VMA_DEBUG_MARGIN at the end.
+         if(VMA_DEBUG_MARGIN > 0)
+         {
++#if VMA_DEBUG_MARGIN
+             if(resultOffset < VMA_DEBUG_MARGIN)
+             {
+                 return false;
+             }
++#endif
+             resultOffset -= VMA_DEBUG_MARGIN;
+         }
+ 
+@@ -10542,18 +10549,19 @@ void VmaBlockMetadata_Buddy::PrintDetailedMap(class VmaJsonWriter& json) const
+ #endif // #if VMA_STATS_STRING_ENABLED
+ 
+ bool VmaBlockMetadata_Buddy::CreateAllocationRequest(
+-    uint32_t currentFrameIndex,
+-    uint32_t frameInUseCount,
++    uint32_t /*currentFrameIndex*/,
++    uint32_t /*frameInUseCount*/,
+     VkDeviceSize bufferImageGranularity,
+     VkDeviceSize allocSize,
+     VkDeviceSize allocAlignment,
+     bool upperAddress,
+     VmaSuballocationType allocType,
+-    bool canMakeOtherLost,
+-    uint32_t strategy,
++    bool /*canMakeOtherLost*/,
++    uint32_t /*strategy*/,
+     VmaAllocationRequest* pAllocationRequest)
+ {
+     VMA_ASSERT(!upperAddress && "VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm.");
++    (void) upperAddress;
+ 
+     // Simple way to respect bufferImageGranularity. May be optimized some day.
+     // Whenever it might be an OPTIMAL image...
+@@ -10593,8 +10601,8 @@ bool VmaBlockMetadata_Buddy::CreateAllocationRequest(
+ }
+ 
+ bool VmaBlockMetadata_Buddy::MakeRequestedAllocationsLost(
+-    uint32_t currentFrameIndex,
+-    uint32_t frameInUseCount,
++    uint32_t /*currentFrameIndex*/,
++    uint32_t /*frameInUseCount*/,
+     VmaAllocationRequest* pAllocationRequest)
+ {
+     /*
+@@ -10604,7 +10612,7 @@ bool VmaBlockMetadata_Buddy::MakeRequestedAllocationsLost(
+     return pAllocationRequest->itemsToMakeLostCount == 0;
+ }
+ 
+-uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount)
++uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t /*currentFrameIndex*/, uint32_t /*frameInUseCount*/)
+ {
+     /*
+     Lost allocations are not supported in buddy allocator at the moment.
+@@ -10615,9 +10623,9 @@ uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t currentFrameIndex,
+ 
+ void VmaBlockMetadata_Buddy::Alloc(
+     const VmaAllocationRequest& request,
+-    VmaSuballocationType type,
++    VmaSuballocationType /*type*/,
+     VkDeviceSize allocSize,
+-    bool upperAddress,
++    bool /*upperAddress*/,
+     VmaAllocation hAllocation)
+ {
+     const uint32_t targetLevel = AllocSizeToLevel(allocSize);
+@@ -10941,7 +10949,7 @@ void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, con
+ ////////////////////////////////////////////////////////////////////////////////
+ // class VmaDeviceMemoryBlock
+ 
+-VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator) :
++VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator /*hAllocator*/) :
+     m_pMetadata(VMA_NULL),
+     m_MemoryTypeIndex(UINT32_MAX),
+     m_Id(0),
+@@ -11691,6 +11699,7 @@ VkResult VmaBlockVector::AllocatePage(
+                     if(IsCorruptionDetectionEnabled())
+                     {
+                         VkResult res = pBestRequestBlock->WriteMagicValueAroundAllocation(m_hAllocator, bestRequest.offset, size);
++                        (void) res;
+                         VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value.");
+                     }
+                     return VK_SUCCESS;
+@@ -11729,6 +11738,7 @@ void VmaBlockVector::Free(
+         if(IsCorruptionDetectionEnabled())
+         {
+             VkResult res = pBlock->ValidateMagicValueAroundAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize());
++            (void) res;
+             VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to validate magic value.");
+         }
+ 
+@@ -11894,6 +11904,7 @@ VkResult VmaBlockVector::AllocateFromBlock(
+         if(IsCorruptionDetectionEnabled())
+         {
+             VkResult res = pBlock->WriteMagicValueAroundAllocation(m_hAllocator, currRequest.offset, size);
++            (void) res;
+             VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value.");
+         }
+         return VK_SUCCESS;
+@@ -11903,7 +11914,8 @@ VkResult VmaBlockVector::AllocateFromBlock(
+ 
+ VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex)
+ {
+-    VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };
++    VkMemoryAllocateInfo allocInfo = {};
++    allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+     allocInfo.memoryTypeIndex = m_MemoryTypeIndex;
+     allocInfo.allocationSize = blockSize;
+     VkDeviceMemory mem = VK_NULL_HANDLE;
+@@ -11991,7 +12003,8 @@ void VmaBlockVector::ApplyDefragmentationMovesCpu(
+     if(pDefragCtx->res == VK_SUCCESS)
+     {
+         const VkDeviceSize nonCoherentAtomSize = m_hAllocator->m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
+-        VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE };
++        VkMappedMemoryRange memRange = {};
++        memRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+ 
+         for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+         {
+@@ -12076,7 +12089,8 @@ void VmaBlockVector::ApplyDefragmentationMovesGpu(
+ 
+     // Go over all blocks. Create and bind buffer for whole block if necessary.
+     {
+-        VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
++        VkBufferCreateInfo bufCreateInfo = {};
++        bufCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+         bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT |
+             VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+ 
+@@ -12101,8 +12115,9 @@ void VmaBlockVector::ApplyDefragmentationMovesGpu(
+     // Go over all moves. Post data transfer commands to command buffer.
+     if(pDefragCtx->res == VK_SUCCESS)
+     {
+-        const VkDeviceSize nonCoherentAtomSize = m_hAllocator->m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
+-        VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE };
++        /*const VkDeviceSize nonCoherentAtomSize = m_hAllocator->m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
++        VkMappedMemoryRange memRange = {};
++        memRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;*/
+ 
+         for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+         {
+@@ -12435,10 +12450,10 @@ VmaDefragmentationAlgorithm_Generic::VmaDefragmentationAlgorithm_Generic(
+     VmaAllocator hAllocator,
+     VmaBlockVector* pBlockVector,
+     uint32_t currentFrameIndex,
+-    bool overlappingMoveSupported) :
++    bool /*overlappingMoveSupported*/) :
+     VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex),
+-    m_AllAllocations(false),
+     m_AllocationCount(0),
++    m_AllAllocations(false),
+     m_BytesMoved(0),
+     m_AllocationsMoved(0),
+     m_Blocks(VmaStlAllocator<BlockInfo*>(hAllocator->GetAllocationCallbacks()))
+@@ -12813,7 +12828,7 @@ VkResult VmaDefragmentationAlgorithm_Fast::Defragment(
+                 size_t freeSpaceOrigBlockIndex = m_BlockInfos[freeSpaceInfoIndex].origBlockIndex;
+                 VmaDeviceMemoryBlock* pFreeSpaceBlock = m_pBlockVector->GetBlock(freeSpaceOrigBlockIndex);
+                 VmaBlockMetadata_Generic* pFreeSpaceMetadata = (VmaBlockMetadata_Generic*)pFreeSpaceBlock->m_pMetadata;
+-                VkDeviceSize freeSpaceBlockSize = pFreeSpaceMetadata->GetSize();
++                /*VkDeviceSize freeSpaceBlockSize = pFreeSpaceMetadata->GetSize();*/
+ 
+                 // Same block
+                 if(freeSpaceInfoIndex == srcBlockInfoIndex)
+@@ -13098,7 +13113,7 @@ VmaBlockVectorDefragmentationContext::VmaBlockVectorDefragmentationContext(
+     VmaPool hCustomPool,
+     VmaBlockVector* pBlockVector,
+     uint32_t currFrameIndex,
+-    uint32_t algorithmFlags) :
++    uint32_t /*algorithmFlags*/) :
+     res(VK_SUCCESS),
+     mutexLocked(false),
+     blockContexts(VmaStlAllocator<VmaBlockDefragmentationContext>(hAllocator->GetAllocationCallbacks())),
+@@ -13106,7 +13121,7 @@ VmaBlockVectorDefragmentationContext::VmaBlockVectorDefragmentationContext(
+     m_hCustomPool(hCustomPool),
+     m_pBlockVector(pBlockVector),
+     m_CurrFrameIndex(currFrameIndex),
+-    m_AlgorithmFlags(algorithmFlags),
++    /*m_AlgorithmFlags(algorithmFlags),*/
+     m_pAlgorithm(VMA_NULL),
+     m_Allocations(VmaStlAllocator<AllocInfo>(hAllocator->GetAllocationCallbacks())),
+     m_AllAllocations(false)
+@@ -14311,19 +14326,21 @@ VkResult VmaAllocator_T::AllocateDedicatedMemory(
+     bool map,
+     bool isUserDataString,
+     void* pUserData,
+-    VkBuffer dedicatedBuffer,
+-    VkImage dedicatedImage,
++    VkBuffer /*dedicatedBuffer*/,
++    VkImage /*dedicatedImage*/,
+     size_t allocationCount,
+     VmaAllocation* pAllocations)
+ {
+     VMA_ASSERT(allocationCount > 0 && pAllocations);
+ 
+-    VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };
++    VkMemoryAllocateInfo allocInfo = {};
++    allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+     allocInfo.memoryTypeIndex = memTypeIndex;
+     allocInfo.allocationSize = size;
+ 
+ #if VMA_DEDICATED_ALLOCATION
+-    VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR };
++    VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = {};
++    dedicatedAllocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR;
+     if(m_UseKhrDedicatedAllocation)
+     {
+         if(dedicatedBuffer != VK_NULL_HANDLE)
+@@ -14341,7 +14358,7 @@ VkResult VmaAllocator_T::AllocateDedicatedMemory(
+ #endif // #if VMA_DEDICATED_ALLOCATION
+ 
+     size_t allocIndex;
+-    VkResult res;
++    VkResult res = VK_SUCCESS;
+     for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+     {
+         res = AllocateDedicatedMemoryPage(
+@@ -14460,12 +14477,15 @@ void VmaAllocator_T::GetBufferMemoryRequirements(
+ #if VMA_DEDICATED_ALLOCATION
+     if(m_UseKhrDedicatedAllocation)
+     {
+-        VkBufferMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR };
++        VkBufferMemoryRequirementsInfo2KHR memReqInfo = {};
++        memReqInfo.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR;
+         memReqInfo.buffer = hBuffer;
+ 
+-        VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR };
++        VkMemoryDedicatedRequirementsKHR memDedicatedReq = {};
++        memDedicatedReq.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR;
+ 
+-        VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR };
++        VkMemoryRequirements2KHR memReq2 = {};
++        memReq2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR;
+         memReq2.pNext = &memDedicatedReq;
+ 
+         (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);
+@@ -14492,12 +14512,15 @@ void VmaAllocator_T::GetImageMemoryRequirements(
+ #if VMA_DEDICATED_ALLOCATION
+     if(m_UseKhrDedicatedAllocation)
+     {
+-        VkImageMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR };
++        VkImageMemoryRequirementsInfo2KHR memReqInfo = {};
++        memReqInfo.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR;
+         memReqInfo.image = hImage;
+ 
+-        VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR };
++        VkMemoryDedicatedRequirementsKHR memDedicatedReq = {};
++        memDedicatedReq.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR;
+ 
+-        VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR };
++        VkMemoryRequirements2KHR memReq2 = {};
++        memReq2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR;
+         memReq2.pNext = &memDedicatedReq;
+ 
+         (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);
+@@ -14734,7 +14757,7 @@ VkResult VmaAllocator_T::ResizeAllocation(
+         }
+         else
+         {
+-            return VK_ERROR_OUT_OF_POOL_MEMORY;
++            return VkResult(-1000069000); // VK_ERROR_OUT_OF_POOL_MEMORY
+         }
+     default:
+         VMA_ASSERT(0);
+@@ -15000,6 +15023,7 @@ void VmaAllocator_T::DestroyPool(VmaPool pool)
+     {
+         VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);
+         bool success = VmaVectorRemoveSorted<VmaPointerLess>(m_Pools, pool);
++        (void) success;
+         VMA_ASSERT(success && "Pool not found in Allocator.");
+     }
+ 
+@@ -15248,7 +15272,8 @@ void VmaAllocator_T::FlushOrInvalidateAllocation(
+ 
+         const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
+ 
+-        VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE };
++        VkMappedMemoryRange memRange = {};
++        memRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+         memRange.memory = hAllocation->GetMemory();
+         
+         switch(hAllocation->GetType())
+@@ -15321,6 +15346,7 @@ void VmaAllocator_T::FreeDedicatedMemory(VmaAllocation allocation)
+         AllocationVectorType* const pDedicatedAllocations = m_pDedicatedAllocations[memTypeIndex];
+         VMA_ASSERT(pDedicatedAllocations);
+         bool success = VmaVectorRemoveSorted<VmaPointerLess>(*pDedicatedAllocations, allocation);
++        (void) success;
+         VMA_ASSERT(success);
+     }
+ 
diff --git a/src/3rdparty/VulkanMemoryAllocator/patches/0002-Fix-gcc8-warning.patch b/src/3rdparty/VulkanMemoryAllocator/patches/0002-Fix-gcc8-warning.patch
new file mode 100644
index 0000000000..57a2f1a0f1
--- /dev/null
+++ b/src/3rdparty/VulkanMemoryAllocator/patches/0002-Fix-gcc8-warning.patch
@@ -0,0 +1,14 @@
+diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
+index fbe6f9e3e8..f043bdc289 100644
+--- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
++++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
+@@ -12074,7 +12074,8 @@ void VmaBlockVector::ApplyDefragmentationMovesGpu(
+     const size_t blockCount = m_Blocks.size();
+ 
+     pDefragCtx->blockContexts.resize(blockCount);
+-    memset(pDefragCtx->blockContexts.data(), 0, blockCount * sizeof(VmaBlockDefragmentationContext));
++    for (size_t i = 0; i < blockCount; ++i)
++        pDefragCtx->blockContexts[i] = VmaBlockDefragmentationContext();
+ 
+     // Go over all moves. Mark blocks that are used with BLOCK_FLAG_USED.
+     const size_t moveCount = moves.size();
diff --git a/src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch b/src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch
new file mode 100644
index 0000000000..ab7acfe40b
--- /dev/null
+++ b/src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch
@@ -0,0 +1,13 @@
+diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
+index f043bdc289..2355de091f 100644
+--- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
++++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
+@@ -3298,7 +3298,7 @@ void *aligned_alloc(size_t alignment, size_t size)
+             std::shared_mutex m_Mutex;
+         };
+         #define VMA_RW_MUTEX VmaRWMutex
+-    #elif defined(_WIN32)
++    #elif defined(_WIN32) && !defined(__MINGW32__)
+         // Use SRWLOCK from WinAPI.
+         class VmaRWMutex
+         {
diff --git a/src/3rdparty/VulkanMemoryAllocator/qt_attribution.json b/src/3rdparty/VulkanMemoryAllocator/qt_attribution.json
new file mode 100644
index 0000000000..2548856ca7
--- /dev/null
+++ b/src/3rdparty/VulkanMemoryAllocator/qt_attribution.json
@@ -0,0 +1,16 @@
+[
+    {
+        "Id": "VulkanMemoryAllocator",
+        "Name": "Vulkan Memory Allocator",
+        "QDocModule": "qtrhi",
+        "Description": "Vulkan Memory Allocator",
+        "QtUsage": "Memory management for the Vulkan backend of QRhi.",
+
+        "Homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
+        "Version": "2.2.0",
+        "License": "MIT License",
+        "LicenseId": "MIT",
+        "LicenseFile": "LICENSE.txt",
+        "Copyright": "Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved."
+    }
+]
diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
new file mode 100644
index 0000000000..2355de091f
--- /dev/null
+++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
@@ -0,0 +1,16790 @@
+//
+// Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
+#define AMD_VULKAN_MEMORY_ALLOCATOR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \mainpage Vulkan Memory Allocator
+
+<b>Version 2.2.0</b> (2018-12-13)
+
+Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved. \n
+License: MIT
+
+Documentation of all members: vk_mem_alloc.h
+
+\section main_table_of_contents Table of contents
+
+- <b>User guide</b>
+  - \subpage quick_start
+    - [Project setup](@ref quick_start_project_setup)
+    - [Initialization](@ref quick_start_initialization)
+    - [Resource allocation](@ref quick_start_resource_allocation)
+  - \subpage choosing_memory_type
+    - [Usage](@ref choosing_memory_type_usage)
+    - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags)
+    - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types)
+    - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools)
+  - \subpage memory_mapping
+    - [Mapping functions](@ref memory_mapping_mapping_functions)
+    - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory)
+    - [Cache control](@ref memory_mapping_cache_control)
+    - [Finding out if memory is mappable](@ref memory_mapping_finding_if_memory_mappable)
+  - \subpage custom_memory_pools
+    - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex)
+    - [Linear allocation algorithm](@ref linear_algorithm)
+      - [Free-at-once](@ref linear_algorithm_free_at_once)
+      - [Stack](@ref linear_algorithm_stack)
+      - [Double stack](@ref linear_algorithm_double_stack)
+      - [Ring buffer](@ref linear_algorithm_ring_buffer)
+    - [Buddy allocation algorithm](@ref buddy_algorithm)
+  - \subpage defragmentation
+  	- [Defragmenting CPU memory](@ref defragmentation_cpu)
+  	- [Defragmenting GPU memory](@ref defragmentation_gpu)
+  	- [Additional notes](@ref defragmentation_additional_notes)
+  	- [Writing custom allocation algorithm](@ref defragmentation_custom_algorithm)
+  - \subpage lost_allocations
+  - \subpage statistics
+    - [Numeric statistics](@ref statistics_numeric_statistics)
+    - [JSON dump](@ref statistics_json_dump)
+  - \subpage allocation_annotation
+    - [Allocation user data](@ref allocation_user_data)
+    - [Allocation names](@ref allocation_names)
+  - \subpage debugging_memory_usage
+    - [Memory initialization](@ref debugging_memory_usage_initialization)
+    - [Margins](@ref debugging_memory_usage_margins)
+    - [Corruption detection](@ref debugging_memory_usage_corruption_detection)
+  - \subpage record_and_replay
+- \subpage usage_patterns
+  - [Simple patterns](@ref usage_patterns_simple)
+  - [Advanced patterns](@ref usage_patterns_advanced)
+- \subpage configuration
+  - [Pointers to Vulkan functions](@ref config_Vulkan_functions)
+  - [Custom host memory allocator](@ref custom_memory_allocator)
+  - [Device memory allocation callbacks](@ref allocation_callbacks)
+  - [Device heap memory limit](@ref heap_memory_limit)
+  - \subpage vk_khr_dedicated_allocation
+- \subpage general_considerations
+  - [Thread safety](@ref general_considerations_thread_safety)
+  - [Validation layer warnings](@ref general_considerations_validation_layer_warnings)
+  - [Allocation algorithm](@ref general_considerations_allocation_algorithm)
+  - [Features not supported](@ref general_considerations_features_not_supported)
+
+\section main_see_also See also
+
+- [Product page on GPUOpen](https://gpuopen.com/gaming-product/vulkan-memory-allocator/)
+- [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
+
+
+
+
+\page quick_start Quick start
+
+\section quick_start_project_setup Project setup
+
+Vulkan Memory Allocator comes in form of a single header file.
+You don't need to build it as a separate library project.
+You can add this file directly to your project and submit it to code repository next to your other source files.
+
+"Single header" doesn't mean that everything is contained in C/C++ declarations,
+like it tends to be in case of inline functions or C++ templates.
+It means that implementation is bundled with interface in a single file and needs to be extracted using preprocessor macro.
+If you don't do it properly, you will get linker errors.
+
+To do it properly:
+
+-# Include "vk_mem_alloc.h" file in each CPP file where you want to use the library.
+   This includes declarations of all members of the library.
+-# In exacly one CPP file define following macro before this include.
+   It enables also internal definitions.
+
+\code
+#define VMA_IMPLEMENTATION
+#include "vk_mem_alloc.h"
+\endcode
+
+It may be a good idea to create dedicated CPP file just for this purpose.
+
+Note on language: This library is written in C++, but has C-compatible interface.
+Thus you can include and use vk_mem_alloc.h in C or C++ code, but full
+implementation with `VMA_IMPLEMENTATION` macro must be compiled as C++, NOT as C.
+
+Please note that this library includes header `<vulkan/vulkan.h>`, which in turn
+includes `<windows.h>` on Windows. If you need some specific macros defined
+before including these headers (like `WIN32_LEAN_AND_MEAN` or
+`WINVER` for Windows, `VK_USE_PLATFORM_WIN32_KHR` for Vulkan), you must define
+them before every `#include` of this library.
+
+
+\section quick_start_initialization Initialization
+
+At program startup:
+
+-# Initialize Vulkan to have `VkPhysicalDevice` and `VkDevice` object.
+-# Fill VmaAllocatorCreateInfo structure and create #VmaAllocator object by
+   calling vmaCreateAllocator().
+
+\code
+VmaAllocatorCreateInfo allocatorInfo = {};
+allocatorInfo.physicalDevice = physicalDevice;
+allocatorInfo.device = device;
+
+VmaAllocator allocator;
+vmaCreateAllocator(&allocatorInfo, &allocator);
+\endcode
+
+\section quick_start_resource_allocation Resource allocation
+
+When you want to create a buffer or image:
+
+-# Fill `VkBufferCreateInfo` / `VkImageCreateInfo` structure.
+-# Fill VmaAllocationCreateInfo structure.
+-# Call vmaCreateBuffer() / vmaCreateImage() to get `VkBuffer`/`VkImage` with memory
+   already allocated and bound to it.
+
+\code
+VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufferInfo.size = 65536;
+bufferInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocInfo = {};
+allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);
+\endcode
+
+Don't forget to destroy your objects when no longer needed:
+
+\code
+vmaDestroyBuffer(allocator, buffer, allocation);
+vmaDestroyAllocator(allocator);
+\endcode
+
+
+\page choosing_memory_type Choosing memory type
+
+Physical devices in Vulkan support various combinations of memory heaps and
+types. Help with choosing correct and optimal memory type for your specific
+resource is one of the key features of this library. You can use it by filling
+appropriate members of VmaAllocationCreateInfo structure, as described below.
+You can also combine multiple methods.
+
+-# If you just want to find memory type index that meets your requirements, you
+   can use function vmaFindMemoryTypeIndex().
+-# If you want to allocate a region of device memory without association with any
+   specific image or buffer, you can use function vmaAllocateMemory(). Usage of
+   this function is not recommended and usually not needed.
+-# If you already have a buffer or an image created, you want to allocate memory
+   for it and then you will bind it yourself, you can use function
+   vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage().
+   For binding you should use functions: vmaBindBufferMemory(), vmaBindImageMemory().
+-# If you want to create a buffer or an image, allocate memory for it and bind
+   them together, all in one call, you can use function vmaCreateBuffer(),
+   vmaCreateImage(). This is the recommended way to use this library.
+
+When using 3. or 4., the library internally queries Vulkan for memory types
+supported for that buffer or image (function `vkGetBufferMemoryRequirements()`)
+and uses only one of these types.
+
+If no memory type can be found that meets all the requirements, these functions
+return `VK_ERROR_FEATURE_NOT_PRESENT`.
+
+You can leave VmaAllocationCreateInfo structure completely filled with zeros.
+It means no requirements are specified for memory type.
+It is valid, although not very useful.
+
+\section choosing_memory_type_usage Usage
+
+The easiest way to specify memory requirements is to fill member
+VmaAllocationCreateInfo::usage using one of the values of enum #VmaMemoryUsage.
+It defines high level, common usage types.
+For more details, see description of this enum.
+
+For example, if you want to create a uniform buffer that will be filled using
+transfer only once or infrequently and used for rendering every frame, you can
+do it using following code:
+
+\code
+VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufferInfo.size = 65536;
+bufferInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocInfo = {};
+allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);
+\endcode
+
+\section choosing_memory_type_required_preferred_flags Required and preferred flags
+
+You can specify more detailed requirements by filling members
+VmaAllocationCreateInfo::requiredFlags and VmaAllocationCreateInfo::preferredFlags
+with a combination of bits from enum `VkMemoryPropertyFlags`. For example,
+if you want to create a buffer that will be persistently mapped on host (so it
+must be `HOST_VISIBLE`) and preferably will also be `HOST_COHERENT` and `HOST_CACHED`,
+use following code:
+
+\code
+VmaAllocationCreateInfo allocInfo = {};
+allocInfo.requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+allocInfo.preferredFlags = VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+allocInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);
+\endcode
+
+A memory type is chosen that has all the required flags and as many preferred
+flags set as possible.
+
+If you use VmaAllocationCreateInfo::usage, it is just internally converted to
+a set of required and preferred flags.
+
+\section choosing_memory_type_explicit_memory_types Explicit memory types
+
+If you inspected memory types available on the physical device and you have
+a preference for memory types that you want to use, you can fill member
+VmaAllocationCreateInfo::memoryTypeBits. It is a bit mask, where each bit set
+means that a memory type with that index is allowed to be used for the
+allocation. Special value 0, just like `UINT32_MAX`, means there are no
+restrictions to memory type index.
+
+Please note that this member is NOT just a memory type index.
+Still you can use it to choose just one, specific memory type.
+For example, if you already determined that your buffer should be created in
+memory type 2, use following code:
+
+\code
+uint32_t memoryTypeIndex = 2;
+
+VmaAllocationCreateInfo allocInfo = {};
+allocInfo.memoryTypeBits = 1u << memoryTypeIndex;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);
+\endcode
+
+\section choosing_memory_type_custom_memory_pools Custom memory pools
+
+If you allocate from custom memory pool, all the ways of specifying memory
+requirements described above are not applicable and the aforementioned members
+of VmaAllocationCreateInfo structure are ignored. Memory type is selected
+explicitly when creating the pool and then used to make all the allocations from
+that pool. For further details, see \ref custom_memory_pools.
+
+
+\page memory_mapping Memory mapping
+
+To "map memory" in Vulkan means to obtain a CPU pointer to `VkDeviceMemory`,
+to be able to read from it or write to it in CPU code.
+Mapping is possible only of memory allocated from a memory type that has
+`VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag.
+Functions `vkMapMemory()`, `vkUnmapMemory()` are designed for this purpose.
+You can use them directly with memory allocated by this library,
+but it is not recommended because of following issue:
+Mapping the same `VkDeviceMemory` block multiple times is illegal - only one mapping at a time is allowed.
+This includes mapping disjoint regions. Mapping is not reference-counted internally by Vulkan.
+Because of this, Vulkan Memory Allocator provides following facilities:
+
+\section memory_mapping_mapping_functions Mapping functions
+
+The library provides following functions for mapping of a specific #VmaAllocation: vmaMapMemory(), vmaUnmapMemory().
+They are safer and more convenient to use than standard Vulkan functions.
+You can map an allocation multiple times simultaneously - mapping is reference-counted internally.
+You can also map different allocations simultaneously regardless of whether they use the same `VkDeviceMemory` block.
+The way it's implemented is that the library always maps entire memory block, not just region of the allocation.
+For further details, see description of vmaMapMemory() function.
+Example:
+
+\code
+// Having these objects initialized:
+
+struct ConstantBuffer
+{
+    ...
+};
+ConstantBuffer constantBufferData;
+
+VmaAllocator allocator;
+VkBuffer constantBuffer;
+VmaAllocation constantBufferAllocation;
+
+// You can map and fill your buffer using following code:
+
+void* mappedData;
+vmaMapMemory(allocator, constantBufferAllocation, &mappedData);
+memcpy(mappedData, &constantBufferData, sizeof(constantBufferData));
+vmaUnmapMemory(allocator, constantBufferAllocation);
+\endcode
+
+When mapping, you may see a warning from Vulkan validation layer similar to this one:
+
+<i>Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.</i>
+
+It happens because the library maps entire `VkDeviceMemory` block, where different
+types of images and buffers may end up together, especially on GPUs with unified memory like Intel.
+You can safely ignore it if you are sure you access only memory of the intended
+object that you wanted to map.
+
+
+\section memory_mapping_persistently_mapped_memory Persistently mapped memory
+
+Kepping your memory persistently mapped is generally OK in Vulkan.
+You don't need to unmap it before using its data on the GPU.
+The library provides a special feature designed for that:
+Allocations made with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag set in
+VmaAllocationCreateInfo::flags stay mapped all the time,
+so you can just access CPU pointer to it any time
+without a need to call any "map" or "unmap" function.
+Example:
+
+\code
+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufCreateInfo.size = sizeof(ConstantBuffer);
+bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_CPU_ONLY;
+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
+
+VkBuffer buf;
+VmaAllocation alloc;
+VmaAllocationInfo allocInfo;
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
+
+// Buffer is already mapped. You can access its memory.
+memcpy(allocInfo.pMappedData, &constantBufferData, sizeof(constantBufferData));
+\endcode
+
+There are some exceptions though, when you should consider mapping memory only for a short period of time:
+
+- When operating system is Windows 7 or 8.x (Windows 10 is not affected because it uses WDDM2),
+  device is discrete AMD GPU,
+  and memory type is the special 256 MiB pool of `DEVICE_LOCAL + HOST_VISIBLE` memory
+  (selected when you use #VMA_MEMORY_USAGE_CPU_TO_GPU),
+  then whenever a memory block allocated from this memory type stays mapped
+  for the time of any call to `vkQueueSubmit()` or `vkQueuePresentKHR()`, this
+  block is migrated by WDDM to system RAM, which degrades performance. It doesn't
+  matter if that particular memory block is actually used by the command buffer
+  being submitted.
+- On Mac/MoltenVK there is a known bug - [Issue #175](https://github.com/KhronosGroup/MoltenVK/issues/175)
+  which requires unmapping before GPU can see updated texture.
+- Keeping many large memory blocks mapped may impact performance or stability of some debugging tools.
+
+\section memory_mapping_cache_control Cache control
+  
+Memory in Vulkan doesn't need to be unmapped before using it on GPU,
+but unless a memory types has `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT` flag set,
+you need to manually invalidate cache before reading of mapped pointer
+and flush cache after writing to mapped pointer.
+Vulkan provides following functions for this purpose `vkFlushMappedMemoryRanges()`,
+`vkInvalidateMappedMemoryRanges()`, but this library provides more convenient
+functions that refer to given allocation object: vmaFlushAllocation(),
+vmaInvalidateAllocation().
+
+Regions of memory specified for flush/invalidate must be aligned to
+`VkPhysicalDeviceLimits::nonCoherentAtomSize`. This is automatically ensured by the library.
+In any memory type that is `HOST_VISIBLE` but not `HOST_COHERENT`, all allocations
+within blocks are aligned to this value, so their offsets are always multiply of
+`nonCoherentAtomSize` and two different allocations never share same "line" of this size.
+
+Please note that memory allocated with #VMA_MEMORY_USAGE_CPU_ONLY is guaranteed to be `HOST_COHERENT`.
+
+Also, Windows drivers from all 3 PC GPU vendors (AMD, Intel, NVIDIA)
+currently provide `HOST_COHERENT` flag on all memory types that are
+`HOST_VISIBLE`, so on this platform you may not need to bother.
+
+\section memory_mapping_finding_if_memory_mappable Finding out if memory is mappable
+
+It may happen that your allocation ends up in memory that is `HOST_VISIBLE` (available for mapping)
+despite it wasn't explicitly requested.
+For example, application may work on integrated graphics with unified memory (like Intel) or
+allocation from video memory might have failed, so the library chose system memory as fallback.
+
+You can detect this case and map such allocation to access its memory on CPU directly,
+instead of launching a transfer operation.
+In order to do that: inspect `allocInfo.memoryType`, call vmaGetMemoryTypeProperties(),
+and look for `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag in properties of that memory type.
+
+\code
+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufCreateInfo.size = sizeof(ConstantBuffer);
+bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+allocCreateInfo.preferredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+
+VkBuffer buf;
+VmaAllocation alloc;
+VmaAllocationInfo allocInfo;
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
+
+VkMemoryPropertyFlags memFlags;
+vmaGetMemoryTypeProperties(allocator, allocInfo.memoryType, &memFlags);
+if((memFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+{
+    // Allocation ended up in mappable memory. You can map it and access it directly.
+    void* mappedData;
+    vmaMapMemory(allocator, alloc, &mappedData);
+    memcpy(mappedData, &constantBufferData, sizeof(constantBufferData));
+    vmaUnmapMemory(allocator, alloc);
+}
+else
+{
+    // Allocation ended up in non-mappable memory.
+    // You need to create CPU-side buffer in VMA_MEMORY_USAGE_CPU_ONLY and make a transfer.
+}
+\endcode
+
+You can even use #VMA_ALLOCATION_CREATE_MAPPED_BIT flag while creating allocations
+that are not necessarily `HOST_VISIBLE` (e.g. using #VMA_MEMORY_USAGE_GPU_ONLY).
+If the allocation ends up in memory type that is `HOST_VISIBLE`, it will be persistently mapped and you can use it directly.
+If not, the flag is just ignored.
+Example:
+
+\code
+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufCreateInfo.size = sizeof(ConstantBuffer);
+bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
+
+VkBuffer buf;
+VmaAllocation alloc;
+VmaAllocationInfo allocInfo;
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
+
+if(allocInfo.pUserData != nullptr)
+{
+    // Allocation ended up in mappable memory.
+    // It's persistently mapped. You can access it directly.
+    memcpy(allocInfo.pMappedData, &constantBufferData, sizeof(constantBufferData));
+}
+else
+{
+    // Allocation ended up in non-mappable memory.
+    // You need to create CPU-side buffer in VMA_MEMORY_USAGE_CPU_ONLY and make a transfer.
+}
+\endcode
+
+
+\page custom_memory_pools Custom memory pools
+
+A memory pool contains a number of `VkDeviceMemory` blocks.
+The library automatically creates and manages default pool for each memory type available on the device.
+Default memory pool automatically grows in size.
+Size of allocated blocks is also variable and managed automatically.
+
+You can create custom pool and allocate memory out of it.
+It can be useful if you want to:
+
+- Keep certain kind of allocations separate from others.
+- Enforce particular, fixed size of Vulkan memory blocks.
+- Limit maximum amount of Vulkan memory allocated for that pool.
+- Reserve minimum or fixed amount of Vulkan memory always preallocated for that pool.
+
+To use custom memory pools:
+
+-# Fill VmaPoolCreateInfo structure.
+-# Call vmaCreatePool() to obtain #VmaPool handle.
+-# When making an allocation, set VmaAllocationCreateInfo::pool to this handle.
+   You don't need to specify any other parameters of this structure, like `usage`.
+
+Example:
+
+\code
+// Create a pool that can have at most 2 blocks, 128 MiB each.
+VmaPoolCreateInfo poolCreateInfo = {};
+poolCreateInfo.memoryTypeIndex = ...
+poolCreateInfo.blockSize = 128ull * 1024 * 1024;
+poolCreateInfo.maxBlockCount = 2;
+
+VmaPool pool;
+vmaCreatePool(allocator, &poolCreateInfo, &pool);
+
+// Allocate a buffer out of it.
+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufCreateInfo.size = 1024;
+bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.pool = pool;
+
+VkBuffer buf;
+VmaAllocation alloc;
+VmaAllocationInfo allocInfo;
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
+\endcode
+
+You have to free all allocations made from this pool before destroying it.
+
+\code
+vmaDestroyBuffer(allocator, buf, alloc);
+vmaDestroyPool(allocator, pool);
+\endcode
+
+\section custom_memory_pools_MemTypeIndex Choosing memory type index
+
+When creating a pool, you must explicitly specify memory type index.
+To find the one suitable for your buffers or images, you can use helper functions
+vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo().
+You need to provide structures with example parameters of buffers or images
+that you are going to create in that pool.
+
+\code
+VkBufferCreateInfo exampleBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+exampleBufCreateInfo.size = 1024; // Whatever.
+exampleBufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; // Change if needed.
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; // Change if needed.
+
+uint32_t memTypeIndex;
+vmaFindMemoryTypeIndexForBufferInfo(allocator, &exampleBufCreateInfo, &allocCreateInfo, &memTypeIndex);
+
+VmaPoolCreateInfo poolCreateInfo = {};
+poolCreateInfo.memoryTypeIndex = memTypeIndex;
+// ...
+\endcode
+
+When creating buffers/images allocated in that pool, provide following parameters:
+
+- `VkBufferCreateInfo`: Prefer to pass same parameters as above.
+  Otherwise you risk creating resources in a memory type that is not suitable for them, which may result in undefined behavior.
+  Using different `VK_BUFFER_USAGE_` flags may work, but you shouldn't create images in a pool intended for buffers
+  or the other way around.
+- VmaAllocationCreateInfo: You don't need to pass same parameters. Fill only `pool` member.
+  Other members are ignored anyway.
+
+\section linear_algorithm Linear allocation algorithm
+
+Each Vulkan memory block managed by this library has accompanying metadata that
+keeps track of used and unused regions. By default, the metadata structure and
+algorithm tries to find best place for new allocations among free regions to
+optimize memory usage. This way you can allocate and free objects in any order.
+
+![Default allocation algorithm](../gfx/Linear_allocator_1_algo_default.png)
+
+Sometimes there is a need to use simpler, linear allocation algorithm. You can
+create custom pool that uses such algorithm by adding flag
+#VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT to VmaPoolCreateInfo::flags while creating
+#VmaPool object. Then an alternative metadata management is used. It always
+creates new allocations after last one and doesn't reuse free regions after
+allocations freed in the middle. It results in better allocation performance and
+less memory consumed by metadata.
+
+![Linear allocation algorithm](../gfx/Linear_allocator_2_algo_linear.png)
+
+With this one flag, you can create a custom pool that can be used in many ways:
+free-at-once, stack, double stack, and ring buffer. See below for details.
+
+\subsection linear_algorithm_free_at_once Free-at-once
+
+In a pool that uses linear algorithm, you still need to free all the allocations
+individually, e.g. by using vmaFreeMemory() or vmaDestroyBuffer(). You can free
+them in any order. New allocations are always made after last one - free space
+in the middle is not reused. However, when you release all the allocation and
+the pool becomes empty, allocation starts from the beginning again. This way you
+can use linear algorithm to speed up creation of allocations that you are going
+to release all at once.
+
+![Free-at-once](../gfx/Linear_allocator_3_free_at_once.png)
+
+This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount
+value that allows multiple memory blocks.
+
+\subsection linear_algorithm_stack Stack
+
+When you free an allocation that was created last, its space can be reused.
+Thanks to this, if you always release allocations in the order opposite to their
+creation (LIFO - Last In First Out), you can achieve behavior of a stack.
+
+![Stack](../gfx/Linear_allocator_4_stack.png)
+
+This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount
+value that allows multiple memory blocks.
+
+\subsection linear_algorithm_double_stack Double stack
+
+The space reserved by a custom pool with linear algorithm may be used by two
+stacks:
+
+- First, default one, growing up from offset 0.
+- Second, "upper" one, growing down from the end towards lower offsets.
+
+To make allocation from upper stack, add flag #VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT
+to VmaAllocationCreateInfo::flags.
+
+![Double stack](../gfx/Linear_allocator_7_double_stack.png)
+
+Double stack is available only in pools with one memory block -
+VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined.
+
+When the two stacks' ends meet so there is not enough space between them for a
+new allocation, such allocation fails with usual
+`VK_ERROR_OUT_OF_DEVICE_MEMORY` error.
+
+\subsection linear_algorithm_ring_buffer Ring buffer
+
+When you free some allocations from the beginning and there is not enough free space
+for a new one at the end of a pool, allocator's "cursor" wraps around to the
+beginning and starts allocation there. Thanks to this, if you always release
+allocations in the same order as you created them (FIFO - First In First Out),
+you can achieve behavior of a ring buffer / queue.
+
+![Ring buffer](../gfx/Linear_allocator_5_ring_buffer.png)
+
+Pools with linear algorithm support [lost allocations](@ref lost_allocations) when used as ring buffer.
+If there is not enough free space for a new allocation, but existing allocations
+from the front of the queue can become lost, they become lost and the allocation
+succeeds.
+
+![Ring buffer with lost allocations](../gfx/Linear_allocator_6_ring_buffer_lost.png)
+
+Ring buffer is available only in pools with one memory block -
+VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined.
+
+\section buddy_algorithm Buddy allocation algorithm
+
+There is another allocation algorithm that can be used with custom pools, called
+"buddy". Its internal data structure is based on a tree of blocks, each having
+size that is a power of two and a half of its parent's size. When you want to
+allocate memory of certain size, a free node in the tree is located. If it's too
+large, it is recursively split into two halves (called "buddies"). However, if
+requested allocation size is not a power of two, the size of a tree node is
+aligned up to the nearest power of two and the remaining space is wasted. When
+two buddy nodes become free, they are merged back into one larger node.
+
+![Buddy allocator](../gfx/Buddy_allocator.png)
+
+The advantage of buddy allocation algorithm over default algorithm is faster
+allocation and deallocation, as well as smaller external fragmentation. The
+disadvantage is more wasted space (internal fragmentation).
+
+For more information, please read ["Buddy memory allocation" on Wikipedia](https://en.wikipedia.org/wiki/Buddy_memory_allocation)
+or other sources that describe this concept in general.
+
+To use buddy allocation algorithm with a custom pool, add flag
+#VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT to VmaPoolCreateInfo::flags while creating
+#VmaPool object.
+
+Several limitations apply to pools that use buddy algorithm:
+
+- It is recommended to use VmaPoolCreateInfo::blockSize that is a power of two.
+  Otherwise, only largest power of two smaller than the size is used for
+  allocations. The remaining space always stays unused.
+- [Margins](@ref debugging_memory_usage_margins) and
+  [corruption detection](@ref debugging_memory_usage_corruption_detection)
+  don't work in such pools.
+- [Lost allocations](@ref lost_allocations) don't work in such pools. You can
+  use them, but they never become lost. Support may be added in the future.
+- [Defragmentation](@ref defragmentation) doesn't work with allocations made from
+  such pool.
+
+\page defragmentation Defragmentation
+
+Interleaved allocations and deallocations of many objects of varying size can
+cause fragmentation over time, which can lead to a situation where the library is unable
+to find a continuous range of free memory for a new allocation despite there is
+enough free space, just scattered across many small free ranges between existing
+allocations.
+
+To mitigate this problem, you can use defragmentation feature:
+structure #VmaDefragmentationInfo2, function vmaDefragmentationBegin(), vmaDefragmentationEnd().
+Given set of allocations, 
+this function can move them to compact used memory, ensure more continuous free
+space and possibly also free some `VkDeviceMemory` blocks.
+
+What the defragmentation does is:
+
+- Updates #VmaAllocation objects to point to new `VkDeviceMemory` and offset.
+  After allocation has been moved, its VmaAllocationInfo::deviceMemory and/or
+  VmaAllocationInfo::offset changes. You must query them again using
+  vmaGetAllocationInfo() if you need them.
+- Moves actual data in memory.
+
+What it doesn't do, so you need to do it yourself:
+
+- Recreate buffers and images that were bound to allocations that were defragmented and
+  bind them with their new places in memory.
+  You must use `vkDestroyBuffer()`, `vkDestroyImage()`,
+  `vkCreateBuffer()`, `vkCreateImage()` for that purpose and NOT vmaDestroyBuffer(),
+  vmaDestroyImage(), vmaCreateBuffer(), vmaCreateImage(), because you don't need to
+  destroy or create allocation objects!
+- Recreate views and update descriptors that point to these buffers and images.
+
+\section defragmentation_cpu Defragmenting CPU memory
+
+Following example demonstrates how you can run defragmentation on CPU.
+Only allocations created in memory types that are `HOST_VISIBLE` can be defragmented.
+Others are ignored.
+
+The way it works is:
+
+- It temporarily maps entire memory blocks when necessary.
+- It moves data using `memmove()` function.
+
+\code
+// Given following variables already initialized:
+VkDevice device;
+VmaAllocator allocator;
+std::vector<VkBuffer> buffers;
+std::vector<VmaAllocation> allocations;
+
+
+const uint32_t allocCount = (uint32_t)allocations.size();
+std::vector<VkBool32> allocationsChanged(allocCount);
+
+VmaDefragmentationInfo2 defragInfo = {};
+defragInfo.allocationCount = allocCount;
+defragInfo.pAllocations = allocations.data();
+defragInfo.pAllocationsChanged = allocationsChanged.data();
+defragInfo.maxCpuBytesToMove = VK_WHOLE_SIZE; // No limit.
+defragInfo.maxCpuAllocationsToMove = UINT32_MAX; // No limit.
+
+VmaDefragmentationContext defragCtx;
+vmaDefragmentationBegin(allocator, &defragInfo, nullptr, &defragCtx);
+vmaDefragmentationEnd(allocator, defragCtx);
+
+for(uint32_t i = 0; i < allocCount; ++i)
+{
+    if(allocationsChanged[i])
+    {
+        // Destroy buffer that is immutably bound to memory region which is no longer valid.
+        vkDestroyBuffer(device, buffers[i], nullptr);
+
+        // Create new buffer with same parameters.
+        VkBufferCreateInfo bufferInfo = ...;
+        vkCreateBuffer(device, &bufferInfo, nullptr, &buffers[i]);
+            
+        // You can make dummy call to vkGetBufferMemoryRequirements here to silence validation layer warning.
+            
+        // Bind new buffer to new memory region. Data contained in it is already moved.
+        VmaAllocationInfo allocInfo;
+        vmaGetAllocationInfo(allocator, allocations[i], &allocInfo);
+        vkBindBufferMemory(device, buffers[i], allocInfo.deviceMemory, allocInfo.offset);
+    }
+}
+\endcode
+
+Setting VmaDefragmentationInfo2::pAllocationsChanged is optional.
+This output array tells whether particular allocation in VmaDefragmentationInfo2::pAllocations at the same index
+has been modified during defragmentation.
+You can pass null, but you then need to query every allocation passed to defragmentation
+for new parameters using vmaGetAllocationInfo() if you might need to recreate and rebind a buffer or image associated with it.
+
+If you use [Custom memory pools](@ref choosing_memory_type_custom_memory_pools),
+you can fill VmaDefragmentationInfo2::poolCount and VmaDefragmentationInfo2::pPools
+instead of VmaDefragmentationInfo2::allocationCount and VmaDefragmentationInfo2::pAllocations
+to defragment all allocations in given pools.
+You cannot use VmaDefragmentationInfo2::pAllocationsChanged in that case.
+You can also combine both methods.
+
+\section defragmentation_gpu Defragmenting GPU memory
+
+It is also possible to defragment allocations created in memory types that are not `HOST_VISIBLE`.
+To do that, you need to pass a command buffer that meets requirements as described in
+VmaDefragmentationInfo2::commandBuffer. The way it works is:
+
+- It creates temporary buffers and binds them to entire memory blocks when necessary.
+- It issues `vkCmdCopyBuffer()` to passed command buffer.
+
+Example:
+
+\code
+// Given following variables already initialized:
+VkDevice device;
+VmaAllocator allocator;
+VkCommandBuffer commandBuffer;
+std::vector<VkBuffer> buffers;
+std::vector<VmaAllocation> allocations;
+
+
+const uint32_t allocCount = (uint32_t)allocations.size();
+std::vector<VkBool32> allocationsChanged(allocCount);
+
+VkCommandBufferBeginInfo cmdBufBeginInfo = ...;
+vkBeginCommandBuffer(commandBuffer, &cmdBufBeginInfo);
+
+VmaDefragmentationInfo2 defragInfo = {};
+defragInfo.allocationCount = allocCount;
+defragInfo.pAllocations = allocations.data();
+defragInfo.pAllocationsChanged = allocationsChanged.data();
+defragInfo.maxGpuBytesToMove = VK_WHOLE_SIZE; // Notice it's "GPU" this time.
+defragInfo.maxGpuAllocationsToMove = UINT32_MAX; // Notice it's "GPU" this time.
+defragInfo.commandBuffer = commandBuffer;
+
+VmaDefragmentationContext defragCtx;
+vmaDefragmentationBegin(allocator, &defragInfo, nullptr, &defragCtx);
+
+vkEndCommandBuffer(commandBuffer);
+
+// Submit commandBuffer.
+// Wait for a fence that ensures commandBuffer execution finished.
+
+vmaDefragmentationEnd(allocator, defragCtx);
+
+for(uint32_t i = 0; i < allocCount; ++i)
+{
+    if(allocationsChanged[i])
+    {
+        // Destroy buffer that is immutably bound to memory region which is no longer valid.
+        vkDestroyBuffer(device, buffers[i], nullptr);
+
+        // Create new buffer with same parameters.
+        VkBufferCreateInfo bufferInfo = ...;
+        vkCreateBuffer(device, &bufferInfo, nullptr, &buffers[i]);
+            
+        // You can make dummy call to vkGetBufferMemoryRequirements here to silence validation layer warning.
+            
+        // Bind new buffer to new memory region. Data contained in it is already moved.
+        VmaAllocationInfo allocInfo;
+        vmaGetAllocationInfo(allocator, allocations[i], &allocInfo);
+        vkBindBufferMemory(device, buffers[i], allocInfo.deviceMemory, allocInfo.offset);
+    }
+}
+\endcode
+
+You can combine these two methods by specifying non-zero `maxGpu*` as well as `maxCpu*` parameters.
+The library automatically chooses best method to defragment each memory pool.
+
+You may try not to block your entire program to wait until defragmentation finishes,
+but do it in the background, as long as you carefully fullfill requirements described
+in function vmaDefragmentationBegin().
+
+\section defragmentation_additional_notes Additional notes
+
+While using defragmentation, you may experience validation layer warnings, which you just need to ignore.
+See [Validation layer warnings](@ref general_considerations_validation_layer_warnings).
+
+If you defragment allocations bound to images, these images should be created with
+`VK_IMAGE_CREATE_ALIAS_BIT` flag, to make sure that new image created with same
+parameters and pointing to data copied to another memory region will interpret
+its contents consistently. Otherwise you may experience corrupted data on some
+implementations, e.g. due to different pixel swizzling used internally by the graphics driver.
+
+If you defragment allocations bound to images, new images to be bound to new
+memory region after defragmentation should be created with `VK_IMAGE_LAYOUT_PREINITIALIZED`
+and then transitioned to their original layout from before defragmentation using
+an image memory barrier.
+
+Please don't expect memory to be fully compacted after defragmentation.
+Algorithms inside are based on some heuristics that try to maximize number of Vulkan
+memory blocks to make totally empty to release them, as well as to maximimze continuous
+empty space inside remaining blocks, while minimizing the number and size of allocations that
+need to be moved. Some fragmentation may still remain - this is normal.
+
+\section defragmentation_custom_algorithm Writing custom defragmentation algorithm
+
+If you want to implement your own, custom defragmentation algorithm,
+there is infrastructure prepared for that,
+but it is not exposed through the library API - you need to hack its source code.
+Here are steps needed to do this:
+
+-# Main thing you need to do is to define your own class derived from base abstract
+   class `VmaDefragmentationAlgorithm` and implement your version of its pure virtual methods.
+   See definition and comments of this class for details.
+-# Your code needs to interact with device memory block metadata.
+   If you need more access to its data than it's provided by its public interface,
+   declare your new class as a friend class e.g. in class `VmaBlockMetadata_Generic`.
+-# If you want to create a flag that would enable your algorithm or pass some additional
+   flags to configure it, add them to `VmaDefragmentationFlagBits` and use them in
+   VmaDefragmentationInfo2::flags.
+-# Modify function `VmaBlockVectorDefragmentationContext::Begin` to create object
+   of your new class whenever needed.
+
+
+\page lost_allocations Lost allocations
+
+If your game oversubscribes video memory, if may work OK in previous-generation
+graphics APIs (DirectX 9, 10, 11, OpenGL) because resources are automatically
+paged to system RAM. In Vulkan you can't do it because when you run out of
+memory, an allocation just fails. If you have more data (e.g. textures) that can
+fit into VRAM and you don't need it all at once, you may want to upload them to
+GPU on demand and "push out" ones that are not used for a long time to make room
+for the new ones, effectively using VRAM (or a cartain memory pool) as a form of
+cache. Vulkan Memory Allocator can help you with that by supporting a concept of
+"lost allocations".
+
+To create an allocation that can become lost, include #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT
+flag in VmaAllocationCreateInfo::flags. Before using a buffer or image bound to
+such allocation in every new frame, you need to query it if it's not lost.
+To check it, call vmaTouchAllocation().
+If the allocation is lost, you should not use it or buffer/image bound to it.
+You mustn't forget to destroy this allocation and this buffer/image.
+vmaGetAllocationInfo() can also be used for checking status of the allocation.
+Allocation is lost when returned VmaAllocationInfo::deviceMemory == `VK_NULL_HANDLE`.
+
+To create an allocation that can make some other allocations lost to make room
+for it, use #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag. You will
+usually use both flags #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT and
+#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT at the same time.
+
+Warning! Current implementation uses quite naive, brute force algorithm,
+which can make allocation calls that use #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT
+flag quite slow. A new, more optimal algorithm and data structure to speed this
+up is planned for the future.
+
+<b>Q: When interleaving creation of new allocations with usage of existing ones,
+how do you make sure that an allocation won't become lost while it's used in the
+current frame?</b>
+
+It is ensured because vmaTouchAllocation() / vmaGetAllocationInfo() not only returns allocation
+status/parameters and checks whether it's not lost, but when it's not, it also
+atomically marks it as used in the current frame, which makes it impossible to
+become lost in that frame. It uses lockless algorithm, so it works fast and
+doesn't involve locking any internal mutex.
+
+<b>Q: What if my allocation may still be in use by the GPU when it's rendering a
+previous frame while I already submit new frame on the CPU?</b>
+
+You can make sure that allocations "touched" by vmaTouchAllocation() / vmaGetAllocationInfo() will not
+become lost for a number of additional frames back from the current one by
+specifying this number as VmaAllocatorCreateInfo::frameInUseCount (for default
+memory pool) and VmaPoolCreateInfo::frameInUseCount (for custom pool).
+
+<b>Q: How do you inform the library when new frame starts?</b>
+
+You need to call function vmaSetCurrentFrameIndex().
+
+Example code:
+
+\code
+struct MyBuffer
+{
+    VkBuffer m_Buf = nullptr;
+    VmaAllocation m_Alloc = nullptr;
+
+    // Called when the buffer is really needed in the current frame.
+    void EnsureBuffer();
+};
+
+void MyBuffer::EnsureBuffer()
+{
+    // Buffer has been created.
+    if(m_Buf != VK_NULL_HANDLE)
+    {
+        // Check if its allocation is not lost + mark it as used in current frame.
+        if(vmaTouchAllocation(allocator, m_Alloc))
+        {
+            // It's all OK - safe to use m_Buf.
+            return;
+        }
+    }
+
+    // Buffer not yet exists or lost - destroy and recreate it.
+
+    vmaDestroyBuffer(allocator, m_Buf, m_Alloc);
+
+    VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+    bufCreateInfo.size = 1024;
+    bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+    VmaAllocationCreateInfo allocCreateInfo = {};
+    allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+    allocCreateInfo.flags = VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT |
+        VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT;
+
+    vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &m_Buf, &m_Alloc, nullptr);
+}
+\endcode
+
+When using lost allocations, you may see some Vulkan validation layer warnings
+about overlapping regions of memory bound to different kinds of buffers and
+images. This is still valid as long as you implement proper handling of lost
+allocations (like in the example above) and don't use them.
+
+You can create an allocation that is already in lost state from the beginning using function
+vmaCreateLostAllocation(). It may be useful if you need a "dummy" allocation that is not null.
+
+You can call function vmaMakePoolAllocationsLost() to set all eligible allocations
+in a specified custom pool to lost state.
+Allocations that have been "touched" in current frame or VmaPoolCreateInfo::frameInUseCount frames back
+cannot become lost.
+
+<b>Q: Can I touch allocation that cannot become lost?</b>
+
+Yes, although it has no visible effect.
+Calls to vmaGetAllocationInfo() and vmaTouchAllocation() update last use frame index
+also for allocations that cannot become lost, but the only way to observe it is to dump
+internal allocator state using vmaBuildStatsString().
+You can use this feature for debugging purposes to explicitly mark allocations that you use
+in current frame and then analyze JSON dump to see for how long each allocation stays unused.
+
+
+\page statistics Statistics
+
+This library contains functions that return information about its internal state,
+especially the amount of memory allocated from Vulkan.
+Please keep in mind that these functions need to traverse all internal data structures
+to gather these information, so they may be quite time-consuming.
+Don't call them too often.
+
+\section statistics_numeric_statistics Numeric statistics
+
+You can query for overall statistics of the allocator using function vmaCalculateStats().
+Information are returned using structure #VmaStats.
+It contains #VmaStatInfo - number of allocated blocks, number of allocations
+(occupied ranges in these blocks), number of unused (free) ranges in these blocks,
+number of bytes used and unused (but still allocated from Vulkan) and other information.
+They are summed across memory heaps, memory types and total for whole allocator.
+
+You can query for statistics of a custom pool using function vmaGetPoolStats().
+Information are returned using structure #VmaPoolStats.
+
+You can query for information about specific allocation using function vmaGetAllocationInfo().
+It fill structure #VmaAllocationInfo.
+
+\section statistics_json_dump JSON dump
+
+You can dump internal state of the allocator to a string in JSON format using function vmaBuildStatsString().
+The result is guaranteed to be correct JSON.
+It uses ANSI encoding.
+Any strings provided by user (see [Allocation names](@ref allocation_names))
+are copied as-is and properly escaped for JSON, so if they use UTF-8, ISO-8859-2 or any other encoding,
+this JSON string can be treated as using this encoding.
+It must be freed using function vmaFreeStatsString().
+
+The format of this JSON string is not part of official documentation of the library,
+but it will not change in backward-incompatible way without increasing library major version number
+and appropriate mention in changelog.
+
+The JSON string contains all the data that can be obtained using vmaCalculateStats().
+It can also contain detailed map of allocated memory blocks and their regions -
+free and occupied by allocations.
+This allows e.g. to visualize the memory or assess fragmentation.
+
+
+\page allocation_annotation Allocation names and user data
+
+\section allocation_user_data Allocation user data
+
+You can annotate allocations with your own information, e.g. for debugging purposes.
+To do that, fill VmaAllocationCreateInfo::pUserData field when creating
+an allocation. It's an opaque `void*` pointer. You can use it e.g. as a pointer,
+some handle, index, key, ordinal number or any other value that would associate
+the allocation with your custom metadata.
+
+\code
+VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+// Fill bufferInfo...
+
+MyBufferMetadata* pMetadata = CreateBufferMetadata();
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+allocCreateInfo.pUserData = pMetadata;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocCreateInfo, &buffer, &allocation, nullptr);
+\endcode
+
+The pointer may be later retrieved as VmaAllocationInfo::pUserData:
+
+\code
+VmaAllocationInfo allocInfo;
+vmaGetAllocationInfo(allocator, allocation, &allocInfo);
+MyBufferMetadata* pMetadata = (MyBufferMetadata*)allocInfo.pUserData;
+\endcode
+
+It can also be changed using function vmaSetAllocationUserData().
+
+Values of (non-zero) allocations' `pUserData` are printed in JSON report created by
+vmaBuildStatsString(), in hexadecimal form.
+
+\section allocation_names Allocation names
+
+There is alternative mode available where `pUserData` pointer is used to point to
+a null-terminated string, giving a name to the allocation. To use this mode,
+set #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT flag in VmaAllocationCreateInfo::flags.
+Then `pUserData` passed as VmaAllocationCreateInfo::pUserData or argument to
+vmaSetAllocationUserData() must be either null or pointer to a null-terminated string.
+The library creates internal copy of the string, so the pointer you pass doesn't need
+to be valid for whole lifetime of the allocation. You can free it after the call.
+
+\code
+VkImageCreateInfo imageInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };
+// Fill imageInfo...
+
+std::string imageName = "Texture: ";
+imageName += fileName;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT;
+allocCreateInfo.pUserData = imageName.c_str();
+
+VkImage image;
+VmaAllocation allocation;
+vmaCreateImage(allocator, &imageInfo, &allocCreateInfo, &image, &allocation, nullptr);
+\endcode
+
+The value of `pUserData` pointer of the allocation will be different than the one
+you passed when setting allocation's name - pointing to a buffer managed
+internally that holds copy of the string.
+
+\code
+VmaAllocationInfo allocInfo;
+vmaGetAllocationInfo(allocator, allocation, &allocInfo);
+const char* imageName = (const char*)allocInfo.pUserData;
+printf("Image name: %s\n", imageName);
+\endcode
+
+That string is also printed in JSON report created by vmaBuildStatsString().
+
+
+\page debugging_memory_usage Debugging incorrect memory usage
+
+If you suspect a bug with memory usage, like usage of uninitialized memory or
+memory being overwritten out of bounds of an allocation,
+you can use debug features of this library to verify this.
+
+\section debugging_memory_usage_initialization Memory initialization
+
+If you experience a bug with incorrect and nondeterministic data in your program and you suspect uninitialized memory to be used,
+you can enable automatic memory initialization to verify this.
+To do it, define macro `VMA_DEBUG_INITIALIZE_ALLOCATIONS` to 1.
+
+\code
+#define VMA_DEBUG_INITIALIZE_ALLOCATIONS 1
+#include "vk_mem_alloc.h"
+\endcode
+
+It makes memory of all new allocations initialized to bit pattern `0xDCDCDCDC`.
+Before an allocation is destroyed, its memory is filled with bit pattern `0xEFEFEFEF`.
+Memory is automatically mapped and unmapped if necessary.
+
+If you find these values while debugging your program, good chances are that you incorrectly
+read Vulkan memory that is allocated but not initialized, or already freed, respectively.
+
+Memory initialization works only with memory types that are `HOST_VISIBLE`.
+It works also with dedicated allocations.
+It doesn't work with allocations created with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag,
+as they cannot be mapped.
+
+\section debugging_memory_usage_margins Margins
+
+By default, allocations are laid out in memory blocks next to each other if possible
+(considering required alignment, `bufferImageGranularity`, and `nonCoherentAtomSize`).
+
+![Allocations without margin](../gfx/Margins_1.png)
+
+Define macro `VMA_DEBUG_MARGIN` to some non-zero value (e.g. 16) to enforce specified
+number of bytes as a margin before and after every allocation.
+
+\code
+#define VMA_DEBUG_MARGIN 16
+#include "vk_mem_alloc.h"
+\endcode
+
+![Allocations with margin](../gfx/Margins_2.png)
+
+If your bug goes away after enabling margins, it means it may be caused by memory
+being overwritten outside of allocation boundaries. It is not 100% certain though.
+Change in application behavior may also be caused by different order and distribution
+of allocations across memory blocks after margins are applied.
+
+The margin is applied also before first and after last allocation in a block.
+It may occur only once between two adjacent allocations.
+
+Margins work with all types of memory.
+
+Margin is applied only to allocations made out of memory blocks and not to dedicated
+allocations, which have their own memory block of specific size.
+It is thus not applied to allocations made using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT flag
+or those automatically decided to put into dedicated allocations, e.g. due to its
+large size or recommended by VK_KHR_dedicated_allocation extension.
+Margins are also not active in custom pools created with #VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT flag.
+
+Margins appear in [JSON dump](@ref statistics_json_dump) as part of free space.
+
+Note that enabling margins increases memory usage and fragmentation.
+
+\section debugging_memory_usage_corruption_detection Corruption detection
+
+You can additionally define macro `VMA_DEBUG_DETECT_CORRUPTION` to 1 to enable validation
+of contents of the margins.
+
+\code
+#define VMA_DEBUG_MARGIN 16
+#define VMA_DEBUG_DETECT_CORRUPTION 1
+#include "vk_mem_alloc.h"
+\endcode
+
+When this feature is enabled, number of bytes specified as `VMA_DEBUG_MARGIN`
+(it must be multiply of 4) before and after every allocation is filled with a magic number.
+This idea is also know as "canary".
+Memory is automatically mapped and unmapped if necessary.
+
+This number is validated automatically when the allocation is destroyed.
+If it's not equal to the expected value, `VMA_ASSERT()` is executed.
+It clearly means that either CPU or GPU overwritten the memory outside of boundaries of the allocation,
+which indicates a serious bug.
+
+You can also explicitly request checking margins of all allocations in all memory blocks
+that belong to specified memory types by using function vmaCheckCorruption(),
+or in memory blocks that belong to specified custom pool, by using function 
+vmaCheckPoolCorruption().
+
+Margin validation (corruption detection) works only for memory types that are
+`HOST_VISIBLE` and `HOST_COHERENT`.
+
+
+\page record_and_replay Record and replay
+
+\section record_and_replay_introduction Introduction
+
+While using the library, sequence of calls to its functions together with their
+parameters can be recorded to a file and later replayed using standalone player
+application. It can be useful to:
+
+- Test correctness - check if same sequence of calls will not cause crash or
+  failures on a target platform.
+- Gather statistics - see number of allocations, peak memory usage, number of
+  calls etc.
+- Benchmark performance - see how much time it takes to replay the whole
+  sequence.
+
+\section record_and_replay_usage Usage
+
+<b>To record sequence of calls to a file:</b> Fill in
+VmaAllocatorCreateInfo::pRecordSettings member while creating #VmaAllocator
+object. File is opened and written during whole lifetime of the allocator.
+
+<b>To replay file:</b> Use VmaReplay - standalone command-line program.
+Precompiled binary can be found in "bin" directory.
+Its source can be found in "src/VmaReplay" directory.
+Its project is generated by Premake.
+Command line syntax is printed when the program is launched without parameters.
+Basic usage:
+
+    VmaReplay.exe MyRecording.csv
+
+<b>Documentation of file format</b> can be found in file: "docs/Recording file format.md".
+It's a human-readable, text file in CSV format (Comma Separated Values).
+
+\section record_and_replay_additional_considerations Additional considerations
+
+- Replaying file that was recorded on a different GPU (with different parameters
+  like `bufferImageGranularity`, `nonCoherentAtomSize`, and especially different
+  set of memory heaps and types) may give different performance and memory usage
+  results, as well as issue some warnings and errors.
+- Current implementation of recording in VMA, as well as VmaReplay application, is
+  coded and tested only on Windows. Inclusion of recording code is driven by
+  `VMA_RECORDING_ENABLED` macro. Support for other platforms should be easy to
+  add. Contributions are welcomed.
+- Currently calls to vmaDefragment() function are not recorded.
+
+
+\page usage_patterns Recommended usage patterns
+
+See also slides from talk:
+[Sawicki, Adam. Advanced Graphics Techniques Tutorial: Memory management in Vulkan and DX12. Game Developers Conference, 2018](https://www.gdcvault.com/play/1025458/Advanced-Graphics-Techniques-Tutorial-New)
+
+
+\section usage_patterns_simple Simple patterns
+
+\subsection usage_patterns_simple_render_targets Render targets
+
+<b>When:</b>
+Any resources that you frequently write and read on GPU,
+e.g. images used as color attachments (aka "render targets"), depth-stencil attachments,
+images/buffers used as storage image/buffer (aka "Unordered Access View (UAV)").
+
+<b>What to do:</b>
+Create them in video memory that is fastest to access from GPU using
+#VMA_MEMORY_USAGE_GPU_ONLY.
+
+Consider using [VK_KHR_dedicated_allocation](@ref vk_khr_dedicated_allocation) extension
+and/or manually creating them as dedicated allocations using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT,
+especially if they are large or if you plan to destroy and recreate them e.g. when
+display resolution changes.
+Prefer to create such resources first and all other GPU resources (like textures and vertex buffers) later.
+
+\subsection usage_patterns_simple_immutable_resources Immutable resources
+
+<b>When:</b>
+Any resources that you fill on CPU only once (aka "immutable") or infrequently
+and then read frequently on GPU,
+e.g. textures, vertex and index buffers, constant buffers that don't change often.
+
+<b>What to do:</b>
+Create them in video memory that is fastest to access from GPU using
+#VMA_MEMORY_USAGE_GPU_ONLY.
+
+To initialize content of such resource, create a CPU-side (aka "staging") copy of it
+in system memory - #VMA_MEMORY_USAGE_CPU_ONLY, map it, fill it,
+and submit a transfer from it to the GPU resource.
+You can keep the staging copy if you need it for another upload transfer in the future.
+If you don't, you can destroy it or reuse this buffer for uploading different resource
+after the transfer finishes.
+
+Prefer to create just buffers in system memory rather than images, even for uploading textures.
+Use `vkCmdCopyBufferToImage()`.
+Dont use images with `VK_IMAGE_TILING_LINEAR`.
+
+\subsection usage_patterns_dynamic_resources Dynamic resources
+
+<b>When:</b>
+Any resources that change frequently (aka "dynamic"), e.g. every frame or every draw call,
+written on CPU, read on GPU.
+
+<b>What to do:</b>
+Create them using #VMA_MEMORY_USAGE_CPU_TO_GPU.
+You can map it and write to it directly on CPU, as well as read from it on GPU.
+
+This is a more complex situation. Different solutions are possible,
+and the best one depends on specific GPU type, but you can use this simple approach for the start.
+Prefer to write to such resource sequentially (e.g. using `memcpy`).
+Don't perform random access or any reads from it on CPU, as it may be very slow.
+
+\subsection usage_patterns_readback Readback
+
+<b>When:</b>
+Resources that contain data written by GPU that you want to read back on CPU,
+e.g. results of some computations.
+
+<b>What to do:</b>
+Create them using #VMA_MEMORY_USAGE_GPU_TO_CPU.
+You can write to them directly on GPU, as well as map and read them on CPU.
+
+\section usage_patterns_advanced Advanced patterns
+
+\subsection usage_patterns_integrated_graphics Detecting integrated graphics
+
+You can support integrated graphics (like Intel HD Graphics, AMD APU) better
+by detecting it in Vulkan.
+To do it, call `vkGetPhysicalDeviceProperties()`, inspect
+`VkPhysicalDeviceProperties::deviceType` and look for `VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU`.
+When you find it, you can assume that memory is unified and all memory types are comparably fast
+to access from GPU, regardless of `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.
+
+You can then sum up sizes of all available memory heaps and treat them as useful for
+your GPU resources, instead of only `DEVICE_LOCAL` ones.
+You can also prefer to create your resources in memory types that are `HOST_VISIBLE` to map them
+directly instead of submitting explicit transfer (see below).
+
+\subsection usage_patterns_direct_vs_transfer Direct access versus transfer
+
+For resources that you frequently write on CPU and read on GPU, many solutions are possible:
+
+-# Create one copy in video memory using #VMA_MEMORY_USAGE_GPU_ONLY,
+   second copy in system memory using #VMA_MEMORY_USAGE_CPU_ONLY and submit explicit tranfer each time.
+-# Create just single copy using #VMA_MEMORY_USAGE_CPU_TO_GPU, map it and fill it on CPU,
+   read it directly on GPU.
+-# Create just single copy using #VMA_MEMORY_USAGE_CPU_ONLY, map it and fill it on CPU,
+   read it directly on GPU.
+
+Which solution is the most efficient depends on your resource and especially on the GPU.
+It is best to measure it and then make the decision.
+Some general recommendations:
+
+- On integrated graphics use (2) or (3) to avoid unnecesary time and memory overhead
+  related to using a second copy and making transfer.
+- For small resources (e.g. constant buffers) use (2).
+  Discrete AMD cards have special 256 MiB pool of video memory that is directly mappable.
+  Even if the resource ends up in system memory, its data may be cached on GPU after first
+  fetch over PCIe bus.
+- For larger resources (e.g. textures), decide between (1) and (2).
+  You may want to differentiate NVIDIA and AMD, e.g. by looking for memory type that is
+  both `DEVICE_LOCAL` and `HOST_VISIBLE`. When you find it, use (2), otherwise use (1).
+
+Similarly, for resources that you frequently write on GPU and read on CPU, multiple
+solutions are possible:
+
+-# Create one copy in video memory using #VMA_MEMORY_USAGE_GPU_ONLY,
+   second copy in system memory using #VMA_MEMORY_USAGE_GPU_TO_CPU and submit explicit tranfer each time.
+-# Create just single copy using #VMA_MEMORY_USAGE_GPU_TO_CPU, write to it directly on GPU,
+   map it and read it on CPU.
+
+You should take some measurements to decide which option is faster in case of your specific
+resource.
+
+If you don't want to specialize your code for specific types of GPUs, you can still make
+an simple optimization for cases when your resource ends up in mappable memory to use it
+directly in this case instead of creating CPU-side staging copy.
+For details see [Finding out if memory is mappable](@ref memory_mapping_finding_if_memory_mappable).
+
+
+\page configuration Configuration
+
+Please check "CONFIGURATION SECTION" in the code to find macros that you can define
+before each include of this file or change directly in this file to provide
+your own implementation of basic facilities like assert, `min()` and `max()` functions,
+mutex, atomic etc.
+The library uses its own implementation of containers by default, but you can switch to using
+STL containers instead.
+
+\section config_Vulkan_functions Pointers to Vulkan functions
+
+The library uses Vulkan functions straight from the `vulkan.h` header by default.
+If you want to provide your own pointers to these functions, e.g. fetched using
+`vkGetInstanceProcAddr()` and `vkGetDeviceProcAddr()`:
+
+-# Define `VMA_STATIC_VULKAN_FUNCTIONS 0`.
+-# Provide valid pointers through VmaAllocatorCreateInfo::pVulkanFunctions.
+
+\section custom_memory_allocator Custom host memory allocator
+
+If you use custom allocator for CPU memory rather than default operator `new`
+and `delete` from C++, you can make this library using your allocator as well
+by filling optional member VmaAllocatorCreateInfo::pAllocationCallbacks. These
+functions will be passed to Vulkan, as well as used by the library itself to
+make any CPU-side allocations.
+
+\section allocation_callbacks Device memory allocation callbacks
+
+The library makes calls to `vkAllocateMemory()` and `vkFreeMemory()` internally.
+You can setup callbacks to be informed about these calls, e.g. for the purpose
+of gathering some statistics. To do it, fill optional member
+VmaAllocatorCreateInfo::pDeviceMemoryCallbacks.
+
+\section heap_memory_limit Device heap memory limit
+
+If you want to test how your program behaves with limited amount of Vulkan device
+memory available without switching your graphics card to one that really has
+smaller VRAM, you can use a feature of this library intended for this purpose.
+To do it, fill optional member VmaAllocatorCreateInfo::pHeapSizeLimit.
+
+
+
+\page vk_khr_dedicated_allocation VK_KHR_dedicated_allocation
+
+VK_KHR_dedicated_allocation is a Vulkan extension which can be used to improve
+performance on some GPUs. It augments Vulkan API with possibility to query
+driver whether it prefers particular buffer or image to have its own, dedicated
+allocation (separate `VkDeviceMemory` block) for better efficiency - to be able
+to do some internal optimizations.
+
+The extension is supported by this library. It will be used automatically when
+enabled. To enable it:
+
+1 . When creating Vulkan device, check if following 2 device extensions are
+supported (call `vkEnumerateDeviceExtensionProperties()`).
+If yes, enable them (fill `VkDeviceCreateInfo::ppEnabledExtensionNames`).
+
+- VK_KHR_get_memory_requirements2
+- VK_KHR_dedicated_allocation
+
+If you enabled these extensions:
+
+2 . Use #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag when creating
+your #VmaAllocator`to inform the library that you enabled required extensions
+and you want the library to use them.
+
+\code
+allocatorInfo.flags |= VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT;
+
+vmaCreateAllocator(&allocatorInfo, &allocator);
+\endcode
+
+That's all. The extension will be automatically used whenever you create a
+buffer using vmaCreateBuffer() or image using vmaCreateImage().
+
+When using the extension together with Vulkan Validation Layer, you will receive
+warnings like this:
+
+    vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequirements() has not been called on that buffer.
+
+It is OK, you should just ignore it. It happens because you use function
+`vkGetBufferMemoryRequirements2KHR()` instead of standard
+`vkGetBufferMemoryRequirements()`, while the validation layer seems to be
+unaware of it.
+
+To learn more about this extension, see:
+
+- [VK_KHR_dedicated_allocation in Vulkan specification](https://www.khronos.org/registry/vulkan/specs/1.0-extensions/html/vkspec.html#VK_KHR_dedicated_allocation)
+- [VK_KHR_dedicated_allocation unofficial manual](http://asawicki.info/articles/VK_KHR_dedicated_allocation.php5)
+
+
+
+\page general_considerations General considerations
+
+\section general_considerations_thread_safety Thread safety
+
+- The library has no global state, so separate #VmaAllocator objects can be used
+  independently.
+  There should be no need to create multiple such objects though - one per `VkDevice` is enough.
+- By default, all calls to functions that take #VmaAllocator as first parameter
+  are safe to call from multiple threads simultaneously because they are
+  synchronized internally when needed.
+- When the allocator is created with #VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT
+  flag, calls to functions that take such #VmaAllocator object must be
+  synchronized externally.
+- Access to a #VmaAllocation object must be externally synchronized. For example,
+  you must not call vmaGetAllocationInfo() and vmaMapMemory() from different
+  threads at the same time if you pass the same #VmaAllocation object to these
+  functions.
+
+\section general_considerations_validation_layer_warnings Validation layer warnings
+
+When using this library, you can meet following types of warnings issued by
+Vulkan validation layer. They don't necessarily indicate a bug, so you may need
+to just ignore them.
+
+- *vkBindBufferMemory(): Binding memory to buffer 0xeb8e4 but vkGetBufferMemoryRequirements() has not been called on that buffer.*
+  - It happens when VK_KHR_dedicated_allocation extension is enabled.
+    `vkGetBufferMemoryRequirements2KHR` function is used instead, while validation layer seems to be unaware of it.
+- *Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.*
+  - It happens when you map a buffer or image, because the library maps entire
+    `VkDeviceMemory` block, where different types of images and buffers may end
+    up together, especially on GPUs with unified memory like Intel.
+- *Non-linear image 0xebc91 is aliased with linear buffer 0xeb8e4 which may indicate a bug.*
+  - It happens when you use lost allocations, and a new image or buffer is
+    created in place of an existing object that bacame lost.
+  - It may happen also when you use [defragmentation](@ref defragmentation).
+
+\section general_considerations_allocation_algorithm Allocation algorithm
+
+The library uses following algorithm for allocation, in order:
+
+-# Try to find free range of memory in existing blocks.
+-# If failed, try to create a new block of `VkDeviceMemory`, with preferred block size.
+-# If failed, try to create such block with size/2, size/4, size/8.
+-# If failed and #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag was
+   specified, try to find space in existing blocks, possilby making some other
+   allocations lost.
+-# If failed, try to allocate separate `VkDeviceMemory` for this allocation,
+   just like when you use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.
+-# If failed, choose other memory type that meets the requirements specified in
+   VmaAllocationCreateInfo and go to point 1.
+-# If failed, return `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+
+\section general_considerations_features_not_supported Features not supported
+
+Features deliberately excluded from the scope of this library:
+
+- Data transfer. Uploading (straming) and downloading data of buffers and images
+  between CPU and GPU memory and related synchronization is responsibility of the user.
+- Allocations for imported/exported external memory. They tend to require
+  explicit memory type index and dedicated allocation anyway, so they don't
+  interact with main features of this library. Such special purpose allocations
+  should be made manually, using `vkCreateBuffer()` and `vkAllocateMemory()`.
+- Recreation of buffers and images. Although the library has functions for
+  buffer and image creation (vmaCreateBuffer(), vmaCreateImage()), you need to
+  recreate these objects yourself after defragmentation. That's because the big
+  structures `VkBufferCreateInfo`, `VkImageCreateInfo` are not stored in
+  #VmaAllocation object.
+- Handling CPU memory allocation failures. When dynamically creating small C++
+  objects in CPU memory (not Vulkan memory), allocation failures are not checked
+  and handled gracefully, because that would complicate code significantly and
+  is usually not needed in desktop PC applications anyway.
+- Code free of any compiler warnings. Maintaining the library to compile and
+  work correctly on so many different platforms is hard enough. Being free of 
+  any warnings, on any version of any compiler, is simply not feasible.
+- This is a C++ library with C interface.
+  Bindings or ports to any other programming languages are welcomed as external projects and
+  are not going to be included into this repository.
+
+*/
+
+/*
+Define this macro to 0/1 to disable/enable support for recording functionality,
+available through VmaAllocatorCreateInfo::pRecordSettings.
+*/
+#ifndef VMA_RECORDING_ENABLED
+    #ifdef _WIN32
+        #define VMA_RECORDING_ENABLED 1
+    #else
+        #define VMA_RECORDING_ENABLED 0
+    #endif
+#endif
+
+#ifndef NOMINMAX
+    #define NOMINMAX // For windows.h
+#endif
+
+#ifndef VULKAN_H_
+    #include <vulkan/vulkan.h>
+#endif
+
+#if VMA_RECORDING_ENABLED
+    #include <windows.h>
+#endif
+
+#if !defined(VMA_DEDICATED_ALLOCATION)
+    #if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation
+        #define VMA_DEDICATED_ALLOCATION 1
+    #else
+        #define VMA_DEDICATED_ALLOCATION 0
+    #endif
+#endif
+
+/** \struct VmaAllocator
+\brief Represents main object of this library initialized.
+
+Fill structure #VmaAllocatorCreateInfo and call function vmaCreateAllocator() to create it.
+Call function vmaDestroyAllocator() to destroy it.
+
+It is recommended to create just one object of this type per `VkDevice` object,
+right after Vulkan is initialized and keep it alive until before Vulkan device is destroyed.
+*/
+VK_DEFINE_HANDLE(VmaAllocator)
+
+/// Callback function called after successful vkAllocateMemory.
+typedef void (VKAPI_PTR *PFN_vmaAllocateDeviceMemoryFunction)(
+    VmaAllocator      allocator,
+    uint32_t          memoryType,
+    VkDeviceMemory    memory,
+    VkDeviceSize      size);
+/// Callback function called before vkFreeMemory.
+typedef void (VKAPI_PTR *PFN_vmaFreeDeviceMemoryFunction)(
+    VmaAllocator      allocator,
+    uint32_t          memoryType,
+    VkDeviceMemory    memory,
+    VkDeviceSize      size);
+
+/** \brief Set of callbacks that the library will call for `vkAllocateMemory` and `vkFreeMemory`.
+
+Provided for informative purpose, e.g. to gather statistics about number of
+allocations or total amount of memory allocated in Vulkan.
+
+Used in VmaAllocatorCreateInfo::pDeviceMemoryCallbacks.
+*/
+typedef struct VmaDeviceMemoryCallbacks {
+    /// Optional, can be null.
+    PFN_vmaAllocateDeviceMemoryFunction pfnAllocate;
+    /// Optional, can be null.
+    PFN_vmaFreeDeviceMemoryFunction pfnFree;
+} VmaDeviceMemoryCallbacks;
+
+/// Flags for created #VmaAllocator.
+typedef enum VmaAllocatorCreateFlagBits {
+    /** \brief Allocator and all objects created from it will not be synchronized internally, so you must guarantee they are used from only one thread at a time or synchronized externally by you.
+
+    Using this flag may increase performance because internal mutexes are not used.
+    */
+    VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001,
+    /** \brief Enables usage of VK_KHR_dedicated_allocation extension.
+
+    Using this extenion will automatically allocate dedicated blocks of memory for
+    some buffers and images instead of suballocating place for them out of bigger
+    memory blocks (as if you explicitly used #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT
+    flag) when it is recommended by the driver. It may improve performance on some
+    GPUs.
+
+    You may set this flag only if you found out that following device extensions are
+    supported, you enabled them while creating Vulkan device passed as
+    VmaAllocatorCreateInfo::device, and you want them to be used internally by this
+    library:
+
+    - VK_KHR_get_memory_requirements2
+    - VK_KHR_dedicated_allocation
+
+When this flag is set, you can experience following warnings reported by Vulkan
+validation layer. You can ignore them.
+
+> vkBindBufferMemory(): Binding memory to buffer 0x2d but vkGetBufferMemoryRequirements() has not been called on that buffer.
+    */
+    VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT = 0x00000002,
+
+    VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaAllocatorCreateFlagBits;
+typedef VkFlags VmaAllocatorCreateFlags;
+
+/** \brief Pointers to some Vulkan functions - a subset used by the library.
+
+Used in VmaAllocatorCreateInfo::pVulkanFunctions.
+*/
+typedef struct VmaVulkanFunctions {
+    PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
+    PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;
+    PFN_vkAllocateMemory vkAllocateMemory;
+    PFN_vkFreeMemory vkFreeMemory;
+    PFN_vkMapMemory vkMapMemory;
+    PFN_vkUnmapMemory vkUnmapMemory;
+    PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges;
+    PFN_vkInvalidateMappedMemoryRanges vkInvalidateMappedMemoryRanges;
+    PFN_vkBindBufferMemory vkBindBufferMemory;
+    PFN_vkBindImageMemory vkBindImageMemory;
+    PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements;
+    PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements;
+    PFN_vkCreateBuffer vkCreateBuffer;
+    PFN_vkDestroyBuffer vkDestroyBuffer;
+    PFN_vkCreateImage vkCreateImage;
+    PFN_vkDestroyImage vkDestroyImage;
+    PFN_vkCmdCopyBuffer vkCmdCopyBuffer;
+#if VMA_DEDICATED_ALLOCATION
+    PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR;
+    PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR;
+#endif
+} VmaVulkanFunctions;
+
+/// Flags to be used in VmaRecordSettings::flags.
+typedef enum VmaRecordFlagBits {
+    /** \brief Enables flush after recording every function call.
+
+    Enable it if you expect your application to crash, which may leave recording file truncated.
+    It may degrade performance though.
+    */
+    VMA_RECORD_FLUSH_AFTER_CALL_BIT = 0x00000001,
+    
+    VMA_RECORD_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaRecordFlagBits;
+typedef VkFlags VmaRecordFlags;
+
+/// Parameters for recording calls to VMA functions. To be used in VmaAllocatorCreateInfo::pRecordSettings.
+typedef struct VmaRecordSettings
+{
+    /// Flags for recording. Use #VmaRecordFlagBits enum.
+    VmaRecordFlags flags;
+    /** \brief Path to the file that should be written by the recording.
+
+    Suggested extension: "csv".
+    If the file already exists, it will be overwritten.
+    It will be opened for the whole time #VmaAllocator object is alive.
+    If opening this file fails, creation of the whole allocator object fails.
+    */
+    const char* pFilePath;
+} VmaRecordSettings;
+
+/// Description of a Allocator to be created.
+typedef struct VmaAllocatorCreateInfo
+{
+    /// Flags for created allocator. Use #VmaAllocatorCreateFlagBits enum.
+    VmaAllocatorCreateFlags flags;
+    /// Vulkan physical device.
+    /** It must be valid throughout whole lifetime of created allocator. */
+    VkPhysicalDevice physicalDevice;
+    /// Vulkan device.
+    /** It must be valid throughout whole lifetime of created allocator. */
+    VkDevice device;
+    /// Preferred size of a single `VkDeviceMemory` block to be allocated from large heaps > 1 GiB. Optional.
+    /** Set to 0 to use default, which is currently 256 MiB. */
+    VkDeviceSize preferredLargeHeapBlockSize;
+    /// Custom CPU memory allocation callbacks. Optional.
+    /** Optional, can be null. When specified, will also be used for all CPU-side memory allocations. */
+    const VkAllocationCallbacks* pAllocationCallbacks;
+    /// Informative callbacks for `vkAllocateMemory`, `vkFreeMemory`. Optional.
+    /** Optional, can be null. */
+    const VmaDeviceMemoryCallbacks* pDeviceMemoryCallbacks;
+    /** \brief Maximum number of additional frames that are in use at the same time as current frame.
+
+    This value is used only when you make allocations with
+    VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocation cannot become
+    lost if allocation.lastUseFrameIndex >= allocator.currentFrameIndex - frameInUseCount.
+
+    For example, if you double-buffer your command buffers, so resources used for
+    rendering in previous frame may still be in use by the GPU at the moment you
+    allocate resources needed for the current frame, set this value to 1.
+
+    If you want to allow any allocations other than used in the current frame to
+    become lost, set this value to 0.
+    */
+    uint32_t frameInUseCount;
+    /** \brief Either null or a pointer to an array of limits on maximum number of bytes that can be allocated out of particular Vulkan memory heap.
+
+    If not NULL, it must be a pointer to an array of
+    `VkPhysicalDeviceMemoryProperties::memoryHeapCount` elements, defining limit on
+    maximum number of bytes that can be allocated out of particular Vulkan memory
+    heap.
+
+    Any of the elements may be equal to `VK_WHOLE_SIZE`, which means no limit on that
+    heap. This is also the default in case of `pHeapSizeLimit` = NULL.
+
+    If there is a limit defined for a heap:
+
+    - If user tries to allocate more memory from that heap using this allocator,
+      the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+    - If the limit is smaller than heap size reported in `VkMemoryHeap::size`, the
+      value of this limit will be reported instead when using vmaGetMemoryProperties().
+
+    Warning! Using this feature may not be equivalent to installing a GPU with
+    smaller amount of memory, because graphics driver doesn't necessary fail new
+    allocations with `VK_ERROR_OUT_OF_DEVICE_MEMORY` result when memory capacity is
+    exceeded. It may return success and just silently migrate some device memory
+    blocks to system RAM. This driver behavior can also be controlled using
+    VK_AMD_memory_overallocation_behavior extension.
+    */
+    const VkDeviceSize* pHeapSizeLimit;
+    /** \brief Pointers to Vulkan functions. Can be null if you leave define `VMA_STATIC_VULKAN_FUNCTIONS 1`.
+
+    If you leave define `VMA_STATIC_VULKAN_FUNCTIONS 1` in configuration section,
+    you can pass null as this member, because the library will fetch pointers to
+    Vulkan functions internally in a static way, like:
+
+        vulkanFunctions.vkAllocateMemory = &vkAllocateMemory;
+
+    Fill this member if you want to provide your own pointers to Vulkan functions,
+    e.g. fetched using `vkGetInstanceProcAddr()` and `vkGetDeviceProcAddr()`.
+    */
+    const VmaVulkanFunctions* pVulkanFunctions;
+    /** \brief Parameters for recording of VMA calls. Can be null.
+
+    If not null, it enables recording of calls to VMA functions to a file.
+    If support for recording is not enabled using `VMA_RECORDING_ENABLED` macro,
+    creation of the allocator object fails with `VK_ERROR_FEATURE_NOT_PRESENT`.
+    */
+    const VmaRecordSettings* pRecordSettings;
+} VmaAllocatorCreateInfo;
+
+/// Creates Allocator object.
+VkResult vmaCreateAllocator(
+    const VmaAllocatorCreateInfo* pCreateInfo,
+    VmaAllocator* pAllocator);
+
+/// Destroys allocator object.
+void vmaDestroyAllocator(
+    VmaAllocator allocator);
+
+/**
+PhysicalDeviceProperties are fetched from physicalDevice by the allocator.
+You can access it here, without fetching it again on your own.
+*/
+void vmaGetPhysicalDeviceProperties(
+    VmaAllocator allocator,
+    const VkPhysicalDeviceProperties** ppPhysicalDeviceProperties);
+
+/**
+PhysicalDeviceMemoryProperties are fetched from physicalDevice by the allocator.
+You can access it here, without fetching it again on your own.
+*/
+void vmaGetMemoryProperties(
+    VmaAllocator allocator,
+    const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties);
+
+/**
+\brief Given Memory Type Index, returns Property Flags of this memory type.
+
+This is just a convenience function. Same information can be obtained using
+vmaGetMemoryProperties().
+*/
+void vmaGetMemoryTypeProperties(
+    VmaAllocator allocator,
+    uint32_t memoryTypeIndex,
+    VkMemoryPropertyFlags* pFlags);
+
+/** \brief Sets index of the current frame.
+
+This function must be used if you make allocations with
+#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT and
+#VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flags to inform the allocator
+when a new frame begins. Allocations queried using vmaGetAllocationInfo() cannot
+become lost in the current frame.
+*/
+void vmaSetCurrentFrameIndex(
+    VmaAllocator allocator,
+    uint32_t frameIndex);
+
+/** \brief Calculated statistics of memory usage in entire allocator.
+*/
+typedef struct VmaStatInfo
+{
+    /// Number of `VkDeviceMemory` Vulkan memory blocks allocated.
+    uint32_t blockCount;
+    /// Number of #VmaAllocation allocation objects allocated.
+    uint32_t allocationCount;
+    /// Number of free ranges of memory between allocations.
+    uint32_t unusedRangeCount;
+    /// Total number of bytes occupied by all allocations.
+    VkDeviceSize usedBytes;
+    /// Total number of bytes occupied by unused ranges.
+    VkDeviceSize unusedBytes;
+    VkDeviceSize allocationSizeMin, allocationSizeAvg, allocationSizeMax;
+    VkDeviceSize unusedRangeSizeMin, unusedRangeSizeAvg, unusedRangeSizeMax;
+} VmaStatInfo;
+
+/// General statistics from current state of Allocator.
+typedef struct VmaStats
+{
+    VmaStatInfo memoryType[VK_MAX_MEMORY_TYPES];
+    VmaStatInfo memoryHeap[VK_MAX_MEMORY_HEAPS];
+    VmaStatInfo total;
+} VmaStats;
+
+/// Retrieves statistics from current state of the Allocator.
+void vmaCalculateStats(
+    VmaAllocator allocator,
+    VmaStats* pStats);
+
+#define VMA_STATS_STRING_ENABLED 1
+
+#if VMA_STATS_STRING_ENABLED
+
+/// Builds and returns statistics as string in JSON format.
+/** @param[out] ppStatsString Must be freed using vmaFreeStatsString() function.
+*/
+void vmaBuildStatsString(
+    VmaAllocator allocator,
+    char** ppStatsString,
+    VkBool32 detailedMap);
+
+void vmaFreeStatsString(
+    VmaAllocator allocator,
+    char* pStatsString);
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+/** \struct VmaPool
+\brief Represents custom memory pool
+
+Fill structure VmaPoolCreateInfo and call function vmaCreatePool() to create it.
+Call function vmaDestroyPool() to destroy it.
+
+For more information see [Custom memory pools](@ref choosing_memory_type_custom_memory_pools).
+*/
+VK_DEFINE_HANDLE(VmaPool)
+
+typedef enum VmaMemoryUsage
+{
+    /** No intended memory usage specified.
+    Use other members of VmaAllocationCreateInfo to specify your requirements.
+    */
+    VMA_MEMORY_USAGE_UNKNOWN = 0,
+    /** Memory will be used on device only, so fast access from the device is preferred.
+    It usually means device-local GPU (video) memory.
+    No need to be mappable on host.
+    It is roughly equivalent of `D3D12_HEAP_TYPE_DEFAULT`.
+
+    Usage:
+    
+    - Resources written and read by device, e.g. images used as attachments.
+    - Resources transferred from host once (immutable) or infrequently and read by
+      device multiple times, e.g. textures to be sampled, vertex buffers, uniform
+      (constant) buffers, and majority of other types of resources used on GPU.
+
+    Allocation may still end up in `HOST_VISIBLE` memory on some implementations.
+    In such case, you are free to map it.
+    You can use #VMA_ALLOCATION_CREATE_MAPPED_BIT with this usage type.
+    */
+    VMA_MEMORY_USAGE_GPU_ONLY = 1,
+    /** Memory will be mappable on host.
+    It usually means CPU (system) memory.
+    Guarantees to be `HOST_VISIBLE` and `HOST_COHERENT`.
+    CPU access is typically uncached. Writes may be write-combined.
+    Resources created in this pool may still be accessible to the device, but access to them can be slow.
+    It is roughly equivalent of `D3D12_HEAP_TYPE_UPLOAD`.
+
+    Usage: Staging copy of resources used as transfer source.
+    */
+    VMA_MEMORY_USAGE_CPU_ONLY = 2,
+    /**
+    Memory that is both mappable on host (guarantees to be `HOST_VISIBLE`) and preferably fast to access by GPU.
+    CPU access is typically uncached. Writes may be write-combined.
+
+    Usage: Resources written frequently by host (dynamic), read by device. E.g. textures, vertex buffers, uniform buffers updated every frame or every draw call.
+    */
+    VMA_MEMORY_USAGE_CPU_TO_GPU = 3,
+    /** Memory mappable on host (guarantees to be `HOST_VISIBLE`) and cached.
+    It is roughly equivalent of `D3D12_HEAP_TYPE_READBACK`.
+
+    Usage:
+
+    - Resources written by device, read by host - results of some computations, e.g. screen capture, average scene luminance for HDR tone mapping.
+    - Any resources read or accessed randomly on host, e.g. CPU-side copy of vertex buffer used as source of transfer, but also used for collision detection.
+    */
+    VMA_MEMORY_USAGE_GPU_TO_CPU = 4,
+    VMA_MEMORY_USAGE_MAX_ENUM = 0x7FFFFFFF
+} VmaMemoryUsage;
+
+/// Flags to be passed as VmaAllocationCreateInfo::flags.
+typedef enum VmaAllocationCreateFlagBits {
+    /** \brief Set this flag if the allocation should have its own memory block.
+    
+    Use it for special, big resources, like fullscreen images used as attachments.
+   
+    This flag must also be used for host visible resources that you want to map
+    simultaneously because otherwise they might end up as regions of the same
+    `VkDeviceMemory`, while mapping same `VkDeviceMemory` multiple times
+    simultaneously is illegal.
+
+    You should not use this flag if VmaAllocationCreateInfo::pool is not null.
+    */
+    VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT = 0x00000001,
+
+    /** \brief Set this flag to only try to allocate from existing `VkDeviceMemory` blocks and never create new such block.
+    
+    If new allocation cannot be placed in any of the existing blocks, allocation
+    fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY` error.
+    
+    You should not use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT and
+    #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT at the same time. It makes no sense.
+    
+    If VmaAllocationCreateInfo::pool is not null, this flag is implied and ignored. */
+    VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT = 0x00000002,
+    /** \brief Set this flag to use a memory that will be persistently mapped and retrieve pointer to it.
+    
+    Pointer to mapped memory will be returned through VmaAllocationInfo::pMappedData.
+
+    Is it valid to use this flag for allocation made from memory type that is not
+    `HOST_VISIBLE`. This flag is then ignored and memory is not mapped. This is
+    useful if you need an allocation that is efficient to use on GPU
+    (`DEVICE_LOCAL`) and still want to map it directly if possible on platforms that
+    support it (e.g. Intel GPU).
+
+    You should not use this flag together with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT.
+    */
+    VMA_ALLOCATION_CREATE_MAPPED_BIT = 0x00000004,
+    /** Allocation created with this flag can become lost as a result of another
+    allocation with #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag, so you
+    must check it before use.
+
+    To check if allocation is not lost, call vmaGetAllocationInfo() and check if
+    VmaAllocationInfo::deviceMemory is not `VK_NULL_HANDLE`.
+
+    For details about supporting lost allocations, see Lost Allocations
+    chapter of User Guide on Main Page.
+
+    You should not use this flag together with #VMA_ALLOCATION_CREATE_MAPPED_BIT.
+    */
+    VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT = 0x00000008,
+    /** While creating allocation using this flag, other allocations that were
+    created with flag #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT can become lost.
+
+    For details about supporting lost allocations, see Lost Allocations
+    chapter of User Guide on Main Page.
+    */
+    VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT = 0x00000010,
+    /** Set this flag to treat VmaAllocationCreateInfo::pUserData as pointer to a
+    null-terminated string. Instead of copying pointer value, a local copy of the
+    string is made and stored in allocation's `pUserData`. The string is automatically
+    freed together with the allocation. It is also used in vmaBuildStatsString().
+    */
+    VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT = 0x00000020,
+    /** Allocation will be created from upper stack in a double stack pool.
+
+    This flag is only allowed for custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT flag.
+    */
+    VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = 0x00000040,
+
+    /** Allocation strategy that chooses smallest possible free range for the
+    allocation.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT  = 0x00010000,
+    /** Allocation strategy that chooses biggest possible free range for the
+    allocation.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT = 0x00020000,
+    /** Allocation strategy that chooses first suitable free range for the
+    allocation.
+
+    "First" doesn't necessarily means the one with smallest offset in memory,
+    but rather the one that is easiest and fastest to find.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT = 0x00040000,
+
+    /** Allocation strategy that tries to minimize memory usage.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT,
+    /** Allocation strategy that tries to minimize allocation time.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT,
+    /** Allocation strategy that tries to minimize memory fragmentation.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_MIN_FRAGMENTATION_BIT = VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT,
+
+    /** A bit mask to extract only `STRATEGY` bits from entire set of flags.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_MASK =
+        VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT |
+        VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT |
+        VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT,
+
+    VMA_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaAllocationCreateFlagBits;
+typedef VkFlags VmaAllocationCreateFlags;
+
+typedef struct VmaAllocationCreateInfo
+{
+    /// Use #VmaAllocationCreateFlagBits enum.
+    VmaAllocationCreateFlags flags;
+    /** \brief Intended usage of memory.
+    
+    You can leave #VMA_MEMORY_USAGE_UNKNOWN if you specify memory requirements in other way. \n
+    If `pool` is not null, this member is ignored.
+    */
+    VmaMemoryUsage usage;
+    /** \brief Flags that must be set in a Memory Type chosen for an allocation.
+    
+    Leave 0 if you specify memory requirements in other way. \n
+    If `pool` is not null, this member is ignored.*/
+    VkMemoryPropertyFlags requiredFlags;
+    /** \brief Flags that preferably should be set in a memory type chosen for an allocation.
+    
+    Set to 0 if no additional flags are prefered. \n
+    If `pool` is not null, this member is ignored. */
+    VkMemoryPropertyFlags preferredFlags;
+    /** \brief Bitmask containing one bit set for every memory type acceptable for this allocation.
+
+    Value 0 is equivalent to `UINT32_MAX` - it means any memory type is accepted if
+    it meets other requirements specified by this structure, with no further
+    restrictions on memory type index. \n
+    If `pool` is not null, this member is ignored.
+    */
+    uint32_t memoryTypeBits;
+    /** \brief Pool that this allocation should be created in.
+
+    Leave `VK_NULL_HANDLE` to allocate from default pool. If not null, members:
+    `usage`, `requiredFlags`, `preferredFlags`, `memoryTypeBits` are ignored.
+    */
+    VmaPool pool;
+    /** \brief Custom general-purpose pointer that will be stored in #VmaAllocation, can be read as VmaAllocationInfo::pUserData and changed using vmaSetAllocationUserData().
+    
+    If #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT is used, it must be either
+    null or pointer to a null-terminated string. The string will be then copied to
+    internal buffer, so it doesn't need to be valid after allocation call.
+    */
+    void* pUserData;
+} VmaAllocationCreateInfo;
+
+/**
+\brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo.
+
+This algorithm tries to find a memory type that:
+
+- Is allowed by memoryTypeBits.
+- Contains all the flags from pAllocationCreateInfo->requiredFlags.
+- Matches intended usage.
+- Has as many flags from pAllocationCreateInfo->preferredFlags as possible.
+
+\return Returns VK_ERROR_FEATURE_NOT_PRESENT if not found. Receiving such result
+from this function or any other allocating function probably means that your
+device doesn't support any memory type with requested features for the specific
+type of resource you want to use it for. Please check parameters of your
+resource, like image layout (OPTIMAL versus LINEAR) or mip level count.
+*/
+VkResult vmaFindMemoryTypeIndex(
+    VmaAllocator allocator,
+    uint32_t memoryTypeBits,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex);
+
+/**
+\brief Helps to find memoryTypeIndex, given VkBufferCreateInfo and VmaAllocationCreateInfo.
+
+It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex.
+It internally creates a temporary, dummy buffer that never has memory bound.
+It is just a convenience function, equivalent to calling:
+
+- `vkCreateBuffer`
+- `vkGetBufferMemoryRequirements`
+- `vmaFindMemoryTypeIndex`
+- `vkDestroyBuffer`
+*/
+VkResult vmaFindMemoryTypeIndexForBufferInfo(
+    VmaAllocator allocator,
+    const VkBufferCreateInfo* pBufferCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex);
+
+/**
+\brief Helps to find memoryTypeIndex, given VkImageCreateInfo and VmaAllocationCreateInfo.
+
+It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex.
+It internally creates a temporary, dummy image that never has memory bound.
+It is just a convenience function, equivalent to calling:
+
+- `vkCreateImage`
+- `vkGetImageMemoryRequirements`
+- `vmaFindMemoryTypeIndex`
+- `vkDestroyImage`
+*/
+VkResult vmaFindMemoryTypeIndexForImageInfo(
+    VmaAllocator allocator,
+    const VkImageCreateInfo* pImageCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex);
+
+/// Flags to be passed as VmaPoolCreateInfo::flags.
+typedef enum VmaPoolCreateFlagBits {
+    /** \brief Use this flag if you always allocate only buffers and linear images or only optimal images out of this pool and so Buffer-Image Granularity can be ignored.
+
+    This is an optional optimization flag.
+
+    If you always allocate using vmaCreateBuffer(), vmaCreateImage(),
+    vmaAllocateMemoryForBuffer(), then you don't need to use it because allocator
+    knows exact type of your allocations so it can handle Buffer-Image Granularity
+    in the optimal way.
+
+    If you also allocate using vmaAllocateMemoryForImage() or vmaAllocateMemory(),
+    exact type of such allocations is not known, so allocator must be conservative
+    in handling Buffer-Image Granularity, which can lead to suboptimal allocation
+    (wasted memory). In that case, if you can make sure you always allocate only
+    buffers and linear images or only optimal images out of this pool, use this flag
+    to make allocator disregard Buffer-Image Granularity and so make allocations
+    faster and more optimal.
+    */
+    VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT = 0x00000002,
+
+    /** \brief Enables alternative, linear allocation algorithm in this pool.
+
+    Specify this flag to enable linear allocation algorithm, which always creates
+    new allocations after last one and doesn't reuse space from allocations freed in
+    between. It trades memory consumption for simplified algorithm and data
+    structure, which has better performance and uses less memory for metadata.
+
+    By using this flag, you can achieve behavior of free-at-once, stack,
+    ring buffer, and double stack. For details, see documentation chapter
+    \ref linear_algorithm.
+
+    When using this flag, you must specify VmaPoolCreateInfo::maxBlockCount == 1 (or 0 for default).
+
+    For more details, see [Linear allocation algorithm](@ref linear_algorithm).
+    */
+    VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT = 0x00000004,
+
+    /** \brief Enables alternative, buddy allocation algorithm in this pool.
+
+    It operates on a tree of blocks, each having size that is a power of two and
+    a half of its parent's size. Comparing to default algorithm, this one provides
+    faster allocation and deallocation and decreased external fragmentation,
+    at the expense of more memory wasted (internal fragmentation).
+
+    For more details, see [Buddy allocation algorithm](@ref buddy_algorithm).
+    */
+    VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT = 0x00000008,
+
+    /** Bit mask to extract only `ALGORITHM` bits from entire set of flags.
+    */
+    VMA_POOL_CREATE_ALGORITHM_MASK =
+        VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT |
+        VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT,
+
+    VMA_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaPoolCreateFlagBits;
+typedef VkFlags VmaPoolCreateFlags;
+
+/** \brief Describes parameter of created #VmaPool.
+*/
+typedef struct VmaPoolCreateInfo {
+    /** \brief Vulkan memory type index to allocate this pool from.
+    */
+    uint32_t memoryTypeIndex;
+    /** \brief Use combination of #VmaPoolCreateFlagBits.
+    */
+    VmaPoolCreateFlags flags;
+    /** \brief Size of a single `VkDeviceMemory` block to be allocated as part of this pool, in bytes. Optional.
+
+    Specify nonzero to set explicit, constant size of memory blocks used by this
+    pool.
+
+    Leave 0 to use default and let the library manage block sizes automatically.
+    Sizes of particular blocks may vary.
+    */
+    VkDeviceSize blockSize;
+    /** \brief Minimum number of blocks to be always allocated in this pool, even if they stay empty.
+
+    Set to 0 to have no preallocated blocks and allow the pool be completely empty.
+    */
+    size_t minBlockCount;
+    /** \brief Maximum number of blocks that can be allocated in this pool. Optional.
+
+    Set to 0 to use default, which is `SIZE_MAX`, which means no limit.
+    
+    Set to same value as VmaPoolCreateInfo::minBlockCount to have fixed amount of memory allocated
+    throughout whole lifetime of this pool.
+    */
+    size_t maxBlockCount;
+    /** \brief Maximum number of additional frames that are in use at the same time as current frame.
+
+    This value is used only when you make allocations with
+    #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocation cannot become
+    lost if allocation.lastUseFrameIndex >= allocator.currentFrameIndex - frameInUseCount.
+
+    For example, if you double-buffer your command buffers, so resources used for
+    rendering in previous frame may still be in use by the GPU at the moment you
+    allocate resources needed for the current frame, set this value to 1.
+
+    If you want to allow any allocations other than used in the current frame to
+    become lost, set this value to 0.
+    */
+    uint32_t frameInUseCount;
+} VmaPoolCreateInfo;
+
+/** \brief Describes parameter of existing #VmaPool.
+*/
+typedef struct VmaPoolStats {
+    /** \brief Total amount of `VkDeviceMemory` allocated from Vulkan for this pool, in bytes.
+    */
+    VkDeviceSize size;
+    /** \brief Total number of bytes in the pool not used by any #VmaAllocation.
+    */
+    VkDeviceSize unusedSize;
+    /** \brief Number of #VmaAllocation objects created from this pool that were not destroyed or lost.
+    */
+    size_t allocationCount;
+    /** \brief Number of continuous memory ranges in the pool not used by any #VmaAllocation.
+    */
+    size_t unusedRangeCount;
+    /** \brief Size of the largest continuous free memory region available for new allocation.
+
+    Making a new allocation of that size is not guaranteed to succeed because of
+    possible additional margin required to respect alignment and buffer/image
+    granularity.
+    */
+    VkDeviceSize unusedRangeSizeMax;
+    /** \brief Number of `VkDeviceMemory` blocks allocated for this pool.
+    */
+    size_t blockCount;
+} VmaPoolStats;
+
+/** \brief Allocates Vulkan device memory and creates #VmaPool object.
+
+@param allocator Allocator object.
+@param pCreateInfo Parameters of pool to create.
+@param[out] pPool Handle to created pool.
+*/
+VkResult vmaCreatePool(
+	VmaAllocator allocator,
+	const VmaPoolCreateInfo* pCreateInfo,
+	VmaPool* pPool);
+
+/** \brief Destroys #VmaPool object and frees Vulkan device memory.
+*/
+void vmaDestroyPool(
+    VmaAllocator allocator,
+    VmaPool pool);
+
+/** \brief Retrieves statistics of existing #VmaPool object.
+
+@param allocator Allocator object.
+@param pool Pool object.
+@param[out] pPoolStats Statistics of specified pool.
+*/
+void vmaGetPoolStats(
+    VmaAllocator allocator,
+    VmaPool pool,
+    VmaPoolStats* pPoolStats);
+
+/** \brief Marks all allocations in given pool as lost if they are not used in current frame or VmaPoolCreateInfo::frameInUseCount back from now.
+
+@param allocator Allocator object.
+@param pool Pool.
+@param[out] pLostAllocationCount Number of allocations marked as lost. Optional - pass null if you don't need this information.
+*/
+void vmaMakePoolAllocationsLost(
+    VmaAllocator allocator,
+    VmaPool pool,
+    size_t* pLostAllocationCount);
+
+/** \brief Checks magic number in margins around all allocations in given memory pool in search for corruptions.
+
+Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero,
+`VMA_DEBUG_MARGIN` is defined to nonzero and the pool is created in memory type that is
+`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection).
+
+Possible return values:
+
+- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for specified pool.
+- `VK_SUCCESS` - corruption detection has been performed and succeeded.
+- `VK_ERROR_VALIDATION_FAILED_EXT` - corruption detection has been performed and found memory corruptions around one of the allocations.
+  `VMA_ASSERT` is also fired in that case.
+- Other value: Error returned by Vulkan, e.g. memory mapping failure.
+*/
+VkResult vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool);
+
+/** \struct VmaAllocation
+\brief Represents single memory allocation.
+
+It may be either dedicated block of `VkDeviceMemory` or a specific region of a bigger block of this type
+plus unique offset.
+
+There are multiple ways to create such object.
+You need to fill structure VmaAllocationCreateInfo.
+For more information see [Choosing memory type](@ref choosing_memory_type).
+
+Although the library provides convenience functions that create Vulkan buffer or image,
+allocate memory for it and bind them together,
+binding of the allocation to a buffer or an image is out of scope of the allocation itself.
+Allocation object can exist without buffer/image bound,
+binding can be done manually by the user, and destruction of it can be done
+independently of destruction of the allocation.
+
+The object also remembers its size and some other information.
+To retrieve this information, use function vmaGetAllocationInfo() and inspect
+returned structure VmaAllocationInfo.
+
+Some kinds allocations can be in lost state.
+For more information, see [Lost allocations](@ref lost_allocations).
+*/
+VK_DEFINE_HANDLE(VmaAllocation)
+
+/** \brief Parameters of #VmaAllocation objects, that can be retrieved using function vmaGetAllocationInfo().
+*/
+typedef struct VmaAllocationInfo {
+    /** \brief Memory type index that this allocation was allocated from.
+    
+    It never changes.
+    */
+    uint32_t memoryType;
+    /** \brief Handle to Vulkan memory object.
+
+    Same memory object can be shared by multiple allocations.
+    
+    It can change after call to vmaDefragment() if this allocation is passed to the function, or if allocation is lost.
+
+    If the allocation is lost, it is equal to `VK_NULL_HANDLE`.
+    */
+    VkDeviceMemory deviceMemory;
+    /** \brief Offset into deviceMemory object to the beginning of this allocation, in bytes. (deviceMemory, offset) pair is unique to this allocation.
+
+    It can change after call to vmaDefragment() if this allocation is passed to the function, or if allocation is lost.
+    */
+    VkDeviceSize offset;
+    /** \brief Size of this allocation, in bytes.
+
+    It never changes, unless allocation is lost.
+    */
+    VkDeviceSize size;
+    /** \brief Pointer to the beginning of this allocation as mapped data.
+
+    If the allocation hasn't been mapped using vmaMapMemory() and hasn't been
+    created with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag, this value null.
+
+    It can change after call to vmaMapMemory(), vmaUnmapMemory().
+    It can also change after call to vmaDefragment() if this allocation is passed to the function.
+    */
+    void* pMappedData;
+    /** \brief Custom general-purpose pointer that was passed as VmaAllocationCreateInfo::pUserData or set using vmaSetAllocationUserData().
+
+    It can change after call to vmaSetAllocationUserData() for this allocation.
+    */
+    void* pUserData;
+} VmaAllocationInfo;
+
+/** \brief General purpose memory allocation.
+
+@param[out] pAllocation Handle to allocated memory.
+@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().
+
+You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().
+
+It is recommended to use vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(),
+vmaCreateBuffer(), vmaCreateImage() instead whenever possible.
+*/
+VkResult vmaAllocateMemory(
+    VmaAllocator allocator,
+    const VkMemoryRequirements* pVkMemoryRequirements,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief General purpose memory allocation for multiple allocation objects at once.
+
+@param allocator Allocator object.
+@param pVkMemoryRequirements Memory requirements for each allocation.
+@param pCreateInfo Creation parameters for each alloction.
+@param allocationCount Number of allocations to make.
+@param[out] pAllocations Pointer to array that will be filled with handles to created allocations.
+@param[out] pAllocationInfo Optional. Pointer to array that will be filled with parameters of created allocations.
+
+You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().
+
+Word "pages" is just a suggestion to use this function to allocate pieces of memory needed for sparse binding.
+It is just a general purpose allocation function able to make multiple allocations at once.
+It may be internally optimized to be more efficient than calling vmaAllocateMemory() `allocationCount` times.
+
+All allocations are made using same parameters. All of them are created out of the same memory pool and type.
+If any allocation fails, all allocations already made within this function call are also freed, so that when
+returned result is not `VK_SUCCESS`, `pAllocation` array is always entirely filled with `VK_NULL_HANDLE`.
+*/
+VkResult vmaAllocateMemoryPages(
+    VmaAllocator allocator,
+    const VkMemoryRequirements* pVkMemoryRequirements,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    size_t allocationCount,
+    VmaAllocation* pAllocations,
+    VmaAllocationInfo* pAllocationInfo);
+
+/**
+@param[out] pAllocation Handle to allocated memory.
+@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().
+
+You should free the memory using vmaFreeMemory().
+*/
+VkResult vmaAllocateMemoryForBuffer(
+    VmaAllocator allocator,
+    VkBuffer buffer,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/// Function similar to vmaAllocateMemoryForBuffer().
+VkResult vmaAllocateMemoryForImage(
+    VmaAllocator allocator,
+    VkImage image,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief Frees memory previously allocated using vmaAllocateMemory(), vmaAllocateMemoryForBuffer(), or vmaAllocateMemoryForImage().
+
+Passing `VK_NULL_HANDLE` as `allocation` is valid. Such function call is just skipped.
+*/
+void vmaFreeMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation);
+
+/** \brief Frees memory and destroys multiple allocations.
+
+Word "pages" is just a suggestion to use this function to free pieces of memory used for sparse binding.
+It is just a general purpose function to free memory and destroy allocations made using e.g. vmaAllocateMemory(),
+vmaAllocateMemoryPages() and other functions.
+It may be internally optimized to be more efficient than calling vmaFreeMemory() `allocationCount` times.
+
+Allocations in `pAllocations` array can come from any memory pools and types.
+Passing `VK_NULL_HANDLE` as elements of `pAllocations` array is valid. Such entries are just skipped.
+*/
+void vmaFreeMemoryPages(
+    VmaAllocator allocator,
+    size_t allocationCount,
+    VmaAllocation* pAllocations);
+
+/** \brief Tries to resize an allocation in place, if there is enough free memory after it.
+
+Tries to change allocation's size without moving or reallocating it.
+You can both shrink and grow allocation size.
+When growing, it succeeds only when the allocation belongs to a memory block with enough
+free space after it.
+
+Returns `VK_SUCCESS` if allocation's size has been successfully changed.
+Returns `VK_ERROR_OUT_OF_POOL_MEMORY` if allocation's size could not be changed.
+
+After successful call to this function, VmaAllocationInfo::size of this allocation changes.
+All other parameters stay the same: memory pool and type, alignment, offset, mapped pointer.
+
+- Calling this function on allocation that is in lost state fails with result `VK_ERROR_VALIDATION_FAILED_EXT`.
+- Calling this function with `newSize` same as current allocation size does nothing and returns `VK_SUCCESS`.
+- Resizing dedicated allocations, as well as allocations created in pools that use linear
+  or buddy algorithm, is not supported.
+  The function returns `VK_ERROR_FEATURE_NOT_PRESENT` in such cases.
+  Support may be added in the future.
+*/
+VkResult vmaResizeAllocation(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkDeviceSize newSize);
+
+/** \brief Returns current information about specified allocation and atomically marks it as used in current frame.
+
+Current paramters of given allocation are returned in `pAllocationInfo`.
+
+This function also atomically "touches" allocation - marks it as used in current frame,
+just like vmaTouchAllocation().
+If the allocation is in lost state, `pAllocationInfo->deviceMemory == VK_NULL_HANDLE`.
+
+Although this function uses atomics and doesn't lock any mutex, so it should be quite efficient,
+you can avoid calling it too often.
+
+- You can retrieve same VmaAllocationInfo structure while creating your resource, from function
+  vmaCreateBuffer(), vmaCreateImage(). You can remember it if you are sure parameters don't change
+  (e.g. due to defragmentation or allocation becoming lost).
+- If you just want to check if allocation is not lost, vmaTouchAllocation() will work faster.
+*/
+void vmaGetAllocationInfo(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief Returns `VK_TRUE` if allocation is not lost and atomically marks it as used in current frame.
+
+If the allocation has been created with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag,
+this function returns `VK_TRUE` if it's not in lost state, so it can still be used.
+It then also atomically "touches" the allocation - marks it as used in current frame,
+so that you can be sure it won't become lost in current frame or next `frameInUseCount` frames.
+
+If the allocation is in lost state, the function returns `VK_FALSE`.
+Memory of such allocation, as well as buffer or image bound to it, should not be used.
+Lost allocation and the buffer/image still need to be destroyed.
+
+If the allocation has been created without #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag,
+this function always returns `VK_TRUE`.
+*/
+VkBool32 vmaTouchAllocation(
+    VmaAllocator allocator,
+    VmaAllocation allocation);
+
+/** \brief Sets pUserData in given allocation to new value.
+
+If the allocation was created with VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT,
+pUserData must be either null, or pointer to a null-terminated string. The function
+makes local copy of the string and sets it as allocation's `pUserData`. String
+passed as pUserData doesn't need to be valid for whole lifetime of the allocation -
+you can free it after this call. String previously pointed by allocation's
+pUserData is freed from memory.
+
+If the flag was not used, the value of pointer `pUserData` is just copied to
+allocation's `pUserData`. It is opaque, so you can use it however you want - e.g.
+as a pointer, ordinal number or some handle to you own data.
+*/
+void vmaSetAllocationUserData(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    void* pUserData);
+
+/** \brief Creates new allocation that is in lost state from the beginning.
+
+It can be useful if you need a dummy, non-null allocation.
+
+You still need to destroy created object using vmaFreeMemory().
+
+Returned allocation is not tied to any specific memory pool or memory type and
+not bound to any image or buffer. It has size = 0. It cannot be turned into
+a real, non-empty allocation.
+*/
+void vmaCreateLostAllocation(
+    VmaAllocator allocator,
+    VmaAllocation* pAllocation);
+
+/** \brief Maps memory represented by given allocation and returns pointer to it.
+
+Maps memory represented by given allocation to make it accessible to CPU code.
+When succeeded, `*ppData` contains pointer to first byte of this memory.
+If the allocation is part of bigger `VkDeviceMemory` block, the pointer is
+correctly offseted to the beginning of region assigned to this particular
+allocation.
+
+Mapping is internally reference-counted and synchronized, so despite raw Vulkan
+function `vkMapMemory()` cannot be used to map same block of `VkDeviceMemory`
+multiple times simultaneously, it is safe to call this function on allocations
+assigned to the same memory block. Actual Vulkan memory will be mapped on first
+mapping and unmapped on last unmapping.
+
+If the function succeeded, you must call vmaUnmapMemory() to unmap the
+allocation when mapping is no longer needed or before freeing the allocation, at
+the latest.
+
+It also safe to call this function multiple times on the same allocation. You
+must call vmaUnmapMemory() same number of times as you called vmaMapMemory().
+
+It is also safe to call this function on allocation created with
+#VMA_ALLOCATION_CREATE_MAPPED_BIT flag. Its memory stays mapped all the time.
+You must still call vmaUnmapMemory() same number of times as you called
+vmaMapMemory(). You must not call vmaUnmapMemory() additional time to free the
+"0-th" mapping made automatically due to #VMA_ALLOCATION_CREATE_MAPPED_BIT flag.
+
+This function fails when used on allocation made in memory type that is not
+`HOST_VISIBLE`.
+
+This function always fails when called for allocation that was created with
+#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocations cannot be
+mapped.
+*/
+VkResult vmaMapMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    void** ppData);
+
+/** \brief Unmaps memory represented by given allocation, mapped previously using vmaMapMemory().
+
+For details, see description of vmaMapMemory().
+*/
+void vmaUnmapMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation);
+
+/** \brief Flushes memory of given allocation.
+
+Calls `vkFlushMappedMemoryRanges()` for memory associated with given range of given allocation.
+
+- `offset` must be relative to the beginning of allocation.
+- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation.
+- `offset` and `size` don't have to be aligned.
+  They are internally rounded down/up to multiply of `nonCoherentAtomSize`.
+- If `size` is 0, this call is ignored.
+- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`,
+  this call is ignored.
+*/
+void vmaFlushAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size);
+
+/** \brief Invalidates memory of given allocation.
+
+Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given range of given allocation.
+
+- `offset` must be relative to the beginning of allocation.
+- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation.
+- `offset` and `size` don't have to be aligned.
+  They are internally rounded down/up to multiply of `nonCoherentAtomSize`.
+- If `size` is 0, this call is ignored.
+- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`,
+  this call is ignored.
+*/
+void vmaInvalidateAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size);
+
+/** \brief Checks magic number in margins around all allocations in given memory types (in both default and custom pools) in search for corruptions.
+
+@param memoryTypeBits Bit mask, where each bit set means that a memory type with that index should be checked.
+
+Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero,
+`VMA_DEBUG_MARGIN` is defined to nonzero and only for memory types that are
+`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection).
+
+Possible return values:
+
+- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for any of specified memory types.
+- `VK_SUCCESS` - corruption detection has been performed and succeeded.
+- `VK_ERROR_VALIDATION_FAILED_EXT` - corruption detection has been performed and found memory corruptions around one of the allocations.
+  `VMA_ASSERT` is also fired in that case.
+- Other value: Error returned by Vulkan, e.g. memory mapping failure.
+*/
+VkResult vmaCheckCorruption(VmaAllocator allocator, uint32_t memoryTypeBits);
+
+/** \struct VmaDefragmentationContext
+\brief Represents Opaque object that represents started defragmentation process.
+
+Fill structure #VmaDefragmentationInfo2 and call function vmaDefragmentationBegin() to create it.
+Call function vmaDefragmentationEnd() to destroy it.
+*/
+VK_DEFINE_HANDLE(VmaDefragmentationContext)
+
+/// Flags to be used in vmaDefragmentationBegin(). None at the moment. Reserved for future use.
+typedef enum VmaDefragmentationFlagBits {
+    VMA_DEFRAGMENTATION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaDefragmentationFlagBits;
+typedef VkFlags VmaDefragmentationFlags;
+
+/** \brief Parameters for defragmentation.
+
+To be used with function vmaDefragmentationBegin().
+*/
+typedef struct VmaDefragmentationInfo2 {
+    /** \brief Reserved for future use. Should be 0.
+    */
+    VmaDefragmentationFlags flags;
+    /** \brief Number of allocations in `pAllocations` array.
+    */
+    uint32_t allocationCount;
+    /** \brief Pointer to array of allocations that can be defragmented.
+
+    The array should have `allocationCount` elements.
+    The array should not contain nulls.
+    Elements in the array should be unique - same allocation cannot occur twice.
+    It is safe to pass allocations that are in the lost state - they are ignored.
+    All allocations not present in this array are considered non-moveable during this defragmentation.
+    */
+    VmaAllocation* pAllocations;
+    /** \brief Optional, output. Pointer to array that will be filled with information whether the allocation at certain index has been changed during defragmentation.
+
+    The array should have `allocationCount` elements.
+    You can pass null if you are not interested in this information.
+    */
+    VkBool32* pAllocationsChanged;
+    /** \brief Numer of pools in `pPools` array.
+    */
+    uint32_t poolCount;
+    /** \brief Either null or pointer to array of pools to be defragmented.
+
+    All the allocations in the specified pools can be moved during defragmentation
+    and there is no way to check if they were really moved as in `pAllocationsChanged`,
+    so you must query all the allocations in all these pools for new `VkDeviceMemory`
+    and offset using vmaGetAllocationInfo() if you might need to recreate buffers
+    and images bound to them.
+
+    The array should have `poolCount` elements.
+    The array should not contain nulls.
+    Elements in the array should be unique - same pool cannot occur twice.
+
+    Using this array is equivalent to specifying all allocations from the pools in `pAllocations`.
+    It might be more efficient.
+    */
+    VmaPool* pPools;
+    /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places using transfers on CPU side, like `memcpy()`, `memmove()`.
+    
+    `VK_WHOLE_SIZE` means no limit.
+    */
+    VkDeviceSize maxCpuBytesToMove;
+    /** \brief Maximum number of allocations that can be moved to a different place using transfers on CPU side, like `memcpy()`, `memmove()`.
+
+    `UINT32_MAX` means no limit.
+    */
+    uint32_t maxCpuAllocationsToMove;
+    /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places using transfers on GPU side, posted to `commandBuffer`.
+    
+    `VK_WHOLE_SIZE` means no limit.
+    */
+    VkDeviceSize maxGpuBytesToMove;
+    /** \brief Maximum number of allocations that can be moved to a different place using transfers on GPU side, posted to `commandBuffer`.
+
+    `UINT32_MAX` means no limit.
+    */
+    uint32_t maxGpuAllocationsToMove;
+    /** \brief Optional. Command buffer where GPU copy commands will be posted.
+
+    If not null, it must be a valid command buffer handle that supports Transfer queue type.
+    It must be in the recording state and outside of a render pass instance.
+    You need to submit it and make sure it finished execution before calling vmaDefragmentationEnd().
+
+    Passing null means that only CPU defragmentation will be performed.
+    */
+    VkCommandBuffer commandBuffer;
+} VmaDefragmentationInfo2;
+
+/** \brief Deprecated. Optional configuration parameters to be passed to function vmaDefragment().
+
+\deprecated This is a part of the old interface. It is recommended to use structure #VmaDefragmentationInfo2 and function vmaDefragmentationBegin() instead.
+*/
+typedef struct VmaDefragmentationInfo {
+    /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places.
+    
+    Default is `VK_WHOLE_SIZE`, which means no limit.
+    */
+    VkDeviceSize maxBytesToMove;
+    /** \brief Maximum number of allocations that can be moved to different place.
+
+    Default is `UINT32_MAX`, which means no limit.
+    */
+    uint32_t maxAllocationsToMove;
+} VmaDefragmentationInfo;
+
+/** \brief Statistics returned by function vmaDefragment(). */
+typedef struct VmaDefragmentationStats {
+    /// Total number of bytes that have been copied while moving allocations to different places.
+    VkDeviceSize bytesMoved;
+    /// Total number of bytes that have been released to the system by freeing empty `VkDeviceMemory` objects.
+    VkDeviceSize bytesFreed;
+    /// Number of allocations that have been moved to different places.
+    uint32_t allocationsMoved;
+    /// Number of empty `VkDeviceMemory` objects that have been released to the system.
+    uint32_t deviceMemoryBlocksFreed;
+} VmaDefragmentationStats;
+
+/** \brief Begins defragmentation process.
+
+@param allocator Allocator object.
+@param pInfo Structure filled with parameters of defragmentation.
+@param[out] pStats Optional. Statistics of defragmentation. You can pass null if you are not interested in this information.
+@param[out] pContext Context object that must be passed to vmaDefragmentationEnd() to finish defragmentation.
+@return `VK_SUCCESS` and `*pContext == null` if defragmentation finished within this function call. `VK_NOT_READY` and `*pContext != null` if defragmentation has been started and you need to call vmaDefragmentationEnd() to finish it. Negative value in case of error.
+
+Use this function instead of old, deprecated vmaDefragment().
+
+Warning! Between the call to vmaDefragmentationBegin() and vmaDefragmentationEnd():
+
+- You should not use any of allocations passed as `pInfo->pAllocations` or
+  any allocations that belong to pools passed as `pInfo->pPools`,
+  including calling vmaGetAllocationInfo(), vmaTouchAllocation(), or access
+  their data.
+- Some mutexes protecting internal data structures may be locked, so trying to
+  make or free any allocations, bind buffers or images, map memory, or launch
+  another simultaneous defragmentation in between may cause stall (when done on
+  another thread) or deadlock (when done on the same thread), unless you are
+  100% sure that defragmented allocations are in different pools.
+- Information returned via `pStats` and `pInfo->pAllocationsChanged` are undefined.
+  They become valid after call to vmaDefragmentationEnd().
+- If `pInfo->commandBuffer` is not null, you must submit that command buffer
+  and make sure it finished execution before calling vmaDefragmentationEnd().
+*/
+VkResult vmaDefragmentationBegin(
+    VmaAllocator allocator,
+    const VmaDefragmentationInfo2* pInfo,
+    VmaDefragmentationStats* pStats,
+    VmaDefragmentationContext *pContext);
+
+/** \brief Ends defragmentation process.
+
+Use this function to finish defragmentation started by vmaDefragmentationBegin().
+It is safe to pass `context == null`. The function then does nothing.
+*/
+VkResult vmaDefragmentationEnd(
+    VmaAllocator allocator,
+    VmaDefragmentationContext context);
+
+/** \brief Deprecated. Compacts memory by moving allocations.
+
+@param pAllocations Array of allocations that can be moved during this compation.
+@param allocationCount Number of elements in pAllocations and pAllocationsChanged arrays.
+@param[out] pAllocationsChanged Array of boolean values that will indicate whether matching allocation in pAllocations array has been moved. This parameter is optional. Pass null if you don't need this information.
+@param pDefragmentationInfo Configuration parameters. Optional - pass null to use default values.
+@param[out] pDefragmentationStats Statistics returned by the function. Optional - pass null if you don't need this information.
+@return `VK_SUCCESS` if completed, negative error code in case of error.
+
+\deprecated This is a part of the old interface. It is recommended to use structure #VmaDefragmentationInfo2 and function vmaDefragmentationBegin() instead.
+
+This function works by moving allocations to different places (different
+`VkDeviceMemory` objects and/or different offsets) in order to optimize memory
+usage. Only allocations that are in `pAllocations` array can be moved. All other
+allocations are considered nonmovable in this call. Basic rules:
+
+- Only allocations made in memory types that have
+  `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` and `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT`
+  flags can be compacted. You may pass other allocations but it makes no sense -
+  these will never be moved.
+- Custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT or
+  #VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT flag are not defragmented. Allocations
+  passed to this function that come from such pools are ignored.
+- Allocations created with #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT or
+  created as dedicated allocations for any other reason are also ignored.
+- Both allocations made with or without #VMA_ALLOCATION_CREATE_MAPPED_BIT
+  flag can be compacted. If not persistently mapped, memory will be mapped
+  temporarily inside this function if needed.
+- You must not pass same #VmaAllocation object multiple times in `pAllocations` array.
+
+The function also frees empty `VkDeviceMemory` blocks.
+
+Warning: This function may be time-consuming, so you shouldn't call it too often
+(like after every resource creation/destruction).
+You can call it on special occasions (like when reloading a game level or
+when you just destroyed a lot of objects). Calling it every frame may be OK, but
+you should measure that on your platform.
+
+For more information, see [Defragmentation](@ref defragmentation) chapter.
+*/
+VkResult vmaDefragment(
+    VmaAllocator allocator,
+    VmaAllocation* pAllocations,
+    size_t allocationCount,
+    VkBool32* pAllocationsChanged,
+    const VmaDefragmentationInfo *pDefragmentationInfo,
+    VmaDefragmentationStats* pDefragmentationStats);
+
+/** \brief Binds buffer to allocation.
+
+Binds specified buffer to region of memory represented by specified allocation.
+Gets `VkDeviceMemory` handle and offset from the allocation.
+If you want to create a buffer, allocate memory for it and bind them together separately,
+you should use this function for binding instead of standard `vkBindBufferMemory()`,
+because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple
+allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously
+(which is illegal in Vulkan).
+
+It is recommended to use function vmaCreateBuffer() instead of this one.
+*/
+VkResult vmaBindBufferMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkBuffer buffer);
+
+/** \brief Binds image to allocation.
+
+Binds specified image to region of memory represented by specified allocation.
+Gets `VkDeviceMemory` handle and offset from the allocation.
+If you want to create an image, allocate memory for it and bind them together separately,
+you should use this function for binding instead of standard `vkBindImageMemory()`,
+because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple
+allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously
+(which is illegal in Vulkan).
+
+It is recommended to use function vmaCreateImage() instead of this one.
+*/
+VkResult vmaBindImageMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkImage image);
+
+/**
+@param[out] pBuffer Buffer that was created.
+@param[out] pAllocation Allocation that was created.
+@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().
+
+This function automatically:
+
+-# Creates buffer.
+-# Allocates appropriate memory for it.
+-# Binds the buffer with the memory.
+
+If any of these operations fail, buffer and allocation are not created,
+returned value is negative error code, *pBuffer and *pAllocation are null.
+
+If the function succeeded, you must destroy both buffer and allocation when you
+no longer need them using either convenience function vmaDestroyBuffer() or
+separately, using `vkDestroyBuffer()` and vmaFreeMemory().
+
+If VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag was used,
+VK_KHR_dedicated_allocation extension is used internally to query driver whether
+it requires or prefers the new buffer to have dedicated allocation. If yes,
+and if dedicated allocation is possible (VmaAllocationCreateInfo::pool is null
+and VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT is not used), it creates dedicated
+allocation for this buffer, just like when using
+VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.
+*/
+VkResult vmaCreateBuffer(
+    VmaAllocator allocator,
+    const VkBufferCreateInfo* pBufferCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    VkBuffer* pBuffer,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief Destroys Vulkan buffer and frees allocated memory.
+
+This is just a convenience function equivalent to:
+
+\code
+vkDestroyBuffer(device, buffer, allocationCallbacks);
+vmaFreeMemory(allocator, allocation);
+\endcode
+
+It it safe to pass null as buffer and/or allocation.
+*/
+void vmaDestroyBuffer(
+    VmaAllocator allocator,
+    VkBuffer buffer,
+    VmaAllocation allocation);
+
+/// Function similar to vmaCreateBuffer().
+VkResult vmaCreateImage(
+    VmaAllocator allocator,
+    const VkImageCreateInfo* pImageCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    VkImage* pImage,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief Destroys Vulkan image and frees allocated memory.
+
+This is just a convenience function equivalent to:
+
+\code
+vkDestroyImage(device, image, allocationCallbacks);
+vmaFreeMemory(allocator, allocation);
+\endcode
+
+It it safe to pass null as image and/or allocation.
+*/
+void vmaDestroyImage(
+    VmaAllocator allocator,
+    VkImage image,
+    VmaAllocation allocation);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // AMD_VULKAN_MEMORY_ALLOCATOR_H
+
+// For Visual Studio IntelliSense.
+#if defined(__cplusplus) && defined(__INTELLISENSE__)
+#define VMA_IMPLEMENTATION
+#endif
+
+#ifdef VMA_IMPLEMENTATION
+#undef VMA_IMPLEMENTATION
+
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+
+/*******************************************************************************
+CONFIGURATION SECTION
+
+Define some of these macros before each #include of this header or change them
+here if you need other then default behavior depending on your environment.
+*/
+
+/*
+Define this macro to 1 to make the library fetch pointers to Vulkan functions
+internally, like:
+
+    vulkanFunctions.vkAllocateMemory = &vkAllocateMemory;
+
+Define to 0 if you are going to provide you own pointers to Vulkan functions via
+VmaAllocatorCreateInfo::pVulkanFunctions.
+*/
+#if !defined(VMA_STATIC_VULKAN_FUNCTIONS) && !defined(VK_NO_PROTOTYPES)
+#define VMA_STATIC_VULKAN_FUNCTIONS 1
+#endif
+
+// Define this macro to 1 to make the library use STL containers instead of its own implementation.
+//#define VMA_USE_STL_CONTAINERS 1
+
+/* Set this macro to 1 to make the library including and using STL containers:
+std::pair, std::vector, std::list, std::unordered_map.
+
+Set it to 0 or undefined to make the library using its own implementation of
+the containers.
+*/
+#if VMA_USE_STL_CONTAINERS
+   #define VMA_USE_STL_VECTOR 1
+   #define VMA_USE_STL_UNORDERED_MAP 1
+   #define VMA_USE_STL_LIST 1
+#endif
+
+#ifndef VMA_USE_STL_SHARED_MUTEX
+    // Minimum Visual Studio 2015 Update 2
+    #if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918
+        #define VMA_USE_STL_SHARED_MUTEX 1
+    #endif
+#endif
+
+#if VMA_USE_STL_VECTOR
+   #include <vector>
+#endif
+
+#if VMA_USE_STL_UNORDERED_MAP
+   #include <unordered_map>
+#endif
+
+#if VMA_USE_STL_LIST
+   #include <list>
+#endif
+
+/*
+Following headers are used in this CONFIGURATION section only, so feel free to
+remove them if not needed.
+*/
+#include <cassert> // for assert
+#include <algorithm> // for min, max
+#include <mutex>
+#include <atomic> // for std::atomic
+
+#ifndef VMA_NULL
+   // Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0.
+   #define VMA_NULL   nullptr
+#endif
+
+#if defined(__ANDROID_API__) && (__ANDROID_API__ < 16)
+#include <cstdlib>
+void *aligned_alloc(size_t alignment, size_t size)
+{
+    // alignment must be >= sizeof(void*)
+    if(alignment < sizeof(void*))
+    {
+        alignment = sizeof(void*);
+    }
+
+    return memalign(alignment, size);
+}
+#elif defined(__APPLE__) || defined(__ANDROID__)
+#include <cstdlib>
+void *aligned_alloc(size_t alignment, size_t size)
+{
+    // alignment must be >= sizeof(void*)
+    if(alignment < sizeof(void*))
+    {
+        alignment = sizeof(void*);
+    }
+
+    void *pointer;
+    if(posix_memalign(&pointer, alignment, size) == 0)
+        return pointer;
+    return VMA_NULL;
+}
+#endif
+
+// If your compiler is not compatible with C++11 and definition of
+// aligned_alloc() function is missing, uncommeting following line may help:
+
+//#include <malloc.h>
+
+// Normal assert to check for programmer's errors, especially in Debug configuration.
+#ifndef VMA_ASSERT
+   #ifdef _DEBUG
+       #define VMA_ASSERT(expr)         assert(expr)
+   #else
+       #define VMA_ASSERT(expr)
+   #endif
+#endif
+
+// Assert that will be called very often, like inside data structures e.g. operator[].
+// Making it non-empty can make program slow.
+#ifndef VMA_HEAVY_ASSERT
+   #ifdef _DEBUG
+       #define VMA_HEAVY_ASSERT(expr)   //VMA_ASSERT(expr)
+   #else
+       #define VMA_HEAVY_ASSERT(expr)
+   #endif
+#endif
+
+#ifndef VMA_ALIGN_OF
+   #define VMA_ALIGN_OF(type)       (__alignof(type))
+#endif
+
+#ifndef VMA_SYSTEM_ALIGNED_MALLOC
+   #if defined(_WIN32)
+       #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment)   (_aligned_malloc((size), (alignment)))
+   #else
+       #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment)   (aligned_alloc((alignment), (size) ))
+   #endif
+#endif
+
+#ifndef VMA_SYSTEM_FREE
+   #if defined(_WIN32)
+       #define VMA_SYSTEM_FREE(ptr)   _aligned_free(ptr)
+   #else
+       #define VMA_SYSTEM_FREE(ptr)   free(ptr)
+   #endif
+#endif
+
+#ifndef VMA_MIN
+   #define VMA_MIN(v1, v2)    (std::min((v1), (v2)))
+#endif
+
+#ifndef VMA_MAX
+   #define VMA_MAX(v1, v2)    (std::max((v1), (v2)))
+#endif
+
+#ifndef VMA_SWAP
+   #define VMA_SWAP(v1, v2)   std::swap((v1), (v2))
+#endif
+
+#ifndef VMA_SORT
+   #define VMA_SORT(beg, end, cmp)  std::sort(beg, end, cmp)
+#endif
+
+#ifndef VMA_DEBUG_LOG
+   #define VMA_DEBUG_LOG(format, ...)
+   /*
+   #define VMA_DEBUG_LOG(format, ...) do { \
+       printf(format, __VA_ARGS__); \
+       printf("\n"); \
+   } while(false)
+   */
+#endif
+
+// Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.
+#if VMA_STATS_STRING_ENABLED
+    static inline void VmaUint32ToStr(char* outStr, size_t strLen, uint32_t num)
+    {
+        snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num));
+    }
+    static inline void VmaUint64ToStr(char* outStr, size_t strLen, uint64_t num)
+    {
+        snprintf(outStr, strLen, "%llu", static_cast<unsigned long long>(num));
+    }
+    static inline void VmaPtrToStr(char* outStr, size_t strLen, const void* ptr)
+    {
+        snprintf(outStr, strLen, "%p", ptr);
+    }
+#endif
+
+#ifndef VMA_MUTEX
+    class VmaMutex
+    {
+    public:
+        void Lock() { m_Mutex.lock(); }
+        void Unlock() { m_Mutex.unlock(); }
+    private:
+        std::mutex m_Mutex;
+    };
+    #define VMA_MUTEX VmaMutex
+#endif
+
+// Read-write mutex, where "read" is shared access, "write" is exclusive access.
+#ifndef VMA_RW_MUTEX
+    #if VMA_USE_STL_SHARED_MUTEX
+        // Use std::shared_mutex from C++17.
+        #include <shared_mutex>
+        class VmaRWMutex
+        {
+        public:
+            void LockRead() { m_Mutex.lock_shared(); }
+            void UnlockRead() { m_Mutex.unlock_shared(); }
+            void LockWrite() { m_Mutex.lock(); }
+            void UnlockWrite() { m_Mutex.unlock(); }
+        private:
+            std::shared_mutex m_Mutex;
+        };
+        #define VMA_RW_MUTEX VmaRWMutex
+    #elif defined(_WIN32) && !defined(__MINGW32__)
+        // Use SRWLOCK from WinAPI.
+        class VmaRWMutex
+        {
+        public:
+            VmaRWMutex() { InitializeSRWLock(&m_Lock); }
+            void LockRead() { AcquireSRWLockShared(&m_Lock); }
+            void UnlockRead() { ReleaseSRWLockShared(&m_Lock); }
+            void LockWrite() { AcquireSRWLockExclusive(&m_Lock); }
+            void UnlockWrite() { ReleaseSRWLockExclusive(&m_Lock); }
+        private:
+            SRWLOCK m_Lock;
+        };
+        #define VMA_RW_MUTEX VmaRWMutex
+    #else
+        // Less efficient fallback: Use normal mutex.
+        class VmaRWMutex
+        {
+        public:
+            void LockRead() { m_Mutex.Lock(); }
+            void UnlockRead() { m_Mutex.Unlock(); }
+            void LockWrite() { m_Mutex.Lock(); }
+            void UnlockWrite() { m_Mutex.Unlock(); }
+        private:
+            VMA_MUTEX m_Mutex;
+        };
+        #define VMA_RW_MUTEX VmaRWMutex
+    #endif // #if VMA_USE_STL_SHARED_MUTEX
+#endif // #ifndef VMA_RW_MUTEX
+
+/*
+If providing your own implementation, you need to implement a subset of std::atomic:
+
+- Constructor(uint32_t desired)
+- uint32_t load() const
+- void store(uint32_t desired)
+- bool compare_exchange_weak(uint32_t& expected, uint32_t desired)
+*/
+#ifndef VMA_ATOMIC_UINT32
+   #define VMA_ATOMIC_UINT32 std::atomic<uint32_t>
+#endif
+
+#ifndef VMA_DEBUG_ALWAYS_DEDICATED_MEMORY
+    /**
+    Every allocation will have its own memory block.
+    Define to 1 for debugging purposes only.
+    */
+    #define VMA_DEBUG_ALWAYS_DEDICATED_MEMORY (0)
+#endif
+
+#ifndef VMA_DEBUG_ALIGNMENT
+    /**
+    Minimum alignment of all allocations, in bytes.
+    Set to more than 1 for debugging purposes only. Must be power of two.
+    */
+    #define VMA_DEBUG_ALIGNMENT (1)
+#endif
+
+#ifndef VMA_DEBUG_MARGIN
+    /**
+    Minimum margin before and after every allocation, in bytes.
+    Set nonzero for debugging purposes only.
+    */
+    #define VMA_DEBUG_MARGIN (0)
+#endif
+
+#ifndef VMA_DEBUG_INITIALIZE_ALLOCATIONS
+    /**
+    Define this macro to 1 to automatically fill new allocations and destroyed
+    allocations with some bit pattern.
+    */
+    #define VMA_DEBUG_INITIALIZE_ALLOCATIONS (0)
+#endif
+
+#ifndef VMA_DEBUG_DETECT_CORRUPTION
+    /**
+    Define this macro to 1 together with non-zero value of VMA_DEBUG_MARGIN to
+    enable writing magic value to the margin before and after every allocation and
+    validating it, so that memory corruptions (out-of-bounds writes) are detected.
+    */
+    #define VMA_DEBUG_DETECT_CORRUPTION (0)
+#endif
+
+#ifndef VMA_DEBUG_GLOBAL_MUTEX
+    /**
+    Set this to 1 for debugging purposes only, to enable single mutex protecting all
+    entry calls to the library. Can be useful for debugging multithreading issues.
+    */
+    #define VMA_DEBUG_GLOBAL_MUTEX (0)
+#endif
+
+#ifndef VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY
+    /**
+    Minimum value for VkPhysicalDeviceLimits::bufferImageGranularity.
+    Set to more than 1 for debugging purposes only. Must be power of two.
+    */
+    #define VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY (1)
+#endif
+
+#ifndef VMA_SMALL_HEAP_MAX_SIZE
+   /// Maximum size of a memory heap in Vulkan to consider it "small".
+   #define VMA_SMALL_HEAP_MAX_SIZE (1024ull * 1024 * 1024)
+#endif
+
+#ifndef VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE
+   /// Default size of a block allocated as single VkDeviceMemory from a "large" heap.
+   #define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ull * 1024 * 1024)
+#endif
+
+#ifndef VMA_CLASS_NO_COPY
+    #define VMA_CLASS_NO_COPY(className) \
+        private: \
+            className(const className&) = delete; \
+            className& operator=(const className&) = delete;
+#endif
+
+static const uint32_t VMA_FRAME_INDEX_LOST = UINT32_MAX;
+
+// Decimal 2139416166, float NaN, little-endian binary 66 E6 84 7F.
+static const uint32_t VMA_CORRUPTION_DETECTION_MAGIC_VALUE = 0x7F84E666;
+
+static const uint8_t VMA_ALLOCATION_FILL_PATTERN_CREATED   = 0xDC;
+static const uint8_t VMA_ALLOCATION_FILL_PATTERN_DESTROYED = 0xEF;
+
+/*******************************************************************************
+END OF CONFIGURATION
+*/
+
+static const uint32_t VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET = 0x10000000u;
+
+static VkAllocationCallbacks VmaEmptyAllocationCallbacks = {
+    VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL };
+
+// Returns number of bits set to 1 in (v).
+static inline uint32_t VmaCountBitsSet(uint32_t v)
+{
+	uint32_t c = v - ((v >> 1) & 0x55555555);
+	c = ((c >>  2) & 0x33333333) + (c & 0x33333333);
+	c = ((c >>  4) + c) & 0x0F0F0F0F;
+	c = ((c >>  8) + c) & 0x00FF00FF;
+	c = ((c >> 16) + c) & 0x0000FFFF;
+	return c;
+}
+
+// Aligns given value up to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 16.
+// Use types like uint32_t, uint64_t as T.
+template <typename T>
+static inline T VmaAlignUp(T val, T align)
+{
+	return (val + align - 1) / align * align;
+}
+// Aligns given value down to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 8.
+// Use types like uint32_t, uint64_t as T.
+template <typename T>
+static inline T VmaAlignDown(T val, T align)
+{
+    return val / align * align;
+}
+
+// Division with mathematical rounding to nearest number.
+template <typename T>
+static inline T VmaRoundDiv(T x, T y)
+{
+	return (x + (y / (T)2)) / y;
+}
+
+/*
+Returns true if given number is a power of two.
+T must be unsigned integer number or signed integer but always nonnegative.
+For 0 returns true.
+*/
+template <typename T>
+inline bool VmaIsPow2(T x)
+{
+    return (x & (x-1)) == 0;
+}
+
+// Returns smallest power of 2 greater or equal to v.
+static inline uint32_t VmaNextPow2(uint32_t v)
+{
+	v--;
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v++;
+    return v;
+}
+static inline uint64_t VmaNextPow2(uint64_t v)
+{
+	v--;
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v |= v >> 32;
+    v++;
+    return v;
+}
+
+// Returns largest power of 2 less or equal to v.
+static inline uint32_t VmaPrevPow2(uint32_t v)
+{
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v = v ^ (v >> 1);
+    return v;
+}
+static inline uint64_t VmaPrevPow2(uint64_t v)
+{
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v |= v >> 32;
+    v = v ^ (v >> 1);
+    return v;
+}
+
+static inline bool VmaStrIsEmpty(const char* pStr)
+{
+    return pStr == VMA_NULL || *pStr == '\0';
+}
+
+static const char* VmaAlgorithmToStr(uint32_t algorithm)
+{
+    switch(algorithm)
+    {
+    case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:
+        return "Linear";
+    case VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT:
+        return "Buddy";
+    case 0:
+        return "Default";
+    default:
+        VMA_ASSERT(0);
+        return "";
+    }
+}
+
+#ifndef VMA_SORT
+
+template<typename Iterator, typename Compare>
+Iterator VmaQuickSortPartition(Iterator beg, Iterator end, Compare cmp)
+{
+    Iterator centerValue = end; --centerValue;
+    Iterator insertIndex = beg;
+    for(Iterator memTypeIndex = beg; memTypeIndex < centerValue; ++memTypeIndex)
+    {
+        if(cmp(*memTypeIndex, *centerValue))
+        {
+            if(insertIndex != memTypeIndex)
+            {
+                VMA_SWAP(*memTypeIndex, *insertIndex);
+            }
+            ++insertIndex;
+        }
+    }
+    if(insertIndex != centerValue)
+    {
+        VMA_SWAP(*insertIndex, *centerValue);
+    }
+    return insertIndex;
+}
+
+template<typename Iterator, typename Compare>
+void VmaQuickSort(Iterator beg, Iterator end, Compare cmp)
+{
+    if(beg < end)
+    {
+        Iterator it = VmaQuickSortPartition<Iterator, Compare>(beg, end, cmp);
+        VmaQuickSort<Iterator, Compare>(beg, it, cmp);
+        VmaQuickSort<Iterator, Compare>(it + 1, end, cmp);
+    }
+}
+
+#define VMA_SORT(beg, end, cmp) VmaQuickSort(beg, end, cmp)
+
+#endif // #ifndef VMA_SORT
+
+/*
+Returns true if two memory blocks occupy overlapping pages.
+ResourceA must be in less memory offset than ResourceB.
+
+Algorithm is based on "Vulkan 1.0.39 - A Specification (with all registered Vulkan extensions)"
+chapter 11.6 "Resource Memory Association", paragraph "Buffer-Image Granularity".
+*/
+static inline bool VmaBlocksOnSamePage(
+    VkDeviceSize resourceAOffset,
+    VkDeviceSize resourceASize,
+    VkDeviceSize resourceBOffset,
+    VkDeviceSize pageSize)
+{
+    VMA_ASSERT(resourceAOffset + resourceASize <= resourceBOffset && resourceASize > 0 && pageSize > 0);
+    VkDeviceSize resourceAEnd = resourceAOffset + resourceASize - 1;
+    VkDeviceSize resourceAEndPage = resourceAEnd & ~(pageSize - 1);
+    VkDeviceSize resourceBStart = resourceBOffset;
+    VkDeviceSize resourceBStartPage = resourceBStart & ~(pageSize - 1);
+    return resourceAEndPage == resourceBStartPage;
+}
+
+enum VmaSuballocationType
+{
+    VMA_SUBALLOCATION_TYPE_FREE = 0,
+    VMA_SUBALLOCATION_TYPE_UNKNOWN = 1,
+    VMA_SUBALLOCATION_TYPE_BUFFER = 2,
+    VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN = 3,
+    VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR = 4,
+    VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL = 5,
+    VMA_SUBALLOCATION_TYPE_MAX_ENUM = 0x7FFFFFFF
+};
+
+/*
+Returns true if given suballocation types could conflict and must respect
+VkPhysicalDeviceLimits::bufferImageGranularity. They conflict if one is buffer
+or linear image and another one is optimal image. If type is unknown, behave
+conservatively.
+*/
+static inline bool VmaIsBufferImageGranularityConflict(
+    VmaSuballocationType suballocType1,
+    VmaSuballocationType suballocType2)
+{
+    if(suballocType1 > suballocType2)
+    {
+        VMA_SWAP(suballocType1, suballocType2);
+    }
+    
+    switch(suballocType1)
+    {
+    case VMA_SUBALLOCATION_TYPE_FREE:
+        return false;
+    case VMA_SUBALLOCATION_TYPE_UNKNOWN:
+        return true;
+    case VMA_SUBALLOCATION_TYPE_BUFFER:
+        return
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;
+    case VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN:
+        return
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR ||
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;
+    case VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR:
+        return
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;
+    case VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL:
+        return false;
+    default:
+        VMA_ASSERT(0);
+        return true;
+    }
+}
+
+static void VmaWriteMagicValue(void* pData, VkDeviceSize offset)
+{
+    uint32_t* pDst = (uint32_t*)((char*)pData + offset);
+    const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t);
+    for(size_t i = 0; i != numberCount; ++i, ++pDst)
+    {
+        *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE;
+    }
+}
+
+static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset)
+{
+    const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset);
+    const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t);
+    for(size_t i = 0; i != numberCount; ++i, ++pSrc)
+    {
+        if(*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+// Helper RAII class to lock a mutex in constructor and unlock it in destructor (at the end of scope).
+struct VmaMutexLock
+{
+    VMA_CLASS_NO_COPY(VmaMutexLock)
+public:
+    VmaMutexLock(VMA_MUTEX& mutex, bool useMutex) :
+        m_pMutex(useMutex ? &mutex : VMA_NULL)
+    { if(m_pMutex) { m_pMutex->Lock(); } }
+    ~VmaMutexLock()
+    { if(m_pMutex) { m_pMutex->Unlock(); } }
+private:
+    VMA_MUTEX* m_pMutex;
+};
+
+// Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for reading.
+struct VmaMutexLockRead
+{
+    VMA_CLASS_NO_COPY(VmaMutexLockRead)
+public:
+    VmaMutexLockRead(VMA_RW_MUTEX& mutex, bool useMutex) :
+        m_pMutex(useMutex ? &mutex : VMA_NULL)
+    { if(m_pMutex) { m_pMutex->LockRead(); } }
+    ~VmaMutexLockRead() { if(m_pMutex) { m_pMutex->UnlockRead(); } }
+private:
+    VMA_RW_MUTEX* m_pMutex;
+};
+
+// Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for writing.
+struct VmaMutexLockWrite
+{
+    VMA_CLASS_NO_COPY(VmaMutexLockWrite)
+public:
+    VmaMutexLockWrite(VMA_RW_MUTEX& mutex, bool useMutex) :
+        m_pMutex(useMutex ? &mutex : VMA_NULL)
+    { if(m_pMutex) { m_pMutex->LockWrite(); } }
+    ~VmaMutexLockWrite() { if(m_pMutex) { m_pMutex->UnlockWrite(); } }
+private:
+    VMA_RW_MUTEX* m_pMutex;
+};
+
+#if VMA_DEBUG_GLOBAL_MUTEX
+    static VMA_MUTEX gDebugGlobalMutex;
+    #define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex, true);
+#else
+    #define VMA_DEBUG_GLOBAL_MUTEX_LOCK
+#endif
+
+// Minimum size of a free suballocation to register it in the free suballocation collection.
+static const VkDeviceSize VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER = 16;
+
+/*
+Performs binary search and returns iterator to first element that is greater or
+equal to (key), according to comparison (cmp).
+
+Cmp should return true if first argument is less than second argument.
+
+Returned value is the found element, if present in the collection or place where
+new element with value (key) should be inserted.
+*/
+template <typename CmpLess, typename IterT, typename KeyT>
+static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT &key, CmpLess cmp)
+{
+    size_t down = 0, up = (end - beg);
+    while(down < up)
+    {
+        const size_t mid = (down + up) / 2;
+        if(cmp(*(beg+mid), key))
+        {
+            down = mid + 1;
+        }
+        else
+        {
+            up = mid;
+        }
+    }
+    return beg + down;
+}
+
+/*
+Returns true if all pointers in the array are not-null and unique.
+Warning! O(n^2) complexity. Use only inside VMA_HEAVY_ASSERT.
+T must be pointer type, e.g. VmaAllocation, VmaPool.
+*/
+template<typename T>
+static bool VmaValidatePointerArray(uint32_t count, const T* arr)
+{
+    for(uint32_t i = 0; i < count; ++i)
+    {
+        const T iPtr = arr[i];
+        if(iPtr == VMA_NULL)
+        {
+            return false;
+        }
+        for(uint32_t j = i + 1; j < count; ++j)
+        {
+            if(iPtr == arr[j])
+            {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Memory allocation
+
+static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t size, size_t alignment)
+{
+    if((pAllocationCallbacks != VMA_NULL) &&
+        (pAllocationCallbacks->pfnAllocation != VMA_NULL))
+    {
+        return (*pAllocationCallbacks->pfnAllocation)(
+            pAllocationCallbacks->pUserData,
+            size,
+            alignment,
+            VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+    }
+    else
+    {
+        return VMA_SYSTEM_ALIGNED_MALLOC(size, alignment);
+    }
+}
+
+static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr)
+{
+    if((pAllocationCallbacks != VMA_NULL) &&
+        (pAllocationCallbacks->pfnFree != VMA_NULL))
+    {
+        (*pAllocationCallbacks->pfnFree)(pAllocationCallbacks->pUserData, ptr);
+    }
+    else
+    {
+        VMA_SYSTEM_FREE(ptr);
+    }
+}
+
+template<typename T>
+static T* VmaAllocate(const VkAllocationCallbacks* pAllocationCallbacks)
+{
+    return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T), VMA_ALIGN_OF(T));
+}
+
+template<typename T>
+static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, size_t count)
+{
+    return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T) * count, VMA_ALIGN_OF(T));
+}
+
+#define vma_new(allocator, type)   new(VmaAllocate<type>(allocator))(type)
+
+#define vma_new_array(allocator, type, count)   new(VmaAllocateArray<type>((allocator), (count)))(type)
+
+template<typename T>
+static void vma_delete(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr)
+{
+    ptr->~T();
+    VmaFree(pAllocationCallbacks, ptr);
+}
+
+template<typename T>
+static void vma_delete_array(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr, size_t count)
+{
+    if(ptr != VMA_NULL)
+    {
+        for(size_t i = count; i--; )
+        {
+            ptr[i].~T();
+        }
+        VmaFree(pAllocationCallbacks, ptr);
+    }
+}
+
+// STL-compatible allocator.
+template<typename T>
+class VmaStlAllocator
+{
+public:
+    const VkAllocationCallbacks* const m_pCallbacks;
+    typedef T value_type;
+    
+    VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) { }
+    template<typename U> VmaStlAllocator(const VmaStlAllocator<U>& src) : m_pCallbacks(src.m_pCallbacks) { }
+
+    T* allocate(size_t n) { return VmaAllocateArray<T>(m_pCallbacks, n); }
+    void deallocate(T* p, size_t /*n*/) { VmaFree(m_pCallbacks, p); }
+
+    template<typename U>
+    bool operator==(const VmaStlAllocator<U>& rhs) const
+    {
+        return m_pCallbacks == rhs.m_pCallbacks;
+    }
+    template<typename U>
+    bool operator!=(const VmaStlAllocator<U>& rhs) const
+    {
+        return m_pCallbacks != rhs.m_pCallbacks;
+    }
+
+    VmaStlAllocator& operator=(const VmaStlAllocator& x) = delete;
+};
+
+#if VMA_USE_STL_VECTOR
+
+#define VmaVector std::vector
+
+template<typename T, typename allocatorT>
+static void VmaVectorInsert(std::vector<T, allocatorT>& vec, size_t index, const T& item)
+{
+    vec.insert(vec.begin() + index, item);
+}
+
+template<typename T, typename allocatorT>
+static void VmaVectorRemove(std::vector<T, allocatorT>& vec, size_t index)
+{
+    vec.erase(vec.begin() + index);
+}
+
+#else // #if VMA_USE_STL_VECTOR
+
+/* Class with interface compatible with subset of std::vector.
+T must be POD because constructors and destructors are not called and memcpy is
+used for these objects. */
+template<typename T, typename AllocatorT>
+class VmaVector
+{
+public:
+    typedef T value_type;
+
+    VmaVector(const AllocatorT& allocator) :
+        m_Allocator(allocator),
+        m_pArray(VMA_NULL),
+        m_Count(0),
+        m_Capacity(0)
+    {
+    }
+
+    VmaVector(size_t count, const AllocatorT& allocator) :
+        m_Allocator(allocator),
+        m_pArray(count ? (T*)VmaAllocateArray<T>(allocator.m_pCallbacks, count) : VMA_NULL),
+        m_Count(count),
+        m_Capacity(count)
+    {
+    }
+    
+    VmaVector(const VmaVector<T, AllocatorT>& src) :
+        m_Allocator(src.m_Allocator),
+        m_pArray(src.m_Count ? (T*)VmaAllocateArray<T>(src.m_Allocator.m_pCallbacks, src.m_Count) : VMA_NULL),
+        m_Count(src.m_Count),
+        m_Capacity(src.m_Count)
+    {
+        if(m_Count != 0)
+        {
+            memcpy(m_pArray, src.m_pArray, m_Count * sizeof(T));
+        }
+    }
+    
+    ~VmaVector()
+    {
+        VmaFree(m_Allocator.m_pCallbacks, m_pArray);
+    }
+
+    VmaVector& operator=(const VmaVector<T, AllocatorT>& rhs)
+    {
+        if(&rhs != this)
+        {
+            resize(rhs.m_Count);
+            if(m_Count != 0)
+            {
+                memcpy(m_pArray, rhs.m_pArray, m_Count * sizeof(T));
+            }
+        }
+        return *this;
+    }
+    
+    bool empty() const { return m_Count == 0; }
+    size_t size() const { return m_Count; }
+    T* data() { return m_pArray; }
+    const T* data() const { return m_pArray; }
+    
+    T& operator[](size_t index)
+    {
+        VMA_HEAVY_ASSERT(index < m_Count);
+        return m_pArray[index];
+    }
+    const T& operator[](size_t index) const
+    {
+        VMA_HEAVY_ASSERT(index < m_Count);
+        return m_pArray[index];
+    }
+
+    T& front()
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        return m_pArray[0];
+    }
+    const T& front() const
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        return m_pArray[0];
+    }
+    T& back()
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        return m_pArray[m_Count - 1];
+    }
+    const T& back() const
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        return m_pArray[m_Count - 1];
+    }
+
+    void reserve(size_t newCapacity, bool freeMemory = false)
+    {
+        newCapacity = VMA_MAX(newCapacity, m_Count);
+        
+        if((newCapacity < m_Capacity) && !freeMemory)
+        {
+            newCapacity = m_Capacity;
+        }
+        
+        if(newCapacity != m_Capacity)
+        {
+            T* const newArray = newCapacity ? VmaAllocateArray<T>(m_Allocator, newCapacity) : VMA_NULL;
+            if(m_Count != 0)
+            {
+                memcpy(newArray, m_pArray, m_Count * sizeof(T));
+            }
+            VmaFree(m_Allocator.m_pCallbacks, m_pArray);
+            m_Capacity = newCapacity;
+            m_pArray = newArray;
+        }
+    }
+
+    void resize(size_t newCount, bool freeMemory = false)
+    {
+        size_t newCapacity = m_Capacity;
+        if(newCount > m_Capacity)
+        {
+            newCapacity = VMA_MAX(newCount, VMA_MAX(m_Capacity * 3 / 2, (size_t)8));
+        }
+        else if(freeMemory)
+        {
+            newCapacity = newCount;
+        }
+
+        if(newCapacity != m_Capacity)
+        {
+            T* const newArray = newCapacity ? VmaAllocateArray<T>(m_Allocator.m_pCallbacks, newCapacity) : VMA_NULL;
+            const size_t elementsToCopy = VMA_MIN(m_Count, newCount);
+            if(elementsToCopy != 0)
+            {
+                memcpy(newArray, m_pArray, elementsToCopy * sizeof(T));
+            }
+            VmaFree(m_Allocator.m_pCallbacks, m_pArray);
+            m_Capacity = newCapacity;
+            m_pArray = newArray;
+        }
+
+        m_Count = newCount;
+    }
+
+    void clear(bool freeMemory = false)
+    {
+        resize(0, freeMemory);
+    }
+
+    void insert(size_t index, const T& src)
+    {
+        VMA_HEAVY_ASSERT(index <= m_Count);
+        const size_t oldCount = size();
+        resize(oldCount + 1);
+        if(index < oldCount)
+        {
+            memmove(m_pArray + (index + 1), m_pArray + index, (oldCount - index) * sizeof(T));
+        }
+        m_pArray[index] = src;
+    }
+
+    void remove(size_t index)
+    {
+        VMA_HEAVY_ASSERT(index < m_Count);
+        const size_t oldCount = size();
+        if(index < oldCount - 1)
+        {
+            memmove(m_pArray + index, m_pArray + (index + 1), (oldCount - index - 1) * sizeof(T));
+        }
+        resize(oldCount - 1);
+    }
+
+    void push_back(const T& src)
+    {
+        const size_t newIndex = size();
+        resize(newIndex + 1);
+        m_pArray[newIndex] = src;
+    }
+
+    void pop_back()
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        resize(size() - 1);
+    }
+
+    void push_front(const T& src)
+    {
+        insert(0, src);
+    }
+
+    void pop_front()
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        remove(0);
+    }
+
+    typedef T* iterator;
+
+    iterator begin() { return m_pArray; }
+    iterator end() { return m_pArray + m_Count; }
+
+private:
+    AllocatorT m_Allocator;
+    T* m_pArray;
+    size_t m_Count;
+    size_t m_Capacity;
+};
+
+template<typename T, typename allocatorT>
+static void VmaVectorInsert(VmaVector<T, allocatorT>& vec, size_t index, const T& item)
+{
+    vec.insert(index, item);
+}
+
+template<typename T, typename allocatorT>
+static void VmaVectorRemove(VmaVector<T, allocatorT>& vec, size_t index)
+{
+    vec.remove(index);
+}
+
+#endif // #if VMA_USE_STL_VECTOR
+
+template<typename CmpLess, typename VectorT>
+size_t VmaVectorInsertSorted(VectorT& vector, const typename VectorT::value_type& value)
+{
+    const size_t indexToInsert = VmaBinaryFindFirstNotLess(
+        vector.data(),
+        vector.data() + vector.size(),
+        value,
+        CmpLess()) - vector.data();
+    VmaVectorInsert(vector, indexToInsert, value);
+    return indexToInsert;
+}
+
+template<typename CmpLess, typename VectorT>
+bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& value)
+{
+    CmpLess comparator;
+    typename VectorT::iterator it = VmaBinaryFindFirstNotLess(
+        vector.begin(),
+        vector.end(),
+        value,
+        comparator);
+    if((it != vector.end()) && !comparator(*it, value) && !comparator(value, *it))
+    {
+        size_t indexToRemove = it - vector.begin();
+        VmaVectorRemove(vector, indexToRemove);
+        return true;
+    }
+    return false;
+}
+
+template<typename CmpLess, typename IterT, typename KeyT>
+IterT VmaVectorFindSorted(const IterT& beg, const IterT& end, const KeyT& value)
+{
+    CmpLess comparator;
+    IterT it = VmaBinaryFindFirstNotLess<CmpLess, IterT, KeyT>(
+        beg, end, value, comparator);
+    if(it == end ||
+        (!comparator(*it, value) && !comparator(value, *it)))
+    {
+        return it;
+    }
+    return end;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaPoolAllocator
+
+/*
+Allocator for objects of type T using a list of arrays (pools) to speed up
+allocation. Number of elements that can be allocated is not bounded because
+allocator can create multiple blocks.
+*/
+template<typename T>
+class VmaPoolAllocator
+{
+    VMA_CLASS_NO_COPY(VmaPoolAllocator)
+public:
+    VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, size_t itemsPerBlock);
+    ~VmaPoolAllocator();
+    void Clear();
+    T* Alloc();
+    void Free(T* ptr);
+
+private:
+    union Item
+    {
+        uint32_t NextFreeIndex;
+        T Value;
+    };
+
+    struct ItemBlock
+    {
+        Item* pItems;
+        uint32_t FirstFreeIndex;
+    };
+    
+    const VkAllocationCallbacks* m_pAllocationCallbacks;
+    size_t m_ItemsPerBlock;
+    VmaVector< ItemBlock, VmaStlAllocator<ItemBlock> > m_ItemBlocks;
+
+    ItemBlock& CreateNewBlock();
+};
+
+template<typename T>
+VmaPoolAllocator<T>::VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, size_t itemsPerBlock) :
+    m_pAllocationCallbacks(pAllocationCallbacks),
+    m_ItemsPerBlock(itemsPerBlock),
+    m_ItemBlocks(VmaStlAllocator<ItemBlock>(pAllocationCallbacks))
+{
+    VMA_ASSERT(itemsPerBlock > 0);
+}
+
+template<typename T>
+VmaPoolAllocator<T>::~VmaPoolAllocator()
+{
+    Clear();
+}
+
+template<typename T>
+void VmaPoolAllocator<T>::Clear()
+{
+    for(size_t i = m_ItemBlocks.size(); i--; )
+        vma_delete_array(m_pAllocationCallbacks, m_ItemBlocks[i].pItems, m_ItemsPerBlock);
+    m_ItemBlocks.clear();
+}
+
+template<typename T>
+T* VmaPoolAllocator<T>::Alloc()
+{
+    for(size_t i = m_ItemBlocks.size(); i--; )
+    {
+        ItemBlock& block = m_ItemBlocks[i];
+        // This block has some free items: Use first one.
+        if(block.FirstFreeIndex != UINT32_MAX)
+        {
+            Item* const pItem = &block.pItems[block.FirstFreeIndex];
+            block.FirstFreeIndex = pItem->NextFreeIndex;
+            return &pItem->Value;
+        }
+    }
+
+    // No block has free item: Create new one and use it.
+    ItemBlock& newBlock = CreateNewBlock();
+    Item* const pItem = &newBlock.pItems[0];
+    newBlock.FirstFreeIndex = pItem->NextFreeIndex;
+    return &pItem->Value;
+}
+
+template<typename T>
+void VmaPoolAllocator<T>::Free(T* ptr)
+{
+    // Search all memory blocks to find ptr.
+    for(size_t i = 0; i < m_ItemBlocks.size(); ++i)
+    {
+        ItemBlock& block = m_ItemBlocks[i];
+        
+        // Casting to union.
+        Item* pItemPtr;
+        memcpy(&pItemPtr, &ptr, sizeof(pItemPtr));
+        
+        // Check if pItemPtr is in address range of this block.
+        if((pItemPtr >= block.pItems) && (pItemPtr < block.pItems + m_ItemsPerBlock))
+        {
+            const uint32_t index = static_cast<uint32_t>(pItemPtr - block.pItems);
+            pItemPtr->NextFreeIndex = block.FirstFreeIndex;
+            block.FirstFreeIndex = index;
+            return;
+        }
+    }
+    VMA_ASSERT(0 && "Pointer doesn't belong to this memory pool.");
+}
+
+template<typename T>
+typename VmaPoolAllocator<T>::ItemBlock& VmaPoolAllocator<T>::CreateNewBlock()
+{
+    ItemBlock newBlock = {
+        vma_new_array(m_pAllocationCallbacks, Item, m_ItemsPerBlock), 0 };
+
+    m_ItemBlocks.push_back(newBlock);
+
+    // Setup singly-linked list of all free items in this block.
+    for(uint32_t i = 0; i < m_ItemsPerBlock - 1; ++i)
+        newBlock.pItems[i].NextFreeIndex = i + 1;
+    newBlock.pItems[m_ItemsPerBlock - 1].NextFreeIndex = UINT32_MAX;
+    return m_ItemBlocks.back();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaRawList, VmaList
+
+#if VMA_USE_STL_LIST
+
+#define VmaList std::list
+
+#else // #if VMA_USE_STL_LIST
+
+template<typename T>
+struct VmaListItem
+{
+    VmaListItem* pPrev;
+    VmaListItem* pNext;
+    T Value;
+};
+
+// Doubly linked list.
+template<typename T>
+class VmaRawList
+{
+    VMA_CLASS_NO_COPY(VmaRawList)
+public:
+    typedef VmaListItem<T> ItemType;
+
+    VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks);
+    ~VmaRawList();
+    void Clear();
+
+    size_t GetCount() const { return m_Count; }
+    bool IsEmpty() const { return m_Count == 0; }
+
+    ItemType* Front() { return m_pFront; }
+    const ItemType* Front() const { return m_pFront; }
+    ItemType* Back() { return m_pBack; }
+    const ItemType* Back() const { return m_pBack; }
+
+    ItemType* PushBack();
+    ItemType* PushFront();
+    ItemType* PushBack(const T& value);
+    ItemType* PushFront(const T& value);
+    void PopBack();
+    void PopFront();
+    
+    // Item can be null - it means PushBack.
+    ItemType* InsertBefore(ItemType* pItem);
+    // Item can be null - it means PushFront.
+    ItemType* InsertAfter(ItemType* pItem);
+
+    ItemType* InsertBefore(ItemType* pItem, const T& value);
+    ItemType* InsertAfter(ItemType* pItem, const T& value);
+
+    void Remove(ItemType* pItem);
+
+private:
+    const VkAllocationCallbacks* const m_pAllocationCallbacks;
+    VmaPoolAllocator<ItemType> m_ItemAllocator;
+    ItemType* m_pFront;
+    ItemType* m_pBack;
+    size_t m_Count;
+};
+
+template<typename T>
+VmaRawList<T>::VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks) :
+    m_pAllocationCallbacks(pAllocationCallbacks),
+    m_ItemAllocator(pAllocationCallbacks, 128),
+    m_pFront(VMA_NULL),
+    m_pBack(VMA_NULL),
+    m_Count(0)
+{
+}
+
+template<typename T>
+VmaRawList<T>::~VmaRawList()
+{
+    // Intentionally not calling Clear, because that would be unnecessary
+    // computations to return all items to m_ItemAllocator as free.
+}
+
+template<typename T>
+void VmaRawList<T>::Clear()
+{
+    if(IsEmpty() == false)
+    {
+        ItemType* pItem = m_pBack;
+        while(pItem != VMA_NULL)
+        {
+            ItemType* const pPrevItem = pItem->pPrev;
+            m_ItemAllocator.Free(pItem);
+            pItem = pPrevItem;
+        }
+        m_pFront = VMA_NULL;
+        m_pBack = VMA_NULL;
+        m_Count = 0;
+    }
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::PushBack()
+{
+    ItemType* const pNewItem = m_ItemAllocator.Alloc();
+    pNewItem->pNext = VMA_NULL;
+    if(IsEmpty())
+    {
+        pNewItem->pPrev = VMA_NULL;
+        m_pFront = pNewItem;
+        m_pBack = pNewItem;
+        m_Count = 1;
+    }
+    else
+    {
+        pNewItem->pPrev = m_pBack;
+        m_pBack->pNext = pNewItem;
+        m_pBack = pNewItem;
+        ++m_Count;
+    }
+    return pNewItem;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::PushFront()
+{
+    ItemType* const pNewItem = m_ItemAllocator.Alloc();
+    pNewItem->pPrev = VMA_NULL;
+    if(IsEmpty())
+    {
+        pNewItem->pNext = VMA_NULL;
+        m_pFront = pNewItem;
+        m_pBack = pNewItem;
+        m_Count = 1;
+    }
+    else
+    {
+        pNewItem->pNext = m_pFront;
+        m_pFront->pPrev = pNewItem;
+        m_pFront = pNewItem;
+        ++m_Count;
+    }
+    return pNewItem;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::PushBack(const T& value)
+{
+    ItemType* const pNewItem = PushBack();
+    pNewItem->Value = value;
+    return pNewItem;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::PushFront(const T& value)
+{
+    ItemType* const pNewItem = PushFront();
+    pNewItem->Value = value;
+    return pNewItem;
+}
+
+template<typename T>
+void VmaRawList<T>::PopBack()
+{
+    VMA_HEAVY_ASSERT(m_Count > 0);
+    ItemType* const pBackItem = m_pBack;
+    ItemType* const pPrevItem = pBackItem->pPrev;
+    if(pPrevItem != VMA_NULL)
+    {
+        pPrevItem->pNext = VMA_NULL;
+    }
+    m_pBack = pPrevItem;
+    m_ItemAllocator.Free(pBackItem);
+    --m_Count;
+}
+
+template<typename T>
+void VmaRawList<T>::PopFront()
+{
+    VMA_HEAVY_ASSERT(m_Count > 0);
+    ItemType* const pFrontItem = m_pFront;
+    ItemType* const pNextItem = pFrontItem->pNext;
+    if(pNextItem != VMA_NULL)
+    {
+        pNextItem->pPrev = VMA_NULL;
+    }
+    m_pFront = pNextItem;
+    m_ItemAllocator.Free(pFrontItem);
+    --m_Count;
+}
+
+template<typename T>
+void VmaRawList<T>::Remove(ItemType* pItem)
+{
+    VMA_HEAVY_ASSERT(pItem != VMA_NULL);
+    VMA_HEAVY_ASSERT(m_Count > 0);
+
+    if(pItem->pPrev != VMA_NULL)
+    {
+        pItem->pPrev->pNext = pItem->pNext;
+    }
+    else
+    {
+        VMA_HEAVY_ASSERT(m_pFront == pItem);
+        m_pFront = pItem->pNext;
+    }
+
+    if(pItem->pNext != VMA_NULL)
+    {
+        pItem->pNext->pPrev = pItem->pPrev;
+    }
+    else
+    {
+        VMA_HEAVY_ASSERT(m_pBack == pItem);
+        m_pBack = pItem->pPrev;
+    }
+
+    m_ItemAllocator.Free(pItem);
+    --m_Count;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem)
+{
+    if(pItem != VMA_NULL)
+    {
+        ItemType* const prevItem = pItem->pPrev;
+        ItemType* const newItem = m_ItemAllocator.Alloc();
+        newItem->pPrev = prevItem;
+        newItem->pNext = pItem;
+        pItem->pPrev = newItem;
+        if(prevItem != VMA_NULL)
+        {
+            prevItem->pNext = newItem;
+        }
+        else
+        {
+            VMA_HEAVY_ASSERT(m_pFront == pItem);
+            m_pFront = newItem;
+        }
+        ++m_Count;
+        return newItem;
+    }
+    else
+        return PushBack();
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem)
+{
+    if(pItem != VMA_NULL)
+    {
+        ItemType* const nextItem = pItem->pNext;
+        ItemType* const newItem = m_ItemAllocator.Alloc();
+        newItem->pNext = nextItem;
+        newItem->pPrev = pItem;
+        pItem->pNext = newItem;
+        if(nextItem != VMA_NULL)
+        {
+            nextItem->pPrev = newItem;
+        }
+        else
+        {
+            VMA_HEAVY_ASSERT(m_pBack == pItem);
+            m_pBack = newItem;
+        }
+        ++m_Count;
+        return newItem;
+    }
+    else
+        return PushFront();
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem, const T& value)
+{
+    ItemType* const newItem = InsertBefore(pItem);
+    newItem->Value = value;
+    return newItem;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem, const T& value)
+{
+    ItemType* const newItem = InsertAfter(pItem);
+    newItem->Value = value;
+    return newItem;
+}
+
+template<typename T, typename AllocatorT>
+class VmaList
+{
+    VMA_CLASS_NO_COPY(VmaList)
+public:
+    class iterator
+    {
+    public:
+        iterator() :
+            m_pList(VMA_NULL),
+            m_pItem(VMA_NULL)
+        {
+        }
+
+        T& operator*() const
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            return m_pItem->Value;
+        }
+        T* operator->() const
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            return &m_pItem->Value;
+        }
+
+        iterator& operator++()
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            m_pItem = m_pItem->pNext;
+            return *this;
+        }
+        iterator& operator--()
+        {
+            if(m_pItem != VMA_NULL)
+            {
+                m_pItem = m_pItem->pPrev;
+            }
+            else
+            {
+                VMA_HEAVY_ASSERT(!m_pList->IsEmpty());
+                m_pItem = m_pList->Back();
+            }
+            return *this;
+        }
+
+        iterator operator++(int)
+        {
+            iterator result = *this;
+            ++*this;
+            return result;
+        }
+        iterator operator--(int)
+        {
+            iterator result = *this;
+            --*this;
+            return result;
+        }
+
+        bool operator==(const iterator& rhs) const
+        {
+            VMA_HEAVY_ASSERT(m_pList == rhs.m_pList);
+            return m_pItem == rhs.m_pItem;
+        }
+        bool operator!=(const iterator& rhs) const
+        {
+            VMA_HEAVY_ASSERT(m_pList == rhs.m_pList);
+            return m_pItem != rhs.m_pItem;
+        }
+        
+    private:
+        VmaRawList<T>* m_pList;
+        VmaListItem<T>* m_pItem;
+
+        iterator(VmaRawList<T>* pList, VmaListItem<T>* pItem) :
+            m_pList(pList),
+            m_pItem(pItem)
+        {
+        }
+
+        friend class VmaList<T, AllocatorT>;
+    };
+
+    class const_iterator
+    {
+    public:
+        const_iterator() :
+            m_pList(VMA_NULL),
+            m_pItem(VMA_NULL)
+        {
+        }
+
+        const_iterator(const iterator& src) :
+            m_pList(src.m_pList),
+            m_pItem(src.m_pItem)
+        {
+        }
+        
+        const T& operator*() const
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            return m_pItem->Value;
+        }
+        const T* operator->() const
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            return &m_pItem->Value;
+        }
+
+        const_iterator& operator++()
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            m_pItem = m_pItem->pNext;
+            return *this;
+        }
+        const_iterator& operator--()
+        {
+            if(m_pItem != VMA_NULL)
+            {
+                m_pItem = m_pItem->pPrev;
+            }
+            else
+            {
+                VMA_HEAVY_ASSERT(!m_pList->IsEmpty());
+                m_pItem = m_pList->Back();
+            }
+            return *this;
+        }
+
+        const_iterator operator++(int)
+        {
+            const_iterator result = *this;
+            ++*this;
+            return result;
+        }
+        const_iterator operator--(int)
+        {
+            const_iterator result = *this;
+            --*this;
+            return result;
+        }
+
+        bool operator==(const const_iterator& rhs) const
+        {
+            VMA_HEAVY_ASSERT(m_pList == rhs.m_pList);
+            return m_pItem == rhs.m_pItem;
+        }
+        bool operator!=(const const_iterator& rhs) const
+        {
+            VMA_HEAVY_ASSERT(m_pList == rhs.m_pList);
+            return m_pItem != rhs.m_pItem;
+        }
+        
+    private:
+        const_iterator(const VmaRawList<T>* pList, const VmaListItem<T>* pItem) :
+            m_pList(pList),
+            m_pItem(pItem)
+        {
+        }
+
+        const VmaRawList<T>* m_pList;
+        const VmaListItem<T>* m_pItem;
+
+        friend class VmaList<T, AllocatorT>;
+    };
+
+    VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) { }
+
+    bool empty() const { return m_RawList.IsEmpty(); }
+    size_t size() const { return m_RawList.GetCount(); }
+
+    iterator begin() { return iterator(&m_RawList, m_RawList.Front()); }
+    iterator end() { return iterator(&m_RawList, VMA_NULL); }
+
+    const_iterator cbegin() const { return const_iterator(&m_RawList, m_RawList.Front()); }
+    const_iterator cend() const { return const_iterator(&m_RawList, VMA_NULL); }
+
+    void clear() { m_RawList.Clear(); }
+    void push_back(const T& value) { m_RawList.PushBack(value); }
+    void erase(iterator it) { m_RawList.Remove(it.m_pItem); }
+    iterator insert(iterator it, const T& value) { return iterator(&m_RawList, m_RawList.InsertBefore(it.m_pItem, value)); }
+
+private:
+    VmaRawList<T> m_RawList;
+};
+
+#endif // #if VMA_USE_STL_LIST
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaMap
+
+// Unused in this version.
+#if 0
+
+#if VMA_USE_STL_UNORDERED_MAP
+
+#define VmaPair std::pair
+
+#define VMA_MAP_TYPE(KeyT, ValueT) \
+    std::unordered_map< KeyT, ValueT, std::hash<KeyT>, std::equal_to<KeyT>, VmaStlAllocator< std::pair<KeyT, ValueT> > >
+
+#else // #if VMA_USE_STL_UNORDERED_MAP
+
+template<typename T1, typename T2>
+struct VmaPair
+{
+    T1 first;
+    T2 second;
+
+    VmaPair() : first(), second() { }
+    VmaPair(const T1& firstSrc, const T2& secondSrc) : first(firstSrc), second(secondSrc) { }
+};
+
+/* Class compatible with subset of interface of std::unordered_map.
+KeyT, ValueT must be POD because they will be stored in VmaVector.
+*/
+template<typename KeyT, typename ValueT>
+class VmaMap
+{
+public:
+    typedef VmaPair<KeyT, ValueT> PairType;
+    typedef PairType* iterator;
+
+    VmaMap(const VmaStlAllocator<PairType>& allocator) : m_Vector(allocator) { }
+
+    iterator begin() { return m_Vector.begin(); }
+    iterator end() { return m_Vector.end(); }
+
+    void insert(const PairType& pair);
+    iterator find(const KeyT& key);
+    void erase(iterator it);
+    
+private:
+    VmaVector< PairType, VmaStlAllocator<PairType> > m_Vector;
+};
+
+#define VMA_MAP_TYPE(KeyT, ValueT) VmaMap<KeyT, ValueT>
+
+template<typename FirstT, typename SecondT>
+struct VmaPairFirstLess
+{
+    bool operator()(const VmaPair<FirstT, SecondT>& lhs, const VmaPair<FirstT, SecondT>& rhs) const
+    {
+        return lhs.first < rhs.first;
+    }
+    bool operator()(const VmaPair<FirstT, SecondT>& lhs, const FirstT& rhsFirst) const
+    {
+        return lhs.first < rhsFirst;
+    }
+};
+
+template<typename KeyT, typename ValueT>
+void VmaMap<KeyT, ValueT>::insert(const PairType& pair)
+{
+    const size_t indexToInsert = VmaBinaryFindFirstNotLess(
+        m_Vector.data(),
+        m_Vector.data() + m_Vector.size(),
+        pair,
+        VmaPairFirstLess<KeyT, ValueT>()) - m_Vector.data();
+    VmaVectorInsert(m_Vector, indexToInsert, pair);
+}
+
+template<typename KeyT, typename ValueT>
+VmaPair<KeyT, ValueT>* VmaMap<KeyT, ValueT>::find(const KeyT& key)
+{
+    PairType* it = VmaBinaryFindFirstNotLess(
+        m_Vector.data(),
+        m_Vector.data() + m_Vector.size(),
+        key,
+        VmaPairFirstLess<KeyT, ValueT>());
+    if((it != m_Vector.end()) && (it->first == key))
+    {
+        return it;
+    }
+    else
+    {
+        return m_Vector.end();
+    }
+}
+
+template<typename KeyT, typename ValueT>
+void VmaMap<KeyT, ValueT>::erase(iterator it)
+{
+    VmaVectorRemove(m_Vector, it - m_Vector.begin());
+}
+
+#endif // #if VMA_USE_STL_UNORDERED_MAP
+
+#endif // #if 0
+
+////////////////////////////////////////////////////////////////////////////////
+
+class VmaDeviceMemoryBlock;
+
+enum VMA_CACHE_OPERATION { VMA_CACHE_FLUSH, VMA_CACHE_INVALIDATE };
+
+struct VmaAllocation_T
+{
+    VMA_CLASS_NO_COPY(VmaAllocation_T)
+private:
+    static const uint8_t MAP_COUNT_FLAG_PERSISTENT_MAP = 0x80;
+
+    enum FLAGS
+    {
+        FLAG_USER_DATA_STRING = 0x01,
+    };
+
+public:
+    enum ALLOCATION_TYPE
+    {
+        ALLOCATION_TYPE_NONE,
+        ALLOCATION_TYPE_BLOCK,
+        ALLOCATION_TYPE_DEDICATED,
+    };
+
+    VmaAllocation_T(uint32_t currentFrameIndex, bool userDataString) :
+        m_Alignment(1),
+        m_Size(0),
+        m_pUserData(VMA_NULL),
+        m_LastUseFrameIndex(currentFrameIndex),
+        m_Type((uint8_t)ALLOCATION_TYPE_NONE),
+        m_SuballocationType((uint8_t)VMA_SUBALLOCATION_TYPE_UNKNOWN),
+        m_MapCount(0),
+        m_Flags(userDataString ? (uint8_t)FLAG_USER_DATA_STRING : 0)
+    {
+#if VMA_STATS_STRING_ENABLED
+        m_CreationFrameIndex = currentFrameIndex;
+        m_BufferImageUsage = 0;
+#endif
+    }
+
+    ~VmaAllocation_T()
+    {
+        VMA_ASSERT((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) == 0 && "Allocation was not unmapped before destruction.");
+
+        // Check if owned string was freed.
+        VMA_ASSERT(m_pUserData == VMA_NULL);
+    }
+
+    void InitBlockAllocation(
+        VmaPool hPool,
+        VmaDeviceMemoryBlock* block,
+        VkDeviceSize offset,
+        VkDeviceSize alignment,
+        VkDeviceSize size,
+        VmaSuballocationType suballocationType,
+        bool mapped,
+        bool canBecomeLost)
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);
+        VMA_ASSERT(block != VMA_NULL);
+        m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK;
+        m_Alignment = alignment;
+        m_Size = size;
+        m_MapCount = mapped ? MAP_COUNT_FLAG_PERSISTENT_MAP : 0;
+        m_SuballocationType = (uint8_t)suballocationType;
+        m_BlockAllocation.m_hPool = hPool;
+        m_BlockAllocation.m_Block = block;
+        m_BlockAllocation.m_Offset = offset;
+        m_BlockAllocation.m_CanBecomeLost = canBecomeLost;
+    }
+
+    void InitLost()
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);
+        VMA_ASSERT(m_LastUseFrameIndex.load() == VMA_FRAME_INDEX_LOST);
+        m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK;
+        m_BlockAllocation.m_hPool = VK_NULL_HANDLE;
+        m_BlockAllocation.m_Block = VMA_NULL;
+        m_BlockAllocation.m_Offset = 0;
+        m_BlockAllocation.m_CanBecomeLost = true;
+    }
+
+    void ChangeBlockAllocation(
+        VmaAllocator hAllocator,
+        VmaDeviceMemoryBlock* block,
+        VkDeviceSize offset); 
+
+    void ChangeSize(VkDeviceSize newSize);
+    void ChangeOffset(VkDeviceSize newOffset);
+
+    // pMappedData not null means allocation is created with MAPPED flag.
+    void InitDedicatedAllocation(
+        uint32_t memoryTypeIndex,
+        VkDeviceMemory hMemory,
+        VmaSuballocationType suballocationType,
+        void* pMappedData,
+        VkDeviceSize size)
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);
+        VMA_ASSERT(hMemory != VK_NULL_HANDLE);
+        m_Type = (uint8_t)ALLOCATION_TYPE_DEDICATED;
+        m_Alignment = 0;
+        m_Size = size;
+        m_SuballocationType = (uint8_t)suballocationType;
+        m_MapCount = (pMappedData != VMA_NULL) ? MAP_COUNT_FLAG_PERSISTENT_MAP : 0;
+        m_DedicatedAllocation.m_MemoryTypeIndex = memoryTypeIndex;
+        m_DedicatedAllocation.m_hMemory = hMemory;
+        m_DedicatedAllocation.m_pMappedData = pMappedData;
+    }
+
+    ALLOCATION_TYPE GetType() const { return (ALLOCATION_TYPE)m_Type; }
+    VkDeviceSize GetAlignment() const { return m_Alignment; }
+    VkDeviceSize GetSize() const { return m_Size; }
+    bool IsUserDataString() const { return (m_Flags & FLAG_USER_DATA_STRING) != 0; }
+    void* GetUserData() const { return m_pUserData; }
+    void SetUserData(VmaAllocator hAllocator, void* pUserData);
+    VmaSuballocationType GetSuballocationType() const { return (VmaSuballocationType)m_SuballocationType; }
+
+    VmaDeviceMemoryBlock* GetBlock() const
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);
+        return m_BlockAllocation.m_Block;
+    }
+    VkDeviceSize GetOffset() const;
+    VkDeviceMemory GetMemory() const;
+    uint32_t GetMemoryTypeIndex() const;
+    bool IsPersistentMap() const { return (m_MapCount & MAP_COUNT_FLAG_PERSISTENT_MAP) != 0; }
+    void* GetMappedData() const;
+    bool CanBecomeLost() const;
+    VmaPool GetPool() const;
+    
+    uint32_t GetLastUseFrameIndex() const
+    {
+        return m_LastUseFrameIndex.load();
+    }
+    bool CompareExchangeLastUseFrameIndex(uint32_t& expected, uint32_t desired)
+    {
+        return m_LastUseFrameIndex.compare_exchange_weak(expected, desired);
+    }
+    /*
+    - If hAllocation.LastUseFrameIndex + frameInUseCount < allocator.CurrentFrameIndex,
+      makes it lost by setting LastUseFrameIndex = VMA_FRAME_INDEX_LOST and returns true.
+    - Else, returns false.
+    
+    If hAllocation is already lost, assert - you should not call it then.
+    If hAllocation was not created with CAN_BECOME_LOST_BIT, assert.
+    */
+    bool MakeLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+
+    void DedicatedAllocCalcStatsInfo(VmaStatInfo& outInfo)
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_DEDICATED);
+        outInfo.blockCount = 1;
+        outInfo.allocationCount = 1;
+        outInfo.unusedRangeCount = 0;
+        outInfo.usedBytes = m_Size;
+        outInfo.unusedBytes = 0;
+        outInfo.allocationSizeMin = outInfo.allocationSizeMax = m_Size;
+        outInfo.unusedRangeSizeMin = UINT64_MAX;
+        outInfo.unusedRangeSizeMax = 0;
+    }
+
+    void BlockAllocMap();
+    void BlockAllocUnmap();
+    VkResult DedicatedAllocMap(VmaAllocator hAllocator, void** ppData);
+    void DedicatedAllocUnmap(VmaAllocator hAllocator);
+
+#if VMA_STATS_STRING_ENABLED
+    uint32_t GetCreationFrameIndex() const { return m_CreationFrameIndex; }
+    uint32_t GetBufferImageUsage() const { return m_BufferImageUsage; }
+
+    void InitBufferImageUsage(uint32_t bufferImageUsage)
+    {
+        VMA_ASSERT(m_BufferImageUsage == 0);
+        m_BufferImageUsage = bufferImageUsage;
+    }
+
+    void PrintParameters(class VmaJsonWriter& json) const;
+#endif
+
+private:
+    VkDeviceSize m_Alignment;
+    VkDeviceSize m_Size;
+    void* m_pUserData;
+    VMA_ATOMIC_UINT32 m_LastUseFrameIndex;
+    uint8_t m_Type; // ALLOCATION_TYPE
+    uint8_t m_SuballocationType; // VmaSuballocationType
+    // Bit 0x80 is set when allocation was created with VMA_ALLOCATION_CREATE_MAPPED_BIT.
+    // Bits with mask 0x7F are reference counter for vmaMapMemory()/vmaUnmapMemory().
+    uint8_t m_MapCount;
+    uint8_t m_Flags; // enum FLAGS
+
+    // Allocation out of VmaDeviceMemoryBlock.
+    struct BlockAllocation
+    {
+        VmaPool m_hPool; // Null if belongs to general memory.
+        VmaDeviceMemoryBlock* m_Block;
+        VkDeviceSize m_Offset;
+        bool m_CanBecomeLost;
+    };
+
+    // Allocation for an object that has its own private VkDeviceMemory.
+    struct DedicatedAllocation
+    {
+        uint32_t m_MemoryTypeIndex;
+        VkDeviceMemory m_hMemory;
+        void* m_pMappedData; // Not null means memory is mapped.
+    };
+
+    union
+    {
+        // Allocation out of VmaDeviceMemoryBlock.
+        BlockAllocation m_BlockAllocation;
+        // Allocation for an object that has its own private VkDeviceMemory.
+        DedicatedAllocation m_DedicatedAllocation;
+    };
+
+#if VMA_STATS_STRING_ENABLED
+    uint32_t m_CreationFrameIndex;
+    uint32_t m_BufferImageUsage; // 0 if unknown.
+#endif
+
+    void FreeUserDataString(VmaAllocator hAllocator);
+};
+
+/*
+Represents a region of VmaDeviceMemoryBlock that is either assigned and returned as
+allocated memory block or free.
+*/
+struct VmaSuballocation
+{
+    VkDeviceSize offset;
+    VkDeviceSize size;
+    VmaAllocation hAllocation;
+    VmaSuballocationType type;
+};
+
+// Comparator for offsets.
+struct VmaSuballocationOffsetLess
+{
+    bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const
+    {
+        return lhs.offset < rhs.offset;
+    }
+};
+struct VmaSuballocationOffsetGreater
+{
+    bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const
+    {
+        return lhs.offset > rhs.offset;
+    }
+};
+
+typedef VmaList< VmaSuballocation, VmaStlAllocator<VmaSuballocation> > VmaSuballocationList;
+
+// Cost of one additional allocation lost, as equivalent in bytes.
+static const VkDeviceSize VMA_LOST_ALLOCATION_COST = 1048576;
+
+/*
+Parameters of planned allocation inside a VmaDeviceMemoryBlock.
+
+If canMakeOtherLost was false:
+- item points to a FREE suballocation.
+- itemsToMakeLostCount is 0.
+
+If canMakeOtherLost was true:
+- item points to first of sequence of suballocations, which are either FREE,
+  or point to VmaAllocations that can become lost.
+- itemsToMakeLostCount is the number of VmaAllocations that need to be made lost for
+  the requested allocation to succeed.
+*/
+struct VmaAllocationRequest
+{
+    VkDeviceSize offset;
+    VkDeviceSize sumFreeSize; // Sum size of free items that overlap with proposed allocation.
+    VkDeviceSize sumItemSize; // Sum size of items to make lost that overlap with proposed allocation.
+    VmaSuballocationList::iterator item;
+    size_t itemsToMakeLostCount;
+    void* customData;
+
+    VkDeviceSize CalcCost() const
+    {
+        return sumItemSize + itemsToMakeLostCount * VMA_LOST_ALLOCATION_COST;
+    }
+};
+
+/*
+Data structure used for bookkeeping of allocations and unused ranges of memory
+in a single VkDeviceMemory block.
+*/
+class VmaBlockMetadata
+{
+public:
+    VmaBlockMetadata(VmaAllocator hAllocator);
+    virtual ~VmaBlockMetadata() { }
+    virtual void Init(VkDeviceSize size) { m_Size = size; }
+
+    // Validates all data structures inside this object. If not valid, returns false.
+    virtual bool Validate() const = 0;
+    VkDeviceSize GetSize() const { return m_Size; }
+    virtual size_t GetAllocationCount() const = 0;
+    virtual VkDeviceSize GetSumFreeSize() const = 0;
+    virtual VkDeviceSize GetUnusedRangeSizeMax() const = 0;
+    // Returns true if this block is empty - contains only single free suballocation.
+    virtual bool IsEmpty() const = 0;
+
+    virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const = 0;
+    // Shouldn't modify blockCount.
+    virtual void AddPoolStats(VmaPoolStats& inoutStats) const = 0;
+
+#if VMA_STATS_STRING_ENABLED
+    virtual void PrintDetailedMap(class VmaJsonWriter& json) const = 0;
+#endif
+
+    // Tries to find a place for suballocation with given parameters inside this block.
+    // If succeeded, fills pAllocationRequest and returns true.
+    // If failed, returns false.
+    virtual bool CreateAllocationRequest(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        bool upperAddress,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        // Always one of VMA_ALLOCATION_CREATE_STRATEGY_* or VMA_ALLOCATION_INTERNAL_STRATEGY_* flags.
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest) = 0;
+
+    virtual bool MakeRequestedAllocationsLost(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VmaAllocationRequest* pAllocationRequest) = 0;
+
+    virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) = 0;
+
+    virtual VkResult CheckCorruption(const void* pBlockData) = 0;
+
+    // Makes actual allocation based on request. Request must already be checked and valid.
+    virtual void Alloc(
+        const VmaAllocationRequest& request,
+        VmaSuballocationType type,
+        VkDeviceSize allocSize,
+        bool upperAddress,
+        VmaAllocation hAllocation) = 0;
+
+    // Frees suballocation assigned to given memory region.
+    virtual void Free(const VmaAllocation allocation) = 0;
+    virtual void FreeAtOffset(VkDeviceSize offset) = 0;
+
+    // Tries to resize (grow or shrink) space for given allocation, in place.
+    virtual bool ResizeAllocation(const VmaAllocation /*alloc*/, VkDeviceSize /*newSize*/) { return false; }
+
+protected:
+    const VkAllocationCallbacks* GetAllocationCallbacks() const { return m_pAllocationCallbacks; }
+
+#if VMA_STATS_STRING_ENABLED
+    void PrintDetailedMap_Begin(class VmaJsonWriter& json,
+        VkDeviceSize unusedBytes,
+        size_t allocationCount,
+        size_t unusedRangeCount) const;
+    void PrintDetailedMap_Allocation(class VmaJsonWriter& json,
+        VkDeviceSize offset,
+        VmaAllocation hAllocation) const;
+    void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,
+        VkDeviceSize offset,
+        VkDeviceSize size) const;
+    void PrintDetailedMap_End(class VmaJsonWriter& json) const;
+#endif
+
+private:
+    VkDeviceSize m_Size;
+    const VkAllocationCallbacks* m_pAllocationCallbacks;
+};
+
+#define VMA_VALIDATE(cond) do { if(!(cond)) { \
+        VMA_ASSERT(0 && "Validation failed: " #cond); \
+        return false; \
+    } } while(false)
+
+class VmaBlockMetadata_Generic : public VmaBlockMetadata
+{
+    VMA_CLASS_NO_COPY(VmaBlockMetadata_Generic)
+public:
+    VmaBlockMetadata_Generic(VmaAllocator hAllocator);
+    virtual ~VmaBlockMetadata_Generic();
+    virtual void Init(VkDeviceSize size);
+
+    virtual bool Validate() const;
+    virtual size_t GetAllocationCount() const { return m_Suballocations.size() - m_FreeCount; }
+    virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; }
+    virtual VkDeviceSize GetUnusedRangeSizeMax() const;
+    virtual bool IsEmpty() const;
+
+    virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
+    virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
+
+#if VMA_STATS_STRING_ENABLED
+    virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
+#endif
+
+    virtual bool CreateAllocationRequest(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        bool upperAddress,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual bool MakeRequestedAllocationsLost(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+
+    virtual VkResult CheckCorruption(const void* pBlockData);
+
+    virtual void Alloc(
+        const VmaAllocationRequest& request,
+        VmaSuballocationType type,
+        VkDeviceSize allocSize,
+        bool upperAddress,
+        VmaAllocation hAllocation);
+
+    virtual void Free(const VmaAllocation allocation);
+    virtual void FreeAtOffset(VkDeviceSize offset);
+
+    virtual bool ResizeAllocation(const VmaAllocation alloc, VkDeviceSize newSize);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // For defragmentation
+    
+    bool IsBufferImageGranularityConflictPossible(
+        VkDeviceSize bufferImageGranularity,
+        VmaSuballocationType& inOutPrevSuballocType) const;
+
+private:
+    friend class VmaDefragmentationAlgorithm_Generic;
+    friend class VmaDefragmentationAlgorithm_Fast;
+
+    uint32_t m_FreeCount;
+    VkDeviceSize m_SumFreeSize;
+    VmaSuballocationList m_Suballocations;
+    // Suballocations that are free and have size greater than certain threshold.
+    // Sorted by size, ascending.
+    VmaVector< VmaSuballocationList::iterator, VmaStlAllocator< VmaSuballocationList::iterator > > m_FreeSuballocationsBySize;
+
+    bool ValidateFreeSuballocationList() const;
+
+    // Checks if requested suballocation with given parameters can be placed in given pFreeSuballocItem.
+    // If yes, fills pOffset and returns true. If no, returns false.
+    bool CheckAllocation(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        VmaSuballocationType allocType,
+        VmaSuballocationList::const_iterator suballocItem,
+        bool canMakeOtherLost,
+        VkDeviceSize* pOffset,
+        size_t* itemsToMakeLostCount,
+        VkDeviceSize* pSumFreeSize,
+        VkDeviceSize* pSumItemSize) const;
+    // Given free suballocation, it merges it with following one, which must also be free.
+    void MergeFreeWithNext(VmaSuballocationList::iterator item);
+    // Releases given suballocation, making it free.
+    // Merges it with adjacent free suballocations if applicable.
+    // Returns iterator to new free suballocation at this place.
+    VmaSuballocationList::iterator FreeSuballocation(VmaSuballocationList::iterator suballocItem);
+    // Given free suballocation, it inserts it into sorted list of
+    // m_FreeSuballocationsBySize if it's suitable.
+    void RegisterFreeSuballocation(VmaSuballocationList::iterator item);
+    // Given free suballocation, it removes it from sorted list of
+    // m_FreeSuballocationsBySize if it's suitable.
+    void UnregisterFreeSuballocation(VmaSuballocationList::iterator item);
+};
+
+/*
+Allocations and their references in internal data structure look like this:
+
+if(m_2ndVectorMode == SECOND_VECTOR_EMPTY):
+
+        0 +-------+
+          |       |
+          |       |
+          |       |
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount]
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount + 1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  1st[1st.size() - 1]
+          +-------+
+          |       |
+          |       |
+          |       |
+GetSize() +-------+
+
+if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER):
+
+        0 +-------+
+          | Alloc |  2nd[0]
+          +-------+
+          | Alloc |  2nd[1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  2nd[2nd.size() - 1]
+          +-------+
+          |       |
+          |       |
+          |       |
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount]
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount + 1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  1st[1st.size() - 1]
+          +-------+
+          |       |
+GetSize() +-------+
+
+if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK):
+
+        0 +-------+
+          |       |
+          |       |
+          |       |
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount]
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount + 1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  1st[1st.size() - 1]
+          +-------+
+          |       |
+          |       |
+          |       |
+          +-------+
+          | Alloc |  2nd[2nd.size() - 1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  2nd[1]
+          +-------+
+          | Alloc |  2nd[0]
+GetSize() +-------+
+
+*/
+class VmaBlockMetadata_Linear : public VmaBlockMetadata
+{
+    VMA_CLASS_NO_COPY(VmaBlockMetadata_Linear)
+public:
+    VmaBlockMetadata_Linear(VmaAllocator hAllocator);
+    virtual ~VmaBlockMetadata_Linear();
+    virtual void Init(VkDeviceSize size);
+
+    virtual bool Validate() const;
+    virtual size_t GetAllocationCount() const;
+    virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; }
+    virtual VkDeviceSize GetUnusedRangeSizeMax() const;
+    virtual bool IsEmpty() const { return GetAllocationCount() == 0; }
+
+    virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
+    virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
+
+#if VMA_STATS_STRING_ENABLED
+    virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
+#endif
+
+    virtual bool CreateAllocationRequest(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        bool upperAddress,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual bool MakeRequestedAllocationsLost(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+
+    virtual VkResult CheckCorruption(const void* pBlockData);
+
+    virtual void Alloc(
+        const VmaAllocationRequest& request,
+        VmaSuballocationType type,
+        VkDeviceSize allocSize,
+        bool upperAddress,
+        VmaAllocation hAllocation);
+
+    virtual void Free(const VmaAllocation allocation);
+    virtual void FreeAtOffset(VkDeviceSize offset);
+
+private:
+    /*
+    There are two suballocation vectors, used in ping-pong way.
+    The one with index m_1stVectorIndex is called 1st.
+    The one with index (m_1stVectorIndex ^ 1) is called 2nd.
+    2nd can be non-empty only when 1st is not empty.
+    When 2nd is not empty, m_2ndVectorMode indicates its mode of operation.
+    */
+    typedef VmaVector< VmaSuballocation, VmaStlAllocator<VmaSuballocation> > SuballocationVectorType;
+
+    enum SECOND_VECTOR_MODE
+    {
+        SECOND_VECTOR_EMPTY,
+        /*
+        Suballocations in 2nd vector are created later than the ones in 1st, but they
+        all have smaller offset.
+        */
+        SECOND_VECTOR_RING_BUFFER,
+        /*
+        Suballocations in 2nd vector are upper side of double stack.
+        They all have offsets higher than those in 1st vector.
+        Top of this stack means smaller offsets, but higher indices in this vector.
+        */
+        SECOND_VECTOR_DOUBLE_STACK,
+    };
+
+    VkDeviceSize m_SumFreeSize;
+    SuballocationVectorType m_Suballocations0, m_Suballocations1;
+    uint32_t m_1stVectorIndex;
+    SECOND_VECTOR_MODE m_2ndVectorMode;
+
+    SuballocationVectorType& AccessSuballocations1st() { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; }
+    SuballocationVectorType& AccessSuballocations2nd() { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; }
+    const SuballocationVectorType& AccessSuballocations1st() const { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; }
+    const SuballocationVectorType& AccessSuballocations2nd() const { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; }
+    
+    // Number of items in 1st vector with hAllocation = null at the beginning.
+    size_t m_1stNullItemsBeginCount;
+    // Number of other items in 1st vector with hAllocation = null somewhere in the middle.
+    size_t m_1stNullItemsMiddleCount;
+    // Number of items in 2nd vector with hAllocation = null.
+    size_t m_2ndNullItemsCount;
+
+    bool ShouldCompact1st() const;
+    void CleanupAfterFree();
+};
+
+/*
+- GetSize() is the original size of allocated memory block.
+- m_UsableSize is this size aligned down to a power of two.
+  All allocations and calculations happen relative to m_UsableSize.
+- GetUnusableSize() is the difference between them.
+  It is repoted as separate, unused range, not available for allocations.
+
+Node at level 0 has size = m_UsableSize.
+Each next level contains nodes with size 2 times smaller than current level.
+m_LevelCount is the maximum number of levels to use in the current object.
+*/
+class VmaBlockMetadata_Buddy : public VmaBlockMetadata
+{
+    VMA_CLASS_NO_COPY(VmaBlockMetadata_Buddy)
+public:
+    VmaBlockMetadata_Buddy(VmaAllocator hAllocator);
+    virtual ~VmaBlockMetadata_Buddy();
+    virtual void Init(VkDeviceSize size);
+
+    virtual bool Validate() const;
+    virtual size_t GetAllocationCount() const { return m_AllocationCount; }
+    virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize + GetUnusableSize(); }
+    virtual VkDeviceSize GetUnusedRangeSizeMax() const;
+    virtual bool IsEmpty() const { return m_Root->type == Node::TYPE_FREE; }
+
+    virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
+    virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
+
+#if VMA_STATS_STRING_ENABLED
+    virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
+#endif
+
+    virtual bool CreateAllocationRequest(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        bool upperAddress,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual bool MakeRequestedAllocationsLost(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+
+    virtual VkResult CheckCorruption(const void* /*pBlockData*/) { return VK_ERROR_FEATURE_NOT_PRESENT; }
+
+    virtual void Alloc(
+        const VmaAllocationRequest& request,
+        VmaSuballocationType type,
+        VkDeviceSize allocSize,
+        bool upperAddress,
+        VmaAllocation hAllocation);
+
+    virtual void Free(const VmaAllocation allocation) { FreeAtOffset(allocation, allocation->GetOffset()); }
+    virtual void FreeAtOffset(VkDeviceSize offset) { FreeAtOffset(VMA_NULL, offset); }
+
+private:
+    static const VkDeviceSize MIN_NODE_SIZE = 32;
+    static const size_t MAX_LEVELS = 30;
+
+    struct ValidationContext
+    {
+        size_t calculatedAllocationCount;
+        size_t calculatedFreeCount;
+        VkDeviceSize calculatedSumFreeSize;
+
+        ValidationContext() :
+            calculatedAllocationCount(0),
+            calculatedFreeCount(0),
+            calculatedSumFreeSize(0) { }
+    };
+
+    struct Node
+    {
+        VkDeviceSize offset;
+        enum TYPE
+        {
+            TYPE_FREE,
+            TYPE_ALLOCATION,
+            TYPE_SPLIT,
+            TYPE_COUNT
+        } type;
+        Node* parent;
+        Node* buddy;
+
+        union
+        {
+            struct
+            {
+                Node* prev;
+                Node* next;
+            } free;
+            struct
+            {
+                VmaAllocation alloc;
+            } allocation;
+            struct
+            {
+                Node* leftChild;
+            } split;
+        };
+    };
+
+    // Size of the memory block aligned down to a power of two.
+    VkDeviceSize m_UsableSize;
+    uint32_t m_LevelCount;
+
+    Node* m_Root;
+    struct {
+        Node* front;
+        Node* back;
+    } m_FreeList[MAX_LEVELS];
+    // Number of nodes in the tree with type == TYPE_ALLOCATION.
+    size_t m_AllocationCount;
+    // Number of nodes in the tree with type == TYPE_FREE.
+    size_t m_FreeCount;
+    // This includes space wasted due to internal fragmentation. Doesn't include unusable size.
+    VkDeviceSize m_SumFreeSize;
+
+    VkDeviceSize GetUnusableSize() const { return GetSize() - m_UsableSize; }
+    void DeleteNode(Node* node);
+    bool ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const;
+    uint32_t AllocSizeToLevel(VkDeviceSize allocSize) const;
+    inline VkDeviceSize LevelToNodeSize(uint32_t level) const { return m_UsableSize >> level; }
+    // Alloc passed just for validation. Can be null.
+    void FreeAtOffset(VmaAllocation alloc, VkDeviceSize offset);
+    void CalcAllocationStatInfoNode(VmaStatInfo& outInfo, const Node* node, VkDeviceSize levelNodeSize) const;
+    // Adds node to the front of FreeList at given level.
+    // node->type must be FREE.
+    // node->free.prev, next can be undefined.
+    void AddToFreeListFront(uint32_t level, Node* node);
+    // Removes node from FreeList at given level.
+    // node->type must be FREE.
+    // node->free.prev, next stay untouched.
+    void RemoveFromFreeList(uint32_t level, Node* node);
+
+#if VMA_STATS_STRING_ENABLED
+    void PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const;
+#endif
+};
+
+/*
+Represents a single block of device memory (`VkDeviceMemory`) with all the
+data about its regions (aka suballocations, #VmaAllocation), assigned and free.
+
+Thread-safety: This class must be externally synchronized.
+*/
+class VmaDeviceMemoryBlock
+{
+    VMA_CLASS_NO_COPY(VmaDeviceMemoryBlock)
+public:
+    VmaBlockMetadata* m_pMetadata;
+
+    VmaDeviceMemoryBlock(VmaAllocator hAllocator);
+
+    ~VmaDeviceMemoryBlock()
+    {
+        VMA_ASSERT(m_MapCount == 0 && "VkDeviceMemory block is being destroyed while it is still mapped.");
+        VMA_ASSERT(m_hMemory == VK_NULL_HANDLE);
+    }
+
+    // Always call after construction.
+    void Init(
+        VmaAllocator hAllocator,
+        uint32_t newMemoryTypeIndex,
+        VkDeviceMemory newMemory,
+        VkDeviceSize newSize,
+        uint32_t id,
+        uint32_t algorithm);
+    // Always call before destruction.
+    void Destroy(VmaAllocator allocator);
+    
+    VkDeviceMemory GetDeviceMemory() const { return m_hMemory; }
+    uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }
+    uint32_t GetId() const { return m_Id; }
+    void* GetMappedData() const { return m_pMappedData; }
+
+    // Validates all data structures inside this object. If not valid, returns false.
+    bool Validate() const;
+
+    VkResult CheckCorruption(VmaAllocator hAllocator);
+
+    // ppData can be null.
+    VkResult Map(VmaAllocator hAllocator, uint32_t count, void** ppData);
+    void Unmap(VmaAllocator hAllocator, uint32_t count);
+
+    VkResult WriteMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);
+    VkResult ValidateMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);
+
+    VkResult BindBufferMemory(
+        const VmaAllocator hAllocator,
+        const VmaAllocation hAllocation,
+        VkBuffer hBuffer);
+    VkResult BindImageMemory(
+        const VmaAllocator hAllocator,
+        const VmaAllocation hAllocation,
+        VkImage hImage);
+
+private:
+    uint32_t m_MemoryTypeIndex;
+    uint32_t m_Id;
+    VkDeviceMemory m_hMemory;
+
+    /*
+    Protects access to m_hMemory so it's not used by multiple threads simultaneously, e.g. vkMapMemory, vkBindBufferMemory.
+    Also protects m_MapCount, m_pMappedData.
+    Allocations, deallocations, any change in m_pMetadata is protected by parent's VmaBlockVector::m_Mutex.
+    */
+    VMA_MUTEX m_Mutex;
+    uint32_t m_MapCount;
+    void* m_pMappedData;
+};
+
+struct VmaPointerLess
+{
+    bool operator()(const void* lhs, const void* rhs) const
+    {
+        return lhs < rhs;
+    }
+};
+
+struct VmaDefragmentationMove
+{
+    size_t srcBlockIndex;
+    size_t dstBlockIndex;
+    VkDeviceSize srcOffset;
+    VkDeviceSize dstOffset;
+    VkDeviceSize size;
+};
+
+class VmaDefragmentationAlgorithm;
+
+/*
+Sequence of VmaDeviceMemoryBlock. Represents memory blocks allocated for a specific
+Vulkan memory type.
+
+Synchronized internally with a mutex.
+*/
+struct VmaBlockVector
+{
+    VMA_CLASS_NO_COPY(VmaBlockVector)
+public:
+    VmaBlockVector(
+        VmaAllocator hAllocator,
+        uint32_t memoryTypeIndex,
+        VkDeviceSize preferredBlockSize,
+        size_t minBlockCount,
+        size_t maxBlockCount,
+        VkDeviceSize bufferImageGranularity,
+        uint32_t frameInUseCount,
+        bool isCustomPool,
+        bool explicitBlockSize,
+        uint32_t algorithm);
+    ~VmaBlockVector();
+
+    VkResult CreateMinBlocks();
+
+    uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }
+    VkDeviceSize GetPreferredBlockSize() const { return m_PreferredBlockSize; }
+    VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; }
+    uint32_t GetFrameInUseCount() const { return m_FrameInUseCount; }
+    uint32_t GetAlgorithm() const { return m_Algorithm; }
+
+    void GetPoolStats(VmaPoolStats* pStats);
+
+    bool IsEmpty() const { return m_Blocks.empty(); }
+    bool IsCorruptionDetectionEnabled() const;
+
+    VkResult Allocate(
+        VmaPool hCurrentPool,
+        uint32_t currentFrameIndex,
+        VkDeviceSize size,
+        VkDeviceSize alignment,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaSuballocationType suballocType,
+        size_t allocationCount,
+        VmaAllocation* pAllocations);
+
+    void Free(
+        VmaAllocation hAllocation);
+
+    // Adds statistics of this BlockVector to pStats.
+    void AddStats(VmaStats* pStats);
+
+#if VMA_STATS_STRING_ENABLED
+    void PrintDetailedMap(class VmaJsonWriter& json);
+#endif
+
+    void MakePoolAllocationsLost(
+        uint32_t currentFrameIndex,
+        size_t* pLostAllocationCount);
+    VkResult CheckCorruption();
+
+    // Saves results in pCtx->res.
+    void Defragment(
+        class VmaBlockVectorDefragmentationContext* pCtx,
+        VmaDefragmentationStats* pStats,
+        VkDeviceSize& maxCpuBytesToMove, uint32_t& maxCpuAllocationsToMove,
+        VkDeviceSize& maxGpuBytesToMove, uint32_t& maxGpuAllocationsToMove,
+        VkCommandBuffer commandBuffer);
+    void DefragmentationEnd(
+        class VmaBlockVectorDefragmentationContext* pCtx,
+        VmaDefragmentationStats* pStats);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // To be used only while the m_Mutex is locked. Used during defragmentation.
+
+    size_t GetBlockCount() const { return m_Blocks.size(); }
+    VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; }
+    size_t CalcAllocationCount() const;
+    bool IsBufferImageGranularityConflictPossible() const;
+
+private:
+    friend class VmaDefragmentationAlgorithm_Generic;
+
+    const VmaAllocator m_hAllocator;
+    const uint32_t m_MemoryTypeIndex;
+    const VkDeviceSize m_PreferredBlockSize;
+    const size_t m_MinBlockCount;
+    const size_t m_MaxBlockCount;
+    const VkDeviceSize m_BufferImageGranularity;
+    const uint32_t m_FrameInUseCount;
+    const bool m_IsCustomPool;
+    const bool m_ExplicitBlockSize;
+    const uint32_t m_Algorithm;
+    /* There can be at most one allocation that is completely empty - a
+    hysteresis to avoid pessimistic case of alternating creation and destruction
+    of a VkDeviceMemory. */
+    bool m_HasEmptyBlock;
+    VMA_RW_MUTEX m_Mutex;
+    // Incrementally sorted by sumFreeSize, ascending.
+    VmaVector< VmaDeviceMemoryBlock*, VmaStlAllocator<VmaDeviceMemoryBlock*> > m_Blocks;
+    uint32_t m_NextBlockId;
+
+    VkDeviceSize CalcMaxBlockSize() const;
+
+    // Finds and removes given block from vector.
+    void Remove(VmaDeviceMemoryBlock* pBlock);
+
+    // Performs single step in sorting m_Blocks. They may not be fully sorted
+    // after this call.
+    void IncrementallySortBlocks();
+
+    VkResult AllocatePage(
+        VmaPool hCurrentPool,
+        uint32_t currentFrameIndex,
+        VkDeviceSize size,
+        VkDeviceSize alignment,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaSuballocationType suballocType,
+        VmaAllocation* pAllocation);
+
+    // To be used only without CAN_MAKE_OTHER_LOST flag.
+    VkResult AllocateFromBlock(
+        VmaDeviceMemoryBlock* pBlock,
+        VmaPool hCurrentPool,
+        uint32_t currentFrameIndex,
+        VkDeviceSize size,
+        VkDeviceSize alignment,
+        VmaAllocationCreateFlags allocFlags,
+        void* pUserData,
+        VmaSuballocationType suballocType,
+        uint32_t strategy,
+        VmaAllocation* pAllocation);
+
+    VkResult CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex);
+
+    // Saves result to pCtx->res.
+    void ApplyDefragmentationMovesCpu(
+        class VmaBlockVectorDefragmentationContext* pDefragCtx,
+        const VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves);
+    // Saves result to pCtx->res.
+    void ApplyDefragmentationMovesGpu(
+        class VmaBlockVectorDefragmentationContext* pDefragCtx,
+        const VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkCommandBuffer commandBuffer);
+
+    /*
+    Used during defragmentation. pDefragmentationStats is optional. It's in/out
+    - updated with new data.
+    */
+    void FreeEmptyBlocks(VmaDefragmentationStats* pDefragmentationStats);
+};
+
+struct VmaPool_T
+{
+    VMA_CLASS_NO_COPY(VmaPool_T)
+public:
+    VmaBlockVector m_BlockVector;
+
+    VmaPool_T(
+        VmaAllocator hAllocator,
+        const VmaPoolCreateInfo& createInfo,
+        VkDeviceSize preferredBlockSize);
+    ~VmaPool_T();
+
+    uint32_t GetId() const { return m_Id; }
+    void SetId(uint32_t id) { VMA_ASSERT(m_Id == 0); m_Id = id; }
+
+#if VMA_STATS_STRING_ENABLED
+    //void PrintDetailedMap(class VmaStringBuilder& sb);
+#endif
+
+private:
+    uint32_t m_Id;
+};
+
+/*
+Performs defragmentation:
+
+- Updates `pBlockVector->m_pMetadata`.
+- Updates allocations by calling ChangeBlockAllocation() or ChangeOffset().
+- Does not move actual data, only returns requested moves as `moves`.
+*/
+class VmaDefragmentationAlgorithm
+{
+    VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm)
+public:
+    VmaDefragmentationAlgorithm(
+        VmaAllocator hAllocator,
+        VmaBlockVector* pBlockVector,
+        uint32_t currentFrameIndex) :
+        m_hAllocator(hAllocator),
+        m_pBlockVector(pBlockVector),
+        m_CurrentFrameIndex(currentFrameIndex)
+    {
+    }
+    virtual ~VmaDefragmentationAlgorithm()
+    {
+    }
+
+    virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) = 0;
+    virtual void AddAll() = 0;
+
+    virtual VkResult Defragment(
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkDeviceSize maxBytesToMove,
+        uint32_t maxAllocationsToMove) = 0;
+
+    virtual VkDeviceSize GetBytesMoved() const = 0;
+    virtual uint32_t GetAllocationsMoved() const = 0;
+
+protected:
+    VmaAllocator const m_hAllocator;
+    VmaBlockVector* const m_pBlockVector;
+    const uint32_t m_CurrentFrameIndex;
+
+    struct AllocationInfo
+    {
+        VmaAllocation m_hAllocation;
+        VkBool32* m_pChanged;
+
+        AllocationInfo() :
+            m_hAllocation(VK_NULL_HANDLE),
+            m_pChanged(VMA_NULL)
+        {
+        }
+        AllocationInfo(VmaAllocation hAlloc, VkBool32* pChanged) :
+            m_hAllocation(hAlloc),
+            m_pChanged(pChanged)
+        {
+        }
+    };
+};
+
+class VmaDefragmentationAlgorithm_Generic : public VmaDefragmentationAlgorithm
+{
+    VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm_Generic)
+public:
+    VmaDefragmentationAlgorithm_Generic(
+        VmaAllocator hAllocator,
+        VmaBlockVector* pBlockVector,
+        uint32_t currentFrameIndex,
+        bool overlappingMoveSupported);
+    virtual ~VmaDefragmentationAlgorithm_Generic();
+
+    virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged);
+    virtual void AddAll() { m_AllAllocations = true; }
+
+    virtual VkResult Defragment(
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkDeviceSize maxBytesToMove,
+        uint32_t maxAllocationsToMove);
+
+    virtual VkDeviceSize GetBytesMoved() const { return m_BytesMoved; }
+    virtual uint32_t GetAllocationsMoved() const { return m_AllocationsMoved; }
+
+private:
+    uint32_t m_AllocationCount;
+    bool m_AllAllocations;
+
+    VkDeviceSize m_BytesMoved;
+    uint32_t m_AllocationsMoved;
+
+    struct AllocationInfoSizeGreater
+    {
+        bool operator()(const AllocationInfo& lhs, const AllocationInfo& rhs) const
+        {
+            return lhs.m_hAllocation->GetSize() > rhs.m_hAllocation->GetSize();
+        }
+    };
+
+    struct AllocationInfoOffsetGreater
+    {
+        bool operator()(const AllocationInfo& lhs, const AllocationInfo& rhs) const
+        {
+            return lhs.m_hAllocation->GetOffset() > rhs.m_hAllocation->GetOffset();
+        }
+    };
+
+    struct BlockInfo
+    {
+        size_t m_OriginalBlockIndex;
+        VmaDeviceMemoryBlock* m_pBlock;
+        bool m_HasNonMovableAllocations;
+        VmaVector< AllocationInfo, VmaStlAllocator<AllocationInfo> > m_Allocations;
+
+        BlockInfo(const VkAllocationCallbacks* pAllocationCallbacks) :
+            m_OriginalBlockIndex(SIZE_MAX),
+            m_pBlock(VMA_NULL),
+            m_HasNonMovableAllocations(true),
+            m_Allocations(pAllocationCallbacks)
+        {
+        }
+
+        void CalcHasNonMovableAllocations()
+        {
+            const size_t blockAllocCount = m_pBlock->m_pMetadata->GetAllocationCount();
+            const size_t defragmentAllocCount = m_Allocations.size();
+            m_HasNonMovableAllocations = blockAllocCount != defragmentAllocCount;
+        }
+
+        void SortAllocationsBySizeDescending()
+        {
+            VMA_SORT(m_Allocations.begin(), m_Allocations.end(), AllocationInfoSizeGreater());
+        }
+
+        void SortAllocationsByOffsetDescending()
+        {
+            VMA_SORT(m_Allocations.begin(), m_Allocations.end(), AllocationInfoOffsetGreater());
+        }
+    };
+
+    struct BlockPointerLess
+    {
+        bool operator()(const BlockInfo* pLhsBlockInfo, const VmaDeviceMemoryBlock* pRhsBlock) const
+        {
+            return pLhsBlockInfo->m_pBlock < pRhsBlock;
+        }
+        bool operator()(const BlockInfo* pLhsBlockInfo, const BlockInfo* pRhsBlockInfo) const
+        {
+            return pLhsBlockInfo->m_pBlock < pRhsBlockInfo->m_pBlock;
+        }
+    };
+
+    // 1. Blocks with some non-movable allocations go first.
+    // 2. Blocks with smaller sumFreeSize go first.
+    struct BlockInfoCompareMoveDestination
+    {
+        bool operator()(const BlockInfo* pLhsBlockInfo, const BlockInfo* pRhsBlockInfo) const
+        {
+            if(pLhsBlockInfo->m_HasNonMovableAllocations && !pRhsBlockInfo->m_HasNonMovableAllocations)
+            {
+                return true;
+            }
+            if(!pLhsBlockInfo->m_HasNonMovableAllocations && pRhsBlockInfo->m_HasNonMovableAllocations)
+            {
+                return false;
+            }
+            if(pLhsBlockInfo->m_pBlock->m_pMetadata->GetSumFreeSize() < pRhsBlockInfo->m_pBlock->m_pMetadata->GetSumFreeSize())
+            {
+                return true;
+            }
+            return false;
+        }
+    };
+
+    typedef VmaVector< BlockInfo*, VmaStlAllocator<BlockInfo*> > BlockInfoVector;
+    BlockInfoVector m_Blocks;
+
+    VkResult DefragmentRound(
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkDeviceSize maxBytesToMove,
+        uint32_t maxAllocationsToMove);
+
+    size_t CalcBlocksWithNonMovableCount() const;
+
+    static bool MoveMakesSense(
+        size_t dstBlockIndex, VkDeviceSize dstOffset,
+        size_t srcBlockIndex, VkDeviceSize srcOffset);
+};
+
+class VmaDefragmentationAlgorithm_Fast : public VmaDefragmentationAlgorithm
+{
+    VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm_Fast)
+public:
+    VmaDefragmentationAlgorithm_Fast(
+        VmaAllocator hAllocator,
+        VmaBlockVector* pBlockVector,
+        uint32_t currentFrameIndex,
+        bool overlappingMoveSupported);
+    virtual ~VmaDefragmentationAlgorithm_Fast();
+
+    virtual void AddAllocation(VmaAllocation /*hAlloc*/, VkBool32* /*pChanged*/) { ++m_AllocationCount; }
+    virtual void AddAll() { m_AllAllocations = true; }
+
+    virtual VkResult Defragment(
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkDeviceSize maxBytesToMove,
+        uint32_t maxAllocationsToMove);
+
+    virtual VkDeviceSize GetBytesMoved() const { return m_BytesMoved; }
+    virtual uint32_t GetAllocationsMoved() const { return m_AllocationsMoved; }
+
+private:
+    struct BlockInfo
+    {
+        size_t origBlockIndex;
+    };
+
+    class FreeSpaceDatabase
+    {
+    public:
+        FreeSpaceDatabase()
+        {
+            FreeSpace s = {};
+            s.blockInfoIndex = SIZE_MAX;
+            for(size_t i = 0; i < MAX_COUNT; ++i)
+            {
+                m_FreeSpaces[i] = s;
+            }
+        }
+
+        void Register(size_t blockInfoIndex, VkDeviceSize offset, VkDeviceSize size)
+        {
+            if(size < VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+            {
+                return;
+            }
+
+            // Find first invalid or the smallest structure.
+            size_t bestIndex = SIZE_MAX;
+            for(size_t i = 0; i < MAX_COUNT; ++i)
+            {
+                // Empty structure.
+                if(m_FreeSpaces[i].blockInfoIndex == SIZE_MAX)
+                {
+                    bestIndex = i;
+                    break;
+                }
+                if(m_FreeSpaces[i].size < size &&
+                    (bestIndex == SIZE_MAX || m_FreeSpaces[bestIndex].size > m_FreeSpaces[i].size))
+                {
+                    bestIndex = i;
+                }
+            }
+
+            if(bestIndex != SIZE_MAX)
+            {
+                m_FreeSpaces[bestIndex].blockInfoIndex = blockInfoIndex;
+                m_FreeSpaces[bestIndex].offset = offset;
+                m_FreeSpaces[bestIndex].size = size;
+            }
+        }
+
+        bool Fetch(VkDeviceSize alignment, VkDeviceSize size,
+            size_t& outBlockInfoIndex, VkDeviceSize& outDstOffset)
+        {
+            size_t bestIndex = SIZE_MAX;
+            VkDeviceSize bestFreeSpaceAfter = 0;
+            for(size_t i = 0; i < MAX_COUNT; ++i)
+            {
+                // Structure is valid.
+                if(m_FreeSpaces[i].blockInfoIndex != SIZE_MAX)
+                {
+                    const VkDeviceSize dstOffset = VmaAlignUp(m_FreeSpaces[i].offset, alignment);
+                    // Allocation fits into this structure.
+                    if(dstOffset + size <= m_FreeSpaces[i].offset + m_FreeSpaces[i].size)
+                    {
+                        const VkDeviceSize freeSpaceAfter = (m_FreeSpaces[i].offset + m_FreeSpaces[i].size) -
+                            (dstOffset + size);
+                        if(bestIndex == SIZE_MAX || freeSpaceAfter > bestFreeSpaceAfter)
+                        {
+                            bestIndex = i;
+                            bestFreeSpaceAfter = freeSpaceAfter;
+                        }
+                    }
+                }
+            }
+            
+            if(bestIndex != SIZE_MAX)
+            {
+                outBlockInfoIndex = m_FreeSpaces[bestIndex].blockInfoIndex;
+                outDstOffset = VmaAlignUp(m_FreeSpaces[bestIndex].offset, alignment);
+
+                if(bestFreeSpaceAfter >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+                {
+                    // Leave this structure for remaining empty space.
+                    const VkDeviceSize alignmentPlusSize = (outDstOffset - m_FreeSpaces[bestIndex].offset) + size;
+                    m_FreeSpaces[bestIndex].offset += alignmentPlusSize;
+                    m_FreeSpaces[bestIndex].size -= alignmentPlusSize;
+                }
+                else
+                {
+                    // This structure becomes invalid.
+                    m_FreeSpaces[bestIndex].blockInfoIndex = SIZE_MAX;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+    private:
+        static const size_t MAX_COUNT = 4;
+
+        struct FreeSpace
+        {
+            size_t blockInfoIndex; // SIZE_MAX means this structure is invalid.
+            VkDeviceSize offset;
+            VkDeviceSize size;
+        } m_FreeSpaces[MAX_COUNT];
+    };
+
+    const bool m_OverlappingMoveSupported;
+
+    uint32_t m_AllocationCount;
+    bool m_AllAllocations;
+
+    VkDeviceSize m_BytesMoved;
+    uint32_t m_AllocationsMoved;
+
+    VmaVector< BlockInfo, VmaStlAllocator<BlockInfo> > m_BlockInfos;
+
+    void PreprocessMetadata();
+    void PostprocessMetadata();
+    void InsertSuballoc(VmaBlockMetadata_Generic* pMetadata, const VmaSuballocation& suballoc);
+};
+
+struct VmaBlockDefragmentationContext
+{
+    enum BLOCK_FLAG
+    {
+        BLOCK_FLAG_USED = 0x00000001,
+    };
+    uint32_t flags;
+    VkBuffer hBuffer;
+
+    VmaBlockDefragmentationContext() :
+        flags(0),
+        hBuffer(VK_NULL_HANDLE)
+    {
+    }
+};
+
+class VmaBlockVectorDefragmentationContext
+{
+    VMA_CLASS_NO_COPY(VmaBlockVectorDefragmentationContext)
+public:
+    VkResult res;
+    bool mutexLocked;
+    VmaVector< VmaBlockDefragmentationContext, VmaStlAllocator<VmaBlockDefragmentationContext> > blockContexts;
+
+    VmaBlockVectorDefragmentationContext(
+        VmaAllocator hAllocator,
+        VmaPool hCustomPool, // Optional.
+        VmaBlockVector* pBlockVector,
+        uint32_t currFrameIndex,
+        uint32_t flags);
+    ~VmaBlockVectorDefragmentationContext();
+
+    VmaPool GetCustomPool() const { return m_hCustomPool; }
+    VmaBlockVector* GetBlockVector() const { return m_pBlockVector; }
+    VmaDefragmentationAlgorithm* GetAlgorithm() const { return m_pAlgorithm; }
+
+    void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged);
+    void AddAll() { m_AllAllocations = true; }
+
+    void Begin(bool overlappingMoveSupported);
+
+private:
+    const VmaAllocator m_hAllocator;
+    // Null if not from custom pool.
+    const VmaPool m_hCustomPool;
+    // Redundant, for convenience not to fetch from m_hCustomPool->m_BlockVector or m_hAllocator->m_pBlockVectors.
+    VmaBlockVector* const m_pBlockVector;
+    const uint32_t m_CurrFrameIndex;
+    /*const uint32_t m_AlgorithmFlags;*/
+    // Owner of this object.
+    VmaDefragmentationAlgorithm* m_pAlgorithm;
+
+    struct AllocInfo
+    {
+        VmaAllocation hAlloc;
+        VkBool32* pChanged;
+    };
+    // Used between constructor and Begin.
+    VmaVector< AllocInfo, VmaStlAllocator<AllocInfo> > m_Allocations;
+    bool m_AllAllocations;
+};
+
+struct VmaDefragmentationContext_T
+{
+private:
+    VMA_CLASS_NO_COPY(VmaDefragmentationContext_T)
+public:
+    VmaDefragmentationContext_T(
+        VmaAllocator hAllocator,
+        uint32_t currFrameIndex,
+        uint32_t flags,
+        VmaDefragmentationStats* pStats);
+    ~VmaDefragmentationContext_T();
+
+    void AddPools(uint32_t poolCount, VmaPool* pPools);
+    void AddAllocations(
+        uint32_t allocationCount,
+        VmaAllocation* pAllocations,
+        VkBool32* pAllocationsChanged);
+
+    /*
+    Returns:
+    - `VK_SUCCESS` if succeeded and object can be destroyed immediately.
+    - `VK_NOT_READY` if succeeded but the object must remain alive until vmaDefragmentationEnd().
+    - Negative value if error occured and object can be destroyed immediately.
+    */
+    VkResult Defragment(
+        VkDeviceSize maxCpuBytesToMove, uint32_t maxCpuAllocationsToMove,
+        VkDeviceSize maxGpuBytesToMove, uint32_t maxGpuAllocationsToMove,
+        VkCommandBuffer commandBuffer, VmaDefragmentationStats* pStats);
+
+private:
+    const VmaAllocator m_hAllocator;
+    const uint32_t m_CurrFrameIndex;
+    const uint32_t m_Flags;
+    VmaDefragmentationStats* const m_pStats;
+    // Owner of these objects.
+    VmaBlockVectorDefragmentationContext* m_DefaultPoolContexts[VK_MAX_MEMORY_TYPES];
+    // Owner of these objects.
+    VmaVector< VmaBlockVectorDefragmentationContext*, VmaStlAllocator<VmaBlockVectorDefragmentationContext*> > m_CustomPoolContexts;
+};
+
+#if VMA_RECORDING_ENABLED
+
+class VmaRecorder
+{
+public:
+    VmaRecorder();
+    VkResult Init(const VmaRecordSettings& settings, bool useMutex);
+    void WriteConfiguration(
+        const VkPhysicalDeviceProperties& devProps,
+        const VkPhysicalDeviceMemoryProperties& memProps,
+        bool dedicatedAllocationExtensionEnabled);
+    ~VmaRecorder();
+
+    void RecordCreateAllocator(uint32_t frameIndex);
+    void RecordDestroyAllocator(uint32_t frameIndex);
+    void RecordCreatePool(uint32_t frameIndex,
+        const VmaPoolCreateInfo& createInfo,
+        VmaPool pool);
+    void RecordDestroyPool(uint32_t frameIndex, VmaPool pool);
+    void RecordAllocateMemory(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaAllocation allocation);
+    void RecordAllocateMemoryPages(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        const VmaAllocationCreateInfo& createInfo,
+        uint64_t allocationCount,
+        const VmaAllocation* pAllocations);
+    void RecordAllocateMemoryForBuffer(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        bool requiresDedicatedAllocation,
+        bool prefersDedicatedAllocation,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaAllocation allocation);
+    void RecordAllocateMemoryForImage(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        bool requiresDedicatedAllocation,
+        bool prefersDedicatedAllocation,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaAllocation allocation);
+    void RecordFreeMemory(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordFreeMemoryPages(uint32_t frameIndex,
+        uint64_t allocationCount,
+        const VmaAllocation* pAllocations);
+    void RecordResizeAllocation(
+        uint32_t frameIndex,
+        VmaAllocation allocation,
+        VkDeviceSize newSize);
+    void RecordSetAllocationUserData(uint32_t frameIndex,
+        VmaAllocation allocation,
+        const void* pUserData);
+    void RecordCreateLostAllocation(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordMapMemory(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordUnmapMemory(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordFlushAllocation(uint32_t frameIndex,
+        VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size);
+    void RecordInvalidateAllocation(uint32_t frameIndex,
+        VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size);
+    void RecordCreateBuffer(uint32_t frameIndex,
+        const VkBufferCreateInfo& bufCreateInfo,
+        const VmaAllocationCreateInfo& allocCreateInfo,
+        VmaAllocation allocation);
+    void RecordCreateImage(uint32_t frameIndex,
+        const VkImageCreateInfo& imageCreateInfo,
+        const VmaAllocationCreateInfo& allocCreateInfo,
+        VmaAllocation allocation);
+    void RecordDestroyBuffer(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordDestroyImage(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordTouchAllocation(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordGetAllocationInfo(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordMakePoolAllocationsLost(uint32_t frameIndex,
+        VmaPool pool);
+    void RecordDefragmentationBegin(uint32_t frameIndex,
+        const VmaDefragmentationInfo2& info,
+        VmaDefragmentationContext ctx);
+    void RecordDefragmentationEnd(uint32_t frameIndex,
+        VmaDefragmentationContext ctx);
+
+private:
+    struct CallParams
+    {
+        uint32_t threadId;
+        double time;
+    };
+
+    class UserDataString
+    {
+    public:
+        UserDataString(VmaAllocationCreateFlags allocFlags, const void* pUserData);
+        const char* GetString() const { return m_Str; }
+
+    private:
+        char m_PtrStr[17];
+        const char* m_Str;
+    };
+
+    bool m_UseMutex;
+    VmaRecordFlags m_Flags;
+    FILE* m_File;
+    VMA_MUTEX m_FileMutex;
+    int64_t m_Freq;
+    int64_t m_StartCounter;
+
+    void GetBasicParams(CallParams& outParams);
+
+    // T must be a pointer type, e.g. VmaAllocation, VmaPool.
+    template<typename T>
+    void PrintPointerList(uint64_t count, const T* pItems)
+    {
+        if(count)
+        {
+            fprintf(m_File, "%p", pItems[0]);
+            for(uint64_t i = 1; i < count; ++i)
+            {
+                fprintf(m_File, " %p", pItems[i]);
+            }
+        }
+    }
+
+    void PrintPointerList(uint64_t count, const VmaAllocation* pItems);
+    void Flush();
+};
+
+#endif // #if VMA_RECORDING_ENABLED
+
+// Main allocator object.
+struct VmaAllocator_T
+{
+    VMA_CLASS_NO_COPY(VmaAllocator_T)
+public:
+    bool m_UseMutex;
+    bool m_UseKhrDedicatedAllocation;
+    VkDevice m_hDevice;
+    bool m_AllocationCallbacksSpecified;
+    VkAllocationCallbacks m_AllocationCallbacks;
+    VmaDeviceMemoryCallbacks m_DeviceMemoryCallbacks;
+    
+    // Number of bytes free out of limit, or VK_WHOLE_SIZE if no limit for that heap.
+    VkDeviceSize m_HeapSizeLimit[VK_MAX_MEMORY_HEAPS];
+    VMA_MUTEX m_HeapSizeLimitMutex;
+
+    VkPhysicalDeviceProperties m_PhysicalDeviceProperties;
+    VkPhysicalDeviceMemoryProperties m_MemProps;
+
+    // Default pools.
+    VmaBlockVector* m_pBlockVectors[VK_MAX_MEMORY_TYPES];
+
+    // Each vector is sorted by memory (handle value).
+    typedef VmaVector< VmaAllocation, VmaStlAllocator<VmaAllocation> > AllocationVectorType;
+    AllocationVectorType* m_pDedicatedAllocations[VK_MAX_MEMORY_TYPES];
+    VMA_RW_MUTEX m_DedicatedAllocationsMutex[VK_MAX_MEMORY_TYPES];
+
+    VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo);
+    VkResult Init(const VmaAllocatorCreateInfo* pCreateInfo);
+    ~VmaAllocator_T();
+
+    const VkAllocationCallbacks* GetAllocationCallbacks() const
+    {
+        return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : 0;
+    }
+    const VmaVulkanFunctions& GetVulkanFunctions() const
+    {
+        return m_VulkanFunctions;
+    }
+
+    VkDeviceSize GetBufferImageGranularity() const
+    {
+        return VMA_MAX(
+            static_cast<VkDeviceSize>(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY),
+            m_PhysicalDeviceProperties.limits.bufferImageGranularity);
+    }
+
+    uint32_t GetMemoryHeapCount() const { return m_MemProps.memoryHeapCount; }
+    uint32_t GetMemoryTypeCount() const { return m_MemProps.memoryTypeCount; }
+
+    uint32_t MemoryTypeIndexToHeapIndex(uint32_t memTypeIndex) const
+    {
+        VMA_ASSERT(memTypeIndex < m_MemProps.memoryTypeCount);
+        return m_MemProps.memoryTypes[memTypeIndex].heapIndex;
+    }
+    // True when specific memory type is HOST_VISIBLE but not HOST_COHERENT.
+    bool IsMemoryTypeNonCoherent(uint32_t memTypeIndex) const
+    {
+        return (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) ==
+            VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+    }
+    // Minimum alignment for all allocations in specific memory type.
+    VkDeviceSize GetMemoryTypeMinAlignment(uint32_t memTypeIndex) const
+    {
+        return IsMemoryTypeNonCoherent(memTypeIndex) ?
+            VMA_MAX((VkDeviceSize)VMA_DEBUG_ALIGNMENT, m_PhysicalDeviceProperties.limits.nonCoherentAtomSize) :
+            (VkDeviceSize)VMA_DEBUG_ALIGNMENT;
+    }
+
+    bool IsIntegratedGpu() const
+    {
+        return m_PhysicalDeviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU;
+    }
+
+#if VMA_RECORDING_ENABLED
+    VmaRecorder* GetRecorder() const { return m_pRecorder; }
+#endif
+
+    void GetBufferMemoryRequirements(
+        VkBuffer hBuffer,
+        VkMemoryRequirements& memReq,
+        bool& requiresDedicatedAllocation,
+        bool& prefersDedicatedAllocation) const;
+    void GetImageMemoryRequirements(
+        VkImage hImage,
+        VkMemoryRequirements& memReq,
+        bool& requiresDedicatedAllocation,
+        bool& prefersDedicatedAllocation) const;
+
+    // Main allocation function.
+    VkResult AllocateMemory(
+        const VkMemoryRequirements& vkMemReq,
+        bool requiresDedicatedAllocation,
+        bool prefersDedicatedAllocation,
+        VkBuffer dedicatedBuffer,
+        VkImage dedicatedImage,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaSuballocationType suballocType,
+        size_t allocationCount,
+        VmaAllocation* pAllocations);
+
+    // Main deallocation function.
+    void FreeMemory(
+        size_t allocationCount,
+        const VmaAllocation* pAllocations);
+
+    VkResult ResizeAllocation(
+        const VmaAllocation alloc,
+        VkDeviceSize newSize);
+
+    void CalculateStats(VmaStats* pStats);
+
+#if VMA_STATS_STRING_ENABLED
+    void PrintDetailedMap(class VmaJsonWriter& json);
+#endif
+
+    VkResult DefragmentationBegin(
+        const VmaDefragmentationInfo2& info,
+        VmaDefragmentationStats* pStats,
+        VmaDefragmentationContext* pContext);
+    VkResult DefragmentationEnd(
+        VmaDefragmentationContext context);
+
+    void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo);
+    bool TouchAllocation(VmaAllocation hAllocation);
+
+    VkResult CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool);
+    void DestroyPool(VmaPool pool);
+    void GetPoolStats(VmaPool pool, VmaPoolStats* pPoolStats);
+
+    void SetCurrentFrameIndex(uint32_t frameIndex);
+    uint32_t GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); }
+
+    void MakePoolAllocationsLost(
+        VmaPool hPool,
+        size_t* pLostAllocationCount);
+    VkResult CheckPoolCorruption(VmaPool hPool);
+    VkResult CheckCorruption(uint32_t memoryTypeBits);
+
+    void CreateLostAllocation(VmaAllocation* pAllocation);
+
+    VkResult AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory);
+    void FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory);
+
+    VkResult Map(VmaAllocation hAllocation, void** ppData);
+    void Unmap(VmaAllocation hAllocation);
+
+    VkResult BindBufferMemory(VmaAllocation hAllocation, VkBuffer hBuffer);
+    VkResult BindImageMemory(VmaAllocation hAllocation, VkImage hImage);
+
+    void FlushOrInvalidateAllocation(
+        VmaAllocation hAllocation,
+        VkDeviceSize offset, VkDeviceSize size,
+        VMA_CACHE_OPERATION op);
+
+    void FillAllocation(const VmaAllocation hAllocation, uint8_t pattern);
+
+private:
+    VkDeviceSize m_PreferredLargeHeapBlockSize;
+
+    VkPhysicalDevice m_PhysicalDevice;
+    VMA_ATOMIC_UINT32 m_CurrentFrameIndex;
+    
+    VMA_RW_MUTEX m_PoolsMutex;
+    // Protected by m_PoolsMutex. Sorted by pointer value.
+    VmaVector<VmaPool, VmaStlAllocator<VmaPool> > m_Pools;
+    uint32_t m_NextPoolId;
+
+    VmaVulkanFunctions m_VulkanFunctions;
+
+#if VMA_RECORDING_ENABLED
+    VmaRecorder* m_pRecorder;
+#endif
+
+    void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions);
+
+    VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex);
+
+    VkResult AllocateMemoryOfType(
+        VkDeviceSize size,
+        VkDeviceSize alignment,
+        bool dedicatedAllocation,
+        VkBuffer dedicatedBuffer,
+        VkImage dedicatedImage,
+        const VmaAllocationCreateInfo& createInfo,
+        uint32_t memTypeIndex,
+        VmaSuballocationType suballocType,
+        size_t allocationCount,
+        VmaAllocation* pAllocations);
+
+    // Helper function only to be used inside AllocateDedicatedMemory.
+    VkResult AllocateDedicatedMemoryPage(
+        VkDeviceSize size,
+        VmaSuballocationType suballocType,
+        uint32_t memTypeIndex,
+        const VkMemoryAllocateInfo& allocInfo,
+        bool map,
+        bool isUserDataString,
+        void* pUserData,
+        VmaAllocation* pAllocation);
+
+    // Allocates and registers new VkDeviceMemory specifically for dedicated allocations.
+    VkResult AllocateDedicatedMemory(
+        VkDeviceSize size,
+        VmaSuballocationType suballocType,
+        uint32_t memTypeIndex,
+        bool map,
+        bool isUserDataString,
+        void* pUserData,
+        VkBuffer dedicatedBuffer,
+        VkImage dedicatedImage,
+        size_t allocationCount,
+        VmaAllocation* pAllocations);
+
+    // Tries to free pMemory as Dedicated Memory. Returns true if found and freed.
+    void FreeDedicatedMemory(VmaAllocation allocation);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Memory allocation #2 after VmaAllocator_T definition
+
+static void* VmaMalloc(VmaAllocator hAllocator, size_t size, size_t alignment)
+{
+    return VmaMalloc(&hAllocator->m_AllocationCallbacks, size, alignment);
+}
+
+static void VmaFree(VmaAllocator hAllocator, void* ptr)
+{
+    VmaFree(&hAllocator->m_AllocationCallbacks, ptr);
+}
+
+template<typename T>
+static T* VmaAllocate(VmaAllocator hAllocator)
+{
+    return (T*)VmaMalloc(hAllocator, sizeof(T), VMA_ALIGN_OF(T));
+}
+
+template<typename T>
+static T* VmaAllocateArray(VmaAllocator hAllocator, size_t count)
+{
+    return (T*)VmaMalloc(hAllocator, sizeof(T) * count, VMA_ALIGN_OF(T));
+}
+
+template<typename T>
+static void vma_delete(VmaAllocator hAllocator, T* ptr)
+{
+    if(ptr != VMA_NULL)
+    {
+        ptr->~T();
+        VmaFree(hAllocator, ptr);
+    }
+}
+
+template<typename T>
+static void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count)
+{
+    if(ptr != VMA_NULL)
+    {
+        for(size_t i = count; i--; )
+            ptr[i].~T();
+        VmaFree(hAllocator, ptr);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaStringBuilder
+
+#if VMA_STATS_STRING_ENABLED
+
+class VmaStringBuilder
+{
+public:
+    VmaStringBuilder(VmaAllocator alloc) : m_Data(VmaStlAllocator<char>(alloc->GetAllocationCallbacks())) { }
+    size_t GetLength() const { return m_Data.size(); }
+    const char* GetData() const { return m_Data.data(); }
+
+    void Add(char ch) { m_Data.push_back(ch); }
+    void Add(const char* pStr);
+    void AddNewLine() { Add('\n'); }
+    void AddNumber(uint32_t num);
+    void AddNumber(uint64_t num);
+    void AddPointer(const void* ptr);
+
+private:
+    VmaVector< char, VmaStlAllocator<char> > m_Data;
+};
+
+void VmaStringBuilder::Add(const char* pStr)
+{
+    const size_t strLen = strlen(pStr);
+    if(strLen > 0)
+    {
+        const size_t oldCount = m_Data.size();
+        m_Data.resize(oldCount + strLen);
+        memcpy(m_Data.data() + oldCount, pStr, strLen);
+    }
+}
+
+void VmaStringBuilder::AddNumber(uint32_t num)
+{
+    char buf[11];
+    VmaUint32ToStr(buf, sizeof(buf), num);
+    Add(buf);
+}
+
+void VmaStringBuilder::AddNumber(uint64_t num)
+{
+    char buf[21];
+    VmaUint64ToStr(buf, sizeof(buf), num);
+    Add(buf);
+}
+
+void VmaStringBuilder::AddPointer(const void* ptr)
+{
+    char buf[21];
+    VmaPtrToStr(buf, sizeof(buf), ptr);
+    Add(buf);
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaJsonWriter
+
+#if VMA_STATS_STRING_ENABLED
+
+class VmaJsonWriter
+{
+    VMA_CLASS_NO_COPY(VmaJsonWriter)
+public:
+    VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb);
+    ~VmaJsonWriter();
+
+    void BeginObject(bool singleLine = false);
+    void EndObject();
+    
+    void BeginArray(bool singleLine = false);
+    void EndArray();
+    
+    void WriteString(const char* pStr);
+    void BeginString(const char* pStr = VMA_NULL);
+    void ContinueString(const char* pStr);
+    void ContinueString(uint32_t n);
+    void ContinueString(uint64_t n);
+    void ContinueString_Pointer(const void* ptr);
+    void EndString(const char* pStr = VMA_NULL);
+    
+    void WriteNumber(uint32_t n);
+    void WriteNumber(uint64_t n);
+    void WriteBool(bool b);
+    void WriteNull();
+
+private:
+    static const char* const INDENT;
+
+    enum COLLECTION_TYPE
+    {
+        COLLECTION_TYPE_OBJECT,
+        COLLECTION_TYPE_ARRAY,
+    };
+    struct StackItem
+    {
+        COLLECTION_TYPE type;
+        uint32_t valueCount;
+        bool singleLineMode;
+    };
+
+    VmaStringBuilder& m_SB;
+    VmaVector< StackItem, VmaStlAllocator<StackItem> > m_Stack;
+    bool m_InsideString;
+
+    void BeginValue(bool isString);
+    void WriteIndent(bool oneLess = false);
+};
+
+const char* const VmaJsonWriter::INDENT = "  ";
+
+VmaJsonWriter::VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb) :
+    m_SB(sb),
+    m_Stack(VmaStlAllocator<StackItem>(pAllocationCallbacks)),
+    m_InsideString(false)
+{
+}
+
+VmaJsonWriter::~VmaJsonWriter()
+{
+    VMA_ASSERT(!m_InsideString);
+    VMA_ASSERT(m_Stack.empty());
+}
+
+void VmaJsonWriter::BeginObject(bool singleLine)
+{
+    VMA_ASSERT(!m_InsideString);
+
+    BeginValue(false);
+    m_SB.Add('{');
+
+    StackItem item;
+    item.type = COLLECTION_TYPE_OBJECT;
+    item.valueCount = 0;
+    item.singleLineMode = singleLine;
+    m_Stack.push_back(item);
+}
+
+void VmaJsonWriter::EndObject()
+{
+    VMA_ASSERT(!m_InsideString);
+
+    WriteIndent(true);
+    m_SB.Add('}');
+
+    VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_OBJECT);
+    m_Stack.pop_back();
+}
+
+void VmaJsonWriter::BeginArray(bool singleLine)
+{
+    VMA_ASSERT(!m_InsideString);
+
+    BeginValue(false);
+    m_SB.Add('[');
+
+    StackItem item;
+    item.type = COLLECTION_TYPE_ARRAY;
+    item.valueCount = 0;
+    item.singleLineMode = singleLine;
+    m_Stack.push_back(item);
+}
+
+void VmaJsonWriter::EndArray()
+{
+    VMA_ASSERT(!m_InsideString);
+
+    WriteIndent(true);
+    m_SB.Add(']');
+
+    VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_ARRAY);
+    m_Stack.pop_back();
+}
+
+void VmaJsonWriter::WriteString(const char* pStr)
+{
+    BeginString(pStr);
+    EndString();
+}
+
+void VmaJsonWriter::BeginString(const char* pStr)
+{
+    VMA_ASSERT(!m_InsideString);
+
+    BeginValue(true);
+    m_SB.Add('"');
+    m_InsideString = true;
+    if(pStr != VMA_NULL && pStr[0] != '\0')
+    {
+        ContinueString(pStr);
+    }
+}
+
+void VmaJsonWriter::ContinueString(const char* pStr)
+{
+    VMA_ASSERT(m_InsideString);
+
+    const size_t strLen = strlen(pStr);
+    for(size_t i = 0; i < strLen; ++i)
+    {
+        char ch = pStr[i];
+        if(ch == '\\')
+        {
+            m_SB.Add("\\\\");
+        }
+        else if(ch == '"')
+        {
+            m_SB.Add("\\\"");
+        }
+        else if(ch >= 32)
+        {
+            m_SB.Add(ch);
+        }
+        else switch(ch)
+        {
+        case '\b':
+            m_SB.Add("\\b");
+            break;
+        case '\f':
+            m_SB.Add("\\f");
+            break;
+        case '\n':
+            m_SB.Add("\\n");
+            break;
+        case '\r':
+            m_SB.Add("\\r");
+            break;
+        case '\t':
+            m_SB.Add("\\t");
+            break;
+        default:
+            VMA_ASSERT(0 && "Character not currently supported.");
+            break;
+        }
+    }
+}
+
+void VmaJsonWriter::ContinueString(uint32_t n)
+{
+    VMA_ASSERT(m_InsideString);
+    m_SB.AddNumber(n);
+}
+
+void VmaJsonWriter::ContinueString(uint64_t n)
+{
+    VMA_ASSERT(m_InsideString);
+    m_SB.AddNumber(n);
+}
+
+void VmaJsonWriter::ContinueString_Pointer(const void* ptr)
+{
+    VMA_ASSERT(m_InsideString);
+    m_SB.AddPointer(ptr);
+}
+
+void VmaJsonWriter::EndString(const char* pStr)
+{
+    VMA_ASSERT(m_InsideString);
+    if(pStr != VMA_NULL && pStr[0] != '\0')
+    {
+        ContinueString(pStr);
+    }
+    m_SB.Add('"');
+    m_InsideString = false;
+}
+
+void VmaJsonWriter::WriteNumber(uint32_t n)
+{
+    VMA_ASSERT(!m_InsideString);
+    BeginValue(false);
+    m_SB.AddNumber(n);
+}
+
+void VmaJsonWriter::WriteNumber(uint64_t n)
+{
+    VMA_ASSERT(!m_InsideString);
+    BeginValue(false);
+    m_SB.AddNumber(n);
+}
+
+void VmaJsonWriter::WriteBool(bool b)
+{
+    VMA_ASSERT(!m_InsideString);
+    BeginValue(false);
+    m_SB.Add(b ? "true" : "false");
+}
+
+void VmaJsonWriter::WriteNull()
+{
+    VMA_ASSERT(!m_InsideString);
+    BeginValue(false);
+    m_SB.Add("null");
+}
+
+void VmaJsonWriter::BeginValue(bool isString)
+{
+    if(!m_Stack.empty())
+    {
+        StackItem& currItem = m_Stack.back();
+        if(currItem.type == COLLECTION_TYPE_OBJECT &&
+            currItem.valueCount % 2 == 0)
+        {
+            (void) isString;
+            VMA_ASSERT(isString);
+        }
+
+        if(currItem.type == COLLECTION_TYPE_OBJECT &&
+            currItem.valueCount % 2 != 0)
+        {
+            m_SB.Add(": ");
+        }
+        else if(currItem.valueCount > 0)
+        {
+            m_SB.Add(", ");
+            WriteIndent();
+        }
+        else
+        {
+            WriteIndent();
+        }
+        ++currItem.valueCount;
+    }
+}
+
+void VmaJsonWriter::WriteIndent(bool oneLess)
+{
+    if(!m_Stack.empty() && !m_Stack.back().singleLineMode)
+    {
+        m_SB.AddNewLine();
+        
+        size_t count = m_Stack.size();
+        if(count > 0 && oneLess)
+        {
+            --count;
+        }
+        for(size_t i = 0; i < count; ++i)
+        {
+            m_SB.Add(INDENT);
+        }
+    }
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+
+void VmaAllocation_T::SetUserData(VmaAllocator hAllocator, void* pUserData)
+{
+    if(IsUserDataString())
+    {
+        VMA_ASSERT(pUserData == VMA_NULL || pUserData != m_pUserData);
+
+        FreeUserDataString(hAllocator);
+
+        if(pUserData != VMA_NULL)
+        {
+            const char* const newStrSrc = (char*)pUserData;
+            const size_t newStrLen = strlen(newStrSrc);
+            char* const newStrDst = vma_new_array(hAllocator, char, newStrLen + 1);
+            memcpy(newStrDst, newStrSrc, newStrLen + 1);
+            m_pUserData = newStrDst;
+        }
+    }
+    else
+    {
+        m_pUserData = pUserData;
+    }
+}
+
+void VmaAllocation_T::ChangeBlockAllocation(
+    VmaAllocator hAllocator,
+    VmaDeviceMemoryBlock* block,
+    VkDeviceSize offset)
+{
+    VMA_ASSERT(block != VMA_NULL);
+    VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);
+
+    // Move mapping reference counter from old block to new block.
+    if(block != m_BlockAllocation.m_Block)
+    {
+        uint32_t mapRefCount = m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP;
+        if(IsPersistentMap())
+            ++mapRefCount;
+        m_BlockAllocation.m_Block->Unmap(hAllocator, mapRefCount);
+        block->Map(hAllocator, mapRefCount, VMA_NULL);
+    }
+
+    m_BlockAllocation.m_Block = block;
+    m_BlockAllocation.m_Offset = offset;
+}
+
+void VmaAllocation_T::ChangeSize(VkDeviceSize newSize)
+{
+    VMA_ASSERT(newSize > 0);
+    m_Size = newSize;
+}
+
+void VmaAllocation_T::ChangeOffset(VkDeviceSize newOffset)
+{
+    VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);
+    m_BlockAllocation.m_Offset = newOffset;
+}
+
+VkDeviceSize VmaAllocation_T::GetOffset() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        return m_BlockAllocation.m_Offset;
+    case ALLOCATION_TYPE_DEDICATED:
+        return 0;
+    default:
+        VMA_ASSERT(0);
+        return 0;
+    }
+}
+
+VkDeviceMemory VmaAllocation_T::GetMemory() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        return m_BlockAllocation.m_Block->GetDeviceMemory();
+    case ALLOCATION_TYPE_DEDICATED:
+        return m_DedicatedAllocation.m_hMemory;
+    default:
+        VMA_ASSERT(0);
+        return VK_NULL_HANDLE;
+    }
+}
+
+uint32_t VmaAllocation_T::GetMemoryTypeIndex() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        return m_BlockAllocation.m_Block->GetMemoryTypeIndex();
+    case ALLOCATION_TYPE_DEDICATED:
+        return m_DedicatedAllocation.m_MemoryTypeIndex;
+    default:
+        VMA_ASSERT(0);
+        return UINT32_MAX;
+    }
+}
+
+void* VmaAllocation_T::GetMappedData() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        if(m_MapCount != 0)
+        {
+            void* pBlockData = m_BlockAllocation.m_Block->GetMappedData();
+            VMA_ASSERT(pBlockData != VMA_NULL);
+            return (char*)pBlockData + m_BlockAllocation.m_Offset;
+        }
+        else
+        {
+            return VMA_NULL;
+        }
+        break;
+    case ALLOCATION_TYPE_DEDICATED:
+        VMA_ASSERT((m_DedicatedAllocation.m_pMappedData != VMA_NULL) == (m_MapCount != 0));
+        return m_DedicatedAllocation.m_pMappedData;
+    default:
+        VMA_ASSERT(0);
+        return VMA_NULL;
+    }
+}
+
+bool VmaAllocation_T::CanBecomeLost() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        return m_BlockAllocation.m_CanBecomeLost;
+    case ALLOCATION_TYPE_DEDICATED:
+        return false;
+    default:
+        VMA_ASSERT(0);
+        return false;
+    }
+}
+
+VmaPool VmaAllocation_T::GetPool() const
+{
+    VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);
+    return m_BlockAllocation.m_hPool;
+}
+
+bool VmaAllocation_T::MakeLost(uint32_t currentFrameIndex, uint32_t frameInUseCount)
+{
+    VMA_ASSERT(CanBecomeLost());
+
+    /*
+    Warning: This is a carefully designed algorithm.
+    Do not modify unless you really know what you're doing :)
+    */
+    uint32_t localLastUseFrameIndex = GetLastUseFrameIndex();
+    for(;;)
+    {
+        if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST)
+        {
+            VMA_ASSERT(0);
+            return false;
+        }
+        else if(localLastUseFrameIndex + frameInUseCount >= currentFrameIndex)
+        {
+            return false;
+        }
+        else // Last use time earlier than current time.
+        {
+            if(CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, VMA_FRAME_INDEX_LOST))
+            {
+                // Setting hAllocation.LastUseFrameIndex atomic to VMA_FRAME_INDEX_LOST is enough to mark it as LOST.
+                // Calling code just needs to unregister this allocation in owning VmaDeviceMemoryBlock.
+                return true;
+            }
+        }
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+// Correspond to values of enum VmaSuballocationType.
+static const char* VMA_SUBALLOCATION_TYPE_NAMES[] = {
+    "FREE",
+    "UNKNOWN",
+    "BUFFER",
+    "IMAGE_UNKNOWN",
+    "IMAGE_LINEAR",
+    "IMAGE_OPTIMAL",
+};
+
+void VmaAllocation_T::PrintParameters(class VmaJsonWriter& json) const
+{
+    json.WriteString("Type");
+    json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[m_SuballocationType]);
+
+    json.WriteString("Size");
+    json.WriteNumber(m_Size);
+
+    if(m_pUserData != VMA_NULL)
+    {
+        json.WriteString("UserData");
+        if(IsUserDataString())
+        {
+            json.WriteString((const char*)m_pUserData);
+        }
+        else
+        {
+            json.BeginString();
+            json.ContinueString_Pointer(m_pUserData);
+            json.EndString();
+        }
+    }
+
+    json.WriteString("CreationFrameIndex");
+    json.WriteNumber(m_CreationFrameIndex);
+
+    json.WriteString("LastUseFrameIndex");
+    json.WriteNumber(GetLastUseFrameIndex());
+
+    if(m_BufferImageUsage != 0)
+    {
+        json.WriteString("Usage");
+        json.WriteNumber(m_BufferImageUsage);
+    }
+}
+
+#endif
+
+void VmaAllocation_T::FreeUserDataString(VmaAllocator hAllocator)
+{
+    VMA_ASSERT(IsUserDataString());
+    if(m_pUserData != VMA_NULL)
+    {
+        char* const oldStr = (char*)m_pUserData;
+        const size_t oldStrLen = strlen(oldStr);
+        vma_delete_array(hAllocator, oldStr, oldStrLen + 1);
+        m_pUserData = VMA_NULL;
+    }
+}
+
+void VmaAllocation_T::BlockAllocMap()
+{
+    VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK);
+
+    if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) < 0x7F)
+    {
+        ++m_MapCount;
+    }
+    else
+    {
+        VMA_ASSERT(0 && "Allocation mapped too many times simultaneously.");
+    }
+}
+
+void VmaAllocation_T::BlockAllocUnmap()
+{
+    VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK);
+
+    if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) != 0)
+    {
+        --m_MapCount;
+    }
+    else
+    {
+        VMA_ASSERT(0 && "Unmapping allocation not previously mapped.");
+    }
+}
+
+VkResult VmaAllocation_T::DedicatedAllocMap(VmaAllocator hAllocator, void** ppData)
+{
+    VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);
+
+    if(m_MapCount != 0)
+    {
+        if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) < 0x7F)
+        {
+            VMA_ASSERT(m_DedicatedAllocation.m_pMappedData != VMA_NULL);
+            *ppData = m_DedicatedAllocation.m_pMappedData;
+            ++m_MapCount;
+            return VK_SUCCESS;
+        }
+        else
+        {
+            VMA_ASSERT(0 && "Dedicated allocation mapped too many times simultaneously.");
+            return VK_ERROR_MEMORY_MAP_FAILED;
+        }
+    }
+    else
+    {
+        VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(
+            hAllocator->m_hDevice,
+            m_DedicatedAllocation.m_hMemory,
+            0, // offset
+            VK_WHOLE_SIZE,
+            0, // flags
+            ppData);
+        if(result == VK_SUCCESS)
+        {
+            m_DedicatedAllocation.m_pMappedData = *ppData;
+            m_MapCount = 1;
+        }
+        return result;
+    }
+}
+
+void VmaAllocation_T::DedicatedAllocUnmap(VmaAllocator hAllocator)
+{
+    VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);
+
+    if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) != 0)
+    {
+        --m_MapCount;
+        if(m_MapCount == 0)
+        {
+            m_DedicatedAllocation.m_pMappedData = VMA_NULL;
+            (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(
+                hAllocator->m_hDevice,
+                m_DedicatedAllocation.m_hMemory);
+        }
+    }
+    else
+    {
+        VMA_ASSERT(0 && "Unmapping dedicated allocation not previously mapped.");
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+static void VmaPrintStatInfo(VmaJsonWriter& json, const VmaStatInfo& stat)
+{
+    json.BeginObject();
+
+    json.WriteString("Blocks");
+    json.WriteNumber(stat.blockCount);
+
+    json.WriteString("Allocations");
+    json.WriteNumber(stat.allocationCount);
+
+    json.WriteString("UnusedRanges");
+    json.WriteNumber(stat.unusedRangeCount);
+
+    json.WriteString("UsedBytes");
+    json.WriteNumber(stat.usedBytes);
+
+    json.WriteString("UnusedBytes");
+    json.WriteNumber(stat.unusedBytes);
+
+    if(stat.allocationCount > 1)
+    {
+        json.WriteString("AllocationSize");
+        json.BeginObject(true);
+        json.WriteString("Min");
+        json.WriteNumber(stat.allocationSizeMin);
+        json.WriteString("Avg");
+        json.WriteNumber(stat.allocationSizeAvg);
+        json.WriteString("Max");
+        json.WriteNumber(stat.allocationSizeMax);
+        json.EndObject();
+    }
+
+    if(stat.unusedRangeCount > 1)
+    {
+        json.WriteString("UnusedRangeSize");
+        json.BeginObject(true);
+        json.WriteString("Min");
+        json.WriteNumber(stat.unusedRangeSizeMin);
+        json.WriteString("Avg");
+        json.WriteNumber(stat.unusedRangeSizeAvg);
+        json.WriteString("Max");
+        json.WriteNumber(stat.unusedRangeSizeMax);
+        json.EndObject();
+    }
+
+    json.EndObject();
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+struct VmaSuballocationItemSizeLess
+{
+    bool operator()(
+        const VmaSuballocationList::iterator lhs,
+        const VmaSuballocationList::iterator rhs) const
+    {
+        return lhs->size < rhs->size;
+    }
+    bool operator()(
+        const VmaSuballocationList::iterator lhs,
+        VkDeviceSize rhsSize) const
+    {
+        return lhs->size < rhsSize;
+    }
+};
+
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaBlockMetadata
+
+VmaBlockMetadata::VmaBlockMetadata(VmaAllocator hAllocator) :
+    m_Size(0),
+    m_pAllocationCallbacks(hAllocator->GetAllocationCallbacks())
+{
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaBlockMetadata::PrintDetailedMap_Begin(class VmaJsonWriter& json,
+    VkDeviceSize unusedBytes,
+    size_t allocationCount,
+    size_t unusedRangeCount) const
+{
+    json.BeginObject();
+
+    json.WriteString("TotalBytes");
+    json.WriteNumber(GetSize());
+
+    json.WriteString("UnusedBytes");
+    json.WriteNumber(unusedBytes);
+
+    json.WriteString("Allocations");
+    json.WriteNumber((uint64_t)allocationCount);
+
+    json.WriteString("UnusedRanges");
+    json.WriteNumber((uint64_t)unusedRangeCount);
+
+    json.WriteString("Suballocations");
+    json.BeginArray();
+}
+
+void VmaBlockMetadata::PrintDetailedMap_Allocation(class VmaJsonWriter& json,
+    VkDeviceSize offset,
+    VmaAllocation hAllocation) const
+{
+    json.BeginObject(true);
+        
+    json.WriteString("Offset");
+    json.WriteNumber(offset);
+
+    hAllocation->PrintParameters(json);
+
+    json.EndObject();
+}
+
+void VmaBlockMetadata::PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,
+    VkDeviceSize offset,
+    VkDeviceSize size) const
+{
+    json.BeginObject(true);
+        
+    json.WriteString("Offset");
+    json.WriteNumber(offset);
+
+    json.WriteString("Type");
+    json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[VMA_SUBALLOCATION_TYPE_FREE]);
+
+    json.WriteString("Size");
+    json.WriteNumber(size);
+
+    json.EndObject();
+}
+
+void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json) const
+{
+    json.EndArray();
+    json.EndObject();
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaBlockMetadata_Generic
+
+VmaBlockMetadata_Generic::VmaBlockMetadata_Generic(VmaAllocator hAllocator) :
+    VmaBlockMetadata(hAllocator),
+    m_FreeCount(0),
+    m_SumFreeSize(0),
+    m_Suballocations(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),
+    m_FreeSuballocationsBySize(VmaStlAllocator<VmaSuballocationList::iterator>(hAllocator->GetAllocationCallbacks()))
+{
+}
+
+VmaBlockMetadata_Generic::~VmaBlockMetadata_Generic()
+{
+}
+
+void VmaBlockMetadata_Generic::Init(VkDeviceSize size)
+{
+    VmaBlockMetadata::Init(size);
+
+    m_FreeCount = 1;
+    m_SumFreeSize = size;
+
+    VmaSuballocation suballoc = {};
+    suballoc.offset = 0;
+    suballoc.size = size;
+    suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+    suballoc.hAllocation = VK_NULL_HANDLE;
+
+    VMA_ASSERT(size > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER);
+    m_Suballocations.push_back(suballoc);
+    VmaSuballocationList::iterator suballocItem = m_Suballocations.end();
+    --suballocItem;
+    m_FreeSuballocationsBySize.push_back(suballocItem);
+}
+
+bool VmaBlockMetadata_Generic::Validate() const
+{
+    VMA_VALIDATE(!m_Suballocations.empty());
+    
+    // Expected offset of new suballocation as calculated from previous ones.
+    VkDeviceSize calculatedOffset = 0;
+    // Expected number of free suballocations as calculated from traversing their list.
+    uint32_t calculatedFreeCount = 0;
+    // Expected sum size of free suballocations as calculated from traversing their list.
+    VkDeviceSize calculatedSumFreeSize = 0;
+    // Expected number of free suballocations that should be registered in
+    // m_FreeSuballocationsBySize calculated from traversing their list.
+    size_t freeSuballocationsToRegister = 0;
+    // True if previous visited suballocation was free.
+    bool prevFree = false;
+
+    for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin();
+        suballocItem != m_Suballocations.cend();
+        ++suballocItem)
+    {
+        const VmaSuballocation& subAlloc = *suballocItem;
+        
+        // Actual offset of this suballocation doesn't match expected one.
+        VMA_VALIDATE(subAlloc.offset == calculatedOffset);
+
+        const bool currFree = (subAlloc.type == VMA_SUBALLOCATION_TYPE_FREE);
+        // Two adjacent free suballocations are invalid. They should be merged.
+        VMA_VALIDATE(!prevFree || !currFree);
+
+        VMA_VALIDATE(currFree == (subAlloc.hAllocation == VK_NULL_HANDLE));
+
+        if(currFree)
+        {
+            calculatedSumFreeSize += subAlloc.size;
+            ++calculatedFreeCount;
+            if(subAlloc.size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+            {
+                ++freeSuballocationsToRegister;
+            }
+
+            // Margin required between allocations - every free space must be at least that large.
+#if VMA_DEBUG_MARGIN
+            VMA_VALIDATE(subAlloc.size >= VMA_DEBUG_MARGIN);
+#endif
+        }
+        else
+        {
+            VMA_VALIDATE(subAlloc.hAllocation->GetOffset() == subAlloc.offset);
+            VMA_VALIDATE(subAlloc.hAllocation->GetSize() == subAlloc.size);
+
+            // Margin required between allocations - previous allocation must be free.
+            VMA_VALIDATE(VMA_DEBUG_MARGIN == 0 || prevFree);
+        }
+
+        calculatedOffset += subAlloc.size;
+        prevFree = currFree;
+    }
+
+    // Number of free suballocations registered in m_FreeSuballocationsBySize doesn't
+    // match expected one.
+    VMA_VALIDATE(m_FreeSuballocationsBySize.size() == freeSuballocationsToRegister);
+
+    VkDeviceSize lastSize = 0;
+    for(size_t i = 0; i < m_FreeSuballocationsBySize.size(); ++i)
+    {
+        VmaSuballocationList::iterator suballocItem = m_FreeSuballocationsBySize[i];
+        
+        // Only free suballocations can be registered in m_FreeSuballocationsBySize.
+        VMA_VALIDATE(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE);
+        // They must be sorted by size ascending.
+        VMA_VALIDATE(suballocItem->size >= lastSize);
+
+        lastSize = suballocItem->size;
+    }
+
+    // Check if totals match calculacted values.
+    VMA_VALIDATE(ValidateFreeSuballocationList());
+    VMA_VALIDATE(calculatedOffset == GetSize());
+    VMA_VALIDATE(calculatedSumFreeSize == m_SumFreeSize);
+    VMA_VALIDATE(calculatedFreeCount == m_FreeCount);
+
+    return true;
+}
+
+VkDeviceSize VmaBlockMetadata_Generic::GetUnusedRangeSizeMax() const
+{
+    if(!m_FreeSuballocationsBySize.empty())
+    {
+        return m_FreeSuballocationsBySize.back()->size;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+bool VmaBlockMetadata_Generic::IsEmpty() const
+{
+    return (m_Suballocations.size() == 1) && (m_FreeCount == 1);
+}
+
+void VmaBlockMetadata_Generic::CalcAllocationStatInfo(VmaStatInfo& outInfo) const
+{
+    outInfo.blockCount = 1;
+
+    const uint32_t rangeCount = (uint32_t)m_Suballocations.size();
+    outInfo.allocationCount = rangeCount - m_FreeCount;
+    outInfo.unusedRangeCount = m_FreeCount;
+    
+    outInfo.unusedBytes = m_SumFreeSize;
+    outInfo.usedBytes = GetSize() - outInfo.unusedBytes;
+
+    outInfo.allocationSizeMin = UINT64_MAX;
+    outInfo.allocationSizeMax = 0;
+    outInfo.unusedRangeSizeMin = UINT64_MAX;
+    outInfo.unusedRangeSizeMax = 0;
+
+    for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin();
+        suballocItem != m_Suballocations.cend();
+        ++suballocItem)
+    {
+        const VmaSuballocation& suballoc = *suballocItem;
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size);
+            outInfo.allocationSizeMax = VMA_MAX(outInfo.allocationSizeMax, suballoc.size);
+        }
+        else
+        {
+            outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, suballoc.size);
+            outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, suballoc.size);
+        }
+    }
+}
+
+void VmaBlockMetadata_Generic::AddPoolStats(VmaPoolStats& inoutStats) const
+{
+    const uint32_t rangeCount = (uint32_t)m_Suballocations.size();
+
+    inoutStats.size += GetSize();
+    inoutStats.unusedSize += m_SumFreeSize;
+    inoutStats.allocationCount += rangeCount - m_FreeCount;
+    inoutStats.unusedRangeCount += m_FreeCount;
+    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, GetUnusedRangeSizeMax());
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaBlockMetadata_Generic::PrintDetailedMap(class VmaJsonWriter& json) const
+{
+    PrintDetailedMap_Begin(json,
+        m_SumFreeSize, // unusedBytes
+        m_Suballocations.size() - (size_t)m_FreeCount, // allocationCount
+        m_FreeCount); // unusedRangeCount
+
+    size_t i = 0;
+    for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin();
+        suballocItem != m_Suballocations.cend();
+        ++suballocItem, ++i)
+    {
+        if(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            PrintDetailedMap_UnusedRange(json, suballocItem->offset, suballocItem->size);
+        }
+        else
+        {
+            PrintDetailedMap_Allocation(json, suballocItem->offset, suballocItem->hAllocation);
+        }
+    }
+
+    PrintDetailedMap_End(json);
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+bool VmaBlockMetadata_Generic::CreateAllocationRequest(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    bool upperAddress,
+    VmaSuballocationType allocType,
+    bool canMakeOtherLost,
+    uint32_t strategy,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    VMA_ASSERT(allocSize > 0);
+    VMA_ASSERT(!upperAddress);
+    (void) upperAddress;
+    VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(pAllocationRequest != VMA_NULL);
+    VMA_HEAVY_ASSERT(Validate());
+
+    // There is not enough total free space in this block to fullfill the request: Early return.
+    if(canMakeOtherLost == false &&
+        m_SumFreeSize < allocSize + 2 * VMA_DEBUG_MARGIN)
+    {
+        return false;
+    }
+
+    // New algorithm, efficiently searching freeSuballocationsBySize.
+    const size_t freeSuballocCount = m_FreeSuballocationsBySize.size();
+    if(freeSuballocCount > 0)
+    {
+        if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT)
+        {
+            // Find first free suballocation with size not less than allocSize + 2 * VMA_DEBUG_MARGIN.
+            VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess(
+                m_FreeSuballocationsBySize.data(),
+                m_FreeSuballocationsBySize.data() + freeSuballocCount,
+                allocSize + 2 * VMA_DEBUG_MARGIN,
+                VmaSuballocationItemSizeLess());
+            size_t index = it - m_FreeSuballocationsBySize.data();
+            for(; index < freeSuballocCount; ++index)
+            {
+                if(CheckAllocation(
+                    currentFrameIndex,
+                    frameInUseCount,
+                    bufferImageGranularity,
+                    allocSize,
+                    allocAlignment,
+                    allocType,
+                    m_FreeSuballocationsBySize[index],
+                    false, // canMakeOtherLost
+                    &pAllocationRequest->offset,
+                    &pAllocationRequest->itemsToMakeLostCount,
+                    &pAllocationRequest->sumFreeSize,
+                    &pAllocationRequest->sumItemSize))
+                {
+                    pAllocationRequest->item = m_FreeSuballocationsBySize[index];
+                    return true;
+                }
+            }
+        }
+        else if(strategy == VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET)
+        {
+            for(VmaSuballocationList::iterator it = m_Suballocations.begin();
+                it != m_Suballocations.end();
+                ++it)
+            {
+                if(it->type == VMA_SUBALLOCATION_TYPE_FREE && CheckAllocation(
+                    currentFrameIndex,
+                    frameInUseCount,
+                    bufferImageGranularity,
+                    allocSize,
+                    allocAlignment,
+                    allocType,
+                    it,
+                    false, // canMakeOtherLost
+                    &pAllocationRequest->offset,
+                    &pAllocationRequest->itemsToMakeLostCount,
+                    &pAllocationRequest->sumFreeSize,
+                    &pAllocationRequest->sumItemSize))
+                {
+                    pAllocationRequest->item = it;
+                    return true;
+                }
+            }
+        }
+        else // WORST_FIT, FIRST_FIT
+        {
+            // Search staring from biggest suballocations.
+            for(size_t index = freeSuballocCount; index--; )
+            {
+                if(CheckAllocation(
+                    currentFrameIndex,
+                    frameInUseCount,
+                    bufferImageGranularity,
+                    allocSize,
+                    allocAlignment,
+                    allocType,
+                    m_FreeSuballocationsBySize[index],
+                    false, // canMakeOtherLost
+                    &pAllocationRequest->offset,
+                    &pAllocationRequest->itemsToMakeLostCount,
+                    &pAllocationRequest->sumFreeSize,
+                    &pAllocationRequest->sumItemSize))
+                {
+                    pAllocationRequest->item = m_FreeSuballocationsBySize[index];
+                    return true;
+                }
+            }
+        }
+    }
+
+    if(canMakeOtherLost)
+    {
+        // Brute-force algorithm. TODO: Come up with something better.
+
+        pAllocationRequest->sumFreeSize = VK_WHOLE_SIZE;
+        pAllocationRequest->sumItemSize = VK_WHOLE_SIZE;
+
+        VmaAllocationRequest tmpAllocRequest = {};
+        for(VmaSuballocationList::iterator suballocIt = m_Suballocations.begin();
+            suballocIt != m_Suballocations.end();
+            ++suballocIt)
+        {
+            if(suballocIt->type == VMA_SUBALLOCATION_TYPE_FREE ||
+                suballocIt->hAllocation->CanBecomeLost())
+            {
+                if(CheckAllocation(
+                    currentFrameIndex,
+                    frameInUseCount,
+                    bufferImageGranularity,
+                    allocSize,
+                    allocAlignment,
+                    allocType,
+                    suballocIt,
+                    canMakeOtherLost,
+                    &tmpAllocRequest.offset,
+                    &tmpAllocRequest.itemsToMakeLostCount,
+                    &tmpAllocRequest.sumFreeSize,
+                    &tmpAllocRequest.sumItemSize))
+                {
+                    tmpAllocRequest.item = suballocIt;
+
+                    if(tmpAllocRequest.CalcCost() < pAllocationRequest->CalcCost() ||
+                        strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT)
+                    {
+                        *pAllocationRequest = tmpAllocRequest;
+                    }
+                }
+            }
+        }
+
+        if(pAllocationRequest->sumItemSize != VK_WHOLE_SIZE)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool VmaBlockMetadata_Generic::MakeRequestedAllocationsLost(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    while(pAllocationRequest->itemsToMakeLostCount > 0)
+    {
+        if(pAllocationRequest->item->type == VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            ++pAllocationRequest->item;
+        }
+        VMA_ASSERT(pAllocationRequest->item != m_Suballocations.end());
+        VMA_ASSERT(pAllocationRequest->item->hAllocation != VK_NULL_HANDLE);
+        VMA_ASSERT(pAllocationRequest->item->hAllocation->CanBecomeLost());
+        if(pAllocationRequest->item->hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+        {
+            pAllocationRequest->item = FreeSuballocation(pAllocationRequest->item);
+            --pAllocationRequest->itemsToMakeLostCount;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    VMA_HEAVY_ASSERT(Validate());
+    VMA_ASSERT(pAllocationRequest->item != m_Suballocations.end());
+    VMA_ASSERT(pAllocationRequest->item->type == VMA_SUBALLOCATION_TYPE_FREE);
+    
+    return true;
+}
+
+uint32_t VmaBlockMetadata_Generic::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount)
+{
+    uint32_t lostAllocationCount = 0;
+    for(VmaSuballocationList::iterator it = m_Suballocations.begin();
+        it != m_Suballocations.end();
+        ++it)
+    {
+        if(it->type != VMA_SUBALLOCATION_TYPE_FREE &&
+            it->hAllocation->CanBecomeLost() &&
+            it->hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+        {
+            it = FreeSuballocation(it);
+            ++lostAllocationCount;
+        }
+    }
+    return lostAllocationCount;
+}
+
+VkResult VmaBlockMetadata_Generic::CheckCorruption(const void* pBlockData)
+{
+    for(VmaSuballocationList::iterator it = m_Suballocations.begin();
+        it != m_Suballocations.end();
+        ++it)
+    {
+        if(it->type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            if(!VmaValidateMagicValue(pBlockData, it->offset - VMA_DEBUG_MARGIN))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+            if(!VmaValidateMagicValue(pBlockData, it->offset + it->size))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+        }
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaBlockMetadata_Generic::Alloc(
+    const VmaAllocationRequest& request,
+    VmaSuballocationType type,
+    VkDeviceSize allocSize,
+    bool upperAddress,
+    VmaAllocation hAllocation)
+{
+    VMA_ASSERT(!upperAddress);
+    (void) upperAddress;
+    VMA_ASSERT(request.item != m_Suballocations.end());
+    VmaSuballocation& suballoc = *request.item;
+    // Given suballocation is a free block.
+    VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+    // Given offset is inside this suballocation.
+    VMA_ASSERT(request.offset >= suballoc.offset);
+    const VkDeviceSize paddingBegin = request.offset - suballoc.offset;
+    VMA_ASSERT(suballoc.size >= paddingBegin + allocSize);
+    const VkDeviceSize paddingEnd = suballoc.size - paddingBegin - allocSize;
+
+    // Unregister this free suballocation from m_FreeSuballocationsBySize and update
+    // it to become used.
+    UnregisterFreeSuballocation(request.item);
+
+    suballoc.offset = request.offset;
+    suballoc.size = allocSize;
+    suballoc.type = type;
+    suballoc.hAllocation = hAllocation;
+
+    // If there are any free bytes remaining at the end, insert new free suballocation after current one.
+    if(paddingEnd)
+    {
+        VmaSuballocation paddingSuballoc = {};
+        paddingSuballoc.offset = request.offset + allocSize;
+        paddingSuballoc.size = paddingEnd;
+        paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+        VmaSuballocationList::iterator next = request.item;
+        ++next;
+        const VmaSuballocationList::iterator paddingEndItem =
+            m_Suballocations.insert(next, paddingSuballoc);
+        RegisterFreeSuballocation(paddingEndItem);
+    }
+
+    // If there are any free bytes remaining at the beginning, insert new free suballocation before current one.
+    if(paddingBegin)
+    {
+        VmaSuballocation paddingSuballoc = {};
+        paddingSuballoc.offset = request.offset - paddingBegin;
+        paddingSuballoc.size = paddingBegin;
+        paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+        const VmaSuballocationList::iterator paddingBeginItem =
+            m_Suballocations.insert(request.item, paddingSuballoc);
+        RegisterFreeSuballocation(paddingBeginItem);
+    }
+
+    // Update totals.
+    m_FreeCount = m_FreeCount - 1;
+    if(paddingBegin > 0)
+    {
+        ++m_FreeCount;
+    }
+    if(paddingEnd > 0)
+    {
+        ++m_FreeCount;
+    }
+    m_SumFreeSize -= allocSize;
+}
+
+void VmaBlockMetadata_Generic::Free(const VmaAllocation allocation)
+{
+    for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin();
+        suballocItem != m_Suballocations.end();
+        ++suballocItem)
+    {
+        VmaSuballocation& suballoc = *suballocItem;
+        if(suballoc.hAllocation == allocation)
+        {
+            FreeSuballocation(suballocItem);
+            VMA_HEAVY_ASSERT(Validate());
+            return;
+        }
+    }
+    VMA_ASSERT(0 && "Not found!");
+}
+
+void VmaBlockMetadata_Generic::FreeAtOffset(VkDeviceSize offset)
+{
+    for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin();
+        suballocItem != m_Suballocations.end();
+        ++suballocItem)
+    {
+        VmaSuballocation& suballoc = *suballocItem;
+        if(suballoc.offset == offset)
+        {
+            FreeSuballocation(suballocItem);
+            return;
+        }
+    }
+    VMA_ASSERT(0 && "Not found!");
+}
+
+bool VmaBlockMetadata_Generic::ResizeAllocation(const VmaAllocation alloc, VkDeviceSize newSize)
+{
+    typedef VmaSuballocationList::iterator iter_type;
+    for(iter_type suballocItem = m_Suballocations.begin();
+        suballocItem != m_Suballocations.end();
+        ++suballocItem)
+    {
+        VmaSuballocation& suballoc = *suballocItem;
+        if(suballoc.hAllocation == alloc)
+        {
+            iter_type nextItem = suballocItem;
+            ++nextItem;
+
+            // Should have been ensured on higher level.
+            VMA_ASSERT(newSize != alloc->GetSize() && newSize > 0);
+
+            // Shrinking.
+            if(newSize < alloc->GetSize())
+            {
+                const VkDeviceSize sizeDiff = suballoc.size - newSize;
+
+                // There is next item.
+                if(nextItem != m_Suballocations.end())
+                {
+                    // Next item is free.
+                    if(nextItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+                    {
+                        // Grow this next item backward.
+                        UnregisterFreeSuballocation(nextItem);
+                        nextItem->offset -= sizeDiff;
+                        nextItem->size += sizeDiff;
+                        RegisterFreeSuballocation(nextItem);
+                    }
+                    // Next item is not free.
+                    else
+                    {
+                        // Create free item after current one.
+                        VmaSuballocation newFreeSuballoc;
+                        newFreeSuballoc.hAllocation = VK_NULL_HANDLE;
+                        newFreeSuballoc.offset = suballoc.offset + newSize;
+                        newFreeSuballoc.size = sizeDiff;
+                        newFreeSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+                        iter_type newFreeSuballocIt = m_Suballocations.insert(nextItem, newFreeSuballoc);
+                        RegisterFreeSuballocation(newFreeSuballocIt);
+
+                        ++m_FreeCount;
+                    }
+                }
+                // This is the last item.
+                else
+                {
+                    // Create free item at the end.
+                    VmaSuballocation newFreeSuballoc;
+                    newFreeSuballoc.hAllocation = VK_NULL_HANDLE;
+                    newFreeSuballoc.offset = suballoc.offset + newSize;
+                    newFreeSuballoc.size = sizeDiff;
+                    newFreeSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+                    m_Suballocations.push_back(newFreeSuballoc);
+
+                    iter_type newFreeSuballocIt = m_Suballocations.end();
+                    RegisterFreeSuballocation(--newFreeSuballocIt);
+
+                    ++m_FreeCount;
+                }
+
+                suballoc.size = newSize;
+                m_SumFreeSize += sizeDiff;
+            }
+            // Growing.
+            else
+            {
+                const VkDeviceSize sizeDiff = newSize - suballoc.size;
+
+                // There is next item.
+                if(nextItem != m_Suballocations.end())
+                {
+                    // Next item is free.
+                    if(nextItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+                    {
+                        // There is not enough free space, including margin.
+                        if(nextItem->size < sizeDiff + VMA_DEBUG_MARGIN)
+                        {
+                            return false;
+                        }
+
+                        // There is more free space than required.
+                        if(nextItem->size > sizeDiff)
+                        {
+                            // Move and shrink this next item.
+                            UnregisterFreeSuballocation(nextItem);
+                            nextItem->offset += sizeDiff;
+                            nextItem->size -= sizeDiff;
+                            RegisterFreeSuballocation(nextItem);
+                        }
+                        // There is exactly the amount of free space required.
+                        else
+                        {
+                            // Remove this next free item.
+                            UnregisterFreeSuballocation(nextItem);
+                            m_Suballocations.erase(nextItem);
+                            --m_FreeCount;
+                        }
+                    }
+                    // Next item is not free - there is no space to grow.
+                    else
+                    {
+                        return false;
+                    }
+                }
+                // This is the last item - there is no space to grow.
+                else
+                {
+                    return false;
+                }
+
+                suballoc.size = newSize;
+                m_SumFreeSize -= sizeDiff;
+            }
+
+            // We cannot call Validate() here because alloc object is updated to new size outside of this call.
+            return true;
+        }
+    }
+    VMA_ASSERT(0 && "Not found!");
+    return false;
+}
+
+bool VmaBlockMetadata_Generic::ValidateFreeSuballocationList() const
+{
+    VkDeviceSize lastSize = 0;
+    for(size_t i = 0, count = m_FreeSuballocationsBySize.size(); i < count; ++i)
+    {
+        const VmaSuballocationList::iterator it = m_FreeSuballocationsBySize[i];
+
+        VMA_VALIDATE(it->type == VMA_SUBALLOCATION_TYPE_FREE);
+        VMA_VALIDATE(it->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER);
+        VMA_VALIDATE(it->size >= lastSize);
+        lastSize = it->size;
+    }
+    return true;
+}
+
+bool VmaBlockMetadata_Generic::CheckAllocation(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    VmaSuballocationType allocType,
+    VmaSuballocationList::const_iterator suballocItem,
+    bool canMakeOtherLost,
+    VkDeviceSize* pOffset,
+    size_t* itemsToMakeLostCount,
+    VkDeviceSize* pSumFreeSize,
+    VkDeviceSize* pSumItemSize) const
+{
+    VMA_ASSERT(allocSize > 0);
+    VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(suballocItem != m_Suballocations.cend());
+    VMA_ASSERT(pOffset != VMA_NULL);
+    
+    *itemsToMakeLostCount = 0;
+    *pSumFreeSize = 0;
+    *pSumItemSize = 0;
+
+    if(canMakeOtherLost)
+    {
+        if(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            *pSumFreeSize = suballocItem->size;
+        }
+        else
+        {
+            if(suballocItem->hAllocation->CanBecomeLost() &&
+                suballocItem->hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+            {
+                ++*itemsToMakeLostCount;
+                *pSumItemSize = suballocItem->size;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        // Remaining size is too small for this request: Early return.
+        if(GetSize() - suballocItem->offset < allocSize)
+        {
+            return false;
+        }
+
+        // Start from offset equal to beginning of this suballocation.
+        *pOffset = suballocItem->offset;
+    
+        // Apply VMA_DEBUG_MARGIN at the beginning.
+        if(VMA_DEBUG_MARGIN > 0)
+        {
+            *pOffset += VMA_DEBUG_MARGIN;
+        }
+    
+        // Apply alignment.
+        *pOffset = VmaAlignUp(*pOffset, allocAlignment);
+
+        // Check previous suballocations for BufferImageGranularity conflicts.
+        // Make bigger alignment if necessary.
+        if(bufferImageGranularity > 1)
+        {
+            bool bufferImageGranularityConflict = false;
+            VmaSuballocationList::const_iterator prevSuballocItem = suballocItem;
+            while(prevSuballocItem != m_Suballocations.cbegin())
+            {
+                --prevSuballocItem;
+                const VmaSuballocation& prevSuballoc = *prevSuballocItem;
+                if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, *pOffset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))
+                    {
+                        bufferImageGranularityConflict = true;
+                        break;
+                    }
+                }
+                else
+                    // Already on previous page.
+                    break;
+            }
+            if(bufferImageGranularityConflict)
+            {
+                *pOffset = VmaAlignUp(*pOffset, bufferImageGranularity);
+            }
+        }
+    
+        // Now that we have final *pOffset, check if we are past suballocItem.
+        // If yes, return false - this function should be called for another suballocItem as starting point.
+        if(*pOffset >= suballocItem->offset + suballocItem->size)
+        {
+            return false;
+        }
+    
+        // Calculate padding at the beginning based on current offset.
+        const VkDeviceSize paddingBegin = *pOffset - suballocItem->offset;
+
+        // Calculate required margin at the end.
+        const VkDeviceSize requiredEndMargin = VMA_DEBUG_MARGIN;
+
+        const VkDeviceSize totalSize = paddingBegin + allocSize + requiredEndMargin;
+        // Another early return check.
+        if(suballocItem->offset + totalSize > GetSize())
+        {
+            return false;
+        }
+
+        // Advance lastSuballocItem until desired size is reached.
+        // Update itemsToMakeLostCount.
+        VmaSuballocationList::const_iterator lastSuballocItem = suballocItem;
+        if(totalSize > suballocItem->size)
+        {
+            VkDeviceSize remainingSize = totalSize - suballocItem->size;
+            while(remainingSize > 0)
+            {
+                ++lastSuballocItem;
+                if(lastSuballocItem == m_Suballocations.cend())
+                {
+                    return false;
+                }
+                if(lastSuballocItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+                {
+                    *pSumFreeSize += lastSuballocItem->size;
+                }
+                else
+                {
+                    VMA_ASSERT(lastSuballocItem->hAllocation != VK_NULL_HANDLE);
+                    if(lastSuballocItem->hAllocation->CanBecomeLost() &&
+                        lastSuballocItem->hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+                    {
+                        ++*itemsToMakeLostCount;
+                        *pSumItemSize += lastSuballocItem->size;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                remainingSize = (lastSuballocItem->size < remainingSize) ?
+                    remainingSize - lastSuballocItem->size : 0;
+            }
+        }
+
+        // Check next suballocations for BufferImageGranularity conflicts.
+        // If conflict exists, we must mark more allocations lost or fail.
+        if(bufferImageGranularity > 1)
+        {
+            VmaSuballocationList::const_iterator nextSuballocItem = lastSuballocItem;
+            ++nextSuballocItem;
+            while(nextSuballocItem != m_Suballocations.cend())
+            {
+                const VmaSuballocation& nextSuballoc = *nextSuballocItem;
+                if(VmaBlocksOnSamePage(*pOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))
+                    {
+                        VMA_ASSERT(nextSuballoc.hAllocation != VK_NULL_HANDLE);
+                        if(nextSuballoc.hAllocation->CanBecomeLost() &&
+                            nextSuballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+                        {
+                            ++*itemsToMakeLostCount;
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                }
+                else
+                {
+                    // Already on next page.
+                    break;
+                }
+                ++nextSuballocItem;
+            }
+        }
+    }
+    else
+    {
+        const VmaSuballocation& suballoc = *suballocItem;
+        VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+
+        *pSumFreeSize = suballoc.size;
+
+        // Size of this suballocation is too small for this request: Early return.
+        if(suballoc.size < allocSize)
+        {
+            return false;
+        }
+
+        // Start from offset equal to beginning of this suballocation.
+        *pOffset = suballoc.offset;
+    
+        // Apply VMA_DEBUG_MARGIN at the beginning.
+        if(VMA_DEBUG_MARGIN > 0)
+        {
+            *pOffset += VMA_DEBUG_MARGIN;
+        }
+    
+        // Apply alignment.
+        *pOffset = VmaAlignUp(*pOffset, allocAlignment);
+    
+        // Check previous suballocations for BufferImageGranularity conflicts.
+        // Make bigger alignment if necessary.
+        if(bufferImageGranularity > 1)
+        {
+            bool bufferImageGranularityConflict = false;
+            VmaSuballocationList::const_iterator prevSuballocItem = suballocItem;
+            while(prevSuballocItem != m_Suballocations.cbegin())
+            {
+                --prevSuballocItem;
+                const VmaSuballocation& prevSuballoc = *prevSuballocItem;
+                if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, *pOffset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))
+                    {
+                        bufferImageGranularityConflict = true;
+                        break;
+                    }
+                }
+                else
+                    // Already on previous page.
+                    break;
+            }
+            if(bufferImageGranularityConflict)
+            {
+                *pOffset = VmaAlignUp(*pOffset, bufferImageGranularity);
+            }
+        }
+    
+        // Calculate padding at the beginning based on current offset.
+        const VkDeviceSize paddingBegin = *pOffset - suballoc.offset;
+
+        // Calculate required margin at the end.
+        const VkDeviceSize requiredEndMargin = VMA_DEBUG_MARGIN;
+
+        // Fail if requested size plus margin before and after is bigger than size of this suballocation.
+        if(paddingBegin + allocSize + requiredEndMargin > suballoc.size)
+        {
+            return false;
+        }
+
+        // Check next suballocations for BufferImageGranularity conflicts.
+        // If conflict exists, allocation cannot be made here.
+        if(bufferImageGranularity > 1)
+        {
+            VmaSuballocationList::const_iterator nextSuballocItem = suballocItem;
+            ++nextSuballocItem;
+            while(nextSuballocItem != m_Suballocations.cend())
+            {
+                const VmaSuballocation& nextSuballoc = *nextSuballocItem;
+                if(VmaBlocksOnSamePage(*pOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    // Already on next page.
+                    break;
+                }
+                ++nextSuballocItem;
+            }
+        }
+    }
+
+    // All tests passed: Success. pOffset is already filled.
+    return true;
+}
+
+void VmaBlockMetadata_Generic::MergeFreeWithNext(VmaSuballocationList::iterator item)
+{
+    VMA_ASSERT(item != m_Suballocations.end());
+    VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);
+    
+    VmaSuballocationList::iterator nextItem = item;
+    ++nextItem;
+    VMA_ASSERT(nextItem != m_Suballocations.end());
+    VMA_ASSERT(nextItem->type == VMA_SUBALLOCATION_TYPE_FREE);
+
+    item->size += nextItem->size;
+    --m_FreeCount;
+    m_Suballocations.erase(nextItem);
+}
+
+VmaSuballocationList::iterator VmaBlockMetadata_Generic::FreeSuballocation(VmaSuballocationList::iterator suballocItem)
+{
+    // Change this suballocation to be marked as free.
+    VmaSuballocation& suballoc = *suballocItem;
+    suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+    suballoc.hAllocation = VK_NULL_HANDLE;
+    
+    // Update totals.
+    ++m_FreeCount;
+    m_SumFreeSize += suballoc.size;
+
+    // Merge with previous and/or next suballocation if it's also free.
+    bool mergeWithNext = false;
+    bool mergeWithPrev = false;
+    
+    VmaSuballocationList::iterator nextItem = suballocItem;
+    ++nextItem;
+    if((nextItem != m_Suballocations.end()) && (nextItem->type == VMA_SUBALLOCATION_TYPE_FREE))
+    {
+        mergeWithNext = true;
+    }
+
+    VmaSuballocationList::iterator prevItem = suballocItem;
+    if(suballocItem != m_Suballocations.begin())
+    {
+        --prevItem;
+        if(prevItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            mergeWithPrev = true;
+        }
+    }
+
+    if(mergeWithNext)
+    {
+        UnregisterFreeSuballocation(nextItem);
+        MergeFreeWithNext(suballocItem);
+    }
+
+    if(mergeWithPrev)
+    {
+        UnregisterFreeSuballocation(prevItem);
+        MergeFreeWithNext(prevItem);
+        RegisterFreeSuballocation(prevItem);
+        return prevItem;
+    }
+    else
+    {
+        RegisterFreeSuballocation(suballocItem);
+        return suballocItem;
+    }
+}
+
+void VmaBlockMetadata_Generic::RegisterFreeSuballocation(VmaSuballocationList::iterator item)
+{
+    VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(item->size > 0);
+
+    // You may want to enable this validation at the beginning or at the end of
+    // this function, depending on what do you want to check.
+    VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());
+
+    if(item->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+    {
+        if(m_FreeSuballocationsBySize.empty())
+        {
+            m_FreeSuballocationsBySize.push_back(item);
+        }
+        else
+        {
+            VmaVectorInsertSorted<VmaSuballocationItemSizeLess>(m_FreeSuballocationsBySize, item);
+        }
+    }
+
+    //VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());
+}
+
+
+void VmaBlockMetadata_Generic::UnregisterFreeSuballocation(VmaSuballocationList::iterator item)
+{
+    VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(item->size > 0);
+
+    // You may want to enable this validation at the beginning or at the end of
+    // this function, depending on what do you want to check.
+    VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());
+
+    if(item->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+    {
+        VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess(
+            m_FreeSuballocationsBySize.data(),
+            m_FreeSuballocationsBySize.data() + m_FreeSuballocationsBySize.size(),
+            item,
+            VmaSuballocationItemSizeLess());
+        for(size_t index = it - m_FreeSuballocationsBySize.data();
+            index < m_FreeSuballocationsBySize.size();
+            ++index)
+        {
+            if(m_FreeSuballocationsBySize[index] == item)
+            {
+                VmaVectorRemove(m_FreeSuballocationsBySize, index);
+                return;
+            }
+            VMA_ASSERT((m_FreeSuballocationsBySize[index]->size == item->size) && "Not found.");
+        }
+        VMA_ASSERT(0 && "Not found.");
+    }
+
+    //VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());
+}
+
+bool VmaBlockMetadata_Generic::IsBufferImageGranularityConflictPossible(
+    VkDeviceSize bufferImageGranularity,
+    VmaSuballocationType& inOutPrevSuballocType) const
+{
+    if(bufferImageGranularity == 1 || IsEmpty())
+    {
+        return false;
+    }
+
+    VkDeviceSize minAlignment = VK_WHOLE_SIZE;
+    bool typeConflictFound = false;
+    for(VmaSuballocationList::const_iterator it = m_Suballocations.cbegin();
+        it != m_Suballocations.cend();
+        ++it)
+    {
+        const VmaSuballocationType suballocType = it->type;
+        if(suballocType != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            minAlignment = VMA_MIN(minAlignment, it->hAllocation->GetAlignment());
+            if(VmaIsBufferImageGranularityConflict(inOutPrevSuballocType, suballocType))
+            {
+                typeConflictFound = true;
+            }
+            inOutPrevSuballocType = suballocType;
+        }
+    }
+
+    return typeConflictFound || minAlignment >= bufferImageGranularity;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaBlockMetadata_Linear
+
+VmaBlockMetadata_Linear::VmaBlockMetadata_Linear(VmaAllocator hAllocator) :
+    VmaBlockMetadata(hAllocator),
+    m_SumFreeSize(0),
+    m_Suballocations0(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),
+    m_Suballocations1(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),
+    m_1stVectorIndex(0),
+    m_2ndVectorMode(SECOND_VECTOR_EMPTY),
+    m_1stNullItemsBeginCount(0),
+    m_1stNullItemsMiddleCount(0),
+    m_2ndNullItemsCount(0)
+{
+}
+
+VmaBlockMetadata_Linear::~VmaBlockMetadata_Linear()
+{
+}
+
+void VmaBlockMetadata_Linear::Init(VkDeviceSize size)
+{
+    VmaBlockMetadata::Init(size);
+    m_SumFreeSize = size;
+}
+
+bool VmaBlockMetadata_Linear::Validate() const
+{
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    VMA_VALIDATE(suballocations2nd.empty() == (m_2ndVectorMode == SECOND_VECTOR_EMPTY));
+    VMA_VALIDATE(!suballocations1st.empty() ||
+        suballocations2nd.empty() ||
+        m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER);
+
+    if(!suballocations1st.empty())
+    {
+        // Null item at the beginning should be accounted into m_1stNullItemsBeginCount.
+        VMA_VALIDATE(suballocations1st[m_1stNullItemsBeginCount].hAllocation != VK_NULL_HANDLE);
+        // Null item at the end should be just pop_back().
+        VMA_VALIDATE(suballocations1st.back().hAllocation != VK_NULL_HANDLE);
+    }
+    if(!suballocations2nd.empty())
+    {
+        // Null item at the end should be just pop_back().
+        VMA_VALIDATE(suballocations2nd.back().hAllocation != VK_NULL_HANDLE);
+    }
+
+    VMA_VALIDATE(m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount <= suballocations1st.size());
+    VMA_VALIDATE(m_2ndNullItemsCount <= suballocations2nd.size());
+
+    VkDeviceSize sumUsedSize = 0;
+    const size_t suballoc1stCount = suballocations1st.size();
+    VkDeviceSize offset = VMA_DEBUG_MARGIN;
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const size_t suballoc2ndCount = suballocations2nd.size();
+        size_t nullItem2ndCount = 0;
+        for(size_t i = 0; i < suballoc2ndCount; ++i)
+        {
+            const VmaSuballocation& suballoc = suballocations2nd[i];
+            const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+
+            VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE));
+            VMA_VALIDATE(suballoc.offset >= offset);
+
+            if(!currFree)
+            {
+                VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset);
+                VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size);
+                sumUsedSize += suballoc.size;
+            }
+            else
+            {
+                ++nullItem2ndCount;
+            }
+
+            offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN;
+        }
+
+        VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount);
+    }
+
+    for(size_t i = 0; i < m_1stNullItemsBeginCount; ++i)
+    {
+        const VmaSuballocation& suballoc = suballocations1st[i];
+        VMA_VALIDATE(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE &&
+            suballoc.hAllocation == VK_NULL_HANDLE);
+    }
+
+    size_t nullItem1stCount = m_1stNullItemsBeginCount;
+
+    for(size_t i = m_1stNullItemsBeginCount; i < suballoc1stCount; ++i)
+    {
+        const VmaSuballocation& suballoc = suballocations1st[i];
+        const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+
+        VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE));
+        VMA_VALIDATE(suballoc.offset >= offset);
+        VMA_VALIDATE(i >= m_1stNullItemsBeginCount || currFree);
+
+        if(!currFree)
+        {
+            VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset);
+            VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size);
+            sumUsedSize += suballoc.size;
+        }
+        else
+        {
+            ++nullItem1stCount;
+        }
+
+        offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN;
+    }
+    VMA_VALIDATE(nullItem1stCount == m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount);
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        const size_t suballoc2ndCount = suballocations2nd.size();
+        size_t nullItem2ndCount = 0;
+        for(size_t i = suballoc2ndCount; i--; )
+        {
+            const VmaSuballocation& suballoc = suballocations2nd[i];
+            const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+
+            VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE));
+            VMA_VALIDATE(suballoc.offset >= offset);
+
+            if(!currFree)
+            {
+                VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset);
+                VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size);
+                sumUsedSize += suballoc.size;
+            }
+            else
+            {
+                ++nullItem2ndCount;
+            }
+
+            offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN;
+        }
+
+        VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount);
+    }
+
+    VMA_VALIDATE(offset <= GetSize());
+    VMA_VALIDATE(m_SumFreeSize == GetSize() - sumUsedSize);
+
+    return true;
+}
+
+size_t VmaBlockMetadata_Linear::GetAllocationCount() const
+{
+    return AccessSuballocations1st().size() - (m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount) +
+        AccessSuballocations2nd().size() - m_2ndNullItemsCount;
+}
+
+VkDeviceSize VmaBlockMetadata_Linear::GetUnusedRangeSizeMax() const
+{
+    const VkDeviceSize size = GetSize();
+
+    /*
+    We don't consider gaps inside allocation vectors with freed allocations because
+    they are not suitable for reuse in linear allocator. We consider only space that
+    is available for new allocations.
+    */
+    if(IsEmpty())
+    {
+        return size;
+    }
+    
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+
+    switch(m_2ndVectorMode)
+    {
+    case SECOND_VECTOR_EMPTY:
+        /*
+        Available space is after end of 1st, as well as before beginning of 1st (which
+        whould make it a ring buffer).
+        */
+        {
+            const size_t suballocations1stCount = suballocations1st.size();
+            VMA_ASSERT(suballocations1stCount > m_1stNullItemsBeginCount);
+            const VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount];
+            const VmaSuballocation& lastSuballoc  = suballocations1st[suballocations1stCount - 1];
+            return VMA_MAX(
+                firstSuballoc.offset,
+                size - (lastSuballoc.offset + lastSuballoc.size));
+        }
+        break;
+
+    case SECOND_VECTOR_RING_BUFFER:
+        /*
+        Available space is only between end of 2nd and beginning of 1st.
+        */
+        {
+            const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+            const VmaSuballocation& lastSuballoc2nd = suballocations2nd.back();
+            const VmaSuballocation& firstSuballoc1st = suballocations1st[m_1stNullItemsBeginCount];
+            return firstSuballoc1st.offset - (lastSuballoc2nd.offset + lastSuballoc2nd.size);
+        }
+        break;
+
+    case SECOND_VECTOR_DOUBLE_STACK:
+        /*
+        Available space is only between end of 1st and top of 2nd.
+        */
+        {
+            const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+            const VmaSuballocation& topSuballoc2nd = suballocations2nd.back();
+            const VmaSuballocation& lastSuballoc1st = suballocations1st.back();
+            return topSuballoc2nd.offset - (lastSuballoc1st.offset + lastSuballoc1st.size);
+        }
+        break;
+
+    default:
+        VMA_ASSERT(0);
+        return 0;
+    }
+}
+
+void VmaBlockMetadata_Linear::CalcAllocationStatInfo(VmaStatInfo& outInfo) const
+{
+    const VkDeviceSize size = GetSize();
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    const size_t suballoc1stCount = suballocations1st.size();
+    const size_t suballoc2ndCount = suballocations2nd.size();
+
+    outInfo.blockCount = 1;
+    outInfo.allocationCount = (uint32_t)GetAllocationCount();
+    outInfo.unusedRangeCount = 0;
+    outInfo.usedBytes = 0;
+    outInfo.allocationSizeMin = UINT64_MAX;
+    outInfo.allocationSizeMax = 0;
+    outInfo.unusedRangeSizeMin = UINT64_MAX;
+    outInfo.unusedRangeSizeMax = 0;
+
+    VkDeviceSize lastOffset = 0;
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;
+        size_t nextAlloc2ndIndex = 0;
+        while(lastOffset < freeSpace2ndTo1stEnd)
+        {
+            // Find next non-null allocation or move nextAllocIndex to the end.
+            while(nextAlloc2ndIndex < suballoc2ndCount &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                ++nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex < suballoc2ndCount)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    ++outInfo.unusedRangeCount;
+                    outInfo.unusedBytes += unusedRangeSize;
+                    outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                    outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                outInfo.usedBytes += suballoc.size;
+                outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size);
+                outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size);
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                ++nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                // There is free space from lastOffset to freeSpace2ndTo1stEnd.
+                if(lastOffset < freeSpace2ndTo1stEnd)
+                {
+                    const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;
+                    ++outInfo.unusedRangeCount;
+                    outInfo.unusedBytes += unusedRangeSize;
+                    outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                    outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+               }
+
+                // End of loop.
+                lastOffset = freeSpace2ndTo1stEnd;
+            }
+        }
+    }
+
+    size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;
+    const VkDeviceSize freeSpace1stTo2ndEnd =
+        m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;
+    while(lastOffset < freeSpace1stTo2ndEnd)
+    {
+        // Find next non-null allocation or move nextAllocIndex to the end.
+        while(nextAlloc1stIndex < suballoc1stCount &&
+            suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE)
+        {
+            ++nextAlloc1stIndex;
+        }
+
+        // Found non-null allocation.
+        if(nextAlloc1stIndex < suballoc1stCount)
+        {
+            const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];
+            
+            // 1. Process free space before this allocation.
+            if(lastOffset < suballoc.offset)
+            {
+                // There is free space from lastOffset to suballoc.offset.
+                const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                ++outInfo.unusedRangeCount;
+                outInfo.unusedBytes += unusedRangeSize;
+                outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+            }
+            
+            // 2. Process this allocation.
+            // There is allocation with suballoc.offset, suballoc.size.
+            outInfo.usedBytes += suballoc.size;
+            outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size);
+            outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size);
+            
+            // 3. Prepare for next iteration.
+            lastOffset = suballoc.offset + suballoc.size;
+            ++nextAlloc1stIndex;
+        }
+        // We are at the end.
+        else
+        {
+            // There is free space from lastOffset to freeSpace1stTo2ndEnd.
+            if(lastOffset < freeSpace1stTo2ndEnd)
+            {
+                const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;
+                ++outInfo.unusedRangeCount;
+                outInfo.unusedBytes += unusedRangeSize;
+                outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+           }
+
+            // End of loop.
+            lastOffset = freeSpace1stTo2ndEnd;
+        }
+    }
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;
+        while(lastOffset < size)
+        {
+            // Find next non-null allocation or move nextAllocIndex to the end.
+            while(nextAlloc2ndIndex != SIZE_MAX &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                --nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex != SIZE_MAX)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    ++outInfo.unusedRangeCount;
+                    outInfo.unusedBytes += unusedRangeSize;
+                    outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                    outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                outInfo.usedBytes += suballoc.size;
+                outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size);
+                outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size);
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                --nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                // There is free space from lastOffset to size.
+                if(lastOffset < size)
+                {
+                    const VkDeviceSize unusedRangeSize = size - lastOffset;
+                    ++outInfo.unusedRangeCount;
+                    outInfo.unusedBytes += unusedRangeSize;
+                    outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                    outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+               }
+
+                // End of loop.
+                lastOffset = size;
+            }
+        }
+    }
+
+    outInfo.unusedBytes = size - outInfo.usedBytes;
+}
+
+void VmaBlockMetadata_Linear::AddPoolStats(VmaPoolStats& inoutStats) const
+{
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    const VkDeviceSize size = GetSize();
+    const size_t suballoc1stCount = suballocations1st.size();
+    const size_t suballoc2ndCount = suballocations2nd.size();
+
+    inoutStats.size += size;
+
+    VkDeviceSize lastOffset = 0;
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;
+        size_t nextAlloc2ndIndex = m_1stNullItemsBeginCount;
+        while(lastOffset < freeSpace2ndTo1stEnd)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex < suballoc2ndCount &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                ++nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex < suballoc2ndCount)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    inoutStats.unusedSize += unusedRangeSize;
+                    ++inoutStats.unusedRangeCount;
+                    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                ++inoutStats.allocationCount;
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                ++nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < freeSpace2ndTo1stEnd)
+                {
+                    // There is free space from lastOffset to freeSpace2ndTo1stEnd.
+                    const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;
+                    inoutStats.unusedSize += unusedRangeSize;
+                    ++inoutStats.unusedRangeCount;
+                    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+                }
+
+                // End of loop.
+                lastOffset = freeSpace2ndTo1stEnd;
+            }
+        }
+    }
+
+    size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;
+    const VkDeviceSize freeSpace1stTo2ndEnd =
+        m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;
+    while(lastOffset < freeSpace1stTo2ndEnd)
+    {
+        // Find next non-null allocation or move nextAllocIndex to the end.
+        while(nextAlloc1stIndex < suballoc1stCount &&
+            suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE)
+        {
+            ++nextAlloc1stIndex;
+        }
+
+        // Found non-null allocation.
+        if(nextAlloc1stIndex < suballoc1stCount)
+        {
+            const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];
+            
+            // 1. Process free space before this allocation.
+            if(lastOffset < suballoc.offset)
+            {
+                // There is free space from lastOffset to suballoc.offset.
+                const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                inoutStats.unusedSize += unusedRangeSize;
+                ++inoutStats.unusedRangeCount;
+                inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+            }
+            
+            // 2. Process this allocation.
+            // There is allocation with suballoc.offset, suballoc.size.
+            ++inoutStats.allocationCount;
+            
+            // 3. Prepare for next iteration.
+            lastOffset = suballoc.offset + suballoc.size;
+            ++nextAlloc1stIndex;
+        }
+        // We are at the end.
+        else
+        {
+            if(lastOffset < freeSpace1stTo2ndEnd)
+            {
+                // There is free space from lastOffset to freeSpace1stTo2ndEnd.
+                const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;
+                inoutStats.unusedSize += unusedRangeSize;
+                ++inoutStats.unusedRangeCount;
+                inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+            }
+
+            // End of loop.
+            lastOffset = freeSpace1stTo2ndEnd;
+        }
+    }
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;
+        while(lastOffset < size)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex != SIZE_MAX &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                --nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex != SIZE_MAX)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    inoutStats.unusedSize += unusedRangeSize;
+                    ++inoutStats.unusedRangeCount;
+                    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                ++inoutStats.allocationCount;
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                --nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < size)
+                {
+                    // There is free space from lastOffset to size.
+                    const VkDeviceSize unusedRangeSize = size - lastOffset;
+                    inoutStats.unusedSize += unusedRangeSize;
+                    ++inoutStats.unusedRangeCount;
+                    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+                }
+
+                // End of loop.
+                lastOffset = size;
+            }
+        }
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+void VmaBlockMetadata_Linear::PrintDetailedMap(class VmaJsonWriter& json) const
+{
+    const VkDeviceSize size = GetSize();
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    const size_t suballoc1stCount = suballocations1st.size();
+    const size_t suballoc2ndCount = suballocations2nd.size();
+
+    // FIRST PASS
+
+    size_t unusedRangeCount = 0;
+    VkDeviceSize usedBytes = 0;
+
+    VkDeviceSize lastOffset = 0;
+
+    size_t alloc2ndCount = 0;
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;
+        size_t nextAlloc2ndIndex = 0;
+        while(lastOffset < freeSpace2ndTo1stEnd)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex < suballoc2ndCount &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                ++nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex < suballoc2ndCount)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    ++unusedRangeCount;
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                ++alloc2ndCount;
+                usedBytes += suballoc.size;
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                ++nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < freeSpace2ndTo1stEnd)
+                {
+                    // There is free space from lastOffset to freeSpace2ndTo1stEnd.
+                    ++unusedRangeCount;
+                }
+
+                // End of loop.
+                lastOffset = freeSpace2ndTo1stEnd;
+            }
+        }
+    }
+
+    size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;
+    size_t alloc1stCount = 0;
+    const VkDeviceSize freeSpace1stTo2ndEnd =
+        m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;
+    while(lastOffset < freeSpace1stTo2ndEnd)
+    {
+        // Find next non-null allocation or move nextAllocIndex to the end.
+        while(nextAlloc1stIndex < suballoc1stCount &&
+            suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE)
+        {
+            ++nextAlloc1stIndex;
+        }
+
+        // Found non-null allocation.
+        if(nextAlloc1stIndex < suballoc1stCount)
+        {
+            const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];
+            
+            // 1. Process free space before this allocation.
+            if(lastOffset < suballoc.offset)
+            {
+                // There is free space from lastOffset to suballoc.offset.
+                ++unusedRangeCount;
+            }
+            
+            // 2. Process this allocation.
+            // There is allocation with suballoc.offset, suballoc.size.
+            ++alloc1stCount;
+            usedBytes += suballoc.size;
+            
+            // 3. Prepare for next iteration.
+            lastOffset = suballoc.offset + suballoc.size;
+            ++nextAlloc1stIndex;
+        }
+        // We are at the end.
+        else
+        {
+            if(lastOffset < size)
+            {
+                // There is free space from lastOffset to freeSpace1stTo2ndEnd.
+                ++unusedRangeCount;
+            }
+
+            // End of loop.
+            lastOffset = freeSpace1stTo2ndEnd;
+        }
+    }
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;
+        while(lastOffset < size)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex != SIZE_MAX &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                --nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex != SIZE_MAX)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    ++unusedRangeCount;
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                ++alloc2ndCount;
+                usedBytes += suballoc.size;
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                --nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < size)
+                {
+                    // There is free space from lastOffset to size.
+                    ++unusedRangeCount;
+                }
+
+                // End of loop.
+                lastOffset = size;
+            }
+        }
+    }
+
+    const VkDeviceSize unusedBytes = size - usedBytes;
+    PrintDetailedMap_Begin(json, unusedBytes, alloc1stCount + alloc2ndCount, unusedRangeCount);
+
+    // SECOND PASS
+    lastOffset = 0;
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;
+        size_t nextAlloc2ndIndex = 0;
+        while(lastOffset < freeSpace2ndTo1stEnd)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex < suballoc2ndCount &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                ++nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex < suballoc2ndCount)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation);
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                ++nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < freeSpace2ndTo1stEnd)
+                {
+                    // There is free space from lastOffset to freeSpace2ndTo1stEnd.
+                    const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;
+                    PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+                }
+
+                // End of loop.
+                lastOffset = freeSpace2ndTo1stEnd;
+            }
+        }
+    }
+
+    nextAlloc1stIndex = m_1stNullItemsBeginCount;
+    while(lastOffset < freeSpace1stTo2ndEnd)
+    {
+        // Find next non-null allocation or move nextAllocIndex to the end.
+        while(nextAlloc1stIndex < suballoc1stCount &&
+            suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE)
+        {
+            ++nextAlloc1stIndex;
+        }
+
+        // Found non-null allocation.
+        if(nextAlloc1stIndex < suballoc1stCount)
+        {
+            const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];
+            
+            // 1. Process free space before this allocation.
+            if(lastOffset < suballoc.offset)
+            {
+                // There is free space from lastOffset to suballoc.offset.
+                const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+            }
+            
+            // 2. Process this allocation.
+            // There is allocation with suballoc.offset, suballoc.size.
+            PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation);
+            
+            // 3. Prepare for next iteration.
+            lastOffset = suballoc.offset + suballoc.size;
+            ++nextAlloc1stIndex;
+        }
+        // We are at the end.
+        else
+        {
+            if(lastOffset < freeSpace1stTo2ndEnd)
+            {
+                // There is free space from lastOffset to freeSpace1stTo2ndEnd.
+                const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;
+                PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+            }
+
+            // End of loop.
+            lastOffset = freeSpace1stTo2ndEnd;
+        }
+    }
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;
+        while(lastOffset < size)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex != SIZE_MAX &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                --nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex != SIZE_MAX)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation);
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                --nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < size)
+                {
+                    // There is free space from lastOffset to size.
+                    const VkDeviceSize unusedRangeSize = size - lastOffset;
+                    PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+                }
+
+                // End of loop.
+                lastOffset = size;
+            }
+        }
+    }
+
+    PrintDetailedMap_End(json);
+}
+#endif // #if VMA_STATS_STRING_ENABLED
+
+bool VmaBlockMetadata_Linear::CreateAllocationRequest(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    bool upperAddress,
+    VmaSuballocationType allocType,
+    bool canMakeOtherLost,
+    uint32_t /*strategy*/,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    VMA_ASSERT(allocSize > 0);
+    VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(pAllocationRequest != VMA_NULL);
+    VMA_HEAVY_ASSERT(Validate());
+
+    const VkDeviceSize size = GetSize();
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    if(upperAddress)
+    {
+        if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+        {
+            VMA_ASSERT(0 && "Trying to use pool with linear algorithm as double stack, while it is already being used as ring buffer.");
+            return false;
+        }
+
+        // Try to allocate before 2nd.back(), or end of block if 2nd.empty().
+        if(allocSize > size)
+        {
+            return false;
+        }
+        VkDeviceSize resultBaseOffset = size - allocSize;
+        if(!suballocations2nd.empty())
+        {
+            const VmaSuballocation& lastSuballoc = suballocations2nd.back();
+            resultBaseOffset = lastSuballoc.offset - allocSize;
+            if(allocSize > lastSuballoc.offset)
+            {
+                return false;
+            }
+        }
+
+        // Start from offset equal to end of free space.
+        VkDeviceSize resultOffset = resultBaseOffset;
+
+        // Apply VMA_DEBUG_MARGIN at the end.
+        if(VMA_DEBUG_MARGIN > 0)
+        {
+#if VMA_DEBUG_MARGIN
+            if(resultOffset < VMA_DEBUG_MARGIN)
+            {
+                return false;
+            }
+#endif
+            resultOffset -= VMA_DEBUG_MARGIN;
+        }
+
+        // Apply alignment.
+        resultOffset = VmaAlignDown(resultOffset, allocAlignment);
+
+        // Check next suballocations from 2nd for BufferImageGranularity conflicts.
+        // Make bigger alignment if necessary.
+        if(bufferImageGranularity > 1 && !suballocations2nd.empty())
+        {
+            bool bufferImageGranularityConflict = false;
+            for(size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )
+            {
+                const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex];
+                if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(nextSuballoc.type, allocType))
+                    {
+                        bufferImageGranularityConflict = true;
+                        break;
+                    }
+                }
+                else
+                    // Already on previous page.
+                    break;
+            }
+            if(bufferImageGranularityConflict)
+            {
+                resultOffset = VmaAlignDown(resultOffset, bufferImageGranularity);
+            }
+        }
+
+        // There is enough free space.
+        const VkDeviceSize endOf1st = !suballocations1st.empty() ?
+            suballocations1st.back().offset + suballocations1st.back().size :
+            0;
+        if(endOf1st + VMA_DEBUG_MARGIN <= resultOffset)
+        {
+            // Check previous suballocations for BufferImageGranularity conflicts.
+            // If conflict exists, allocation cannot be made here.
+            if(bufferImageGranularity > 1)
+            {
+                for(size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )
+                {
+                    const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex];
+                    if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))
+                    {
+                        if(VmaIsBufferImageGranularityConflict(allocType, prevSuballoc.type))
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        // Already on next page.
+                        break;
+                    }
+                }
+            }
+
+            // All tests passed: Success.
+            pAllocationRequest->offset = resultOffset;
+            pAllocationRequest->sumFreeSize = resultBaseOffset + allocSize - endOf1st;
+            pAllocationRequest->sumItemSize = 0;
+            // pAllocationRequest->item unused.
+            pAllocationRequest->itemsToMakeLostCount = 0;
+            return true;
+        }
+    }
+    else // !upperAddress
+    {
+        if(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+        {
+            // Try to allocate at the end of 1st vector.
+
+            VkDeviceSize resultBaseOffset = 0;
+            if(!suballocations1st.empty())
+            {
+                const VmaSuballocation& lastSuballoc = suballocations1st.back();
+                resultBaseOffset = lastSuballoc.offset + lastSuballoc.size;
+            }
+
+            // Start from offset equal to beginning of free space.
+            VkDeviceSize resultOffset = resultBaseOffset;
+
+            // Apply VMA_DEBUG_MARGIN at the beginning.
+            if(VMA_DEBUG_MARGIN > 0)
+            {
+                resultOffset += VMA_DEBUG_MARGIN;
+            }
+
+            // Apply alignment.
+            resultOffset = VmaAlignUp(resultOffset, allocAlignment);
+
+            // Check previous suballocations for BufferImageGranularity conflicts.
+            // Make bigger alignment if necessary.
+            if(bufferImageGranularity > 1 && !suballocations1st.empty())
+            {
+                bool bufferImageGranularityConflict = false;
+                for(size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )
+                {
+                    const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex];
+                    if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))
+                    {
+                        if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))
+                        {
+                            bufferImageGranularityConflict = true;
+                            break;
+                        }
+                    }
+                    else
+                        // Already on previous page.
+                        break;
+                }
+                if(bufferImageGranularityConflict)
+                {
+                    resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity);
+                }
+            }
+
+            const VkDeviceSize freeSpaceEnd = m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ?
+                suballocations2nd.back().offset : size;
+
+            // There is enough free space at the end after alignment.
+            if(resultOffset + allocSize + VMA_DEBUG_MARGIN <= freeSpaceEnd)
+            {
+                // Check next suballocations for BufferImageGranularity conflicts.
+                // If conflict exists, allocation cannot be made here.
+                if(bufferImageGranularity > 1 && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+                {
+                    for(size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )
+                    {
+                        const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex];
+                        if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                        {
+                            if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))
+                            {
+                                return false;
+                            }
+                        }
+                        else
+                        {
+                            // Already on previous page.
+                            break;
+                        }
+                    }
+                }
+
+                // All tests passed: Success.
+                pAllocationRequest->offset = resultOffset;
+                pAllocationRequest->sumFreeSize = freeSpaceEnd - resultBaseOffset;
+                pAllocationRequest->sumItemSize = 0;
+                // pAllocationRequest->item unused.
+                pAllocationRequest->itemsToMakeLostCount = 0;
+                return true;
+            }
+        }
+
+        // Wrap-around to end of 2nd vector. Try to allocate there, watching for the
+        // beginning of 1st vector as the end of free space.
+        if(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+        {
+            VMA_ASSERT(!suballocations1st.empty());
+
+            VkDeviceSize resultBaseOffset = 0;
+            if(!suballocations2nd.empty())
+            {
+                const VmaSuballocation& lastSuballoc = suballocations2nd.back();
+                resultBaseOffset = lastSuballoc.offset + lastSuballoc.size;
+            }
+
+            // Start from offset equal to beginning of free space.
+            VkDeviceSize resultOffset = resultBaseOffset;
+
+            // Apply VMA_DEBUG_MARGIN at the beginning.
+            if(VMA_DEBUG_MARGIN > 0)
+            {
+                resultOffset += VMA_DEBUG_MARGIN;
+            }
+
+            // Apply alignment.
+            resultOffset = VmaAlignUp(resultOffset, allocAlignment);
+
+            // Check previous suballocations for BufferImageGranularity conflicts.
+            // Make bigger alignment if necessary.
+            if(bufferImageGranularity > 1 && !suballocations2nd.empty())
+            {
+                bool bufferImageGranularityConflict = false;
+                for(size_t prevSuballocIndex = suballocations2nd.size(); prevSuballocIndex--; )
+                {
+                    const VmaSuballocation& prevSuballoc = suballocations2nd[prevSuballocIndex];
+                    if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))
+                    {
+                        if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))
+                        {
+                            bufferImageGranularityConflict = true;
+                            break;
+                        }
+                    }
+                    else
+                        // Already on previous page.
+                        break;
+                }
+                if(bufferImageGranularityConflict)
+                {
+                    resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity);
+                }
+            }
+
+            pAllocationRequest->itemsToMakeLostCount = 0;
+            pAllocationRequest->sumItemSize = 0;
+            size_t index1st = m_1stNullItemsBeginCount;
+
+            if(canMakeOtherLost)
+            {
+                while(index1st < suballocations1st.size() &&
+                    resultOffset + allocSize + VMA_DEBUG_MARGIN > suballocations1st[index1st].offset)
+                {
+                    // Next colliding allocation at the beginning of 1st vector found. Try to make it lost.
+                    const VmaSuballocation& suballoc = suballocations1st[index1st];
+                    if(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE)
+                    {
+                        // No problem.
+                    }
+                    else
+                    {
+                        VMA_ASSERT(suballoc.hAllocation != VK_NULL_HANDLE);
+                        if(suballoc.hAllocation->CanBecomeLost() &&
+                            suballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+                        {
+                            ++pAllocationRequest->itemsToMakeLostCount;
+                            pAllocationRequest->sumItemSize += suballoc.size;
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                    ++index1st;
+                }
+
+                // Check next suballocations for BufferImageGranularity conflicts.
+                // If conflict exists, we must mark more allocations lost or fail.
+                if(bufferImageGranularity > 1)
+                {
+                    while(index1st < suballocations1st.size())
+                    {
+                        const VmaSuballocation& suballoc = suballocations1st[index1st];
+                        if(VmaBlocksOnSamePage(resultOffset, allocSize, suballoc.offset, bufferImageGranularity))
+                        {
+                            if(suballoc.hAllocation != VK_NULL_HANDLE)
+                            {
+                                // Not checking actual VmaIsBufferImageGranularityConflict(allocType, suballoc.type).
+                                if(suballoc.hAllocation->CanBecomeLost() &&
+                                    suballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+                                {
+                                    ++pAllocationRequest->itemsToMakeLostCount;
+                                    pAllocationRequest->sumItemSize += suballoc.size;
+                                }
+                                else
+                                {
+                                    return false;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // Already on next page.
+                            break;
+                        }
+                        ++index1st;
+                    }
+                }
+            }
+
+            // There is enough free space at the end after alignment.
+            if((index1st == suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN < size) ||
+                (index1st < suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN <= suballocations1st[index1st].offset))
+            {
+                // Check next suballocations for BufferImageGranularity conflicts.
+                // If conflict exists, allocation cannot be made here.
+                if(bufferImageGranularity > 1)
+                {
+                    for(size_t nextSuballocIndex = index1st;
+                        nextSuballocIndex < suballocations1st.size();
+                        nextSuballocIndex++)
+                    {
+                        const VmaSuballocation& nextSuballoc = suballocations1st[nextSuballocIndex];
+                        if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                        {
+                            if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))
+                            {
+                                return false;
+                            }
+                        }
+                        else
+                        {
+                            // Already on next page.
+                            break;
+                        }
+                    }
+                }
+
+                // All tests passed: Success.
+                pAllocationRequest->offset = resultOffset;
+                pAllocationRequest->sumFreeSize =
+                    (index1st < suballocations1st.size() ? suballocations1st[index1st].offset : size)
+                    - resultBaseOffset
+                    - pAllocationRequest->sumItemSize;
+                // pAllocationRequest->item unused.
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool VmaBlockMetadata_Linear::MakeRequestedAllocationsLost(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    if(pAllocationRequest->itemsToMakeLostCount == 0)
+    {
+        return true;
+    }
+
+    VMA_ASSERT(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER);
+    
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    size_t index1st = m_1stNullItemsBeginCount;
+    size_t madeLostCount = 0;
+    while(madeLostCount < pAllocationRequest->itemsToMakeLostCount)
+    {
+        VMA_ASSERT(index1st < suballocations1st.size());
+        VmaSuballocation& suballoc = suballocations1st[index1st];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            VMA_ASSERT(suballoc.hAllocation != VK_NULL_HANDLE);
+            VMA_ASSERT(suballoc.hAllocation->CanBecomeLost());
+            if(suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+            {
+                suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+                suballoc.hAllocation = VK_NULL_HANDLE;
+                m_SumFreeSize += suballoc.size;
+                ++m_1stNullItemsMiddleCount;
+                ++madeLostCount;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        ++index1st;
+    }
+
+    CleanupAfterFree();
+    //VMA_HEAVY_ASSERT(Validate()); // Already called by ClanupAfterFree().
+    
+    return true;
+}
+
+uint32_t VmaBlockMetadata_Linear::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount)
+{
+    uint32_t lostAllocationCount = 0;
+    
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    for(size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i)
+    {
+        VmaSuballocation& suballoc = suballocations1st[i];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE &&
+            suballoc.hAllocation->CanBecomeLost() &&
+            suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+        {
+            suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+            suballoc.hAllocation = VK_NULL_HANDLE;
+            ++m_1stNullItemsMiddleCount;
+            m_SumFreeSize += suballoc.size;
+            ++lostAllocationCount;
+        }
+    }
+
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    for(size_t i = 0, count = suballocations2nd.size(); i < count; ++i)
+    {
+        VmaSuballocation& suballoc = suballocations2nd[i];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE &&
+            suballoc.hAllocation->CanBecomeLost() &&
+            suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+        {
+            suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+            suballoc.hAllocation = VK_NULL_HANDLE;
+            ++m_2ndNullItemsCount;
+            ++lostAllocationCount;
+        }
+    }
+
+    if(lostAllocationCount)
+    {
+        CleanupAfterFree();
+    }
+
+    return lostAllocationCount;
+}
+
+VkResult VmaBlockMetadata_Linear::CheckCorruption(const void* pBlockData)
+{
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    for(size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i)
+    {
+        const VmaSuballocation& suballoc = suballocations1st[i];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            if(!VmaValidateMagicValue(pBlockData, suballoc.offset - VMA_DEBUG_MARGIN))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+            if(!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+        }
+    }
+
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    for(size_t i = 0, count = suballocations2nd.size(); i < count; ++i)
+    {
+        const VmaSuballocation& suballoc = suballocations2nd[i];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            if(!VmaValidateMagicValue(pBlockData, suballoc.offset - VMA_DEBUG_MARGIN))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+            if(!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+        }
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaBlockMetadata_Linear::Alloc(
+    const VmaAllocationRequest& request,
+    VmaSuballocationType type,
+    VkDeviceSize allocSize,
+    bool upperAddress,
+    VmaAllocation hAllocation)
+{
+    const VmaSuballocation newSuballoc = { request.offset, allocSize, hAllocation, type };
+
+    if(upperAddress)
+    {
+        VMA_ASSERT(m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER &&
+            "CRITICAL ERROR: Trying to use linear allocator as double stack while it was already used as ring buffer.");
+        SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+        suballocations2nd.push_back(newSuballoc);
+        m_2ndVectorMode = SECOND_VECTOR_DOUBLE_STACK;
+    }
+    else
+    {
+        SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+
+        // First allocation.
+        if(suballocations1st.empty())
+        {
+            suballocations1st.push_back(newSuballoc);
+        }
+        else
+        {
+            // New allocation at the end of 1st vector.
+            if(request.offset >= suballocations1st.back().offset + suballocations1st.back().size)
+            {
+                // Check if it fits before the end of the block.
+                VMA_ASSERT(request.offset + allocSize <= GetSize());
+                suballocations1st.push_back(newSuballoc);
+            }
+            // New allocation at the end of 2-part ring buffer, so before first allocation from 1st vector.
+            else if(request.offset + allocSize <= suballocations1st[m_1stNullItemsBeginCount].offset)
+            {
+                SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+                switch(m_2ndVectorMode)
+                {
+                case SECOND_VECTOR_EMPTY:
+                    // First allocation from second part ring buffer.
+                    VMA_ASSERT(suballocations2nd.empty());
+                    m_2ndVectorMode = SECOND_VECTOR_RING_BUFFER;
+                    break;
+                case SECOND_VECTOR_RING_BUFFER:
+                    // 2-part ring buffer is already started.
+                    VMA_ASSERT(!suballocations2nd.empty());
+                    break;
+                case SECOND_VECTOR_DOUBLE_STACK:
+                    VMA_ASSERT(0 && "CRITICAL ERROR: Trying to use linear allocator as ring buffer while it was already used as double stack.");
+                    break;
+                default:
+                    VMA_ASSERT(0);
+                }
+
+                suballocations2nd.push_back(newSuballoc);
+            }
+            else
+            {
+                VMA_ASSERT(0 && "CRITICAL INTERNAL ERROR.");
+            }
+        }
+    }
+
+    m_SumFreeSize -= newSuballoc.size;
+}
+
+void VmaBlockMetadata_Linear::Free(const VmaAllocation allocation)
+{
+    FreeAtOffset(allocation->GetOffset());
+}
+
+void VmaBlockMetadata_Linear::FreeAtOffset(VkDeviceSize offset)
+{
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    if(!suballocations1st.empty())
+    {
+        // First allocation: Mark it as next empty at the beginning.
+        VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount];
+        if(firstSuballoc.offset == offset)
+        {
+            firstSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+            firstSuballoc.hAllocation = VK_NULL_HANDLE;
+            m_SumFreeSize += firstSuballoc.size;
+            ++m_1stNullItemsBeginCount;
+            CleanupAfterFree();
+            return;
+        }
+    }
+
+    // Last allocation in 2-part ring buffer or top of upper stack (same logic).
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ||
+        m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        VmaSuballocation& lastSuballoc = suballocations2nd.back();
+        if(lastSuballoc.offset == offset)
+        {
+            m_SumFreeSize += lastSuballoc.size;
+            suballocations2nd.pop_back();
+            CleanupAfterFree();
+            return;
+        }
+    }
+    // Last allocation in 1st vector.
+    else if(m_2ndVectorMode == SECOND_VECTOR_EMPTY)
+    {
+        VmaSuballocation& lastSuballoc = suballocations1st.back();
+        if(lastSuballoc.offset == offset)
+        {
+            m_SumFreeSize += lastSuballoc.size;
+            suballocations1st.pop_back();
+            CleanupAfterFree();
+            return;
+        }
+    }
+
+    // Item from the middle of 1st vector.
+    {
+        VmaSuballocation refSuballoc;
+        refSuballoc.offset = offset;
+        // Rest of members stays uninitialized intentionally for better performance.
+        SuballocationVectorType::iterator it = VmaVectorFindSorted<VmaSuballocationOffsetLess>(
+            suballocations1st.begin() + m_1stNullItemsBeginCount,
+            suballocations1st.end(),
+            refSuballoc);
+        if(it != suballocations1st.end())
+        {
+            it->type = VMA_SUBALLOCATION_TYPE_FREE;
+            it->hAllocation = VK_NULL_HANDLE;
+            ++m_1stNullItemsMiddleCount;
+            m_SumFreeSize += it->size;
+            CleanupAfterFree();
+            return;
+        }
+    }
+
+    if(m_2ndVectorMode != SECOND_VECTOR_EMPTY)
+    {
+        // Item from the middle of 2nd vector.
+        VmaSuballocation refSuballoc;
+        refSuballoc.offset = offset;
+        // Rest of members stays uninitialized intentionally for better performance.
+        SuballocationVectorType::iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ?
+            VmaVectorFindSorted<VmaSuballocationOffsetLess>(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc) :
+            VmaVectorFindSorted<VmaSuballocationOffsetGreater>(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc);
+        if(it != suballocations2nd.end())
+        {
+            it->type = VMA_SUBALLOCATION_TYPE_FREE;
+            it->hAllocation = VK_NULL_HANDLE;
+            ++m_2ndNullItemsCount;
+            m_SumFreeSize += it->size;
+            CleanupAfterFree();
+            return;
+        }
+    }
+
+    VMA_ASSERT(0 && "Allocation to free not found in linear allocator!");
+}
+
+bool VmaBlockMetadata_Linear::ShouldCompact1st() const
+{
+    const size_t nullItemCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount;
+    const size_t suballocCount = AccessSuballocations1st().size();
+    return suballocCount > 32 && nullItemCount * 2 >= (suballocCount - nullItemCount) * 3;
+}
+
+void VmaBlockMetadata_Linear::CleanupAfterFree()
+{
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    if(IsEmpty())
+    {
+        suballocations1st.clear();
+        suballocations2nd.clear();
+        m_1stNullItemsBeginCount = 0;
+        m_1stNullItemsMiddleCount = 0;
+        m_2ndNullItemsCount = 0;
+        m_2ndVectorMode = SECOND_VECTOR_EMPTY;
+    }
+    else
+    {
+        const size_t suballoc1stCount = suballocations1st.size();
+        const size_t nullItem1stCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount;
+        VMA_ASSERT(nullItem1stCount <= suballoc1stCount);
+
+        // Find more null items at the beginning of 1st vector.
+        while(m_1stNullItemsBeginCount < suballoc1stCount &&
+            suballocations1st[m_1stNullItemsBeginCount].hAllocation == VK_NULL_HANDLE)
+        {
+            ++m_1stNullItemsBeginCount;
+            --m_1stNullItemsMiddleCount;
+        }
+
+        // Find more null items at the end of 1st vector.
+        while(m_1stNullItemsMiddleCount > 0 &&
+            suballocations1st.back().hAllocation == VK_NULL_HANDLE)
+        {
+            --m_1stNullItemsMiddleCount;
+            suballocations1st.pop_back();
+        }
+
+        // Find more null items at the end of 2nd vector.
+        while(m_2ndNullItemsCount > 0 &&
+            suballocations2nd.back().hAllocation == VK_NULL_HANDLE)
+        {
+            --m_2ndNullItemsCount;
+            suballocations2nd.pop_back();
+        }
+
+        if(ShouldCompact1st())
+        {
+            const size_t nonNullItemCount = suballoc1stCount - nullItem1stCount;
+            size_t srcIndex = m_1stNullItemsBeginCount;
+            for(size_t dstIndex = 0; dstIndex < nonNullItemCount; ++dstIndex)
+            {
+                while(suballocations1st[srcIndex].hAllocation == VK_NULL_HANDLE)
+                {
+                    ++srcIndex;
+                }
+                if(dstIndex != srcIndex)
+                {
+                    suballocations1st[dstIndex] = suballocations1st[srcIndex];
+                }
+                ++srcIndex;
+            }
+            suballocations1st.resize(nonNullItemCount);
+            m_1stNullItemsBeginCount = 0;
+            m_1stNullItemsMiddleCount = 0;
+        }
+
+        // 2nd vector became empty.
+        if(suballocations2nd.empty())
+        {
+            m_2ndVectorMode = SECOND_VECTOR_EMPTY;
+        }
+
+        // 1st vector became empty.
+        if(suballocations1st.size() - m_1stNullItemsBeginCount == 0)
+        {
+            suballocations1st.clear();
+            m_1stNullItemsBeginCount = 0;
+
+            if(!suballocations2nd.empty() && m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+            {
+                // Swap 1st with 2nd. Now 2nd is empty.
+                m_2ndVectorMode = SECOND_VECTOR_EMPTY;
+                m_1stNullItemsMiddleCount = m_2ndNullItemsCount;
+                while(m_1stNullItemsBeginCount < suballocations2nd.size() &&
+                    suballocations2nd[m_1stNullItemsBeginCount].hAllocation == VK_NULL_HANDLE)
+                {
+                    ++m_1stNullItemsBeginCount;
+                    --m_1stNullItemsMiddleCount;
+                }
+                m_2ndNullItemsCount = 0;
+                m_1stVectorIndex ^= 1;
+            }
+        }
+    }
+
+    VMA_HEAVY_ASSERT(Validate());
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaBlockMetadata_Buddy
+
+VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(VmaAllocator hAllocator) :
+    VmaBlockMetadata(hAllocator),
+    m_Root(VMA_NULL),
+    m_AllocationCount(0),
+    m_FreeCount(1),
+    m_SumFreeSize(0)
+{
+    memset(m_FreeList, 0, sizeof(m_FreeList));
+}
+
+VmaBlockMetadata_Buddy::~VmaBlockMetadata_Buddy()
+{
+    DeleteNode(m_Root);
+}
+
+void VmaBlockMetadata_Buddy::Init(VkDeviceSize size)
+{
+    VmaBlockMetadata::Init(size);
+
+    m_UsableSize = VmaPrevPow2(size);
+    m_SumFreeSize = m_UsableSize;
+
+    // Calculate m_LevelCount.
+    m_LevelCount = 1;
+    while(m_LevelCount < MAX_LEVELS &&
+        LevelToNodeSize(m_LevelCount) >= MIN_NODE_SIZE)
+    {
+        ++m_LevelCount;
+    }
+
+    Node* rootNode = vma_new(GetAllocationCallbacks(), Node)();
+    rootNode->offset = 0;
+    rootNode->type = Node::TYPE_FREE;
+    rootNode->parent = VMA_NULL;
+    rootNode->buddy = VMA_NULL;
+
+    m_Root = rootNode;
+    AddToFreeListFront(0, rootNode);
+}
+
+bool VmaBlockMetadata_Buddy::Validate() const
+{
+    // Validate tree.
+    ValidationContext ctx;
+    if(!ValidateNode(ctx, VMA_NULL, m_Root, 0, LevelToNodeSize(0)))
+    {
+        VMA_VALIDATE(false && "ValidateNode failed.");
+    }
+    VMA_VALIDATE(m_AllocationCount == ctx.calculatedAllocationCount);
+    VMA_VALIDATE(m_SumFreeSize == ctx.calculatedSumFreeSize);
+
+    // Validate free node lists.
+    for(uint32_t level = 0; level < m_LevelCount; ++level)
+    {
+        VMA_VALIDATE(m_FreeList[level].front == VMA_NULL ||
+            m_FreeList[level].front->free.prev == VMA_NULL);
+
+        for(Node* node = m_FreeList[level].front;
+            node != VMA_NULL;
+            node = node->free.next)
+        {
+            VMA_VALIDATE(node->type == Node::TYPE_FREE);
+            
+            if(node->free.next == VMA_NULL)
+            {
+                VMA_VALIDATE(m_FreeList[level].back == node);
+            }
+            else
+            {
+                VMA_VALIDATE(node->free.next->free.prev == node);
+            }
+        }
+    }
+
+    // Validate that free lists ar higher levels are empty.
+    for(uint32_t level = m_LevelCount; level < MAX_LEVELS; ++level)
+    {
+        VMA_VALIDATE(m_FreeList[level].front == VMA_NULL && m_FreeList[level].back == VMA_NULL);
+    }
+
+    return true;
+}
+
+VkDeviceSize VmaBlockMetadata_Buddy::GetUnusedRangeSizeMax() const
+{
+    for(uint32_t level = 0; level < m_LevelCount; ++level)
+    {
+        if(m_FreeList[level].front != VMA_NULL)
+        {
+            return LevelToNodeSize(level);
+        }
+    }
+    return 0;
+}
+
+void VmaBlockMetadata_Buddy::CalcAllocationStatInfo(VmaStatInfo& outInfo) const
+{
+    const VkDeviceSize unusableSize = GetUnusableSize();
+
+    outInfo.blockCount = 1;
+
+    outInfo.allocationCount = outInfo.unusedRangeCount = 0;
+    outInfo.usedBytes = outInfo.unusedBytes = 0;
+
+    outInfo.allocationSizeMax = outInfo.unusedRangeSizeMax = 0;
+    outInfo.allocationSizeMin = outInfo.unusedRangeSizeMin = UINT64_MAX;
+    outInfo.allocationSizeAvg = outInfo.unusedRangeSizeAvg = 0; // Unused.
+
+    CalcAllocationStatInfoNode(outInfo, m_Root, LevelToNodeSize(0));
+
+    if(unusableSize > 0)
+    {
+        ++outInfo.unusedRangeCount;
+        outInfo.unusedBytes += unusableSize;
+        outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, unusableSize);
+        outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusableSize);
+    }
+}
+
+void VmaBlockMetadata_Buddy::AddPoolStats(VmaPoolStats& inoutStats) const
+{
+    const VkDeviceSize unusableSize = GetUnusableSize();
+
+    inoutStats.size += GetSize();
+    inoutStats.unusedSize += m_SumFreeSize + unusableSize;
+    inoutStats.allocationCount += m_AllocationCount;
+    inoutStats.unusedRangeCount += m_FreeCount;
+    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, GetUnusedRangeSizeMax());
+
+    if(unusableSize > 0)
+    {
+        ++inoutStats.unusedRangeCount;
+        // Not updating inoutStats.unusedRangeSizeMax with unusableSize because this space is not available for allocations.
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaBlockMetadata_Buddy::PrintDetailedMap(class VmaJsonWriter& json) const
+{
+    // TODO optimize
+    VmaStatInfo stat;
+    CalcAllocationStatInfo(stat);
+
+    PrintDetailedMap_Begin(
+        json,
+        stat.unusedBytes,
+        stat.allocationCount,
+        stat.unusedRangeCount);
+
+    PrintDetailedMapNode(json, m_Root, LevelToNodeSize(0));
+
+    const VkDeviceSize unusableSize = GetUnusableSize();
+    if(unusableSize > 0)
+    {
+        PrintDetailedMap_UnusedRange(json,
+            m_UsableSize, // offset
+            unusableSize); // size
+    }
+
+    PrintDetailedMap_End(json);
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+bool VmaBlockMetadata_Buddy::CreateAllocationRequest(
+    uint32_t /*currentFrameIndex*/,
+    uint32_t /*frameInUseCount*/,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    bool upperAddress,
+    VmaSuballocationType allocType,
+    bool /*canMakeOtherLost*/,
+    uint32_t /*strategy*/,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    VMA_ASSERT(!upperAddress && "VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm.");
+    (void) upperAddress;
+
+    // Simple way to respect bufferImageGranularity. May be optimized some day.
+    // Whenever it might be an OPTIMAL image...
+    if(allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN ||
+        allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||
+        allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL)
+    {
+        allocAlignment = VMA_MAX(allocAlignment, bufferImageGranularity);
+        allocSize = VMA_MAX(allocSize, bufferImageGranularity);
+    }
+
+    if(allocSize > m_UsableSize)
+    {
+        return false;
+    }
+
+    const uint32_t targetLevel = AllocSizeToLevel(allocSize);
+    for(uint32_t level = targetLevel + 1; level--; )
+    {
+        for(Node* freeNode = m_FreeList[level].front;
+            freeNode != VMA_NULL;
+            freeNode = freeNode->free.next)
+        {
+            if(freeNode->offset % allocAlignment == 0)
+            {
+                pAllocationRequest->offset = freeNode->offset;
+                pAllocationRequest->sumFreeSize = LevelToNodeSize(level);
+                pAllocationRequest->sumItemSize = 0;
+                pAllocationRequest->itemsToMakeLostCount = 0;
+                pAllocationRequest->customData = (void*)(uintptr_t)level;
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool VmaBlockMetadata_Buddy::MakeRequestedAllocationsLost(
+    uint32_t /*currentFrameIndex*/,
+    uint32_t /*frameInUseCount*/,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    /*
+    Lost allocations are not supported in buddy allocator at the moment.
+    Support might be added in the future.
+    */
+    return pAllocationRequest->itemsToMakeLostCount == 0;
+}
+
+uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t /*currentFrameIndex*/, uint32_t /*frameInUseCount*/)
+{
+    /*
+    Lost allocations are not supported in buddy allocator at the moment.
+    Support might be added in the future.
+    */
+    return 0;
+}
+
+void VmaBlockMetadata_Buddy::Alloc(
+    const VmaAllocationRequest& request,
+    VmaSuballocationType /*type*/,
+    VkDeviceSize allocSize,
+    bool /*upperAddress*/,
+    VmaAllocation hAllocation)
+{
+    const uint32_t targetLevel = AllocSizeToLevel(allocSize);
+    uint32_t currLevel = (uint32_t)(uintptr_t)request.customData;
+    
+    Node* currNode = m_FreeList[currLevel].front;
+    VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE);
+    while(currNode->offset != request.offset)
+    {
+        currNode = currNode->free.next;
+        VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE);
+    }
+    
+    // Go down, splitting free nodes.
+    while(currLevel < targetLevel)
+    {
+        // currNode is already first free node at currLevel.
+        // Remove it from list of free nodes at this currLevel.
+        RemoveFromFreeList(currLevel, currNode);
+         
+        const uint32_t childrenLevel = currLevel + 1;
+
+        // Create two free sub-nodes.
+        Node* leftChild = vma_new(GetAllocationCallbacks(), Node)();
+        Node* rightChild = vma_new(GetAllocationCallbacks(), Node)();
+
+        leftChild->offset = currNode->offset;
+        leftChild->type = Node::TYPE_FREE;
+        leftChild->parent = currNode;
+        leftChild->buddy = rightChild;
+
+        rightChild->offset = currNode->offset + LevelToNodeSize(childrenLevel);
+        rightChild->type = Node::TYPE_FREE;
+        rightChild->parent = currNode;
+        rightChild->buddy = leftChild;
+
+        // Convert current currNode to split type.
+        currNode->type = Node::TYPE_SPLIT;
+        currNode->split.leftChild = leftChild;
+
+        // Add child nodes to free list. Order is important!
+        AddToFreeListFront(childrenLevel, rightChild);
+        AddToFreeListFront(childrenLevel, leftChild);
+
+        ++m_FreeCount;
+        //m_SumFreeSize -= LevelToNodeSize(currLevel) % 2; // Useful only when level node sizes can be non power of 2.
+        ++currLevel;
+        currNode = m_FreeList[currLevel].front;
+
+        /*
+        We can be sure that currNode, as left child of node previously split,
+        also fullfills the alignment requirement.
+        */
+    }
+
+    // Remove from free list.
+    VMA_ASSERT(currLevel == targetLevel &&
+        currNode != VMA_NULL &&
+        currNode->type == Node::TYPE_FREE);
+    RemoveFromFreeList(currLevel, currNode);
+
+    // Convert to allocation node.
+    currNode->type = Node::TYPE_ALLOCATION;
+    currNode->allocation.alloc = hAllocation;
+
+    ++m_AllocationCount;
+    --m_FreeCount;
+    m_SumFreeSize -= allocSize;
+}
+
+void VmaBlockMetadata_Buddy::DeleteNode(Node* node)
+{
+    if(node->type == Node::TYPE_SPLIT)
+    {
+        DeleteNode(node->split.leftChild->buddy);
+        DeleteNode(node->split.leftChild);
+    }
+
+    vma_delete(GetAllocationCallbacks(), node);
+}
+
+bool VmaBlockMetadata_Buddy::ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const
+{
+    VMA_VALIDATE(level < m_LevelCount);
+    VMA_VALIDATE(curr->parent == parent);
+    VMA_VALIDATE((curr->buddy == VMA_NULL) == (parent == VMA_NULL));
+    VMA_VALIDATE(curr->buddy == VMA_NULL || curr->buddy->buddy == curr);
+    switch(curr->type)
+    {
+    case Node::TYPE_FREE:
+        // curr->free.prev, next are validated separately.
+        ctx.calculatedSumFreeSize += levelNodeSize;
+        ++ctx.calculatedFreeCount;
+        break;
+    case Node::TYPE_ALLOCATION:
+        ++ctx.calculatedAllocationCount;
+        ctx.calculatedSumFreeSize += levelNodeSize - curr->allocation.alloc->GetSize();
+        VMA_VALIDATE(curr->allocation.alloc != VK_NULL_HANDLE);
+        break;
+    case Node::TYPE_SPLIT:
+        {
+            const uint32_t childrenLevel = level + 1;
+            const VkDeviceSize childrenLevelNodeSize = levelNodeSize / 2;
+            const Node* const leftChild = curr->split.leftChild;
+            VMA_VALIDATE(leftChild != VMA_NULL);
+            VMA_VALIDATE(leftChild->offset == curr->offset);
+            if(!ValidateNode(ctx, curr, leftChild, childrenLevel, childrenLevelNodeSize))
+            {
+                VMA_VALIDATE(false && "ValidateNode for left child failed.");
+            }
+            const Node* const rightChild = leftChild->buddy;
+            VMA_VALIDATE(rightChild->offset == curr->offset + childrenLevelNodeSize);
+            if(!ValidateNode(ctx, curr, rightChild, childrenLevel, childrenLevelNodeSize))
+            {
+                VMA_VALIDATE(false && "ValidateNode for right child failed.");
+            }
+        }
+        break;
+    default:
+        return false;
+    }
+
+    return true;
+}
+
+uint32_t VmaBlockMetadata_Buddy::AllocSizeToLevel(VkDeviceSize allocSize) const
+{
+    // I know this could be optimized somehow e.g. by using std::log2p1 from C++20.
+    uint32_t level = 0;
+    VkDeviceSize currLevelNodeSize = m_UsableSize;
+    VkDeviceSize nextLevelNodeSize = currLevelNodeSize >> 1;
+    while(allocSize <= nextLevelNodeSize && level + 1 < m_LevelCount)
+    {
+        ++level;
+        currLevelNodeSize = nextLevelNodeSize;
+        nextLevelNodeSize = currLevelNodeSize >> 1;
+    }
+    return level;
+}
+
+void VmaBlockMetadata_Buddy::FreeAtOffset(VmaAllocation alloc, VkDeviceSize offset)
+{
+    // Find node and level.
+    Node* node = m_Root;
+    VkDeviceSize nodeOffset = 0;
+    uint32_t level = 0;
+    VkDeviceSize levelNodeSize = LevelToNodeSize(0);
+    while(node->type == Node::TYPE_SPLIT)
+    {
+        const VkDeviceSize nextLevelSize = levelNodeSize >> 1;
+        if(offset < nodeOffset + nextLevelSize)
+        {
+            node = node->split.leftChild;
+        }
+        else
+        {
+            node = node->split.leftChild->buddy;
+            nodeOffset += nextLevelSize;
+        }
+        ++level;
+        levelNodeSize = nextLevelSize;
+    }
+
+    VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION);
+    VMA_ASSERT(alloc == VK_NULL_HANDLE || node->allocation.alloc == alloc);
+
+    ++m_FreeCount;
+    --m_AllocationCount;
+    m_SumFreeSize += alloc->GetSize();
+
+    node->type = Node::TYPE_FREE;
+
+    // Join free nodes if possible.
+    while(level > 0 && node->buddy->type == Node::TYPE_FREE)
+    {
+        RemoveFromFreeList(level, node->buddy);
+        Node* const parent = node->parent;
+
+        vma_delete(GetAllocationCallbacks(), node->buddy);
+        vma_delete(GetAllocationCallbacks(), node);
+        parent->type = Node::TYPE_FREE;
+        
+        node = parent;
+        --level;
+        //m_SumFreeSize += LevelToNodeSize(level) % 2; // Useful only when level node sizes can be non power of 2.
+        --m_FreeCount;
+    }
+
+    AddToFreeListFront(level, node);
+}
+
+void VmaBlockMetadata_Buddy::CalcAllocationStatInfoNode(VmaStatInfo& outInfo, const Node* node, VkDeviceSize levelNodeSize) const
+{
+    switch(node->type)
+    {
+    case Node::TYPE_FREE:
+        ++outInfo.unusedRangeCount;
+        outInfo.unusedBytes += levelNodeSize;
+        outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, levelNodeSize);
+        outInfo.unusedRangeSizeMin = VMA_MAX(outInfo.unusedRangeSizeMin, levelNodeSize);
+        break;
+    case Node::TYPE_ALLOCATION:
+        {
+            const VkDeviceSize allocSize = node->allocation.alloc->GetSize();
+            ++outInfo.allocationCount;
+            outInfo.usedBytes += allocSize;
+            outInfo.allocationSizeMax = VMA_MAX(outInfo.allocationSizeMax, allocSize);
+            outInfo.allocationSizeMin = VMA_MAX(outInfo.allocationSizeMin, allocSize);
+
+            const VkDeviceSize unusedRangeSize = levelNodeSize - allocSize;
+            if(unusedRangeSize > 0)
+            {
+                ++outInfo.unusedRangeCount;
+                outInfo.unusedBytes += unusedRangeSize;
+                outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, unusedRangeSize);
+                outInfo.unusedRangeSizeMin = VMA_MAX(outInfo.unusedRangeSizeMin, unusedRangeSize);
+            }
+        }
+        break;
+    case Node::TYPE_SPLIT:
+        {
+            const VkDeviceSize childrenNodeSize = levelNodeSize / 2;
+            const Node* const leftChild = node->split.leftChild;
+            CalcAllocationStatInfoNode(outInfo, leftChild, childrenNodeSize);
+            const Node* const rightChild = leftChild->buddy;
+            CalcAllocationStatInfoNode(outInfo, rightChild, childrenNodeSize);
+        }
+        break;
+    default:
+        VMA_ASSERT(0);
+    }
+}
+
+void VmaBlockMetadata_Buddy::AddToFreeListFront(uint32_t level, Node* node)
+{
+    VMA_ASSERT(node->type == Node::TYPE_FREE);
+
+    // List is empty.
+    Node* const frontNode = m_FreeList[level].front;
+    if(frontNode == VMA_NULL)
+    {
+        VMA_ASSERT(m_FreeList[level].back == VMA_NULL);
+        node->free.prev = node->free.next = VMA_NULL;
+        m_FreeList[level].front = m_FreeList[level].back = node;
+    }
+    else
+    {
+        VMA_ASSERT(frontNode->free.prev == VMA_NULL);
+        node->free.prev = VMA_NULL;
+        node->free.next = frontNode;
+        frontNode->free.prev = node;
+        m_FreeList[level].front = node;
+    }
+}
+
+void VmaBlockMetadata_Buddy::RemoveFromFreeList(uint32_t level, Node* node)
+{
+    VMA_ASSERT(m_FreeList[level].front != VMA_NULL);
+
+    // It is at the front.
+    if(node->free.prev == VMA_NULL)
+    {
+        VMA_ASSERT(m_FreeList[level].front == node);
+        m_FreeList[level].front = node->free.next;
+    }
+    else
+    {
+        Node* const prevFreeNode = node->free.prev;
+        VMA_ASSERT(prevFreeNode->free.next == node);
+        prevFreeNode->free.next = node->free.next;
+    }
+
+    // It is at the back.
+    if(node->free.next == VMA_NULL)
+    {
+        VMA_ASSERT(m_FreeList[level].back == node);
+        m_FreeList[level].back = node->free.prev;
+    }
+    else
+    {
+        Node* const nextFreeNode = node->free.next;
+        VMA_ASSERT(nextFreeNode->free.prev == node);
+        nextFreeNode->free.prev = node->free.prev;
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const
+{
+    switch(node->type)
+    {
+    case Node::TYPE_FREE:
+        PrintDetailedMap_UnusedRange(json, node->offset, levelNodeSize);
+        break;
+    case Node::TYPE_ALLOCATION:
+        {   
+            PrintDetailedMap_Allocation(json, node->offset, node->allocation.alloc);
+            const VkDeviceSize allocSize = node->allocation.alloc->GetSize();
+            if(allocSize < levelNodeSize)
+            {
+                PrintDetailedMap_UnusedRange(json, node->offset + allocSize, levelNodeSize - allocSize);
+            }
+        }
+        break;
+    case Node::TYPE_SPLIT:
+        {
+            const VkDeviceSize childrenNodeSize = levelNodeSize / 2;
+            const Node* const leftChild = node->split.leftChild;
+            PrintDetailedMapNode(json, leftChild, childrenNodeSize);
+            const Node* const rightChild = leftChild->buddy;
+            PrintDetailedMapNode(json, rightChild, childrenNodeSize);
+        }
+        break;
+    default:
+        VMA_ASSERT(0);
+    }
+}
+#endif // #if VMA_STATS_STRING_ENABLED
+
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaDeviceMemoryBlock
+
+VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator /*hAllocator*/) :
+    m_pMetadata(VMA_NULL),
+    m_MemoryTypeIndex(UINT32_MAX),
+    m_Id(0),
+    m_hMemory(VK_NULL_HANDLE),
+    m_MapCount(0),
+    m_pMappedData(VMA_NULL)
+{
+}
+
+void VmaDeviceMemoryBlock::Init(
+    VmaAllocator hAllocator,
+    uint32_t newMemoryTypeIndex,
+    VkDeviceMemory newMemory,
+    VkDeviceSize newSize,
+    uint32_t id,
+    uint32_t algorithm)
+{
+    VMA_ASSERT(m_hMemory == VK_NULL_HANDLE);
+
+    m_MemoryTypeIndex = newMemoryTypeIndex;
+    m_Id = id;
+    m_hMemory = newMemory;
+
+    switch(algorithm)
+    {
+    case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:
+        m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator);
+        break;
+    case VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT:
+        m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Buddy)(hAllocator);
+        break;
+    default:
+        VMA_ASSERT(0);
+        // Fall-through.
+    case 0:
+        m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Generic)(hAllocator);
+    }
+    m_pMetadata->Init(newSize);
+}
+
+void VmaDeviceMemoryBlock::Destroy(VmaAllocator allocator)
+{
+    // This is the most important assert in the entire library.
+    // Hitting it means you have some memory leak - unreleased VmaAllocation objects.
+    VMA_ASSERT(m_pMetadata->IsEmpty() && "Some allocations were not freed before destruction of this memory block!");
+
+    VMA_ASSERT(m_hMemory != VK_NULL_HANDLE);
+    allocator->FreeVulkanMemory(m_MemoryTypeIndex, m_pMetadata->GetSize(), m_hMemory);
+    m_hMemory = VK_NULL_HANDLE;
+
+    vma_delete(allocator, m_pMetadata);
+    m_pMetadata = VMA_NULL;
+}
+
+bool VmaDeviceMemoryBlock::Validate() const
+{
+    VMA_VALIDATE((m_hMemory != VK_NULL_HANDLE) &&
+        (m_pMetadata->GetSize() != 0));
+    
+    return m_pMetadata->Validate();
+}
+
+VkResult VmaDeviceMemoryBlock::CheckCorruption(VmaAllocator hAllocator)
+{
+    void* pData = nullptr;
+    VkResult res = Map(hAllocator, 1, &pData);
+    if(res != VK_SUCCESS)
+    {
+        return res;
+    }
+
+    res = m_pMetadata->CheckCorruption(pData);
+
+    Unmap(hAllocator, 1);
+
+    return res;
+}
+
+VkResult VmaDeviceMemoryBlock::Map(VmaAllocator hAllocator, uint32_t count, void** ppData)
+{
+    if(count == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex);
+    if(m_MapCount != 0)
+    {
+        m_MapCount += count;
+        VMA_ASSERT(m_pMappedData != VMA_NULL);
+        if(ppData != VMA_NULL)
+        {
+            *ppData = m_pMappedData;
+        }
+        return VK_SUCCESS;
+    }
+    else
+    {
+        VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(
+            hAllocator->m_hDevice,
+            m_hMemory,
+            0, // offset
+            VK_WHOLE_SIZE,
+            0, // flags
+            &m_pMappedData);
+        if(result == VK_SUCCESS)
+        {
+            if(ppData != VMA_NULL)
+            {
+                *ppData = m_pMappedData;
+            }
+            m_MapCount = count;
+        }
+        return result;
+    }
+}
+
+void VmaDeviceMemoryBlock::Unmap(VmaAllocator hAllocator, uint32_t count)
+{
+    if(count == 0)
+    {
+        return;
+    }
+
+    VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex);
+    if(m_MapCount >= count)
+    {
+        m_MapCount -= count;
+        if(m_MapCount == 0)
+        {
+            m_pMappedData = VMA_NULL;
+            (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory);
+        }
+    }
+    else
+    {
+        VMA_ASSERT(0 && "VkDeviceMemory block is being unmapped while it was not previously mapped.");
+    }
+}
+
+VkResult VmaDeviceMemoryBlock::WriteMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize)
+{
+    VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);
+    VMA_ASSERT(allocOffset >= VMA_DEBUG_MARGIN);
+
+    void* pData;
+    VkResult res = Map(hAllocator, 1, &pData);
+    if(res != VK_SUCCESS)
+    {
+        return res;
+    }
+
+    VmaWriteMagicValue(pData, allocOffset - VMA_DEBUG_MARGIN);
+    VmaWriteMagicValue(pData, allocOffset + allocSize);
+
+    Unmap(hAllocator, 1);
+
+    return VK_SUCCESS;
+}
+
+VkResult VmaDeviceMemoryBlock::ValidateMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize)
+{
+    VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);
+    VMA_ASSERT(allocOffset >= VMA_DEBUG_MARGIN);
+
+    void* pData;
+    VkResult res = Map(hAllocator, 1, &pData);
+    if(res != VK_SUCCESS)
+    {
+        return res;
+    }
+
+    if(!VmaValidateMagicValue(pData, allocOffset - VMA_DEBUG_MARGIN))
+    {
+        VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE FREED ALLOCATION!");
+    }
+    else if(!VmaValidateMagicValue(pData, allocOffset + allocSize))
+    {
+        VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER FREED ALLOCATION!");
+    }
+
+    Unmap(hAllocator, 1);
+
+    return VK_SUCCESS;
+}
+
+VkResult VmaDeviceMemoryBlock::BindBufferMemory(
+    const VmaAllocator hAllocator,
+    const VmaAllocation hAllocation,
+    VkBuffer hBuffer)
+{
+    VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK &&
+        hAllocation->GetBlock() == this);
+    // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads.
+    VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex);
+    return hAllocator->GetVulkanFunctions().vkBindBufferMemory(
+        hAllocator->m_hDevice,
+        hBuffer,
+        m_hMemory,
+        hAllocation->GetOffset());
+}
+
+VkResult VmaDeviceMemoryBlock::BindImageMemory(
+    const VmaAllocator hAllocator,
+    const VmaAllocation hAllocation,
+    VkImage hImage)
+{
+    VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK &&
+        hAllocation->GetBlock() == this);
+    // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads.
+    VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex);
+    return hAllocator->GetVulkanFunctions().vkBindImageMemory(
+        hAllocator->m_hDevice,
+        hImage,
+        m_hMemory,
+        hAllocation->GetOffset());
+}
+
+static void InitStatInfo(VmaStatInfo& outInfo)
+{
+    memset(&outInfo, 0, sizeof(outInfo));
+    outInfo.allocationSizeMin = UINT64_MAX;
+    outInfo.unusedRangeSizeMin = UINT64_MAX;
+}
+
+// Adds statistics srcInfo into inoutInfo, like: inoutInfo += srcInfo.
+static void VmaAddStatInfo(VmaStatInfo& inoutInfo, const VmaStatInfo& srcInfo)
+{
+    inoutInfo.blockCount += srcInfo.blockCount;
+    inoutInfo.allocationCount += srcInfo.allocationCount;
+    inoutInfo.unusedRangeCount += srcInfo.unusedRangeCount;
+    inoutInfo.usedBytes += srcInfo.usedBytes;
+    inoutInfo.unusedBytes += srcInfo.unusedBytes;
+    inoutInfo.allocationSizeMin = VMA_MIN(inoutInfo.allocationSizeMin, srcInfo.allocationSizeMin);
+    inoutInfo.allocationSizeMax = VMA_MAX(inoutInfo.allocationSizeMax, srcInfo.allocationSizeMax);
+    inoutInfo.unusedRangeSizeMin = VMA_MIN(inoutInfo.unusedRangeSizeMin, srcInfo.unusedRangeSizeMin);
+    inoutInfo.unusedRangeSizeMax = VMA_MAX(inoutInfo.unusedRangeSizeMax, srcInfo.unusedRangeSizeMax);
+}
+
+static void VmaPostprocessCalcStatInfo(VmaStatInfo& inoutInfo)
+{
+    inoutInfo.allocationSizeAvg = (inoutInfo.allocationCount > 0) ?
+        VmaRoundDiv<VkDeviceSize>(inoutInfo.usedBytes, inoutInfo.allocationCount) : 0;
+    inoutInfo.unusedRangeSizeAvg = (inoutInfo.unusedRangeCount > 0) ?
+        VmaRoundDiv<VkDeviceSize>(inoutInfo.unusedBytes, inoutInfo.unusedRangeCount) : 0;
+}
+
+VmaPool_T::VmaPool_T(
+    VmaAllocator hAllocator,
+    const VmaPoolCreateInfo& createInfo,
+    VkDeviceSize preferredBlockSize) :
+    m_BlockVector(
+        hAllocator,
+        createInfo.memoryTypeIndex,
+        createInfo.blockSize != 0 ? createInfo.blockSize : preferredBlockSize,
+        createInfo.minBlockCount,
+        createInfo.maxBlockCount,
+        (createInfo.flags & VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(),
+        createInfo.frameInUseCount,
+        true, // isCustomPool
+        createInfo.blockSize != 0, // explicitBlockSize
+        createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK), // algorithm
+    m_Id(0)
+{
+}
+
+VmaPool_T::~VmaPool_T()
+{
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+VmaBlockVector::VmaBlockVector(
+    VmaAllocator hAllocator,
+    uint32_t memoryTypeIndex,
+    VkDeviceSize preferredBlockSize,
+    size_t minBlockCount,
+    size_t maxBlockCount,
+    VkDeviceSize bufferImageGranularity,
+    uint32_t frameInUseCount,
+    bool isCustomPool,
+    bool explicitBlockSize,
+    uint32_t algorithm) :
+    m_hAllocator(hAllocator),
+    m_MemoryTypeIndex(memoryTypeIndex),
+    m_PreferredBlockSize(preferredBlockSize),
+    m_MinBlockCount(minBlockCount),
+    m_MaxBlockCount(maxBlockCount),
+    m_BufferImageGranularity(bufferImageGranularity),
+    m_FrameInUseCount(frameInUseCount),
+    m_IsCustomPool(isCustomPool),
+    m_ExplicitBlockSize(explicitBlockSize),
+    m_Algorithm(algorithm),
+    m_HasEmptyBlock(false),
+    m_Blocks(VmaStlAllocator<VmaDeviceMemoryBlock*>(hAllocator->GetAllocationCallbacks())),
+    m_NextBlockId(0)
+{
+}
+
+VmaBlockVector::~VmaBlockVector()
+{
+    for(size_t i = m_Blocks.size(); i--; )
+    {
+        m_Blocks[i]->Destroy(m_hAllocator);
+        vma_delete(m_hAllocator, m_Blocks[i]);
+    }
+}
+
+VkResult VmaBlockVector::CreateMinBlocks()
+{
+    for(size_t i = 0; i < m_MinBlockCount; ++i)
+    {
+        VkResult res = CreateBlock(m_PreferredBlockSize, VMA_NULL);
+        if(res != VK_SUCCESS)
+        {
+            return res;
+        }
+    }
+    return VK_SUCCESS;
+}
+
+void VmaBlockVector::GetPoolStats(VmaPoolStats* pStats)
+{
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+
+    const size_t blockCount = m_Blocks.size();
+
+    pStats->size = 0;
+    pStats->unusedSize = 0;
+    pStats->allocationCount = 0;
+    pStats->unusedRangeCount = 0;
+    pStats->unusedRangeSizeMax = 0;
+    pStats->blockCount = blockCount;
+
+    for(uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];
+        VMA_ASSERT(pBlock);
+        VMA_HEAVY_ASSERT(pBlock->Validate());
+        pBlock->m_pMetadata->AddPoolStats(*pStats);
+    }
+}
+
+bool VmaBlockVector::IsCorruptionDetectionEnabled() const
+{
+    const uint32_t requiredMemFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+    return (VMA_DEBUG_DETECT_CORRUPTION != 0) &&
+        (VMA_DEBUG_MARGIN > 0) &&
+        (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & requiredMemFlags) == requiredMemFlags;
+}
+
+static const uint32_t VMA_ALLOCATION_TRY_COUNT = 32;
+
+VkResult VmaBlockVector::Allocate(
+    VmaPool hCurrentPool,
+    uint32_t currentFrameIndex,
+    VkDeviceSize size,
+    VkDeviceSize alignment,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaSuballocationType suballocType,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    size_t allocIndex;
+    VkResult res = VK_SUCCESS;
+
+    {
+        VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
+        for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+        {
+            res = AllocatePage(
+                hCurrentPool,
+                currentFrameIndex,
+                size,
+                alignment,
+                createInfo,
+                suballocType,
+                pAllocations + allocIndex);
+            if(res != VK_SUCCESS)
+            {
+                break;
+            }
+        }
+    }
+
+    if(res != VK_SUCCESS)
+    {
+        // Free all already created allocations.
+        while(allocIndex--)
+        {
+            Free(pAllocations[allocIndex]);
+        }
+        memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);
+    }
+
+    return res;
+}
+
+VkResult VmaBlockVector::AllocatePage(
+    VmaPool hCurrentPool,
+    uint32_t currentFrameIndex,
+    VkDeviceSize size,
+    VkDeviceSize alignment,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaSuballocationType suballocType,
+    VmaAllocation* pAllocation)
+{
+    const bool isUpperAddress = (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;
+    bool canMakeOtherLost = (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT) != 0;
+    const bool mapped = (createInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0;
+    const bool isUserDataString = (createInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0;
+    const bool canCreateNewBlock =
+        ((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0) &&
+        (m_Blocks.size() < m_MaxBlockCount);
+    uint32_t strategy = createInfo.flags & VMA_ALLOCATION_CREATE_STRATEGY_MASK;
+
+    // If linearAlgorithm is used, canMakeOtherLost is available only when used as ring buffer.
+    // Which in turn is available only when maxBlockCount = 1.
+    if(m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT && m_MaxBlockCount > 1)
+    {
+        canMakeOtherLost = false;
+    }
+
+    // Upper address can only be used with linear allocator and within single memory block.
+    if(isUpperAddress &&
+        (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT || m_MaxBlockCount > 1))
+    {
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+    }
+
+    // Validate strategy.
+    switch(strategy)
+    {
+    case 0:
+        strategy = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT;
+        break;
+    case VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT:
+    case VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT:
+    case VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT:
+        break;
+    default:
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+    }
+
+    // Early reject: requested allocation size is larger that maximum block size for this block vector.
+    if(size + 2 * VMA_DEBUG_MARGIN > m_PreferredBlockSize)
+    {
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
+
+    /*
+    Under certain condition, this whole section can be skipped for optimization, so
+    we move on directly to trying to allocate with canMakeOtherLost. That's the case
+    e.g. for custom pools with linear algorithm.
+    */
+    if(!canMakeOtherLost || canCreateNewBlock)
+    {
+        // 1. Search existing allocations. Try to allocate without making other allocations lost.
+        VmaAllocationCreateFlags allocFlagsCopy = createInfo.flags;
+        allocFlagsCopy &= ~VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT;
+
+        if(m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)
+        {
+            // Use only last block.
+            if(!m_Blocks.empty())
+            {
+                VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks.back();
+                VMA_ASSERT(pCurrBlock);
+                VkResult res = AllocateFromBlock(
+                    pCurrBlock,
+                    hCurrentPool,
+                    currentFrameIndex,
+                    size,
+                    alignment,
+                    allocFlagsCopy,
+                    createInfo.pUserData,
+                    suballocType,
+                    strategy,
+                    pAllocation);
+                if(res == VK_SUCCESS)
+                {
+                    VMA_DEBUG_LOG("    Returned from last block #%u", (uint32_t)(m_Blocks.size() - 1));
+                    return VK_SUCCESS;
+                }
+            }
+        }
+        else
+        {
+            if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT)
+            {
+                // Forward order in m_Blocks - prefer blocks with smallest amount of free space.
+                for(size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex )
+                {
+                    VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];
+                    VMA_ASSERT(pCurrBlock);
+                    VkResult res = AllocateFromBlock(
+                        pCurrBlock,
+                        hCurrentPool,
+                        currentFrameIndex,
+                        size,
+                        alignment,
+                        allocFlagsCopy,
+                        createInfo.pUserData,
+                        suballocType,
+                        strategy,
+                        pAllocation);
+                    if(res == VK_SUCCESS)
+                    {
+                        VMA_DEBUG_LOG("    Returned from existing block #%u", (uint32_t)blockIndex);
+                        return VK_SUCCESS;
+                    }
+                }
+            }
+            else // WORST_FIT, FIRST_FIT
+            {
+                // Backward order in m_Blocks - prefer blocks with largest amount of free space.
+                for(size_t blockIndex = m_Blocks.size(); blockIndex--; )
+                {
+                    VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];
+                    VMA_ASSERT(pCurrBlock);
+                    VkResult res = AllocateFromBlock(
+                        pCurrBlock,
+                        hCurrentPool,
+                        currentFrameIndex,
+                        size,
+                        alignment,
+                        allocFlagsCopy,
+                        createInfo.pUserData,
+                        suballocType,
+                        strategy,
+                        pAllocation);
+                    if(res == VK_SUCCESS)
+                    {
+                        VMA_DEBUG_LOG("    Returned from existing block #%u", (uint32_t)blockIndex);
+                        return VK_SUCCESS;
+                    }
+                }
+            }
+        }
+
+        // 2. Try to create new block.
+        if(canCreateNewBlock)
+        {
+            // Calculate optimal size for new block.
+            VkDeviceSize newBlockSize = m_PreferredBlockSize;
+            uint32_t newBlockSizeShift = 0;
+            const uint32_t NEW_BLOCK_SIZE_SHIFT_MAX = 3;
+
+            if(!m_ExplicitBlockSize)
+            {
+                // Allocate 1/8, 1/4, 1/2 as first blocks.
+                const VkDeviceSize maxExistingBlockSize = CalcMaxBlockSize();
+                for(uint32_t i = 0; i < NEW_BLOCK_SIZE_SHIFT_MAX; ++i)
+                {
+                    const VkDeviceSize smallerNewBlockSize = newBlockSize / 2;
+                    if(smallerNewBlockSize > maxExistingBlockSize && smallerNewBlockSize >= size * 2)
+                    {
+                        newBlockSize = smallerNewBlockSize;
+                        ++newBlockSizeShift;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            size_t newBlockIndex = 0;
+            VkResult res = CreateBlock(newBlockSize, &newBlockIndex);
+            // Allocation of this size failed? Try 1/2, 1/4, 1/8 of m_PreferredBlockSize.
+            if(!m_ExplicitBlockSize)
+            {
+                while(res < 0 && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX)
+                {
+                    const VkDeviceSize smallerNewBlockSize = newBlockSize / 2;
+                    if(smallerNewBlockSize >= size)
+                    {
+                        newBlockSize = smallerNewBlockSize;
+                        ++newBlockSizeShift;
+                        res = CreateBlock(newBlockSize, &newBlockIndex);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            if(res == VK_SUCCESS)
+            {
+                VmaDeviceMemoryBlock* const pBlock = m_Blocks[newBlockIndex];
+                VMA_ASSERT(pBlock->m_pMetadata->GetSize() >= size);
+
+                res = AllocateFromBlock(
+                    pBlock,
+                    hCurrentPool,
+                    currentFrameIndex,
+                    size,
+                    alignment,
+                    allocFlagsCopy,
+                    createInfo.pUserData,
+                    suballocType,
+                    strategy,
+                    pAllocation);
+                if(res == VK_SUCCESS)
+                {
+                    VMA_DEBUG_LOG("    Created new block Size=%llu", newBlockSize);
+                    return VK_SUCCESS;
+                }
+                else
+                {
+                    // Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment.
+                    return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+                }
+            }
+        }
+    }
+
+    // 3. Try to allocate from existing blocks with making other allocations lost.
+    if(canMakeOtherLost)
+    {
+        uint32_t tryIndex = 0;
+        for(; tryIndex < VMA_ALLOCATION_TRY_COUNT; ++tryIndex)
+        {
+            VmaDeviceMemoryBlock* pBestRequestBlock = VMA_NULL;
+            VmaAllocationRequest bestRequest = {};
+            VkDeviceSize bestRequestCost = VK_WHOLE_SIZE;
+
+            // 1. Search existing allocations.
+            if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT)
+            {
+                // Forward order in m_Blocks - prefer blocks with smallest amount of free space.
+                for(size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex )
+                {
+                    VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];
+                    VMA_ASSERT(pCurrBlock);
+                    VmaAllocationRequest currRequest = {};
+                    if(pCurrBlock->m_pMetadata->CreateAllocationRequest(
+                        currentFrameIndex,
+                        m_FrameInUseCount,
+                        m_BufferImageGranularity,
+                        size,
+                        alignment,
+                        (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0,
+                        suballocType,
+                        canMakeOtherLost,
+                        strategy,
+                        &currRequest))
+                    {
+                        const VkDeviceSize currRequestCost = currRequest.CalcCost();
+                        if(pBestRequestBlock == VMA_NULL ||
+                            currRequestCost < bestRequestCost)
+                        {
+                            pBestRequestBlock = pCurrBlock;
+                            bestRequest = currRequest;
+                            bestRequestCost = currRequestCost;
+
+                            if(bestRequestCost == 0)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            else // WORST_FIT, FIRST_FIT
+            {
+                // Backward order in m_Blocks - prefer blocks with largest amount of free space.
+                for(size_t blockIndex = m_Blocks.size(); blockIndex--; )
+                {
+                    VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];
+                    VMA_ASSERT(pCurrBlock);
+                    VmaAllocationRequest currRequest = {};
+                    if(pCurrBlock->m_pMetadata->CreateAllocationRequest(
+                        currentFrameIndex,
+                        m_FrameInUseCount,
+                        m_BufferImageGranularity,
+                        size,
+                        alignment,
+                        (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0,
+                        suballocType,
+                        canMakeOtherLost,
+                        strategy,
+                        &currRequest))
+                    {
+                        const VkDeviceSize currRequestCost = currRequest.CalcCost();
+                        if(pBestRequestBlock == VMA_NULL ||
+                            currRequestCost < bestRequestCost ||
+                            strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT)
+                        {
+                            pBestRequestBlock = pCurrBlock;
+                            bestRequest = currRequest;
+                            bestRequestCost = currRequestCost;
+
+                            if(bestRequestCost == 0 ||
+                                strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if(pBestRequestBlock != VMA_NULL)
+            {
+                if(mapped)
+                {
+                    VkResult res = pBestRequestBlock->Map(m_hAllocator, 1, VMA_NULL);
+                    if(res != VK_SUCCESS)
+                    {
+                        return res;
+                    }
+                }
+
+                if(pBestRequestBlock->m_pMetadata->MakeRequestedAllocationsLost(
+                    currentFrameIndex,
+                    m_FrameInUseCount,
+                    &bestRequest))
+                {
+                    // We no longer have an empty Allocation.
+                    if(pBestRequestBlock->m_pMetadata->IsEmpty())
+                    {
+                        m_HasEmptyBlock = false;
+                    }
+                    // Allocate from this pBlock.
+                    *pAllocation = vma_new(m_hAllocator, VmaAllocation_T)(currentFrameIndex, isUserDataString);
+                    pBestRequestBlock->m_pMetadata->Alloc(bestRequest, suballocType, size, isUpperAddress, *pAllocation);
+                    (*pAllocation)->InitBlockAllocation(
+                        hCurrentPool,
+                        pBestRequestBlock,
+                        bestRequest.offset,
+                        alignment,
+                        size,
+                        suballocType,
+                        mapped,
+                        (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0);
+                    VMA_HEAVY_ASSERT(pBestRequestBlock->Validate());
+                    VMA_DEBUG_LOG("    Returned from existing allocation #%u", (uint32_t)blockIndex);
+                    (*pAllocation)->SetUserData(m_hAllocator, createInfo.pUserData);
+                    if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)
+                    {
+                        m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);
+                    }
+                    if(IsCorruptionDetectionEnabled())
+                    {
+                        VkResult res = pBestRequestBlock->WriteMagicValueAroundAllocation(m_hAllocator, bestRequest.offset, size);
+                        (void) res;
+                        VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value.");
+                    }
+                    return VK_SUCCESS;
+                }
+                // else: Some allocations must have been touched while we are here. Next try.
+            }
+            else
+            {
+                // Could not find place in any of the blocks - break outer loop.
+                break;
+            }
+        }
+        /* Maximum number of tries exceeded - a very unlike event when many other
+        threads are simultaneously touching allocations making it impossible to make
+        lost at the same time as we try to allocate. */
+        if(tryIndex == VMA_ALLOCATION_TRY_COUNT)
+        {
+            return VK_ERROR_TOO_MANY_OBJECTS;
+        }
+    }
+
+    return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+}
+
+void VmaBlockVector::Free(
+    VmaAllocation hAllocation)
+{
+    VmaDeviceMemoryBlock* pBlockToDelete = VMA_NULL;
+
+    // Scope for lock.
+    {
+        VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
+
+        VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();
+
+        if(IsCorruptionDetectionEnabled())
+        {
+            VkResult res = pBlock->ValidateMagicValueAroundAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize());
+            (void) res;
+            VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to validate magic value.");
+        }
+
+        if(hAllocation->IsPersistentMap())
+        {
+            pBlock->Unmap(m_hAllocator, 1);
+        }
+
+        pBlock->m_pMetadata->Free(hAllocation);
+        VMA_HEAVY_ASSERT(pBlock->Validate());
+
+        VMA_DEBUG_LOG("  Freed from MemoryTypeIndex=%u", memTypeIndex);
+
+        // pBlock became empty after this deallocation.
+        if(pBlock->m_pMetadata->IsEmpty())
+        {
+            // Already has empty Allocation. We don't want to have two, so delete this one.
+            if(m_HasEmptyBlock && m_Blocks.size() > m_MinBlockCount)
+            {
+                pBlockToDelete = pBlock;
+                Remove(pBlock);
+            }
+            // We now have first empty block.
+            else
+            {
+                m_HasEmptyBlock = true;
+            }
+        }
+        // pBlock didn't become empty, but we have another empty block - find and free that one.
+        // (This is optional, heuristics.)
+        else if(m_HasEmptyBlock)
+        {
+            VmaDeviceMemoryBlock* pLastBlock = m_Blocks.back();
+            if(pLastBlock->m_pMetadata->IsEmpty() && m_Blocks.size() > m_MinBlockCount)
+            {
+                pBlockToDelete = pLastBlock;
+                m_Blocks.pop_back();
+                m_HasEmptyBlock = false;
+            }
+        }
+
+        IncrementallySortBlocks();
+    }
+
+    // Destruction of a free Allocation. Deferred until this point, outside of mutex
+    // lock, for performance reason.
+    if(pBlockToDelete != VMA_NULL)
+    {
+        VMA_DEBUG_LOG("    Deleted empty allocation");
+        pBlockToDelete->Destroy(m_hAllocator);
+        vma_delete(m_hAllocator, pBlockToDelete);
+    }
+}
+
+VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const
+{
+    VkDeviceSize result = 0;
+    for(size_t i = m_Blocks.size(); i--; )
+    {
+        result = VMA_MAX(result, m_Blocks[i]->m_pMetadata->GetSize());
+        if(result >= m_PreferredBlockSize)
+        {
+            break;
+        }
+    }
+    return result;
+}
+
+void VmaBlockVector::Remove(VmaDeviceMemoryBlock* pBlock)
+{
+    for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)
+    {
+        if(m_Blocks[blockIndex] == pBlock)
+        {
+            VmaVectorRemove(m_Blocks, blockIndex);
+            return;
+        }
+    }
+    VMA_ASSERT(0);
+}
+
+void VmaBlockVector::IncrementallySortBlocks()
+{
+    if(m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)
+    {
+        // Bubble sort only until first swap.
+        for(size_t i = 1; i < m_Blocks.size(); ++i)
+        {
+            if(m_Blocks[i - 1]->m_pMetadata->GetSumFreeSize() > m_Blocks[i]->m_pMetadata->GetSumFreeSize())
+            {
+                VMA_SWAP(m_Blocks[i - 1], m_Blocks[i]);
+                return;
+            }
+        }
+    }
+}
+
+VkResult VmaBlockVector::AllocateFromBlock(
+    VmaDeviceMemoryBlock* pBlock,
+    VmaPool hCurrentPool,
+    uint32_t currentFrameIndex,
+    VkDeviceSize size,
+    VkDeviceSize alignment,
+    VmaAllocationCreateFlags allocFlags,
+    void* pUserData,
+    VmaSuballocationType suballocType,
+    uint32_t strategy,
+    VmaAllocation* pAllocation)
+{
+    VMA_ASSERT((allocFlags & VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT) == 0);
+    const bool isUpperAddress = (allocFlags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;
+    const bool mapped = (allocFlags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0;
+    const bool isUserDataString = (allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0;
+
+    VmaAllocationRequest currRequest = {};
+    if(pBlock->m_pMetadata->CreateAllocationRequest(
+        currentFrameIndex,
+        m_FrameInUseCount,
+        m_BufferImageGranularity,
+        size,
+        alignment,
+        isUpperAddress,
+        suballocType,
+        false, // canMakeOtherLost
+        strategy,
+        &currRequest))
+    {
+        // Allocate from pCurrBlock.
+        VMA_ASSERT(currRequest.itemsToMakeLostCount == 0);
+
+        if(mapped)
+        {
+            VkResult res = pBlock->Map(m_hAllocator, 1, VMA_NULL);
+            if(res != VK_SUCCESS)
+            {
+                return res;
+            }
+        }
+            
+        // We no longer have an empty Allocation.
+        if(pBlock->m_pMetadata->IsEmpty())
+        {
+            m_HasEmptyBlock = false;
+        }
+            
+        *pAllocation = vma_new(m_hAllocator, VmaAllocation_T)(currentFrameIndex, isUserDataString);
+        pBlock->m_pMetadata->Alloc(currRequest, suballocType, size, isUpperAddress, *pAllocation);
+        (*pAllocation)->InitBlockAllocation(
+            hCurrentPool,
+            pBlock,
+            currRequest.offset,
+            alignment,
+            size,
+            suballocType,
+            mapped,
+            (allocFlags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0);
+        VMA_HEAVY_ASSERT(pBlock->Validate());
+        (*pAllocation)->SetUserData(m_hAllocator, pUserData);
+        if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)
+        {
+            m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);
+        }
+        if(IsCorruptionDetectionEnabled())
+        {
+            VkResult res = pBlock->WriteMagicValueAroundAllocation(m_hAllocator, currRequest.offset, size);
+            (void) res;
+            VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value.");
+        }
+        return VK_SUCCESS;
+    }
+    return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+}
+
+VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex)
+{
+    VkMemoryAllocateInfo allocInfo = {};
+    allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+    allocInfo.memoryTypeIndex = m_MemoryTypeIndex;
+    allocInfo.allocationSize = blockSize;
+    VkDeviceMemory mem = VK_NULL_HANDLE;
+    VkResult res = m_hAllocator->AllocateVulkanMemory(&allocInfo, &mem);
+    if(res < 0)
+    {
+        return res;
+    }
+
+    // New VkDeviceMemory successfully created.
+
+    // Create new Allocation for it.
+    VmaDeviceMemoryBlock* const pBlock = vma_new(m_hAllocator, VmaDeviceMemoryBlock)(m_hAllocator);
+    pBlock->Init(
+        m_hAllocator,
+        m_MemoryTypeIndex,
+        mem,
+        allocInfo.allocationSize,
+        m_NextBlockId++,
+        m_Algorithm);
+
+    m_Blocks.push_back(pBlock);
+    if(pNewBlockIndex != VMA_NULL)
+    {
+        *pNewBlockIndex = m_Blocks.size() - 1;
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaBlockVector::ApplyDefragmentationMovesCpu(
+    class VmaBlockVectorDefragmentationContext* pDefragCtx,
+    const VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves)
+{
+    const size_t blockCount = m_Blocks.size();
+    const bool isNonCoherent = m_hAllocator->IsMemoryTypeNonCoherent(m_MemoryTypeIndex);
+
+    enum BLOCK_FLAG
+    {
+        BLOCK_FLAG_USED = 0x00000001,
+        BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION = 0x00000002,
+    };
+
+    struct BlockInfo
+    {
+        uint32_t flags;
+        void* pMappedData;
+    };
+    VmaVector< BlockInfo, VmaStlAllocator<BlockInfo> >
+        blockInfo(blockCount, VmaStlAllocator<BlockInfo>(m_hAllocator->GetAllocationCallbacks()));
+    memset(blockInfo.data(), 0, blockCount * sizeof(BlockInfo));
+
+    // Go over all moves. Mark blocks that are used with BLOCK_FLAG_USED.
+    const size_t moveCount = moves.size();
+    for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+    {
+        const VmaDefragmentationMove& move = moves[moveIndex];
+        blockInfo[move.srcBlockIndex].flags |= BLOCK_FLAG_USED;
+        blockInfo[move.dstBlockIndex].flags |= BLOCK_FLAG_USED;
+    }
+
+    VMA_ASSERT(pDefragCtx->res == VK_SUCCESS);
+
+    // Go over all blocks. Get mapped pointer or map if necessary.
+    for(size_t blockIndex = 0; pDefragCtx->res == VK_SUCCESS && blockIndex < blockCount; ++blockIndex)
+    {
+        BlockInfo& currBlockInfo = blockInfo[blockIndex];
+        VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex];
+        if((currBlockInfo.flags & BLOCK_FLAG_USED) != 0)
+        {
+            currBlockInfo.pMappedData = pBlock->GetMappedData();
+            // It is not originally mapped - map it.
+            if(currBlockInfo.pMappedData == VMA_NULL)
+            {
+                pDefragCtx->res = pBlock->Map(m_hAllocator, 1, &currBlockInfo.pMappedData);
+                if(pDefragCtx->res == VK_SUCCESS)
+                {
+                    currBlockInfo.flags |= BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION;
+                }
+            }
+        }
+    }
+
+    // Go over all moves. Do actual data transfer.
+    if(pDefragCtx->res == VK_SUCCESS)
+    {
+        const VkDeviceSize nonCoherentAtomSize = m_hAllocator->m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
+        VkMappedMemoryRange memRange = {};
+        memRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+
+        for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+        {
+            const VmaDefragmentationMove& move = moves[moveIndex];
+
+            const BlockInfo& srcBlockInfo = blockInfo[move.srcBlockIndex];
+            const BlockInfo& dstBlockInfo = blockInfo[move.dstBlockIndex];
+
+            VMA_ASSERT(srcBlockInfo.pMappedData && dstBlockInfo.pMappedData);
+
+            // Invalidate source.
+            if(isNonCoherent)
+            {
+                VmaDeviceMemoryBlock* const pSrcBlock = m_Blocks[move.srcBlockIndex];
+                memRange.memory = pSrcBlock->GetDeviceMemory();
+                memRange.offset = VmaAlignDown(move.srcOffset, nonCoherentAtomSize);
+                memRange.size = VMA_MIN(
+                    VmaAlignUp(move.size + (move.srcOffset - memRange.offset), nonCoherentAtomSize),
+                    pSrcBlock->m_pMetadata->GetSize() - memRange.offset);
+                (*m_hAllocator->GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hAllocator->m_hDevice, 1, &memRange);
+            }
+
+            // THE PLACE WHERE ACTUAL DATA COPY HAPPENS.
+            memmove(
+                reinterpret_cast<char*>(dstBlockInfo.pMappedData) + move.dstOffset,
+                reinterpret_cast<char*>(srcBlockInfo.pMappedData) + move.srcOffset,
+                static_cast<size_t>(move.size));
+
+            if(IsCorruptionDetectionEnabled())
+            {
+                VmaWriteMagicValue(dstBlockInfo.pMappedData, move.dstOffset - VMA_DEBUG_MARGIN);
+                VmaWriteMagicValue(dstBlockInfo.pMappedData, move.dstOffset + move.size);
+            }
+
+            // Flush destination.
+            if(isNonCoherent)
+            {
+                VmaDeviceMemoryBlock* const pDstBlock = m_Blocks[move.dstBlockIndex];
+                memRange.memory = pDstBlock->GetDeviceMemory();
+                memRange.offset = VmaAlignDown(move.dstOffset, nonCoherentAtomSize);
+                memRange.size = VMA_MIN(
+                    VmaAlignUp(move.size + (move.dstOffset - memRange.offset), nonCoherentAtomSize),
+                    pDstBlock->m_pMetadata->GetSize() - memRange.offset);
+                (*m_hAllocator->GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hAllocator->m_hDevice, 1, &memRange);
+            }
+        }
+    }
+
+    // Go over all blocks in reverse order. Unmap those that were mapped just for defragmentation.
+    // Regardless of pCtx->res == VK_SUCCESS.
+    for(size_t blockIndex = blockCount; blockIndex--; )
+    {
+        const BlockInfo& currBlockInfo = blockInfo[blockIndex];
+        if((currBlockInfo.flags & BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION) != 0)
+        {
+            VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex];
+            pBlock->Unmap(m_hAllocator, 1);
+        }
+    }
+}
+
+void VmaBlockVector::ApplyDefragmentationMovesGpu(
+    class VmaBlockVectorDefragmentationContext* pDefragCtx,
+    const VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+    VkCommandBuffer commandBuffer)
+{
+    const size_t blockCount = m_Blocks.size();
+
+    pDefragCtx->blockContexts.resize(blockCount);
+    for (size_t i = 0; i < blockCount; ++i)
+        pDefragCtx->blockContexts[i] = VmaBlockDefragmentationContext();
+
+    // Go over all moves. Mark blocks that are used with BLOCK_FLAG_USED.
+    const size_t moveCount = moves.size();
+    for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+    {
+        const VmaDefragmentationMove& move = moves[moveIndex];
+        pDefragCtx->blockContexts[move.srcBlockIndex].flags |= VmaBlockDefragmentationContext::BLOCK_FLAG_USED;
+        pDefragCtx->blockContexts[move.dstBlockIndex].flags |= VmaBlockDefragmentationContext::BLOCK_FLAG_USED;
+    }
+
+    VMA_ASSERT(pDefragCtx->res == VK_SUCCESS);
+
+    // Go over all blocks. Create and bind buffer for whole block if necessary.
+    {
+        VkBufferCreateInfo bufCreateInfo = {};
+        bufCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+        bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT |
+            VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+        for(size_t blockIndex = 0; pDefragCtx->res == VK_SUCCESS && blockIndex < blockCount; ++blockIndex)
+        {
+            VmaBlockDefragmentationContext& currBlockCtx = pDefragCtx->blockContexts[blockIndex];
+            VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex];
+            if((currBlockCtx.flags & VmaBlockDefragmentationContext::BLOCK_FLAG_USED) != 0)
+            {
+                bufCreateInfo.size = pBlock->m_pMetadata->GetSize();
+                pDefragCtx->res = (*m_hAllocator->GetVulkanFunctions().vkCreateBuffer)(
+                    m_hAllocator->m_hDevice, &bufCreateInfo, m_hAllocator->GetAllocationCallbacks(), &currBlockCtx.hBuffer);
+                if(pDefragCtx->res == VK_SUCCESS)
+                {
+                    pDefragCtx->res = (*m_hAllocator->GetVulkanFunctions().vkBindBufferMemory)(
+                        m_hAllocator->m_hDevice, currBlockCtx.hBuffer, pBlock->GetDeviceMemory(), 0);
+                }
+            }
+        }
+    }
+
+    // Go over all moves. Post data transfer commands to command buffer.
+    if(pDefragCtx->res == VK_SUCCESS)
+    {
+        /*const VkDeviceSize nonCoherentAtomSize = m_hAllocator->m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
+        VkMappedMemoryRange memRange = {};
+        memRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;*/
+
+        for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+        {
+            const VmaDefragmentationMove& move = moves[moveIndex];
+
+            const VmaBlockDefragmentationContext& srcBlockCtx = pDefragCtx->blockContexts[move.srcBlockIndex];
+            const VmaBlockDefragmentationContext& dstBlockCtx = pDefragCtx->blockContexts[move.dstBlockIndex];
+
+            VMA_ASSERT(srcBlockCtx.hBuffer && dstBlockCtx.hBuffer);
+
+            VkBufferCopy region = {
+                move.srcOffset,
+                move.dstOffset,
+                move.size };
+            (*m_hAllocator->GetVulkanFunctions().vkCmdCopyBuffer)(
+                commandBuffer, srcBlockCtx.hBuffer, dstBlockCtx.hBuffer, 1, &region);
+        }
+    }
+
+    // Save buffers to defrag context for later destruction.
+    if(pDefragCtx->res == VK_SUCCESS && moveCount > 0)
+    {
+        pDefragCtx->res = VK_NOT_READY;
+    }
+}
+
+void VmaBlockVector::FreeEmptyBlocks(VmaDefragmentationStats* pDefragmentationStats)
+{
+    m_HasEmptyBlock = false;
+    for(size_t blockIndex = m_Blocks.size(); blockIndex--; )
+    {
+        VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex];
+        if(pBlock->m_pMetadata->IsEmpty())
+        {
+            if(m_Blocks.size() > m_MinBlockCount)
+            {
+                if(pDefragmentationStats != VMA_NULL)
+                {
+                    ++pDefragmentationStats->deviceMemoryBlocksFreed;
+                    pDefragmentationStats->bytesFreed += pBlock->m_pMetadata->GetSize();
+                }
+
+                VmaVectorRemove(m_Blocks, blockIndex);
+                pBlock->Destroy(m_hAllocator);
+                vma_delete(m_hAllocator, pBlock);
+            }
+            else
+            {
+                m_HasEmptyBlock = true;
+            }
+        }
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaBlockVector::PrintDetailedMap(class VmaJsonWriter& json)
+{
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+
+    json.BeginObject();
+
+    if(m_IsCustomPool)
+    {
+        json.WriteString("MemoryTypeIndex");
+        json.WriteNumber(m_MemoryTypeIndex);
+
+        json.WriteString("BlockSize");
+        json.WriteNumber(m_PreferredBlockSize);
+
+        json.WriteString("BlockCount");
+        json.BeginObject(true);
+        if(m_MinBlockCount > 0)
+        {
+            json.WriteString("Min");
+            json.WriteNumber((uint64_t)m_MinBlockCount);
+        }
+        if(m_MaxBlockCount < SIZE_MAX)
+        {
+            json.WriteString("Max");
+            json.WriteNumber((uint64_t)m_MaxBlockCount);
+        }
+        json.WriteString("Cur");
+        json.WriteNumber((uint64_t)m_Blocks.size());
+        json.EndObject();
+
+        if(m_FrameInUseCount > 0)
+        {
+            json.WriteString("FrameInUseCount");
+            json.WriteNumber(m_FrameInUseCount);
+        }
+
+        if(m_Algorithm != 0)
+        {
+            json.WriteString("Algorithm");
+            json.WriteString(VmaAlgorithmToStr(m_Algorithm));
+        }
+    }
+    else
+    {
+        json.WriteString("PreferredBlockSize");
+        json.WriteNumber(m_PreferredBlockSize);
+    }
+
+    json.WriteString("Blocks");
+    json.BeginObject();
+    for(size_t i = 0; i < m_Blocks.size(); ++i)
+    {
+        json.BeginString();
+        json.ContinueString(m_Blocks[i]->GetId());
+        json.EndString();
+
+        m_Blocks[i]->m_pMetadata->PrintDetailedMap(json);
+    }
+    json.EndObject();
+
+    json.EndObject();
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+void VmaBlockVector::Defragment(
+    class VmaBlockVectorDefragmentationContext* pCtx,
+    VmaDefragmentationStats* pStats,
+    VkDeviceSize& maxCpuBytesToMove, uint32_t& maxCpuAllocationsToMove,
+    VkDeviceSize& maxGpuBytesToMove, uint32_t& maxGpuAllocationsToMove,
+    VkCommandBuffer commandBuffer)
+{
+    pCtx->res = VK_SUCCESS;
+    
+    const VkMemoryPropertyFlags memPropFlags =
+        m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags;
+    const bool isHostVisible = (memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0;
+    const bool isHostCoherent = (memPropFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0;
+
+    const bool canDefragmentOnCpu = maxCpuBytesToMove > 0 && maxCpuAllocationsToMove > 0 &&
+        isHostVisible;
+    const bool canDefragmentOnGpu = maxGpuBytesToMove > 0 && maxGpuAllocationsToMove > 0 &&
+        (VMA_DEBUG_DETECT_CORRUPTION == 0 || !(isHostVisible && isHostCoherent));
+
+    // There are options to defragment this memory type.
+    if(canDefragmentOnCpu || canDefragmentOnGpu)
+    {
+        bool defragmentOnGpu;
+        // There is only one option to defragment this memory type.
+        if(canDefragmentOnGpu != canDefragmentOnCpu)
+        {
+            defragmentOnGpu = canDefragmentOnGpu;
+        }
+        // Both options are available: Heuristics to choose the best one.
+        else
+        {
+            defragmentOnGpu = (memPropFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) != 0 ||
+                m_hAllocator->IsIntegratedGpu();
+        }
+
+        bool overlappingMoveSupported = !defragmentOnGpu;
+
+        if(m_hAllocator->m_UseMutex)
+        {
+            m_Mutex.LockWrite();
+            pCtx->mutexLocked = true;
+        }
+
+        pCtx->Begin(overlappingMoveSupported);
+
+        // Defragment.
+
+        const VkDeviceSize maxBytesToMove = defragmentOnGpu ? maxGpuBytesToMove : maxCpuBytesToMove;
+        const uint32_t maxAllocationsToMove = defragmentOnGpu ? maxGpuAllocationsToMove : maxCpuAllocationsToMove;
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> > moves = 
+            VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >(VmaStlAllocator<VmaDefragmentationMove>(m_hAllocator->GetAllocationCallbacks()));
+        pCtx->res = pCtx->GetAlgorithm()->Defragment(moves, maxBytesToMove, maxAllocationsToMove);
+
+        // Accumulate statistics.
+        if(pStats != VMA_NULL)
+        {
+            const VkDeviceSize bytesMoved = pCtx->GetAlgorithm()->GetBytesMoved();
+            const uint32_t allocationsMoved = pCtx->GetAlgorithm()->GetAllocationsMoved();
+            pStats->bytesMoved += bytesMoved;
+            pStats->allocationsMoved += allocationsMoved;
+            VMA_ASSERT(bytesMoved <= maxBytesToMove);
+            VMA_ASSERT(allocationsMoved <= maxAllocationsToMove);
+            if(defragmentOnGpu)
+            {
+                maxGpuBytesToMove -= bytesMoved;
+                maxGpuAllocationsToMove -= allocationsMoved;
+            }
+            else
+            {
+                maxCpuBytesToMove -= bytesMoved;
+                maxCpuAllocationsToMove -= allocationsMoved;
+            }
+        }
+    
+        if(pCtx->res >= VK_SUCCESS)
+        {
+            if(defragmentOnGpu)
+            {
+                ApplyDefragmentationMovesGpu(pCtx, moves, commandBuffer);
+            }
+            else
+            {
+                ApplyDefragmentationMovesCpu(pCtx, moves);
+            }
+        }
+    }
+}
+
+void VmaBlockVector::DefragmentationEnd(
+    class VmaBlockVectorDefragmentationContext* pCtx,
+    VmaDefragmentationStats* pStats)
+{
+    // Destroy buffers.
+    for(size_t blockIndex = pCtx->blockContexts.size(); blockIndex--; )
+    {
+        VmaBlockDefragmentationContext& blockCtx = pCtx->blockContexts[blockIndex];
+        if(blockCtx.hBuffer)
+        {
+            (*m_hAllocator->GetVulkanFunctions().vkDestroyBuffer)(
+                m_hAllocator->m_hDevice, blockCtx.hBuffer, m_hAllocator->GetAllocationCallbacks());
+        }
+    }
+
+    if(pCtx->res >= VK_SUCCESS)
+    {
+        FreeEmptyBlocks(pStats);
+    }
+
+    if(pCtx->mutexLocked)
+    {
+        VMA_ASSERT(m_hAllocator->m_UseMutex);
+        m_Mutex.UnlockWrite();
+    }
+}
+
+size_t VmaBlockVector::CalcAllocationCount() const
+{
+    size_t result = 0;
+    for(size_t i = 0; i < m_Blocks.size(); ++i)
+    {
+        result += m_Blocks[i]->m_pMetadata->GetAllocationCount();
+    }
+    return result;
+}
+
+bool VmaBlockVector::IsBufferImageGranularityConflictPossible() const
+{
+    if(m_BufferImageGranularity == 1)
+    {
+        return false;
+    }
+    VmaSuballocationType lastSuballocType = VMA_SUBALLOCATION_TYPE_FREE;
+    for(size_t i = 0, count = m_Blocks.size(); i < count; ++i)
+    {
+        VmaDeviceMemoryBlock* const pBlock = m_Blocks[i];
+        VMA_ASSERT(m_Algorithm == 0);
+        VmaBlockMetadata_Generic* const pMetadata = (VmaBlockMetadata_Generic*)pBlock->m_pMetadata;
+        if(pMetadata->IsBufferImageGranularityConflictPossible(m_BufferImageGranularity, lastSuballocType))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+void VmaBlockVector::MakePoolAllocationsLost(
+    uint32_t currentFrameIndex,
+    size_t* pLostAllocationCount)
+{
+    VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
+    size_t lostAllocationCount = 0;
+    for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)
+    {
+        VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];
+        VMA_ASSERT(pBlock);
+        lostAllocationCount += pBlock->m_pMetadata->MakeAllocationsLost(currentFrameIndex, m_FrameInUseCount);
+    }
+    if(pLostAllocationCount != VMA_NULL)
+    {
+        *pLostAllocationCount = lostAllocationCount;
+    }
+}
+
+VkResult VmaBlockVector::CheckCorruption()
+{
+    if(!IsCorruptionDetectionEnabled())
+    {
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+    }
+
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+    for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)
+    {
+        VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];
+        VMA_ASSERT(pBlock);
+        VkResult res = pBlock->CheckCorruption(m_hAllocator);
+        if(res != VK_SUCCESS)
+        {
+            return res;
+        }
+    }
+    return VK_SUCCESS;
+}
+
+void VmaBlockVector::AddStats(VmaStats* pStats)
+{
+    const uint32_t memTypeIndex = m_MemoryTypeIndex;
+    const uint32_t memHeapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(memTypeIndex);
+
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+
+    for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)
+    {
+        const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];
+        VMA_ASSERT(pBlock);
+        VMA_HEAVY_ASSERT(pBlock->Validate());
+        VmaStatInfo allocationStatInfo;
+        pBlock->m_pMetadata->CalcAllocationStatInfo(allocationStatInfo);
+        VmaAddStatInfo(pStats->total, allocationStatInfo);
+        VmaAddStatInfo(pStats->memoryType[memTypeIndex], allocationStatInfo);
+        VmaAddStatInfo(pStats->memoryHeap[memHeapIndex], allocationStatInfo);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaDefragmentationAlgorithm_Generic members definition
+
+VmaDefragmentationAlgorithm_Generic::VmaDefragmentationAlgorithm_Generic(
+    VmaAllocator hAllocator,
+    VmaBlockVector* pBlockVector,
+    uint32_t currentFrameIndex,
+    bool /*overlappingMoveSupported*/) :
+    VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex),
+    m_AllocationCount(0),
+    m_AllAllocations(false),
+    m_BytesMoved(0),
+    m_AllocationsMoved(0),
+    m_Blocks(VmaStlAllocator<BlockInfo*>(hAllocator->GetAllocationCallbacks()))
+{
+    // Create block info for each block.
+    const size_t blockCount = m_pBlockVector->m_Blocks.size();
+    for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        BlockInfo* pBlockInfo = vma_new(m_hAllocator, BlockInfo)(m_hAllocator->GetAllocationCallbacks());
+        pBlockInfo->m_OriginalBlockIndex = blockIndex;
+        pBlockInfo->m_pBlock = m_pBlockVector->m_Blocks[blockIndex];
+        m_Blocks.push_back(pBlockInfo);
+    }
+
+    // Sort them by m_pBlock pointer value.
+    VMA_SORT(m_Blocks.begin(), m_Blocks.end(), BlockPointerLess());
+}
+
+VmaDefragmentationAlgorithm_Generic::~VmaDefragmentationAlgorithm_Generic()
+{
+    for(size_t i = m_Blocks.size(); i--; )
+    {
+        vma_delete(m_hAllocator, m_Blocks[i]);
+    }
+}
+
+void VmaDefragmentationAlgorithm_Generic::AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged)
+{
+    // Now as we are inside VmaBlockVector::m_Mutex, we can make final check if this allocation was not lost.
+    if(hAlloc->GetLastUseFrameIndex() != VMA_FRAME_INDEX_LOST)
+    {
+        VmaDeviceMemoryBlock* pBlock = hAlloc->GetBlock();
+        BlockInfoVector::iterator it = VmaBinaryFindFirstNotLess(m_Blocks.begin(), m_Blocks.end(), pBlock, BlockPointerLess());
+        if(it != m_Blocks.end() && (*it)->m_pBlock == pBlock)
+        {
+            AllocationInfo allocInfo = AllocationInfo(hAlloc, pChanged);
+            (*it)->m_Allocations.push_back(allocInfo);
+        }
+        else
+        {
+            VMA_ASSERT(0);
+        }
+
+        ++m_AllocationCount;
+    }
+}
+
+VkResult VmaDefragmentationAlgorithm_Generic::DefragmentRound(
+    VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+    VkDeviceSize maxBytesToMove,
+    uint32_t maxAllocationsToMove)
+{
+    if(m_Blocks.empty())
+    {
+        return VK_SUCCESS;
+    }
+
+    // This is a choice based on research.
+    // Option 1:
+    uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT;
+    // Option 2:
+    //uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT;
+    // Option 3:
+    //uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_FRAGMENTATION_BIT;
+
+    size_t srcBlockMinIndex = 0;
+    // When FAST_ALGORITHM, move allocations from only last out of blocks that contain non-movable allocations.
+    /*
+    if(m_AlgorithmFlags & VMA_DEFRAGMENTATION_FAST_ALGORITHM_BIT)
+    {
+        const size_t blocksWithNonMovableCount = CalcBlocksWithNonMovableCount();
+        if(blocksWithNonMovableCount > 0)
+        {
+            srcBlockMinIndex = blocksWithNonMovableCount - 1;
+        }
+    }
+    */
+
+    size_t srcBlockIndex = m_Blocks.size() - 1;
+    size_t srcAllocIndex = SIZE_MAX;
+    for(;;)
+    {
+        // 1. Find next allocation to move.
+        // 1.1. Start from last to first m_Blocks - they are sorted from most "destination" to most "source".
+        // 1.2. Then start from last to first m_Allocations.
+        while(srcAllocIndex >= m_Blocks[srcBlockIndex]->m_Allocations.size())
+        {
+            if(m_Blocks[srcBlockIndex]->m_Allocations.empty())
+            {
+                // Finished: no more allocations to process.
+                if(srcBlockIndex == srcBlockMinIndex)
+                {
+                    return VK_SUCCESS;
+                }
+                else
+                {
+                    --srcBlockIndex;
+                    srcAllocIndex = SIZE_MAX;
+                }
+            }
+            else
+            {
+                srcAllocIndex = m_Blocks[srcBlockIndex]->m_Allocations.size() - 1;
+            }
+        }
+        
+        BlockInfo* pSrcBlockInfo = m_Blocks[srcBlockIndex];
+        AllocationInfo& allocInfo = pSrcBlockInfo->m_Allocations[srcAllocIndex];
+
+        const VkDeviceSize size = allocInfo.m_hAllocation->GetSize();
+        const VkDeviceSize srcOffset = allocInfo.m_hAllocation->GetOffset();
+        const VkDeviceSize alignment = allocInfo.m_hAllocation->GetAlignment();
+        const VmaSuballocationType suballocType = allocInfo.m_hAllocation->GetSuballocationType();
+
+        // 2. Try to find new place for this allocation in preceding or current block.
+        for(size_t dstBlockIndex = 0; dstBlockIndex <= srcBlockIndex; ++dstBlockIndex)
+        {
+            BlockInfo* pDstBlockInfo = m_Blocks[dstBlockIndex];
+            VmaAllocationRequest dstAllocRequest;
+            if(pDstBlockInfo->m_pBlock->m_pMetadata->CreateAllocationRequest(
+                m_CurrentFrameIndex,
+                m_pBlockVector->GetFrameInUseCount(),
+                m_pBlockVector->GetBufferImageGranularity(),
+                size,
+                alignment,
+                false, // upperAddress
+                suballocType,
+                false, // canMakeOtherLost
+                strategy,
+                &dstAllocRequest) &&
+            MoveMakesSense(
+                dstBlockIndex, dstAllocRequest.offset, srcBlockIndex, srcOffset))
+            {
+                VMA_ASSERT(dstAllocRequest.itemsToMakeLostCount == 0);
+
+                // Reached limit on number of allocations or bytes to move.
+                if((m_AllocationsMoved + 1 > maxAllocationsToMove) ||
+                    (m_BytesMoved + size > maxBytesToMove))
+                {
+                    return VK_SUCCESS;
+                }
+
+                VmaDefragmentationMove move;
+                move.srcBlockIndex = pSrcBlockInfo->m_OriginalBlockIndex;
+                move.dstBlockIndex = pDstBlockInfo->m_OriginalBlockIndex;
+                move.srcOffset = srcOffset;
+                move.dstOffset = dstAllocRequest.offset;
+                move.size = size;
+                moves.push_back(move);
+
+                pDstBlockInfo->m_pBlock->m_pMetadata->Alloc(
+                    dstAllocRequest,
+                    suballocType,
+                    size,
+                    false, // upperAddress
+                    allocInfo.m_hAllocation);
+                pSrcBlockInfo->m_pBlock->m_pMetadata->FreeAtOffset(srcOffset);
+                
+                allocInfo.m_hAllocation->ChangeBlockAllocation(m_hAllocator, pDstBlockInfo->m_pBlock, dstAllocRequest.offset);
+
+                if(allocInfo.m_pChanged != VMA_NULL)
+                {
+                    *allocInfo.m_pChanged = VK_TRUE;
+                }
+
+                ++m_AllocationsMoved;
+                m_BytesMoved += size;
+
+                VmaVectorRemove(pSrcBlockInfo->m_Allocations, srcAllocIndex);
+
+                break;
+            }
+        }
+
+        // If not processed, this allocInfo remains in pBlockInfo->m_Allocations for next round.
+
+        if(srcAllocIndex > 0)
+        {
+            --srcAllocIndex;
+        }
+        else
+        {
+            if(srcBlockIndex > 0)
+            {
+                --srcBlockIndex;
+                srcAllocIndex = SIZE_MAX;
+            }
+            else
+            {
+                return VK_SUCCESS;
+            }
+        }
+    }
+}
+
+size_t VmaDefragmentationAlgorithm_Generic::CalcBlocksWithNonMovableCount() const
+{
+    size_t result = 0;
+    for(size_t i = 0; i < m_Blocks.size(); ++i)
+    {
+        if(m_Blocks[i]->m_HasNonMovableAllocations)
+        {
+            ++result;
+        }
+    }
+    return result;
+}
+
+VkResult VmaDefragmentationAlgorithm_Generic::Defragment(
+    VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+    VkDeviceSize maxBytesToMove,
+    uint32_t maxAllocationsToMove)
+{
+    if(!m_AllAllocations && m_AllocationCount == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    const size_t blockCount = m_Blocks.size();
+    for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        BlockInfo* pBlockInfo = m_Blocks[blockIndex];
+
+        if(m_AllAllocations)
+        {
+            VmaBlockMetadata_Generic* pMetadata = (VmaBlockMetadata_Generic*)pBlockInfo->m_pBlock->m_pMetadata;
+            for(VmaSuballocationList::const_iterator it = pMetadata->m_Suballocations.begin();
+                it != pMetadata->m_Suballocations.end();
+                ++it)
+            {
+                if(it->type != VMA_SUBALLOCATION_TYPE_FREE)
+                {
+                    AllocationInfo allocInfo = AllocationInfo(it->hAllocation, VMA_NULL);
+                    pBlockInfo->m_Allocations.push_back(allocInfo);
+                }
+            }
+        }
+
+        pBlockInfo->CalcHasNonMovableAllocations();
+        
+        // This is a choice based on research.
+        // Option 1:
+        pBlockInfo->SortAllocationsByOffsetDescending();
+        // Option 2:
+        //pBlockInfo->SortAllocationsBySizeDescending();
+    }
+
+    // Sort m_Blocks this time by the main criterium, from most "destination" to most "source" blocks.
+    VMA_SORT(m_Blocks.begin(), m_Blocks.end(), BlockInfoCompareMoveDestination());
+
+    // This is a choice based on research.
+    const uint32_t roundCount = 2;
+
+    // Execute defragmentation rounds (the main part).
+    VkResult result = VK_SUCCESS;
+    for(uint32_t round = 0; (round < roundCount) && (result == VK_SUCCESS); ++round)
+    {
+        result = DefragmentRound(moves, maxBytesToMove, maxAllocationsToMove);
+    }
+
+    return result;
+}
+
+bool VmaDefragmentationAlgorithm_Generic::MoveMakesSense(
+        size_t dstBlockIndex, VkDeviceSize dstOffset,
+        size_t srcBlockIndex, VkDeviceSize srcOffset)
+{
+    if(dstBlockIndex < srcBlockIndex)
+    {
+        return true;
+    }
+    if(dstBlockIndex > srcBlockIndex)
+    {
+        return false;
+    }
+    if(dstOffset < srcOffset)
+    {
+        return true;
+    }
+    return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaDefragmentationAlgorithm_Fast
+
+VmaDefragmentationAlgorithm_Fast::VmaDefragmentationAlgorithm_Fast(
+    VmaAllocator hAllocator,
+    VmaBlockVector* pBlockVector,
+    uint32_t currentFrameIndex,
+    bool overlappingMoveSupported) :
+    VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex),
+    m_OverlappingMoveSupported(overlappingMoveSupported),
+    m_AllocationCount(0),
+    m_AllAllocations(false),
+    m_BytesMoved(0),
+    m_AllocationsMoved(0),
+    m_BlockInfos(VmaStlAllocator<BlockInfo>(hAllocator->GetAllocationCallbacks()))
+{
+    VMA_ASSERT(VMA_DEBUG_MARGIN == 0);
+
+}
+
+VmaDefragmentationAlgorithm_Fast::~VmaDefragmentationAlgorithm_Fast()
+{
+}
+
+VkResult VmaDefragmentationAlgorithm_Fast::Defragment(
+    VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+    VkDeviceSize maxBytesToMove,
+    uint32_t maxAllocationsToMove)
+{
+    VMA_ASSERT(m_AllAllocations || m_pBlockVector->CalcAllocationCount() == m_AllocationCount);
+
+    const size_t blockCount = m_pBlockVector->GetBlockCount();
+    if(blockCount == 0 || maxBytesToMove == 0 || maxAllocationsToMove == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    PreprocessMetadata();
+
+    // Sort blocks in order from most destination.
+
+    m_BlockInfos.resize(blockCount);
+    for(size_t i = 0; i < blockCount; ++i)
+    {
+        m_BlockInfos[i].origBlockIndex = i;
+    }
+
+    VMA_SORT(m_BlockInfos.begin(), m_BlockInfos.end(), [this](const BlockInfo& lhs, const BlockInfo& rhs) -> bool {
+        return m_pBlockVector->GetBlock(lhs.origBlockIndex)->m_pMetadata->GetSumFreeSize() <
+            m_pBlockVector->GetBlock(rhs.origBlockIndex)->m_pMetadata->GetSumFreeSize();
+    });
+
+    // THE MAIN ALGORITHM
+
+    FreeSpaceDatabase freeSpaceDb;
+
+    size_t dstBlockInfoIndex = 0;
+    size_t dstOrigBlockIndex = m_BlockInfos[dstBlockInfoIndex].origBlockIndex;
+    VmaDeviceMemoryBlock* pDstBlock = m_pBlockVector->GetBlock(dstOrigBlockIndex);
+    VmaBlockMetadata_Generic* pDstMetadata = (VmaBlockMetadata_Generic*)pDstBlock->m_pMetadata;
+    VkDeviceSize dstBlockSize = pDstMetadata->GetSize();
+    VkDeviceSize dstOffset = 0;
+
+    bool end = false;
+    for(size_t srcBlockInfoIndex = 0; !end && srcBlockInfoIndex < blockCount; ++srcBlockInfoIndex)
+    {
+        const size_t srcOrigBlockIndex = m_BlockInfos[srcBlockInfoIndex].origBlockIndex;
+        VmaDeviceMemoryBlock* const pSrcBlock = m_pBlockVector->GetBlock(srcOrigBlockIndex);
+        VmaBlockMetadata_Generic* const pSrcMetadata = (VmaBlockMetadata_Generic*)pSrcBlock->m_pMetadata;
+        for(VmaSuballocationList::iterator srcSuballocIt = pSrcMetadata->m_Suballocations.begin();
+            !end && srcSuballocIt != pSrcMetadata->m_Suballocations.end(); )
+        {
+            VmaAllocation_T* const pAlloc = srcSuballocIt->hAllocation;
+            const VkDeviceSize srcAllocAlignment = pAlloc->GetAlignment();
+            const VkDeviceSize srcAllocSize = srcSuballocIt->size;
+            if(m_AllocationsMoved == maxAllocationsToMove ||
+                m_BytesMoved + srcAllocSize > maxBytesToMove)
+            {
+                end = true;
+                break;
+            }
+            const VkDeviceSize srcAllocOffset = srcSuballocIt->offset;
+
+            // Try to place it in one of free spaces from the database.
+            size_t freeSpaceInfoIndex;
+            VkDeviceSize dstAllocOffset;
+            if(freeSpaceDb.Fetch(srcAllocAlignment, srcAllocSize,
+                freeSpaceInfoIndex, dstAllocOffset))
+            {
+                size_t freeSpaceOrigBlockIndex = m_BlockInfos[freeSpaceInfoIndex].origBlockIndex;
+                VmaDeviceMemoryBlock* pFreeSpaceBlock = m_pBlockVector->GetBlock(freeSpaceOrigBlockIndex);
+                VmaBlockMetadata_Generic* pFreeSpaceMetadata = (VmaBlockMetadata_Generic*)pFreeSpaceBlock->m_pMetadata;
+                /*VkDeviceSize freeSpaceBlockSize = pFreeSpaceMetadata->GetSize();*/
+
+                // Same block
+                if(freeSpaceInfoIndex == srcBlockInfoIndex)
+                {
+                    VMA_ASSERT(dstAllocOffset <= srcAllocOffset);
+
+                    // MOVE OPTION 1: Move the allocation inside the same block by decreasing offset.
+
+                    VmaSuballocation suballoc = *srcSuballocIt;
+                    suballoc.offset = dstAllocOffset;
+                    suballoc.hAllocation->ChangeOffset(dstAllocOffset);
+                    m_BytesMoved += srcAllocSize;
+                    ++m_AllocationsMoved;
+                    
+                    VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt;
+                    ++nextSuballocIt;
+                    pSrcMetadata->m_Suballocations.erase(srcSuballocIt);
+                    srcSuballocIt = nextSuballocIt;
+
+                    InsertSuballoc(pFreeSpaceMetadata, suballoc);
+
+                    VmaDefragmentationMove move = {
+                        srcOrigBlockIndex, freeSpaceOrigBlockIndex,
+                        srcAllocOffset, dstAllocOffset,
+                        srcAllocSize };
+                    moves.push_back(move);
+                }
+                // Different block
+                else
+                {
+                    // MOVE OPTION 2: Move the allocation to a different block.
+
+                    VMA_ASSERT(freeSpaceInfoIndex < srcBlockInfoIndex);
+
+                    VmaSuballocation suballoc = *srcSuballocIt;
+                    suballoc.offset = dstAllocOffset;
+                    suballoc.hAllocation->ChangeBlockAllocation(m_hAllocator, pFreeSpaceBlock, dstAllocOffset);
+                    m_BytesMoved += srcAllocSize;
+                    ++m_AllocationsMoved;
+
+                    VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt;
+                    ++nextSuballocIt;
+                    pSrcMetadata->m_Suballocations.erase(srcSuballocIt);
+                    srcSuballocIt = nextSuballocIt;
+
+                    InsertSuballoc(pFreeSpaceMetadata, suballoc);
+
+                    VmaDefragmentationMove move = {
+                        srcOrigBlockIndex, freeSpaceOrigBlockIndex,
+                        srcAllocOffset, dstAllocOffset,
+                        srcAllocSize };
+                    moves.push_back(move);
+                }
+            }
+            else
+            {
+                dstAllocOffset = VmaAlignUp(dstOffset, srcAllocAlignment);
+
+                // If the allocation doesn't fit before the end of dstBlock, forward to next block.
+                while(dstBlockInfoIndex < srcBlockInfoIndex &&
+                    dstAllocOffset + srcAllocSize > dstBlockSize)
+                {
+                    // But before that, register remaining free space at the end of dst block.
+                    freeSpaceDb.Register(dstBlockInfoIndex, dstOffset, dstBlockSize - dstOffset);
+
+                    ++dstBlockInfoIndex;
+                    dstOrigBlockIndex = m_BlockInfos[dstBlockInfoIndex].origBlockIndex;
+                    pDstBlock = m_pBlockVector->GetBlock(dstOrigBlockIndex);
+                    pDstMetadata = (VmaBlockMetadata_Generic*)pDstBlock->m_pMetadata;
+                    dstBlockSize = pDstMetadata->GetSize();
+                    dstOffset = 0;
+                    dstAllocOffset = 0;
+                }
+
+                // Same block
+                if(dstBlockInfoIndex == srcBlockInfoIndex)
+                {
+                    VMA_ASSERT(dstAllocOffset <= srcAllocOffset);
+
+                    const bool overlap = dstAllocOffset + srcAllocSize > srcAllocOffset;
+
+                    bool skipOver = overlap;
+                    if(overlap && m_OverlappingMoveSupported && dstAllocOffset < srcAllocOffset)
+                    {
+                        // If destination and source place overlap, skip if it would move it
+                        // by only < 1/64 of its size.
+                        skipOver = (srcAllocOffset - dstAllocOffset) * 64 < srcAllocSize;
+                    }
+
+                    if(skipOver)
+                    {
+                        freeSpaceDb.Register(dstBlockInfoIndex, dstOffset, srcAllocOffset - dstOffset);
+
+                        dstOffset = srcAllocOffset + srcAllocSize;
+                        ++srcSuballocIt;
+                    }
+                    // MOVE OPTION 1: Move the allocation inside the same block by decreasing offset.
+                    else
+                    {
+                        srcSuballocIt->offset = dstAllocOffset;
+                        srcSuballocIt->hAllocation->ChangeOffset(dstAllocOffset);
+                        dstOffset = dstAllocOffset + srcAllocSize;
+                        m_BytesMoved += srcAllocSize;
+                        ++m_AllocationsMoved;
+                        ++srcSuballocIt;
+                        VmaDefragmentationMove move = {
+                            srcOrigBlockIndex, dstOrigBlockIndex,
+                            srcAllocOffset, dstAllocOffset,
+                            srcAllocSize };
+                        moves.push_back(move);
+                    }
+                }
+                // Different block
+                else
+                {
+                    // MOVE OPTION 2: Move the allocation to a different block.
+
+                    VMA_ASSERT(dstBlockInfoIndex < srcBlockInfoIndex);
+                    VMA_ASSERT(dstAllocOffset + srcAllocSize <= dstBlockSize);
+
+                    VmaSuballocation suballoc = *srcSuballocIt;
+                    suballoc.offset = dstAllocOffset;
+                    suballoc.hAllocation->ChangeBlockAllocation(m_hAllocator, pDstBlock, dstAllocOffset);
+                    dstOffset = dstAllocOffset + srcAllocSize;
+                    m_BytesMoved += srcAllocSize;
+                    ++m_AllocationsMoved;
+
+                    VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt;
+                    ++nextSuballocIt;
+                    pSrcMetadata->m_Suballocations.erase(srcSuballocIt);
+                    srcSuballocIt = nextSuballocIt;
+
+                    pDstMetadata->m_Suballocations.push_back(suballoc);
+
+                    VmaDefragmentationMove move = {
+                        srcOrigBlockIndex, dstOrigBlockIndex,
+                        srcAllocOffset, dstAllocOffset,
+                        srcAllocSize };
+                    moves.push_back(move);
+                }
+            }
+        }
+    }
+
+    m_BlockInfos.clear();
+    
+    PostprocessMetadata();
+
+    return VK_SUCCESS;
+}
+
+void VmaDefragmentationAlgorithm_Fast::PreprocessMetadata()
+{
+    const size_t blockCount = m_pBlockVector->GetBlockCount();
+    for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        VmaBlockMetadata_Generic* const pMetadata =
+            (VmaBlockMetadata_Generic*)m_pBlockVector->GetBlock(blockIndex)->m_pMetadata;
+        pMetadata->m_FreeCount = 0;
+        pMetadata->m_SumFreeSize = pMetadata->GetSize();
+        pMetadata->m_FreeSuballocationsBySize.clear();
+        for(VmaSuballocationList::iterator it = pMetadata->m_Suballocations.begin();
+            it != pMetadata->m_Suballocations.end(); )
+        {
+            if(it->type == VMA_SUBALLOCATION_TYPE_FREE)
+            {
+                VmaSuballocationList::iterator nextIt = it;
+                ++nextIt;
+                pMetadata->m_Suballocations.erase(it);
+                it = nextIt;
+            }
+            else
+            {
+                ++it;
+            }
+        }
+    }
+}
+
+void VmaDefragmentationAlgorithm_Fast::PostprocessMetadata()
+{
+    const size_t blockCount = m_pBlockVector->GetBlockCount();
+    for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        VmaBlockMetadata_Generic* const pMetadata =
+            (VmaBlockMetadata_Generic*)m_pBlockVector->GetBlock(blockIndex)->m_pMetadata;
+        const VkDeviceSize blockSize = pMetadata->GetSize();
+        
+        // No allocations in this block - entire area is free.
+        if(pMetadata->m_Suballocations.empty())
+        {
+            pMetadata->m_FreeCount = 1;
+            //pMetadata->m_SumFreeSize is already set to blockSize.
+            VmaSuballocation suballoc = {
+                0, // offset
+                blockSize, // size
+                VMA_NULL, // hAllocation
+                VMA_SUBALLOCATION_TYPE_FREE };
+            pMetadata->m_Suballocations.push_back(suballoc);
+            pMetadata->RegisterFreeSuballocation(pMetadata->m_Suballocations.begin());
+        }
+        // There are some allocations in this block.
+        else
+        {
+            VkDeviceSize offset = 0;
+            VmaSuballocationList::iterator it;
+            for(it = pMetadata->m_Suballocations.begin();
+                it != pMetadata->m_Suballocations.end();
+                ++it)
+            {
+                VMA_ASSERT(it->type != VMA_SUBALLOCATION_TYPE_FREE);
+                VMA_ASSERT(it->offset >= offset);
+
+                // Need to insert preceding free space.
+                if(it->offset > offset)
+                {
+                    ++pMetadata->m_FreeCount;
+                    const VkDeviceSize freeSize = it->offset - offset;
+                    VmaSuballocation suballoc = {
+                        offset, // offset
+                        freeSize, // size
+                        VMA_NULL, // hAllocation
+                        VMA_SUBALLOCATION_TYPE_FREE };
+                    VmaSuballocationList::iterator precedingFreeIt = pMetadata->m_Suballocations.insert(it, suballoc);
+                    if(freeSize >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+                    {
+                        pMetadata->m_FreeSuballocationsBySize.push_back(precedingFreeIt);
+                    }
+                }
+
+                pMetadata->m_SumFreeSize -= it->size;
+                offset = it->offset + it->size;
+            }
+
+            // Need to insert trailing free space.
+            if(offset < blockSize)
+            {
+                ++pMetadata->m_FreeCount;
+                const VkDeviceSize freeSize = blockSize - offset;
+                VmaSuballocation suballoc = {
+                    offset, // offset
+                    freeSize, // size
+                    VMA_NULL, // hAllocation
+                    VMA_SUBALLOCATION_TYPE_FREE };
+                VMA_ASSERT(it == pMetadata->m_Suballocations.end());
+                VmaSuballocationList::iterator trailingFreeIt = pMetadata->m_Suballocations.insert(it, suballoc);
+                if(freeSize > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+                {
+                    pMetadata->m_FreeSuballocationsBySize.push_back(trailingFreeIt);
+                }
+            }
+
+            VMA_SORT(
+                pMetadata->m_FreeSuballocationsBySize.begin(),
+                pMetadata->m_FreeSuballocationsBySize.end(),
+                VmaSuballocationItemSizeLess());
+        }
+
+        VMA_HEAVY_ASSERT(pMetadata->Validate());
+    }
+}
+
+void VmaDefragmentationAlgorithm_Fast::InsertSuballoc(VmaBlockMetadata_Generic* pMetadata, const VmaSuballocation& suballoc)
+{
+    // TODO: Optimize somehow. Remember iterator instead of searching for it linearly.
+    VmaSuballocationList::iterator it = pMetadata->m_Suballocations.begin();
+    while(it != pMetadata->m_Suballocations.end())
+    {
+        if(it->offset < suballoc.offset)
+        {
+            ++it;
+        }
+    }
+    pMetadata->m_Suballocations.insert(it, suballoc);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaBlockVectorDefragmentationContext
+
+VmaBlockVectorDefragmentationContext::VmaBlockVectorDefragmentationContext(
+    VmaAllocator hAllocator,
+    VmaPool hCustomPool,
+    VmaBlockVector* pBlockVector,
+    uint32_t currFrameIndex,
+    uint32_t /*algorithmFlags*/) :
+    res(VK_SUCCESS),
+    mutexLocked(false),
+    blockContexts(VmaStlAllocator<VmaBlockDefragmentationContext>(hAllocator->GetAllocationCallbacks())),
+    m_hAllocator(hAllocator),
+    m_hCustomPool(hCustomPool),
+    m_pBlockVector(pBlockVector),
+    m_CurrFrameIndex(currFrameIndex),
+    /*m_AlgorithmFlags(algorithmFlags),*/
+    m_pAlgorithm(VMA_NULL),
+    m_Allocations(VmaStlAllocator<AllocInfo>(hAllocator->GetAllocationCallbacks())),
+    m_AllAllocations(false)
+{
+}
+
+VmaBlockVectorDefragmentationContext::~VmaBlockVectorDefragmentationContext()
+{
+    vma_delete(m_hAllocator, m_pAlgorithm);
+}
+
+void VmaBlockVectorDefragmentationContext::AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged)
+{
+    AllocInfo info = { hAlloc, pChanged };
+    m_Allocations.push_back(info);
+}
+
+void VmaBlockVectorDefragmentationContext::Begin(bool overlappingMoveSupported)
+{
+    const bool allAllocations = m_AllAllocations ||
+        m_Allocations.size() == m_pBlockVector->CalcAllocationCount();
+
+    /********************************
+    HERE IS THE CHOICE OF DEFRAGMENTATION ALGORITHM.
+    ********************************/
+
+    /*
+    Fast algorithm is supported only when certain criteria are met:
+    - VMA_DEBUG_MARGIN is 0.
+    - All allocations in this block vector are moveable.
+    - There is no possibility of image/buffer granularity conflict.
+    */
+    if(VMA_DEBUG_MARGIN == 0 &&
+        allAllocations &&
+        !m_pBlockVector->IsBufferImageGranularityConflictPossible())
+    {
+        m_pAlgorithm = vma_new(m_hAllocator, VmaDefragmentationAlgorithm_Fast)(
+            m_hAllocator, m_pBlockVector, m_CurrFrameIndex, overlappingMoveSupported);
+    }
+    else
+    {
+        m_pAlgorithm = vma_new(m_hAllocator, VmaDefragmentationAlgorithm_Generic)(
+            m_hAllocator, m_pBlockVector, m_CurrFrameIndex, overlappingMoveSupported);
+    }
+
+    if(allAllocations)
+    {
+        m_pAlgorithm->AddAll();
+    }
+    else
+    {
+        for(size_t i = 0, count = m_Allocations.size(); i < count; ++i)
+        {
+            m_pAlgorithm->AddAllocation(m_Allocations[i].hAlloc, m_Allocations[i].pChanged);
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaDefragmentationContext
+
+VmaDefragmentationContext_T::VmaDefragmentationContext_T(
+    VmaAllocator hAllocator,
+    uint32_t currFrameIndex,
+    uint32_t flags,
+    VmaDefragmentationStats* pStats) :
+    m_hAllocator(hAllocator),
+    m_CurrFrameIndex(currFrameIndex),
+    m_Flags(flags),
+    m_pStats(pStats),
+    m_CustomPoolContexts(VmaStlAllocator<VmaBlockVectorDefragmentationContext*>(hAllocator->GetAllocationCallbacks()))
+{
+    memset(m_DefaultPoolContexts, 0, sizeof(m_DefaultPoolContexts));
+}
+
+VmaDefragmentationContext_T::~VmaDefragmentationContext_T()
+{
+    for(size_t i = m_CustomPoolContexts.size(); i--; )
+    {
+        VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_CustomPoolContexts[i];
+        pBlockVectorCtx->GetBlockVector()->DefragmentationEnd(pBlockVectorCtx, m_pStats);
+        vma_delete(m_hAllocator, pBlockVectorCtx);
+    }
+    for(size_t i = m_hAllocator->m_MemProps.memoryTypeCount; i--; )
+    {
+        VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_DefaultPoolContexts[i];
+        if(pBlockVectorCtx)
+        {
+            pBlockVectorCtx->GetBlockVector()->DefragmentationEnd(pBlockVectorCtx, m_pStats);
+            vma_delete(m_hAllocator, pBlockVectorCtx);
+        }
+    }
+}
+
+void VmaDefragmentationContext_T::AddPools(uint32_t poolCount, VmaPool* pPools)
+{
+    for(uint32_t poolIndex = 0; poolIndex < poolCount; ++poolIndex)
+    {
+        VmaPool pool = pPools[poolIndex];
+        VMA_ASSERT(pool);
+        // Pools with algorithm other than default are not defragmented.
+        if(pool->m_BlockVector.GetAlgorithm() == 0)
+        {
+            VmaBlockVectorDefragmentationContext* pBlockVectorDefragCtx = VMA_NULL;
+            
+            for(size_t i = m_CustomPoolContexts.size(); i--; )
+            {
+                if(m_CustomPoolContexts[i]->GetCustomPool() == pool)
+                {
+                    pBlockVectorDefragCtx = m_CustomPoolContexts[i];
+                    break;
+                }
+            }
+            
+            if(!pBlockVectorDefragCtx)
+            {
+                pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)(
+                    m_hAllocator,
+                    pool,
+                    &pool->m_BlockVector,
+                    m_CurrFrameIndex,
+                    m_Flags);
+                m_CustomPoolContexts.push_back(pBlockVectorDefragCtx);
+            }
+
+            pBlockVectorDefragCtx->AddAll();
+        }
+    }
+}
+
+void VmaDefragmentationContext_T::AddAllocations(
+    uint32_t allocationCount,
+    VmaAllocation* pAllocations,
+    VkBool32* pAllocationsChanged)
+{
+    // Dispatch pAllocations among defragmentators. Create them when necessary.
+    for(uint32_t allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+    {
+        const VmaAllocation hAlloc = pAllocations[allocIndex];
+        VMA_ASSERT(hAlloc);
+        // DedicatedAlloc cannot be defragmented.
+        if((hAlloc->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK) &&
+            // Lost allocation cannot be defragmented.
+            (hAlloc->GetLastUseFrameIndex() != VMA_FRAME_INDEX_LOST))
+        {
+            VmaBlockVectorDefragmentationContext* pBlockVectorDefragCtx = VMA_NULL;
+
+            const VmaPool hAllocPool = hAlloc->GetPool();
+            // This allocation belongs to custom pool.
+            if(hAllocPool != VK_NULL_HANDLE)
+            {
+                // Pools with algorithm other than default are not defragmented.
+                if(hAllocPool->m_BlockVector.GetAlgorithm() == 0)
+                {
+                    for(size_t i = m_CustomPoolContexts.size(); i--; )
+                    {
+                        if(m_CustomPoolContexts[i]->GetCustomPool() == hAllocPool)
+                        {
+                            pBlockVectorDefragCtx = m_CustomPoolContexts[i];
+                            break;
+                        }
+                    }
+                    if(!pBlockVectorDefragCtx)
+                    {
+                        pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)(
+                            m_hAllocator,
+                            hAllocPool,
+                            &hAllocPool->m_BlockVector,
+                            m_CurrFrameIndex,
+                            m_Flags);
+                        m_CustomPoolContexts.push_back(pBlockVectorDefragCtx);
+                    }
+                }
+            }
+            // This allocation belongs to default pool.
+            else
+            {
+                const uint32_t memTypeIndex = hAlloc->GetMemoryTypeIndex();
+                pBlockVectorDefragCtx = m_DefaultPoolContexts[memTypeIndex];
+                if(!pBlockVectorDefragCtx)
+                {
+                    pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)(
+                        m_hAllocator,
+                        VMA_NULL, // hCustomPool
+                        m_hAllocator->m_pBlockVectors[memTypeIndex],
+                        m_CurrFrameIndex,
+                        m_Flags);
+                    m_DefaultPoolContexts[memTypeIndex] = pBlockVectorDefragCtx;
+                }
+            }
+
+            if(pBlockVectorDefragCtx)
+            {
+                VkBool32* const pChanged = (pAllocationsChanged != VMA_NULL) ?
+                    &pAllocationsChanged[allocIndex] : VMA_NULL;
+                pBlockVectorDefragCtx->AddAllocation(hAlloc, pChanged);
+            }
+        }
+    }
+}
+
+VkResult VmaDefragmentationContext_T::Defragment(
+    VkDeviceSize maxCpuBytesToMove, uint32_t maxCpuAllocationsToMove,
+    VkDeviceSize maxGpuBytesToMove, uint32_t maxGpuAllocationsToMove,
+    VkCommandBuffer commandBuffer, VmaDefragmentationStats* pStats)
+{
+    if(pStats)
+    {
+        memset(pStats, 0, sizeof(VmaDefragmentationStats));
+    }
+
+    if(commandBuffer == VK_NULL_HANDLE)
+    {
+        maxGpuBytesToMove = 0;
+        maxGpuAllocationsToMove = 0;
+    }
+
+    VkResult res = VK_SUCCESS;
+
+    // Process default pools.
+    for(uint32_t memTypeIndex = 0;
+        memTypeIndex < m_hAllocator->GetMemoryTypeCount() && res >= VK_SUCCESS;
+        ++memTypeIndex)
+    {
+        VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_DefaultPoolContexts[memTypeIndex];
+        if(pBlockVectorCtx)
+        {
+            VMA_ASSERT(pBlockVectorCtx->GetBlockVector());
+            pBlockVectorCtx->GetBlockVector()->Defragment(
+                pBlockVectorCtx,
+                pStats,
+                maxCpuBytesToMove, maxCpuAllocationsToMove,
+                maxGpuBytesToMove, maxGpuAllocationsToMove,
+                commandBuffer);
+            if(pBlockVectorCtx->res != VK_SUCCESS)
+            {
+                res = pBlockVectorCtx->res;
+            }
+        }
+    }
+
+    // Process custom pools.
+    for(size_t customCtxIndex = 0, customCtxCount = m_CustomPoolContexts.size();
+        customCtxIndex < customCtxCount && res >= VK_SUCCESS;
+        ++customCtxIndex)
+    {
+        VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_CustomPoolContexts[customCtxIndex];
+        VMA_ASSERT(pBlockVectorCtx && pBlockVectorCtx->GetBlockVector());
+        pBlockVectorCtx->GetBlockVector()->Defragment(
+            pBlockVectorCtx,
+            pStats,
+            maxCpuBytesToMove, maxCpuAllocationsToMove,
+            maxGpuBytesToMove, maxGpuAllocationsToMove,
+            commandBuffer);
+        if(pBlockVectorCtx->res != VK_SUCCESS)
+        {
+            res = pBlockVectorCtx->res;
+        }
+    }
+
+    return res;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaRecorder
+
+#if VMA_RECORDING_ENABLED
+
+VmaRecorder::VmaRecorder() :
+    m_UseMutex(true),
+    m_Flags(0),
+    m_File(VMA_NULL),
+    m_Freq(INT64_MAX),
+    m_StartCounter(INT64_MAX)
+{
+}
+
+VkResult VmaRecorder::Init(const VmaRecordSettings& settings, bool useMutex)
+{
+    m_UseMutex = useMutex;
+    m_Flags = settings.flags;
+
+    QueryPerformanceFrequency((LARGE_INTEGER*)&m_Freq);
+    QueryPerformanceCounter((LARGE_INTEGER*)&m_StartCounter);
+
+    // Open file for writing.
+    errno_t err = fopen_s(&m_File, settings.pFilePath, "wb");
+    if(err != 0)
+    {
+        return VK_ERROR_INITIALIZATION_FAILED;
+    }
+
+    // Write header.
+    fprintf(m_File, "%s\n", "Vulkan Memory Allocator,Calls recording");
+    fprintf(m_File, "%s\n", "1,5");
+
+    return VK_SUCCESS;
+}
+
+VmaRecorder::~VmaRecorder()
+{
+    if(m_File != VMA_NULL)
+    {
+        fclose(m_File);
+    }
+}
+
+void VmaRecorder::RecordCreateAllocator(uint32_t frameIndex)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreateAllocator\n", callParams.threadId, callParams.time, frameIndex);
+    Flush();
+}
+
+void VmaRecorder::RecordDestroyAllocator(uint32_t frameIndex)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDestroyAllocator\n", callParams.threadId, callParams.time, frameIndex);
+    Flush();
+}
+
+void VmaRecorder::RecordCreatePool(uint32_t frameIndex, const VmaPoolCreateInfo& createInfo, VmaPool pool)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreatePool,%u,%u,%llu,%llu,%llu,%u,%p\n", callParams.threadId, callParams.time, frameIndex,
+        createInfo.memoryTypeIndex,
+        createInfo.flags,
+        createInfo.blockSize,
+        (uint64_t)createInfo.minBlockCount,
+        (uint64_t)createInfo.maxBlockCount,
+        createInfo.frameInUseCount,
+        pool);
+    Flush();
+}
+
+void VmaRecorder::RecordDestroyPool(uint32_t frameIndex, VmaPool pool)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDestroyPool,%p\n", callParams.threadId, callParams.time, frameIndex,
+        pool);
+    Flush();
+}
+
+void VmaRecorder::RecordAllocateMemory(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(createInfo.flags, createInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemory,%llu,%llu,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        vkMemReq.size,
+        vkMemReq.alignment,
+        vkMemReq.memoryTypeBits,
+        createInfo.flags,
+        createInfo.usage,
+        createInfo.requiredFlags,
+        createInfo.preferredFlags,
+        createInfo.memoryTypeBits,
+        createInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordAllocateMemoryPages(uint32_t frameIndex,
+    const VkMemoryRequirements& vkMemReq,
+    const VmaAllocationCreateInfo& createInfo,
+    uint64_t allocationCount,
+    const VmaAllocation* pAllocations)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(createInfo.flags, createInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryPages,%llu,%llu,%u,%u,%u,%u,%u,%u,%p,", callParams.threadId, callParams.time, frameIndex,
+        vkMemReq.size,
+        vkMemReq.alignment,
+        vkMemReq.memoryTypeBits,
+        createInfo.flags,
+        createInfo.usage,
+        createInfo.requiredFlags,
+        createInfo.preferredFlags,
+        createInfo.memoryTypeBits,
+        createInfo.pool);
+    PrintPointerList(allocationCount, pAllocations);
+    fprintf(m_File, ",%s\n", userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordAllocateMemoryForBuffer(uint32_t frameIndex,
+    const VkMemoryRequirements& vkMemReq,
+    bool requiresDedicatedAllocation,
+    bool prefersDedicatedAllocation,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(createInfo.flags, createInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryForBuffer,%llu,%llu,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        vkMemReq.size,
+        vkMemReq.alignment,
+        vkMemReq.memoryTypeBits,
+        requiresDedicatedAllocation ? 1 : 0,
+        prefersDedicatedAllocation ? 1 : 0,
+        createInfo.flags,
+        createInfo.usage,
+        createInfo.requiredFlags,
+        createInfo.preferredFlags,
+        createInfo.memoryTypeBits,
+        createInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordAllocateMemoryForImage(uint32_t frameIndex,
+    const VkMemoryRequirements& vkMemReq,
+    bool requiresDedicatedAllocation,
+    bool prefersDedicatedAllocation,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(createInfo.flags, createInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryForImage,%llu,%llu,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        vkMemReq.size,
+        vkMemReq.alignment,
+        vkMemReq.memoryTypeBits,
+        requiresDedicatedAllocation ? 1 : 0,
+        prefersDedicatedAllocation ? 1 : 0,
+        createInfo.flags,
+        createInfo.usage,
+        createInfo.requiredFlags,
+        createInfo.preferredFlags,
+        createInfo.memoryTypeBits,
+        createInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordFreeMemory(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaFreeMemory,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordFreeMemoryPages(uint32_t frameIndex,
+    uint64_t allocationCount,
+    const VmaAllocation* pAllocations)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaFreeMemoryPages,", callParams.threadId, callParams.time, frameIndex);
+    PrintPointerList(allocationCount, pAllocations);
+    fprintf(m_File, "\n");
+    Flush();
+}
+
+void VmaRecorder::RecordResizeAllocation(
+    uint32_t frameIndex,
+    VmaAllocation allocation,
+    VkDeviceSize newSize)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaResizeAllocation,%p,%llu\n", callParams.threadId, callParams.time, frameIndex,
+        allocation, newSize);
+    Flush();
+}
+
+void VmaRecorder::RecordSetAllocationUserData(uint32_t frameIndex,
+    VmaAllocation allocation,
+    const void* pUserData)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(
+        allocation->IsUserDataString() ? VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT : 0,
+        pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaSetAllocationUserData,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordCreateLostAllocation(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreateLostAllocation,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordMapMemory(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaMapMemory,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordUnmapMemory(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaUnmapMemory,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordFlushAllocation(uint32_t frameIndex,
+    VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaFlushAllocation,%p,%llu,%llu\n", callParams.threadId, callParams.time, frameIndex,
+        allocation,
+        offset,
+        size);
+    Flush();
+}
+
+void VmaRecorder::RecordInvalidateAllocation(uint32_t frameIndex,
+    VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaInvalidateAllocation,%p,%llu,%llu\n", callParams.threadId, callParams.time, frameIndex,
+        allocation,
+        offset,
+        size);
+    Flush();
+}
+
+void VmaRecorder::RecordCreateBuffer(uint32_t frameIndex,
+    const VkBufferCreateInfo& bufCreateInfo,
+    const VmaAllocationCreateInfo& allocCreateInfo,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(allocCreateInfo.flags, allocCreateInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreateBuffer,%u,%llu,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        bufCreateInfo.flags,
+        bufCreateInfo.size,
+        bufCreateInfo.usage,
+        bufCreateInfo.sharingMode,
+        allocCreateInfo.flags,
+        allocCreateInfo.usage,
+        allocCreateInfo.requiredFlags,
+        allocCreateInfo.preferredFlags,
+        allocCreateInfo.memoryTypeBits,
+        allocCreateInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordCreateImage(uint32_t frameIndex,
+    const VkImageCreateInfo& imageCreateInfo,
+    const VmaAllocationCreateInfo& allocCreateInfo,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(allocCreateInfo.flags, allocCreateInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreateImage,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        imageCreateInfo.flags,
+        imageCreateInfo.imageType,
+        imageCreateInfo.format,
+        imageCreateInfo.extent.width,
+        imageCreateInfo.extent.height,
+        imageCreateInfo.extent.depth,
+        imageCreateInfo.mipLevels,
+        imageCreateInfo.arrayLayers,
+        imageCreateInfo.samples,
+        imageCreateInfo.tiling,
+        imageCreateInfo.usage,
+        imageCreateInfo.sharingMode,
+        imageCreateInfo.initialLayout,
+        allocCreateInfo.flags,
+        allocCreateInfo.usage,
+        allocCreateInfo.requiredFlags,
+        allocCreateInfo.preferredFlags,
+        allocCreateInfo.memoryTypeBits,
+        allocCreateInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordDestroyBuffer(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDestroyBuffer,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordDestroyImage(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDestroyImage,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordTouchAllocation(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaTouchAllocation,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordGetAllocationInfo(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaGetAllocationInfo,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordMakePoolAllocationsLost(uint32_t frameIndex,
+    VmaPool pool)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaMakePoolAllocationsLost,%p\n", callParams.threadId, callParams.time, frameIndex,
+        pool);
+    Flush();
+}
+
+void VmaRecorder::RecordDefragmentationBegin(uint32_t frameIndex,
+    const VmaDefragmentationInfo2& info,
+    VmaDefragmentationContext ctx)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDefragmentationBegin,%u,", callParams.threadId, callParams.time, frameIndex,
+        info.flags);
+    PrintPointerList(info.allocationCount, info.pAllocations);
+    fprintf(m_File, ",");
+    PrintPointerList(info.poolCount, info.pPools);
+    fprintf(m_File, ",%llu,%u,%llu,%u,%p,%p\n",
+        info.maxCpuBytesToMove,
+        info.maxCpuAllocationsToMove,
+        info.maxGpuBytesToMove,
+        info.maxGpuAllocationsToMove,
+        info.commandBuffer,
+        ctx);
+    Flush();
+}
+
+void VmaRecorder::RecordDefragmentationEnd(uint32_t frameIndex,
+    VmaDefragmentationContext ctx)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDefragmentationEnd,%p\n", callParams.threadId, callParams.time, frameIndex,
+        ctx);
+    Flush();
+}
+
+VmaRecorder::UserDataString::UserDataString(VmaAllocationCreateFlags allocFlags, const void* pUserData)
+{
+    if(pUserData != VMA_NULL)
+    {
+        if((allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0)
+        {
+            m_Str = (const char*)pUserData;
+        }
+        else
+        {
+            sprintf_s(m_PtrStr, "%p", pUserData);
+            m_Str = m_PtrStr;
+        }
+    }
+    else
+    {
+        m_Str = "";
+    }
+}
+
+void VmaRecorder::WriteConfiguration(
+    const VkPhysicalDeviceProperties& devProps,
+    const VkPhysicalDeviceMemoryProperties& memProps,
+    bool dedicatedAllocationExtensionEnabled)
+{
+    fprintf(m_File, "Config,Begin\n");
+
+    fprintf(m_File, "PhysicalDevice,apiVersion,%u\n", devProps.apiVersion);
+    fprintf(m_File, "PhysicalDevice,driverVersion,%u\n", devProps.driverVersion);
+    fprintf(m_File, "PhysicalDevice,vendorID,%u\n", devProps.vendorID);
+    fprintf(m_File, "PhysicalDevice,deviceID,%u\n", devProps.deviceID);
+    fprintf(m_File, "PhysicalDevice,deviceType,%u\n", devProps.deviceType);
+    fprintf(m_File, "PhysicalDevice,deviceName,%s\n", devProps.deviceName);
+
+    fprintf(m_File, "PhysicalDeviceLimits,maxMemoryAllocationCount,%u\n", devProps.limits.maxMemoryAllocationCount);
+    fprintf(m_File, "PhysicalDeviceLimits,bufferImageGranularity,%llu\n", devProps.limits.bufferImageGranularity);
+    fprintf(m_File, "PhysicalDeviceLimits,nonCoherentAtomSize,%llu\n", devProps.limits.nonCoherentAtomSize);
+
+    fprintf(m_File, "PhysicalDeviceMemory,HeapCount,%u\n", memProps.memoryHeapCount);
+    for(uint32_t i = 0; i < memProps.memoryHeapCount; ++i)
+    {
+        fprintf(m_File, "PhysicalDeviceMemory,Heap,%u,size,%llu\n", i, memProps.memoryHeaps[i].size);
+        fprintf(m_File, "PhysicalDeviceMemory,Heap,%u,flags,%u\n", i, memProps.memoryHeaps[i].flags);
+    }
+    fprintf(m_File, "PhysicalDeviceMemory,TypeCount,%u\n", memProps.memoryTypeCount);
+    for(uint32_t i = 0; i < memProps.memoryTypeCount; ++i)
+    {
+        fprintf(m_File, "PhysicalDeviceMemory,Type,%u,heapIndex,%u\n", i, memProps.memoryTypes[i].heapIndex);
+        fprintf(m_File, "PhysicalDeviceMemory,Type,%u,propertyFlags,%u\n", i, memProps.memoryTypes[i].propertyFlags);
+    }
+
+    fprintf(m_File, "Extension,VK_KHR_dedicated_allocation,%u\n", dedicatedAllocationExtensionEnabled ? 1 : 0);
+
+    fprintf(m_File, "Macro,VMA_DEBUG_ALWAYS_DEDICATED_MEMORY,%u\n", VMA_DEBUG_ALWAYS_DEDICATED_MEMORY ? 1 : 0);
+    fprintf(m_File, "Macro,VMA_DEBUG_ALIGNMENT,%llu\n", (VkDeviceSize)VMA_DEBUG_ALIGNMENT);
+    fprintf(m_File, "Macro,VMA_DEBUG_MARGIN,%llu\n", (VkDeviceSize)VMA_DEBUG_MARGIN);
+    fprintf(m_File, "Macro,VMA_DEBUG_INITIALIZE_ALLOCATIONS,%u\n", VMA_DEBUG_INITIALIZE_ALLOCATIONS ? 1 : 0);
+    fprintf(m_File, "Macro,VMA_DEBUG_DETECT_CORRUPTION,%u\n", VMA_DEBUG_DETECT_CORRUPTION ? 1 : 0);
+    fprintf(m_File, "Macro,VMA_DEBUG_GLOBAL_MUTEX,%u\n", VMA_DEBUG_GLOBAL_MUTEX ? 1 : 0);
+    fprintf(m_File, "Macro,VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY,%llu\n", (VkDeviceSize)VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY);
+    fprintf(m_File, "Macro,VMA_SMALL_HEAP_MAX_SIZE,%llu\n", (VkDeviceSize)VMA_SMALL_HEAP_MAX_SIZE);
+    fprintf(m_File, "Macro,VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE,%llu\n", (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE);
+
+    fprintf(m_File, "Config,End\n");
+}
+
+void VmaRecorder::GetBasicParams(CallParams& outParams)
+{
+    outParams.threadId = GetCurrentThreadId();
+
+    LARGE_INTEGER counter;
+    QueryPerformanceCounter(&counter);
+    outParams.time = (double)(counter.QuadPart - m_StartCounter) / (double)m_Freq;
+}
+
+void VmaRecorder::PrintPointerList(uint64_t count, const VmaAllocation* pItems)
+{
+    if(count)
+    {
+        fprintf(m_File, "%p", pItems[0]);
+        for(uint64_t i = 1; i < count; ++i)
+        {
+            fprintf(m_File, " %p", pItems[i]);
+        }
+    }
+}
+
+void VmaRecorder::Flush()
+{
+    if((m_Flags & VMA_RECORD_FLUSH_AFTER_CALL_BIT) != 0)
+    {
+        fflush(m_File);
+    }
+}
+
+#endif // #if VMA_RECORDING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaAllocator_T
+
+VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :
+    m_UseMutex((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT) == 0),
+    m_UseKhrDedicatedAllocation((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0),
+    m_hDevice(pCreateInfo->device),
+    m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL),
+    m_AllocationCallbacks(pCreateInfo->pAllocationCallbacks ?
+        *pCreateInfo->pAllocationCallbacks : VmaEmptyAllocationCallbacks),
+    m_PreferredLargeHeapBlockSize(0),
+    m_PhysicalDevice(pCreateInfo->physicalDevice),
+    m_CurrentFrameIndex(0),
+    m_Pools(VmaStlAllocator<VmaPool>(GetAllocationCallbacks())),
+    m_NextPoolId(0)
+#if VMA_RECORDING_ENABLED
+    ,m_pRecorder(VMA_NULL)
+#endif
+{
+    if(VMA_DEBUG_DETECT_CORRUPTION)
+    {
+        // Needs to be multiply of uint32_t size because we are going to write VMA_CORRUPTION_DETECTION_MAGIC_VALUE to it.
+        VMA_ASSERT(VMA_DEBUG_MARGIN % sizeof(uint32_t) == 0);
+    }
+
+    VMA_ASSERT(pCreateInfo->physicalDevice && pCreateInfo->device);
+
+#if !(VMA_DEDICATED_ALLOCATION)
+    if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0)
+    {
+        VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT set but required extensions are disabled by preprocessor macros.");
+    }
+#endif
+
+    memset(&m_DeviceMemoryCallbacks, 0 ,sizeof(m_DeviceMemoryCallbacks));
+    memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties));
+    memset(&m_MemProps, 0, sizeof(m_MemProps));
+        
+    memset(&m_pBlockVectors, 0, sizeof(m_pBlockVectors));
+    memset(&m_pDedicatedAllocations, 0, sizeof(m_pDedicatedAllocations));
+
+    for(uint32_t i = 0; i < VK_MAX_MEMORY_HEAPS; ++i)
+    {
+        m_HeapSizeLimit[i] = VK_WHOLE_SIZE;
+    }
+
+    if(pCreateInfo->pDeviceMemoryCallbacks != VMA_NULL)
+    {
+        m_DeviceMemoryCallbacks.pfnAllocate = pCreateInfo->pDeviceMemoryCallbacks->pfnAllocate;
+        m_DeviceMemoryCallbacks.pfnFree = pCreateInfo->pDeviceMemoryCallbacks->pfnFree;
+    }
+
+    ImportVulkanFunctions(pCreateInfo->pVulkanFunctions);
+
+    (*m_VulkanFunctions.vkGetPhysicalDeviceProperties)(m_PhysicalDevice, &m_PhysicalDeviceProperties);
+    (*m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties)(m_PhysicalDevice, &m_MemProps);
+
+    VMA_ASSERT(VmaIsPow2(VMA_DEBUG_ALIGNMENT));
+    VMA_ASSERT(VmaIsPow2(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY));
+    VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.bufferImageGranularity));
+    VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.nonCoherentAtomSize));
+
+    m_PreferredLargeHeapBlockSize = (pCreateInfo->preferredLargeHeapBlockSize != 0) ?
+        pCreateInfo->preferredLargeHeapBlockSize : static_cast<VkDeviceSize>(VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE);
+
+    if(pCreateInfo->pHeapSizeLimit != VMA_NULL)
+    {
+        for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex)
+        {
+            const VkDeviceSize limit = pCreateInfo->pHeapSizeLimit[heapIndex];
+            if(limit != VK_WHOLE_SIZE)
+            {
+                m_HeapSizeLimit[heapIndex] = limit;
+                if(limit < m_MemProps.memoryHeaps[heapIndex].size)
+                {
+                    m_MemProps.memoryHeaps[heapIndex].size = limit;
+                }
+            }
+        }
+    }
+
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(memTypeIndex);
+
+        m_pBlockVectors[memTypeIndex] = vma_new(this, VmaBlockVector)(
+            this,
+            memTypeIndex,
+            preferredBlockSize,
+            0,
+            SIZE_MAX,
+            GetBufferImageGranularity(),
+            pCreateInfo->frameInUseCount,
+            false, // isCustomPool
+            false, // explicitBlockSize
+            false); // linearAlgorithm
+        // No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here,
+        // becase minBlockCount is 0.
+        m_pDedicatedAllocations[memTypeIndex] = vma_new(this, AllocationVectorType)(VmaStlAllocator<VmaAllocation>(GetAllocationCallbacks()));
+
+    }
+}
+
+VkResult VmaAllocator_T::Init(const VmaAllocatorCreateInfo* pCreateInfo)
+{
+    VkResult res = VK_SUCCESS;
+
+    if(pCreateInfo->pRecordSettings != VMA_NULL &&
+        !VmaStrIsEmpty(pCreateInfo->pRecordSettings->pFilePath))
+    {
+#if VMA_RECORDING_ENABLED
+        m_pRecorder = vma_new(this, VmaRecorder)();
+        res = m_pRecorder->Init(*pCreateInfo->pRecordSettings, m_UseMutex);
+        if(res != VK_SUCCESS)
+        {
+            return res;
+        }
+        m_pRecorder->WriteConfiguration(
+            m_PhysicalDeviceProperties,
+            m_MemProps,
+            m_UseKhrDedicatedAllocation);
+        m_pRecorder->RecordCreateAllocator(GetCurrentFrameIndex());
+#else
+        VMA_ASSERT(0 && "VmaAllocatorCreateInfo::pRecordSettings used, but not supported due to VMA_RECORDING_ENABLED not defined to 1.");
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+#endif
+    }
+
+    return res;
+}
+
+VmaAllocator_T::~VmaAllocator_T()
+{
+#if VMA_RECORDING_ENABLED
+    if(m_pRecorder != VMA_NULL)
+    {
+        m_pRecorder->RecordDestroyAllocator(GetCurrentFrameIndex());
+        vma_delete(this, m_pRecorder);
+    }
+#endif
+    
+    VMA_ASSERT(m_Pools.empty());
+
+    for(size_t i = GetMemoryTypeCount(); i--; )
+    {
+        vma_delete(this, m_pDedicatedAllocations[i]);
+        vma_delete(this, m_pBlockVectors[i]);
+    }
+}
+
+void VmaAllocator_T::ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions)
+{
+#if VMA_STATIC_VULKAN_FUNCTIONS == 1
+    m_VulkanFunctions.vkGetPhysicalDeviceProperties = &vkGetPhysicalDeviceProperties;
+    m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = &vkGetPhysicalDeviceMemoryProperties;
+    m_VulkanFunctions.vkAllocateMemory = &vkAllocateMemory;
+    m_VulkanFunctions.vkFreeMemory = &vkFreeMemory;
+    m_VulkanFunctions.vkMapMemory = &vkMapMemory;
+    m_VulkanFunctions.vkUnmapMemory = &vkUnmapMemory;
+    m_VulkanFunctions.vkFlushMappedMemoryRanges = &vkFlushMappedMemoryRanges;
+    m_VulkanFunctions.vkInvalidateMappedMemoryRanges = &vkInvalidateMappedMemoryRanges;
+    m_VulkanFunctions.vkBindBufferMemory = &vkBindBufferMemory;
+    m_VulkanFunctions.vkBindImageMemory = &vkBindImageMemory;
+    m_VulkanFunctions.vkGetBufferMemoryRequirements = &vkGetBufferMemoryRequirements;
+    m_VulkanFunctions.vkGetImageMemoryRequirements = &vkGetImageMemoryRequirements;
+    m_VulkanFunctions.vkCreateBuffer = &vkCreateBuffer;
+    m_VulkanFunctions.vkDestroyBuffer = &vkDestroyBuffer;
+    m_VulkanFunctions.vkCreateImage = &vkCreateImage;
+    m_VulkanFunctions.vkDestroyImage = &vkDestroyImage;
+    m_VulkanFunctions.vkCmdCopyBuffer = &vkCmdCopyBuffer;
+#if VMA_DEDICATED_ALLOCATION
+    if(m_UseKhrDedicatedAllocation)
+    {
+        m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR =
+            (PFN_vkGetBufferMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetBufferMemoryRequirements2KHR");
+        m_VulkanFunctions.vkGetImageMemoryRequirements2KHR =
+            (PFN_vkGetImageMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetImageMemoryRequirements2KHR");
+    }
+#endif // #if VMA_DEDICATED_ALLOCATION
+#endif // #if VMA_STATIC_VULKAN_FUNCTIONS == 1
+
+#define VMA_COPY_IF_NOT_NULL(funcName) \
+    if(pVulkanFunctions->funcName != VMA_NULL) m_VulkanFunctions.funcName = pVulkanFunctions->funcName;
+
+    if(pVulkanFunctions != VMA_NULL)
+    {
+        VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceProperties);
+        VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties);
+        VMA_COPY_IF_NOT_NULL(vkAllocateMemory);
+        VMA_COPY_IF_NOT_NULL(vkFreeMemory);
+        VMA_COPY_IF_NOT_NULL(vkMapMemory);
+        VMA_COPY_IF_NOT_NULL(vkUnmapMemory);
+        VMA_COPY_IF_NOT_NULL(vkFlushMappedMemoryRanges);
+        VMA_COPY_IF_NOT_NULL(vkInvalidateMappedMemoryRanges);
+        VMA_COPY_IF_NOT_NULL(vkBindBufferMemory);
+        VMA_COPY_IF_NOT_NULL(vkBindImageMemory);
+        VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements);
+        VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements);
+        VMA_COPY_IF_NOT_NULL(vkCreateBuffer);
+        VMA_COPY_IF_NOT_NULL(vkDestroyBuffer);
+        VMA_COPY_IF_NOT_NULL(vkCreateImage);
+        VMA_COPY_IF_NOT_NULL(vkDestroyImage);
+        VMA_COPY_IF_NOT_NULL(vkCmdCopyBuffer);
+#if VMA_DEDICATED_ALLOCATION
+        VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements2KHR);
+        VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements2KHR);
+#endif
+    }
+
+#undef VMA_COPY_IF_NOT_NULL
+
+    // If these asserts are hit, you must either #define VMA_STATIC_VULKAN_FUNCTIONS 1
+    // or pass valid pointers as VmaAllocatorCreateInfo::pVulkanFunctions.
+    VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkAllocateMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkFreeMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkMapMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkUnmapMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkFlushMappedMemoryRanges != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkInvalidateMappedMemoryRanges != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkCreateBuffer != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkDestroyBuffer != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkCreateImage != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkDestroyImage != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkCmdCopyBuffer != VMA_NULL);
+#if VMA_DEDICATED_ALLOCATION
+    if(m_UseKhrDedicatedAllocation)
+    {
+        VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR != VMA_NULL);
+        VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements2KHR != VMA_NULL);
+    }
+#endif
+}
+
+VkDeviceSize VmaAllocator_T::CalcPreferredBlockSize(uint32_t memTypeIndex)
+{
+    const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);
+    const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size;
+    const bool isSmallHeap = heapSize <= VMA_SMALL_HEAP_MAX_SIZE;
+    return isSmallHeap ? (heapSize / 8) : m_PreferredLargeHeapBlockSize;
+}
+
+VkResult VmaAllocator_T::AllocateMemoryOfType(
+    VkDeviceSize size,
+    VkDeviceSize alignment,
+    bool dedicatedAllocation,
+    VkBuffer dedicatedBuffer,
+    VkImage dedicatedImage,
+    const VmaAllocationCreateInfo& createInfo,
+    uint32_t memTypeIndex,
+    VmaSuballocationType suballocType,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    VMA_ASSERT(pAllocations != VMA_NULL);
+    VMA_DEBUG_LOG("  AllocateMemory: MemoryTypeIndex=%u, AllocationCount=%zu, Size=%llu", memTypeIndex, allocationCount, vkMemReq.size);
+
+    VmaAllocationCreateInfo finalCreateInfo = createInfo;
+
+    // If memory type is not HOST_VISIBLE, disable MAPPED.
+    if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 &&
+        (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+    {
+        finalCreateInfo.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT;
+    }
+
+    VmaBlockVector* const blockVector = m_pBlockVectors[memTypeIndex];
+    VMA_ASSERT(blockVector);
+
+    const VkDeviceSize preferredBlockSize = blockVector->GetPreferredBlockSize();
+    bool preferDedicatedMemory =
+        VMA_DEBUG_ALWAYS_DEDICATED_MEMORY ||
+        dedicatedAllocation ||
+        // Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size.
+        size > preferredBlockSize / 2;
+
+    if(preferDedicatedMemory &&
+        (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 &&
+        finalCreateInfo.pool == VK_NULL_HANDLE)
+    {
+        finalCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;
+    }
+
+    if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0)
+    {
+        if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)
+        {
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+        else
+        {
+            return AllocateDedicatedMemory(
+                size,
+                suballocType,
+                memTypeIndex,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,
+                finalCreateInfo.pUserData,
+                dedicatedBuffer,
+                dedicatedImage,
+                allocationCount,
+                pAllocations);
+        }
+    }
+    else
+    {
+        VkResult res = blockVector->Allocate(
+            VK_NULL_HANDLE, // hCurrentPool
+            m_CurrentFrameIndex.load(),
+            size,
+            alignment,
+            finalCreateInfo,
+            suballocType,
+            allocationCount,
+            pAllocations);
+        if(res == VK_SUCCESS)
+        {
+            return res;
+        }
+
+        // 5. Try dedicated memory.
+        if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)
+        {
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+        else
+        {
+            res = AllocateDedicatedMemory(
+                size,
+                suballocType,
+                memTypeIndex,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,
+                finalCreateInfo.pUserData,
+                dedicatedBuffer,
+                dedicatedImage,
+                allocationCount,
+                pAllocations);
+            if(res == VK_SUCCESS)
+            {
+                // Succeeded: AllocateDedicatedMemory function already filld pMemory, nothing more to do here.
+                VMA_DEBUG_LOG("    Allocated as DedicatedMemory");
+                return VK_SUCCESS;
+            }
+            else
+            {
+                // Everything failed: Return error code.
+                VMA_DEBUG_LOG("    vkAllocateMemory FAILED");
+                return res;
+            }
+        }
+    }
+}
+
+VkResult VmaAllocator_T::AllocateDedicatedMemory(
+    VkDeviceSize size,
+    VmaSuballocationType suballocType,
+    uint32_t memTypeIndex,
+    bool map,
+    bool isUserDataString,
+    void* pUserData,
+    VkBuffer /*dedicatedBuffer*/,
+    VkImage /*dedicatedImage*/,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    VMA_ASSERT(allocationCount > 0 && pAllocations);
+
+    VkMemoryAllocateInfo allocInfo = {};
+    allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+    allocInfo.memoryTypeIndex = memTypeIndex;
+    allocInfo.allocationSize = size;
+
+#if VMA_DEDICATED_ALLOCATION
+    VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = {};
+    dedicatedAllocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR;
+    if(m_UseKhrDedicatedAllocation)
+    {
+        if(dedicatedBuffer != VK_NULL_HANDLE)
+        {
+            VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE);
+            dedicatedAllocInfo.buffer = dedicatedBuffer;
+            allocInfo.pNext = &dedicatedAllocInfo;
+        }
+        else if(dedicatedImage != VK_NULL_HANDLE)
+        {
+            dedicatedAllocInfo.image = dedicatedImage;
+            allocInfo.pNext = &dedicatedAllocInfo;
+        }
+    }
+#endif // #if VMA_DEDICATED_ALLOCATION
+
+    size_t allocIndex;
+    VkResult res = VK_SUCCESS;
+    for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+    {
+        res = AllocateDedicatedMemoryPage(
+            size,
+            suballocType,
+            memTypeIndex,
+            allocInfo,
+            map,
+            isUserDataString,
+            pUserData,
+            pAllocations + allocIndex);
+        if(res != VK_SUCCESS)
+        {
+            break;
+        }
+    }
+
+    if(res == VK_SUCCESS)
+    {
+        // Register them in m_pDedicatedAllocations.
+        {
+            VmaMutexLockWrite lock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex);
+            AllocationVectorType* pDedicatedAllocations = m_pDedicatedAllocations[memTypeIndex];
+            VMA_ASSERT(pDedicatedAllocations);
+            for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+            {
+                VmaVectorInsertSorted<VmaPointerLess>(*pDedicatedAllocations, pAllocations[allocIndex]);
+            }
+        }
+
+        VMA_DEBUG_LOG("    Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%u", allocationCount, memTypeIndex);
+    }
+    else
+    {
+        // Free all already created allocations.
+        while(allocIndex--)
+        {
+            VmaAllocation currAlloc = pAllocations[allocIndex];
+            VkDeviceMemory hMemory = currAlloc->GetMemory();
+    
+            /*
+            There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory
+            before vkFreeMemory.
+
+            if(currAlloc->GetMappedData() != VMA_NULL)
+            {
+                (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory);
+            }
+            */
+    
+            FreeVulkanMemory(memTypeIndex, currAlloc->GetSize(), hMemory);
+
+            currAlloc->SetUserData(this, VMA_NULL);
+            vma_delete(this, currAlloc);
+        }
+
+        memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);
+    }
+
+    return res;
+}
+
+VkResult VmaAllocator_T::AllocateDedicatedMemoryPage(
+    VkDeviceSize size,
+    VmaSuballocationType suballocType,
+    uint32_t memTypeIndex,
+    const VkMemoryAllocateInfo& allocInfo,
+    bool map,
+    bool isUserDataString,
+    void* pUserData,
+    VmaAllocation* pAllocation)
+{
+    VkDeviceMemory hMemory = VK_NULL_HANDLE;
+    VkResult res = AllocateVulkanMemory(&allocInfo, &hMemory);
+    if(res < 0)
+    {
+        VMA_DEBUG_LOG("    vkAllocateMemory FAILED");
+        return res;
+    }
+
+    void* pMappedData = VMA_NULL;
+    if(map)
+    {
+        res = (*m_VulkanFunctions.vkMapMemory)(
+            m_hDevice,
+            hMemory,
+            0,
+            VK_WHOLE_SIZE,
+            0,
+            &pMappedData);
+        if(res < 0)
+        {
+            VMA_DEBUG_LOG("    vkMapMemory FAILED");
+            FreeVulkanMemory(memTypeIndex, size, hMemory);
+            return res;
+        }
+    }
+
+    *pAllocation = vma_new(this, VmaAllocation_T)(m_CurrentFrameIndex.load(), isUserDataString);
+    (*pAllocation)->InitDedicatedAllocation(memTypeIndex, hMemory, suballocType, pMappedData, size);
+    (*pAllocation)->SetUserData(this, pUserData);
+    if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)
+    {
+        FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaAllocator_T::GetBufferMemoryRequirements(
+    VkBuffer hBuffer,
+    VkMemoryRequirements& memReq,
+    bool& requiresDedicatedAllocation,
+    bool& prefersDedicatedAllocation) const
+{
+#if VMA_DEDICATED_ALLOCATION
+    if(m_UseKhrDedicatedAllocation)
+    {
+        VkBufferMemoryRequirementsInfo2KHR memReqInfo = {};
+        memReqInfo.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR;
+        memReqInfo.buffer = hBuffer;
+
+        VkMemoryDedicatedRequirementsKHR memDedicatedReq = {};
+        memDedicatedReq.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR;
+
+        VkMemoryRequirements2KHR memReq2 = {};
+        memReq2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR;
+        memReq2.pNext = &memDedicatedReq;
+
+        (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);
+
+        memReq = memReq2.memoryRequirements;
+        requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE);
+        prefersDedicatedAllocation  = (memDedicatedReq.prefersDedicatedAllocation  != VK_FALSE);
+    }
+    else
+#endif // #if VMA_DEDICATED_ALLOCATION
+    {
+        (*m_VulkanFunctions.vkGetBufferMemoryRequirements)(m_hDevice, hBuffer, &memReq);
+        requiresDedicatedAllocation = false;
+        prefersDedicatedAllocation  = false;
+    }
+}
+
+void VmaAllocator_T::GetImageMemoryRequirements(
+    VkImage hImage,
+    VkMemoryRequirements& memReq,
+    bool& requiresDedicatedAllocation,
+    bool& prefersDedicatedAllocation) const
+{
+#if VMA_DEDICATED_ALLOCATION
+    if(m_UseKhrDedicatedAllocation)
+    {
+        VkImageMemoryRequirementsInfo2KHR memReqInfo = {};
+        memReqInfo.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR;
+        memReqInfo.image = hImage;
+
+        VkMemoryDedicatedRequirementsKHR memDedicatedReq = {};
+        memDedicatedReq.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR;
+
+        VkMemoryRequirements2KHR memReq2 = {};
+        memReq2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR;
+        memReq2.pNext = &memDedicatedReq;
+
+        (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);
+
+        memReq = memReq2.memoryRequirements;
+        requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE);
+        prefersDedicatedAllocation  = (memDedicatedReq.prefersDedicatedAllocation  != VK_FALSE);
+    }
+    else
+#endif // #if VMA_DEDICATED_ALLOCATION
+    {
+        (*m_VulkanFunctions.vkGetImageMemoryRequirements)(m_hDevice, hImage, &memReq);
+        requiresDedicatedAllocation = false;
+        prefersDedicatedAllocation  = false;
+    }
+}
+
+VkResult VmaAllocator_T::AllocateMemory(
+    const VkMemoryRequirements& vkMemReq,
+    bool requiresDedicatedAllocation,
+    bool prefersDedicatedAllocation,
+    VkBuffer dedicatedBuffer,
+    VkImage dedicatedImage,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaSuballocationType suballocType,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);
+
+    VMA_ASSERT(VmaIsPow2(vkMemReq.alignment));
+
+    if(vkMemReq.size == 0)
+    {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+    if((createInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 &&
+        (createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)
+    {
+        VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT together with VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT makes no sense.");
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
+    if((createInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 &&
+        (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0)
+    {
+        VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_MAPPED_BIT together with VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT is invalid.");
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
+    if(requiresDedicatedAllocation)
+    {
+        if((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)
+        {
+            VMA_ASSERT(0 && "VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT specified while dedicated allocation is required.");
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+        if(createInfo.pool != VK_NULL_HANDLE)
+        {
+            VMA_ASSERT(0 && "Pool specified while dedicated allocation is required.");
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+    }
+    if((createInfo.pool != VK_NULL_HANDLE) &&
+        ((createInfo.flags & (VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT)) != 0))
+    {
+        VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT when pool != null is invalid.");
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
+
+    if(createInfo.pool != VK_NULL_HANDLE)
+    {
+        const VkDeviceSize alignmentForPool = VMA_MAX(
+            vkMemReq.alignment,
+            GetMemoryTypeMinAlignment(createInfo.pool->m_BlockVector.GetMemoryTypeIndex()));
+        return createInfo.pool->m_BlockVector.Allocate(
+            createInfo.pool,
+            m_CurrentFrameIndex.load(),
+            vkMemReq.size,
+            alignmentForPool,
+            createInfo,
+            suballocType,
+            allocationCount,
+            pAllocations);
+    }
+    else
+    {
+        // Bit mask of memory Vulkan types acceptable for this allocation.
+        uint32_t memoryTypeBits = vkMemReq.memoryTypeBits;
+        uint32_t memTypeIndex = UINT32_MAX;
+        VkResult res = vmaFindMemoryTypeIndex(this, memoryTypeBits, &createInfo, &memTypeIndex);
+        if(res == VK_SUCCESS)
+        {
+            VkDeviceSize alignmentForMemType = VMA_MAX(
+                vkMemReq.alignment,
+                GetMemoryTypeMinAlignment(memTypeIndex));
+
+            res = AllocateMemoryOfType(
+                vkMemReq.size,
+                alignmentForMemType,
+                requiresDedicatedAllocation || prefersDedicatedAllocation,
+                dedicatedBuffer,
+                dedicatedImage,
+                createInfo,
+                memTypeIndex,
+                suballocType,
+                allocationCount,
+                pAllocations);
+            // Succeeded on first try.
+            if(res == VK_SUCCESS)
+            {
+                return res;
+            }
+            // Allocation from this memory type failed. Try other compatible memory types.
+            else
+            {
+                for(;;)
+                {
+                    // Remove old memTypeIndex from list of possibilities.
+                    memoryTypeBits &= ~(1u << memTypeIndex);
+                    // Find alternative memTypeIndex.
+                    res = vmaFindMemoryTypeIndex(this, memoryTypeBits, &createInfo, &memTypeIndex);
+                    if(res == VK_SUCCESS)
+                    {
+                        alignmentForMemType = VMA_MAX(
+                            vkMemReq.alignment,
+                            GetMemoryTypeMinAlignment(memTypeIndex));
+                        
+                        res = AllocateMemoryOfType(
+                            vkMemReq.size,
+                            alignmentForMemType,
+                            requiresDedicatedAllocation || prefersDedicatedAllocation,
+                            dedicatedBuffer,
+                            dedicatedImage,
+                            createInfo,
+                            memTypeIndex,
+                            suballocType,
+                            allocationCount,
+                            pAllocations);
+                        // Allocation from this alternative memory type succeeded.
+                        if(res == VK_SUCCESS)
+                        {
+                            return res;
+                        }
+                        // else: Allocation from this memory type failed. Try next one - next loop iteration.
+                    }
+                    // No other matching memory type index could be found.
+                    else
+                    {
+                        // Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once.
+                        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+                    }
+                }
+            }
+        }
+        // Can't find any single memory type maching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT.
+        else
+            return res;
+    }
+}
+
+void VmaAllocator_T::FreeMemory(
+    size_t allocationCount,
+    const VmaAllocation* pAllocations)
+{
+    VMA_ASSERT(pAllocations);
+
+    for(size_t allocIndex = allocationCount; allocIndex--; )
+    {
+        VmaAllocation allocation = pAllocations[allocIndex];
+
+        if(allocation != VK_NULL_HANDLE)
+        {
+            if(TouchAllocation(allocation))
+            {
+                if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)
+                {
+                    FillAllocation(allocation, VMA_ALLOCATION_FILL_PATTERN_DESTROYED);
+                }
+
+                switch(allocation->GetType())
+                {
+                case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+                    {
+                        VmaBlockVector* pBlockVector = VMA_NULL;
+                        VmaPool hPool = allocation->GetPool();
+                        if(hPool != VK_NULL_HANDLE)
+                        {
+                            pBlockVector = &hPool->m_BlockVector;
+                        }
+                        else
+                        {
+                            const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();
+                            pBlockVector = m_pBlockVectors[memTypeIndex];
+                        }
+                        pBlockVector->Free(allocation);
+                    }
+                    break;
+                case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+                    FreeDedicatedMemory(allocation);
+                    break;
+                default:
+                    VMA_ASSERT(0);
+                }
+            }
+
+            allocation->SetUserData(this, VMA_NULL);
+            vma_delete(this, allocation);
+        }
+    }
+}
+
+VkResult VmaAllocator_T::ResizeAllocation(
+    const VmaAllocation alloc,
+    VkDeviceSize newSize)
+{
+    if(newSize == 0 || alloc->GetLastUseFrameIndex() == VMA_FRAME_INDEX_LOST)
+    {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+    if(newSize == alloc->GetSize())
+    {
+        return VK_SUCCESS;
+    }
+
+    switch(alloc->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+        if(alloc->GetBlock()->m_pMetadata->ResizeAllocation(alloc, newSize))
+        {
+            alloc->ChangeSize(newSize);
+            VMA_HEAVY_ASSERT(alloc->GetBlock()->m_pMetadata->Validate());
+            return VK_SUCCESS;
+        }
+        else
+        {
+            return VkResult(-1000069000); // VK_ERROR_OUT_OF_POOL_MEMORY
+        }
+    default:
+        VMA_ASSERT(0);
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+}
+
+void VmaAllocator_T::CalculateStats(VmaStats* pStats)
+{
+    // Initialize.
+    InitStatInfo(pStats->total);
+    for(size_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i)
+        InitStatInfo(pStats->memoryType[i]);
+    for(size_t i = 0; i < VK_MAX_MEMORY_HEAPS; ++i)
+        InitStatInfo(pStats->memoryHeap[i]);
+    
+    // Process default pools.
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex];
+        VMA_ASSERT(pBlockVector);
+        pBlockVector->AddStats(pStats);
+    }
+
+    // Process custom pools.
+    {
+        VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);
+        for(size_t poolIndex = 0, poolCount = m_Pools.size(); poolIndex < poolCount; ++poolIndex)
+        {
+            m_Pools[poolIndex]->m_BlockVector.AddStats(pStats);
+        }
+    }
+
+    // Process dedicated allocations.
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        const uint32_t memHeapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);
+        VmaMutexLockRead dedicatedAllocationsLock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex);
+        AllocationVectorType* const pDedicatedAllocVector = m_pDedicatedAllocations[memTypeIndex];
+        VMA_ASSERT(pDedicatedAllocVector);
+        for(size_t allocIndex = 0, allocCount = pDedicatedAllocVector->size(); allocIndex < allocCount; ++allocIndex)
+        {
+            VmaStatInfo allocationStatInfo;
+            (*pDedicatedAllocVector)[allocIndex]->DedicatedAllocCalcStatsInfo(allocationStatInfo);
+            VmaAddStatInfo(pStats->total, allocationStatInfo);
+            VmaAddStatInfo(pStats->memoryType[memTypeIndex], allocationStatInfo);
+            VmaAddStatInfo(pStats->memoryHeap[memHeapIndex], allocationStatInfo);
+        }
+    }
+
+    // Postprocess.
+    VmaPostprocessCalcStatInfo(pStats->total);
+    for(size_t i = 0; i < GetMemoryTypeCount(); ++i)
+        VmaPostprocessCalcStatInfo(pStats->memoryType[i]);
+    for(size_t i = 0; i < GetMemoryHeapCount(); ++i)
+        VmaPostprocessCalcStatInfo(pStats->memoryHeap[i]);
+}
+
+static const uint32_t VMA_VENDOR_ID_AMD = 4098;
+
+VkResult VmaAllocator_T::DefragmentationBegin(
+    const VmaDefragmentationInfo2& info,
+    VmaDefragmentationStats* pStats,
+    VmaDefragmentationContext* pContext)
+{
+    if(info.pAllocationsChanged != VMA_NULL)
+    {
+        memset(info.pAllocationsChanged, 0, info.allocationCount * sizeof(VkBool32));
+    }
+
+    *pContext = vma_new(this, VmaDefragmentationContext_T)(
+        this, m_CurrentFrameIndex.load(), info.flags, pStats);
+
+    (*pContext)->AddPools(info.poolCount, info.pPools);
+    (*pContext)->AddAllocations(
+        info.allocationCount, info.pAllocations, info.pAllocationsChanged);
+
+    VkResult res = (*pContext)->Defragment(
+        info.maxCpuBytesToMove, info.maxCpuAllocationsToMove,
+        info.maxGpuBytesToMove, info.maxGpuAllocationsToMove,
+        info.commandBuffer, pStats);
+
+    if(res != VK_NOT_READY)
+    {
+        vma_delete(this, *pContext);
+        *pContext = VMA_NULL;
+    }
+
+    return res;
+}
+
+VkResult VmaAllocator_T::DefragmentationEnd(
+    VmaDefragmentationContext context)
+{
+    vma_delete(this, context);
+    return VK_SUCCESS;
+}
+
+void VmaAllocator_T::GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo)
+{
+    if(hAllocation->CanBecomeLost())
+    {
+        /*
+        Warning: This is a carefully designed algorithm.
+        Do not modify unless you really know what you're doing :)
+        */
+        const uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load();
+        uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex();
+        for(;;)
+        {
+            if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST)
+            {
+                pAllocationInfo->memoryType = UINT32_MAX;
+                pAllocationInfo->deviceMemory = VK_NULL_HANDLE;
+                pAllocationInfo->offset = 0;
+                pAllocationInfo->size = hAllocation->GetSize();
+                pAllocationInfo->pMappedData = VMA_NULL;
+                pAllocationInfo->pUserData = hAllocation->GetUserData();
+                return;
+            }
+            else if(localLastUseFrameIndex == localCurrFrameIndex)
+            {
+                pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex();
+                pAllocationInfo->deviceMemory = hAllocation->GetMemory();
+                pAllocationInfo->offset = hAllocation->GetOffset();
+                pAllocationInfo->size = hAllocation->GetSize();
+                pAllocationInfo->pMappedData = VMA_NULL;
+                pAllocationInfo->pUserData = hAllocation->GetUserData();
+                return;
+            }
+            else // Last use time earlier than current time.
+            {
+                if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex))
+                {
+                    localLastUseFrameIndex = localCurrFrameIndex;
+                }
+            }
+        }
+    }
+    else
+    {
+#if VMA_STATS_STRING_ENABLED
+        uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load();
+        uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex();
+        for(;;)
+        {
+            VMA_ASSERT(localLastUseFrameIndex != VMA_FRAME_INDEX_LOST);
+            if(localLastUseFrameIndex == localCurrFrameIndex)
+            {
+                break;
+            }
+            else // Last use time earlier than current time.
+            {
+                if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex))
+                {
+                    localLastUseFrameIndex = localCurrFrameIndex;
+                }
+            }
+        }
+#endif
+
+        pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex();
+        pAllocationInfo->deviceMemory = hAllocation->GetMemory();
+        pAllocationInfo->offset = hAllocation->GetOffset();
+        pAllocationInfo->size = hAllocation->GetSize();
+        pAllocationInfo->pMappedData = hAllocation->GetMappedData();
+        pAllocationInfo->pUserData = hAllocation->GetUserData();
+    }
+}
+
+bool VmaAllocator_T::TouchAllocation(VmaAllocation hAllocation)
+{
+    // This is a stripped-down version of VmaAllocator_T::GetAllocationInfo.
+    if(hAllocation->CanBecomeLost())
+    {
+        uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load();
+        uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex();
+        for(;;)
+        {
+            if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST)
+            {
+                return false;
+            }
+            else if(localLastUseFrameIndex == localCurrFrameIndex)
+            {
+                return true;
+            }
+            else // Last use time earlier than current time.
+            {
+                if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex))
+                {
+                    localLastUseFrameIndex = localCurrFrameIndex;
+                }
+            }
+        }
+    }
+    else
+    {
+#if VMA_STATS_STRING_ENABLED
+        uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load();
+        uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex();
+        for(;;)
+        {
+            VMA_ASSERT(localLastUseFrameIndex != VMA_FRAME_INDEX_LOST);
+            if(localLastUseFrameIndex == localCurrFrameIndex)
+            {
+                break;
+            }
+            else // Last use time earlier than current time.
+            {
+                if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex))
+                {
+                    localLastUseFrameIndex = localCurrFrameIndex;
+                }
+            }
+        }
+#endif
+
+        return true;
+    }
+}
+
+VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool)
+{
+    VMA_DEBUG_LOG("  CreatePool: MemoryTypeIndex=%u, flags=%u", pCreateInfo->memoryTypeIndex, pCreateInfo->flags);
+
+    VmaPoolCreateInfo newCreateInfo = *pCreateInfo;
+
+    if(newCreateInfo.maxBlockCount == 0)
+    {
+        newCreateInfo.maxBlockCount = SIZE_MAX;
+    }
+    if(newCreateInfo.minBlockCount > newCreateInfo.maxBlockCount)
+    {
+        return VK_ERROR_INITIALIZATION_FAILED;
+    }
+
+    const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(newCreateInfo.memoryTypeIndex);
+
+    *pPool = vma_new(this, VmaPool_T)(this, newCreateInfo, preferredBlockSize);
+
+    VkResult res = (*pPool)->m_BlockVector.CreateMinBlocks();
+    if(res != VK_SUCCESS)
+    {
+        vma_delete(this, *pPool);
+        *pPool = VMA_NULL;
+        return res;
+    }
+
+    // Add to m_Pools.
+    {
+        VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);
+        (*pPool)->SetId(m_NextPoolId++);
+        VmaVectorInsertSorted<VmaPointerLess>(m_Pools, *pPool);
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaAllocator_T::DestroyPool(VmaPool pool)
+{
+    // Remove from m_Pools.
+    {
+        VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);
+        bool success = VmaVectorRemoveSorted<VmaPointerLess>(m_Pools, pool);
+        (void) success;
+        VMA_ASSERT(success && "Pool not found in Allocator.");
+    }
+
+    vma_delete(this, pool);
+}
+
+void VmaAllocator_T::GetPoolStats(VmaPool pool, VmaPoolStats* pPoolStats)
+{
+    pool->m_BlockVector.GetPoolStats(pPoolStats);
+}
+
+void VmaAllocator_T::SetCurrentFrameIndex(uint32_t frameIndex)
+{
+    m_CurrentFrameIndex.store(frameIndex);
+}
+
+void VmaAllocator_T::MakePoolAllocationsLost(
+    VmaPool hPool,
+    size_t* pLostAllocationCount)
+{
+    hPool->m_BlockVector.MakePoolAllocationsLost(
+        m_CurrentFrameIndex.load(),
+        pLostAllocationCount);
+}
+
+VkResult VmaAllocator_T::CheckPoolCorruption(VmaPool hPool)
+{
+    return hPool->m_BlockVector.CheckCorruption();
+}
+
+VkResult VmaAllocator_T::CheckCorruption(uint32_t memoryTypeBits)
+{
+    VkResult finalRes = VK_ERROR_FEATURE_NOT_PRESENT;
+
+    // Process default pools.
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        if(((1u << memTypeIndex) & memoryTypeBits) != 0)
+        {
+            VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex];
+            VMA_ASSERT(pBlockVector);
+            VkResult localRes = pBlockVector->CheckCorruption();
+            switch(localRes)
+            {
+            case VK_ERROR_FEATURE_NOT_PRESENT:
+                break;
+            case VK_SUCCESS:
+                finalRes = VK_SUCCESS;
+                break;
+            default:
+                return localRes;
+            }
+        }
+    }
+
+    // Process custom pools.
+    {
+        VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);
+        for(size_t poolIndex = 0, poolCount = m_Pools.size(); poolIndex < poolCount; ++poolIndex)
+        {
+            if(((1u << m_Pools[poolIndex]->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0)
+            {
+                VkResult localRes = m_Pools[poolIndex]->m_BlockVector.CheckCorruption();
+                switch(localRes)
+                {
+                case VK_ERROR_FEATURE_NOT_PRESENT:
+                    break;
+                case VK_SUCCESS:
+                    finalRes = VK_SUCCESS;
+                    break;
+                default:
+                    return localRes;
+                }
+            }
+        }
+    }
+
+    return finalRes;
+}
+
+void VmaAllocator_T::CreateLostAllocation(VmaAllocation* pAllocation)
+{
+    *pAllocation = vma_new(this, VmaAllocation_T)(VMA_FRAME_INDEX_LOST, false);
+    (*pAllocation)->InitLost();
+}
+
+VkResult VmaAllocator_T::AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory)
+{
+    const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex);
+
+    VkResult res;
+    if(m_HeapSizeLimit[heapIndex] != VK_WHOLE_SIZE)
+    {
+        VmaMutexLock lock(m_HeapSizeLimitMutex, m_UseMutex);
+        if(m_HeapSizeLimit[heapIndex] >= pAllocateInfo->allocationSize)
+        {
+            res = (*m_VulkanFunctions.vkAllocateMemory)(m_hDevice, pAllocateInfo, GetAllocationCallbacks(), pMemory);
+            if(res == VK_SUCCESS)
+            {
+                m_HeapSizeLimit[heapIndex] -= pAllocateInfo->allocationSize;
+            }
+        }
+        else
+        {
+            res = VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+    }
+    else
+    {
+        res = (*m_VulkanFunctions.vkAllocateMemory)(m_hDevice, pAllocateInfo, GetAllocationCallbacks(), pMemory);
+    }
+
+    if(res == VK_SUCCESS && m_DeviceMemoryCallbacks.pfnAllocate != VMA_NULL)
+    {
+        (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize);
+    }
+
+    return res;
+}
+
+void VmaAllocator_T::FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory)
+{
+    if(m_DeviceMemoryCallbacks.pfnFree != VMA_NULL)
+    {
+        (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size);
+    }
+
+    (*m_VulkanFunctions.vkFreeMemory)(m_hDevice, hMemory, GetAllocationCallbacks());
+
+    const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memoryType);
+    if(m_HeapSizeLimit[heapIndex] != VK_WHOLE_SIZE)
+    {
+        VmaMutexLock lock(m_HeapSizeLimitMutex, m_UseMutex);
+        m_HeapSizeLimit[heapIndex] += size;
+    }
+}
+
+VkResult VmaAllocator_T::Map(VmaAllocation hAllocation, void** ppData)
+{
+    if(hAllocation->CanBecomeLost())
+    {
+        return VK_ERROR_MEMORY_MAP_FAILED;
+    }
+
+    switch(hAllocation->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+        {
+            VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();
+            char *pBytes = VMA_NULL;
+            VkResult res = pBlock->Map(this, 1, (void**)&pBytes);
+            if(res == VK_SUCCESS)
+            {
+                *ppData = pBytes + (ptrdiff_t)hAllocation->GetOffset();
+                hAllocation->BlockAllocMap();
+            }
+            return res;
+        }
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        return hAllocation->DedicatedAllocMap(this, ppData);
+    default:
+        VMA_ASSERT(0);
+        return VK_ERROR_MEMORY_MAP_FAILED;
+    }
+}
+
+void VmaAllocator_T::Unmap(VmaAllocation hAllocation)
+{
+    switch(hAllocation->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+        {
+            VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();
+            hAllocation->BlockAllocUnmap();
+            pBlock->Unmap(this, 1);
+        }
+        break;
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        hAllocation->DedicatedAllocUnmap(this);
+        break;
+    default:
+        VMA_ASSERT(0);
+    }
+}
+
+VkResult VmaAllocator_T::BindBufferMemory(VmaAllocation hAllocation, VkBuffer hBuffer)
+{
+    VkResult res = VK_SUCCESS;
+    switch(hAllocation->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        res = GetVulkanFunctions().vkBindBufferMemory(
+            m_hDevice,
+            hBuffer,
+            hAllocation->GetMemory(),
+            0); //memoryOffset
+        break;
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+    {
+        VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();
+        VMA_ASSERT(pBlock && "Binding buffer to allocation that doesn't belong to any block. Is the allocation lost?");
+        res = pBlock->BindBufferMemory(this, hAllocation, hBuffer);
+        break;
+    }
+    default:
+        VMA_ASSERT(0);
+    }
+    return res;
+}
+
+VkResult VmaAllocator_T::BindImageMemory(VmaAllocation hAllocation, VkImage hImage)
+{
+    VkResult res = VK_SUCCESS;
+    switch(hAllocation->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        res = GetVulkanFunctions().vkBindImageMemory(
+            m_hDevice,
+            hImage,
+            hAllocation->GetMemory(),
+            0); //memoryOffset
+        break;
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+    {
+        VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();
+        VMA_ASSERT(pBlock && "Binding image to allocation that doesn't belong to any block. Is the allocation lost?");
+        res = pBlock->BindImageMemory(this, hAllocation, hImage);
+        break;
+    }
+    default:
+        VMA_ASSERT(0);
+    }
+    return res;
+}
+
+void VmaAllocator_T::FlushOrInvalidateAllocation(
+    VmaAllocation hAllocation,
+    VkDeviceSize offset, VkDeviceSize size,
+    VMA_CACHE_OPERATION op)
+{
+    const uint32_t memTypeIndex = hAllocation->GetMemoryTypeIndex();
+    if(size > 0 && IsMemoryTypeNonCoherent(memTypeIndex))
+    {
+        const VkDeviceSize allocationSize = hAllocation->GetSize();
+        VMA_ASSERT(offset <= allocationSize);
+
+        const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
+
+        VkMappedMemoryRange memRange = {};
+        memRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+        memRange.memory = hAllocation->GetMemory();
+        
+        switch(hAllocation->GetType())
+        {
+        case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+            memRange.offset = VmaAlignDown(offset, nonCoherentAtomSize);
+            if(size == VK_WHOLE_SIZE)
+            {
+                memRange.size = allocationSize - memRange.offset;
+            }
+            else
+            {
+                VMA_ASSERT(offset + size <= allocationSize);
+                memRange.size = VMA_MIN(
+                    VmaAlignUp(size + (offset - memRange.offset), nonCoherentAtomSize),
+                    allocationSize - memRange.offset);
+            }
+            break;
+
+        case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+        {
+            // 1. Still within this allocation.
+            memRange.offset = VmaAlignDown(offset, nonCoherentAtomSize);
+            if(size == VK_WHOLE_SIZE)
+            {
+                size = allocationSize - offset;
+            }
+            else
+            {
+                VMA_ASSERT(offset + size <= allocationSize);
+            }
+            memRange.size = VmaAlignUp(size + (offset - memRange.offset), nonCoherentAtomSize);
+
+            // 2. Adjust to whole block.
+            const VkDeviceSize allocationOffset = hAllocation->GetOffset();
+            VMA_ASSERT(allocationOffset % nonCoherentAtomSize == 0);
+            const VkDeviceSize blockSize = hAllocation->GetBlock()->m_pMetadata->GetSize();
+            memRange.offset += allocationOffset;
+            memRange.size = VMA_MIN(memRange.size, blockSize - memRange.offset);
+            
+            break;
+        }
+        
+        default:
+            VMA_ASSERT(0);
+        }
+
+        switch(op)
+        {
+        case VMA_CACHE_FLUSH:
+            (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, 1, &memRange);
+            break;
+        case VMA_CACHE_INVALIDATE:
+            (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, 1, &memRange);
+            break;
+        default:
+            VMA_ASSERT(0);
+        }
+    }
+    // else: Just ignore this call.
+}
+
+void VmaAllocator_T::FreeDedicatedMemory(VmaAllocation allocation)
+{
+    VMA_ASSERT(allocation && allocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);
+
+    const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();
+    {
+        VmaMutexLockWrite lock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex);
+        AllocationVectorType* const pDedicatedAllocations = m_pDedicatedAllocations[memTypeIndex];
+        VMA_ASSERT(pDedicatedAllocations);
+        bool success = VmaVectorRemoveSorted<VmaPointerLess>(*pDedicatedAllocations, allocation);
+        (void) success;
+        VMA_ASSERT(success);
+    }
+
+    VkDeviceMemory hMemory = allocation->GetMemory();
+    
+    /*
+    There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory
+    before vkFreeMemory.
+
+    if(allocation->GetMappedData() != VMA_NULL)
+    {
+        (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory);
+    }
+    */
+    
+    FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory);
+
+    VMA_DEBUG_LOG("    Freed DedicatedMemory MemoryTypeIndex=%u", memTypeIndex);
+}
+
+void VmaAllocator_T::FillAllocation(const VmaAllocation hAllocation, uint8_t pattern)
+{
+    if(VMA_DEBUG_INITIALIZE_ALLOCATIONS &&
+        !hAllocation->CanBecomeLost() &&
+        (m_MemProps.memoryTypes[hAllocation->GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)
+    {
+        void* pData = VMA_NULL;
+        VkResult res = Map(hAllocation, &pData);
+        if(res == VK_SUCCESS)
+        {
+            memset(pData, (int)pattern, (size_t)hAllocation->GetSize());
+            FlushOrInvalidateAllocation(hAllocation, 0, VK_WHOLE_SIZE, VMA_CACHE_FLUSH);
+            Unmap(hAllocation);
+        }
+        else
+        {
+            VMA_ASSERT(0 && "VMA_DEBUG_INITIALIZE_ALLOCATIONS is enabled, but couldn't map memory to fill allocation.");
+        }
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json)
+{
+    bool dedicatedAllocationsStarted = false;
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        VmaMutexLockRead dedicatedAllocationsLock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex);
+        AllocationVectorType* const pDedicatedAllocVector = m_pDedicatedAllocations[memTypeIndex];
+        VMA_ASSERT(pDedicatedAllocVector);
+        if(pDedicatedAllocVector->empty() == false)
+        {
+            if(dedicatedAllocationsStarted == false)
+            {
+                dedicatedAllocationsStarted = true;
+                json.WriteString("DedicatedAllocations");
+                json.BeginObject();
+            }
+
+            json.BeginString("Type ");
+            json.ContinueString(memTypeIndex);
+            json.EndString();
+                
+            json.BeginArray();
+
+            for(size_t i = 0; i < pDedicatedAllocVector->size(); ++i)
+            {
+                json.BeginObject(true);
+                const VmaAllocation hAlloc = (*pDedicatedAllocVector)[i];
+                hAlloc->PrintParameters(json);
+                json.EndObject();
+            }
+
+            json.EndArray();
+        }
+    }
+    if(dedicatedAllocationsStarted)
+    {
+        json.EndObject();
+    }
+
+    {
+        bool allocationsStarted = false;
+        for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+        {
+            if(m_pBlockVectors[memTypeIndex]->IsEmpty() == false)
+            {
+                if(allocationsStarted == false)
+                {
+                    allocationsStarted = true;
+                    json.WriteString("DefaultPools");
+                    json.BeginObject();
+                }
+
+                json.BeginString("Type ");
+                json.ContinueString(memTypeIndex);
+                json.EndString();
+
+                m_pBlockVectors[memTypeIndex]->PrintDetailedMap(json);
+            }
+        }
+        if(allocationsStarted)
+        {
+            json.EndObject();
+        }
+    }
+
+    // Custom pools
+    {
+        VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);
+        const size_t poolCount = m_Pools.size();
+        if(poolCount > 0)
+        {
+            json.WriteString("Pools");
+            json.BeginObject();
+            for(size_t poolIndex = 0; poolIndex < poolCount; ++poolIndex)
+            {
+                json.BeginString();
+                json.ContinueString(m_Pools[poolIndex]->GetId());
+                json.EndString();
+
+                m_Pools[poolIndex]->m_BlockVector.PrintDetailedMap(json);
+            }
+            json.EndObject();
+        }
+    }
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+// Public interface
+
+VkResult vmaCreateAllocator(
+    const VmaAllocatorCreateInfo* pCreateInfo,
+    VmaAllocator* pAllocator)
+{
+    VMA_ASSERT(pCreateInfo && pAllocator);
+    VMA_DEBUG_LOG("vmaCreateAllocator");
+    *pAllocator = vma_new(pCreateInfo->pAllocationCallbacks, VmaAllocator_T)(pCreateInfo);
+    return (*pAllocator)->Init(pCreateInfo);
+}
+
+void vmaDestroyAllocator(
+    VmaAllocator allocator)
+{
+    if(allocator != VK_NULL_HANDLE)
+    {
+        VMA_DEBUG_LOG("vmaDestroyAllocator");
+        VkAllocationCallbacks allocationCallbacks = allocator->m_AllocationCallbacks;
+        vma_delete(&allocationCallbacks, allocator);
+    }
+}
+
+void vmaGetPhysicalDeviceProperties(
+    VmaAllocator allocator,
+    const VkPhysicalDeviceProperties **ppPhysicalDeviceProperties)
+{
+    VMA_ASSERT(allocator && ppPhysicalDeviceProperties);
+    *ppPhysicalDeviceProperties = &allocator->m_PhysicalDeviceProperties;
+}
+
+void vmaGetMemoryProperties(
+    VmaAllocator allocator,
+    const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties)
+{
+    VMA_ASSERT(allocator && ppPhysicalDeviceMemoryProperties);
+    *ppPhysicalDeviceMemoryProperties = &allocator->m_MemProps;
+}
+
+void vmaGetMemoryTypeProperties(
+    VmaAllocator allocator,
+    uint32_t memoryTypeIndex,
+    VkMemoryPropertyFlags* pFlags)
+{
+    VMA_ASSERT(allocator && pFlags);
+    VMA_ASSERT(memoryTypeIndex < allocator->GetMemoryTypeCount());
+    *pFlags = allocator->m_MemProps.memoryTypes[memoryTypeIndex].propertyFlags;
+}
+
+void vmaSetCurrentFrameIndex(
+    VmaAllocator allocator,
+    uint32_t frameIndex)
+{
+    VMA_ASSERT(allocator);
+    VMA_ASSERT(frameIndex != VMA_FRAME_INDEX_LOST);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocator->SetCurrentFrameIndex(frameIndex);
+}
+
+void vmaCalculateStats(
+    VmaAllocator allocator,
+    VmaStats* pStats)
+{
+    VMA_ASSERT(allocator && pStats);
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+    allocator->CalculateStats(pStats);
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void vmaBuildStatsString(
+    VmaAllocator allocator,
+    char** ppStatsString,
+    VkBool32 detailedMap)
+{
+    VMA_ASSERT(allocator && ppStatsString);
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VmaStringBuilder sb(allocator);
+    {
+        VmaJsonWriter json(allocator->GetAllocationCallbacks(), sb);
+        json.BeginObject();
+
+        VmaStats stats;
+        allocator->CalculateStats(&stats);
+
+        json.WriteString("Total");
+        VmaPrintStatInfo(json, stats.total);
+    
+        for(uint32_t heapIndex = 0; heapIndex < allocator->GetMemoryHeapCount(); ++heapIndex)
+        {
+            json.BeginString("Heap ");
+            json.ContinueString(heapIndex);
+            json.EndString();
+            json.BeginObject();
+
+            json.WriteString("Size");
+            json.WriteNumber(allocator->m_MemProps.memoryHeaps[heapIndex].size);
+
+            json.WriteString("Flags");
+            json.BeginArray(true);
+            if((allocator->m_MemProps.memoryHeaps[heapIndex].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) != 0)
+            {
+                json.WriteString("DEVICE_LOCAL");
+            }
+            json.EndArray();
+
+            if(stats.memoryHeap[heapIndex].blockCount > 0)
+            {
+                json.WriteString("Stats");
+                VmaPrintStatInfo(json, stats.memoryHeap[heapIndex]);
+            }
+
+            for(uint32_t typeIndex = 0; typeIndex < allocator->GetMemoryTypeCount(); ++typeIndex)
+            {
+                if(allocator->MemoryTypeIndexToHeapIndex(typeIndex) == heapIndex)
+                {
+                    json.BeginString("Type ");
+                    json.ContinueString(typeIndex);
+                    json.EndString();
+
+                    json.BeginObject();
+
+                    json.WriteString("Flags");
+                    json.BeginArray(true);
+                    VkMemoryPropertyFlags flags = allocator->m_MemProps.memoryTypes[typeIndex].propertyFlags;
+                    if((flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) != 0)
+                    {
+                        json.WriteString("DEVICE_LOCAL");
+                    }
+                    if((flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)
+                    {
+                        json.WriteString("HOST_VISIBLE");
+                    }
+                    if((flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0)
+                    {
+                        json.WriteString("HOST_COHERENT");
+                    }
+                    if((flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) != 0)
+                    {
+                        json.WriteString("HOST_CACHED");
+                    }
+                    if((flags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) != 0)
+                    {
+                        json.WriteString("LAZILY_ALLOCATED");
+                    }
+                    json.EndArray();
+
+                    if(stats.memoryType[typeIndex].blockCount > 0)
+                    {
+                        json.WriteString("Stats");
+                        VmaPrintStatInfo(json, stats.memoryType[typeIndex]);
+                    }
+
+                    json.EndObject();
+                }
+            }
+
+            json.EndObject();
+        }
+        if(detailedMap == VK_TRUE)
+        {
+            allocator->PrintDetailedMap(json);
+        }
+
+        json.EndObject();
+    }
+
+    const size_t len = sb.GetLength();
+    char* const pChars = vma_new_array(allocator, char, len + 1);
+    if(len > 0)
+    {
+        memcpy(pChars, sb.GetData(), len);
+    }
+    pChars[len] = '\0';
+    *ppStatsString = pChars;
+}
+
+void vmaFreeStatsString(
+    VmaAllocator allocator,
+    char* pStatsString)
+{
+    if(pStatsString != VMA_NULL)
+    {
+        VMA_ASSERT(allocator);
+        size_t len = strlen(pStatsString);
+        vma_delete_array(allocator, pStatsString, len + 1);
+    }
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+/*
+This function is not protected by any mutex because it just reads immutable data.
+*/
+VkResult vmaFindMemoryTypeIndex(
+    VmaAllocator allocator,
+    uint32_t memoryTypeBits,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex)
+{
+    VMA_ASSERT(allocator != VK_NULL_HANDLE);
+    VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);
+    VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);
+
+    if(pAllocationCreateInfo->memoryTypeBits != 0)
+    {
+        memoryTypeBits &= pAllocationCreateInfo->memoryTypeBits;
+    }
+    
+    uint32_t requiredFlags = pAllocationCreateInfo->requiredFlags;
+    uint32_t preferredFlags = pAllocationCreateInfo->preferredFlags;
+
+    const bool mapped = (pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0;
+    if(mapped)
+    {
+        preferredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+    }
+
+    // Convert usage to requiredFlags and preferredFlags.
+    switch(pAllocationCreateInfo->usage)
+    {
+    case VMA_MEMORY_USAGE_UNKNOWN:
+        break;
+    case VMA_MEMORY_USAGE_GPU_ONLY:
+        if(!allocator->IsIntegratedGpu() || (preferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+        {
+            preferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+        }
+        break;
+    case VMA_MEMORY_USAGE_CPU_ONLY:
+        requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+        break;
+    case VMA_MEMORY_USAGE_CPU_TO_GPU:
+        requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+        if(!allocator->IsIntegratedGpu() || (preferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+        {
+            preferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+        }
+        break;
+    case VMA_MEMORY_USAGE_GPU_TO_CPU:
+        requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+        preferredFlags |= VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+        break;
+    default:
+        break;
+    }
+
+    *pMemoryTypeIndex = UINT32_MAX;
+    uint32_t minCost = UINT32_MAX;
+    for(uint32_t memTypeIndex = 0, memTypeBit = 1;
+        memTypeIndex < allocator->GetMemoryTypeCount();
+        ++memTypeIndex, memTypeBit <<= 1)
+    {
+        // This memory type is acceptable according to memoryTypeBits bitmask.
+        if((memTypeBit & memoryTypeBits) != 0)
+        {
+            const VkMemoryPropertyFlags currFlags =
+                allocator->m_MemProps.memoryTypes[memTypeIndex].propertyFlags;
+            // This memory type contains requiredFlags.
+            if((requiredFlags & ~currFlags) == 0)
+            {
+                // Calculate cost as number of bits from preferredFlags not present in this memory type.
+                uint32_t currCost = VmaCountBitsSet(preferredFlags & ~currFlags);
+                // Remember memory type with lowest cost.
+                if(currCost < minCost)
+                {
+                    *pMemoryTypeIndex = memTypeIndex;
+                    if(currCost == 0)
+                    {
+                        return VK_SUCCESS;
+                    }
+                    minCost = currCost;
+                }
+            }
+        }
+    }
+    return (*pMemoryTypeIndex != UINT32_MAX) ? VK_SUCCESS : VK_ERROR_FEATURE_NOT_PRESENT;
+}
+
+VkResult vmaFindMemoryTypeIndexForBufferInfo(
+    VmaAllocator allocator,
+    const VkBufferCreateInfo* pBufferCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex)
+{
+    VMA_ASSERT(allocator != VK_NULL_HANDLE);
+    VMA_ASSERT(pBufferCreateInfo != VMA_NULL);
+    VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);
+    VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);
+
+    const VkDevice hDev = allocator->m_hDevice;
+    VkBuffer hBuffer = VK_NULL_HANDLE;
+    VkResult res = allocator->GetVulkanFunctions().vkCreateBuffer(
+        hDev, pBufferCreateInfo, allocator->GetAllocationCallbacks(), &hBuffer);
+    if(res == VK_SUCCESS)
+    {
+        VkMemoryRequirements memReq = {};
+        allocator->GetVulkanFunctions().vkGetBufferMemoryRequirements(
+            hDev, hBuffer, &memReq);
+
+        res = vmaFindMemoryTypeIndex(
+            allocator,
+            memReq.memoryTypeBits,
+            pAllocationCreateInfo,
+            pMemoryTypeIndex);
+
+        allocator->GetVulkanFunctions().vkDestroyBuffer(
+            hDev, hBuffer, allocator->GetAllocationCallbacks());
+    }
+    return res;
+}
+
+VkResult vmaFindMemoryTypeIndexForImageInfo(
+    VmaAllocator allocator,
+    const VkImageCreateInfo* pImageCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex)
+{
+    VMA_ASSERT(allocator != VK_NULL_HANDLE);
+    VMA_ASSERT(pImageCreateInfo != VMA_NULL);
+    VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);
+    VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);
+
+    const VkDevice hDev = allocator->m_hDevice;
+    VkImage hImage = VK_NULL_HANDLE;
+    VkResult res = allocator->GetVulkanFunctions().vkCreateImage(
+        hDev, pImageCreateInfo, allocator->GetAllocationCallbacks(), &hImage);
+    if(res == VK_SUCCESS)
+    {
+        VkMemoryRequirements memReq = {};
+        allocator->GetVulkanFunctions().vkGetImageMemoryRequirements(
+            hDev, hImage, &memReq);
+
+        res = vmaFindMemoryTypeIndex(
+            allocator,
+            memReq.memoryTypeBits,
+            pAllocationCreateInfo,
+            pMemoryTypeIndex);
+
+        allocator->GetVulkanFunctions().vkDestroyImage(
+            hDev, hImage, allocator->GetAllocationCallbacks());
+    }
+    return res;
+}
+
+VkResult vmaCreatePool(
+	VmaAllocator allocator,
+	const VmaPoolCreateInfo* pCreateInfo,
+	VmaPool* pPool)
+{
+    VMA_ASSERT(allocator && pCreateInfo && pPool);
+    
+    VMA_DEBUG_LOG("vmaCreatePool");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+    
+    VkResult res = allocator->CreatePool(pCreateInfo, pPool);
+    
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordCreatePool(allocator->GetCurrentFrameIndex(), *pCreateInfo, *pPool);
+    }
+#endif
+    
+    return res;
+}
+
+void vmaDestroyPool(
+    VmaAllocator allocator,
+    VmaPool pool)
+{
+    VMA_ASSERT(allocator);
+    
+    if(pool == VK_NULL_HANDLE)
+    {
+        return;
+    }
+    
+    VMA_DEBUG_LOG("vmaDestroyPool");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+    
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordDestroyPool(allocator->GetCurrentFrameIndex(), pool);
+    }
+#endif
+
+    allocator->DestroyPool(pool);
+}
+
+void vmaGetPoolStats(
+    VmaAllocator allocator,
+    VmaPool pool,
+    VmaPoolStats* pPoolStats)
+{
+    VMA_ASSERT(allocator && pool && pPoolStats);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocator->GetPoolStats(pool, pPoolStats);
+}
+
+void vmaMakePoolAllocationsLost(
+    VmaAllocator allocator,
+    VmaPool pool,
+    size_t* pLostAllocationCount)
+{
+    VMA_ASSERT(allocator && pool);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordMakePoolAllocationsLost(allocator->GetCurrentFrameIndex(), pool);
+    }
+#endif
+
+    allocator->MakePoolAllocationsLost(pool, pLostAllocationCount);
+}
+
+VkResult vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool)
+{
+    VMA_ASSERT(allocator && pool);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VMA_DEBUG_LOG("vmaCheckPoolCorruption");
+
+    return allocator->CheckPoolCorruption(pool);
+}
+
+VkResult vmaAllocateMemory(
+    VmaAllocator allocator,
+    const VkMemoryRequirements* pVkMemoryRequirements,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocation);
+
+    VMA_DEBUG_LOG("vmaAllocateMemory");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+	VkResult result = allocator->AllocateMemory(
+        *pVkMemoryRequirements,
+        false, // requiresDedicatedAllocation
+        false, // prefersDedicatedAllocation
+        VK_NULL_HANDLE, // dedicatedBuffer
+        VK_NULL_HANDLE, // dedicatedImage
+        *pCreateInfo,
+        VMA_SUBALLOCATION_TYPE_UNKNOWN,
+        1, // allocationCount
+        pAllocation);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordAllocateMemory(
+            allocator->GetCurrentFrameIndex(),
+            *pVkMemoryRequirements,
+            *pCreateInfo,
+            *pAllocation);
+    }
+#endif
+        
+    if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS)
+    {
+        allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+    }
+
+	return result;
+}
+
+VkResult vmaAllocateMemoryPages(
+    VmaAllocator allocator,
+    const VkMemoryRequirements* pVkMemoryRequirements,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    size_t allocationCount,
+    VmaAllocation* pAllocations,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    if(allocationCount == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocations);
+
+    VMA_DEBUG_LOG("vmaAllocateMemoryPages");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+	VkResult result = allocator->AllocateMemory(
+        *pVkMemoryRequirements,
+        false, // requiresDedicatedAllocation
+        false, // prefersDedicatedAllocation
+        VK_NULL_HANDLE, // dedicatedBuffer
+        VK_NULL_HANDLE, // dedicatedImage
+        *pCreateInfo,
+        VMA_SUBALLOCATION_TYPE_UNKNOWN,
+        allocationCount,
+        pAllocations);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordAllocateMemoryPages(
+            allocator->GetCurrentFrameIndex(),
+            *pVkMemoryRequirements,
+            *pCreateInfo,
+            (uint64_t)allocationCount,
+            pAllocations);
+    }
+#endif
+        
+    if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS)
+    {
+        for(size_t i = 0; i < allocationCount; ++i)
+        {
+            allocator->GetAllocationInfo(pAllocations[i], pAllocationInfo + i);
+        }
+    }
+
+	return result;
+}
+
+VkResult vmaAllocateMemoryForBuffer(
+    VmaAllocator allocator,
+    VkBuffer buffer,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && buffer != VK_NULL_HANDLE && pCreateInfo && pAllocation);
+
+    VMA_DEBUG_LOG("vmaAllocateMemoryForBuffer");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VkMemoryRequirements vkMemReq = {};
+    bool requiresDedicatedAllocation = false;
+    bool prefersDedicatedAllocation = false;
+    allocator->GetBufferMemoryRequirements(buffer, vkMemReq,
+        requiresDedicatedAllocation,
+        prefersDedicatedAllocation);
+
+    VkResult result = allocator->AllocateMemory(
+        vkMemReq,
+        requiresDedicatedAllocation,
+        prefersDedicatedAllocation,
+        buffer, // dedicatedBuffer
+        VK_NULL_HANDLE, // dedicatedImage
+        *pCreateInfo,
+        VMA_SUBALLOCATION_TYPE_BUFFER,
+        1, // allocationCount
+        pAllocation);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordAllocateMemoryForBuffer(
+            allocator->GetCurrentFrameIndex(),
+            vkMemReq,
+            requiresDedicatedAllocation,
+            prefersDedicatedAllocation,
+            *pCreateInfo,
+            *pAllocation);
+    }
+#endif
+
+    if(pAllocationInfo && result == VK_SUCCESS)
+    {
+        allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+    }
+
+	return result;
+}
+
+VkResult vmaAllocateMemoryForImage(
+    VmaAllocator allocator,
+    VkImage image,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && image != VK_NULL_HANDLE && pCreateInfo && pAllocation);
+
+    VMA_DEBUG_LOG("vmaAllocateMemoryForImage");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VkMemoryRequirements vkMemReq = {};
+    bool requiresDedicatedAllocation = false;
+    bool prefersDedicatedAllocation  = false;
+    allocator->GetImageMemoryRequirements(image, vkMemReq,
+        requiresDedicatedAllocation, prefersDedicatedAllocation);
+
+    VkResult result = allocator->AllocateMemory(
+        vkMemReq,
+        requiresDedicatedAllocation,
+        prefersDedicatedAllocation,
+        VK_NULL_HANDLE, // dedicatedBuffer
+        image, // dedicatedImage
+        *pCreateInfo,
+        VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN,
+        1, // allocationCount
+        pAllocation);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordAllocateMemoryForImage(
+            allocator->GetCurrentFrameIndex(),
+            vkMemReq,
+            requiresDedicatedAllocation,
+            prefersDedicatedAllocation,
+            *pCreateInfo,
+            *pAllocation);
+    }
+#endif
+
+    if(pAllocationInfo && result == VK_SUCCESS)
+    {
+        allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+    }
+
+	return result;
+}
+
+void vmaFreeMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator);
+    
+    if(allocation == VK_NULL_HANDLE)
+    {
+        return;
+    }
+    
+    VMA_DEBUG_LOG("vmaFreeMemory");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordFreeMemory(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+    
+    allocator->FreeMemory(
+        1, // allocationCount
+        &allocation);
+}
+
+void vmaFreeMemoryPages(
+    VmaAllocator allocator,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    if(allocationCount == 0)
+    {
+        return;
+    }
+
+    VMA_ASSERT(allocator);
+    
+    VMA_DEBUG_LOG("vmaFreeMemoryPages");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordFreeMemoryPages(
+            allocator->GetCurrentFrameIndex(),
+            (uint64_t)allocationCount,
+            pAllocations);
+    }
+#endif
+    
+    allocator->FreeMemory(allocationCount, pAllocations);
+}
+
+VkResult vmaResizeAllocation(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkDeviceSize newSize)
+{
+    VMA_ASSERT(allocator && allocation);
+    
+    VMA_DEBUG_LOG("vmaResizeAllocation");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordResizeAllocation(
+            allocator->GetCurrentFrameIndex(),
+            allocation,
+            newSize);
+    }
+#endif
+    
+    return allocator->ResizeAllocation(allocation, newSize);
+}
+
+void vmaGetAllocationInfo(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && allocation && pAllocationInfo);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordGetAllocationInfo(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    allocator->GetAllocationInfo(allocation, pAllocationInfo);
+}
+
+VkBool32 vmaTouchAllocation(
+    VmaAllocator allocator,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordTouchAllocation(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    return allocator->TouchAllocation(allocation);
+}
+
+void vmaSetAllocationUserData(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    void* pUserData)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocation->SetUserData(allocator, pUserData);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordSetAllocationUserData(
+            allocator->GetCurrentFrameIndex(),
+            allocation,
+            pUserData);
+    }
+#endif
+}
+
+void vmaCreateLostAllocation(
+    VmaAllocator allocator,
+    VmaAllocation* pAllocation)
+{
+    VMA_ASSERT(allocator && pAllocation);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK;
+
+    allocator->CreateLostAllocation(pAllocation);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordCreateLostAllocation(
+            allocator->GetCurrentFrameIndex(),
+            *pAllocation);
+    }
+#endif
+}
+
+VkResult vmaMapMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    void** ppData)
+{
+    VMA_ASSERT(allocator && allocation && ppData);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VkResult res = allocator->Map(allocation, ppData);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordMapMemory(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    return res;
+}
+
+void vmaUnmapMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordUnmapMemory(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    allocator->Unmap(allocation);
+}
+
+void vmaFlushAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_LOG("vmaFlushAllocation");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_FLUSH);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordFlushAllocation(
+            allocator->GetCurrentFrameIndex(),
+            allocation, offset, size);
+    }
+#endif
+}
+
+void vmaInvalidateAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_LOG("vmaInvalidateAllocation");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_INVALIDATE);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordInvalidateAllocation(
+            allocator->GetCurrentFrameIndex(),
+            allocation, offset, size);
+    }
+#endif
+}
+
+VkResult vmaCheckCorruption(VmaAllocator allocator, uint32_t memoryTypeBits)
+{
+    VMA_ASSERT(allocator);
+
+    VMA_DEBUG_LOG("vmaCheckCorruption");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    return allocator->CheckCorruption(memoryTypeBits);
+}
+
+VkResult vmaDefragment(
+    VmaAllocator allocator,
+    VmaAllocation* pAllocations,
+    size_t allocationCount,
+    VkBool32* pAllocationsChanged,
+    const VmaDefragmentationInfo *pDefragmentationInfo,
+    VmaDefragmentationStats* pDefragmentationStats)
+{
+    // Deprecated interface, reimplemented using new one.
+
+    VmaDefragmentationInfo2 info2 = {};
+    info2.allocationCount = (uint32_t)allocationCount;
+    info2.pAllocations = pAllocations;
+    info2.pAllocationsChanged = pAllocationsChanged;
+    if(pDefragmentationInfo != VMA_NULL)
+    {
+        info2.maxCpuAllocationsToMove = pDefragmentationInfo->maxAllocationsToMove;
+        info2.maxCpuBytesToMove = pDefragmentationInfo->maxBytesToMove;
+    }
+    else
+    {
+        info2.maxCpuAllocationsToMove = UINT32_MAX;
+        info2.maxCpuBytesToMove = VK_WHOLE_SIZE;
+    }
+    // info2.flags, maxGpuAllocationsToMove, maxGpuBytesToMove, commandBuffer deliberately left zero.
+
+    VmaDefragmentationContext ctx;
+    VkResult res = vmaDefragmentationBegin(allocator, &info2, pDefragmentationStats, &ctx);
+    if(res == VK_NOT_READY)
+    {
+        res = vmaDefragmentationEnd( allocator, ctx);
+    }
+    return res;
+}
+
+VkResult vmaDefragmentationBegin(
+    VmaAllocator allocator,
+    const VmaDefragmentationInfo2* pInfo,
+    VmaDefragmentationStats* pStats,
+    VmaDefragmentationContext *pContext)
+{
+    VMA_ASSERT(allocator && pInfo && pContext);
+
+    // Degenerate case: Nothing to defragment.
+    if(pInfo->allocationCount == 0 && pInfo->poolCount == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    VMA_ASSERT(pInfo->allocationCount == 0 || pInfo->pAllocations != VMA_NULL);
+    VMA_ASSERT(pInfo->poolCount == 0 || pInfo->pPools != VMA_NULL);
+    VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->allocationCount, pInfo->pAllocations));
+    VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->poolCount, pInfo->pPools));
+
+    VMA_DEBUG_LOG("vmaDefragmentationBegin");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VkResult res = allocator->DefragmentationBegin(*pInfo, pStats, pContext);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordDefragmentationBegin(
+            allocator->GetCurrentFrameIndex(), *pInfo, *pContext);
+    }
+#endif
+
+    return res;
+}
+
+VkResult vmaDefragmentationEnd(
+    VmaAllocator allocator,
+    VmaDefragmentationContext context)
+{
+    VMA_ASSERT(allocator);
+
+    VMA_DEBUG_LOG("vmaDefragmentationEnd");
+
+    if(context != VK_NULL_HANDLE)
+    {
+        VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+        if(allocator->GetRecorder() != VMA_NULL)
+        {
+            allocator->GetRecorder()->RecordDefragmentationEnd(
+                allocator->GetCurrentFrameIndex(), context);
+        }
+#endif
+
+        return allocator->DefragmentationEnd(context);
+    }
+    else
+    {
+        return VK_SUCCESS;
+    }
+}
+
+VkResult vmaBindBufferMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkBuffer buffer)
+{
+    VMA_ASSERT(allocator && allocation && buffer);
+
+    VMA_DEBUG_LOG("vmaBindBufferMemory");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    return allocator->BindBufferMemory(allocation, buffer);
+}
+
+VkResult vmaBindImageMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkImage image)
+{
+    VMA_ASSERT(allocator && allocation && image);
+
+    VMA_DEBUG_LOG("vmaBindImageMemory");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    return allocator->BindImageMemory(allocation, image);
+}
+
+VkResult vmaCreateBuffer(
+    VmaAllocator allocator,
+    const VkBufferCreateInfo* pBufferCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    VkBuffer* pBuffer,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && pBuffer && pAllocation);
+
+    if(pBufferCreateInfo->size == 0)
+    {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+    
+    VMA_DEBUG_LOG("vmaCreateBuffer");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    *pBuffer = VK_NULL_HANDLE;
+    *pAllocation = VK_NULL_HANDLE;
+
+    // 1. Create VkBuffer.
+    VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)(
+        allocator->m_hDevice,
+        pBufferCreateInfo,
+        allocator->GetAllocationCallbacks(),
+        pBuffer);
+    if(res >= 0)
+    {
+        // 2. vkGetBufferMemoryRequirements.
+        VkMemoryRequirements vkMemReq = {};
+        bool requiresDedicatedAllocation = false;
+        bool prefersDedicatedAllocation  = false;
+        allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq,
+            requiresDedicatedAllocation, prefersDedicatedAllocation);
+
+        // Make sure alignment requirements for specific buffer usages reported
+        // in Physical Device Properties are included in alignment reported by memory requirements.
+        if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT) != 0)
+        {
+           VMA_ASSERT(vkMemReq.alignment %
+              allocator->m_PhysicalDeviceProperties.limits.minTexelBufferOffsetAlignment == 0);
+        }
+        if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT) != 0)
+        {
+           VMA_ASSERT(vkMemReq.alignment %
+              allocator->m_PhysicalDeviceProperties.limits.minUniformBufferOffsetAlignment == 0);
+        }
+        if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) != 0)
+        {
+           VMA_ASSERT(vkMemReq.alignment %
+              allocator->m_PhysicalDeviceProperties.limits.minStorageBufferOffsetAlignment == 0);
+        }
+
+        // 3. Allocate memory using allocator.
+        res = allocator->AllocateMemory(
+            vkMemReq,
+            requiresDedicatedAllocation,
+            prefersDedicatedAllocation,
+            *pBuffer, // dedicatedBuffer
+            VK_NULL_HANDLE, // dedicatedImage
+            *pAllocationCreateInfo,
+            VMA_SUBALLOCATION_TYPE_BUFFER,
+            1, // allocationCount
+            pAllocation);
+
+#if VMA_RECORDING_ENABLED
+        if(allocator->GetRecorder() != VMA_NULL)
+        {
+            allocator->GetRecorder()->RecordCreateBuffer(
+                allocator->GetCurrentFrameIndex(),
+                *pBufferCreateInfo,
+                *pAllocationCreateInfo,
+                *pAllocation);
+        }
+#endif
+
+        if(res >= 0)
+        {
+            // 3. Bind buffer with memory.
+            res = allocator->BindBufferMemory(*pAllocation, *pBuffer);
+            if(res >= 0)
+            {
+                // All steps succeeded.
+                #if VMA_STATS_STRING_ENABLED
+                    (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage);
+                #endif
+                if(pAllocationInfo != VMA_NULL)
+                {
+                    allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+                }
+
+                return VK_SUCCESS;
+            }
+            allocator->FreeMemory(
+                1, // allocationCount
+                pAllocation);
+            *pAllocation = VK_NULL_HANDLE;
+            (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());
+            *pBuffer = VK_NULL_HANDLE;
+            return res;
+        }
+        (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());
+        *pBuffer = VK_NULL_HANDLE;
+        return res;
+    }
+    return res;
+}
+
+void vmaDestroyBuffer(
+    VmaAllocator allocator,
+    VkBuffer buffer,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator);
+
+    if(buffer == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE)
+    {
+        return;
+    }
+
+    VMA_DEBUG_LOG("vmaDestroyBuffer");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordDestroyBuffer(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    if(buffer != VK_NULL_HANDLE)
+    {
+        (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, buffer, allocator->GetAllocationCallbacks());
+    }
+
+    if(allocation != VK_NULL_HANDLE)
+    {
+        allocator->FreeMemory(
+            1, // allocationCount
+            &allocation);
+    }
+}
+
+VkResult vmaCreateImage(
+    VmaAllocator allocator,
+    const VkImageCreateInfo* pImageCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    VkImage* pImage,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && pImageCreateInfo && pAllocationCreateInfo && pImage && pAllocation);
+
+    if(pImageCreateInfo->extent.width == 0 ||
+        pImageCreateInfo->extent.height == 0 ||
+        pImageCreateInfo->extent.depth == 0 ||
+        pImageCreateInfo->mipLevels == 0 ||
+        pImageCreateInfo->arrayLayers == 0)
+    {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+
+    VMA_DEBUG_LOG("vmaCreateImage");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    *pImage = VK_NULL_HANDLE;
+    *pAllocation = VK_NULL_HANDLE;
+
+    // 1. Create VkImage.
+    VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)(
+        allocator->m_hDevice,
+        pImageCreateInfo,
+        allocator->GetAllocationCallbacks(),
+        pImage);
+    if(res >= 0)
+    {
+        VmaSuballocationType suballocType = pImageCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ?
+            VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL :
+            VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR;
+        
+        // 2. Allocate memory using allocator.
+        VkMemoryRequirements vkMemReq = {};
+        bool requiresDedicatedAllocation = false;
+        bool prefersDedicatedAllocation  = false;
+        allocator->GetImageMemoryRequirements(*pImage, vkMemReq,
+            requiresDedicatedAllocation, prefersDedicatedAllocation);
+
+        res = allocator->AllocateMemory(
+            vkMemReq,
+            requiresDedicatedAllocation,
+            prefersDedicatedAllocation,
+            VK_NULL_HANDLE, // dedicatedBuffer
+            *pImage, // dedicatedImage
+            *pAllocationCreateInfo,
+            suballocType,
+            1, // allocationCount
+            pAllocation);
+
+#if VMA_RECORDING_ENABLED
+        if(allocator->GetRecorder() != VMA_NULL)
+        {
+            allocator->GetRecorder()->RecordCreateImage(
+                allocator->GetCurrentFrameIndex(),
+                *pImageCreateInfo,
+                *pAllocationCreateInfo,
+                *pAllocation);
+        }
+#endif
+
+        if(res >= 0)
+        {
+            // 3. Bind image with memory.
+            res = allocator->BindImageMemory(*pAllocation, *pImage);
+            if(res >= 0)
+            {
+                // All steps succeeded.
+                #if VMA_STATS_STRING_ENABLED
+                    (*pAllocation)->InitBufferImageUsage(pImageCreateInfo->usage);
+                #endif
+                if(pAllocationInfo != VMA_NULL)
+                {
+                    allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+                }
+
+                return VK_SUCCESS;
+            }
+            allocator->FreeMemory(
+                1, // allocationCount
+                pAllocation);
+            *pAllocation = VK_NULL_HANDLE;
+            (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks());
+            *pImage = VK_NULL_HANDLE;
+            return res;
+        }
+        (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks());
+        *pImage = VK_NULL_HANDLE;
+        return res;
+    }
+    return res;
+}
+
+void vmaDestroyImage(
+    VmaAllocator allocator,
+    VkImage image,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator);
+
+    if(image == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE)
+    {
+        return;
+    }
+
+    VMA_DEBUG_LOG("vmaDestroyImage");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordDestroyImage(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    if(image != VK_NULL_HANDLE)
+    {
+        (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, image, allocator->GetAllocationCallbacks());
+    }
+    if(allocation != VK_NULL_HANDLE)
+    {
+        allocator->FreeMemory(
+            1, // allocationCount
+            &allocation);
+    }
+}
+
+#endif // #ifdef VMA_IMPLEMENTATION
diff --git a/src/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc
index ecd1a5ef3f..881ca0adbc 100644
--- a/src/3rdparty/double-conversion/double-conversion.cc
+++ b/src/3rdparty/double-conversion/double-conversion.cc
@@ -38,6 +38,11 @@
 #include <double-conversion/strtod.h>
 #include <double-conversion/utils.h>
 
+// Fix warning C4244: 'argument': conversion from 'const uc16' to 'char', possible loss of data
+#ifdef _MSC_VER
+ __pragma(warning(disable: 4244))
+#endif
+
 namespace double_conversion {
 
 const DoubleToStringConverter& DoubleToStringConverter::EcmaScriptConverter() {
diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c
index bef109e401..e4f3bd85de 100644
--- a/src/3rdparty/forkfd/forkfd.c
+++ b/src/3rdparty/forkfd/forkfd.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Intel Corporation.
+** Copyright (C) 2019 Intel Corporation.
 ** Copyright (C) 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -59,9 +59,6 @@
 #    define HAVE_PIPE2    1
 #  endif
 #endif
-#if defined(__FreeBSD__) && __FreeBSD__ >= 9
-#  include <sys/procdesc.h>
-#endif
 
 #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
 #  define HAVE_WAITID   1
@@ -93,9 +90,11 @@
 #  endif
 #endif
 
-#ifndef FFD_ATOMIC_RELAXED
-#  include "forkfd_gcc.h"
-#endif
+#include "forkfd_atomic.h"
+
+static int system_has_forkfd(void);
+static int system_forkfd(int flags, pid_t *ppid, int *system);
+static int system_forkfd_wait(int ffd, struct forkfd_info *info, struct rusage *rusage);
 
 #define CHILDREN_IN_SMALL_ARRAY     16
 #define CHILDREN_IN_BIG_ARRAY       256
@@ -267,7 +266,7 @@ static int tryReaping(pid_t pid, struct pipe_payload *payload)
 static void freeInfo(Header *header, ProcessInfo *entry)
 {
     entry->deathPipe = -1;
-    entry->pid = 0;
+    ffd_atomic_store(&entry->pid, 0, FFD_ATOMIC_RELEASE);
 
     (void)ffd_atomic_add_fetch(&header->busyCount, -1, FFD_ATOMIC_RELEASE);
     assert(header->busyCount >= 0);
@@ -448,6 +447,37 @@ static void ignore_sigpipe()
 #endif
 }
 
+#if defined(__GNUC__) && (!defined(__FreeBSD__) || __FreeBSD__ < 10)
+__attribute((destructor, unused)) static void cleanup();
+#endif
+
+static void cleanup()
+{
+    BigArray *array;
+    /* This function is not thread-safe!
+     * It must only be called when the process is shutting down.
+     * At shutdown, we expect no one to be calling forkfd(), so we don't
+     * need to be thread-safe with what is done there.
+     *
+     * But SIGCHLD might be delivered to any thread, including this one.
+     * There's no way to prevent that. The correct solution would be to
+     * cooperatively delete. We don't do that.
+     */
+    if (ffd_atomic_load(&forkfd_status, FFD_ATOMIC_RELAXED) == 0)
+        return;
+
+    /* notify the handler that we're no longer in operation */
+    ffd_atomic_store(&forkfd_status, 0, FFD_ATOMIC_RELAXED);
+
+    /* free any arrays we might have */
+    array = ffd_atomic_load(&children.header.nextArray, FFD_ATOMIC_ACQUIRE);
+    while (array != NULL) {
+        BigArray *next = ffd_atomic_load(&array->header.nextArray, FFD_ATOMIC_ACQUIRE);
+        free(array);
+        array = next;
+    }
+}
+
 static void forkfd_initialize()
 {
 #if defined(HAVE_BROKEN_WAITID)
@@ -489,44 +519,15 @@ static void forkfd_initialize()
     ignore_sigpipe();
 #endif
 
-#ifndef __GNUC__
+#ifdef __GNUC__
+    (void) cleanup; /* suppress unused static function warning */
+#else
     atexit(cleanup);
 #endif
 
     ffd_atomic_store(&forkfd_status, 1, FFD_ATOMIC_RELAXED);
 }
 
-#ifdef __GNUC__
-__attribute((destructor, unused)) static void cleanup();
-#endif
-
-static void cleanup()
-{
-    BigArray *array;
-    /* This function is not thread-safe!
-     * It must only be called when the process is shutting down.
-     * At shutdown, we expect no one to be calling forkfd(), so we don't
-     * need to be thread-safe with what is done there.
-     *
-     * But SIGCHLD might be delivered to any thread, including this one.
-     * There's no way to prevent that. The correct solution would be to
-     * cooperatively delete. We don't do that.
-     */
-    if (ffd_atomic_load(&forkfd_status, FFD_ATOMIC_RELAXED) == 0)
-        return;
-
-    /* notify the handler that we're no longer in operation */
-    ffd_atomic_store(&forkfd_status, 0, FFD_ATOMIC_RELAXED);
-
-    /* free any arrays we might have */
-    array = children.header.nextArray;
-    while (array != NULL) {
-        BigArray *next = array->header.nextArray;
-        free(array);
-        array = next;
-    }
-}
-
 static int create_pipe(int filedes[], int flags)
 {
     int ret = -1;
@@ -565,55 +566,6 @@ static int create_pipe(int filedes[], int flags)
     return ret;
 }
 
-#if defined(FORKFD_NO_SPAWNFD) && defined(__FreeBSD__) && __FreeBSD__ >= 9
-#  if __FreeBSD__ == 9
-/* PROCDESC is an optional feature in the kernel and wasn't enabled
- * by default on FreeBSD 9. So we need to check for it at runtime. */
-static ffd_atomic_int system_has_forkfd = FFD_ATOMIC_INIT(1);
-#  else
-/* On FreeBSD 10, PROCDESC was enabled by default. On v11, it's not an option
- * anymore and can't be disabled. */
-static const int system_has_forkfd = 1;
-#  endif
-
-static int system_forkfd(int flags, pid_t *ppid)
-{
-    int ret;
-    pid_t pid;
-    pid = pdfork(&ret, PD_DAEMON);
-    if (__builtin_expect(pid == -1, 0)) {
-#  if __FreeBSD__ == 9
-        if (errno == ENOSYS) {
-            /* PROCDESC wasn't compiled into the kernel: don't try it again. */
-            ffd_atomic_store(&system_has_forkfd, 0, FFD_ATOMIC_RELAXED);
-        }
-#  endif
-        return -1;
-    }
-    if (pid == 0) {
-        /* child process */
-        return FFD_CHILD_PROCESS;
-    }
-
-    /* parent process */
-    if (flags & FFD_CLOEXEC)
-        fcntl(ret, F_SETFD, FD_CLOEXEC);
-    if (flags & FFD_NONBLOCK)
-        fcntl(ret, F_SETFL, fcntl(ret, F_GETFL) | O_NONBLOCK);
-    if (ppid)
-        *ppid = pid;
-    return ret;
-}
-#else
-static const int system_has_forkfd = 0;
-static int system_forkfd(int flags, pid_t *ppid)
-{
-    (void)flags;
-    (void)ppid;
-    return -1;
-}
-#endif
-
 #ifndef FORKFD_NO_FORKFD
 /**
  * @brief forkfd returns a file descriptor representing a child process
@@ -661,11 +613,9 @@ int forkfd(int flags, pid_t *ppid)
     int efd;
 #endif
 
-    if (system_has_forkfd) {
-        ret = system_forkfd(flags, ppid);
-        if (system_has_forkfd)
-            return ret;
-    }
+    fd = system_forkfd(flags, ppid, &ret);
+    if (ret)
+        return fd;
 
     (void) pthread_once(&forkfd_initialization, forkfd_initialize);
 
@@ -790,7 +740,7 @@ int spawnfd(int flags, pid_t *ppid, const char *path, const posix_spawn_file_act
     /* we can only do work if we have a way to start the child in stopped mode;
      * otherwise, we have a major race condition. */
 
-    assert(!system_has_forkfd);
+    assert(!system_has_forkfd());
 
     (void) pthread_once(&forkfd_initialization, forkfd_initialize);
 
@@ -843,30 +793,13 @@ out:
 #endif // _POSIX_SPAWN && !FORKFD_NO_SPAWNFD
 
 
-int forkfd_wait(int ffd, forkfd_info *info, struct rusage *rusage)
+int forkfd_wait(int ffd, struct forkfd_info *info, struct rusage *rusage)
 {
     struct pipe_payload payload;
     int ret;
 
-    if (system_has_forkfd) {
-#if defined(__FreeBSD__) && __FreeBSD__ >= 9
-        pid_t pid;
-        int status;
-        int options = WEXITED;
-
-        ret = pdgetpid(ffd, &pid);
-        if (ret == -1)
-            return ret;
-        ret = fcntl(ffd, F_GETFL);
-        if (ret == -1)
-            return ret;
-        options |= (ret & O_NONBLOCK) ? WNOHANG : 0;
-        ret = wait4(pid, &status, options, rusage);
-        if (ret != -1 && info)
-            convertStatusToForkfdInfo(status, info);
-        return ret == -1 ? -1 : 0;
-#endif
-    }
+    if (system_has_forkfd())
+        return system_forkfd_wait(ffd, info, rusage);
 
     ret = read(ffd, &payload, sizeof(payload));
     if (ret == -1)
@@ -886,3 +819,28 @@ int forkfd_close(int ffd)
 {
     return close(ffd);
 }
+
+#if defined(__FreeBSD__) && __FreeBSD__ >= 9
+#  include "forkfd_freebsd.c"
+#else
+int system_has_forkfd()
+{
+    return 0;
+}
+
+int system_forkfd(int flags, pid_t *ppid, int *system)
+{
+    (void)flags;
+    (void)ppid;
+    *system = 0;
+    return -1;
+}
+
+int system_forkfd_wait(int ffd, struct forkfd_info *info, struct rusage *rusage)
+{
+    (void)ffd;
+    (void)info;
+    (void)rusage;
+    return -1;
+}
+#endif
diff --git a/src/3rdparty/forkfd/forkfd.h b/src/3rdparty/forkfd/forkfd.h
index 958321c299..eb121de593 100644
--- a/src/3rdparty/forkfd/forkfd.h
+++ b/src/3rdparty/forkfd/forkfd.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Intel Corporation.
+** Copyright (C) 2019 Intel Corporation.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
 ** of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,7 @@
 
 #include <fcntl.h>
 #include <stdint.h>
+#include <sys/wait.h>
 #include <unistd.h> // to get the POSIX flags
 
 #if _POSIX_SPAWN > 0
@@ -48,7 +49,7 @@ struct forkfd_info {
 };
 
 int forkfd(int flags, pid_t *ppid);
-int forkfd_wait(int ffd, forkfd_info *info, struct rusage *rusage);
+int forkfd_wait(int ffd, struct forkfd_info *info, struct rusage *rusage);
 int forkfd_close(int ffd);
 
 #if _POSIX_SPAWN > 0
diff --git a/src/3rdparty/forkfd/forkfd_atomic.h b/src/3rdparty/forkfd/forkfd_atomic.h
new file mode 100644
index 0000000000..394e30d26c
--- /dev/null
+++ b/src/3rdparty/forkfd/forkfd_atomic.h
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Intel Corporation.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#if !defined(FFD_ATOMIC_H) & !defined(FFD_ATOMIC_RELAXED)
+#define FFD_ATOMIC_H
+
+#if defined(__cplusplus) && __cplusplus >= 201103L
+#  include "forkfd_c11.h"
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+#  include "forkfd_c11.h"
+#elif defined(__GNUC__)
+#  include "forkfd_gcc.h"
+#endif
+
+#endif /* FFD_ATOMIC_h && FFD_ATOMIC_RELAXED */
+#ifndef FFD_ATOMIC_RELAXED
+#  error "Could not determine atomics for this platform"
+#endif
diff --git a/src/3rdparty/forkfd/forkfd_c11.h b/src/3rdparty/forkfd/forkfd_c11.h
new file mode 100644
index 0000000000..f3dc2b5357
--- /dev/null
+++ b/src/3rdparty/forkfd/forkfd_c11.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Intel Corporation.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#ifndef FFD_ATOMIC_C11_H
+#define FFD_ATOMIC_C11_H
+
+/* atomics */
+/* Using the C11 <stdatomic.h> header or C++11's <atomic>
+ */
+
+#if defined(__cplusplus)
+#  include <atomic>
+#  define ffd_atomic_pointer(type)  std::atomic<type*>
+#  define FFD_ATOMIC_RELAXED        std::memory_order_relaxed
+#  define FFD_ATOMIC_ACQUIRE        std::memory_order_acquire
+#  define FFD_ATOMIC_RELEASE        std::memory_order_release
+// acq_rel & cst not necessary
+typedef std::atomic_int ffd_atomic_int;
+#else
+#  include <stdatomic.h>
+#  define ffd_atomic_pointer(type)  _Atomic(type*)
+#  define FFD_ATOMIC_RELAXED        memory_order_relaxed
+#  define FFD_ATOMIC_ACQUIRE        memory_order_acquire
+#  define FFD_ATOMIC_RELEASE        memory_order_release
+// acq_rel & cst not necessary
+
+typedef atomic_int ffd_atomic_int;
+#endif
+
+#define FFD_ATOMIC_INIT(val)        ATOMIC_VAR_INIT(val)
+
+#define ffd_atomic_load(ptr, order) \
+    atomic_load_explicit(ptr, order)
+#define ffd_atomic_store(ptr, val, order) \
+    atomic_store_explicit(ptr, val, order)
+#define ffd_atomic_exchange(ptr,val,order) \
+    atomic_exchange_explicit(ptr, val, order)
+#define ffd_atomic_compare_exchange(ptr, expected, desired, order1, order2) \
+    atomic_compare_exchange_strong_explicit(ptr, expected, desired, order1, order2)
+#define ffd_atomic_add_fetch(ptr, val, order) \
+    (atomic_fetch_add_explicit(ptr, val, order) + (val))
+
+#endif
diff --git a/src/3rdparty/forkfd/forkfd_freebsd.c b/src/3rdparty/forkfd/forkfd_freebsd.c
new file mode 100644
index 0000000000..77ce3fcfad
--- /dev/null
+++ b/src/3rdparty/forkfd/forkfd_freebsd.c
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Intel Corporation.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+** THE SOFTWARE.
+**
+****************************************************************************/
+
+#include "forkfd.h"
+
+#include <sys/types.h>
+#include <sys/procdesc.h>
+
+#include "forkfd_atomic.h"
+
+#if __FreeBSD__ >= 10
+/* On FreeBSD 10, PROCDESC was enabled by default. On v11, it's not an option
+ * anymore and can't be disabled. */
+static ffd_atomic_int system_forkfd_state = FFD_ATOMIC_INIT(1);
+#else
+static ffd_atomic_int system_forkfd_state = FFD_ATOMIC_INIT(0);
+#endif
+
+int system_has_forkfd()
+{
+    return ffd_atomic_load(&system_forkfd_state, FFD_ATOMIC_RELAXED) > 0;
+}
+
+int system_forkfd(int flags, pid_t *ppid, int *system)
+{
+    int ret;
+    pid_t pid;
+
+    int state = ffd_atomic_load(&system_forkfd_state, FFD_ATOMIC_RELAXED);
+    *system = 0;
+    if (state < 0)
+        return -1;
+
+    pid = pdfork(&ret, PD_DAEMON);
+#  if __FreeBSD__ == 9
+    if (state == 0 && pid != 0) {
+        /* Parent process: remember whether PROCDESC was compiled into the kernel */
+        state = (pid == -1 && errno == ENOSYS) ? -1 : 1;
+        ffd_atomic_store(&system_forkfd_state, state, FFD_ATOMIC_RELAXED);
+    }
+    if (state < 0)
+        return -1;
+#  endif
+    *system = 1;
+    if (__builtin_expect(pid == -1, 0))
+        return -1;
+
+    if (pid == 0) {
+        /* child process */
+        return FFD_CHILD_PROCESS;
+    }
+
+    /* parent process */
+    if (flags & FFD_CLOEXEC)
+        fcntl(ret, F_SETFD, FD_CLOEXEC);
+    if (flags & FFD_NONBLOCK)
+        fcntl(ret, F_SETFL, fcntl(ret, F_GETFL) | O_NONBLOCK);
+    if (ppid)
+        *ppid = pid;
+    return ret;
+}
+
+int system_forkfd_wait(int ffd, struct forkfd_info *info, struct rusage *rusage)
+{
+    pid_t pid;
+    int status;
+    int options = WEXITED;
+
+    int ret = pdgetpid(ffd, &pid);
+    if (ret == -1)
+        return ret;
+    ret = fcntl(ffd, F_GETFL);
+    if (ret == -1)
+        return ret;
+    options |= (ret & O_NONBLOCK) ? WNOHANG : 0;
+    ret = wait4(pid, &status, options, rusage);
+    if (ret != -1 && info)
+        convertStatusToForkfdInfo(status, info);
+    return ret == -1 ? -1 : 0;
+}
diff --git a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties
index bf3de21830..4b7e1f3d38 100644
--- a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
index 704ea9774a..de3bcb2bbf 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
@@ -1471,7 +1471,7 @@ static bool indic_shape_syllable(HB_Bool openType, HB_ShaperItem *item, bool inv
         while (finalOrder[toMove].form && fixed < len-1) {
             IDEBUG("        fixed = %d, toMove=%d, moving form %d with pos %d", fixed, toMove, finalOrder[toMove].form, finalOrder[toMove].position);
             for (i = fixed; i < len; i++) {
-//                IDEBUG() << "           i=" << i << "uc=" << hex << uc[i] << "form=" << form(uc[i])
+//                IDEBUG() << "           i=" << i << "uc=" << Qt::hex << uc[i] << "form=" << form(uc[i])
 //                         << "position=" << position[i];
                 if (form(uc[i]) == finalOrder[toMove].form &&
                      position[i] == finalOrder[toMove].position) {
diff --git a/src/3rdparty/harfbuzz/tests/shaping/main.cpp b/src/3rdparty/harfbuzz/tests/shaping/main.cpp
index 10818c565c..16f469029b 100644
--- a/src/3rdparty/harfbuzz/tests/shaping/main.cpp
+++ b/src/3rdparty/harfbuzz/tests/shaping/main.cpp
@@ -370,7 +370,7 @@ void tst_QScriptEngine::greek()
             QString str;
             str.append(uc);
             if (str.normalized(QString::NormalizationForm_D).normalized(QString::NormalizationForm_C) != str) {
-                //qDebug() << "skipping" << hex << uc;
+                //qDebug() << "skipping" << Qt::hex << uc;
                 continue;
             }
             if (uc == 0x1fc1 || uc == 0x1fed)
@@ -389,7 +389,7 @@ void tst_QScriptEngine::greek()
             QString str;
             str.append(uc);
             if (str.normalized(QString::NormalizationForm_D).normalized(QString::NormalizationForm_C) != str) {
-                //qDebug() << "skipping" << hex << uc;
+                //qDebug() << "skipping" << Qt::hex << uc;
                 continue;
             }
             if (uc == 0x1fc1 || uc == 0x1fed)
diff --git a/src/3rdparty/md4c.pri b/src/3rdparty/md4c.pri
new file mode 100644
index 0000000000..e0150dc6ed
--- /dev/null
+++ b/src/3rdparty/md4c.pri
@@ -0,0 +1,3 @@
+INCLUDEPATH +=  $$PWD/md4c
+HEADERS +=      $$PWD/md4c/md4c.h
+SOURCES +=      $$PWD/md4c/md4c.c
diff --git a/src/3rdparty/md4c/LICENSE.md b/src/3rdparty/md4c/LICENSE.md
new file mode 100644
index 0000000000..d58ef9341d
--- /dev/null
+++ b/src/3rdparty/md4c/LICENSE.md
@@ -0,0 +1,22 @@
+
+# The MIT License (MIT)
+
+Copyright © 2016-2019 Martin Mitáš
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the “Software”),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
diff --git a/src/3rdparty/md4c/md4c.c b/src/3rdparty/md4c/md4c.c
new file mode 100644
index 0000000000..01e63a5fd2
--- /dev/null
+++ b/src/3rdparty/md4c/md4c.c
@@ -0,0 +1,6109 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2019 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "md4c.h"
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/*****************************
+ ***  Miscellaneous Stuff  ***
+ *****************************/
+
+#ifdef _MSC_VER
+    /* MSVC does not understand "inline" when building as pure C (not C++).
+     * However it understands "__inline" */
+    #ifndef __cplusplus
+        #define inline __inline
+    #endif
+#endif
+
+#ifdef _T
+    #undef _T
+#endif
+#if defined MD4C_USE_UTF16
+    #define _T(x)           L##x
+#else
+    #define _T(x)           x
+#endif
+
+/* Misc. macros. */
+#define SIZEOF_ARRAY(a)     (sizeof(a) / sizeof(a[0]))
+
+#define STRINGIZE_(x)       #x
+#define STRINGIZE(x)        STRINGIZE_(x)
+
+#ifndef TRUE
+    #define TRUE            1
+    #define FALSE           0
+#endif
+
+
+/************************
+ ***  Internal Types  ***
+ ************************/
+
+/* These are omnipresent so lets save some typing. */
+#define CHAR    MD_CHAR
+#define SZ      MD_SIZE
+#define OFF     MD_OFFSET
+
+typedef struct MD_MARK_tag MD_MARK;
+typedef struct MD_BLOCK_tag MD_BLOCK;
+typedef struct MD_CONTAINER_tag MD_CONTAINER;
+typedef struct MD_REF_DEF_tag MD_REF_DEF;
+
+
+/* During analyzes of inline marks, we need to manage some "mark chains",
+ * of (yet unresolved) openers. This structure holds start/end of the chain.
+ * The chain internals are then realized through MD_MARK::prev and ::next.
+ */
+typedef struct MD_MARKCHAIN_tag MD_MARKCHAIN;
+struct MD_MARKCHAIN_tag {
+    int head;   /* Index of first mark in the chain, or -1 if empty. */
+    int tail;   /* Index of last mark in the chain, or -1 if empty. */
+};
+
+/* Context propagated through all the parsing. */
+typedef struct MD_CTX_tag MD_CTX;
+struct MD_CTX_tag {
+    /* Immutable stuff (parameters of md_parse()). */
+    const CHAR* text;
+    SZ size;
+    MD_PARSER parser;
+    void* userdata;
+
+    /* When this is true, it allows some optimizations. */
+    int doc_ends_with_newline;
+
+    /* Helper temporary growing buffer. */
+    CHAR* buffer;
+    unsigned alloc_buffer;
+
+    /* Reference definitions. */
+    MD_REF_DEF* ref_defs;
+    int n_ref_defs;
+    int alloc_ref_defs;
+    void** ref_def_hashtable;
+    int ref_def_hashtable_size;
+
+    /* Stack of inline/span markers.
+     * This is only used for parsing a single block contents but by storing it
+     * here we may reuse the stack for subsequent blocks; i.e. we have fewer
+     * (re)allocations. */
+    MD_MARK* marks;
+    int n_marks;
+    int alloc_marks;
+
+#if defined MD4C_USE_UTF16
+    char mark_char_map[128];
+#else
+    char mark_char_map[256];
+#endif
+
+    /* For resolving of inline spans. */
+    MD_MARKCHAIN mark_chains[11];
+#define PTR_CHAIN                               ctx->mark_chains[0]
+#define TABLECELLBOUNDARIES                     ctx->mark_chains[1]
+#define ASTERISK_OPENERS_extraword_mod3_0       ctx->mark_chains[2]
+#define ASTERISK_OPENERS_extraword_mod3_1       ctx->mark_chains[3]
+#define ASTERISK_OPENERS_extraword_mod3_2       ctx->mark_chains[4]
+#define ASTERISK_OPENERS_intraword_mod3_0       ctx->mark_chains[5]
+#define ASTERISK_OPENERS_intraword_mod3_1       ctx->mark_chains[6]
+#define ASTERISK_OPENERS_intraword_mod3_2       ctx->mark_chains[7]
+#define UNDERSCORE_OPENERS                      ctx->mark_chains[8]
+#define TILDE_OPENERS                           ctx->mark_chains[9]
+#define BRACKET_OPENERS                         ctx->mark_chains[10]
+#define OPENERS_CHAIN_FIRST                     2
+#define OPENERS_CHAIN_LAST                      10
+
+    int n_table_cell_boundaries;
+
+    /* For resolving links. */
+    int unresolved_link_head;
+    int unresolved_link_tail;
+
+    /* For resolving raw HTML. */
+    OFF html_comment_horizon;
+    OFF html_proc_instr_horizon;
+    OFF html_decl_horizon;
+    OFF html_cdata_horizon;
+
+    /* For block analysis.
+     * Notes:
+     *   -- It holds MD_BLOCK as well as MD_LINE structures. After each
+     *      MD_BLOCK, its (multiple) MD_LINE(s) follow.
+     *   -- For MD_BLOCK_HTML and MD_BLOCK_CODE, MD_VERBATIMLINE(s) are used
+     *      instead of MD_LINE(s).
+     */
+    void* block_bytes;
+    MD_BLOCK* current_block;
+    int n_block_bytes;
+    int alloc_block_bytes;
+
+    /* For container block analysis. */
+    MD_CONTAINER* containers;
+    int n_containers;
+    int alloc_containers;
+
+    /* Minimal indentation to call the block "indented code block". */
+    unsigned code_indent_offset;
+
+    /* Contextual info for line analysis. */
+    SZ code_fence_length;   /* For checking closing fence length. */
+    int html_block_type;    /* For checking closing raw HTML condition. */
+    int last_line_has_list_loosening_effect;
+    int last_list_item_starts_with_two_blank_lines;
+};
+
+enum MD_LINETYPE_tag {
+    MD_LINE_BLANK,
+    MD_LINE_HR,
+    MD_LINE_ATXHEADER,
+    MD_LINE_SETEXTHEADER,
+    MD_LINE_SETEXTUNDERLINE,
+    MD_LINE_INDENTEDCODE,
+    MD_LINE_FENCEDCODE,
+    MD_LINE_HTML,
+    MD_LINE_TEXT,
+    MD_LINE_TABLE,
+    MD_LINE_TABLEUNDERLINE
+};
+typedef enum MD_LINETYPE_tag MD_LINETYPE;
+
+typedef struct MD_LINE_ANALYSIS_tag MD_LINE_ANALYSIS;
+struct MD_LINE_ANALYSIS_tag {
+    MD_LINETYPE type    : 16;
+    unsigned data       : 16;
+    OFF beg;
+    OFF end;
+    unsigned indent;        /* Indentation level. */
+};
+
+typedef struct MD_LINE_tag MD_LINE;
+struct MD_LINE_tag {
+    OFF beg;
+    OFF end;
+};
+
+typedef struct MD_VERBATIMLINE_tag MD_VERBATIMLINE;
+struct MD_VERBATIMLINE_tag {
+    OFF beg;
+    OFF end;
+    OFF indent;
+};
+
+
+/*******************
+ ***  Debugging  ***
+ *******************/
+
+#define MD_LOG(msg)                                                     \
+    do {                                                                \
+        if(ctx->parser.debug_log != NULL)                               \
+            ctx->parser.debug_log((msg), ctx->userdata);                \
+    } while(0)
+
+#ifdef DEBUG
+    #define MD_ASSERT(cond)                                             \
+            do {                                                        \
+                if(!(cond)) {                                           \
+                    MD_LOG(__FILE__ ":" STRINGIZE(__LINE__) ": "        \
+                           "Assertion '" STRINGIZE(cond) "' failed.");  \
+                    exit(1);                                            \
+                }                                                       \
+            } while(0)
+
+    #define MD_UNREACHABLE()        MD_ASSERT(1 == 0)
+#else
+    #ifdef __GNUC__
+        #define MD_ASSERT(cond)     do { if(!(cond)) __builtin_unreachable(); } while(0)
+        #define MD_UNREACHABLE()    do { __builtin_unreachable(); } while(0)
+    #elif defined _MSC_VER  &&  _MSC_VER > 120
+        #define MD_ASSERT(cond)     do { __assume(cond); } while(0)
+        #define MD_UNREACHABLE()    do { __assume(0); } while(0)
+    #else
+        #define MD_ASSERT(cond)     do {} while(0)
+        #define MD_UNREACHABLE()    do {} while(0)
+    #endif
+#endif
+
+
+/*****************
+ ***  Helpers  ***
+ *****************/
+
+/* Character accessors. */
+#define CH(off)                 (ctx->text[(off)])
+#define STR(off)                (ctx->text + (off))
+
+/* Character classification.
+ * Note we assume ASCII compatibility of code points < 128 here. */
+#define ISIN_(ch, ch_min, ch_max)       ((ch_min) <= (unsigned)(ch) && (unsigned)(ch) <= (ch_max))
+#define ISANYOF_(ch, palette)           (md_strchr((palette), (ch)) != NULL)
+#define ISANYOF2_(ch, ch1, ch2)         ((ch) == (ch1) || (ch) == (ch2))
+#define ISANYOF3_(ch, ch1, ch2, ch3)    ((ch) == (ch1) || (ch) == (ch2) || (ch) == (ch3))
+#define ISASCII_(ch)                    ((unsigned)(ch) <= 127)
+#define ISBLANK_(ch)                    (ISANYOF2_((ch), _T(' '), _T('\t')))
+#define ISNEWLINE_(ch)                  (ISANYOF2_((ch), _T('\r'), _T('\n')))
+#define ISWHITESPACE_(ch)               (ISBLANK_(ch) || ISANYOF2_((ch), _T('\v'), _T('\f')))
+#define ISCNTRL_(ch)                    ((unsigned)(ch) <= 31 || (unsigned)(ch) == 127)
+#define ISPUNCT_(ch)                    (ISIN_(ch, 33, 47) || ISIN_(ch, 58, 64) || ISIN_(ch, 91, 96) || ISIN_(ch, 123, 126))
+#define ISUPPER_(ch)                    (ISIN_(ch, _T('A'), _T('Z')))
+#define ISLOWER_(ch)                    (ISIN_(ch, _T('a'), _T('z')))
+#define ISALPHA_(ch)                    (ISUPPER_(ch) || ISLOWER_(ch))
+#define ISDIGIT_(ch)                    (ISIN_(ch, _T('0'), _T('9')))
+#define ISXDIGIT_(ch)                   (ISDIGIT_(ch) || ISIN_(ch, _T('A'), _T('F')) || ISIN_(ch, _T('a'), _T('f')))
+#define ISALNUM_(ch)                    (ISALPHA_(ch) || ISDIGIT_(ch))
+
+#define ISANYOF(off, palette)           ISANYOF_(CH(off), (palette))
+#define ISANYOF2(off, ch1, ch2)         ISANYOF2_(CH(off), (ch1), (ch2))
+#define ISANYOF3(off, ch1, ch2, ch3)    ISANYOF3_(CH(off), (ch1), (ch2), (ch3))
+#define ISASCII(off)                    ISASCII_(CH(off))
+#define ISBLANK(off)                    ISBLANK_(CH(off))
+#define ISNEWLINE(off)                  ISNEWLINE_(CH(off))
+#define ISWHITESPACE(off)               ISWHITESPACE_(CH(off))
+#define ISCNTRL(off)                    ISCNTRL_(CH(off))
+#define ISPUNCT(off)                    ISPUNCT_(CH(off))
+#define ISUPPER(off)                    ISUPPER_(CH(off))
+#define ISLOWER(off)                    ISLOWER_(CH(off))
+#define ISALPHA(off)                    ISALPHA_(CH(off))
+#define ISDIGIT(off)                    ISDIGIT_(CH(off))
+#define ISXDIGIT(off)                   ISXDIGIT_(CH(off))
+#define ISALNUM(off)                    ISALNUM_(CH(off))
+static inline const CHAR*
+md_strchr(const CHAR* str, CHAR ch)
+{
+    OFF i;
+    for(i = 0; str[i] != _T('\0'); i++) {
+        if(ch == str[i])
+            return (str + i);
+    }
+    return NULL;
+}
+
+/* Case insensitive check of string equality. */
+static inline int
+md_ascii_case_eq(const CHAR* s1, const CHAR* s2, SZ n)
+{
+    OFF i;
+    for(i = 0; i < n; i++) {
+        CHAR ch1 = s1[i];
+        CHAR ch2 = s2[i];
+
+        if(ISLOWER_(ch1))
+            ch1 += ('A'-'a');
+        if(ISLOWER_(ch2))
+            ch2 += ('A'-'a');
+        if(ch1 != ch2)
+            return FALSE;
+    }
+    return TRUE;
+}
+
+static inline int
+md_ascii_eq(const CHAR* s1, const CHAR* s2, SZ n)
+{
+    return memcmp(s1, s2, n * sizeof(CHAR)) == 0;
+}
+
+static int
+md_text_with_null_replacement(MD_CTX* ctx, MD_TEXTTYPE type, const CHAR* str, SZ size)
+{
+    OFF off = 0;
+    int ret = 0;
+
+    while(1) {
+        while(off < size  &&  str[off] != _T('\0'))
+            off++;
+
+        if(off > 0) {
+            ret = ctx->parser.text(type, str, off, ctx->userdata);
+            if(ret != 0)
+                return ret;
+
+            str += off;
+            size -= off;
+            off = 0;
+        }
+
+        if(off >= size)
+            return 0;
+
+        ret = ctx->parser.text(MD_TEXT_NULLCHAR, _T(""), 1, ctx->userdata);
+        if(ret != 0)
+            return ret;
+        off++;
+    }
+}
+
+
+#define MD_CHECK(func)                                                  \
+    do {                                                                \
+        ret = (func);                                                   \
+        if(ret < 0)                                                     \
+            goto abort;                                                 \
+    } while(0)
+
+
+#define MD_TEMP_BUFFER(sz)                                              \
+    do {                                                                \
+        if(sz > ctx->alloc_buffer) {                                    \
+            CHAR* new_buffer;                                           \
+            SZ new_size = ((sz) + (sz) / 2 + 128) & ~127;               \
+                                                                        \
+            new_buffer = realloc(ctx->buffer, new_size);                \
+            if(new_buffer == NULL) {                                    \
+                MD_LOG("realloc() failed.");                            \
+                ret = -1;                                               \
+                goto abort;                                             \
+            }                                                           \
+                                                                        \
+            ctx->buffer = new_buffer;                                   \
+            ctx->alloc_buffer = new_size;                               \
+        }                                                               \
+    } while(0)
+
+
+#define MD_ENTER_BLOCK(type, arg)                                       \
+    do {                                                                \
+        ret = ctx->parser.enter_block((type), (arg), ctx->userdata);         \
+        if(ret != 0) {                                                  \
+            MD_LOG("Aborted from enter_block() callback.");             \
+            goto abort;                                                 \
+        }                                                               \
+    } while(0)
+
+#define MD_LEAVE_BLOCK(type, arg)                                       \
+    do {                                                                \
+        ret = ctx->parser.leave_block((type), (arg), ctx->userdata);         \
+        if(ret != 0) {                                                  \
+            MD_LOG("Aborted from leave_block() callback.");             \
+            goto abort;                                                 \
+        }                                                               \
+    } while(0)
+
+#define MD_ENTER_SPAN(type, arg)                                        \
+    do {                                                                \
+        ret = ctx->parser.enter_span((type), (arg), ctx->userdata);          \
+        if(ret != 0) {                                                  \
+            MD_LOG("Aborted from enter_span() callback.");              \
+            goto abort;                                                 \
+        }                                                               \
+    } while(0)
+
+#define MD_LEAVE_SPAN(type, arg)                                        \
+    do {                                                                \
+        ret = ctx->parser.leave_span((type), (arg), ctx->userdata);          \
+        if(ret != 0) {                                                  \
+            MD_LOG("Aborted from leave_span() callback.");              \
+            goto abort;                                                 \
+        }                                                               \
+    } while(0)
+
+#define MD_TEXT(type, str, size)                                        \
+    do {                                                                \
+        if(size > 0) {                                                  \
+            ret = ctx->parser.text((type), (str), (size), ctx->userdata);    \
+            if(ret != 0) {                                              \
+                MD_LOG("Aborted from text() callback.");                \
+                goto abort;                                             \
+            }                                                           \
+        }                                                               \
+    } while(0)
+
+#define MD_TEXT_INSECURE(type, str, size)                               \
+    do {                                                                \
+        if(size > 0) {                                                  \
+            ret = md_text_with_null_replacement(ctx, type, str, size);  \
+            if(ret != 0) {                                              \
+                MD_LOG("Aborted from text() callback.");                \
+                goto abort;                                             \
+            }                                                           \
+        }                                                               \
+    } while(0)
+
+
+
+/*************************
+ ***  Unicode Support  ***
+ *************************/
+
+typedef struct MD_UNICODE_FOLD_INFO_tag MD_UNICODE_FOLD_INFO;
+struct MD_UNICODE_FOLD_INFO_tag {
+    unsigned codepoints[3];
+    int n_codepoints;
+};
+
+
+#if defined MD4C_USE_UTF16 || defined MD4C_USE_UTF8
+    /* Binary search over sorted "map" of codepoints. Consecutive sequences
+     * of codepoints may be encoded in the map by just using the
+     * (MIN_CODEPOINT | 0x40000000) and (MAX_CODEPOINT | 0x80000000).
+     *
+     * Returns index of the found record in the map (in the case of ranges,
+     * the minimal value is used); or -1 on failure. */
+    static int
+    md_unicode_bsearch__(unsigned codepoint, const unsigned* map, size_t map_size)
+    {
+        int beg, end;
+        int pivot_beg, pivot_end;
+
+        beg = 0;
+        end = (int) map_size-1;
+        while(beg <= end) {
+            /* Pivot may be a range, not just a single value. */
+            pivot_beg = pivot_end = (beg + end) / 2;
+            if(map[pivot_end] & 0x40000000)
+                pivot_end++;
+            if(map[pivot_beg] & 0x80000000)
+                pivot_beg--;
+
+            if(codepoint < (map[pivot_beg] & 0x00ffffff))
+                end = pivot_beg - 1;
+            else if(codepoint > (map[pivot_end] & 0x00ffffff))
+                beg = pivot_end + 1;
+            else
+                return pivot_beg;
+        }
+
+        return -1;
+    }
+
+    static int
+    md_is_unicode_whitespace__(unsigned codepoint)
+    {
+#define R(cp_min, cp_max)   ((cp_min) | 0x40000000), ((cp_max) | 0x80000000)
+#define S(cp)               (cp)
+        /* Unicode "Zs" category.
+         * (generated by scripts/build_whitespace_map.py) */
+        static const unsigned WHITESPACE_MAP[] = {
+            S(0x0020), S(0x00a0), S(0x1680), R(0x2000,0x200a), S(0x202f), S(0x205f), S(0x3000)
+        };
+#undef R
+#undef S
+
+        /* The ASCII ones are the most frequently used ones, also CommonMark
+         * specification requests few more in this range. */
+        if(codepoint <= 0x7f)
+            return ISWHITESPACE_(codepoint);
+
+        return (md_unicode_bsearch__(codepoint, WHITESPACE_MAP, SIZEOF_ARRAY(WHITESPACE_MAP)) >= 0);
+    }
+
+    static int
+    md_is_unicode_punct__(unsigned codepoint)
+    {
+#define R(cp_min, cp_max)   ((cp_min) | 0x40000000), ((cp_max) | 0x80000000)
+#define S(cp)               (cp)
+        /* Unicode "Pc", "Pd", "Pe", "Pf", "Pi", "Po", "Ps" categories.
+         * (generated by scripts/build_punct_map.py) */
+        static const unsigned PUNCT_MAP[] = {
+            R(0x0021,0x0023), R(0x0025,0x002a), R(0x002c,0x002f), R(0x003a,0x003b), R(0x003f,0x0040),
+            R(0x005b,0x005d), S(0x005f), S(0x007b), S(0x007d), S(0x00a1), S(0x00a7), S(0x00ab), R(0x00b6,0x00b7),
+            S(0x00bb), S(0x00bf), S(0x037e), S(0x0387), R(0x055a,0x055f), R(0x0589,0x058a), S(0x05be), S(0x05c0),
+            S(0x05c3), S(0x05c6), R(0x05f3,0x05f4), R(0x0609,0x060a), R(0x060c,0x060d), S(0x061b), R(0x061e,0x061f),
+            R(0x066a,0x066d), S(0x06d4), R(0x0700,0x070d), R(0x07f7,0x07f9), R(0x0830,0x083e), S(0x085e),
+            R(0x0964,0x0965), S(0x0970), S(0x09fd), S(0x0a76), S(0x0af0), S(0x0c77), S(0x0c84), S(0x0df4), S(0x0e4f),
+            R(0x0e5a,0x0e5b), R(0x0f04,0x0f12), S(0x0f14), R(0x0f3a,0x0f3d), S(0x0f85), R(0x0fd0,0x0fd4),
+            R(0x0fd9,0x0fda), R(0x104a,0x104f), S(0x10fb), R(0x1360,0x1368), S(0x1400), S(0x166e), R(0x169b,0x169c),
+            R(0x16eb,0x16ed), R(0x1735,0x1736), R(0x17d4,0x17d6), R(0x17d8,0x17da), R(0x1800,0x180a),
+            R(0x1944,0x1945), R(0x1a1e,0x1a1f), R(0x1aa0,0x1aa6), R(0x1aa8,0x1aad), R(0x1b5a,0x1b60),
+            R(0x1bfc,0x1bff), R(0x1c3b,0x1c3f), R(0x1c7e,0x1c7f), R(0x1cc0,0x1cc7), S(0x1cd3), R(0x2010,0x2027),
+            R(0x2030,0x2043), R(0x2045,0x2051), R(0x2053,0x205e), R(0x207d,0x207e), R(0x208d,0x208e),
+            R(0x2308,0x230b), R(0x2329,0x232a), R(0x2768,0x2775), R(0x27c5,0x27c6), R(0x27e6,0x27ef),
+            R(0x2983,0x2998), R(0x29d8,0x29db), R(0x29fc,0x29fd), R(0x2cf9,0x2cfc), R(0x2cfe,0x2cff), S(0x2d70),
+            R(0x2e00,0x2e2e), R(0x2e30,0x2e4f), R(0x3001,0x3003), R(0x3008,0x3011), R(0x3014,0x301f), S(0x3030),
+            S(0x303d), S(0x30a0), S(0x30fb), R(0xa4fe,0xa4ff), R(0xa60d,0xa60f), S(0xa673), S(0xa67e),
+            R(0xa6f2,0xa6f7), R(0xa874,0xa877), R(0xa8ce,0xa8cf), R(0xa8f8,0xa8fa), S(0xa8fc), R(0xa92e,0xa92f),
+            S(0xa95f), R(0xa9c1,0xa9cd), R(0xa9de,0xa9df), R(0xaa5c,0xaa5f), R(0xaade,0xaadf), R(0xaaf0,0xaaf1),
+            S(0xabeb), R(0xfd3e,0xfd3f), R(0xfe10,0xfe19), R(0xfe30,0xfe52), R(0xfe54,0xfe61), S(0xfe63), S(0xfe68),
+            R(0xfe6a,0xfe6b), R(0xff01,0xff03), R(0xff05,0xff0a), R(0xff0c,0xff0f), R(0xff1a,0xff1b),
+            R(0xff1f,0xff20), R(0xff3b,0xff3d), S(0xff3f), S(0xff5b), S(0xff5d), R(0xff5f,0xff65), R(0x10100,0x10102),
+            S(0x1039f), S(0x103d0), S(0x1056f), S(0x10857), S(0x1091f), S(0x1093f), R(0x10a50,0x10a58), S(0x10a7f),
+            R(0x10af0,0x10af6), R(0x10b39,0x10b3f), R(0x10b99,0x10b9c), R(0x10f55,0x10f59), R(0x11047,0x1104d),
+            R(0x110bb,0x110bc), R(0x110be,0x110c1), R(0x11140,0x11143), R(0x11174,0x11175), R(0x111c5,0x111c8),
+            S(0x111cd), S(0x111db), R(0x111dd,0x111df), R(0x11238,0x1123d), S(0x112a9), R(0x1144b,0x1144f),
+            S(0x1145b), S(0x1145d), S(0x114c6), R(0x115c1,0x115d7), R(0x11641,0x11643), R(0x11660,0x1166c),
+            R(0x1173c,0x1173e), S(0x1183b), S(0x119e2), R(0x11a3f,0x11a46), R(0x11a9a,0x11a9c), R(0x11a9e,0x11aa2),
+            R(0x11c41,0x11c45), R(0x11c70,0x11c71), R(0x11ef7,0x11ef8), S(0x11fff), R(0x12470,0x12474),
+            R(0x16a6e,0x16a6f), S(0x16af5), R(0x16b37,0x16b3b), S(0x16b44), R(0x16e97,0x16e9a), S(0x16fe2),
+            S(0x1bc9f), R(0x1da87,0x1da8b), R(0x1e95e,0x1e95f)
+        };
+#undef R
+#undef S
+
+        /* The ASCII ones are the most frequently used ones, also CommonMark
+         * specification requests few more in this range. */
+        if(codepoint <= 0x7f)
+            return ISPUNCT_(codepoint);
+
+        return (md_unicode_bsearch__(codepoint, PUNCT_MAP, SIZEOF_ARRAY(PUNCT_MAP)) >= 0);
+    }
+
+    static void
+    md_get_unicode_fold_info(unsigned codepoint, MD_UNICODE_FOLD_INFO* info)
+    {
+#define R(cp_min, cp_max)   ((cp_min) | 0x40000000), ((cp_max) | 0x80000000)
+#define S(cp)               (cp)
+        /* Unicode "Pc", "Pd", "Pe", "Pf", "Pi", "Po", "Ps" categories.
+         * (generated by scripts/build_punct_map.py) */
+        static const unsigned FOLD_MAP_1[] = {
+            R(0x0041,0x005a), S(0x00b5), R(0x00c0,0x00d6), R(0x00d8,0x00de), R(0x0100,0x012e), R(0x0132,0x0136),
+            R(0x0139,0x0147), R(0x014a,0x0176), S(0x0178), R(0x0179,0x017d), S(0x017f), S(0x0181), S(0x0182),
+            S(0x0186), S(0x0187), S(0x0189), S(0x018b), S(0x018e), S(0x018f), S(0x0190), S(0x0191), S(0x0193),
+            S(0x0194), S(0x0196), S(0x0197), S(0x0198), S(0x019c), S(0x019d), S(0x019f), R(0x01a0,0x01a4), S(0x01a6),
+            S(0x01a7), S(0x01a9), S(0x01ac), S(0x01ae), S(0x01af), S(0x01b1), S(0x01b3), S(0x01b7), S(0x01b8),
+            S(0x01bc), S(0x01c4), S(0x01c5), S(0x01c7), S(0x01c8), S(0x01ca), R(0x01cb,0x01db), R(0x01de,0x01ee),
+            S(0x01f1), S(0x01f2), S(0x01f6), S(0x01f7), R(0x01f8,0x021e), S(0x0220), R(0x0222,0x0232), S(0x023a),
+            S(0x023b), S(0x023d), S(0x023e), S(0x0241), S(0x0243), S(0x0244), S(0x0245), R(0x0246,0x024e), S(0x0345),
+            S(0x0370), S(0x0376), S(0x037f), S(0x0386), R(0x0388,0x038a), S(0x038c), S(0x038e), R(0x0391,0x03a1),
+            R(0x03a3,0x03ab), S(0x03c2), S(0x03cf), S(0x03d0), S(0x03d1), S(0x03d5), S(0x03d6), R(0x03d8,0x03ee),
+            S(0x03f0), S(0x03f1), S(0x03f4), S(0x03f5), S(0x03f7), S(0x03f9), S(0x03fa), R(0x03fd,0x03ff),
+            R(0x0400,0x040f), R(0x0410,0x042f), R(0x0460,0x0480), R(0x048a,0x04be), S(0x04c0), R(0x04c1,0x04cd),
+            R(0x04d0,0x052e), R(0x0531,0x0556), R(0x10a0,0x10c5), S(0x10c7), S(0x10cd), R(0x13f8,0x13fd), S(0x1c80),
+            S(0x1c81), S(0x1c82), S(0x1c83), S(0x1c85), S(0x1c86), S(0x1c87), S(0x1c88), R(0x1c90,0x1cba),
+            R(0x1cbd,0x1cbf), R(0x1e00,0x1e94), S(0x1e9b), R(0x1ea0,0x1efe), R(0x1f08,0x1f0f), R(0x1f18,0x1f1d),
+            R(0x1f28,0x1f2f), R(0x1f38,0x1f3f), R(0x1f48,0x1f4d), S(0x1f59), S(0x1f5b), S(0x1f5d), S(0x1f5f),
+            R(0x1f68,0x1f6f), S(0x1fb8), S(0x1fba), S(0x1fbe), R(0x1fc8,0x1fcb), S(0x1fd8), S(0x1fda), S(0x1fe8),
+            S(0x1fea), S(0x1fec), S(0x1ff8), S(0x1ffa), S(0x2126), S(0x212a), S(0x212b), S(0x2132), R(0x2160,0x216f),
+            S(0x2183), R(0x24b6,0x24cf), R(0x2c00,0x2c2e), S(0x2c60), S(0x2c62), S(0x2c63), S(0x2c64),
+            R(0x2c67,0x2c6b), S(0x2c6d), S(0x2c6e), S(0x2c6f), S(0x2c70), S(0x2c72), S(0x2c75), S(0x2c7e),
+            R(0x2c80,0x2ce2), S(0x2ceb), S(0x2cf2), R(0xa640,0xa66c), R(0xa680,0xa69a), R(0xa722,0xa72e),
+            R(0xa732,0xa76e), S(0xa779), S(0xa77d), R(0xa77e,0xa786), S(0xa78b), S(0xa78d), S(0xa790),
+            R(0xa796,0xa7a8), S(0xa7aa), S(0xa7ab), S(0xa7ac), S(0xa7ad), S(0xa7ae), S(0xa7b0), S(0xa7b1), S(0xa7b2),
+            S(0xa7b3), R(0xa7b4,0xa7be), S(0xa7c2), S(0xa7c4), S(0xa7c5), S(0xa7c6), R(0xab70,0xabbf),
+            R(0xff21,0xff3a), R(0x10400,0x10427), R(0x104b0,0x104d3), R(0x10c80,0x10cb2), R(0x118a0,0x118bf),
+            R(0x16e40,0x16e5f), R(0x1e900,0x1e921)
+        };
+        static const unsigned FOLD_MAP_1_DATA[] = {
+            0x0061, 0x007a, 0x03bc, 0x00e0, 0x00f6, 0x00f8, 0x00fe, 0x0101, 0x012f, 0x0133, 0x0137, 0x013a, 0x0148,
+            0x014b, 0x0177, 0x00ff, 0x017a, 0x017e, 0x0073, 0x0253, 0x0183, 0x0254, 0x0188, 0x0256, 0x018c, 0x01dd,
+            0x0259, 0x025b, 0x0192, 0x0260, 0x0263, 0x0269, 0x0268, 0x0199, 0x026f, 0x0272, 0x0275, 0x01a1, 0x01a5,
+            0x0280, 0x01a8, 0x0283, 0x01ad, 0x0288, 0x01b0, 0x028a, 0x01b4, 0x0292, 0x01b9, 0x01bd, 0x01c6, 0x01c6,
+            0x01c9, 0x01c9, 0x01cc, 0x01cc, 0x01dc, 0x01df, 0x01ef, 0x01f3, 0x01f3, 0x0195, 0x01bf, 0x01f9, 0x021f,
+            0x019e, 0x0223, 0x0233, 0x2c65, 0x023c, 0x019a, 0x2c66, 0x0242, 0x0180, 0x0289, 0x028c, 0x0247, 0x024f,
+            0x03b9, 0x0371, 0x0377, 0x03f3, 0x03ac, 0x03ad, 0x03af, 0x03cc, 0x03cd, 0x03b1, 0x03c1, 0x03c3, 0x03cb,
+            0x03c3, 0x03d7, 0x03b2, 0x03b8, 0x03c6, 0x03c0, 0x03d9, 0x03ef, 0x03ba, 0x03c1, 0x03b8, 0x03b5, 0x03f8,
+            0x03f2, 0x03fb, 0x037b, 0x037d, 0x0450, 0x045f, 0x0430, 0x044f, 0x0461, 0x0481, 0x048b, 0x04bf, 0x04cf,
+            0x04c2, 0x04ce, 0x04d1, 0x052f, 0x0561, 0x0586, 0x2d00, 0x2d25, 0x2d27, 0x2d2d, 0x13f0, 0x13f5, 0x0432,
+            0x0434, 0x043e, 0x0441, 0x0442, 0x044a, 0x0463, 0xa64b, 0x10d0, 0x10fa, 0x10fd, 0x10ff, 0x1e01, 0x1e95,
+            0x1e61, 0x1ea1, 0x1eff, 0x1f00, 0x1f07, 0x1f10, 0x1f15, 0x1f20, 0x1f27, 0x1f30, 0x1f37, 0x1f40, 0x1f45,
+            0x1f51, 0x1f53, 0x1f55, 0x1f57, 0x1f60, 0x1f67, 0x1fb0, 0x1f70, 0x03b9, 0x1f72, 0x1f75, 0x1fd0, 0x1f76,
+            0x1fe0, 0x1f7a, 0x1fe5, 0x1f78, 0x1f7c, 0x03c9, 0x006b, 0x00e5, 0x214e, 0x2170, 0x217f, 0x2184, 0x24d0,
+            0x24e9, 0x2c30, 0x2c5e, 0x2c61, 0x026b, 0x1d7d, 0x027d, 0x2c68, 0x2c6c, 0x0251, 0x0271, 0x0250, 0x0252,
+            0x2c73, 0x2c76, 0x023f, 0x2c81, 0x2ce3, 0x2cec, 0x2cf3, 0xa641, 0xa66d, 0xa681, 0xa69b, 0xa723, 0xa72f,
+            0xa733, 0xa76f, 0xa77a, 0x1d79, 0xa77f, 0xa787, 0xa78c, 0x0265, 0xa791, 0xa797, 0xa7a9, 0x0266, 0x025c,
+            0x0261, 0x026c, 0x026a, 0x029e, 0x0287, 0x029d, 0xab53, 0xa7b5, 0xa7bf, 0xa7c3, 0xa794, 0x0282, 0x1d8e,
+            0x13a0, 0x13ef, 0xff41, 0xff5a, 0x10428, 0x1044f, 0x104d8, 0x104fb, 0x10cc0, 0x10cf2, 0x118c0, 0x118df,
+            0x16e60, 0x16e7f, 0x1e922, 0x1e943
+        };
+        static const unsigned FOLD_MAP_2[] = {
+            S(0x00df), S(0x0130), S(0x0149), S(0x01f0), S(0x0587), S(0x1e96), S(0x1e97), S(0x1e98), S(0x1e99),
+            S(0x1e9a), S(0x1e9e), S(0x1f50), R(0x1f80,0x1f87), R(0x1f88,0x1f8f), R(0x1f90,0x1f97), R(0x1f98,0x1f9f),
+            R(0x1fa0,0x1fa7), R(0x1fa8,0x1faf), S(0x1fb2), S(0x1fb3), S(0x1fb4), S(0x1fb6), S(0x1fbc), S(0x1fc2),
+            S(0x1fc3), S(0x1fc4), S(0x1fc6), S(0x1fcc), S(0x1fd6), S(0x1fe4), S(0x1fe6), S(0x1ff2), S(0x1ff3),
+            S(0x1ff4), S(0x1ff6), S(0x1ffc), S(0xfb00), S(0xfb01), S(0xfb02), S(0xfb05), S(0xfb06), S(0xfb13),
+            S(0xfb14), S(0xfb15), S(0xfb16), S(0xfb17)
+        };
+        static const unsigned FOLD_MAP_2_DATA[] = {
+            0x0073,0x0073, 0x0069,0x0307, 0x02bc,0x006e, 0x006a,0x030c, 0x0565,0x0582, 0x0068,0x0331, 0x0074,0x0308,
+            0x0077,0x030a, 0x0079,0x030a, 0x0061,0x02be, 0x0073,0x0073, 0x03c5,0x0313, 0x1f00,0x03b9, 0x1f07,0x03b9,
+            0x1f00,0x03b9, 0x1f07,0x03b9, 0x1f20,0x03b9, 0x1f27,0x03b9, 0x1f20,0x03b9, 0x1f27,0x03b9, 0x1f60,0x03b9,
+            0x1f67,0x03b9, 0x1f60,0x03b9, 0x1f67,0x03b9, 0x1f70,0x03b9, 0x03b1,0x03b9, 0x03ac,0x03b9, 0x03b1,0x0342,
+            0x03b1,0x03b9, 0x1f74,0x03b9, 0x03b7,0x03b9, 0x03ae,0x03b9, 0x03b7,0x0342, 0x03b7,0x03b9, 0x03b9,0x0342,
+            0x03c1,0x0313, 0x03c5,0x0342, 0x1f7c,0x03b9, 0x03c9,0x03b9, 0x03ce,0x03b9, 0x03c9,0x0342, 0x03c9,0x03b9,
+            0x0066,0x0066, 0x0066,0x0069, 0x0066,0x006c, 0x0073,0x0074, 0x0073,0x0074, 0x0574,0x0576, 0x0574,0x0565,
+            0x0574,0x056b, 0x057e,0x0576, 0x0574,0x056d
+        };
+        static const unsigned FOLD_MAP_3[] = {
+            S(0x0390), S(0x03b0), S(0x1f52), S(0x1f54), S(0x1f56), S(0x1fb7), S(0x1fc7), S(0x1fd2), S(0x1fd3),
+            S(0x1fd7), S(0x1fe2), S(0x1fe3), S(0x1fe7), S(0x1ff7), S(0xfb03), S(0xfb04)
+        };
+        static const unsigned FOLD_MAP_3_DATA[] = {
+            0x03b9,0x0308,0x0301, 0x03c5,0x0308,0x0301, 0x03c5,0x0313,0x0300, 0x03c5,0x0313,0x0301,
+            0x03c5,0x0313,0x0342, 0x03b1,0x0342,0x03b9, 0x03b7,0x0342,0x03b9, 0x03b9,0x0308,0x0300,
+            0x03b9,0x0308,0x0301, 0x03b9,0x0308,0x0342, 0x03c5,0x0308,0x0300, 0x03c5,0x0308,0x0301,
+            0x03c5,0x0308,0x0342, 0x03c9,0x0342,0x03b9, 0x0066,0x0066,0x0069, 0x0066,0x0066,0x006c
+        };
+#undef R
+#undef S
+        static const struct {
+            const unsigned* map;
+            const unsigned* data;
+            size_t map_size;
+            int n_codepoints;
+        } FOLD_MAP_LIST[] = {
+            { FOLD_MAP_1, FOLD_MAP_1_DATA, SIZEOF_ARRAY(FOLD_MAP_1), 1 },
+            { FOLD_MAP_2, FOLD_MAP_2_DATA, SIZEOF_ARRAY(FOLD_MAP_2), 2 },
+            { FOLD_MAP_3, FOLD_MAP_3_DATA, SIZEOF_ARRAY(FOLD_MAP_3), 3 }
+        };
+
+        int i;
+
+        /* Fast path for ASCII characters. */
+        if(codepoint <= 0x7f) {
+            info->codepoints[0] = codepoint;
+            if(ISUPPER_(codepoint))
+                info->codepoints[0] += 'a' - 'A';
+            info->n_codepoints = 1;
+            return;
+        }
+
+        /* Try to locate the codepoint in any of the maps. */
+        for(i = 0; i < (int) SIZEOF_ARRAY(FOLD_MAP_LIST); i++) {
+            int index;
+
+            index = md_unicode_bsearch__(codepoint, FOLD_MAP_LIST[i].map, FOLD_MAP_LIST[i].map_size);
+            if(index >= 0) {
+                /* Found the mapping. */
+                int n_codepoints = FOLD_MAP_LIST[i].n_codepoints;
+                const unsigned* map = FOLD_MAP_LIST[i].map;
+                const unsigned* codepoints = FOLD_MAP_LIST[i].data + (index * n_codepoints);
+
+                memcpy(info->codepoints, codepoints, sizeof(unsigned) * n_codepoints);
+                info->n_codepoints = n_codepoints;
+
+                if(FOLD_MAP_LIST[i].map[index] != codepoint) {
+                    /* The found mapping maps whole range of codepoints,
+                     * i.e. we have to offset info->codepoints[0] accordingly. */
+                    if((map[index] & 0x00ffffff)+1 == codepoints[0]) {
+                        /* Alternating type of the range. */
+                        info->codepoints[0] = codepoint + ((codepoint & 0x1) == (map[index] & 0x1) ? 1 : 0);
+                    } else {
+                        /* Range to range kind of mapping. */
+                        info->codepoints[0] += (codepoint - (map[index] & 0x00ffffff));
+                    }
+                }
+
+                return;
+            }
+        }
+
+        /* No mapping found. Map the codepoint to itself. */
+        info->codepoints[0] = codepoint;
+        info->n_codepoints = 1;
+    }
+#endif
+
+
+#if defined MD4C_USE_UTF16
+    #define IS_UTF16_SURROGATE_HI(word)     (((WORD)(word) & 0xfc00) == 0xd800)
+    #define IS_UTF16_SURROGATE_LO(word)     (((WORD)(word) & 0xfc00) == 0xdc00)
+    #define UTF16_DECODE_SURROGATE(hi, lo)  (0x10000 + ((((unsigned)(hi) & 0x3ff) << 10) | (((unsigned)(lo) & 0x3ff) << 0)))
+
+    static unsigned
+    md_decode_utf16le__(const CHAR* str, SZ str_size, SZ* p_size)
+    {
+        if(IS_UTF16_SURROGATE_HI(str[0])) {
+            if(1 < str_size && IS_UTF16_SURROGATE_LO(str[1])) {
+                if(p_size != NULL)
+                    *p_size = 2;
+                return UTF16_DECODE_SURROGATE(str[0], str[1]);
+            }
+        }
+
+        if(p_size != NULL)
+            *p_size = 1;
+        return str[0];
+    }
+
+    static unsigned
+    md_decode_utf16le_before__(MD_CTX* ctx, OFF off)
+    {
+        if(off > 2 && IS_UTF16_SURROGATE_HI(CH(off-2)) && IS_UTF16_SURROGATE_LO(CH(off-1)))
+            return UTF16_DECODE_SURROGATE(CH(off-2), CH(off-1));
+
+        return CH(off);
+    }
+
+    /* No whitespace uses surrogates, so no decoding needed here. */
+    #define ISUNICODEWHITESPACE_(codepoint) md_is_unicode_whitespace__(codepoint)
+    #define ISUNICODEWHITESPACE(off)        md_is_unicode_whitespace__(CH(off))
+    #define ISUNICODEWHITESPACEBEFORE(off)  md_is_unicode_whitespace__(CH((off)-1))
+
+    #define ISUNICODEPUNCT(off)             md_is_unicode_punct__(md_decode_utf16le__(STR(off), ctx->size - (off), NULL))
+    #define ISUNICODEPUNCTBEFORE(off)       md_is_unicode_punct__(md_decode_utf16le_before__(ctx, off))
+
+    static inline int
+    md_decode_unicode(const CHAR* str, OFF off, SZ str_size, SZ* p_char_size)
+    {
+        return md_decode_utf16le__(str+off, str_size-off, p_char_size);
+    }
+#elif defined MD4C_USE_UTF8
+    #define IS_UTF8_LEAD1(byte)     ((unsigned char)(byte) <= 0x7f)
+    #define IS_UTF8_LEAD2(byte)     (((unsigned char)(byte) & 0xe0) == 0xc0)
+    #define IS_UTF8_LEAD3(byte)     (((unsigned char)(byte) & 0xf0) == 0xe0)
+    #define IS_UTF8_LEAD4(byte)     (((unsigned char)(byte) & 0xf8) == 0xf0)
+    #define IS_UTF8_TAIL(byte)      (((unsigned char)(byte) & 0xc0) == 0x80)
+
+    static unsigned
+    md_decode_utf8__(const CHAR* str, SZ str_size, SZ* p_size)
+    {
+        if(!IS_UTF8_LEAD1(str[0])) {
+            if(IS_UTF8_LEAD2(str[0])) {
+                if(1 < str_size && IS_UTF8_TAIL(str[1])) {
+                    if(p_size != NULL)
+                        *p_size = 2;
+
+                    return (((unsigned int)str[0] & 0x1f) << 6) |
+                           (((unsigned int)str[1] & 0x3f) << 0);
+                }
+            } else if(IS_UTF8_LEAD3(str[0])) {
+                if(2 < str_size && IS_UTF8_TAIL(str[1]) && IS_UTF8_TAIL(str[2])) {
+                    if(p_size != NULL)
+                        *p_size = 3;
+
+                    return (((unsigned int)str[0] & 0x0f) << 12) |
+                           (((unsigned int)str[1] & 0x3f) << 6) |
+                           (((unsigned int)str[2] & 0x3f) << 0);
+                }
+            } else if(IS_UTF8_LEAD4(str[0])) {
+                if(3 < str_size && IS_UTF8_TAIL(str[1]) && IS_UTF8_TAIL(str[2]) && IS_UTF8_TAIL(str[3])) {
+                    if(p_size != NULL)
+                        *p_size = 4;
+
+                    return (((unsigned int)str[0] & 0x07) << 18) |
+                           (((unsigned int)str[1] & 0x3f) << 12) |
+                           (((unsigned int)str[2] & 0x3f) << 6) |
+                           (((unsigned int)str[3] & 0x3f) << 0);
+                }
+            }
+        }
+
+        if(p_size != NULL)
+            *p_size = 1;
+        return (unsigned) str[0];
+    }
+
+    static unsigned
+    md_decode_utf8_before__(MD_CTX* ctx, OFF off)
+    {
+        if(!IS_UTF8_LEAD1(CH(off-1))) {
+            if(off > 1 && IS_UTF8_LEAD2(CH(off-2)) && IS_UTF8_TAIL(CH(off-1)))
+                return (((unsigned int)CH(off-2) & 0x1f) << 6) |
+                       (((unsigned int)CH(off-1) & 0x3f) << 0);
+
+            if(off > 2 && IS_UTF8_LEAD3(CH(off-3)) && IS_UTF8_TAIL(CH(off-2)) && IS_UTF8_TAIL(CH(off-1)))
+                return (((unsigned int)CH(off-3) & 0x0f) << 12) |
+                       (((unsigned int)CH(off-2) & 0x3f) << 6) |
+                       (((unsigned int)CH(off-1) & 0x3f) << 0);
+
+            if(off > 3 && IS_UTF8_LEAD4(CH(off-4)) && IS_UTF8_TAIL(CH(off-3)) && IS_UTF8_TAIL(CH(off-2)) && IS_UTF8_TAIL(CH(off-1)))
+                return (((unsigned int)CH(off-4) & 0x07) << 18) |
+                       (((unsigned int)CH(off-3) & 0x3f) << 12) |
+                       (((unsigned int)CH(off-2) & 0x3f) << 6) |
+                       (((unsigned int)CH(off-1) & 0x3f) << 0);
+        }
+
+        return (unsigned) CH(off-1);
+    }
+
+    #define ISUNICODEWHITESPACE_(codepoint) md_is_unicode_whitespace__(codepoint)
+    #define ISUNICODEWHITESPACE(off)        md_is_unicode_whitespace__(md_decode_utf8__(STR(off), ctx->size - (off), NULL))
+    #define ISUNICODEWHITESPACEBEFORE(off)  md_is_unicode_whitespace__(md_decode_utf8_before__(ctx, off))
+
+    #define ISUNICODEPUNCT(off)             md_is_unicode_punct__(md_decode_utf8__(STR(off), ctx->size - (off), NULL))
+    #define ISUNICODEPUNCTBEFORE(off)       md_is_unicode_punct__(md_decode_utf8_before__(ctx, off))
+
+    static inline unsigned
+    md_decode_unicode(const CHAR* str, OFF off, SZ str_size, SZ* p_char_size)
+    {
+        return md_decode_utf8__(str+off, str_size-off, p_char_size);
+    }
+#else
+    #define ISUNICODEWHITESPACE_(codepoint) ISWHITESPACE_(codepoint)
+    #define ISUNICODEWHITESPACE(off)        ISWHITESPACE(off)
+    #define ISUNICODEWHITESPACEBEFORE(off)  ISWHITESPACE((off)-1)
+
+    #define ISUNICODEPUNCT(off)             ISPUNCT(off)
+    #define ISUNICODEPUNCTBEFORE(off)       ISPUNCT((off)-1)
+
+    static inline void
+    md_get_unicode_fold_info(unsigned codepoint, MD_UNICODE_FOLD_INFO* info)
+    {
+        info->codepoints[0] = codepoint;
+        if(ISUPPER_(codepoint))
+            info->codepoints[0] += 'a' - 'A';
+        info->n_codepoints = 1;
+    }
+
+    static inline unsigned
+    md_decode_unicode(const CHAR* str, OFF off, SZ str_size, SZ* p_size)
+    {
+        *p_size = 1;
+        return (unsigned) str[off];
+    }
+#endif
+
+
+/*************************************
+ ***  Helper string manipulations  ***
+ *************************************/
+
+/* Fill buffer with copy of the string between 'beg' and 'end' but replace any
+ * line breaks with given replacement character.
+ *
+ * NOTE: Caller is responsible to make sure the buffer is large enough.
+ * (Given the output is always shorter then input, (end - beg) is good idea
+ * what the caller should allocate.)
+ */
+static void
+md_merge_lines(MD_CTX* ctx, OFF beg, OFF end, const MD_LINE* lines, int n_lines,
+               CHAR line_break_replacement_char, CHAR* buffer, SZ* p_size)
+{
+    CHAR* ptr = buffer;
+    int line_index = 0;
+    OFF off = beg;
+
+    while(1) {
+        const MD_LINE* line = &lines[line_index];
+        OFF line_end = line->end;
+        if(end < line_end)
+            line_end = end;
+
+        while(off < line_end) {
+            *ptr = CH(off);
+            ptr++;
+            off++;
+        }
+
+        if(off >= end) {
+            *p_size = ptr - buffer;
+            return;
+        }
+
+        *ptr = line_break_replacement_char;
+        ptr++;
+
+        line_index++;
+        off = lines[line_index].beg;
+    }
+}
+
+/* Wrapper of md_merge_lines() which allocates new buffer for the output string.
+ */
+static int
+md_merge_lines_alloc(MD_CTX* ctx, OFF beg, OFF end, const MD_LINE* lines, int n_lines,
+                    CHAR line_break_replacement_char, CHAR** p_str, SZ* p_size)
+{
+    CHAR* buffer;
+
+    buffer = (CHAR*) malloc(sizeof(CHAR) * (end - beg));
+    if(buffer == NULL) {
+        MD_LOG("malloc() failed.");
+        return -1;
+    }
+
+    md_merge_lines(ctx, beg, end, lines, n_lines,
+                line_break_replacement_char, buffer, p_size);
+
+    *p_str = buffer;
+    return 0;
+}
+
+static OFF
+md_skip_unicode_whitespace(const CHAR* label, OFF off, SZ size)
+{
+    SZ char_size;
+    unsigned codepoint;
+
+    while(off < size) {
+        codepoint = md_decode_unicode(label, off, size, &char_size);
+        if(!ISUNICODEWHITESPACE_(codepoint)  &&  !ISNEWLINE_(label[off]))
+            break;
+        off += char_size;
+    }
+
+    return off;
+}
+
+
+/******************************
+ ***  Recognizing raw HTML  ***
+ ******************************/
+
+/* md_is_html_tag() may be called when processing inlines (inline raw HTML)
+ * or when breaking document to blocks (checking for start of HTML block type 7).
+ *
+ * When breaking document to blocks, we do not yet know line boundaries, but
+ * in that case the whole tag has to live on a single line. We distinguish this
+ * by n_lines == 0.
+ */
+static int
+md_is_html_tag(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    int attr_state;
+    OFF off = beg;
+    OFF line_end = (n_lines > 0) ? lines[0].end : ctx->size;
+    int i = 0;
+
+    MD_ASSERT(CH(beg) == _T('<'));
+
+    if(off + 1 >= line_end)
+        return FALSE;
+    off++;
+
+    /* For parsing attributes, we need a little state automaton below.
+     * State -1: no attributes are allowed.
+     * State 0: attribute could follow after some whitespace.
+     * State 1: after a whitespace (attribute name may follow).
+     * State 2: after attribute name ('=' MAY follow).
+     * State 3: after '=' (value specification MUST follow).
+     * State 41: in middle of unquoted attribute value.
+     * State 42: in middle of single-quoted attribute value.
+     * State 43: in middle of double-quoted attribute value.
+     */
+    attr_state = 0;
+
+    if(CH(off) == _T('/')) {
+        /* Closer tag "</ ... >". No attributes may be present. */
+        attr_state = -1;
+        off++;
+    }
+
+    /* Tag name */
+    if(off >= line_end  ||  !ISALPHA(off))
+        return FALSE;
+    off++;
+    while(off < line_end  &&  (ISALNUM(off)  ||  CH(off) == _T('-')))
+        off++;
+
+    /* (Optional) attributes (if not closer), (optional) '/' (if not closer)
+     * and final '>'. */
+    while(1) {
+        while(off < line_end  &&  !ISNEWLINE(off)) {
+            if(attr_state > 40) {
+                if(attr_state == 41 && (ISBLANK(off) || ISANYOF(off, _T("\"'=<>`")))) {
+                    attr_state = 0;
+                    off--;  /* Put the char back for re-inspection in the new state. */
+                } else if(attr_state == 42 && CH(off) == _T('\'')) {
+                    attr_state = 0;
+                } else if(attr_state == 43 && CH(off) == _T('"')) {
+                    attr_state = 0;
+                }
+                off++;
+            } else if(ISWHITESPACE(off)) {
+                if(attr_state == 0)
+                    attr_state = 1;
+                off++;
+            } else if(attr_state <= 2 && CH(off) == _T('>')) {
+                /* End. */
+                goto done;
+            } else if(attr_state <= 2 && CH(off) == _T('/') && off+1 < line_end && CH(off+1) == _T('>')) {
+                /* End with digraph '/>' */
+                off++;
+                goto done;
+            } else if((attr_state == 1 || attr_state == 2) && (ISALPHA(off) || CH(off) == _T('_') || CH(off) == _T(':'))) {
+                off++;
+                /* Attribute name */
+                while(off < line_end && (ISALNUM(off) || ISANYOF(off, _T("_.:-"))))
+                    off++;
+                attr_state = 2;
+            } else if(attr_state == 2 && CH(off) == _T('=')) {
+                /* Attribute assignment sign */
+                off++;
+                attr_state = 3;
+            } else if(attr_state == 3) {
+                /* Expecting start of attribute value. */
+                if(CH(off) == _T('"'))
+                    attr_state = 43;
+                else if(CH(off) == _T('\''))
+                    attr_state = 42;
+                else if(!ISANYOF(off, _T("\"'=<>`"))  &&  !ISNEWLINE(off))
+                    attr_state = 41;
+                else
+                    return FALSE;
+                off++;
+            } else {
+                /* Anything unexpected. */
+                return FALSE;
+            }
+        }
+
+        /* We have to be on a single line. See definition of start condition
+         * of HTML block, type 7. */
+        if(n_lines == 0)
+            return FALSE;
+
+        i++;
+        if(i >= n_lines)
+            return FALSE;
+
+        off = lines[i].beg;
+        line_end = lines[i].end;
+
+        if(attr_state == 0  ||  attr_state == 41)
+            attr_state = 1;
+
+        if(off >= max_end)
+            return FALSE;
+    }
+
+done:
+    if(off >= max_end)
+        return FALSE;
+
+    *p_end = off+1;
+    return TRUE;
+}
+
+static int
+md_scan_for_html_closer(MD_CTX* ctx, const MD_CHAR* str, MD_SIZE len,
+                        const MD_LINE* lines, int n_lines,
+                        OFF beg, OFF max_end, OFF* p_end,
+                        OFF* p_scan_horizon)
+{
+    OFF off = beg;
+    int i = 0;
+
+    if(off < *p_scan_horizon  &&  *p_scan_horizon >= max_end - len) {
+        /* We have already scanned the range up to the max_end so we know
+         * there is nothing to see. */
+        return FALSE;
+    }
+
+    while(TRUE) {
+        while(off + len <= lines[i].end  &&  off + len <= max_end) {
+            if(md_ascii_eq(STR(off), str, len)) {
+                /* Success. */
+                *p_end = off + len;
+                return TRUE;
+            }
+            off++;
+        }
+
+        i++;
+        if(off >= max_end  ||  i >= n_lines) {
+            /* Failure. */
+            *p_scan_horizon = off;
+            return FALSE;
+        }
+
+        off = lines[i].beg;
+    }
+}
+
+static int
+md_is_html_comment(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    MD_ASSERT(CH(beg) == _T('<'));
+
+    if(off + 4 >= lines[0].end)
+        return FALSE;
+    if(CH(off+1) != _T('!')  ||  CH(off+2) != _T('-')  ||  CH(off+3) != _T('-'))
+        return FALSE;
+    off += 4;
+
+    /* ">" and "->" must not follow the opening. */
+    if(off < lines[0].end  &&  CH(off) == _T('>'))
+        return FALSE;
+    if(off+1 < lines[0].end  &&  CH(off) == _T('-')  &&  CH(off+1) == _T('>'))
+        return FALSE;
+
+    /* HTML comment must not contyain "--", so we scan just for "--" instead
+     * of "-->" and verify manually that '>' follows. */
+    if(md_scan_for_html_closer(ctx, _T("--"), 2,
+                lines, n_lines, off, max_end, p_end, &ctx->html_comment_horizon))
+    {
+        if(*p_end < max_end  &&  CH(*p_end) == _T('>')) {
+            *p_end = *p_end + 1;
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static int
+md_is_html_processing_instruction(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    if(off + 2 >= lines[0].end)
+        return FALSE;
+    if(CH(off+1) != _T('?'))
+        return FALSE;
+    off += 2;
+
+    return md_scan_for_html_closer(ctx, _T("?>"), 2,
+                lines, n_lines, off, max_end, p_end, &ctx->html_proc_instr_horizon);
+}
+
+static int
+md_is_html_declaration(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    if(off + 2 >= lines[0].end)
+        return FALSE;
+    if(CH(off+1) != _T('!'))
+        return FALSE;
+    off += 2;
+
+    /* Declaration name. */
+    if(off >= lines[0].end  ||  !ISALPHA(off))
+        return FALSE;
+    off++;
+    while(off < lines[0].end  &&  ISALPHA(off))
+        off++;
+    if(off < lines[0].end  &&  !ISWHITESPACE(off))
+        return FALSE;
+
+    return md_scan_for_html_closer(ctx, _T(">"), 1,
+                lines, n_lines, off, max_end, p_end, &ctx->html_decl_horizon);
+}
+
+static int
+md_is_html_cdata(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    static const CHAR open_str[] = _T("<![CDATA[");
+    static const SZ open_size = SIZEOF_ARRAY(open_str) - 1;
+
+    OFF off = beg;
+
+    if(off + open_size >= lines[0].end)
+        return FALSE;
+    if(memcmp(STR(off), open_str, open_size) != 0)
+        return FALSE;
+    off += open_size;
+
+    if(lines[n_lines-1].end < max_end)
+        max_end = lines[n_lines-1].end - 2;
+
+    return md_scan_for_html_closer(ctx, _T("]]>"), 3,
+                lines, n_lines, off, max_end, p_end, &ctx->html_cdata_horizon);
+}
+
+static int
+md_is_html_any(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    MD_ASSERT(CH(beg) == _T('<'));
+    return (md_is_html_tag(ctx, lines, n_lines, beg, max_end, p_end)  ||
+            md_is_html_comment(ctx, lines, n_lines, beg, max_end, p_end)  ||
+            md_is_html_processing_instruction(ctx, lines, n_lines, beg, max_end, p_end)  ||
+            md_is_html_declaration(ctx, lines, n_lines, beg, max_end, p_end)  ||
+            md_is_html_cdata(ctx, lines, n_lines, beg, max_end, p_end));
+}
+
+
+/****************************
+ ***  Recognizing Entity  ***
+ ****************************/
+
+static int
+md_is_hex_entity_contents(MD_CTX* ctx, const CHAR* text, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    while(off < max_end  &&  ISXDIGIT_(text[off])  &&  off - beg <= 8)
+        off++;
+
+    if(1 <= off - beg  &&  off - beg <= 6) {
+        *p_end = off;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+static int
+md_is_dec_entity_contents(MD_CTX* ctx, const CHAR* text, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    while(off < max_end  &&  ISDIGIT_(text[off])  &&  off - beg <= 8)
+        off++;
+
+    if(1 <= off - beg  &&  off - beg <= 7) {
+        *p_end = off;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+static int
+md_is_named_entity_contents(MD_CTX* ctx, const CHAR* text, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    if(off < max_end  &&  ISALPHA_(text[off]))
+        off++;
+    else
+        return FALSE;
+
+    while(off < max_end  &&  ISALNUM_(text[off])  &&  off - beg <= 48)
+        off++;
+
+    if(2 <= off - beg  &&  off - beg <= 48) {
+        *p_end = off;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+static int
+md_is_entity_str(MD_CTX* ctx, const CHAR* text, OFF beg, OFF max_end, OFF* p_end)
+{
+    int is_contents;
+    OFF off = beg;
+
+    MD_ASSERT(text[off] == _T('&'));
+    off++;
+
+    if(off+2 < max_end  &&  text[off] == _T('#')  &&  (text[off+1] == _T('x') || text[off+1] == _T('X')))
+        is_contents = md_is_hex_entity_contents(ctx, text, off+2, max_end, &off);
+    else if(off+1 < max_end  &&  text[off] == _T('#'))
+        is_contents = md_is_dec_entity_contents(ctx, text, off+1, max_end, &off);
+    else
+        is_contents = md_is_named_entity_contents(ctx, text, off, max_end, &off);
+
+    if(is_contents  &&  off < max_end  &&  text[off] == _T(';')) {
+        *p_end = off+1;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+static inline int
+md_is_entity(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end)
+{
+    return md_is_entity_str(ctx, ctx->text, beg, max_end, p_end);
+}
+
+
+/******************************
+ ***  Attribute Management  ***
+ ******************************/
+
+typedef struct MD_ATTRIBUTE_BUILD_tag MD_ATTRIBUTE_BUILD;
+struct MD_ATTRIBUTE_BUILD_tag {
+    CHAR* text;
+    MD_TEXTTYPE* substr_types;
+    OFF* substr_offsets;
+    int substr_count;
+    int substr_alloc;
+    MD_TEXTTYPE trivial_types[1];
+    OFF trivial_offsets[2];
+};
+
+
+#define MD_BUILD_ATTR_NO_ESCAPES    0x0001
+
+static int
+md_build_attr_append_substr(MD_CTX* ctx, MD_ATTRIBUTE_BUILD* build,
+                            MD_TEXTTYPE type, OFF off)
+{
+    if(build->substr_count >= build->substr_alloc) {
+        MD_TEXTTYPE* new_substr_types;
+        OFF* new_substr_offsets;
+
+        build->substr_alloc = (build->substr_alloc == 0 ? 8 : build->substr_alloc * 2);
+
+        new_substr_types = (MD_TEXTTYPE*) realloc(build->substr_types,
+                                    build->substr_alloc * sizeof(MD_TEXTTYPE));
+        if(new_substr_types == NULL) {
+            MD_LOG("realloc() failed.");
+            return -1;
+        }
+        /* Note +1 to reserve space for final offset (== raw_size). */
+        new_substr_offsets = (OFF*) realloc(build->substr_offsets,
+                                    (build->substr_alloc+1) * sizeof(OFF));
+        if(new_substr_offsets == NULL) {
+            MD_LOG("realloc() failed.");
+            free(new_substr_types);
+            return -1;
+        }
+
+        build->substr_types = new_substr_types;
+        build->substr_offsets = new_substr_offsets;
+    }
+
+    build->substr_types[build->substr_count] = type;
+    build->substr_offsets[build->substr_count] = off;
+    build->substr_count++;
+    return 0;
+}
+
+static void
+md_free_attribute(MD_CTX* ctx, MD_ATTRIBUTE_BUILD* build)
+{
+    if(build->substr_alloc > 0) {
+        free(build->text);
+        free(build->substr_types);
+        free(build->substr_offsets);
+    }
+}
+
+static int
+md_build_attribute(MD_CTX* ctx, const CHAR* raw_text, SZ raw_size,
+                   unsigned flags, MD_ATTRIBUTE* attr, MD_ATTRIBUTE_BUILD* build)
+{
+    OFF raw_off, off;
+    int is_trivial;
+    int ret = 0;
+
+    memset(build, 0, sizeof(MD_ATTRIBUTE_BUILD));
+
+    /* If there is no backslash and no ampersand, build trivial attribute
+     * without any malloc(). */
+    is_trivial = TRUE;
+    for(raw_off = 0; raw_off < raw_size; raw_off++) {
+        if(ISANYOF3_(raw_text[raw_off], _T('\\'), _T('&'), _T('\0'))) {
+            is_trivial = FALSE;
+            break;
+        }
+    }
+
+    if(is_trivial) {
+        build->text = (CHAR*) (raw_size ? raw_text : NULL);
+        build->substr_types = build->trivial_types;
+        build->substr_offsets = build->trivial_offsets;
+        build->substr_count = 1;
+        build->substr_alloc = 0;
+        build->trivial_types[0] = MD_TEXT_NORMAL;
+        build->trivial_offsets[0] = 0;
+        build->trivial_offsets[1] = raw_size;
+        off = raw_size;
+    } else {
+        build->text = (CHAR*) malloc(raw_size * sizeof(CHAR));
+        if(build->text == NULL) {
+            MD_LOG("malloc() failed.");
+            goto abort;
+        }
+
+        raw_off = 0;
+        off = 0;
+
+        while(raw_off < raw_size) {
+            if(raw_text[raw_off] == _T('\0')) {
+                MD_CHECK(md_build_attr_append_substr(ctx, build, MD_TEXT_NULLCHAR, off));
+                memcpy(build->text + off, raw_text + raw_off, 1);
+                off++;
+                raw_off++;
+                continue;
+            }
+
+            if(raw_text[raw_off] == _T('&')) {
+                OFF ent_end;
+
+                if(md_is_entity_str(ctx, raw_text, raw_off, raw_size, &ent_end)) {
+                    MD_CHECK(md_build_attr_append_substr(ctx, build, MD_TEXT_ENTITY, off));
+                    memcpy(build->text + off, raw_text + raw_off, ent_end - raw_off);
+                    off += ent_end - raw_off;
+                    raw_off = ent_end;
+                    continue;
+                }
+            }
+
+            if(build->substr_count == 0  ||  build->substr_types[build->substr_count-1] != MD_TEXT_NORMAL)
+                MD_CHECK(md_build_attr_append_substr(ctx, build, MD_TEXT_NORMAL, off));
+
+            if(!(flags & MD_BUILD_ATTR_NO_ESCAPES)  &&
+               raw_text[raw_off] == _T('\\')  &&  raw_off+1 < raw_size  &&
+               (ISPUNCT_(raw_text[raw_off+1]) || ISNEWLINE_(raw_text[raw_off+1])))
+                raw_off++;
+
+            build->text[off++] = raw_text[raw_off++];
+        }
+        build->substr_offsets[build->substr_count] = off;
+    }
+
+    attr->text = build->text;
+    attr->size = off;
+    attr->substr_offsets = build->substr_offsets;
+    attr->substr_types = build->substr_types;
+    return 0;
+
+abort:
+    md_free_attribute(ctx, build);
+    return -1;
+}
+
+
+/*********************************************
+ ***  Dictionary of Reference Definitions  ***
+ *********************************************/
+
+#define MD_FNV1A_BASE       2166136261
+#define MD_FNV1A_PRIME      16777619
+
+static inline unsigned
+md_fnv1a(unsigned base, const void* data, size_t n)
+{
+    const unsigned char* buf = (const unsigned char*) data;
+    unsigned hash = base;
+    size_t i;
+
+    for(i = 0; i < n; i++) {
+        hash ^= buf[i];
+        hash *= MD_FNV1A_PRIME;
+    }
+
+    return hash;
+}
+
+
+struct MD_REF_DEF_tag {
+    CHAR* label;
+    CHAR* title;
+    unsigned hash;
+    SZ label_size                   : 24;
+    unsigned label_needs_free       :  1;
+    unsigned title_needs_free       :  1;
+    SZ title_size;
+    OFF dest_beg;
+    OFF dest_end;
+};
+
+/* Label equivalence is quite complicated with regards to whitespace and case
+ * folding. This complicates computing a hash of it as well as direct comparison
+ * of two labels. */
+
+static unsigned
+md_link_label_hash(const CHAR* label, SZ size)
+{
+    unsigned hash = MD_FNV1A_BASE;
+    OFF off;
+    unsigned codepoint;
+    int is_whitespace = FALSE;
+
+    off = md_skip_unicode_whitespace(label, 0, size);
+    while(off < size) {
+        SZ char_size;
+
+        codepoint = md_decode_unicode(label, off, size, &char_size);
+        is_whitespace = ISUNICODEWHITESPACE_(codepoint) || ISNEWLINE_(label[off]);
+
+        if(is_whitespace) {
+            codepoint = ' ';
+            hash = md_fnv1a(hash, &codepoint, sizeof(unsigned));
+            off = md_skip_unicode_whitespace(label, off, size);
+        } else {
+            MD_UNICODE_FOLD_INFO fold_info;
+
+            md_get_unicode_fold_info(codepoint, &fold_info);
+            hash = md_fnv1a(hash, fold_info.codepoints, fold_info.n_codepoints * sizeof(unsigned));
+            off += char_size;
+        }
+    }
+
+    return hash;
+}
+
+static OFF
+md_link_label_cmp_load_fold_info(const CHAR* label, OFF off, SZ size,
+                                 MD_UNICODE_FOLD_INFO* fold_info)
+{
+    unsigned codepoint;
+    SZ char_size;
+
+    if(off >= size) {
+        /* Treat end of link label as a whitespace. */
+        goto whitespace;
+    }
+
+    if(ISNEWLINE_(label[off])) {
+        /* Treat new lines as a whitespace. */
+        off++;
+        goto whitespace;
+    }
+
+    codepoint = md_decode_unicode(label, off, size, &char_size);
+    off += char_size;
+    if(ISUNICODEWHITESPACE_(codepoint)) {
+        /* Treat all whitespace as equivalent */
+        goto whitespace;
+    }
+
+    /* Get real folding info. */
+    md_get_unicode_fold_info(codepoint, fold_info);
+    return off;
+
+whitespace:
+    fold_info->codepoints[0] = _T(' ');
+    fold_info->n_codepoints = 1;
+    return off;
+}
+
+static int
+md_link_label_cmp(const CHAR* a_label, SZ a_size, const CHAR* b_label, SZ b_size)
+{
+    OFF a_off;
+    OFF b_off;
+    int a_reached_end = FALSE;
+    int b_reached_end = FALSE;
+    MD_UNICODE_FOLD_INFO a_fi = { 0 };
+    MD_UNICODE_FOLD_INFO b_fi = { 0 };
+    OFF a_fi_off = 0;
+    OFF b_fi_off = 0;
+    int cmp;
+
+    a_off = md_skip_unicode_whitespace(a_label, 0, a_size);
+    b_off = md_skip_unicode_whitespace(b_label, 0, b_size);
+    while(!a_reached_end  &&  !b_reached_end) {
+        /* If needed, load fold info for next char. */
+        if(a_fi_off >= a_fi.n_codepoints) {
+            a_fi_off = 0;
+            a_off = md_link_label_cmp_load_fold_info(a_label, a_off, a_size, &a_fi);
+            a_reached_end = (a_off >= a_size);
+        }
+        if(b_fi_off >= b_fi.n_codepoints) {
+            b_fi_off = 0;
+            b_off = md_link_label_cmp_load_fold_info(b_label, b_off, b_size, &b_fi);
+            b_reached_end = (b_off >= b_size);
+        }
+
+        cmp = b_fi.codepoints[b_fi_off] - a_fi.codepoints[a_fi_off];
+        if(cmp != 0)
+            return cmp;
+
+        a_fi_off++;
+        b_fi_off++;
+    }
+
+    return 0;
+}
+
+typedef struct MD_REF_DEF_LIST_tag MD_REF_DEF_LIST;
+struct MD_REF_DEF_LIST_tag {
+    int n_ref_defs;
+    int alloc_ref_defs;
+    MD_REF_DEF* ref_defs[];  /* Valid items always  point into ctx->ref_defs[] */
+};
+
+static int
+md_ref_def_cmp(const void* a, const void* b)
+{
+    const MD_REF_DEF* a_ref = *(const MD_REF_DEF**)a;
+    const MD_REF_DEF* b_ref = *(const MD_REF_DEF**)b;
+
+    if(a_ref->hash < b_ref->hash)
+        return -1;
+    else if(a_ref->hash > b_ref->hash)
+        return +1;
+    else
+        return md_link_label_cmp(a_ref->label, a_ref->label_size, b_ref->label, b_ref->label_size);
+}
+
+static int
+md_ref_def_cmp_stable(const void* a, const void* b)
+{
+    int cmp;
+
+    cmp = md_ref_def_cmp(a, b);
+
+    /* Ensure stability of the sorting. */
+    if(cmp == 0) {
+        const MD_REF_DEF* a_ref = *(const MD_REF_DEF**)a;
+        const MD_REF_DEF* b_ref = *(const MD_REF_DEF**)b;
+
+        if(a_ref < b_ref)
+            cmp = -1;
+        else if(a_ref > b_ref)
+            cmp = +1;
+        else
+            cmp = 0;
+    }
+
+    return cmp;
+}
+
+static int
+md_build_ref_def_hashtable(MD_CTX* ctx)
+{
+    int i, j;
+
+    if(ctx->n_ref_defs == 0)
+        return 0;
+
+    ctx->ref_def_hashtable_size = (ctx->n_ref_defs * 5) / 4;
+    ctx->ref_def_hashtable = malloc(ctx->ref_def_hashtable_size * sizeof(void*));
+    if(ctx->ref_def_hashtable == NULL) {
+        MD_LOG("malloc() failed.");
+        goto abort;
+    }
+    memset(ctx->ref_def_hashtable, 0, ctx->ref_def_hashtable_size * sizeof(void*));
+
+    /* Each member of ctx->ref_def_hashtable[] can be:
+     *  -- NULL,
+     *  -- pointer to the MD_REF_DEF in ctx->ref_defs[], or
+     *  -- pointer to a MD_REF_DEF_LIST, which holds multiple pointers to
+     *     such MD_REF_DEFs.
+     */
+    for(i = 0; i < ctx->n_ref_defs; i++) {
+        MD_REF_DEF* def = &ctx->ref_defs[i];
+        void* bucket;
+        MD_REF_DEF_LIST* list;
+
+        def->hash = md_link_label_hash(def->label, def->label_size);
+        bucket = ctx->ref_def_hashtable[def->hash % ctx->ref_def_hashtable_size];
+
+        if(bucket == NULL) {
+            ctx->ref_def_hashtable[def->hash % ctx->ref_def_hashtable_size] = def;
+            continue;
+        }
+
+        if(ctx->ref_defs <= (MD_REF_DEF*) bucket  &&  (MD_REF_DEF*) bucket < ctx->ref_defs + ctx->n_ref_defs) {
+            /* The bucket already contains one ref. def. Lets see whether it
+             * is the same label (ref. def. duplicate) or different one
+             * (hash conflict). */
+            MD_REF_DEF* old_def = (MD_REF_DEF*) bucket;
+
+            if(md_link_label_cmp(def->label, def->label_size, old_def->label, old_def->label_size) == 0) {
+                /* Ignore this ref. def. */
+                continue;
+            }
+
+            /* Make the bucket capable of holding more ref. defs. */
+            list = (MD_REF_DEF_LIST*) malloc(sizeof(MD_REF_DEF_LIST) + 4 * sizeof(MD_REF_DEF));
+            if(list == NULL) {
+                MD_LOG("malloc() failed.");
+                goto abort;
+            }
+            list->ref_defs[0] = old_def;
+            list->ref_defs[1] = def;
+            list->n_ref_defs = 2;
+            list->alloc_ref_defs = 4;
+            ctx->ref_def_hashtable[def->hash % ctx->ref_def_hashtable_size] = list;
+            continue;
+        }
+
+        /* Append the def to the bucket list. */
+        list = (MD_REF_DEF_LIST*) bucket;
+        if(list->n_ref_defs >= list->alloc_ref_defs) {
+            MD_REF_DEF_LIST* list_tmp = (MD_REF_DEF_LIST*) realloc(list,
+                        sizeof(MD_REF_DEF_LIST) + 2 * list->alloc_ref_defs * sizeof(MD_REF_DEF));
+            if(list_tmp == NULL) {
+                MD_LOG("realloc() failed.");
+                goto abort;
+            }
+            list = list_tmp;
+            list->alloc_ref_defs *= 2;
+            ctx->ref_def_hashtable[def->hash % ctx->ref_def_hashtable_size] = list;
+        }
+
+        list->ref_defs[list->n_ref_defs] = def;
+        list->n_ref_defs++;
+    }
+
+    /* Sort the complex buckets so we can use bsearch() with them. */
+    for(i = 0; i < ctx->ref_def_hashtable_size; i++) {
+        void* bucket = ctx->ref_def_hashtable[i];
+        MD_REF_DEF_LIST* list;
+
+        if(bucket == NULL)
+            continue;
+        if(ctx->ref_defs <= (MD_REF_DEF*) bucket  &&  (MD_REF_DEF*) bucket < ctx->ref_defs + ctx->n_ref_defs)
+            continue;
+
+        list = (MD_REF_DEF_LIST*) bucket;
+        qsort(list->ref_defs, list->n_ref_defs, sizeof(MD_REF_DEF*), md_ref_def_cmp_stable);
+
+        /* Disable duplicates. */
+        for(j = 1; j < list->n_ref_defs; j++) {
+            if(md_ref_def_cmp(&list->ref_defs[j-1], &list->ref_defs[j]) == 0)
+                list->ref_defs[j] = list->ref_defs[j-1];
+        }
+    }
+
+    return 0;
+
+abort:
+    return -1;
+}
+
+static void
+md_free_ref_def_hashtable(MD_CTX* ctx)
+{
+    if(ctx->ref_def_hashtable != NULL) {
+        int i;
+
+        for(i = 0; i < ctx->ref_def_hashtable_size; i++) {
+            void* bucket = ctx->ref_def_hashtable[i];
+            if(bucket == NULL)
+                continue;
+            if(ctx->ref_defs <= (MD_REF_DEF*) bucket  &&  (MD_REF_DEF*) bucket < ctx->ref_defs + ctx->n_ref_defs)
+                continue;
+            free(bucket);
+        }
+
+        free(ctx->ref_def_hashtable);
+    }
+}
+
+static const MD_REF_DEF*
+md_lookup_ref_def(MD_CTX* ctx, const CHAR* label, SZ label_size)
+{
+    unsigned hash;
+    void* bucket;
+
+    if(ctx->ref_def_hashtable_size == 0)
+        return NULL;
+
+    hash = md_link_label_hash(label, label_size);
+    bucket = ctx->ref_def_hashtable[hash % ctx->ref_def_hashtable_size];
+
+    if(bucket == NULL) {
+        return NULL;
+    } else if(ctx->ref_defs <= (MD_REF_DEF*) bucket  &&  (MD_REF_DEF*) bucket < ctx->ref_defs + ctx->n_ref_defs) {
+        const MD_REF_DEF* def = (MD_REF_DEF*) bucket;
+
+        if(md_link_label_cmp(def->label, def->label_size, label, label_size) == 0)
+            return def;
+        else
+            return NULL;
+    } else {
+        MD_REF_DEF_LIST* list = (MD_REF_DEF_LIST*) bucket;
+        MD_REF_DEF key_buf;
+        const MD_REF_DEF* key = &key_buf;
+        const MD_REF_DEF** ret;
+
+        key_buf.label = (CHAR*) label;
+        key_buf.label_size = label_size;
+        key_buf.hash = md_link_label_hash(key_buf.label, key_buf.label_size);
+
+        ret = (const MD_REF_DEF**) bsearch(&key, list->ref_defs,
+                    list->n_ref_defs, sizeof(MD_REF_DEF*), md_ref_def_cmp);
+        if(ret != NULL)
+            return *ret;
+        else
+            return NULL;
+    }
+}
+
+
+/***************************
+ ***  Recognizing Links  ***
+ ***************************/
+
+/* Note this code is partially shared between processing inlines and blocks
+ * as reference definitions and links share some helper parser functions.
+ */
+
+typedef struct MD_LINK_ATTR_tag MD_LINK_ATTR;
+struct MD_LINK_ATTR_tag {
+    OFF dest_beg;
+    OFF dest_end;
+
+    CHAR* title;
+    SZ title_size;
+    int title_needs_free;
+};
+
+
+static int
+md_is_link_label(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg,
+                 OFF* p_end, int* p_beg_line_index, int* p_end_line_index,
+                 OFF* p_contents_beg, OFF* p_contents_end)
+{
+    OFF off = beg;
+    OFF contents_beg = 0;
+    OFF contents_end = 0;
+    int line_index = 0;
+    int len = 0;
+
+    if(CH(off) != _T('['))
+        return FALSE;
+    off++;
+
+    while(1) {
+        OFF line_end = lines[line_index].end;
+
+        while(off < line_end) {
+            if(CH(off) == _T('\\')  &&  off+1 < ctx->size  &&  (ISPUNCT(off+1) || ISNEWLINE(off+1))) {
+                if(contents_end == 0) {
+                    contents_beg = off;
+                    *p_beg_line_index = line_index;
+                }
+                contents_end = off + 2;
+                off += 2;
+            } else if(CH(off) == _T('[')) {
+                return FALSE;
+            } else if(CH(off) == _T(']')) {
+                if(contents_beg < contents_end) {
+                    /* Success. */
+                    *p_contents_beg = contents_beg;
+                    *p_contents_end = contents_end;
+                    *p_end = off+1;
+                    *p_end_line_index = line_index;
+                    return TRUE;
+                } else {
+                    /* Link label must have some non-whitespace contents. */
+                    return FALSE;
+                }
+            } else {
+                unsigned codepoint;
+                SZ char_size;
+
+                codepoint = md_decode_unicode(ctx->text, off, ctx->size, &char_size);
+                if(!ISUNICODEWHITESPACE_(codepoint)) {
+                    if(contents_end == 0) {
+                        contents_beg = off;
+                        *p_beg_line_index = line_index;
+                    }
+                    contents_end = off + char_size;
+                }
+
+                off += char_size;
+            }
+
+            len++;
+            if(len > 999)
+                return FALSE;
+        }
+
+        line_index++;
+        len++;
+        if(line_index < n_lines)
+            off = lines[line_index].beg;
+        else
+            break;
+    }
+
+    return FALSE;
+}
+
+static int
+md_is_link_destination_A(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end,
+                         OFF* p_contents_beg, OFF* p_contents_end)
+{
+    OFF off = beg;
+
+    if(off >= max_end  ||  CH(off) != _T('<'))
+        return FALSE;
+    off++;
+
+    while(off < max_end) {
+        if(CH(off) == _T('\\')  &&  off+1 < max_end  &&  ISPUNCT(off+1)) {
+            off += 2;
+            continue;
+        }
+
+        if(ISNEWLINE(off)  ||  CH(off) == _T('<'))
+            return FALSE;
+
+        if(CH(off) == _T('>')) {
+            /* Success. */
+            *p_contents_beg = beg+1;
+            *p_contents_end = off;
+            *p_end = off+1;
+            return TRUE;
+        }
+
+        off++;
+    }
+
+    return FALSE;
+}
+
+static int
+md_is_link_destination_B(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end,
+                         OFF* p_contents_beg, OFF* p_contents_end)
+{
+    OFF off = beg;
+    int parenthesis_level = 0;
+
+    while(off < max_end) {
+        if(CH(off) == _T('\\')  &&  off+1 < max_end  &&  ISPUNCT(off+1)) {
+            off += 2;
+            continue;
+        }
+
+        if(ISWHITESPACE(off) || ISCNTRL(off))
+            break;
+
+        /* Link destination may include balanced pairs of unescaped '(' ')'.
+         * Note we limit the maximal nesting level by 32 to protect us from
+         * https://github.com/jgm/cmark/issues/214 */
+        if(CH(off) == _T('(')) {
+            parenthesis_level++;
+            if(parenthesis_level > 32)
+                return FALSE;
+        } else if(CH(off) == _T(')')) {
+            if(parenthesis_level == 0)
+                break;
+            parenthesis_level--;
+        }
+
+        off++;
+    }
+
+    if(parenthesis_level != 0  ||  off == beg)
+        return FALSE;
+
+    /* Success. */
+    *p_contents_beg = beg;
+    *p_contents_end = off;
+    *p_end = off;
+    return TRUE;
+}
+
+static inline int
+md_is_link_destination(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end,
+                       OFF* p_contents_beg, OFF* p_contents_end)
+{
+    if(CH(beg) == _T('<'))
+        return md_is_link_destination_A(ctx, beg, max_end, p_end, p_contents_beg, p_contents_end);
+    else
+        return md_is_link_destination_B(ctx, beg, max_end, p_end, p_contents_beg, p_contents_end);
+}
+
+static int
+md_is_link_title(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg,
+                 OFF* p_end, int* p_beg_line_index, int* p_end_line_index,
+                 OFF* p_contents_beg, OFF* p_contents_end)
+{
+    OFF off = beg;
+    CHAR closer_char;
+    int line_index = 0;
+
+    /* White space with up to one line break. */
+    while(off < lines[line_index].end  &&  ISWHITESPACE(off))
+        off++;
+    if(off >= lines[line_index].end) {
+        line_index++;
+        if(line_index >= n_lines)
+            return FALSE;
+        off = lines[line_index].beg;
+    }
+    if(off == beg)
+        return FALSE;
+
+    *p_beg_line_index = line_index;
+
+    /* First char determines how to detect end of it. */
+    switch(CH(off)) {
+        case _T('"'):   closer_char = _T('"'); break;
+        case _T('\''):  closer_char = _T('\''); break;
+        case _T('('):   closer_char = _T(')'); break;
+        default:        return FALSE;
+    }
+    off++;
+
+    *p_contents_beg = off;
+
+    while(line_index < n_lines) {
+        OFF line_end = lines[line_index].end;
+
+        while(off < line_end) {
+            if(CH(off) == _T('\\')  &&  off+1 < ctx->size  &&  (ISPUNCT(off+1) || ISNEWLINE(off+1))) {
+                off++;
+            } else if(CH(off) == closer_char) {
+                /* Success. */
+                *p_contents_end = off;
+                *p_end = off+1;
+                *p_end_line_index = line_index;
+                return TRUE;
+            } else if(closer_char == _T(')')  &&  CH(off) == _T('(')) {
+                /* ()-style title cannot contain (unescaped '(')) */
+                return FALSE;
+            }
+
+            off++;
+        }
+
+        line_index++;
+    }
+
+    return FALSE;
+}
+
+/* Returns 0 if it is not a reference definition.
+ *
+ * Returns N > 0 if it is a reference definition. N then corresponds to the
+ * number of lines forming it). In this case the definition is stored for
+ * resolving any links referring to it.
+ *
+ * Returns -1 in case of an error (out of memory).
+ */
+static int
+md_is_link_reference_definition(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
+{
+    OFF label_contents_beg;
+    OFF label_contents_end;
+    int label_contents_line_index = -1;
+    int label_is_multiline;
+    CHAR* label;
+    SZ label_size;
+    int label_needs_free = FALSE;
+    OFF dest_contents_beg;
+    OFF dest_contents_end;
+    OFF title_contents_beg;
+    OFF title_contents_end;
+    int title_contents_line_index;
+    int title_is_multiline;
+    OFF off;
+    int line_index = 0;
+    int tmp_line_index;
+    MD_REF_DEF* def;
+    int ret;
+
+    /* Link label. */
+    if(!md_is_link_label(ctx, lines, n_lines, lines[0].beg,
+                &off, &label_contents_line_index, &line_index,
+                &label_contents_beg, &label_contents_end))
+        return FALSE;
+    label_is_multiline = (label_contents_line_index != line_index);
+
+    /* Colon. */
+    if(off >= lines[line_index].end  ||  CH(off) != _T(':'))
+        return FALSE;
+    off++;
+
+    /* Optional white space with up to one line break. */
+    while(off < lines[line_index].end  &&  ISWHITESPACE(off))
+        off++;
+    if(off >= lines[line_index].end) {
+        line_index++;
+        if(line_index >= n_lines)
+            return FALSE;
+        off = lines[line_index].beg;
+    }
+
+    /* Link destination. */
+    if(!md_is_link_destination(ctx, off, lines[line_index].end,
+                &off, &dest_contents_beg, &dest_contents_end))
+        return FALSE;
+
+    /* (Optional) title. Note we interpret it as an title only if nothing
+     * more follows on its last line. */
+    if(md_is_link_title(ctx, lines + line_index, n_lines - line_index, off,
+                &off, &title_contents_line_index, &tmp_line_index,
+                &title_contents_beg, &title_contents_end)
+        &&  off >= lines[line_index + tmp_line_index].end)
+    {
+        title_is_multiline = (tmp_line_index != title_contents_line_index);
+        title_contents_line_index += line_index;
+        line_index += tmp_line_index;
+    } else {
+        /* Not a title. */
+        title_is_multiline = FALSE;
+        title_contents_beg = off;
+        title_contents_end = off;
+        title_contents_line_index = 0;
+    }
+
+    /* Nothing more can follow on the last line. */
+    if(off < lines[line_index].end)
+        return FALSE;
+
+    /* Construct label. */
+    if(!label_is_multiline) {
+        label = (CHAR*) STR(label_contents_beg);
+        label_size = label_contents_end - label_contents_beg;
+        label_needs_free = FALSE;
+    } else {
+        MD_CHECK(md_merge_lines_alloc(ctx, label_contents_beg, label_contents_end,
+                    lines + label_contents_line_index, n_lines - label_contents_line_index,
+                    _T(' '), &label, &label_size));
+        label_needs_free = TRUE;
+    }
+
+    /* Store the reference definition. */
+    if(ctx->n_ref_defs >= ctx->alloc_ref_defs) {
+        MD_REF_DEF* new_defs;
+
+        ctx->alloc_ref_defs = (ctx->alloc_ref_defs > 0 ? ctx->alloc_ref_defs * 2 : 16);
+        new_defs = (MD_REF_DEF*) realloc(ctx->ref_defs, ctx->alloc_ref_defs * sizeof(MD_REF_DEF));
+        if(new_defs == NULL) {
+            MD_LOG("realloc() failed.");
+            ret = -1;
+            goto abort;
+        }
+
+        ctx->ref_defs = new_defs;
+    }
+
+    def = &ctx->ref_defs[ctx->n_ref_defs];
+    memset(def, 0, sizeof(MD_REF_DEF));
+
+    def->label = label;
+    def->label_size = label_size;
+    def->label_needs_free = label_needs_free;
+
+    def->dest_beg = dest_contents_beg;
+    def->dest_end = dest_contents_end;
+
+    if(title_contents_beg >= title_contents_end) {
+        def->title = NULL;
+        def->title_size = 0;
+    } else if(!title_is_multiline) {
+        def->title = (CHAR*) STR(title_contents_beg);
+        def->title_size = title_contents_end - title_contents_beg;
+    } else {
+        MD_CHECK(md_merge_lines_alloc(ctx, title_contents_beg, title_contents_end,
+                    lines + title_contents_line_index, n_lines - title_contents_line_index,
+                    _T('\n'), &def->title, &def->title_size));
+        def->title_needs_free = TRUE;
+    }
+
+    /* Success. */
+    ctx->n_ref_defs++;
+    return line_index + 1;
+
+abort:
+    /* Failure. */
+    if(label_needs_free)
+        free(label);
+    return -1;
+}
+
+static int
+md_is_link_reference(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                     OFF beg, OFF end, MD_LINK_ATTR* attr)
+{
+    const MD_REF_DEF* def;
+    const MD_LINE* beg_line;
+    const MD_LINE* end_line;
+    CHAR* label;
+    SZ label_size;
+    int ret;
+
+    MD_ASSERT(CH(beg) == _T('[') || CH(beg) == _T('!'));
+    MD_ASSERT(CH(end-1) == _T(']'));
+
+    beg += (CH(beg) == _T('!') ? 2 : 1);
+    end--;
+
+    /* Find lines corresponding to the beg and end positions. */
+    MD_ASSERT(lines[0].beg <= beg);
+    beg_line = lines;
+    while(beg >= beg_line->end)
+        beg_line++;
+
+    MD_ASSERT(end <= lines[n_lines-1].end);
+    end_line = beg_line;
+    while(end >= end_line->end)
+        end_line++;
+
+    if(beg_line != end_line) {
+        MD_CHECK(md_merge_lines_alloc(ctx, beg, end, beg_line,
+                 n_lines - (beg_line - lines), _T(' '), &label, &label_size));
+    } else {
+        label = (CHAR*) STR(beg);
+        label_size = end - beg;
+    }
+
+    def = md_lookup_ref_def(ctx, label, label_size);
+    if(def != NULL) {
+        attr->dest_beg = def->dest_beg;
+        attr->dest_end = def->dest_end;
+        attr->title = def->title;
+        attr->title_size = def->title_size;
+        attr->title_needs_free = FALSE;
+    }
+
+    if(beg_line != end_line)
+        free(label);
+
+    ret = (def != NULL);
+
+abort:
+    return ret;
+}
+
+static int
+md_is_inline_link_spec(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                       OFF beg, OFF* p_end, MD_LINK_ATTR* attr)
+{
+    int line_index = 0;
+    int tmp_line_index;
+    OFF title_contents_beg;
+    OFF title_contents_end;
+    int title_contents_line_index;
+    int title_is_multiline;
+    OFF off = beg;
+    int ret = FALSE;
+
+    while(off >= lines[line_index].end)
+        line_index++;
+
+    MD_ASSERT(CH(off) == _T('('));
+    off++;
+
+    /* Optional white space with up to one line break. */
+    while(off < lines[line_index].end  &&  ISWHITESPACE(off))
+        off++;
+    if(off >= lines[line_index].end  &&  ISNEWLINE(off)) {
+        line_index++;
+        if(line_index >= n_lines)
+            return FALSE;
+        off = lines[line_index].beg;
+    }
+
+    /* Link destination may be omitted, but only when not also having a title. */
+    if(off < ctx->size  &&  CH(off) == _T(')')) {
+        attr->dest_beg = off;
+        attr->dest_end = off;
+        attr->title = NULL;
+        attr->title_size = 0;
+        attr->title_needs_free = FALSE;
+        off++;
+        *p_end = off;
+        return TRUE;
+    }
+
+    /* Link destination. */
+    if(!md_is_link_destination(ctx, off, lines[line_index].end,
+                        &off, &attr->dest_beg, &attr->dest_end))
+        return FALSE;
+
+    /* (Optional) title. */
+    if(md_is_link_title(ctx, lines + line_index, n_lines - line_index, off,
+                &off, &title_contents_line_index, &tmp_line_index,
+                &title_contents_beg, &title_contents_end))
+    {
+        title_is_multiline = (tmp_line_index != title_contents_line_index);
+        title_contents_line_index += line_index;
+        line_index += tmp_line_index;
+    } else {
+        /* Not a title. */
+        title_is_multiline = FALSE;
+        title_contents_beg = off;
+        title_contents_end = off;
+        title_contents_line_index = 0;
+    }
+
+    /* Optional whitespace followed with final ')'. */
+    while(off < lines[line_index].end  &&  ISWHITESPACE(off))
+        off++;
+    if(off >= lines[line_index].end  &&  ISNEWLINE(off)) {
+        line_index++;
+        if(line_index >= n_lines)
+            return FALSE;
+        off = lines[line_index].beg;
+    }
+    if(CH(off) != _T(')'))
+        goto abort;
+    off++;
+
+    if(title_contents_beg >= title_contents_end) {
+        attr->title = NULL;
+        attr->title_size = 0;
+        attr->title_needs_free = FALSE;
+    } else if(!title_is_multiline) {
+        attr->title = (CHAR*) STR(title_contents_beg);
+        attr->title_size = title_contents_end - title_contents_beg;
+        attr->title_needs_free = FALSE;
+    } else {
+        MD_CHECK(md_merge_lines_alloc(ctx, title_contents_beg, title_contents_end,
+                    lines + title_contents_line_index, n_lines - title_contents_line_index,
+                    _T('\n'), &attr->title, &attr->title_size));
+        attr->title_needs_free = TRUE;
+    }
+
+    *p_end = off;
+    ret = TRUE;
+
+abort:
+    return ret;
+}
+
+static void
+md_free_ref_defs(MD_CTX* ctx)
+{
+    int i;
+
+    for(i = 0; i < ctx->n_ref_defs; i++) {
+        MD_REF_DEF* def = &ctx->ref_defs[i];
+
+        if(def->label_needs_free)
+            free(def->label);
+        if(def->title_needs_free)
+            free(def->title);
+    }
+
+    free(ctx->ref_defs);
+}
+
+
+/******************************************
+ ***  Processing Inlines (a.k.a Spans)  ***
+ ******************************************/
+
+/* We process inlines in few phases:
+ *
+ * (1) We go through the block text and collect all significant characters
+ *     which may start/end a span or some other significant position into
+ *     ctx->marks[]. Core of this is what md_collect_marks() does.
+ *
+ *     We also do some very brief preliminary context-less analysis, whether
+ *     it might be opener or closer (e.g. of an emphasis span).
+ *
+ *     This speeds the other steps as we do not need to re-iterate over all
+ *     characters anymore.
+ *
+ * (2) We analyze each potential mark types, in order by their precedence.
+ *
+ *     In each md_analyze_XXX() function, we re-iterate list of the marks,
+ *     skipping already resolved regions (in preceding precedences) and try to
+ *     resolve them.
+ *
+ * (2.1) For trivial marks, which are single (e.g. HTML entity), we just mark
+ *       them as resolved.
+ *
+ * (2.2) For range-type marks, we analyze whether the mark could be closer
+ *       and, if yes, whether there is some preceding opener it could satisfy.
+ *
+ *       If not we check whether it could be really an opener and if yes, we
+ *       remember it so subsequent closers may resolve it.
+ *
+ * (3) Finally, when all marks were analyzed, we render the block contents
+ *     by calling MD_RENDERER::text() callback, interrupting by ::enter_span()
+ *     or ::close_span() whenever we reach a resolved mark.
+ */
+
+
+/* The mark structure.
+ *
+ * '\\': Maybe escape sequence.
+ * '\0': NULL char.
+ *  '*': Maybe (strong) emphasis start/end.
+ *  '_': Maybe (strong) emphasis start/end.
+ *  '~': Maybe strikethrough start/end (needs MD_FLAG_STRIKETHROUGH).
+ *  '`': Maybe code span start/end.
+ *  '&': Maybe start of entity.
+ *  ';': Maybe end of entity.
+ *  '<': Maybe start of raw HTML or autolink.
+ *  '>': Maybe end of raw HTML or autolink.
+ *  '[': Maybe start of link label or link text.
+ *  '!': Equivalent of '[' for image.
+ *  ']': Maybe end of link label or link text.
+ *  '@': Maybe permissive e-mail auto-link (needs MD_FLAG_PERMISSIVEEMAILAUTOLINKS).
+ *  ':': Maybe permissive URL auto-link (needs MD_FLAG_PERMISSIVEURLAUTOLINKS).
+ *  '.': Maybe permissive WWW auto-link (needs MD_FLAG_PERMISSIVEWWWAUTOLINKS).
+ *  'D': Dummy mark, it reserves a space for splitting a previous mark
+ *       (e.g. emphasis) or to make more space for storing some special data
+ *       related to the preceding mark (e.g. link).
+ *
+ * Note that not all instances of these chars in the text imply creation of the
+ * structure. Only those which have (or may have, after we see more context)
+ * the special meaning.
+ *
+ * (Keep this struct as small as possible to fit as much of them into CPU
+ * cache line.)
+ */
+struct MD_MARK_tag {
+    OFF beg;
+    OFF end;
+
+    /* For unresolved openers, 'prev' and 'next' form the chain of open openers
+     * of given type 'ch'.
+     *
+     * During resolving, we disconnect from the chain and point to the
+     * corresponding counterpart so opener points to its closer and vice versa.
+     */
+    int prev;
+    int next;
+    CHAR ch;
+    unsigned char flags;
+};
+
+/* Mark flags (these apply to ALL mark types). */
+#define MD_MARK_POTENTIAL_OPENER            0x01  /* Maybe opener. */
+#define MD_MARK_POTENTIAL_CLOSER            0x02  /* Maybe closer. */
+#define MD_MARK_OPENER                      0x04  /* Definitely opener. */
+#define MD_MARK_CLOSER                      0x08  /* Definitely closer. */
+#define MD_MARK_RESOLVED                    0x10  /* Resolved in any definite way. */
+
+/* Mark flags specific for various mark types (so they can share bits). */
+#define MD_MARK_EMPH_INTRAWORD              0x20  /* Helper for the "rule of 3". */
+#define MD_MARK_EMPH_MOD3_0                 0x40
+#define MD_MARK_EMPH_MOD3_1                 0x80
+#define MD_MARK_EMPH_MOD3_2                 (0x40 | 0x80)
+#define MD_MARK_EMPH_MOD3_MASK              (0x40 | 0x80)
+#define MD_MARK_AUTOLINK                    0x20  /* Distinguisher for '<', '>'. */
+#define MD_MARK_VALIDPERMISSIVEAUTOLINK     0x20  /* For permissive autolinks. */
+
+static MD_MARKCHAIN*
+md_asterisk_chain(MD_CTX* ctx, unsigned flags)
+{
+    switch(flags & (MD_MARK_EMPH_INTRAWORD | MD_MARK_EMPH_MOD3_MASK)) {
+        case MD_MARK_EMPH_INTRAWORD | MD_MARK_EMPH_MOD3_0:  return &ASTERISK_OPENERS_intraword_mod3_0;
+        case MD_MARK_EMPH_INTRAWORD | MD_MARK_EMPH_MOD3_1:  return &ASTERISK_OPENERS_intraword_mod3_1;
+        case MD_MARK_EMPH_INTRAWORD | MD_MARK_EMPH_MOD3_2:  return &ASTERISK_OPENERS_intraword_mod3_2;
+        case MD_MARK_EMPH_MOD3_0:                           return &ASTERISK_OPENERS_extraword_mod3_0;
+        case MD_MARK_EMPH_MOD3_1:                           return &ASTERISK_OPENERS_extraword_mod3_1;
+        case MD_MARK_EMPH_MOD3_2:                           return &ASTERISK_OPENERS_extraword_mod3_2;
+        default:                                            MD_UNREACHABLE();
+    }
+    return NULL;
+}
+
+static MD_MARKCHAIN*
+md_mark_chain(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+
+    switch(mark->ch) {
+        case _T('*'):   return md_asterisk_chain(ctx, mark->flags);
+        case _T('_'):   return &UNDERSCORE_OPENERS;
+        case _T('~'):   return &TILDE_OPENERS;
+        case _T('['):   return &BRACKET_OPENERS;
+        case _T('|'):   return &TABLECELLBOUNDARIES;
+        default:        return NULL;
+    }
+}
+
+static MD_MARK*
+md_push_mark(MD_CTX* ctx)
+{
+    if(ctx->n_marks >= ctx->alloc_marks) {
+        MD_MARK* new_marks;
+
+        ctx->alloc_marks = (ctx->alloc_marks > 0 ? ctx->alloc_marks * 2 : 64);
+        new_marks = realloc(ctx->marks, ctx->alloc_marks * sizeof(MD_MARK));
+        if(new_marks == NULL) {
+            MD_LOG("realloc() failed.");
+            return NULL;
+        }
+
+        ctx->marks = new_marks;
+    }
+
+    return &ctx->marks[ctx->n_marks++];
+}
+
+#define PUSH_MARK_()                                                    \
+        do {                                                            \
+            mark = md_push_mark(ctx);                                   \
+            if(mark == NULL) {                                          \
+                ret = -1;                                               \
+                goto abort;                                             \
+            }                                                           \
+        } while(0)
+
+#define PUSH_MARK(ch_, beg_, end_, flags_)                              \
+        do {                                                            \
+            PUSH_MARK_();                                               \
+            mark->beg = (beg_);                                         \
+            mark->end = (end_);                                         \
+            mark->prev = -1;                                            \
+            mark->next = -1;                                            \
+            mark->ch = (char)(ch_);                                     \
+            mark->flags = (flags_);                                     \
+        } while(0)
+
+
+static void
+md_mark_chain_append(MD_CTX* ctx, MD_MARKCHAIN* chain, int mark_index)
+{
+    if(chain->tail >= 0)
+        ctx->marks[chain->tail].next = mark_index;
+    else
+        chain->head = mark_index;
+
+    ctx->marks[mark_index].prev = chain->tail;
+    chain->tail = mark_index;
+}
+
+/* Sometimes, we need to store a pointer into the mark. It is quite rare
+ * so we do not bother to make MD_MARK use union, and it can only happen
+ * for dummy marks. */
+static inline void
+md_mark_store_ptr(MD_CTX* ctx, int mark_index, void* ptr)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    MD_ASSERT(mark->ch == 'D');
+
+    /* Check only members beg and end are misused for this. */
+    MD_ASSERT(sizeof(void*) <= 2 * sizeof(OFF));
+    memcpy(mark, &ptr, sizeof(void*));
+}
+
+static inline void*
+md_mark_get_ptr(MD_CTX* ctx, int mark_index)
+{
+    void* ptr;
+    MD_MARK* mark = &ctx->marks[mark_index];
+    MD_ASSERT(mark->ch == 'D');
+    memcpy(&ptr, mark, sizeof(void*));
+    return ptr;
+}
+
+static void
+md_resolve_range(MD_CTX* ctx, MD_MARKCHAIN* chain, int opener_index, int closer_index)
+{
+    MD_MARK* opener = &ctx->marks[opener_index];
+    MD_MARK* closer = &ctx->marks[closer_index];
+
+    /* Remove opener from the list of openers. */
+    if(chain != NULL) {
+        if(opener->prev >= 0)
+            ctx->marks[opener->prev].next = opener->next;
+        else
+            chain->head = opener->next;
+
+        if(opener->next >= 0)
+            ctx->marks[opener->next].prev = opener->prev;
+        else
+            chain->tail = opener->prev;
+    }
+
+    /* Interconnect opener and closer and mark both as resolved. */
+    opener->next = closer_index;
+    opener->flags |= MD_MARK_OPENER | MD_MARK_RESOLVED;
+    closer->prev = opener_index;
+    closer->flags |= MD_MARK_CLOSER | MD_MARK_RESOLVED;
+}
+
+
+#define MD_ROLLBACK_ALL         0
+#define MD_ROLLBACK_CROSSING    1
+
+/* In the range ctx->marks[opener_index] ... [closer_index], undo some or all
+ * resolvings accordingly to these rules:
+ *
+ * (1) All openers BEFORE the range corresponding to any closer inside the
+ *     range are un-resolved and they are re-added to their respective chains
+ *     of unresolved openers. This ensures we can reuse the opener for closers
+ *     AFTER the range.
+ *
+ * (2) If 'how' is MD_ROLLBACK_ALL, then ALL resolved marks inside the range
+ *     are discarded.
+ *
+ * (3) If 'how' is MD_ROLLBACK_CROSSING, only closers with openers handled
+ *     in (1) are discarded. I.e. pairs of openers and closers which are both
+ *     inside the range are retained as well as any unpaired marks.
+ */
+static void
+md_rollback(MD_CTX* ctx, int opener_index, int closer_index, int how)
+{
+    int i;
+    int mark_index;
+
+    /* Cut all unresolved openers at the mark index. */
+    for(i = OPENERS_CHAIN_FIRST; i < OPENERS_CHAIN_LAST+1; i++) {
+        MD_MARKCHAIN* chain = &ctx->mark_chains[i];
+
+        while(chain->tail >= opener_index)
+            chain->tail = ctx->marks[chain->tail].prev;
+
+        if(chain->tail >= 0)
+            ctx->marks[chain->tail].next = -1;
+        else
+            chain->head = -1;
+    }
+
+    /* Go backwards so that un-resolved openers are re-added into their
+     * respective chains, in the right order. */
+    mark_index = closer_index - 1;
+    while(mark_index > opener_index) {
+        MD_MARK* mark = &ctx->marks[mark_index];
+        int mark_flags = mark->flags;
+        int discard_flag = (how == MD_ROLLBACK_ALL);
+
+        if(mark->flags & MD_MARK_CLOSER) {
+            int mark_opener_index = mark->prev;
+
+            /* Undo opener BEFORE the range. */
+            if(mark_opener_index < opener_index) {
+                MD_MARK* mark_opener = &ctx->marks[mark_opener_index];
+                MD_MARKCHAIN* chain;
+
+                mark_opener->flags &= ~(MD_MARK_OPENER | MD_MARK_CLOSER | MD_MARK_RESOLVED);
+                chain = md_mark_chain(ctx, opener_index);
+                if(chain != NULL) {
+                    md_mark_chain_append(ctx, chain, mark_opener_index);
+                    discard_flag = 1;
+                }
+            }
+        }
+
+        /* And reset our flags. */
+        if(discard_flag)
+            mark->flags &= ~(MD_MARK_OPENER | MD_MARK_CLOSER | MD_MARK_RESOLVED);
+
+        /* Jump as far as we can over unresolved or non-interesting marks. */
+        switch(how) {
+            case MD_ROLLBACK_CROSSING:
+                if((mark_flags & MD_MARK_CLOSER)  &&  mark->prev > opener_index) {
+                    /* If we are closer with opener INSIDE the range, there may
+                     * not be any other crosser inside the subrange. */
+                    mark_index = mark->prev;
+                    break;
+                }
+                /* Pass through. */
+            default:
+                mark_index--;
+                break;
+        }
+    }
+}
+
+static void
+md_build_mark_char_map(MD_CTX* ctx)
+{
+    memset(ctx->mark_char_map, 0, sizeof(ctx->mark_char_map));
+
+    ctx->mark_char_map['\\'] = 1;
+    ctx->mark_char_map['*'] = 1;
+    ctx->mark_char_map['_'] = 1;
+    ctx->mark_char_map['`'] = 1;
+    ctx->mark_char_map['&'] = 1;
+    ctx->mark_char_map[';'] = 1;
+    ctx->mark_char_map['<'] = 1;
+    ctx->mark_char_map['>'] = 1;
+    ctx->mark_char_map['['] = 1;
+    ctx->mark_char_map['!'] = 1;
+    ctx->mark_char_map[']'] = 1;
+    ctx->mark_char_map['\0'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_STRIKETHROUGH)
+        ctx->mark_char_map['~'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_PERMISSIVEEMAILAUTOLINKS)
+        ctx->mark_char_map['@'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_PERMISSIVEURLAUTOLINKS)
+        ctx->mark_char_map[':'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_PERMISSIVEWWWAUTOLINKS)
+        ctx->mark_char_map['.'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_TABLES)
+        ctx->mark_char_map['|'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_COLLAPSEWHITESPACE) {
+        int i;
+
+        for(i = 0; i < (int) sizeof(ctx->mark_char_map); i++) {
+            if(ISWHITESPACE_(i))
+                ctx->mark_char_map[i] = 1;
+        }
+    }
+}
+
+/* We limit code span marks to lower then 32 backticks. This solves the
+ * pathologic case of too many openers, each of different length: Their
+ * resolving would be then O(n^2). */
+#define CODESPAN_MARK_MAXLEN    32
+
+static int
+md_is_code_span(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg,
+                OFF* p_opener_beg, OFF* p_opener_end,
+                OFF* p_closer_beg, OFF* p_closer_end,
+                OFF last_potential_closers[CODESPAN_MARK_MAXLEN],
+                int* p_reached_paragraph_end)
+{
+    OFF opener_beg = beg;
+    OFF opener_end;
+    OFF closer_beg;
+    OFF closer_end;
+    SZ mark_len;
+    OFF line_end;
+    int has_space_after_opener = FALSE;
+    int has_eol_after_opener = FALSE;
+    int has_space_before_closer = FALSE;
+    int has_eol_before_closer = FALSE;
+    int has_only_space = TRUE;
+    int line_index = 0;
+
+    line_end = lines[0].end;
+    opener_end = opener_beg;
+    while(opener_end < line_end  &&  CH(opener_end) == _T('`'))
+        opener_end++;
+    has_space_after_opener = (opener_end < line_end && CH(opener_end) == _T(' '));
+    has_eol_after_opener = (opener_end == line_end);
+
+    /* The caller needs to know end of the opening mark even if we fail. */
+    *p_opener_end = opener_end;
+
+    mark_len = opener_end - opener_beg;
+    if(mark_len > CODESPAN_MARK_MAXLEN)
+        return FALSE;
+
+    /* Check whether we already know there is no closer of this length.
+     * If so, re-scan does no sense. This fixes issue #59. */
+    if(last_potential_closers[mark_len-1] >= lines[n_lines-1].end  ||
+       (*p_reached_paragraph_end  &&  last_potential_closers[mark_len-1] < opener_end))
+        return FALSE;
+
+    closer_beg = opener_end;
+    closer_end = opener_end;
+
+    /* Find closer mark. */
+    while(TRUE) {
+        while(closer_beg < line_end  &&  CH(closer_beg) != _T('`')) {
+            if(CH(closer_beg) != _T(' '))
+                has_only_space = FALSE;
+            closer_beg++;
+        }
+        closer_end = closer_beg;
+        while(closer_end < line_end  &&  CH(closer_end) == _T('`'))
+            closer_end++;
+
+        if(closer_end - closer_beg == mark_len) {
+            /* Success. */
+            has_space_before_closer = (closer_beg > lines[line_index].beg && CH(closer_beg-1) == _T(' '));
+            has_eol_before_closer = (closer_beg == lines[line_index].beg);
+            break;
+        }
+
+        if(closer_end - closer_beg > 0) {
+            /* We have found a back-tick which is not part of the closer. */
+            has_only_space = FALSE;
+
+            /* But if we eventually fail, remember it as a potential closer
+             * of its own length for future attempts. This mitigates needs for
+             * rescans. */
+            if(closer_end - closer_beg < CODESPAN_MARK_MAXLEN) {
+                if(closer_beg > last_potential_closers[closer_end - closer_beg - 1])
+                    last_potential_closers[closer_end - closer_beg - 1] = closer_beg;
+            }
+        }
+
+        if(closer_end >= line_end) {
+            line_index++;
+            if(line_index >= n_lines) {
+                /* Reached end of the paragraph and still nothing. */
+                *p_reached_paragraph_end = TRUE;
+                return FALSE;
+            }
+            /* Try on the next line. */
+            line_end = lines[line_index].end;
+            closer_beg = lines[line_index].beg;
+        } else {
+            closer_beg = closer_end;
+        }
+    }
+
+    /* If there is a space or a new line both after and before the opener
+     * (and if the code span is not made of spaces only), consume one initial
+     * and one trailing space as part of the marks. */
+    if(!has_only_space  &&
+       (has_space_after_opener || has_eol_after_opener)  &&
+       (has_space_before_closer || has_eol_before_closer))
+    {
+        if(has_space_after_opener)
+            opener_end++;
+        else
+            opener_end = lines[1].beg;
+
+        if(has_space_before_closer)
+            closer_beg--;
+        else {
+            closer_beg = lines[line_index-1].end;
+            /* We need to eat the preceding "\r\n" but not any line trailing
+             * spaces. */
+            while(closer_beg < ctx->size  &&  ISBLANK(closer_beg))
+                closer_beg++;
+        }
+    }
+
+    *p_opener_beg = opener_beg;
+    *p_opener_end = opener_end;
+    *p_closer_beg = closer_beg;
+    *p_closer_end = closer_end;
+    return TRUE;
+}
+
+static int
+md_is_autolink_uri(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg+1;
+
+    MD_ASSERT(CH(beg) == _T('<'));
+
+    /* Check for scheme. */
+    if(off >= max_end  ||  !ISASCII(off))
+        return FALSE;
+    off++;
+    while(1) {
+        if(off >= max_end)
+            return FALSE;
+        if(off - beg > 32)
+            return FALSE;
+        if(CH(off) == _T(':')  &&  off - beg >= 3)
+            break;
+        if(!ISALNUM(off) && CH(off) != _T('+') && CH(off) != _T('-') && CH(off) != _T('.'))
+            return FALSE;
+        off++;
+    }
+
+    /* Check the path after the scheme. */
+    while(off < max_end  &&  CH(off) != _T('>')) {
+        if(ISWHITESPACE(off) || ISCNTRL(off) || CH(off) == _T('<'))
+            return FALSE;
+        off++;
+    }
+
+    if(off >= max_end)
+        return FALSE;
+
+    MD_ASSERT(CH(off) == _T('>'));
+    *p_end = off+1;
+    return TRUE;
+}
+
+static int
+md_is_autolink_email(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg + 1;
+    int label_len;
+
+    MD_ASSERT(CH(beg) == _T('<'));
+
+    /* The code should correspond to this regexp:
+            /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+
+            @[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?
+            (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+     */
+
+    /* Username (before '@'). */
+    while(off < max_end  &&  (ISALNUM(off) || ISANYOF(off, _T(".!#$%&'*+/=?^_`{|}~-"))))
+        off++;
+    if(off <= beg+1)
+        return FALSE;
+
+    /* '@' */
+    if(off >= max_end  ||  CH(off) != _T('@'))
+        return FALSE;
+    off++;
+
+    /* Labels delimited with '.'; each label is sequence of 1 - 62 alnum
+     * characters or '-', but '-' is not allowed as first or last char. */
+    label_len = 0;
+    while(off < max_end) {
+        if(ISALNUM(off))
+            label_len++;
+        else if(CH(off) == _T('-')  &&  label_len > 0)
+            label_len++;
+        else if(CH(off) == _T('.')  &&  label_len > 0  &&  CH(off-1) != _T('-'))
+            label_len = 0;
+        else
+            break;
+
+        if(label_len > 62)
+            return FALSE;
+
+        off++;
+    }
+
+    if(label_len <= 0  || off >= max_end  ||  CH(off) != _T('>') ||  CH(off-1) == _T('-'))
+        return FALSE;
+
+    *p_end = off+1;
+    return TRUE;
+}
+
+static int
+md_is_autolink(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end, int* p_missing_mailto)
+{
+    if(md_is_autolink_uri(ctx, beg, max_end, p_end)) {
+        *p_missing_mailto = FALSE;
+        return TRUE;
+    }
+
+    if(md_is_autolink_email(ctx, beg, max_end, p_end)) {
+        *p_missing_mailto = TRUE;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static int
+md_collect_marks(MD_CTX* ctx, const MD_LINE* lines, int n_lines, int table_mode)
+{
+    int i;
+    int ret = 0;
+    MD_MARK* mark;
+    OFF codespan_last_potential_closers[CODESPAN_MARK_MAXLEN] = { 0 };
+    int codespan_scanned_till_paragraph_end = FALSE;
+
+    for(i = 0; i < n_lines; i++) {
+        const MD_LINE* line = &lines[i];
+        OFF off = line->beg;
+        OFF line_end = line->end;
+
+        while(TRUE) {
+            CHAR ch;
+
+#ifdef MD4C_USE_UTF16
+    /* For UTF-16, mark_char_map[] covers only ASCII. */
+    #define IS_MARK_CHAR(off)   ((CH(off) < SIZEOF_ARRAY(ctx->mark_char_map))  &&  \
+                                (ctx->mark_char_map[(unsigned char) CH(off)]))
+#else
+    /* For 8-bit encodings, mark_char_map[] covers all 256 elements. */
+    #define IS_MARK_CHAR(off)   (ctx->mark_char_map[(unsigned char) CH(off)])
+#endif
+
+            /* Optimization: Use some loop unrolling. */
+            while(off + 3 < line_end  &&  !IS_MARK_CHAR(off+0)  &&  !IS_MARK_CHAR(off+1)
+                                      &&  !IS_MARK_CHAR(off+2)  &&  !IS_MARK_CHAR(off+3))
+                off += 4;
+            while(off < line_end  &&  !IS_MARK_CHAR(off+0))
+                off++;
+
+            if(off >= line_end)
+                break;
+
+            ch = CH(off);
+
+            /* A backslash escape.
+             * It can go beyond line->end as it may involve escaped new
+             * line to form a hard break. */
+            if(ch == _T('\\')  &&  off+1 < ctx->size  &&  (ISPUNCT(off+1) || ISNEWLINE(off+1))) {
+                /* Hard-break cannot be on the last line of the block. */
+                if(!ISNEWLINE(off+1)  ||  i+1 < n_lines)
+                    PUSH_MARK(ch, off, off+2, MD_MARK_RESOLVED);
+                off += 2;
+                continue;
+            }
+
+            /* A potential (string) emphasis start/end. */
+            if(ch == _T('*')  ||  ch == _T('_')) {
+                OFF tmp = off+1;
+                int left_level;     /* What precedes: 0 = whitespace; 1 = punctuation; 2 = other char. */
+                int right_level;    /* What follows: 0 = whitespace; 1 = punctuation; 2 = other char. */
+
+                while(tmp < line_end  &&  CH(tmp) == ch)
+                    tmp++;
+
+                if(off == line->beg  ||  ISUNICODEWHITESPACEBEFORE(off))
+                    left_level = 0;
+                else if(ISUNICODEPUNCTBEFORE(off))
+                    left_level = 1;
+                else
+                    left_level = 2;
+
+                if(tmp == line_end  ||  ISUNICODEWHITESPACE(tmp))
+                    right_level = 0;
+                else if(ISUNICODEPUNCT(tmp))
+                    right_level = 1;
+                else
+                    right_level = 2;
+
+                /* Intra-word underscore doesn't have special meaning. */
+                if(ch == _T('_')  &&  left_level == 2  &&  right_level == 2) {
+                    left_level = 0;
+                    right_level = 0;
+                }
+
+                if(left_level != 0  ||  right_level != 0) {
+                    unsigned flags = 0;
+
+                    if(left_level > 0  &&  left_level >= right_level)
+                        flags |= MD_MARK_POTENTIAL_CLOSER;
+                    if(right_level > 0  &&  right_level >= left_level)
+                        flags |= MD_MARK_POTENTIAL_OPENER;
+                    if(left_level == 2  &&  right_level == 2)
+                        flags |= MD_MARK_EMPH_INTRAWORD;
+
+                    /* For "the rule of three" we need to remember the original
+                     * size of the mark (modulo three), before we potentially
+                     * split the mark when being later resolved partially by some
+                     * shorter closer. */
+                    switch((tmp - off) % 3) {
+                        case 0: flags |= MD_MARK_EMPH_MOD3_0; break;
+                        case 1: flags |= MD_MARK_EMPH_MOD3_1; break;
+                        case 2: flags |= MD_MARK_EMPH_MOD3_2; break;
+                    }
+
+                    PUSH_MARK(ch, off, tmp, flags);
+
+                    /* During resolving, multiple asterisks may have to be
+                     * split into independent span start/ends. Consider e.g.
+                     * "**foo* bar*". Therefore we push also some empty dummy
+                     * marks to have enough space for that. */
+                    off++;
+                    while(off < tmp) {
+                        PUSH_MARK('D', off, off, 0);
+                        off++;
+                    }
+                    continue;
+                }
+
+                off = tmp;
+                continue;
+            }
+
+            /* A potential code span start/end. */
+            if(ch == _T('`')) {
+                OFF opener_beg, opener_end;
+                OFF closer_beg, closer_end;
+                int is_code_span;
+
+                is_code_span = md_is_code_span(ctx, lines + i, n_lines - i, off,
+                                    &opener_beg, &opener_end, &closer_beg, &closer_end,
+                                    codespan_last_potential_closers,
+                                    &codespan_scanned_till_paragraph_end);
+                if(is_code_span) {
+                    PUSH_MARK(_T('`'), opener_beg, opener_end, MD_MARK_OPENER | MD_MARK_RESOLVED);
+                    PUSH_MARK(_T('`'), closer_beg, closer_end, MD_MARK_CLOSER | MD_MARK_RESOLVED);
+                    ctx->marks[ctx->n_marks-2].next = ctx->n_marks-1;
+                    ctx->marks[ctx->n_marks-1].prev = ctx->n_marks-2;
+
+                    off = closer_end;
+
+                    /* Advance the current line accordingly. */
+                    while(off > line_end) {
+                        i++;
+                        line++;
+                        line_end = line->end;
+                    }
+                    continue;
+                }
+
+                off = opener_end;
+                continue;
+            }
+
+            /* A potential entity start. */
+            if(ch == _T('&')) {
+                PUSH_MARK(ch, off, off+1, MD_MARK_POTENTIAL_OPENER);
+                off++;
+                continue;
+            }
+
+            /* A potential entity end. */
+            if(ch == _T(';')) {
+                /* We surely cannot be entity unless the previous mark is '&'. */
+                if(ctx->n_marks > 0  &&  ctx->marks[ctx->n_marks-1].ch == _T('&'))
+                    PUSH_MARK(ch, off, off+1, MD_MARK_POTENTIAL_CLOSER);
+
+                off++;
+                continue;
+            }
+
+            /* A potential autolink or raw HTML start/end. */
+            if(ch == _T('<')) {
+                int is_autolink;
+                OFF autolink_end;
+                int missing_mailto;
+
+                if(!(ctx->parser.flags & MD_FLAG_NOHTMLSPANS)) {
+                    int is_html;
+                    OFF html_end;
+
+                    /* Given the nature of the raw HTML, we have to recognize
+                     * it here. Doing so later in md_analyze_lt_gt() could
+                     * open can of worms of quadratic complexity. */
+                    is_html = md_is_html_any(ctx, lines + i, n_lines - i, off,
+                                    lines[n_lines-1].end, &html_end);
+                    if(is_html) {
+                        PUSH_MARK(_T('<'), off, off, MD_MARK_OPENER | MD_MARK_RESOLVED);
+                        PUSH_MARK(_T('>'), html_end, html_end, MD_MARK_CLOSER | MD_MARK_RESOLVED);
+                        ctx->marks[ctx->n_marks-2].next = ctx->n_marks-1;
+                        ctx->marks[ctx->n_marks-1].prev = ctx->n_marks-2;
+                        off = html_end;
+
+                        /* Advance the current line accordingly. */
+                        while(off > line_end) {
+                            i++;
+                            line++;
+                            line_end = line->end;
+                        }
+                        continue;
+                    }
+                }
+
+                is_autolink = md_is_autolink(ctx, off, lines[n_lines-1].end,
+                                    &autolink_end, &missing_mailto);
+                if(is_autolink) {
+                    PUSH_MARK((missing_mailto ? _T('@') : _T('<')), off, off+1,
+                                MD_MARK_OPENER | MD_MARK_RESOLVED | MD_MARK_AUTOLINK);
+                    PUSH_MARK(_T('>'), autolink_end-1, autolink_end,
+                                MD_MARK_CLOSER | MD_MARK_RESOLVED | MD_MARK_AUTOLINK);
+                    ctx->marks[ctx->n_marks-2].next = ctx->n_marks-1;
+                    ctx->marks[ctx->n_marks-1].prev = ctx->n_marks-2;
+                    off = autolink_end;
+                    continue;
+                }
+
+                off++;
+                continue;
+            }
+
+            /* A potential link or its part. */
+            if(ch == _T('[')  ||  (ch == _T('!') && off+1 < line_end && CH(off+1) == _T('['))) {
+                OFF tmp = (ch == _T('[') ? off+1 : off+2);
+                PUSH_MARK(ch, off, tmp, MD_MARK_POTENTIAL_OPENER);
+                off = tmp;
+                /* Two dummies to make enough place for data we need if it is
+                 * a link. */
+                PUSH_MARK('D', off, off, 0);
+                PUSH_MARK('D', off, off, 0);
+                continue;
+            }
+            if(ch == _T(']')) {
+                PUSH_MARK(ch, off, off+1, MD_MARK_POTENTIAL_CLOSER);
+                off++;
+                continue;
+            }
+
+            /* A potential permissive e-mail autolink. */
+            if(ch == _T('@')) {
+                if(line->beg + 1 <= off  &&  ISALNUM(off-1)  &&
+                    off + 3 < line->end  &&  ISALNUM(off+1))
+                {
+                    PUSH_MARK(ch, off, off+1, MD_MARK_POTENTIAL_OPENER);
+                    /* Push a dummy as a reserve for a closer. */
+                    PUSH_MARK('D', off, off, 0);
+                }
+
+                off++;
+                continue;
+            }
+
+            /* A potential permissive URL autolink. */
+            if(ch == _T(':')) {
+                static struct {
+                    const CHAR* scheme;
+                    SZ scheme_size;
+                    const CHAR* suffix;
+                    SZ suffix_size;
+                } scheme_map[] = {
+                    /* In the order from the most frequently used, arguably. */
+                    { _T("http"), 4,    _T("//"), 2 },
+                    { _T("https"), 5,   _T("//"), 2 },
+                    { _T("ftp"), 3,     _T("//"), 2 }
+                };
+                int scheme_index;
+
+                for(scheme_index = 0; scheme_index < (int) SIZEOF_ARRAY(scheme_map); scheme_index++) {
+                    const CHAR* scheme = scheme_map[scheme_index].scheme;
+                    const SZ scheme_size = scheme_map[scheme_index].scheme_size;
+                    const CHAR* suffix = scheme_map[scheme_index].suffix;
+                    const SZ suffix_size = scheme_map[scheme_index].suffix_size;
+
+                    if(line->beg + scheme_size <= off  &&  md_ascii_eq(STR(off-scheme_size), scheme, scheme_size)  &&
+                        (line->beg + scheme_size == off || ISWHITESPACE(off-scheme_size-1) || ISANYOF(off-scheme_size-1, _T("*_~([")))  &&
+                        off + 1 + suffix_size < line->end  &&  md_ascii_eq(STR(off+1), suffix, suffix_size))
+                    {
+                        PUSH_MARK(ch, off-scheme_size, off+1+suffix_size, MD_MARK_POTENTIAL_OPENER);
+                        /* Push a dummy as a reserve for a closer. */
+                        PUSH_MARK('D', off, off, 0);
+                        off += 1 + suffix_size;
+                        continue;
+                    }
+                }
+
+                off++;
+                continue;
+            }
+
+            /* A potential permissive WWW autolink. */
+            if(ch == _T('.')) {
+                if(line->beg + 3 <= off  &&  md_ascii_eq(STR(off-3), _T("www"), 3)  &&
+                    (line->beg + 3 == off || ISWHITESPACE(off-4) || ISANYOF(off-4, _T("*_~([")))  &&
+                    off + 1 < line_end)
+                {
+                    PUSH_MARK(ch, off-3, off+1, MD_MARK_POTENTIAL_OPENER);
+                    /* Push a dummy as a reserve for a closer. */
+                    PUSH_MARK('D', off, off, 0);
+                    off++;
+                    continue;
+                }
+
+                off++;
+                continue;
+            }
+
+            /* A potential table cell boundary. */
+            if(table_mode  &&  ch == _T('|')) {
+                PUSH_MARK(ch, off, off+1, 0);
+                off++;
+                continue;
+            }
+
+            /* A potential strikethrough start/end. */
+            if(ch == _T('~')) {
+                OFF tmp = off+1;
+
+                while(tmp < line_end  &&  CH(tmp) == _T('~'))
+                    tmp++;
+
+                PUSH_MARK(ch, off, tmp, MD_MARK_POTENTIAL_OPENER | MD_MARK_POTENTIAL_CLOSER);
+                off = tmp;
+                continue;
+            }
+
+            /* Turn non-trivial whitespace into single space. */
+            if(ISWHITESPACE_(ch)) {
+                OFF tmp = off+1;
+
+                while(tmp < line_end  &&  ISWHITESPACE(tmp))
+                    tmp++;
+
+                if(tmp - off > 1  ||  ch != _T(' '))
+                    PUSH_MARK(ch, off, tmp, MD_MARK_RESOLVED);
+
+                off = tmp;
+                continue;
+            }
+
+            /* NULL character. */
+            if(ch == _T('\0')) {
+                PUSH_MARK(ch, off, off+1, MD_MARK_RESOLVED);
+                off++;
+                continue;
+            }
+
+            off++;
+        }
+    }
+
+    /* Add a dummy mark at the end of the mark vector to simplify
+     * process_inlines(). */
+    PUSH_MARK(127, ctx->size, ctx->size, MD_MARK_RESOLVED);
+
+abort:
+    return ret;
+}
+
+static void
+md_analyze_bracket(MD_CTX* ctx, int mark_index)
+{
+    /* We cannot really resolve links here as for that we would need
+     * more context. E.g. a following pair of brackets (reference link),
+     * or enclosing pair of brackets (if the inner is the link, the outer
+     * one cannot be.)
+     *
+     * Therefore we here only construct a list of resolved '[' ']' pairs
+     * ordered by position of the closer. This allows ur to analyze what is
+     * or is not link in the right order, from inside to outside in case
+     * of nested brackets.
+     *
+     * The resolving itself is deferred into md_resolve_links().
+     */
+
+    MD_MARK* mark = &ctx->marks[mark_index];
+
+    if(mark->flags & MD_MARK_POTENTIAL_OPENER) {
+        md_mark_chain_append(ctx, &BRACKET_OPENERS, mark_index);
+        return;
+    }
+
+    if(BRACKET_OPENERS.tail >= 0) {
+        /* Pop the opener from the chain. */
+        int opener_index = BRACKET_OPENERS.tail;
+        MD_MARK* opener = &ctx->marks[opener_index];
+        if(opener->prev >= 0)
+            ctx->marks[opener->prev].next = -1;
+        else
+            BRACKET_OPENERS.head = -1;
+        BRACKET_OPENERS.tail = opener->prev;
+
+        /* Interconnect the opener and closer. */
+        opener->next = mark_index;
+        mark->prev = opener_index;
+
+        /* Add the pair into chain of potential links for md_resolve_links().
+         * Note we misuse opener->prev for this as opener->next points to its
+         * closer. */
+        if(ctx->unresolved_link_tail >= 0)
+            ctx->marks[ctx->unresolved_link_tail].prev = opener_index;
+        else
+            ctx->unresolved_link_head = opener_index;
+        ctx->unresolved_link_tail = opener_index;
+        opener->prev = -1;
+    }
+}
+
+/* Forward declaration. */
+static void md_analyze_link_contents(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                                     int mark_beg, int mark_end);
+
+static int
+md_resolve_links(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
+{
+    int opener_index = ctx->unresolved_link_head;
+    OFF last_link_beg = 0;
+    OFF last_link_end = 0;
+    OFF last_img_beg = 0;
+    OFF last_img_end = 0;
+
+    while(opener_index >= 0) {
+        MD_MARK* opener = &ctx->marks[opener_index];
+        int closer_index = opener->next;
+        MD_MARK* closer = &ctx->marks[closer_index];
+        int next_index = opener->prev;
+        MD_MARK* next_opener;
+        MD_MARK* next_closer;
+        MD_LINK_ATTR attr;
+        int is_link = FALSE;
+
+        if(next_index >= 0) {
+            next_opener = &ctx->marks[next_index];
+            next_closer = &ctx->marks[next_opener->next];
+        } else {
+            next_opener = NULL;
+            next_closer = NULL;
+        }
+
+        /* If nested ("[ [ ] ]"), we need to make sure that:
+         *   - The outer does not end inside of (...) belonging to the inner.
+         *   - The outer cannot be link if the inner is link (i.e. not image).
+         *
+         * (Note we here analyze from inner to outer as the marks are ordered
+         * by closer->beg.)
+         */
+        if((opener->beg < last_link_beg  &&  closer->end < last_link_end)  ||
+           (opener->beg < last_img_beg  &&  closer->end < last_img_end)  ||
+           (opener->beg < last_link_end  &&  opener->ch == '['))
+        {
+            opener_index = next_index;
+            continue;
+        }
+
+        if(next_opener != NULL  &&  next_opener->beg == closer->end) {
+            if(next_closer->beg > closer->end + 1) {
+                /* Might be full reference link. */
+                is_link = md_is_link_reference(ctx, lines, n_lines, next_opener->beg, next_closer->end, &attr);
+            } else {
+                /* Might be shortcut reference link. */
+                is_link = md_is_link_reference(ctx, lines, n_lines, opener->beg, closer->end, &attr);
+            }
+
+            if(is_link < 0)
+                return -1;
+
+            if(is_link) {
+                /* Eat the 2nd "[...]". */
+                closer->end = next_closer->end;
+            }
+        } else {
+            if(closer->end < ctx->size  &&  CH(closer->end) == _T('(')) {
+                /* Might be inline link. */
+                OFF inline_link_end = UINT_MAX;
+
+                is_link = md_is_inline_link_spec(ctx, lines, n_lines, closer->end, &inline_link_end, &attr);
+                if(is_link < 0)
+                    return -1;
+
+                /* Check the closing ')' is not inside an already resolved range
+                 * (i.e. a range with a higher priority), e.g. a code span. */
+                if(is_link) {
+                    int i = closer_index + 1;
+
+                    while(i < ctx->n_marks) {
+                        MD_MARK* mark = &ctx->marks[i];
+
+                        if(mark->beg >= inline_link_end)
+                            break;
+                        if((mark->flags & (MD_MARK_OPENER | MD_MARK_RESOLVED)) == (MD_MARK_OPENER | MD_MARK_RESOLVED)) {
+                            if(ctx->marks[mark->next].beg >= inline_link_end) {
+                                /* Cancel the link status. */
+                                if(attr.title_needs_free)
+                                    free(attr.title);
+                                is_link = FALSE;
+                                break;
+                            }
+
+                            i = mark->next + 1;
+                        } else {
+                            i++;
+                        }
+                    }
+                }
+
+                if(is_link) {
+                    /* Eat the "(...)" */
+                    closer->end = inline_link_end;
+                }
+            }
+
+            if(!is_link) {
+                /* Might be collapsed reference link. */
+                is_link = md_is_link_reference(ctx, lines, n_lines, opener->beg, closer->end, &attr);
+                if(is_link < 0)
+                    return -1;
+            }
+        }
+
+        if(is_link) {
+            /* Resolve the brackets as a link. */
+            opener->flags |= MD_MARK_OPENER | MD_MARK_RESOLVED;
+            closer->flags |= MD_MARK_CLOSER | MD_MARK_RESOLVED;
+
+            /* If it is a link, we store the destination and title in the two
+             * dummy marks after the opener. */
+            MD_ASSERT(ctx->marks[opener_index+1].ch == 'D');
+            ctx->marks[opener_index+1].beg = attr.dest_beg;
+            ctx->marks[opener_index+1].end = attr.dest_end;
+
+            MD_ASSERT(ctx->marks[opener_index+2].ch == 'D');
+            md_mark_store_ptr(ctx, opener_index+2, attr.title);
+            if(attr.title_needs_free)
+                md_mark_chain_append(ctx, &PTR_CHAIN, opener_index+2);
+            ctx->marks[opener_index+2].prev = attr.title_size;
+
+            if(opener->ch == '[') {
+                last_link_beg = opener->beg;
+                last_link_end = closer->end;
+            } else {
+                last_img_beg = opener->beg;
+                last_img_end = closer->end;
+            }
+
+            md_analyze_link_contents(ctx, lines, n_lines, opener_index+1, closer_index);
+        }
+
+        opener_index = next_index;
+    }
+
+    return 0;
+}
+
+/* Analyze whether the mark '&' starts a HTML entity.
+ * If so, update its flags as well as flags of corresponding closer ';'. */
+static void
+md_analyze_entity(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* opener = &ctx->marks[mark_index];
+    MD_MARK* closer;
+    OFF off;
+
+    /* Cannot be entity if there is no closer as the next mark.
+     * (Any other mark between would mean strange character which cannot be
+     * part of the entity.
+     *
+     * So we can do all the work on '&' and do not call this later for the
+     * closing mark ';'.
+     */
+    if(mark_index + 1 >= ctx->n_marks)
+        return;
+    closer = &ctx->marks[mark_index+1];
+    if(closer->ch != ';')
+        return;
+
+    if(md_is_entity(ctx, opener->beg, closer->end, &off)) {
+        MD_ASSERT(off == closer->end);
+
+        md_resolve_range(ctx, NULL, mark_index, mark_index+1);
+        opener->end = closer->end;
+    }
+}
+
+static void
+md_analyze_table_cell_boundary(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    mark->flags |= MD_MARK_RESOLVED;
+
+    md_mark_chain_append(ctx, &TABLECELLBOUNDARIES, mark_index);
+    ctx->n_table_cell_boundaries++;
+}
+
+/* Split a longer mark into two. The new mark takes the given count of
+ * characters. May only be called if an adequate number of dummy 'D' marks
+ * follows.
+ */
+static int
+md_split_emph_mark(MD_CTX* ctx, int mark_index, SZ n)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    int new_mark_index = mark_index + (mark->end - mark->beg - n);
+    MD_MARK* dummy = &ctx->marks[new_mark_index];
+
+    MD_ASSERT(mark->end - mark->beg > n);
+    MD_ASSERT(dummy->ch == 'D');
+
+    memcpy(dummy, mark, sizeof(MD_MARK));
+    mark->end -= n;
+    dummy->beg = mark->end;
+
+    return new_mark_index;
+}
+
+static void
+md_analyze_emph(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    MD_MARKCHAIN* chain = md_mark_chain(ctx, mark_index);
+
+    /* If we can be a closer, try to resolve with the preceding opener. */
+    if(mark->flags & MD_MARK_POTENTIAL_CLOSER) {
+        MD_MARK* opener = NULL;
+        int opener_index;
+
+        if(mark->ch == _T('*')) {
+            MD_MARKCHAIN* opener_chains[6];
+            int i, n_opener_chains;
+            unsigned flags = mark->flags;
+
+            /* Apply "rule of three". (This is why we break asterisk opener
+             * marks into multiple chains.) */
+            n_opener_chains = 0;
+            opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_intraword_mod3_0;
+            if((flags & MD_MARK_EMPH_MOD3_MASK) != MD_MARK_EMPH_MOD3_2)
+                opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_intraword_mod3_1;
+            if((flags & MD_MARK_EMPH_MOD3_MASK) != MD_MARK_EMPH_MOD3_1)
+                opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_intraword_mod3_2;
+            opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_extraword_mod3_0;
+            if(!(flags & MD_MARK_EMPH_INTRAWORD)  ||  (flags & MD_MARK_EMPH_MOD3_MASK) != MD_MARK_EMPH_MOD3_2)
+                opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_extraword_mod3_1;
+            if(!(flags & MD_MARK_EMPH_INTRAWORD)  ||  (flags & MD_MARK_EMPH_MOD3_MASK) != MD_MARK_EMPH_MOD3_1)
+                opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_extraword_mod3_2;
+
+            /* Opener is the most recent mark from the allowed chains. */
+            for(i = 0; i < n_opener_chains; i++) {
+                if(opener_chains[i]->tail >= 0) {
+                    int tmp_index = opener_chains[i]->tail;
+                    MD_MARK* tmp_mark = &ctx->marks[tmp_index];
+                    if(opener == NULL  ||  tmp_mark->end > opener->end) {
+                        opener_index = tmp_index;
+                        opener = tmp_mark;
+                    }
+                }
+            }
+        } else {
+            /* Simple emph. mark */
+            if(chain->tail >= 0) {
+                opener_index = chain->tail;
+                opener = &ctx->marks[opener_index];
+            }
+        }
+
+        /* Resolve, if we have found matching opener. */
+        if(opener != NULL) {
+            SZ opener_size = opener->end - opener->beg;
+            SZ closer_size = mark->end - mark->beg;
+
+            if(opener_size > closer_size) {
+                opener_index = md_split_emph_mark(ctx, opener_index, closer_size);
+                md_mark_chain_append(ctx, md_mark_chain(ctx, opener_index), opener_index);
+            } else if(opener_size < closer_size) {
+                md_split_emph_mark(ctx, mark_index, closer_size - opener_size);
+            }
+
+            md_rollback(ctx, opener_index, mark_index, MD_ROLLBACK_CROSSING);
+            md_resolve_range(ctx, chain, opener_index, mark_index);
+            return;
+        }
+    }
+
+    /* If we could not resolve as closer, we may be yet be an opener. */
+    if(mark->flags & MD_MARK_POTENTIAL_OPENER)
+        md_mark_chain_append(ctx, chain, mark_index);
+}
+
+static void
+md_analyze_tilde(MD_CTX* ctx, int mark_index)
+{
+    /* We attempt to be Github Flavored Markdown compatible here. GFM says
+     * that length of the tilde sequence is not important at all. Note that
+     * implies the TILDE_OPENERS chain can have at most one item. */
+
+    if(TILDE_OPENERS.head >= 0) {
+        /* The chain already contains an opener, so we may resolve the span. */
+        int opener_index = TILDE_OPENERS.head;
+
+        md_rollback(ctx, opener_index, mark_index, MD_ROLLBACK_CROSSING);
+        md_resolve_range(ctx, &TILDE_OPENERS, opener_index, mark_index);
+    } else {
+        /* We can only be opener. */
+        md_mark_chain_append(ctx, &TILDE_OPENERS, mark_index);
+    }
+}
+
+static void
+md_analyze_permissive_url_autolink(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* opener = &ctx->marks[mark_index];
+    int closer_index = mark_index + 1;
+    MD_MARK* closer = &ctx->marks[closer_index];
+    MD_MARK* next_resolved_mark;
+    OFF off = opener->end;
+    int n_dots = FALSE;
+    int has_underscore_in_last_seg = FALSE;
+    int has_underscore_in_next_to_last_seg = FALSE;
+    int n_opened_parenthesis = 0;
+
+    /* Check for domain. */
+    while(off < ctx->size) {
+        if(ISALNUM(off) || CH(off) == _T('-')) {
+            off++;
+        } else if(CH(off) == _T('.')) {
+            /* We must see at least one period. */
+            n_dots++;
+            has_underscore_in_next_to_last_seg = has_underscore_in_last_seg;
+            has_underscore_in_last_seg = FALSE;
+            off++;
+        } else if(CH(off) == _T('_')) {
+            /* No underscore may be present in the last two domain segments. */
+            has_underscore_in_last_seg = TRUE;
+            off++;
+        } else {
+            break;
+        }
+    }
+    if(off > opener->end  &&  CH(off-1) == _T('.')) {
+        off--;
+        n_dots--;
+    }
+    if(off <= opener->end || n_dots == 0 || has_underscore_in_next_to_last_seg || has_underscore_in_last_seg)
+        return;
+
+    /* Check for path. */
+    next_resolved_mark = closer + 1;
+    while(next_resolved_mark->ch == 'D' || !(next_resolved_mark->flags & MD_MARK_RESOLVED))
+        next_resolved_mark++;
+    while(off < next_resolved_mark->beg  &&  CH(off) != _T('<')  &&  !ISWHITESPACE(off)  &&  !ISNEWLINE(off)) {
+        /* Parenthesis must be balanced. */
+        if(CH(off) == _T('(')) {
+            n_opened_parenthesis++;
+        } else if(CH(off) == _T(')')) {
+            if(n_opened_parenthesis > 0)
+                n_opened_parenthesis--;
+            else
+                break;
+        }
+
+        off++;
+    }
+    /* These cannot be last char In such case they are more likely normal
+     * punctuation. */
+    if(ISANYOF(off-1, _T("?!.,:*_~")))
+        off--;
+
+    /* Ok. Lets call it auto-link. Adapt opener and create closer to zero
+     * length so all the contents becomes the link text. */
+    MD_ASSERT(closer->ch == 'D');
+    opener->end = opener->beg;
+    closer->ch = opener->ch;
+    closer->beg = off;
+    closer->end = off;
+    md_resolve_range(ctx, NULL, mark_index, closer_index);
+}
+
+/* The permissive autolinks do not have to be enclosed in '<' '>' but we
+ * instead impose stricter rules what is understood as an e-mail address
+ * here. Actually any non-alphanumeric characters with exception of '.'
+ * are prohibited both in username and after '@'. */
+static void
+md_analyze_permissive_email_autolink(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* opener = &ctx->marks[mark_index];
+    int closer_index;
+    MD_MARK* closer;
+    OFF beg = opener->beg;
+    OFF end = opener->end;
+    int dot_count = 0;
+
+    MD_ASSERT(CH(beg) == _T('@'));
+
+    /* Scan for name before '@'. */
+    while(beg > 0  &&  (ISALNUM(beg-1) || ISANYOF(beg-1, _T(".-_+"))))
+        beg--;
+
+    /* Scan for domain after '@'. */
+    while(end < ctx->size  &&  (ISALNUM(end) || ISANYOF(end, _T(".-_")))) {
+        if(CH(end) == _T('.'))
+            dot_count++;
+        end++;
+    }
+    if(CH(end-1) == _T('.')) {  /* Final '.' not part of it. */
+        dot_count--;
+        end--;
+    }
+    else if(ISANYOF2(end-1, _T('-'), _T('_'))) /* These are forbidden at the end. */
+        return;
+    if(CH(end-1) == _T('@')  ||  dot_count == 0)
+        return;
+
+    /* Ok. Lets call it auto-link. Adapt opener and create closer to zero
+     * length so all the contents becomes the link text. */
+    closer_index = mark_index + 1;
+    closer = &ctx->marks[closer_index];
+    MD_ASSERT(closer->ch == 'D');
+
+    opener->beg = beg;
+    opener->end = beg;
+    closer->ch = opener->ch;
+    closer->beg = end;
+    closer->end = end;
+    md_resolve_range(ctx, NULL, mark_index, closer_index);
+}
+
+static inline void
+md_analyze_marks(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                 int mark_beg, int mark_end, const CHAR* mark_chars)
+{
+    int i = mark_beg;
+
+    while(i < mark_end) {
+        MD_MARK* mark = &ctx->marks[i];
+
+        /* Skip resolved spans. */
+        if(mark->flags & MD_MARK_RESOLVED) {
+            if(mark->flags & MD_MARK_OPENER) {
+                MD_ASSERT(i < mark->next);
+                i = mark->next + 1;
+            } else {
+                i++;
+            }
+            continue;
+        }
+
+        /* Skip marks we do not want to deal with. */
+        if(!ISANYOF_(mark->ch, mark_chars)) {
+            i++;
+            continue;
+        }
+
+        /* Analyze the mark. */
+        switch(mark->ch) {
+            case '[':   /* Pass through. */
+            case '!':   /* Pass through. */
+            case ']':   md_analyze_bracket(ctx, i); break;
+            case '&':   md_analyze_entity(ctx, i); break;
+            case '|':   md_analyze_table_cell_boundary(ctx, i); break;
+            case '_':   /* Pass through. */
+            case '*':   md_analyze_emph(ctx, i); break;
+            case '~':   md_analyze_tilde(ctx, i); break;
+            case '.':   /* Pass through. */
+            case ':':   md_analyze_permissive_url_autolink(ctx, i); break;
+            case '@':   md_analyze_permissive_email_autolink(ctx, i); break;
+        }
+
+        i++;
+    }
+}
+
+/* Analyze marks (build ctx->marks). */
+static int
+md_analyze_inlines(MD_CTX* ctx, const MD_LINE* lines, int n_lines, int table_mode)
+{
+    int ret;
+
+    /* Reset the previously collected stack of marks. */
+    ctx->n_marks = 0;
+
+    /* Collect all marks. */
+    MD_CHECK(md_collect_marks(ctx, lines, n_lines, table_mode));
+
+    /* We analyze marks in few groups to handle their precedence. */
+    /* (1) Entities; code spans; autolinks; raw HTML. */
+    md_analyze_marks(ctx, lines, n_lines, 0, ctx->n_marks, _T("&"));
+
+    if(table_mode) {
+        /* (2) Analyze table cell boundaries.
+         * Note we reset TABLECELLBOUNDARIES chain prior to the call md_analyze_marks(),
+         * not after, because caller may need it. */
+        MD_ASSERT(n_lines == 1);
+        TABLECELLBOUNDARIES.head = -1;
+        TABLECELLBOUNDARIES.tail = -1;
+        ctx->n_table_cell_boundaries = 0;
+        md_analyze_marks(ctx, lines, n_lines, 0, ctx->n_marks, _T("|"));
+        return ret;
+    }
+
+    /* (3) Links. */
+    md_analyze_marks(ctx, lines, n_lines, 0, ctx->n_marks, _T("[]!"));
+    MD_CHECK(md_resolve_links(ctx, lines, n_lines));
+    BRACKET_OPENERS.head = -1;
+    BRACKET_OPENERS.tail = -1;
+    ctx->unresolved_link_head = -1;
+    ctx->unresolved_link_tail = -1;
+
+    /* (4) Emphasis and strong emphasis; permissive autolinks. */
+    md_analyze_link_contents(ctx, lines, n_lines, 0, ctx->n_marks);
+
+abort:
+    return ret;
+}
+
+static void
+md_analyze_link_contents(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                         int mark_beg, int mark_end)
+{
+    md_analyze_marks(ctx, lines, n_lines, mark_beg, mark_end, _T("*_~@:."));
+    ASTERISK_OPENERS_extraword_mod3_0.head = -1;
+    ASTERISK_OPENERS_extraword_mod3_0.tail = -1;
+    ASTERISK_OPENERS_extraword_mod3_1.head = -1;
+    ASTERISK_OPENERS_extraword_mod3_1.tail = -1;
+    ASTERISK_OPENERS_extraword_mod3_2.head = -1;
+    ASTERISK_OPENERS_extraword_mod3_2.tail = -1;
+    ASTERISK_OPENERS_intraword_mod3_0.head = -1;
+    ASTERISK_OPENERS_intraword_mod3_0.tail = -1;
+    ASTERISK_OPENERS_intraword_mod3_1.head = -1;
+    ASTERISK_OPENERS_intraword_mod3_1.tail = -1;
+    ASTERISK_OPENERS_intraword_mod3_2.head = -1;
+    ASTERISK_OPENERS_intraword_mod3_2.tail = -1;
+    UNDERSCORE_OPENERS.head = -1;
+    UNDERSCORE_OPENERS.tail = -1;
+    TILDE_OPENERS.head = -1;
+    TILDE_OPENERS.tail = -1;
+}
+
+static int
+md_enter_leave_span_a(MD_CTX* ctx, int enter, MD_SPANTYPE type,
+                      const CHAR* dest, SZ dest_size, int prohibit_escapes_in_dest,
+                      const CHAR* title, SZ title_size)
+{
+    MD_ATTRIBUTE_BUILD href_build = { 0 };
+    MD_ATTRIBUTE_BUILD title_build = { 0 };
+    MD_SPAN_A_DETAIL det;
+    int ret = 0;
+
+    /* Note we here rely on fact that MD_SPAN_A_DETAIL and
+     * MD_SPAN_IMG_DETAIL are binary-compatible. */
+    memset(&det, 0, sizeof(MD_SPAN_A_DETAIL));
+    MD_CHECK(md_build_attribute(ctx, dest, dest_size,
+                    (prohibit_escapes_in_dest ? MD_BUILD_ATTR_NO_ESCAPES : 0),
+                    &det.href, &href_build));
+    MD_CHECK(md_build_attribute(ctx, title, title_size, 0, &det.title, &title_build));
+
+    if(enter)
+        MD_ENTER_SPAN(type, &det);
+    else
+        MD_LEAVE_SPAN(type, &det);
+
+abort:
+    md_free_attribute(ctx, &href_build);
+    md_free_attribute(ctx, &title_build);
+    return ret;
+}
+
+/* Render the output, accordingly to the analyzed ctx->marks. */
+static int
+md_process_inlines(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
+{
+    MD_TEXTTYPE text_type;
+    const MD_LINE* line = lines;
+    MD_MARK* prev_mark = NULL;
+    MD_MARK* mark;
+    OFF off = lines[0].beg;
+    OFF end = lines[n_lines-1].end;
+    int enforce_hardbreak = 0;
+    int ret = 0;
+
+    /* Find first resolved mark. Note there is always at least one resolved
+     * mark,  the dummy last one after the end of the latest line we actually
+     * never really reach. This saves us of a lot of special checks and cases
+     * in this function. */
+    mark = ctx->marks;
+    while(!(mark->flags & MD_MARK_RESOLVED))
+        mark++;
+
+    text_type = MD_TEXT_NORMAL;
+
+    while(1) {
+        /* Process the text up to the next mark or end-of-line. */
+        OFF tmp = (line->end < mark->beg ? line->end : mark->beg);
+        if(tmp > off) {
+            MD_TEXT(text_type, STR(off), tmp - off);
+            off = tmp;
+        }
+
+        /* If reached the mark, process it and move to next one. */
+        if(off >= mark->beg) {
+            switch(mark->ch) {
+                case '\\':      /* Backslash escape. */
+                    if(ISNEWLINE(mark->beg+1))
+                        enforce_hardbreak = 1;
+                    else
+                        MD_TEXT(text_type, STR(mark->beg+1), 1);
+                    break;
+
+                case ' ':       /* Non-trivial space. */
+                    MD_TEXT(text_type, _T(" "), 1);
+                    break;
+
+                case '`':       /* Code span. */
+                    if(mark->flags & MD_MARK_OPENER) {
+                        MD_ENTER_SPAN(MD_SPAN_CODE, NULL);
+                        text_type = MD_TEXT_CODE;
+                    } else {
+                        MD_LEAVE_SPAN(MD_SPAN_CODE, NULL);
+                        text_type = MD_TEXT_NORMAL;
+                    }
+                    break;
+
+                case '_':
+                case '*':       /* Emphasis, strong emphasis. */
+                    if(mark->flags & MD_MARK_OPENER) {
+                        if((mark->end - off) % 2) {
+                            MD_ENTER_SPAN(MD_SPAN_EM, NULL);
+                            off++;
+                        }
+                        while(off + 1 < mark->end) {
+                            MD_ENTER_SPAN(MD_SPAN_STRONG, NULL);
+                            off += 2;
+                        }
+                    } else {
+                        while(off + 1 < mark->end) {
+                            MD_LEAVE_SPAN(MD_SPAN_STRONG, NULL);
+                            off += 2;
+                        }
+                        if((mark->end - off) % 2) {
+                            MD_LEAVE_SPAN(MD_SPAN_EM, NULL);
+                            off++;
+                        }
+                    }
+                    break;
+
+                case '~':
+                    if(mark->flags & MD_MARK_OPENER)
+                        MD_ENTER_SPAN(MD_SPAN_DEL, NULL);
+                    else
+                        MD_LEAVE_SPAN(MD_SPAN_DEL, NULL);
+                    break;
+
+                case '[':       /* Link, image. */
+                case '!':
+                case ']':
+                {
+                    const MD_MARK* opener = (mark->ch != ']' ? mark : &ctx->marks[mark->prev]);
+                    const MD_MARK* dest_mark = opener+1;
+                    const MD_MARK* title_mark = opener+2;
+
+                    MD_ASSERT(dest_mark->ch == 'D');
+                    MD_ASSERT(title_mark->ch == 'D');
+
+                    MD_CHECK(md_enter_leave_span_a(ctx, (mark->ch != ']'),
+                                (opener->ch == '!' ? MD_SPAN_IMG : MD_SPAN_A),
+                                STR(dest_mark->beg), dest_mark->end - dest_mark->beg, FALSE,
+                                md_mark_get_ptr(ctx, title_mark - ctx->marks), title_mark->prev));
+
+                    /* link/image closer may span multiple lines. */
+                    if(mark->ch == ']') {
+                        while(mark->end > line->end)
+                            line++;
+                    }
+
+                    break;
+                }
+
+                case '<':
+                case '>':       /* Autolink or raw HTML. */
+                    if(!(mark->flags & MD_MARK_AUTOLINK)) {
+                        /* Raw HTML. */
+                        if(mark->flags & MD_MARK_OPENER)
+                            text_type = MD_TEXT_HTML;
+                        else
+                            text_type = MD_TEXT_NORMAL;
+                        break;
+                    }
+                    /* Pass through, if auto-link. */
+
+                case '@':       /* Permissive e-mail autolink. */
+                case ':':       /* Permissive URL autolink. */
+                case '.':       /* Permissive WWW autolink. */
+                {
+                    MD_MARK* opener = ((mark->flags & MD_MARK_OPENER) ? mark : &ctx->marks[mark->prev]);
+                    MD_MARK* closer = &ctx->marks[opener->next];
+                    const CHAR* dest = STR(opener->end);
+                    SZ dest_size = closer->beg - opener->end;
+
+                    /* For permissive auto-links we do not know closer mark
+                     * position at the time of md_collect_marks(), therefore
+                     * it can be out-of-order in ctx->marks[].
+                     *
+                     * With this flag, we make sure that we output the closer
+                     * only if we processed the opener. */
+                    if(mark->flags & MD_MARK_OPENER)
+                        closer->flags |= MD_MARK_VALIDPERMISSIVEAUTOLINK;
+
+                    if(opener->ch == '@' || opener->ch == '.') {
+                        dest_size += 7;
+                        MD_TEMP_BUFFER(dest_size * sizeof(CHAR));
+                        memcpy(ctx->buffer,
+                                (opener->ch == '@' ? _T("mailto:") : _T("http://")),
+                                7 * sizeof(CHAR));
+                        memcpy(ctx->buffer + 7, dest, (dest_size-7) * sizeof(CHAR));
+                        dest = ctx->buffer;
+                    }
+
+                    if(closer->flags & MD_MARK_VALIDPERMISSIVEAUTOLINK)
+                        MD_CHECK(md_enter_leave_span_a(ctx, (mark->flags & MD_MARK_OPENER),
+                                    MD_SPAN_A, dest, dest_size, TRUE, NULL, 0));
+                    break;
+                }
+
+                case '&':       /* Entity. */
+                    MD_TEXT(MD_TEXT_ENTITY, STR(mark->beg), mark->end - mark->beg);
+                    break;
+
+                case '\0':
+                    MD_TEXT(MD_TEXT_NULLCHAR, _T(""), 1);
+                    break;
+
+                case 127:
+                    goto abort;
+            }
+
+            off = mark->end;
+
+            /* Move to next resolved mark. */
+            prev_mark = mark;
+            mark++;
+            while(!(mark->flags & MD_MARK_RESOLVED)  ||  mark->beg < off)
+                mark++;
+        }
+
+        /* If reached end of line, move to next one. */
+        if(off >= line->end) {
+            /* If it is the last line, we are done. */
+            if(off >= end)
+                break;
+
+            if(text_type == MD_TEXT_CODE) {
+                OFF tmp;
+
+                MD_ASSERT(prev_mark != NULL);
+                MD_ASSERT(prev_mark->ch == '`'  &&  (prev_mark->flags & MD_MARK_OPENER));
+                MD_ASSERT(mark->ch == '`'  &&  (mark->flags & MD_MARK_CLOSER));
+
+                /* Inside a code span, trailing line whitespace has to be
+                 * outputted. */
+                tmp = off;
+                while(off < ctx->size  &&  ISBLANK(off))
+                    off++;
+                if(off > tmp)
+                    MD_TEXT(MD_TEXT_CODE, STR(tmp), off-tmp);
+
+                /* and new lines are transformed into single spaces. */
+                if(prev_mark->end < off  &&  off < mark->beg)
+                    MD_TEXT(MD_TEXT_CODE, _T(" "), 1);
+
+            } else if(text_type == MD_TEXT_HTML) {
+                /* Inside raw HTML, we output the new line verbatim, including
+                 * any trailing spaces. */
+                OFF tmp = off;
+
+                while(tmp < end  &&  ISBLANK(tmp))
+                    tmp++;
+                if(tmp > off)
+                    MD_TEXT(MD_TEXT_HTML, STR(off), tmp - off);
+                MD_TEXT(MD_TEXT_HTML, _T("\n"), 1);
+            } else {
+                /* Output soft or hard line break. */
+                MD_TEXTTYPE break_type = MD_TEXT_SOFTBR;
+
+                if(text_type == MD_TEXT_NORMAL) {
+                    if(enforce_hardbreak)
+                        break_type = MD_TEXT_BR;
+                    else if((CH(line->end) == _T(' ') && CH(line->end+1) == _T(' ')))
+                        break_type = MD_TEXT_BR;
+                }
+
+                MD_TEXT(break_type, _T("\n"), 1);
+            }
+
+            /* Move to the next line. */
+            line++;
+            off = line->beg;
+
+            enforce_hardbreak = 0;
+        }
+    }
+
+abort:
+    return ret;
+}
+
+
+/***************************
+ ***  Processing Tables  ***
+ ***************************/
+
+static void
+md_analyze_table_alignment(MD_CTX* ctx, OFF beg, OFF end, MD_ALIGN* align, int n_align)
+{
+    static const MD_ALIGN align_map[] = { MD_ALIGN_DEFAULT, MD_ALIGN_LEFT, MD_ALIGN_RIGHT, MD_ALIGN_CENTER };
+    OFF off = beg;
+
+    while(n_align > 0) {
+        int index = 0;  /* index into align_map[] */
+
+        while(CH(off) != _T('-'))
+            off++;
+        if(off > beg  &&  CH(off-1) == _T(':'))
+            index |= 1;
+        while(off < end  &&  CH(off) == _T('-'))
+            off++;
+        if(off < end  &&  CH(off) == _T(':'))
+            index |= 2;
+
+        *align = align_map[index];
+        align++;
+        n_align--;
+    }
+
+}
+
+/* Forward declaration. */
+static int md_process_normal_block_contents(MD_CTX* ctx, const MD_LINE* lines, int n_lines);
+
+static int
+md_process_table_cell(MD_CTX* ctx, MD_BLOCKTYPE cell_type, MD_ALIGN align, OFF beg, OFF end)
+{
+    MD_LINE line;
+    MD_BLOCK_TD_DETAIL det;
+    int ret = 0;
+
+    while(beg < end  &&  ISWHITESPACE(beg))
+        beg++;
+    while(end > beg  &&  ISWHITESPACE(end-1))
+        end--;
+
+    det.align = align;
+    line.beg = beg;
+    line.end = end;
+
+    MD_ENTER_BLOCK(cell_type, &det);
+    MD_CHECK(md_process_normal_block_contents(ctx, &line, 1));
+    MD_LEAVE_BLOCK(cell_type, &det);
+
+abort:
+    return ret;
+}
+
+static int
+md_process_table_row(MD_CTX* ctx, MD_BLOCKTYPE cell_type, OFF beg, OFF end,
+                     const MD_ALIGN* align, int col_count)
+{
+    MD_LINE line;
+    OFF* pipe_offs = NULL;
+    int i, j, n;
+    int ret = 0;
+
+    line.beg = beg;
+    line.end = end;
+
+    /* Break the line into table cells by identifying pipe characters who
+     * form the cell boundary. */
+    MD_CHECK(md_analyze_inlines(ctx, &line, 1, TRUE));
+
+    /* We have to remember the cell boundaries in local buffer because
+     * ctx->marks[] shall be reused during cell contents processing. */
+    n = ctx->n_table_cell_boundaries;
+    pipe_offs = (OFF*) malloc(n * sizeof(OFF));
+    if(pipe_offs == NULL) {
+        MD_LOG("malloc() failed.");
+        ret = -1;
+        goto abort;
+    }
+    for(i = TABLECELLBOUNDARIES.head, j = 0; i >= 0; i = ctx->marks[i].next) {
+        MD_MARK* mark = &ctx->marks[i];
+        pipe_offs[j++] = mark->beg;
+    }
+
+    /* Process cells. */
+    MD_ENTER_BLOCK(MD_BLOCK_TR, NULL);
+    j = 0;
+    if(beg < pipe_offs[0]  &&  j < col_count)
+        MD_CHECK(md_process_table_cell(ctx, cell_type, align[j++], beg, pipe_offs[0]));
+    for(i = 0; i < n-1  &&  j < col_count; i++)
+        MD_CHECK(md_process_table_cell(ctx, cell_type, align[j++], pipe_offs[i]+1, pipe_offs[i+1]));
+    if(pipe_offs[n-1] < end-1  &&  j < col_count)
+        MD_CHECK(md_process_table_cell(ctx, cell_type, align[j++], pipe_offs[n-1]+1, end));
+    /* Make sure we call enough table cells even if the current table contains
+     * too few of them. */
+    while(j < col_count)
+        MD_CHECK(md_process_table_cell(ctx, cell_type, align[j++], 0, 0));
+
+    MD_LEAVE_BLOCK(MD_BLOCK_TR, NULL);
+
+abort:
+    free(pipe_offs);
+
+    /* Free any temporary memory blocks stored within some dummy marks. */
+    for(i = PTR_CHAIN.head; i >= 0; i = ctx->marks[i].next)
+        free(md_mark_get_ptr(ctx, i));
+    PTR_CHAIN.head = -1;
+    PTR_CHAIN.tail = -1;
+
+    return ret;
+}
+
+static int
+md_process_table_block_contents(MD_CTX* ctx, int col_count, const MD_LINE* lines, int n_lines)
+{
+    MD_ALIGN* align;
+    int i;
+    int ret = 0;
+
+    /* At least two lines have to be present: The column headers and the line
+     * with the underlines. */
+    MD_ASSERT(n_lines >= 2);
+
+    align = malloc(col_count * sizeof(MD_ALIGN));
+    if(align == NULL) {
+        MD_LOG("malloc() failed.");
+        ret = -1;
+        goto abort;
+    }
+
+    md_analyze_table_alignment(ctx, lines[1].beg, lines[1].end, align, col_count);
+
+    MD_ENTER_BLOCK(MD_BLOCK_THEAD, NULL);
+    MD_CHECK(md_process_table_row(ctx, MD_BLOCK_TH,
+                        lines[0].beg, lines[0].end, align, col_count));
+    MD_LEAVE_BLOCK(MD_BLOCK_THEAD, NULL);
+
+    MD_ENTER_BLOCK(MD_BLOCK_TBODY, NULL);
+    for(i = 2; i < n_lines; i++) {
+        MD_CHECK(md_process_table_row(ctx, MD_BLOCK_TD,
+                        lines[i].beg, lines[i].end, align, col_count));
+    }
+    MD_LEAVE_BLOCK(MD_BLOCK_TBODY, NULL);
+
+abort:
+    free(align);
+    return ret;
+}
+
+static int
+md_is_table_row(MD_CTX* ctx, OFF beg, OFF* p_end)
+{
+    MD_LINE line;
+    int i;
+    int ret = FALSE;
+
+    line.beg = beg;
+    line.end = beg;
+
+    /* Find end of line. */
+    while(line.end < ctx->size  &&  !ISNEWLINE(line.end))
+        line.end++;
+
+    MD_CHECK(md_analyze_inlines(ctx, &line, 1, TRUE));
+
+    if(TABLECELLBOUNDARIES.head >= 0) {
+        if(p_end != NULL)
+            *p_end = line.end;
+        ret = TRUE;
+    }
+
+abort:
+    /* Free any temporary memory blocks stored within some dummy marks. */
+    for(i = PTR_CHAIN.head; i >= 0; i = ctx->marks[i].next)
+        free(md_mark_get_ptr(ctx, i));
+    PTR_CHAIN.head = -1;
+    PTR_CHAIN.tail = -1;
+
+    return ret;
+}
+
+
+/**************************
+ ***  Processing Block  ***
+ **************************/
+
+#define MD_BLOCK_CONTAINER_OPENER   0x01
+#define MD_BLOCK_CONTAINER_CLOSER   0x02
+#define MD_BLOCK_CONTAINER          (MD_BLOCK_CONTAINER_OPENER | MD_BLOCK_CONTAINER_CLOSER)
+#define MD_BLOCK_LOOSE_LIST         0x04
+#define MD_BLOCK_SETEXT_HEADER      0x08
+
+struct MD_BLOCK_tag {
+    MD_BLOCKTYPE type  :  8;
+    unsigned flags     :  8;
+
+    /* MD_BLOCK_H:      Header level (1 - 6)
+     * MD_BLOCK_CODE:   Non-zero if fenced, zero if indented.
+     * MD_BLOCK_LI:     Task mark character (0 if not task list item, 'x', 'X' or ' ').
+     * MD_BLOCK_TABLE:  Column count (as determined by the table underline).
+     */
+    unsigned data      : 16;
+
+    /* Leaf blocks:     Count of lines (MD_LINE or MD_VERBATIMLINE) on the block.
+     * MD_BLOCK_LI:     Task mark offset in the input doc.
+     * MD_BLOCK_OL:     Start item number.
+     */
+    unsigned n_lines;
+};
+
+struct MD_CONTAINER_tag {
+    CHAR ch;
+    unsigned is_loose    : 8;
+    unsigned is_task     : 8;
+    unsigned start;
+    unsigned mark_indent;
+    unsigned contents_indent;
+    OFF block_byte_off;
+    OFF task_mark_off;
+};
+
+
+static int
+md_process_normal_block_contents(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
+{
+    int i;
+    int ret;
+
+    MD_CHECK(md_analyze_inlines(ctx, lines, n_lines, FALSE));
+    MD_CHECK(md_process_inlines(ctx, lines, n_lines));
+
+abort:
+    /* Free any temporary memory blocks stored within some dummy marks. */
+    for(i = PTR_CHAIN.head; i >= 0; i = ctx->marks[i].next)
+        free(md_mark_get_ptr(ctx, i));
+    PTR_CHAIN.head = -1;
+    PTR_CHAIN.tail = -1;
+
+    return ret;
+}
+
+static int
+md_process_verbatim_block_contents(MD_CTX* ctx, MD_TEXTTYPE text_type, const MD_VERBATIMLINE* lines, int n_lines)
+{
+    static const CHAR indent_chunk_str[] = _T("                ");
+    static const SZ indent_chunk_size = SIZEOF_ARRAY(indent_chunk_str) - 1;
+
+    int i;
+    int ret = 0;
+
+    for(i = 0; i < n_lines; i++) {
+        const MD_VERBATIMLINE* line = &lines[i];
+        int indent = line->indent;
+
+        MD_ASSERT(indent >= 0);
+
+        /* Output code indentation. */
+        while(indent > (int) SIZEOF_ARRAY(indent_chunk_str)) {
+            MD_TEXT(text_type, indent_chunk_str, indent_chunk_size);
+            indent -= SIZEOF_ARRAY(indent_chunk_str);
+        }
+        if(indent > 0)
+            MD_TEXT(text_type, indent_chunk_str, indent);
+
+        /* Output the code line itself. */
+        MD_TEXT_INSECURE(text_type, STR(line->beg), line->end - line->beg);
+
+        /* Enforce end-of-line. */
+        MD_TEXT(text_type, _T("\n"), 1);
+    }
+
+abort:
+    return ret;
+}
+
+static int
+md_process_code_block_contents(MD_CTX* ctx, int is_fenced, const MD_VERBATIMLINE* lines, int n_lines)
+{
+    if(is_fenced) {
+        /* Skip the first line in case of fenced code: It is the fence.
+         * (Only the starting fence is present due to logic in md_analyze_line().) */
+        lines++;
+        n_lines--;
+    } else {
+        /* Ignore blank lines at start/end of indented code block. */
+        while(n_lines > 0  &&  lines[0].beg == lines[0].end) {
+            lines++;
+            n_lines--;
+        }
+        while(n_lines > 0  &&  lines[n_lines-1].beg == lines[n_lines-1].end) {
+            n_lines--;
+        }
+    }
+
+    if(n_lines == 0)
+        return 0;
+
+    return md_process_verbatim_block_contents(ctx, MD_TEXT_CODE, lines, n_lines);
+}
+
+static int
+md_setup_fenced_code_detail(MD_CTX* ctx, const MD_BLOCK* block, MD_BLOCK_CODE_DETAIL* det,
+                            MD_ATTRIBUTE_BUILD* info_build, MD_ATTRIBUTE_BUILD* lang_build)
+{
+    const MD_VERBATIMLINE* fence_line = (const MD_VERBATIMLINE*)(block + 1);
+    OFF beg = fence_line->beg;
+    OFF end = fence_line->end;
+    OFF lang_end;
+    CHAR fence_ch = CH(fence_line->beg);
+    int ret = 0;
+
+    /* Skip the fence itself. */
+    while(beg < ctx->size  &&  CH(beg) == fence_ch)
+        beg++;
+    /* Trim initial spaces. */
+    while(beg < ctx->size  &&  CH(beg) == _T(' '))
+        beg++;
+
+    /* Trim trailing spaces. */
+    while(end > beg  &&  CH(end-1) == _T(' '))
+        end--;
+
+    /* Build info string attribute. */
+    MD_CHECK(md_build_attribute(ctx, STR(beg), end - beg, 0, &det->info, info_build));
+
+    /* Build info string attribute. */
+    lang_end = beg;
+    while(lang_end < end  &&  !ISWHITESPACE(lang_end))
+        lang_end++;
+    MD_CHECK(md_build_attribute(ctx, STR(beg), lang_end - beg, 0, &det->lang, lang_build));
+
+    det->fence_char = fence_ch;
+
+abort:
+    return ret;
+}
+
+static int
+md_process_leaf_block(MD_CTX* ctx, const MD_BLOCK* block)
+{
+    union {
+        MD_BLOCK_H_DETAIL header;
+        MD_BLOCK_CODE_DETAIL code;
+    } det;
+    MD_ATTRIBUTE_BUILD info_build;
+    MD_ATTRIBUTE_BUILD lang_build;
+    int is_in_tight_list;
+    int clean_fence_code_detail = FALSE;
+    int ret = 0;
+
+    memset(&det, 0, sizeof(det));
+
+    if(ctx->n_containers == 0)
+        is_in_tight_list = FALSE;
+    else
+        is_in_tight_list = !ctx->containers[ctx->n_containers-1].is_loose;
+
+    switch(block->type) {
+        case MD_BLOCK_H:
+            det.header.level = block->data;
+            break;
+
+        case MD_BLOCK_CODE:
+            /* For fenced code block, we may need to set the info string. */
+            if(block->data != 0) {
+                memset(&det.code, 0, sizeof(MD_BLOCK_CODE_DETAIL));
+                clean_fence_code_detail = TRUE;
+                MD_CHECK(md_setup_fenced_code_detail(ctx, block, &det.code, &info_build, &lang_build));
+            }
+            break;
+
+        default:
+            /* Noop. */
+            break;
+    }
+
+    if(!is_in_tight_list  ||  block->type != MD_BLOCK_P)
+        MD_ENTER_BLOCK(block->type, (void*) &det);
+
+    /* Process the block contents accordingly to is type. */
+    switch(block->type) {
+        case MD_BLOCK_HR:
+            /* noop */
+            break;
+
+        case MD_BLOCK_CODE:
+            MD_CHECK(md_process_code_block_contents(ctx, (block->data != 0),
+                            (const MD_VERBATIMLINE*)(block + 1), block->n_lines));
+            break;
+
+        case MD_BLOCK_HTML:
+            MD_CHECK(md_process_verbatim_block_contents(ctx, MD_TEXT_HTML,
+                            (const MD_VERBATIMLINE*)(block + 1), block->n_lines));
+            break;
+
+        case MD_BLOCK_TABLE:
+            MD_CHECK(md_process_table_block_contents(ctx, block->data,
+                            (const MD_LINE*)(block + 1), block->n_lines));
+            break;
+
+        default:
+            MD_CHECK(md_process_normal_block_contents(ctx,
+                            (const MD_LINE*)(block + 1), block->n_lines));
+            break;
+    }
+
+    if(!is_in_tight_list  ||  block->type != MD_BLOCK_P)
+        MD_LEAVE_BLOCK(block->type, (void*) &det);
+
+abort:
+    if(clean_fence_code_detail) {
+        md_free_attribute(ctx, &info_build);
+        md_free_attribute(ctx, &lang_build);
+    }
+    return ret;
+}
+
+static int
+md_process_all_blocks(MD_CTX* ctx)
+{
+    int byte_off = 0;
+    int ret = 0;
+
+    /* ctx->containers now is not needed for detection of lists and list items
+     * so we reuse it for tracking what lists are loose or tight. We rely
+     * on the fact the vector is large enough to hold the deepest nesting
+     * level of lists. */
+    ctx->n_containers = 0;
+
+    while(byte_off < ctx->n_block_bytes) {
+        MD_BLOCK* block = (MD_BLOCK*)((char*)ctx->block_bytes + byte_off);
+        union {
+            MD_BLOCK_UL_DETAIL ul;
+            MD_BLOCK_OL_DETAIL ol;
+            MD_BLOCK_LI_DETAIL li;
+        } det;
+
+        switch(block->type) {
+            case MD_BLOCK_UL:
+                det.ul.is_tight = (block->flags & MD_BLOCK_LOOSE_LIST) ? FALSE : TRUE;
+                det.ul.mark = (CHAR) block->data;
+                break;
+
+            case MD_BLOCK_OL:
+                det.ol.start = block->n_lines;
+                det.ol.is_tight =  (block->flags & MD_BLOCK_LOOSE_LIST) ? FALSE : TRUE;
+                det.ol.mark_delimiter = (CHAR) block->data;
+                break;
+
+            case MD_BLOCK_LI:
+                det.li.is_task = (block->data != 0);
+                det.li.task_mark = (CHAR) block->data;
+                det.li.task_mark_offset = (OFF) block->n_lines;
+                break;
+
+            default:
+                /* noop */
+                break;
+        }
+
+        if(block->flags & MD_BLOCK_CONTAINER) {
+            if(block->flags & MD_BLOCK_CONTAINER_CLOSER) {
+                MD_LEAVE_BLOCK(block->type, &det);
+
+                if(block->type == MD_BLOCK_UL || block->type == MD_BLOCK_OL || block->type == MD_BLOCK_QUOTE)
+                    ctx->n_containers--;
+            }
+
+            if(block->flags & MD_BLOCK_CONTAINER_OPENER) {
+                MD_ENTER_BLOCK(block->type, &det);
+
+                if(block->type == MD_BLOCK_UL || block->type == MD_BLOCK_OL) {
+                    ctx->containers[ctx->n_containers].is_loose = (block->flags & MD_BLOCK_LOOSE_LIST);
+                    ctx->n_containers++;
+                } else if(block->type == MD_BLOCK_QUOTE) {
+                    /* This causes that any text in a block quote, even if
+                     * nested inside a tight list item, is wrapped with
+                     * <p>...</p>. */
+                    ctx->containers[ctx->n_containers].is_loose = TRUE;
+                    ctx->n_containers++;
+                }
+            }
+        } else {
+            MD_CHECK(md_process_leaf_block(ctx, block));
+
+            if(block->type == MD_BLOCK_CODE || block->type == MD_BLOCK_HTML)
+                byte_off += block->n_lines * sizeof(MD_VERBATIMLINE);
+            else
+                byte_off += block->n_lines * sizeof(MD_LINE);
+        }
+
+        byte_off += sizeof(MD_BLOCK);
+    }
+
+    ctx->n_block_bytes = 0;
+
+abort:
+    return ret;
+}
+
+
+/************************************
+ ***  Grouping Lines into Blocks  ***
+ ************************************/
+
+static void*
+md_push_block_bytes(MD_CTX* ctx, int n_bytes)
+{
+    void* ptr;
+
+    if(ctx->n_block_bytes + n_bytes > ctx->alloc_block_bytes) {
+        void* new_block_bytes;
+
+        ctx->alloc_block_bytes = (ctx->alloc_block_bytes > 0 ? ctx->alloc_block_bytes * 2 : 512);
+        new_block_bytes = realloc(ctx->block_bytes, ctx->alloc_block_bytes);
+        if(new_block_bytes == NULL) {
+            MD_LOG("realloc() failed.");
+            return NULL;
+        }
+
+        /* Fix the ->current_block after the reallocation. */
+        if(ctx->current_block != NULL) {
+            OFF off_current_block = (char*) ctx->current_block - (char*) ctx->block_bytes;
+            ctx->current_block = (MD_BLOCK*) ((char*) new_block_bytes + off_current_block);
+        }
+
+        ctx->block_bytes = new_block_bytes;
+    }
+
+    ptr = (char*)ctx->block_bytes + ctx->n_block_bytes;
+    ctx->n_block_bytes += n_bytes;
+    return ptr;
+}
+
+static int
+md_start_new_block(MD_CTX* ctx, const MD_LINE_ANALYSIS* line)
+{
+    MD_BLOCK* block;
+
+    MD_ASSERT(ctx->current_block == NULL);
+
+    block = (MD_BLOCK*) md_push_block_bytes(ctx, sizeof(MD_BLOCK));
+    if(block == NULL)
+        return -1;
+
+    switch(line->type) {
+        case MD_LINE_HR:
+            block->type = MD_BLOCK_HR;
+            break;
+
+        case MD_LINE_ATXHEADER:
+        case MD_LINE_SETEXTHEADER:
+            block->type = MD_BLOCK_H;
+            break;
+
+        case MD_LINE_FENCEDCODE:
+        case MD_LINE_INDENTEDCODE:
+            block->type = MD_BLOCK_CODE;
+            break;
+
+        case MD_LINE_TEXT:
+            block->type = MD_BLOCK_P;
+            break;
+
+        case MD_LINE_HTML:
+            block->type = MD_BLOCK_HTML;
+            break;
+
+        case MD_LINE_BLANK:
+        case MD_LINE_SETEXTUNDERLINE:
+        case MD_LINE_TABLEUNDERLINE:
+        default:
+            MD_UNREACHABLE();
+            break;
+    }
+
+    block->flags = 0;
+    block->data = line->data;
+    block->n_lines = 0;
+
+    ctx->current_block = block;
+    return 0;
+}
+
+/* Eat from start of current (textual) block any reference definitions and
+ * remember them so we can resolve any links referring to them.
+ *
+ * (Reference definitions can only be at start of it as they cannot break
+ * a paragraph.)
+ */
+static int
+md_consume_link_reference_definitions(MD_CTX* ctx)
+{
+    MD_LINE* lines = (MD_LINE*) (ctx->current_block + 1);
+    int n_lines = ctx->current_block->n_lines;
+    int n = 0;
+
+    /* Compute how many lines at the start of the block form one or more
+     * reference definitions. */
+    while(n < n_lines) {
+        int n_link_ref_lines;
+
+        n_link_ref_lines = md_is_link_reference_definition(ctx,
+                                    lines + n, n_lines - n);
+        /* Not a reference definition? */
+        if(n_link_ref_lines == 0)
+            break;
+
+        /* We fail if it is the ref. def. but it could not be stored due
+         * a memory allocation error. */
+        if(n_link_ref_lines < 0)
+            return -1;
+
+        n += n_link_ref_lines;
+    }
+
+    /* If there was at least one reference definition, we need to remove
+     * its lines from the block, or perhaps even the whole block. */
+    if(n > 0) {
+        if(n == n_lines) {
+            /* Remove complete block. */
+            ctx->n_block_bytes -= n * sizeof(MD_LINE);
+            ctx->n_block_bytes -= sizeof(MD_BLOCK);
+            ctx->current_block = NULL;
+        } else {
+            /* Remove just some initial lines from the block. */
+            memmove(lines, lines + n, (n_lines - n) * sizeof(MD_LINE));
+            ctx->current_block->n_lines -= n;
+            ctx->n_block_bytes -= n * sizeof(MD_LINE);
+        }
+    }
+
+    return 0;
+}
+
+static int
+md_end_current_block(MD_CTX* ctx)
+{
+    int ret = 0;
+
+    if(ctx->current_block == NULL)
+        return ret;
+
+    /* Check whether there is a reference definition. (We do this here instead
+     * of in md_analyze_line() because reference definition can take multiple
+     * lines.) */
+    if(ctx->current_block->type == MD_BLOCK_P  ||
+       (ctx->current_block->type == MD_BLOCK_H  &&  (ctx->current_block->flags & MD_BLOCK_SETEXT_HEADER)))
+    {
+        MD_LINE* lines = (MD_LINE*) (ctx->current_block + 1);
+        if(CH(lines[0].beg) == _T('[')) {
+            MD_CHECK(md_consume_link_reference_definitions(ctx));
+            if(ctx->current_block == NULL)
+                return ret;
+        }
+    }
+
+    if(ctx->current_block->type == MD_BLOCK_H  &&  (ctx->current_block->flags & MD_BLOCK_SETEXT_HEADER)) {
+        int n_lines = ctx->current_block->n_lines;
+
+        if(n_lines > 1) {
+            /* Get rid of the underline. */
+            ctx->current_block->n_lines--;
+            ctx->n_block_bytes -= sizeof(MD_LINE);
+        } else {
+            /* Only the underline has left after eating the ref. defs.
+             * Keep the line as beginning of a new ordinary paragraph. */
+            ctx->current_block->type = MD_BLOCK_P;
+            return 0;
+        }
+    }
+
+    /* Mark we are not building any block anymore. */
+    ctx->current_block = NULL;
+
+abort:
+    return ret;
+}
+
+static int
+md_add_line_into_current_block(MD_CTX* ctx, const MD_LINE_ANALYSIS* analysis)
+{
+    MD_ASSERT(ctx->current_block != NULL);
+
+    if(ctx->current_block->type == MD_BLOCK_CODE || ctx->current_block->type == MD_BLOCK_HTML) {
+        MD_VERBATIMLINE* line;
+
+        line = (MD_VERBATIMLINE*) md_push_block_bytes(ctx, sizeof(MD_VERBATIMLINE));
+        if(line == NULL)
+            return -1;
+
+        line->indent = analysis->indent;
+        line->beg = analysis->beg;
+        line->end = analysis->end;
+    } else {
+        MD_LINE* line;
+
+        line = (MD_LINE*) md_push_block_bytes(ctx, sizeof(MD_LINE));
+        if(line == NULL)
+            return -1;
+
+        line->beg = analysis->beg;
+        line->end = analysis->end;
+    }
+    ctx->current_block->n_lines++;
+
+    return 0;
+}
+
+static int
+md_push_container_bytes(MD_CTX* ctx, MD_BLOCKTYPE type, unsigned start,
+                        unsigned data, unsigned flags)
+{
+    MD_BLOCK* block;
+    int ret = 0;
+
+    MD_CHECK(md_end_current_block(ctx));
+
+    block = (MD_BLOCK*) md_push_block_bytes(ctx, sizeof(MD_BLOCK));
+    if(block == NULL)
+        return -1;
+
+    block->type = type;
+    block->flags = flags;
+    block->data = data;
+    block->n_lines = start;
+
+abort:
+    return ret;
+}
+
+
+
+/***********************
+ ***  Line Analysis  ***
+ ***********************/
+
+static int
+md_is_hr_line(MD_CTX* ctx, OFF beg, OFF* p_end, OFF* p_killer)
+{
+    OFF off = beg + 1;
+    int n = 1;
+
+    while(off < ctx->size  &&  (CH(off) == CH(beg) || CH(off) == _T(' ') || CH(off) == _T('\t'))) {
+        if(CH(off) == CH(beg))
+            n++;
+        off++;
+    }
+
+    if(n < 3) {
+        *p_killer = off;
+        return FALSE;
+    }
+
+    /* Nothing else can be present on the line. */
+    if(off < ctx->size  &&  !ISNEWLINE(off)) {
+        *p_killer = off;
+        return FALSE;
+    }
+
+    *p_end = off;
+    return TRUE;
+}
+
+static int
+md_is_atxheader_line(MD_CTX* ctx, OFF beg, OFF* p_beg, OFF* p_end, unsigned* p_level)
+{
+    int n;
+    OFF off = beg + 1;
+
+    while(off < ctx->size  &&  CH(off) == _T('#')  &&  off - beg < 7)
+        off++;
+    n = off - beg;
+
+    if(n > 6)
+        return FALSE;
+    *p_level = n;
+
+    if(!(ctx->parser.flags & MD_FLAG_PERMISSIVEATXHEADERS)  &&  off < ctx->size  &&
+       CH(off) != _T(' ')  &&  CH(off) != _T('\t')  &&  !ISNEWLINE(off))
+        return FALSE;
+
+    while(off < ctx->size  &&  CH(off) == _T(' '))
+        off++;
+    *p_beg = off;
+    *p_end = off;
+    return TRUE;
+}
+
+static int
+md_is_setext_underline(MD_CTX* ctx, OFF beg, OFF* p_end, unsigned* p_level)
+{
+    OFF off = beg + 1;
+
+    while(off < ctx->size  &&  CH(off) == CH(beg))
+        off++;
+
+    /* Optionally, space(s) can follow. */
+    while(off < ctx->size  &&  CH(off) == _T(' '))
+        off++;
+
+    /* But nothing more is allowed on the line. */
+    if(off < ctx->size  &&  !ISNEWLINE(off))
+        return FALSE;
+
+    *p_level = (CH(beg) == _T('=') ? 1 : 2);
+    *p_end = off;
+    return TRUE;
+}
+
+static int
+md_is_table_underline(MD_CTX* ctx, OFF beg, OFF* p_end, unsigned* p_col_count)
+{
+    OFF off = beg;
+    int found_pipe = FALSE;
+    unsigned col_count = 0;
+
+    if(off < ctx->size  &&  CH(off) == _T('|')) {
+        found_pipe = TRUE;
+        off++;
+        while(off < ctx->size  &&  ISWHITESPACE(off))
+            off++;
+    }
+
+    while(1) {
+        OFF cell_beg;
+        int delimited = FALSE;
+
+        /* Cell underline ("-----", ":----", "----:" or ":----:") */
+        cell_beg = off;
+        if(off < ctx->size  &&  CH(off) == _T(':'))
+            off++;
+        while(off < ctx->size  &&  CH(off) == _T('-'))
+            off++;
+        if(off < ctx->size  &&  CH(off) == _T(':'))
+            off++;
+        if(off - cell_beg < 3)
+            return FALSE;
+
+        col_count++;
+
+        /* Pipe delimiter (optional at the end of line). */
+        while(off < ctx->size  &&  ISWHITESPACE(off))
+            off++;
+        if(off < ctx->size  &&  CH(off) == _T('|')) {
+            delimited = TRUE;
+            found_pipe =  TRUE;
+            off++;
+            while(off < ctx->size  &&  ISWHITESPACE(off))
+                off++;
+        }
+
+        /* Success, if we reach end of line. */
+        if(off >= ctx->size  ||  ISNEWLINE(off))
+            break;
+
+        if(!delimited)
+            return FALSE;
+    }
+
+    if(!found_pipe)
+        return FALSE;
+
+    *p_end = off;
+    *p_col_count = col_count;
+    return TRUE;
+}
+
+static int
+md_is_opening_code_fence(MD_CTX* ctx, OFF beg, OFF* p_end)
+{
+    OFF off = beg;
+
+    while(off < ctx->size && CH(off) == CH(beg))
+        off++;
+
+    /* Fence must have at least three characters. */
+    if(off - beg < 3)
+        return FALSE;
+
+    ctx->code_fence_length = off - beg;
+
+    /* Optionally, space(s) can follow. */
+    while(off < ctx->size  &&  CH(off) == _T(' '))
+        off++;
+
+    /* Optionally, an info string can follow. */
+    while(off < ctx->size  &&  !ISNEWLINE(off)) {
+        /* Backtick-based fence must not contain '`' in the info string. */
+        if(CH(beg) == _T('`')  &&  CH(off) == _T('`'))
+            return FALSE;
+        off++;
+    }
+
+    *p_end = off;
+    return TRUE;
+}
+
+static int
+md_is_closing_code_fence(MD_CTX* ctx, CHAR ch, OFF beg, OFF* p_end)
+{
+    OFF off = beg;
+    int ret = FALSE;
+
+    /* Closing fence must have at least the same length and use same char as
+     * opening one. */
+    while(off < ctx->size  &&  CH(off) == ch)
+        off++;
+    if(off - beg < ctx->code_fence_length)
+        goto out;
+
+    /* Optionally, space(s) can follow */
+    while(off < ctx->size  &&  CH(off) == _T(' '))
+        off++;
+
+    /* But nothing more is allowed on the line. */
+    if(off < ctx->size  &&  !ISNEWLINE(off))
+        goto out;
+
+    ret = TRUE;
+
+out:
+    /* Note we set *p_end even on failure: If we are not closing fence, caller
+     * would eat the line anyway without any parsing. */
+    *p_end = off;
+    return ret;
+}
+
+/* Returns type of the raw HTML block, or FALSE if it is not HTML block.
+ * (Refer to CommonMark specification for details about the types.)
+ */
+static int
+md_is_html_block_start_condition(MD_CTX* ctx, OFF beg)
+{
+    typedef struct TAG_tag TAG;
+    struct TAG_tag {
+        const CHAR* name;
+        unsigned len    : 8;
+    };
+
+    /* Type 6 is started by a long list of allowed tags. We use two-level
+     * tree to speed-up the search. */
+#ifdef X
+    #undef X
+#endif
+#define X(name)     { _T(name), sizeof(name)-1 }
+#define Xend        { NULL, 0 }
+    static const TAG t1[] = { X("script"), X("pre"), X("style"), Xend };
+
+    static const TAG a6[] = { X("address"), X("article"), X("aside"), Xend };
+    static const TAG b6[] = { X("base"), X("basefont"), X("blockquote"), X("body"), Xend };
+    static const TAG c6[] = { X("caption"), X("center"), X("col"), X("colgroup"), Xend };
+    static const TAG d6[] = { X("dd"), X("details"), X("dialog"), X("dir"),
+                              X("div"), X("dl"), X("dt"), Xend };
+    static const TAG f6[] = { X("fieldset"), X("figcaption"), X("figure"), X("footer"),
+                              X("form"), X("frame"), X("frameset"), Xend };
+    static const TAG h6[] = { X("h1"), X("head"), X("header"), X("hr"), X("html"), Xend };
+    static const TAG i6[] = { X("iframe"), Xend };
+    static const TAG l6[] = { X("legend"), X("li"), X("link"), Xend };
+    static const TAG m6[] = { X("main"), X("menu"), X("menuitem"), Xend };
+    static const TAG n6[] = { X("nav"), X("noframes"), Xend };
+    static const TAG o6[] = { X("ol"), X("optgroup"), X("option"), Xend };
+    static const TAG p6[] = { X("p"), X("param"), Xend };
+    static const TAG s6[] = { X("section"), X("source"), X("summary"), Xend };
+    static const TAG t6[] = { X("table"), X("tbody"), X("td"), X("tfoot"), X("th"),
+                              X("thead"), X("title"), X("tr"), X("track"), Xend };
+    static const TAG u6[] = { X("ul"), Xend };
+    static const TAG xx[] = { Xend };
+#undef X
+
+    static const TAG* map6[26] = {
+        a6, b6, c6, d6, xx, f6, xx, h6, i6, xx, xx, l6, m6,
+        n6, o6, p6, xx, xx, s6, t6, u6, xx, xx, xx, xx, xx
+    };
+    OFF off = beg + 1;
+    int i;
+
+    /* Check for type 1: <script, <pre, or <style */
+    for(i = 0; t1[i].name != NULL; i++) {
+        if(off + t1[i].len <= ctx->size) {
+            if(md_ascii_case_eq(STR(off), t1[i].name, t1[i].len))
+                return 1;
+        }
+    }
+
+    /* Check for type 2: <!-- */
+    if(off + 3 < ctx->size  &&  CH(off) == _T('!')  &&  CH(off+1) == _T('-')  &&  CH(off+2) == _T('-'))
+        return 2;
+
+    /* Check for type 3: <? */
+    if(off < ctx->size  &&  CH(off) == _T('?'))
+        return 3;
+
+    /* Check for type 4 or 5: <! */
+    if(off < ctx->size  &&  CH(off) == _T('!')) {
+        /* Check for type 4: <! followed by uppercase letter. */
+        if(off + 1 < ctx->size  &&  ISUPPER(off+1))
+            return 4;
+
+        /* Check for type 5: <![CDATA[ */
+        if(off + 8 < ctx->size) {
+            if(md_ascii_eq(STR(off), _T("![CDATA["), 8 * sizeof(CHAR)))
+                return 5;
+        }
+    }
+
+    /* Check for type 6: Many possible starting tags listed above. */
+    if(off + 1 < ctx->size  &&  (ISALPHA(off) || (CH(off) == _T('/') && ISALPHA(off+1)))) {
+        int slot;
+        const TAG* tags;
+
+        if(CH(off) == _T('/'))
+            off++;
+
+        slot = (ISUPPER(off) ? CH(off) - 'A' : CH(off) - 'a');
+        tags = map6[slot];
+
+        for(i = 0; tags[i].name != NULL; i++) {
+            if(off + tags[i].len <= ctx->size) {
+                if(md_ascii_case_eq(STR(off), tags[i].name, tags[i].len)) {
+                    OFF tmp = off + tags[i].len;
+                    if(tmp >= ctx->size)
+                        return 6;
+                    if(ISBLANK(tmp) || ISNEWLINE(tmp) || CH(tmp) == _T('>'))
+                        return 6;
+                    if(tmp+1 < ctx->size && CH(tmp) == _T('/') && CH(tmp+1) == _T('>'))
+                        return 6;
+                    break;
+                }
+            }
+        }
+    }
+
+    /* Check for type 7: any COMPLETE other opening or closing tag. */
+    if(off + 1 < ctx->size) {
+        OFF end;
+
+        if(md_is_html_tag(ctx, NULL, 0, beg, ctx->size, &end)) {
+            /* Only optional whitespace and new line may follow. */
+            while(end < ctx->size  &&  ISWHITESPACE(end))
+                end++;
+            if(end >= ctx->size  ||  ISNEWLINE(end))
+                return 7;
+        }
+    }
+
+    return FALSE;
+}
+
+/* Case sensitive check whether there is a substring 'what' between 'beg'
+ * and end of line. */
+static int
+md_line_contains(MD_CTX* ctx, OFF beg, const CHAR* what, SZ what_len, OFF* p_end)
+{
+    OFF i;
+    for(i = beg; i + what_len < ctx->size; i++) {
+        if(ISNEWLINE(i))
+            break;
+        if(memcmp(STR(i), what, what_len * sizeof(CHAR)) == 0) {
+            *p_end = i + what_len;
+            return TRUE;
+        }
+    }
+
+    *p_end = i;
+    return FALSE;
+}
+
+/* Returns type of HTML block end condition or FALSE if not an end condition.
+ *
+ * Note it fills p_end even when it is not end condition as the caller
+ * does not need to analyze contents of a raw HTML block.
+ */
+static int
+md_is_html_block_end_condition(MD_CTX* ctx, OFF beg, OFF* p_end)
+{
+    switch(ctx->html_block_type) {
+        case 1:
+        {
+            OFF off = beg;
+
+            while(off < ctx->size  &&  !ISNEWLINE(off)) {
+                if(CH(off) == _T('<')) {
+                    if(md_ascii_case_eq(STR(off), _T("</script>"), 9)) {
+                        *p_end = off + 9;
+                        return TRUE;
+                    }
+
+                    if(md_ascii_case_eq(STR(off), _T("</style>"), 8)) {
+                        *p_end = off + 8;
+                        return TRUE;
+                    }
+
+                    if(md_ascii_case_eq(STR(off), _T("</pre>"), 6)) {
+                        *p_end = off + 6;
+                        return TRUE;
+                    }
+                }
+
+                off++;
+            }
+            *p_end = off;
+            return FALSE;
+        }
+
+        case 2:
+            return (md_line_contains(ctx, beg, _T("-->"), 3, p_end) ? 2 : FALSE);
+
+        case 3:
+            return (md_line_contains(ctx, beg, _T("?>"), 2, p_end) ? 3 : FALSE);
+
+        case 4:
+            return (md_line_contains(ctx, beg, _T(">"), 1, p_end) ? 4 : FALSE);
+
+        case 5:
+            return (md_line_contains(ctx, beg, _T("]]>"), 3, p_end) ? 5 : FALSE);
+
+        case 6:     /* Pass through */
+        case 7:
+            *p_end = beg;
+            return (ISNEWLINE(beg) ? ctx->html_block_type : FALSE);
+
+        default:
+            MD_UNREACHABLE();
+    }
+    return FALSE;
+}
+
+
+static int
+md_is_container_compatible(const MD_CONTAINER* pivot, const MD_CONTAINER* container)
+{
+    /* Block quote has no "items" like lists. */
+    if(container->ch == _T('>'))
+        return FALSE;
+
+    if(container->ch != pivot->ch)
+        return FALSE;
+    if(container->mark_indent > pivot->contents_indent)
+        return FALSE;
+
+    return TRUE;
+}
+
+static int
+md_push_container(MD_CTX* ctx, const MD_CONTAINER* container)
+{
+    if(ctx->n_containers >= ctx->alloc_containers) {
+        MD_CONTAINER* new_containers;
+
+        ctx->alloc_containers = (ctx->alloc_containers > 0 ? ctx->alloc_containers * 2 : 16);
+        new_containers = realloc(ctx->containers, ctx->alloc_containers * sizeof(MD_CONTAINER));
+        if(new_containers == NULL) {
+            MD_LOG("realloc() failed.");
+            return -1;
+        }
+
+        ctx->containers = new_containers;
+    }
+
+    memcpy(&ctx->containers[ctx->n_containers++], container, sizeof(MD_CONTAINER));
+    return 0;
+}
+
+static int
+md_enter_child_containers(MD_CTX* ctx, int n_children, unsigned data)
+{
+    int i;
+    int ret = 0;
+
+    for(i = ctx->n_containers - n_children; i < ctx->n_containers; i++) {
+        MD_CONTAINER* c = &ctx->containers[i];
+        int is_ordered_list = FALSE;
+
+        switch(c->ch) {
+            case _T(')'):
+            case _T('.'):
+                is_ordered_list = TRUE;
+                /* Pass through */
+
+            case _T('-'):
+            case _T('+'):
+            case _T('*'):
+                /* Remember offset in ctx->block_bytes so we can revisit the
+                 * block if we detect it is a loose list. */
+                md_end_current_block(ctx);
+                c->block_byte_off = ctx->n_block_bytes;
+
+                MD_CHECK(md_push_container_bytes(ctx,
+                                (is_ordered_list ? MD_BLOCK_OL : MD_BLOCK_UL),
+                                c->start, data, MD_BLOCK_CONTAINER_OPENER));
+                MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_LI,
+                                c->task_mark_off,
+                                (c->is_task ? CH(c->task_mark_off) : 0),
+                                MD_BLOCK_CONTAINER_OPENER));
+                break;
+
+            case _T('>'):
+                MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_QUOTE, 0, 0, MD_BLOCK_CONTAINER_OPENER));
+                break;
+
+            default:
+                MD_UNREACHABLE();
+                break;
+        }
+    }
+
+abort:
+    return ret;
+}
+
+static int
+md_leave_child_containers(MD_CTX* ctx, int n_keep)
+{
+    int ret = 0;
+
+    while(ctx->n_containers > n_keep) {
+        MD_CONTAINER* c = &ctx->containers[ctx->n_containers-1];
+        int is_ordered_list = FALSE;
+
+        switch(c->ch) {
+            case _T(')'):
+            case _T('.'):
+                is_ordered_list = TRUE;
+                /* Pass through */
+
+            case _T('-'):
+            case _T('+'):
+            case _T('*'):
+                MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_LI,
+                                c->task_mark_off, (c->is_task ? CH(c->task_mark_off) : 0),
+                                MD_BLOCK_CONTAINER_CLOSER));
+                MD_CHECK(md_push_container_bytes(ctx,
+                                (is_ordered_list ? MD_BLOCK_OL : MD_BLOCK_UL), 0,
+                                c->ch, MD_BLOCK_CONTAINER_CLOSER));
+                break;
+
+            case _T('>'):
+                MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_QUOTE, 0,
+                                0, MD_BLOCK_CONTAINER_CLOSER));
+                break;
+
+            default:
+                MD_UNREACHABLE();
+                break;
+        }
+
+        ctx->n_containers--;
+    }
+
+abort:
+    return ret;
+}
+
+static int
+md_is_container_mark(MD_CTX* ctx, unsigned indent, OFF beg, OFF* p_end, MD_CONTAINER* p_container)
+{
+    OFF off = beg;
+    OFF max_end;
+
+    if(indent >= ctx->code_indent_offset)
+        return FALSE;
+
+    /* Check for block quote mark. */
+    if(off < ctx->size  &&  CH(off) == _T('>')) {
+        off++;
+        p_container->ch = _T('>');
+        p_container->is_loose = FALSE;
+        p_container->is_task = FALSE;
+        p_container->mark_indent = indent;
+        p_container->contents_indent = indent + 1;
+        *p_end = off;
+        return TRUE;
+    }
+
+    /* Check for list item bullet mark. */
+    if(off+1 < ctx->size  &&  ISANYOF(off, _T("-+*"))  &&  (ISBLANK(off+1) || ISNEWLINE(off+1))) {
+        p_container->ch = CH(off);
+        p_container->is_loose = FALSE;
+        p_container->is_task = FALSE;
+        p_container->mark_indent = indent;
+        p_container->contents_indent = indent + 1;
+        *p_end = off + 1;
+        return TRUE;
+    }
+
+    /* Check for ordered list item marks. */
+    max_end = off + 9;
+    if(max_end > ctx->size)
+        max_end = ctx->size;
+    p_container->start = 0;
+    while(off < max_end  &&  ISDIGIT(off)) {
+        p_container->start = p_container->start * 10 + CH(off) - _T('0');
+        off++;
+    }
+    if(off+1 < ctx->size  &&  (CH(off) == _T('.') || CH(off) == _T(')'))   &&  (ISBLANK(off+1) || ISNEWLINE(off+1))) {
+        p_container->ch = CH(off);
+        p_container->is_loose = FALSE;
+        p_container->is_task = FALSE;
+        p_container->mark_indent = indent;
+        p_container->contents_indent = indent + off - beg + 1;
+        *p_end = off + 1;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static unsigned
+md_line_indentation(MD_CTX* ctx, unsigned total_indent, OFF beg, OFF* p_end)
+{
+    OFF off = beg;
+    unsigned indent = total_indent;
+
+    while(off < ctx->size  &&  ISBLANK(off)) {
+        if(CH(off) == _T('\t'))
+            indent = (indent + 4) & ~3;
+        else
+            indent++;
+        off++;
+    }
+
+    *p_end = off;
+    return indent - total_indent;
+}
+
+static const MD_LINE_ANALYSIS md_dummy_blank_line = { MD_LINE_BLANK, 0 };
+
+/* Analyze type of the line and find some its properties. This serves as a
+ * main input for determining type and boundaries of a block. */
+static int
+md_analyze_line(MD_CTX* ctx, OFF beg, OFF* p_end,
+                const MD_LINE_ANALYSIS* pivot_line, MD_LINE_ANALYSIS* line)
+{
+    unsigned total_indent = 0;
+    int n_parents = 0;
+    int n_brothers = 0;
+    int n_children = 0;
+    MD_CONTAINER container = { 0 };
+    int prev_line_has_list_loosening_effect = ctx->last_line_has_list_loosening_effect;
+    OFF off = beg;
+    OFF hr_killer = 0;
+    int ret = 0;
+
+    line->indent = md_line_indentation(ctx, total_indent, off, &off);
+    total_indent += line->indent;
+    line->beg = off;
+
+    /* Given the indentation and block quote marks '>', determine how many of
+     * the current containers are our parents. */
+    while(n_parents < ctx->n_containers) {
+        MD_CONTAINER* c = &ctx->containers[n_parents];
+
+        if(c->ch == _T('>')  &&  line->indent < ctx->code_indent_offset  &&
+            off < ctx->size  &&  CH(off) == _T('>'))
+        {
+            /* Block quote mark. */
+            off++;
+            total_indent++;
+            line->indent = md_line_indentation(ctx, total_indent, off, &off);
+            total_indent += line->indent;
+
+            /* The optional 1st space after '>' is part of the block quote mark. */
+            if(line->indent > 0)
+                line->indent--;
+
+            line->beg = off;
+        } else if(c->ch != _T('>')  &&  line->indent >= c->contents_indent) {
+            /* List. */
+            line->indent -= c->contents_indent;
+        } else {
+            break;
+        }
+
+        n_parents++;
+    }
+
+    if(off >= ctx->size  ||  ISNEWLINE(off)) {
+        /* Blank line does not need any real indentation to be nested inside
+         * a list. */
+        if(n_brothers + n_children == 0) {
+            while(n_parents < ctx->n_containers  &&  ctx->containers[n_parents].ch != _T('>'))
+                n_parents++;
+        }
+    }
+
+    while(TRUE) {
+        /* Check whether we are fenced code continuation. */
+        if(pivot_line->type == MD_LINE_FENCEDCODE) {
+            line->beg = off;
+
+            /* We are another MD_LINE_FENCEDCODE unless we are closing fence
+             * which we transform into MD_LINE_BLANK. */
+            if(line->indent < ctx->code_indent_offset) {
+                if(md_is_closing_code_fence(ctx, CH(pivot_line->beg), off, &off)) {
+                    line->type = MD_LINE_BLANK;
+                    ctx->last_line_has_list_loosening_effect = FALSE;
+                    break;
+                }
+            }
+
+            /* Change indentation accordingly to the initial code fence. */
+            if(n_parents == ctx->n_containers) {
+                if(line->indent > pivot_line->indent)
+                    line->indent -= pivot_line->indent;
+                else
+                    line->indent = 0;
+
+                line->type = MD_LINE_FENCEDCODE;
+                break;
+            }
+        }
+
+        /* Check whether we are HTML block continuation. */
+        if(pivot_line->type == MD_LINE_HTML  &&  ctx->html_block_type > 0) {
+            int html_block_type;
+
+            html_block_type = md_is_html_block_end_condition(ctx, off, &off);
+            if(html_block_type > 0) {
+                MD_ASSERT(html_block_type == ctx->html_block_type);
+
+                /* Make sure this is the last line of the block. */
+                ctx->html_block_type = 0;
+
+                /* Some end conditions serve as blank lines at the same time. */
+                if(html_block_type == 6 || html_block_type == 7) {
+                    line->type = MD_LINE_BLANK;
+                    line->indent = 0;
+                    break;
+                }
+            }
+
+            if(n_parents == ctx->n_containers) {
+                line->type = MD_LINE_HTML;
+                break;
+            }
+        }
+
+        /* Check for blank line. */
+        if(off >= ctx->size  ||  ISNEWLINE(off)) {
+            if(pivot_line->type == MD_LINE_INDENTEDCODE  &&  n_parents == ctx->n_containers) {
+                line->type = MD_LINE_INDENTEDCODE;
+                if(line->indent > ctx->code_indent_offset)
+                    line->indent -= ctx->code_indent_offset;
+                else
+                    line->indent = 0;
+                ctx->last_line_has_list_loosening_effect = FALSE;
+            } else {
+                line->type = MD_LINE_BLANK;
+                ctx->last_line_has_list_loosening_effect = (n_parents > 0  &&
+                        n_brothers + n_children == 0  &&
+                        ctx->containers[n_parents-1].ch != _T('>'));
+
+    #if 1
+                /* See https://github.com/mity/md4c/issues/6
+                 *
+                 * This ugly checking tests we are in (yet empty) list item but not
+                 * its very first line (with the list item mark).
+                 *
+                 * If we are such blank line, then any following non-blank line
+                 * which would be part of this list item actually ends the list
+                 * because "a list item can begin with at most one blank line."
+                 */
+                if(n_parents > 0  &&  ctx->containers[n_parents-1].ch != _T('>')  &&
+                   n_brothers + n_children == 0  &&  ctx->current_block == NULL  &&
+                   ctx->n_block_bytes > (int) sizeof(MD_BLOCK))
+                {
+                    MD_BLOCK* top_block = (MD_BLOCK*) ((char*)ctx->block_bytes + ctx->n_block_bytes - sizeof(MD_BLOCK));
+                    if(top_block->type == MD_BLOCK_LI)
+                        ctx->last_list_item_starts_with_two_blank_lines = TRUE;
+                }
+    #endif
+            }
+            break;
+        } else {
+    #if 1
+            /* This is 2nd half of the hack. If the flag is set (that is there
+             * were 2nd blank line at the start of the list item) and we would also
+             * belonging to such list item, then interrupt the list. */
+            ctx->last_line_has_list_loosening_effect = FALSE;
+            if(ctx->last_list_item_starts_with_two_blank_lines) {
+                if(n_parents > 0  &&  ctx->containers[n_parents-1].ch != _T('>')  &&
+                   n_brothers + n_children == 0  &&  ctx->current_block == NULL  &&
+                   ctx->n_block_bytes > (int) sizeof(MD_BLOCK))
+                {
+                    MD_BLOCK* top_block = (MD_BLOCK*) ((char*)ctx->block_bytes + ctx->n_block_bytes - sizeof(MD_BLOCK));
+                    if(top_block->type == MD_BLOCK_LI)
+                        n_parents--;
+                }
+
+                ctx->last_list_item_starts_with_two_blank_lines = FALSE;
+            }
+    #endif
+        }
+
+        /* Check whether we are Setext underline. */
+        if(line->indent < ctx->code_indent_offset  &&  pivot_line->type == MD_LINE_TEXT
+            &&  (CH(off) == _T('=') || CH(off) == _T('-'))
+            &&  (n_parents == ctx->n_containers))
+        {
+            unsigned level;
+
+            if(md_is_setext_underline(ctx, off, &off, &level)) {
+                line->type = MD_LINE_SETEXTUNDERLINE;
+                line->data = level;
+                break;
+            }
+        }
+
+        /* Check for thematic break line. */
+        if(line->indent < ctx->code_indent_offset  &&  ISANYOF(off, _T("-_*"))  &&  off >= hr_killer) {
+            if(md_is_hr_line(ctx, off, &off, &hr_killer)) {
+                line->type = MD_LINE_HR;
+                break;
+            }
+        }
+
+        /* Check for "brother" container. I.e. whether we are another list item
+         * in already started list. */
+        if(n_parents < ctx->n_containers  &&  n_brothers + n_children == 0) {
+            OFF tmp;
+
+            if(md_is_container_mark(ctx, line->indent, off, &tmp, &container)  &&
+               md_is_container_compatible(&ctx->containers[n_parents], &container))
+            {
+                pivot_line = &md_dummy_blank_line;
+
+                off = tmp;
+
+                total_indent += container.contents_indent - container.mark_indent;
+                line->indent = md_line_indentation(ctx, total_indent, off, &off);
+                total_indent += line->indent;
+                line->beg = off;
+
+                /* Some of the following whitespace actually still belongs to the mark. */
+                if(off >= ctx->size || ISNEWLINE(off)) {
+                    container.contents_indent++;
+                } else if(line->indent <= ctx->code_indent_offset) {
+                    container.contents_indent += line->indent;
+                    line->indent = 0;
+                } else {
+                    container.contents_indent += 1;
+                    line->indent--;
+                }
+
+                ctx->containers[n_parents].mark_indent = container.mark_indent;
+                ctx->containers[n_parents].contents_indent = container.contents_indent;
+
+                n_brothers++;
+                continue;
+            }
+        }
+
+        /* Check for indented code.
+         * Note indented code block cannot interrupt a paragraph. */
+        if(line->indent >= ctx->code_indent_offset  &&
+            (pivot_line->type == MD_LINE_BLANK || pivot_line->type == MD_LINE_INDENTEDCODE))
+        {
+            line->type = MD_LINE_INDENTEDCODE;
+            MD_ASSERT(line->indent >= ctx->code_indent_offset);
+            line->indent -= ctx->code_indent_offset;
+            line->data = 0;
+            break;
+        }
+
+        /* Check for start of a new container block. */
+        if(line->indent < ctx->code_indent_offset  &&
+           md_is_container_mark(ctx, line->indent, off, &off, &container))
+        {
+            if(pivot_line->type == MD_LINE_TEXT  &&  n_parents == ctx->n_containers  &&
+                        (off >= ctx->size || ISNEWLINE(off)))
+            {
+                /* Noop. List mark followed by a blank line cannot interrupt a paragraph. */
+            } else if(pivot_line->type == MD_LINE_TEXT  &&  n_parents == ctx->n_containers  &&
+                        (container.ch == _T('.') || container.ch == _T(')'))  &&  container.start != 1)
+            {
+                /* Noop. Ordered list cannot interrupt a paragraph unless the start index is 1. */
+            } else {
+                total_indent += container.contents_indent - container.mark_indent;
+                line->indent = md_line_indentation(ctx, total_indent, off, &off);
+                total_indent += line->indent;
+
+                line->beg = off;
+                line->data = container.ch;
+
+                /* Some of the following whitespace actually still belongs to the mark. */
+                if(off >= ctx->size || ISNEWLINE(off)) {
+                    container.contents_indent++;
+                } else if(line->indent <= ctx->code_indent_offset) {
+                    container.contents_indent += line->indent;
+                    line->indent = 0;
+                } else {
+                    container.contents_indent += 1;
+                    line->indent--;
+                }
+
+                if(n_brothers + n_children == 0)
+                    pivot_line = &md_dummy_blank_line;
+
+                if(n_children == 0)
+                    MD_CHECK(md_leave_child_containers(ctx, n_parents + n_brothers));
+
+                n_children++;
+                MD_CHECK(md_push_container(ctx, &container));
+                continue;
+            }
+        }
+
+        /* Check whether we are table continuation. */
+        if(pivot_line->type == MD_LINE_TABLE  &&  md_is_table_row(ctx, off, &off)  &&
+           n_parents == ctx->n_containers)
+        {
+            line->type = MD_LINE_TABLE;
+            break;
+        }
+
+        /* Check for ATX header. */
+        if(line->indent < ctx->code_indent_offset  &&  CH(off) == _T('#')) {
+            unsigned level;
+
+            if(md_is_atxheader_line(ctx, off, &line->beg, &off, &level)) {
+                line->type = MD_LINE_ATXHEADER;
+                line->data = level;
+                break;
+            }
+        }
+
+        /* Check whether we are starting code fence. */
+        if(CH(off) == _T('`') || CH(off) == _T('~')) {
+            if(md_is_opening_code_fence(ctx, off, &off)) {
+                line->type = MD_LINE_FENCEDCODE;
+                line->data = 1;
+                break;
+            }
+        }
+
+        /* Check for start of raw HTML block. */
+        if(CH(off) == _T('<')  &&  !(ctx->parser.flags & MD_FLAG_NOHTMLBLOCKS))
+        {
+            ctx->html_block_type = md_is_html_block_start_condition(ctx, off);
+
+            /* HTML block type 7 cannot interrupt paragraph. */
+            if(ctx->html_block_type == 7  &&  pivot_line->type == MD_LINE_TEXT)
+                ctx->html_block_type = 0;
+
+            if(ctx->html_block_type > 0) {
+                /* The line itself also may immediately close the block. */
+                if(md_is_html_block_end_condition(ctx, off, &off) == ctx->html_block_type) {
+                    /* Make sure this is the last line of the block. */
+                    ctx->html_block_type = 0;
+                }
+
+                line->type = MD_LINE_HTML;
+                break;
+            }
+        }
+
+        /* Check for table underline. */
+        if((ctx->parser.flags & MD_FLAG_TABLES)  &&  pivot_line->type == MD_LINE_TEXT  &&
+           (CH(off) == _T('|') || CH(off) == _T('-') || CH(off) == _T(':'))  &&
+           n_parents == ctx->n_containers)
+        {
+            unsigned col_count;
+
+            if(ctx->current_block != NULL  &&  ctx->current_block->n_lines == 1  &&
+                md_is_table_underline(ctx, off, &off, &col_count)  &&
+                md_is_table_row(ctx, pivot_line->beg, NULL))
+            {
+                line->data = col_count;
+                line->type = MD_LINE_TABLEUNDERLINE;
+                break;
+            }
+        }
+
+        /* By default, we are normal text line. */
+        line->type = MD_LINE_TEXT;
+        if(pivot_line->type == MD_LINE_TEXT  &&  n_brothers + n_children == 0) {
+            /* Lazy continuation. */
+            n_parents = ctx->n_containers;
+        }
+
+        /* Check for task mark. */
+        if((ctx->parser.flags & MD_FLAG_TASKLISTS)  &&  n_brothers + n_children > 0  &&
+           ISANYOF_(ctx->containers[ctx->n_containers-1].ch, _T("-+*.)")))
+        {
+            OFF tmp = off;
+
+            while(tmp < ctx->size  &&  tmp < off + 3  &&  ISBLANK(tmp))
+                tmp++;
+            if(tmp + 2 < ctx->size  &&  CH(tmp) == _T('[')  &&
+               ISANYOF(tmp+1, _T("xX "))  &&  CH(tmp+2) == _T(']')  &&
+               (tmp + 3 == ctx->size  ||  ISBLANK(tmp+3)  ||  ISNEWLINE(tmp+3)))
+            {
+                MD_CONTAINER* task_container = (n_children > 0 ? &ctx->containers[ctx->n_containers-1] : &container);
+                task_container->is_task = TRUE;
+                task_container->task_mark_off = tmp + 1;
+                off = tmp + 3;
+                while(ISWHITESPACE(off))
+                    off++;
+                line->beg = off;
+            }
+        }
+
+        break;
+    }
+
+    /* Scan for end of the line.
+     *
+     * Note this is quite a bottleneck of the parsing as we here iterate almost
+     * over compete document.
+     */
+#if defined __linux__ && !defined MD4C_USE_UTF16
+    /* Recent glibc versions have superbly optimized strcspn(), even using
+     * vectorization if available. */
+    if(ctx->doc_ends_with_newline  &&  off < ctx->size) {
+        while(TRUE) {
+            off += (OFF) strcspn(STR(off), "\r\n");
+
+            /* strcspn() can stop on zero terminator; but that can appear
+             * anywhere in the Markfown input... */
+            if(CH(off) == _T('\0'))
+                off++;
+            else
+                break;
+        }
+    } else
+#endif
+    {
+        /* Optimization: Use some loop unrolling. */
+        while(off + 3 < ctx->size  &&  !ISNEWLINE(off+0)  &&  !ISNEWLINE(off+1)
+                                   &&  !ISNEWLINE(off+2)  &&  !ISNEWLINE(off+3))
+            off += 4;
+        while(off < ctx->size  &&  !ISNEWLINE(off))
+            off++;
+    }
+
+    /* Set end of the line. */
+    line->end = off;
+
+    /* But for ATX header, we should exclude the optional trailing mark. */
+    if(line->type == MD_LINE_ATXHEADER) {
+        OFF tmp = line->end;
+        while(tmp > line->beg && CH(tmp-1) == _T(' '))
+            tmp--;
+        while(tmp > line->beg && CH(tmp-1) == _T('#'))
+            tmp--;
+        if(tmp == line->beg || CH(tmp-1) == _T(' ') || (ctx->parser.flags & MD_FLAG_PERMISSIVEATXHEADERS))
+            line->end = tmp;
+    }
+
+    /* Trim trailing spaces. */
+    if(line->type != MD_LINE_INDENTEDCODE  &&  line->type != MD_LINE_FENCEDCODE) {
+        while(line->end > line->beg && CH(line->end-1) == _T(' '))
+            line->end--;
+    }
+
+    /* Eat also the new line. */
+    if(off < ctx->size && CH(off) == _T('\r'))
+        off++;
+    if(off < ctx->size && CH(off) == _T('\n'))
+        off++;
+
+    *p_end = off;
+
+    /* If we belong to a list after seeing a blank line, the list is loose. */
+    if(prev_line_has_list_loosening_effect  &&  line->type != MD_LINE_BLANK  &&  n_parents + n_brothers > 0) {
+        MD_CONTAINER* c = &ctx->containers[n_parents + n_brothers - 1];
+        if(c->ch != _T('>')) {
+            MD_BLOCK* block = (MD_BLOCK*) (((char*)ctx->block_bytes) + c->block_byte_off);
+            block->flags |= MD_BLOCK_LOOSE_LIST;
+        }
+    }
+
+    /* Leave any containers we are not part of anymore. */
+    if(n_children == 0  &&  n_parents + n_brothers < ctx->n_containers)
+        MD_CHECK(md_leave_child_containers(ctx, n_parents + n_brothers));
+
+    /* Enter any container we found a mark for. */
+    if(n_brothers > 0) {
+        MD_ASSERT(n_brothers == 1);
+        MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_LI,
+                    ctx->containers[n_parents].task_mark_off,
+                    (ctx->containers[n_parents].is_task ? CH(ctx->containers[n_parents].task_mark_off) : 0),
+                    MD_BLOCK_CONTAINER_CLOSER));
+        MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_LI,
+                    container.task_mark_off,
+                    (container.is_task ? CH(container.task_mark_off) : 0),
+                    MD_BLOCK_CONTAINER_OPENER));
+        ctx->containers[n_parents].is_task = container.is_task;
+        ctx->containers[n_parents].task_mark_off = container.task_mark_off;
+    }
+
+    if(n_children > 0)
+        MD_CHECK(md_enter_child_containers(ctx, n_children, line->data));
+
+abort:
+    return ret;
+}
+
+static int
+md_process_line(MD_CTX* ctx, const MD_LINE_ANALYSIS** p_pivot_line, MD_LINE_ANALYSIS* line)
+{
+    const MD_LINE_ANALYSIS* pivot_line = *p_pivot_line;
+    int ret = 0;
+
+    /* Blank line ends current leaf block. */
+    if(line->type == MD_LINE_BLANK) {
+        MD_CHECK(md_end_current_block(ctx));
+        *p_pivot_line = &md_dummy_blank_line;
+        return 0;
+    }
+
+    /* Some line types form block on their own. */
+    if(line->type == MD_LINE_HR || line->type == MD_LINE_ATXHEADER) {
+        MD_CHECK(md_end_current_block(ctx));
+
+        /* Add our single-line block. */
+        MD_CHECK(md_start_new_block(ctx, line));
+        MD_CHECK(md_add_line_into_current_block(ctx, line));
+        MD_CHECK(md_end_current_block(ctx));
+        *p_pivot_line = &md_dummy_blank_line;
+        return 0;
+    }
+
+    /* MD_LINE_SETEXTUNDERLINE changes meaning of the current block and ends it. */
+    if(line->type == MD_LINE_SETEXTUNDERLINE) {
+        MD_ASSERT(ctx->current_block != NULL);
+        ctx->current_block->type = MD_BLOCK_H;
+        ctx->current_block->data = line->data;
+        ctx->current_block->flags |= MD_BLOCK_SETEXT_HEADER;
+        MD_CHECK(md_add_line_into_current_block(ctx, line));
+        MD_CHECK(md_end_current_block(ctx));
+        if(ctx->current_block == NULL) {
+            *p_pivot_line = &md_dummy_blank_line;
+        } else {
+            /* This happens if we have consumed all the body as link ref. defs.
+             * and downgraded the underline into start of a new paragraph block. */
+            line->type = MD_LINE_TEXT;
+            *p_pivot_line = line;
+        }
+        return 0;
+    }
+
+    /* MD_LINE_TABLEUNDERLINE changes meaning of the current block. */
+    if(line->type == MD_LINE_TABLEUNDERLINE) {
+        MD_ASSERT(ctx->current_block != NULL);
+        MD_ASSERT(ctx->current_block->n_lines == 1);
+        ctx->current_block->type = MD_BLOCK_TABLE;
+        ctx->current_block->data = line->data;
+        MD_ASSERT(pivot_line != &md_dummy_blank_line);
+        ((MD_LINE_ANALYSIS*)pivot_line)->type = MD_LINE_TABLE;
+        MD_CHECK(md_add_line_into_current_block(ctx, line));
+        return 0;
+    }
+
+    /* The current block also ends if the line has different type. */
+    if(line->type != pivot_line->type)
+        MD_CHECK(md_end_current_block(ctx));
+
+    /* The current line may start a new block. */
+    if(ctx->current_block == NULL) {
+        MD_CHECK(md_start_new_block(ctx, line));
+        *p_pivot_line = line;
+    }
+
+    /* In all other cases the line is just a continuation of the current block. */
+    MD_CHECK(md_add_line_into_current_block(ctx, line));
+
+abort:
+    return ret;
+}
+
+static int
+md_process_doc(MD_CTX *ctx)
+{
+    const MD_LINE_ANALYSIS* pivot_line = &md_dummy_blank_line;
+    MD_LINE_ANALYSIS line_buf[2];
+    MD_LINE_ANALYSIS* line = &line_buf[0];
+    OFF off = 0;
+    int ret = 0;
+
+    MD_ENTER_BLOCK(MD_BLOCK_DOC, NULL);
+
+    while(off < ctx->size) {
+        if(line == pivot_line)
+            line = (line == &line_buf[0] ? &line_buf[1] : &line_buf[0]);
+
+        MD_CHECK(md_analyze_line(ctx, off, &off, pivot_line, line));
+        MD_CHECK(md_process_line(ctx, &pivot_line, line));
+    }
+
+    md_end_current_block(ctx);
+
+    MD_CHECK(md_build_ref_def_hashtable(ctx));
+
+    /* Process all blocks. */
+    MD_CHECK(md_leave_child_containers(ctx, 0));
+    MD_CHECK(md_process_all_blocks(ctx));
+
+    MD_LEAVE_BLOCK(MD_BLOCK_DOC, NULL);
+
+abort:
+
+#if 0
+    /* Output some memory consumption statistics. */
+    {
+        char buffer[256];
+        sprintf(buffer, "Alloced %u bytes for block buffer.",
+                    (unsigned)(ctx->alloc_block_bytes));
+        MD_LOG(buffer);
+
+        sprintf(buffer, "Alloced %u bytes for containers buffer.",
+                    (unsigned)(ctx->alloc_containers * sizeof(MD_CONTAINER)));
+        MD_LOG(buffer);
+
+        sprintf(buffer, "Alloced %u bytes for marks buffer.",
+                    (unsigned)(ctx->alloc_marks * sizeof(MD_MARK)));
+        MD_LOG(buffer);
+
+        sprintf(buffer, "Alloced %u bytes for aux. buffer.",
+                    (unsigned)(ctx->alloc_buffer * sizeof(MD_CHAR)));
+        MD_LOG(buffer);
+    }
+#endif
+
+    return ret;
+}
+
+
+/********************
+ ***  Public API  ***
+ ********************/
+
+int
+md_parse(const MD_CHAR* text, MD_SIZE size, const MD_PARSER* parser, void* userdata)
+{
+    MD_CTX ctx;
+    int i;
+    int ret;
+
+    if(parser->abi_version != 0) {
+        if(parser->debug_log != NULL)
+            parser->debug_log("Unsupported abi_version.", userdata);
+        return -1;
+    }
+
+    /* Setup context structure. */
+    memset(&ctx, 0, sizeof(MD_CTX));
+    ctx.text = text;
+    ctx.size = size;
+    memcpy(&ctx.parser, parser, sizeof(MD_PARSER));
+    ctx.userdata = userdata;
+    ctx.code_indent_offset = (ctx.parser.flags & MD_FLAG_NOINDENTEDCODEBLOCKS) ? (OFF)(-1) : 4;
+    md_build_mark_char_map(&ctx);
+    ctx.doc_ends_with_newline = (size > 0  &&  ISNEWLINE_(text[size-1]));
+
+    /* Reset all unresolved opener mark chains. */
+    for(i = 0; i < (int) SIZEOF_ARRAY(ctx.mark_chains); i++) {
+        ctx.mark_chains[i].head = -1;
+        ctx.mark_chains[i].tail = -1;
+    }
+    ctx.unresolved_link_head = -1;
+    ctx.unresolved_link_tail = -1;
+
+    /* All the work. */
+    ret = md_process_doc(&ctx);
+
+    /* Clean-up. */
+    md_free_ref_defs(&ctx);
+    md_free_ref_def_hashtable(&ctx);
+    free(ctx.buffer);
+    free(ctx.marks);
+    free(ctx.block_bytes);
+    free(ctx.containers);
+
+    return ret;
+}
diff --git a/src/3rdparty/md4c/md4c.h b/src/3rdparty/md4c/md4c.h
new file mode 100644
index 0000000000..dcdadad88d
--- /dev/null
+++ b/src/3rdparty/md4c/md4c.h
@@ -0,0 +1,362 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2019 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef MD4C_MARKDOWN_H
+#define MD4C_MARKDOWN_H
+
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
+#if defined MD4C_USE_UTF16
+    /* Magic to support UTF-16. Not that in order to use it, you have to define
+     * the macro MD4C_USE_UTF16 both when building MD4C as well as when
+     * including this header in your code. */
+    #ifdef _WIN32
+        #include <windows.h>
+        typedef WCHAR       MD_CHAR;
+    #else
+        #error MD4C_USE_UTF16 is only supported on Windows.
+    #endif
+#else
+    typedef char            MD_CHAR;
+#endif
+
+typedef unsigned MD_SIZE;
+typedef unsigned MD_OFFSET;
+
+
+/* Block represents a part of document hierarchy structure like a paragraph
+ * or list item.
+ */
+typedef enum MD_BLOCKTYPE {
+    /* <body>...</body> */
+    MD_BLOCK_DOC = 0,
+
+    /* <blockquote>...</blockquote> */
+    MD_BLOCK_QUOTE,
+
+    /* <ul>...</ul>
+     * Detail: Structure MD_BLOCK_UL_DETAIL. */
+    MD_BLOCK_UL,
+
+    /* <ol>...</ol>
+     * Detail: Structure MD_BLOCK_OL_DETAIL. */
+    MD_BLOCK_OL,
+
+    /* <li>...</li>
+     * Detail: Structure MD_BLOCK_LI_DETAIL. */
+    MD_BLOCK_LI,
+
+    /* <hr> */
+    MD_BLOCK_HR,
+
+    /* <h1>...</h1> (for levels up to 6)
+     * Detail: Structure MD_BLOCK_H_DETAIL. */
+    MD_BLOCK_H,
+
+    /* <pre><code>...</code></pre>
+     * Note the text lines within code blocks are terminated with '\n'
+     * instead of explicit MD_TEXT_BR. */
+    MD_BLOCK_CODE,
+
+    /* Raw HTML block. This itself does not correspond to any particular HTML
+     * tag. The contents of it _is_ raw HTML source intended to be put
+     * in verbatim form to the HTML output. */
+    MD_BLOCK_HTML,
+
+    /* <p>...</p> */
+    MD_BLOCK_P,
+
+    /* <table>...</table> and its contents.
+     * Detail: Structure MD_BLOCK_TD_DETAIL (used with MD_BLOCK_TH and MD_BLOCK_TD)
+     * Note all of these are used only if extension MD_FLAG_TABLES is enabled. */
+    MD_BLOCK_TABLE,
+    MD_BLOCK_THEAD,
+    MD_BLOCK_TBODY,
+    MD_BLOCK_TR,
+    MD_BLOCK_TH,
+    MD_BLOCK_TD
+} MD_BLOCKTYPE;
+
+/* Span represents an in-line piece of a document which should be rendered with
+ * the same font, color and other attributes. A sequence of spans forms a block
+ * like paragraph or list item. */
+typedef enum MD_SPANTYPE {
+    /* <em>...</em> */
+    MD_SPAN_EM,
+
+    /* <strong>...</strong> */
+    MD_SPAN_STRONG,
+
+    /* <a href="xxx">...</a>
+     * Detail: Structure MD_SPAN_A_DETAIL. */
+    MD_SPAN_A,
+
+    /* <img src="xxx">...</a>
+     * Detail: Structure MD_SPAN_IMG_DETAIL.
+     * Note: Image text can contain nested spans and even nested images.
+     * If rendered into ALT attribute of HTML <IMG> tag, it's responsibility
+     * of the renderer to deal with it.
+     */
+    MD_SPAN_IMG,
+
+    /* <code>...</code> */
+    MD_SPAN_CODE,
+
+    /* <del>...</del>
+     * Note: Recognized only when MD_FLAG_STRIKETHROUGH is enabled.
+     */
+    MD_SPAN_DEL
+} MD_SPANTYPE;
+
+/* Text is the actual textual contents of span. */
+typedef enum MD_TEXTTYPE {
+    /* Normal text. */
+    MD_TEXT_NORMAL = 0,
+
+    /* NULL character. CommonMark requires replacing NULL character with
+     * the replacement char U+FFFD, so this allows caller to do that easily. */
+    MD_TEXT_NULLCHAR,
+
+    /* Line breaks.
+     * Note these are not sent from blocks with verbatim output (MD_BLOCK_CODE
+     * or MD_BLOCK_HTML). In such cases, '\n' is part of the text itself. */
+    MD_TEXT_BR,         /* <br> (hard break) */
+    MD_TEXT_SOFTBR,     /* '\n' in source text where it is not semantically meaningful (soft break) */
+
+    /* Entity.
+     * (a) Named entity, e.g. &nbsp; 
+     *     (Note MD4C does not have a list of known entities.
+     *     Anything matching the regexp /&[A-Za-z][A-Za-z0-9]{1,47};/ is
+     *     treated as a named entity.)
+     * (b) Numerical entity, e.g. &#1234;
+     * (c) Hexadecimal entity, e.g. &#x12AB;
+     *
+     * As MD4C is mostly encoding agnostic, application gets the verbatim
+     * entity text into the MD_RENDERER::text_callback(). */
+    MD_TEXT_ENTITY,
+
+    /* Text in a code block (inside MD_BLOCK_CODE) or inlined code (`code`).
+     * If it is inside MD_BLOCK_CODE, it includes spaces for indentation and
+     * '\n' for new lines. MD_TEXT_BR and MD_TEXT_SOFTBR are not sent for this
+     * kind of text. */
+    MD_TEXT_CODE,
+
+    /* Text is a raw HTML. If it is contents of a raw HTML block (i.e. not
+     * an inline raw HTML), then MD_TEXT_BR and MD_TEXT_SOFTBR are not used.
+     * The text contains verbatim '\n' for the new lines. */
+    MD_TEXT_HTML
+} MD_TEXTTYPE;
+
+
+/* Alignment enumeration. */
+typedef enum MD_ALIGN {
+    MD_ALIGN_DEFAULT = 0,   /* When unspecified. */
+    MD_ALIGN_LEFT,
+    MD_ALIGN_CENTER,
+    MD_ALIGN_RIGHT
+} MD_ALIGN;
+
+
+/* String attribute.
+ *
+ * This wraps strings which are outside of a normal text flow and which are
+ * propagated within various detailed structures, but which still may contain
+ * string portions of different types like e.g. entities.
+ *
+ * So, for example, lets consider an image has a title attribute string
+ * set to "foo &quot; bar". (Note the string size is 14.)
+ *
+ * Then the attribute MD_SPAN_IMG_DETAIL::title shall provide the following:
+ *  -- [0]: "foo "   (substr_types[0] == MD_TEXT_NORMAL; substr_offsets[0] == 0)
+ *  -- [1]: "&quot;" (substr_types[1] == MD_TEXT_ENTITY; substr_offsets[1] == 4)
+ *  -- [2]: " bar"   (substr_types[2] == MD_TEXT_NORMAL; substr_offsets[2] == 10)
+ *  -- [3]: (n/a)    (n/a                              ; substr_offsets[3] == 14)
+ *
+ * Note that these conditions are guaranteed:
+ *  -- substr_offsets[0] == 0
+ *  -- substr_offsets[LAST+1] == size
+ *  -- Only MD_TEXT_NORMAL, MD_TEXT_ENTITY, MD_TEXT_NULLCHAR substrings can appear.
+ */
+typedef struct MD_ATTRIBUTE {
+    const MD_CHAR* text;
+    MD_SIZE size;
+    const MD_TEXTTYPE* substr_types;
+    const MD_OFFSET* substr_offsets;
+} MD_ATTRIBUTE;
+
+
+/* Detailed info for MD_BLOCK_UL. */
+typedef struct MD_BLOCK_UL_DETAIL {
+    int is_tight;           /* Non-zero if tight list, zero if loose. */
+    MD_CHAR mark;           /* Item bullet character in MarkDown source of the list, e.g. '-', '+', '*'. */
+} MD_BLOCK_UL_DETAIL;
+
+/* Detailed info for MD_BLOCK_OL. */
+typedef struct MD_BLOCK_OL_DETAIL {
+    unsigned start;         /* Start index of the ordered list. */
+    int is_tight;           /* Non-zero if tight list, zero if loose. */
+    MD_CHAR mark_delimiter; /* Character delimiting the item marks in MarkDown source, e.g. '.' or ')' */
+} MD_BLOCK_OL_DETAIL;
+
+/* Detailed info for MD_BLOCK_LI. */
+typedef struct MD_BLOCK_LI_DETAIL {
+    int is_task;            /* Can be non-zero only with MD_FLAG_TASKLISTS */
+    MD_CHAR task_mark;      /* If is_task, then one of 'x', 'X' or ' '. Undefined otherwise. */
+    MD_OFFSET task_mark_offset;  /* If is_task, then offset in the input of the char between '[' and ']'. */
+} MD_BLOCK_LI_DETAIL;
+
+/* Detailed info for MD_BLOCK_H. */
+typedef struct MD_BLOCK_H_DETAIL {
+    unsigned level;         /* Header level (1 - 6) */
+} MD_BLOCK_H_DETAIL;
+
+/* Detailed info for MD_BLOCK_CODE. */
+typedef struct MD_BLOCK_CODE_DETAIL {
+    MD_ATTRIBUTE info;
+    MD_ATTRIBUTE lang;
+    MD_CHAR fence_char;     /* The character used for fenced code block; or zero for indented code block. */
+} MD_BLOCK_CODE_DETAIL;
+
+/* Detailed info for MD_BLOCK_TH and MD_BLOCK_TD. */
+typedef struct MD_BLOCK_TD_DETAIL {
+    MD_ALIGN align;
+} MD_BLOCK_TD_DETAIL;
+
+/* Detailed info for MD_SPAN_A. */
+typedef struct MD_SPAN_A_DETAIL {
+    MD_ATTRIBUTE href;
+    MD_ATTRIBUTE title;
+} MD_SPAN_A_DETAIL;
+
+/* Detailed info for MD_SPAN_IMG. */
+typedef struct MD_SPAN_IMG_DETAIL {
+    MD_ATTRIBUTE src;
+    MD_ATTRIBUTE title;
+} MD_SPAN_IMG_DETAIL;
+
+
+/* Flags specifying extensions/deviations from CommonMark specification.
+ *
+ * By default (when MD_RENDERER::flags == 0), we follow CommonMark specification.
+ * The following flags may allow some extensions or deviations from it.
+ */
+#define MD_FLAG_COLLAPSEWHITESPACE          0x0001  /* In MD_TEXT_NORMAL, collapse non-trivial whitespace into single ' ' */
+#define MD_FLAG_PERMISSIVEATXHEADERS        0x0002  /* Do not require space in ATX headers ( ###header ) */
+#define MD_FLAG_PERMISSIVEURLAUTOLINKS      0x0004  /* Recognize URLs as autolinks even without '<', '>' */
+#define MD_FLAG_PERMISSIVEEMAILAUTOLINKS    0x0008  /* Recognize e-mails as autolinks even without '<', '>' and 'mailto:' */
+#define MD_FLAG_NOINDENTEDCODEBLOCKS        0x0010  /* Disable indented code blocks. (Only fenced code works.) */
+#define MD_FLAG_NOHTMLBLOCKS                0x0020  /* Disable raw HTML blocks. */
+#define MD_FLAG_NOHTMLSPANS                 0x0040  /* Disable raw HTML (inline). */
+#define MD_FLAG_TABLES                      0x0100  /* Enable tables extension. */
+#define MD_FLAG_STRIKETHROUGH               0x0200  /* Enable strikethrough extension. */
+#define MD_FLAG_PERMISSIVEWWWAUTOLINKS      0x0400  /* Enable WWW autolinks (even without any scheme prefix, if they begin with 'www.') */
+#define MD_FLAG_TASKLISTS                   0x0800  /* Enable task list extension. */
+
+#define MD_FLAG_PERMISSIVEAUTOLINKS         (MD_FLAG_PERMISSIVEEMAILAUTOLINKS | MD_FLAG_PERMISSIVEURLAUTOLINKS | MD_FLAG_PERMISSIVEWWWAUTOLINKS)
+#define MD_FLAG_NOHTML                      (MD_FLAG_NOHTMLBLOCKS | MD_FLAG_NOHTMLSPANS)
+
+/* Convenient sets of flags corresponding to well-known Markdown dialects.
+ *
+ * Note we may only support subset of features of the referred dialect.
+ * The constant just enables those extensions which bring us as close as
+ * possible given what features we implement.
+ *
+ * ABI compatibility note: Meaning of these can change in time as new
+ * extensions, bringing the dialect closer to the original, are implemented.
+ */
+#define MD_DIALECT_COMMONMARK               0
+#define MD_DIALECT_GITHUB                   (MD_FLAG_PERMISSIVEAUTOLINKS | MD_FLAG_TABLES | MD_FLAG_STRIKETHROUGH | MD_FLAG_TASKLISTS)
+
+/* Renderer structure.
+ */
+typedef struct MD_PARSER {
+    /* Reserved. Set to zero.
+     */
+    unsigned abi_version;
+
+    /* Dialect options. Bitmask of MD_FLAG_xxxx values.
+     */
+    unsigned flags;
+
+    /* Caller-provided rendering callbacks.
+     *
+     * For some block/span types, more detailed information is provided in a
+     * type-specific structure pointed by the argument 'detail'.
+     *
+     * The last argument of all callbacks, 'userdata', is just propagated from
+     * md_parse() and is available for any use by the application.
+     *
+     * Note any strings provided to the callbacks as their arguments or as
+     * members of any detail structure are generally not zero-terminated.
+     * Application has take the respective size information into account.
+     *
+     * Callbacks may abort further parsing of the document by returning non-zero.
+     */
+    int (*enter_block)(MD_BLOCKTYPE /*type*/, void* /*detail*/, void* /*userdata*/);
+    int (*leave_block)(MD_BLOCKTYPE /*type*/, void* /*detail*/, void* /*userdata*/);
+
+    int (*enter_span)(MD_SPANTYPE /*type*/, void* /*detail*/, void* /*userdata*/);
+    int (*leave_span)(MD_SPANTYPE /*type*/, void* /*detail*/, void* /*userdata*/);
+
+    int (*text)(MD_TEXTTYPE /*type*/, const MD_CHAR* /*text*/, MD_SIZE /*size*/, void* /*userdata*/);
+
+    /* Debug callback. Optional (may be NULL).
+     *
+     * If provided and something goes wrong, this function gets called.
+     * This is intended for debugging and problem diagnosis for developers;
+     * it is not intended to provide any errors suitable for displaying to an
+     * end user.
+     */
+    void (*debug_log)(const char* /*msg*/, void* /*userdata*/);
+
+    /* Reserved. Set to NULL.
+     */
+    void (*syntax)(void);
+} MD_PARSER;
+
+
+/* For backward compatibility. Do not use in new code. */
+typedef MD_PARSER MD_RENDERER;
+
+
+/* Parse the Markdown document stored in the string 'text' of size 'size'.
+ * The renderer provides callbacks to be called during the parsing so the
+ * caller can render the document on the screen or convert the Markdown
+ * to another format.
+ *
+ * Zero is returned on success. If a runtime error occurs (e.g. a memory
+ * fails), -1 is returned. If the processing is aborted due any callback
+ * returning non-zero, md_parse() the return value of the callback is returned.
+ */
+int md_parse(const MD_CHAR* text, MD_SIZE size, const MD_PARSER* parser, void* userdata);
+
+
+#ifdef __cplusplus
+    }  /* extern "C" { */
+#endif
+
+#endif  /* MD4C_MARKDOWN_H */
diff --git a/src/3rdparty/md4c/qt_attribution.json b/src/3rdparty/md4c/qt_attribution.json
new file mode 100644
index 0000000000..fa0fd18853
--- /dev/null
+++ b/src/3rdparty/md4c/qt_attribution.json
@@ -0,0 +1,15 @@
+{
+    "Id": "md4c",
+    "Name": "MD4C",
+    "QDocModule": "qtgui",
+    "QtUsage": "Optionally used in QTextDocument if configured with textmarkdownreader.",
+
+    "Description": "A CommonMark-compliant Markdown parser.",
+    "Homepage": "https://github.com/mity/md4c",
+    "License": "MIT License",
+    "LicenseId": "MIT",
+    "LicenseFile": "LICENSE.md",
+    "Version": "0.3.3",
+    "DownloadLocation": "https://github.com/mity/md4c/releases/tag/release-0.3.3",
+    "Copyright": "Copyright © 2016-2019 Martin Mitáš"
+}
diff --git a/src/3rdparty/pcre2/patches/0001-fix-rtems-build-undefine-madvise.patch b/src/3rdparty/pcre2/patches/0001-fix-rtems-build-undefine-madvise.patch
new file mode 100644
index 0000000000..074b39df85
--- /dev/null
+++ b/src/3rdparty/pcre2/patches/0001-fix-rtems-build-undefine-madvise.patch
@@ -0,0 +1,28 @@
+From ac10063196685fe6124055feb1275e13a78f562e Mon Sep 17 00:00:00 2001
+From: Mikhail Svetkin <mikhail.svetkin@qt.io>
+Date: Tue, 20 Mar 2018 14:03:54 +0100
+Subject: [PATCH] rtems: Fix pcre2 build (madvise undefined)
+
+RTEMS does not have madvise. We can use only posix_madvise
+
+Change-Id: Ia18b7cd2d7f9db84331f7e2350d060b9e85b30c8
+---
+ src/3rdparty/pcre2/src/sljit/sljitUtils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/pcre2/src/sljit/sljitUtils.c b/src/3rdparty/pcre2/src/sljit/sljitUtils.c
+index 5c2a838932..2ead044b1b 100644
+--- a/src/3rdparty/pcre2/src/sljit/sljitUtils.c
++++ b/src/3rdparty/pcre2/src/sljit/sljitUtils.c
+@@ -315,7 +315,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_u8 *SLJIT_FUNC sljit_stack_resize(struct sljit_st
+ 		aligned_new_start = (sljit_uw)new_start & ~sljit_page_align;
+ 		aligned_old_start = ((sljit_uw)stack->start) & ~sljit_page_align;
+ 		/* If madvise is available, we release the unnecessary space. */
+-#if defined(MADV_DONTNEED)
++#if defined(MADV_DONTNEED) && !defined(__rtems__)
+ 		if (aligned_new_start > aligned_old_start)
+ 			madvise((void*)aligned_old_start, aligned_new_start - aligned_old_start, MADV_DONTNEED);
+ #elif defined(POSIX_MADV_DONTNEED)
+-- 
+2.21.0
+
diff --git a/src/3rdparty/pcre2/src/sljit/sljitUtils.c b/src/3rdparty/pcre2/src/sljit/sljitUtils.c
index 5c2a838932..2ead044b1b 100644
--- a/src/3rdparty/pcre2/src/sljit/sljitUtils.c
+++ b/src/3rdparty/pcre2/src/sljit/sljitUtils.c
@@ -315,7 +315,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_u8 *SLJIT_FUNC sljit_stack_resize(struct sljit_st
 		aligned_new_start = (sljit_uw)new_start & ~sljit_page_align;
 		aligned_old_start = ((sljit_uw)stack->start) & ~sljit_page_align;
 		/* If madvise is available, we release the unnecessary space. */
-#if defined(MADV_DONTNEED)
+#if defined(MADV_DONTNEED) && !defined(__rtems__)
 		if (aligned_new_start > aligned_old_start)
 			madvise((void*)aligned_old_start, aligned_new_start - aligned_old_start, MADV_DONTNEED);
 #elif defined(POSIX_MADV_DONTNEED)
diff --git a/src/3rdparty/sha3/brg_endian.h b/src/3rdparty/sha3/brg_endian.h
index 09d2a8b6a9..9bb306e678 100644
--- a/src/3rdparty/sha3/brg_endian.h
+++ b/src/3rdparty/sha3/brg_endian.h
@@ -42,7 +42,7 @@ Changes for ARM 9/9/2010 [Downstream relative to Gladman's GitHub, upstream to Q
 #elif defined( __linux__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
 #  if !defined( __MINGW32__ ) && !defined( _AIX ) && !defined(Q_OS_QNX)
 #    include <endian.h>
-#    if !defined( __BEOS__ )
+#    if !defined( __BEOS__ ) && !defined(Q_OS_RTEMS)
 #      include <byteswap.h>
 #    endif
 #  endif
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri
index 068764c726..cc8c12a6da 100644
--- a/src/3rdparty/sqlite.pri
+++ b/src/3rdparty/sqlite.pri
@@ -1,5 +1,6 @@
 CONFIG(release, debug|release):DEFINES *= NDEBUG
-DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE SQLITE_ENABLE_JSON1
+QT_FOR_CONFIG += core-private
+DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE SQLITE_ENABLE_JSON1
 !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS
 qtConfig(posix_fallocate): DEFINES += HAVE_POSIX_FALLOCATE=1
 winrt {
@@ -8,6 +9,11 @@ winrt {
 }
 qnx: DEFINES += _QNX_SOURCE
 !win32:!winrt:!winphone: DEFINES += HAVE_USLEEP=1
+qtConfig(dlopen) {
+    QMAKE_USE += libdl
+} else {
+    DEFINES += SQLITE_OMIT_LOAD_EXTENSION
+}
 integrity: QMAKE_CFLAGS += -include qplatformdefs.h
 INCLUDEPATH +=  $$PWD/sqlite
 SOURCES +=      $$PWD/sqlite/sqlite3.c
diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro
index ac6fc79968..24a83d56a1 100644
--- a/src/android/jar/jar.pro
+++ b/src/android/jar/jar.pro
@@ -1,6 +1,7 @@
 TARGET = QtAndroid
 
 CONFIG += java
+
 DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar
 
 PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
index c33d5016ce..7db16002ff 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -1013,6 +1013,25 @@ public class QtNative
         });
     }
 
+    private static String[] listAssetContent(android.content.res.AssetManager asset, String path) {
+        String [] list;
+        ArrayList<String> res = new ArrayList<String>();
+        try {
+            list = asset.list(path);
+            if (list.length > 0) {
+                for (String file : list) {
+                    try {
+                        String[] isDir = asset.list(path.length() > 0 ? path + "/" + file : file);
+                        if (isDir != null && isDir.length > 0)
+                            file += "/";
+                        res.add(file);
+                    } catch (Exception e) {}
+                }
+            }
+        } catch (Exception e) {}
+        return res.toArray(new String[res.size()]);
+    }
+
     // screen methods
     public static native void setDisplayMetrics(int screenWidthPixels,
                                                 int screenHeightPixels,
diff --git a/src/android/java/java.pro b/src/android/java/java.pro
index 9d37eb1026..7f0dfa8a1b 100644
--- a/src/android/java/java.pro
+++ b/src/android/java/java.pro
@@ -1,3 +1,5 @@
+CONFIG += single_arch
+
 CONFIG -= qt android_install
 
 javaresources.files = \
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
index 9d5578ed6d..1e72aa3841 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2016, BogDan Vatra <bogdan@kde.org>
+    Copyright (c) 2019, BogDan Vatra <bogdan@kde.org>
     Contact: http://www.qt.io/licensing/
 
     Commercial License Usage
@@ -44,8 +44,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.pm.ComponentInfo;
-import android.content.pm.PackageInfo;
-import android.content.res.AssetManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -55,17 +53,13 @@ import android.util.Log;
 import org.kde.necessitas.ministro.IMinistro;
 import org.kde.necessitas.ministro.IMinistroCallback;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 
 import dalvik.system.DexClassLoader;
 
@@ -85,9 +79,6 @@ public abstract class QtLoader {
     public static final String ENVIRONMENT_VARIABLES_KEY = "environment.variables";
     public static final String APPLICATION_PARAMETERS_KEY = "application.parameters";
     public static final String BUNDLED_LIBRARIES_KEY = "bundled.libraries";
-    public static final String QT_LIBS_RESOURCE_ID_KEY = "android.app.qt_libs_resource_id";
-    public static final String BUNDLED_IN_LIB_RESOURCE_ID_KEY = "android.app.bundled_in_lib_resource_id";
-    public static final String BUNDLED_IN_ASSETS_RESOURCE_ID_KEY = "android.app.bundled_in_assets_resource_id";
     public static final String MAIN_LIBRARY_KEY = "main.library";
     public static final String STATIC_INIT_CLASSES_KEY = "static.init.classes";
     public static final String NECESSITAS_API_LEVEL_KEY = "necessitas.api.level";
@@ -139,7 +130,6 @@ public abstract class QtLoader {
     public String QT_ANDROID_DEFAULT_THEME = null; // sets the default theme.
 
     public static final int INCOMPATIBLE_MINISTRO_VERSION = 1; // Incompatible Ministro version. Ministro needs to be upgraded.
-    public static final int BUFFER_SIZE = 1024;
 
     public String[] m_sources = {"https://download.qt-project.org/ministro/android/qt5/qt-5.7"}; // Make sure you are using ONLY secure locations
     public String m_repository = "default"; // Overwrites the default Ministro repository
@@ -153,12 +143,15 @@ public abstract class QtLoader {
     // this repository is used to push a new release, and should be used to test your application.
     // * unstable - unstable repository, DO NOT use this repository in production,
     // this repository is used to push Qt snapshots.
-    public String[] m_qtLibs = null; // required qt libs
+    public ArrayList<String> m_qtLibs = null; // required qt libs
     public int m_displayDensity = -1;
     private ContextWrapper m_context;
     protected ComponentInfo m_contextInfo;
     private Class<?> m_delegateClass;
 
+    private static ArrayList<FileOutputStream> m_fileOutputStreams = new ArrayList<FileOutputStream>();
+    // List of open file streams associated with files copied during installation.
+
     QtLoader(ContextWrapper context, Class<?> clazz) {
         m_context = context;
         m_delegateClass = clazz;
@@ -188,6 +181,36 @@ public abstract class QtLoader {
     }
     // Implement in subclass
 
+    private final List<String> supportedAbis = Arrays.asList(Build.SUPPORTED_ABIS);
+    private String preferredAbi = null;
+
+    private ArrayList<String> prefferedAbiLibs(String []libs)
+    {
+        HashMap<String, ArrayList<String>> abisLibs = new HashMap<>();
+        for (String lib : libs) {
+            String[] archLib = lib.split(";", 2);
+            if (preferredAbi != null && !archLib[0].equals(preferredAbi))
+                continue;
+            if (!abisLibs.containsKey(archLib[0]))
+                abisLibs.put(archLib[0], new ArrayList<String>());
+            abisLibs.get(archLib[0]).add(archLib[1]);
+        }
+
+        if (preferredAbi != null) {
+            if (abisLibs.containsKey(preferredAbi)) {
+                return abisLibs.get(preferredAbi);
+            }
+            return new ArrayList<String>();
+        }
+
+        for (String abi: supportedAbis) {
+            if (abisLibs.containsKey(abi)) {
+                preferredAbi = abi;
+                return abisLibs.get(abi);
+            }
+        }
+        return new ArrayList<String>();
+    }
 
     // this function is used to load and start the loader
     private void loadApplication(Bundle loaderParams)
@@ -215,12 +238,14 @@ public abstract class QtLoader {
 
             // add all bundled Qt libs to loader params
             ArrayList<String> libs = new ArrayList<String>();
-            if (m_contextInfo.metaData.containsKey("android.app.bundled_libs_resource_id"))
-                libs.addAll(Arrays.asList(m_context.getResources().getStringArray(m_contextInfo.metaData.getInt("android.app.bundled_libs_resource_id"))));
+            if (m_contextInfo.metaData.containsKey("android.app.bundled_libs_resource_id")) {
+                int resourceId = m_contextInfo.metaData.getInt("android.app.bundled_libs_resource_id");
+                libs.addAll(prefferedAbiLibs(m_context.getResources().getStringArray(resourceId)));
+            }
 
             String libName = null;
             if (m_contextInfo.metaData.containsKey("android.app.lib_name")) {
-                libName = m_contextInfo.metaData.getString("android.app.lib_name");
+                libName = m_contextInfo.metaData.getString("android.app.lib_name") + "_" + preferredAbi;
                 loaderParams.putString(MAIN_LIBRARY_KEY, libName); //main library contains main() function
             }
 
@@ -275,7 +300,7 @@ public abstract class QtLoader {
             try {
                 if (m_service != null) {
                     Bundle parameters = new Bundle();
-                    parameters.putStringArray(REQUIRED_MODULES_KEY, m_qtLibs);
+                    parameters.putStringArray(REQUIRED_MODULES_KEY, (String[]) m_qtLibs.toArray());
                     parameters.putString(APPLICATION_TITLE_KEY, getTitle());
                     parameters.putInt(MINIMUM_MINISTRO_API_KEY, MINISTRO_API_LEVEL);
                     parameters.putInt(MINIMUM_QT_VERSION_KEY, QT_VERSION);
@@ -331,215 +356,6 @@ public abstract class QtLoader {
         errorDialog.show();
     }
 
-    static private void copyFile(InputStream inputStream, OutputStream outputStream)
-            throws IOException
-    {
-        byte[] buffer = new byte[BUFFER_SIZE];
-
-        int count;
-        while ((count = inputStream.read(buffer)) > 0)
-            outputStream.write(buffer, 0, count);
-    }
-
-    private void copyAsset(String source, String destination)
-            throws IOException
-    {
-        // Already exists, we don't have to do anything
-        File destinationFile = new File(destination);
-        if (destinationFile.exists())
-            return;
-
-        File parentDirectory = destinationFile.getParentFile();
-        if (!parentDirectory.exists())
-            parentDirectory.mkdirs();
-
-        destinationFile.createNewFile();
-
-        AssetManager assetsManager = m_context.getAssets();
-        InputStream inputStream = null;
-        OutputStream outputStream = null;
-        try {
-            inputStream = assetsManager.open(source);
-            outputStream = new FileOutputStream(destinationFile);
-            copyFile(inputStream, outputStream);
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (inputStream != null)
-                inputStream.close();
-
-            if (outputStream != null)
-                outputStream.close();
-        }
-    }
-
-    private static void createBundledBinary(String source, String destination)
-            throws IOException
-    {
-        // Already exists, we don't have to do anything
-        File destinationFile = new File(destination);
-        if (destinationFile.exists())
-            return;
-
-        File parentDirectory = destinationFile.getParentFile();
-        if (!parentDirectory.exists())
-            parentDirectory.mkdirs();
-
-        destinationFile.createNewFile();
-
-        InputStream inputStream = null;
-        OutputStream outputStream = null;
-        try {
-            inputStream = new FileInputStream(source);
-            outputStream = new FileOutputStream(destinationFile);
-            copyFile(inputStream, outputStream);
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (inputStream != null)
-                inputStream.close();
-
-            if (outputStream != null)
-                outputStream.close();
-        }
-    }
-
-    private boolean cleanCacheIfNecessary(String pluginsPrefix, long packageVersion)
-    {
-        File versionFile = new File(pluginsPrefix + "cache.version");
-
-        long cacheVersion = 0;
-        if (versionFile.exists() && versionFile.canRead()) {
-            DataInputStream inputStream = null;
-            try {
-                inputStream = new DataInputStream(new FileInputStream(versionFile));
-                cacheVersion = inputStream.readLong();
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
-                if (inputStream != null) {
-                    try {
-                        inputStream.close();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-
-        if (cacheVersion != packageVersion) {
-            deleteRecursively(new File(pluginsPrefix));
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    private void extractBundledPluginsAndImports(String pluginsPrefix, String libsDir)
-            throws IOException
-    {
-        long packageVersion = -1;
-        try {
-            PackageInfo packageInfo = m_context.getPackageManager().getPackageInfo(m_context.getPackageName(), 0);
-            packageVersion = packageInfo.lastUpdateTime;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        if (!cleanCacheIfNecessary(pluginsPrefix, packageVersion))
-            return;
-
-        {
-            File versionFile = new File(pluginsPrefix + "cache.version");
-
-            File parentDirectory = versionFile.getParentFile();
-            if (!parentDirectory.exists())
-                parentDirectory.mkdirs();
-
-            versionFile.createNewFile();
-
-            DataOutputStream outputStream = null;
-            try {
-                outputStream = new DataOutputStream(new FileOutputStream(versionFile));
-                outputStream.writeLong(packageVersion);
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
-                if (outputStream != null)
-                    outputStream.close();
-            }
-        }
-
-        {
-            // why can't we load the plugins directly from libs ?!?!
-            String key = BUNDLED_IN_LIB_RESOURCE_ID_KEY;
-            if (m_contextInfo.metaData.containsKey(key)) {
-                String[] list = m_context.getResources().getStringArray(m_contextInfo.metaData.getInt(key));
-
-                for (String bundledImportBinary : list) {
-                    String[] split = bundledImportBinary.split(":");
-                    String sourceFileName = libsDir + split[0];
-                    String destinationFileName = pluginsPrefix + split[1];
-                    createBundledBinary(sourceFileName, destinationFileName);
-                }
-            }
-        }
-
-        {
-            String key = BUNDLED_IN_ASSETS_RESOURCE_ID_KEY;
-            if (m_contextInfo.metaData.containsKey(key)) {
-                String[] list = m_context.getResources().getStringArray(m_contextInfo.metaData.getInt(key));
-
-                for (String fileName : list) {
-                    String[] split = fileName.split(":");
-                    String sourceFileName = split[0];
-                    String destinationFileName = pluginsPrefix + split[1];
-                    copyAsset(sourceFileName, destinationFileName);
-                }
-            }
-
-        }
-    }
-
-    private void deleteRecursively(File directory)
-    {
-        File[] files = directory.listFiles();
-        if (files != null) {
-            for (File file : files) {
-                if (file.isDirectory())
-                    deleteRecursively(file);
-                else
-                    file.delete();
-            }
-
-            directory.delete();
-        }
-    }
-
-    private void cleanOldCacheIfNecessary(String oldLocalPrefix, String localPrefix)
-    {
-        File newCache = new File(localPrefix);
-        if (!newCache.exists()) {
-            {
-                File oldPluginsCache = new File(oldLocalPrefix + "plugins/");
-                if (oldPluginsCache.exists() && oldPluginsCache.isDirectory())
-                    deleteRecursively(oldPluginsCache);
-            }
-
-            {
-                File oldImportsCache = new File(oldLocalPrefix + "imports/");
-                if (oldImportsCache.exists() && oldImportsCache.isDirectory())
-                    deleteRecursively(oldImportsCache);
-            }
-
-            {
-                File oldQmlCache = new File(oldLocalPrefix + "qml/");
-                if (oldQmlCache.exists() && oldQmlCache.isDirectory())
-                    deleteRecursively(oldQmlCache);
-            }
-        }
-    }
-
     public void startApp(final boolean firstStart)
     {
         try {
@@ -553,7 +369,7 @@ public abstract class QtLoader {
 
             if (m_contextInfo.metaData.containsKey("android.app.qt_libs_resource_id")) {
                 int resourceId = m_contextInfo.metaData.getInt("android.app.qt_libs_resource_id");
-                m_qtLibs = m_context.getResources().getStringArray(resourceId);
+                m_qtLibs = prefferedAbiLibs(m_context.getResources().getStringArray(resourceId));
             }
 
             if (m_contextInfo.metaData.containsKey("android.app.use_local_qt_libs")
@@ -567,6 +383,7 @@ public abstract class QtLoader {
                     apkDeployFromSystem = true;
 
                 String libsDir = null;
+                String bundledLibsDir = null;
                 if (apkDeployFromSystem) {
                     String systemLibsPrefix = SYSTEM_LIB_PATH;
                     if (m_contextInfo.metaData.containsKey("android.app.system_libs_prefix")) {
@@ -583,8 +400,11 @@ public abstract class QtLoader {
                 } else {
                     String nativeLibraryPrefix = m_context.getApplicationInfo().nativeLibraryDir + "/";
                     File nativeLibraryDir = new File(nativeLibraryPrefix);
-                    if (nativeLibraryDir.exists() && nativeLibraryDir.isDirectory() && nativeLibraryDir.list().length > 0)
+                    if (nativeLibraryDir.exists() && nativeLibraryDir.isDirectory() && nativeLibraryDir.list().length > 0) {
                         libsDir = nativeLibraryPrefix;
+                        bundledLibsDir = nativeLibraryPrefix;
+                    }
+
                 }
 
                 if (apkDeployFromSystem && libsDir == null)
@@ -593,33 +413,21 @@ public abstract class QtLoader {
 
                 if (m_qtLibs != null) {
                     String libPrefix = libsDir + "lib";
-                    for (int i = 0; i < m_qtLibs.length; i++)
-                        libraryList.add(libPrefix + m_qtLibs[i] + ".so");
+                    for (String lib : m_qtLibs)
+                        libraryList.add(libPrefix + lib + ".so");
                 }
 
                 if (m_contextInfo.metaData.containsKey("android.app.bundle_local_qt_libs")
                         && m_contextInfo.metaData.getInt("android.app.bundle_local_qt_libs") == 1) {
-                    File dataDir = new File(m_context.getApplicationInfo().dataDir);
-                    String dataPath = dataDir.getCanonicalPath() + "/";
-                    String pluginsPrefix = dataPath + "qt-reserved-files/";
-
-                    if (libsDir == null)
-                        throw new Exception("");
-
-                    cleanOldCacheIfNecessary(dataPath, pluginsPrefix);
-                    extractBundledPluginsAndImports(pluginsPrefix, libsDir);
-
-                    if (m_contextInfo.metaData.containsKey(BUNDLED_IN_LIB_RESOURCE_ID_KEY)) {
-                        String[] extraLibs = m_contextInfo.metaData.getString("android.app.load_local_libs").split(":");
-                        for (String lib : extraLibs) {
+                    int resourceId = m_contextInfo.metaData.getInt("android.app.load_local_libs_resource_id");
+                    for (String libs : prefferedAbiLibs(m_context.getResources().getStringArray(resourceId))) {
+                        for (String lib : libs.split(":")) {
                             if (!lib.isEmpty())
-                                libraryList.add(pluginsPrefix + lib);
+                                libraryList.add(libsDir + lib);
                         }
                     }
-
-                    ENVIRONMENT_VARIABLES += "\tQML2_IMPORT_PATH=" + pluginsPrefix + "/qml"
-                            + "\tQML_IMPORT_PATH=" + pluginsPrefix + "/imports"
-                            + "\tQT_PLUGIN_PATH=" + pluginsPrefix + "/plugins";
+                    if (bundledLibsDir != null)
+                        ENVIRONMENT_VARIABLES += "\tQT_BUNDLED_LIBS_PATH=" + bundledLibsDir;
                 }
 
                 Bundle loaderParams = new Bundle();
diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml
index aed8a3c888..6d0f4e0d45 100644
--- a/src/android/templates/AndroidManifest.xml
+++ b/src/android/templates/AndroidManifest.xml
@@ -12,7 +12,7 @@
 
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
                   android:label="-- %%INSERT_APP_NAME%% --"
@@ -34,12 +34,11 @@
             <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
             <!-- Deploy Qt libs as part of package -->
             <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+
             <!-- Run with local libs -->
             <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
             <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
+            <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
             <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
             <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
             <!-- Used to specify custom system library path to run with local system libs -->
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle
index ed704c4957..3087d08c83 100644
--- a/src/android/templates/build.gradle
+++ b/src/android/templates/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.5.0'
     }
 }
 
@@ -44,7 +44,7 @@ android {
             java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
             aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
             res.srcDirs = [qt5AndroidDir + '/res', 'res']
-            resources.srcDirs = ['src']
+            resources.srcDirs = ['resources']
             renderscript.srcDirs = ['src']
             assets.srcDirs = ['assets']
             jniLibs.srcDirs = ['libs']
@@ -54,4 +54,9 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    // Do not compress Qt binary resources file
+    aaptOptions {
+        noCompress 'rcc'
+    }
 }
diff --git a/src/android/templates/res/values/libs.xml b/src/android/templates/res/values/libs.xml
index 4009a7785a..6b1a4a2a02 100644
--- a/src/android/templates/res/values/libs.xml
+++ b/src/android/templates/res/values/libs.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <array name="qt_sources">
-        <item>https://download.qt.io/ministro/android/qt5/qt-5.9</item>
+        <item>https://download.qt.io/ministro/android/qt5/qt-5.14</item>
     </array>
 
     <!-- The following is handled automatically by the deployment tool. It should
@@ -11,15 +11,12 @@
         <!-- %%INSERT_EXTRA_LIBS%% -->
     </array>
 
-     <array name="qt_libs">
-         <!-- %%INSERT_QT_LIBS%% -->
-     </array>
-
-    <array name="bundled_in_lib">
-        <!-- %%INSERT_BUNDLED_IN_LIB%% -->
+    <array name="qt_libs">
+        <!-- %%INSERT_QT_LIBS%% -->
     </array>
-    <array name="bundled_in_assets">
-        <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
+
+    <array name="load_local_libs">
+        <!-- %%INSERT_LOCAL_LIBS%% -->
     </array>
 
 </resources>
diff --git a/src/android/templates/templates.pro b/src/android/templates/templates.pro
index 55387f3af7..9a64251ee3 100644
--- a/src/android/templates/templates.pro
+++ b/src/android/templates/templates.pro
@@ -1,3 +1,5 @@
+CONFIG += single_arch
+
 CONFIG -= qt android_install
 
 templates.files = \
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri
index cafae0e742..af53d4c621 100644
--- a/src/angle/src/config.pri
+++ b/src/angle/src/config.pri
@@ -53,6 +53,7 @@ CONFIG(debug, debug|release) {
 }
 
 !isEmpty(BUILD_PASS): BUILDSUBDIR = $$lower($$BUILD_PASS)/
+else: BUILDSUBDIR = $$PWD/
 
 # c++11 is needed by MinGW to get support for unordered_map.
 CONFIG += stl exceptions c++11 c++14
diff --git a/src/concurrent/qtconcurrentcompilertest.h b/src/concurrent/qtconcurrentcompilertest.h
index cddfd06ca1..72cf1670a0 100644
--- a/src/concurrent/qtconcurrentcompilertest.h
+++ b/src/concurrent/qtconcurrentcompilertest.h
@@ -52,7 +52,7 @@ template<class T>
 class HasResultType {
     typedef char Yes;
     typedef void *No;
-    template<typename U> static Yes test(int, const typename U::result_type * = 0);
+    template<typename U> static Yes test(int, const typename U::result_type * = nullptr);
     template<typename U> static No test(double);
 public:
     enum { Value = (sizeof(test<T>(0)) == sizeof(Yes)) };
diff --git a/src/concurrent/qtconcurrentfilterkernel.h b/src/concurrent/qtconcurrentfilterkernel.h
index 9cbea2e671..e921a3d51a 100644
--- a/src/concurrent/qtconcurrentfilterkernel.h
+++ b/src/concurrent/qtconcurrentfilterkernel.h
@@ -266,7 +266,7 @@ public:
         if (keep(*it))
             this->reportResult(&(*it), index);
         else
-            this->reportResult(0, index);
+            this->reportResult(nullptr, index);
         return false;
     }
 
diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h
index 734bb29df1..7ba6720e03 100644
--- a/src/concurrent/qtconcurrentfunctionwrappers.h
+++ b/src/concurrent/qtconcurrentfunctionwrappers.h
@@ -225,13 +225,11 @@ struct PushBackWrapper
         return c.push_back(u);
     }
 
-#ifdef Q_COMPILER_RVALUE_REFS
     template <class C, class U>
     inline void operator()(C &c, U &&u) const
     {
         return c.push_back(u);
     }
-#endif
 };
 
 template <typename Functor, bool foo = HasResultType<Functor>::Value>
diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h
index 89fd3d2592..3095c9ff52 100644
--- a/src/concurrent/qtconcurrentiteratekernel.h
+++ b/src/concurrent/qtconcurrentiteratekernel.h
@@ -206,9 +206,9 @@ public:
     bool shouldStartThread() override
     {
         if (forIteration)
-            return (currentIndex.load() < iterationCount) && !this->shouldThrottleThread();
+            return (currentIndex.loadRelaxed() < iterationCount) && !this->shouldThrottleThread();
         else // whileIteration
-            return (iteratorThreads.load() == 0);
+            return (iteratorThreads.loadRelaxed() == 0);
     }
 
     ThreadFunctionResult threadFunction() override
@@ -230,7 +230,7 @@ public:
 
             const int currentBlockSize = blockSizeManager.blockSize();
 
-            if (currentIndex.load() >= iterationCount)
+            if (currentIndex.loadRelaxed() >= iterationCount)
                 break;
 
             // Atomically reserve a block of iterationCount for this thread.
@@ -261,7 +261,7 @@ public:
             // Report progress if progress reporting enabled.
             if (progressReportingEnabled) {
                 completed.fetchAndAddAcquire(finalBlockSize);
-                this->setProgressValue(this->completed.load());
+                this->setProgressValue(this->completed.loadRelaxed());
             }
 
             if (this->shouldThrottleThread())
diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h
index 3424124118..7c9538a015 100644
--- a/src/concurrent/qtconcurrentmapkernel.h
+++ b/src/concurrent/qtconcurrentmapkernel.h
@@ -74,7 +74,7 @@ public:
         Iterator it = sequenceBeginIterator;
         std::advance(it, beginIndex);
         for (int i = beginIndex; i < endIndex; ++i) {
-            runIteration(it, i, 0);
+            runIteration(it, i, nullptr);
             std::advance(it, 1);
         }
 
@@ -118,16 +118,16 @@ public:
         return false;
     }
 
-    bool runIterations(Iterator sequenceBeginIterator, int begin, int end, ReducedResultType *) override
+    bool runIterations(Iterator sequenceBeginIterator, int beginIndex, int endIndex, ReducedResultType *) override
     {
         IntermediateResults<typename MapFunctor::result_type> results;
-        results.begin = begin;
-        results.end = end;
-        results.vector.reserve(end - begin);
+        results.begin = beginIndex;
+        results.end = endIndex;
+        results.vector.reserve(endIndex - beginIndex);
 
         Iterator it = sequenceBeginIterator;
-        std::advance(it, begin);
-        for (int i = begin; i < end; ++i) {
+        std::advance(it, beginIndex);
+        for (int i = beginIndex; i < endIndex; ++i) {
             results.vector.append(map(*(it)));
             std::advance(it, 1);
         }
@@ -176,13 +176,13 @@ public:
         return true;
     }
 
-    bool runIterations(Iterator sequenceBeginIterator, int begin, int end, T *results) override
+    bool runIterations(Iterator sequenceBeginIterator, int beginIndex, int endIndex, T *results) override
     {
 
         Iterator it = sequenceBeginIterator;
-        std::advance(it, begin);
-        for (int i = begin; i < end; ++i) {
-            runIteration(it, i, results + (i - begin));
+        std::advance(it, beginIndex);
+        for (int i = beginIndex; i < endIndex; ++i) {
+            runIteration(it, i, results + (i - beginIndex));
             std::advance(it, 1);
         }
 
diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h
index 0fbc40e02e..8f9a938952 100644
--- a/src/concurrent/qtconcurrentreducekernel.h
+++ b/src/concurrent/qtconcurrentreducekernel.h
@@ -52,6 +52,8 @@
 #include <QtCore/qthreadpool.h>
 #include <QtCore/qvector.h>
 
+#include <mutex>
+
 QT_BEGIN_NAMESPACE
 
 
@@ -147,7 +149,7 @@ public:
                    ReduceResultType &r,
                    const IntermediateResults<T> &result)
     {
-        QMutexLocker locker(&mutex);
+        std::unique_lock<QMutex> locker(mutex);
         if (!canReduce(result.begin)) {
             ++resultsMapSize;
             resultsMap.insert(result.begin, result);
@@ -161,7 +163,7 @@ public:
             // reduce this result
             locker.unlock();
             reduceResult(reduce, r, result);
-            locker.relock();
+            locker.lock();
 
             // reduce all stored results as well
             while (!resultsMap.isEmpty()) {
@@ -170,7 +172,7 @@ public:
 
                 locker.unlock();
                 reduceResults(reduce, r, resultsMapCopy);
-                locker.relock();
+                locker.lock();
 
                 resultsMapSize -= resultsMapCopy.size();
             }
@@ -180,7 +182,7 @@ public:
             // reduce this result
             locker.unlock();
             reduceResult(reduce, r, result);
-            locker.relock();
+            locker.lock();
 
             // OrderedReduce
             progress += result.end - result.begin;
@@ -193,7 +195,7 @@ public:
 
                 locker.unlock();
                 reduceResult(reduce, r, it.value());
-                locker.relock();
+                locker.lock();
 
                 --resultsMapSize;
                 progress += it.value().end - it.value().begin;
diff --git a/src/concurrent/qtconcurrentrun.h b/src/concurrent/qtconcurrentrun.h
index 6001010a78..22dae70460 100644
--- a/src/concurrent/qtconcurrentrun.h
+++ b/src/concurrent/qtconcurrentrun.h
@@ -99,8 +99,6 @@ QFuture<T> run(T (*functionPointer)(Param1, Param2, Param3, Param4, Param5), con
     return (new StoredFunctorCall5<T, T (*)(Param1, Param2, Param3, Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5>(functionPointer, arg1, arg2, arg3, arg4, arg5))->start();
 }
 
-#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_AUTO_FUNCTION)
-
 template <typename Functor>
 auto run(Functor functor) -> typename std::enable_if<!QtPrivate::HasResultType<Functor>::Value, QFuture<decltype(functor())>>::type
 {
@@ -148,8 +146,6 @@ auto run(Functor functor, const Arg1 &arg1, const Arg2 &arg2, const Arg3 &arg3,
     return (new StoredFunctorCall5<result_type, Functor, Arg1, Arg2, Arg3, Arg4, Arg5>(functor, arg1, arg2, arg3, arg4, arg5))->start();
 }
 
-#endif
-
 template <typename FunctionObject>
 QFuture<typename FunctionObject::result_type> run(FunctionObject functionObject)
 {
@@ -370,8 +366,6 @@ QFuture<T> run(QThreadPool *pool, T (*functionPointer)(Param1, Param2, Param3, P
     return (new StoredFunctorCall5<T, T (*)(Param1, Param2, Param3, Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5>(functionPointer, arg1, arg2, arg3, arg4, arg5))->start(pool);
 }
 
-#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_AUTO_FUNCTION)
-
 template <typename Functor>
 auto run(QThreadPool *pool, Functor functor) -> typename std::enable_if<!QtPrivate::HasResultType<Functor>::Value, QFuture<decltype(functor())>>::type
 {
@@ -419,8 +413,6 @@ auto run(QThreadPool *pool, Functor functor, const Arg1 &arg1, const Arg2 &arg2,
     return (new StoredFunctorCall5<result_type, Functor, Arg1, Arg2, Arg3, Arg4, Arg5>(functor, arg1, arg2, arg3, arg4, arg5))->start(pool);
 }
 
-#endif
-
 template <typename FunctionObject>
 QFuture<typename FunctionObject::result_type> run(QThreadPool *pool, FunctionObject functionObject)
 {
diff --git a/src/concurrent/qtconcurrentthreadengine.cpp b/src/concurrent/qtconcurrentthreadengine.cpp
index 968720cbbe..7f91a2ba68 100644
--- a/src/concurrent/qtconcurrentthreadengine.cpp
+++ b/src/concurrent/qtconcurrentthreadengine.cpp
@@ -91,7 +91,7 @@ ThreadEngineBarrier::ThreadEngineBarrier()
 void ThreadEngineBarrier::acquire()
 {
     forever {
-        int localCount = count.load();
+        int localCount = count.loadRelaxed();
         if (localCount < 0) {
             if (count.testAndSetOrdered(localCount, localCount -1))
                 return;
@@ -105,7 +105,7 @@ void ThreadEngineBarrier::acquire()
 int ThreadEngineBarrier::release()
 {
     forever {
-        int localCount = count.load();
+        int localCount = count.loadRelaxed();
         if (localCount == -1) {
             if (count.testAndSetOrdered(-1, 0)) {
                 semaphore.release();
@@ -125,7 +125,7 @@ int ThreadEngineBarrier::release()
 void ThreadEngineBarrier::wait()
 {
     forever {
-        int localCount = count.load();
+        int localCount = count.loadRelaxed();
         if (localCount == 0)
             return;
 
@@ -139,7 +139,7 @@ void ThreadEngineBarrier::wait()
 
 int ThreadEngineBarrier::currentCount()
 {
-    return count.load();
+    return count.loadRelaxed();
 }
 
 // releases a thread, unless this is the last thread.
@@ -147,7 +147,7 @@ int ThreadEngineBarrier::currentCount()
 bool ThreadEngineBarrier::releaseUnlessLast()
 {
     forever {
-        int localCount = count.load();
+        int localCount = count.loadRelaxed();
         if (qAbs(localCount) == 1) {
             return false;
         } else if (localCount < 0) {
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index e0652fdcf9..659faac6a5 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -46,6 +46,8 @@ if (NOT TARGET Qt5::rcc)
     )
 endif()
 
+set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")
+
 set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
 set(Qt5Core_MOC_EXECUTABLE Qt5::moc)
 set(Qt5Core_RCC_EXECUTABLE Qt5::rcc)
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
index 0f006fe1e3..17cc19fc4e 100644
--- a/src/corelib/Qt5CoreMacros.cmake
+++ b/src/corelib/Qt5CoreMacros.cmake
@@ -393,3 +393,35 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9)
         endforeach()
     endmacro()
 endif()
+
+function(QT5_IMPORT_PLUGINS TARGET_NAME)
+    set(_doing "")
+    foreach(_arg ${ARGN})
+        if(_arg STREQUAL "INCLUDE")
+            set(_doing "INCLUDE")
+        elseif(_arg STREQUAL "EXCLUDE")
+            set(_doing "EXCLUDE")
+        elseif(_arg STREQUAL "INCLUDE_BY_TYPE")
+            set(_doing "INCLUDE_BY_TYPE")
+        elseif(_arg STREQUAL "EXCLUDE_BY_TYPE")
+            set(_doing "EXCLUDE_BY_TYPE")
+        else()
+            if(_doing STREQUAL "INCLUDE")
+                set_property(TARGET ${TARGET_NAME} APPEND PROPERTY QT_PLUGINS "${_arg}")
+            elseif(_doing STREQUAL "EXCLUDE")
+                set_property(TARGET ${TARGET_NAME} APPEND PROPERTY QT_NO_PLUGINS "${_arg}")
+            elseif(_doing STREQUAL "INCLUDE_BY_TYPE")
+                string(REGEX REPLACE "[-/]" "_" _plugin_type "${_arg}")
+                set(_doing "INCLUDE_BY_TYPE_PLUGINS")
+            elseif(_doing STREQUAL "INCLUDE_BY_TYPE_PLUGINS")
+                set_property(TARGET ${TARGET_NAME} APPEND PROPERTY "QT_PLUGINS_${_plugin_type}" "${_arg}")
+            elseif(_doing STREQUAL "EXCLUDE_BY_TYPE")
+                string(REGEX REPLACE "[-/]" "_" _plugin_type "${_arg}")
+                set_property(TARGET ${TARGET_NAME} PROPERTY "QT_PLUGINS_${_plugin_type}" -)
+                set(_doing "")
+            else()
+                message(FATAL_ERROR "Unexpected extra argument: \"${_arg}\"")
+            endif()
+        endif()
+    endforeach()
+endfunction()
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 5da8419fe8..46b01449d4 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -152,6 +152,7 @@
 #include <QtCore/qthreadstorage.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qpointer.h>
+#include <QtCore/qscopedvaluerollback.h>
 
 #define DEFAULT_TIMER_INTERVAL 16
 #define PAUSE_TIMER_COARSE_THRESHOLD 2000
@@ -315,14 +316,13 @@ void QUnifiedTimer::updateAnimationTimers(qint64 currentTick)
     //* it might happen in some cases that the delta is negative because the animation driver
     //  advances faster than time.elapsed()
     if (delta > 0) {
-        insideTick = true;
+        QScopedValueRollback<bool> guard(insideTick, true);
         if (profilerCallback)
             profilerCallback(delta);
         for (currentAnimationIdx = 0; currentAnimationIdx < animationTimers.count(); ++currentAnimationIdx) {
             QAbstractAnimationTimer *animation = animationTimers.at(currentAnimationIdx);
             animation->updateAnimationsTime(delta);
         }
-        insideTick = false;
         currentAnimationIdx = 0;
     }
 }
@@ -361,10 +361,11 @@ void QUnifiedTimer::localRestart()
 
 void QUnifiedTimer::restart()
 {
-    insideRestart = true;
-    for (int i = 0; i < animationTimers.count(); ++i)
-        animationTimers.at(i)->restartAnimationTimer();
-    insideRestart = false;
+    {
+        QScopedValueRollback<bool> guard(insideRestart, true);
+        for (int i = 0; i < animationTimers.count(); ++i)
+            animationTimers.at(i)->restartAnimationTimer();
+    }
 
     localRestart();
 }
@@ -599,14 +600,13 @@ void QAnimationTimer::updateAnimationsTime(qint64 delta)
     //it might happen in some cases that the time doesn't change because events are delayed
     //when the CPU load is high
     if (delta) {
-        insideTick = true;
+        QScopedValueRollback<bool> guard(insideTick, true);
         for (currentAnimationIdx = 0; currentAnimationIdx < animations.count(); ++currentAnimationIdx) {
             QAbstractAnimation *animation = animations.at(currentAnimationIdx);
             int elapsed = QAbstractAnimationPrivate::get(animation)->totalCurrentTime
                           + (animation->direction() == QAbstractAnimation::Forward ? delta : -delta);
             animation->setCurrentTime(elapsed);
         }
-        insideTick = false;
         currentAnimationIdx = 0;
     }
 }
diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h
index 3b6e8d6cc4..037d3be74f 100644
--- a/src/corelib/animation/qabstractanimation_p.h
+++ b/src/corelib/animation/qabstractanimation_p.h
@@ -78,7 +78,7 @@ public:
           hasRegisteredTimer(false),
           isPause(false),
           isGroup(false),
-          group(0)
+          group(nullptr)
     {
     }
 
diff --git a/src/corelib/animation/qanimationgroup_p.h b/src/corelib/animation/qanimationgroup_p.h
index d0b2e9f9bb..4d1d690e69 100644
--- a/src/corelib/animation/qanimationgroup_p.h
+++ b/src/corelib/animation/qanimationgroup_p.h
@@ -78,7 +78,7 @@ public:
     void disconnectUncontrolledAnimation(QAbstractAnimation *anim)
     {
         //0 for the signal here because we might be called from the animation destructor
-        QObject::disconnect(anim, 0, q_func(), SLOT(_q_uncontrolledAnimationFinished()));
+        QObject::disconnect(anim, nullptr, q_func(), SLOT(_q_uncontrolledAnimationFinished()));
     }
 
     void connectUncontrolledAnimation(QAbstractAnimation *anim)
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index 271be248ec..2a3572d441 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -85,6 +85,7 @@
 #include "qpropertyanimation_p.h"
 
 #include <QtCore/QMutex>
+#include <QtCore/private/qlocking_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -261,7 +262,7 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState,
     QPropertyAnimation *animToStop = 0;
     {
         static QBasicMutex mutex;
-        QMutexLocker locker(&mutex);
+        auto locker = qt_unique_lock(mutex);
         typedef QPair<QObject *, QByteArray> QPropertyAnimationPair;
         typedef QHash<QPropertyAnimationPair, QPropertyAnimation*> QPropertyAnimationHash;
         static QPropertyAnimationHash hash;
@@ -277,15 +278,20 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState,
             if (oldState == Stopped) {
                 d->setDefaultStartEndValue(d->targetValue->property(d->propertyName.constData()));
                 //let's check if we have a start value and an end value
+                const char *what = nullptr;
                 if (!startValue().isValid() && (d->direction == Backward || !d->defaultStartEndValue.isValid())) {
-                    qWarning("QPropertyAnimation::updateState (%s, %s, %s): starting an animation without start value",
-                             d->propertyName.constData(), d->target.data()->metaObject()->className(),
-                             qPrintable(d->target.data()->objectName()));
+                    what = "start";
                 }
                 if (!endValue().isValid() && (d->direction == Forward || !d->defaultStartEndValue.isValid())) {
-                    qWarning("QPropertyAnimation::updateState (%s, %s, %s): starting an animation without end value",
+                    if (what)
+                        what = "start and end";
+                    else
+                        what = "end";
+                }
+                if (Q_UNLIKELY(what)) {
+                    qWarning("QPropertyAnimation::updateState (%s, %s, %ls): starting an animation without %s value",
                              d->propertyName.constData(), d->target.data()->metaObject()->className(),
-                             qPrintable(d->target.data()->objectName()));
+                             qUtf16Printable(d->target.data()->objectName()), what);
                 }
             }
         } else if (hash.value(key) == this) {
diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h
index 479762f573..cbd3ce287d 100644
--- a/src/corelib/animation/qpropertyanimation_p.h
+++ b/src/corelib/animation/qpropertyanimation_p.h
@@ -64,7 +64,7 @@ class QPropertyAnimationPrivate : public QVariantAnimationPrivate
    Q_DECLARE_PUBLIC(QPropertyAnimation)
 public:
     QPropertyAnimationPrivate()
-        : targetValue(0), propertyType(0), propertyIndex(-1)
+        : targetValue(nullptr), propertyType(0), propertyIndex(-1)
     {
     }
 
diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h
index 88dac4f566..c082d6b524 100644
--- a/src/corelib/animation/qsequentialanimationgroup_p.h
+++ b/src/corelib/animation/qsequentialanimationgroup_p.h
@@ -63,7 +63,7 @@ class QSequentialAnimationGroupPrivate : public QAnimationGroupPrivate
     Q_DECLARE_PUBLIC(QSequentialAnimationGroup)
 public:
     QSequentialAnimationGroupPrivate()
-        : currentAnimation(0), currentAnimationIndex(-1), lastLoop(0)
+        : currentAnimation(nullptr), currentAnimationIndex(-1), lastLoop(0)
     { }
 
 
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index ac81f89ed4..216c015732 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -43,6 +43,7 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qline.h>
 #include <QtCore/qmutex.h>
+#include <QtCore/private/qlocking_p.h>
 
 #include <algorithm>
 
@@ -283,11 +284,11 @@ void QVariantAnimationPrivate::setCurrentValueForProgress(const qreal progress)
     qSwap(currentValue, ret);
     q->updateCurrentValue(currentValue);
     static QBasicAtomicInt changedSignalIndex = Q_BASIC_ATOMIC_INITIALIZER(0);
-    if (!changedSignalIndex.load()) {
+    if (!changedSignalIndex.loadRelaxed()) {
         //we keep the mask so that we emit valueChanged only when needed (for performance reasons)
         changedSignalIndex.testAndSetRelaxed(0, signalIndex("valueChanged(QVariant)"));
     }
-    if (isSignalConnected(changedSignalIndex.load()) && currentValue != ret) {
+    if (isSignalConnected(changedSignalIndex.loadRelaxed()) && currentValue != ret) {
         //the value has changed
         emit q->valueChanged(currentValue);
     }
@@ -426,7 +427,7 @@ void QVariantAnimation::registerInterpolator(QVariantAnimation::Interpolator fun
     // in such an order that we get here with interpolators == NULL,
     // to continue causes the app to crash on exit with a SEGV
     if (interpolators) {
-        QMutexLocker locker(&registeredInterpolatorsMutex);
+        const auto locker = qt_scoped_lock(registeredInterpolatorsMutex);
         if (int(interpolationType) >= interpolators->count())
             interpolators->resize(int(interpolationType) + 1);
         interpolators->replace(interpolationType, func);
@@ -443,7 +444,7 @@ QVariantAnimation::Interpolator QVariantAnimationPrivate::getInterpolator(int in
 {
     {
         QInterpolatorVector *interpolators = registeredInterpolators();
-        QMutexLocker locker(&registeredInterpolatorsMutex);
+        const auto locker = qt_scoped_lock(registeredInterpolatorsMutex);
         QVariantAnimation::Interpolator ret = 0;
         if (interpolationType < interpolators->count()) {
             ret = interpolators->at(interpolationType);
diff --git a/src/corelib/codecs/qlatincodec.cpp b/src/corelib/codecs/qlatincodec.cpp
index 1b53d26ef4..55e6f0ba4d 100644
--- a/src/corelib/codecs/qlatincodec.cpp
+++ b/src/corelib/codecs/qlatincodec.cpp
@@ -48,7 +48,7 @@ QLatin1Codec::~QLatin1Codec()
 
 QString QLatin1Codec::convertToUnicode(const char *chars, int len, ConverterState *) const
 {
-    if (chars == 0)
+    if (chars == nullptr)
         return QString();
 
     return QString::fromLatin1(chars, len);
@@ -62,7 +62,7 @@ QByteArray QLatin1Codec::convertFromUnicode(const QChar *ch, int len, ConverterS
     char *d = r.data();
     int invalid = 0;
     for (int i = 0; i < len; ++i) {
-        if (ch[i] > 0xff) {
+        if (ch[i] > QChar(0xff)) {
             d[i] = replacement;
             ++invalid;
         } else {
@@ -104,7 +104,7 @@ QLatin15Codec::~QLatin15Codec()
 
 QString QLatin15Codec::convertToUnicode(const char* chars, int len, ConverterState *) const
 {
-    if (chars == 0)
+    if (chars == nullptr)
         return QString();
 
     QString str = QString::fromLatin1(chars, len);
@@ -112,28 +112,28 @@ QString QLatin15Codec::convertToUnicode(const char* chars, int len, ConverterSta
     while(len--) {
         switch(uc->unicode()) {
             case 0xa4:
-                *uc = 0x20ac;
+                *uc = QChar(0x20ac);
                 break;
             case 0xa6:
-                *uc = 0x0160;
+                *uc = QChar(0x0160);
                 break;
             case 0xa8:
-                *uc = 0x0161;
+                *uc = QChar(0x0161);
                 break;
             case 0xb4:
-                *uc = 0x017d;
+                *uc = QChar(0x017d);
                 break;
             case 0xb8:
-                *uc = 0x017e;
+                *uc = QChar(0x017e);
                 break;
             case 0xbc:
-                *uc = 0x0152;
+                *uc = QChar(0x0152);
                 break;
             case 0xbd:
-                *uc = 0x0153;
+                *uc = QChar(0x0153);
                 break;
             case 0xbe:
-                *uc = 0x0178;
+                *uc = QChar(0x0178);
                 break;
             default:
                 break;
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index b7bb3196af..06fd88da90 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -47,6 +47,7 @@
 #include "qendian.h"
 #include "qfile.h"
 #include "qlist.h"
+#include <private/qlocking_p.h>
 #include "qstringlist.h"
 #include "qvarlengtharray.h"
 #if !defined(QT_BOOTSTRAPPED)
@@ -86,7 +87,7 @@
 #endif // icu
 #endif // QT_BOOTSTRAPPED
 
-#include "qmutex.h"
+#include <mutex>
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -100,8 +101,16 @@ QT_BEGIN_NAMESPACE
 typedef QList<QTextCodec*>::ConstIterator TextCodecListConstIt;
 typedef QList<QByteArray>::ConstIterator ByteArrayListConstIt;
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, textCodecsMutex, (QMutex::Recursive));
-QMutex *qTextCodecsMutex() { return textCodecsMutex(); }
+Q_GLOBAL_STATIC(QRecursiveMutex, textCodecsMutex);
+
+class TextCodecsMutexLocker
+{
+    using Lock = decltype(qt_unique_lock(std::declval<QRecursiveMutex&>()));
+    // ### FIXME: this is used when textCodecsMutex already == nullptr
+    const Lock lock = qt_unique_lock(textCodecsMutex());
+public:
+    TextCodecsMutexLocker() {} // required d/t an ICC 19 bug
+};
 
 #if !QT_CONFIG(icu)
 static char qtolower(char c)
@@ -159,10 +168,10 @@ static QTextCodec *setupLocaleMapper()
 {
     QCoreGlobalData *globalData = QCoreGlobalData::instance();
 
-    QTextCodec *locale = 0;
+    QTextCodec *locale = nullptr;
 
     {
-        QMutexLocker locker(textCodecsMutex());
+        const TextCodecsMutexLocker locker;
         if (globalData->allCodecs.isEmpty())
             setup();
     }
@@ -208,7 +217,7 @@ static QTextCodec *setupLocaleMapper()
         // First part is getting that locale name.  First try setlocale() which
         // definitely knows it, but since we cannot fully trust it, get ready
         // to fall back to environment variables.
-        const QByteArray ctype = setlocale(LC_CTYPE, 0);
+        const QByteArray ctype = setlocale(LC_CTYPE, nullptr);
 
         // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
         // environment variables.
@@ -477,7 +486,7 @@ QTextCodec::ConverterState::~ConverterState()
 */
 QTextCodec::QTextCodec()
 {
-    QMutexLocker locker(textCodecsMutex());
+    const TextCodecsMutexLocker locker;
 
     QCoreGlobalData *globalInstance = QCoreGlobalData::instance();
     if (globalInstance->allCodecs.isEmpty())
@@ -501,7 +510,7 @@ QTextCodec::~QTextCodec()
 
     globalData->codecForLocale.testAndSetRelaxed(this, nullptr);
 
-    QMutexLocker locker(textCodecsMutex());
+    const TextCodecsMutexLocker locker;
 
     globalData->allCodecs.removeOne(this);
 
@@ -532,23 +541,21 @@ QTextCodec::~QTextCodec()
 QTextCodec *QTextCodec::codecForName(const QByteArray &name)
 {
     if (name.isEmpty())
-        return 0;
+        return nullptr;
 
-    QMutexLocker locker(textCodecsMutex());
+    const TextCodecsMutexLocker locker;
 
     QCoreGlobalData *globalData = QCoreGlobalData::instance();
     if (!globalData)
-        return 0;
+        return nullptr;
     setup();
 
 #if !QT_CONFIG(icu)
     QTextCodecCache *cache = &globalData->codecCache;
     QTextCodec *codec;
-    if (cache) {
-        codec = cache->value(name);
-        if (codec)
-            return codec;
-    }
+    codec = cache->value(name);
+    if (codec)
+        return codec;
 
     for (TextCodecListConstIt it = globalData->allCodecs.constBegin(), cend = globalData->allCodecs.constEnd(); it != cend; ++it) {
         QTextCodec *cursor = *it;
@@ -560,14 +567,13 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name)
         QList<QByteArray> aliases = cursor->aliases();
         for (ByteArrayListConstIt ait = aliases.constBegin(), acend = aliases.constEnd(); ait != acend; ++ait) {
             if (qTextCodecNameMatch(*ait, name)) {
-                if (cache)
-                    cache->insert(name, cursor);
+                cache->insert(name, cursor);
                 return cursor;
             }
         }
     }
 
-    return 0;
+    return nullptr;
 #else
     return QIcuCodec::codecForNameUnlocked(name);
 #endif
@@ -581,11 +587,11 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name)
 */
 QTextCodec* QTextCodec::codecForMib(int mib)
 {
-    QMutexLocker locker(textCodecsMutex());
+    const TextCodecsMutexLocker locker;
 
     QCoreGlobalData *globalData = QCoreGlobalData::instance();
     if (!globalData)
-        return 0;
+        return nullptr;
     if (globalData->allCodecs.isEmpty())
         setup();
 
@@ -611,7 +617,7 @@ QTextCodec* QTextCodec::codecForMib(int mib)
 #if QT_CONFIG(icu)
     return QIcuCodec::codecForMibUnlocked(mib);
 #else
-    return 0;
+    return nullptr;
 #endif
 }
 
@@ -627,7 +633,7 @@ QTextCodec* QTextCodec::codecForMib(int mib)
 */
 QList<QByteArray> QTextCodec::availableCodecs()
 {
-    QMutexLocker locker(textCodecsMutex());
+    const TextCodecsMutexLocker locker;
 
     QCoreGlobalData *globalData = QCoreGlobalData::instance();
     if (globalData->allCodecs.isEmpty())
@@ -659,7 +665,7 @@ QList<int> QTextCodec::availableMibs()
 #if QT_CONFIG(icu)
     return QIcuCodec::availableMibs();
 #else
-    QMutexLocker locker(textCodecsMutex());
+    const TextCodecsMutexLocker locker;
 
     QCoreGlobalData *globalData = QCoreGlobalData::instance();
     if (globalData->allCodecs.isEmpty())
@@ -704,14 +710,13 @@ QTextCodec* QTextCodec::codecForLocale()
 {
     QCoreGlobalData *globalData = QCoreGlobalData::instance();
     if (!globalData)
-        return 0;
+        return nullptr;
 
     QTextCodec *codec = globalData->codecForLocale.loadAcquire();
     if (!codec) {
 #if QT_CONFIG(icu)
-        textCodecsMutex()->lock();
+        const TextCodecsMutexLocker locker;
         codec = QIcuCodec::defaultCodecUnlocked();
-        textCodecsMutex()->unlock();
 #else
         // setupLocaleMapper locks as necessary
         codec = setupLocaleMapper();
@@ -830,7 +835,7 @@ QTextEncoder* QTextCodec::makeEncoder(QTextCodec::ConversionFlags flags) const
 */
 QByteArray QTextCodec::fromUnicode(const QString& str) const
 {
-    return convertFromUnicode(str.constData(), str.length(), 0);
+    return convertFromUnicode(str.constData(), str.length(), nullptr);
 }
 #endif
 
@@ -863,7 +868,7 @@ QByteArray QTextCodec::fromUnicode(QStringView str) const
 */
 QString QTextCodec::toUnicode(const QByteArray& a) const
 {
-    return convertToUnicode(a.constData(), a.length(), 0);
+    return convertToUnicode(a.constData(), a.length(), nullptr);
 }
 
 /*!
@@ -915,7 +920,7 @@ bool QTextCodec::canEncode(QStringView s) const
 QString QTextCodec::toUnicode(const char *chars) const
 {
     int len = qstrlen(chars);
-    return convertToUnicode(chars, len, 0);
+    return convertToUnicode(chars, len, nullptr);
 }
 
 
@@ -1061,7 +1066,7 @@ QString QTextDecoder::toUnicode(const char *chars, int len)
 }
 
 // in qstring.cpp:
-void qt_from_latin1(ushort *dst, const char *str, size_t size) Q_DECL_NOTHROW;
+void qt_from_latin1(ushort *dst, const char *str, size_t size) noexcept;
 
 /*! \overload
 
@@ -1110,7 +1115,7 @@ QString QTextDecoder::toUnicode(const QByteArray &ba)
 QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba, QTextCodec *defaultCodec)
 {
     // determine charset
-    QTextCodec *c = QTextCodec::codecForUtfText(ba, 0);
+    QTextCodec *c = QTextCodec::codecForUtfText(ba, nullptr);
     if (!c) {
         static Q_RELAXED_CONSTEXPR auto matcher = qMakeStaticByteArrayMatcher("meta ");
         QByteArray header = ba.left(1024).toLower();
diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h
index 0e449d994c..7fcf6df984 100644
--- a/src/corelib/codecs/qtextcodec_p.h
+++ b/src/corelib/codecs/qtextcodec_p.h
@@ -98,7 +98,7 @@ public:
 
     struct ConverterState {
         ConverterState(ConversionFlags f = DefaultConversion)
-            : flags(f), remainingChars(0), invalidChars(0), d(0) { state_data[0] = state_data[1] = state_data[2] = 0; }
+            : flags(f), remainingChars(0), invalidChars(0), d(nullptr) { state_data[0] = state_data[1] = state_data[2] = 0; }
         ~ConverterState() { }
         ConversionFlags flags;
         int remainingChars;
diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp
index 643c8ee475..af36bd7e2f 100644
--- a/src/corelib/codecs/qutfcodec.cpp
+++ b/src/corelib/codecs/qutfcodec.cpp
@@ -54,7 +54,7 @@ static const uchar utf8bom[] = { 0xef, 0xbb, 0xbf };
 
 #if (defined(__SSE2__) && defined(QT_COMPILER_SUPPORTS_SSE2)) \
     || (defined(__ARM_NEON__) && defined(Q_PROCESSOR_ARM_64))
-static Q_ALWAYS_INLINE uint qBitScanReverse(unsigned v) Q_DECL_NOTHROW
+static Q_ALWAYS_INLINE uint qBitScanReverse(unsigned v) noexcept
 {
     uint result = qCountLeadingZeroBits(v);
     // Now Invert the result: clz will count *down* from the msb to the lsb, so the msb index is 31
@@ -504,7 +504,7 @@ QString QUtf8::convertToUnicode(const char *chars, int len)
     This function never throws.
 */
 
-QChar *QUtf8::convertToUnicode(QChar *buffer, const char *chars, int len) Q_DECL_NOTHROW
+QChar *QUtf8::convertToUnicode(QChar *buffer, const char *chars, int len) noexcept
 {
     ushort *dst = reinterpret_cast<ushort *>(buffer);
     const uchar *src = reinterpret_cast<const uchar *>(chars);
@@ -951,10 +951,10 @@ QString QUtf32::convertToUnicode(const char *chars, int len, QTextCodec::Convert
             }
             uint code = (endian == BigEndianness) ? qFromBigEndian<quint32>(tuple) : qFromLittleEndian<quint32>(tuple);
             if (QChar::requiresSurrogates(code)) {
-                *qch++ = QChar::highSurrogate(code);
-                *qch++ = QChar::lowSurrogate(code);
+                *qch++ = QChar(QChar::highSurrogate(code));
+                *qch++ = QChar(QChar::lowSurrogate(code));
             } else {
-                *qch++ = code;
+                *qch++ = QChar(code);
             }
             num = 0;
         }
diff --git a/src/corelib/codecs/qutfcodec_p.h b/src/corelib/codecs/qutfcodec_p.h
index b24283ac5e..083e16317a 100644
--- a/src/corelib/codecs/qutfcodec_p.h
+++ b/src/corelib/codecs/qutfcodec_p.h
@@ -291,7 +291,7 @@ enum DataEndianness
 
 struct QUtf8
 {
-    static QChar *convertToUnicode(QChar *, const char *, int) Q_DECL_NOTHROW;
+    static QChar *convertToUnicode(QChar *, const char *, int) noexcept;
     static QString convertToUnicode(const char *, int);
     static QString convertToUnicode(const char *, int, QTextCodec::ConverterState *);
     static QByteArray convertFromUnicode(const QChar *, int);
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 1b01b2b817..ae360239c6 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -12,7 +12,7 @@
             "inotify": "boolean",
             "journald": "boolean",
             "mimetype-database": "boolean",
-            "pcre": { "type": "enum", "values": [ "qt", "system" ] },
+            "pcre": { "type": "enum", "values": [ "no", "qt", "system" ] },
             "posix-ipc": { "type": "boolean", "name": "ipc_posix" },
             "pps": { "type": "boolean", "name": "qqnx_pps" },
             "slog2": "boolean",
@@ -158,21 +158,6 @@
                 "-latomic"
             ]
         },
-        "libdl": {
-            "label": "dlopen()",
-            "test": {
-                "main": [
-                    "dlclose(dlopen(0, 0));",
-                    "dlsym(RTLD_DEFAULT, 0);",
-                    "dlerror();"
-                ]
-            },
-            "headers": "dlfcn.h",
-            "sources": [
-                "",
-                "-ldl"
-            ]
-        },
         "librt": {
             "label": "clock_gettime()",
             "test": {
@@ -235,6 +220,66 @@
             "sources": [
                 "-lslog2"
             ]
+        },
+        "advapi32": {
+            "label": "advapi32",
+            "sources": [
+                "-ladvapi32"
+            ]
+        },
+        "gdi32": {
+            "label": "gdi32",
+            "sources": [
+                "-lgdi32"
+            ]
+        },
+        "kernel32": {
+            "label": "kernel32",
+            "sources": [
+                "-lkernel32"
+            ]
+        },
+        "netapi32": {
+            "label": "netapi32",
+            "sources": [
+                "-lnetapi32"
+            ]
+        },
+        "ole32": {
+            "label": "ole32",
+            "sources": [
+                "-lole32"
+            ]
+        },
+        "shell32": {
+            "label": "shell32",
+            "sources": [
+                "-lshell32"
+            ]
+        },
+        "uuid": {
+            "label": "uuid",
+            "sources": [
+                "-luuid"
+            ]
+        },
+        "user32": {
+            "label": "user32",
+            "sources": [
+                "-luser32"
+            ]
+        },
+        "winmm": {
+            "label": "winmm",
+            "sources": [
+                "-lwinmm"
+            ]
+        },
+        "ws2_32": {
+            "label": "ws2_32",
+            "sources": [
+                "-lws2_32"
+            ]
         }
     },
 
@@ -536,7 +581,7 @@
                     "qDoubleSnprintf(argv[0], 1, invalidLocale, \"invalid format\", a);",
                     "qDoubleSscanf(argv[0], invalidLocale, \"invalid format\", &a, &argc);"
                 ],
-                "qmake": "DEFINES += QDSP_P_H=$$shell_quote(\\\"@PWD@/tools/qdoublescanprint_p.h\\\")"
+                "qmake": "DEFINES += QDSP_P_H=$$shell_quote(\\\"@PWD@/text/qdoublescanprint_p.h\\\")"
             }
         }
     },
@@ -552,11 +597,6 @@
             "condition": "features.clock-gettime && tests.clock-monotonic",
             "output": [ "feature" ]
         },
-        "dlopen": {
-            "label": "dlopen()",
-            "condition": "config.unix && libs.libdl",
-            "output": [ "privateFeature" ]
-        },
         "doubleconversion": {
             "label": "DoubleConversion",
             "output": [ "privateFeature", "feature" ]
@@ -684,15 +724,18 @@
             "condition": "features.mimetype",
             "output": [ "privateFeature" ]
         },
+        "pcre2": {
+            "label": "PCRE2",
+            "disable": "input.pcre == 'no' || input.pcre == 'system'",
+            "enable": "input.pcre == 'qt'",
+            "output": [ "privateConfig" ]
+        },
         "system-pcre2": {
-            "label": "Using system PCRE2",
-            "disable": "input.pcre == 'qt'",
+            "label": "  Using system PCRE2",
+            "disable": "input.pcre == 'no' || input.pcre == 'qt'",
             "enable": "input.pcre == 'system'",
             "condition": "libs.pcre2",
-            "output": [
-                "privateFeature",
-                { "type": "privateConfig", "negative": true, "name": "pcre2" }
-            ]
+            "output": [ "privateFeature" ]
         },
         "poll_ppoll": {
             "label": "Native ppoll()",
@@ -771,6 +814,7 @@
             "label": "QRegularExpression",
             "purpose": "Provides an API to Perl-compatible regular expressions.",
             "section": "Kernel",
+            "condition": "features.system-pcre2 || features.pcre2",
             "output": [ "publicFeature", "feature" ]
         },
         "sharedmemory": {
@@ -787,7 +831,7 @@
             "purpose": "Provides a general counting system semaphore.",
             "section": "Kernel",
             "condition": [
-                "!config.integrity && !config.vxworks",
+                "!config.integrity && !config.vxworks && !config.rtems",
                 "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix"
             ],
             "output": [ "publicFeature", "feature" ]
@@ -829,14 +873,14 @@
             "label": "QProcess",
             "purpose": "Supports external process invocation.",
             "section": "File I/O",
-            "condition": "features.processenvironment && !config.winrt && !config.uikit && !config.integrity && !config.vxworks",
+            "condition": "features.processenvironment && !config.winrt && !config.uikit && !config.integrity && !config.vxworks && !config.rtems",
             "output": [ "publicFeature", "feature" ]
         },
         "processenvironment": {
             "label": "QProcessEnvironment",
             "purpose": "Provides a higher-level abstraction of environment variables.",
             "section": "File I/O",
-            "condition": "!config.winrt && !config.integrity",
+            "condition": "!config.winrt && !config.integrity && !config.rtems",
             "output": [ "publicFeature" ]
         },
         "temporaryfile": {
@@ -945,11 +989,17 @@
             "condition": "features.textcodec",
             "output": [ "publicFeature", "feature" ]
         },
+        "easingcurve": {
+            "label": "Easing curve",
+            "purpose": "Provides easing curve.",
+            "section": "Utilities",
+            "output": [ "publicFeature" ]
+        },
         "animation": {
             "label": "Animation",
             "purpose": "Provides a framework for animations.",
             "section": "Utilities",
-            "condition": "features.properties",
+            "condition": "features.properties && features.easingcurve",
             "output": [ "publicFeature", "feature" ]
         },
         "statemachine": {
@@ -971,6 +1021,25 @@
             "section": "Utilities",
             "output": [ "privateFeature" ]
         },
+        "jalalicalendar": {
+            "label": "QJalaliCalendar",
+            "purpose": "Support the Jalali (Persian) calendar",
+            "section": "Utilities",
+            "output": [ "publicFeature" ]
+        },
+        "hijricalendar": {
+            "label": "QHijriCalendar",
+            "purpose": "Generic basis for Islamic calendars, providing shared locale data",
+            "section": "Utilities",
+            "output": [ "privateFeature" ]
+        },
+        "islamiccivilcalendar": {
+            "label": "QIslamicCivilCalendar",
+            "purpose": "Support the Islamic Civil calendar",
+            "section": "Utilities",
+            "condition": "features.hijricalendar",
+            "output": [ "publicFeature" ]
+        },
         "timezone": {
             "label": "QTimeZone",
             "purpose": "Provides support for time-zone handling.",
@@ -1013,6 +1082,10 @@ If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org
 Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie.",
             "section": "Utilities",
             "output": [ "publicFeature" ]
+        },
+        "win32_system_libs": {
+            "label": "Windows System Libraries",
+            "condition": "config.win32 && libs.advapi32 && libs.gdi32 && libs.kernel32 && libs.netapi32 && libs.ole32 && libs.shell32 && libs.uuid && libs.user32 && libs.winmm && libs.ws2_32"
         }
     },
 
@@ -1042,6 +1115,17 @@ You need to use libdouble-conversion for double/string conversion."
             "message": "detected a std::atomic implementation that fails for function pointers.
 Please apply the patch corresponding to your Standard Library vendor, found in
   qtbase/config.tests/atomicfptr"
+        },
+        {
+            "type": "error",
+            "condition": [
+                "config.unix || config.integrity",
+                "!features.poll_ppoll",
+                "!features.poll_pollts",
+                "!features.poll_poll",
+                "!features.poll_select"
+            ],
+            "message": "Qt requires poll(), ppoll(), poll_ts() or select() on this platform"
         }
     ],
 
@@ -1071,6 +1155,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in
                     "args": "qqnx_pps",
                     "condition": "config.qnx"
                 },
+                "pcre2",
                 "system-pcre2"
             ]
         }
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 4b758532e6..452d2db0fd 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -12,6 +12,7 @@ CONFIG += qt_tracepoints
 
 CONFIG += $$MODULE_CONFIG
 DEFINES += $$MODULE_DEFINES
+android: DEFINES += LIBS_SUFFIX='\\"_$${QT_ARCH}.so\\"'
 DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH
 msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x67000000
 
@@ -20,7 +21,7 @@ CONFIG += simd optimize_full
 QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf
 
 ANDROID_LIB_DEPENDENCIES = \
-    plugins/platforms/android/libqtforandroid.so
+    plugins/platforms/libplugins_platforms_qtforandroid.so
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
     jar/QtAndroid.jar
 ANDROID_PERMISSIONS = \
@@ -36,6 +37,8 @@ qtConfig(animation): include(animation/animation.pri)
 include(global/global.pri)
 include(thread/thread.pri)
 include(tools/tools.pri)
+include(text/text.pri)
+include(time/time.pri)
 include(io/io.pri)
 include(itemmodels/itemmodels.pri)
 include(plugin/plugin.pri)
@@ -47,10 +50,8 @@ include(mimetypes/mimetypes.pri)
 include(platform/platform.pri)
 
 win32 {
-    LIBS_PRIVATE += -lws2_32
-    !winrt {
-        LIBS_PRIVATE += -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lwinmm
-    }
+    QMAKE_USE_PRIVATE += ws2_32
+    !winrt: QMAKE_USE_PRIVATE += advapi32 kernel32 ole32 shell32 uuid user32 winmm
 }
 
 darwin {
@@ -68,8 +69,6 @@ integrity {
 
 QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtCore.dynlist
 
-contains(DEFINES,QT_EVAL):include(eval.pri)
-
 HOST_BINS = $$[QT_HOST_BINS]
 host_bins.name = host_bins
 host_bins.variable = HOST_BINS
diff --git a/src/corelib/doc/snippets/cmake-macros/examples.cmake b/src/corelib/doc/snippets/cmake-macros/examples.cmake
index bba082586f..ea7da56ec7 100644
--- a/src/corelib/doc/snippets/cmake-macros/examples.cmake
+++ b/src/corelib/doc/snippets/cmake-macros/examples.cmake
@@ -24,3 +24,14 @@ add_dependencies(myapp resources)
 #! [qt5_generate_moc]
 qt5_generate_moc(main.cpp main.moc TARGET myapp)
 #! [qt5_generate_moc]
+
+#! [qt5_import_plugins]
+add_executable(myapp main.cpp)
+target_link_libraries(myapp Qt5::Gui Qt5::Sql)
+qt5_import_plugins(myapp
+    INCLUDE Qt5::QCocoaIntegrationPlugin
+    EXCLUDE Qt5::QMinimalIntegrationPlugin
+    INCLUDE_BY_TYPE imageformats Qt5::QGifPlugin Qt5::QJpegPlugin
+    EXCLUDE_BY_TYPE sqldrivers
+)
+#! [qt5_import_plugins]
diff --git a/src/corelib/doc/snippets/code/doc_src_qset.cpp b/src/corelib/doc/snippets/code/doc_src_qset.cpp
index 4cd84d7330..96ef07738b 100644
--- a/src/corelib/doc/snippets/code/doc_src_qset.cpp
+++ b/src/corelib/doc/snippets/code/doc_src_qset.cpp
@@ -131,7 +131,8 @@ while (i != set.end()) {
 //! [10]
 QSet<QString> set;
 ...
-QSet<QString>::iterator it = qFind(set.begin(), set.end(), "Jeanette");
+const auto predicate = [](const QString &s) { return s.compare("Jeanette", Qt::CaseInsensitive) == 0; };
+QSet<QString>::iterator it = std::find_if(set.begin(), set.end(), predicate);
 if (it != set.end())
     cout << "Found Jeanette" << endl;
 //! [10]
@@ -150,7 +151,8 @@ for (i = set.begin(); i != set.end(); ++i)
 //! [12]
 QSet<QString> set;
 ...
-QSet<QString>::iterator it = qFind(set.begin(), set.end(), "Jeanette");
+const auto predicate = [](const QString &s) { return s.compare("Jeanette", Qt::CaseInsensitive) == 0; };
+QSet<QString>::const_iterator it = std::find_if(set.cbegin(), set.cend(), predicate);
 if (it != set.constEnd())
     cout << "Found Jeanette" << endl;
 //! [12]
@@ -161,7 +163,7 @@ QSet<QString> set;
 set << "red" << "green" << "blue" << ... << "black";
 
 QList<QString> list = set.toList();
-qSort(list);
+std::sort(list.begin(), list.end());
 //! [13]
 
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp
index 625c1cf9bc..c30f13df5a 100644
--- a/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp
@@ -124,12 +124,12 @@ in >> ch1 >> ch2 >> ch3;
 
 //! [8]
 QTextStream out(stdout);
-out << "Qt rocks!" << endl;
+out << "Qt rocks!" << Qt::endl;
 //! [8]
 
 
 //! [9]
-stream << '\n' << flush;
+stream << '\n' << Qt::flush;
 //! [9]
 
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp
index 382b08fdb7..dfa9b670e7 100644
--- a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp
@@ -53,7 +53,7 @@ QFuture<QString> future = ...;
 
 QFuture<QString>::const_iterator i;
 for (i = future.constBegin(); i != future.constEnd(); ++i)
-    cout << *i << endl;
+    cout << *i << Qt::endl;
 //! [0]
 
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
index 32fccbefbf..11ab50687d 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -71,7 +71,7 @@ ba[4] = 0xca;
 //! [2]
 for (int i = 0; i < ba.size(); ++i) {
     if (ba.at(i) >= 'a' && ba.at(i) <= 'f')
-        cout << "Found character in range [a-f]" << endl;
+        cout << "Found character in range [a-f]" << Qt::endl;
 }
 //! [2]
 
@@ -88,7 +88,7 @@ x.replace(5, 3, "&");       // x == "rock & roll"
 QByteArray ba("We must be <b>bold</b>, very <b>bold</b>");
 int j = 0;
 while ((j = ba.indexOf("<b>", j)) != -1) {
-    cout << "Found <b> tag at index position " << j << endl;
+    cout << "Found <b> tag at index position " << j << Qt::endl;
     ++j;
 }
 //! [4]
@@ -126,17 +126,17 @@ QByteArray("abc").isEmpty();    // returns false
 QByteArray ba("Hello world");
 char *data = ba.data();
 while (*data) {
-    cout << "[" << *data << "]" << endl;
+    cout << "[" << *data << "]" << Qt::endl;
     ++data;
 }
 //! [8]
 
 
 //! [9]
-QByteArray ba;
-for (int i = 0; i < 10; ++i)
-    ba[i] = 'A' + i;
-// ba == "ABCDEFGHIJ"
+QByteArray ba("Hello, world");
+cout << ba[0]; // prints H
+ba[7] = 'W';
+// ba == "Hello, World"
 //! [9]
 
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp
index 3ecb67a48f..a477e91548 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp
@@ -128,7 +128,7 @@ qDebug("Time elapsed: %d ms", t.elapsed());
 
 //! [11]
 QDateTime now = QDateTime::currentDateTime();
-QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
+QDateTime xmas(QDate(now.date().year(), 12, 25).startOfDay());
 qDebug("There are %d seconds to Christmas", now.secsTo(xmas));
 //! [11]
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp
index a3d2dd7f9e..9813cc98d5 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp
@@ -89,7 +89,7 @@ QHash<int, QWidget *> hash;
 ...
 for (int i = 0; i < 1000; ++i) {
     if (hash[i] == okButton)
-        cout << "Found button at index " << i << endl;
+        cout << "Found button at index " << i << Qt::endl;
 }
 //! [6]
 
@@ -98,7 +98,7 @@ for (int i = 0; i < 1000; ++i) {
 QHashIterator<QString, int> i(hash);
 while (i.hasNext()) {
     i.next();
-    cout << i.key() << ": " << i.value() << endl;
+    cout << i.key() << ": " << i.value() << Qt::endl;
 }
 //! [7]
 
@@ -106,7 +106,7 @@ while (i.hasNext()) {
 //! [8]
 QHash<QString, int>::const_iterator i = hash.constBegin();
 while (i != hash.constEnd()) {
-    cout << i.key() << ": " << i.value() << endl;
+    cout << i.key() << ": " << i.value() << Qt::endl;
     ++i;
 }
 //! [8]
@@ -122,14 +122,14 @@ hash.insert("plenty", 2000);
 //! [10]
 QList<int> values = hash.values("plenty");
 for (int i = 0; i < values.size(); ++i)
-    cout << values.at(i) << endl;
+    cout << values.at(i) << Qt::endl;
 //! [10]
 
 
 //! [11]
 QHash<QString, int>::iterator i = hash.find("plenty");
 while (i != hash.end() && i.key() == "plenty") {
-    cout << i.value() << endl;
+    cout << i.value() << Qt::endl;
     ++i;
 }
 //! [11]
@@ -139,7 +139,7 @@ while (i != hash.end() && i.key() == "plenty") {
 QHash<QString, int> hash;
 ...
 foreach (int value, hash)
-    cout << value << endl;
+    cout << value << Qt::endl;
 //! [12]
 
 
@@ -201,7 +201,7 @@ QHash<QString, int> hash;
 ...
 QHash<QString, int>::const_iterator i = hash.find("HDR");
 while (i != hash.end() && i.key() == "HDR") {
-    cout << i.value() << endl;
+    cout << i.value() << Qt::endl;
     ++i;
 }
 //! [16]
@@ -216,7 +216,7 @@ hash.insert("December", 12);
 
 QHash<QString, int>::iterator i;
 for (i = hash.begin(); i != hash.end(); ++i)
-    cout << i.key() << ": " << i.value() << endl;
+    cout << i.key() << ": " << i.value() << Qt::endl;
 //! [17]
 
 
@@ -274,7 +274,7 @@ hash.insert("December", 12);
 
 QHash<QString, int>::const_iterator i;
 for (i = hash.constBegin(); i != hash.constEnd(); ++i)
-    cout << i.key() << ": " << i.value() << endl;
+    cout << i.key() << ": " << i.value() << Qt::endl;
 //! [23]
 
 
@@ -296,23 +296,23 @@ hash3 = hash1 + hash2;
 //! [25]
 QList<int> values = hash.values("plenty");
 for (int i = 0; i < values.size(); ++i)
-    cout << values.at(i) << endl;
+    cout << values.at(i) << Qt::endl;
 //! [25]
 
 
 //! [26]
 QMultiHash<QString, int>::iterator i = hash.find("plenty");
 while (i != hash.end() && i.key() == "plenty") {
-    cout << i.value() << endl;
+    cout << i.value() << Qt::endl;
     ++i;
 }
 //! [26]
 
 //! [27]
 for (QHash<int, QString>::const_iterator it = hash.cbegin(), end = hash.cend(); it != end; ++it) {
-    cout << "The key: " << it.key() << endl
-    cout << "The value: " << it.value() << endl;
-    cout << "Also the value: " << (*it) << endl;
+    cout << "The key: " << it.key() << Qt::endl
+    cout << "The value: " << it.value() << Qt::endl;
+    cout << "Also the value: " << (*it) << Qt::endl;
 }
 //! [27]
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp
index 7f743bbd25..e8754a5f34 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp
@@ -112,17 +112,17 @@ list.append("December");
 
 QLinkedList<QString>::iterator i;
 for (i = list.begin(); i != list.end(); ++i)
-    cout << *i << endl;
+    cout << *i << Qt::endl;
 //! [7]
 
 
 //! [8]
 QLinkedList<QString> list;
 ...
-QLinkedList<QString>::iterator it = qFind(list.begin(),
-                                          list.end(), "Joel");
+QLinkedList<QString>::iterator it = std::find(list.begin(),
+                                              list.end(), "Joel");
 if (it != list.end())
-    cout << "Found Joel" << endl;
+    cout << "Found Joel" << Qt::endl;
 //! [8]
 
 
@@ -182,17 +182,17 @@ list.append("December");
 
 QLinkedList<QString>::const_iterator i;
 for (i = list.constBegin(); i != list.constEnd(); ++i)
-    cout << *i << endl;
+    cout << *i << Qt::endl;
 //! [14]
 
 
 //! [15]
 QLinkedList<QString> list;
 ...
-QLinkedList<QString>::iterator it = qFind(list.constBegin(),
-                                          list.constEnd(), "Joel");
+QLinkedList<QString>::const_iterator it = std::find(list.constBegin(),
+                                                    list.constEnd(), "Joel");
 if (it != list.constEnd())
-    cout << "Found Joel" << endl;
+    cout << "Found Joel" << Qt::endl;
 //! [15]
 
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp
index 0e746cd6e6..38fa526ef4 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp
@@ -73,7 +73,7 @@ if (list[0] == "Bob")
 //! [3]
 for (int i = 0; i < list.size(); ++i) {
     if (list.at(i) == "Jane")
-        cout << "Found Jane at position " << i << endl;
+        cout << "Found Jane at position " << i << Qt::endl;
 }
 //! [3]
 
@@ -89,7 +89,7 @@ while (!list.isEmpty())
 //! [5]
 int i = list.indexOf("Jane");
 if (i != -1)
-    cout << "First occurrence of Jane is at position " << i << endl;
+    cout << "First occurrence of Jane is at position " << i << Qt::endl;
 //! [5]
 
 
@@ -180,7 +180,7 @@ list.append("December");
 
 QList<QString>::iterator i;
 for (i = list.begin(); i != list.end(); ++i)
-    cout << *i << endl;
+    cout << *i << Qt::endl;
 //! [15]
 
 
@@ -213,7 +213,7 @@ list.append("December");
 
 QList<QString>::const_iterator i;
 for (i = list.constBegin(); i != list.constEnd(); ++i)
-    cout << *i << endl;
+    cout << *i << Qt::endl;
 //! [19]
 
 
@@ -247,7 +247,7 @@ QSet<int> set;
 set << 20 << 30 << 40 << ... << 70;
 
 QList<int> list = QList<int>::fromSet(set);
-qSort(list);
+std::sort(list.begin(), list.end());
 //! [23]
 
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp
index bd59758f71..506022f082 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp
@@ -89,7 +89,7 @@ QMap<int, QWidget *> map;
 ...
 for (int i = 0; i < 1000; ++i) {
     if (map[i] == okButton)
-        cout << "Found button at index " << i << endl;
+        cout << "Found button at index " << i << Qt::endl;
 }
 //! [6]
 
@@ -98,7 +98,7 @@ for (int i = 0; i < 1000; ++i) {
 QMapIterator<QString, int> i(map);
 while (i.hasNext()) {
     i.next();
-    cout << i.key() << ": " << i.value() << endl;
+    cout << i.key() << ": " << i.value() << Qt::endl;
 }
 //! [7]
 
@@ -106,7 +106,7 @@ while (i.hasNext()) {
 //! [8]
 QMap<QString, int>::const_iterator i = map.constBegin();
 while (i != map.constEnd()) {
-    cout << i.key() << ": " << i.value() << endl;
+    cout << i.key() << ": " << i.value() << Qt::endl;
     ++i;
 }
 //! [8]
@@ -122,14 +122,14 @@ map.insert("plenty", 2000);
 //! [10]
 QList<int> values = map.values("plenty");
 for (int i = 0; i < values.size(); ++i)
-    cout << values.at(i) << endl;
+    cout << values.at(i) << Qt::endl;
 //! [10]
 
 
 //! [11]
 QMap<QString, int>::iterator i = map.find("plenty");
 while (i != map.end() && i.key() == "plenty") {
-    cout << i.value() << endl;
+    cout << i.value() << Qt::endl;
     ++i;
 }
 //! [11]
@@ -139,7 +139,7 @@ while (i != map.end() && i.key() == "plenty") {
 QMap<QString, int> map;
 ...
 foreach (int value, map)
-    cout << value << endl;
+    cout << value << Qt::endl;
 //! [12]
 
 
@@ -175,7 +175,7 @@ QMap<QString, int> map;
 ...
 QMap<QString, int>::const_iterator i = map.find("HDR");
 while (i != map.end() && i.key() == "HDR") {
-    cout << i.value() << endl;
+    cout << i.value() << Qt::endl;
     ++i;
 }
 //! [14]
@@ -201,7 +201,7 @@ QMap<QString, int> map;
 QMap<QString, int>::const_iterator i = map.lowerBound("HDR");
 QMap<QString, int>::const_iterator upperBound = map.upperBound("HDR");
 while (i != upperBound) {
-    cout << i.value() << endl;
+    cout << i.value() << Qt::endl;
     ++i;
 }
 //! [16]
@@ -230,7 +230,7 @@ map.insert("December", 12);
 
 QMap<QString, int>::iterator i;
 for (i = map.begin(); i != map.end(); ++i)
-    cout << i.key() << ": " << i.value() << endl;
+    cout << i.key() << ": " << i.value() << Qt::endl;
 //! [18]
 
 
@@ -288,7 +288,7 @@ map.insert("December", 12);
 
 QMap<QString, int>::const_iterator i;
 for (i = map.constBegin(); i != map.constEnd(); ++i)
-    cout << i.key() << ": " << i.value() << endl;
+    cout << i.key() << ": " << i.value() << Qt::endl;
 //! [24]
 
 
@@ -310,23 +310,23 @@ map3 = map1 + map2;
 //! [26]
 QList<int> values = map.values("plenty");
 for (int i = 0; i < values.size(); ++i)
-    cout << values.at(i) << endl;
+    cout << values.at(i) << Qt::endl;
 //! [26]
 
 
 //! [27]
 QMultiMap<QString, int>::iterator i = map.find("plenty");
 while (i != map.end() && i.key() == "plenty") {
-    cout << i.value() << endl;
+    cout << i.value() << Qt::endl;
     ++i;
 }
 //! [27]
 
 //! [keyiterator1]
 for (QMap<int, QString>::const_iterator it = map.cbegin(), end = map.cend(); it != end; ++it) {
-    cout << "The key: " << it.key() << endl
-    cout << "The value: " << it.value() << endl;
-    cout << "Also the value: " << (*it) << endl;
+    cout << "The key: " << it.key() << Qt::endl
+    cout << "The value: " << it.value() << Qt::endl;
+    cout << "Also the value: " << (*it) << Qt::endl;
 }
 //! [keyiterator1]
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp
index b74ac31933..6046c73b0f 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp
@@ -54,5 +54,5 @@ queue.enqueue(1);
 queue.enqueue(2);
 queue.enqueue(3);
 while (!queue.isEmpty())
-    cout << queue.dequeue() << endl;
+    cout << queue.dequeue() << Qt::endl;
 //! [0]
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp
index afdd9c3d25..99cd4ea7a2 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp
@@ -286,15 +286,11 @@ if (!invalidRe.isValid()) {
 
 {
 //! [24]
-QRegularExpression re("^this pattern must match exactly$");
-//! [24]
-}
-
-{
-//! [25]
 QString p("a .*|pattern");
-QRegularExpression re("\\A(?:" + p + ")\\z"); // re matches exactly the pattern string p
-//! [25]
+
+// re matches exactly the pattern string p
+QRegularExpression re(QRegularExpression::anchoredPattern(p));
+//! [24]
 }
 
 {
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qstringiterator.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qstringiterator.cpp
index 7a2b4812ef..eb09fb99e2 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qstringiterator.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qstringiterator.cpp
@@ -72,9 +72,9 @@ while (i.hasNext())
 {
 //! [2]
 QStringIterator i(u"𝄞 is the G clef");
-qDebug() << hex << i.next(); // will print 1d11e (U+1D11E, MUSICAL SYMBOL G CLEF)
-qDebug() << hex << i.next(); // will print 20 (U+0020, SPACE)
-qDebug() << hex << i.next(); // will print 69 (U+0069, LATIN SMALL LETTER I)
+qDebug() << Qt::hex << i.next(); // will print 1d11e (U+1D11E, MUSICAL SYMBOL G CLEF)
+qDebug() << Qt::hex << i.next(); // will print 20 (U+0020, SPACE)
+qDebug() << Qt::hex << i.next(); // will print 69 (U+0069, LATIN SMALL LETTER I)
 //! [2]
 }
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp
index 1f2af4a408..a05233049f 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp
@@ -73,7 +73,7 @@ if (vector[0] == "Liz")
 //! [4]
 for (int i = 0; i < vector.size(); ++i) {
     if (vector.at(i) == "Alfonso")
-        cout << "Found Alfonso at position " << i << endl;
+        cout << "Found Alfonso at position " << i << Qt::endl;
 }
 //! [4]
 
@@ -81,7 +81,7 @@ for (int i = 0; i < vector.size(); ++i) {
 //! [5]
 int i = vector.indexOf("Harumi");
 if (i != -1)
-    cout << "First occurrence of Harumi is at position " << i << endl;
+    cout << "First occurrence of Harumi is at position " << i << Qt::endl;
 //! [5]
 
 
diff --git a/src/corelib/doc/snippets/hellotrmain.cpp b/src/corelib/doc/snippets/hellotrmain.cpp
index 2fab919a47..721a83240b 100644
--- a/src/corelib/doc/snippets/hellotrmain.cpp
+++ b/src/corelib/doc/snippets/hellotrmain.cpp
@@ -56,13 +56,13 @@ int main(int argc, char *argv[])
     QTranslator translator;
     // look up e.g. :/translations/myapp_de.qm
     if (translator.load(QLocale(), QLatin1String("myapp"), QLatin1String("_"), QLatin1String(":/translations")))
-        app.installTranslator(&translator);
+        QCoreApplication::installTranslator(&translator);
 
     QPushButton hello(QCoreApplication::translate("main", "Hello world!"));
     hello.resize(100, 30);
 
     hello.show();
-    return app.exec();
+    return QCoreApplication::exec();
 }
 //! [0]
 
diff --git a/src/corelib/doc/snippets/qstack/main.cpp b/src/corelib/doc/snippets/qstack/main.cpp
index af6b960e57..66823bcb59 100644
--- a/src/corelib/doc/snippets/qstack/main.cpp
+++ b/src/corelib/doc/snippets/qstack/main.cpp
@@ -60,6 +60,6 @@ int main(int argc, char *argv[])
     stack.push(2);
     stack.push(3);
     while (!stack.isEmpty())
-        cout << stack.pop() << endl;
+        cout << stack.pop() << Qt::endl;
 //! [0]
 }
diff --git a/src/corelib/doc/snippets/qstringlist/main.cpp b/src/corelib/doc/snippets/qstringlist/main.cpp
index 55c60650fe..80788ccd76 100644
--- a/src/corelib/doc/snippets/qstringlist/main.cpp
+++ b/src/corelib/doc/snippets/qstringlist/main.cpp
@@ -71,20 +71,20 @@ Widget::Widget(QWidget *parent)
 
 //! [1]
     for (int i = 0; i < fonts.size(); ++i)
-         cout << fonts.at(i).toLocal8Bit().constData() << endl;
+         cout << fonts.at(i).toLocal8Bit().constData() << Qt::endl;
 //! [1]
 
 //! [2]
     QStringListIterator javaStyleIterator(fonts);
     while (javaStyleIterator.hasNext())
-         cout << javaStyleIterator.next().toLocal8Bit().constData() << endl;
+         cout << javaStyleIterator.next().toLocal8Bit().constData() << Qt::endl;
 //! [2]
 
 //! [3]
     QStringList::const_iterator constIterator;
     for (constIterator = fonts.constBegin(); constIterator != fonts.constEnd();
            ++constIterator)
-        cout << (*constIterator).toLocal8Bit().constData() << endl;
+        cout << (*constIterator).toLocal8Bit().constData() << Qt::endl;
 //! [3]
 
 //! [4]
diff --git a/src/corelib/doc/src/cmake-macros.qdoc b/src/corelib/doc/src/cmake-macros.qdoc
index 7fb133020f..7c0443fba7 100644
--- a/src/corelib/doc/src/cmake-macros.qdoc
+++ b/src/corelib/doc/src/cmake-macros.qdoc
@@ -212,3 +212,72 @@ when scanning the source files with \c{moc}.
 
 \snippet cmake-macros/examples.cmake qt5_generate_moc
 */
+
+
+/*!
+\page qtcore-cmake-qt5-import-plugins.html
+\ingroup cmake-macros-qtcore
+
+\title qt5_import_plugins
+
+\brief Specifies a custom set of plugins to import for a static Qt build
+
+\section1 Synopsis
+
+\badcode
+qt5_import_plugins(target
+                   [INCLUDE plugin ...]
+                   [EXCLUDE plugin ...]
+                   [INCLUDE_BY_TYPE plugin_type plugin ...]
+                   [EXCLUDE_BY_TYPE plugin_type])
+\endcode
+
+\section1 Description
+
+Specifies a custom set of plugins to import. The optional arguments:
+\c INCLUDE, \c EXCLUDE, \c INCLUDE_BY_TYPE, and \c EXCLUDE_BY_TYPE,
+can be used more than once.
+
+This CMake command was introduced in Qt 5.14.
+
+\list
+\li \c INCLUDE -- can be used to specify a list of plugins to import.
+\li \c EXCLUDE -- can be used to specify a list of plugins to exclude.
+\li \c INCLUDE_BY_TYPE -- can be used to override the list of plugins to
+       import for a certain plugin type.
+\li \c EXCLUDE_BY_TYPE -- can be used to specify a plugin type to exclude;
+       then no plugins of that type are imported.
+\endlist
+
+Qt provides plugin types such as \c imageformats, \c platforms,
+and \c sqldrivers.
+
+If \c qt5_import_plugins() isn't called, the target automatically links against
+a sane set of default plugins, for each Qt module that the target is linked
+against. For more information, see
+\l{CMake target_link_libraries Documentation}{target_link_libraries}.
+
+Each plugin comes with a C++ stub file that automatically
+initializes the plugin. Consequently, any target that links against a plugin
+has this C++ file added to its \c SOURCES.
+
+\note This macro imports plugins from static Qt builds only.
+On shared builds, it does nothing.
+
+\section1 Example
+
+\snippet cmake-macros/examples.cmake qt5_import_plugins
+
+In the snippet above, the following occurs with the executable \c myapp:
+
+\list
+\li The \c Qt5::QCocoaIntegrationPlugin is imported into myapp.
+\li The \c Qt5::QMinimalIntegrationPlugin plugin is
+    excluded from being automatically imported into myapp.
+\li The default list of plugins for \c imageformats is
+    overridden to only include Qt5::QGifPlugin and Qt5::QJpegPlugin.
+\li All \c sqldrivers plugins are excluded from automatic importing.
+\endlist
+
+*/
+
diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc
index e6c95129db..919533f651 100644
--- a/src/corelib/doc/src/containers.qdoc
+++ b/src/corelib/doc/src/containers.qdoc
@@ -666,7 +666,7 @@
     \li \b{Logarithmic time:} O(log \e n). A function that runs in
        logarithmic time is a function whose running time is
        proportional to the logarithm of the number of items in the
-       container. One example is qBinaryFind().
+       container. One example is the binary search algorithm.
 
     \li \b{Linear time:} O(\e n). A function that runs in linear time
        will execute in a time directly proportional to the number of
diff --git a/src/corelib/eval.pri b/src/corelib/eval.pri
deleted file mode 100644
index efda56b16a..0000000000
--- a/src/corelib/eval.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES += \
-        $$QT_SOURCE_TREE/src/corelib/kernel/qtcore_eval.cpp
-INCLUDEPATH += \
-    $$QT_BUILD_TREE/src/corelib/global
diff --git a/src/corelib/global/archdetect.cpp b/src/corelib/global/archdetect.cpp
index 66a5e074f6..1d00b7f5a5 100644
--- a/src/corelib/global/archdetect.cpp
+++ b/src/corelib/global/archdetect.cpp
@@ -67,6 +67,10 @@
 #  define ARCH_PROCESSOR "power"
 #elif defined(Q_PROCESSOR_POWER_64)
 #  define ARCH_PROCESSOR "power64"
+#elif defined(Q_PROCESSOR_RISCV_32)
+#  define ARCH_PROCESSOR "riscv32"
+#elif defined(Q_PROCESSOR_RISCV_64)
+#  define ARCH_PROCESSOR "riscv64"
 #elif defined(Q_PROCESSOR_S390_X)
 #  define ARCH_PROCESSOR "s390x"
 #elif defined(Q_PROCESSOR_S390)
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 029357ff43..1da69aba9b 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -7,12 +7,12 @@ HEADERS +=  \
         global/qsystemdetection.h \
         global/qcompilerdetection.h \
         global/qprocessordetection.h \
+        global/qmemory_p.h \
 	global/qnamespace.h \
         global/qendian.h \
         global/qendian_p.h \
         global/qnumeric_p.h \
         global/qnumeric.h \
-        global/qfloat16_p.h \
         global/qfloat16.h \
         global/qglobalstatic.h \
         global/qlibraryinfo.h \
@@ -40,6 +40,10 @@ SOURCES += \
         global/qrandom.cpp \
         global/qhooks.cpp
 
+# To get listed in IDEs
+false: SOURCES += \
+        global/qfloat16tables.cpp
+
 # Only add global/qfloat16_f16c.c if qfloat16.cpp can't #include it.
 # Any compiler: if it is already generating F16C code, let qfloat16.cpp do it
 # Clang: ICE if not generating F16C code, so use qfloat16_f16c.c
@@ -124,14 +128,3 @@ gcc:ltcg {
 } else {
     SOURCES += $$VERSIONTAGGING_SOURCES
 }
-
-QMAKE_QFLOAT16_TABLES_GENERATE = global/qfloat16.h
-
-qtPrepareTool(QMAKE_QFLOAT16_TABLES, qfloat16-tables)
-
-qfloat16_tables.commands = $$QMAKE_QFLOAT16_TABLES ${QMAKE_FILE_OUT}
-qfloat16_tables.output = global/qfloat16tables.cpp
-qfloat16_tables.depends = $$QMAKE_QFLOAT16_TABLES_EXE
-qfloat16_tables.input = QMAKE_QFLOAT16_TABLES_GENERATE
-qfloat16_tables.variable_out = SOURCES
-QMAKE_EXTRA_COMPILERS += qfloat16_tables
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 345ab9e8ad..e47f284a42 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -110,12 +110,6 @@
 #    define Q_CC_INTEL  __INTEL_COMPILER
 #  endif
 
-/* only defined for MSVC since that's the only compiler that actually optimizes for this */
-/* might get overridden further down when Q_COMPILER_NOEXCEPT is detected */
-#  ifdef __cplusplus
-#    define Q_DECL_NOTHROW  throw()
-#  endif
-
 #elif defined(__BORLANDC__) || defined(__TURBOC__)
 #  define Q_CC_BOR
 #  define Q_INLINE_TEMPLATE
@@ -1128,16 +1122,11 @@
 #ifdef Q_COMPILER_NOEXCEPT
 # define Q_DECL_NOEXCEPT noexcept
 # define Q_DECL_NOEXCEPT_EXPR(x) noexcept(x)
-# ifdef Q_DECL_NOTHROW
-#  undef Q_DECL_NOTHROW /* override with C++11 noexcept if available */
-# endif
 #else
 # define Q_DECL_NOEXCEPT
 # define Q_DECL_NOEXCEPT_EXPR(x)
 #endif
-#ifndef Q_DECL_NOTHROW
-# define Q_DECL_NOTHROW Q_DECL_NOEXCEPT
-#endif
+#define Q_DECL_NOTHROW Q_DECL_NOEXCEPT
 
 #if defined(Q_COMPILER_ALIGNOF)
 #  undef Q_ALIGNOF
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
index 10458e41d7..e6ad80525a 100644
--- a/src/corelib/global/qconfig-bootstrapped.h
+++ b/src/corelib/global/qconfig-bootstrapped.h
@@ -79,12 +79,16 @@
 #define QT_NO_DATASTREAM
 #define QT_FEATURE_datestring 1
 #define QT_FEATURE_datetimeparser -1
+#define QT_FEATURE_easingcurve -1
 #define QT_FEATURE_etw -1
 #define QT_FEATURE_getauxval (QT_HAS_INCLUDE(<sys/auxv.h>) ? 1 : -1)
 #define QT_FEATURE_getentropy -1
 #define QT_NO_GEOM_VARIANT
+#define QT_FEATURE_hijricalendar -1
 #define QT_FEATURE_iconv -1
 #define QT_FEATURE_icu -1
+#define QT_FEATURE_islamiccivilcalendar -1
+#define QT_FEATURE_jalalicalendar -1
 #define QT_FEATURE_journald -1
 #define QT_FEATURE_futimens -1
 #define QT_FEATURE_futimes -1
@@ -105,6 +109,7 @@
 # define QT_FEATURE_renameat2 -1
 #endif
 #define QT_FEATURE_sharedmemory -1
+#define QT_FEATURE_signaling_nan -1
 #define QT_FEATURE_slog2 -1
 #ifdef __GLIBC_PREREQ
 # define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h
index e9fee5f23e..bd3c219968 100644
--- a/src/corelib/global/qflags.h
+++ b/src/corelib/global/qflags.h
@@ -42,9 +42,7 @@
 #ifndef QFLAGS_H
 #define QFLAGS_H
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
 #include <initializer_list>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -54,21 +52,21 @@ class QFlag
 {
     int i;
 public:
-    Q_DECL_CONSTEXPR inline QFlag(int value) Q_DECL_NOTHROW : i(value) {}
-    Q_DECL_CONSTEXPR inline operator int() const Q_DECL_NOTHROW { return i; }
+    Q_DECL_CONSTEXPR inline QFlag(int value) noexcept : i(value) {}
+    Q_DECL_CONSTEXPR inline operator int() const noexcept { return i; }
 
 #if !defined(Q_CC_MSVC)
     // Microsoft Visual Studio has buggy behavior when it comes to
     // unsigned enums: even if the enum is unsigned, the enum tags are
     // always signed
 #  if !defined(__LP64__) && !defined(Q_CLANG_QDOC)
-    Q_DECL_CONSTEXPR inline QFlag(long value) Q_DECL_NOTHROW : i(int(value)) {}
-    Q_DECL_CONSTEXPR inline QFlag(ulong value) Q_DECL_NOTHROW : i(int(long(value))) {}
+    Q_DECL_CONSTEXPR inline QFlag(long value) noexcept : i(int(value)) {}
+    Q_DECL_CONSTEXPR inline QFlag(ulong value) noexcept : i(int(long(value))) {}
 #  endif
-    Q_DECL_CONSTEXPR inline QFlag(uint value) Q_DECL_NOTHROW : i(int(value)) {}
-    Q_DECL_CONSTEXPR inline QFlag(short value) Q_DECL_NOTHROW : i(int(value)) {}
-    Q_DECL_CONSTEXPR inline QFlag(ushort value) Q_DECL_NOTHROW : i(int(uint(value))) {}
-    Q_DECL_CONSTEXPR inline operator uint() const Q_DECL_NOTHROW { return uint(i); }
+    Q_DECL_CONSTEXPR inline QFlag(uint value) noexcept : i(int(value)) {}
+    Q_DECL_CONSTEXPR inline QFlag(short value) noexcept : i(int(value)) {}
+    Q_DECL_CONSTEXPR inline QFlag(ushort value) noexcept : i(int(uint(value))) {}
+    Q_DECL_CONSTEXPR inline operator uint() const noexcept { return uint(i); }
 #endif
 };
 Q_DECLARE_TYPEINFO(QFlag, Q_PRIMITIVE_TYPE);
@@ -77,12 +75,12 @@ class QIncompatibleFlag
 {
     int i;
 public:
-    Q_DECL_CONSTEXPR inline explicit QIncompatibleFlag(int i) Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline operator int() const Q_DECL_NOTHROW { return i; }
+    Q_DECL_CONSTEXPR inline explicit QIncompatibleFlag(int i) noexcept;
+    Q_DECL_CONSTEXPR inline operator int() const noexcept { return i; }
 };
 Q_DECLARE_TYPEINFO(QIncompatibleFlag, Q_PRIMITIVE_TYPE);
 
-Q_DECL_CONSTEXPR inline QIncompatibleFlag::QIncompatibleFlag(int value) Q_DECL_NOTHROW : i(value) {}
+Q_DECL_CONSTEXPR inline QIncompatibleFlag::QIncompatibleFlag(int value) noexcept : i(value) {}
 
 
 #ifndef Q_NO_TYPESAFE_FLAGS
@@ -117,51 +115,47 @@ public:
     Q_DECL_CONSTEXPR inline QFlags(const QFlags &other);
     Q_DECL_CONSTEXPR inline QFlags &operator=(const QFlags &other);
 #endif
-    Q_DECL_CONSTEXPR inline QFlags(Enum flags) Q_DECL_NOTHROW : i(Int(flags)) {}
-    Q_DECL_CONSTEXPR inline QFlags(Zero = Q_NULLPTR) Q_DECL_NOTHROW : i(0) {}
-    Q_DECL_CONSTEXPR inline QFlags(QFlag flag) Q_DECL_NOTHROW : i(flag) {}
+    Q_DECL_CONSTEXPR inline QFlags(Enum flags) noexcept : i(Int(flags)) {}
+    Q_DECL_CONSTEXPR inline QFlags(Zero = nullptr) noexcept : i(0) {}
+    Q_DECL_CONSTEXPR inline QFlags(QFlag flag) noexcept : i(flag) {}
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
-    Q_DECL_CONSTEXPR inline QFlags(std::initializer_list<Enum> flags) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR inline QFlags(std::initializer_list<Enum> flags) noexcept
         : i(initializer_list_helper(flags.begin(), flags.end())) {}
-#endif
 
-    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(int mask) Q_DECL_NOTHROW { i &= mask; return *this; }
-    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(uint mask) Q_DECL_NOTHROW { i &= mask; return *this; }
-    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(Enum mask) Q_DECL_NOTHROW { i &= Int(mask); return *this; }
-    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(QFlags other) Q_DECL_NOTHROW { i |= other.i; return *this; }
-    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(Enum other) Q_DECL_NOTHROW { i |= Int(other); return *this; }
-    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(QFlags other) Q_DECL_NOTHROW { i ^= other.i; return *this; }
-    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(Enum other) Q_DECL_NOTHROW { i ^= Int(other); return *this; }
-
-    Q_DECL_CONSTEXPR inline operator Int() const Q_DECL_NOTHROW { return i; }
-
-    Q_DECL_CONSTEXPR inline QFlags operator|(QFlags other) const Q_DECL_NOTHROW { return QFlags(QFlag(i | other.i)); }
-    Q_DECL_CONSTEXPR inline QFlags operator|(Enum other) const Q_DECL_NOTHROW { return QFlags(QFlag(i | Int(other))); }
-    Q_DECL_CONSTEXPR inline QFlags operator^(QFlags other) const Q_DECL_NOTHROW { return QFlags(QFlag(i ^ other.i)); }
-    Q_DECL_CONSTEXPR inline QFlags operator^(Enum other) const Q_DECL_NOTHROW { return QFlags(QFlag(i ^ Int(other))); }
-    Q_DECL_CONSTEXPR inline QFlags operator&(int mask) const Q_DECL_NOTHROW { return QFlags(QFlag(i & mask)); }
-    Q_DECL_CONSTEXPR inline QFlags operator&(uint mask) const Q_DECL_NOTHROW { return QFlags(QFlag(i & mask)); }
-    Q_DECL_CONSTEXPR inline QFlags operator&(Enum other) const Q_DECL_NOTHROW { return QFlags(QFlag(i & Int(other))); }
-    Q_DECL_CONSTEXPR inline QFlags operator~() const Q_DECL_NOTHROW { return QFlags(QFlag(~i)); }
-
-    Q_DECL_CONSTEXPR inline bool operator!() const Q_DECL_NOTHROW { return !i; }
-
-    Q_DECL_CONSTEXPR inline bool testFlag(Enum flag) const Q_DECL_NOTHROW { return (i & Int(flag)) == Int(flag) && (Int(flag) != 0 || i == Int(flag) ); }
-    Q_DECL_RELAXED_CONSTEXPR inline QFlags &setFlag(Enum flag, bool on = true) Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(int mask) noexcept { i &= mask; return *this; }
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(uint mask) noexcept { i &= mask; return *this; }
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(Enum mask) noexcept { i &= Int(mask); return *this; }
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(QFlags other) noexcept { i |= other.i; return *this; }
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(Enum other) noexcept { i |= Int(other); return *this; }
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(QFlags other) noexcept { i ^= other.i; return *this; }
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(Enum other) noexcept { i ^= Int(other); return *this; }
+
+    Q_DECL_CONSTEXPR inline operator Int() const noexcept { return i; }
+
+    Q_DECL_CONSTEXPR inline QFlags operator|(QFlags other) const noexcept { return QFlags(QFlag(i | other.i)); }
+    Q_DECL_CONSTEXPR inline QFlags operator|(Enum other) const noexcept { return QFlags(QFlag(i | Int(other))); }
+    Q_DECL_CONSTEXPR inline QFlags operator^(QFlags other) const noexcept { return QFlags(QFlag(i ^ other.i)); }
+    Q_DECL_CONSTEXPR inline QFlags operator^(Enum other) const noexcept { return QFlags(QFlag(i ^ Int(other))); }
+    Q_DECL_CONSTEXPR inline QFlags operator&(int mask) const noexcept { return QFlags(QFlag(i & mask)); }
+    Q_DECL_CONSTEXPR inline QFlags operator&(uint mask) const noexcept { return QFlags(QFlag(i & mask)); }
+    Q_DECL_CONSTEXPR inline QFlags operator&(Enum other) const noexcept { return QFlags(QFlag(i & Int(other))); }
+    Q_DECL_CONSTEXPR inline QFlags operator~() const noexcept { return QFlags(QFlag(~i)); }
+
+    Q_DECL_CONSTEXPR inline bool operator!() const noexcept { return !i; }
+
+    Q_DECL_CONSTEXPR inline bool testFlag(Enum flag) const noexcept { return (i & Int(flag)) == Int(flag) && (Int(flag) != 0 || i == Int(flag) ); }
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &setFlag(Enum flag, bool on = true) noexcept
     {
         return on ? (*this |= flag) : (*this &= ~Int(flag));
     }
 
 private:
-#ifdef Q_COMPILER_INITIALIZER_LISTS
     Q_DECL_CONSTEXPR static inline Int initializer_list_helper(typename std::initializer_list<Enum>::const_iterator it,
                                                                typename std::initializer_list<Enum>::const_iterator end)
-    Q_DECL_NOTHROW
+    noexcept
     {
         return (it == end ? Int(0) : (Int(*it) | initializer_list_helper(it + 1, end)));
     }
-#endif
 
     Int i;
 };
@@ -172,13 +166,13 @@ typedef QFlags<Enum> Flags;
 #endif
 
 #define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) \
-Q_DECL_CONSTEXPR inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) Q_DECL_NOTHROW \
+Q_DECL_CONSTEXPR inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) noexcept \
 { return QIncompatibleFlag(int(f1) | f2); }
 
 #define Q_DECLARE_OPERATORS_FOR_FLAGS(Flags) \
-Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, Flags::enum_type f2) Q_DECL_NOTHROW \
+Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, Flags::enum_type f2) noexcept \
 { return QFlags<Flags::enum_type>(f1) | f2; } \
-Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, QFlags<Flags::enum_type> f2) Q_DECL_NOTHROW \
+Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, QFlags<Flags::enum_type> f2) noexcept \
 { return f2 | f1; } Q_DECLARE_INCOMPATIBLE_FLAGS(Flags)
 
 
diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp
index 87ff796368..6c21b7de5a 100644
--- a/src/corelib/global/qfloat16.cpp
+++ b/src/corelib/global/qfloat16.cpp
@@ -1,5 +1,6 @@
 /****************************************************************************
 **
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 by Southwest Research Institute (R)
 ** Contact: http://www.qt-project.org/legal
 **
@@ -37,8 +38,9 @@
 **
 ****************************************************************************/
 
-#include "qfloat16_p.h"
+#include "qfloat16.h"
 #include "private/qsimd_p.h"
+#include <cmath> // for fpclassify()'s return values
 
 QT_BEGIN_NAMESPACE
 
@@ -78,28 +80,83 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    Returns true if the \c qfloat16 \a {f} is equivalent to infinity.
+    \fn bool qIsInf(qfloat16 f)
     \relates <QFloat16>
 
+    Returns true if the \c qfloat16 \a {f} is equivalent to infinity.
+
     \sa qIsInf
 */
-Q_REQUIRED_RESULT bool qIsInf(qfloat16 f) Q_DECL_NOTHROW { return qt_is_inf(f); }
 
 /*!
-    Returns true if the \c qfloat16 \a {f} is not a number (NaN).
+    \fn bool qIsNaN(qfloat16 f)
     \relates <QFloat16>
 
+    Returns true if the \c qfloat16 \a {f} is not a number (NaN).
+
     \sa qIsNaN
 */
-Q_REQUIRED_RESULT bool qIsNaN(qfloat16 f) Q_DECL_NOTHROW { return qt_is_nan(f); }
 
 /*!
-    Returns true if the \c qfloat16 \a {f} is a finite number.
+    \fn bool qIsFinite(qfloat16 f)
     \relates <QFloat16>
 
+    Returns true if the \c qfloat16 \a {f} is a finite number.
+
     \sa qIsFinite
 */
-Q_REQUIRED_RESULT bool qIsFinite(qfloat16 f) Q_DECL_NOTHROW { return qt_is_finite(f); }
+
+/*!
+    \internal
+    \since 5.14
+    bool qfloat16::isInf() const noexcept
+
+    Tests whether this \c qfloat16 value is an infinity.
+
+    \sa qIsInf()
+*/
+
+/*!
+    \internal
+    \since 5.14
+    bool qfloat16::isNaN() const noexcept
+
+    Tests whether this \c qfloat16 value is "not a number".
+
+    \sa qIsNaN()
+*/
+
+/*!
+    \since 5.14
+    bool qfloat16::isNormal() const noexcept
+
+    Tests whether this \c qfloat16 value is finite and in normal form.
+
+    \sa qFpClassify()
+*/
+
+/*!
+    \internal
+    \since 5.14
+    bool qfloat16::isFinite() const noexcept
+
+    Tests whether this \c qfloat16 value is finite.
+
+    \sa qIsFinite()
+*/
+
+/*!
+    \internal
+    \since 5.14
+    Implements qFpClassify() for qfloat16.
+
+    \sa qFpClassify()
+*/
+int qfloat16::fpClassify() const noexcept
+{
+    return isInf() ? FP_INFINITE : isNaN() ? FP_NAN
+        : !(b16 & 0x7fff) ? FP_ZERO : isNormal() ? FP_NORMAL : FP_SUBNORMAL;
+}
 
 /*! \fn int qRound(qfloat16 value)
     \relates <QFloat16>
@@ -142,8 +199,8 @@ extern "C" {
 #  define f16cextern    extern
 #endif
 
-f16cextern void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW;
-f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOTHROW;
+f16cextern void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) noexcept;
+f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) noexcept;
 
 #undef f16cextern
 }
@@ -154,7 +211,7 @@ static inline bool hasFastF16()
     return true;
 }
 
-static void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW
+static void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) noexcept
 {
     __fp16 *out_f16 = reinterpret_cast<__fp16 *>(out);
     qsizetype i = 0;
@@ -164,7 +221,7 @@ static void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q
         out_f16[i] = __fp16(in[i]);
 }
 
-static void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOTHROW
+static void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) noexcept
 {
     const __fp16 *in_f16 = reinterpret_cast<const __fp16 *>(in);
     qsizetype i = 0;
@@ -179,12 +236,12 @@ static inline bool hasFastF16()
     return false;
 }
 
-static void qFloatToFloat16_fast(quint16 *, const float *, qsizetype) Q_DECL_NOTHROW
+static void qFloatToFloat16_fast(quint16 *, const float *, qsizetype) noexcept
 {
     Q_UNREACHABLE();
 }
 
-static void qFloatFromFloat16_fast(float *, const quint16 *, qsizetype) Q_DECL_NOTHROW
+static void qFloatFromFloat16_fast(float *, const quint16 *, qsizetype) noexcept
 {
     Q_UNREACHABLE();
 }
@@ -196,7 +253,7 @@ static void qFloatFromFloat16_fast(float *, const quint16 *, qsizetype) Q_DECL_N
     Converts \a len floats from \a in to qfloat16 and stores them in \a out.
     Both \a in and \a out must have \a len allocated entries.
 */
-Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW
+Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *out, const float *in, qsizetype len) noexcept
 {
     if (hasFastF16())
         return qFloatToFloat16_fast(reinterpret_cast<quint16 *>(out), in, len);
@@ -212,7 +269,7 @@ Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *out, const float *in, qsizetype len
     Converts \a len qfloat16 from \a in to floats and stores them in \a out.
     Both \a in and \a out must have \a len allocated entries.
 */
-Q_CORE_EXPORT void qFloatFromFloat16(float *out, const qfloat16 *in, qsizetype len) Q_DECL_NOTHROW
+Q_CORE_EXPORT void qFloatFromFloat16(float *out, const qfloat16 *in, qsizetype len) noexcept
 {
     if (hasFastF16())
         return qFloatFromFloat16_fast(out, reinterpret_cast<const quint16 *>(in), len);
@@ -223,6 +280,7 @@ Q_CORE_EXPORT void qFloatFromFloat16(float *out, const qfloat16 *in, qsizetype l
 
 QT_END_NAMESPACE
 
+#include "qfloat16tables.cpp"
 #ifdef QFLOAT16_INCLUDE_FAST
 #  include "qfloat16_f16c.c"
 #endif
diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
index fc006db3f2..9a4f1800a4 100644
--- a/src/corelib/global/qfloat16.h
+++ b/src/corelib/global/qfloat16.h
@@ -1,5 +1,6 @@
 /****************************************************************************
 **
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 by Southwest Research Institute (R)
 ** Contact: http://www.qt-project.org/legal
 **
@@ -66,13 +67,37 @@ QT_BEGIN_NAMESPACE
 
 class qfloat16
 {
+    struct Wrap
+    {
+        // To let our private constructor work, without other code seeing
+        // ambiguity when constructing from int, double &c.
+        quint16 b16;
+        constexpr inline explicit Wrap(int value) : b16(value) {}
+    };
 public:
-    Q_DECL_CONSTEXPR inline qfloat16() Q_DECL_NOTHROW : b16(0) { }
-    inline qfloat16(float f) Q_DECL_NOTHROW;
-    inline operator float() const Q_DECL_NOTHROW;
-
+    constexpr inline qfloat16() noexcept : b16(0) {}
+    inline qfloat16(float f) noexcept;
+    inline operator float() const noexcept;
+
+    // Support for qIs{Inf,NaN,Finite}:
+    bool isInf() const noexcept { return ((b16 >> 8) & 0x7e) == 0x7c; }
+    bool isNaN() const noexcept { return ((b16 >> 8) & 0x7e) == 0x7e; }
+    bool isFinite() const noexcept { return ((b16 >> 8) & 0x7c) != 0x7c; }
+    Q_CORE_EXPORT int fpClassify() const noexcept;
+    // Support for std::numeric_limits<qfloat16>
+    static constexpr qfloat16 _limit_epsilon()    noexcept { return qfloat16(Wrap(0x1400)); }
+    static constexpr qfloat16 _limit_min()        noexcept { return qfloat16(Wrap(0x400)); }
+    static constexpr qfloat16 _limit_denorm_min() noexcept { return qfloat16(Wrap(1)); }
+    static constexpr qfloat16 _limit_max()        noexcept { return qfloat16(Wrap(0x7bff)); }
+    static constexpr qfloat16 _limit_lowest()     noexcept { return qfloat16(Wrap(0xfbff)); }
+    static constexpr qfloat16 _limit_infinity()   noexcept { return qfloat16(Wrap(0x7c00)); }
+    static constexpr qfloat16 _limit_quiet_NaN()  noexcept { return qfloat16(Wrap(0x7e00)); }
+    // Signalling NaN is 0x7f00
+    inline constexpr bool isNormal() const noexcept
+    { return (b16 & 0x7fff) == 0 || ((b16 & 0x7c00) && (b16 & 0x7c00) != 0x7c00); }
 private:
     quint16 b16;
+    constexpr inline explicit qfloat16(Wrap nibble) noexcept : b16(nibble.b16) {}
 
     Q_CORE_EXPORT static const quint32 mantissatable[];
     Q_CORE_EXPORT static const quint32 exponenttable[];
@@ -80,29 +105,32 @@ private:
     Q_CORE_EXPORT static const quint32 basetable[];
     Q_CORE_EXPORT static const quint32 shifttable[];
 
-    friend bool qIsNull(qfloat16 f) Q_DECL_NOTHROW;
+    friend bool qIsNull(qfloat16 f) noexcept;
 #if !defined(QT_NO_FLOAT16_OPERATORS)
-    friend qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW;
+    friend qfloat16 operator-(qfloat16 a) noexcept;
 #endif
 };
 
 Q_DECLARE_TYPEINFO(qfloat16, Q_PRIMITIVE_TYPE);
 
-Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *, const float *, qsizetype length) Q_DECL_NOTHROW;
-Q_CORE_EXPORT void qFloatFromFloat16(float *, const qfloat16 *, qsizetype length) Q_DECL_NOTHROW;
+Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *, const float *, qsizetype length) noexcept;
+Q_CORE_EXPORT void qFloatFromFloat16(float *, const qfloat16 *, qsizetype length) noexcept;
 
-Q_REQUIRED_RESULT Q_CORE_EXPORT bool qIsInf(qfloat16 f) Q_DECL_NOTHROW;    // complements qnumeric.h
-Q_REQUIRED_RESULT Q_CORE_EXPORT bool qIsNaN(qfloat16 f) Q_DECL_NOTHROW;    // complements qnumeric.h
-Q_REQUIRED_RESULT Q_CORE_EXPORT bool qIsFinite(qfloat16 f) Q_DECL_NOTHROW; // complements qnumeric.h
+// Complement qnumeric.h:
+Q_REQUIRED_RESULT inline bool qIsInf(qfloat16 f) noexcept { return f.isInf(); }
+Q_REQUIRED_RESULT inline bool qIsNaN(qfloat16 f) noexcept { return f.isNaN(); }
+Q_REQUIRED_RESULT inline bool qIsFinite(qfloat16 f) noexcept { return f.isFinite(); }
+Q_REQUIRED_RESULT inline int qFpClassify(qfloat16 f) noexcept { return f.fpClassify(); }
+// Q_REQUIRED_RESULT quint32 qFloatDistance(qfloat16 a, qfloat16 b);
 
 // The remainder of these utility functions complement qglobal.h
-Q_REQUIRED_RESULT inline int qRound(qfloat16 d) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline int qRound(qfloat16 d) noexcept
 { return qRound(static_cast<float>(d)); }
 
-Q_REQUIRED_RESULT inline qint64 qRound64(qfloat16 d) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline qint64 qRound64(qfloat16 d) noexcept
 { return qRound64(static_cast<float>(d)); }
 
-Q_REQUIRED_RESULT inline bool qFuzzyCompare(qfloat16 p1, qfloat16 p2) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool qFuzzyCompare(qfloat16 p1, qfloat16 p2) noexcept
 {
     float f1 = static_cast<float>(p1);
     float f2 = static_cast<float>(p2);
@@ -115,19 +143,19 @@ Q_REQUIRED_RESULT inline bool qFuzzyCompare(qfloat16 p1, qfloat16 p2) Q_DECL_NOT
     return (qAbs(f1 - f2) * 102.5f <= qMin(qAbs(f1), qAbs(f2)));
 }
 
-Q_REQUIRED_RESULT inline bool qIsNull(qfloat16 f) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool qIsNull(qfloat16 f) noexcept
 {
     return (f.b16 & static_cast<quint16>(0x7fff)) == 0;
 }
 
-inline int qIntCast(qfloat16 f) Q_DECL_NOTHROW
+inline int qIntCast(qfloat16 f) noexcept
 { return int(static_cast<float>(f)); }
 
 #ifndef Q_QDOC
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wc99-extensions")
 QT_WARNING_DISABLE_GCC("-Wold-style-cast")
-inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW
+inline qfloat16::qfloat16(float f) noexcept
 {
 #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
     __m128 packsingle = _mm_set_ss(f);
@@ -145,7 +173,7 @@ inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW
 }
 QT_WARNING_POP
 
-inline qfloat16::operator float() const Q_DECL_NOTHROW
+inline qfloat16::operator float() const noexcept
 {
 #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
     __m128i packhalf = _mm_cvtsi32_si128(b16);
@@ -166,23 +194,23 @@ inline qfloat16::operator float() const Q_DECL_NOTHROW
 #endif
 
 #if !defined(QT_NO_FLOAT16_OPERATORS)
-inline qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW
+inline qfloat16 operator-(qfloat16 a) noexcept
 {
     qfloat16 f;
     f.b16 = a.b16 ^ quint16(0x8000);
     return f;
 }
 
-inline qfloat16 operator+(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) + static_cast<float>(b)); }
-inline qfloat16 operator-(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) - static_cast<float>(b)); }
-inline qfloat16 operator*(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) * static_cast<float>(b)); }
-inline qfloat16 operator/(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) / static_cast<float>(b)); }
+inline qfloat16 operator+(qfloat16 a, qfloat16 b) noexcept { return qfloat16(static_cast<float>(a) + static_cast<float>(b)); }
+inline qfloat16 operator-(qfloat16 a, qfloat16 b) noexcept { return qfloat16(static_cast<float>(a) - static_cast<float>(b)); }
+inline qfloat16 operator*(qfloat16 a, qfloat16 b) noexcept { return qfloat16(static_cast<float>(a) * static_cast<float>(b)); }
+inline qfloat16 operator/(qfloat16 a, qfloat16 b) noexcept { return qfloat16(static_cast<float>(a) / static_cast<float>(b)); }
 
 #define QF16_MAKE_ARITH_OP_FP(FP, OP) \
-    inline FP operator OP(qfloat16 lhs, FP rhs) Q_DECL_NOTHROW { return static_cast<FP>(lhs) OP rhs; } \
-    inline FP operator OP(FP lhs, qfloat16 rhs) Q_DECL_NOTHROW { return lhs OP static_cast<FP>(rhs); }
+    inline FP operator OP(qfloat16 lhs, FP rhs) noexcept { return static_cast<FP>(lhs) OP rhs; } \
+    inline FP operator OP(FP lhs, qfloat16 rhs) noexcept { return lhs OP static_cast<FP>(rhs); }
 #define QF16_MAKE_ARITH_OP_EQ_FP(FP, OP_EQ, OP) \
-    inline qfloat16& operator OP_EQ(qfloat16& lhs, FP rhs) Q_DECL_NOTHROW \
+    inline qfloat16& operator OP_EQ(qfloat16& lhs, FP rhs) noexcept \
     { lhs = qfloat16(float(static_cast<FP>(lhs) OP rhs)); return lhs; }
 #define QF16_MAKE_ARITH_OP(FP) \
     QF16_MAKE_ARITH_OP_FP(FP, +) \
@@ -200,8 +228,8 @@ QF16_MAKE_ARITH_OP(float)
 #undef QF16_MAKE_ARITH_OP_FP
 
 #define QF16_MAKE_ARITH_OP_INT(OP) \
-    inline double operator OP(qfloat16 lhs, int rhs) Q_DECL_NOTHROW { return static_cast<double>(lhs) OP rhs; } \
-    inline double operator OP(int lhs, qfloat16 rhs) Q_DECL_NOTHROW { return lhs OP static_cast<double>(rhs); }
+    inline double operator OP(qfloat16 lhs, int rhs) noexcept { return static_cast<double>(lhs) OP rhs; } \
+    inline double operator OP(int lhs, qfloat16 rhs) noexcept { return lhs OP static_cast<double>(rhs); }
 QF16_MAKE_ARITH_OP_INT(+)
 QF16_MAKE_ARITH_OP_INT(-)
 QF16_MAKE_ARITH_OP_INT(*)
@@ -212,16 +240,16 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
 QT_WARNING_DISABLE_GCC("-Wfloat-equal")
 
-inline bool operator>(qfloat16 a, qfloat16 b)  Q_DECL_NOTHROW { return static_cast<float>(a) >  static_cast<float>(b); }
-inline bool operator<(qfloat16 a, qfloat16 b)  Q_DECL_NOTHROW { return static_cast<float>(a) <  static_cast<float>(b); }
-inline bool operator>=(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) >= static_cast<float>(b); }
-inline bool operator<=(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) <= static_cast<float>(b); }
-inline bool operator==(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) == static_cast<float>(b); }
-inline bool operator!=(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) != static_cast<float>(b); }
+inline bool operator>(qfloat16 a, qfloat16 b)  noexcept { return static_cast<float>(a) >  static_cast<float>(b); }
+inline bool operator<(qfloat16 a, qfloat16 b)  noexcept { return static_cast<float>(a) <  static_cast<float>(b); }
+inline bool operator>=(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) >= static_cast<float>(b); }
+inline bool operator<=(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) <= static_cast<float>(b); }
+inline bool operator==(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) == static_cast<float>(b); }
+inline bool operator!=(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) != static_cast<float>(b); }
 
 #define QF16_MAKE_BOOL_OP_FP(FP, OP) \
-    inline bool operator OP(qfloat16 lhs, FP rhs) Q_DECL_NOTHROW { return static_cast<FP>(lhs) OP rhs; } \
-    inline bool operator OP(FP lhs, qfloat16 rhs) Q_DECL_NOTHROW { return lhs OP static_cast<FP>(rhs); }
+    inline bool operator OP(qfloat16 lhs, FP rhs) noexcept { return static_cast<FP>(lhs) OP rhs; } \
+    inline bool operator OP(FP lhs, qfloat16 rhs) noexcept { return lhs OP static_cast<FP>(rhs); }
 #define QF16_MAKE_BOOL_OP(FP) \
     QF16_MAKE_BOOL_OP_FP(FP, <) \
     QF16_MAKE_BOOL_OP_FP(FP, >) \
@@ -236,8 +264,8 @@ QF16_MAKE_BOOL_OP(float)
 #undef QF16_MAKE_BOOL_OP_FP
 
 #define QF16_MAKE_BOOL_OP_INT(OP) \
-    inline bool operator OP(qfloat16 a, int b) Q_DECL_NOTHROW { return static_cast<float>(a) OP b; } \
-    inline bool operator OP(int a, qfloat16 b) Q_DECL_NOTHROW { return a OP static_cast<float>(b); }
+    inline bool operator OP(qfloat16 a, int b) noexcept { return static_cast<float>(a) OP b; } \
+    inline bool operator OP(int a, qfloat16 b) noexcept { return a OP static_cast<float>(b); }
 QF16_MAKE_BOOL_OP_INT(>)
 QF16_MAKE_BOOL_OP_INT(<)
 QF16_MAKE_BOOL_OP_INT(>=)
@@ -252,7 +280,7 @@ QT_WARNING_POP
 /*!
   \internal
 */
-Q_REQUIRED_RESULT inline bool qFuzzyIsNull(qfloat16 f) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool qFuzzyIsNull(qfloat16 f) noexcept
 {
     return qAbs(static_cast<float>(f)) <= 0.001f;
 }
@@ -261,4 +289,55 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(qfloat16)
 
+namespace std {
+template<>
+class numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> : public numeric_limits<float>
+{
+public:
+    /*
+      Treat quint16 b16 as if it were:
+      uint S: 1; // b16 >> 15 (sign); can be set for zero
+      uint E: 5; // (b16 >> 10) & 0x1f (offset exponent)
+      uint M: 10; // b16 & 0x3ff (adjusted mantissa)
+
+      for E == 0: magnitude is M / 2.^{24}
+      for 0 < E < 31: magnitude is (1. + M / 2.^{10}) * 2.^{E - 15)
+      for E == 31: not finite
+     */
+    static constexpr int digits = 11;
+    static constexpr int min_exponent = -13;
+    static constexpr int max_exponent = 16;
+
+    static constexpr int digits10 = 3;
+    static constexpr int max_digits10 = 5;
+    static constexpr int min_exponent10 = -4;
+    static constexpr int max_exponent10 = 4;
+
+    static constexpr QT_PREPEND_NAMESPACE(qfloat16) epsilon()
+    { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_epsilon(); }
+    static constexpr QT_PREPEND_NAMESPACE(qfloat16) (min)()
+    { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_min(); }
+    static constexpr QT_PREPEND_NAMESPACE(qfloat16) denorm_min()
+    { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_denorm_min(); }
+    static constexpr QT_PREPEND_NAMESPACE(qfloat16) (max)()
+    { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_max(); }
+    static constexpr QT_PREPEND_NAMESPACE(qfloat16) lowest()
+    { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_lowest(); }
+    static constexpr QT_PREPEND_NAMESPACE(qfloat16) infinity()
+    { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_infinity(); }
+    static constexpr QT_PREPEND_NAMESPACE(qfloat16) quiet_NaN()
+    { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_quiet_NaN(); }
+};
+
+template<> class numeric_limits<const QT_PREPEND_NAMESPACE(qfloat16)>
+    : public numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> {};
+template<> class numeric_limits<volatile QT_PREPEND_NAMESPACE(qfloat16)>
+    : public numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> {};
+template<> class numeric_limits<const volatile QT_PREPEND_NAMESPACE(qfloat16)>
+    : public numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> {};
+
+// Adding overloads to std isn't allowed, so we can't extend this to support
+// for fpclassify(), isnormal() &c. (which, furthermore, are macros on MinGW).
+} // namespace std
+
 #endif // QFLOAT16_H
diff --git a/src/corelib/global/qfloat16_f16c.c b/src/corelib/global/qfloat16_f16c.c
index a7eadc71b7..ba1e16f481 100644
--- a/src/corelib/global/qfloat16_f16c.c
+++ b/src/corelib/global/qfloat16_f16c.c
@@ -54,7 +54,7 @@ extern "C" {
 #endif
 
 QT_FUNCTION_TARGET(F16C)
-void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW
+void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOEXCEPT
 {
     qsizetype i = 0;
     int epilog_i;
@@ -70,7 +70,7 @@ void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_N
 }
 
 QT_FUNCTION_TARGET(F16C)
-void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOTHROW
+void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOEXCEPT
 {
     qsizetype i = 0;
     int epilog_i;
diff --git a/src/corelib/global/qfloat16tables.cpp b/src/corelib/global/qfloat16tables.cpp
new file mode 100644
index 0000000000..3d764937d7
--- /dev/null
+++ b/src/corelib/global/qfloat16tables.cpp
@@ -0,0 +1,3266 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 by Southwest Research Institute (R)
+** Copyright (C) 2019 Intel Corporation.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/* This file was generated by gen_qfloat16_tables.cpp */
+
+#include <QtCore/qfloat16.h>
+
+QT_BEGIN_NAMESPACE
+
+#if !defined(__F16C__) && !defined(__ARM_FP16_FORMAT_IEEE)
+
+const quint32 qfloat16::mantissatable[2048] = {
+0,
+0x33800000U,
+0x34000000U,
+0x34400000U,
+0x34800000U,
+0x34A00000U,
+0x34C00000U,
+0x34E00000U,
+0x35000000U,
+0x35100000U,
+0x35200000U,
+0x35300000U,
+0x35400000U,
+0x35500000U,
+0x35600000U,
+0x35700000U,
+0x35800000U,
+0x35880000U,
+0x35900000U,
+0x35980000U,
+0x35A00000U,
+0x35A80000U,
+0x35B00000U,
+0x35B80000U,
+0x35C00000U,
+0x35C80000U,
+0x35D00000U,
+0x35D80000U,
+0x35E00000U,
+0x35E80000U,
+0x35F00000U,
+0x35F80000U,
+0x36000000U,
+0x36040000U,
+0x36080000U,
+0x360C0000U,
+0x36100000U,
+0x36140000U,
+0x36180000U,
+0x361C0000U,
+0x36200000U,
+0x36240000U,
+0x36280000U,
+0x362C0000U,
+0x36300000U,
+0x36340000U,
+0x36380000U,
+0x363C0000U,
+0x36400000U,
+0x36440000U,
+0x36480000U,
+0x364C0000U,
+0x36500000U,
+0x36540000U,
+0x36580000U,
+0x365C0000U,
+0x36600000U,
+0x36640000U,
+0x36680000U,
+0x366C0000U,
+0x36700000U,
+0x36740000U,
+0x36780000U,
+0x367C0000U,
+0x36800000U,
+0x36820000U,
+0x36840000U,
+0x36860000U,
+0x36880000U,
+0x368A0000U,
+0x368C0000U,
+0x368E0000U,
+0x36900000U,
+0x36920000U,
+0x36940000U,
+0x36960000U,
+0x36980000U,
+0x369A0000U,
+0x369C0000U,
+0x369E0000U,
+0x36A00000U,
+0x36A20000U,
+0x36A40000U,
+0x36A60000U,
+0x36A80000U,
+0x36AA0000U,
+0x36AC0000U,
+0x36AE0000U,
+0x36B00000U,
+0x36B20000U,
+0x36B40000U,
+0x36B60000U,
+0x36B80000U,
+0x36BA0000U,
+0x36BC0000U,
+0x36BE0000U,
+0x36C00000U,
+0x36C20000U,
+0x36C40000U,
+0x36C60000U,
+0x36C80000U,
+0x36CA0000U,
+0x36CC0000U,
+0x36CE0000U,
+0x36D00000U,
+0x36D20000U,
+0x36D40000U,
+0x36D60000U,
+0x36D80000U,
+0x36DA0000U,
+0x36DC0000U,
+0x36DE0000U,
+0x36E00000U,
+0x36E20000U,
+0x36E40000U,
+0x36E60000U,
+0x36E80000U,
+0x36EA0000U,
+0x36EC0000U,
+0x36EE0000U,
+0x36F00000U,
+0x36F20000U,
+0x36F40000U,
+0x36F60000U,
+0x36F80000U,
+0x36FA0000U,
+0x36FC0000U,
+0x36FE0000U,
+0x37000000U,
+0x37010000U,
+0x37020000U,
+0x37030000U,
+0x37040000U,
+0x37050000U,
+0x37060000U,
+0x37070000U,
+0x37080000U,
+0x37090000U,
+0x370A0000U,
+0x370B0000U,
+0x370C0000U,
+0x370D0000U,
+0x370E0000U,
+0x370F0000U,
+0x37100000U,
+0x37110000U,
+0x37120000U,
+0x37130000U,
+0x37140000U,
+0x37150000U,
+0x37160000U,
+0x37170000U,
+0x37180000U,
+0x37190000U,
+0x371A0000U,
+0x371B0000U,
+0x371C0000U,
+0x371D0000U,
+0x371E0000U,
+0x371F0000U,
+0x37200000U,
+0x37210000U,
+0x37220000U,
+0x37230000U,
+0x37240000U,
+0x37250000U,
+0x37260000U,
+0x37270000U,
+0x37280000U,
+0x37290000U,
+0x372A0000U,
+0x372B0000U,
+0x372C0000U,
+0x372D0000U,
+0x372E0000U,
+0x372F0000U,
+0x37300000U,
+0x37310000U,
+0x37320000U,
+0x37330000U,
+0x37340000U,
+0x37350000U,
+0x37360000U,
+0x37370000U,
+0x37380000U,
+0x37390000U,
+0x373A0000U,
+0x373B0000U,
+0x373C0000U,
+0x373D0000U,
+0x373E0000U,
+0x373F0000U,
+0x37400000U,
+0x37410000U,
+0x37420000U,
+0x37430000U,
+0x37440000U,
+0x37450000U,
+0x37460000U,
+0x37470000U,
+0x37480000U,
+0x37490000U,
+0x374A0000U,
+0x374B0000U,
+0x374C0000U,
+0x374D0000U,
+0x374E0000U,
+0x374F0000U,
+0x37500000U,
+0x37510000U,
+0x37520000U,
+0x37530000U,
+0x37540000U,
+0x37550000U,
+0x37560000U,
+0x37570000U,
+0x37580000U,
+0x37590000U,
+0x375A0000U,
+0x375B0000U,
+0x375C0000U,
+0x375D0000U,
+0x375E0000U,
+0x375F0000U,
+0x37600000U,
+0x37610000U,
+0x37620000U,
+0x37630000U,
+0x37640000U,
+0x37650000U,
+0x37660000U,
+0x37670000U,
+0x37680000U,
+0x37690000U,
+0x376A0000U,
+0x376B0000U,
+0x376C0000U,
+0x376D0000U,
+0x376E0000U,
+0x376F0000U,
+0x37700000U,
+0x37710000U,
+0x37720000U,
+0x37730000U,
+0x37740000U,
+0x37750000U,
+0x37760000U,
+0x37770000U,
+0x37780000U,
+0x37790000U,
+0x377A0000U,
+0x377B0000U,
+0x377C0000U,
+0x377D0000U,
+0x377E0000U,
+0x377F0000U,
+0x37800000U,
+0x37808000U,
+0x37810000U,
+0x37818000U,
+0x37820000U,
+0x37828000U,
+0x37830000U,
+0x37838000U,
+0x37840000U,
+0x37848000U,
+0x37850000U,
+0x37858000U,
+0x37860000U,
+0x37868000U,
+0x37870000U,
+0x37878000U,
+0x37880000U,
+0x37888000U,
+0x37890000U,
+0x37898000U,
+0x378A0000U,
+0x378A8000U,
+0x378B0000U,
+0x378B8000U,
+0x378C0000U,
+0x378C8000U,
+0x378D0000U,
+0x378D8000U,
+0x378E0000U,
+0x378E8000U,
+0x378F0000U,
+0x378F8000U,
+0x37900000U,
+0x37908000U,
+0x37910000U,
+0x37918000U,
+0x37920000U,
+0x37928000U,
+0x37930000U,
+0x37938000U,
+0x37940000U,
+0x37948000U,
+0x37950000U,
+0x37958000U,
+0x37960000U,
+0x37968000U,
+0x37970000U,
+0x37978000U,
+0x37980000U,
+0x37988000U,
+0x37990000U,
+0x37998000U,
+0x379A0000U,
+0x379A8000U,
+0x379B0000U,
+0x379B8000U,
+0x379C0000U,
+0x379C8000U,
+0x379D0000U,
+0x379D8000U,
+0x379E0000U,
+0x379E8000U,
+0x379F0000U,
+0x379F8000U,
+0x37A00000U,
+0x37A08000U,
+0x37A10000U,
+0x37A18000U,
+0x37A20000U,
+0x37A28000U,
+0x37A30000U,
+0x37A38000U,
+0x37A40000U,
+0x37A48000U,
+0x37A50000U,
+0x37A58000U,
+0x37A60000U,
+0x37A68000U,
+0x37A70000U,
+0x37A78000U,
+0x37A80000U,
+0x37A88000U,
+0x37A90000U,
+0x37A98000U,
+0x37AA0000U,
+0x37AA8000U,
+0x37AB0000U,
+0x37AB8000U,
+0x37AC0000U,
+0x37AC8000U,
+0x37AD0000U,
+0x37AD8000U,
+0x37AE0000U,
+0x37AE8000U,
+0x37AF0000U,
+0x37AF8000U,
+0x37B00000U,
+0x37B08000U,
+0x37B10000U,
+0x37B18000U,
+0x37B20000U,
+0x37B28000U,
+0x37B30000U,
+0x37B38000U,
+0x37B40000U,
+0x37B48000U,
+0x37B50000U,
+0x37B58000U,
+0x37B60000U,
+0x37B68000U,
+0x37B70000U,
+0x37B78000U,
+0x37B80000U,
+0x37B88000U,
+0x37B90000U,
+0x37B98000U,
+0x37BA0000U,
+0x37BA8000U,
+0x37BB0000U,
+0x37BB8000U,
+0x37BC0000U,
+0x37BC8000U,
+0x37BD0000U,
+0x37BD8000U,
+0x37BE0000U,
+0x37BE8000U,
+0x37BF0000U,
+0x37BF8000U,
+0x37C00000U,
+0x37C08000U,
+0x37C10000U,
+0x37C18000U,
+0x37C20000U,
+0x37C28000U,
+0x37C30000U,
+0x37C38000U,
+0x37C40000U,
+0x37C48000U,
+0x37C50000U,
+0x37C58000U,
+0x37C60000U,
+0x37C68000U,
+0x37C70000U,
+0x37C78000U,
+0x37C80000U,
+0x37C88000U,
+0x37C90000U,
+0x37C98000U,
+0x37CA0000U,
+0x37CA8000U,
+0x37CB0000U,
+0x37CB8000U,
+0x37CC0000U,
+0x37CC8000U,
+0x37CD0000U,
+0x37CD8000U,
+0x37CE0000U,
+0x37CE8000U,
+0x37CF0000U,
+0x37CF8000U,
+0x37D00000U,
+0x37D08000U,
+0x37D10000U,
+0x37D18000U,
+0x37D20000U,
+0x37D28000U,
+0x37D30000U,
+0x37D38000U,
+0x37D40000U,
+0x37D48000U,
+0x37D50000U,
+0x37D58000U,
+0x37D60000U,
+0x37D68000U,
+0x37D70000U,
+0x37D78000U,
+0x37D80000U,
+0x37D88000U,
+0x37D90000U,
+0x37D98000U,
+0x37DA0000U,
+0x37DA8000U,
+0x37DB0000U,
+0x37DB8000U,
+0x37DC0000U,
+0x37DC8000U,
+0x37DD0000U,
+0x37DD8000U,
+0x37DE0000U,
+0x37DE8000U,
+0x37DF0000U,
+0x37DF8000U,
+0x37E00000U,
+0x37E08000U,
+0x37E10000U,
+0x37E18000U,
+0x37E20000U,
+0x37E28000U,
+0x37E30000U,
+0x37E38000U,
+0x37E40000U,
+0x37E48000U,
+0x37E50000U,
+0x37E58000U,
+0x37E60000U,
+0x37E68000U,
+0x37E70000U,
+0x37E78000U,
+0x37E80000U,
+0x37E88000U,
+0x37E90000U,
+0x37E98000U,
+0x37EA0000U,
+0x37EA8000U,
+0x37EB0000U,
+0x37EB8000U,
+0x37EC0000U,
+0x37EC8000U,
+0x37ED0000U,
+0x37ED8000U,
+0x37EE0000U,
+0x37EE8000U,
+0x37EF0000U,
+0x37EF8000U,
+0x37F00000U,
+0x37F08000U,
+0x37F10000U,
+0x37F18000U,
+0x37F20000U,
+0x37F28000U,
+0x37F30000U,
+0x37F38000U,
+0x37F40000U,
+0x37F48000U,
+0x37F50000U,
+0x37F58000U,
+0x37F60000U,
+0x37F68000U,
+0x37F70000U,
+0x37F78000U,
+0x37F80000U,
+0x37F88000U,
+0x37F90000U,
+0x37F98000U,
+0x37FA0000U,
+0x37FA8000U,
+0x37FB0000U,
+0x37FB8000U,
+0x37FC0000U,
+0x37FC8000U,
+0x37FD0000U,
+0x37FD8000U,
+0x37FE0000U,
+0x37FE8000U,
+0x37FF0000U,
+0x37FF8000U,
+0x38000000U,
+0x38004000U,
+0x38008000U,
+0x3800C000U,
+0x38010000U,
+0x38014000U,
+0x38018000U,
+0x3801C000U,
+0x38020000U,
+0x38024000U,
+0x38028000U,
+0x3802C000U,
+0x38030000U,
+0x38034000U,
+0x38038000U,
+0x3803C000U,
+0x38040000U,
+0x38044000U,
+0x38048000U,
+0x3804C000U,
+0x38050000U,
+0x38054000U,
+0x38058000U,
+0x3805C000U,
+0x38060000U,
+0x38064000U,
+0x38068000U,
+0x3806C000U,
+0x38070000U,
+0x38074000U,
+0x38078000U,
+0x3807C000U,
+0x38080000U,
+0x38084000U,
+0x38088000U,
+0x3808C000U,
+0x38090000U,
+0x38094000U,
+0x38098000U,
+0x3809C000U,
+0x380A0000U,
+0x380A4000U,
+0x380A8000U,
+0x380AC000U,
+0x380B0000U,
+0x380B4000U,
+0x380B8000U,
+0x380BC000U,
+0x380C0000U,
+0x380C4000U,
+0x380C8000U,
+0x380CC000U,
+0x380D0000U,
+0x380D4000U,
+0x380D8000U,
+0x380DC000U,
+0x380E0000U,
+0x380E4000U,
+0x380E8000U,
+0x380EC000U,
+0x380F0000U,
+0x380F4000U,
+0x380F8000U,
+0x380FC000U,
+0x38100000U,
+0x38104000U,
+0x38108000U,
+0x3810C000U,
+0x38110000U,
+0x38114000U,
+0x38118000U,
+0x3811C000U,
+0x38120000U,
+0x38124000U,
+0x38128000U,
+0x3812C000U,
+0x38130000U,
+0x38134000U,
+0x38138000U,
+0x3813C000U,
+0x38140000U,
+0x38144000U,
+0x38148000U,
+0x3814C000U,
+0x38150000U,
+0x38154000U,
+0x38158000U,
+0x3815C000U,
+0x38160000U,
+0x38164000U,
+0x38168000U,
+0x3816C000U,
+0x38170000U,
+0x38174000U,
+0x38178000U,
+0x3817C000U,
+0x38180000U,
+0x38184000U,
+0x38188000U,
+0x3818C000U,
+0x38190000U,
+0x38194000U,
+0x38198000U,
+0x3819C000U,
+0x381A0000U,
+0x381A4000U,
+0x381A8000U,
+0x381AC000U,
+0x381B0000U,
+0x381B4000U,
+0x381B8000U,
+0x381BC000U,
+0x381C0000U,
+0x381C4000U,
+0x381C8000U,
+0x381CC000U,
+0x381D0000U,
+0x381D4000U,
+0x381D8000U,
+0x381DC000U,
+0x381E0000U,
+0x381E4000U,
+0x381E8000U,
+0x381EC000U,
+0x381F0000U,
+0x381F4000U,
+0x381F8000U,
+0x381FC000U,
+0x38200000U,
+0x38204000U,
+0x38208000U,
+0x3820C000U,
+0x38210000U,
+0x38214000U,
+0x38218000U,
+0x3821C000U,
+0x38220000U,
+0x38224000U,
+0x38228000U,
+0x3822C000U,
+0x38230000U,
+0x38234000U,
+0x38238000U,
+0x3823C000U,
+0x38240000U,
+0x38244000U,
+0x38248000U,
+0x3824C000U,
+0x38250000U,
+0x38254000U,
+0x38258000U,
+0x3825C000U,
+0x38260000U,
+0x38264000U,
+0x38268000U,
+0x3826C000U,
+0x38270000U,
+0x38274000U,
+0x38278000U,
+0x3827C000U,
+0x38280000U,
+0x38284000U,
+0x38288000U,
+0x3828C000U,
+0x38290000U,
+0x38294000U,
+0x38298000U,
+0x3829C000U,
+0x382A0000U,
+0x382A4000U,
+0x382A8000U,
+0x382AC000U,
+0x382B0000U,
+0x382B4000U,
+0x382B8000U,
+0x382BC000U,
+0x382C0000U,
+0x382C4000U,
+0x382C8000U,
+0x382CC000U,
+0x382D0000U,
+0x382D4000U,
+0x382D8000U,
+0x382DC000U,
+0x382E0000U,
+0x382E4000U,
+0x382E8000U,
+0x382EC000U,
+0x382F0000U,
+0x382F4000U,
+0x382F8000U,
+0x382FC000U,
+0x38300000U,
+0x38304000U,
+0x38308000U,
+0x3830C000U,
+0x38310000U,
+0x38314000U,
+0x38318000U,
+0x3831C000U,
+0x38320000U,
+0x38324000U,
+0x38328000U,
+0x3832C000U,
+0x38330000U,
+0x38334000U,
+0x38338000U,
+0x3833C000U,
+0x38340000U,
+0x38344000U,
+0x38348000U,
+0x3834C000U,
+0x38350000U,
+0x38354000U,
+0x38358000U,
+0x3835C000U,
+0x38360000U,
+0x38364000U,
+0x38368000U,
+0x3836C000U,
+0x38370000U,
+0x38374000U,
+0x38378000U,
+0x3837C000U,
+0x38380000U,
+0x38384000U,
+0x38388000U,
+0x3838C000U,
+0x38390000U,
+0x38394000U,
+0x38398000U,
+0x3839C000U,
+0x383A0000U,
+0x383A4000U,
+0x383A8000U,
+0x383AC000U,
+0x383B0000U,
+0x383B4000U,
+0x383B8000U,
+0x383BC000U,
+0x383C0000U,
+0x383C4000U,
+0x383C8000U,
+0x383CC000U,
+0x383D0000U,
+0x383D4000U,
+0x383D8000U,
+0x383DC000U,
+0x383E0000U,
+0x383E4000U,
+0x383E8000U,
+0x383EC000U,
+0x383F0000U,
+0x383F4000U,
+0x383F8000U,
+0x383FC000U,
+0x38400000U,
+0x38404000U,
+0x38408000U,
+0x3840C000U,
+0x38410000U,
+0x38414000U,
+0x38418000U,
+0x3841C000U,
+0x38420000U,
+0x38424000U,
+0x38428000U,
+0x3842C000U,
+0x38430000U,
+0x38434000U,
+0x38438000U,
+0x3843C000U,
+0x38440000U,
+0x38444000U,
+0x38448000U,
+0x3844C000U,
+0x38450000U,
+0x38454000U,
+0x38458000U,
+0x3845C000U,
+0x38460000U,
+0x38464000U,
+0x38468000U,
+0x3846C000U,
+0x38470000U,
+0x38474000U,
+0x38478000U,
+0x3847C000U,
+0x38480000U,
+0x38484000U,
+0x38488000U,
+0x3848C000U,
+0x38490000U,
+0x38494000U,
+0x38498000U,
+0x3849C000U,
+0x384A0000U,
+0x384A4000U,
+0x384A8000U,
+0x384AC000U,
+0x384B0000U,
+0x384B4000U,
+0x384B8000U,
+0x384BC000U,
+0x384C0000U,
+0x384C4000U,
+0x384C8000U,
+0x384CC000U,
+0x384D0000U,
+0x384D4000U,
+0x384D8000U,
+0x384DC000U,
+0x384E0000U,
+0x384E4000U,
+0x384E8000U,
+0x384EC000U,
+0x384F0000U,
+0x384F4000U,
+0x384F8000U,
+0x384FC000U,
+0x38500000U,
+0x38504000U,
+0x38508000U,
+0x3850C000U,
+0x38510000U,
+0x38514000U,
+0x38518000U,
+0x3851C000U,
+0x38520000U,
+0x38524000U,
+0x38528000U,
+0x3852C000U,
+0x38530000U,
+0x38534000U,
+0x38538000U,
+0x3853C000U,
+0x38540000U,
+0x38544000U,
+0x38548000U,
+0x3854C000U,
+0x38550000U,
+0x38554000U,
+0x38558000U,
+0x3855C000U,
+0x38560000U,
+0x38564000U,
+0x38568000U,
+0x3856C000U,
+0x38570000U,
+0x38574000U,
+0x38578000U,
+0x3857C000U,
+0x38580000U,
+0x38584000U,
+0x38588000U,
+0x3858C000U,
+0x38590000U,
+0x38594000U,
+0x38598000U,
+0x3859C000U,
+0x385A0000U,
+0x385A4000U,
+0x385A8000U,
+0x385AC000U,
+0x385B0000U,
+0x385B4000U,
+0x385B8000U,
+0x385BC000U,
+0x385C0000U,
+0x385C4000U,
+0x385C8000U,
+0x385CC000U,
+0x385D0000U,
+0x385D4000U,
+0x385D8000U,
+0x385DC000U,
+0x385E0000U,
+0x385E4000U,
+0x385E8000U,
+0x385EC000U,
+0x385F0000U,
+0x385F4000U,
+0x385F8000U,
+0x385FC000U,
+0x38600000U,
+0x38604000U,
+0x38608000U,
+0x3860C000U,
+0x38610000U,
+0x38614000U,
+0x38618000U,
+0x3861C000U,
+0x38620000U,
+0x38624000U,
+0x38628000U,
+0x3862C000U,
+0x38630000U,
+0x38634000U,
+0x38638000U,
+0x3863C000U,
+0x38640000U,
+0x38644000U,
+0x38648000U,
+0x3864C000U,
+0x38650000U,
+0x38654000U,
+0x38658000U,
+0x3865C000U,
+0x38660000U,
+0x38664000U,
+0x38668000U,
+0x3866C000U,
+0x38670000U,
+0x38674000U,
+0x38678000U,
+0x3867C000U,
+0x38680000U,
+0x38684000U,
+0x38688000U,
+0x3868C000U,
+0x38690000U,
+0x38694000U,
+0x38698000U,
+0x3869C000U,
+0x386A0000U,
+0x386A4000U,
+0x386A8000U,
+0x386AC000U,
+0x386B0000U,
+0x386B4000U,
+0x386B8000U,
+0x386BC000U,
+0x386C0000U,
+0x386C4000U,
+0x386C8000U,
+0x386CC000U,
+0x386D0000U,
+0x386D4000U,
+0x386D8000U,
+0x386DC000U,
+0x386E0000U,
+0x386E4000U,
+0x386E8000U,
+0x386EC000U,
+0x386F0000U,
+0x386F4000U,
+0x386F8000U,
+0x386FC000U,
+0x38700000U,
+0x38704000U,
+0x38708000U,
+0x3870C000U,
+0x38710000U,
+0x38714000U,
+0x38718000U,
+0x3871C000U,
+0x38720000U,
+0x38724000U,
+0x38728000U,
+0x3872C000U,
+0x38730000U,
+0x38734000U,
+0x38738000U,
+0x3873C000U,
+0x38740000U,
+0x38744000U,
+0x38748000U,
+0x3874C000U,
+0x38750000U,
+0x38754000U,
+0x38758000U,
+0x3875C000U,
+0x38760000U,
+0x38764000U,
+0x38768000U,
+0x3876C000U,
+0x38770000U,
+0x38774000U,
+0x38778000U,
+0x3877C000U,
+0x38780000U,
+0x38784000U,
+0x38788000U,
+0x3878C000U,
+0x38790000U,
+0x38794000U,
+0x38798000U,
+0x3879C000U,
+0x387A0000U,
+0x387A4000U,
+0x387A8000U,
+0x387AC000U,
+0x387B0000U,
+0x387B4000U,
+0x387B8000U,
+0x387BC000U,
+0x387C0000U,
+0x387C4000U,
+0x387C8000U,
+0x387CC000U,
+0x387D0000U,
+0x387D4000U,
+0x387D8000U,
+0x387DC000U,
+0x387E0000U,
+0x387E4000U,
+0x387E8000U,
+0x387EC000U,
+0x387F0000U,
+0x387F4000U,
+0x387F8000U,
+0x387FC000U,
+0x38000000U,
+0x38002000U,
+0x38004000U,
+0x38006000U,
+0x38008000U,
+0x3800A000U,
+0x3800C000U,
+0x3800E000U,
+0x38010000U,
+0x38012000U,
+0x38014000U,
+0x38016000U,
+0x38018000U,
+0x3801A000U,
+0x3801C000U,
+0x3801E000U,
+0x38020000U,
+0x38022000U,
+0x38024000U,
+0x38026000U,
+0x38028000U,
+0x3802A000U,
+0x3802C000U,
+0x3802E000U,
+0x38030000U,
+0x38032000U,
+0x38034000U,
+0x38036000U,
+0x38038000U,
+0x3803A000U,
+0x3803C000U,
+0x3803E000U,
+0x38040000U,
+0x38042000U,
+0x38044000U,
+0x38046000U,
+0x38048000U,
+0x3804A000U,
+0x3804C000U,
+0x3804E000U,
+0x38050000U,
+0x38052000U,
+0x38054000U,
+0x38056000U,
+0x38058000U,
+0x3805A000U,
+0x3805C000U,
+0x3805E000U,
+0x38060000U,
+0x38062000U,
+0x38064000U,
+0x38066000U,
+0x38068000U,
+0x3806A000U,
+0x3806C000U,
+0x3806E000U,
+0x38070000U,
+0x38072000U,
+0x38074000U,
+0x38076000U,
+0x38078000U,
+0x3807A000U,
+0x3807C000U,
+0x3807E000U,
+0x38080000U,
+0x38082000U,
+0x38084000U,
+0x38086000U,
+0x38088000U,
+0x3808A000U,
+0x3808C000U,
+0x3808E000U,
+0x38090000U,
+0x38092000U,
+0x38094000U,
+0x38096000U,
+0x38098000U,
+0x3809A000U,
+0x3809C000U,
+0x3809E000U,
+0x380A0000U,
+0x380A2000U,
+0x380A4000U,
+0x380A6000U,
+0x380A8000U,
+0x380AA000U,
+0x380AC000U,
+0x380AE000U,
+0x380B0000U,
+0x380B2000U,
+0x380B4000U,
+0x380B6000U,
+0x380B8000U,
+0x380BA000U,
+0x380BC000U,
+0x380BE000U,
+0x380C0000U,
+0x380C2000U,
+0x380C4000U,
+0x380C6000U,
+0x380C8000U,
+0x380CA000U,
+0x380CC000U,
+0x380CE000U,
+0x380D0000U,
+0x380D2000U,
+0x380D4000U,
+0x380D6000U,
+0x380D8000U,
+0x380DA000U,
+0x380DC000U,
+0x380DE000U,
+0x380E0000U,
+0x380E2000U,
+0x380E4000U,
+0x380E6000U,
+0x380E8000U,
+0x380EA000U,
+0x380EC000U,
+0x380EE000U,
+0x380F0000U,
+0x380F2000U,
+0x380F4000U,
+0x380F6000U,
+0x380F8000U,
+0x380FA000U,
+0x380FC000U,
+0x380FE000U,
+0x38100000U,
+0x38102000U,
+0x38104000U,
+0x38106000U,
+0x38108000U,
+0x3810A000U,
+0x3810C000U,
+0x3810E000U,
+0x38110000U,
+0x38112000U,
+0x38114000U,
+0x38116000U,
+0x38118000U,
+0x3811A000U,
+0x3811C000U,
+0x3811E000U,
+0x38120000U,
+0x38122000U,
+0x38124000U,
+0x38126000U,
+0x38128000U,
+0x3812A000U,
+0x3812C000U,
+0x3812E000U,
+0x38130000U,
+0x38132000U,
+0x38134000U,
+0x38136000U,
+0x38138000U,
+0x3813A000U,
+0x3813C000U,
+0x3813E000U,
+0x38140000U,
+0x38142000U,
+0x38144000U,
+0x38146000U,
+0x38148000U,
+0x3814A000U,
+0x3814C000U,
+0x3814E000U,
+0x38150000U,
+0x38152000U,
+0x38154000U,
+0x38156000U,
+0x38158000U,
+0x3815A000U,
+0x3815C000U,
+0x3815E000U,
+0x38160000U,
+0x38162000U,
+0x38164000U,
+0x38166000U,
+0x38168000U,
+0x3816A000U,
+0x3816C000U,
+0x3816E000U,
+0x38170000U,
+0x38172000U,
+0x38174000U,
+0x38176000U,
+0x38178000U,
+0x3817A000U,
+0x3817C000U,
+0x3817E000U,
+0x38180000U,
+0x38182000U,
+0x38184000U,
+0x38186000U,
+0x38188000U,
+0x3818A000U,
+0x3818C000U,
+0x3818E000U,
+0x38190000U,
+0x38192000U,
+0x38194000U,
+0x38196000U,
+0x38198000U,
+0x3819A000U,
+0x3819C000U,
+0x3819E000U,
+0x381A0000U,
+0x381A2000U,
+0x381A4000U,
+0x381A6000U,
+0x381A8000U,
+0x381AA000U,
+0x381AC000U,
+0x381AE000U,
+0x381B0000U,
+0x381B2000U,
+0x381B4000U,
+0x381B6000U,
+0x381B8000U,
+0x381BA000U,
+0x381BC000U,
+0x381BE000U,
+0x381C0000U,
+0x381C2000U,
+0x381C4000U,
+0x381C6000U,
+0x381C8000U,
+0x381CA000U,
+0x381CC000U,
+0x381CE000U,
+0x381D0000U,
+0x381D2000U,
+0x381D4000U,
+0x381D6000U,
+0x381D8000U,
+0x381DA000U,
+0x381DC000U,
+0x381DE000U,
+0x381E0000U,
+0x381E2000U,
+0x381E4000U,
+0x381E6000U,
+0x381E8000U,
+0x381EA000U,
+0x381EC000U,
+0x381EE000U,
+0x381F0000U,
+0x381F2000U,
+0x381F4000U,
+0x381F6000U,
+0x381F8000U,
+0x381FA000U,
+0x381FC000U,
+0x381FE000U,
+0x38200000U,
+0x38202000U,
+0x38204000U,
+0x38206000U,
+0x38208000U,
+0x3820A000U,
+0x3820C000U,
+0x3820E000U,
+0x38210000U,
+0x38212000U,
+0x38214000U,
+0x38216000U,
+0x38218000U,
+0x3821A000U,
+0x3821C000U,
+0x3821E000U,
+0x38220000U,
+0x38222000U,
+0x38224000U,
+0x38226000U,
+0x38228000U,
+0x3822A000U,
+0x3822C000U,
+0x3822E000U,
+0x38230000U,
+0x38232000U,
+0x38234000U,
+0x38236000U,
+0x38238000U,
+0x3823A000U,
+0x3823C000U,
+0x3823E000U,
+0x38240000U,
+0x38242000U,
+0x38244000U,
+0x38246000U,
+0x38248000U,
+0x3824A000U,
+0x3824C000U,
+0x3824E000U,
+0x38250000U,
+0x38252000U,
+0x38254000U,
+0x38256000U,
+0x38258000U,
+0x3825A000U,
+0x3825C000U,
+0x3825E000U,
+0x38260000U,
+0x38262000U,
+0x38264000U,
+0x38266000U,
+0x38268000U,
+0x3826A000U,
+0x3826C000U,
+0x3826E000U,
+0x38270000U,
+0x38272000U,
+0x38274000U,
+0x38276000U,
+0x38278000U,
+0x3827A000U,
+0x3827C000U,
+0x3827E000U,
+0x38280000U,
+0x38282000U,
+0x38284000U,
+0x38286000U,
+0x38288000U,
+0x3828A000U,
+0x3828C000U,
+0x3828E000U,
+0x38290000U,
+0x38292000U,
+0x38294000U,
+0x38296000U,
+0x38298000U,
+0x3829A000U,
+0x3829C000U,
+0x3829E000U,
+0x382A0000U,
+0x382A2000U,
+0x382A4000U,
+0x382A6000U,
+0x382A8000U,
+0x382AA000U,
+0x382AC000U,
+0x382AE000U,
+0x382B0000U,
+0x382B2000U,
+0x382B4000U,
+0x382B6000U,
+0x382B8000U,
+0x382BA000U,
+0x382BC000U,
+0x382BE000U,
+0x382C0000U,
+0x382C2000U,
+0x382C4000U,
+0x382C6000U,
+0x382C8000U,
+0x382CA000U,
+0x382CC000U,
+0x382CE000U,
+0x382D0000U,
+0x382D2000U,
+0x382D4000U,
+0x382D6000U,
+0x382D8000U,
+0x382DA000U,
+0x382DC000U,
+0x382DE000U,
+0x382E0000U,
+0x382E2000U,
+0x382E4000U,
+0x382E6000U,
+0x382E8000U,
+0x382EA000U,
+0x382EC000U,
+0x382EE000U,
+0x382F0000U,
+0x382F2000U,
+0x382F4000U,
+0x382F6000U,
+0x382F8000U,
+0x382FA000U,
+0x382FC000U,
+0x382FE000U,
+0x38300000U,
+0x38302000U,
+0x38304000U,
+0x38306000U,
+0x38308000U,
+0x3830A000U,
+0x3830C000U,
+0x3830E000U,
+0x38310000U,
+0x38312000U,
+0x38314000U,
+0x38316000U,
+0x38318000U,
+0x3831A000U,
+0x3831C000U,
+0x3831E000U,
+0x38320000U,
+0x38322000U,
+0x38324000U,
+0x38326000U,
+0x38328000U,
+0x3832A000U,
+0x3832C000U,
+0x3832E000U,
+0x38330000U,
+0x38332000U,
+0x38334000U,
+0x38336000U,
+0x38338000U,
+0x3833A000U,
+0x3833C000U,
+0x3833E000U,
+0x38340000U,
+0x38342000U,
+0x38344000U,
+0x38346000U,
+0x38348000U,
+0x3834A000U,
+0x3834C000U,
+0x3834E000U,
+0x38350000U,
+0x38352000U,
+0x38354000U,
+0x38356000U,
+0x38358000U,
+0x3835A000U,
+0x3835C000U,
+0x3835E000U,
+0x38360000U,
+0x38362000U,
+0x38364000U,
+0x38366000U,
+0x38368000U,
+0x3836A000U,
+0x3836C000U,
+0x3836E000U,
+0x38370000U,
+0x38372000U,
+0x38374000U,
+0x38376000U,
+0x38378000U,
+0x3837A000U,
+0x3837C000U,
+0x3837E000U,
+0x38380000U,
+0x38382000U,
+0x38384000U,
+0x38386000U,
+0x38388000U,
+0x3838A000U,
+0x3838C000U,
+0x3838E000U,
+0x38390000U,
+0x38392000U,
+0x38394000U,
+0x38396000U,
+0x38398000U,
+0x3839A000U,
+0x3839C000U,
+0x3839E000U,
+0x383A0000U,
+0x383A2000U,
+0x383A4000U,
+0x383A6000U,
+0x383A8000U,
+0x383AA000U,
+0x383AC000U,
+0x383AE000U,
+0x383B0000U,
+0x383B2000U,
+0x383B4000U,
+0x383B6000U,
+0x383B8000U,
+0x383BA000U,
+0x383BC000U,
+0x383BE000U,
+0x383C0000U,
+0x383C2000U,
+0x383C4000U,
+0x383C6000U,
+0x383C8000U,
+0x383CA000U,
+0x383CC000U,
+0x383CE000U,
+0x383D0000U,
+0x383D2000U,
+0x383D4000U,
+0x383D6000U,
+0x383D8000U,
+0x383DA000U,
+0x383DC000U,
+0x383DE000U,
+0x383E0000U,
+0x383E2000U,
+0x383E4000U,
+0x383E6000U,
+0x383E8000U,
+0x383EA000U,
+0x383EC000U,
+0x383EE000U,
+0x383F0000U,
+0x383F2000U,
+0x383F4000U,
+0x383F6000U,
+0x383F8000U,
+0x383FA000U,
+0x383FC000U,
+0x383FE000U,
+0x38400000U,
+0x38402000U,
+0x38404000U,
+0x38406000U,
+0x38408000U,
+0x3840A000U,
+0x3840C000U,
+0x3840E000U,
+0x38410000U,
+0x38412000U,
+0x38414000U,
+0x38416000U,
+0x38418000U,
+0x3841A000U,
+0x3841C000U,
+0x3841E000U,
+0x38420000U,
+0x38422000U,
+0x38424000U,
+0x38426000U,
+0x38428000U,
+0x3842A000U,
+0x3842C000U,
+0x3842E000U,
+0x38430000U,
+0x38432000U,
+0x38434000U,
+0x38436000U,
+0x38438000U,
+0x3843A000U,
+0x3843C000U,
+0x3843E000U,
+0x38440000U,
+0x38442000U,
+0x38444000U,
+0x38446000U,
+0x38448000U,
+0x3844A000U,
+0x3844C000U,
+0x3844E000U,
+0x38450000U,
+0x38452000U,
+0x38454000U,
+0x38456000U,
+0x38458000U,
+0x3845A000U,
+0x3845C000U,
+0x3845E000U,
+0x38460000U,
+0x38462000U,
+0x38464000U,
+0x38466000U,
+0x38468000U,
+0x3846A000U,
+0x3846C000U,
+0x3846E000U,
+0x38470000U,
+0x38472000U,
+0x38474000U,
+0x38476000U,
+0x38478000U,
+0x3847A000U,
+0x3847C000U,
+0x3847E000U,
+0x38480000U,
+0x38482000U,
+0x38484000U,
+0x38486000U,
+0x38488000U,
+0x3848A000U,
+0x3848C000U,
+0x3848E000U,
+0x38490000U,
+0x38492000U,
+0x38494000U,
+0x38496000U,
+0x38498000U,
+0x3849A000U,
+0x3849C000U,
+0x3849E000U,
+0x384A0000U,
+0x384A2000U,
+0x384A4000U,
+0x384A6000U,
+0x384A8000U,
+0x384AA000U,
+0x384AC000U,
+0x384AE000U,
+0x384B0000U,
+0x384B2000U,
+0x384B4000U,
+0x384B6000U,
+0x384B8000U,
+0x384BA000U,
+0x384BC000U,
+0x384BE000U,
+0x384C0000U,
+0x384C2000U,
+0x384C4000U,
+0x384C6000U,
+0x384C8000U,
+0x384CA000U,
+0x384CC000U,
+0x384CE000U,
+0x384D0000U,
+0x384D2000U,
+0x384D4000U,
+0x384D6000U,
+0x384D8000U,
+0x384DA000U,
+0x384DC000U,
+0x384DE000U,
+0x384E0000U,
+0x384E2000U,
+0x384E4000U,
+0x384E6000U,
+0x384E8000U,
+0x384EA000U,
+0x384EC000U,
+0x384EE000U,
+0x384F0000U,
+0x384F2000U,
+0x384F4000U,
+0x384F6000U,
+0x384F8000U,
+0x384FA000U,
+0x384FC000U,
+0x384FE000U,
+0x38500000U,
+0x38502000U,
+0x38504000U,
+0x38506000U,
+0x38508000U,
+0x3850A000U,
+0x3850C000U,
+0x3850E000U,
+0x38510000U,
+0x38512000U,
+0x38514000U,
+0x38516000U,
+0x38518000U,
+0x3851A000U,
+0x3851C000U,
+0x3851E000U,
+0x38520000U,
+0x38522000U,
+0x38524000U,
+0x38526000U,
+0x38528000U,
+0x3852A000U,
+0x3852C000U,
+0x3852E000U,
+0x38530000U,
+0x38532000U,
+0x38534000U,
+0x38536000U,
+0x38538000U,
+0x3853A000U,
+0x3853C000U,
+0x3853E000U,
+0x38540000U,
+0x38542000U,
+0x38544000U,
+0x38546000U,
+0x38548000U,
+0x3854A000U,
+0x3854C000U,
+0x3854E000U,
+0x38550000U,
+0x38552000U,
+0x38554000U,
+0x38556000U,
+0x38558000U,
+0x3855A000U,
+0x3855C000U,
+0x3855E000U,
+0x38560000U,
+0x38562000U,
+0x38564000U,
+0x38566000U,
+0x38568000U,
+0x3856A000U,
+0x3856C000U,
+0x3856E000U,
+0x38570000U,
+0x38572000U,
+0x38574000U,
+0x38576000U,
+0x38578000U,
+0x3857A000U,
+0x3857C000U,
+0x3857E000U,
+0x38580000U,
+0x38582000U,
+0x38584000U,
+0x38586000U,
+0x38588000U,
+0x3858A000U,
+0x3858C000U,
+0x3858E000U,
+0x38590000U,
+0x38592000U,
+0x38594000U,
+0x38596000U,
+0x38598000U,
+0x3859A000U,
+0x3859C000U,
+0x3859E000U,
+0x385A0000U,
+0x385A2000U,
+0x385A4000U,
+0x385A6000U,
+0x385A8000U,
+0x385AA000U,
+0x385AC000U,
+0x385AE000U,
+0x385B0000U,
+0x385B2000U,
+0x385B4000U,
+0x385B6000U,
+0x385B8000U,
+0x385BA000U,
+0x385BC000U,
+0x385BE000U,
+0x385C0000U,
+0x385C2000U,
+0x385C4000U,
+0x385C6000U,
+0x385C8000U,
+0x385CA000U,
+0x385CC000U,
+0x385CE000U,
+0x385D0000U,
+0x385D2000U,
+0x385D4000U,
+0x385D6000U,
+0x385D8000U,
+0x385DA000U,
+0x385DC000U,
+0x385DE000U,
+0x385E0000U,
+0x385E2000U,
+0x385E4000U,
+0x385E6000U,
+0x385E8000U,
+0x385EA000U,
+0x385EC000U,
+0x385EE000U,
+0x385F0000U,
+0x385F2000U,
+0x385F4000U,
+0x385F6000U,
+0x385F8000U,
+0x385FA000U,
+0x385FC000U,
+0x385FE000U,
+0x38600000U,
+0x38602000U,
+0x38604000U,
+0x38606000U,
+0x38608000U,
+0x3860A000U,
+0x3860C000U,
+0x3860E000U,
+0x38610000U,
+0x38612000U,
+0x38614000U,
+0x38616000U,
+0x38618000U,
+0x3861A000U,
+0x3861C000U,
+0x3861E000U,
+0x38620000U,
+0x38622000U,
+0x38624000U,
+0x38626000U,
+0x38628000U,
+0x3862A000U,
+0x3862C000U,
+0x3862E000U,
+0x38630000U,
+0x38632000U,
+0x38634000U,
+0x38636000U,
+0x38638000U,
+0x3863A000U,
+0x3863C000U,
+0x3863E000U,
+0x38640000U,
+0x38642000U,
+0x38644000U,
+0x38646000U,
+0x38648000U,
+0x3864A000U,
+0x3864C000U,
+0x3864E000U,
+0x38650000U,
+0x38652000U,
+0x38654000U,
+0x38656000U,
+0x38658000U,
+0x3865A000U,
+0x3865C000U,
+0x3865E000U,
+0x38660000U,
+0x38662000U,
+0x38664000U,
+0x38666000U,
+0x38668000U,
+0x3866A000U,
+0x3866C000U,
+0x3866E000U,
+0x38670000U,
+0x38672000U,
+0x38674000U,
+0x38676000U,
+0x38678000U,
+0x3867A000U,
+0x3867C000U,
+0x3867E000U,
+0x38680000U,
+0x38682000U,
+0x38684000U,
+0x38686000U,
+0x38688000U,
+0x3868A000U,
+0x3868C000U,
+0x3868E000U,
+0x38690000U,
+0x38692000U,
+0x38694000U,
+0x38696000U,
+0x38698000U,
+0x3869A000U,
+0x3869C000U,
+0x3869E000U,
+0x386A0000U,
+0x386A2000U,
+0x386A4000U,
+0x386A6000U,
+0x386A8000U,
+0x386AA000U,
+0x386AC000U,
+0x386AE000U,
+0x386B0000U,
+0x386B2000U,
+0x386B4000U,
+0x386B6000U,
+0x386B8000U,
+0x386BA000U,
+0x386BC000U,
+0x386BE000U,
+0x386C0000U,
+0x386C2000U,
+0x386C4000U,
+0x386C6000U,
+0x386C8000U,
+0x386CA000U,
+0x386CC000U,
+0x386CE000U,
+0x386D0000U,
+0x386D2000U,
+0x386D4000U,
+0x386D6000U,
+0x386D8000U,
+0x386DA000U,
+0x386DC000U,
+0x386DE000U,
+0x386E0000U,
+0x386E2000U,
+0x386E4000U,
+0x386E6000U,
+0x386E8000U,
+0x386EA000U,
+0x386EC000U,
+0x386EE000U,
+0x386F0000U,
+0x386F2000U,
+0x386F4000U,
+0x386F6000U,
+0x386F8000U,
+0x386FA000U,
+0x386FC000U,
+0x386FE000U,
+0x38700000U,
+0x38702000U,
+0x38704000U,
+0x38706000U,
+0x38708000U,
+0x3870A000U,
+0x3870C000U,
+0x3870E000U,
+0x38710000U,
+0x38712000U,
+0x38714000U,
+0x38716000U,
+0x38718000U,
+0x3871A000U,
+0x3871C000U,
+0x3871E000U,
+0x38720000U,
+0x38722000U,
+0x38724000U,
+0x38726000U,
+0x38728000U,
+0x3872A000U,
+0x3872C000U,
+0x3872E000U,
+0x38730000U,
+0x38732000U,
+0x38734000U,
+0x38736000U,
+0x38738000U,
+0x3873A000U,
+0x3873C000U,
+0x3873E000U,
+0x38740000U,
+0x38742000U,
+0x38744000U,
+0x38746000U,
+0x38748000U,
+0x3874A000U,
+0x3874C000U,
+0x3874E000U,
+0x38750000U,
+0x38752000U,
+0x38754000U,
+0x38756000U,
+0x38758000U,
+0x3875A000U,
+0x3875C000U,
+0x3875E000U,
+0x38760000U,
+0x38762000U,
+0x38764000U,
+0x38766000U,
+0x38768000U,
+0x3876A000U,
+0x3876C000U,
+0x3876E000U,
+0x38770000U,
+0x38772000U,
+0x38774000U,
+0x38776000U,
+0x38778000U,
+0x3877A000U,
+0x3877C000U,
+0x3877E000U,
+0x38780000U,
+0x38782000U,
+0x38784000U,
+0x38786000U,
+0x38788000U,
+0x3878A000U,
+0x3878C000U,
+0x3878E000U,
+0x38790000U,
+0x38792000U,
+0x38794000U,
+0x38796000U,
+0x38798000U,
+0x3879A000U,
+0x3879C000U,
+0x3879E000U,
+0x387A0000U,
+0x387A2000U,
+0x387A4000U,
+0x387A6000U,
+0x387A8000U,
+0x387AA000U,
+0x387AC000U,
+0x387AE000U,
+0x387B0000U,
+0x387B2000U,
+0x387B4000U,
+0x387B6000U,
+0x387B8000U,
+0x387BA000U,
+0x387BC000U,
+0x387BE000U,
+0x387C0000U,
+0x387C2000U,
+0x387C4000U,
+0x387C6000U,
+0x387C8000U,
+0x387CA000U,
+0x387CC000U,
+0x387CE000U,
+0x387D0000U,
+0x387D2000U,
+0x387D4000U,
+0x387D6000U,
+0x387D8000U,
+0x387DA000U,
+0x387DC000U,
+0x387DE000U,
+0x387E0000U,
+0x387E2000U,
+0x387E4000U,
+0x387E6000U,
+0x387E8000U,
+0x387EA000U,
+0x387EC000U,
+0x387EE000U,
+0x387F0000U,
+0x387F2000U,
+0x387F4000U,
+0x387F6000U,
+0x387F8000U,
+0x387FA000U,
+0x387FC000U,
+0x387FE000U,
+};
+
+const quint32 qfloat16::exponenttable[64] = {
+0,
+0x800000U,
+0x1000000U,
+0x1800000U,
+0x2000000U,
+0x2800000U,
+0x3000000U,
+0x3800000U,
+0x4000000U,
+0x4800000U,
+0x5000000U,
+0x5800000U,
+0x6000000U,
+0x6800000U,
+0x7000000U,
+0x7800000U,
+0x8000000U,
+0x8800000U,
+0x9000000U,
+0x9800000U,
+0xA000000U,
+0xA800000U,
+0xB000000U,
+0xB800000U,
+0xC000000U,
+0xC800000U,
+0xD000000U,
+0xD800000U,
+0xE000000U,
+0xE800000U,
+0xF000000U,
+0x47800000U,
+0x80000000U,
+0x80800000U,
+0x81000000U,
+0x81800000U,
+0x82000000U,
+0x82800000U,
+0x83000000U,
+0x83800000U,
+0x84000000U,
+0x84800000U,
+0x85000000U,
+0x85800000U,
+0x86000000U,
+0x86800000U,
+0x87000000U,
+0x87800000U,
+0x88000000U,
+0x88800000U,
+0x89000000U,
+0x89800000U,
+0x8A000000U,
+0x8A800000U,
+0x8B000000U,
+0x8B800000U,
+0x8C000000U,
+0x8C800000U,
+0x8D000000U,
+0x8D800000U,
+0x8E000000U,
+0x8E800000U,
+0x8F000000U,
+0xC7800000U,
+};
+
+const quint32 qfloat16::offsettable[64] = {
+0,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+0,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+1024U,
+};
+
+const quint32 qfloat16::basetable[512] = {
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x0U,
+0x1U,
+0x2U,
+0x4U,
+0x8U,
+0x10U,
+0x20U,
+0x40U,
+0x80U,
+0x100U,
+0x200U,
+0x400U,
+0x800U,
+0xC00U,
+0x1000U,
+0x1400U,
+0x1800U,
+0x1C00U,
+0x2000U,
+0x2400U,
+0x2800U,
+0x2C00U,
+0x3000U,
+0x3400U,
+0x3800U,
+0x3C00U,
+0x4000U,
+0x4400U,
+0x4800U,
+0x4C00U,
+0x5000U,
+0x5400U,
+0x5800U,
+0x5C00U,
+0x6000U,
+0x6400U,
+0x6800U,
+0x6C00U,
+0x7000U,
+0x7400U,
+0x7800U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x7C00U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8000U,
+0x8001U,
+0x8002U,
+0x8004U,
+0x8008U,
+0x8010U,
+0x8020U,
+0x8040U,
+0x8080U,
+0x8100U,
+0x8200U,
+0x8400U,
+0x8800U,
+0x8C00U,
+0x9000U,
+0x9400U,
+0x9800U,
+0x9C00U,
+0xA000U,
+0xA400U,
+0xA800U,
+0xAC00U,
+0xB000U,
+0xB400U,
+0xB800U,
+0xBC00U,
+0xC000U,
+0xC400U,
+0xC800U,
+0xCC00U,
+0xD000U,
+0xD400U,
+0xD800U,
+0xDC00U,
+0xE000U,
+0xE400U,
+0xE800U,
+0xEC00U,
+0xF000U,
+0xF400U,
+0xF800U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+0xFC00U,
+};
+
+const quint32 qfloat16::shifttable[512] = {
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x17U,
+0x16U,
+0x15U,
+0x14U,
+0x13U,
+0x12U,
+0x11U,
+0x10U,
+0xFU,
+0xEU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0xDU,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x17U,
+0x16U,
+0x15U,
+0x14U,
+0x13U,
+0x12U,
+0x11U,
+0x10U,
+0xFU,
+0xEU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0xDU,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0x18U,
+0xDU,
+};
+
+#endif // !__F16C__ && !__ARM_FP16_FORMAT_IEEE
+
+QT_END_NAMESPACE
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 78ad2a5421..4ab5bd2edb 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -47,11 +47,15 @@
 #include "qoperatingsystemversion.h"
 #include "qoperatingsystemversion_p.h"
 #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) || defined(Q_OS_WINRT)
-#include "qoperatingsystemversion_win_p.h"
-#endif
+#  include "qoperatingsystemversion_win_p.h"
+#  ifndef Q_OS_WINRT
+#    include "private/qwinregistry_p.h"
+#  endif
+#endif // Q_OS_WIN || Q_OS_CYGWIN
 #include <private/qlocale_tools_p.h>
 
 #include <qmutex.h>
+#include <QtCore/private/qlocking_p.h>
 
 #include <stdlib.h>
 #include <limits.h>
@@ -1152,12 +1156,12 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value));
     \sa QT_VERSION_STR, QLibraryInfo::version()
 */
 
-const char *qVersion() Q_DECL_NOTHROW
+const char *qVersion() noexcept
 {
     return QT_VERSION_STR;
 }
 
-bool qSharedBuild() Q_DECL_NOTHROW
+bool qSharedBuild() noexcept
 {
 #ifdef QT_SHARED
     return true;
@@ -1903,6 +1907,42 @@ bool qSharedBuild() Q_DECL_NOTHROW
 */
 
 /*!
+    \macro Q_PROCESSOR_RISCV
+    \relates <QtGlobal>
+    \since 5.13
+
+    Defined if the application is compiled for RISC-V processors. Qt currently
+    supports two RISC-V variants: \l Q_PROCESSOR_RISCV_32 and \l
+    Q_PROCESSOR_RISCV_64.
+
+    \sa QSysInfo::buildCpuArchitecture()
+*/
+
+/*!
+    \macro Q_PROCESSOR_RISCV_32
+    \relates <QtGlobal>
+    \since 5.13
+
+    Defined if the application is compiled for 32-bit RISC-V processors. The \l
+    Q_PROCESSOR_RISCV macro is also defined when Q_PROCESSOR_RISCV_32 is
+    defined.
+
+    \sa QSysInfo::buildCpuArchitecture()
+*/
+
+/*!
+    \macro Q_PROCESSOR_RISCV_64
+    \relates <QtGlobal>
+    \since 5.13
+
+    Defined if the application is compiled for 64-bit RISC-V processors. The \l
+    Q_PROCESSOR_RISCV macro is also defined when Q_PROCESSOR_RISCV_64 is
+    defined.
+
+    \sa QSysInfo::buildCpuArchitecture()
+*/
+
+/*!
     \macro Q_PROCESSOR_S390
     \relates <QtGlobal>
 
@@ -2149,12 +2189,33 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
 QT_WARNING_POP
 #endif
 
+static QString readVersionRegistryString(const wchar_t *subKey)
+{
+#if !defined(QT_BUILD_QMAKE) && !defined(Q_OS_WINRT)
+     return QWinRegistryKey(HKEY_LOCAL_MACHINE, LR"(SOFTWARE\Microsoft\Windows NT\CurrentVersion)")
+            .stringValue(subKey);
+#else
+     Q_UNUSED(subKey);
+     return QString();
+#endif
+}
+
+static inline QString windows10ReleaseId()
+{
+    return readVersionRegistryString(L"ReleaseId");
+}
+
+static inline QString windows7Build()
+{
+    return readVersionRegistryString(L"CurrentBuild");
+}
+
 static QString winSp_helper()
 {
     const auto osv = qWindowsVersionInfo();
     const qint16 major = osv.wServicePackMajor;
     if (major) {
-        QString sp = QStringLiteral(" SP ") + QString::number(major);
+        QString sp = QStringLiteral("SP ") + QString::number(major);
         const qint16 minor = osv.wServicePackMinor;
         if (minor)
             sp += QLatin1Char('.') + QString::number(minor);
@@ -2867,19 +2928,34 @@ QString QSysInfo::prettyProductName()
 {
 #if (defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)) || defined(Q_OS_DARWIN) || defined(Q_OS_WIN)
     const auto version = QOperatingSystemVersion::current();
+    const int majorVersion = version.majorVersion();
+    const QString versionString = QString::number(majorVersion) + QLatin1Char('.')
+        + QString::number(version.minorVersion());
+    QString result = version.name() + QLatin1Char(' ');
     const char *name = osVer_helper(version);
-    if (name)
-        return version.name() + QLatin1Char(' ') + QLatin1String(name)
-#    if defined(Q_OS_WIN)
-            + winSp_helper()
-#    endif
-            + QLatin1String(" (") + QString::number(version.majorVersion())
-            + QLatin1Char('.') + QString::number(version.minorVersion())
-            + QLatin1Char(')');
-      else
-        return version.name() + QLatin1Char(' ')
-            + QString::number(version.majorVersion()) + QLatin1Char('.')
-            + QString::number(version.minorVersion());
+    if (!name)
+        return result + versionString;
+    result += QLatin1String(name);
+#  if !defined(Q_OS_WIN) || defined(Q_OS_WINRT)
+    return result + QLatin1String(" (") + versionString + QLatin1Char(')');
+#  else
+    // (resembling winver.exe): Windows 10 "Windows 10 Version 1809"
+    if (majorVersion >= 10) {
+        const auto releaseId = windows10ReleaseId();
+        if (!releaseId.isEmpty())
+            result += QLatin1String(" Version ") + releaseId;
+        return result;
+    }
+    // Windows 7: "Windows 7 Version 6.1 (Build 7601: Service Pack 1)"
+    result += QLatin1String(" Version ") + versionString + QLatin1String(" (");
+    const auto build = windows7Build();
+    if (!build.isEmpty())
+        result += QLatin1String("Build ") + build;
+    const auto servicePack = winSp_helper();
+    if (!servicePack.isEmpty())
+        result += QLatin1String(": ") + servicePack;
+    return result + QLatin1Char(')');
+#  endif // Windows
 #elif defined(Q_OS_HAIKU)
     return QLatin1String("Haiku ") + productVersion();
 #elif defined(Q_OS_UNIX)
@@ -2921,6 +2997,7 @@ QString QSysInfo::machineHostName()
     struct utsname u;
     if (uname(&u) == 0)
         return QString::fromLocal8Bit(u.nodename);
+    return QString();
 #else
 #  ifdef Q_OS_WIN
     // Important: QtNetwork depends on machineHostName() initializing ws2_32.dll
@@ -2933,7 +3010,6 @@ QString QSysInfo::machineHostName()
     hostName[sizeof(hostName) - 1] = '\0';
     return QString::fromLocal8Bit(hostName);
 #endif
-    return QString();
 }
 #endif // QT_BOOTSTRAPPED
 
@@ -2998,6 +3074,7 @@ QByteArray QSysInfo::machineUniqueId()
     }
 #elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
     // Let's poke at the registry
+    // ### Qt 6: Use new helpers from qwinregistry.cpp (once bootstrap builds are obsolete)
     HKEY key = NULL;
     if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Cryptography", 0, KEY_READ | KEY_WOW64_64KEY, &key)
             == ERROR_SUCCESS) {
@@ -3224,7 +3301,7 @@ QByteArray QSysInfo::bootUniqueId()
     The Q_CHECK_PTR macro calls this function if an allocation check
     fails.
 */
-void qt_check_pointer(const char *n, int l) Q_DECL_NOTHROW
+void qt_check_pointer(const char *n, int l) noexcept
 {
     // make separate printing calls so that the first one may flush;
     // the second one could want to allocate memory (fputs prints a
@@ -3251,7 +3328,7 @@ void qBadAlloc()
    Allows you to call std::terminate() without including <exception>.
    Called internally from QT_TERMINATE_ON_EXCEPTION
 */
-Q_NORETURN void qTerminate() Q_DECL_NOTHROW
+Q_NORETURN void qTerminate() noexcept
 {
     std::terminate();
 }
@@ -3260,7 +3337,7 @@ Q_NORETURN void qTerminate() Q_DECL_NOTHROW
 /*
   The Q_ASSERT macro calls this function when the test fails.
 */
-void qt_assert(const char *assertion, const char *file, int line) Q_DECL_NOTHROW
+void qt_assert(const char *assertion, const char *file, int line) noexcept
 {
     QMessageLogger(file, line, nullptr).fatal("ASSERT: \"%s\" in file %s, line %d", assertion, file, line);
 }
@@ -3268,7 +3345,7 @@ void qt_assert(const char *assertion, const char *file, int line) Q_DECL_NOTHROW
 /*
   The Q_ASSERT_X macro calls this function when the test fails.
 */
-void qt_assert_x(const char *where, const char *what, const char *file, int line) Q_DECL_NOTHROW
+void qt_assert_x(const char *where, const char *what, const char *file, int line) noexcept
 {
     QMessageLogger(file, line, nullptr).fatal("ASSERT failure in %s: \"%s\", file %s, line %d", where, what, file, line);
 }
@@ -3315,7 +3392,7 @@ static QBasicMutex environmentMutex;
 */
 void qTzSet()
 {
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
 #if defined(Q_OS_WIN)
     _tzset();
 #else
@@ -3329,7 +3406,7 @@ void qTzSet()
 */
 time_t qMkTime(struct tm *when)
 {
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
     return mktime(when);
 }
 
@@ -3361,7 +3438,7 @@ time_t qMkTime(struct tm *when)
 */
 QByteArray qgetenv(const char *varName)
 {
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
 #ifdef Q_CC_MSVC
     size_t requiredSize = 0;
     QByteArray buffer;
@@ -3429,7 +3506,7 @@ QByteArray qgetenv(const char *varName)
 QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
 {
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
     QVarLengthArray<wchar_t, 32> wname(int(strlen(varName)) + 1);
     for (int i = 0; i < wname.size(); ++i) // wname.size() is correct: will copy terminating null
         wname[i] = uchar(varName[i]);
@@ -3475,9 +3552,9 @@ QString qEnvironmentVariable(const char *varName)
 
     \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsSet()
 */
-bool qEnvironmentVariableIsEmpty(const char *varName) Q_DECL_NOEXCEPT
+bool qEnvironmentVariableIsEmpty(const char *varName) noexcept
 {
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
 #ifdef Q_CC_MSVC
     // we provide a buffer that can only hold the empty string, so
     // when the env.var isn't empty, we'll get an ERANGE error (buffer
@@ -3510,13 +3587,13 @@ bool qEnvironmentVariableIsEmpty(const char *varName) Q_DECL_NOEXCEPT
 
     \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsSet()
 */
-int qEnvironmentVariableIntValue(const char *varName, bool *ok) Q_DECL_NOEXCEPT
+int qEnvironmentVariableIntValue(const char *varName, bool *ok) noexcept
 {
     static const int NumBinaryDigitsPerOctalDigit = 3;
     static const int MaxDigitsForOctalInt =
         (std::numeric_limits<uint>::digits + NumBinaryDigitsPerOctalDigit - 1) / NumBinaryDigitsPerOctalDigit;
 
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
 #ifdef Q_CC_MSVC
     // we provide a buffer that can hold any int value:
     char buffer[MaxDigitsForOctalInt + 2]; // +1 for NUL +1 for optional '-'
@@ -3579,15 +3656,15 @@ int qEnvironmentVariableIntValue(const char *varName, bool *ok) Q_DECL_NOEXCEPT
 
     \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsEmpty()
 */
-bool qEnvironmentVariableIsSet(const char *varName) Q_DECL_NOEXCEPT
+bool qEnvironmentVariableIsSet(const char *varName) noexcept
 {
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
 #ifdef Q_CC_MSVC
     size_t requiredSize = 0;
     (void)getenv_s(&requiredSize, 0, 0, varName);
     return requiredSize != 0;
 #else
-    return ::getenv(varName) != 0;
+    return ::getenv(varName) != nullptr;
 #endif
 }
 
@@ -3611,7 +3688,7 @@ bool qEnvironmentVariableIsSet(const char *varName) Q_DECL_NOEXCEPT
 */
 bool qputenv(const char *varName, const QByteArray& value)
 {
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
 #if defined(Q_CC_MSVC)
     return _putenv_s(varName, value.constData()) == 0;
 #elif (defined(_POSIX_VERSION) && (_POSIX_VERSION-0) >= 200112L) || defined(Q_OS_HAIKU)
@@ -3642,7 +3719,7 @@ bool qputenv(const char *varName, const QByteArray& value)
 */
 bool qunsetenv(const char *varName)
 {
-    QMutexLocker locker(&environmentMutex);
+    const auto locker = qt_scoped_lock(environmentMutex);
 #if defined(Q_CC_MSVC)
     return _putenv_s(varName, "") == 0;
 #elif (defined(_POSIX_VERSION) && (_POSIX_VERSION-0) >= 200112L) || defined(Q_OS_BSD4) || defined(Q_OS_HAIKU)
@@ -3781,6 +3858,56 @@ bool qunsetenv(const char *varName)
 */
 
 /*!
+    \fn template <typename T, typename U = T> T qExchange(T &obj, U &&newValue)
+    \relates <QtGlobal>
+    \since 5.14
+
+    Replaces the value of \a obj with \a newValue and returns the old value of \a obj.
+
+    This is Qt's implementation of std::exchange(). It differs from std::exchange()
+    only in that it is \c constexpr already in C++14, and available on all supported
+    compilers.
+
+    Here is how to use qExchange() to implement move constructors:
+    \code
+    MyClass(MyClass &&other)
+      : m_pointer{qExchange(other.m_pointer, nullptr)},
+        m_int{qExchange(other.m_int, 0)},
+        m_vector{std::move(other.m_vector)},
+        ...
+    \endcode
+
+    For members of class type, we can use std::move(), as their move-constructor will
+    do the right thing. But for scalar types such as raw pointers or integer type, move
+    is the same as copy, which, particularly for pointers, is not what we expect. So, we
+    cannot use std::move() for such types, but we can use std::exchange()/qExchange() to
+    make sure the source object's member is already reset by the time we get to the
+    initialization of our next data member, which might come in handy if the constructor
+    exits with an exception.
+
+    Here is how to use qExchange() to write a loop that consumes the collection it
+    iterates over:
+    \code
+    for (auto &e : qExchange(collection, {})
+        doSomethingWith(e);
+    \endcode
+
+    Which is equivalent to the following, much more verbose code:
+    \code
+    {
+        auto tmp = std::move(collection);
+        collection = {};                    // or collection.clear()
+        for (auto &e : tmp)
+            doSomethingWith(e);
+    }                                       // destroys 'tmp'
+    \endcode
+
+    This is perfectly safe, as the for-loop keeps the result of qExchange() alive for as
+    long as the loop runs, saving the declaration of a temporary variable. Be aware, though,
+    that qExchange() returns a non-const object, so Qt containers may detach.
+*/
+
+/*!
     \macro QT_TR_NOOP(sourceText)
     \relates <QtGlobal>
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 223ebbcabe..1e26e9453a 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2016 Intel Corporation.
+** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2019 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -307,6 +307,14 @@ typedef double qreal;
 #  define QT_DEPRECATED_CONSTRUCTOR
 #endif
 
+#ifndef QT_DEPRECATED_WARNINGS_SINCE
+# ifdef QT_DISABLE_DEPRECATED_BEFORE
+#  define QT_DEPRECATED_WARNINGS_SINCE QT_DISABLE_DEPRECATED_BEFORE
+# else
+#  define QT_DEPRECATED_WARNINGS_SINCE QT_VERSION
+# endif
+#endif
+
 #ifndef QT_DISABLE_DEPRECATED_BEFORE
 #define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(5, 0, 0)
 #endif
@@ -330,6 +338,59 @@ typedef double qreal;
 #endif
 
 /*
+  QT_DEPRECATED_VERSION(major, minor) and QT_DEPRECATED_VERSION_X(major, minor, text)
+  outputs a deprecation warning if QT_DEPRECATED_WARNINGS_SINCE is equal or greater
+  than the version specified as major, minor. This makes it possible to deprecate a
+  function without annoying a user who needs to stick at a specified minimum version
+  and therefore can't use the new function.
+*/
+#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 12, 0)
+# define QT_DEPRECATED_VERSION_X_5_12(text) QT_DEPRECATED_X(text)
+# define QT_DEPRECATED_VERSION_5_12         QT_DEPRECATED
+#else
+# define QT_DEPRECATED_VERSION_X_5_12(text)
+# define QT_DEPRECATED_VERSION_5_12
+#endif
+
+#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 13, 0)
+# define QT_DEPRECATED_VERSION_X_5_13(text) QT_DEPRECATED_X(text)
+# define QT_DEPRECATED_VERSION_5_13         QT_DEPRECATED
+#else
+# define QT_DEPRECATED_VERSION_X_5_13(text)
+# define QT_DEPRECATED_VERSION_5_13
+#endif
+
+#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 14, 0)
+# define QT_DEPRECATED_VERSION_X_5_14(text) QT_DEPRECATED_X(text)
+# define QT_DEPRECATED_VERSION_5_14         QT_DEPRECATED
+#else
+# define QT_DEPRECATED_VERSION_X_5_14(text)
+# define QT_DEPRECATED_VERSION_5_14
+#endif
+
+#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 15, 0)
+# define QT_DEPRECATED_VERSION_X_5_15(text) QT_DEPRECATED_X(text)
+# define QT_DEPRECATED_VERSION_5_15         QT_DEPRECATED
+#else
+# define QT_DEPRECATED_VERSION_X_5_15(text)
+# define QT_DEPRECATED_VERSION_5_15
+#endif
+
+#define QT_DEPRECATED_VERSION_X_5(minor, text)      QT_DEPRECATED_VERSION_X_5_##minor(text)
+#define QT_DEPRECATED_VERSION_X(major, minor, text) QT_DEPRECATED_VERSION_X_##major(minor, text)
+
+#define QT_DEPRECATED_VERSION_5(minor)      QT_DEPRECATED_VERSION_5_##minor
+#define QT_DEPRECATED_VERSION(major, minor) QT_DEPRECATED_VERSION_##major(minor)
+
+#ifdef __cplusplus
+// A tag to help mark stuff deprecated (cf. QStringViewLiteral)
+namespace QtPrivate {
+enum class Deprecated_t {};
+constexpr Q_DECL_UNUSED Deprecated_t Deprecated = {};
+}
+#endif
+
+/*
    The Qt modules' export macros.
    The options are:
     - defined(QT_STATIC): Qt was built or is being built in static mode
@@ -369,8 +430,8 @@ typedef double qreal;
    operator to disable copying (the compiler gives an error message).
 */
 #define Q_DISABLE_COPY(Class) \
-    Class(const Class &) Q_DECL_EQ_DELETE;\
-    Class &operator=(const Class &) Q_DECL_EQ_DELETE;
+    Class(const Class &) = delete;\
+    Class &operator=(const Class &) = delete;
 
 #define Q_DISABLE_MOVE(Class) \
     Class(Class &&) = delete; \
@@ -411,7 +472,7 @@ typedef double qreal;
 #if !defined(QT_NAMESPACE) && defined(__cplusplus) && !defined(Q_QDOC)
 extern "C"
 #endif
-Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOTHROW;
+Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOEXCEPT;
 
 #if defined(__cplusplus)
 
@@ -456,11 +517,8 @@ namespace QtPrivate {
 
     template <class T> struct AlignOf : AlignOf_Default<T> { };
     template <class T> struct AlignOf<T &> : AlignOf<T> {};
-    template <size_t N, class T> struct AlignOf<T[N]> : AlignOf<T> {};
-
-#ifdef Q_COMPILER_RVALUE_REFS
     template <class T> struct AlignOf<T &&> : AlignOf<T> {};
-#endif
+    template <size_t N, class T> struct AlignOf<T[N]> : AlignOf<T> {};
 
 #if defined(Q_PROCESSOR_X86_32) && !defined(Q_OS_WIN)
     template <class T> struct AlignOf_WorkaroundForI386Abi { enum { Value = sizeof(T) }; };
@@ -562,7 +620,8 @@ using qsizetype = QIntegerForSizeof<std::size_t>::Signed;
 #  define Q_ALWAYS_INLINE inline
 #endif
 
-#if defined(Q_CC_GNU) && defined(Q_OS_WIN)
+#if defined(Q_CC_GNU) && defined(Q_OS_WIN) && !defined(QT_NO_DATA_RELOCATION)
+// ### Qt6: you can remove me
 #  define QT_INIT_METAOBJECT __attribute__((init_priority(101)))
 #else
 #  define QT_INIT_METAOBJECT
@@ -730,7 +789,7 @@ inline void qt_noop(void) {}
 #  define QT_CATCH(A) catch (A)
 #  define QT_THROW(A) throw A
 #  define QT_RETHROW throw
-Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() Q_DECL_NOTHROW;
+Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() noexcept;
 #  ifdef Q_COMPILER_NOEXCEPT
 #    define QT_TERMINATE_ON_EXCEPTION(expr) do { expr; } while (false)
 #  else
@@ -738,7 +797,7 @@ Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() Q_DECL_NOTHROW;
 #  endif
 #endif
 
-Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() Q_DECL_NOTHROW;
+Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept;
 
 #ifndef Q_OUTOFLINE_TEMPLATE
 #  define Q_OUTOFLINE_TEMPLATE
@@ -781,7 +840,7 @@ Q_CORE_EXPORT QString qt_error_string(int errorCode = -1);
 Q_NORETURN
 #endif
 Q_DECL_COLD_FUNCTION
-Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line) Q_DECL_NOTHROW;
+Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line) noexcept;
 
 #if !defined(Q_ASSERT)
 #  if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
@@ -791,15 +850,11 @@ Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line)
 #  endif
 #endif
 
-#if defined(QT_NO_DEBUG) && !defined(QT_PAINT_DEBUG)
-#define QT_NO_PAINT_DEBUG
-#endif
-
 #ifndef Q_CC_MSVC
 Q_NORETURN
 #endif
 Q_DECL_COLD_FUNCTION
-Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *file, int line) Q_DECL_NOTHROW;
+Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *file, int line) noexcept;
 
 #if !defined(Q_ASSERT_X)
 #  if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
@@ -809,7 +864,7 @@ Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *
 #  endif
 #endif
 
-Q_NORETURN Q_CORE_EXPORT void qt_check_pointer(const char *, int) Q_DECL_NOTHROW;
+Q_NORETURN Q_CORE_EXPORT void qt_check_pointer(const char *, int) noexcept;
 Q_DECL_COLD_FUNCTION
 Q_CORE_EXPORT void qBadAlloc();
 
@@ -852,38 +907,23 @@ Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline Q_DECL_UNUSED  bool qFuzzyIsNul
     return qAbs(f) <= 0.00001f;
 }
 
-/*
-   This function tests a double for a null value. It doesn't
-   check whether the actual value is 0 or close to 0, but whether
-   it is binary 0, disregarding sign.
-*/
-Q_REQUIRED_RESULT static inline Q_DECL_UNUSED bool qIsNull(double d)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
+QT_WARNING_DISABLE_GCC("-Wfloat-equal")
+QT_WARNING_DISABLE_INTEL(1572)
+
+Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline Q_DECL_UNUSED bool qIsNull(double d) noexcept
 {
-    union U {
-        double d;
-        quint64 u;
-    };
-    U val;
-    val.d = d;
-    return (val.u & Q_UINT64_C(0x7fffffffffffffff)) == 0;
+    return d == 0.0;
 }
 
-/*
-   This function tests a float for a null value. It doesn't
-   check whether the actual value is 0 or close to 0, but whether
-   it is binary 0, disregarding sign.
-*/
-Q_REQUIRED_RESULT static inline Q_DECL_UNUSED bool qIsNull(float f)
+Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline Q_DECL_UNUSED bool qIsNull(float f) noexcept
 {
-    union U {
-        float f;
-        quint32 u;
-    };
-    U val;
-    val.f = f;
-    return (val.u & 0x7fffffff) == 0;
+    return f == 0.0f;
 }
 
+QT_WARNING_POP
+
 /*
    Compilers which follow outdated template instantiation rules
    require a class to have a comparison operator to exist when
@@ -910,14 +950,14 @@ namespace SwapExceptionTester { // insulate users from the "using std::swap" bel
     using std::swap; // import std::swap
     template <typename T>
     void checkSwap(T &t)
-        Q_DECL_NOEXCEPT_EXPR(noexcept(swap(t, t)));
+        noexcept(noexcept(swap(t, t)));
     // declared, but not implemented (only to be used in unevaluated contexts (noexcept operator))
 }
 } // namespace QtPrivate
 
 template <typename T>
 inline void qSwap(T &value1, T &value2)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(QtPrivate::SwapExceptionTester::checkSwap(value1)))
+    noexcept(noexcept(QtPrivate::SwapExceptionTester::checkSwap(value1)))
 {
     using std::swap;
     swap(value1, value2);
@@ -966,12 +1006,44 @@ QT_WARNING_DISABLE_MSVC(4530) /* C++ exception handler used, but unwind semantic
 #  endif
 #endif
 
+// Work around MSVC warning about use of 3-arg algorithms
+// until we can depend on the C++14 4-arg ones.
+//
+// These algortithms do NOT check for equal length.
+// They need to be treated as if they called the 3-arg version (which they do)!
+#ifdef Q_CC_MSVC
+# define QT_3ARG_ALG(alg, f1, l1, f2, l2) \
+    std::alg(f1, l1, f2, l2)
+#else
+# define QT_3ARG_ALG(alg, f1, l1, f2, l2)     \
+    [&f1, &l1, &f2, &l2]() {                  \
+        Q_UNUSED(l2);                         \
+        return std::alg(f1, l1, f2);          \
+    }()
+#endif
+template <typename ForwardIterator1, typename ForwardIterator2>
+inline bool qt_is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
+                              ForwardIterator2 first2, ForwardIterator2 last2)
+{
+    return QT_3ARG_ALG(is_permutation, first1, last1, first2, last2);
+}
+#undef QT_3ARG_ALG
+
 // this adds const to non-const objects (like std::as_const)
 template <typename T>
-Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
+Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; }
 // prevent rvalue arguments:
 template <typename T>
-void qAsConst(const T &&) Q_DECL_EQ_DELETE;
+void qAsConst(const T &&) = delete;
+
+// like std::exchange
+template <typename T, typename U = T>
+Q_DECL_RELAXED_CONSTEXPR T qExchange(T &t, U &&newValue)
+{
+    T old = std::move(t);
+    t = std::forward<U>(newValue);
+    return old;
+}
 
 #ifndef QT_NO_FOREACH
 
@@ -1052,7 +1124,7 @@ for (auto _container_ = QtPrivate::qMakeForeachContainer(container); \
 #endif
 
 template <typename T> inline T *qGetPtrHelper(T *ptr) { return ptr; }
-template <typename Ptr> inline auto qGetPtrHelper(const Ptr &ptr) -> decltype(ptr.operator->()) { return ptr.operator->(); }
+template <typename Ptr> inline auto qGetPtrHelper(Ptr &ptr) -> decltype(ptr.operator->()) { return ptr.operator->(); }
 
 // The body must be a statement:
 #define Q_CAST_IGNORE_ALIGN(body) QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wcast-align") body QT_WARNING_POP
@@ -1130,11 +1202,11 @@ template <typename... Args>
 struct QNonConstOverload
 {
     template <typename R, typename T>
-    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr)
+    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const noexcept -> decltype(ptr)
     { return ptr; }
 
     template <typename R, typename T>
-    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
+    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) noexcept -> decltype(ptr)
     { return ptr; }
 };
 
@@ -1142,11 +1214,11 @@ template <typename... Args>
 struct QConstOverload
 {
     template <typename R, typename T>
-    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const Q_DECL_NOTHROW -> decltype(ptr)
+    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const noexcept -> decltype(ptr)
     { return ptr; }
 
     template <typename R, typename T>
-    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) Q_DECL_NOTHROW -> decltype(ptr)
+    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) noexcept -> decltype(ptr)
     { return ptr; }
 };
 
@@ -1159,11 +1231,11 @@ struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...>
     using QNonConstOverload<Args...>::operator();
 
     template <typename R>
-    Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr)
+    Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const noexcept -> decltype(ptr)
     { return ptr; }
 
     template <typename R>
-    static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
+    static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) noexcept -> decltype(ptr)
     { return ptr; }
 };
 
@@ -1184,9 +1256,9 @@ Q_CORE_EXPORT QString qEnvironmentVariable(const char *varName, const QString &d
 Q_CORE_EXPORT bool qputenv(const char *varName, const QByteArray& value);
 Q_CORE_EXPORT bool qunsetenv(const char *varName);
 
-Q_CORE_EXPORT bool qEnvironmentVariableIsEmpty(const char *varName) Q_DECL_NOEXCEPT;
-Q_CORE_EXPORT bool qEnvironmentVariableIsSet(const char *varName) Q_DECL_NOEXCEPT;
-Q_CORE_EXPORT int  qEnvironmentVariableIntValue(const char *varName, bool *ok=nullptr) Q_DECL_NOEXCEPT;
+Q_CORE_EXPORT bool qEnvironmentVariableIsEmpty(const char *varName) noexcept;
+Q_CORE_EXPORT bool qEnvironmentVariableIsSet(const char *varName) noexcept;
+Q_CORE_EXPORT int  qEnvironmentVariableIntValue(const char *varName, bool *ok=nullptr) noexcept;
 
 inline int qIntCast(double f) { return int(f); }
 inline int qIntCast(float f) { return int(f); }
diff --git a/src/corelib/global/qglobalstatic.h b/src/corelib/global/qglobalstatic.h
index 555bdf04c1..e56fe1dbcb 100644
--- a/src/corelib/global/qglobalstatic.h
+++ b/src/corelib/global/qglobalstatic.h
@@ -79,16 +79,16 @@ enum GuardValues {
     Q_GLOBAL_STATIC_INTERNAL_DECORATION Type *innerFunction()   \
     {                                                           \
         struct HolderBase {                                     \
-            ~HolderBase() Q_DECL_NOTHROW                        \
-            { if (guard.load() == QtGlobalStatic::Initialized)  \
-                  guard.store(QtGlobalStatic::Destroyed); }     \
+            ~HolderBase() noexcept                        \
+            { if (guard.loadRelaxed() == QtGlobalStatic::Initialized)  \
+                  guard.storeRelaxed(QtGlobalStatic::Destroyed); }     \
         };                                                      \
         static struct Holder : public HolderBase {              \
             Type value;                                         \
             Holder()                                            \
-                Q_DECL_NOEXCEPT_EXPR(noexcept(Type ARGS))       \
+                noexcept(noexcept(Type ARGS))       \
                 : value ARGS                                    \
-            { guard.store(QtGlobalStatic::Initialized); }       \
+            { guard.storeRelaxed(QtGlobalStatic::Initialized); }       \
         } holder;                                               \
         return &holder.value;                                   \
     }
@@ -98,6 +98,7 @@ enum GuardValues {
 
 QT_END_NAMESPACE
 #include <QtCore/qmutex.h>
+#include <mutex>
 QT_BEGIN_NAMESPACE
 
 #define Q_GLOBAL_STATIC_INTERNAL(ARGS)                                  \
@@ -107,13 +108,13 @@ QT_BEGIN_NAMESPACE
         static QBasicMutex mutex;                                       \
         int x = guard.loadAcquire();                                    \
         if (Q_UNLIKELY(x >= QtGlobalStatic::Uninitialized)) {           \
-            QMutexLocker locker(&mutex);                                \
-            if (guard.load() == QtGlobalStatic::Uninitialized) {        \
+            const std::lock_guard<QBasicMutex> locker(mutex);           \
+            if (guard.loadRelaxed() == QtGlobalStatic::Uninitialized) {        \
                 d = new Type ARGS;                                      \
                 static struct Cleanup {                                 \
                     ~Cleanup() {                                        \
                         delete d;                                       \
-                        guard.store(QtGlobalStatic::Destroyed);         \
+                        guard.storeRelaxed(QtGlobalStatic::Destroyed);         \
                     }                                                   \
                 } cleanup;                                              \
                 guard.storeRelease(QtGlobalStatic::Initialized);        \
@@ -129,10 +130,10 @@ struct QGlobalStatic
 {
     typedef T Type;
 
-    bool isDestroyed() const { return guard.load() <= QtGlobalStatic::Destroyed; }
-    bool exists() const { return guard.load() == QtGlobalStatic::Initialized; }
-    operator Type *() { if (isDestroyed()) return 0; return innerFunction(); }
-    Type *operator()() { if (isDestroyed()) return 0; return innerFunction(); }
+    bool isDestroyed() const { return guard.loadRelaxed() <= QtGlobalStatic::Destroyed; }
+    bool exists() const { return guard.loadRelaxed() == QtGlobalStatic::Initialized; }
+    operator Type *() { if (isDestroyed()) return nullptr; return innerFunction(); }
+    Type *operator()() { if (isDestroyed()) return nullptr; return innerFunction(); }
     Type *operator->()
     {
       Q_ASSERT_X(!isDestroyed(), "Q_GLOBAL_STATIC", "The global static was used after being destroyed");
diff --git a/src/corelib/global/qhooks.cpp b/src/corelib/global/qhooks.cpp
index bbddb1cbf1..79f9b7d6c2 100644
--- a/src/corelib/global/qhooks.cpp
+++ b/src/corelib/global/qhooks.cpp
@@ -67,7 +67,7 @@ quintptr Q_CORE_EXPORT qtHookData[] = {
     // The required sizes and offsets are tested in tests/auto/other/toolsupport.
     // When this fails and the change was intentional, adjust the test and
     // adjust this value here.
-    16
+    18
 };
 
 Q_STATIC_ASSERT(QHooks::LastHookIndex == sizeof(qtHookData) / sizeof(qtHookData[0]));
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index f2ada4ab30..8bcf67e73d 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -55,15 +55,24 @@ QT_END_NAMESPACE
 # include "qcoreapplication.h"
 #endif
 
+#ifndef QT_BUILD_QMAKE_BOOTSTRAP
+#  include "private/qglobal_p.h"
+#  include "qconfig.cpp"
+#endif
+
 #ifdef Q_OS_DARWIN
 #  include "private/qcore_mac_p.h"
-#endif
+#endif // Q_OS_DARWIN
 
-#ifndef QT_BUILD_QMAKE_BOOTSTRAP
-# include "qconfig.cpp"
+#include "archdetect.cpp"
+
+#if !defined(QT_BUILD_QMAKE) && QT_CONFIG(relocatable) && QT_CONFIG(dlopen) && !QT_CONFIG(framework)
+#  include <dlfcn.h>
 #endif
 
-#include "archdetect.cpp"
+#if !defined(QT_BUILD_QMAKE) && QT_CONFIG(relocatable) && defined(Q_OS_WIN)
+#  include <qt_windows.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -352,7 +361,7 @@ QLibraryInfo::buildDate()
   \since 5.3
 */
 
-const char *QLibraryInfo::build() Q_DECL_NOTHROW
+const char *QLibraryInfo::build() noexcept
 {
     return QT_BUILD_STR;
 }
@@ -379,7 +388,7 @@ QLibraryInfo::isDebugBuild()
 
     \sa qVersion()
 */
-QVersionNumber QLibraryInfo::version() Q_DECL_NOTHROW
+QVersionNumber QLibraryInfo::version() noexcept
 {
     return QVersionNumber(QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH);
 }
@@ -453,6 +462,180 @@ void QLibraryInfo::sysrootify(QString *path)
 }
 #endif // QT_BUILD_QMAKE
 
+#ifndef QT_BUILD_QMAKE
+static QString prefixFromAppDirHelper()
+{
+    QString appDir;
+
+    if (QCoreApplication::instance()) {
+#ifdef Q_OS_DARWIN
+        CFBundleRef bundleRef = CFBundleGetMainBundle();
+        if (bundleRef) {
+            QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
+            if (urlRef) {
+                QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
+#ifdef Q_OS_MACOS
+                QString bundleContentsDir = QString(path) + QLatin1String("/Contents/");
+                if (QDir(bundleContentsDir).exists())
+                    return QDir::cleanPath(bundleContentsDir);
+#else
+                return QDir::cleanPath(QString(path)); // iOS
+#endif // Q_OS_MACOS
+            }
+        }
+#endif // Q_OS_DARWIN
+        // We make the prefix path absolute to the executable's directory.
+        appDir = QCoreApplication::applicationDirPath();
+    } else {
+        appDir = QDir::currentPath();
+    }
+
+    return appDir;
+}
+#endif
+
+#if !defined(QT_BUILD_QMAKE) && QT_CONFIG(relocatable)
+#if !defined(QT_STATIC) && !(defined(Q_OS_DARWIN) && QT_CONFIG(framework)) \
+        && (QT_CONFIG(dlopen) || defined(Q_OS_WIN))
+static QString prefixFromQtCoreLibraryHelper(const QString &qtCoreLibraryPath)
+{
+    const QString qtCoreLibrary = QDir::fromNativeSeparators(qtCoreLibraryPath);
+    const QString libDir = QFileInfo(qtCoreLibrary).absolutePath();
+    const QString prefixDir = libDir + QLatin1Char('/')
+            + QLatin1String(QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH);
+    return QDir::cleanPath(prefixDir);
+}
+#endif
+
+#if defined(Q_OS_WIN)
+#if defined(Q_OS_WINRT)
+EXTERN_C IMAGE_DOS_HEADER __ImageBase;
+static HMODULE getWindowsModuleHandle()
+{
+    return reinterpret_cast<HMODULE>(&__ImageBase);
+}
+#else  // Q_OS_WINRT
+static HMODULE getWindowsModuleHandle()
+{
+    HMODULE hModule = NULL;
+    GetModuleHandleEx(
+        GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+        (LPCTSTR)&QLibraryInfo::isDebugBuild, &hModule);
+    return hModule;
+}
+#endif // !Q_OS_WINRT
+#endif // Q_OS_WIN
+
+static QString getRelocatablePrefix()
+{
+    QString prefixPath;
+
+    // For static builds, the prefix will be the app directory.
+    // For regular builds, the prefix will be relative to the location of the QtCore shared library.
+#if defined(QT_STATIC)
+    prefixPath = prefixFromAppDirHelper();
+#elif defined(Q_OS_DARWIN) && QT_CONFIG(framework)
+    CFBundleRef qtCoreBundle = CFBundleGetBundleWithIdentifier(
+            CFSTR("org.qt-project.QtCore"));
+    Q_ASSERT(qtCoreBundle);
+
+    QCFType<CFURLRef> qtCorePath = CFBundleCopyBundleURL(qtCoreBundle);
+    Q_ASSERT(qtCorePath);
+
+    QCFType<CFURLRef> qtCorePathAbsolute = CFURLCopyAbsoluteURL(qtCorePath);
+    Q_ASSERT(qtCorePathAbsolute);
+
+    QCFType<CFURLRef> libDirCFPath = CFURLCreateCopyDeletingLastPathComponent(NULL, qtCorePathAbsolute);
+
+    const QCFString libDirCFString = CFURLCopyFileSystemPath(libDirCFPath, kCFURLPOSIXPathStyle);
+
+    const QString prefixDir = QString(libDirCFString) + QLatin1Char('/')
+        + QLatin1String(QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH);
+
+    prefixPath = QDir::cleanPath(prefixDir);
+#elif QT_CONFIG(dlopen)
+    Dl_info info;
+    int result = dladdr(reinterpret_cast<void *>(&QLibraryInfo::isDebugBuild), &info);
+    if (result > 0 && info.dli_fname)
+        prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLatin1(info.dli_fname));
+#elif defined(Q_OS_WIN)
+    HMODULE hModule = getWindowsModuleHandle();
+    const int kBufferSize = 4096;
+    wchar_t buffer[kBufferSize];
+    const int pathSize = GetModuleFileName(hModule, buffer, kBufferSize);
+    if (pathSize > 0)
+        prefixPath = prefixFromQtCoreLibraryHelper(QString::fromWCharArray(buffer, pathSize));
+#else
+#error "The chosen platform / config does not support querying for a dynamic prefix."
+#endif
+
+#if defined(Q_OS_LINUX) && !defined(QT_STATIC) && defined(__GLIBC__)
+    // QTBUG-78948: libQt5Core.so may be located in subdirectories below libdir.
+    // See "Hardware capabilities" in the ld.so documentation and the Qt 5.3.0
+    // changelog regarding SSE2 support.
+    const QString libdir = QString::fromLatin1(
+        qt_configure_strs + qt_configure_str_offsets[QLibraryInfo::LibrariesPath - 1]);
+    QDir prefixDir(prefixPath);
+    while (!prefixDir.exists(libdir)) {
+        prefixDir.cdUp();
+        prefixPath = prefixDir.absolutePath();
+        if (prefixDir.isRoot()) {
+            prefixPath.clear();
+            break;
+        }
+    }
+#endif
+
+    Q_ASSERT_X(!prefixPath.isEmpty(), "getRelocatablePrefix",
+                                      "Failed to find the Qt prefix path.");
+    return prefixPath;
+}
+#endif
+
+#if defined(QT_BUILD_QMAKE) && !defined(QT_BUILD_QMAKE_BOOTSTRAP)
+QString qmake_abslocation();
+
+static QString getPrefixFromHostBinDir(const char *hostBinDirToPrefixPath)
+{
+    const QFileInfo qmfi = QFileInfo(qmake_abslocation()).canonicalFilePath();
+    return QDir::cleanPath(qmfi.absolutePath() + QLatin1Char('/')
+                           + QLatin1String(hostBinDirToPrefixPath));
+}
+
+static QString getExtPrefixFromHostBinDir()
+{
+    return getPrefixFromHostBinDir(QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH);
+}
+
+static QString getHostPrefixFromHostBinDir()
+{
+    return getPrefixFromHostBinDir(QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH);
+}
+#endif
+
+#ifndef QT_BUILD_QMAKE_BOOTSTRAP
+static const char *getPrefix(
+#ifdef QT_BUILD_QMAKE
+        QLibraryInfo::PathGroup group
+#endif
+        )
+{
+#if defined(QT_BUILD_QMAKE)
+#  if QT_CONFIGURE_CROSSBUILD
+    if (group == QLibraryInfo::DevicePaths)
+        return QT_CONFIGURE_PREFIX_PATH;
+#  endif
+    static QByteArray extPrefixPath = getExtPrefixFromHostBinDir().toLatin1();
+    return extPrefixPath.constData();
+#elif QT_CONFIG(relocatable)
+    static QByteArray prefixPath = getRelocatablePrefix().toLatin1();
+    return prefixPath.constData();
+#else
+    return QT_CONFIGURE_PREFIX_PATH;
+#endif
+}
+#endif // QT_BUILD_QMAKE_BOOTSTRAP
+
 /*!
   Returns the location specified by \a loc.
 */
@@ -564,12 +747,11 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
     if (!fromConf) {
         const char * volatile path = 0;
         if (loc == PrefixPath) {
-            path =
-# ifdef QT_BUILD_QMAKE
-                (group != DevicePaths) ?
-                    QT_CONFIGURE_EXT_PREFIX_PATH :
-# endif
-                    QT_CONFIGURE_PREFIX_PATH;
+            path = getPrefix(
+#ifdef QT_BUILD_QMAKE
+                        group
+#endif
+                   );
         } else if (unsigned(loc) <= sizeof(qt_configure_str_offsets)/sizeof(qt_configure_str_offsets[0])) {
             path = qt_configure_strs + qt_configure_str_offsets[loc - 1];
 #ifndef Q_OS_WIN // On Windows we use the registry
@@ -578,7 +760,8 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
 #endif
 # ifdef QT_BUILD_QMAKE
         } else if (loc == HostPrefixPath) {
-            path = QT_CONFIGURE_HOST_PREFIX_PATH;
+            static const QByteArray hostPrefixPath = getHostPrefixFromHostBinDir().toLatin1();
+            path = hostPrefixPath.constData();
 # endif
         }
 
@@ -612,28 +795,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
         }
 #else
         if (loc == PrefixPath) {
-            if (QCoreApplication::instance()) {
-#ifdef Q_OS_DARWIN
-                CFBundleRef bundleRef = CFBundleGetMainBundle();
-                if (bundleRef) {
-                    QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
-                    if (urlRef) {
-                        QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
-#ifdef Q_OS_OSX
-                        QString bundleContentsDir = QString(path) + QLatin1String("/Contents/");
-                        if (QDir(bundleContentsDir).exists())
-                            return QDir::cleanPath(bundleContentsDir + ret);
-#else
-                        return QDir::cleanPath(QString(path) + QLatin1Char('/') + ret); // iOS
-#endif // Q_OS_OSX
-                    }
-                }
-#endif // Q_OS_DARWIN
-                // We make the prefix path absolute to the executable's directory.
-                baseDir = QCoreApplication::applicationDirPath();
-            } else {
-                baseDir = QDir::currentPath();
-            }
+            baseDir = prefixFromAppDirHelper();
         } else {
             // we make any other path absolute to the prefix directory
             baseDir = location(PrefixPath);
@@ -732,11 +894,6 @@ void qt_core_boilerplate()
 
     QT_PREPEND_NAMESPACE(qDumpCPUFeatures)();
 
-#ifdef QT_EVAL
-    extern void qt_core_eval_init(QCoreApplicationPrivate::Type);
-    qt_core_eval_init(QCoreApplicationPrivate::Tty);
-#endif
-
     exit(0);
 }
 
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index 9414af9b7d..ed60b170a5 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -62,12 +62,12 @@ public:
 #endif // QT_DEPRECATED_SINCE(5, 5)
 #endif // datestring
 
-    static const char * build() Q_DECL_NOTHROW;
+    static const char * build() noexcept;
 
     static bool isDebugBuild();
 
 #ifndef QT_BOOTSTRAPPED
-    static QVersionNumber version() Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static QVersionNumber version() noexcept Q_DECL_CONST_FUNCTION;
 #endif
 
     enum LibraryLocation
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 0a2c1961cb..17f2246082 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -44,10 +44,12 @@
 #include "qlogging_p.h"
 #include "qlist.h"
 #include "qbytearray.h"
+#include "qscopeguard.h"
 #include "qstring.h"
 #include "qvarlengtharray.h"
 #include "qdebug.h"
 #include "qmutex.h"
+#include <QtCore/private/qlocking_p.h>
 #include "qloggingcategory.h"
 #ifndef QT_BOOTSTRAPPED
 #include "qelapsedtimer.h"
@@ -158,6 +160,9 @@ static QT_PREPEND_NAMESPACE(qint64) qt_gettid()
 #endif // !QT_BOOTSTRAPPED
 
 #include <cstdlib>
+#include <algorithm>
+#include <memory>
+#include <vector>
 
 #include <stdio.h>
 
@@ -194,7 +199,7 @@ static bool isFatal(QtMsgType msgType)
 
         // it's fatal if the current value is exactly 1,
         // otherwise decrement if it's non-zero
-        return fatalCriticals.load() && fatalCriticals.fetchAndAddRelaxed(-1) == 1;
+        return fatalCriticals.loadRelaxed() && fatalCriticals.fetchAndAddRelaxed(-1) == 1;
     }
 
     if (msgType == QtWarningMsg || msgType == QtCriticalMsg) {
@@ -202,7 +207,7 @@ static bool isFatal(QtMsgType msgType)
 
         // it's fatal if the current value is exactly 1,
         // otherwise decrement if it's non-zero
-        return fatalWarnings.load() && fatalWarnings.fetchAndAddRelaxed(-1) == 1;
+        return fatalWarnings.loadRelaxed() && fatalWarnings.fetchAndAddRelaxed(-1) == 1;
     }
 
     return false;
@@ -347,7 +352,7 @@ using namespace QtPrivate;
 */
 
 #if defined(Q_CC_MSVC) && defined(QT_DEBUG) && defined(_DEBUG) && defined(_CRT_ERROR)
-static inline void convert_to_wchar_t_elided(wchar_t *d, size_t space, const char *s) Q_DECL_NOEXCEPT
+static inline void convert_to_wchar_t_elided(wchar_t *d, size_t space, const char *s) noexcept
 {
     size_t len = qstrlen(s);
     if (len + 1 > space) {
@@ -439,7 +444,7 @@ void QMessageLogger::debug(const QLoggingCategory &cat, const char *msg, ...) co
         return;
 
     QMessageLogContext ctxt;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     va_list ap;
@@ -466,7 +471,7 @@ void QMessageLogger::debug(QMessageLogger::CategoryFunction catFunc,
         return;
 
     QMessageLogContext ctxt;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     va_list ap;
@@ -489,7 +494,7 @@ QDebug QMessageLogger::debug() const
 {
     QDebug dbg = QDebug(QtDebugMsg);
     QMessageLogContext &ctxt = dbg.stream->context;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     return dbg;
 }
 
@@ -506,7 +511,7 @@ QDebug QMessageLogger::debug(const QLoggingCategory &cat) const
         dbg.stream->message_output = false;
 
     QMessageLogContext &ctxt = dbg.stream->context;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     return dbg;
@@ -530,7 +535,7 @@ QDebug QMessageLogger::debug(QMessageLogger::CategoryFunction catFunc) const
 
     \sa QNoDebug, qDebug()
 */
-QNoDebug QMessageLogger::noDebug() const Q_DECL_NOTHROW
+QNoDebug QMessageLogger::noDebug() const noexcept
 {
     return QNoDebug();
 }
@@ -550,7 +555,7 @@ void QMessageLogger::info(const QLoggingCategory &cat, const char *msg, ...) con
         return;
 
     QMessageLogContext ctxt;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     va_list ap;
@@ -577,7 +582,7 @@ void QMessageLogger::info(QMessageLogger::CategoryFunction catFunc,
         return;
 
     QMessageLogContext ctxt;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     va_list ap;
@@ -601,7 +606,7 @@ QDebug QMessageLogger::info() const
 {
     QDebug dbg = QDebug(QtInfoMsg);
     QMessageLogContext &ctxt = dbg.stream->context;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     return dbg;
 }
 
@@ -618,7 +623,7 @@ QDebug QMessageLogger::info(const QLoggingCategory &cat) const
         dbg.stream->message_output = false;
 
     QMessageLogContext &ctxt = dbg.stream->context;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     return dbg;
@@ -668,7 +673,7 @@ void QMessageLogger::warning(const QLoggingCategory &cat, const char *msg, ...)
         return;
 
     QMessageLogContext ctxt;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     va_list ap;
@@ -695,7 +700,7 @@ void QMessageLogger::warning(QMessageLogger::CategoryFunction catFunc,
         return;
 
     QMessageLogContext ctxt;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     va_list ap;
@@ -717,7 +722,7 @@ QDebug QMessageLogger::warning() const
 {
     QDebug dbg = QDebug(QtWarningMsg);
     QMessageLogContext &ctxt = dbg.stream->context;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     return dbg;
 }
 
@@ -733,7 +738,7 @@ QDebug QMessageLogger::warning(const QLoggingCategory &cat) const
         dbg.stream->message_output = false;
 
     QMessageLogContext &ctxt = dbg.stream->context;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     return dbg;
@@ -784,7 +789,7 @@ void QMessageLogger::critical(const QLoggingCategory &cat, const char *msg, ...)
         return;
 
     QMessageLogContext ctxt;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     va_list ap;
@@ -811,7 +816,7 @@ void QMessageLogger::critical(QMessageLogger::CategoryFunction catFunc,
         return;
 
     QMessageLogContext ctxt;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     va_list ap;
@@ -833,7 +838,7 @@ QDebug QMessageLogger::critical() const
 {
     QDebug dbg = QDebug(QtCriticalMsg);
     QMessageLogContext &ctxt = dbg.stream->context;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     return dbg;
 }
 
@@ -850,7 +855,7 @@ QDebug QMessageLogger::critical(const QLoggingCategory &cat) const
         dbg.stream->message_output = false;
 
     QMessageLogContext &ctxt = dbg.stream->context;
-    ctxt.copy(context);
+    ctxt.copyContextFrom(context);
     ctxt.category = cat.categoryName();
 
     return dbg;
@@ -876,7 +881,7 @@ QDebug QMessageLogger::critical(QMessageLogger::CategoryFunction catFunc) const
 
     \sa qFatal()
 */
-void QMessageLogger::fatal(const char *msg, ...) const Q_DECL_NOTHROW
+void QMessageLogger::fatal(const char *msg, ...) const noexcept
 {
     QString message;
 
@@ -1076,8 +1081,8 @@ struct QMessagePattern {
     void setPattern(const QString &pattern);
 
     // 0 terminated arrays of literal tokens / literal or placeholder tokens
-    const char **literals;
-    const char **tokens;
+    std::unique_ptr<std::unique_ptr<const char[]>[]> literals;
+    std::unique_ptr<const char*[]> tokens;
     QList<QString> timeArgs;   // timeFormats in sequence of %{time
 #ifndef QT_BOOTSTRAPPED
     QElapsedTimer timer;
@@ -1100,9 +1105,6 @@ Q_DECLARE_TYPEINFO(QMessagePattern::BacktraceParams, Q_MOVABLE_TYPE);
 QBasicMutex QMessagePattern::mutex;
 
 QMessagePattern::QMessagePattern()
-    : literals(0)
-    , tokens(0)
-    , fromEnvironment(false)
 {
 #ifndef QT_BOOTSTRAPPED
     timer.start();
@@ -1110,6 +1112,7 @@ QMessagePattern::QMessagePattern()
     const QString envPattern = QString::fromLocal8Bit(qgetenv("QT_MESSAGE_PATTERN"));
     if (envPattern.isEmpty()) {
         setPattern(QLatin1String(defaultPattern));
+        fromEnvironment = false;
     } else {
         setPattern(envPattern);
         fromEnvironment = true;
@@ -1117,23 +1120,10 @@ QMessagePattern::QMessagePattern()
 }
 
 QMessagePattern::~QMessagePattern()
-{
-    for (int i = 0; literals[i]; ++i)
-        delete [] literals[i];
-    delete [] literals;
-    literals = 0;
-    delete [] tokens;
-    tokens = 0;
-}
+    = default;
 
 void QMessagePattern::setPattern(const QString &pattern)
 {
-    if (literals) {
-        for (int i = 0; literals[i]; ++i)
-            delete [] literals[i];
-        delete [] literals;
-    }
-    delete [] tokens;
     timeArgs.clear();
 #ifdef QLOGGING_HAVE_BACKTRACE
     backtraceArgs.clear();
@@ -1171,9 +1161,9 @@ void QMessagePattern::setPattern(const QString &pattern)
         lexemes.append(lexeme);
 
     // tokenizer
-    QVarLengthArray<const char*> literalsVar;
-    tokens = new const char*[lexemes.size() + 1];
-    tokens[lexemes.size()] = 0;
+    std::vector<std::unique_ptr<const char[]>> literalsVar;
+    tokens.reset(new const char*[lexemes.size() + 1]);
+    tokens[lexemes.size()] = nullptr;
 
     bool nestedIfError = false;
     bool inIf = false;
@@ -1267,7 +1257,7 @@ void QMessagePattern::setPattern(const QString &pattern)
             char *literal = new char[lexeme.size() + 1];
             strncpy(literal, lexeme.toLatin1().constData(), lexeme.size());
             literal[lexeme.size()] = '\0';
-            literalsVar.append(literal);
+            literalsVar.emplace_back(literal);
             tokens[i] = literal;
         }
     }
@@ -1279,9 +1269,8 @@ void QMessagePattern::setPattern(const QString &pattern)
     if (!error.isEmpty())
         qt_message_print(error);
 
-    literals = new const char*[literalsVar.size() + 1];
-    literals[literalsVar.size()] = 0;
-    memcpy(literals, literalsVar.constData(), literalsVar.size() * sizeof(const char*));
+    literals.reset(new std::unique_ptr<const char[]>[literalsVar.size() + 1]);
+    std::move(literalsVar.begin(), literalsVar.end(), &literals[0]);
 }
 
 #if defined(QLOGGING_HAVE_BACKTRACE) && !defined(QT_BOOTSTRAPPED)
@@ -1387,7 +1376,7 @@ QString qFormatLogMessage(QtMsgType type, const QMessageLogContext &context, con
 {
     QString message;
 
-    QMutexLocker lock(&QMessagePattern::mutex);
+    const auto locker = qt_scoped_lock(QMessagePattern::mutex);
 
     QMessagePattern *pattern = qMessagePattern();
     if (!pattern) {
@@ -1406,7 +1395,7 @@ QString qFormatLogMessage(QtMsgType type, const QMessageLogContext &context, con
 #endif
 
     // we do not convert file, function, line literals to local encoding due to overhead
-    for (int i = 0; pattern->tokens[i] != 0; ++i) {
+    for (int i = 0; pattern->tokens[i]; ++i) {
         const char *token = pattern->tokens[i];
         if (token == endifTokenC) {
             skip = false;
@@ -1826,9 +1815,7 @@ static void qt_message_print(QtMsgType msgType, const QMessageLogContext &contex
     // prevent recursion in case the message handler generates messages
     // itself, e.g. by using Qt API
     if (grabMessageHandler()) {
-        struct Ungrabber {
-            ~Ungrabber() { ungrabMessageHandler(); }
-        } ungrabber;
+        const auto ungrab = qScopeGuard([]{ ungrabMessageHandler(); });
         auto oldStyle = msgHandler.loadAcquire();
         auto newStye = messageHandler.loadAcquire();
         // prefer new message handler over the old one
@@ -2107,7 +2094,7 @@ QtMsgHandler qInstallMsgHandler(QtMsgHandler h)
 
 void qSetMessagePattern(const QString &pattern)
 {
-    QMutexLocker lock(&QMessagePattern::mutex);
+    const auto locker = qt_scoped_lock(QMessagePattern::mutex);
 
     if (!qMessagePattern()->fromEnvironment)
         qMessagePattern()->setPattern(pattern);
@@ -2115,15 +2102,20 @@ void qSetMessagePattern(const QString &pattern)
 
 
 /*!
-    Copies context information from \a logContext into this QMessageLogContext
+    Copies context information from \a logContext into this QMessageLogContext.
+    Returns a reference to this object.
+
+    Note that the version is \b not copied, only the context information.
+
     \internal
 */
-void QMessageLogContext::copy(const QMessageLogContext &logContext)
+QMessageLogContext &QMessageLogContext::copyContextFrom(const QMessageLogContext &logContext) noexcept
 {
     this->category = logContext.category;
     this->file = logContext.file;
     this->line = logContext.line;
     this->function = logContext.function;
+    return *this;
 }
 
 /*!
diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h
index dded09999b..4a528a2973 100644
--- a/src/corelib/global/qlogging.h
+++ b/src/corelib/global/qlogging.h
@@ -63,20 +63,19 @@ class QMessageLogContext
 {
     Q_DISABLE_COPY(QMessageLogContext)
 public:
-    Q_DECL_CONSTEXPR QMessageLogContext()
-        : version(2), line(0), file(nullptr), function(nullptr), category(nullptr) {}
-    Q_DECL_CONSTEXPR QMessageLogContext(const char *fileName, int lineNumber, const char *functionName, const char *categoryName)
-        : version(2), line(lineNumber), file(fileName), function(functionName), category(categoryName) {}
+    Q_DECL_CONSTEXPR QMessageLogContext() noexcept = default;
+    Q_DECL_CONSTEXPR QMessageLogContext(const char *fileName, int lineNumber, const char *functionName, const char *categoryName) noexcept
+        : line(lineNumber), file(fileName), function(functionName), category(categoryName) {}
 
-    void copy(const QMessageLogContext &logContext);
-
-    int version;
-    int line;
-    const char *file;
-    const char *function;
-    const char *category;
+    int version = 2;
+    int line = 0;
+    const char *file = nullptr;
+    const char *function = nullptr;
+    const char *category = nullptr;
 
 private:
+    QMessageLogContext &copyContextFrom(const QMessageLogContext &logContext) noexcept;
+
     friend class QMessageLogger;
     friend class QDebug;
 };
@@ -121,7 +120,7 @@ public:
     Q_NORETURN
 #endif
     Q_DECL_COLD_FUNCTION
-    void fatal(const char *msg, ...) const Q_DECL_NOTHROW Q_ATTRIBUTE_FORMAT_PRINTF(2, 3);
+    void fatal(const char *msg, ...) const noexcept Q_ATTRIBUTE_FORMAT_PRINTF(2, 3);
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug debug() const;
@@ -137,7 +136,7 @@ public:
     QDebug critical(const QLoggingCategory &cat) const;
     QDebug critical(CategoryFunction catFunc) const;
 
-    QNoDebug noDebug() const Q_DECL_NOTHROW;
+    QNoDebug noDebug() const noexcept;
 #endif // QT_NO_DEBUG_STREAM
 
 private:
diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp
index 05676a0da2..b071c1df62 100644
--- a/src/corelib/global/qmalloc.cpp
+++ b/src/corelib/global/qmalloc.cpp
@@ -74,18 +74,18 @@ void *qRealloc(void *ptr, size_t size)
 
 void *qMallocAligned(size_t size, size_t alignment)
 {
-    return qReallocAligned(0, size, 0, alignment);
+    return qReallocAligned(nullptr, size, 0, alignment);
 }
 
 void *qReallocAligned(void *oldptr, size_t newsize, size_t oldsize, size_t alignment)
 {
     // fake an aligned allocation
-    void *actualptr = oldptr ? static_cast<void **>(oldptr)[-1] : 0;
+    void *actualptr = oldptr ? static_cast<void **>(oldptr)[-1] : nullptr;
     if (alignment <= sizeof(void*)) {
         // special, fast case
         void **newptr = static_cast<void **>(realloc(actualptr, newsize + sizeof(void*)));
         if (!newptr)
-            return 0;
+            return nullptr;
         if (newptr == actualptr) {
             // realloc succeeded without reallocating
             return oldptr;
@@ -105,7 +105,7 @@ void *qReallocAligned(void *oldptr, size_t newsize, size_t oldsize, size_t align
 
     void *real = realloc(actualptr, newsize + alignment);
     if (!real)
-        return 0;
+        return nullptr;
 
     quintptr faked = reinterpret_cast<quintptr>(real) + alignment;
     faked &= ~(alignment - 1);
diff --git a/src/corelib/global/qfloat16_p.h b/src/corelib/global/qmemory_p.h
index f3fc96e119..ac791385bd 100644
--- a/src/corelib/global/qfloat16_p.h
+++ b/src/corelib/global/qmemory_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 by Southwest Research Institute (R)
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com>
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -36,9 +36,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
-#ifndef QFLOAT16_P_H
-#define QFLOAT16_P_H
+#ifndef QMEMORY_P_H
+#define QMEMORY_P_H
 
 //
 //  W A R N I N G
@@ -51,45 +50,22 @@
 // We mean it.
 //
 
-#include <QtCore/qfloat16.h>
-#include <QtCore/qsysinfo.h>
-
-QT_BEGIN_NAMESPACE
+#include <QtCore/qglobal.h>
 
-static inline bool qt_is_inf(qfloat16 d) Q_DECL_NOTHROW
-{
-    bool is_inf;
-    uchar *ch = (uchar *)&d;
-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-        is_inf = (ch[0] & 0x7c) == 0x7c && (ch[0] & 0x02) == 0;
-    else
-        is_inf = (ch[1] & 0x7c) == 0x7c && (ch[1] & 0x02) == 0;
-    return is_inf;
-}
+#include <memory>
+#include <type_traits>
+#include <utility>
 
-static inline bool qt_is_nan(qfloat16 d) Q_DECL_NOTHROW
-{
-    bool is_nan;
-    uchar *ch = (uchar *)&d;
-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-        is_nan = (ch[0] & 0x7c) == 0x7c && (ch[0] & 0x02) != 0;
-    else
-        is_nan = (ch[1] & 0x7c) == 0x7c && (ch[1] & 0x02) != 0;
-    return is_nan;
-}
+QT_BEGIN_NAMESPACE
 
-static inline bool qt_is_finite(qfloat16 d) Q_DECL_NOTHROW
+// Like std::make_unique, but less ambitious, so keep as private API, for use in Qt itself:
+template <typename T, typename... Args>
+typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
+qt_make_unique(Args &&...args)
 {
-    bool is_finite;
-    uchar *ch = (uchar *)&d;
-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-        is_finite = (ch[0] & 0x7c) != 0x7c;
-    else
-        is_finite = (ch[1] & 0x7c) != 0x7c;
-    return is_finite;
+    return std::unique_ptr<T>{new T(std::forward<Args>(args)...)};
 }
 
-
 QT_END_NAMESPACE
 
-#endif // QFLOAT16_P_H
+#endif /* QMEMORY_P_H */
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 6488426e64..810c55709c 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -50,10 +50,10 @@ QT_BEGIN_NAMESPACE
 
 #if !defined(Q_QDOC) && !defined(Q_MOC_RUN)
 struct QMetaObject;
-const QMetaObject *qt_getQtMetaObject() Q_DECL_NOEXCEPT; // defined in qobject.h (which can't be included here)
+const QMetaObject *qt_getQtMetaObject() noexcept; // defined in qobject.h (which can't be included here)
 #define QT_Q_ENUM(ENUM) \
-    inline const QMetaObject *qt_getEnumMetaObject(ENUM) Q_DECL_NOEXCEPT { return qt_getQtMetaObject(); } \
-    inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) Q_DECL_NOEXCEPT { return #ENUM; }
+    inline const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return qt_getQtMetaObject(); } \
+    inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; }
 #define QT_Q_FLAG(ENUM) QT_Q_ENUM(ENUM)
 #else
 #define QT_Q_ENUM Q_ENUM
@@ -194,6 +194,13 @@ public:
         DescendingOrder
     };
 
+    enum SplitBehaviorFlags {
+        KeepEmptyParts = 0,
+        SkipEmptyParts = 0x1,
+    };
+    Q_DECLARE_FLAGS(SplitBehavior, SplitBehaviorFlags)
+    Q_DECLARE_OPERATORS_FOR_FLAGS(SplitBehavior)
+
     enum TileRule {
         StretchTile,
         RepeatTile,
@@ -351,14 +358,18 @@ public:
         WA_MouseTracking = 2,
         WA_ContentsPropagated = 3, // ## deprecated
         WA_OpaquePaintEvent = 4,
-        WA_NoBackground = WA_OpaquePaintEvent, // ## deprecated
+#if QT_DEPRECATED_SINCE(5, 14)
+        WA_NoBackground Q_DECL_ENUMERATOR_DEPRECATED = WA_OpaquePaintEvent,
+#endif
         WA_StaticContents = 5,
         WA_LaidOut = 7,
         WA_PaintOnScreen = 8,
         WA_NoSystemBackground = 9,
         WA_UpdatesDisabled = 10,
         WA_Mapped = 11,
-        WA_MacNoClickThrough = 12, // Mac only
+#if QT_DEPRECATED_SINCE(5, 14)
+        WA_MacNoClickThrough Q_DECL_ENUMERATOR_DEPRECATED = 12,
+#endif
         WA_InputMethodEnabled = 14,
         WA_WState_Visible = 15,
         WA_WState_Hidden = 16,
@@ -376,8 +387,10 @@ public:
         WA_Moved = 43,
         WA_PendingUpdate = 44,
         WA_InvalidSize = 45,
-        WA_MacBrushedMetal = 46, // Mac only
-        WA_MacMetalStyle = WA_MacBrushedMetal, // obsolete
+#if QT_DEPRECATED_SINCE(5, 14)
+        WA_MacBrushedMetal Q_DECL_ENUMERATOR_DEPRECATED = 46,
+        WA_MacMetalStyle Q_DECL_ENUMERATOR_DEPRECATED = 46,
+#endif
         WA_CustomWhatsThis = 47,
         WA_LayoutOnEntireRect = 48,
         WA_OutsideWSRange = 49,
@@ -434,7 +447,9 @@ public:
 
         WA_LayoutUsesWidgetRect = 92,
         WA_StyledBackground = 93, // internal
-        WA_MSWindowsUseDirect3D = 94, // Win only
+#if QT_DEPRECATED_SINCE(5, 14)
+        WA_MSWindowsUseDirect3D Q_DECL_ENUMERATOR_DEPRECATED = 94,
+#endif
         WA_CanHostQMdiSubWindowTitleBar = 95, // Internal
 
         WA_MacAlwaysShowToolWindow = 96, // Mac only
@@ -466,9 +481,9 @@ public:
         WA_X11NetWmWindowTypeNotification = 114,
         WA_X11NetWmWindowTypeCombo = 115,
         WA_X11NetWmWindowTypeDND = 116,
-
-        WA_MacFrameworkScaled  = 117,
-
+#if QT_DEPRECATED_SINCE(5, 14)
+        WA_MacFrameworkScaled Q_DECL_ENUMERATOR_DEPRECATED = 117,
+#endif
         WA_SetWindowModality = 118,
         WA_WState_WindowOpacitySet = 119, // internal
         WA_TranslucentBackground = 120,
@@ -495,7 +510,9 @@ public:
     enum ApplicationAttribute
     {
         AA_ImmediateWidgetCreation = 0,
-        AA_MSWindowsUseDirect3DByDefault = 1, // Win only
+#if QT_DEPRECATED_SINCE(5, 14)
+        AA_MSWindowsUseDirect3DByDefault Q_DECL_ENUMERATOR_DEPRECATED = 1,
+#endif
         AA_DontShowIconsInMenus = 2,
         AA_NativeWindows = 3,
         AA_DontCreateNativeWidgetSiblings = 4,
@@ -506,7 +523,9 @@ public:
         AA_DontUseNativeMenuBar = 6,
         AA_MacDontSwapCtrlAndMeta = 7,
         AA_Use96Dpi = 8,
-        AA_X11InitThreads = 10,
+#if QT_DEPRECATED_SINCE(5, 14)
+        AA_X11InitThreads Q_DECL_ENUMERATOR_DEPRECATED = 10,
+#endif
         AA_SynthesizeTouchForUnhandledMouseEvents = 11,
         AA_SynthesizeMouseForUnhandledTouchEvents = 12,
         AA_UseHighDpiPixmaps = 13,
@@ -527,6 +546,7 @@ public:
         AA_DontShowShortcutsInContextMenus = 28,
         AA_CompressTabletEvents = 29,
         AA_DisableWindowContextHelpButton = 30, // ### Qt 6: remove me
+        AA_DisableSessionManager = 31,
 
         // Add new attributes before this line
         AA_AttributeCount
@@ -1198,7 +1218,8 @@ public:
     enum TextFormat {
         PlainText,
         RichText,
-        AutoText
+        AutoText,
+        MarkdownText
     };
 
     enum AspectRatioMode {
@@ -1379,7 +1400,9 @@ public:
     enum InputMethodQuery {
         ImEnabled = 0x1,
         ImCursorRectangle = 0x2,
-        ImMicroFocus = 0x2, // deprecated
+#if QT_DEPRECATED_SINCE(5, 14)
+        ImMicroFocus Q_DECL_ENUMERATOR_DEPRECATED = 0x2,
+#endif
         ImFont = 0x4,
         ImCursorPosition = 0x8,
         ImSurroundingText = 0x10,
@@ -1614,7 +1637,7 @@ public:
         TitleBarArea    // For move
     };
 
-#if defined(Q_COMPILER_CLASS_ENUM) && defined(Q_COMPILER_CONSTEXPR)
+#if defined(Q_COMPILER_CONSTEXPR)
     enum class Initialization {
         Uninitialized
     };
@@ -1731,6 +1754,15 @@ public:
         ChecksumItuV41
     };
 
+    enum class HighDpiScaleFactorRoundingPolicy {
+        Unset,
+        Round,
+        Ceil,
+        Floor,
+        RoundPreferFloor,
+        PassThrough
+    };
+
 #ifndef Q_QDOC
     // NOTE: Generally, do not add QT_Q_ENUM if a corresponding Q_Q_FLAG exists.
     QT_Q_ENUM(ScrollBarPolicy)
@@ -1757,6 +1789,7 @@ public:
     QT_Q_FLAG(Alignment)
     QT_Q_ENUM(TextFlag)
     QT_Q_FLAG(Orientations)
+    QT_Q_FLAG(SplitBehavior)
     QT_Q_FLAG(DropActions)
     QT_Q_FLAG(Edges)
     QT_Q_FLAG(DockWidgetAreas)
@@ -1816,6 +1849,7 @@ public:
     QT_Q_ENUM(MouseEventSource)
     QT_Q_FLAG(MouseEventFlag)
     QT_Q_ENUM(ChecksumType)
+    QT_Q_ENUM(HighDpiScaleFactorRoundingPolicy)
     QT_Q_ENUM(TabFocusBehavior)
 #endif // Q_DOC
 
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 5bba8c5fe5..cce88782e9 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -286,6 +286,13 @@
            This value was added in Qt 5.10. In Qt 6, WindowContextHelpButtonHint
            will not be set by default.
 
+    \value AA_DisableSessionManager Disables the QSessionManager.
+           By default Qt will connect to a running session manager for a GUI
+           application on supported platforms, use of a session manager may be
+           redundant for system services.
+           This attribute must be set before QGuiApplication is constructed.
+           This value was added in 5.13
+
     The following values are deprecated or obsolete:
 
     \value AA_ImmediateWidgetCreation This attribute is no longer fully
@@ -2362,6 +2369,19 @@
 */
 
 /*!
+    \enum Qt::SplitBehaviorFlags
+    \since 5.14
+
+    This enum specifies how the split() functions should behave with
+    respect to empty strings.
+
+    \value KeepEmptyParts  If a field is empty, keep it in the result.
+    \value SkipEmptyParts  If a field is empty, don't include it in the result.
+
+    \sa QString::split()
+*/
+
+/*!
     \enum Qt::ClipOperation
 
     \value NoClip This operation turns clipping off.
@@ -2464,6 +2484,9 @@
     \value AutoText The text string is interpreted as for
         Qt::RichText if Qt::mightBeRichText() returns \c true, otherwise
         as Qt::PlainText.
+
+    \value MarkdownText The text string is interpreted as Markdown-formatted text.
+        This enum value was added in Qt 5.14.
 */
 
 /*!
@@ -3252,3 +3275,25 @@
 
   \value ChecksumItuV41 Checksum calculation based on ITU-V.41.
 */
+
+/*!
+  \enum Qt::HighDpiScaleFactorRoundingPolicy
+  \since 5.14
+
+  This enum describes the possible High-DPI scale factor rounding policies, which
+  decide how non-integer scale factors (such as Windows 150%) are handled.
+
+  The active policy is set by calling QGuiApplication::setHighDdpiScaleFactorRoundingPolicy() before
+  the application object is created, or by setting the QT_SCALE_FACTOR_ROUNDING_POLICY
+  environment variable.
+
+  \sa QGuiApplication::setHighDpiScaleFactorRoundingPolicy()
+  \sa AA_EnableHighDpiScaling.
+
+  \omitvalue Unset
+  \value Round Round up for .5 and above.
+  \value Ceil Always round up.
+  \value Floor Always round down.
+  \value RoundPreferFloor Round up for .75 and above.
+  \value PassThrough Don't round.
+*/
diff --git a/src/corelib/global/qnumeric.cpp b/src/corelib/global/qnumeric.cpp
index fc2b052edf..9cb9c1283a 100644
--- a/src/corelib/global/qnumeric.cpp
+++ b/src/corelib/global/qnumeric.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 /*!
     Returns \c true if the double \a {d} is equivalent to infinity.
     \relates <QtGlobal>
+    \sa qInf()
 */
 Q_CORE_EXPORT bool qIsInf(double d) { return qt_is_inf(d); }
 
@@ -64,6 +65,7 @@ Q_CORE_EXPORT bool qIsFinite(double d) { return qt_is_finite(d); }
 /*!
     Returns \c true if the float \a {f} is equivalent to infinity.
     \relates <QtGlobal>
+    \sa qInf()
 */
 Q_CORE_EXPORT bool qIsInf(float f) { return qt_is_inf(f); }
 
@@ -79,24 +81,48 @@ Q_CORE_EXPORT bool qIsNaN(float f) { return qt_is_nan(f); }
 */
 Q_CORE_EXPORT bool qIsFinite(float f) { return qt_is_finite(f); }
 
+#if QT_CONFIG(signaling_nan)
 /*!
     Returns the bit pattern of a signalling NaN as a double.
     \relates <QtGlobal>
 */
 Q_CORE_EXPORT double qSNaN() { return qt_snan(); }
+#endif
 
 /*!
     Returns the bit pattern of a quiet NaN as a double.
     \relates <QtGlobal>
+    \sa qIsNaN()
 */
 Q_CORE_EXPORT double qQNaN() { return qt_qnan(); }
 
 /*!
     Returns the bit pattern for an infinite number as a double.
     \relates <QtGlobal>
+    \sa qIsInf()
 */
 Q_CORE_EXPORT double qInf() { return qt_inf(); }
 
+/*!
+    \relates <QtGlobal>
+    Classifies a floating-point value.
+
+    The return values are defined in \c{<cmath>}: returns one of the following,
+    determined by the floating-point class of \a val:
+    \list
+    \li FP_NAN not a number
+    \li FP_INFINITE infinities (positive or negative)
+    \li FP_ZERO zero (positive or negative)
+    \li FP_NORMAL finite with a full mantissa
+    \li FP_SUBNORMAL finite with a reduced mantissa
+    \endlist
+*/
+Q_CORE_EXPORT int qFpClassify(double val) { return qt_fpclassify(val); }
+
+/*!
+    \overload
+*/
+Q_CORE_EXPORT int qFpClassify(float val) { return qt_fpclassify(val); }
 
 
 /*!
diff --git a/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h
index 535a96aaec..2771eea64f 100644
--- a/src/corelib/global/qnumeric.h
+++ b/src/corelib/global/qnumeric.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -44,14 +44,17 @@
 
 QT_BEGIN_NAMESPACE
 
-
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsInf(double d);
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsNaN(double d);
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsFinite(double d);
+Q_CORE_EXPORT Q_DECL_CONST_FUNCTION int qFpClassify(double val);
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsInf(float f);
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsNaN(float f);
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsFinite(float f);
+Q_CORE_EXPORT Q_DECL_CONST_FUNCTION int qFpClassify(float val);
+#if QT_CONFIG(signaling_nan)
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION double qSNaN();
+#endif
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION double qQNaN();
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION double qInf();
 
@@ -59,7 +62,9 @@ Q_CORE_EXPORT quint32 qFloatDistance(float a, float b);
 Q_CORE_EXPORT quint64 qFloatDistance(double a, double b);
 
 #define Q_INFINITY (QT_PREPEND_NAMESPACE(qInf)())
-#define Q_SNAN (QT_PREPEND_NAMESPACE(qSNaN)())
+#if QT_CONFIG(signaling_nan)
+#  define Q_SNAN (QT_PREPEND_NAMESPACE(qSNaN)())
+#endif
 #define Q_QNAN (QT_PREPEND_NAMESPACE(qQNaN)())
 
 QT_END_NAMESPACE
diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
index 4a225b2599..86e7997680 100644
--- a/src/corelib/global/qnumeric_p.h
+++ b/src/corelib/global/qnumeric_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2018 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -85,9 +85,11 @@ namespace qnumeric_std_wrapper {
 Q_DECL_CONST_FUNCTION static inline bool math_h_isnan(double d) { using namespace std; return isnan(d); }
 Q_DECL_CONST_FUNCTION static inline bool math_h_isinf(double d) { using namespace std; return isinf(d); }
 Q_DECL_CONST_FUNCTION static inline bool math_h_isfinite(double d) { using namespace std; return isfinite(d); }
+Q_DECL_CONST_FUNCTION static inline int math_h_fpclassify(double d) { using namespace std; return fpclassify(d); }
 Q_DECL_CONST_FUNCTION static inline bool math_h_isnan(float f) { using namespace std; return isnan(f); }
 Q_DECL_CONST_FUNCTION static inline bool math_h_isinf(float f) { using namespace std; return isinf(f); }
 Q_DECL_CONST_FUNCTION static inline bool math_h_isfinite(float f) { using namespace std; return isfinite(f); }
+Q_DECL_CONST_FUNCTION static inline int math_h_fpclassify(float f) { using namespace std; return fpclassify(f); }
 }
 QT_END_NAMESPACE
 // These macros from math.h conflict with the real functions in the std namespace.
@@ -95,6 +97,7 @@ QT_END_NAMESPACE
 #    undef isnan
 #    undef isinf
 #    undef isfinite
+#    undef fpclassify
 #  endif // defined(isnan)
 #endif
 
@@ -106,36 +109,41 @@ namespace qnumeric_std_wrapper {
 Q_DECL_CONST_FUNCTION static inline bool isnan(double d) { return math_h_isnan(d); }
 Q_DECL_CONST_FUNCTION static inline bool isinf(double d) { return math_h_isinf(d); }
 Q_DECL_CONST_FUNCTION static inline bool isfinite(double d) { return math_h_isfinite(d); }
+Q_DECL_CONST_FUNCTION static inline int fpclassify(double d) { return math_h_fpclassify(d); }
 Q_DECL_CONST_FUNCTION static inline bool isnan(float f) { return math_h_isnan(f); }
 Q_DECL_CONST_FUNCTION static inline bool isinf(float f) { return math_h_isinf(f); }
 Q_DECL_CONST_FUNCTION static inline bool isfinite(float f) { return math_h_isfinite(f); }
+Q_DECL_CONST_FUNCTION static inline int fpclassify(float f) { return math_h_fpclassify(f); }
 #else
 Q_DECL_CONST_FUNCTION static inline bool isnan(double d) { return std::isnan(d); }
 Q_DECL_CONST_FUNCTION static inline bool isinf(double d) { return std::isinf(d); }
 Q_DECL_CONST_FUNCTION static inline bool isfinite(double d) { return std::isfinite(d); }
+Q_DECL_CONST_FUNCTION static inline int fpclassify(double d) { return std::fpclassify(d); }
 Q_DECL_CONST_FUNCTION static inline bool isnan(float f) { return std::isnan(f); }
 Q_DECL_CONST_FUNCTION static inline bool isinf(float f) { return std::isinf(f); }
 Q_DECL_CONST_FUNCTION static inline bool isfinite(float f) { return std::isfinite(f); }
+Q_DECL_CONST_FUNCTION static inline int fpclassify(float f) { return std::fpclassify(f); }
 #endif
 }
 
-Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_inf() Q_DECL_NOEXCEPT
+Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_inf() noexcept
 {
     Q_STATIC_ASSERT_X(std::numeric_limits<double>::has_infinity,
                       "platform has no definition for infinity for type double");
     return std::numeric_limits<double>::infinity();
 }
 
-// Signaling NaN
-Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_snan() Q_DECL_NOEXCEPT
+#if QT_CONFIG(signaling_nan)
+Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_snan() noexcept
 {
     Q_STATIC_ASSERT_X(std::numeric_limits<double>::has_signaling_NaN,
                       "platform has no definition for signaling NaN for type double");
     return std::numeric_limits<double>::signaling_NaN();
 }
+#endif
 
 // Quiet NaN
-Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_qnan() Q_DECL_NOEXCEPT
+Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_qnan() noexcept
 {
     Q_STATIC_ASSERT_X(std::numeric_limits<double>::has_quiet_NaN,
                       "platform has no definition for quiet NaN for type double");
@@ -157,6 +165,11 @@ Q_DECL_CONST_FUNCTION static inline bool qt_is_finite(double d)
     return qnumeric_std_wrapper::isfinite(d);
 }
 
+Q_DECL_CONST_FUNCTION static inline int qt_fpclassify(double d)
+{
+    return qnumeric_std_wrapper::fpclassify(d);
+}
+
 Q_DECL_CONST_FUNCTION static inline bool qt_is_inf(float f)
 {
     return qnumeric_std_wrapper::isinf(f);
@@ -172,6 +185,11 @@ Q_DECL_CONST_FUNCTION static inline bool qt_is_finite(float f)
     return qnumeric_std_wrapper::isfinite(f);
 }
 
+Q_DECL_CONST_FUNCTION static inline int qt_fpclassify(float f)
+{
+    return qnumeric_std_wrapper::fpclassify(f);
+}
+
 #ifndef Q_CLANG_QDOC
 namespace {
 /*!
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp
index bc6adb54dc..33793ca168 100644
--- a/src/corelib/global/qoperatingsystemversion.cpp
+++ b/src/corelib/global/qoperatingsystemversion.cpp
@@ -340,7 +340,6 @@ QString QOperatingSystemVersion::name() const
     }
 }
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
 /*!
     \fn bool QOperatingSystemVersion::isAnyOfType(std::initializer_list<OSType> types) const
 
@@ -355,7 +354,6 @@ bool QOperatingSystemVersion::isAnyOfType(std::initializer_list<OSType> types) c
     }
     return false;
 }
-#endif
 
 /*!
     \variable QOperatingSystemVersion::Windows7
diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h
index 89c60c4960..f22878de89 100644
--- a/src/corelib/global/qoperatingsystemversion.h
+++ b/src/corelib/global/qoperatingsystemversion.h
@@ -120,9 +120,7 @@ public:
     Q_DECL_CONSTEXPR int segmentCount() const
     { return m_micro >= 0 ? 3 : m_minor >= 0 ? 2 : m_major >= 0 ? 1 : 0; }
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
     bool isAnyOfType(std::initializer_list<OSType> types) const;
-#endif
     Q_DECL_CONSTEXPR OSType type() const { return m_os; }
     QString name() const;
 
diff --git a/src/corelib/global/qoperatingsystemversion_win.cpp b/src/corelib/global/qoperatingsystemversion_win.cpp
index 2da190da48..798d985a76 100644
--- a/src/corelib/global/qoperatingsystemversion_win.cpp
+++ b/src/corelib/global/qoperatingsystemversion_win.cpp
@@ -84,7 +84,6 @@ static inline OSVERSIONINFOEX determineWinOsVersion()
 #define pGetModuleHandle GetModuleHandleW
 #endif
 
-#ifndef Q_OS_WINCE
     HMODULE ntdll = pGetModuleHandle(L"ntdll.dll");
     if (Q_UNLIKELY(!ntdll))
         return result;
@@ -104,9 +103,6 @@ static inline OSVERSIONINFOEX determineWinOsVersion()
     // GetVersionEx() has been deprecated in Windows 8.1 and will return
     // only Windows 8 from that version on, so use the kernel API function.
     pRtlGetVersion(reinterpret_cast<LPOSVERSIONINFO>(&result)); // always returns STATUS_SUCCESS
-#else // !Q_OS_WINCE
-    GetVersionEx(&result);
-#endif
     return result;
 }
 
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
index 1f327c352e..8d65720850 100644
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
@@ -282,6 +282,20 @@
 // Q_BYTE_ORDER not defined, use endianness auto-detection
 
 /*
+    RISC-V family, known variants: 32- and 64-bit
+
+    RISC-V is little-endian.
+*/
+#elif defined(__riscv)
+#  define Q_PROCESSOR_RISCV
+#  if __riscv_xlen == 64
+#    define Q_PROCESSOR_RISCV_64
+#  else
+#    define Q_PROCESSOR_RISCV_32
+#  endif
+#  define Q_BYTE_ORDER Q_LITTLE_ENDIAN
+
+/*
     S390 family, known variant: S390X (64-bit)
 
     S390 is big-endian.
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
index b150a29b88..3cbd40b772 100644
--- a/src/corelib/global/qrandom.cpp
+++ b/src/corelib/global/qrandom.cpp
@@ -98,7 +98,7 @@ enum {
 struct QRandomGenerator::SystemGenerator
 {
 #if QT_CONFIG(getentropy)
-    static qsizetype fillBuffer(void *buffer, qsizetype count) Q_DECL_NOTHROW
+    static qsizetype fillBuffer(void *buffer, qsizetype count) noexcept
     {
         // getentropy can read at most 256 bytes, so break the reading
         qsizetype read = 0;
@@ -150,7 +150,7 @@ struct QRandomGenerator::SystemGenerator
 #endif
     static void closeDevice()
     {
-        int fd = self().fdp1.load() - 1;
+        int fd = self().fdp1.loadRelaxed() - 1;
         if (fd >= 0)
             qt_safe_close(fd);
     }
@@ -168,13 +168,13 @@ struct QRandomGenerator::SystemGenerator
     }
 
 #elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-    qsizetype fillBuffer(void *buffer, qsizetype count) Q_DECL_NOTHROW
+    qsizetype fillBuffer(void *buffer, qsizetype count) noexcept
     {
         auto RtlGenRandom = SystemFunction036;
         return RtlGenRandom(buffer, ULONG(count)) ? count: 0;
     }
 #elif defined(Q_OS_WINRT)
-    qsizetype fillBuffer(void *, qsizetype) Q_DECL_NOTHROW
+    qsizetype fillBuffer(void *, qsizetype) noexcept
     {
         // always use the fallback
         return 0;
@@ -183,7 +183,7 @@ struct QRandomGenerator::SystemGenerator
 
     static SystemGenerator &self();
     typedef quint32 result_type;
-    void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
+    void generate(quint32 *begin, quint32 *end) noexcept(FillBufferNoexcept);
 
     // For std::mersenne_twister_engine implementations that use something
     // other than quint32 (unsigned int) to fill their buffers.
@@ -206,7 +206,7 @@ struct QRandomGenerator::SystemGenerator
 
 #if defined(Q_OS_WIN)
 static void fallback_update_seed(unsigned) {}
-static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW
+static void fallback_fill(quint32 *ptr, qsizetype left) noexcept
 {
     // on Windows, rand_s is a high-quality random number generator
     // and it requires no seeding
@@ -218,14 +218,14 @@ static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW
 }
 #elif QT_CONFIG(getentropy)
 static void fallback_update_seed(unsigned) {}
-static void fallback_fill(quint32 *, qsizetype) Q_DECL_NOTHROW
+static void fallback_fill(quint32 *, qsizetype) noexcept
 {
     // no fallback necessary, getentropy cannot fail under normal circumstances
     Q_UNREACHABLE();
 }
 #elif defined(Q_OS_BSD4) && !defined(__GLIBC__)
 static void fallback_update_seed(unsigned) {}
-static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW
+static void fallback_fill(quint32 *ptr, qsizetype left) noexcept
 {
     // BSDs have arc4random(4) and these work even in chroot(2)
     arc4random_buf(ptr, left * sizeof(*ptr));
@@ -244,7 +244,7 @@ Q_NEVER_INLINE
 #ifdef Q_CC_GNU
 __attribute__((cold))   // this function is pretty big, so optimize for size
 #endif
-static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW
+static void fallback_fill(quint32 *ptr, qsizetype left) noexcept
 {
     quint32 scratch[12];    // see element count below
     quint32 *end = scratch;
@@ -274,7 +274,7 @@ static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW
     *end++ = quint32(nsecs);    // 5
 #endif
 
-    if (quint32 v = seed.load())
+    if (quint32 v = seed.loadRelaxed())
         *end++ = v; // 6
 
 #if QT_CONFIG(getauxval)
@@ -318,22 +318,22 @@ static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW
 #endif
 
 Q_NEVER_INLINE void QRandomGenerator::SystemGenerator::generate(quint32 *begin, quint32 *end)
-    Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept)
+    noexcept(FillBufferNoexcept)
 {
     quint32 *buffer = begin;
     qsizetype count = end - begin;
 
-    if (Q_UNLIKELY(uint(qt_randomdevice_control) & SetRandomData)) {
-        uint value = uint(qt_randomdevice_control) & RandomDataMask;
+    if (Q_UNLIKELY(uint(qt_randomdevice_control.loadAcquire()) & SetRandomData)) {
+        uint value = uint(qt_randomdevice_control.loadAcquire()) & RandomDataMask;
         std::fill_n(buffer, count, value);
         return;
     }
 
     qsizetype filled = 0;
-    if (qHasHwrng() && (uint(qt_randomdevice_control) & SkipHWRNG) == 0)
+    if (qHasHwrng() && (uint(qt_randomdevice_control.loadAcquire()) & SkipHWRNG) == 0)
         filled += qRandomCpu(buffer, count);
 
-    if (filled != count && (uint(qt_randomdevice_control) & SkipSystemRNG) == 0) {
+    if (filled != count && (uint(qt_randomdevice_control.loadAcquire()) & SkipSystemRNG) == 0) {
         qsizetype bytesFilled =
                 fillBuffer(buffer + filled, (count - filled) * qsizetype(sizeof(*buffer)));
         filled += bytesFilled / qsizetype(sizeof(*buffer));
@@ -1139,7 +1139,7 @@ QRandomGenerator &QRandomGenerator::operator=(const QRandomGenerator &other)
     return *this;
 }
 
-QRandomGenerator::QRandomGenerator(std::seed_seq &sseq) Q_DECL_NOTHROW
+QRandomGenerator::QRandomGenerator(std::seed_seq &sseq) noexcept
     : type(MersenneTwister)
 {
     Q_ASSERT(this != system());
@@ -1194,7 +1194,7 @@ void QRandomGenerator::_fillRange(void *buffer, void *bufferEnd)
     quint32 *begin = static_cast<quint32 *>(buffer);
     quint32 *end = static_cast<quint32 *>(bufferEnd);
 
-    if (type == SystemRNG || Q_UNLIKELY(uint(qt_randomdevice_control) & (UseSystemRNG|SetRandomData)))
+    if (type == SystemRNG || Q_UNLIKELY(uint(qt_randomdevice_control.loadAcquire()) & (UseSystemRNG|SetRandomData)))
         return SystemGenerator::self().generate(begin, end);
 
     SystemAndGlobalGenerators::PRNGLocker lock(this);
diff --git a/src/corelib/global/qrandom.h b/src/corelib/global/qrandom.h
index 260fc1501a..445b520c76 100644
--- a/src/corelib/global/qrandom.h
+++ b/src/corelib/global/qrandom.h
@@ -68,7 +68,7 @@ public:
     QRandomGenerator(const quint32 *seedBuffer, qsizetype len)
         : QRandomGenerator(seedBuffer, seedBuffer + len)
     {}
-    Q_CORE_EXPORT QRandomGenerator(std::seed_seq &sseq) Q_DECL_NOTHROW;
+    Q_CORE_EXPORT QRandomGenerator(std::seed_seq &sseq) noexcept;
     Q_CORE_EXPORT QRandomGenerator(const quint32 *begin, const quint32 *end);
 
     // copy constructor & assignment operator (move unnecessary)
@@ -167,7 +167,7 @@ public:
     typedef quint32 result_type;
     result_type operator()() { return generate(); }
     void seed(quint32 s = 1) { *this = { s }; }
-    void seed(std::seed_seq &sseq) Q_DECL_NOTHROW { *this = { sseq }; }
+    void seed(std::seed_seq &sseq) noexcept { *this = { sseq }; }
     Q_CORE_EXPORT void discard(unsigned long long z);
     static Q_DECL_CONSTEXPR result_type min() { return std::numeric_limits<result_type>::min(); }
     static Q_DECL_CONSTEXPR result_type max() { return std::numeric_limits<result_type>::max(); }
@@ -230,7 +230,7 @@ public:
     QRandomGenerator64(const quint32 *seedBuffer, qsizetype len)
         : QRandomGenerator(seedBuffer, len)
     {}
-    QRandomGenerator64(std::seed_seq &sseq) Q_DECL_NOTHROW
+    QRandomGenerator64(std::seed_seq &sseq) noexcept
         : QRandomGenerator(sseq)
     {}
     QRandomGenerator64(const quint32 *begin, const quint32 *end)
diff --git a/src/corelib/global/qrandom_p.h b/src/corelib/global/qrandom_p.h
index 4a0adff51c..934a9282b8 100644
--- a/src/corelib/global/qrandom_p.h
+++ b/src/corelib/global/qrandom_p.h
@@ -76,7 +76,9 @@ Q_CORE_EXPORT QBasicAtomicInteger<uint> qt_randomdevice_control = Q_BASIC_ATOMIC
 #elif defined(QT_BUILD_INTERNAL)
 extern Q_CORE_EXPORT QBasicAtomicInteger<uint> qt_randomdevice_control;
 #else
-enum { qt_randomdevice_control = 0 };
+static const struct {
+    uint loadAcquire() const { return 0; }
+} qt_randomdevice_control;
 #endif
 
 
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index 3e38e6790b..a020788b11 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2019 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -166,6 +167,8 @@
 #  define Q_OS_QNX
 #elif defined(__INTEGRITY)
 #  define Q_OS_INTEGRITY
+#elif defined(__rtems__)
+#  define Q_OS_RTEMS
 #elif defined(VXWORKS) /* there is no "real" VxWorks define - this has to be set in the mkspec! */
 #  define Q_OS_VXWORKS
 #elif defined(__HAIKU__)
@@ -178,6 +181,12 @@
 #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINRT)
 #  define Q_OS_WINDOWS
 #  define Q_OS_WIN
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+// On Windows, pointers to dllimport'ed variables are not constant expressions,
+// so to keep to certain initializations (like QMetaObject) constexpr, we need
+// to use functions instead.
+#    define QT_NO_DATA_RELOCATION
+#  endif
 #endif
 
 #if defined(Q_OS_WIN)
diff --git a/src/corelib/global/qtrace_p.h b/src/corelib/global/qtrace_p.h
index 4cef126bb6..d9011c6066 100644
--- a/src/corelib/global/qtrace_p.h
+++ b/src/corelib/global/qtrace_p.h
@@ -122,6 +122,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(Q_TRACEPOINT) && !defined(QT_BOOTSTRAPPED)
+#  define Q_HAS_TRACEPOINTS 1
 #  define Q_TRACE(x, ...) QtPrivate::trace_ ## x(__VA_ARGS__)
 #  define Q_TRACE_EXIT(x, ...) \
     const auto qTraceExit_ ## x ## __COUNTER__ = qScopeGuard([&]() { Q_TRACE(x, __VA_ARGS__); });
@@ -131,6 +132,7 @@ QT_BEGIN_NAMESPACE
 #  define Q_UNCONDITIONAL_TRACE(x, ...) QtPrivate::do_trace_ ## x(__VA_ARGS__)
 #  define Q_TRACE_ENABLED(x) QtPrivate::trace_ ## x ## _enabled()
 #else
+#  define Q_HAS_TRACEPOINTS 0
 #  define Q_TRACE(x, ...)
 #  define Q_TRACE_EXIT(x, ...)
 #  define Q_TRACE_SCOPE(x, ...)
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h
index 567ff5c08e..30be47296e 100644
--- a/src/corelib/global/qtypeinfo.h
+++ b/src/corelib/global/qtypeinfo.h
@@ -213,7 +213,6 @@ Q_DECLARE_MOVABLE_CONTAINER(QList);
 Q_DECLARE_MOVABLE_CONTAINER(QVector);
 Q_DECLARE_MOVABLE_CONTAINER(QQueue);
 Q_DECLARE_MOVABLE_CONTAINER(QStack);
-Q_DECLARE_MOVABLE_CONTAINER(QLinkedList);
 Q_DECLARE_MOVABLE_CONTAINER(QSet);
 
 #undef Q_DECLARE_MOVABLE_CONTAINER
@@ -308,7 +307,7 @@ Q_DECLARE_TYPEINFO_BODY(QFlags<T>, Q_PRIMITIVE_TYPE);
 #define Q_DECLARE_SHARED_IMPL(TYPE, FLAGS) \
 Q_DECLARE_TYPEINFO(TYPE, FLAGS); \
 inline void swap(TYPE &value1, TYPE &value2) \
-    Q_DECL_NOEXCEPT_EXPR(noexcept(value1.swap(value2))) \
+    noexcept(noexcept(value1.swap(value2))) \
 { value1.swap(value2); }
 #define Q_DECLARE_SHARED(TYPE) Q_DECLARE_SHARED_IMPL(TYPE, Q_MOVABLE_TYPE)
 #define Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(TYPE) \
diff --git a/src/corelib/io/forkfd_qt.cpp b/src/corelib/io/forkfd_qt.cpp
index dce0ebb4da..cf44874153 100644
--- a/src/corelib/io/forkfd_qt.cpp
+++ b/src/corelib/io/forkfd_qt.cpp
@@ -37,39 +37,12 @@
 **
 ****************************************************************************/
 
-// these might be defined via precompiled headers
-#include <QtCore/qatomic.h>
+#include <QtCore/qglobal.h>
 
 #define FORKFD_NO_SPAWNFD
-
 #if defined(QT_NO_DEBUG) && !defined(NDEBUG)
 #  define NDEBUG
 #endif
 
-typedef QT_PREPEND_NAMESPACE(QBasicAtomicInt) ffd_atomic_int;
-#define ffd_atomic_pointer(type)    QT_PREPEND_NAMESPACE(QBasicAtomicPointer<type>)
-
-QT_BEGIN_NAMESPACE
-
-#define FFD_ATOMIC_INIT(val)    Q_BASIC_ATOMIC_INITIALIZER(val)
-
-#define FFD_ATOMIC_RELAXED  Relaxed
-#define FFD_ATOMIC_ACQUIRE  Acquire
-#define FFD_ATOMIC_RELEASE  Release
-#define loadRelaxed         load
-#define storeRelaxed        store
-
-#define FFD_CONCAT(x, y)    x ## y
-
-#define ffd_atomic_load(ptr,order)      (ptr)->FFD_CONCAT(load, order)()
-#define ffd_atomic_store(ptr,val,order) (ptr)->FFD_CONCAT(store, order)(val)
-#define ffd_atomic_exchange(ptr,val,order) (ptr)->FFD_CONCAT(fetchAndStore, order)(val)
-#define ffd_atomic_compare_exchange(ptr,expected,desired,order1,order2) \
-    (ptr)->FFD_CONCAT(testAndSet, order1)(*expected, desired, *expected)
-#define ffd_atomic_add_fetch(ptr,val,order) ((ptr)->FFD_CONCAT(fetchAndAdd, order)(val) + val)
-
-QT_END_NAMESPACE
-
-extern "C" {
+#include <forkfd.h>
 #include "../../3rdparty/forkfd/forkfd.c"
-}
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index 9b6044752f..fe81689932 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -158,7 +158,8 @@ win32 {
             io/qwindowspipereader.cpp \
             io/qwindowspipewriter.cpp
 
-        LIBS += -lmpr -lnetapi32 -luserenv
+        LIBS += -lmpr -luserenv
+        QMAKE_USE_PRIVATE += netapi32
     } else {
         SOURCES += \
                 io/qstandardpaths_winrt.cpp \
@@ -171,7 +172,7 @@ win32 {
                 io/qlockfile_unix.cpp \
                 io/qfilesystemiterator_unix.cpp
 
-        !integrity:!uikit {
+        !integrity:!uikit:!rtems {
             SOURCES += io/forkfd_qt.cpp
             HEADERS += \
                      ../3rdparty/forkfd/forkfd.h
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp
index f2a895bbb8..8a1679c5af 100644
--- a/src/corelib/io/qabstractfileengine.cpp
+++ b/src/corelib/io/qabstractfileengine.cpp
@@ -159,7 +159,7 @@ QAbstractFileEngineHandler::~QAbstractFileEngineHandler()
 */
 QAbstractFileEngine *qt_custom_file_engine_handler_create(const QString &path)
 {
-    QAbstractFileEngine *engine = 0;
+    QAbstractFileEngine *engine = nullptr;
 
     if (qt_file_engine_handlers_in_use) {
         QReadLocker locker(fileEngineHandlerMutex());
@@ -658,7 +658,7 @@ QStringList QAbstractFileEngine::entryList(QDir::Filters filters, const QStringL
 QAbstractFileEngine::FileFlags QAbstractFileEngine::fileFlags(FileFlags type) const
 {
     Q_UNUSED(type);
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -838,7 +838,7 @@ uchar *QAbstractFileEngine::map(qint64 offset, qint64 size, QFile::MemoryMapFlag
     option.flags = flags;
     MapExtensionReturn r;
     if (!extension(MapExtension, &option, &r))
-        return 0;
+        return nullptr;
     return r.address;
 }
 
@@ -1118,7 +1118,7 @@ QAbstractFileEngine::Iterator *QAbstractFileEngine::beginEntryList(QDir::Filters
 {
     Q_UNUSED(filters);
     Q_UNUSED(filterNames);
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -1126,7 +1126,7 @@ QAbstractFileEngine::Iterator *QAbstractFileEngine::beginEntryList(QDir::Filters
 */
 QAbstractFileEngine::Iterator *QAbstractFileEngine::endEntryList()
 {
-    return 0;
+    return nullptr;
 }
 
 /*!
diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h
index 4a7fe7bff5..c88b66c7ce 100644
--- a/src/corelib/io/qabstractfileengine_p.h
+++ b/src/corelib/io/qabstractfileengine_p.h
@@ -193,7 +193,7 @@ public:
         uchar *address;
     };
 
-    virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0);
+    virtual bool extension(Extension extension, const ExtensionOption *option = nullptr, ExtensionReturn *output = nullptr);
     virtual bool supportsExtension(Extension extension) const;
 
     // Factory
diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp
index 7b3fa2ccad..8e980733de 100644
--- a/src/corelib/io/qbuffer.cpp
+++ b/src/corelib/io/qbuffer.cpp
@@ -50,7 +50,7 @@ class QBufferPrivate : public QIODevicePrivate
 
 public:
     QBufferPrivate()
-    : buf(0)
+        : buf(nullptr)
 #ifndef QT_NO_QOBJECT
         , writtenSinceLastEmit(0), signalConnectionCount(0), signalsEmitted(false)
 #endif
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 15c5e0ce96..d13e94e096 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -147,7 +147,7 @@ using QtMiscUtils::fromHex;
 // Has been defined in the header / inlined before Qt 5.4
 QDebug::~QDebug()
 {
-    if (!--stream->ref) {
+    if (stream && !--stream->ref) {
         if (stream->space && stream->buffer.endsWith(QLatin1Char(' ')))
             stream->buffer.chop(1);
         if (stream->message_output) {
@@ -166,7 +166,7 @@ void QDebug::putUcs4(uint ucs4)
 {
     maybeQuote('\'');
     if (ucs4 < 0x20) {
-        stream->ts << "\\x" << hex << ucs4 << reset;
+        stream->ts << "\\x" << Qt::hex << ucs4 << Qt::reset;
     } else if (ucs4 < 0x80) {
         stream->ts << char(ucs4);
     } else {
@@ -174,7 +174,7 @@ void QDebug::putUcs4(uint ucs4)
             stream->ts << "\\u" << qSetFieldWidth(4);
         else
             stream->ts << "\\U" << qSetFieldWidth(8);
-        stream->ts << hex << qSetPadChar(QLatin1Char('0')) << ucs4 << reset;
+        stream->ts << Qt::hex << qSetPadChar(QLatin1Char('0')) << ucs4 << Qt::reset;
     }
     maybeQuote('\'');
 }
@@ -834,7 +834,7 @@ QDebug &QDebug::resetFormat()
     that QDebugStateSaver stores for the duration of the current block.
 
     The settings of the internal QTextStream are also saved and restored,
-    so that using << hex in a QDebug operator doesn't affect other QDebug
+    so that using << Qt::hex in a QDebug operator doesn't affect other QDebug
     operators.
 
     \since 5.1
@@ -843,36 +843,34 @@ QDebug &QDebug::resetFormat()
 class QDebugStateSaverPrivate
 {
 public:
-    QDebugStateSaverPrivate(QDebug &dbg)
-        : m_dbg(dbg),
-          m_spaces(dbg.autoInsertSpaces()),
-          m_flags(0),
-          m_streamParams(dbg.stream->ts.d_ptr->params)
+    QDebugStateSaverPrivate(QDebug::Stream *stream)
+        : m_stream(stream),
+          m_spaces(stream->space),
+          m_flags(stream->context.version > 1 ? stream->flags : 0),
+          m_streamParams(stream->ts.d_ptr->params)
     {
-        if (m_dbg.stream->context.version > 1)
-            m_flags = m_dbg.stream->flags;
     }
     void restoreState()
     {
-        const bool currentSpaces = m_dbg.autoInsertSpaces();
+        const bool currentSpaces = m_stream->space;
         if (currentSpaces && !m_spaces)
-            if (m_dbg.stream->buffer.endsWith(QLatin1Char(' ')))
-                m_dbg.stream->buffer.chop(1);
+            if (m_stream->buffer.endsWith(QLatin1Char(' ')))
+                m_stream->buffer.chop(1);
 
-        m_dbg.setAutoInsertSpaces(m_spaces);
-        m_dbg.stream->ts.d_ptr->params = m_streamParams;
-        if (m_dbg.stream->context.version > 1)
-            m_dbg.stream->flags = m_flags;
+        m_stream->space = m_spaces;
+        m_stream->ts.d_ptr->params = m_streamParams;
+        if (m_stream->context.version > 1)
+            m_stream->flags = m_flags;
 
         if (!currentSpaces && m_spaces)
-            m_dbg.stream->ts << ' ';
+            m_stream->ts << ' ';
     }
 
-    QDebug &m_dbg;
+    QDebug::Stream *m_stream;
 
     // QDebug state
     const bool m_spaces;
-    int m_flags;
+    const int m_flags;
 
     // QTextStream state
     const QTextStreamPrivate::Params m_streamParams;
@@ -886,7 +884,7 @@ public:
     \sa QDebug::setAutoInsertSpaces(), QDebug::autoInsertSpaces()
 */
 QDebugStateSaver::QDebugStateSaver(QDebug &dbg)
-    : d(new QDebugStateSaverPrivate(dbg))
+    : d(new QDebugStateSaverPrivate(dbg.stream))
 {
 }
 
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index 91fde75fa5..421c5d933b 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -65,6 +65,7 @@ QT_BEGIN_NAMESPACE
 class Q_CORE_EXPORT QDebug
 {
     friend class QMessageLogger;
+    friend class QDebugStateSaver;
     friend class QDebugStateSaverPrivate;
     struct Stream {
         enum { VerbosityShift = 29, VerbosityMask = 0x7 };
@@ -114,9 +115,12 @@ public:
     inline QDebug(QString *string) : stream(new Stream(string)) {}
     inline QDebug(QtMsgType t) : stream(new Stream(t)) {}
     inline QDebug(const QDebug &o):stream(o.stream) { ++stream->ref; }
+    QDebug(QDebug &&other) noexcept : stream{qExchange(other.stream, nullptr)} {}
     inline QDebug &operator=(const QDebug &other);
+    QDebug &operator=(QDebug &&other) noexcept
+    { QDebug{std::move(other)}.swap(*this); return *this; }
     ~QDebug();
-    inline void swap(QDebug &other) Q_DECL_NOTHROW { qSwap(stream, other.stream); }
+    inline void swap(QDebug &other) noexcept { qSwap(stream, other.stream); }
 
     QDebug &resetFormat();
 
@@ -161,9 +165,7 @@ public:
     inline QDebug &operator<<(QLatin1String t) { putByteArray(t.latin1(), t.size(), ContainsLatin1); return maybeSpace(); }
     inline QDebug &operator<<(const QByteArray & t) { putByteArray(t.constData(), t.size(), ContainsBinary); return maybeSpace(); }
     inline QDebug &operator<<(const void * t) { stream->ts << t; return maybeSpace(); }
-#ifdef Q_COMPILER_NULLPTR
     inline QDebug &operator<<(std::nullptr_t) { stream->ts << "(nullptr)"; return maybeSpace(); }
-#endif
     inline QDebug &operator<<(QTextStreamFunction f) {
         stream->ts << f;
         return *this;
@@ -205,10 +207,7 @@ public:
 
 inline QDebug &QDebug::operator=(const QDebug &other)
 {
-    if (this != &other) {
-        QDebug copy(other);
-        qSwap(stream, copy.stream);
-    }
+    QDebug{other}.swap(*this);
     return *this;
 }
 
@@ -352,7 +351,7 @@ void qt_QMetaEnum_flagDebugOperator(QDebug &debug, size_t sizeofT, Int value)
 {
     const QDebugStateSaver saver(debug);
     debug.resetFormat();
-    debug.nospace() << "QFlags(" << hex << showbase;
+    debug.nospace() << "QFlags(" << Qt::hex << Qt::showbase;
     bool needSeparator = false;
     for (uint i = 0; i < sizeofT * 8; ++i) {
         if (value & (Int(1) << i)) {
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 671913e92f..fae935fc24 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -153,7 +153,7 @@ QDirPrivate::QDirPrivate(const QDirPrivate &copy)
 
 bool QDirPrivate::exists() const
 {
-    if (fileEngine.isNull()) {
+    if (!fileEngine) {
         QFileSystemEngine::fillMetaData(dirEntry, metaData,
                 QFileSystemMetaData::ExistsAttribute | QFileSystemMetaData::DirectoryType); // always stat
         return metaData.exists() && metaData.isDirectory();
@@ -226,7 +226,7 @@ inline void QDirPrivate::resolveAbsoluteEntry() const
         return;
 
     QString absoluteName;
-    if (fileEngine.isNull()) {
+    if (!fileEngine) {
         if (!dirEntry.isRelative() && dirEntry.isClean()) {
             absoluteDirEntry = dirEntry;
             return;
@@ -693,7 +693,7 @@ QString QDir::absolutePath() const
 QString QDir::canonicalPath() const
 {
     const QDirPrivate* d = d_ptr.constData();
-    if (d->fileEngine.isNull()) {
+    if (!d->fileEngine) {
         QFileSystemEntry answer = QFileSystemEngine::canonicalName(d->dirEntry, d->metaData);
         return answer.filePath();
     }
@@ -947,6 +947,12 @@ QString QDir::fromNativeSeparators(const QString &pathName)
     int i = pathName.indexOf(QLatin1Char('\\'));
     if (i != -1) {
         QString n(pathName);
+        if (n.startsWith(QLatin1String("\\\\?\\"))) {
+            n.remove(0, 4);
+            i = n.indexOf(QLatin1Char('\\'));
+            if (i == -1)
+                return n;
+        }
 
         QChar * const data = n.data();
         data[i++] = QLatin1Char('/');
@@ -1431,7 +1437,7 @@ QStringList QDir::entryList(const QStringList &nameFilters, Filters filters,
         l.append(it.fileInfo());
     }
     QStringList ret;
-    d->sortFileList(sort, l, &ret, 0);
+    d->sortFileList(sort, l, &ret, nullptr);
     return ret;
 }
 
@@ -1473,7 +1479,7 @@ QFileInfoList QDir::entryInfoList(const QStringList &nameFilters, Filters filter
         l.append(it.fileInfo());
     }
     QFileInfoList ret;
-    d->sortFileList(sort, l, 0, &ret);
+    d->sortFileList(sort, l, nullptr, &ret);
     return ret;
 }
 
@@ -1496,7 +1502,7 @@ bool QDir::mkdir(const QString &dirName) const
     }
 
     QString fn = filePath(dirName);
-    if (d->fileEngine.isNull())
+    if (!d->fileEngine)
         return QFileSystemEngine::createDirectory(QFileSystemEntry(fn), false);
     return d->fileEngine->mkdir(fn, false);
 }
@@ -1520,7 +1526,7 @@ bool QDir::rmdir(const QString &dirName) const
     }
 
     QString fn = filePath(dirName);
-    if (d->fileEngine.isNull())
+    if (!d->fileEngine)
         return QFileSystemEngine::removeDirectory(QFileSystemEntry(fn), false);
 
     return d->fileEngine->rmdir(fn, false);
@@ -1548,7 +1554,7 @@ bool QDir::mkpath(const QString &dirPath) const
     }
 
     QString fn = filePath(dirPath);
-    if (d->fileEngine.isNull())
+    if (!d->fileEngine)
         return QFileSystemEngine::createDirectory(QFileSystemEntry(fn), true);
     return d->fileEngine->mkdir(fn, true);
 }
@@ -1574,7 +1580,7 @@ bool QDir::rmpath(const QString &dirPath) const
     }
 
     QString fn = filePath(dirPath);
-    if (d->fileEngine.isNull())
+    if (!d->fileEngine)
         return QFileSystemEngine::removeDirectory(QFileSystemEntry(fn), true);
     return d->fileEngine->rmdir(fn, true);
 }
@@ -1647,7 +1653,7 @@ bool QDir::isReadable() const
 {
     const QDirPrivate* d = d_ptr.constData();
 
-    if (d->fileEngine.isNull()) {
+    if (!d->fileEngine) {
         if (!d->metaData.hasFlags(QFileSystemMetaData::UserReadPermission))
             QFileSystemEngine::fillMetaData(d->dirEntry, d->metaData, QFileSystemMetaData::UserReadPermission);
 
@@ -1692,7 +1698,7 @@ bool QDir::exists() const
 */
 bool QDir::isRoot() const
 {
-    if (d_ptr->fileEngine.isNull())
+    if (!d_ptr->fileEngine)
         return d_ptr->dirEntry.isRoot();
     return d_ptr->fileEngine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::RootFlag;
 }
@@ -1724,7 +1730,7 @@ bool QDir::isRoot() const
 */
 bool QDir::isRelative() const
 {
-    if (d_ptr->fileEngine.isNull())
+    if (!d_ptr->fileEngine)
         return d_ptr->dirEntry.isRelative();
     return d_ptr->fileEngine->isRelativePath();
 }
@@ -1741,7 +1747,7 @@ bool QDir::makeAbsolute()
 {
     const QDirPrivate *d = d_ptr.constData();
     QScopedPointer<QDirPrivate> dir;
-    if (!d->fileEngine.isNull()) {
+    if (!!d->fileEngine) {
         QString absolutePath = d->fileEngine->fileName(QAbstractFileEngine::AbsoluteName);
         if (QDir::isRelativePath(absolutePath))
             return false;
@@ -1774,8 +1780,8 @@ bool QDir::operator==(const QDir &dir) const
     if (d == other)
         return true;
     Qt::CaseSensitivity sensitive;
-    if (d->fileEngine.isNull() || other->fileEngine.isNull()) {
-        if (d->fileEngine.data() != other->fileEngine.data()) // one is native, the other is a custom file-engine
+    if (!d->fileEngine || !other->fileEngine) {
+        if (d->fileEngine.get() != other->fileEngine.get()) // one is native, the other is a custom file-engine
             return false;
 
         sensitive = QFileSystemEngine::isCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive;
@@ -2339,6 +2345,11 @@ static QString qt_cleanPath(const QString &path, bool *ok)
     if (path.isEmpty())
         return path;
     QString name = path;
+#if defined (Q_OS_WIN)
+    if (name.startsWith(QLatin1String("\\\\?\\")))
+        name.remove(0, 4);
+#endif
+
     QChar dir_separator = QDir::separator();
     if (dir_separator != QLatin1Char('/'))
        name.replace(dir_separator, QLatin1Char('/'));
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index 9abb833ab1..45a40995f8 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -109,11 +109,9 @@ public:
     QT_DEPRECATED_X("Use QDir::setPath() instead")
     QDir &operator=(const QString &path);
 #endif
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDir &operator=(QDir &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDir &operator=(QDir &&other) noexcept { swap(other); return *this; }
 
-    void swap(QDir &other) Q_DECL_NOTHROW
+    void swap(QDir &other) noexcept
     { qSwap(d_ptr, other.d_ptr); }
 
     void setPath(const QString &path);
@@ -190,7 +188,7 @@ public:
 
     static QFileInfoList drives();
 
-    Q_DECL_CONSTEXPR static inline QChar listSeparator() Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR static inline QChar listSeparator() noexcept
     {
 #if defined(Q_OS_WIN)
         return QLatin1Char(';');
diff --git a/src/corelib/io/qdir_p.h b/src/corelib/io/qdir_p.h
index 0f3ab7f899..af105de8db 100644
--- a/src/corelib/io/qdir_p.h
+++ b/src/corelib/io/qdir_p.h
@@ -54,6 +54,8 @@
 #include "qfilesystementry_p.h"
 #include "qfilesystemmetadata_p.h"
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QDirPrivate : public QSharedData
@@ -82,7 +84,7 @@ public:
 
     static inline QChar getFilterSepChar(const QString &nameFilter);
 
-    static inline QStringList splitFilters(const QString &nameFilter, QChar sep = 0);
+    static inline QStringList splitFilters(const QString &nameFilter, QChar sep = {});
 
     void setPath(const QString &path);
 
@@ -98,7 +100,7 @@ public:
     QDir::SortFlags sort;
     QDir::Filters filters;
 
-    QScopedPointer<QAbstractFileEngine> fileEngine;
+    std::unique_ptr<QAbstractFileEngine> fileEngine;
 
     QFileSystemEntry dirEntry;
     mutable QFileSystemEntry absoluteDirEntry;
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index ccde9745bf..ce436b06e3 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -93,9 +93,13 @@
 #include "qdir_p.h"
 #include "qabstractfileengine_p.h"
 
+#include <QtCore/qregexp.h>
 #include <QtCore/qset.h>
 #include <QtCore/qstack.h>
 #include <QtCore/qvariant.h>
+#if QT_CONFIG(regularexpression)
+#include <QtCore/qregularexpression.h>
+#endif
 
 #include <QtCore/private/qfilesystemiterator_p.h>
 #include <QtCore/private/qfilesystementry_p.h>
@@ -103,6 +107,8 @@
 #include <QtCore/private/qfilesystemengine_p.h>
 #include <QtCore/private/qfileinfo_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 template <class Iterator>
@@ -128,15 +134,18 @@ public:
     void checkAndPushDirectory(const QFileInfo &);
     bool matchesFilters(const QString &fileName, const QFileInfo &fi) const;
 
-    QScopedPointer<QAbstractFileEngine> engine;
+    std::unique_ptr<QAbstractFileEngine> engine;
 
     QFileSystemEntry dirEntry;
     const QStringList nameFilters;
     const QDir::Filters filters;
     const QDirIterator::IteratorFlags iteratorFlags;
 
-#ifndef QT_NO_REGEXP
+#if defined(QT_BOOTSTRAPPED)
+    // ### Qt6: Get rid of this once we don't bootstrap qmake anymore
     QVector<QRegExp> nameRegExps;
+#elif QT_CONFIG(regularexpression)
+    QVector<QRegularExpression> nameRegExps;
 #endif
 
     QDirIteratorPrivateIteratorStack<QAbstractFileEngineIterator> fileEngineIterators;
@@ -161,13 +170,21 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QFileSystemEntry &entry, const QS
       , filters(QDir::NoFilter == filters ? QDir::AllEntries : filters)
       , iteratorFlags(flags)
 {
-#ifndef QT_NO_REGEXP
+#if defined(QT_BOOTSTRAPPED)
     nameRegExps.reserve(nameFilters.size());
-    for (int i = 0; i < nameFilters.size(); ++i)
+    for (const auto &filter : nameFilters) {
         nameRegExps.append(
-            QRegExp(nameFilters.at(i),
+            QRegExp(filter,
                     (filters & QDir::CaseSensitive) ? Qt::CaseSensitive : Qt::CaseInsensitive,
                     QRegExp::Wildcard));
+    }
+#elif QT_CONFIG(regularexpression)
+    nameRegExps.reserve(nameFilters.size());
+    for (const auto &filter : nameFilters) {
+        QString re = QRegularExpression::anchoredPattern(QRegularExpression::wildcardToRegularExpression(filter));
+        nameRegExps.append(
+            QRegularExpression(re, (filters & QDir::CaseSensitive) ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption));
+    }
 #endif
     QFileSystemMetaData metaData;
     if (resolveEngine)
@@ -334,19 +351,23 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf
         return false;
 
     // name filter
-#ifndef QT_NO_REGEXP
+#if QT_CONFIG(regularexpression) || defined(QT_BOOTSTRAPPED)
     // Pass all entries through name filters, except dirs if the AllDirs
     if (!nameFilters.isEmpty() && !((filters & QDir::AllDirs) && fi.isDir())) {
         bool matched = false;
-        for (QVector<QRegExp>::const_iterator iter = nameRegExps.constBegin(),
-                                              end = nameRegExps.constEnd();
-                iter != end; ++iter) {
-
-            QRegExp copy = *iter;
+        for (const auto &re : nameRegExps) {
+#if defined(QT_BOOTSTRAPPED)
+            QRegExp copy = re;
             if (copy.exactMatch(fileName)) {
                 matched = true;
                 break;
             }
+#else
+            if (re.match(fileName).hasMatch()) {
+                matched = true;
+                break;
+            }
+#endif
         }
         if (!matched)
             return false;
@@ -416,7 +437,7 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf
 QDirIterator::QDirIterator(const QDir &dir, IteratorFlags flags)
 {
     const QDirPrivate *other = dir.d_ptr.constData();
-    d.reset(new QDirIteratorPrivate(other->dirEntry, other->nameFilters, other->filters, flags, !other->fileEngine.isNull()));
+    d.reset(new QDirIteratorPrivate(other->dirEntry, other->nameFilters, other->filters, flags, bool(other->fileEngine)));
 }
 
 /*!
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 37de4450cc..95f03ef816 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -55,12 +55,21 @@
 # include "qcoreapplication.h"
 #endif
 
+#include <private/qmemory_p.h>
+
 #ifdef QT_NO_QOBJECT
 #define tr(X) QString::fromLatin1(X)
 #endif
 
 QT_BEGIN_NAMESPACE
 
+Q_DECL_COLD_FUNCTION
+static bool file_already_open(QFile &file, const char *where = nullptr)
+{
+    qWarning("QFile::%s: File (%ls) already open", where ? where : "open", qUtf16Printable(file.fileName()));
+    return false;
+}
+
 //************* QFilePrivate
 QFilePrivate::QFilePrivate()
 {
@@ -78,10 +87,9 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF
     Q_UNUSED(fd);
     return false;
 #else
-    delete fileEngine;
-    fileEngine = 0;
-    QFSFileEngine *fe = new QFSFileEngine;
-    fileEngine = fe;
+    auto fs = qt_make_unique<QFSFileEngine>();
+    auto fe = fs.get();
+    fileEngine = std::move(fs);
     return fe->open(QIODevice::OpenMode(flags), fd, handleFlags);
 #endif
 }
@@ -94,10 +102,9 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl
     Q_UNUSED(fh);
     return false;
 #else
-    delete fileEngine;
-    fileEngine = 0;
-    QFSFileEngine *fe = new QFSFileEngine;
-    fileEngine = fe;
+    auto fs = qt_make_unique<QFSFileEngine>();
+    auto fe = fs.get();
+    fileEngine = std::move(fs);
     return fe->open(QIODevice::OpenMode(flags), fh, handleFlags);
 #endif
 }
@@ -105,8 +112,8 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl
 QAbstractFileEngine *QFilePrivate::engine() const
 {
     if (!fileEngine)
-        fileEngine = QAbstractFileEngine::create(fileName);
-    return fileEngine;
+        fileEngine.reset(QAbstractFileEngine::create(fileName));
+    return fileEngine.get();
 }
 
 //************* QFile
@@ -324,14 +331,10 @@ QFile::setFileName(const QString &name)
 {
     Q_D(QFile);
     if (isOpen()) {
-        qWarning("QFile::setFileName: File (%s) is already opened",
-                 qPrintable(fileName()));
+        file_already_open(*this, "setFileName");
         close();
     }
-    if(d->fileEngine) { //get a new file engine later
-        delete d->fileEngine;
-        d->fileEngine = 0;
-    }
+    d->fileEngine.reset(); //get a new file engine later
     d->fileName = name;
 }
 
@@ -804,7 +807,7 @@ QFile::copy(const QString &newName)
                 error = true;
                 d->setError(QFile::CopyError, tr("Cannot open %1 for input").arg(d->fileName));
             } else {
-                QString fileTemplate = QLatin1String("%1/qt_temp.XXXXXX");
+                const auto fileTemplate = QLatin1String("%1/qt_temp.XXXXXX");
 #ifdef QT_NO_TEMPORARYFILE
                 QFile out(fileTemplate.arg(QFileInfo(newName).path()));
                 if (!out.open(QIODevice::ReadWrite))
@@ -910,10 +913,8 @@ QFile::copy(const QString &fileName, const QString &newName)
 bool QFile::open(OpenMode mode)
 {
     Q_D(QFile);
-    if (isOpen()) {
-        qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));
-        return false;
-    }
+    if (isOpen())
+        return file_already_open(*this);
     // Either Append or NewOnly implies WriteOnly
     if (mode & (Append | NewOnly))
         mode |= WriteOnly;
@@ -982,10 +983,8 @@ bool QFile::open(OpenMode mode)
 bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags)
 {
     Q_D(QFile);
-    if (isOpen()) {
-        qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));
-        return false;
-    }
+    if (isOpen())
+        return file_already_open(*this);
     // Either Append or NewOnly implies WriteOnly
     if (mode & (Append | NewOnly))
         mode |= WriteOnly;
@@ -1041,10 +1040,8 @@ bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags)
 bool QFile::open(int fd, OpenMode mode, FileHandleFlags handleFlags)
 {
     Q_D(QFile);
-    if (isOpen()) {
-        qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));
-        return false;
-    }
+    if (isOpen())
+        return file_already_open(*this);
     // Either Append or NewOnly implies WriteOnly
     if (mode & (Append | NewOnly))
         mode |= WriteOnly;
diff --git a/src/corelib/io/qfiledevice.cpp b/src/corelib/io/qfiledevice.cpp
index 0689118f3e..ee619d99cc 100644
--- a/src/corelib/io/qfiledevice.cpp
+++ b/src/corelib/io/qfiledevice.cpp
@@ -42,6 +42,8 @@
 #include "qfiledevice_p.h"
 #include "qfsfileengine_p.h"
 
+#include <private/qmemory_p.h>
+
 #ifdef QT_NO_QOBJECT
 #define tr(X) QString::fromLatin1(X)
 #endif
@@ -53,24 +55,20 @@ QT_BEGIN_NAMESPACE
 #endif
 
 QFileDevicePrivate::QFileDevicePrivate()
-    : fileEngine(0),
-      cachedSize(0),
+    : cachedSize(0),
       error(QFile::NoError), lastWasWrite(false)
 {
     writeBufferChunkSize = QFILE_WRITEBUFFER_SIZE;
 }
 
 QFileDevicePrivate::~QFileDevicePrivate()
-{
-    delete fileEngine;
-    fileEngine = 0;
-}
+    = default;
 
 QAbstractFileEngine * QFileDevicePrivate::engine() const
 {
     if (!fileEngine)
-        fileEngine = new QFSFileEngine;
-    return fileEngine;
+        fileEngine = qt_make_unique<QFSFileEngine>();
+    return fileEngine.get();
 }
 
 void QFileDevicePrivate::setError(QFileDevice::FileError err)
diff --git a/src/corelib/io/qfiledevice_p.h b/src/corelib/io/qfiledevice_p.h
index 47053d01b7..aef3fca811 100644
--- a/src/corelib/io/qfiledevice_p.h
+++ b/src/corelib/io/qfiledevice_p.h
@@ -53,6 +53,8 @@
 
 #include "private/qiodevice_p.h"
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QAbstractFileEngine;
@@ -75,7 +77,7 @@ protected:
     void setError(QFileDevice::FileError err, const QString &errorString);
     void setError(QFileDevice::FileError err, int errNum);
 
-    mutable QAbstractFileEngine *fileEngine;
+    mutable std::unique_ptr<QAbstractFileEngine> fileEngine;
     mutable qint64 cachedSize;
 
     QFileDevice::FileHandleFlags handleFlags;
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 82d848eba0..89834de29f 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -52,7 +52,7 @@ QString QFileInfoPrivate::getFileName(QAbstractFileEngine::FileName name) const
         return fileNames[(int)name];
 
     QString ret;
-    if (fileEngine == 0) { // local file; use the QFileSystemEngine directly
+    if (fileEngine == nullptr) { // local file; use the QFileSystemEngine directly
         switch (name) {
             case QAbstractFileEngine::CanonicalName:
             case QAbstractFileEngine::CanonicalPathName: {
@@ -103,7 +103,7 @@ QString QFileInfoPrivate::getFileOwner(QAbstractFileEngine::FileOwner own) const
     if (cache_enabled && !fileOwners[(int)own].isNull())
         return fileOwners[(int)own];
     QString ret;
-    if (fileEngine == 0) {
+    if (fileEngine == nullptr) {
         switch (own) {
         case QAbstractFileEngine::OwnerUser:
             ret = QFileSystemEngine::resolveUserName(fileEntry, metaData);
@@ -134,7 +134,7 @@ uint QFileInfoPrivate::getFileFlags(QAbstractFileEngine::FileFlags request) cons
     // extra syscall. Bundle detecton on Mac can be slow, expecially on network
     // paths, so we separate out that as well.
 
-    QAbstractFileEngine::FileFlags req = 0;
+    QAbstractFileEngine::FileFlags req = nullptr;
     uint cachedFlags = 0;
 
     if (request & (QAbstractFileEngine::FlagsMask | QAbstractFileEngine::TypesMask)) {
@@ -256,11 +256,11 @@ QDateTime &QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request)
 
     \snippet code/src_corelib_io_qfileinfo.cpp 0
 
-    On Windows, symlinks (shortcuts) are \c .lnk files. Similarly to Unix
-    systems, the property getters return the size of the targeted file, not
-    the \c .lnk file itself. Please note this behavior is deprecated and will
-    likely be removed in a future version of Qt, after which \c .lnk files will
-    be treated as regular files.
+    On Windows, shortcuts (\c .lnk files) are currently treated as symlinks. As
+    on Unix systems, the property getters return the size of the targeted file,
+    not the \c .lnk file itself.  This behavior is deprecated and will likely be
+    removed in a future version of Qt, after which \c .lnk files will be treated
+    as regular files.
 
     \snippet code/src_corelib_io_qfileinfo.cpp 1
 
@@ -435,7 +435,7 @@ bool QFileInfo::operator==(const QFileInfo &fileinfo) const
         return true;
 
     Qt::CaseSensitivity sensitive;
-    if (d->fileEngine == 0 || fileinfo.d_ptr->fileEngine == 0) {
+    if (d->fileEngine == nullptr || fileinfo.d_ptr->fileEngine == nullptr) {
         if (d->fileEngine != fileinfo.d_ptr->fileEngine) // one is native, the other is a custom file-engine
             return false;
 
@@ -650,7 +650,7 @@ bool QFileInfo::isRelative() const
     Q_D(const QFileInfo);
     if (d->isDefaultConstructed)
         return true;
-    if (d->fileEngine == 0)
+    if (d->fileEngine == nullptr)
         return d->fileEntry.isRelative();
     return d->fileEngine->isRelativePath();
 }
@@ -683,7 +683,7 @@ bool QFileInfo::exists() const
     Q_D(const QFileInfo);
     if (d->isDefaultConstructed)
         return false;
-    if (d->fileEngine == 0) {
+    if (d->fileEngine == nullptr) {
         if (!d->cache_enabled || !d->metaData.hasFlags(QFileSystemMetaData::ExistsAttribute))
             QFileSystemEngine::fillMetaData(d->fileEntry, d->metaData, QFileSystemMetaData::ExistsAttribute);
         return d->metaData.exists();
@@ -708,11 +708,11 @@ bool QFileInfo::exists(const QString &file)
         return false;
     QFileSystemEntry entry(file);
     QFileSystemMetaData data;
-    QAbstractFileEngine *engine =
-        QFileSystemEngine::resolveEntryAndCreateLegacyEngine(entry, data);
+    std::unique_ptr<QAbstractFileEngine> engine
+        {QFileSystemEngine::resolveEntryAndCreateLegacyEngine(entry, data)};
     // Expensive fallback to non-QFileSystemEngine implementation
     if (engine)
-        return QFileInfo(new QFileInfoPrivate(entry, data, engine)).exists();
+        return QFileInfo(new QFileInfoPrivate(entry, data, std::move(engine))).exists();
 
     QFileSystemEngine::fillMetaData(entry, data, QFileSystemMetaData::ExistsAttribute);
     return data.exists();
@@ -997,7 +997,7 @@ bool QFileInfo::isNativePath() const
     Q_D(const QFileInfo);
     if (d->isDefaultConstructed)
         return false;
-    if (d->fileEngine == 0)
+    if (d->fileEngine == nullptr)
         return true;
     return d->getFileFlags(QAbstractFileEngine::LocalDiskFlag);
 }
@@ -1060,7 +1060,7 @@ bool QFileInfo::isBundle() const
 }
 
 /*!
-    Returns \c true if this object points to a symbolic link;
+    Returns \c true if this object points to a symbolic link or shortcut;
     otherwise returns \c false.
 
     Symbolic links exist on Unix (including \macos and iOS) and Windows
@@ -1091,6 +1091,61 @@ bool QFileInfo::isSymLink() const
 }
 
 /*!
+    Returns \c true if this object points to a symbolic link;
+    otherwise returns \c false.
+
+    Symbolic links exist on Unix (including \macos and iOS) and Windows
+    (NTFS-symlink) and are typically created by the \c{ln -s} or \c{mklink}
+    commands, respectively.
+
+    Unix handles symlinks transparently. Opening a symbolic link effectively
+    opens the \l{symLinkTarget()}{link's target}.
+
+    In contrast to isSymLink(), false will be returned for shortcuts
+    (\c *.lnk files) on Windows. Use QFileInfo::isShortcut() instead.
+
+    \note If the symlink points to a non existing file, exists() returns
+    false.
+
+    \sa isFile(), isDir(), isShortcut(), symLinkTarget()
+*/
+
+bool QFileInfo::isSymbolicLink() const
+{
+    Q_D(const QFileInfo);
+    return d->checkAttribute<bool>(
+                QFileSystemMetaData::LegacyLinkType,
+                [d]() { return d->metaData.isLink(); },
+                [d]() { return d->getFileFlags(QAbstractFileEngine::LinkType); });
+}
+
+/*!
+    Returns \c true if this object points to a shortcut;
+    otherwise returns \c false.
+
+    Shortcuts only exist on Windows and are typically \c .lnk files.
+    For instance, true will be returned for shortcuts (\c *.lnk files) on
+    Windows, but false will be returned on Unix (including \macos and iOS).
+
+    The shortcut (.lnk) files are treated as regular files. Opening those will
+    open the \c .lnk file itself. In order to open the file a shortcut
+    references to, it must uses symLinkTarget() on a shortcut.
+
+    \note Even if a shortcut (broken shortcut) points to a non existing file,
+    isShortcut() returns true.
+
+    \sa isFile(), isDir(), isSymbolicLink(), symLinkTarget()
+*/
+bool QFileInfo::isShortcut() const
+{
+    Q_D(const QFileInfo);
+    return d->checkAttribute<bool>(
+            QFileSystemMetaData::LegacyLinkType,
+            [d]() { return d->metaData.isLnkFile(); },
+            [d]() { return d->getFileFlags(QAbstractFileEngine::LinkType); });
+}
+
+/*!
     Returns \c true if the object points to a directory or to a symbolic
     link to a directory, and that directory is the root directory; otherwise
     returns \c false.
@@ -1100,7 +1155,7 @@ bool QFileInfo::isRoot() const
     Q_D(const QFileInfo);
     if (d->isDefaultConstructed)
         return false;
-    if (d->fileEngine == 0) {
+    if (d->fileEngine == nullptr) {
         if (d->fileEntry.isRoot()) {
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
             //the path is a drive root, but the drive may not exist
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index baea18fab1..3ac028085a 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -67,11 +67,9 @@ public:
     ~QFileInfo();
 
     QFileInfo &operator=(const QFileInfo &fileinfo);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QFileInfo &operator=(QFileInfo &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QFileInfo &operator=(QFileInfo &&other) noexcept { swap(other); return *this; }
 
-    void swap(QFileInfo &other) Q_DECL_NOTHROW
+    void swap(QFileInfo &other) noexcept
     { qSwap(d_ptr, other.d_ptr); }
 
     bool operator==(const QFileInfo &fileinfo) const;
@@ -113,6 +111,8 @@ public:
     bool isFile() const;
     bool isDir() const;
     bool isSymLink() const;
+    bool isSymbolicLink() const;
+    bool isShortcut() const;
     bool isRoot() const;
     bool isBundle() const;
 
diff --git a/src/corelib/io/qfileinfo_p.h b/src/corelib/io/qfileinfo_p.h
index e4b28f4519..333ea70adc 100644
--- a/src/corelib/io/qfileinfo_p.h
+++ b/src/corelib/io/qfileinfo_p.h
@@ -61,6 +61,8 @@
 #include <QtCore/private/qfilesystementry_p.h>
 #include <QtCore/private/qfilesystemmetadata_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QFileInfoPrivate : public QSharedData
@@ -80,7 +82,7 @@ public:
     };
 
     inline QFileInfoPrivate()
-        : QSharedData(), fileEngine(0),
+        : QSharedData(), fileEngine(nullptr),
         cachedFlags(0),
         isDefaultConstructed(true),
         cache_enabled(true), fileFlags(0), fileSize(0)
@@ -126,10 +128,10 @@ public:
             metaData = QFileSystemMetaData();
     }
 
-    inline QFileInfoPrivate(const QFileSystemEntry &file, const QFileSystemMetaData &data, QAbstractFileEngine *engine)
+    inline QFileInfoPrivate(const QFileSystemEntry &file, const QFileSystemMetaData &data, std::unique_ptr<QAbstractFileEngine> engine)
         : fileEntry(file),
         metaData(data),
-        fileEngine(engine),
+        fileEngine{std::move(engine)},
         cachedFlags(0),
 #ifndef QT_NO_FSFILEENGINE
         isDefaultConstructed(false),
@@ -163,7 +165,7 @@ public:
     QFileSystemEntry fileEntry;
     mutable QFileSystemMetaData metaData;
 
-    QScopedPointer<QAbstractFileEngine> const fileEngine;
+    std::unique_ptr<QAbstractFileEngine> const fileEngine;
 
     mutable QString fileNames[QAbstractFileEngine::NFileNames];
     mutable QString fileOwners[2];  // QAbstractFileEngine::FileOwner: OwnerUser and OwnerGroup
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp
index 500b475d1d..31c490de66 100644
--- a/src/corelib/io/qfileselector.cpp
+++ b/src/corelib/io/qfileselector.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QDir>
 #include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
+#include <QtCore/private/qlocking_p.h>
 #include <QtCore/QUrl>
 #include <QtCore/QFileInfo>
 #include <QtCore/QLocale>
@@ -312,7 +312,7 @@ void QFileSelector::setExtraSelectors(const QStringList &list)
 QStringList QFileSelector::allSelectors() const
 {
     Q_D(const QFileSelector);
-    QMutexLocker locker(&sharedDataMutex);
+    const auto locker = qt_scoped_lock(sharedDataMutex);
     QFileSelectorPrivate::updateSelectors();
     return d->extras + sharedData->staticSelectors;
 }
@@ -371,7 +371,7 @@ QStringList QFileSelectorPrivate::platformSelectors()
 
 void QFileSelectorPrivate::addStatics(const QStringList &statics)
 {
-    QMutexLocker locker(&sharedDataMutex);
+    const auto locker = qt_scoped_lock(sharedDataMutex);
     sharedData->preloadedStatics << statics;
     sharedData->staticSelectors.clear();
 }
diff --git a/src/corelib/io/qfilesystemengine.cpp b/src/corelib/io/qfilesystemengine.cpp
index 7abdf90bf5..21847c2a7c 100644
--- a/src/corelib/io/qfilesystemengine.cpp
+++ b/src/corelib/io/qfilesystemengine.cpp
@@ -124,7 +124,7 @@ static inline bool _q_checkEntry(QAbstractFileEngine *&engine, bool resolvingEnt
     if (resolvingEntry) {
         if (!(engine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::ExistsFlag)) {
             delete engine;
-            engine = 0;
+            engine = nullptr;
             return false;
         }
     }
@@ -191,7 +191,7 @@ static bool _q_resolveEntryAndCreateLegacyEngine_recursive(QFileSystemEntry &ent
 QAbstractFileEngine *QFileSystemEngine::resolveEntryAndCreateLegacyEngine(
         QFileSystemEntry &entry, QFileSystemMetaData &data) {
     QFileSystemEntry copy = entry;
-    QAbstractFileEngine *engine = 0;
+    QAbstractFileEngine *engine = nullptr;
 
     if (_q_resolveEntryAndCreateLegacyEngine_recursive(copy, data, engine))
         // Reset entry to resolved copy.
diff --git a/src/corelib/io/qfilesystemengine_p.h b/src/corelib/io/qfilesystemengine_p.h
index 09ec2d6a10..e44837747c 100644
--- a/src/corelib/io/qfilesystemengine_p.h
+++ b/src/corelib/io/qfilesystemengine_p.h
@@ -130,7 +130,7 @@ public:
     static bool removeFile(const QFileSystemEntry &entry, QSystemError &error);
 
     static bool setPermissions(const QFileSystemEntry &entry, QFile::Permissions permissions, QSystemError &error,
-                               QFileSystemMetaData *data = 0);
+                               QFileSystemMetaData *data = nullptr);
 
     // unused, therefore not implemented
     static bool setFileTime(const QFileSystemEntry &entry, const QDateTime &newDate,
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index b78e037865..74865fe31f 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -813,7 +813,7 @@ QString QFileSystemEngine::resolveUserName(uint userId)
 #endif
 
 #if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_WASM)
-    struct passwd *pw = 0;
+    struct passwd *pw = nullptr;
 #if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS)
     struct passwd entry;
     getpwuid_r(userId, &entry, buf.data(), buf.size(), &pw);
@@ -822,6 +822,8 @@ QString QFileSystemEngine::resolveUserName(uint userId)
 #endif
     if (pw)
         return QFile::decodeName(QByteArray(pw->pw_name));
+#else // Integrity || WASM
+    Q_UNUSED(userId);
 #endif
     return QString();
 }
@@ -837,7 +839,7 @@ QString QFileSystemEngine::resolveGroupName(uint groupId)
 #endif
 
 #if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_WASM)
-    struct group *gr = 0;
+    struct group *gr = nullptr;
 #if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS) && (!defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID) && (__ANDROID_API__ >= 24))
     size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
     if (size_max == -1)
@@ -859,6 +861,8 @@ QString QFileSystemEngine::resolveGroupName(uint groupId)
 #endif
     if (gr)
         return QFile::decodeName(QByteArray(gr->gr_name));
+#else // Integrity || WASM
+    Q_UNUSED(groupId);
 #endif
     return QString();
 }
diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp
index 0d178d062a..74b7e820d9 100644
--- a/src/corelib/io/qfilesystemiterator_unix.cpp
+++ b/src/corelib/io/qfilesystemiterator_unix.cpp
@@ -93,15 +93,15 @@ static bool checkNameDecodable(const char *d_name, qsizetype len)
 QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters,
                                          const QStringList &nameFilters, QDirIterator::IteratorFlags flags)
     : nativePath(entry.nativeFilePath())
-    , dir(0)
-    , dirEntry(0)
+    , dir(nullptr)
+    , dirEntry(nullptr)
     , lastError(0)
 {
     Q_UNUSED(filters)
     Q_UNUSED(nameFilters)
     Q_UNUSED(flags)
 
-    if ((dir = QT_OPENDIR(nativePath.constData())) == 0) {
+    if ((dir = QT_OPENDIR(nativePath.constData())) == nullptr) {
         lastError = errno;
     } else {
         if (!nativePath.endsWith('/'))
diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h
index 4d2a5acb9b..81f4b3ba13 100644
--- a/src/corelib/io/qfilesystemmetadata_p.h
+++ b/src/corelib/io/qfilesystemmetadata_p.h
@@ -76,7 +76,7 @@ class Q_AUTOTEST_EXPORT QFileSystemMetaData
 {
 public:
     QFileSystemMetaData()
-        : knownFlagsMask(0),
+        : knownFlagsMask(nullptr),
           size_(-1)
     {
     }
@@ -184,7 +184,7 @@ public:
 
     void clear()
     {
-        knownFlagsMask = 0;
+        knownFlagsMask = nullptr;
     }
 
     void clearFlags(MetaDataFlags flags = AllMetaDataFlags)
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index f40e166d9f..54460aff77 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -41,13 +41,13 @@
 #include "qfilesystemwatcher_p.h"
 
 #include <qdatetime.h>
-#include <qdebug.h>
 #include <qdir.h>
 #include <qfileinfo.h>
+#include <qloggingcategory.h>
 #include <qset.h>
 #include <qtimer.h>
 
-#if defined(Q_OS_LINUX) || (defined(Q_OS_QNX) && !defined(QT_NO_INOTIFY))
+#if (defined(Q_OS_LINUX) || defined(Q_OS_QNX)) && QT_CONFIG(inotify)
 #define USE_INOTIFY
 #endif
 
@@ -67,6 +67,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(lcWatcher, "qt.core.filesystemwatcher")
+
 QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine(QObject *parent)
 {
 #if defined(Q_OS_WIN)
@@ -137,6 +139,7 @@ void QFileSystemWatcherPrivate::initPollerEngine()
 void QFileSystemWatcherPrivate::_q_fileChanged(const QString &path, bool removed)
 {
     Q_Q(QFileSystemWatcher);
+    qCDebug(lcWatcher) << "file changed" << path << "removed?" << removed << "watching?" << files.contains(path);
     if (!files.contains(path)) {
         // the path was removed after a change was detected, but before we delivered the signal
         return;
@@ -149,6 +152,7 @@ void QFileSystemWatcherPrivate::_q_fileChanged(const QString &path, bool removed
 void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool removed)
 {
     Q_Q(QFileSystemWatcher);
+    qCDebug(lcWatcher) << "directory changed" << path << "removed?" << removed << "watching?" << directories.contains(path);
     if (!directories.contains(path)) {
         // perhaps the path was removed after a change was detected, but before we delivered the signal
         return;
@@ -311,6 +315,17 @@ bool QFileSystemWatcher::addPath(const QString &path)
     return paths.isEmpty();
 }
 
+static QStringList empty_paths_pruned(const QStringList &paths)
+{
+    QStringList p;
+    p.reserve(paths.size());
+    const auto isEmpty = [](const QString &s) { return s.isEmpty(); };
+    std::remove_copy_if(paths.begin(), paths.end(),
+                        std::back_inserter(p),
+                        isEmpty);
+    return p;
+}
+
 /*!
     Adds each path in \a paths to the file system watcher. Paths are
     not added if they not exist, or if they are already being
@@ -338,47 +353,41 @@ QStringList QFileSystemWatcher::addPaths(const QStringList &paths)
 {
     Q_D(QFileSystemWatcher);
 
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-
-    while (it.hasNext()) {
-        const QString &path = it.next();
-        if (path.isEmpty())
-            it.remove();
-    }
+    QStringList p = empty_paths_pruned(paths);
 
     if (p.isEmpty()) {
         qWarning("QFileSystemWatcher::addPaths: list is empty");
-        return QStringList();
+        return p;
     }
-
-    QFileSystemWatcherEngine *engine = 0;
-
-    const QString on = objectName();
-
-    if (!on.startsWith(QLatin1String("_qt_autotest_force_engine_"))) {
+    qCDebug(lcWatcher) << "adding" << paths;
+    const auto selectEngine = [this, d]() -> QFileSystemWatcherEngine* {
+#ifdef QT_BUILD_INTERNAL
+        const QString on = objectName();
+
+        if (Q_UNLIKELY(on.startsWith(QLatin1String("_qt_autotest_force_engine_")))) {
+            // Autotest override case - use the explicitly selected engine only
+            const QStringRef forceName = on.midRef(26);
+            if (forceName == QLatin1String("poller")) {
+                qCDebug(lcWatcher, "QFileSystemWatcher: skipping native engine, using only polling engine");
+                d_func()->initPollerEngine();
+                return d->poller;
+            } else if (forceName == QLatin1String("native")) {
+                qCDebug(lcWatcher, "QFileSystemWatcher: skipping polling engine, using only native engine");
+                return d->native;
+            }
+            return nullptr;
+        }
+#endif
         // Normal runtime case - search intelligently for best engine
         if(d->native) {
-            engine = d->native;
+            return d->native;
         } else {
             d_func()->initPollerEngine();
-            engine = d->poller;
+            return d->poller;
         }
+    };
 
-    } else {
-        // Autotest override case - use the explicitly selected engine only
-        const QStringRef forceName = on.midRef(26);
-        if(forceName == QLatin1String("poller")) {
-            qDebug("QFileSystemWatcher: skipping native engine, using only polling engine");
-            d_func()->initPollerEngine();
-            engine = d->poller;
-        } else if(forceName == QLatin1String("native")) {
-            qDebug("QFileSystemWatcher: skipping polling engine, using only native engine");
-            engine = d->native;
-        }
-    }
-
-    if(engine)
+    if (auto engine = selectEngine())
         p = engine->addPaths(p, &d->files, &d->directories);
 
     return p;
@@ -420,19 +429,13 @@ QStringList QFileSystemWatcher::removePaths(const QStringList &paths)
 {
     Q_D(QFileSystemWatcher);
 
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-
-    while (it.hasNext()) {
-        const QString &path = it.next();
-        if (path.isEmpty())
-            it.remove();
-    }
+    QStringList p = empty_paths_pruned(paths);
 
     if (p.isEmpty()) {
         qWarning("QFileSystemWatcher::removePaths: list is empty");
-        return QStringList();
+        return p;
     }
+    qCDebug(lcWatcher) << "removing" << paths;
 
     if (d->native)
         p = d->native->removePaths(p, &d->files, &d->directories);
@@ -448,6 +451,12 @@ QStringList QFileSystemWatcher::removePaths(const QStringList &paths)
     This signal is emitted when the file at the specified \a path is
     modified, renamed or removed from disk.
 
+    \note As a safety measure, many applications save an open file by
+    writing a new file and then deleting the old one. In your slot
+    function, you can check \c watcher.files().contains(path).
+    If it returns \c false, check whether the file still exists
+    and then call \c addPath() to continue watching it.
+
     \sa directoryChanged()
 */
 
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm
index f594fad803..6194bf7c71 100644
--- a/src/corelib/io/qfilesystemwatcher_fsevents.mm
+++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm
@@ -50,6 +50,7 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qvarlengtharray.h>
+#include <qscopeguard.h>
 
 #undef FSEVENT_DEBUG
 #ifdef FSEVENT_DEBUG
@@ -338,10 +339,10 @@ QStringList QFseventsFileSystemWatcherEngine::addPaths(const QStringList &paths,
     bool needsRestart = false;
 
     WatchingState oldState = watchingState;
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString origPath = it.next().normalized(QString::NormalizationForm_C);
+    QStringList unhandled;
+    for (const QString &path : paths) {
+        auto sg = qScopeGuard([&]{ unhandled.push_back(path); });
+        QString origPath = path.normalized(QString::NormalizationForm_C);
         QString realPath = origPath;
         if (realPath.endsWith(QDir::separator()))
             realPath = realPath.mid(0, realPath.size() - 1);
@@ -362,17 +363,17 @@ QStringList QFseventsFileSystemWatcherEngine::addPaths(const QStringList &paths,
                 continue;
             directories->append(origPath);
             watchedPath = realPath;
-            it.remove();
         } else {
             if (files->contains(origPath))
                 continue;
             files->append(origPath);
-            it.remove();
 
             watchedPath = fi.path();
             parentPath = watchedPath;
         }
 
+        sg.dismiss();
+
         for (PathRefCounts::const_iterator i = watchingState.watchedPaths.begin(),
                 ei = watchingState.watchedPaths.end(); i != ei; ++i) {
             if (watchedPath.startsWith(i.key() % QDir::separator())) {
@@ -407,16 +408,16 @@ QStringList QFseventsFileSystemWatcherEngine::addPaths(const QStringList &paths,
         stopStream();
         if (!startStream()) {
             // ok, something went wrong, let's try to restore the previous state
-            watchingState = qMove(oldState);
+            watchingState = std::move(oldState);
             // and because we don't know which path caused the issue (if any), fail on all of them
-            p = paths;
+            unhandled = paths;
 
             if (wasRunning)
                 startStream();
         }
     }
 
-    return p;
+    return unhandled;
 }
 
 QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &paths,
@@ -430,10 +431,9 @@ QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &pat
     bool needsRestart = false;
 
     WatchingState oldState = watchingState;
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString origPath = it.next();
+    QStringList unhandled;
+    for (const QString &origPath : paths) {
+        auto sg = qScopeGuard([&]{ unhandled.push_back(origPath); });
         QString realPath = origPath;
         if (realPath.endsWith(QDir::separator()))
             realPath = realPath.mid(0, realPath.size() - 1);
@@ -447,7 +447,7 @@ QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &pat
                 needsRestart |= derefPath(dirIt->dirInfo.watchedPath);
                 watchingState.watchedDirectories.erase(dirIt);
                 directories->removeAll(origPath);
-                it.remove();
+                sg.dismiss();
                 DEBUG("Removed directory '%s'", qPrintable(realPath));
             }
         } else {
@@ -463,7 +463,7 @@ QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &pat
                     if (filesInDir.isEmpty())
                         watchingState.watchedFiles.erase(pIt);
                     files->removeAll(origPath);
-                    it.remove();
+                    sg.dismiss();
                     DEBUG("Removed file '%s'", qPrintable(realPath));
                 }
             }
@@ -474,12 +474,12 @@ QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &pat
 
     if (needsRestart) {
         if (!restartStream()) {
-            watchingState = qMove(oldState);
+            watchingState = std::move(oldState);
             startStream();
         }
     }
 
-    return p;
+    return unhandled;
 }
 
 // Returns false if FSEventStream* calls failed for some mysterious reason, true if things got a
diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index a5e629b646..ca1f6cc359 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -46,6 +46,7 @@
 #include <qdebug.h>
 #include <qfile.h>
 #include <qfileinfo.h>
+#include <qscopeguard.h>
 #include <qsocketnotifier.h>
 #include <qvarlengtharray.h>
 
@@ -268,12 +269,11 @@ QStringList QInotifyFileSystemWatcherEngine::addPaths(const QStringList &paths,
                                                       QStringList *files,
                                                       QStringList *directories)
 {
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
         QFileInfo fi(path);
         bool isDir = fi.isDir();
+        auto sg = qScopeGuard([&]{ unhandled.push_back(path); });
         if (isDir) {
             if (directories->contains(path))
                 continue;
@@ -305,7 +305,7 @@ QStringList QInotifyFileSystemWatcherEngine::addPaths(const QStringList &paths,
             continue;
         }
 
-        it.remove();
+        sg.dismiss();
 
         int id = isDir ? -wd : wd;
         if (id < 0) {
@@ -318,19 +318,19 @@ QStringList QInotifyFileSystemWatcherEngine::addPaths(const QStringList &paths,
         idToPath.insert(id, path);
     }
 
-    return p;
+    return unhandled;
 }
 
 QStringList QInotifyFileSystemWatcherEngine::removePaths(const QStringList &paths,
                                                          QStringList *files,
                                                          QStringList *directories)
 {
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
         int id = pathToID.take(path);
 
+        auto sg = qScopeGuard([&]{ unhandled.push_back(path); });
+
         // Multiple paths could be associated to the same watch descriptor
         // when a file is moved and added with the new name.
         // So we should find and delete the correct one by using
@@ -349,7 +349,8 @@ QStringList QInotifyFileSystemWatcherEngine::removePaths(const QStringList &path
             inotify_rm_watch(inotifyFd, wd);
         }
 
-        it.remove();
+        sg.dismiss();
+
         if (id < 0) {
             directories->removeAll(path);
         } else {
@@ -357,7 +358,7 @@ QStringList QInotifyFileSystemWatcherEngine::removePaths(const QStringList &path
         }
     }
 
-    return p;
+    return unhandled;
 }
 
 void QInotifyFileSystemWatcherEngine::readFromInotify()
@@ -388,7 +389,7 @@ void QInotifyFileSystemWatcherEngine::readFromInotify()
         const inotify_event &event = **it;
         ++it;
 
-        // qDebug() << "inotify event, wd" << event.wd << "mask" << hex << event.mask;
+        // qDebug() << "inotify event, wd" << event.wd << "mask" << Qt::hex << event.mask;
 
         int id = event.wd;
         QString path = getPathFromID(id);
@@ -421,16 +422,27 @@ void QInotifyFileSystemWatcherEngine::readFromInotify()
     }
 }
 
-QString QInotifyFileSystemWatcherEngine::getPathFromID(int id) const
+template <typename Hash, typename Key>
+typename Hash::const_iterator
+find_last_in_equal_range(const Hash &c, const Key &key)
 {
-    QHash<int, QString>::const_iterator i = idToPath.find(id);
-    while (i != idToPath.constEnd() && i.key() == id) {
-        if ((i + 1) == idToPath.constEnd() || (i + 1).key() != id) {
-            return i.value();
-        }
+    // find c.equal_range(key).second - 1 without backwards iteration:
+    auto i = c.find(key);
+    const auto end = c.cend();
+    if (i == end)
+        return end;
+    decltype(i) prev;
+    do {
+        prev = i;
         ++i;
-    }
-    return QString();
+    } while (i != end && i.key() == key);
+    return prev;
+}
+
+QString QInotifyFileSystemWatcherEngine::getPathFromID(int id) const
+{
+    auto i = find_last_in_equal_range(idToPath, id);
+    return i == idToPath.cend() ? QString() : i.value() ;
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
index 423b88cb7f..c2028e3641 100644
--- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp
+++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
@@ -45,6 +45,7 @@
 
 #include <qdebug.h>
 #include <qfile.h>
+#include <qscopeguard.h>
 #include <qsocketnotifier.h>
 #include <qvarlengtharray.h>
 
@@ -94,10 +95,9 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths,
                                                      QStringList *files,
                                                      QStringList *directories)
 {
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
+        auto sg = qScopeGuard([&]{unhandled.push_back(path);});
         int fd;
 #if defined(O_EVTONLY)
         fd = qt_safe_open(QFile::encodeName(path), O_EVTONLY);
@@ -149,7 +149,8 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths,
             continue;
         }
 
-        it.remove();
+        sg.dismiss();
+
         if (id < 0) {
             DEBUG() << "QKqueueFileSystemWatcherEngine: added directory path" << path;
             directories->append(path);
@@ -162,20 +163,19 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths,
         idToPath.insert(id, path);
     }
 
-    return p;
+    return unhandled;
 }
 
 QStringList QKqueueFileSystemWatcherEngine::removePaths(const QStringList &paths,
                                                         QStringList *files,
                                                         QStringList *directories)
 {
-    QStringList p = paths;
     if (pathToID.isEmpty())
-        return p;
+        return paths;
 
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
+        auto sg = qScopeGuard([&]{unhandled.push_back(path);});
         int id = pathToID.take(path);
         QString x = idToPath.take(id);
         if (x.isEmpty() || x != path)
@@ -183,14 +183,15 @@ QStringList QKqueueFileSystemWatcherEngine::removePaths(const QStringList &paths
 
         ::close(id < 0 ? -id : id);
 
-        it.remove();
+        sg.dismiss();
+
         if (id < 0)
             directories->removeAll(path);
         else
             files->removeAll(path);
     }
 
-    return p;
+    return unhandled;
 }
 
 void QKqueueFileSystemWatcherEngine::readFromKqueue()
diff --git a/src/corelib/io/qfilesystemwatcher_polling.cpp b/src/corelib/io/qfilesystemwatcher_polling.cpp
index 903c15f4a9..e07b02f7c2 100644
--- a/src/corelib/io/qfilesystemwatcher_polling.cpp
+++ b/src/corelib/io/qfilesystemwatcher_polling.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qfilesystemwatcher_polling_p.h"
+#include <QtCore/qscopeguard.h>
 #include <QtCore/qtimer.h>
 
 QT_BEGIN_NAMESPACE
@@ -53,10 +54,9 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths,
                                                       QStringList *files,
                                                       QStringList *directories)
 {
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
+        auto sg = qScopeGuard([&]{ unhandled.push_back(path); });
         QFileInfo fi(path);
         if (!fi.exists())
             continue;
@@ -73,7 +73,7 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths,
             files->append(path);
             this->files.insert(path, fi);
         }
-        it.remove();
+        sg.dismiss();
     }
 
     if ((!this->files.isEmpty() ||
@@ -82,23 +82,21 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths,
         timer.start(PollingInterval);
     }
 
-    return p;
+    return unhandled;
 }
 
 QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &paths,
                                                          QStringList *files,
                                                          QStringList *directories)
 {
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
         if (this->directories.remove(path)) {
             directories->removeAll(path);
-            it.remove();
         } else if (this->files.remove(path)) {
             files->removeAll(path);
-            it.remove();
+        } else {
+            unhandled.push_back(path);
         }
     }
 
@@ -107,38 +105,37 @@ QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &path
         timer.stop();
     }
 
-    return p;
+    return unhandled;
 }
 
 void QPollingFileSystemWatcherEngine::timeout()
 {
-    QMutableHashIterator<QString, FileInfo> fit(files);
-    while (fit.hasNext()) {
-        QHash<QString, FileInfo>::iterator x = fit.next();
+    for (auto it = files.begin(), end = files.end(); it != end; /*erasing*/) {
+        auto x = it++;
         QString path = x.key();
         QFileInfo fi(path);
         if (!fi.exists()) {
-            fit.remove();
+            files.erase(x);
             emit fileChanged(path, true);
         } else if (x.value() != fi) {
             x.value() = fi;
             emit fileChanged(path, false);
         }
     }
-    QMutableHashIterator<QString, FileInfo> dit(directories);
-    while (dit.hasNext()) {
-        QHash<QString, FileInfo>::iterator x = dit.next();
+
+    for (auto it = directories.begin(), end = directories.end(); it != end; /*erasing*/) {
+        auto x = it++;
         QString path = x.key();
         QFileInfo fi(path);
         if (!path.endsWith(QLatin1Char('/')))
             fi = QFileInfo(path + QLatin1Char('/'));
         if (!fi.exists()) {
-            dit.remove();
+            directories.erase(x);
             emit directoryChanged(path, true);
         } else if (x.value() != fi) {
             fi.refresh();
             if (!fi.exists()) {
-                dit.remove();
+                directories.erase(x);
                 emit directoryChanged(path, true);
             } else {
                 x.value() = fi;
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index 66985f8982..5f91ce5e3d 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -44,9 +44,11 @@
 #include <qfileinfo.h>
 #include <qstringlist.h>
 #include <qset.h>
+#include <qscopeguard.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qtextstream.h>
+#include <private/qlocking_p.h>
 
 #include <qt_windows.h>
 
@@ -79,7 +81,7 @@ static Qt::HANDLE createChangeNotification(const QString &path, uint flags)
         nativePath.append(QLatin1Char('\\'));
     const HANDLE result = FindFirstChangeNotification(reinterpret_cast<const wchar_t *>(nativePath.utf16()),
                                                       FALSE, flags);
-    DEBUG() << __FUNCTION__ << nativePath << hex <<showbase << flags << "returns" << result;
+    DEBUG() << __FUNCTION__ << nativePath << Qt::hex <<showbase << flags << "returns" << result;
     return result;
 }
 
@@ -108,7 +110,11 @@ public:
     // Call from QFileSystemWatcher::addPaths() to set up notifications on drives
     void addPath(const QString &path);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &, void *messageIn, qintptr *) override;
+#else
     bool nativeEventFilter(const QByteArray &, void *messageIn, long *) override;
+#endif
 
 signals:
     void driveAdded();
@@ -255,7 +261,11 @@ inline void QWindowsRemovableDriveListener::handleDbtDriveArrivalRemoval(const M
     }
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWindowsRemovableDriveListener::nativeEventFilter(const QByteArray &, void *messageIn, qintptr *)
+#else
 bool QWindowsRemovableDriveListener::nativeEventFilter(const QByteArray &, void *messageIn, long *)
+#endif
 {
     const MSG *msg = reinterpret_cast<const MSG *>(messageIn);
     if (msg->message == WM_DEVICECHANGE) {
@@ -297,8 +307,7 @@ void QWindowsRemovableDriveListener::addPath(const QString &p)
                    OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, //  Volume requires BACKUP_SEMANTICS
                    0);
     if (volumeHandle == INVALID_HANDLE_VALUE) {
-        qErrnoWarning("CreateFile %s failed.",
-                      qPrintable(QString::fromWCharArray(devicePath)));
+        qErrnoWarning("CreateFile %ls failed.", devicePath);
         return;
     }
 
@@ -315,8 +324,7 @@ void QWindowsRemovableDriveListener::addPath(const QString &p)
     // closed. Do it here to avoid having to close/reopen in lock message handling.
     CloseHandle(volumeHandle);
     if (!re.devNotify) {
-        qErrnoWarning("RegisterDeviceNotification %s failed.",
-                      qPrintable(QString::fromWCharArray(devicePath)));
+        qErrnoWarning("RegisterDeviceNotification %ls failed.", devicePath);
         return;
     }
 
@@ -369,10 +377,9 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
                                                        QStringList *directories)
 {
     DEBUG() << "Adding" << paths.count() << "to existing" << (files->count() + directories->count()) << "watchers";
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
+        auto sg = qScopeGuard([&] { unhandled.push_back(path); });
         QString normalPath = path;
         if ((normalPath.endsWith(QLatin1Char('/')) && !normalPath.endsWith(QLatin1String(":/")))
             || (normalPath.endsWith(QLatin1Char('\\')) && !normalPath.endsWith(QLatin1String(":\\")))) {
@@ -417,14 +424,14 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
         end = threads.constEnd();
         for(jt = threads.constBegin(); jt != end; ++jt) {
             thread = *jt;
-            QMutexLocker locker(&(thread->mutex));
+            const auto locker = qt_scoped_lock(thread->mutex);
 
             const auto hit = thread->handleForDir.find(QFileSystemWatcherPathKey(absolutePath));
             if (hit != thread->handleForDir.end() && hit.value().flags < flags) {
                 // Requesting to add a file whose directory has been added previously.
                 // Recreate the notification handle to add the missing notification attributes
                 // for files (FILE_NOTIFY_CHANGE_ATTRIBUTES...)
-                DEBUG() << "recreating" << absolutePath << hex << showbase << hit.value().flags
+                DEBUG() << "recreating" << absolutePath << Qt::hex << Qt::showbase << hit.value().flags
                     << "->" << flags;
                 const Qt::HANDLE fileHandle = createChangeNotification(absolutePath, flags);
                 if (fileHandle != INVALID_HANDLE_VALUE) {
@@ -455,7 +462,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
                     else
                         files->append(path);
                 }
-                it.remove();
+                sg.dismiss();
                 thread->wakeup();
                 break;
             }
@@ -472,7 +479,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
             // now look for a thread to insert
             bool found = false;
             for (QWindowsFileSystemWatcherEngineThread *thread : qAsConst(threads)) {
-                QMutexLocker locker(&(thread->mutex));
+                const auto locker = qt_scoped_lock(thread->mutex);
                 if (thread->handles.count() < MAXIMUM_WAIT_OBJECTS) {
                     DEBUG() << "Added handle" << handle.handle << "for" << absolutePath << "to watch" << fileInfo.absoluteFilePath()
                             << "to existing thread " << thread;
@@ -485,7 +492,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
                     else
                         files->append(path);
 
-                    it.remove();
+                    sg.dismiss();
                     found = true;
                     thread->wakeup();
                     break;
@@ -511,7 +518,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
                 thread->msg = '@';
                 thread->start();
                 threads.append(thread);
-                it.remove();
+                sg.dismiss();
             }
         }
     }
@@ -519,12 +526,12 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
 #ifndef Q_OS_WINRT
     if (Q_LIKELY(m_driveListener)) {
         for (const QString &path : paths) {
-            if (!p.contains(path))
+            if (!unhandled.contains(path))
                 m_driveListener->addPath(path);
         }
     }
 #endif // !Q_OS_WINRT
-    return p;
+    return unhandled;
 }
 
 QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &paths,
@@ -532,10 +539,9 @@ QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &path
                                                           QStringList *directories)
 {
     DEBUG() << "removePaths" << paths;
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
+        auto sg = qScopeGuard([&] { unhandled.push_back(path); });
         QString normalPath = path;
         if (normalPath.endsWith(QLatin1Char('/')) || normalPath.endsWith(QLatin1Char('\\')))
             normalPath.chop(1);
@@ -549,7 +555,7 @@ QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &path
             if (*jt == 0)
                 continue;
 
-            QMutexLocker locker(&(thread->mutex));
+            auto locker = qt_unique_lock(thread->mutex);
 
             QWindowsFileSystemWatcherEngine::Handle handle = thread->handleForDir.value(QFileSystemWatcherPathKey(absolutePath));
             if (handle.handle == INVALID_HANDLE_VALUE) {
@@ -564,7 +570,7 @@ QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &path
                     // ###
                     files->removeAll(path);
                     directories->removeAll(path);
-                    it.remove();
+                    sg.dismiss();
 
                     if (h.isEmpty()) {
                         DEBUG() << "Closing handle" << handle.handle;
@@ -582,7 +588,7 @@ QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &path
                             locker.unlock();
                             thread->stop();
                             thread->wait();
-                            locker.relock();
+                            locker.lock();
                             // We can't delete the thread until the mutex locker is
                             // out of scope
                         }
@@ -605,7 +611,7 @@ QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &path
     }
 
     threads.removeAll(0);
-    return p;
+    return unhandled;
 }
 
 ///////////
@@ -634,26 +640,26 @@ QWindowsFileSystemWatcherEngineThread::~QWindowsFileSystemWatcherEngineThread()
     }
 }
 
-static inline QString msgFindNextFailed(const QWindowsFileSystemWatcherEngineThread::PathInfoHash &pathInfos)
+Q_DECL_COLD_FUNCTION
+static QString msgFindNextFailed(const QWindowsFileSystemWatcherEngineThread::PathInfoHash &pathInfos)
 {
-    QString result;
-    QTextStream str(&result);
-    str << "QFileSystemWatcher: FindNextChangeNotification failed for";
+    QString str;
+    str += QLatin1String("QFileSystemWatcher: FindNextChangeNotification failed for");
     for (const QWindowsFileSystemWatcherEngine::PathInfo &pathInfo : pathInfos)
-        str << " \"" << QDir::toNativeSeparators(pathInfo.absolutePath) << '"';
-    str << ' ';
-    return result;
+        str += QLatin1String(" \"") + QDir::toNativeSeparators(pathInfo.absolutePath) + QLatin1Char('"');
+    str += QLatin1Char(' ');
+    return str;
 }
 
 void QWindowsFileSystemWatcherEngineThread::run()
 {
-    QMutexLocker locker(&mutex);
+    auto locker = qt_unique_lock(mutex);
     forever {
         QVector<HANDLE> handlesCopy = handles;
         locker.unlock();
         DEBUG() << "QWindowsFileSystemWatcherThread" << this << "waiting on" << handlesCopy.count() << "handles";
         DWORD r = WaitForMultipleObjects(handlesCopy.count(), handlesCopy.constData(), false, INFINITE);
-        locker.relock();
+        locker.lock();
         do {
             if (r == WAIT_OBJECT_0) {
                 int m = msg;
@@ -688,11 +694,10 @@ void QWindowsFileSystemWatcherEngineThread::run()
                             fakeRemove = true;
                         }
 
-                        qErrnoWarning(error, "%s", qPrintable(msgFindNextFailed(h)));
+                        qErrnoWarning(error, "%ls", qUtf16Printable(msgFindNextFailed(h)));
                     }
-                    QMutableHashIterator<QFileSystemWatcherPathKey, QWindowsFileSystemWatcherEngine::PathInfo> it(h);
-                    while (it.hasNext()) {
-                        QWindowsFileSystemWatcherEngineThread::PathInfoHash::iterator x = it.next();
+                    for (auto it = h.begin(), end = h.end(); it != end; /*erasing*/ ) {
+                        auto x = it++;
                         QString absolutePath = x.value().absolutePath;
                         QFileInfo fileInfo(x.value().path);
                         DEBUG() << "checking" << x.key();
@@ -718,6 +723,7 @@ void QWindowsFileSystemWatcherEngineThread::run()
 
                                 handleForDir.remove(QFileSystemWatcherPathKey(absolutePath));
                                 // h is now invalid
+                                break;
                             }
                         } else if (x.value().isDir) {
                             DEBUG() << x.key() << "directory changed!";
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index 5d3bef9e70..0d73839f8d 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -127,7 +127,7 @@ void QFSFileEnginePrivate::init()
     is_link = 0;
     openMode = QIODevice::NotOpen;
     fd = -1;
-    fh = 0;
+    fh = nullptr;
     lastIOCommand = IOFlushCommand;
     lastFlushFailed = false;
     closeFileHandle = false;
@@ -247,7 +247,7 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode)
     d->openMode = res.openMode;
     d->lastFlushFailed = false;
     d->tried_stat = 0;
-    d->fh = 0;
+    d->fh = nullptr;
     d->fd = -1;
 
     return d->nativeOpen(d->openMode);
@@ -309,7 +309,7 @@ bool QFSFileEnginePrivate::openFh(QIODevice::OpenMode openMode, FILE *fh)
                         QSystemError::stdString());
 
             this->openMode = QIODevice::NotOpen;
-            this->fh = 0;
+            this->fh = nullptr;
 
             return false;
         }
@@ -341,7 +341,7 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd, QFile::FileHandle
     d->lastFlushFailed = false;
     d->closeFileHandle = (handleFlags & QFile::AutoCloseHandle);
     d->fileEntry.clear();
-    d->fh = 0;
+    d->fh = nullptr;
     d->fd = -1;
     d->tried_stat = 0;
 
@@ -357,7 +357,7 @@ bool QFSFileEnginePrivate::openFd(QIODevice::OpenMode openMode, int fd)
 {
     Q_Q(QFSFileEngine);
     this->fd = fd;
-    fh = 0;
+    fh = nullptr;
 
     // Seek to the end when in Append mode.
     if (openMode & QFile::Append) {
@@ -418,7 +418,7 @@ bool QFSFileEnginePrivate::closeFdFh()
 
         // We must reset these guys regardless; calling close again after a
         // failed close causes crashes on some systems.
-        fh = 0;
+        fh = nullptr;
         fd = -1;
         closed = (ret == 0);
     }
@@ -835,7 +835,7 @@ QAbstractFileEngine::Iterator *QFSFileEngine::beginEntryList(QDir::Filters filte
 */
 QAbstractFileEngine::Iterator *QFSFileEngine::endEntryList()
 {
-    return 0;
+    return nullptr;
 }
 #endif // QT_NO_FILESYSTEMITERATOR
 
@@ -883,7 +883,7 @@ bool QFSFileEngine::extension(Extension extension, const ExtensionOption *option
         const MapExtensionOption *options = (const MapExtensionOption*)(option);
         MapExtensionReturn *returnValue = static_cast<MapExtensionReturn*>(output);
         returnValue->address = d->map(options->offset, options->size, options->flags);
-        return (returnValue->address != 0);
+        return (returnValue->address != nullptr);
     }
     if (extension == UnMapExtension) {
         const UnMapExtensionOption *options = (const UnMapExtensionOption*)option;
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h
index 22109ac5bc..639c01571a 100644
--- a/src/corelib/io/qfsfileengine_p.h
+++ b/src/corelib/io/qfsfileengine_p.h
@@ -122,7 +122,7 @@ public:
     virtual bool isUnnamedFile() const
     { return false; }
 
-    bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override;
+    bool extension(Extension extension, const ExtensionOption *option = nullptr, ExtensionReturn *output = nullptr) override;
     bool supportsExtension(Extension extension) const override;
 
     //FS only!!
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 90ad0126d6..d4983c72af 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -153,7 +153,7 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
             }
         }
 
-        fh = 0;
+        fh = nullptr;
     }
 
     closeFileHandle = true;
@@ -451,14 +451,14 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const
     if (type & Refresh)
         d->metaData.clear();
 
-    QAbstractFileEngine::FileFlags ret = 0;
+    QAbstractFileEngine::FileFlags ret = { };
 
     if (type & FlagsMask)
         ret |= LocalDiskFlag;
 
     bool exists;
     {
-        QFileSystemMetaData::MetaDataFlags queryFlags = 0;
+        QFileSystemMetaData::MetaDataFlags queryFlags = { };
 
         queryFlags |= QFileSystemMetaData::MetaDataFlags(uint(type))
                 & QFileSystemMetaData::Permissions;
@@ -590,9 +590,9 @@ bool QFSFileEngine::setPermissions(uint perms)
     QSystemError error;
     bool ok;
     if (d->fd != -1)
-        ok = QFileSystemEngine::setPermissions(d->fd, QFile::Permissions(perms), error, 0);
+        ok = QFileSystemEngine::setPermissions(d->fd, QFile::Permissions(perms), error);
     else
-        ok = QFileSystemEngine::setPermissions(d->fileEntry, QFile::Permissions(perms), error, 0);
+        ok = QFileSystemEngine::setPermissions(d->fileEntry, QFile::Permissions(perms), error);
     if (!ok) {
         setError(QFile::PermissionsError, error.toString());
         return false;
@@ -651,13 +651,13 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
     Q_Q(QFSFileEngine);
     if (openMode == QIODevice::NotOpen) {
         q->setError(QFile::PermissionsError, qt_error_string(int(EACCES)));
-        return 0;
+        return nullptr;
     }
 
     if (offset < 0 || offset > maxFileOffset
             || size < 0 || quint64(size) > quint64(size_t(-1))) {
         q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL)));
-        return 0;
+        return nullptr;
     }
 
     // If we know the mapping will extend beyond EOF, fail early to avoid
@@ -685,14 +685,14 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
 
     if (quint64(size + extra) > quint64((size_t)-1)) {
         q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL)));
-        return 0;
+        return nullptr;
     }
 
     size_t realSize = (size_t)size + extra;
     QT_OFF_T realOffset = QT_OFF_T(offset);
     realOffset &= ~(QT_OFF_T(pageSize - 1));
 
-    void *mapAddress = QT_MMAP((void*)0, realSize,
+    void *mapAddress = QT_MMAP((void*)nullptr, realSize,
                    access, sharemode, nativeHandle(), realOffset);
     if (MAP_FAILED != mapAddress) {
         uchar *address = extra + static_cast<uchar*>(mapAddress);
@@ -714,7 +714,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
         q->setError(QFile::UnspecifiedError, qt_error_string(int(errno)));
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 bool QFSFileEnginePrivate::unmap(uchar *ptr)
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 74df0f71ef..e26508e631 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -169,7 +169,7 @@ QIODevicePrivate::QIODevicePrivate()
        , baseReadLineDataCalled(false)
        , accessMode(Unset)
 #ifdef QT_NO_QOBJECT
-       , q_ptr(0)
+       , q_ptr(nullptr)
 #endif
 {
 }
diff --git a/src/corelib/io/qipaddress.cpp b/src/corelib/io/qipaddress.cpp
index 039e291b43..ddc5b6607f 100644
--- a/src/corelib/io/qipaddress.cpp
+++ b/src/corelib/io/qipaddress.cpp
@@ -67,7 +67,7 @@ static const QChar *checkedToAscii(Buffer &buffer, const QChar *begin, const QCh
         *dst++ = *src++;
     }
     *dst = '\0';
-    return 0;
+    return nullptr;
 }
 
 static bool parseIp4Internal(IPv4Address &address, const char *ptr, bool acceptLeadingZero);
@@ -175,7 +175,7 @@ const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end
 
     memset(address, 0, sizeof address);
     if (colonCount == 2 && end - begin == 2) // "::"
-        return 0;
+        return nullptr;
 
     // if there's a double colon ("::"), this is how many zeroes it means
     int zeroWordsToFill;
@@ -236,7 +236,7 @@ const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end
             address[13] = ip4 >> 16;
             address[14] = ip4 >> 8;
             address[15] = ip4;
-            return 0;
+            return nullptr;
         }
 
         address[pos++] = x >> 8;
@@ -248,15 +248,15 @@ const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end
             return begin + (endptr - buffer.data());
         ptr = endptr + 1;
     }
-    return pos == 16 ? 0 : end;
+    return pos == 16 ? nullptr : end;
 }
 
 static inline QChar toHex(uchar c)
 {
-    return QtMiscUtils::toHexLower(c);
+    return QChar::fromLatin1(QtMiscUtils::toHexLower(c));
 }
 
-void toString(QString &appendTo, IPv6Address address)
+void toString(QString &appendTo, const IPv6Address address)
 {
     // the longest IPv6 address possible is:
     //   "1111:2222:3333:4444:5555:6666:255.255.255.255"
@@ -312,7 +312,7 @@ void toString(QString &appendTo, IPv6Address address)
         }
     }
 
-    const QChar colon = ushort(':');
+    const QChar colon = u':';
     if (zeroRunLength < 4)
         zeroRunOffset = -1;
     else if (zeroRunOffset == 0)
diff --git a/src/corelib/io/qipaddress_p.h b/src/corelib/io/qipaddress_p.h
index d95cccb3bd..ea31e5883d 100644
--- a/src/corelib/io/qipaddress_p.h
+++ b/src/corelib/io/qipaddress_p.h
@@ -64,7 +64,7 @@ typedef quint8 IPv6Address[16];
 Q_CORE_EXPORT bool parseIp4(IPv4Address &address, const QChar *begin, const QChar *end);
 Q_CORE_EXPORT const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end);
 Q_CORE_EXPORT void toString(QString &appendTo, IPv4Address address);
-Q_CORE_EXPORT void toString(QString &appendTo, IPv6Address address);
+Q_CORE_EXPORT void toString(QString &appendTo, const IPv6Address address);
 
 } // namespace
 
diff --git a/src/corelib/io/qlockfile_unix.cpp b/src/corelib/io/qlockfile_unix.cpp
index 418b7d22ba..b2bf77c0da 100644
--- a/src/corelib/io/qlockfile_unix.cpp
+++ b/src/corelib/io/qlockfile_unix.cpp
@@ -58,6 +58,11 @@
 #include <sys/file.h>  // flock
 #endif
 
+#if defined(Q_OS_RTEMS)
+#  undef LOCK_EX
+#  undef LOCK_NB
+#endif
+
 #include <sys/types.h> // kill
 #include <signal.h>    // kill
 #include <unistd.h>    // gethostname
@@ -169,7 +174,7 @@ QLockFile::LockError QLockFilePrivate::tryLock_sys()
     if (qt_write_loop(fd, fileData.constData(), fileData.size()) < fileData.size()) {
         qt_safe_close(fd);
         if (!QFile::remove(fileName))
-            qWarning("QLockFile: Could not remove our own lock file %s.", qPrintable(fileName));
+            qWarning("QLockFile: Could not remove our own lock file %ls.", qUtf16Printable(fileName));
         return QLockFile::UnknownError; // partition full
     }
 
diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp
index 89607d5a98..4d4784cdf7 100644
--- a/src/corelib/io/qloggingcategory.cpp
+++ b/src/corelib/io/qloggingcategory.cpp
@@ -205,8 +205,8 @@ static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift)
     \note \a category must be kept valid during the lifetime of this object.
 */
 QLoggingCategory::QLoggingCategory(const char *category)
-    : d(0),
-      name(0)
+    : d(nullptr),
+      name(nullptr)
 {
     init(category, QtDebugMsg);
 }
@@ -222,15 +222,15 @@ QLoggingCategory::QLoggingCategory(const char *category)
     \since 5.4
 */
 QLoggingCategory::QLoggingCategory(const char *category, QtMsgType enableForLevel)
-    : d(0),
-      name(0)
+    : d(nullptr),
+      name(nullptr)
 {
     init(category, enableForLevel);
 }
 
 void QLoggingCategory::init(const char *category, QtMsgType severityLevel)
 {
-    enabled.store(0x01010101);   // enabledDebug = enabledWarning = enabledCritical = true;
+    enabled.storeRelaxed(0x01010101);   // enabledDebug = enabledWarning = enabledCritical = true;
 
     if (category)
         name = category;
@@ -333,10 +333,10 @@ void QLoggingCategory::setEnabled(QtMsgType type, bool enable)
 {
     switch (type) {
 #ifdef Q_ATOMIC_INT8_IS_SUPPORTED
-    case QtDebugMsg: bools.enabledDebug.store(enable); break;
-    case QtInfoMsg: bools.enabledInfo.store(enable); break;
-    case QtWarningMsg: bools.enabledWarning.store(enable); break;
-    case QtCriticalMsg: bools.enabledCritical.store(enable); break;
+    case QtDebugMsg: bools.enabledDebug.storeRelaxed(enable); break;
+    case QtInfoMsg: bools.enabledInfo.storeRelaxed(enable); break;
+    case QtWarningMsg: bools.enabledWarning.storeRelaxed(enable); break;
+    case QtCriticalMsg: bools.enabledCritical.storeRelaxed(enable); break;
 #else
     case QtDebugMsg: setBoolLane(&enabled, enable, DebugShift); break;
     case QtInfoMsg: setBoolLane(&enabled, enable, InfoShift); break;
diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h
index 91e3144300..1c3e10b493 100644
--- a/src/corelib/io/qloggingcategory.h
+++ b/src/corelib/io/qloggingcategory.h
@@ -58,15 +58,15 @@ public:
     void setEnabled(QtMsgType type, bool enable);
 
 #ifdef Q_ATOMIC_INT8_IS_SUPPORTED
-    bool isDebugEnabled() const { return bools.enabledDebug.load(); }
-    bool isInfoEnabled() const { return bools.enabledInfo.load(); }
-    bool isWarningEnabled() const { return bools.enabledWarning.load(); }
-    bool isCriticalEnabled() const { return bools.enabledCritical.load(); }
+    bool isDebugEnabled() const { return bools.enabledDebug.loadRelaxed(); }
+    bool isInfoEnabled() const { return bools.enabledInfo.loadRelaxed(); }
+    bool isWarningEnabled() const { return bools.enabledWarning.loadRelaxed(); }
+    bool isCriticalEnabled() const { return bools.enabledCritical.loadRelaxed(); }
 #else
-    bool isDebugEnabled() const { return enabled.load() >> DebugShift & 1; }
-    bool isInfoEnabled() const { return enabled.load() >> InfoShift & 1; }
-    bool isWarningEnabled() const { return enabled.load() >> WarningShift & 1; }
-    bool isCriticalEnabled() const { return enabled.load() >> CriticalShift & 1; }
+    bool isDebugEnabled() const { return enabled.loadRelaxed() >> DebugShift & 1; }
+    bool isInfoEnabled() const { return enabled.loadRelaxed() >> InfoShift & 1; }
+    bool isWarningEnabled() const { return enabled.loadRelaxed() >> WarningShift & 1; }
+    bool isCriticalEnabled() const { return enabled.loadRelaxed() >> CriticalShift & 1; }
 #endif
     const char *categoryName() const { return name; }
 
@@ -111,8 +111,6 @@ private:
 #define Q_DECLARE_LOGGING_CATEGORY(name) \
     extern const QLoggingCategory &name();
 
-#if defined(Q_COMPILER_VARIADIC_MACROS) || defined(Q_MOC_RUN)
-
 #define Q_LOGGING_CATEGORY(name, ...) \
     const QLoggingCategory &name() \
     { \
@@ -148,39 +146,6 @@ private:
     for (bool qt_category_enabled = category().isCriticalEnabled(); qt_category_enabled; qt_category_enabled = false) \
         QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, category().categoryName()).critical(__VA_ARGS__)
 
-#else // defined(Q_COMPILER_VARIADIC_MACROS) || defined(Q_MOC_RUN)
-
-// Optional msgType argument not supported
-#define Q_LOGGING_CATEGORY(name, string) \
-    const QLoggingCategory &name() \
-    { \
-        static const QLoggingCategory category(string); \
-        return category; \
-    }
-
-// check for enabled category inside QMessageLogger.
-#if !defined(QT_NO_DEBUG_OUTPUT)
-#  define qCDebug qDebug
-#else
-#  define qCDebug(category) QT_NO_QDEBUG_MACRO()
-#endif
-
-#if !defined(QT_NO_INFO_OUTPUT)
-#  define qCInfo qInfo
-#else
-#  define qCInfo(category) QT_NO_QDEBUG_MACRO()
-#endif
-
-#if !defined(QT_NO_WARNING_OUTPUT)
-#  define qCWarning qWarning
-#else
-#  define qCWarning(category) QT_NO_QDEBUG_MACRO()
-#endif
-
-#define qCCritical qCritical
-
-#endif // Q_COMPILER_VARIADIC_MACROS || defined(Q_MOC_RUN)
-
 QT_END_NAMESPACE
 
 #endif // QLOGGINGCATEGORY_H
diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index 9792d956cc..e8eb18b4c1 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -41,6 +41,7 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qlibraryinfo.h>
+#include <QtCore/private/qlocking_p.h>
 #include <QtCore/qstandardpaths.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qdir.h>
@@ -165,7 +166,7 @@ void QLoggingRule::parse(const QStringRef &pattern)
             p = QStringRef(p.string(), p.position() + 1, p.length() - 1);
         }
         if (p.contains(QLatin1Char('*'))) // '*' only supported at start/end
-            flags = 0;
+            flags = PatternFlags();
     }
 
     category = p.toString();
@@ -356,7 +357,7 @@ void QLoggingRegistry::initializeRules()
 */
 void QLoggingRegistry::registerCategory(QLoggingCategory *cat, QtMsgType enableForLevel)
 {
-    QMutexLocker locker(&registryMutex);
+    const auto locker = qt_scoped_lock(registryMutex);
 
     if (!categories.contains(cat)) {
         categories.insert(cat, enableForLevel);
@@ -370,7 +371,7 @@ void QLoggingRegistry::registerCategory(QLoggingCategory *cat, QtMsgType enableF
 */
 void QLoggingRegistry::unregisterCategory(QLoggingCategory *cat)
 {
-    QMutexLocker locker(&registryMutex);
+    const auto locker = qt_scoped_lock(registryMutex);
     categories.remove(cat);
 }
 
@@ -413,9 +414,9 @@ void QLoggingRegistry::updateRules()
 QLoggingCategory::CategoryFilter
 QLoggingRegistry::installFilter(QLoggingCategory::CategoryFilter filter)
 {
-    QMutexLocker locker(&registryMutex);
+    const auto locker = qt_scoped_lock(registryMutex);
 
-    if (filter == 0)
+    if (!filter)
         filter = defaultCategoryFilter;
 
     QLoggingCategory::CategoryFilter old = categoryFilter;
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index beca6ccbf7..d1806aa12b 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -534,7 +534,7 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QSharedPointer
 */
 QSharedPointer<QNonContiguousByteDevice> QNonContiguousByteDeviceFactory::createShared(QSharedPointer<QRingBuffer> ringBuffer)
 {
-    return QSharedPointer<QNonContiguousByteDeviceRingBufferImpl>::create(qMove(ringBuffer));
+    return QSharedPointer<QNonContiguousByteDeviceRingBufferImpl>::create(std::move(ringBuffer));
 }
 
 /*!
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 9557a1d24b..35ca2542f7 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -42,6 +42,7 @@
 
 #include <qdebug.h>
 #include <qdir.h>
+#include <qscopedvaluerollback.h>
 #if defined(Q_OS_WIN)
 #include <qtimer.h>
 #endif
@@ -201,6 +202,7 @@ void QProcessEnvironmentPrivate::insert(const QProcessEnvironmentPrivate &other)
         vars.insert(it.key(), it.value());
 
 #ifdef Q_OS_UNIX
+    const OrderedNameMapMutexLocker locker(this, &other);
     auto nit = other.nameMap.constBegin();
     const auto nend = other.nameMap.constEnd();
     for ( ; nit != nend; ++nit)
@@ -274,7 +276,6 @@ bool QProcessEnvironment::operator==(const QProcessEnvironment &other) const
         return true;
     if (d) {
         if (other.d) {
-            QProcessEnvironmentPrivate::OrderedMutexLocker locker(d, other.d);
             return d->vars == other.d->vars;
         } else {
             return isEmpty();
@@ -321,7 +322,6 @@ bool QProcessEnvironment::contains(const QString &name) const
 {
     if (!d)
         return false;
-    QProcessEnvironmentPrivate::MutexLocker locker(d);
     return d->vars.contains(d->prepareName(name));
 }
 
@@ -372,7 +372,6 @@ QString QProcessEnvironment::value(const QString &name, const QString &defaultVa
     if (!d)
         return defaultValue;
 
-    QProcessEnvironmentPrivate::MutexLocker locker(d);
     const auto it = d->vars.constFind(d->prepareName(name));
     if (it == d->vars.constEnd())
         return defaultValue;
@@ -397,7 +396,6 @@ QStringList QProcessEnvironment::toStringList() const
 {
     if (!d)
         return QStringList();
-    QProcessEnvironmentPrivate::MutexLocker locker(d);
     return d->toList();
 }
 
@@ -411,7 +409,6 @@ QStringList QProcessEnvironment::keys() const
 {
     if (!d)
         return QStringList();
-    QProcessEnvironmentPrivate::MutexLocker locker(d);
     return d->keys();
 }
 
@@ -428,7 +425,6 @@ void QProcessEnvironment::insert(const QProcessEnvironment &e)
         return;
 
     // our re-impl of detach() detaches from null
-    QProcessEnvironmentPrivate::MutexLocker locker(e.d);
     d->insert(*e.d);
 }
 
@@ -1068,9 +1064,8 @@ bool QProcessPrivate::tryReadFromChannel(Channel *channel)
     if (currentReadChannel == channelIdx) {
         didRead = true;
         if (!emittedReadyRead) {
-            emittedReadyRead = true;
+            QScopedValueRollback<bool> guard(emittedReadyRead, true);
             emit q->readyRead();
-            emittedReadyRead = false;
         }
     }
     emit q->channelReadyRead(int(channelIdx));
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index a2e3c01f7c..9fda5fba11 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -72,12 +72,10 @@ public:
     QProcessEnvironment();
     QProcessEnvironment(const QProcessEnvironment &other);
     ~QProcessEnvironment();
-#ifdef Q_COMPILER_RVALUE_REFS
-    QProcessEnvironment &operator=(QProcessEnvironment && other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QProcessEnvironment &operator=(QProcessEnvironment && other) noexcept { swap(other); return *this; }
     QProcessEnvironment &operator=(const QProcessEnvironment &other);
 
-    void swap(QProcessEnvironment &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QProcessEnvironment &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QProcessEnvironment &other) const;
     inline bool operator!=(const QProcessEnvironment &other) const
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
index eb2d1ed048..2587530c09 100644
--- a/src/corelib/io/qprocess_p.h
+++ b/src/corelib/io/qprocess_p.h
@@ -146,16 +146,22 @@ public:
     inline QString nameToString(const Key &name) const { return name; }
     inline Value prepareValue(const QString &value) const { return value; }
     inline QString valueToString(const Value &value) const { return value; }
-    struct MutexLocker {
-        MutexLocker(const QProcessEnvironmentPrivate *) {}
+#else
+    struct NameMapMutexLocker : public QMutexLocker
+    {
+        NameMapMutexLocker(const QProcessEnvironmentPrivate *d) : QMutexLocker(&d->nameMapMutex) {}
     };
-    struct OrderedMutexLocker {
-        OrderedMutexLocker(const QProcessEnvironmentPrivate *,
-                           const QProcessEnvironmentPrivate *) {}
+    struct OrderedNameMapMutexLocker : public QOrderedMutexLocker
+    {
+        OrderedNameMapMutexLocker(const QProcessEnvironmentPrivate *d1,
+                                  const QProcessEnvironmentPrivate *d2)
+            : QOrderedMutexLocker(&d1->nameMapMutex, &d2->nameMapMutex)
+        {}
     };
-#else
+
     inline Key prepareName(const QString &name) const
     {
+        const NameMapMutexLocker locker(this);
         Key &ent = nameMap[name];
         if (ent.isEmpty())
             ent = name.toLocal8Bit();
@@ -164,40 +170,27 @@ public:
     inline QString nameToString(const Key &name) const
     {
         const QString sname = QString::fromLocal8Bit(name);
-        nameMap[sname] = name;
+        {
+            const NameMapMutexLocker locker(this);
+            nameMap[sname] = name;
+        }
         return sname;
     }
     inline Value prepareValue(const QString &value) const { return Value(value); }
     inline QString valueToString(const Value &value) const { return value.string(); }
 
-    struct MutexLocker : public QMutexLocker
-    {
-        MutexLocker(const QProcessEnvironmentPrivate *d) : QMutexLocker(&d->mutex) {}
-    };
-    struct OrderedMutexLocker : public QOrderedMutexLocker
-    {
-        OrderedMutexLocker(const QProcessEnvironmentPrivate *d1,
-                           const QProcessEnvironmentPrivate *d2) :
-            QOrderedMutexLocker(&d1->mutex, &d2->mutex)
-        {}
-    };
-
     QProcessEnvironmentPrivate() : QSharedData() {}
     QProcessEnvironmentPrivate(const QProcessEnvironmentPrivate &other) :
-        QSharedData()
+        QSharedData(), vars(other.vars)
     {
-        // This being locked ensures that the functions that only assign
-        // d pointers don't need explicit locking.
         // We don't need to lock our own mutex, as this object is new and
         // consequently not shared. For the same reason, non-const methods
         // do not need a lock, as they detach objects (however, we need to
         // ensure that they really detach before using prepareName()).
-        MutexLocker locker(&other);
-        vars = other.vars;
+        NameMapMutexLocker locker(&other);
         nameMap = other.nameMap;
-        // We need to detach our members, so that our mutex can protect them.
-        // As we are being detached, they likely would be detached a moment later anyway.
-        vars.detach();
+        // We need to detach our nameMap, so that our mutex can protect it.
+        // As we are being detached, it likely would be detached a moment later anyway.
         nameMap.detach();
     }
 #endif
@@ -208,8 +201,7 @@ public:
 #ifdef Q_OS_UNIX
     typedef QHash<QString, Key> NameHash;
     mutable NameHash nameMap;
-
-    mutable QMutex mutex;
+    mutable QMutex nameMapMutex;
 #endif
 
     static QProcessEnvironment fromList(const QStringList &list);
@@ -220,7 +212,7 @@ public:
 
 template<> Q_INLINE_TEMPLATE void QSharedDataPointer<QProcessEnvironmentPrivate>::detach()
 {
-    if (d && d->ref.load() == 1)
+    if (d && d->ref.loadRelaxed() == 1)
         return;
     QProcessEnvironmentPrivate *x = (d ? new QProcessEnvironmentPrivate(*d)
                                      : new QProcessEnvironmentPrivate);
@@ -246,7 +238,7 @@ public:
             // if you add "= 4" here, increase the number of bits below
         };
 
-        Channel() : process(0), notifier(0), type(Normal), closed(false), append(false)
+        Channel() : process(nullptr), notifier(nullptr), type(Normal), closed(false), append(false)
         {
             pipe[0] = INVALID_Q_PIPE;
             pipe[1] = INVALID_Q_PIPE;
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index 7a2daa2a57..0c80daa024 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -89,6 +89,7 @@ QT_END_NAMESPACE
 #include "qprocess_p.h"
 #include "qstandardpaths.h"
 #include "private/qcore_unix_p.h"
+#include "private/qlocking_p.h"
 
 #ifdef Q_OS_MAC
 #include <private/qcore_mac_p.h>
@@ -202,8 +203,7 @@ static int qt_create_pipe(int *pipe)
         qt_safe_close(pipe[1]);
     int pipe_ret = qt_safe_pipe(pipe);
     if (pipe_ret != 0) {
-        qWarning("QProcessPrivate::createPipe: Cannot create pipe %p: %s",
-                 pipe, qPrintable(qt_error_string(errno)));
+        qErrnoWarning("QProcessPrivate::createPipe: Cannot create pipe %p", pipe);
     }
     return pipe_ret;
 }
@@ -405,7 +405,7 @@ void QProcessPrivate::startProcess()
             // CFBundle is not reentrant, since CFBundleCreate might return a reference
             // to a cached bundle object. Protect the bundle calls with a mutex lock.
             static QBasicMutex cfbundleMutex;
-            QMutexLocker lock(&cfbundleMutex);
+            const auto locker = qt_scoped_lock(cfbundleMutex);
             QCFType<CFBundleRef> bundle = CFBundleCreate(0, url);
             // 'executableURL' can be either relative or absolute ...
             QCFType<CFURLRef> executableURL = CFBundleCopyExecutableURL(bundle);
@@ -439,7 +439,6 @@ void QProcessPrivate::startProcess()
     int envc = 0;
     char **envp = 0;
     if (environment.d.constData()) {
-        QProcessEnvironmentPrivate::MutexLocker locker(environment.d);
         envp = _q_dupEnvironment(environment.d.constData()->vars, &envc);
     }
 
@@ -473,7 +472,7 @@ void QProcessPrivate::startProcess()
     if (forkfd == -1) {
         // Cleanup, report error and return
 #if defined (QPROCESS_DEBUG)
-        qDebug("fork failed: %s", qPrintable(qt_error_string(lastForkErrno)));
+        qDebug("fork failed: %ls", qUtf16Printable(qt_error_string(lastForkErrno)));
 #endif
         q->setProcessState(QProcess::NotRunning);
         setErrorAndEmit(QProcess::FailedToStart,
@@ -518,7 +517,7 @@ void QProcessPrivate::startProcess()
     if (stderrChannel.pipe[0] != -1)
         ::fcntl(stderrChannel.pipe[0], F_SETFL, ::fcntl(stderrChannel.pipe[0], F_GETFL) | O_NONBLOCK);
 
-    if (threadData->eventDispatcher) {
+    if (threadData->eventDispatcher.loadAcquire()) {
         deathNotifier = new QSocketNotifier(forkfd, QSocketNotifier::Read, q);
         QObject::connect(deathNotifier, SIGNAL(activated(int)),
                          q, SLOT(_q_processDied()));
@@ -652,7 +651,7 @@ bool QProcessPrivate::writeToStdin()
     qDebug("QProcessPrivate::writeToStdin(), write(%p \"%s\", %lld) == %lld",
            data, qt_prettyDebug(data, bytesToWrite, 16).constData(), bytesToWrite, written);
     if (written == -1)
-        qDebug("QProcessPrivate::writeToStdin(), failed to write (%s)", qPrintable(qt_error_string(errno)));
+        qDebug("QProcessPrivate::writeToStdin(), failed to write (%ls)", qUtf16Printable(qt_error_string(errno)));
 #endif
     if (written == -1) {
         // If the O_NONBLOCK flag is set and If some data can be written without blocking
@@ -971,7 +970,6 @@ bool QProcessPrivate::startDetached(qint64 *pid)
             int envc = 0;
             char **envp = nullptr;
             if (environment.d.constData()) {
-                QProcessEnvironmentPrivate::MutexLocker locker(environment.d);
                 envp = _q_dupEnvironment(environment.d.constData()->vars, &envc);
             }
 
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index b3533397d4..22c22ce711 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2018 The Qt Company Ltd.
-** Copyright (C) 2018 Intel Corporation.
+** Copyright (C) 2019 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -42,7 +42,7 @@
 #include "qresource_p.h"
 #include "qresource_iterator_p.h"
 #include "qset.h"
-#include "qmutex.h"
+#include <private/qlocking_p.h>
 #include "qdebug.h"
 #include "qlocale.h"
 #include "qglobal.h"
@@ -147,7 +147,7 @@ private:
 public:
     mutable QAtomicInt ref;
 
-    inline QResourceRoot(): tree(0), names(0), payloads(0), version(0) {}
+    inline QResourceRoot(): tree(nullptr), names(nullptr), payloads(nullptr), version(0) {}
     inline QResourceRoot(int version, const uchar *t, const uchar *n, const uchar *d) { setSource(version, t, n, d); }
     virtual ~QResourceRoot() { }
     int findNode(const QString &path, const QLocale &locale=QLocale()) const;
@@ -165,7 +165,7 @@ public:
     quint64 lastModified(int node) const;
     QStringList children(int node) const;
     virtual QString mappingRoot() const { return QString(); }
-    bool mappingRootSubdir(const QString &path, QString *match=0) const;
+    bool mappingRootSubdir(const QString &path, QString *match = nullptr) const;
     inline bool operator==(const QResourceRoot &other) const
     { return tree == other.tree && names == other.names && payloads == other.payloads && version == other.version; }
     inline bool operator!=(const QResourceRoot &other) const
@@ -197,14 +197,14 @@ Q_DECLARE_TYPEINFO(QResourceRoot, Q_MOVABLE_TYPE);
 typedef QList<QResourceRoot*> ResourceList;
 struct QResourceGlobalData
 {
-    QMutex resourceMutex{QMutex::Recursive};
+    QRecursiveMutex resourceMutex;
     ResourceList resourceList;
     QStringList resourceSearchPaths;
 };
 Q_GLOBAL_STATIC(QResourceGlobalData, resourceGlobalData)
 
-static inline QMutex *resourceMutex()
-{ return &resourceGlobalData->resourceMutex; }
+static inline QRecursiveMutex &resourceMutex()
+{ return resourceGlobalData->resourceMutex; }
 
 static inline ResourceList *resourceList()
 { return &resourceGlobalData->resourceList; }
@@ -279,14 +279,14 @@ static inline QStringList *resourceSearchPaths()
     This enum is used by compressionAlgorithm() to indicate which algorithm the
     RCC tool used to compress the payload.
 
-    \value NoCompression    Contents are not compressed (isCompressed() is false).
+    \value NoCompression    Contents are not compressed
     \value ZlibCompression  Contents are compressed using \l{zlib}{https://zlib.net} and can
                             be decompressed using the qUncompress() function.
     \value ZstdCompression  Contents are compressed using \l{zstd}{https://zstd.net}. To
                             decompress, use the \c{ZSTD_decompress} function from the zstd
                             library.
 
-    \sa compressionAlgorithm(), isCompressed()
+    \sa compressionAlgorithm()
 */
 
 class QResourcePrivate {
@@ -320,7 +320,7 @@ QResourcePrivate::clear()
 {
     absoluteFilePath.clear();
     compressionAlgo = QResource::NoCompression;
-    data = 0;
+    data = nullptr;
     size = 0;
     children.clear();
     lastModified = 0;
@@ -337,7 +337,7 @@ bool
 QResourcePrivate::load(const QString &file)
 {
     related.clear();
-    QMutexLocker lock(resourceMutex());
+    const auto locker = qt_scoped_lock(resourceMutex());
     const ResourceList *list = resourceList();
     QString cleaned = cleanPath(file);
     for(int i = 0; i < list->size(); ++i) {
@@ -392,7 +392,7 @@ QResourcePrivate::ensureInitialized() const
     if(path.startsWith(QLatin1Char('/'))) {
         that->load(path.toString());
     } else {
-        QMutexLocker lock(resourceMutex());
+        const auto locker = qt_scoped_lock(resourceMutex());
         QStringList searchPaths = *resourceSearchPaths();
         searchPaths << QLatin1String("");
         for(int i = 0; i < searchPaths.size(); ++i) {
@@ -551,13 +551,20 @@ bool QResource::isValid() const
     \sa isDir()
 */
 
-
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
+    \obsolete
+
     Returns \c true if the resource represents a file and the data backing it
     is in a compressed format, false otherwise. If the data is compressed,
     check compressionAlgorithm() to verify what algorithm to use to decompress
     the data.
 
+    \note This function is deprecated and can be replaced with
+    \code
+      compressionAlgorithm() != NoCompression
+    \endcode
+
     \sa data(), compressionAlgorithm(), isFile()
 */
 
@@ -565,6 +572,7 @@ bool QResource::isCompressed() const
 {
     return compressionAlgorithm() != NoCompression;
 }
+#endif
 
 /*!
     \since 5.13
@@ -582,7 +590,7 @@ bool QResource::isCompressed() const
 
     See \l{http://facebook.github.io/zstd/zstd_manual.html}{Zstandard manual}.
 
-    \sa isCompressed(), data(), isFile()
+    \sa data(), isFile()
 */
 QResource::Compression QResource::compressionAlgorithm() const
 {
@@ -606,11 +614,11 @@ qint64 QResource::size() const
 
 /*!
     Returns direct access to a read only segment of data that this resource
-    represents. If the resource is compressed the data returns is
-    compressed and qUncompress() must be used to access the data. If the
-    resource is a directory \nullptr is returned.
+    represents. If the resource is compressed the data returned is compressed
+    and the appropriate library functions must be used to access the data. If
+    the resource is a directory \nullptr is returned.
 
-    \sa size(), isCompressed(), isFile()
+    \sa size(), compressionAlgorithm(), isFile()
 */
 
 const uchar *QResource::data() const
@@ -680,7 +688,7 @@ QResource::addSearchPath(const QString &path)
                  path.toLocal8Bit().data());
         return;
     }
-    QMutexLocker lock(resourceMutex());
+    const auto locker = qt_scoped_lock(resourceMutex());
     resourceSearchPaths()->prepend(path);
 }
 
@@ -698,7 +706,7 @@ QResource::addSearchPath(const QString &path)
 QStringList
 QResource::searchPaths()
 {
-    QMutexLocker lock(resourceMutex());
+    const auto locker = qt_scoped_lock(resourceMutex());
     return *resourceSearchPaths();
 }
 #endif
@@ -864,7 +872,7 @@ const uchar *QResourceRoot::data(int node, qint64 *size) const
 {
     if(node == -1) {
         *size = 0;
-        return 0;
+        return nullptr;
     }
     int offset = findOffset(node) + 4; //jump past name
 
@@ -881,7 +889,7 @@ const uchar *QResourceRoot::data(int node, qint64 *size) const
         return ret;
     }
     *size = 0;
-    return 0;
+    return nullptr;
 }
 
 quint64 QResourceRoot::lastModified(int node) const
@@ -942,12 +950,13 @@ Q_CORE_EXPORT bool qRegisterResourceData(int version, const unsigned char *tree,
 {
     if (resourceGlobalData.isDestroyed())
         return false;
-    QMutexLocker lock(resourceMutex());
+    const auto locker = qt_scoped_lock(resourceMutex());
+    ResourceList *list = resourceList();
     if (version >= 0x01 && version <= 0x3) {
         bool found = false;
         QResourceRoot res(version, tree, name, data);
-        for(int i = 0; i < resourceList()->size(); ++i) {
-            if(*resourceList()->at(i) == res) {
+        for (int i = 0; i < list->size(); ++i) {
+            if (*list->at(i) == res) {
                 found = true;
                 break;
             }
@@ -955,7 +964,7 @@ Q_CORE_EXPORT bool qRegisterResourceData(int version, const unsigned char *tree,
         if(!found) {
             QResourceRoot *root = new QResourceRoot(version, tree, name, data);
             root->ref.ref();
-            resourceList()->append(root);
+            list->append(root);
         }
         return true;
     }
@@ -968,12 +977,13 @@ Q_CORE_EXPORT bool qUnregisterResourceData(int version, const unsigned char *tre
     if (resourceGlobalData.isDestroyed())
         return false;
 
-    QMutexLocker lock(resourceMutex());
+    const auto locker = qt_scoped_lock(resourceMutex());
     if (version >= 0x01 && version <= 0x3) {
         QResourceRoot res(version, tree, name, data);
-        for(int i = 0; i < resourceList()->size(); ) {
-            if(*resourceList()->at(i) == res) {
-                QResourceRoot *root = resourceList()->takeAt(i);
+        ResourceList *list = resourceList();
+        for (int i = 0; i < list->size(); ) {
+            if (*list->at(i) == res) {
+                QResourceRoot *root = list->takeAt(i);
                 if(!root->ref.deref())
                     delete root;
             } else {
@@ -993,7 +1003,7 @@ class QDynamicBufferResourceRoot: public QResourceRoot
     const uchar *buffer;
 
 public:
-    inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { }
+    inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(nullptr) { }
     inline ~QDynamicBufferResourceRoot() { }
     inline const uchar *mappingBuffer() const { return buffer; }
     QString mappingRoot() const override { return root; }
@@ -1065,12 +1075,14 @@ class QDynamicFileResourceRoot: public QDynamicBufferResourceRoot
     qsizetype unmapLength;
 
 public:
-    inline QDynamicFileResourceRoot(const QString &_root) : QDynamicBufferResourceRoot(_root), unmapPointer(0), unmapLength(0) { }
+    QDynamicFileResourceRoot(const QString &_root)
+        : QDynamicBufferResourceRoot(_root), unmapPointer(nullptr), unmapLength(0)
+    { }
     ~QDynamicFileResourceRoot() {
 #if defined(QT_USE_MMAP)
         if (unmapPointer) {
             munmap((char*)unmapPointer, unmapLength);
-            unmapPointer = 0;
+            unmapPointer = nullptr;
             unmapLength = 0;
         } else
 #endif
@@ -1186,7 +1198,7 @@ QResource::registerResource(const QString &rccFilename, const QString &resourceR
     QDynamicFileResourceRoot *root = new QDynamicFileResourceRoot(r);
     if(root->registerSelf(rccFilename)) {
         root->ref.ref();
-        QMutexLocker lock(resourceMutex());
+        const auto locker = qt_scoped_lock(resourceMutex());
         resourceList()->append(root);
         return true;
     }
@@ -1210,14 +1222,14 @@ QResource::unregisterResource(const QString &rccFilename, const QString &resourc
 {
     QString r = qt_resource_fixResourceRoot(resourceRoot);
 
-    QMutexLocker lock(resourceMutex());
+    const auto locker = qt_scoped_lock(resourceMutex());
     ResourceList *list = resourceList();
     for(int i = 0; i < list->size(); ++i) {
         QResourceRoot *res = list->at(i);
         if(res->type() == QResourceRoot::Resource_File) {
             QDynamicFileResourceRoot *root = reinterpret_cast<QDynamicFileResourceRoot*>(res);
             if (root->mappingFile() == rccFilename && root->mappingRoot() == r) {
-                resourceList()->removeAt(i);
+                list->removeAt(i);
                 if(!root->ref.deref()) {
                     delete root;
                     return true;
@@ -1257,7 +1269,7 @@ QResource::registerResource(const uchar *rccData, const QString &resourceRoot)
     QDynamicBufferResourceRoot *root = new QDynamicBufferResourceRoot(r);
     if (root->registerSelf(rccData, -1)) {
         root->ref.ref();
-        QMutexLocker lock(resourceMutex());
+        const auto locker = qt_scoped_lock(resourceMutex());
         resourceList()->append(root);
         return true;
     }
@@ -1281,14 +1293,14 @@ QResource::unregisterResource(const uchar *rccData, const QString &resourceRoot)
 {
     QString r = qt_resource_fixResourceRoot(resourceRoot);
 
-    QMutexLocker lock(resourceMutex());
+    const auto locker = qt_scoped_lock(resourceMutex());
     ResourceList *list = resourceList();
     for(int i = 0; i < list->size(); ++i) {
         QResourceRoot *res = list->at(i);
         if(res->type() == QResourceRoot::Resource_Buffer) {
             QDynamicBufferResourceRoot *root = reinterpret_cast<QDynamicBufferResourceRoot*>(res);
             if (root->mappingBuffer() == rccData && root->mappingRoot() == r) {
-                resourceList()->removeAt(i);
+                list->removeAt(i);
                 if(!root->ref.deref()) {
                     delete root;
                     return true;
@@ -1366,9 +1378,15 @@ bool QResourceFileEngine::open(QIODevice::OpenMode flags)
         qWarning("QResourceFileEngine::open: Missing file name");
         return false;
     }
-    if(flags & QIODevice::WriteOnly)
+    if (flags & QIODevice::WriteOnly)
         return false;
-    d->uncompress();
+    if (d->resource.compressionAlgorithm() != QResource::NoCompression) {
+        d->uncompress();
+        if (d->uncompressed.isNull()) {
+            d->errorString = QSystemError::stdString(EIO);
+            return false;
+        }
+    }
     if (!d->resource.isValid()) {
         d->errorString = QSystemError::stdString(ENOENT);
         return false;
@@ -1395,7 +1413,7 @@ qint64 QResourceFileEngine::read(char *data, qint64 len)
         len = size()-d->offset;
     if(len <= 0)
         return 0;
-    if(d->resource.isCompressed())
+    if (!d->uncompressed.isNull())
         memcpy(data, d->uncompressed.constData()+d->offset, len);
     else
         memcpy(data, d->resource.data()+d->offset, len);
@@ -1431,9 +1449,9 @@ bool QResourceFileEngine::link(const QString &)
 qint64 QResourceFileEngine::size() const
 {
     Q_D(const QResourceFileEngine);
-    if(!d->resource.isValid())
+    if (!d->resource.isValid())
         return 0;
-    if (d->resource.isCompressed()) {
+    if (d->resource.compressionAlgorithm() != QResource::NoCompression) {
         d->uncompress();
         return d->uncompressed.size();
     }
@@ -1596,7 +1614,7 @@ uchar *QResourceFileEnginePrivate::map(qint64 offset, qint64 size, QFile::Memory
     Q_UNUSED(flags);
 
     qint64 max = resource.size();
-    if (resource.isCompressed()) {
+    if (resource.compressionAlgorithm() != QResource::NoCompression) {
         uncompress();
         max = uncompressed.size();
     }
@@ -1609,7 +1627,7 @@ uchar *QResourceFileEnginePrivate::map(qint64 offset, qint64 size, QFile::Memory
     }
 
     const uchar *address = resource.data();
-    if (resource.isCompressed())
+    if (resource.compressionAlgorithm() != QResource::NoCompression)
         address = reinterpret_cast<const uchar *>(uncompressed.constData());
 
     return const_cast<uchar *>(address) + offset;
diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h
index 5e798de436..5ee8d5d266 100644
--- a/src/corelib/io/qresource.h
+++ b/src/corelib/io/qresource.h
@@ -72,7 +72,6 @@ public:
 
     bool isValid() const;
 
-    bool isCompressed() const;
     Compression compressionAlgorithm() const;
     qint64 size() const;
     const uchar *data() const;
@@ -84,6 +83,10 @@ public:
     QT_DEPRECATED_X("Use QDir::searchPaths() instead")
     static QStringList searchPaths();
 #endif
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_VERSION_X_5_15("Use QResource::compressionAlgorithm() instead")
+    bool isCompressed() const;
+#endif
 
     static bool registerResource(const QString &rccFilename, const QString &resourceRoot=QString());
     static bool unregisterResource(const QString &rccFilename, const QString &resourceRoot=QString());
diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h
index 7451de8809..fedf95bb33 100644
--- a/src/corelib/io/qresource_p.h
+++ b/src/corelib/io/qresource_p.h
@@ -108,7 +108,7 @@ public:
     Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
     Iterator *endEntryList() override;
 
-    bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override;
+    bool extension(Extension extension, const ExtensionOption *option = nullptr, ExtensionReturn *output = nullptr) override;
     bool supportsExtension(Extension extension) const override;
 };
 
diff --git a/src/corelib/io/qsavefile.cpp b/src/corelib/io/qsavefile.cpp
index 7ee9142e14..0a884a7df9 100644
--- a/src/corelib/io/qsavefile.cpp
+++ b/src/corelib/io/qsavefile.cpp
@@ -150,8 +150,7 @@ QSaveFile::~QSaveFile()
     QFileDevice::close();
     if (d->fileEngine) {
         d->fileEngine->remove();
-        delete d->fileEngine;
-        d->fileEngine = 0;
+        d->fileEngine.reset();
     }
 }
 
@@ -193,7 +192,7 @@ bool QSaveFile::open(OpenMode mode)
 {
     Q_D(QSaveFile);
     if (isOpen()) {
-        qWarning("QSaveFile::open: File (%s) already open", qPrintable(fileName()));
+        qWarning("QSaveFile::open: File (%ls) already open", qUtf16Printable(fileName()));
         return false;
     }
     unsetError();
@@ -235,7 +234,7 @@ bool QSaveFile::open(OpenMode mode)
     }
 
     auto openDirectly = [&]() {
-        d->fileEngine = QAbstractFileEngine::create(d->finalFileName);
+        d->fileEngine.reset(QAbstractFileEngine::create(d->finalFileName));
         if (d->fileEngine->open(mode | QIODevice::Unbuffered)) {
             d->useTemporaryFile = false;
             QFileDevice::open(mode);
@@ -258,8 +257,7 @@ bool QSaveFile::open(OpenMode mode)
             if (openDirectly())
                 return true;
             d->setError(d->fileEngine->error(), d->fileEngine->errorString());
-            delete d->fileEngine;
-            d->fileEngine = 0;
+            d->fileEngine.reset();
         } else {
             QString msg =
                     QSaveFile::tr("QSaveFile cannot open '%1' without direct write fallback enabled.")
@@ -269,18 +267,17 @@ bool QSaveFile::open(OpenMode mode)
         return false;
     }
 
-    d->fileEngine = new QTemporaryFileEngine(&d->finalFileName, QTemporaryFileEngine::Win32NonShared);
+    d->fileEngine.reset(new QTemporaryFileEngine(&d->finalFileName, QTemporaryFileEngine::Win32NonShared));
     // if the target file exists, we'll copy its permissions below,
     // but until then, let's ensure the temporary file is not accessible
     // to a third party
     int perm = (existingFile.exists() ? 0600 : 0666);
-    static_cast<QTemporaryFileEngine *>(d->fileEngine)->initialize(d->finalFileName, perm);
+    static_cast<QTemporaryFileEngine *>(d->fileEngine.get())->initialize(d->finalFileName, perm);
     // Same as in QFile: QIODevice provides the buffering, so there's no need to request it from the file engine.
     if (!d->fileEngine->open(mode | QIODevice::Unbuffered)) {
         QFileDevice::FileError err = d->fileEngine->error();
 #ifdef Q_OS_UNIX
         if (d->directWriteFallback && err == QFileDevice::OpenError && errno == EACCES) {
-            delete d->fileEngine;
             if (openDirectly())
                 return true;
             err = d->fileEngine->error();
@@ -289,8 +286,7 @@ bool QSaveFile::open(OpenMode mode)
         if (err == QFileDevice::UnspecifiedError)
             err = QFileDevice::OpenError;
         d->setError(err, d->fileEngine->errorString());
-        delete d->fileEngine;
-        d->fileEngine = 0;
+        d->fileEngine.reset();
         return false;
     }
 
@@ -331,35 +327,31 @@ bool QSaveFile::commit()
         return false;
 
     if (!isOpen()) {
-        qWarning("QSaveFile::commit: File (%s) is not open", qPrintable(fileName()));
+        qWarning("QSaveFile::commit: File (%ls) is not open", qUtf16Printable(fileName()));
         return false;
     }
     QFileDevice::close(); // calls flush()
 
+    const auto fe = std::move(d->fileEngine);
+
     // Sync to disk if possible. Ignore errors (e.g. not supported).
-    d->fileEngine->syncToDisk();
+    fe->syncToDisk();
 
     if (d->useTemporaryFile) {
         if (d->writeError != QFileDevice::NoError) {
-            d->fileEngine->remove();
+            fe->remove();
             d->writeError = QFileDevice::NoError;
-            delete d->fileEngine;
-            d->fileEngine = 0;
             return false;
         }
         // atomically replace old file with new file
         // Can't use QFile::rename for that, must use the file engine directly
-        Q_ASSERT(d->fileEngine);
-        if (!d->fileEngine->renameOverwrite(d->finalFileName)) {
-            d->setError(d->fileEngine->error(), d->fileEngine->errorString());
-            d->fileEngine->remove();
-            delete d->fileEngine;
-            d->fileEngine = 0;
+        Q_ASSERT(fe);
+        if (!fe->renameOverwrite(d->finalFileName)) {
+            d->setError(fe->error(), fe->errorString());
+            fe->remove();
             return false;
         }
     }
-    delete d->fileEngine;
-    d->fileEngine = 0;
     return true;
 }
 
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 9234a23f3a..fc7122d904 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -47,6 +47,7 @@
 #include "qdir.h"
 #include "qfileinfo.h"
 #include "qmutex.h"
+#include "private/qlocking_p.h"
 #include "qlibraryinfo.h"
 #include "qtemporaryfile.h"
 #include "qstandardpaths.h"
@@ -210,7 +211,7 @@ QConfFile *QConfFile::fromName(const QString &fileName, bool _userPerms)
     ConfFileCache *unusedCache = unusedCacheFunc();
 
     QConfFile *confFile = 0;
-    QMutexLocker locker(&settingsGlobalMutex);
+    const auto locker = qt_scoped_lock(settingsGlobalMutex);
 
     if (!(confFile = usedHash->value(absPath))) {
         if ((confFile = unusedCache->take(absPath)))
@@ -225,7 +226,7 @@ QConfFile *QConfFile::fromName(const QString &fileName, bool _userPerms)
 
 void QConfFile::clearCache()
 {
-    QMutexLocker locker(&settingsGlobalMutex);
+    const auto locker = qt_scoped_lock(settingsGlobalMutex);
     unusedCacheFunc()->clear();
 }
 
@@ -745,7 +746,6 @@ bool QSettingsPrivate::iniUnescapedStringList(const QByteArray &str, int from, i
         { '\'', '\'' },
         { '\\', '\\' }
     };
-    static const int numEscapeCodes = sizeof(escapeCodes) / sizeof(escapeCodes[0]);
 
     bool isStringList = false;
     bool inQuotedString = false;
@@ -769,9 +769,9 @@ StNormal:
                 goto end;
 
             ch = str.at(i++);
-            for (int j = 0; j < numEscapeCodes; ++j) {
-                if (ch == escapeCodes[j][0]) {
-                    stringResult += QLatin1Char(escapeCodes[j][1]);
+            for (const auto &escapeCode : escapeCodes) {
+                if (ch == escapeCode[0]) {
+                    stringResult += QLatin1Char(escapeCode[1]);
                     goto StNormal;
                 }
             }
@@ -937,7 +937,7 @@ void QConfFileSettingsPrivate::initFormat()
 #endif
 
     if (format > QSettings::IniFormat) {
-        QMutexLocker locker(&settingsGlobalMutex);
+        const auto locker = qt_scoped_lock(settingsGlobalMutex);
         const CustomFormatVector *customFormatVector = customFormatVectorFunc();
 
         int i = (int)format - (int)QSettings::CustomFormat1;
@@ -1052,11 +1052,11 @@ static QString make_user_path()
 }
 #endif // !Q_OS_WIN
 
-static void initDefaultPaths(QMutexLocker *locker)
+static std::unique_lock<QBasicMutex> initDefaultPaths(std::unique_lock<QBasicMutex> locker)
 {
     PathHash *pathHash = pathHashFunc();
 
-    locker->unlock();
+    locker.unlock();
 
     /*
        QLibraryInfo::location() uses QSettings, so in order to
@@ -1065,7 +1065,7 @@ static void initDefaultPaths(QMutexLocker *locker)
     */
     QString systemPath = QLibraryInfo::location(QLibraryInfo::SettingsPath) + QLatin1Char('/');
 
-    locker->relock();
+    locker.lock();
     if (pathHash->isEmpty()) {
         /*
            Lazy initialization of pathHash. We initialize the
@@ -1096,6 +1096,8 @@ static void initDefaultPaths(QMutexLocker *locker)
 #endif
 #endif // Q_OS_WIN
     }
+
+    return locker;
 }
 
 static Path getPath(QSettings::Format format, QSettings::Scope scope)
@@ -1103,10 +1105,10 @@ static Path getPath(QSettings::Format format, QSettings::Scope scope)
     Q_ASSERT((int)QSettings::NativeFormat == 0);
     Q_ASSERT((int)QSettings::IniFormat == 1);
 
-    QMutexLocker locker(&settingsGlobalMutex);
+    auto locker = qt_unique_lock(settingsGlobalMutex);
     PathHash *pathHash = pathHashFunc();
     if (pathHash->isEmpty())
-        initDefaultPaths(&locker);
+        locker = initDefaultPaths(std::move(locker));
 
     Path result = pathHash->value(pathHashKey(format, scope));
     if (!result.path.isEmpty())
@@ -1120,7 +1122,7 @@ static Path getPath(QSettings::Format format, QSettings::Scope scope)
 // Note: Suitable only for autotests.
 void Q_AUTOTEST_EXPORT clearDefaultPaths()
 {
-    QMutexLocker locker(&settingsGlobalMutex);
+    const auto locker = qt_scoped_lock(settingsGlobalMutex);
     pathHashFunc()->clear();
 }
 #endif // QT_BUILD_INTERNAL && Q_XDG_PLATFORM && !QT_NO_STANDARDPATHS
@@ -1200,7 +1202,7 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(const QString &fileName,
 
 QConfFileSettingsPrivate::~QConfFileSettingsPrivate()
 {
-    QMutexLocker locker(&settingsGlobalMutex);
+    const auto locker = qt_scoped_lock(settingsGlobalMutex);
     ConfFileHash *usedHash = usedHashFunc();
     ConfFileCache *unusedCache = unusedCacheFunc();
 
@@ -1239,7 +1241,7 @@ void QConfFileSettingsPrivate::remove(const QString &key)
 
     QSettingsKey theKey(key, caseSensitivity);
     QSettingsKey prefix(key + QLatin1Char('/'), caseSensitivity);
-    QMutexLocker locker(&confFile->mutex);
+    const auto locker = qt_scoped_lock(confFile->mutex);
 
     ensureSectionParsed(confFile, theKey);
     ensureSectionParsed(confFile, prefix);
@@ -1267,7 +1269,7 @@ void QConfFileSettingsPrivate::set(const QString &key, const QVariant &value)
     QConfFile *confFile = confFiles.at(0);
 
     QSettingsKey theKey(key, caseSensitivity, nextPosition++);
-    QMutexLocker locker(&confFile->mutex);
+    const auto locker = qt_scoped_lock(confFile->mutex);
     confFile->removedKeys.remove(theKey);
     confFile->addedKeys.insert(theKey, value);
 }
@@ -1279,7 +1281,7 @@ bool QConfFileSettingsPrivate::get(const QString &key, QVariant *value) const
     bool found = false;
 
     for (auto confFile : qAsConst(confFiles)) {
-        QMutexLocker locker(&confFile->mutex);
+        const auto locker = qt_scoped_lock(confFile->mutex);
 
         if (!confFile->addedKeys.isEmpty()) {
             j = confFile->addedKeys.constFind(theKey);
@@ -1312,7 +1314,7 @@ QStringList QConfFileSettingsPrivate::children(const QString &prefix, ChildSpec
     int startPos = prefix.size();
 
     for (auto confFile : qAsConst(confFiles)) {
-        QMutexLocker locker(&confFile->mutex);
+        const auto locker = qt_scoped_lock(confFile->mutex);
 
         if (thePrefix.isEmpty())
             ensureAllSectionsParsed(confFile);
@@ -1351,7 +1353,7 @@ void QConfFileSettingsPrivate::clear()
     // Note: First config file is always the most specific.
     QConfFile *confFile = confFiles.at(0);
 
-    QMutexLocker locker(&confFile->mutex);
+    const auto locker = qt_scoped_lock(confFile->mutex);
     ensureAllSectionsParsed(confFile);
     confFile->addedKeys.clear();
     confFile->removedKeys = confFile->originalKeys;
@@ -1363,7 +1365,7 @@ void QConfFileSettingsPrivate::sync()
     // error we just try to go on and make the best of it
 
     for (auto confFile : qAsConst(confFiles)) {
-        QMutexLocker locker(&confFile->mutex);
+        const auto locker = qt_scoped_lock(confFile->mutex);
         syncConfFile(confFile);
     }
 }
@@ -2048,8 +2050,8 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     QPixmap, which are part of Qt GUI. In other words, there is no
     \c toColor(), \c toImage(), or \c toPixmap() functions in QVariant.
 
-    Instead, you can use the QVariant::value() or the qVariantValue()
-    template function. For example:
+    Instead, you can use the QVariant::value() template function.
+    For example:
 
     \snippet code/src_corelib_io_qsettings.cpp 0
 
@@ -3521,10 +3523,10 @@ void QSettings::setUserIniPath(const QString &dir)
 */
 void QSettings::setPath(Format format, Scope scope, const QString &path)
 {
-    QMutexLocker locker(&settingsGlobalMutex);
+    auto locker = qt_unique_lock(settingsGlobalMutex);
     PathHash *pathHash = pathHashFunc();
     if (pathHash->isEmpty())
-        initDefaultPaths(&locker);
+        locker = initDefaultPaths(std::move(locker));
     pathHash->insert(pathHashKey(format, scope), Path(path + QDir::separator(), true));
 }
 
@@ -3604,7 +3606,7 @@ QSettings::Format QSettings::registerFormat(const QString &extension, ReadFunc r
     Q_ASSERT(caseSensitivity == Qt::CaseSensitive);
 #endif
 
-    QMutexLocker locker(&settingsGlobalMutex);
+    const auto locker = qt_scoped_lock(settingsGlobalMutex);
     CustomFormatVector *customFormatVector = customFormatVectorFunc();
     int index = customFormatVector->size();
     if (index == 16) // the QSettings::Format enum has room for 16 custom formats
diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp
index dd3468e1f8..6eb318006e 100644
--- a/src/corelib/io/qsettings_win.cpp
+++ b/src/corelib/io/qsettings_win.cpp
@@ -136,6 +136,8 @@ static void mergeKeySets(NameSet *dest, const QStringList &src)
 ** Wrappers for the insane windows registry API
 */
 
+// ### Qt 6: Use new helpers from qwinregistry.cpp (once bootstrap builds are obsolete)
+
 // Open a key with the specified "perms".
 // "access" is to explicitly use the 32- or 64-bit branch.
 static HKEY openKey(HKEY parentHandle, REGSAM perms, const QString &rSubKey, REGSAM access = 0)
@@ -166,8 +168,8 @@ static HKEY createOrOpenKey(HKEY parentHandle, REGSAM perms, const QString &rSub
     if (res == ERROR_SUCCESS)
         return resultHandle;
 
-    //qWarning("QSettings: Failed to create subkey \"%s\": %s",
-    //         qPrintable(rSubKey), qPrintable(qt_error_string(int(res))));
+    //qErrnoWarning(int(res), "QSettings: Failed to create subkey \"%ls\"",
+    //              qUtf16Printable(rSubKey));
 
     return 0;
 }
@@ -207,7 +209,7 @@ static QStringList childKeysOrGroups(HKEY parentHandle, QSettingsPrivate::ChildS
                                &numKeys, &maxKeySize, 0, 0, 0);
 
     if (res != ERROR_SUCCESS) {
-        qWarning("QSettings: RegQueryInfoKey() failed: %s", qPrintable(qt_error_string(int(res))));
+        qErrnoWarning(int(res), "QSettings: RegQueryInfoKey() failed");
         return result;
     }
 
@@ -241,7 +243,7 @@ static QStringList childKeysOrGroups(HKEY parentHandle, QSettingsPrivate::ChildS
             item = QString::fromWCharArray((const wchar_t *)buff.constData(), l);
 
         if (res != ERROR_SUCCESS) {
-            qWarning("QSettings: RegEnumValue failed: %s", qPrintable(qt_error_string(int(res))));
+            qErrnoWarning(int(res), "QSettings: RegEnumValue failed");
             continue;
         }
         if (item.isEmpty())
@@ -295,8 +297,8 @@ static void deleteChildGroups(HKEY parentHandle, REGSAM access = 0)
         // delete group itself
         LONG res = RegDeleteKey(parentHandle, reinterpret_cast<const wchar_t *>(group.utf16()));
         if (res != ERROR_SUCCESS) {
-            qWarning("QSettings: RegDeleteKey failed on subkey \"%s\": %s",
-                     qPrintable(group), qPrintable(qt_error_string(int(res))));
+            qErrnoWarning(int(res), "QSettings: RegDeleteKey failed on subkey \"%ls\"",
+                          qUtf16Printable(group));
             return;
         }
     }
@@ -596,8 +598,8 @@ QWinSettingsPrivate::~QWinSettingsPrivate()
         QString emptyKey;
         DWORD res = RegDeleteKey(writeHandle(), reinterpret_cast<const wchar_t *>(emptyKey.utf16()));
         if (res != ERROR_SUCCESS) {
-            qWarning("QSettings: Failed to delete key \"%s\": %s",
-                     qPrintable(regList.at(0).key()), qPrintable(qt_error_string(int(res))));
+            qErrnoWarning(int(res), "QSettings: Failed to delete key \"%ls\"",
+                          qUtf16Printable(regList.constFirst().key()));
         }
     }
 
@@ -633,16 +635,16 @@ void QWinSettingsPrivate::remove(const QString &uKey)
             for (const QString &group : childKeys) {
                 LONG res = RegDeleteValue(handle, reinterpret_cast<const wchar_t *>(group.utf16()));
                 if (res != ERROR_SUCCESS) {
-                    qWarning("QSettings: RegDeleteValue failed on subkey \"%s\": %s",
-                             qPrintable(group), qPrintable(qt_error_string(int(res))));
+                    qErrnoWarning(int(res), "QSettings: RegDeleteValue failed on subkey \"%ls\"",
+                                  qUtf16Printable(group));
                 }
             }
         } else {
             res = RegDeleteKey(writeHandle(), reinterpret_cast<const wchar_t *>(rKey.utf16()));
 
             if (res != ERROR_SUCCESS) {
-                qWarning("QSettings: RegDeleteKey failed on key \"%s\": %s",
-                         qPrintable(rKey), qPrintable(qt_error_string(int(res))));
+                qErrnoWarning(int(res), "QSettings: RegDeleteKey failed on key \"%ls\"",
+                              qUtf16Printable(rKey));
             }
         }
         RegCloseKey(handle);
@@ -739,8 +741,8 @@ void QWinSettingsPrivate::set(const QString &uKey, const QVariant &value)
     if (res == ERROR_SUCCESS) {
         deleteWriteHandleOnExit = false;
     } else {
-        qWarning("QSettings: failed to set subkey \"%s\": %s",
-                 qPrintable(rKey), qPrintable(qt_error_string(int(res))));
+        qErrnoWarning(int(res), "QSettings: failed to set subkey \"%ls\"",
+                      qUtf16Printable(rKey));
         setStatus(QSettings::AccessError);
     }
 
diff --git a/src/corelib/io/qstandardpaths_android.cpp b/src/corelib/io/qstandardpaths_android.cpp
index 83108e4387..1f4e0de1e7 100644
--- a/src/corelib/io/qstandardpaths_android.cpp
+++ b/src/corelib/io/qstandardpaths_android.cpp
@@ -136,7 +136,7 @@ static QString getExternalStoragePublicDirectory(const char *directoryField)
  */
 static QString getExternalFilesDir(const char *directoryField = 0)
 {
-    QString &path = (*androidDirCache)[QString(QLatin1String("APPNAME_%1")).arg(QLatin1String(directoryField))];
+    QString &path = (*androidDirCache)[QLatin1String("APPNAME_%1").arg(QLatin1String(directoryField))];
     if (!path.isEmpty())
         return path;
 
diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp
index cc656954d9..5f4955c53f 100644
--- a/src/corelib/io/qstandardpaths_unix.cpp
+++ b/src/corelib/io/qstandardpaths_unix.cpp
@@ -71,6 +71,28 @@ static void appendOrganizationAndApp(QString &path)
 #endif
 }
 
+#if QT_CONFIG(regularexpression)
+static QLatin1String xdg_key_name(QStandardPaths::StandardLocation type)
+{
+    switch (type) {
+    case QStandardPaths::DesktopLocation:
+        return QLatin1String("DESKTOP");
+    case QStandardPaths::DocumentsLocation:
+        return QLatin1String("DOCUMENTS");
+    case QStandardPaths::PicturesLocation:
+        return QLatin1String("PICTURES");
+    case QStandardPaths::MusicLocation:
+        return QLatin1String("MUSIC");
+    case QStandardPaths::MoviesLocation:
+        return QLatin1String("VIDEOS");
+    case QStandardPaths::DownloadLocation:
+        return QLatin1String("DOWNLOAD");
+    default:
+        return QLatin1String();
+    }
+}
+#endif
+
 QString QStandardPaths::writableLocation(StandardLocation type)
 {
     switch (type) {
@@ -132,44 +154,45 @@ QString QStandardPaths::writableLocation(StandardLocation type)
             xdgRuntimeDir = QDir::tempPath() + QLatin1String("/runtime-") + userName;
             fileInfo.setFile(xdgRuntimeDir);
 #ifndef Q_OS_WASM
-            qWarning("QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '%s'", qPrintable(xdgRuntimeDir));
+            qWarning("QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '%ls'", qUtf16Printable(xdgRuntimeDir));
 #endif
         } else {
             fileInfo.setFile(xdgRuntimeDir);
         }
         if (fileInfo.exists()) {
             if (!fileInfo.isDir()) {
-                qWarning("QStandardPaths: XDG_RUNTIME_DIR points to '%s' which is not a directory",
-                         qPrintable(xdgRuntimeDir));
+                qWarning("QStandardPaths: XDG_RUNTIME_DIR points to '%ls' which is not a directory",
+                         qUtf16Printable(xdgRuntimeDir));
                 return QString();
             }
         } else {
             QFileSystemEntry entry(xdgRuntimeDir);
             if (!QFileSystemEngine::createDirectory(entry, false)) {
                 if (errno != EEXIST) {
-                    qWarning("QStandardPaths: error creating runtime directory %s: %s",
-                             qPrintable(xdgRuntimeDir), qPrintable(qt_error_string(errno)));
+                    qErrnoWarning("QStandardPaths: error creating runtime directory %ls",
+                                  qUtf16Printable(xdgRuntimeDir));
                     return QString();
                 }
             } else {
                 QSystemError error;
                 if (!QFileSystemEngine::setPermissions(entry, wantedPerms, error)) {
-                    qWarning("QStandardPaths: could not set correct permissions on runtime directory %s: %s",
-                             qPrintable(xdgRuntimeDir), qPrintable(error.toString()));
+                    qWarning("QStandardPaths: could not set correct permissions on runtime directory %ls: %ls",
+                             qUtf16Printable(xdgRuntimeDir), qUtf16Printable(error.toString()));
                     return QString();
                 }
             }
         }
         // "The directory MUST be owned by the user"
         if (fileInfo.ownerId() != myUid) {
-            qWarning("QStandardPaths: wrong ownership on runtime directory %s, %d instead of %d",
-                        qPrintable(xdgRuntimeDir), fileInfo.ownerId(), myUid);
+            qWarning("QStandardPaths: wrong ownership on runtime directory %ls, %d instead of %d",
+                     qUtf16Printable(xdgRuntimeDir),
+                     fileInfo.ownerId(), myUid);
             return QString();
         }
         // "and he MUST be the only one having read and write access to it. Its Unix access mode MUST be 0700."
         if (fileInfo.permissions() != wantedPerms) {
-            qWarning("QStandardPaths: wrong permissions on runtime directory %s, %x instead of %x",
-                        qPrintable(xdgRuntimeDir), uint(fileInfo.permissions()), uint(wantedPerms));
+            qWarning("QStandardPaths: wrong permissions on runtime directory %ls, %x instead of %x",
+                     qUtf16Printable(xdgRuntimeDir), uint(fileInfo.permissions()), uint(wantedPerms));
             return QString();
         }
 
@@ -185,61 +208,32 @@ QString QStandardPaths::writableLocation(StandardLocation type)
     if (xdgConfigHome.isEmpty())
         xdgConfigHome = QDir::homePath() + QLatin1String("/.config");
     QFile file(xdgConfigHome + QLatin1String("/user-dirs.dirs"));
-    if (!isTestModeEnabled() && file.open(QIODevice::ReadOnly)) {
-        QHash<QString, QString> lines;
+    const QLatin1String key = xdg_key_name(type);
+    if (!key.isEmpty() && !isTestModeEnabled() && file.open(QIODevice::ReadOnly)) {
         QTextStream stream(&file);
         // Only look for lines like: XDG_DESKTOP_DIR="$HOME/Desktop"
         QRegularExpression exp(QLatin1String("^XDG_(.*)_DIR=(.*)$"));
+        QString result;
         while (!stream.atEnd()) {
             const QString &line = stream.readLine();
             QRegularExpressionMatch match = exp.match(line);
-            if (match.hasMatch()) {
-                const QStringList lst = match.capturedTexts();
-                const QString key = lst.at(1);
-                QString value = lst.at(2);
+            if (match.hasMatch() && match.capturedView(1) == key) {
+                QStringView value = match.capturedView(2);
                 if (value.length() > 2
                     && value.startsWith(QLatin1Char('\"'))
                     && value.endsWith(QLatin1Char('\"')))
                     value = value.mid(1, value.length() - 2);
-                // Store the key and value: "DESKTOP", "$HOME/Desktop"
-                lines[key] = value;
-            }
-        }
-
-        QString key;
-        switch (type) {
-        case DesktopLocation:
-            key = QLatin1String("DESKTOP");
-            break;
-        case DocumentsLocation:
-            key = QLatin1String("DOCUMENTS");
-            break;
-        case PicturesLocation:
-            key = QLatin1String("PICTURES");
-            break;
-        case MusicLocation:
-            key = QLatin1String("MUSIC");
-            break;
-        case MoviesLocation:
-            key = QLatin1String("VIDEOS");
-            break;
-        case DownloadLocation:
-            key = QLatin1String("DOWNLOAD");
-            break;
-        default:
-            break;
-        }
-        if (!key.isEmpty()) {
-            QString value = lines.value(key);
-            if (!value.isEmpty()) {
                 // value can start with $HOME
                 if (value.startsWith(QLatin1String("$HOME")))
-                    value = QDir::homePath() + value.midRef(5);
-                if (value.length() > 1 && value.endsWith(QLatin1Char('/')))
-                    value.chop(1);
-                return value;
+                    result = QDir::homePath() + value.mid(5);
+                else
+                    result = value.toString();
+                if (result.length() > 1 && result.endsWith(QLatin1Char('/')))
+                    result.chop(1);
             }
         }
+        if (!result.isNull())
+            return result;
     }
 #endif // QT_CONFIG(regularexpression)
 
@@ -289,16 +283,12 @@ static QStringList xdgDataDirs()
         dirs.append(QString::fromLatin1("/usr/local/share"));
         dirs.append(QString::fromLatin1("/usr/share"));
     } else {
-        dirs = xdgDataDirsEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
+        const auto parts = xdgDataDirsEnv.splitRef(QLatin1Char(':'), QString::SkipEmptyParts);
 
         // Normalize paths, skip relative paths
-        QMutableListIterator<QString> it(dirs);
-        while (it.hasNext()) {
-            const QString dir = it.next();
-            if (!dir.startsWith(QLatin1Char('/')))
-                it.remove();
-            else
-                it.setValue(QDir::cleanPath(dir));
+        for (const QStringRef &dir : parts) {
+            if (dir.startsWith(QLatin1Char('/')))
+                dirs.push_back(QDir::cleanPath(dir.toString()));
         }
 
         // Remove duplicates from the list, there's no use for duplicated
diff --git a/src/corelib/io/qstorageinfo.h b/src/corelib/io/qstorageinfo.h
index 4ab7a353ef..237e68d2a1 100644
--- a/src/corelib/io/qstorageinfo.h
+++ b/src/corelib/io/qstorageinfo.h
@@ -62,11 +62,9 @@ public:
     ~QStorageInfo();
 
     QStorageInfo &operator=(const QStorageInfo &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QStorageInfo &operator=(QStorageInfo &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QStorageInfo &operator=(QStorageInfo &&other) noexcept { swap(other); return *this; }
 
-    inline void swap(QStorageInfo &other) Q_DECL_NOTHROW
+    inline void swap(QStorageInfo &other) noexcept
     { qSwap(d, other.d); }
 
     void setPath(const QString &path);
diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index 07c80dda7c..1e72241e68 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -822,7 +822,7 @@ void QStorageInfoPrivate::retrieveVolumeInfo()
         valid = true;
         ready = true;
 
-#if defined(Q_OS_INTEGRITY) || (defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD))
+#if defined(Q_OS_INTEGRITY) || (defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)) || defined(Q_OS_RTEMS)
         bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize;
         bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize;
         bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize;
@@ -832,7 +832,7 @@ void QStorageInfoPrivate::retrieveVolumeInfo()
         bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize;
 #endif
         blockSize = statfs_buf.f_bsize;
-#if defined(Q_OS_ANDROID) || defined(Q_OS_BSD4) || defined(Q_OS_INTEGRITY)
+#if defined(Q_OS_ANDROID) || defined(Q_OS_BSD4) || defined(Q_OS_INTEGRITY) || defined(Q_OS_RTEMS)
 #if defined(_STATFS_F_FLAGS)
         readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;
 #endif
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index ced08a9a87..acd31f4d84 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -327,7 +327,7 @@ bool QTemporaryFileEngine::isReallyOpen() const
 {
     Q_D(const QFSFileEngine);
 
-    if (!((0 == d->fh) && (-1 == d->fd)
+    if (!((nullptr == d->fh) && (-1 == d->fd)
 #if defined Q_OS_WIN
                 && (INVALID_HANDLE_VALUE == d->fileHandle)
 #endif
@@ -544,10 +544,10 @@ QTemporaryFilePrivate::~QTemporaryFilePrivate()
 QAbstractFileEngine *QTemporaryFilePrivate::engine() const
 {
     if (!fileEngine) {
-        fileEngine = new QTemporaryFileEngine(&templateName);
+        fileEngine.reset(new QTemporaryFileEngine(&templateName));
         resetFileEngine();
     }
-    return fileEngine;
+    return fileEngine.get();
 }
 
 void QTemporaryFilePrivate::resetFileEngine() const
@@ -555,7 +555,7 @@ void QTemporaryFilePrivate::resetFileEngine() const
     if (!fileEngine)
         return;
 
-    QTemporaryFileEngine *tef = static_cast<QTemporaryFileEngine *>(fileEngine);
+    QTemporaryFileEngine *tef = static_cast<QTemporaryFileEngine *>(fileEngine.get());
     if (fileName.isEmpty())
         tef->initialize(templateName, 0600);
     else
@@ -568,7 +568,7 @@ void QTemporaryFilePrivate::materializeUnnamedFile()
     if (!fileName.isEmpty() || !fileEngine)
         return;
 
-    auto *tef = static_cast<QTemporaryFileEngine *>(fileEngine);
+    auto *tef = static_cast<QTemporaryFileEngine *>(fileEngine.get());
     fileName = tef->fileName(QAbstractFileEngine::DefaultName);
 #endif
 }
@@ -792,7 +792,7 @@ void QTemporaryFile::setAutoRemove(bool b)
 QString QTemporaryFile::fileName() const
 {
     Q_D(const QTemporaryFile);
-    auto tef = static_cast<QTemporaryFileEngine *>(d->fileEngine);
+    auto tef = static_cast<QTemporaryFileEngine *>(d->fileEngine.get());
     if (tef && tef->isReallyOpen())
         const_cast<QTemporaryFilePrivate *>(d)->materializeUnnamedFile();
 
@@ -841,7 +841,7 @@ void QTemporaryFile::setFileTemplate(const QString &name)
 bool QTemporaryFile::rename(const QString &newName)
 {
     Q_D(QTemporaryFile);
-    auto tef = static_cast<QTemporaryFileEngine *>(d->fileEngine);
+    auto tef = static_cast<QTemporaryFileEngine *>(d->fileEngine.get());
     if (!tef || !tef->isReallyOpen() || !tef->filePathWasTemplate)
         return QFile::rename(newName);
 
@@ -902,7 +902,7 @@ QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file)
 {
     if (QAbstractFileEngine *engine = file.d_func()->engine()) {
         if(engine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag)
-            return 0; //native already
+            return nullptr; // native already
         //cache
         bool wasOpen = file.isOpen();
         qint64 old_off = 0;
@@ -934,7 +934,7 @@ QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file)
         //done
         return ret;
     }
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -947,7 +947,7 @@ QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file)
 bool QTemporaryFile::open(OpenMode flags)
 {
     Q_D(QTemporaryFile);
-    auto tef = static_cast<QTemporaryFileEngine *>(d->fileEngine);
+    auto tef = static_cast<QTemporaryFileEngine *>(d->fileEngine.get());
     if (tef && tef->isReallyOpen()) {
         setOpenMode(flags);
         return true;
@@ -961,7 +961,7 @@ bool QTemporaryFile::open(OpenMode flags)
     d->resetFileEngine();
 
     if (QFile::open(flags)) {
-        tef = static_cast<QTemporaryFileEngine *>(d->fileEngine);
+        tef = static_cast<QTemporaryFileEngine *>(d->fileEngine.get());
         if (tef->isUnnamedFile())
             d->fileName.clear();
         else
diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h
index 0fec88d3cd..6bcff936b4 100644
--- a/src/corelib/io/qtemporaryfile_p.h
+++ b/src/corelib/io/qtemporaryfile_p.h
@@ -145,10 +145,10 @@ public:
     bool isUnnamedFile() const override final;
 
     const QString &templateName;
-    quint32 fileMode;
+    quint32 fileMode = 0;
     int flags = 0;
-    bool filePathIsTemplate;
-    bool filePathWasTemplate;
+    bool filePathIsTemplate = true;
+    bool filePathWasTemplate = true;
     bool unnamedFile = false;
 };
 
diff --git a/src/corelib/io/qtldurl.cpp b/src/corelib/io/qtldurl.cpp
index a934d19fa2..fc3e16b241 100644
--- a/src/corelib/io/qtldurl.cpp
+++ b/src/corelib/io/qtldurl.cpp
@@ -59,9 +59,9 @@ enum TLDMatchType {
 static bool containsTLDEntry(QStringView entry, TLDMatchType match)
 {
     const QStringView matchSymbols[] = {
-        QStringViewLiteral(""),
-        QStringViewLiteral("*"),
-        QStringViewLiteral("!"),
+        u"",
+        u"*",
+        u"!",
     };
     const auto symbol = matchSymbols[match];
     int index = qt_hash(entry, qt_hash(symbol)) % tldCount;
@@ -125,10 +125,10 @@ Q_CORE_EXPORT bool qIsEffectiveTLD(const QStringRef &domain)
         return true;
 
     const int dot = domain.indexOf(QLatin1Char('.'));
-    if (dot >= 0) {
-        if (containsTLDEntry(domain.mid(dot), SuffixMatch))   // 2
-            return !containsTLDEntry(domain, ExceptionMatch); // 3
-    }
+    if (dot < 0) // Actual TLD: may be effective if the subject of a wildcard rule:
+        return containsTLDEntry(QString(QLatin1Char('.') + domain), SuffixMatch);
+    if (containsTLDEntry(domain.mid(dot), SuffixMatch))   // 2
+        return !containsTLDEntry(domain, ExceptionMatch); // 3
     return false;
 }
 
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 6d82981fd6..878e007fb0 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -421,6 +421,7 @@
 #include "private/qipaddress_p.h"
 #include "qurlquery.h"
 #include "private/qdir_p.h"
+#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -520,10 +521,10 @@ public:
     bool isEmpty() const
     { return sectionIsPresent == 0 && port == -1 && path.isEmpty(); }
 
-    Error *cloneError() const;
+    std::unique_ptr<Error> cloneError() const;
     void clearError();
     void setError(ErrorCode errorCode, const QString &source, int supplement = -1);
-    ErrorCode validityError(QString *source = 0, int *position = 0) const;
+    ErrorCode validityError(QString *source = nullptr, int *position = nullptr) const;
     bool validateComponent(Section section, const QString &input, int begin, int end);
     bool validateComponent(Section section, const QString &input)
     { return validateComponent(section, input, 0, uint(input.length())); }
@@ -576,7 +577,7 @@ public:
     QString query;
     QString fragment;
 
-    Error *error;
+    std::unique_ptr<Error> error;
 
     // not used for:
     //  - Port (port == -1 means absence)
@@ -591,7 +592,6 @@ public:
 
 inline QUrlPrivate::QUrlPrivate()
     : ref(1), port(-1),
-      error(0),
       sectionIsPresent(0),
       flags(0)
 {
@@ -613,19 +613,16 @@ inline QUrlPrivate::QUrlPrivate(const QUrlPrivate &copy)
 }
 
 inline QUrlPrivate::~QUrlPrivate()
-{
-    delete error;
-}
+    = default;
 
-inline QUrlPrivate::Error *QUrlPrivate::cloneError() const
+std::unique_ptr<QUrlPrivate::Error> QUrlPrivate::cloneError() const
 {
-    return error ? new Error(*error) : 0;
+    return error ? qt_make_unique<Error>(*error) : nullptr;
 }
 
 inline void QUrlPrivate::clearError()
 {
-    delete error;
-    error = 0;
+    error.reset();
 }
 
 inline void QUrlPrivate::setError(ErrorCode errorCode, const QString &source, int supplement)
@@ -634,7 +631,7 @@ inline void QUrlPrivate::setError(ErrorCode errorCode, const QString &source, in
         // don't overwrite an error set in a previous section during parsing
         return;
     }
-    error = new Error;
+    error = qt_make_unique<Error>();
     error->code = errorCode;
     error->source = source;
     error->position = supplement;
@@ -826,7 +823,7 @@ recodeFromUser(const QString &input, const ushort *actions, int from, int to)
     QString output;
     const QChar *begin = input.constData() + from;
     const QChar *end = input.constData() + to;
-    if (qt_urlRecode(output, begin, end, 0, actions))
+    if (qt_urlRecode(output, begin, end, nullptr, actions))
         return output;
 
     return input.mid(from, to - from);
@@ -954,7 +951,7 @@ inline void QUrlPrivate::appendFragment(QString &appendTo, QUrl::FormattingOptio
 {
     appendToUser(appendTo, fragment, options,
                  options & QUrl::EncodeDelimiters ? fragmentInUrl :
-                 appendingTo == FullUrl ? 0 : fragmentInIsolation);
+                 appendingTo == FullUrl ? nullptr : fragmentInIsolation);
 }
 
 inline void QUrlPrivate::appendQuery(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const
@@ -1013,7 +1010,7 @@ inline bool QUrlPrivate::setScheme(const QString &value, int len, bool doSetErro
         for (int i = needsLowercasing; i >= 0; --i) {
             ushort c = schemeData[i].unicode();
             if (c >= 'A' && c <= 'Z')
-                schemeData[i] = c + 0x20;
+                schemeData[i] = QChar(c + 0x20);
         }
     }
 
@@ -1179,7 +1176,7 @@ inline void QUrlPrivate::appendHost(QString &appendTo, QUrl::FormattingOptions o
     if (host.at(0).unicode() == '[') {
         // IPv6 addresses might contain a zone-id which needs to be recoded
         if (options != 0)
-            if (qt_urlRecode(appendTo, host.constBegin(), host.constEnd(), options, 0))
+            if (qt_urlRecode(appendTo, host.constBegin(), host.constEnd(), options, nullptr))
                 return;
         appendTo += host;
     } else {
@@ -1221,7 +1218,7 @@ static const QChar *parseIpFuture(QString &host, const QChar *begin, const QChar
         --end;
 
         QString decoded;
-        if (mode == QUrl::TolerantMode && qt_urlRecode(decoded, begin, end, QUrl::FullyDecoded, 0)) {
+        if (mode == QUrl::TolerantMode && qt_urlRecode(decoded, begin, end, QUrl::FullyDecoded, nullptr)) {
             begin = decoded.constBegin();
             end = decoded.constEnd();
         }
@@ -1233,13 +1230,13 @@ static const QChar *parseIpFuture(QString &host, const QChar *begin, const QChar
                 host += *begin;
             else if (begin->unicode() >= '0' && begin->unicode() <= '9')
                 host += *begin;
-            else if (begin->unicode() < 0x80 && strchr(acceptable, begin->unicode()) != 0)
+            else if (begin->unicode() < 0x80 && strchr(acceptable, begin->unicode()) != nullptr)
                 host += *begin;
             else
                 return decoded.isEmpty() ? begin : &origBegin[2];
         }
         host += QLatin1Char(']');
-        return 0;
+        return nullptr;
     }
     return &origBegin[2];
 }
@@ -1286,7 +1283,7 @@ static const QChar *parseIp6(QString &host, const QChar *begin, const QChar *end
         host += zoneId;
     }
     host += QLatin1Char(']');
-    return 0;
+    return nullptr;
 }
 
 inline bool QUrlPrivate::setHost(const QString &value, int from, int iend, QUrl::ParsingMode mode)
@@ -1352,7 +1349,7 @@ inline bool QUrlPrivate::setHost(const QString &value, int from, int iend, QUrl:
 
     // check for percent-encoding first
     QString s;
-    if (mode == QUrl::TolerantMode && qt_urlRecode(s, begin, end, 0, 0)) {
+    if (mode == QUrl::TolerantMode && qt_urlRecode(s, begin, end, { }, nullptr)) {
         // something was decoded
         // anything encoded left?
         int pos = s.indexOf(QChar(0x25)); // '%'
@@ -1837,7 +1834,7 @@ inline void QUrlPrivate::validate() const
 
     \sa setUrl(), fromEncoded(), TolerantMode
 */
-QUrl::QUrl(const QString &url, ParsingMode parsingMode) : d(0)
+QUrl::QUrl(const QString &url, ParsingMode parsingMode) : d(nullptr)
 {
     setUrl(url, parsingMode);
 }
@@ -1845,7 +1842,7 @@ QUrl::QUrl(const QString &url, ParsingMode parsingMode) : d(0)
 /*!
     Constructs an empty QUrl object.
 */
-QUrl::QUrl() : d(0)
+QUrl::QUrl() : d(nullptr)
 {
 }
 
@@ -1879,7 +1876,7 @@ QUrl::~QUrl()
 bool QUrl::isValid() const
 {
     if (isEmpty()) {
-        // also catches d == 0
+        // also catches d == nullptr
         return false;
     }
     return d->validityError() == QUrlPrivate::NoError;
@@ -1907,7 +1904,7 @@ void QUrl::clear()
 {
     if (d && !d->ref.deref())
         delete d;
-    d = 0;
+    d = nullptr;
 }
 
 /*!
@@ -3266,10 +3263,10 @@ QUrl QUrl::resolved(const QUrl &relative) const
     removeDotsFromPath(&t.d->path);
 
 #if defined(QURL_DEBUG)
-    qDebug("QUrl(\"%s\").resolved(\"%s\") = \"%s\"",
-           qPrintable(url()),
-           qPrintable(relative.url()),
-           qPrintable(t.url()));
+    qDebug("QUrl(\"%ls\").resolved(\"%ls\") = \"%ls\"",
+           qUtf16Printable(url()),
+           qUtf16Printable(relative.url()),
+           qUtf16Printable(t.url()));
 #endif
     return t;
 }
@@ -3805,7 +3802,7 @@ void QUrl::detach()
 */
 bool QUrl::isDetached() const
 {
-    return !d || d->ref.load() == 1;
+    return !d || d->ref.loadRelaxed() == 1;
 }
 
 
@@ -3994,21 +3991,21 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err
         return QString();
 
     case QUrlPrivate::InvalidSchemeError: {
-        QString msg = QStringLiteral("Invalid scheme (character '%1' not permitted)");
+        auto msg = QLatin1String("Invalid scheme (character '%1' not permitted)");
         return msg.arg(c);
     }
 
     case QUrlPrivate::InvalidUserNameError:
-        return QString(QStringLiteral("Invalid user name (character '%1' not permitted)"))
+        return QLatin1String("Invalid user name (character '%1' not permitted)")
                 .arg(c);
 
     case QUrlPrivate::InvalidPasswordError:
-        return QString(QStringLiteral("Invalid password (character '%1' not permitted)"))
+        return QLatin1String("Invalid password (character '%1' not permitted)")
                 .arg(c);
 
     case QUrlPrivate::InvalidRegNameError:
         if (errorPosition != -1)
-            return QString(QStringLiteral("Invalid hostname (character '%1' not permitted)"))
+            return QLatin1String("Invalid hostname (character '%1' not permitted)")
                     .arg(c);
         else
             return QStringLiteral("Invalid hostname (contains invalid characters)");
@@ -4017,9 +4014,9 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err
     case QUrlPrivate::InvalidIPv6AddressError:
         return QStringLiteral("Invalid IPv6 address");
     case QUrlPrivate::InvalidCharacterInIPv6Error:
-        return QStringLiteral("Invalid IPv6 address (character '%1' not permitted)").arg(c);
+        return QLatin1String("Invalid IPv6 address (character '%1' not permitted)").arg(c);
     case QUrlPrivate::InvalidIPvFutureError:
-        return QStringLiteral("Invalid IPvFuture address (character '%1' not permitted)").arg(c);
+        return QLatin1String("Invalid IPvFuture address (character '%1' not permitted)").arg(c);
     case QUrlPrivate::HostMissingEndBracket:
         return QStringLiteral("Expected ']' to match '[' in hostname");
 
@@ -4029,15 +4026,15 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err
         return QStringLiteral("Port field was empty");
 
     case QUrlPrivate::InvalidPathError:
-        return QString(QStringLiteral("Invalid path (character '%1' not permitted)"))
+        return QLatin1String("Invalid path (character '%1' not permitted)")
                 .arg(c);
 
     case QUrlPrivate::InvalidQueryError:
-        return QString(QStringLiteral("Invalid query (character '%1' not permitted)"))
+        return QLatin1String("Invalid query (character '%1' not permitted)")
                 .arg(c);
 
     case QUrlPrivate::InvalidFragmentError:
-        return QString(QStringLiteral("Invalid fragment (character '%1' not permitted)"))
+        return QLatin1String("Invalid fragment (character '%1' not permitted)")
                 .arg(c);
 
     case QUrlPrivate::AuthorityPresentAndPathIsRelative:
@@ -4159,7 +4156,7 @@ QList<QUrl> QUrl::fromStringList(const QStringList &urls, ParsingMode mode)
     \relates QHash
     \since 5.0
 */
-uint qHash(const QUrl &url, uint seed) Q_DECL_NOTHROW
+uint qHash(const QUrl &url, uint seed) noexcept
 {
     if (!url.d)
         return qHash(-1, seed); // the hash of an unset port (-1)
@@ -4187,7 +4184,7 @@ static QUrl adjustFtpPath(QUrl url)
 static bool isIp6(const QString &text)
 {
     QIPAddressUtils::IPv6Address address;
-    return !text.isEmpty() && QIPAddressUtils::parseIp6(address, text.begin(), text.end()) == 0;
+    return !text.isEmpty() && QIPAddressUtils::parseIp6(address, text.begin(), text.end()) == nullptr;
 }
 
 /*!
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 5062ef7905..94269e4369 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -119,7 +119,7 @@ class QTypeInfo<QUrlTwoFlags<E1, E2> > : public QTypeInfoMerger<QUrlTwoFlags<E1,
 
 class QUrl;
 // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4)
-Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed = 0) noexcept;
 
 class Q_CORE_EXPORT QUrl
 {
@@ -182,15 +182,13 @@ public:
     QUrl(const QString &url, ParsingMode mode = TolerantMode);
     QUrl &operator=(const QString &url);
 #endif
-#ifdef Q_COMPILER_RVALUE_REFS
-    QUrl(QUrl &&other) Q_DECL_NOTHROW : d(other.d)
+    QUrl(QUrl &&other) noexcept : d(other.d)
     { other.d = nullptr; }
-    inline QUrl &operator=(QUrl &&other) Q_DECL_NOTHROW
+    inline QUrl &operator=(QUrl &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
     ~QUrl();
 
-    inline void swap(QUrl &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    inline void swap(QUrl &other) noexcept { qSwap(d, other.d); }
 
     void setUrl(const QString &url, ParsingMode mode = TolerantMode);
     QString url(FormattingOptions options = FormattingOptions(PrettyDecoded)) const;
@@ -361,7 +359,7 @@ public:
     static QList<QUrl> fromStringList(const QStringList &uris, ParsingMode mode = TolerantMode);
 
     static void setIdnWhitelist(const QStringList &);
-    friend Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed) Q_DECL_NOTHROW;
+    friend Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed) noexcept;
 
 private:
     QUrlPrivate *d;
diff --git a/src/corelib/io/qurl_p.h b/src/corelib/io/qurl_p.h
index 1b9237e58a..e75de32e03 100644
--- a/src/corelib/io/qurl_p.h
+++ b/src/corelib/io/qurl_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 // in qurlrecode.cpp
 extern Q_AUTOTEST_EXPORT int qt_urlRecode(QString &appendTo, const QChar *begin, const QChar *end,
-                                          QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications = 0);
+                                          QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications = nullptr);
 
 // in qurlidna.cpp
 enum AceLeadingDot { AllowLeadingDot, ForbidLeadingDot };
diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp
index 2305e66407..a2f0caa606 100644
--- a/src/corelib/io/qurlidna.cpp
+++ b/src/corelib/io/qurlidna.cpp
@@ -1444,7 +1444,7 @@ static void mapToLowerCase(QString *str, int from)
 {
     int N = sizeof(NameprepCaseFolding) / sizeof(NameprepCaseFolding[0]);
 
-    ushort *d = 0;
+    ushort *d = nullptr;
     for (int i = from; i < str->size(); ++i) {
         uint uc = str->at(i).unicode();
         if (uc < 0x80) {
@@ -1474,7 +1474,7 @@ static void mapToLowerCase(QString *str, int from)
                     else
                         str->replace(--i, 2, reinterpret_cast<const QChar *>(&entry->mapping[0]), l);
                     i += l - 1;
-                    d = 0;
+                    d = nullptr;
                 } else {
                     if (!d)
                         d = reinterpret_cast<ushort *>(str->data());
@@ -2220,9 +2220,8 @@ Q_AUTOTEST_EXPORT void qt_punycodeEncoder(const QChar *s, int ucLength, QString
     bool skipped = false;
     // copy all basic code points verbatim to output.
     for (uint j = 0; j < (uint) ucLength; ++j) {
-        ushort js = s[j].unicode();
-        if (js < 0x80)
-            *d++ = js;
+        if (s[j].unicode() < 0x80)
+            *d++ = s[j];
         else
             skipped = true;
     }
@@ -2404,7 +2403,7 @@ static const char * const idn_whitelist[] = {
 };
 static const size_t idn_whitelist_size = sizeof idn_whitelist / sizeof *idn_whitelist;
 
-static QStringList *user_idn_whitelist = 0;
+static QStringList *user_idn_whitelist = nullptr;
 
 static bool lessThan(const QChar *a, int l, const char *c)
 {
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index 73a94cd5d5..8d80a2d8bd 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -189,7 +189,7 @@ public:
 
 template<> void QSharedDataPointer<QUrlQueryPrivate>::detach()
 {
-    if (d && d->ref.load() == 1)
+    if (d && d->ref.loadRelaxed() == 1)
         return;
     QUrlQueryPrivate *x = (d ? new QUrlQueryPrivate(*d)
                              : new QUrlQueryPrivate);
@@ -262,7 +262,7 @@ inline QString QUrlQueryPrivate::recodeToUser(const QString &input, QUrl::Compon
     if (!(encoding & QUrl::EncodeDelimiters)) {
         QString output;
         if (qt_urlRecode(output, input.constData(), input.constData() + input.length(),
-                         encoding, 0))
+                         encoding, nullptr))
             return output;
         return input;
     }
@@ -290,12 +290,12 @@ void QUrlQueryPrivate::setQuery(const QString &query)
     const QChar *const end = pos + query.size();
     while (pos != end) {
         const QChar *begin = pos;
-        const QChar *delimiter = 0;
+        const QChar *delimiter = nullptr;
         while (pos != end) {
             // scan for the component parts of this pair
-            if (!delimiter && pos->unicode() == valueDelimiter)
+            if (!delimiter && *pos == valueDelimiter)
                 delimiter = pos;
-            if (pos->unicode() == pairDelimiter)
+            if (*pos == pairDelimiter)
                 break;
             ++pos;
         }
@@ -345,7 +345,7 @@ QSharedDataPointer<QUrlQueryPrivate>::clone()
     \sa setQuery(), addQueryItem()
 */
 QUrlQuery::QUrlQuery()
-    : d(0)
+    : d(nullptr)
 {
 }
 
@@ -356,7 +356,7 @@ QUrlQuery::QUrlQuery()
     set the query with setQuery().
 */
 QUrlQuery::QUrlQuery(const QString &queryString)
-    : d(queryString.isEmpty() ? 0 : new QUrlQueryPrivate(queryString))
+    : d(queryString.isEmpty() ? nullptr : new QUrlQueryPrivate(queryString))
 {
 }
 
@@ -369,7 +369,7 @@ QUrlQuery::QUrlQuery(const QString &queryString)
     \sa QUrl::query()
 */
 QUrlQuery::QUrlQuery(const QUrl &url)
-    : d(0)
+    : d(nullptr)
 {
     // use internals to avoid unnecessary recoding
     // ### FIXME: actually do it
@@ -434,7 +434,7 @@ bool QUrlQuery::operator ==(const QUrlQuery &other) const
     Returns the hash value for \a key,
     using \a seed to seed the calculation.
 */
-uint qHash(const QUrlQuery &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QUrlQuery &key, uint seed) noexcept
 {
     if (const QUrlQueryPrivate *d = key.d) {
         QtPrivate::QHashCombine hash;
@@ -462,7 +462,7 @@ bool QUrlQuery::isEmpty() const
 */
 bool QUrlQuery::isDetached() const
 {
-    return d && d->ref.load() == 1;
+    return d && d->ref.loadRelaxed() == 1;
 }
 
 /*!
@@ -584,8 +584,8 @@ QString QUrlQuery::query(QUrl::ComponentFormattingOptions encoding) const
 */
 void QUrlQuery::setQueryDelimiters(QChar valueDelimiter, QChar pairDelimiter)
 {
-    d->valueDelimiter = valueDelimiter.unicode();
-    d->pairDelimiter = pairDelimiter.unicode();
+    d->valueDelimiter = valueDelimiter;
+    d->pairDelimiter = pairDelimiter;
 }
 
 /*!
diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h
index e3688aae2c..89d0f88059 100644
--- a/src/corelib/io/qurlquery.h
+++ b/src/corelib/io/qurlquery.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed = 0) noexcept;
 
 class QUrlQueryPrivate;
 class Q_CORE_EXPORT QUrlQuery
@@ -70,16 +70,14 @@ public:
 
     QUrlQuery(const QUrlQuery &other);
     QUrlQuery &operator=(const QUrlQuery &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QUrlQuery &operator=(QUrlQuery &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QUrlQuery &operator=(QUrlQuery &&other) noexcept { swap(other); return *this; }
     ~QUrlQuery();
 
     bool operator==(const QUrlQuery &other) const;
     bool operator!=(const QUrlQuery &other) const
     { return !(*this == other); }
 
-    void swap(QUrlQuery &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QUrlQuery &other) noexcept { qSwap(d, other.d); }
 
     bool isEmpty() const;
     bool isDetached() const;
@@ -111,7 +109,7 @@ public:
 
 private:
     friend class QUrl;
-    friend Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed) Q_DECL_NOTHROW;
+    friend Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed) noexcept;
     QSharedDataPointer<QUrlQueryPrivate> d;
 public:
     typedef QSharedDataPointer<QUrlQueryPrivate> DataPtr;
diff --git a/src/corelib/io/qurlrecode.cpp b/src/corelib/io/qurlrecode.cpp
index 443ae18b21..35ede8d078 100644
--- a/src/corelib/io/qurlrecode.cpp
+++ b/src/corelib/io/qurlrecode.cpp
@@ -377,7 +377,7 @@ static int recode(QString &result, const ushort *begin, const ushort *end, QUrl:
 {
     const int origSize = result.size();
     const ushort *input = begin;
-    ushort *output = 0;
+    ushort *output = nullptr;
 
     EncodingAction action = EncodeCharacter;
     for ( ; input != end; ++input) {
@@ -692,7 +692,7 @@ qt_urlRecode(QString &appendTo, const QChar *begin, const QChar *end,
 }
 
 // qstring.cpp
-bool qt_is_ascii(const char *&ptr, const char *end) Q_DECL_NOTHROW;
+bool qt_is_ascii(const char *&ptr, const char *end) noexcept;
 
 /*!
     \internal
diff --git a/src/corelib/io/qwindowspipereader.cpp b/src/corelib/io/qwindowspipereader.cpp
index 15c9f52cf3..1f03ac5d5a 100644
--- a/src/corelib/io/qwindowspipereader.cpp
+++ b/src/corelib/io/qwindowspipereader.cpp
@@ -40,6 +40,7 @@
 #include "qwindowspipereader_p.h"
 #include "qiodevice_p.h"
 #include <qelapsedtimer.h>
+#include <qscopedvaluerollback.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -301,9 +302,8 @@ void QWindowsPipeReader::emitPendingReadyRead()
 {
     if (readyReadPending) {
         readyReadPending = false;
-        inReadyRead = true;
+        QScopedValueRollback<bool> guard(inReadyRead, true);
         emit readyRead();
-        inReadyRead = false;
     }
 }
 
diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp
index 92e8b6db52..32536f495b 100644
--- a/src/corelib/io/qwindowspipewriter.cpp
+++ b/src/corelib/io/qwindowspipewriter.cpp
@@ -39,6 +39,7 @@
 
 #include "qwindowspipewriter_p.h"
 #include "qiodevice_p.h"
+#include <qscopedvaluerollback.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -111,9 +112,8 @@ void QWindowsPipeWriter::emitPendingBytesWrittenValue()
 
         emit canWrite();
         if (!inBytesWritten) {
-            inBytesWritten = true;
+            QScopedValueRollback<bool> guard(inBytesWritten, true);
             emit bytesWritten(bytes);
-            inBytesWritten = false;
         }
     }
 }
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index 25a80a640c..6e97c2fd39 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -45,6 +45,7 @@
 #include <qmimedata.h>
 #include <qdebug.h>
 #include <qvector.h>
+#include <qregexp.h>
 #include <qstack.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
@@ -76,7 +77,7 @@ QPersistentModelIndexData *QPersistentModelIndexData::create(const QModelIndex &
 void QPersistentModelIndexData::destroy(QPersistentModelIndexData *data)
 {
     Q_ASSERT(data);
-    Q_ASSERT(data->ref.load() == 0);
+    Q_ASSERT(data->ref.loadRelaxed() == 0);
     QAbstractItemModel *model = const_cast<QAbstractItemModel *>(data->index.model());
     // a valid persistent model index with a null model pointer can only happen if the model was destroyed
     if (model) {
@@ -531,21 +532,16 @@ void QAbstractItemModelPrivate::invalidatePersistentIndex(const QModelIndex &ind
     }
 }
 
-namespace {
-    struct DefaultRoleNames : public QHash<int, QByteArray>
+using DefaultRoleNames = QHash<int, QByteArray>;
+Q_GLOBAL_STATIC_WITH_ARGS(DefaultRoleNames, qDefaultRoleNames, (
     {
-        DefaultRoleNames() {
-            (*this)[Qt::DisplayRole] = "display";
-            (*this)[Qt::DecorationRole] = "decoration";
-            (*this)[Qt::EditRole] = "edit";
-            (*this)[Qt::ToolTipRole] = "toolTip";
-            (*this)[Qt::StatusTipRole] = "statusTip";
-            (*this)[Qt::WhatsThisRole] = "whatsThis";
-        }
-    };
-}
-
-Q_GLOBAL_STATIC(DefaultRoleNames, qDefaultRoleNames)
+        { Qt::DisplayRole,    "display"    },
+        { Qt::DecorationRole, "decoration" },
+        { Qt::EditRole,       "edit"       },
+        { Qt::ToolTipRole,    "toolTip"    },
+        { Qt::StatusTipRole,  "statusTip"  },
+        { Qt::WhatsThisRole,  "whatsThis"  },
+    }))
 
 const QHash<int,QByteArray> &QAbstractItemModelPrivate::defaultRoleNames()
 {
@@ -1902,10 +1898,17 @@ bool QAbstractItemModel::clearItemData(const QModelIndex &index)
 */
 bool QAbstractItemModel::setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles)
 {
-    bool b = true;
-    for (QMap<int, QVariant>::ConstIterator it = roles.begin(); it != roles.end(); ++it)
-        b = b && setData(index, it.value(), it.key());
-    return b;
+    // ### Qt 6: Consider change the semantics of this function,
+    // or deprecating/removing it altogether.
+    //
+    // For instance, it should try setting *all* the data
+    // in \a roles, and not bail out at the first setData that returns
+    // false. It should also have a transactional approach.
+    for (auto it = roles.begin(), e = roles.end(); it != e; ++it) {
+        if (!setData(index, it.value(), it.key()))
+            return false;
+    }
+    return true;
 }
 
 /*!
diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index c34876d1d6..43649cf79b 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -57,12 +57,12 @@ class Q_CORE_EXPORT QModelIndex
 {
     friend class QAbstractItemModel;
 public:
-    Q_DECL_CONSTEXPR inline QModelIndex() Q_DECL_NOTHROW : r(-1), c(-1), i(0), m(nullptr) {}
+    Q_DECL_CONSTEXPR inline QModelIndex() noexcept : r(-1), c(-1), i(0), m(nullptr) {}
     // compiler-generated copy/move ctors/assignment operators are fine!
-    Q_DECL_CONSTEXPR inline int row() const Q_DECL_NOTHROW { return r; }
-    Q_DECL_CONSTEXPR inline int column() const Q_DECL_NOTHROW { return c; }
-    Q_DECL_CONSTEXPR inline quintptr internalId() const Q_DECL_NOTHROW { return i; }
-    inline void *internalPointer() const Q_DECL_NOTHROW { return reinterpret_cast<void*>(i); }
+    Q_DECL_CONSTEXPR inline int row() const noexcept { return r; }
+    Q_DECL_CONSTEXPR inline int column() const noexcept { return c; }
+    Q_DECL_CONSTEXPR inline quintptr internalId() const noexcept { return i; }
+    inline void *internalPointer() const noexcept { return reinterpret_cast<void*>(i); }
     inline QModelIndex parent() const;
     inline QModelIndex sibling(int row, int column) const;
     inline QModelIndex siblingAtColumn(int column) const;
@@ -72,13 +72,13 @@ public:
 #endif
     inline QVariant data(int role = Qt::DisplayRole) const;
     inline Qt::ItemFlags flags() const;
-    Q_DECL_CONSTEXPR inline const QAbstractItemModel *model() const Q_DECL_NOTHROW { return m; }
-    Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW { return (r >= 0) && (c >= 0) && (m != nullptr); }
-    Q_DECL_CONSTEXPR inline bool operator==(const QModelIndex &other) const Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR inline const QAbstractItemModel *model() const noexcept { return m; }
+    Q_DECL_CONSTEXPR inline bool isValid() const noexcept { return (r >= 0) && (c >= 0) && (m != nullptr); }
+    Q_DECL_CONSTEXPR inline bool operator==(const QModelIndex &other) const noexcept
         { return (other.r == r) && (other.i == i) && (other.c == c) && (other.m == m); }
-    Q_DECL_CONSTEXPR inline bool operator!=(const QModelIndex &other) const Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR inline bool operator!=(const QModelIndex &other) const noexcept
         { return !(*this == other); }
-    Q_DECL_CONSTEXPR inline bool operator<(const QModelIndex &other) const Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR inline bool operator<(const QModelIndex &other) const noexcept
         {
             return  r <  other.r
                 || (r == other.r && (c <  other.c
@@ -86,9 +86,9 @@ public:
                                                   || (i == other.i && std::less<const QAbstractItemModel *>()(m, other.m))))));
         }
 private:
-    inline QModelIndex(int arow, int acolumn, void *ptr, const QAbstractItemModel *amodel) Q_DECL_NOTHROW
+    inline QModelIndex(int arow, int acolumn, void *ptr, const QAbstractItemModel *amodel) noexcept
         : r(arow), c(acolumn), i(reinterpret_cast<quintptr>(ptr)), m(amodel) {}
-    Q_DECL_CONSTEXPR inline QModelIndex(int arow, int acolumn, quintptr id, const QAbstractItemModel *amodel) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR inline QModelIndex(int arow, int acolumn, quintptr id, const QAbstractItemModel *amodel) noexcept
         : r(arow), c(acolumn), i(id), m(amodel) {}
     int r, c;
     quintptr i;
@@ -103,7 +103,7 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QModelIndex &);
 class QPersistentModelIndexData;
 
 // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4)
-uint qHash(const QPersistentModelIndex &index, uint seed = 0) Q_DECL_NOTHROW;
+uint qHash(const QPersistentModelIndex &index, uint seed = 0) noexcept;
 
 class Q_CORE_EXPORT QPersistentModelIndex
 {
@@ -117,13 +117,11 @@ public:
     inline bool operator!=(const QPersistentModelIndex &other) const
     { return !operator==(other); }
     QPersistentModelIndex &operator=(const QPersistentModelIndex &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QPersistentModelIndex(QPersistentModelIndex &&other) Q_DECL_NOTHROW
+    inline QPersistentModelIndex(QPersistentModelIndex &&other) noexcept
         : d(other.d) { other.d = nullptr; }
-    inline QPersistentModelIndex &operator=(QPersistentModelIndex &&other) Q_DECL_NOTHROW
+    inline QPersistentModelIndex &operator=(QPersistentModelIndex &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
-    inline void swap(QPersistentModelIndex &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    inline void swap(QPersistentModelIndex &other) noexcept { qSwap(d, other.d); }
     bool operator==(const QModelIndex &other) const;
     bool operator!=(const QModelIndex &other) const;
     QPersistentModelIndex &operator=(const QModelIndex &other);
@@ -143,14 +141,14 @@ public:
     bool isValid() const;
 private:
     QPersistentModelIndexData *d;
-    friend uint qHash(const QPersistentModelIndex &, uint seed) Q_DECL_NOTHROW;
+    friend uint qHash(const QPersistentModelIndex &, uint seed) noexcept;
 #ifndef QT_NO_DEBUG_STREAM
     friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QPersistentModelIndex &);
 #endif
 };
 Q_DECLARE_SHARED(QPersistentModelIndex)
 
-inline uint qHash(const QPersistentModelIndex &index, uint seed) Q_DECL_NOTHROW
+inline uint qHash(const QPersistentModelIndex &index, uint seed) noexcept
 { return qHash(index.d, seed); }
 
 
@@ -464,7 +462,7 @@ inline QVariant QModelIndex::data(int arole) const
 inline Qt::ItemFlags QModelIndex::flags() const
 { return m ? m->flags(*this) : Qt::ItemFlags(); }
 
-inline uint qHash(const QModelIndex &index) Q_DECL_NOTHROW
+inline uint qHash(const QModelIndex &index) noexcept
 { return uint((uint(index.row()) << 4) + index.column() + index.internalId()); }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h
index e6085eca94..92a440a125 100644
--- a/src/corelib/itemmodels/qabstractitemmodel_p.h
+++ b/src/corelib/itemmodels/qabstractitemmodel_p.h
@@ -98,7 +98,7 @@ public:
     void itemsMoved(const QModelIndex &srcParent, int srcFirst, int srcLast, const QModelIndex &destinationParent, int destinationChild, Qt::Orientation orientation);
     bool allowMove(const QModelIndex &srcParent, int srcFirst, int srcLast, const QModelIndex &destinationParent, int destinationChild, Qt::Orientation orientation);
 
-    inline QModelIndex createIndex(int row, int column, void *data = 0) const {
+    inline QModelIndex createIndex(int row, int column, void *data = nullptr) const {
         return q_func()->createIndex(row, column, data);
     }
 
diff --git a/src/corelib/itemmodels/qabstractproxymodel_p.h b/src/corelib/itemmodels/qabstractproxymodel_p.h
index f7bd5cc691..a95687c970 100644
--- a/src/corelib/itemmodels/qabstractproxymodel_p.h
+++ b/src/corelib/itemmodels/qabstractproxymodel_p.h
@@ -62,7 +62,7 @@ class Q_CORE_EXPORT QAbstractProxyModelPrivate : public QAbstractItemModelPrivat
 {
     Q_DECLARE_PUBLIC(QAbstractProxyModel)
 public:
-    QAbstractProxyModelPrivate() : QAbstractItemModelPrivate(), model(0) {}
+    QAbstractProxyModelPrivate() : QAbstractItemModelPrivate(), model(nullptr) {}
     QAbstractItemModel *model;
     virtual void _q_sourceModelDestroyed();
     void mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent,
diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
index a20024f468..0319d215a1 100644
--- a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
+++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
@@ -55,7 +55,7 @@ public:
 
     struct SourceModelForRowResult
     {
-        SourceModelForRowResult() : sourceModel(Q_NULLPTR), sourceRow(-1) {}
+        SourceModelForRowResult() : sourceModel(nullptr), sourceRow(-1) {}
         QAbstractItemModel *sourceModel;
         int sourceRow;
     };
diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.h b/src/corelib/itemmodels/qconcatenatetablesproxymodel.h
index 85fc6a9c72..69b3a2ba09 100644
--- a/src/corelib/itemmodels/qconcatenatetablesproxymodel.h
+++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.h
@@ -42,6 +42,8 @@
 
 #include <QtCore/qabstractitemmodel.h>
 
+QT_REQUIRE_CONFIG(concatenatetablesproxymodel);
+
 QT_BEGIN_NAMESPACE
 
 class QConcatenateTablesProxyModelPrivate;
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index 1bacb63b17..c93a4d15b9 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1273,10 +1273,10 @@ struct IsNotValid {
     typedef bool result_type;
     struct is_transparent : std::true_type {};
     template <typename T>
-    Q_DECL_CONSTEXPR bool operator()(T &t) const Q_DECL_NOEXCEPT_EXPR(noexcept(t.isValid()))
+    Q_DECL_CONSTEXPR bool operator()(T &t) const noexcept(noexcept(t.isValid()))
     { return !t.isValid(); }
     template <typename T>
-    Q_DECL_CONSTEXPR bool operator()(T *t) const Q_DECL_NOEXCEPT_EXPR(noexcept(t->isValid()))
+    Q_DECL_CONSTEXPR bool operator()(T *t) const noexcept(noexcept(t->isValid()))
     { return !t->isValid(); }
 };
 }
diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h
index 1c924053a5..3c3f9fb1ac 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.h
+++ b/src/corelib/itemmodels/qitemselectionmodel.h
@@ -60,19 +60,17 @@ public:
     // ### Qt 6: remove them all, the compiler-generated ones are fine
     inline QItemSelectionRange(const QItemSelectionRange &other)
         : tl(other.tl), br(other.br) {}
-# ifdef Q_COMPILER_RVALUE_REFS
-    QItemSelectionRange(QItemSelectionRange &&other) Q_DECL_NOTHROW
+    QItemSelectionRange(QItemSelectionRange &&other) noexcept
         : tl(std::move(other.tl)), br(std::move(other.br)) {}
-    QItemSelectionRange &operator=(QItemSelectionRange &&other) Q_DECL_NOTHROW
+    QItemSelectionRange &operator=(QItemSelectionRange &&other) noexcept
     { tl = std::move(other.tl); br = std::move(other.br); return *this; }
-# endif
     QItemSelectionRange &operator=(const QItemSelectionRange &other)
     { tl = other.tl; br = other.br; return *this; }
 #endif // Qt < 6
     QItemSelectionRange(const QModelIndex &topL, const QModelIndex &bottomR) : tl(topL), br(bottomR) {}
     explicit QItemSelectionRange(const QModelIndex &index) : tl(index), br(tl) {}
 
-    void swap(QItemSelectionRange &other) Q_DECL_NOTHROW
+    void swap(QItemSelectionRange &other) noexcept
     {
         qSwap(tl, other.tl);
         qSwap(br, other.br);
@@ -249,7 +247,7 @@ Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QList<QItemSelectionRange>;
 class Q_CORE_EXPORT QItemSelection : public QList<QItemSelectionRange>
 {
 public:
-    QItemSelection() Q_DECL_NOTHROW : QList<QItemSelectionRange>() {}
+    QItemSelection() noexcept : QList<QItemSelectionRange>() {}
     QItemSelection(const QModelIndex &topLeft, const QModelIndex &bottomRight);
 
     // reusing QList::swap() here is OK!
diff --git a/src/corelib/itemmodels/qitemselectionmodel_p.h b/src/corelib/itemmodels/qitemselectionmodel_p.h
index e12a0c2928..ba85f22be3 100644
--- a/src/corelib/itemmodels/qitemselectionmodel_p.h
+++ b/src/corelib/itemmodels/qitemselectionmodel_p.h
@@ -62,7 +62,7 @@ class QItemSelectionModelPrivate: public QObjectPrivate
     Q_DECLARE_PUBLIC(QItemSelectionModel)
 public:
     QItemSelectionModelPrivate()
-      : model(0),
+      : model(nullptr),
         currentCommand(QItemSelectionModel::NoUpdate),
         tableSelected(false), tableColCount(0), tableRowCount(0) {}
 
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index d13e6199db..978102035e 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -64,11 +64,7 @@ struct QSortFilterProxyModelDataChanged
 
 static inline QSet<int> qVectorToSet(const QVector<int> &vector)
 {
-    QSet<int> set;
-    set.reserve(vector.size());
-    for(int i=0; i < vector.size(); ++i)
-        set << vector.at(i);
-    return set;
+    return {vector.begin(), vector.end()};
 }
 
 class QSortFilterProxyModelLessThan
@@ -130,7 +126,7 @@ struct QRowsRemoval
     {
     }
 
-    bool contains(QModelIndex parent, int row)
+    bool contains(QModelIndex parent, int row) const
     {
         do {
             if (parent == parent_source)
@@ -381,6 +377,7 @@ public:
 
     void sort();
     bool update_source_sort_column();
+    int find_source_sort_column() const;
     void sort_source_rows(QVector<int> &source_rows,
                           const QModelIndex &source_parent) const;
     QVector<QPair<int, QVector<int > > > proxy_intervals_for_source_items_to_add(
@@ -470,8 +467,8 @@ bool QSortFilterProxyModelPrivate::filterRecursiveAcceptsRow(int source_row, con
 void QSortFilterProxyModelPrivate::remove_from_mapping(const QModelIndex &source_parent)
 {
     if (Mapping *m = source_index_mapping.take(source_parent)) {
-        for (int i = 0; i < m->mapped_children.size(); ++i)
-            remove_from_mapping(m->mapped_children.at(i));
+        for (const QModelIndex &mappedIdx : qAsConst(m->mapped_children))
+            remove_from_mapping(mappedIdx);
         delete m;
     }
 }
@@ -483,11 +480,8 @@ void QSortFilterProxyModelPrivate::_q_clearMapping()
 
     qDeleteAll(source_index_mapping);
     source_index_mapping.clear();
-    if (dynamic_sortfilter && update_source_sort_column()) {
-        //update_source_sort_column might have created wrong mapping so we have to clear it again
-        qDeleteAll(source_index_mapping);
-        source_index_mapping.clear();
-    }
+    if (dynamic_sortfilter)
+        source_sort_column = find_source_sort_column();
 
     // update the persistent indexes
     update_persistent_indexes(source_indexes);
@@ -607,9 +601,9 @@ void QSortFilterProxyModelPrivate::sort()
     Q_Q(QSortFilterProxyModel);
     emit q->layoutAboutToBeChanged(QList<QPersistentModelIndex>(), QAbstractItemModel::VerticalSortHint);
     QModelIndexPairList source_indexes = store_persistent_indexes();
-    IndexMap::const_iterator it = source_index_mapping.constBegin();
-    for (; it != source_index_mapping.constEnd(); ++it) {
-        QModelIndex source_parent = it.key();
+    const auto end = source_index_mapping.constEnd();
+    for (auto it = source_index_mapping.constBegin(); it != end; ++it) {
+        const QModelIndex &source_parent = it.key();
         Mapping *m = it.value();
         sort_source_rows(m->source_rows, source_parent);
         build_source_to_proxy_mapping(m->source_rows, m->proxy_rows);
@@ -644,6 +638,31 @@ bool QSortFilterProxyModelPrivate::update_source_sort_column()
     return old_source_sort_column != source_sort_column;
 }
 
+/*!
+  \internal
+
+  Find the source_sort_column without creating a full mapping and
+  without updating anything.
+*/
+int QSortFilterProxyModelPrivate::find_source_sort_column() const
+{
+    if (proxy_sort_column == -1)
+        return -1;
+
+    const QModelIndex rootIndex;
+    const int source_cols = model->columnCount();
+    int accepted_columns = -1;
+
+    Q_Q(const QSortFilterProxyModel);
+    for (int i = 0; i < source_cols; ++i) {
+        if (q->filterAcceptsColumn(i, rootIndex)) {
+            if (++accepted_columns == proxy_sort_column)
+                return i;
+        }
+    }
+
+    return -1;
+}
 
 /*!
   \internal
@@ -735,13 +754,14 @@ void QSortFilterProxyModelPrivate::remove_source_items(
     if (!proxy_parent.isValid() && source_parent.isValid())
         return; // nothing to do (already removed)
 
-    QVector<QPair<int, int> > proxy_intervals;
-    proxy_intervals = proxy_intervals_for_source_items(source_to_proxy, source_items);
+    const auto proxy_intervals = proxy_intervals_for_source_items(
+        source_to_proxy, source_items);
 
-    for (int i = proxy_intervals.size()-1; i >= 0; --i) {
-        QPair<int, int> interval = proxy_intervals.at(i);
-        int proxy_start = interval.first;
-        int proxy_end = interval.second;
+    const auto end = proxy_intervals.rend();
+    for (auto it = proxy_intervals.rbegin(); it != end; ++it) {
+        const QPair<int, int> &interval = *it;
+        const int proxy_start = interval.first;
+        const int proxy_end = interval.second;
         remove_proxy_interval(source_to_proxy, proxy_to_source, proxy_start, proxy_end,
                               proxy_parent, orient, emit_signal);
     }
@@ -875,15 +895,15 @@ void QSortFilterProxyModelPrivate::insert_source_items(
     if (!proxy_parent.isValid() && source_parent.isValid())
         return; // nothing to do (source_parent is not mapped)
 
-    QVector<QPair<int, QVector<int> > > proxy_intervals;
-    proxy_intervals = proxy_intervals_for_source_items_to_add(
+    const auto proxy_intervals = proxy_intervals_for_source_items_to_add(
         proxy_to_source, source_items, source_parent, orient);
 
-    for (int i = proxy_intervals.size()-1; i >= 0; --i) {
-        QPair<int, QVector<int> > interval = proxy_intervals.at(i);
-        int proxy_start = interval.first;
-        QVector<int> source_items = interval.second;
-        int proxy_end = proxy_start + source_items.size() - 1;
+    const auto end = proxy_intervals.rend();
+    for (auto it = proxy_intervals.rbegin(); it != end; ++it) {
+        const QPair<int, QVector<int> > &interval = *it;
+        const int proxy_start = interval.first;
+        const QVector<int> &source_items = interval.second;
+        const int proxy_end = proxy_start + source_items.size() - 1;
 
         if (emit_signal) {
             if (orient == Qt::Vertical)
@@ -1195,8 +1215,8 @@ QModelIndexPairList QSortFilterProxyModelPrivate::store_persistent_indexes() con
     Q_Q(const QSortFilterProxyModel);
     QModelIndexPairList source_indexes;
     source_indexes.reserve(persistent.indexes.count());
-    for (QPersistentModelIndexData *data : qAsConst(persistent.indexes)) {
-        QModelIndex proxy_index = data->index;
+    for (const QPersistentModelIndexData *data : qAsConst(persistent.indexes)) {
+        const QModelIndex &proxy_index = data->index;
         QModelIndex source_index = q->mapToSource(proxy_index);
         source_indexes.append(qMakePair(proxy_index, QPersistentModelIndex(source_index)));
     }
@@ -1217,9 +1237,9 @@ void QSortFilterProxyModelPrivate::update_persistent_indexes(
     const int numSourceIndexes = source_indexes.count();
     from.reserve(numSourceIndexes);
     to.reserve(numSourceIndexes);
-    for (int i = 0; i < numSourceIndexes; ++i) {
-        QModelIndex source_index = source_indexes.at(i).second;
-        QModelIndex old_proxy_index = source_indexes.at(i).first;
+    for (const auto &indexPair : source_indexes) {
+        const QPersistentModelIndex &source_index = indexPair.second;
+        const QModelIndex &old_proxy_index = indexPair.first;
         create_mapping(source_index.parent());
         QModelIndex proxy_index = q->mapFromSource(source_index);
         from << old_proxy_index;
@@ -1264,7 +1284,7 @@ void QSortFilterProxyModelPrivate::filter_changed(const QModelIndex &source_pare
     const QVector<QModelIndex> mappedChildren = m->mapped_children;
     QVector<int> indexesToRemove;
     for (int i = 0; i < mappedChildren.size(); ++i) {
-        const QModelIndex source_child_index = mappedChildren.at(i);
+        const QModelIndex &source_child_index = mappedChildren.at(i);
         if (rows_removed.contains(source_child_index.row()) || columns_removed.contains(source_child_index.column())) {
             indexesToRemove.push_back(i);
             remove_from_mapping(source_child_index);
@@ -1594,11 +1614,8 @@ void QSortFilterProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersisten
     update_persistent_indexes(saved_persistent_indexes);
     saved_persistent_indexes.clear();
 
-    if (dynamic_sortfilter && update_source_sort_column()) {
-        //update_source_sort_column might have created wrong mapping so we have to clear it again
-        qDeleteAll(source_index_mapping);
-        source_index_mapping.clear();
-    }
+    if (dynamic_sortfilter)
+        source_sort_column = find_source_sort_column();
 
     emit q->layoutChanged(saved_layoutChange_parents);
     saved_layoutChange_parents.clear();
@@ -2296,10 +2313,9 @@ QMimeData *QSortFilterProxyModel::mimeData(const QModelIndexList &indexes) const
 {
     Q_D(const QSortFilterProxyModel);
     QModelIndexList source_indexes;
-    const int numIndexes = indexes.count();
-    source_indexes.reserve(numIndexes);
-    for (int i = 0; i < numIndexes; ++i)
-        source_indexes << mapToSource(indexes.at(i));
+    source_indexes.reserve(indexes.count());
+    for (const QModelIndex &idx : indexes)
+        source_indexes << mapToSource(idx);
     return d->model->mimeData(source_indexes);
 }
 
diff --git a/src/corelib/itemmodels/qtransposeproxymodel.h b/src/corelib/itemmodels/qtransposeproxymodel.h
index 879266d931..854a547fd4 100644
--- a/src/corelib/itemmodels/qtransposeproxymodel.h
+++ b/src/corelib/itemmodels/qtransposeproxymodel.h
@@ -43,6 +43,8 @@
 #include <QtCore/qabstractproxymodel.h>
 #include <QtCore/qscopedpointer.h>
 
+QT_REQUIRE_CONFIG(transposeproxymodel);
+
 QT_BEGIN_NAMESPACE
 
 class QTransposeProxyModelPrivate;
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 3f7bf3cd47..bd3cabc01a 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -7,7 +7,7 @@ HEADERS += \
         kernel/qdeadlinetimer.h \
         kernel/qdeadlinetimer_p.h \
         kernel/qelapsedtimer.h \
-        kernel/qeventloop.h\
+        kernel/qeventloop.h \
         kernel/qpointer.h \
         kernel/qcorecmdlineargs_p.h \
         kernel/qcoreapplication.h \
@@ -88,8 +88,10 @@ win32 {
             SOURCES += kernel/qeventdispatcher_winrt.cpp
             HEADERS += kernel/qeventdispatcher_winrt_p.h
         } else {
-            SOURCES += kernel/qeventdispatcher_win.cpp
-            HEADERS += kernel/qeventdispatcher_win_p.h
+            SOURCES += kernel/qeventdispatcher_win.cpp \
+                       kernel/qwinregistry.cpp
+            HEADERS += kernel/qeventdispatcher_win_p.h \
+                       kernel/qwinregistry_p.h
         }
 
         !winrt: LIBS_PRIVATE += -lversion
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index ea08ff571f..7215b3f2bd 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -170,7 +170,7 @@ QAbstractEventDispatcher::~QAbstractEventDispatcher()
 QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread)
 {
     QThreadData *data = thread ? QThreadData::get2(thread) : QThreadData::current();
-    return data->eventDispatcher.load();
+    return data->eventDispatcher.loadRelaxed();
 }
 
 /*!
@@ -470,7 +470,11 @@ void QAbstractEventDispatcher::removeNativeEventFilter(QAbstractNativeEventFilte
     \sa installNativeEventFilter(), QAbstractNativeEventFilter::nativeEventFilter()
     \since 5.0
 */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, void *message, long *result)
+#endif
 {
     Q_D(QAbstractEventDispatcher);
     if (!d->eventFilters.isEmpty()) {
diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h
index bd8da5c35d..4ef9c068df 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.h
+++ b/src/corelib/kernel/qabstracteventdispatcher.h
@@ -110,7 +110,11 @@ public:
 
     void installNativeEventFilter(QAbstractNativeEventFilter *filterObj);
     void removeNativeEventFilter(QAbstractNativeEventFilter *filterObj);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool filterNativeEvent(const QByteArray &eventType, void *message, qintptr *result);
+#else
     bool filterNativeEvent(const QByteArray &eventType, void *message, long *result);
+#endif
 #if QT_DEPRECATED_SINCE(5, 0)
     QT_DEPRECATED bool filterEvent(void *message)
     { return filterNativeEvent("", message, nullptr); }
diff --git a/src/corelib/kernel/qabstractnativeeventfilter.cpp b/src/corelib/kernel/qabstractnativeeventfilter.cpp
index dcbb92f044..eaadea4c12 100644
--- a/src/corelib/kernel/qabstractnativeeventfilter.cpp
+++ b/src/corelib/kernel/qabstractnativeeventfilter.cpp
@@ -74,6 +74,7 @@ QAbstractNativeEventFilter::~QAbstractNativeEventFilter()
         eventDispatcher->removeNativeEventFilter(this);
 }
 
+// ### fixme Qt 6: result will be qintptr *
 /*!
     \fn bool QAbstractNativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
 
diff --git a/src/corelib/kernel/qabstractnativeeventfilter.h b/src/corelib/kernel/qabstractnativeeventfilter.h
index d7baa42513..a468bffd61 100644
--- a/src/corelib/kernel/qabstractnativeeventfilter.h
+++ b/src/corelib/kernel/qabstractnativeeventfilter.h
@@ -52,7 +52,11 @@ public:
     QAbstractNativeEventFilter();
     virtual ~QAbstractNativeEventFilter();
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    virtual bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) = 0;
+#else
     virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) = 0;
+#endif
 
 private:
     Q_DISABLE_COPY(QAbstractNativeEventFilter)
diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp
index 637c98cd40..ea8f8e2c77 100644
--- a/src/corelib/kernel/qbasictimer.cpp
+++ b/src/corelib/kernel/qbasictimer.cpp
@@ -65,6 +65,10 @@ QT_BEGIN_NAMESPACE
     has not been stopped. The timer's ID can be retrieved using
     timerId().
 
+    Objects of this class cannot be copied, but can be moved, so you
+    can maintain a list of basic timers by holding them in container
+    that supports move-only types, e.g. std::vector.
+
     The \l{widgets/wiggly}{Wiggly} example uses QBasicTimer to repaint
     a widget at regular intervals.
 
@@ -79,6 +83,51 @@ QT_BEGIN_NAMESPACE
 
     \sa start()
 */
+
+/*!
+    \fn QBasicTimer::QBasicTimer(QBasicTimer &&other)
+    \since 5.14
+
+    Move-constructs a basic timer from \a other, which is left
+    \l{isActive()}{inactive}.
+
+    \sa isActive(), swap()
+*/
+
+/*!
+    \fn QBasicTimer &QBasicTimer::operator=(QBasicTimer &&other)
+    \since 5.14
+
+    Move-assigns \a other to this basic timer. The timer
+    previously represented by this basic timer is stopped.
+    \a other is left as \l{isActive()}{inactive}.
+
+    \sa stop(), isActive(), swap()
+*/
+
+#if QT_DEPRECATED_SINCE(5, 14)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+/*!
+    \internal
+*/
+QBasicTimer::QBasicTimer(const QBasicTimer &other)
+    : id{other.id}
+{
+    qWarning("QBasicTimer can't be copied");
+}
+
+/*!
+    \internal
+*/
+QBasicTimer &QBasicTimer::operator=(const QBasicTimer &other)
+{
+    id = other.id;
+    qWarning("QBasicTimer can't be assigned to");
+    return *this;
+}
+#endif
+#endif
+
 /*!
     \fn QBasicTimer::~QBasicTimer()
 
@@ -95,6 +144,15 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \fn QBasicTimer::swap(QBasicTimer &other)
+    \fn swap(QBasicTimer &lhs, QBasicTimer &rhs)
+    \since 5.14
+
+    Swaps string \a other with this string, or \a lhs with \a rhs.
+    This operation is very fast and never fails.
+*/
+
+/*!
     \fn int QBasicTimer::timerId() const
 
     Returns the timer's ID.
@@ -115,24 +173,7 @@ QT_BEGIN_NAMESPACE
  */
 void QBasicTimer::start(int msec, QObject *obj)
 {
-    QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance();
-    if (Q_UNLIKELY(!eventDispatcher)) {
-        qWarning("QBasicTimer::start: QBasicTimer can only be used with threads started with QThread");
-        return;
-    }
-    if (Q_UNLIKELY(obj && obj->thread() != eventDispatcher->thread())) {
-        qWarning("QBasicTimer::start: Timers cannot be started from another thread");
-        return;
-    }
-    if (id) {
-        if (Q_LIKELY(eventDispatcher->unregisterTimer(id)))
-            QAbstractEventDispatcherPrivate::releaseTimerId(id);
-        else
-            qWarning("QBasicTimer::start: Stopping previous timer failed. Possibly trying to stop from a different thread");
-    }
-    id = 0;
-    if (obj)
-        id = eventDispatcher->registerTimer(msec, Qt::CoarseTimer, obj);
+    start(msec, Qt::CoarseTimer, obj);
 }
 
 /*!
@@ -161,13 +202,7 @@ void QBasicTimer::start(int msec, Qt::TimerType timerType, QObject *obj)
         qWarning("QBasicTimer::start: Timers cannot be started from another thread");
         return;
     }
-    if (id) {
-        if (Q_LIKELY(eventDispatcher->unregisterTimer(id)))
-            QAbstractEventDispatcherPrivate::releaseTimerId(id);
-        else
-            qWarning("QBasicTimer::start: Stopping previous timer failed. Possibly trying to stop from a different thread");
-    }
-    id = 0;
+    stop();
     if (obj)
         id = eventDispatcher->registerTimer(msec, timerType, obj);
 }
diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h
index bfd6ffd125..769898f835 100644
--- a/src/corelib/kernel/qbasictimer.h
+++ b/src/corelib/kernel/qbasictimer.h
@@ -51,12 +51,35 @@ class QObject;
 class Q_CORE_EXPORT QBasicTimer
 {
     int id;
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    Q_DISABLE_COPY(QBasicTimer)
+#elif QT_DEPRECATED_SINCE(5, 14)
 public:
-    inline QBasicTimer() : id(0) {}
+    // Just here to preserve BC, we can't remove them yet
+    QT_DEPRECATED_X("copy-construction is unsupported; use move-construction instead")
+    QBasicTimer(const QBasicTimer &);
+    QT_DEPRECATED_X("copy-assignment is unsupported; use move-assignment instead")
+    QBasicTimer &operator=(const QBasicTimer &);
+#endif
+
+public:
+    constexpr QBasicTimer() noexcept : id{0} {}
     inline ~QBasicTimer() { if (id) stop(); }
 
-    inline bool isActive() const { return id != 0; }
-    inline int timerId() const { return id; }
+    QBasicTimer(QBasicTimer &&other) noexcept
+        : id{qExchange(other.id, 0)}
+    {}
+
+    QBasicTimer& operator=(QBasicTimer &&other) noexcept
+    {
+        QBasicTimer{std::move(other)}.swap(*this);
+        return *this;
+    }
+
+    void swap(QBasicTimer &other) noexcept { qSwap(id, other.id); }
+
+    bool isActive() const noexcept { return id != 0; }
+    int timerId() const noexcept { return id; }
 
     void start(int msec, QObject *obj);
     void start(int msec, Qt::TimerType timerType, QObject *obj);
@@ -64,6 +87,8 @@ public:
 };
 Q_DECLARE_TYPEINFO(QBasicTimer, Q_MOVABLE_TYPE);
 
+inline void swap(QBasicTimer &lhs, QBasicTimer &rhs) noexcept { lhs.swap(rhs); }
+
 QT_END_NAMESPACE
 
 #endif // QBASICTIMER_H
diff --git a/src/corelib/kernel/qcore_foundation.mm b/src/corelib/kernel/qcore_foundation.mm
index 56eabc4b8c..623d462749 100644
--- a/src/corelib/kernel/qcore_foundation.mm
+++ b/src/corelib/kernel/qcore_foundation.mm
@@ -501,7 +501,7 @@ NSTimeZone *QTimeZone::toNSTimeZone() const
 
     \sa QRectF::fromCGRect()
 */
-CGRect QRect::toCGRect() const Q_DECL_NOTHROW
+CGRect QRect::toCGRect() const noexcept
 {
     return CGRectMake(x(), y(), width(), height());
 }
@@ -513,7 +513,7 @@ CGRect QRect::toCGRect() const Q_DECL_NOTHROW
 
     \sa fromCGRect()
 */
-CGRect QRectF::toCGRect() const Q_DECL_NOTHROW
+CGRect QRectF::toCGRect() const noexcept
 {
     return CGRectMake(x(), y(), width(), height());
 }
@@ -525,7 +525,7 @@ CGRect QRectF::toCGRect() const Q_DECL_NOTHROW
 
     \sa toCGRect()
 */
-QRectF QRectF::fromCGRect(CGRect rect) Q_DECL_NOTHROW
+QRectF QRectF::fromCGRect(CGRect rect) noexcept
 {
     return QRectF(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
 }
@@ -539,7 +539,7 @@ QRectF QRectF::fromCGRect(CGRect rect) Q_DECL_NOTHROW
 
     \sa QPointF::fromCGPoint()
 */
-CGPoint QPoint::toCGPoint() const Q_DECL_NOTHROW
+CGPoint QPoint::toCGPoint() const noexcept
 {
     return CGPointMake(x(), y());
 }
@@ -551,7 +551,7 @@ CGPoint QPoint::toCGPoint() const Q_DECL_NOTHROW
 
     \sa fromCGPoint()
 */
-CGPoint QPointF::toCGPoint() const Q_DECL_NOTHROW
+CGPoint QPointF::toCGPoint() const noexcept
 {
     return CGPointMake(x(), y());
 }
@@ -563,7 +563,7 @@ CGPoint QPointF::toCGPoint() const Q_DECL_NOTHROW
 
     \sa toCGPoint()
 */
-QPointF QPointF::fromCGPoint(CGPoint point) Q_DECL_NOTHROW
+QPointF QPointF::fromCGPoint(CGPoint point) noexcept
 {
     return QPointF(point.x, point.y);
 }
@@ -577,7 +577,7 @@ QPointF QPointF::fromCGPoint(CGPoint point) Q_DECL_NOTHROW
 
     \sa QSizeF::fromCGSize()
 */
-CGSize QSize::toCGSize() const Q_DECL_NOTHROW
+CGSize QSize::toCGSize() const noexcept
 {
     return CGSizeMake(width(), height());
 }
@@ -589,7 +589,7 @@ CGSize QSize::toCGSize() const Q_DECL_NOTHROW
 
     \sa fromCGSize()
 */
-CGSize QSizeF::toCGSize() const Q_DECL_NOTHROW
+CGSize QSizeF::toCGSize() const noexcept
 {
     return CGSizeMake(width(), height());
 }
@@ -601,7 +601,7 @@ CGSize QSizeF::toCGSize() const Q_DECL_NOTHROW
 
     \sa toCGSize()
 */
-QSizeF QSizeF::fromCGSize(CGSize size) Q_DECL_NOTHROW
+QSizeF QSizeF::fromCGSize(CGSize size) noexcept
 {
     return QSizeF(size.width, size.height);
 }
diff --git a/src/corelib/kernel/qcore_mac.cpp b/src/corelib/kernel/qcore_mac.cpp
index b048576f5b..e59835be48 100644
--- a/src/corelib/kernel/qcore_mac.cpp
+++ b/src/corelib/kernel/qcore_mac.cpp
@@ -44,6 +44,7 @@
 #include "qpair.h"
 #include "qmutex.h"
 #include "qvarlengtharray.h"
+#include "private/qlocking_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -135,7 +136,7 @@ os_log_type_t AppleUnifiedLogger::logTypeForMessageType(QtMsgType msgType)
 os_log_t AppleUnifiedLogger::cachedLog(const QString &subsystem, const QString &category)
 {
     static QBasicMutex mutex;
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     static QHash<QPair<QString, QString>, os_log_t> logs;
     const auto cacheKey = qMakePair(subsystem, category);
diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm
index 15df303502..b1f3b74cd4 100644
--- a/src/corelib/kernel/qcore_mac_objc.mm
+++ b/src/corelib/kernel/qcore_mac_objc.mm
@@ -211,6 +211,12 @@ QDebug operator<<(QDebug debug, const QMacAutoReleasePool *pool)
     debug << "QMacAutoReleasePool(" << (const void *)pool << ')';
     return debug;
 }
+
+QDebug operator<<(QDebug debug, const QCFString &string)
+{
+    debug << static_cast<QString>(string);
+    return debug;
+}
 #endif // !QT_NO_DEBUG_STREAM
 
 #ifdef Q_OS_MACOS
@@ -371,7 +377,7 @@ bool operator<(const KeyPair &entry, const Qt::Key &key)
 struct qtKey2CocoaKeySortLessThan
 {
     typedef bool result_type;
-    Q_DECL_CONSTEXPR result_type operator()(const KeyPair &entry1, const KeyPair &entry2) const Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR result_type operator()(const KeyPair &entry1, const KeyPair &entry2) const noexcept
     {
         return entry1.qtKey < entry2.qtKey;
     }
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index 168e0418e4..535d3579b2 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -86,16 +86,24 @@ template <typename T, typename U, U (*RetainFunction)(U), void (*ReleaseFunction
 class QAppleRefCounted
 {
 public:
-    QAppleRefCounted(const T &t = T()) : value(t) {}
-    QAppleRefCounted(QAppleRefCounted &&other) : value(other.value) { other.value = T(); }
+    QAppleRefCounted() : value() {}
+    QAppleRefCounted(const T &t) : value(t) {}
+    QAppleRefCounted(T &&t) noexcept(std::is_nothrow_move_constructible<T>::value)
+        : value(std::move(t)) {}
+    QAppleRefCounted(QAppleRefCounted &&other)
+            noexcept(std::is_nothrow_move_assignable<T>::value &&
+                     std::is_nothrow_move_constructible<T>::value)
+        : value(qExchange(other.value, T())) {}
     QAppleRefCounted(const QAppleRefCounted &other) : value(other.value) { if (value) RetainFunction(value); }
     ~QAppleRefCounted() { if (value) ReleaseFunction(value); }
     operator T() const { return value; }
-    void swap(QAppleRefCounted &other) Q_DECL_NOEXCEPT_EXPR(noexcept(qSwap(value, other.value)))
+    void swap(QAppleRefCounted &other) noexcept(noexcept(qSwap(value, other.value)))
     { qSwap(value, other.value); }
     QAppleRefCounted &operator=(const QAppleRefCounted &other)
     { QAppleRefCounted copy(other); swap(copy); return *this; }
     QAppleRefCounted &operator=(QAppleRefCounted &&other)
+        noexcept(std::is_nothrow_move_assignable<T>::value &&
+                 std::is_nothrow_move_constructible<T>::value)
     { QAppleRefCounted moved(std::move(other)); swap(moved); return *this; }
     T *operator&() { return &value; }
 protected:
@@ -129,8 +137,10 @@ private:
 template <typename T>
 class QCFType : public QAppleRefCounted<T, CFTypeRef, CFRetain, CFRelease>
 {
+    using Base = QAppleRefCounted<T, CFTypeRef, CFRetain, CFRelease>;
 public:
-    using QAppleRefCounted<T, CFTypeRef, CFRetain, CFRelease>::QAppleRefCounted;
+    using Base::Base;
+    explicit QCFType(CFTypeRef r) : Base(static_cast<T>(r)) {}
     template <typename X> X as() const { return reinterpret_cast<X>(this->value); }
     static QCFType constructFromGet(const T &t)
     {
@@ -143,6 +153,7 @@ public:
 class Q_CORE_EXPORT QCFString : public QCFType<CFStringRef>
 {
 public:
+    using QCFType<CFStringRef>::QCFType;
     inline QCFString(const QString &str) : QCFType<CFStringRef>(0), string(str) {}
     inline QCFString(const CFStringRef cfstr = 0) : QCFType<CFStringRef>(cfstr) {}
     inline QCFString(const QCFType<CFStringRef> &other) : QCFType<CFStringRef>(other) {}
@@ -160,7 +171,8 @@ Q_CORE_EXPORT bool qt_mac_applicationIsInDarkMode();
 #endif
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug debug, const QMacAutoReleasePool *pool);
+Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QMacAutoReleasePool *pool);
+Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QCFString &string);
 #endif
 
 Q_CORE_EXPORT bool qt_apple_isApplicationExtension();
diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp
index 18c031f137..ff0c957770 100644
--- a/src/corelib/kernel/qcore_unix.cpp
+++ b/src/corelib/kernel/qcore_unix.cpp
@@ -132,8 +132,10 @@ static inline int qt_ppoll(struct pollfd *fds, nfds_t nfds, const struct timespe
     return ::ppoll(fds, nfds, timeout_ts, nullptr);
 #elif QT_CONFIG(poll_poll)
     return ::poll(fds, nfds, timespecToMillisecs(timeout_ts));
-#else
+#elif QT_CONFIG(poll_select)
     return qt_poll(fds, nfds, timeout_ts);
+#else
+    // configure.json reports an error when everything is not available
 #endif
 }
 
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index 5a2a29a327..6ec7d28318 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -52,8 +52,8 @@
 // We mean it.
 //
 
-#include <QtCore/private/qglobal_p.h>
 #include "qplatformdefs.h"
+#include <QtCore/private/qglobal_p.h>
 #include "qatomic.h"
 #include "qbytearray.h"
 
@@ -164,15 +164,15 @@ inline void qt_ignore_sigpipe()
 {
     // Set to ignore SIGPIPE once only.
     static QBasicAtomicInt atom = Q_BASIC_ATOMIC_INITIALIZER(0);
-    if (!atom.load()) {
+    if (!atom.loadRelaxed()) {
         // More than one thread could turn off SIGPIPE at the same time
         // But that's acceptable because they all would be doing the same
         // action
         struct sigaction noaction;
         memset(&noaction, 0, sizeof(noaction));
         noaction.sa_handler = SIG_IGN;
-        ::sigaction(SIGPIPE, &noaction, 0);
-        atom.store(1);
+        ::sigaction(SIGPIPE, &noaction, nullptr);
+        atom.storeRelaxed(1);
     }
 }
 
@@ -347,7 +347,7 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options)
 #endif
 
 // in qelapsedtimer_mac.cpp or qtimestamp_unix.cpp
-timespec qt_gettime() Q_DECL_NOTHROW;
+timespec qt_gettime() noexcept;
 void qt_nanosleep(timespec amount);
 QByteArray qt_readlink(const char *path);
 
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 75597f8739..e25049f821 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -55,6 +55,7 @@
 #include <qfileinfo.h>
 #include <qmutex.h>
 #include <private/qloggingregistry_p.h>
+#include <qscopeguard.h>
 #include <qstandardpaths.h>
 #ifndef QT_NO_QOBJECT
 #include <qthread.h>
@@ -70,6 +71,7 @@
 #include <private/qfactoryloader_p.h>
 #include <private/qfunctions_p.h>
 #include <private/qlocale_p.h>
+#include <private/qlocking_p.h>
 #include <private/qhooks_p.h>
 
 #ifndef QT_NO_QOBJECT
@@ -217,16 +219,25 @@ QString QCoreApplicationPrivate::appVersion() const
 }
 #endif
 
-QString *QCoreApplicationPrivate::cachedApplicationFilePath = 0;
+QString *QCoreApplicationPrivate::cachedApplicationFilePath = nullptr;
 
 bool QCoreApplicationPrivate::checkInstance(const char *function)
 {
-    bool b = (QCoreApplication::self != 0);
+    bool b = (QCoreApplication::self != nullptr);
     if (!b)
         qWarning("QApplication::%s: Please instantiate the QApplication object first", function);
     return b;
 }
 
+#if QT_CONFIG(commandlineparser)
+void QCoreApplicationPrivate::addQtOptions(QList<QCommandLineOption> *options)
+{
+    options->append(QCommandLineOption(QStringLiteral("qmljsdebugger"),
+                QStringLiteral("Activates the QML/JS debugger with a specified port. The value must be of format port:1234[,block]. \"block\" makes the application wait for a connection."),
+                QStringLiteral("value")));
+}
+#endif
+
 void QCoreApplicationPrivate::processCommandLineArguments()
 {
     int j = argc ? 1 : 0;
@@ -251,22 +262,13 @@ void QCoreApplicationPrivate::processCommandLineArguments()
     }
 
     if (j < argc) {
-        argv[j] = 0;
+        argv[j] = nullptr;
         argc = j;
     }
 }
 
 // Support for introspection
 
-#ifndef QT_NO_QOBJECT
-QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set = { 0, 0, 0, 0 };
-
-void qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set)
-{
-    qt_signal_spy_callback_set = callback_set;
-}
-#endif
-
 extern "C" void Q_CORE_EXPORT qt_startup_hook()
 {
 }
@@ -294,7 +296,7 @@ void qAddPreRoutine(QtStartUpFunction p)
 
     // Due to C++11 parallel dynamic initialization, this can be called
     // from multiple threads.
-    QMutexLocker locker(&globalRoutinesMutex);
+    const auto locker = qt_scoped_lock(globalRoutinesMutex);
     list->prepend(p); // in case QCoreApplication is re-created, see qt_call_pre_routines
 }
 
@@ -303,7 +305,7 @@ void qAddPostRoutine(QtCleanUpFunction p)
     QVFuncList *list = postRList();
     if (!list)
         return;
-    QMutexLocker locker(&globalRoutinesMutex);
+    const auto locker = qt_scoped_lock(globalRoutinesMutex);
     list->prepend(p);
 }
 
@@ -312,7 +314,7 @@ void qRemovePostRoutine(QtCleanUpFunction p)
     QVFuncList *list = postRList();
     if (!list)
         return;
-    QMutexLocker locker(&globalRoutinesMutex);
+    const auto locker = qt_scoped_lock(globalRoutinesMutex);
     list->removeAll(p);
 }
 
@@ -323,7 +325,7 @@ static void qt_call_pre_routines()
 
     QVFuncList list;
     {
-        QMutexLocker locker(&globalRoutinesMutex);
+        const auto locker = qt_scoped_lock(globalRoutinesMutex);
         // Unlike qt_call_post_routines, we don't empty the list, because
         // Q_COREAPP_STARTUP_FUNCTION is a macro, so the user expects
         // the function to be executed every time QCoreApplication is created.
@@ -342,7 +344,7 @@ void Q_CORE_EXPORT qt_call_post_routines()
         QVFuncList list;
         {
             // extract the current list and make the stored list empty
-            QMutexLocker locker(&globalRoutinesMutex);
+            const auto locker = qt_scoped_lock(globalRoutinesMutex);
             qSwap(*postRList, list);
         }
 
@@ -370,25 +372,25 @@ Q_CORE_EXPORT uint qGlobalPostedEventsCount()
     return currentThreadData->postEventList.size() - currentThreadData->postEventList.startOffset;
 }
 
-QAbstractEventDispatcher *QCoreApplicationPrivate::eventDispatcher = 0;
+QAbstractEventDispatcher *QCoreApplicationPrivate::eventDispatcher = nullptr;
 
 #endif // QT_NO_QOBJECT
 
-QCoreApplication *QCoreApplication::self = 0;
+QCoreApplication *QCoreApplication::self = nullptr;
 uint QCoreApplicationPrivate::attribs =
     (1 << Qt::AA_SynthesizeMouseForUnhandledTouchEvents) |
     (1 << Qt::AA_SynthesizeMouseForUnhandledTabletEvents);
 
 struct QCoreApplicationData {
-    QCoreApplicationData() Q_DECL_NOTHROW {
+    QCoreApplicationData() noexcept {
         applicationNameSet = false;
         applicationVersionSet = false;
     }
     ~QCoreApplicationData() {
 #ifndef QT_NO_QOBJECT
         // cleanup the QAdoptedThread created for the main() thread
-        if (QCoreApplicationPrivate::theMainThread) {
-            QThreadData *data = QThreadData::get2(QCoreApplicationPrivate::theMainThread);
+        if (auto *t = QCoreApplicationPrivate::theMainThread.loadAcquire()) {
+            QThreadData *data = QThreadData::get2(t);
             data->deref(); // deletes the data and the adopted thread
         }
 #endif
@@ -458,12 +460,12 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint
     , aboutToQuitEmitted(false)
     , threadData_clean(false)
 #else
-    , q_ptr(0)
+    , q_ptr(nullptr)
 #endif
 {
     app_compile_version = flags & 0xffffff;
     static const char *const empty = "";
-    if (argc == 0 || argv == 0) {
+    if (argc == 0 || argv == nullptr) {
         argc = 0;
         argv = const_cast<char **>(&empty);
     }
@@ -488,7 +490,7 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint
 #endif
 
     QThread *cur = QThread::currentThread(); // note: this may end up setting theMainThread!
-    if (cur != theMainThread)
+    if (cur != theMainThread.loadAcquire())
         qWarning("WARNING: QApplication was not created in the main() thread.");
 #endif
 }
@@ -522,7 +524,7 @@ void QCoreApplicationPrivate::cleanupThreadData()
 #endif
 
         // need to clear the state of the mainData, just in case a new QCoreApplication comes along.
-        QMutexLocker locker(&threadData->postEventList.mutex);
+        const auto locker = qt_scoped_lock(threadData->postEventList.mutex);
         for (int i = 0; i < threadData->postEventList.size(); ++i) {
             const QPostEvent &pe = threadData->postEventList.at(i);
             if (pe.event) {
@@ -554,8 +556,8 @@ void QCoreApplicationPrivate::eventDispatcherReady()
 QBasicAtomicPointer<QThread> QCoreApplicationPrivate::theMainThread = Q_BASIC_ATOMIC_INITIALIZER(0);
 QThread *QCoreApplicationPrivate::mainThread()
 {
-    Q_ASSERT(theMainThread.load() != 0);
-    return theMainThread.load();
+    Q_ASSERT(theMainThread.loadRelaxed() != 0);
+    return theMainThread.loadRelaxed();
 }
 
 bool QCoreApplicationPrivate::threadRequiresCoreApplication()
@@ -856,7 +858,7 @@ void QCoreApplicationPrivate::init()
 #ifndef QT_NO_QOBJECT
     // use the event dispatcher created by the app programmer (if any)
     Q_ASSERT(!eventDispatcher);
-    eventDispatcher = threadData->eventDispatcher.load();
+    eventDispatcher = threadData->eventDispatcher.loadRelaxed();
 
     // otherwise we create one
     if (!eventDispatcher)
@@ -864,7 +866,7 @@ void QCoreApplicationPrivate::init()
     Q_ASSERT(eventDispatcher);
 
     if (!eventDispatcher->parent()) {
-        eventDispatcher->moveToThread(threadData->thread);
+        eventDispatcher->moveToThread(threadData->thread.loadAcquire());
         eventDispatcher->setParent(q);
     }
 
@@ -872,11 +874,6 @@ void QCoreApplicationPrivate::init()
     eventDispatcherReady();
 #endif
 
-#ifdef QT_EVAL
-    extern void qt_core_eval_init(QCoreApplicationPrivate::Type);
-    qt_core_eval_init(application_type);
-#endif
-
     processCommandLineArguments();
 
     qt_call_pre_routines();
@@ -898,7 +895,7 @@ QCoreApplication::~QCoreApplication()
 {
     qt_call_post_routines();
 
-    self = 0;
+    self = nullptr;
 #ifndef QT_NO_QOBJECT
     QCoreApplicationPrivate::is_app_closing = true;
     QCoreApplicationPrivate::is_app_running = false;
@@ -906,7 +903,7 @@ QCoreApplication::~QCoreApplication()
 
 #if QT_CONFIG(thread)
     // Synchronize and stop the global thread pool threads.
-    QThreadPool *globalThreadPool = 0;
+    QThreadPool *globalThreadPool = nullptr;
     QT_TRY {
         globalThreadPool = QThreadPool::globalInstance();
     } QT_CATCH (...) {
@@ -917,10 +914,10 @@ QCoreApplication::~QCoreApplication()
 #endif
 
 #ifndef QT_NO_QOBJECT
-    d_func()->threadData->eventDispatcher = 0;
+    d_func()->threadData->eventDispatcher = nullptr;
     if (QCoreApplicationPrivate::eventDispatcher)
         QCoreApplicationPrivate::eventDispatcher->closingDown();
-    QCoreApplicationPrivate::eventDispatcher = 0;
+    QCoreApplicationPrivate::eventDispatcher = nullptr;
 #endif
 
 #if QT_CONFIG(library)
@@ -1188,7 +1185,7 @@ static bool doNotify(QObject *receiver, QEvent *event)
 bool QCoreApplicationPrivate::sendThroughApplicationEventFilters(QObject *receiver, QEvent *event)
 {
     // We can't access the application event filters outside of the main thread (race conditions)
-    Q_ASSERT(receiver->d_func()->threadData->thread == mainThread());
+    Q_ASSERT(receiver->d_func()->threadData->thread.loadAcquire() == mainThread());
 
     if (extraData) {
         // application event filters are only called for objects in the GUI thread
@@ -1241,7 +1238,7 @@ bool QCoreApplicationPrivate::notify_helper(QObject *receiver, QEvent * event)
 
     // send to all application event filters (only does anything in the main thread)
     if (QCoreApplication::self
-            && receiver->d_func()->threadData->thread == mainThread()
+            && receiver->d_func()->threadData->thread.loadAcquire() == mainThread()
             && QCoreApplication::self->d_func()->sendThroughApplicationEventFilters(receiver, event)) {
         filtered = true;
         return filtered;
@@ -1313,7 +1310,7 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags)
     QThreadData *data = QThreadData::current();
     if (!data->hasEventDispatcher())
         return;
-    data->eventDispatcher.load()->processEvents(flags);
+    data->eventDispatcher.loadRelaxed()->processEvents(flags);
 }
 
 /*!
@@ -1345,7 +1342,7 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags, int m
         return;
     QElapsedTimer start;
     start.start();
-    while (data->eventDispatcher.load()->processEvents(flags & ~QEventLoop::WaitForMoreEvents)) {
+    while (data->eventDispatcher.loadRelaxed()->processEvents(flags & ~QEventLoop::WaitForMoreEvents)) {
         if (start.elapsed() > ms)
             break;
     }
@@ -1710,7 +1707,7 @@ void QCoreApplicationPrivate::sendPostedEvents(QObject *receiver, int event_type
 
     ++data->postEventList.recursion;
 
-    QMutexLocker locker(&data->postEventList.mutex);
+    auto locker = qt_unique_lock(data->postEventList.mutex);
 
     // by default, we assume that the event dispatcher can go to sleep after
     // processing all events. if any new events are posted while we send
@@ -1749,7 +1746,7 @@ void QCoreApplicationPrivate::sendPostedEvents(QObject *receiver, int event_type
 
             --data->postEventList.recursion;
             if (!data->postEventList.recursion && !data->canWait && data->hasEventDispatcher())
-                data->eventDispatcher.load()->wakeUp();
+                data->eventDispatcher.loadRelaxed()->wakeUp();
 
             // clear the global list, i.e. remove everything that was
             // delivered.
@@ -1826,13 +1823,8 @@ void QCoreApplicationPrivate::sendPostedEvents(QObject *receiver, int event_type
         // for the next event.
         const_cast<QPostEvent &>(pe).event = 0;
 
-        struct MutexUnlocker
-        {
-            QMutexLocker &m;
-            MutexUnlocker(QMutexLocker &m) : m(m) { m.unlock(); }
-            ~MutexUnlocker() { m.relock(); }
-        };
-        MutexUnlocker unlocker(locker);
+        locker.unlock();
+        const auto relocker = qScopeGuard([&locker] { locker.lock(); });
 
         QScopedPointer<QEvent> event_deleter(e); // will delete the event (with the mutex unlocked)
 
@@ -1869,7 +1861,7 @@ void QCoreApplicationPrivate::sendPostedEvents(QObject *receiver, int event_type
 void QCoreApplication::removePostedEvents(QObject *receiver, int eventType)
 {
     QThreadData *data = receiver ? receiver->d_func()->threadData : QThreadData::current();
-    QMutexLocker locker(&data->postEventList.mutex);
+    auto locker = qt_unique_lock(data->postEventList.mutex);
 
     // the QObject destructor calls this function directly.  this can
     // happen while the event loop is in the middle of posting events,
@@ -1932,7 +1924,7 @@ void QCoreApplicationPrivate::removePostedEvent(QEvent * event)
 
     QThreadData *data = QThreadData::current();
 
-    QMutexLocker locker(&data->postEventList.mutex);
+    const auto locker = qt_scoped_lock(data->postEventList.mutex);
 
     if (data->postEventList.size() == 0) {
 #if defined(QT_DEBUG)
@@ -2000,7 +1992,7 @@ void QCoreApplicationPrivate::deref()
 
 void QCoreApplicationPrivate::maybeQuit()
 {
-    if (quitLockRef.load() == 0 && in_exec && quitLockRefEnabled && shouldQuit())
+    if (quitLockRef.loadRelaxed() == 0 && in_exec && quitLockRefEnabled && shouldQuit())
         QCoreApplication::postEvent(QCoreApplication::instance(), new QEvent(QEvent::Quit));
 }
 
@@ -2662,7 +2654,7 @@ QString QCoreApplication::applicationVersion()
 
 #if QT_CONFIG(library)
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, libraryPathMutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, libraryPathMutex)
 
 /*!
     Returns a list of paths that the application will search when
@@ -2701,7 +2693,14 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMutex, libraryPathMutex, (QMutex::Recursive))
 QStringList QCoreApplication::libraryPaths()
 {
     QMutexLocker locker(libraryPathMutex());
+    return libraryPathsLocked();
+}
 
+/*!
+    \internal
+*/
+QStringList QCoreApplication::libraryPathsLocked()
+{
     if (coreappdata()->manual_libpaths)
         return *(coreappdata()->manual_libpaths);
 
@@ -2709,18 +2708,22 @@ QStringList QCoreApplication::libraryPaths()
         QStringList *app_libpaths = new QStringList;
         coreappdata()->app_libpaths.reset(app_libpaths);
 
-        QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH");
-        if (!libPathEnv.isEmpty()) {
-            QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
-            for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
-                QString canonicalPath = QDir(*it).canonicalPath();
-                if (!canonicalPath.isEmpty()
-                    && !app_libpaths->contains(canonicalPath)) {
-                    app_libpaths->append(canonicalPath);
+        auto setPathsFromEnv = [&](QString libPathEnv) {
+            if (!libPathEnv.isEmpty()) {
+                QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
+                for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
+                    QString canonicalPath = QDir(*it).canonicalPath();
+                    if (!canonicalPath.isEmpty()
+                        && !app_libpaths->contains(canonicalPath)) {
+                        app_libpaths->append(canonicalPath);
+                    }
                 }
             }
-        }
-
+        };
+        setPathsFromEnv(qEnvironmentVariable("QT_PLUGIN_PATH"));
+#ifdef Q_OS_ANDROID
+        setPathsFromEnv(qEnvironmentVariable("QT_BUNDLED_LIBS_PATH"));
+#endif
 #ifdef Q_OS_DARWIN
         // Check the main bundle's PlugIns directory as this is a standard location for Apple OSes.
         // Note that the QLibraryInfo::PluginsPath below will coincidentally be the same as this value
@@ -2777,7 +2780,7 @@ void QCoreApplication::setLibraryPaths(const QStringList &paths)
     // When the application is constructed it should still amend the paths. So we keep the originals
     // around, and even create them if they don't exist, yet.
     if (!coreappdata()->app_libpaths)
-        libraryPaths();
+        libraryPathsLocked();
 
     if (coreappdata()->manual_libpaths)
         *(coreappdata()->manual_libpaths) = paths;
@@ -2820,7 +2823,7 @@ void QCoreApplication::addLibraryPath(const QString &path)
             return;
     } else {
         // make sure that library paths are initialized
-        libraryPaths();
+        libraryPathsLocked();
         QStringList *app_libpaths = coreappdata()->app_libpaths.data();
         if (app_libpaths->contains(canonicalPath))
             return;
@@ -2859,7 +2862,7 @@ void QCoreApplication::removeLibraryPath(const QString &path)
             return;
     } else {
         // make sure that library paths is initialized
-        libraryPaths();
+        libraryPathsLocked();
         QStringList *app_libpaths = coreappdata()->app_libpaths.data();
         if (!app_libpaths->contains(canonicalPath))
             return;
@@ -2912,7 +2915,7 @@ void QCoreApplication::installNativeEventFilter(QAbstractNativeEventFilter *filt
         return;
     }
 
-    QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(QCoreApplicationPrivate::theMainThread);
+    QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(QCoreApplicationPrivate::theMainThread.loadAcquire());
     if (!filterObj || !eventDispatcher)
         return;
     eventDispatcher->installNativeEventFilter(filterObj);
@@ -2968,8 +2971,8 @@ bool QCoreApplication::hasPendingEvents()
 */
 QAbstractEventDispatcher *QCoreApplication::eventDispatcher()
 {
-    if (QCoreApplicationPrivate::theMainThread)
-        return QCoreApplicationPrivate::theMainThread.load()->eventDispatcher();
+    if (QCoreApplicationPrivate::theMainThread.loadAcquire())
+        return QCoreApplicationPrivate::theMainThread.loadRelaxed()->eventDispatcher();
     return 0;
 }
 
@@ -2981,7 +2984,7 @@ QAbstractEventDispatcher *QCoreApplication::eventDispatcher()
 */
 void QCoreApplication::setEventDispatcher(QAbstractEventDispatcher *eventDispatcher)
 {
-    QThread *mainThread = QCoreApplicationPrivate::theMainThread;
+    QThread *mainThread = QCoreApplicationPrivate::theMainThread.loadAcquire();
     if (!mainThread)
         mainThread = QThread::currentThread(); // will also setup theMainThread
     mainThread->setEventDispatcher(eventDispatcher);
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 3581970765..71ea124fbe 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -208,6 +208,9 @@ private:
     static bool notifyInternal2(QObject *receiver, QEvent *);
     static bool forwardEvent(QObject *receiver, QEvent *event, QEvent *originatingEvent = nullptr);
 #endif
+#if QT_CONFIG(library)
+    static QStringList libraryPathsLocked();
+#endif
 
     static QCoreApplication *self;
 
@@ -227,6 +230,7 @@ private:
 #endif
     friend Q_CORE_EXPORT QString qAppName();
     friend class QClassFactory;
+    friend class QCommandLineParserPrivate;
 };
 
 #ifdef QT_NO_DEPRECATED
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index b3479414ab..3bad42d076 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -52,6 +52,9 @@
 //
 
 #include "QtCore/qcoreapplication.h"
+#if QT_CONFIG(commandlineparser)
+#include "QtCore/qcommandlineoption.h"
+#endif
 #include "QtCore/qtranslator.h"
 #if QT_CONFIG(settings)
 #include "QtCore/qsettings.h"
@@ -84,6 +87,11 @@ public:
     };
 
     QCoreApplicationPrivate(int &aargc,  char **aargv, uint flags);
+
+    // If not inheriting from QObjectPrivate: force this class to be polymorphic
+#ifdef QT_NO_QOBJECT
+    virtual
+#endif
     ~QCoreApplicationPrivate();
 
     void init();
@@ -99,6 +107,10 @@ public:
 
     static bool checkInstance(const char *method);
 
+#if QT_CONFIG(commandlineparser)
+    virtual void addQtOptions(QList<QCommandLineOption> *options);
+#endif
+
 #ifndef QT_NO_QOBJECT
     bool sendThroughApplicationEventFilters(QObject *, QEvent *);
     static bool sendThroughObjectEventFilters(QObject *, QEvent *);
@@ -149,7 +161,7 @@ public:
     QString cachedApplicationDirPath;
     static QString *cachedApplicationFilePath;
     static void setApplicationFilePath(const QString &path);
-    static inline void clearApplicationFilePath() { delete cachedApplicationFilePath; cachedApplicationFilePath = 0; }
+    static inline void clearApplicationFilePath() { delete cachedApplicationFilePath; cachedApplicationFilePath = nullptr; }
 
 #ifndef QT_NO_QOBJECT
     void execCleanup();
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 4f4a29b41b..961b96710e 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -47,6 +47,7 @@
 #ifndef QT_NO_QOBJECT
 #include "qmutex.h"
 #include <private/qthread_p.h>
+#include <private/qlocking_p.h>
 #endif
 #include "qtextstream.h"
 #include <ctype.h>
@@ -64,8 +65,6 @@ using namespace Microsoft::WRL::Wrappers;
 
 QT_BEGIN_NAMESPACE
 
-int appCmdShow = 0;
-
 Q_CORE_EXPORT QString qAppFileName()                // get application file name
 {
     /*
@@ -175,16 +174,12 @@ Q_CORE_EXPORT HINSTANCE qWinAppPrevInst()                // get Windows prev app
 
 Q_CORE_EXPORT int qWinAppCmdShow()                        // get main window show command
 {
-#if defined(Q_OS_WINCE)
-    return appCmdShow;
-#else
     STARTUPINFO startupInfo;
     GetStartupInfo(&startupInfo);
 
     return (startupInfo.dwFlags & STARTF_USESHOWWINDOW)
         ? startupInfo.wShowWindow
         : SW_SHOWDEFAULT;
-#endif
 }
 #endif
 
@@ -925,7 +920,7 @@ void QCoreApplicationPrivate::removePostedTimerEvent(QObject *object, int timerI
 {
     QThreadData *data = object->d_func()->threadData;
 
-    QMutexLocker locker(&data->postEventList.mutex);
+    const auto locker = qt_scoped_lock(data->postEventList.mutex);
     if (data->postEventList.size() == 0)
         return;
     for (int i = 0; i < data->postEventList.size(); ++i) {
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index cacbb1e495..4cfc749386 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -421,10 +421,10 @@ struct QBasicAtomicBitField {
     QBasicAtomicInteger<uint> next;
     QBasicAtomicInteger<uint> data[NumInts];
 
-    bool allocateSpecific(int which) Q_DECL_NOTHROW
+    bool allocateSpecific(int which) noexcept
     {
         QBasicAtomicInteger<uint> &entry = data[which / BitsPerInt];
-        const uint old = entry.load();
+        const uint old = entry.loadRelaxed();
         const uint bit = 1U << (which % BitsPerInt);
         return !(old & bit) // wasn't taken
             && entry.testAndSetRelaxed(old, old | bit); // still wasn't taken
@@ -437,7 +437,7 @@ struct QBasicAtomicBitField {
         // loop.
     }
 
-    int allocateNext() Q_DECL_NOTHROW
+    int allocateNext() noexcept
     {
         // Unroll loop to iterate over ints, then bits? Would save
         // potentially a lot of cmpxchgs, because we can scan the
@@ -445,10 +445,10 @@ struct QBasicAtomicBitField {
 
         // Then again, this should never execute many iterations, so
         // leave like this for now:
-        for (uint i = next.load(); i < NumBits; ++i) {
+        for (uint i = next.loadRelaxed(); i < NumBits; ++i) {
             if (allocateSpecific(i)) {
                 // remember next (possibly) free id:
-                const uint oldNext = next.load();
+                const uint oldNext = next.loadRelaxed();
                 next.testAndSetRelaxed(oldNext, qMax(i + 1, oldNext));
                 return i;
             }
@@ -463,7 +463,7 @@ typedef QBasicAtomicBitField<QEvent::MaxUser - QEvent::User + 1> UserEventTypeRe
 
 static UserEventTypeRegistry userEventTypeRegistry;
 
-static inline int registerEventTypeZeroBased(int id) Q_DECL_NOTHROW
+static inline int registerEventTypeZeroBased(int id) noexcept
 {
     // if the type hint hasn't been registered yet, take it:
     if (id < UserEventTypeRegistry::NumBits && id >= 0 && userEventTypeRegistry.allocateSpecific(id))
@@ -486,7 +486,7 @@ static inline int registerEventTypeZeroBased(int id) Q_DECL_NOTHROW
     Returns -1 if all available values are already taken or the
     program is shutting down.
 */
-int QEvent::registerEventType(int hint) Q_DECL_NOTHROW
+int QEvent::registerEventType(int hint) noexcept
 {
     const int result = registerEventTypeZeroBased(QEvent::MaxUser - hint);
     return result < 0 ? -1 : QEvent::MaxUser - result ;
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index ac974ba411..05af1a6132 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -307,7 +307,7 @@ public:
     inline void accept() { m_accept = true; }
     inline void ignore() { m_accept = false; }
 
-    static int registerEventType(int hint = -1) Q_DECL_NOTHROW;
+    static int registerEventType(int hint = -1) noexcept;
 
 protected:
     QEventPrivate *d;
diff --git a/src/corelib/kernel/qcoreglobaldata.cpp b/src/corelib/kernel/qcoreglobaldata.cpp
index 104be1b87b..7ff222f170 100644
--- a/src/corelib/kernel/qcoreglobaldata.cpp
+++ b/src/corelib/kernel/qcoreglobaldata.cpp
@@ -48,7 +48,7 @@ Q_GLOBAL_STATIC(QCoreGlobalData, globalInstance)
 
 QCoreGlobalData::QCoreGlobalData()
 #if QT_CONFIG(textcodec)
-    : codecForLocale(0)
+    : codecForLocale(nullptr)
 #endif
 {
 }
@@ -56,7 +56,7 @@ QCoreGlobalData::QCoreGlobalData()
 QCoreGlobalData::~QCoreGlobalData()
 {
 #if QT_CONFIG(textcodec)
-    codecForLocale = 0;
+    codecForLocale = nullptr;
     QList<QTextCodec *> tmp = allCodecs;
     allCodecs.clear();
     codecCache.clear();
diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp
index 49874b94b4..06b56bb09b 100644
--- a/src/corelib/kernel/qdeadlinetimer.cpp
+++ b/src/corelib/kernel/qdeadlinetimer.cpp
@@ -464,7 +464,7 @@ inline bool TimeReference::toNanoseconds(qint64 *result) const
 
     \sa hasExpired(), isForever(), remainingTime(), setRemainingTime()
 */
-QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) Q_DECL_NOTHROW
+QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) noexcept
     : t2(0)
 {
     setRemainingTime(msecs, type);
@@ -536,7 +536,7 @@ QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) Q_DECL_NOTHROW
 
     \sa setPreciseRemainingTime(), hasExpired(), isForever(), remainingTime()
 */
-void QDeadlineTimer::setRemainingTime(qint64 msecs, Qt::TimerType timerType) Q_DECL_NOTHROW
+void QDeadlineTimer::setRemainingTime(qint64 msecs, Qt::TimerType timerType) noexcept
 {
     if (msecs == -1) {
         *this = QDeadlineTimer(Forever, timerType);
@@ -562,7 +562,7 @@ void QDeadlineTimer::setRemainingTime(qint64 msecs, Qt::TimerType timerType) Q_D
 
     \sa setRemainingTime(), hasExpired(), isForever(), remainingTime()
 */
-void QDeadlineTimer::setPreciseRemainingTime(qint64 secs, qint64 nsecs, Qt::TimerType timerType) Q_DECL_NOTHROW
+void QDeadlineTimer::setPreciseRemainingTime(qint64 secs, qint64 nsecs, Qt::TimerType timerType) noexcept
 {
     if (secs == -1) {
         *this = QDeadlineTimer(Forever, timerType);
@@ -619,7 +619,7 @@ void QDeadlineTimer::setPreciseRemainingTime(qint64 secs, qint64 nsecs, Qt::Time
 
     \sa isForever(), remainingTime()
 */
-bool QDeadlineTimer::hasExpired() const Q_DECL_NOTHROW
+bool QDeadlineTimer::hasExpired() const noexcept
 {
     if (isForever())
         return false;
@@ -666,7 +666,7 @@ void QDeadlineTimer::setTimerType(Qt::TimerType timerType)
 
     \sa remainingTimeNSecs(), isForever(), hasExpired()
 */
-qint64 QDeadlineTimer::remainingTime() const Q_DECL_NOTHROW
+qint64 QDeadlineTimer::remainingTime() const noexcept
 {
     if (isForever())
         return -1;
@@ -694,7 +694,7 @@ qint64 QDeadlineTimer::remainingTime() const Q_DECL_NOTHROW
 
     \sa remainingTime(), isForever(), hasExpired()
 */
-qint64 QDeadlineTimer::remainingTimeNSecs() const Q_DECL_NOTHROW
+qint64 QDeadlineTimer::remainingTimeNSecs() const noexcept
 {
     if (isForever())
         return -1;
@@ -708,7 +708,7 @@ qint64 QDeadlineTimer::remainingTimeNSecs() const Q_DECL_NOTHROW
     not deal with Forever. In case of underflow the result is saturated to
     the minimum possible value, on overflow  - the maximum possible value.
 */
-qint64 QDeadlineTimer::rawRemainingTimeNSecs() const Q_DECL_NOTHROW
+qint64 QDeadlineTimer::rawRemainingTimeNSecs() const noexcept
 {
     QDeadlineTimer now = current(timerType());
     TimeReference ref(t1, t2);
@@ -744,7 +744,7 @@ qint64 QDeadlineTimer::rawRemainingTimeNSecs() const Q_DECL_NOTHROW
 
     \sa remainingTime(), deadlineNSecs(), setDeadline()
 */
-qint64 QDeadlineTimer::deadline() const Q_DECL_NOTHROW
+qint64 QDeadlineTimer::deadline() const noexcept
 {
     if (isForever())
         return TimeReference::Max;
@@ -777,7 +777,7 @@ qint64 QDeadlineTimer::deadline() const Q_DECL_NOTHROW
 
     \sa remainingTime(), deadlineNSecs()
 */
-qint64 QDeadlineTimer::deadlineNSecs() const Q_DECL_NOTHROW
+qint64 QDeadlineTimer::deadlineNSecs() const noexcept
 {
     if (isForever())
         return TimeReference::Max;
@@ -802,7 +802,7 @@ qint64 QDeadlineTimer::deadlineNSecs() const Q_DECL_NOTHROW
 
     \sa setPreciseDeadline(), deadline(), deadlineNSecs(), setRemainingTime()
 */
-void QDeadlineTimer::setDeadline(qint64 msecs, Qt::TimerType timerType) Q_DECL_NOTHROW
+void QDeadlineTimer::setDeadline(qint64 msecs, Qt::TimerType timerType) noexcept
 {
     if (msecs == TimeReference::Max) {
         *this = QDeadlineTimer(Forever, timerType);
@@ -829,7 +829,7 @@ void QDeadlineTimer::setDeadline(qint64 msecs, Qt::TimerType timerType) Q_DECL_N
 
     \sa setDeadline(), deadline(), deadlineNSecs(), setRemainingTime()
 */
-void QDeadlineTimer::setPreciseDeadline(qint64 secs, qint64 nsecs, Qt::TimerType timerType) Q_DECL_NOTHROW
+void QDeadlineTimer::setPreciseDeadline(qint64 secs, qint64 nsecs, Qt::TimerType timerType) noexcept
 {
     type = timerType;
 
@@ -849,7 +849,7 @@ void QDeadlineTimer::setPreciseDeadline(qint64 secs, qint64 nsecs, Qt::TimerType
     \note if \a dt was created as expired, its deadline is indeterminate and
     adding an amount of time may or may not cause it to become unexpired.
 */
-QDeadlineTimer QDeadlineTimer::addNSecs(QDeadlineTimer dt, qint64 nsecs) Q_DECL_NOTHROW
+QDeadlineTimer QDeadlineTimer::addNSecs(QDeadlineTimer dt, qint64 nsecs) noexcept
 {
     if (dt.isForever())
         return dt;
diff --git a/src/corelib/kernel/qdeadlinetimer.h b/src/corelib/kernel/qdeadlinetimer.h
index f9ad4063e5..9dd92481d2 100644
--- a/src/corelib/kernel/qdeadlinetimer.h
+++ b/src/corelib/kernel/qdeadlinetimer.h
@@ -63,49 +63,49 @@ class Q_CORE_EXPORT QDeadlineTimer
 public:
     enum ForeverConstant { Forever };
 
-    Q_DECL_CONSTEXPR QDeadlineTimer(Qt::TimerType type_ = Qt::CoarseTimer) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QDeadlineTimer(Qt::TimerType type_ = Qt::CoarseTimer) noexcept
         : t1(0), t2(0), type(type_) {}
-    Q_DECL_CONSTEXPR QDeadlineTimer(ForeverConstant, Qt::TimerType type_ = Qt::CoarseTimer) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QDeadlineTimer(ForeverConstant, Qt::TimerType type_ = Qt::CoarseTimer) noexcept
         : t1(std::numeric_limits<qint64>::max()), t2(0), type(type_) {}
-    explicit QDeadlineTimer(qint64 msecs, Qt::TimerType type = Qt::CoarseTimer) Q_DECL_NOTHROW;
+    explicit QDeadlineTimer(qint64 msecs, Qt::TimerType type = Qt::CoarseTimer) noexcept;
 
-    void swap(QDeadlineTimer &other) Q_DECL_NOTHROW
+    void swap(QDeadlineTimer &other) noexcept
     { qSwap(t1, other.t1); qSwap(t2, other.t2); qSwap(type, other.type); }
 
-    Q_DECL_CONSTEXPR bool isForever() const Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR bool isForever() const noexcept
     { return t1 == (std::numeric_limits<qint64>::max)(); }
-    bool hasExpired() const Q_DECL_NOTHROW;
+    bool hasExpired() const noexcept;
 
-    Qt::TimerType timerType() const Q_DECL_NOTHROW
+    Qt::TimerType timerType() const noexcept
     { return Qt::TimerType(type & 0xff); }
     void setTimerType(Qt::TimerType type);
 
-    qint64 remainingTime() const Q_DECL_NOTHROW;
-    qint64 remainingTimeNSecs() const Q_DECL_NOTHROW;
-    void setRemainingTime(qint64 msecs, Qt::TimerType type = Qt::CoarseTimer) Q_DECL_NOTHROW;
+    qint64 remainingTime() const noexcept;
+    qint64 remainingTimeNSecs() const noexcept;
+    void setRemainingTime(qint64 msecs, Qt::TimerType type = Qt::CoarseTimer) noexcept;
     void setPreciseRemainingTime(qint64 secs, qint64 nsecs = 0,
-                                 Qt::TimerType type = Qt::CoarseTimer) Q_DECL_NOTHROW;
+                                 Qt::TimerType type = Qt::CoarseTimer) noexcept;
 
-    qint64 deadline() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION;
-    qint64 deadlineNSecs() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION;
-    void setDeadline(qint64 msecs, Qt::TimerType timerType = Qt::CoarseTimer) Q_DECL_NOTHROW;
+    qint64 deadline() const noexcept Q_DECL_PURE_FUNCTION;
+    qint64 deadlineNSecs() const noexcept Q_DECL_PURE_FUNCTION;
+    void setDeadline(qint64 msecs, Qt::TimerType timerType = Qt::CoarseTimer) noexcept;
     void setPreciseDeadline(qint64 secs, qint64 nsecs = 0,
-                            Qt::TimerType type = Qt::CoarseTimer) Q_DECL_NOTHROW;
+                            Qt::TimerType type = Qt::CoarseTimer) noexcept;
 
-    static QDeadlineTimer addNSecs(QDeadlineTimer dt, qint64 nsecs) Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION;
-    static QDeadlineTimer current(Qt::TimerType timerType = Qt::CoarseTimer) Q_DECL_NOTHROW;
+    static QDeadlineTimer addNSecs(QDeadlineTimer dt, qint64 nsecs) noexcept Q_DECL_PURE_FUNCTION;
+    static QDeadlineTimer current(Qt::TimerType timerType = Qt::CoarseTimer) noexcept;
 
-    friend bool operator==(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW
+    friend bool operator==(QDeadlineTimer d1, QDeadlineTimer d2) noexcept
     { return d1.t1 == d2.t1 && d1.t2 == d2.t2; }
-    friend bool operator!=(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW
+    friend bool operator!=(QDeadlineTimer d1, QDeadlineTimer d2) noexcept
     { return !(d1 == d2); }
-    friend bool operator<(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW
+    friend bool operator<(QDeadlineTimer d1, QDeadlineTimer d2) noexcept
     { return d1.t1 < d2.t1 || (d1.t1 == d2.t1 && d1.t2 < d2.t2); }
-    friend bool operator<=(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW
+    friend bool operator<=(QDeadlineTimer d1, QDeadlineTimer d2) noexcept
     { return d1 == d2 || d1 < d2; }
-    friend bool operator>(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW
+    friend bool operator>(QDeadlineTimer d1, QDeadlineTimer d2) noexcept
     { return d2 < d1; }
-    friend bool operator>=(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW
+    friend bool operator>=(QDeadlineTimer d1, QDeadlineTimer d2) noexcept
     { return !(d1 < d2); }
 
     friend Q_CORE_EXPORT QDeadlineTimer operator+(QDeadlineTimer dt, qint64 msecs);
@@ -159,7 +159,7 @@ public:
             setPreciseRemainingTime(0, std::chrono::nanoseconds(remaining).count(), type_);
     }
 
-    std::chrono::nanoseconds remainingTimeAsDuration() const Q_DECL_NOTHROW
+    std::chrono::nanoseconds remainingTimeAsDuration() const noexcept
     {
         if (isForever())
             return std::chrono::nanoseconds::max();
@@ -185,7 +185,7 @@ private:
     unsigned t2;
     unsigned type;
 
-    qint64 rawRemainingTimeNSecs() const Q_DECL_NOTHROW;
+    qint64 rawRemainingTimeNSecs() const noexcept;
 
 public:
     // This is not a public function, it's here only for Qt's internal convenience...
diff --git a/src/corelib/kernel/qelapsedtimer.cpp b/src/corelib/kernel/qelapsedtimer.cpp
index e578b5b8b3..57825583dd 100644
--- a/src/corelib/kernel/qelapsedtimer.cpp
+++ b/src/corelib/kernel/qelapsedtimer.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
     \snippet qelapsedtimer/main.cpp 0
 
     In this example, the timer is started by a call to start() and the
-    elapsed timer is calculated by the elapsed() function.
+    elapsed time is calculated by the elapsed() function.
 
     The time elapsed can also be used to recalculate the time available for
     another operation, after the first one is complete. This is useful when
@@ -236,7 +236,7 @@ static const qint64 invalidData = Q_INT64_C(0x8000000000000000);
 
     \sa isValid(), start(), restart()
 */
-void QElapsedTimer::invalidate() Q_DECL_NOTHROW
+void QElapsedTimer::invalidate() noexcept
 {
      t1 = t2 = invalidData;
 }
@@ -247,7 +247,7 @@ void QElapsedTimer::invalidate() Q_DECL_NOTHROW
 
     \sa invalidate(), start(), restart()
 */
-bool QElapsedTimer::isValid() const Q_DECL_NOTHROW
+bool QElapsedTimer::isValid() const noexcept
 {
     return t1 != invalidData && t2 != invalidData;
 }
@@ -260,7 +260,7 @@ bool QElapsedTimer::isValid() const Q_DECL_NOTHROW
 
     \sa elapsed(), QDeadlineTimer
 */
-bool QElapsedTimer::hasExpired(qint64 timeout) const Q_DECL_NOTHROW
+bool QElapsedTimer::hasExpired(qint64 timeout) const noexcept
 {
     // if timeout is -1, quint64(timeout) is LLINT_MAX, so this will be
     // considered as never expired
diff --git a/src/corelib/kernel/qelapsedtimer.h b/src/corelib/kernel/qelapsedtimer.h
index 7954b41bf4..873847f6b6 100644
--- a/src/corelib/kernel/qelapsedtimer.h
+++ b/src/corelib/kernel/qelapsedtimer.h
@@ -62,28 +62,28 @@ public:
     {
     }
 
-    static ClockType clockType() Q_DECL_NOTHROW;
-    static bool isMonotonic() Q_DECL_NOTHROW;
+    static ClockType clockType() noexcept;
+    static bool isMonotonic() noexcept;
 
-    void start() Q_DECL_NOTHROW;
-    qint64 restart() Q_DECL_NOTHROW;
-    void invalidate() Q_DECL_NOTHROW;
-    bool isValid() const Q_DECL_NOTHROW;
+    void start() noexcept;
+    qint64 restart() noexcept;
+    void invalidate() noexcept;
+    bool isValid() const noexcept;
 
-    qint64 nsecsElapsed() const Q_DECL_NOTHROW;
-    qint64 elapsed() const Q_DECL_NOTHROW;
-    bool hasExpired(qint64 timeout) const Q_DECL_NOTHROW;
+    qint64 nsecsElapsed() const noexcept;
+    qint64 elapsed() const noexcept;
+    bool hasExpired(qint64 timeout) const noexcept;
 
-    qint64 msecsSinceReference() const Q_DECL_NOTHROW;
-    qint64 msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW;
-    qint64 secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW;
+    qint64 msecsSinceReference() const noexcept;
+    qint64 msecsTo(const QElapsedTimer &other) const noexcept;
+    qint64 secsTo(const QElapsedTimer &other) const noexcept;
 
-    bool operator==(const QElapsedTimer &other) const Q_DECL_NOTHROW
+    bool operator==(const QElapsedTimer &other) const noexcept
     { return t1 == other.t1 && t2 == other.t2; }
-    bool operator!=(const QElapsedTimer &other) const Q_DECL_NOTHROW
+    bool operator!=(const QElapsedTimer &other) const noexcept
     { return !(*this == other); }
 
-    friend bool Q_CORE_EXPORT operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW;
+    friend bool Q_CORE_EXPORT operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept;
 
 private:
     qint64 t1;
diff --git a/src/corelib/kernel/qelapsedtimer_generic.cpp b/src/corelib/kernel/qelapsedtimer_generic.cpp
index fdeb385188..fe959e3c94 100644
--- a/src/corelib/kernel/qelapsedtimer_generic.cpp
+++ b/src/corelib/kernel/qelapsedtimer_generic.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
     \sa isMonotonic()
 */
-QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW
+QElapsedTimer::ClockType QElapsedTimer::clockType() noexcept
 {
     return SystemTime;
 }
@@ -60,7 +60,7 @@ QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW
 
     \sa clockType(), QElapsedTimer::ClockType
 */
-bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW
+bool QElapsedTimer::isMonotonic() noexcept
 {
     return false;
 }
@@ -75,7 +75,7 @@ bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW
 
     \sa restart(), invalidate(), elapsed()
 */
-void QElapsedTimer::start() Q_DECL_NOTHROW
+void QElapsedTimer::start() noexcept
 {
     restart();
 }
@@ -97,7 +97,7 @@ void QElapsedTimer::start() Q_DECL_NOTHROW
 
     \sa start(), invalidate(), elapsed(), isValid()
 */
-qint64 QElapsedTimer::restart() Q_DECL_NOTHROW
+qint64 QElapsedTimer::restart() noexcept
 {
     qint64 old = t1;
     t1 = QDateTime::currentMSecsSinceEpoch();
@@ -118,7 +118,7 @@ qint64 QElapsedTimer::restart() Q_DECL_NOTHROW
 
     \sa start(), restart(), hasExpired(), invalidate()
 */
-qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::nsecsElapsed() const noexcept
 {
     return elapsed() * 1000000;
 }
@@ -132,7 +132,7 @@ qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW
 
     \sa start(), restart(), hasExpired(), isValid(), invalidate()
 */
-qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::elapsed() const noexcept
 {
     return QDateTime::currentMSecsSinceEpoch() - t1;
 }
@@ -152,7 +152,7 @@ qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW
 
     \sa clockType(), elapsed()
 */
-qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::msecsSinceReference() const noexcept
 {
     return t1;
 }
@@ -167,7 +167,7 @@ qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW
 
     \sa secsTo(), elapsed()
 */
-qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
+qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const noexcept
 {
     qint64 diff = other.t1 - t1;
     return diff;
@@ -183,7 +183,7 @@ qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
 
     \sa msecsTo(), elapsed()
 */
-qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
+qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const noexcept
 {
     return msecsTo(other) / 1000;
 }
@@ -197,12 +197,12 @@ qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
     and the other isn't. However, two invalid timers are equal and thus this
     function will return false.
 */
-bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW
+bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept
 {
     return v1.t1 < v2.t1;
 }
 
-QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) Q_DECL_NOTHROW
+QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) noexcept
 {
     QDeadlineTimer result;
     result.t1 = QDateTime::currentMSecsSinceEpoch() * 1000 * 1000;
diff --git a/src/corelib/kernel/qelapsedtimer_mac.cpp b/src/corelib/kernel/qelapsedtimer_mac.cpp
index 7490693991..5370cf7b3d 100644
--- a/src/corelib/kernel/qelapsedtimer_mac.cpp
+++ b/src/corelib/kernel/qelapsedtimer_mac.cpp
@@ -58,12 +58,12 @@ typedef __int128_t LargeInt;
 typedef qint64 LargeInt;
 #endif
 
-QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW
+QElapsedTimer::ClockType QElapsedTimer::clockType() noexcept
 {
     return MachAbsoluteTime;
 }
 
-bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW
+bool QElapsedTimer::isMonotonic() noexcept
 {
     return true;
 }
@@ -87,7 +87,7 @@ static qint64 absoluteToMSecs(qint64 cpuTime)
     return absoluteToNSecs(cpuTime) / 1000000;
 }
 
-timespec qt_gettime() Q_DECL_NOTHROW
+timespec qt_gettime() noexcept
 {
     timespec tv;
 
@@ -107,13 +107,13 @@ void qt_nanosleep(timespec amount)
     EINTR_LOOP(r, nanosleep(&amount, &amount));
 }
 
-void QElapsedTimer::start() Q_DECL_NOTHROW
+void QElapsedTimer::start() noexcept
 {
     t1 = mach_absolute_time();
     t2 = 0;
 }
 
-qint64 QElapsedTimer::restart() Q_DECL_NOTHROW
+qint64 QElapsedTimer::restart() noexcept
 {
     qint64 old = t1;
     t1 = mach_absolute_time();
@@ -122,39 +122,39 @@ qint64 QElapsedTimer::restart() Q_DECL_NOTHROW
     return absoluteToMSecs(t1 - old);
 }
 
-qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::nsecsElapsed() const noexcept
 {
     uint64_t cpu_time = mach_absolute_time();
     return absoluteToNSecs(cpu_time - t1);
 }
 
-qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::elapsed() const noexcept
 {
     uint64_t cpu_time = mach_absolute_time();
     return absoluteToMSecs(cpu_time - t1);
 }
 
-qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::msecsSinceReference() const noexcept
 {
     return absoluteToMSecs(t1);
 }
 
-qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
+qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const noexcept
 {
     return absoluteToMSecs(other.t1 - t1);
 }
 
-qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
+qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const noexcept
 {
     return msecsTo(other) / 1000;
 }
 
-bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW
+bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept
 {
     return v1.t1 < v2.t1;
 }
 
-QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) Q_DECL_NOTHROW
+QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) noexcept
 {
     Q_STATIC_ASSERT(!QDeadlineTimerNanosecondsInT2);
     QDeadlineTimer result;
diff --git a/src/corelib/kernel/qelapsedtimer_unix.cpp b/src/corelib/kernel/qelapsedtimer_unix.cpp
index e166d4e3d2..ccc2eeafa3 100644
--- a/src/corelib/kernel/qelapsedtimer_unix.cpp
+++ b/src/corelib/kernel/qelapsedtimer_unix.cpp
@@ -150,12 +150,12 @@ static int unixCheckClockType()
 #endif
 }
 
-bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW
+bool QElapsedTimer::isMonotonic() noexcept
 {
     return clockType() == MonotonicClock;
 }
 
-QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW
+QElapsedTimer::ClockType QElapsedTimer::clockType() noexcept
 {
     return unixCheckClockType() == CLOCK_REALTIME ? SystemTime : MonotonicClock;
 }
@@ -169,7 +169,7 @@ static inline void do_gettime(qint64 *sec, qint64 *frac)
 }
 
 // used in qcore_unix.cpp and qeventdispatcher_unix.cpp
-struct timespec qt_gettime() Q_DECL_NOTHROW
+struct timespec qt_gettime() noexcept
 {
     qint64 sec, frac;
     do_gettime(&sec, &frac);
@@ -204,17 +204,17 @@ static qint64 elapsedAndRestart(qint64 sec, qint64 frac,
     return (sec * Q_INT64_C(1000000000) + frac) / Q_INT64_C(1000000);
 }
 
-void QElapsedTimer::start() Q_DECL_NOTHROW
+void QElapsedTimer::start() noexcept
 {
     do_gettime(&t1, &t2);
 }
 
-qint64 QElapsedTimer::restart() Q_DECL_NOTHROW
+qint64 QElapsedTimer::restart() noexcept
 {
     return elapsedAndRestart(t1, t2, &t1, &t2);
 }
 
-qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::nsecsElapsed() const noexcept
 {
     qint64 sec, frac;
     do_gettime(&sec, &frac);
@@ -223,34 +223,34 @@ qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW
     return sec * Q_INT64_C(1000000000) + frac;
 }
 
-qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::elapsed() const noexcept
 {
     return nsecsElapsed() / Q_INT64_C(1000000);
 }
 
-qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::msecsSinceReference() const noexcept
 {
     return t1 * Q_INT64_C(1000) + t2 / Q_INT64_C(1000000);
 }
 
-qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
+qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const noexcept
 {
     qint64 secs = other.t1 - t1;
     qint64 fraction = other.t2 - t2;
     return (secs * Q_INT64_C(1000000000) + fraction) / Q_INT64_C(1000000);
 }
 
-qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
+qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const noexcept
 {
     return other.t1 - t1;
 }
 
-bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW
+bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept
 {
     return v1.t1 < v2.t1 || (v1.t1 == v2.t1 && v1.t2 < v2.t2);
 }
 
-QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) Q_DECL_NOTHROW
+QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) noexcept
 {
     Q_STATIC_ASSERT(QDeadlineTimerNanosecondsInT2);
     QDeadlineTimer result;
diff --git a/src/corelib/kernel/qelapsedtimer_win.cpp b/src/corelib/kernel/qelapsedtimer_win.cpp
index 3beb158b8a..8becb17461 100644
--- a/src/corelib/kernel/qelapsedtimer_win.cpp
+++ b/src/corelib/kernel/qelapsedtimer_win.cpp
@@ -101,25 +101,25 @@ quint64 qt_msectime()
     return ticksToNanoseconds(getTickCount()) / 1000000;
 }
 
-QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW
+QElapsedTimer::ClockType QElapsedTimer::clockType() noexcept
 {
     resolveCounterFrequency();
 
     return counterFrequency > 0 ? PerformanceCounter : TickCounter;
 }
 
-bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW
+bool QElapsedTimer::isMonotonic() noexcept
 {
     return true;
 }
 
-void QElapsedTimer::start() Q_DECL_NOTHROW
+void QElapsedTimer::start() noexcept
 {
     t1 = getTickCount();
     t2 = 0;
 }
 
-qint64 QElapsedTimer::restart() Q_DECL_NOTHROW
+qint64 QElapsedTimer::restart() noexcept
 {
     qint64 oldt1 = t1;
     t1 = getTickCount();
@@ -127,40 +127,40 @@ qint64 QElapsedTimer::restart() Q_DECL_NOTHROW
     return ticksToNanoseconds(t1 - oldt1) / 1000000;
 }
 
-qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::nsecsElapsed() const noexcept
 {
     qint64 elapsed = getTickCount() - t1;
     return ticksToNanoseconds(elapsed);
 }
 
-qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::elapsed() const noexcept
 {
     qint64 elapsed = getTickCount() - t1;
     return ticksToNanoseconds(elapsed) / 1000000;
 }
 
-qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW
+qint64 QElapsedTimer::msecsSinceReference() const noexcept
 {
     return ticksToNanoseconds(t1) / 1000000;
 }
 
-qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
+qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const noexcept
 {
     qint64 difference = other.t1 - t1;
     return ticksToNanoseconds(difference) / 1000000;
 }
 
-qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW
+qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const noexcept
 {
     return msecsTo(other) / 1000;
 }
 
-bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW
+bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept
 {
     return (v1.t1 - v2.t1) < 0;
 }
 
-QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) Q_DECL_NOTHROW
+QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) noexcept
 {
     Q_STATIC_ASSERT(!QDeadlineTimerNanosecondsInT2);
     QDeadlineTimer result;
diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm
index b7b379e2c1..177551467c 100644
--- a/src/corelib/kernel/qeventdispatcher_cf.mm
+++ b/src/corelib/kernel/qeventdispatcher_cf.mm
@@ -56,6 +56,14 @@
 #  include <UIKit/UIApplication.h>
 #endif
 
+QT_BEGIN_NAMESPACE
+namespace QtPrivate {
+Q_LOGGING_CATEGORY(lcEventDispatcher, "qt.eventdispatcher");
+Q_LOGGING_CATEGORY(lcEventDispatcherTimers, "qt.eventdispatcher.timers");
+}
+using namespace QtPrivate;
+QT_END_NAMESPACE
+
 QT_USE_NAMESPACE
 
 /*
@@ -148,9 +156,6 @@ static CFStringRef runLoopMode(NSDictionary *dictionary)
 
 QT_BEGIN_NAMESPACE
 
-Q_LOGGING_CATEGORY(lcEventDispatcher, "qt.eventdispatcher");
-Q_LOGGING_CATEGORY(lcEventDispatcherTimers, "qt.eventdispatcher.timers");
-
 class RunLoopDebugger : public QObject
 {
     Q_OBJECT
@@ -190,7 +195,7 @@ Q_ENUM_PRINTER(Result);
 
 QDebug operator<<(QDebug s, timespec tv)
 {
-    s << tv.tv_sec << "." << qSetFieldWidth(9) << qSetPadChar(QChar(48)) << tv.tv_nsec << reset;
+    s << tv.tv_sec << "." << qSetFieldWidth(9) << qSetPadChar(QChar(48)) << tv.tv_nsec << Qt::reset;
     return s;
 }
 
@@ -423,7 +428,7 @@ bool QEventDispatcherCoreFoundation::processPostedEvents()
     m_processEvents.processedPostedEvents = true;
 
     qCDebug(lcEventDispatcher) << "Sending posted events for"
-        << QEventLoop::ProcessEventsFlags(m_processEvents.flags.load());
+        << QEventLoop::ProcessEventsFlags(m_processEvents.flags.loadRelaxed());
     QCoreApplication::sendPostedEvents();
 
     return true;
diff --git a/src/corelib/kernel/qeventdispatcher_cf_p.h b/src/corelib/kernel/qeventdispatcher_cf_p.h
index 26191d520c..a2cecd9a93 100644
--- a/src/corelib/kernel/qeventdispatcher_cf_p.h
+++ b/src/corelib/kernel/qeventdispatcher_cf_p.h
@@ -98,8 +98,10 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(RunLoopModeTracker));
 
 QT_BEGIN_NAMESPACE
 
-Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcher);
-Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcherTimers)
+namespace QtPrivate {
+Q_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcher);
+Q_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcherTimers)
+}
 
 class QEventDispatcherCoreFoundation;
 
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
index 34c2dde6a8..d9746ef6e2 100644
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@@ -261,7 +261,7 @@ static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
     *timeout = canWait ? -1 : 0;
 
     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-    source->d->wakeUpCalled = source->serialNumber.load() != source->lastSerialNumber;
+    source->d->wakeUpCalled = source->serialNumber.loadRelaxed() != source->lastSerialNumber;
     return !canWait || source->d->wakeUpCalled;
 }
 
@@ -273,7 +273,7 @@ static gboolean postEventSourceCheck(GSource *source)
 static gboolean postEventSourceDispatch(GSource *s, GSourceFunc, gpointer)
 {
     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-    source->lastSerialNumber = source->serialNumber.load();
+    source->lastSerialNumber = source->serialNumber.loadRelaxed();
     QCoreApplication::sendPostedEvents();
     source->d->runTimersOnceWithNormalPriority();
     return true; // i dunno, george...
@@ -320,7 +320,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
     // setup post event source
     postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
                                                                         sizeof(GPostEventSource)));
-    postEventSource->serialNumber.store(1);
+    postEventSource->serialNumber.storeRelaxed(1);
     postEventSource->d = this;
     g_source_set_can_recurse(&postEventSource->source, true);
     g_source_attach(&postEventSource->source, mainContext);
diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
index 88ff316ee5..313825d0a7 100644
--- a/src/corelib/kernel/qeventdispatcher_glib_p.h
+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
@@ -66,8 +66,8 @@ class Q_CORE_EXPORT QEventDispatcherGlib : public QAbstractEventDispatcher
     Q_DECLARE_PRIVATE(QEventDispatcherGlib)
 
 public:
-    explicit QEventDispatcherGlib(QObject *parent = 0);
-    explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = 0);
+    explicit QEventDispatcherGlib(QObject *parent = nullptr);
+    explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = nullptr);
     ~QEventDispatcherGlib();
 
     bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
@@ -102,7 +102,7 @@ class Q_CORE_EXPORT QEventDispatcherGlibPrivate : public QAbstractEventDispatche
 {
 
 public:
-    QEventDispatcherGlibPrivate(GMainContext *context = 0);
+    QEventDispatcherGlibPrivate(GMainContext *context = nullptr);
     GMainContext *mainContext;
     GPostEventSource *postEventSource;
     GSocketNotifierSource *socketNotifierSource;
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index df0cac0239..5bc65b7110 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -459,7 +459,7 @@ void QEventDispatcherUNIX::unregisterSocketNotifier(QSocketNotifier *notifier)
 bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags)
 {
     Q_D(QEventDispatcherUNIX);
-    d->interrupt.store(0);
+    d->interrupt.storeRelaxed(0);
 
     // we are awake, broadcast it
     emit awake();
@@ -470,13 +470,13 @@ bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags)
     const bool wait_for_events = flags & QEventLoop::WaitForMoreEvents;
 
     const bool canWait = (d->threadData->canWaitLocked()
-                          && !d->interrupt.load()
+                          && !d->interrupt.loadRelaxed()
                           && wait_for_events);
 
     if (canWait)
         emit aboutToBlock();
 
-    if (d->interrupt.load())
+    if (d->interrupt.loadRelaxed())
         return false;
 
     timespec *tm = nullptr;
@@ -545,7 +545,7 @@ void QEventDispatcherUNIX::wakeUp()
 void QEventDispatcherUNIX::interrupt()
 {
     Q_D(QEventDispatcherUNIX);
-    d->interrupt.store(1);
+    d->interrupt.storeRelaxed(1);
     wakeUp();
 }
 
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index 0fd068b074..f37edfc967 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -64,10 +64,10 @@ class QEventDispatcherUNIXPrivate;
 
 struct Q_CORE_EXPORT QSocketNotifierSetUNIX final
 {
-    inline QSocketNotifierSetUNIX() Q_DECL_NOTHROW;
+    inline QSocketNotifierSetUNIX() noexcept;
 
-    inline bool isEmpty() const Q_DECL_NOTHROW;
-    inline short events() const Q_DECL_NOTHROW;
+    inline bool isEmpty() const noexcept;
+    inline short events() const noexcept;
 
     QSocketNotifier *notifiers[3];
 };
@@ -102,7 +102,7 @@ class Q_CORE_EXPORT QEventDispatcherUNIX : public QAbstractEventDispatcher
     Q_DECLARE_PRIVATE(QEventDispatcherUNIX)
 
 public:
-    explicit QEventDispatcherUNIX(QObject *parent = 0);
+    explicit QEventDispatcherUNIX(QObject *parent = nullptr);
     ~QEventDispatcherUNIX();
 
     bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
@@ -123,7 +123,7 @@ public:
     void flush() override;
 
 protected:
-    QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObject *parent = 0);
+    QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObject *parent = nullptr);
 };
 
 class Q_CORE_EXPORT QEventDispatcherUNIXPrivate : public QAbstractEventDispatcherPrivate
@@ -150,19 +150,19 @@ public:
     QAtomicInt interrupt; // bool
 };
 
-inline QSocketNotifierSetUNIX::QSocketNotifierSetUNIX() Q_DECL_NOTHROW
+inline QSocketNotifierSetUNIX::QSocketNotifierSetUNIX() noexcept
 {
-    notifiers[0] = 0;
-    notifiers[1] = 0;
-    notifiers[2] = 0;
+    notifiers[0] = nullptr;
+    notifiers[1] = nullptr;
+    notifiers[2] = nullptr;
 }
 
-inline bool QSocketNotifierSetUNIX::isEmpty() const Q_DECL_NOTHROW
+inline bool QSocketNotifierSetUNIX::isEmpty() const noexcept
 {
     return !notifiers[0] && !notifiers[1] && !notifiers[2];
 }
 
-inline short QSocketNotifierSetUNIX::events() const Q_DECL_NOTHROW
+inline short QSocketNotifierSetUNIX::events() const noexcept
 {
     short result = 0;
 
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 8ff7637b7e..87623f304a 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -52,7 +52,6 @@
 #include "qelapsedtimer.h"
 #include "qcoreapplication_p.h"
 #include <private/qthread_p.h>
-#include <private/qmutexpool_p.h>
 #include <private/qwineventnotifier_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -82,11 +81,13 @@ extern uint qGlobalPostedEventsCount();
 enum {
     WM_QT_SOCKETNOTIFIER = WM_USER,
     WM_QT_SENDPOSTEDEVENTS = WM_USER + 1,
-    WM_QT_ACTIVATENOTIFIERS = WM_USER + 2,
+    WM_QT_ACTIVATENOTIFIERS = WM_USER + 2
 };
 
-enum : UINT_PTR {
-    SendPostedEventsWindowsTimerId = ~UINT_PTR(1)
+// WM_QT_SENDPOSTEDEVENTS message parameter
+enum {
+    WMWP_QT_TOFOREIGNLOOP = 0,
+    WMWP_QT_FROMWAKEUP
 };
 
 class QEventDispatcherWin32Private;
@@ -99,8 +100,8 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA
 
 QEventDispatcherWin32Private::QEventDispatcherWin32Private()
     : threadId(GetCurrentThreadId()), interrupt(false), internalHwnd(0),
-      getMessageHook(0), serialNumber(0), lastSerialNumber(0), sendPostedEventsWindowsTimerId(0),
-      wakeUps(0), activateNotifiersPosted(false), winEventNotifierActivatedEvent(NULL)
+      getMessageHook(0), wakeUps(0), activateNotifiersPosted(false),
+      winEventNotifierActivatedEvent(NULL)
 {
 }
 
@@ -139,7 +140,11 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA
     msg.wParam = wp;
     msg.lParam = lp;
     QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    qintptr result;
+#else
     long result;
+#endif
     if (!dispatcher) {
         if (message == WM_TIMER)
             KillTimer(hwnd, wp);
@@ -233,30 +238,25 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA
         return 0;
     }
     case WM_TIMER:
-        if (d->sendPostedEventsWindowsTimerId == 0
-            || wp != uint(d->sendPostedEventsWindowsTimerId)) {
-            Q_ASSERT(d != 0);
-            d->sendTimerEvent(wp);
-            return 0;
-        }
-        // we also use a Windows timer to send posted events when the message queue is full
-        Q_FALLTHROUGH();
-    case WM_QT_SENDPOSTEDEVENTS: {
-        const int localSerialNumber = d->serialNumber.load();
-        if (localSerialNumber != d->lastSerialNumber) {
-            d->lastSerialNumber = localSerialNumber;
-            q->sendPostedEvents();
-        }
+        Q_ASSERT(d != 0);
+
+        d->sendTimerEvent(wp);
+        return 0;
+    case WM_QT_SENDPOSTEDEVENTS:
+        Q_ASSERT(d != 0);
+
+        // We send posted events manually, if the window procedure was invoked
+        // by the foreign event loop (e.g. from the native modal dialog).
+        q->sendPostedEvents();
         return 0;
-    }
     } // switch (message)
 
     return DefWindowProc(hwnd, message, wp, lp);
 }
 
-static inline UINT inputTimerMask()
+static inline UINT inputQueueMask()
 {
-    UINT result = QS_TIMER | QS_INPUT | QS_RAWINPUT;
+    UINT result = QS_ALLEVENTS;
     // QTBUG 28513, QTBUG-29097, QTBUG-29435: QS_TOUCH, QS_POINTER became part of
     // QS_INPUT in Windows Kit 8. They should not be used when running on pre-Windows 8.
 #if WINVER > 0x0601
@@ -270,41 +270,19 @@ LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp)
 {
     QEventDispatcherWin32 *q = qobject_cast<QEventDispatcherWin32 *>(QAbstractEventDispatcher::instance());
     Q_ASSERT(q != 0);
-
-    if (wp == PM_REMOVE) {
-        if (q) {
-            MSG *msg = (MSG *) lp;
-            QEventDispatcherWin32Private *d = q->d_func();
-            const int localSerialNumber = d->serialNumber.load();
-            static const UINT mask = inputTimerMask();
-            if (HIWORD(GetQueueStatus(mask)) == 0) {
-                // no more input or timer events in the message queue, we can allow posted events to be sent normally now
-                if (d->sendPostedEventsWindowsTimerId != 0) {
-                    // stop the timer to send posted events, since we now allow the WM_QT_SENDPOSTEDEVENTS message
-                    KillTimer(d->internalHwnd, SendPostedEventsWindowsTimerId);
-                    d->sendPostedEventsWindowsTimerId = 0;
-                }
-                (void) d->wakeUps.fetchAndStoreRelease(0);
-                if (localSerialNumber != d->lastSerialNumber
-                    // if this message IS the one that triggers sendPostedEvents(), no need to post it again
-                    && (msg->hwnd != d->internalHwnd
-                        || msg->message != WM_QT_SENDPOSTEDEVENTS)) {
-                    PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, 0, 0);
-                }
-            } else if (d->sendPostedEventsWindowsTimerId == 0
-                       && localSerialNumber != d->lastSerialNumber) {
-                // start a special timer to continue delivering posted events while
-                // there are still input and timer messages in the message queue
-                d->sendPostedEventsWindowsTimerId = SetTimer(d->internalHwnd,
-                                                             SendPostedEventsWindowsTimerId,
-                                                             0, // we specify zero, but Windows uses USER_TIMER_MINIMUM
-                                                             NULL);
-                // we don't check the return value of SetTimer()... if creating the timer failed, there's little
-                // we can do. we just have to accept that posted events will be starved
-            }
+    QEventDispatcherWin32Private *d = q->d_func();
+    MSG *msg = reinterpret_cast<MSG *>(lp);
+    static const UINT mask = inputQueueMask();
+
+    if (HIWORD(GetQueueStatus(mask)) == 0 && wp == PM_REMOVE) {
+        // Allow posting WM_QT_SENDPOSTEDEVENTS message.
+        d->wakeUps.storeRelaxed(0);
+        if (!(msg->hwnd == d->internalHwnd && msg->message == WM_QT_SENDPOSTEDEVENTS)) {
+            PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS,
+                        WMWP_QT_TOFOREIGNLOOP, 0);
         }
     }
-    return q->d_func()->getMessageHook ? CallNextHookEx(0, code, wp, lp) : 0;
+    return d->getMessageHook ? CallNextHookEx(0, code, wp, lp) : 0;
 }
 
 // Provide class name and atom for the message window used by
@@ -341,7 +319,7 @@ QWindowsMessageWindowClassContext::QWindowsMessageWindowClassContext()
     wc.lpszClassName = className;
     atom = RegisterClass(&wc);
     if (!atom) {
-        qErrnoWarning("%s RegisterClass() failed", qPrintable(qClassName));
+        qErrnoWarning("%ls RegisterClass() failed", qUtf16Printable(qClassName));
         delete [] className;
         className = 0;
     }
@@ -485,36 +463,17 @@ void QEventDispatcherWin32::createInternalHwnd()
         return;
     d->internalHwnd = qt_create_internal_window(this);
 
-    installMessageHook();
-
-    // start all normal timers
-    for (int i = 0; i < d->timerVec.count(); ++i)
-        d->registerTimer(d->timerVec.at(i));
-}
-
-void QEventDispatcherWin32::installMessageHook()
-{
-    Q_D(QEventDispatcherWin32);
-
-    if (d->getMessageHook)
-        return;
-
     // setup GetMessage hook needed to drive our posted events
     d->getMessageHook = SetWindowsHookEx(WH_GETMESSAGE, (HOOKPROC) qt_GetMessageHook, NULL, GetCurrentThreadId());
     if (Q_UNLIKELY(!d->getMessageHook)) {
         int errorCode = GetLastError();
-        qFatal("Qt: INTERNAL ERROR: failed to install GetMessage hook: %d, %s",
-               errorCode, qPrintable(qt_error_string(errorCode)));
+        qFatal("Qt: INTERNAL ERROR: failed to install GetMessage hook: %d, %ls",
+               errorCode, qUtf16Printable(qt_error_string(errorCode)));
     }
-}
-
-void QEventDispatcherWin32::uninstallMessageHook()
-{
-    Q_D(QEventDispatcherWin32);
 
-    if (d->getMessageHook)
-        UnhookWindowsHookEx(d->getMessageHook);
-    d->getMessageHook = 0;
+    // start all normal timers
+    for (int i = 0; i < d->timerVec.count(); ++i)
+        d->registerTimer(d->timerVec.at(i));
 }
 
 QEventDispatcherWin32::QEventDispatcherWin32(QObject *parent)
@@ -555,13 +514,15 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
         wakeUp(); // trigger a call to sendPostedEvents()
     }
 
-    d->interrupt.store(false);
+    d->interrupt.storeRelaxed(false);
     emit awake();
 
+    // To prevent livelocks, send posted events once per iteration.
+    // QCoreApplication::sendPostedEvents() takes care about recursions.
+    sendPostedEvents();
+
     bool canWait;
     bool retVal = false;
-    bool seenWM_QT_SENDPOSTEDEVENTS = false;
-    bool needWM_QT_SENDPOSTEDEVENTS = false;
     do {
         DWORD waitRet = 0;
         DWORD nCount = 0;
@@ -571,7 +532,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
             pHandles = &d->winEventNotifierActivatedEvent;
         }
         QVarLengthArray<MSG> processedTimers;
-        while (!d->interrupt.load()) {
+        while (!d->interrupt.loadRelaxed()) {
             MSG msg;
             bool haveMessage;
 
@@ -609,19 +570,13 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
                 }
             }
             if (haveMessage) {
-                // WinCE doesn't support hooks at all, so we have to call this by hand :(
-                if (!d->getMessageHook)
-                    (void) qt_GetMessageHook(0, PM_REMOVE, reinterpret_cast<LPARAM>(&msg));
-
                 if (d->internalHwnd == msg.hwnd && msg.message == WM_QT_SENDPOSTEDEVENTS) {
-                    if (seenWM_QT_SENDPOSTEDEVENTS) {
-                        // when calling processEvents() "manually", we only want to send posted
-                        // events once
-                        needWM_QT_SENDPOSTEDEVENTS = true;
-                        continue;
-                    }
-                    seenWM_QT_SENDPOSTEDEVENTS = true;
-                } else if (msg.message == WM_TIMER) {
+                    // Set result to 'true', if the message was sent by wakeUp().
+                    if (msg.wParam == WMWP_QT_FROMWAKEUP)
+                        retVal = true;
+                    continue;
+                }
+                if (msg.message == WM_TIMER) {
                     // avoid live-lock by keeping track of the timers we've already sent
                     bool found = false;
                     for (int i = 0; !found && i < processedTimers.count(); ++i) {
@@ -652,7 +607,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
 
         // still nothing - wait for message or signalled objects
         canWait = (!retVal
-                   && !d->interrupt.load()
+                   && !d->interrupt.loadRelaxed()
                    && (flags & QEventLoop::WaitForMoreEvents));
         if (canWait) {
             emit aboutToBlock();
@@ -665,14 +620,6 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
         }
     } while (canWait);
 
-    if (!seenWM_QT_SENDPOSTEDEVENTS && (flags & QEventLoop::EventLoopExec) == 0) {
-        // when called "manually", always send posted events
-        sendPostedEvents();
-    }
-
-    if (needWM_QT_SENDPOSTEDEVENTS)
-        PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, 0, 0);
-
     return retVal;
 }
 
@@ -961,7 +908,7 @@ void QEventDispatcherWin32::activateEventNotifiers()
         for (int i = 0; i < d->winEventNotifierList.count(); ++i) {
             QWinEventNotifier *notifier = d->winEventNotifierList.at(i);
             QWinEventNotifierPrivate *nd = QWinEventNotifierPrivate::get(notifier);
-            if (nd->signaledCount.load() != 0) {
+            if (nd->signaledCount.loadRelaxed() != 0) {
                 --nd->signaledCount;
                 nd->unregisterWaitObject();
                 d->activateEventNotifier(notifier);
@@ -1015,17 +962,18 @@ int QEventDispatcherWin32::remainingTime(int timerId)
 void QEventDispatcherWin32::wakeUp()
 {
     Q_D(QEventDispatcherWin32);
-    d->serialNumber.ref();
     if (d->internalHwnd && d->wakeUps.testAndSetAcquire(0, 1)) {
         // post a WM_QT_SENDPOSTEDEVENTS to this thread if there isn't one already pending
-        PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, 0, 0);
+        if (!PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS,
+                         WMWP_QT_FROMWAKEUP, 0))
+            qErrnoWarning("QEventDispatcherWin32::wakeUp: Failed to post a message");
     }
 }
 
 void QEventDispatcherWin32::interrupt()
 {
     Q_D(QEventDispatcherWin32);
-    d->interrupt.store(true);
+    d->interrupt.storeRelaxed(true);
     wakeUp();
 }
 
@@ -1056,7 +1004,9 @@ void QEventDispatcherWin32::closingDown()
 
     d->closingDown = true;
 
-    uninstallMessageHook();
+    if (d->getMessageHook)
+        UnhookWindowsHookEx(d->getMessageHook);
+    d->getMessageHook = 0;
 }
 
 bool QEventDispatcherWin32::event(QEvent *e)
diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index a3a0cd1c2f..e6620178d8 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -73,8 +73,6 @@ class Q_CORE_EXPORT QEventDispatcherWin32 : public QAbstractEventDispatcher
 
 protected:
     void createInternalHwnd();
-    void installMessageHook();
-    void uninstallMessageHook();
 
 public:
     explicit QEventDispatcherWin32(QObject *parent = 0);
@@ -172,9 +170,6 @@ public:
     HHOOK getMessageHook;
 
     // for controlling when to send posted events
-    QAtomicInt serialNumber;
-    int lastSerialNumber;
-    UINT_PTR sendPostedEventsWindowsTimerId;
     QAtomicInt wakeUps;
 
     // timers
diff --git a/src/corelib/kernel/qeventdispatcher_winrt.cpp b/src/corelib/kernel/qeventdispatcher_winrt.cpp
index 600c6c38fd..f7a1f969a8 100644
--- a/src/corelib/kernel/qeventdispatcher_winrt.cpp
+++ b/src/corelib/kernel/qeventdispatcher_winrt.cpp
@@ -44,12 +44,13 @@
 #include <QtCore/QHash>
 #include <QtCore/QMutex>
 #include <QtCore/QSemaphore>
-#include <QtCore/QSharedPointer>
 #include <QtCore/qfunctions_winrt.h>
 #include <private/qabstracteventdispatcher_p.h>
 #include <private/qcoreapplication_p.h>
 
 #include <functional>
+#include <memory>
+
 #include <wrl.h>
 #include <windows.foundation.h>
 #include <windows.system.threading.h>
@@ -300,19 +301,19 @@ HRESULT QEventDispatcherWinRT::runOnMainThread(const std::function<HRESULT()> &d
     if (QThread::currentThread() == QCoreApplication::instance()->thread())
         return delegate();
 
-    auto semaphore = QSharedPointer<QSemaphore>(new QSemaphore);
-    auto ptrSemaphore = new QSharedPointer<QSemaphore>(semaphore);
-    auto result = QSharedPointer<HRESULT>(new HRESULT);
-    auto ptrResult = new QSharedPointer<HRESULT>(result);
+    struct State {
+        QSemaphore semaphore;
+        HRESULT result;
+    };
+
+    const auto state = std::make_shared<State>();
 
-    QMetaObject::invokeMethod(QCoreApplication::instance(), [delegate, ptrSemaphore, ptrResult]() {
-        **ptrResult = delegate();
-        delete ptrResult;
-        (*ptrSemaphore)->release();
-        delete ptrSemaphore;
+    QMetaObject::invokeMethod(QCoreApplication::instance(), [delegate, state]() {
+        const QSemaphoreReleaser releaser{state->semaphore};
+        state->result = delegate();
     }, nullptr);
 
-    return semaphore->tryAcquire(1, timeout) ? *result : E_FAIL;
+    return state->semaphore.tryAcquire(1, timeout) ? state->result : E_FAIL;
 }
 
 bool QEventDispatcherWinRT::processEvents(QEventLoop::ProcessEventsFlags flags)
diff --git a/src/corelib/kernel/qeventdispatcher_winrt_p.h b/src/corelib/kernel/qeventdispatcher_winrt_p.h
index 8b998a7958..2672f11123 100644
--- a/src/corelib/kernel/qeventdispatcher_winrt_p.h
+++ b/src/corelib/kernel/qeventdispatcher_winrt_p.h
@@ -57,7 +57,7 @@
 
 #include <qt_windows.h>
 
-namespace std { template <typename T> class function; }
+#include <functional>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp
index a6cc51621a..eacd0c4e73 100644
--- a/src/corelib/kernel/qeventloop.cpp
+++ b/src/corelib/kernel/qeventloop.cpp
@@ -135,7 +135,7 @@ bool QEventLoop::processEvents(ProcessEventsFlags flags)
     Q_D(QEventLoop);
     if (!d->threadData->hasEventDispatcher())
         return false;
-    return d->threadData->eventDispatcher.load()->processEvents(flags);
+    return d->threadData->eventDispatcher.loadRelaxed()->processEvents(flags);
 }
 
 /*!
@@ -165,7 +165,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)
 {
     Q_D(QEventLoop);
     //we need to protect from race condition with QThread::exit
-    QMutexLocker locker(&static_cast<QThreadPrivate *>(QObjectPrivate::get(d->threadData->thread))->mutex);
+    QMutexLocker locker(&static_cast<QThreadPrivate *>(QObjectPrivate::get(d->threadData->thread.loadAcquire()))->mutex);
     if (d->threadData->quitNow)
         return -1;
 
@@ -225,7 +225,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)
         processEvents(flags | WaitForMoreEvents | EventLoopExec);
 
     ref.exceptionCaught = false;
-    return d->returnCode.load();
+    return d->returnCode.loadRelaxed();
 }
 
 /*!
@@ -279,9 +279,9 @@ void QEventLoop::exit(int returnCode)
     if (!d->threadData->hasEventDispatcher())
         return;
 
-    d->returnCode.store(returnCode);
+    d->returnCode.storeRelaxed(returnCode);
     d->exit.storeRelease(true);
-    d->threadData->eventDispatcher.load()->interrupt();
+    d->threadData->eventDispatcher.loadRelaxed()->interrupt();
 
 #ifdef Q_OS_WASM
     // QEventLoop::exec() never returns in emscripten. We implement approximate behavior here.
@@ -318,7 +318,7 @@ void QEventLoop::wakeUp()
     Q_D(QEventLoop);
     if (!d->threadData->hasEventDispatcher())
         return;
-    d->threadData->eventDispatcher.load()->wakeUp();
+    d->threadData->eventDispatcher.loadRelaxed()->wakeUp();
 }
 
 
diff --git a/src/corelib/kernel/qeventloop_p.h b/src/corelib/kernel/qeventloop_p.h
index dcbb5c63c6..4ad6d92007 100644
--- a/src/corelib/kernel/qeventloop_p.h
+++ b/src/corelib/kernel/qeventloop_p.h
@@ -63,8 +63,8 @@ public:
     inline QEventLoopPrivate()
         : inExec(false)
     {
-        returnCode.store(-1);
-        exit.store(true);
+        returnCode.storeRelaxed(-1);
+        exit.storeRelaxed(true);
     }
 
     QAtomicInt quitLockRef;
diff --git a/src/corelib/kernel/qfunctions_fake_env_p.h b/src/corelib/kernel/qfunctions_fake_env_p.h
index 7010d2cf5d..68d17ed4a1 100644
--- a/src/corelib/kernel/qfunctions_fake_env_p.h
+++ b/src/corelib/kernel/qfunctions_fake_env_p.h
@@ -72,8 +72,8 @@ Q_DECLARE_TYPEINFO(Variable, Q_MOVABLE_TYPE);
 struct NameEquals {
     typedef bool result_type;
     const char *name;
-    explicit NameEquals(const char *name) Q_DECL_NOTHROW : name(name) {}
-    result_type operator()(const Variable &other) const Q_DECL_NOTHROW
+    explicit NameEquals(const char *name) noexcept : name(name) {}
+    result_type operator()(const Variable &other) const noexcept
     { return qstrcmp(other.name, name) == 0; }
 };
 
diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp
index 75a2436d9d..5f652d70e3 100644
--- a/src/corelib/kernel/qjni.cpp
+++ b/src/corelib/kernel/qjni.cpp
@@ -47,9 +47,9 @@
 
 QT_BEGIN_NAMESPACE
 
-static inline QString keyBase()
+static inline QLatin1String keyBase()
 {
-    return QStringLiteral("%1%2:%3");
+    return QLatin1String("%1%2:%3");
 }
 
 static QString qt_convertJString(jstring string)
@@ -154,7 +154,7 @@ static jmethodID getCachedMethodID(JNIEnv *env,
     if (className.isEmpty())
         return getMethodID(env, clazz, name, sig, isStatic);
 
-    const QString key = keyBase().arg(QLatin1String(className)).arg(QLatin1String(name)).arg(QLatin1String(sig));
+    const QString key = keyBase().arg(QLatin1String(className), QLatin1String(name), QLatin1String(sig));
     QHash<QString, jmethodID>::const_iterator it;
 
     {
@@ -206,7 +206,7 @@ static jfieldID getCachedFieldID(JNIEnv *env,
     if (className.isNull())
         return getFieldID(env, clazz, name, sig, isStatic);
 
-    const QString key = keyBase().arg(QLatin1String(className)).arg(QLatin1String(name)).arg(QLatin1String(sig));
+    const QString key = keyBase().arg(QLatin1String(className), QLatin1String(name), QLatin1String(sig));
     QHash<QString, jfieldID>::const_iterator it;
 
     {
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 51866a1867..5cb30a74ac 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -348,7 +348,7 @@ const char *QMetaObject::className() const
 
     \since 5.7
 */
-bool QMetaObject::inherits(const QMetaObject *metaObject) const Q_DECL_NOEXCEPT
+bool QMetaObject::inherits(const QMetaObject *metaObject) const noexcept
 {
     const QMetaObject *m = this;
     do {
@@ -821,6 +821,7 @@ int QMetaObjectPrivate::indexOfConstructor(const QMetaObject *m, const QByteArra
 }
 
 /*!
+    \fn int QMetaObjectPrivate::signalOffset(const QMetaObject *m)
     \internal
     \since 5.0
 
@@ -830,14 +831,6 @@ int QMetaObjectPrivate::indexOfConstructor(const QMetaObject *m, const QByteArra
     Similar to QMetaObject::methodOffset(), but non-signal methods are
     excluded.
 */
-int QMetaObjectPrivate::signalOffset(const QMetaObject *m)
-{
-    Q_ASSERT(m != 0);
-    int offset = 0;
-    for (m = m->d.superdata; m; m = m->d.superdata)
-        offset += priv(m->d.data)->signalCount;
-    return offset;
-}
 
 /*!
     \internal
@@ -960,7 +953,7 @@ static const QMetaObject *QMetaObject_findMetaObject(const QMetaObject *self, co
             return self;
         if (self->d.relatedMetaObjects) {
             Q_ASSERT(priv(self->d.data)->revision >= 2);
-            const QMetaObject * const *e = self->d.relatedMetaObjects;
+            const auto *e = self->d.relatedMetaObjects;
             if (e) {
                 while (*e) {
                     if (const QMetaObject *m =QMetaObject_findMetaObject((*e), name))
@@ -1549,21 +1542,14 @@ bool QMetaObject::invokeMethodImpl(QObject *object, QtPrivate::QSlotObjectBase *
             return false;
         }
 
-        // args and typesCopy will be deallocated by ~QMetaCallEvent() using free()
-        void **args = static_cast<void **>(calloc(1, sizeof(void *)));
-        Q_CHECK_PTR(args);
-
-        int *types = static_cast<int *>(calloc(1, sizeof(int)));
-        Q_CHECK_PTR(types);
-
-        QCoreApplication::postEvent(object, new QMetaCallEvent(slot, 0, -1, 1, types, args));
+        QCoreApplication::postEvent(object, new QMetaCallEvent(slot, 0, -1, 1));
     } else if (type == Qt::BlockingQueuedConnection) {
 #if QT_CONFIG(thread)
         if (currentThread == objectThread)
             qWarning("QMetaObject::invokeMethod: Dead lock detected");
 
         QSemaphore semaphore;
-        QCoreApplication::postEvent(object, new QMetaCallEvent(slot, 0, -1, 0, 0, argv, &semaphore));
+        QCoreApplication::postEvent(object, new QMetaCallEvent(slot, 0, -1, argv, &semaphore));
         semaphore.acquire();
 #endif // QT_CONFIG(thread)
     } else {
@@ -2317,42 +2303,31 @@ bool QMetaMethod::invoke(QObject *object,
             return false;
         }
 
-        int nargs = 1; // include return type
-        void **args = (void **) malloc(paramCount * sizeof(void *));
-        Q_CHECK_PTR(args);
-        int *types = (int *) malloc(paramCount * sizeof(int));
-        Q_CHECK_PTR(types);
-        types[0] = 0; // return type
-        args[0] = 0;
+        QScopedPointer<QMetaCallEvent> event(new QMetaCallEvent(idx_offset, idx_relative, callFunction, 0, -1, paramCount));
+        int *types = event->types();
+        void **args = event->args();
 
+        int argIndex = 0;
         for (int i = 1; i < paramCount; ++i) {
             types[i] = QMetaType::type(typeNames[i]);
             if (types[i] == QMetaType::UnknownType && param[i]) {
                 // Try to register the type and try again before reporting an error.
-                int index = nargs - 1;
-                void *argv[] = { &types[i], &index };
+                void *argv[] = { &types[i], &argIndex };
                 QMetaObject::metacall(object, QMetaObject::RegisterMethodArgumentMetaType,
                                       idx_relative + idx_offset, argv);
                 if (types[i] == -1) {
                     qWarning("QMetaMethod::invoke: Unable to handle unregistered datatype '%s'",
                             typeNames[i]);
-                    for (int x = 1; x < i; ++x) {
-                        if (types[x] && args[x])
-                            QMetaType::destroy(types[x], args[x]);
-                    }
-                    free(types);
-                    free(args);
                     return false;
                 }
             }
             if (types[i] != QMetaType::UnknownType) {
                 args[i] = QMetaType::create(types[i], param[i]);
-                ++nargs;
+                ++argIndex;
             }
         }
 
-        QCoreApplication::postEvent(object, new QMetaCallEvent(idx_offset, idx_relative, callFunction,
-                                                        0, -1, nargs, types, args));
+        QCoreApplication::postEvent(object, event.take());
     } else { // blocking queued connection
 #if QT_CONFIG(thread)
         QThread *currentThread = QThread::currentThread();
@@ -2365,7 +2340,7 @@ bool QMetaMethod::invoke(QObject *object,
 
         QSemaphore semaphore;
         QCoreApplication::postEvent(object, new QMetaCallEvent(idx_offset, idx_relative, callFunction,
-                                                        0, -1, 0, 0, param, &semaphore));
+                                                        0, -1, param, &semaphore));
         semaphore.acquire();
 #endif // QT_CONFIG(thread)
     }
@@ -3030,6 +3005,18 @@ int QMetaProperty::propertyIndex() const
 }
 
 /*!
+  \since 5.14
+
+  Returns this property's index relative within the enclosing meta object.
+*/
+int QMetaProperty::relativePropertyIndex() const
+{
+    if (!mobj)
+        return -1;
+    return idx;
+}
+
+/*!
     Returns \c true if the property's type is an enumeration value that
     is used as a flag; otherwise returns \c false.
 
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h
index 1efb49017f..fcd92afd89 100644
--- a/src/corelib/kernel/qmetaobject.h
+++ b/src/corelib/kernel/qmetaobject.h
@@ -183,7 +183,7 @@ private:
     // signature() has been renamed to methodSignature() in Qt 5.
     // Warning, that function returns a QByteArray; check the life time if
     // you convert to char*.
-    char *signature(struct renamedInQt5_warning_checkTheLifeTime * = nullptr) Q_DECL_EQ_DELETE;
+    char *signature(struct renamedInQt5_warning_checkTheLifeTime * = nullptr) = delete;
 #endif
     static QMetaMethod fromSignalImpl(const QMetaObject *, void **);
 
@@ -254,6 +254,7 @@ public:
     QVariant::Type type() const;
     int userType() const;
     int propertyIndex() const;
+    int relativePropertyIndex() const;
 
     bool isReadable() const;
     bool isWritable() const;
diff --git a/src/corelib/kernel/qmetaobject_moc_p.h b/src/corelib/kernel/qmetaobject_moc_p.h
index ad258acfcd..8c7900767b 100644
--- a/src/corelib/kernel/qmetaobject_moc_p.h
+++ b/src/corelib/kernel/qmetaobject_moc_p.h
@@ -138,7 +138,7 @@ static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixSc
             { "struct ", 7 },
             { "class ", 6 },
             { "enum ", 5 },
-            { 0, 0 }
+            { nullptr, 0 }
         };
         int i = 0;
         do {
@@ -146,7 +146,7 @@ static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixSc
                 t += optional[i].len;
                 break;
             }
-        } while (optional[++i].keyword != 0);
+        } while (optional[++i].keyword != nullptr);
     }
 
     bool star = false;
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index 522bd78e42..56e3d6cb44 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -54,6 +54,7 @@
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qmutex.h>
 #ifndef QT_NO_QOBJECT
 #include <private/qobject_p.h> // For QObjectPrivate::Connection
 #endif
@@ -168,7 +169,6 @@ Q_DECLARE_TYPEINFO(QArgumentType, Q_MOVABLE_TYPE);
 typedef QVarLengthArray<QArgumentType, 10> QArgumentTypeArray;
 
 class QMetaMethodPrivate;
-class QMutex;
 
 struct QMetaObjectPrivate
 {
@@ -208,7 +208,13 @@ struct QMetaObjectPrivate
     static int indexOfConstructor(const QMetaObject *m, const QByteArray &name,
                                   int argc, const QArgumentType *types);
     Q_CORE_EXPORT static QMetaMethod signal(const QMetaObject *m, int signal_index);
-    Q_CORE_EXPORT static int signalOffset(const QMetaObject *m);
+    static inline int signalOffset(const QMetaObject *m) {
+        Q_ASSERT(m != nullptr);
+        int offset = 0;
+        for (m = m->d.superdata; m; m = m->d.superdata)
+            offset += reinterpret_cast<const QMetaObjectPrivate*>(m->d.data)->signalCount;
+        return offset;
+    }
     Q_CORE_EXPORT static int absoluteSignalCount(const QMetaObject *m);
     Q_CORE_EXPORT static int signalIndex(const QMetaMethod &m);
     static bool checkConnectArgs(int signalArgc, const QArgumentType *signalTypes,
@@ -226,15 +232,15 @@ struct QMetaObjectPrivate
     static QObjectPrivate::Connection *connect(const QObject *sender, int signal_index,
                         const QMetaObject *smeta,
                         const QObject *receiver, int method_index_relative,
-                        const QMetaObject *rmeta = 0,
-                        int type = 0, int *types = 0);
+                        const QMetaObject *rmeta = nullptr,
+                        int type = 0, int *types = nullptr);
     static bool disconnect(const QObject *sender, int signal_index,
                            const QMetaObject *smeta,
                            const QObject *receiver, int method_index, void **slot,
                            DisconnectType = DisconnectAll);
-    static inline bool disconnectHelper(QObjectPrivate::Connection *c,
+    static inline bool disconnectHelper(QObjectPrivate::ConnectionData *connections, int signalIndex,
                                         const QObject *receiver, int method_index, void **slot,
-                                        QMutex *senderMutex, DisconnectType = DisconnectAll);
+                                        QBasicMutex *senderMutex, DisconnectType = DisconnectAll);
 #endif
 };
 
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp
index d2030f0275..f77c4ce32f 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/corelib/kernel/qmetaobjectbuilder.cpp
@@ -747,7 +747,7 @@ void QMetaObjectBuilder::addMetaObject
 
     if ((members & RelatedMetaObjects) != 0) {
         Q_ASSERT(priv(prototype->d.data)->revision >= 2);
-        const QMetaObject * const *objects = prototype->d.relatedMetaObjects;
+        const auto *objects = prototype->d.relatedMetaObjects;
         if (objects) {
             while (*objects != 0) {
                 addRelatedMetaObject(*objects);
@@ -1464,16 +1464,16 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
 
     // Create the relatedMetaObjects block if we need one.
     if (d->relatedMetaObjects.size() > 0) {
-        ALIGN(size, QMetaObject *);
-        const QMetaObject **objects =
-            reinterpret_cast<const QMetaObject **>(buf + size);
+        using SuperData = QMetaObject::SuperData;
+        ALIGN(size, SuperData);
+        auto objects = reinterpret_cast<SuperData *>(buf + size);
         if (buf) {
             meta->d.relatedMetaObjects = objects;
             for (index = 0; index < d->relatedMetaObjects.size(); ++index)
                 objects[index] = d->relatedMetaObjects[index];
-            objects[index] = 0;
+            objects[index] = nullptr;
         }
-        size += sizeof(QMetaObject *) * (d->relatedMetaObjects.size() + 1);
+        size += sizeof(SuperData) * (d->relatedMetaObjects.size() + 1);
     }
 
     // Align the final size and return it.
diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h
index 6100835bad..6d43be7811 100644
--- a/src/corelib/kernel/qmetaobjectbuilder_p.h
+++ b/src/corelib/kernel/qmetaobjectbuilder_p.h
@@ -173,7 +173,7 @@ public:
     void setStaticMetacallFunction(QMetaObjectBuilder::StaticMetacallFunction value);
 
     QMetaObject *toMetaObject() const;
-    QByteArray toRelocatableData(bool * = 0) const;
+    QByteArray toRelocatableData(bool * = nullptr) const;
     static void fromRelocatableData(QMetaObject *, const QMetaObject *, const QByteArray &);
 
 #ifndef QT_NO_DATASTREAM
@@ -196,7 +196,7 @@ private:
 class Q_CORE_EXPORT QMetaMethodBuilder
 {
 public:
-    QMetaMethodBuilder() : _mobj(0), _index(0) {}
+    QMetaMethodBuilder() : _mobj(nullptr), _index(0) {}
 
     int index() const;
 
@@ -238,7 +238,7 @@ private:
 class Q_CORE_EXPORT QMetaPropertyBuilder
 {
 public:
-    QMetaPropertyBuilder() : _mobj(0), _index(0) {}
+    QMetaPropertyBuilder() : _mobj(nullptr), _index(0) {}
 
     int index() const { return _index; }
 
@@ -294,7 +294,7 @@ private:
 class Q_CORE_EXPORT QMetaEnumBuilder
 {
 public:
-    QMetaEnumBuilder() : _mobj(0), _index(0) {}
+    QMetaEnumBuilder() : _mobj(nullptr), _index(0) {}
 
     int index() const { return _index; }
 
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 45d0b5df6c..356a675517 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -47,10 +47,13 @@
 #include "qstringlist.h"
 #include "qvector.h"
 #include "qlocale.h"
+#if QT_CONFIG(easingcurve)
 #include "qeasingcurve.h"
+#endif
 #include "quuid.h"
 #include "qvariant.h"
 #include "qdatastream.h"
+#include "qregexp.h"
 #include "qmetatypeswitcher_p.h"
 
 #if QT_CONFIG(regularexpression)
@@ -516,12 +519,12 @@ static const struct { const char * typeName; int typeNameLength; int type; } typ
     QT_FOR_EACH_STATIC_TYPE(QT_ADD_STATIC_METATYPE)
     QT_FOR_EACH_STATIC_ALIAS_TYPE(QT_ADD_STATIC_METATYPE_ALIASES_ITER)
     QT_FOR_EACH_STATIC_HACKS_TYPE(QT_ADD_STATIC_METATYPE_HACKS_ITER)
-    {0, 0, QMetaType::UnknownType}
+    {nullptr, 0, QMetaType::UnknownType}
 };
 
-Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeGuiHelper = 0;
-Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeWidgetsHelper = 0;
-Q_CORE_EXPORT const QMetaObject *qMetaObjectWidgetsHelper = 0;
+Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeGuiHelper = nullptr;
+Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeWidgetsHelper = nullptr;
+Q_CORE_EXPORT const QMetaObject *qMetaObjectWidgetsHelper = nullptr;
 
 class QCustomTypeInfo : public QMetaTypeInterface
 {
@@ -556,7 +559,7 @@ public:
     {
         const QWriteLocker locker(&lock);
         const T* &fun = map[k];
-        if (fun != 0)
+        if (fun)
             return false;
         fun = f;
         return true;
@@ -565,7 +568,7 @@ public:
     const T *function(Key k) const
     {
         const QReadLocker locker(&lock);
-        return map.value(k, 0);
+        return map.value(k, nullptr);
     }
 
     void remove(int from, int to)
@@ -586,13 +589,7 @@ QMetaTypeComparatorRegistry;
 typedef QMetaTypeFunctionRegistry<QtPrivate::AbstractDebugStreamFunction,int>
 QMetaTypeDebugStreamRegistry;
 
-namespace
-{
-union CheckThatItIsPod
-{   // This should break if QMetaTypeInterface is not a POD type
-    QMetaTypeInterface iface;
-};
-}
+Q_STATIC_ASSERT(std::is_pod<QMetaTypeInterface>::value);
 
 Q_DECLARE_TYPEINFO(QCustomTypeInfo, Q_MOVABLE_TYPE);
 Q_GLOBAL_STATIC(QVector<QCustomTypeInfo>, customTypes)
@@ -915,7 +912,7 @@ template <int... TypeIds> struct MetaTypeOffsets<QtPrivate::IndexesList<TypeIds.
     short offsets[sizeof...(TypeIds)];
     constexpr MetaTypeOffsets() : offsets{calculateOffsetForTypeId(TypeIds)...} {}
 
-    const char *operator[](int typeId) const Q_DECL_NOTHROW
+    const char *operator[](int typeId) const noexcept
     {
         short o = offsets[typeId];
         return o < 0 ? nullptr : metaTypeStrings + o;
@@ -972,7 +969,7 @@ static inline int qMetaTypeStaticType(const char *typeName, int length)
     The extra \a firstInvalidIndex parameter is an easy way to avoid
     iterating over customTypes() a second time in registerNormalizedType().
 */
-static int qMetaTypeCustomType_unlocked(const char *typeName, int length, int *firstInvalidIndex = 0)
+static int qMetaTypeCustomType_unlocked(const char *typeName, int length, int *firstInvalidIndex = nullptr)
 {
     const QVector<QCustomTypeInfo> * const ct = customTypes();
     if (!ct)
@@ -1005,7 +1002,7 @@ int QMetaType::registerType(const char *typeName, Deleter deleter,
 {
     return registerType(typeName, deleter, creator,
                         QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Destruct,
-                        QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct, 0, TypeFlags(), 0);
+                        QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct, 0, TypeFlags(), nullptr);
 }
 
 /*!
@@ -1612,7 +1609,7 @@ void *QMetaType::create(int type, const void *copy)
     QMetaType info(type);
     if (int size = info.sizeOf())
         return info.construct(operator new(size), copy);
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -1638,14 +1635,18 @@ class TypeConstructor {
         static void *Construct(const int type, void *where, const void *copy)
         {
             if (QModulesPrivate::QTypeModuleInfo<T>::IsGui)
-                return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].constructor(where, copy) : 0;
+                return Q_LIKELY(qMetaTypeGuiHelper)
+                    ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].constructor(where, copy)
+                    : nullptr;
 
             if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget)
-                return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].constructor(where, copy) : 0;
+                return Q_LIKELY(qMetaTypeWidgetsHelper)
+                    ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].constructor(where, copy)
+                    : nullptr;
 
             // This point can be reached only for known types that definition is not available, for example
             // in bootstrap mode. We have no other choice then ignore it.
-            return 0;
+            return nullptr;
         }
     };
 public:
@@ -1669,7 +1670,7 @@ private:
         {
             QReadLocker locker(customTypesLock());
             if (Q_UNLIKELY(type < QMetaType::User || !ct || ct->count() <= type - QMetaType::User))
-                return 0;
+                return nullptr;
             const auto &typeInfo = ct->at(type - QMetaType::User);
             ctor = typeInfo.constructor;
             tctor = typeInfo.typedConstructor;
@@ -1714,7 +1715,7 @@ private:
 void *QMetaType::construct(int type, void *where, const void *copy)
 {
     if (!where)
-        return 0;
+        return nullptr;
     TypeConstructor constructor(type, where);
     return QMetaTypeSwitcher::switcher<void*>(constructor, type, copy);
 }
@@ -1860,7 +1861,7 @@ private:
 int QMetaType::sizeOf(int type)
 {
     SizeOf sizeOf(type);
-    return QMetaTypeSwitcher::switcher<int>(sizeOf, type, 0);
+    return QMetaTypeSwitcher::switcher<int>(sizeOf, type);
 }
 
 namespace {
@@ -1924,7 +1925,7 @@ private:
 QMetaType::TypeFlags QMetaType::typeFlags(int type)
 {
     Flags flags(type);
-    return static_cast<QMetaType::TypeFlags>(QMetaTypeSwitcher::switcher<quint32>(flags, type, 0));
+    return static_cast<QMetaType::TypeFlags>(QMetaTypeSwitcher::switcher<quint32>(flags, type));
 }
 
 #ifndef QT_BOOTSTRAPPED
@@ -1947,17 +1948,21 @@ public:
     {
         static const QMetaObject *MetaObject(int type) {
             if (QModulesPrivate::QTypeModuleInfo<T>::IsGui)
-                return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].metaObject : 0;
+                return Q_LIKELY(qMetaTypeGuiHelper)
+                    ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].metaObject
+                    : nullptr;
             if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget)
-                return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].metaObject : 0;
+                return Q_LIKELY(qMetaTypeWidgetsHelper)
+                    ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].metaObject
+                    : nullptr;
             return 0;
         }
     };
 
     template <typename T>
     const QMetaObject *delegate(const T *) { return MetaObjectImpl<T>::MetaObject(m_type); }
-    const QMetaObject *delegate(const void*) { return 0; }
-    const QMetaObject *delegate(const QMetaTypeSwitcher::UnknownType*) { return 0; }
+    const QMetaObject *delegate(const void*) { return nullptr; }
+    const QMetaObject *delegate(const QMetaTypeSwitcher::UnknownType*) { return nullptr; }
     const QMetaObject *delegate(const QMetaTypeSwitcher::NotBuiltinType*) { return customMetaObject(m_type); }
 private:
     const int m_type;
@@ -1965,10 +1970,10 @@ private:
     {
         const QVector<QCustomTypeInfo> * const ct = customTypes();
         if (Q_UNLIKELY(!ct || type < QMetaType::User))
-            return 0;
+            return nullptr;
         QReadLocker locker(customTypesLock());
         if (Q_UNLIKELY(ct->count() <= type - QMetaType::User))
-            return 0;
+            return nullptr;
         return ct->at(type - QMetaType::User).metaObject;
     }
 };
@@ -1986,10 +1991,10 @@ const QMetaObject *QMetaType::metaObjectForType(int type)
 {
 #ifndef QT_BOOTSTRAPPED
     MetaObject mo(type);
-    return QMetaTypeSwitcher::switcher<const QMetaObject*>(mo, type, 0);
+    return QMetaTypeSwitcher::switcher<const QMetaObject*>(mo, type);
 #else
     Q_UNUSED(type);
-    return 0;
+    return nullptr;
 #endif
 }
 
@@ -2186,7 +2191,7 @@ private:
 QMetaType QMetaType::typeInfo(const int type)
 {
     TypeInfo typeInfo(type);
-    QMetaTypeSwitcher::switcher<void>(typeInfo, type, 0);
+    QMetaTypeSwitcher::switcher<void>(typeInfo, type);
     return (typeInfo.info.constructor || typeInfo.info.typedConstructor)
                 ? QMetaType(static_cast<ExtensionFlag>(QMetaType::CreateEx | QMetaType::DestroyEx |
                                                        (typeInfo.info.typedConstructor ? QMetaType::ConstructEx | QMetaType::DestructEx : 0))
@@ -2306,7 +2311,7 @@ void QMetaType::dtor()
 void *QMetaType::createExtended(const void *copy) const
 {
     if (m_typeId == QMetaType::UnknownType)
-        return 0;
+        return nullptr;
     if (Q_UNLIKELY(m_typedConstructor && !m_constructor))
         return m_typedConstructor(m_typeId, operator new(m_size), copy);
     return m_constructor(operator new(m_size), copy);
@@ -2386,7 +2391,7 @@ uint QMetaType::sizeExtended() const
 */
 QMetaType::TypeFlags QMetaType::flagsExtended() const
 {
-    return 0;
+    return { };
 }
 
 /*!
@@ -2399,7 +2404,7 @@ QMetaType::TypeFlags QMetaType::flagsExtended() const
 */
 const QMetaObject *QMetaType::metaObjectExtended() const
 {
-    return 0;
+    return nullptr;
 }
 
 
@@ -2408,7 +2413,7 @@ namespace QtPrivate
 const QMetaObject *metaObjectForQWidget()
 {
     if (!qMetaTypeWidgetsHelper)
-        return 0;
+        return nullptr;
     return qMetaObjectWidgetsHelper;
 }
 }
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index a47fbfe28d..d41f7ee80e 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -94,6 +94,13 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
 #define QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(F)\
     F(VoidStar, 31, void*) \
 
+#if QT_CONFIG(easingcurve)
+#define QT_FOR_EACH_STATIC_EASINGCURVE(F)\
+    F(QEasingCurve, 29, QEasingCurve)
+#else
+#define QT_FOR_EACH_STATIC_EASINGCURVE(F)
+#endif
+
 #if QT_CONFIG(itemmodel)
 #define QT_FOR_EACH_STATIC_ITEMMODEL_CLASS(F)\
     F(QModelIndex, 42, QModelIndex) \
@@ -122,7 +129,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
     F(QPoint, 25, QPoint) \
     F(QPointF, 26, QPointF) \
     F(QRegExp, 27, QRegExp) \
-    F(QEasingCurve, 29, QEasingCurve) \
+    QT_FOR_EACH_STATIC_EASINGCURVE(F) \
     F(QUuid, 30, QUuid) \
     F(QVariant, 41, QVariant) \
     F(QRegularExpression, 44, QRegularExpression) \
@@ -216,7 +223,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
     F(QQueue) \
     F(QStack) \
     F(QSet) \
-    F(QLinkedList)
+    /*end*/
 
 #define QT_FOR_EACH_AUTOMATIC_TEMPLATE_2ARG(F) \
     F(QHash, class) \
@@ -849,7 +856,7 @@ struct VariantData
     const uint flags;
 private:
     // copy constructor allowed to be implicit to silence level 4 warning from MSVC
-    VariantData &operator=(const VariantData &) Q_DECL_EQ_DELETE;
+    VariantData &operator=(const VariantData &) = delete;
 };
 
 template<typename const_iterator>
@@ -1715,12 +1722,17 @@ namespace QtPrivate {
         }
     };
 
+    // hack to delay name lookup to instantiation time by making
+    // EnableInternalData a dependent name:
+    template <typename T>
+    struct EnableInternalDataWrap;
+
     template<typename T>
     struct QSmartPointerConvertFunctor<QWeakPointer<T> >
     {
         QObject* operator()(const QWeakPointer<T> &p) const
         {
-            return p.data();
+            return QtPrivate::EnableInternalDataWrap<T>::internalData(p);
         }
     };
 }
@@ -1994,7 +2006,7 @@ struct QMetaTypeId< SINGLE_ARG_TEMPLATE<T> > \
     static int qt_metatype_id() \
     { \
         static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \
-        if (const int id = metatype_id.load()) \
+        if (const int id = metatype_id.loadRelaxed()) \
             return id; \
         const char *tName = QMetaType::typeName(qMetaTypeId<T>()); \
         Q_ASSERT(tName); \
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h
index eba0207ea7..d743d5a5c7 100644
--- a/src/corelib/kernel/qmetatype_p.h
+++ b/src/corelib/kernel/qmetatype_p.h
@@ -140,12 +140,12 @@ public:
     /*saveOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Save), \
     /*loadOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Load),
 #  define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \
-    /*saveOp*/ 0, \
-    /*loadOp*/ 0,
+    /*saveOp*/ nullptr, \
+    /*loadOp*/ nullptr,
 #else
 #  define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \
-    /*saveOp*/ 0, \
-    /*loadOp*/ 0,
+    /*saveOp*/ nullptr, \
+    /*loadOp*/ nullptr,
 #  define QT_METATYPE_INTERFACE_INIT_DATASTREAM_IMPL(Type) \
     QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type)
 #endif
@@ -153,7 +153,7 @@ public:
 #ifndef QT_BOOTSTRAPPED
 #define METAOBJECT_DELEGATE(Type) (QtPrivate::MetaObjectForType<Type>::value())
 #else
-#define METAOBJECT_DELEGATE(Type) 0
+#define METAOBJECT_DELEGATE(Type) nullptr
 #endif
 
 #define QT_METATYPE_INTERFACE_INIT_IMPL(Type, DATASTREAM_DELEGATE) \
@@ -184,11 +184,11 @@ public:
 #define QT_METATYPE_INTERFACE_INIT_EMPTY() \
 { \
     QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(void) \
-    /*constructor*/ 0, \
-    /*destructor*/ 0, \
+    /*constructor*/ nullptr, \
+    /*destructor*/ nullptr, \
     /*size*/ 0, \
     /*flags*/ 0, \
-    /*metaObject*/ 0 , \
+    /*metaObject*/ nullptr , \
     /*typedConstructor*/ nullptr, \
     /*typedDestructor*/ nullptr \
 }
@@ -206,7 +206,9 @@ template<> struct TypeDefinition<QCborArray> { static const bool IsAvailable = f
 template<> struct TypeDefinition<QCborMap> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QCborSimpleType> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QCborValue> { static const bool IsAvailable = false; };
+#if QT_CONFIG(easingcurve)
 template<> struct TypeDefinition<QEasingCurve> { static const bool IsAvailable = false; };
+#endif
 template<> struct TypeDefinition<QJsonArray> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QJsonDocument> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QJsonObject> { static const bool IsAvailable = false; };
diff --git a/src/corelib/kernel/qmetatypeswitcher_p.h b/src/corelib/kernel/qmetatypeswitcher_p.h
index 154fb8ab7f..dabc70f4b0 100644
--- a/src/corelib/kernel/qmetatypeswitcher_p.h
+++ b/src/corelib/kernel/qmetatypeswitcher_p.h
@@ -60,7 +60,7 @@ public:
     class NotBuiltinType;   // type is not a built-in type, but it may be a custom type or an unknown type
     class UnknownType;      // type not known to QMetaType system
     template<class ReturnType, class DelegateObject>
-    static ReturnType switcher(DelegateObject &logic, int type, const void *data);
+    static ReturnType switcher(DelegateObject &logic, int type, const void *data = nullptr);
 };
 
 
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 598ce75bd4..cf107498dd 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Copyright (C) 2013 Olivier Goffart <ogoffart@woboq.com>
 ** Contact: https://www.qt.io/licensing/
@@ -58,6 +58,7 @@
 #include <qdebug.h>
 #include <qpair.h>
 #include <qvarlengtharray.h>
+#include <qscopeguard.h>
 #include <qset.h>
 #if QT_CONFIG(thread)
 #include <qsemaphore.h>
@@ -77,6 +78,12 @@ QT_BEGIN_NAMESPACE
 
 static int DIRECT_CONNECTION_ONLY = 0;
 
+Q_CORE_EXPORT QBasicAtomicPointer<QSignalSpyCallbackSet> qt_signal_spy_callback_set = Q_BASIC_ATOMIC_INITIALIZER(nullptr);
+
+void qt_register_signal_spy_callbacks(QSignalSpyCallbackSet *callback_set)
+{
+    qt_signal_spy_callback_set.storeRelease(callback_set);
+}
 
 QDynamicMetaObjectData::~QDynamicMetaObjectData()
 {
@@ -86,12 +93,6 @@ QAbstractDynamicMetaObject::~QAbstractDynamicMetaObject()
 {
 }
 
-
-struct QSlotObjectBaseDeleter { // for use with QScopedPointer<QSlotObjectBase,...>
-    static void cleanup(QtPrivate::QSlotObjectBase *slot) {
-        if (slot) slot->destroyIfLastRef();
-    }
-};
 static int *queuedConnectionTypes(const QList<QByteArray> &typeNames)
 {
     int *types = new int [typeNames.count() + 1];
@@ -146,10 +147,9 @@ static QBasicMutex _q_ObjectMutexPool[131];
  * \internal
  * mutex to be locked when accessing the connectionlists or the senders list
  */
-static inline QMutex *signalSlotLock(const QObject *o)
+static inline QBasicMutex *signalSlotLock(const QObject *o)
 {
-    return static_cast<QMutex *>(&_q_ObjectMutexPool[
-        uint(quintptr(o)) % sizeof(_q_ObjectMutexPool)/sizeof(QBasicMutex)]);
+    return &_q_ObjectMutexPool[uint(quintptr(o)) % sizeof(_q_ObjectMutexPool)/sizeof(QBasicMutex)];
 }
 
 #if QT_VERSION < 0x60000
@@ -160,39 +160,6 @@ extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *)
 {}
 #endif
 
-struct QConnectionSenderSwitcher {
-    QObject *receiver;
-    QObjectPrivate::Sender *previousSender;
-    QObjectPrivate::Sender currentSender;
-    bool switched;
-
-    inline QConnectionSenderSwitcher() : switched(false) {}
-
-    inline QConnectionSenderSwitcher(QObject *receiver, QObject *sender, int signal_absolute_id)
-    {
-        switchSender(receiver, sender, signal_absolute_id);
-    }
-
-    inline void switchSender(QObject *receiver, QObject *sender, int signal_absolute_id)
-    {
-        this->receiver = receiver;
-        currentSender.sender = sender;
-        currentSender.signal = signal_absolute_id;
-        currentSender.ref = 1;
-        previousSender = QObjectPrivate::setCurrentSender(receiver, &currentSender);
-        switched = true;
-    }
-
-    inline ~QConnectionSenderSwitcher()
-    {
-        if (switched)
-            QObjectPrivate::resetCurrentSender(receiver, &currentSender, previousSender);
-    }
-private:
-    Q_DISABLE_COPY(QConnectionSenderSwitcher)
-};
-
-
 void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject *) = 0;
 void (*QAbstractDeclarativeData::destroyed_qml1)(QAbstractDeclarativeData *, QObject *) = 0;
 void (*QAbstractDeclarativeData::parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *) = 0;
@@ -201,6 +168,12 @@ int  (*QAbstractDeclarativeData::receivers)(QAbstractDeclarativeData *, const QO
 bool (*QAbstractDeclarativeData::isSignalConnected)(QAbstractDeclarativeData *, const QObject *, int) = 0;
 void (*QAbstractDeclarativeData::setWidgetParent)(QObject *, QObject *) = 0;
 
+/*!
+    \fn QObjectData::QObjectData()
+    \internal
+ */
+
+
 QObjectData::~QObjectData() {}
 
 QMetaObject *QObjectData::dynamicMetaObject() const
@@ -209,7 +182,7 @@ QMetaObject *QObjectData::dynamicMetaObject() const
 }
 
 QObjectPrivate::QObjectPrivate(int version)
-    : threadData(0), connectionLists(0), senders(0), currentSender(0), currentChildBeingDeleted(0)
+    : threadData(0), currentChildBeingDeleted(0)
 {
 #ifdef QT_BUILD_INTERNAL
     // Don't check the version parameter in internal builds.
@@ -232,7 +205,6 @@ QObjectPrivate::QObjectPrivate(int version)
     receiveChildEvents = true;
     postedEvents = 0;
     extraData = 0;
-    connectedSignals[0] = connectedSignals[1] = 0;
     metaObject = 0;
     isWindow = false;
     deleteLaterCalled = false;
@@ -241,10 +213,10 @@ QObjectPrivate::QObjectPrivate(int version)
 QObjectPrivate::~QObjectPrivate()
 {
     if (extraData && !extraData->runningTimers.isEmpty()) {
-        if (Q_LIKELY(threadData->thread == QThread::currentThread())) {
+        if (Q_LIKELY(threadData->thread.loadAcquire() == QThread::currentThread())) {
             // unregister pending timers
             if (threadData->hasEventDispatcher())
-                threadData->eventDispatcher.load()->unregisterTimers(q_ptr);
+                threadData->eventDispatcher.loadRelaxed()->unregisterTimers(q_ptr);
 
             // release the timer ids back to the pool
             for (int i = 0; i < extraData->runningTimers.size(); ++i)
@@ -285,59 +257,22 @@ static void computeOffsets(const QMetaObject *metaobject, int *signalOffset, int
     }
 }
 
-/*
-    This vector contains the all connections from an object.
-
-    Each object may have one vector containing the lists of
-    connections for a given signal. The index in the vector correspond
-    to the signal index. The signal index is the one returned by
-    QObjectPrivate::signalIndex (not QMetaObject::indexOfSignal).
-    Negative index means connections to all signals.
-
-    This vector is protected by the object mutex (signalSlotMutexes())
-
-    Each Connection is also part of a 'senders' linked list. The mutex
-    of the receiver must be locked when touching the pointers of this
-    linked list.
-*/
-class QObjectConnectionListVector : public QVector<QObjectPrivate::ConnectionList>
-{
-public:
-    bool orphaned; //the QObject owner of this vector has been destroyed while the vector was inUse
-    bool dirty; //some Connection have been disconnected (their receiver is 0) but not removed from the list yet
-    int inUse; //number of functions that are currently accessing this object or its connections
-    QObjectPrivate::ConnectionList allsignals;
-
-    QObjectConnectionListVector()
-        : QVector<QObjectPrivate::ConnectionList>(), orphaned(false), dirty(false), inUse(0)
-    { }
-
-    QObjectPrivate::ConnectionList &operator[](int at)
-    {
-        if (at < 0)
-            return allsignals;
-        return QVector<QObjectPrivate::ConnectionList>::operator[](at);
-    }
-};
-
 // Used by QAccessibleWidget
 bool QObjectPrivate::isSender(const QObject *receiver, const char *signal) const
 {
     Q_Q(const QObject);
     int signal_index = signalIndex(signal);
-    if (signal_index < 0)
+    ConnectionData *cd = connections.loadRelaxed();
+    if (signal_index < 0 || !cd)
         return false;
-    QMutexLocker locker(signalSlotLock(q));
-    if (connectionLists) {
-        if (signal_index < connectionLists->count()) {
-            const QObjectPrivate::Connection *c =
-                connectionLists->at(signal_index).first;
-
-            while (c) {
-                if (c->receiver == receiver)
-                    return true;
-                c = c->nextConnectionList;
-            }
+    QBasicMutexLocker locker(signalSlotLock(q));
+    if (signal_index < cd->signalVectorCount()) {
+        const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed();
+
+        while (c) {
+            if (c->receiver.loadRelaxed() == receiver)
+                return true;
+            c = c->nextConnectionList.loadRelaxed();
         }
     }
     return false;
@@ -346,21 +281,19 @@ bool QObjectPrivate::isSender(const QObject *receiver, const char *signal) const
 // Used by QAccessibleWidget
 QObjectList QObjectPrivate::receiverList(const char *signal) const
 {
-    Q_Q(const QObject);
     QObjectList returnValue;
     int signal_index = signalIndex(signal);
-    if (signal_index < 0)
+    ConnectionData *cd = connections.loadRelaxed();
+    if (signal_index < 0 || !cd)
         return returnValue;
-    QMutexLocker locker(signalSlotLock(q));
-    if (connectionLists) {
-        if (signal_index < connectionLists->count()) {
-            const QObjectPrivate::Connection *c = connectionLists->at(signal_index).first;
-
-            while (c) {
-                if (c->receiver)
-                    returnValue << c->receiver;
-                c = c->nextConnectionList;
-            }
+    if (signal_index < cd->signalVectorCount()) {
+        const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed();
+
+        while (c) {
+            QObject *r = c->receiver.loadRelaxed();
+            if (r)
+                returnValue << r;
+            c = c->nextConnectionList.loadRelaxed();
         }
     }
     return returnValue;
@@ -370,9 +303,12 @@ QObjectList QObjectPrivate::receiverList(const char *signal) const
 QObjectList QObjectPrivate::senderList() const
 {
     QObjectList returnValue;
-    QMutexLocker locker(signalSlotLock(q_func()));
-    for (Connection *c = senders; c; c = c->next)
-        returnValue << c->sender;
+    ConnectionData *cd = connections.loadRelaxed();
+    if (cd) {
+        QBasicMutexLocker locker(signalSlotLock(q_func()));
+        for (Connection *c = cd->senders; c; c = c->next)
+            returnValue << c->sender;
+    }
     return returnValue;
 }
 
@@ -389,103 +325,271 @@ QObjectList QObjectPrivate::senderList() const
 void QObjectPrivate::addConnection(int signal, Connection *c)
 {
     Q_ASSERT(c->sender == q_ptr);
-    if (!connectionLists)
-        connectionLists = new QObjectConnectionListVector();
-    if (signal >= connectionLists->count())
-        connectionLists->resize(signal + 1);
-
-    ConnectionList &connectionList = (*connectionLists)[signal];
-    if (connectionList.last) {
-        connectionList.last->nextConnectionList = c;
+    ensureConnectionData();
+    ConnectionData *cd = connections.loadRelaxed();
+    cd->resizeSignalVector(signal + 1);
+
+    ConnectionList &connectionList = cd->connectionsForSignal(signal);
+    if (connectionList.last.loadRelaxed()) {
+        Q_ASSERT(connectionList.last.loadRelaxed()->receiver.loadRelaxed());
+        connectionList.last.loadRelaxed()->nextConnectionList.storeRelaxed(c);
     } else {
-        connectionList.first = c;
+        connectionList.first.storeRelaxed(c);
     }
-    connectionList.last = c;
+    c->id = ++cd->currentConnectionId;
+    c->prevConnectionList = connectionList.last.loadRelaxed();
+    connectionList.last.storeRelaxed(c);
 
-    cleanConnectionLists();
+    QObjectPrivate *rd = QObjectPrivate::get(c->receiver.loadRelaxed());
+    rd->ensureConnectionData();
 
-    c->prev = &(QObjectPrivate::get(c->receiver)->senders);
+    c->prev = &(rd->connections.loadRelaxed()->senders);
     c->next = *c->prev;
     *c->prev = c;
     if (c->next)
         c->next->prev = &c->next;
+}
+
+void QObjectPrivate::ConnectionData::removeConnection(QObjectPrivate::Connection *c)
+{
+    Q_ASSERT(c->receiver.loadRelaxed());
+    ConnectionList &connections = signalVector.loadRelaxed()->at(c->signal_index);
+    c->receiver.storeRelaxed(nullptr);
+    QThreadData *td = c->receiverThreadData.loadRelaxed();
+    if (td)
+        td->deref();
+    c->receiverThreadData.storeRelaxed(nullptr);
 
-    if (signal < 0) {
-        connectedSignals[0] = connectedSignals[1] = ~0;
-    } else if (signal < (int)sizeof(connectedSignals) * 8) {
-        connectedSignals[signal >> 5] |= (1 << (signal & 0x1f));
+#ifndef QT_NO_DEBUG
+    bool found = false;
+    for (Connection *cc = connections.first.loadRelaxed(); cc; cc = cc->nextConnectionList.loadRelaxed()) {
+        if (cc == c) {
+            found = true;
+            break;
+        }
+    }
+    Q_ASSERT(found);
+#endif
+
+    // remove from the senders linked list
+    *c->prev = c->next;
+    if (c->next)
+        c->next->prev = c->prev;
+    c->prev = nullptr;
+
+    if (connections.first.loadRelaxed() == c)
+        connections.first.storeRelaxed(c->nextConnectionList.loadRelaxed());
+    if (connections.last.loadRelaxed() == c)
+        connections.last.storeRelaxed(c->prevConnectionList);
+    Q_ASSERT(signalVector.loadRelaxed()->at(c->signal_index).first.loadRelaxed() != c);
+    Q_ASSERT(signalVector.loadRelaxed()->at(c->signal_index).last.loadRelaxed() != c);
+
+    // keep c->nextConnectionList intact, as it might still get accessed by activate
+    Connection *n = c->nextConnectionList.loadRelaxed();
+    if (n)
+        n->prevConnectionList = c->prevConnectionList;
+    if (c->prevConnectionList)
+        c->prevConnectionList->nextConnectionList.storeRelaxed(n);
+    c->prevConnectionList = nullptr;
+
+    Q_ASSERT(c != orphaned.loadRelaxed());
+    // add c to orphanedConnections
+    c->nextInOrphanList = orphaned.loadRelaxed();
+    orphaned.storeRelaxed(c);
+
+#ifndef QT_NO_DEBUG
+    found = false;
+    for (Connection *cc = connections.first.loadRelaxed(); cc; cc = cc->nextConnectionList.loadRelaxed()) {
+        if (cc == c) {
+            found = true;
+            break;
+        }
     }
+    Q_ASSERT(!found);
+#endif
+
 }
 
-void QObjectPrivate::cleanConnectionLists()
+void QObjectPrivate::ConnectionData::cleanOrphanedConnectionsImpl(QObject *sender)
 {
-    if (connectionLists->dirty && !connectionLists->inUse) {
-        // remove broken connections
-        bool allConnected = false;
-        for (int signal = -1; signal < connectionLists->count(); ++signal) {
-            QObjectPrivate::ConnectionList &connectionList =
-                (*connectionLists)[signal];
-
-            // Set to the last entry in the connection list that was *not*
-            // deleted.  This is needed to update the list's last pointer
-            // at the end of the cleanup.
-            QObjectPrivate::Connection *last = 0;
-
-            QObjectPrivate::Connection **prev = &connectionList.first;
-            QObjectPrivate::Connection *c = *prev;
-            bool connected = false; // whether the signal is still connected somewhere
-            while (c) {
-                if (c->receiver) {
-                    last = c;
-                    prev = &c->nextConnectionList;
-                    c = *prev;
-                    connected = true;
-                } else {
-                    QObjectPrivate::Connection *next = c->nextConnectionList;
-                    *prev = next;
-                    c->deref();
-                    c = next;
-                }
-            }
+    ConnectionOrSignalVector *c = nullptr;
+    {
+        QBasicMutexLocker l(signalSlotLock(sender));
+        if (ref.loadAcquire() > 1)
+            return;
+
+        // Since ref == 1, no activate() is in process since we locked the mutex. That implies,
+        // that nothing can reference the orphaned connection objects anymore and they can
+        // be safely deleted
+        c = orphaned.loadRelaxed();
+        orphaned.storeRelaxed(nullptr);
+    }
+    deleteOrphaned(c);
+}
 
-            // Correct the connection list's last pointer.
-            // As conectionList.last could equal last, this could be a noop
-            connectionList.last = last;
+void QObjectPrivate::ConnectionData::deleteOrphaned(QObjectPrivate::ConnectionOrSignalVector *o)
+{
+    while (o) {
+        QObjectPrivate::ConnectionOrSignalVector *next = nullptr;
+        if (SignalVector *v = ConnectionOrSignalVector::asSignalVector(o)) {
+            next = v->nextInOrphanList;
+            free(v);
+        } else {
+            QObjectPrivate::Connection *c = static_cast<Connection *>(o);
+            next = c->nextInOrphanList;
+            Q_ASSERT(!c->receiver.loadRelaxed());
+            Q_ASSERT(!c->prev);
+            c->freeSlotObject();
+            c->deref();
+        }
+        o = next;
+    }
+}
 
-            if (!allConnected && !connected && signal >= 0
-                && size_t(signal) < sizeof(connectedSignals) * 8) {
-                // This signal is no longer connected
-                connectedSignals[signal >> 5] &= ~(1 << (signal & 0x1f));
-            } else if (signal == -1) {
-                allConnected = connected;
-            }
+/*! \internal
+
+  Returns \c true if the signal with index \a signal_index from object \a sender is connected.
+
+  \a signal_index must be the index returned by QObjectPrivate::signalIndex;
+*/
+bool QObjectPrivate::isSignalConnected(uint signalIndex, bool checkDeclarative) const
+{
+    if (checkDeclarative && isDeclarativeSignalConnected(signalIndex))
+        return true;
+
+    ConnectionData *cd = connections.loadRelaxed();
+    if (!cd)
+        return false;
+    SignalVector *signalVector = cd->signalVector.loadRelaxed();
+    if (!signalVector)
+        return false;
+
+    if (signalVector->at(-1).first.loadRelaxed())
+        return true;
+
+    if (signalIndex < uint(cd->signalVectorCount())) {
+        const QObjectPrivate::Connection *c = signalVector->at(signalIndex).first.loadRelaxed();
+        while (c) {
+            if (c->receiver.loadRelaxed())
+                return true;
+            c = c->nextConnectionList.loadRelaxed();
         }
-        connectionLists->dirty = false;
     }
+    return false;
+}
+
+bool QObjectPrivate::maybeSignalConnected(uint signalIndex) const
+{
+    ConnectionData *cd = connections.loadRelaxed();
+    if (!cd)
+        return false;
+    SignalVector *signalVector = cd->signalVector.loadRelaxed();
+    if (!signalVector)
+        return false;
+
+    if (signalVector->at(-1).first.loadAcquire())
+        return true;
+
+    if (signalIndex < uint(cd->signalVectorCount())) {
+        const QObjectPrivate::Connection *c = signalVector->at(signalIndex).first.loadAcquire();
+        return c != nullptr;
+    }
+    return false;
+}
+
+/*!
+    \internal
+ */
+QAbstractMetaCallEvent::~QAbstractMetaCallEvent()
+{
+#if QT_CONFIG(thread)
+    if (semaphore_)
+        semaphore_->release();
+#endif
 }
 
 /*!
     \internal
  */
-QMetaCallEvent::QMetaCallEvent(ushort method_offset, ushort method_relative, QObjectPrivate::StaticMetaCallFunction callFunction,
+inline void QMetaCallEvent::allocArgs()
+{
+    if (!d.nargs_)
+        return;
+
+    constexpr size_t each = sizeof(void*) + sizeof(int);
+    void *const memory = d.nargs_ * each > sizeof(prealloc_) ?
+        calloc(d.nargs_, each) : prealloc_;
+
+    Q_CHECK_PTR(memory);
+    d.args_ = static_cast<void **>(memory);
+}
+
+/*!
+    \internal
+
+    Used for blocking queued connections, just passes \a args through without
+    allocating any memory.
+ */
+QMetaCallEvent::QMetaCallEvent(ushort method_offset, ushort method_relative,
+                               QObjectPrivate::StaticMetaCallFunction callFunction,
                                const QObject *sender, int signalId,
-                               int nargs, int *types, void **args, QSemaphore *semaphore)
-    : QEvent(MetaCall), slotObj_(0), sender_(sender), signalId_(signalId),
-      nargs_(nargs), types_(types), args_(args), semaphore_(semaphore),
-      callFunction_(callFunction), method_offset_(method_offset), method_relative_(method_relative)
-{ }
+                               void **args, QSemaphore *semaphore)
+    : QAbstractMetaCallEvent(sender, signalId, semaphore),
+      d({nullptr, args, callFunction, 0, method_offset, method_relative}),
+      prealloc_()
+{
+}
+
+/*!
+    \internal
+
+    Used for blocking queued connections, just passes \a args through without
+    allocating any memory.
+ */
+QMetaCallEvent::QMetaCallEvent(QtPrivate::QSlotObjectBase *slotO,
+                               const QObject *sender, int signalId,
+                               void **args, QSemaphore *semaphore)
+    : QAbstractMetaCallEvent(sender, signalId, semaphore),
+      d({slotO, args, nullptr, 0, 0, ushort(-1)}),
+      prealloc_()
+{
+    if (d.slotObj_)
+        d.slotObj_->ref();
+}
 
 /*!
     \internal
+
+    Allocates memory for \a nargs; code creating an event needs to initialize
+    the void* and int arrays by accessing \a args() and \a types(), respectively.
  */
-QMetaCallEvent::QMetaCallEvent(QtPrivate::QSlotObjectBase *slotO, const QObject *sender, int signalId,
-                               int nargs, int *types, void **args, QSemaphore *semaphore)
-    : QEvent(MetaCall), slotObj_(slotO), sender_(sender), signalId_(signalId),
-      nargs_(nargs), types_(types), args_(args), semaphore_(semaphore),
-      callFunction_(0), method_offset_(0), method_relative_(ushort(-1))
+QMetaCallEvent::QMetaCallEvent(ushort method_offset, ushort method_relative,
+                               QObjectPrivate::StaticMetaCallFunction callFunction,
+                               const QObject *sender, int signalId,
+                               int nargs)
+    : QAbstractMetaCallEvent(sender, signalId),
+      d({nullptr, nullptr, callFunction, nargs, method_offset, method_relative}),
+      prealloc_()
+{
+    allocArgs();
+}
+
+/*!
+    \internal
+
+    Allocates memory for \a nargs; code creating an event needs to initialize
+    the void* and int arrays by accessing \a args() and \a types(), respectively.
+ */
+QMetaCallEvent::QMetaCallEvent(QtPrivate::QSlotObjectBase *slotO,
+                               const QObject *sender, int signalId,
+                               int nargs)
+    : QAbstractMetaCallEvent(sender, signalId),
+      d({slotO, nullptr, nullptr, nargs, 0, ushort(-1)}),
+      prealloc_()
 {
-    if (slotObj_)
-        slotObj_->ref();
+    if (d.slotObj_)
+        d.slotObj_->ref();
+    allocArgs();
 }
 
 /*!
@@ -493,20 +597,17 @@ QMetaCallEvent::QMetaCallEvent(QtPrivate::QSlotObjectBase *slotO, const QObject
  */
 QMetaCallEvent::~QMetaCallEvent()
 {
-    if (types_) {
-        for (int i = 0; i < nargs_; ++i) {
-            if (types_[i] && args_[i])
-                QMetaType::destroy(types_[i], args_[i]);
+    if (d.nargs_) {
+        int *typeIDs = types();
+        for (int i = 0; i < d.nargs_; ++i) {
+            if (typeIDs[i] && d.args_[i])
+                QMetaType::destroy(typeIDs[i], d.args_[i]);
         }
-        free(types_);
-        free(args_);
+        if (reinterpret_cast<void*>(d.args_) != reinterpret_cast<void*>(prealloc_))
+            free(d.args_);
     }
-#if QT_CONFIG(thread)
-    if (semaphore_)
-        semaphore_->release();
-#endif
-    if (slotObj_)
-        slotObj_->destroyIfLastRef();
+    if (d.slotObj_)
+        d.slotObj_->destroyIfLastRef();
 }
 
 /*!
@@ -514,12 +615,13 @@ QMetaCallEvent::~QMetaCallEvent()
  */
 void QMetaCallEvent::placeMetaCall(QObject *object)
 {
-    if (slotObj_) {
-        slotObj_->call(object, args_);
-    } else if (callFunction_ && method_offset_ <= object->metaObject()->methodOffset()) {
-        callFunction_(object, QMetaObject::InvokeMetaMethod, method_relative_, args_);
+    if (d.slotObj_) {
+        d.slotObj_->call(object, d.args_);
+    } else if (d.callFunction_ && d.method_offset_ <= object->metaObject()->methodOffset()) {
+        d.callFunction_(object, QMetaObject::InvokeMetaMethod, d.method_relative_, d.args_);
     } else {
-        QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, method_offset_ + method_relative_, args_);
+        QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod,
+                              d.method_offset_ + d.method_relative_, d.args_);
     }
 }
 
@@ -773,8 +875,8 @@ static bool check_parent_thread(QObject *parent,
                                 QThreadData *currentThreadData)
 {
     if (parent && parentThreadData != currentThreadData) {
-        QThread *parentThread = parentThreadData->thread;
-        QThread *currentThread = currentThreadData->thread;
+        QThread *parentThread = parentThreadData->thread.loadAcquire();
+        QThread *currentThread = currentThreadData->thread.loadAcquire();
         qWarning("QObject: Cannot create children for a parent that is in a different thread.\n"
                  "(Parent is %s(%p), parent's thread is %s(%p), current thread is %s(%p)",
                  parent->metaObject()->className(),
@@ -806,6 +908,8 @@ static bool check_parent_thread(QObject *parent,
 QObject::QObject(QObject *parent)
     : d_ptr(new QObjectPrivate)
 {
+    Q_ASSERT_X(this != parent, Q_FUNC_INFO, "Cannot parent a QObject to itself");
+
     Q_D(QObject);
     d_ptr->q_ptr = this;
     d->threadData = (parent && !parent->thread()) ? parent->d_func()->threadData : QThreadData::current();
@@ -834,6 +938,8 @@ QObject::QObject(QObject *parent)
 QObject::QObject(QObjectPrivate &dd, QObject *parent)
     : d_ptr(&dd)
 {
+    Q_ASSERT_X(this != parent, Q_FUNC_INFO, "Cannot parent a QObject to itself");
+
     Q_D(QObject);
     d_ptr->q_ptr = this;
     d->threadData = (parent && !parent->thread()) ? parent->d_func()->threadData : QThreadData::current();
@@ -894,15 +1000,15 @@ QObject::~QObject()
     d->wasDeleted = true;
     d->blockSig = 0; // unblock signals so we always emit destroyed()
 
-    QtSharedPointer::ExternalRefCountData *sharedRefcount = d->sharedRefcount.load();
+    QtSharedPointer::ExternalRefCountData *sharedRefcount = d->sharedRefcount.loadRelaxed();
     if (sharedRefcount) {
-        if (sharedRefcount->strongref.load() > 0) {
+        if (sharedRefcount->strongref.loadRelaxed() > 0) {
             qWarning("QObject: shared QObject was deleted directly. The program is malformed and may crash.");
             // but continue deleting, it's too late to stop anyway
         }
 
         // indicate to all QWeakPointers that this QObject has now been deleted
-        sharedRefcount->strongref.store(0);
+        sharedRefcount->strongref.storeRelaxed(0);
         if (!sharedRefcount->weakref.deref())
             delete sharedRefcount;
     }
@@ -921,92 +1027,56 @@ QObject::~QObject()
         }
     }
 
-    // set ref to zero to indicate that this object has been deleted
-    if (d->currentSender != 0)
-        d->currentSender->ref = 0;
-    d->currentSender = 0;
+    QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
+    if (cd) {
+        if (cd->currentSender) {
+            cd->currentSender->receiverDeleted();
+            cd->currentSender = nullptr;
+        }
 
-    if (d->connectionLists || d->senders) {
-        QMutex *signalSlotMutex = signalSlotLock(this);
-        QMutexLocker locker(signalSlotMutex);
+        QBasicMutex *signalSlotMutex = signalSlotLock(this);
+        QBasicMutexLocker locker(signalSlotMutex);
 
         // disconnect all receivers
-        if (d->connectionLists) {
-            ++d->connectionLists->inUse;
-            int connectionListsCount = d->connectionLists->count();
-            for (int signal = -1; signal < connectionListsCount; ++signal) {
-                QObjectPrivate::ConnectionList &connectionList =
-                    (*d->connectionLists)[signal];
-
-                while (QObjectPrivate::Connection *c = connectionList.first) {
-                    if (!c->receiver) {
-                        connectionList.first = c->nextConnectionList;
-                        c->deref();
-                        continue;
-                    }
-
-                    QMutex *m = signalSlotLock(c->receiver);
-                    bool needToUnlock = QOrderedMutexLocker::relock(signalSlotMutex, m);
-
-                    if (c->receiver) {
-                        *c->prev = c->next;
-                        if (c->next) c->next->prev = c->prev;
-                    }
-                    c->receiver = 0;
-                    if (needToUnlock)
-                        m->unlock();
-
-                    connectionList.first = c->nextConnectionList;
-
-                    // The destroy operation must happen outside the lock
-                    if (c->isSlotObject) {
-                        c->isSlotObject = false;
-                        locker.unlock();
-                        c->slotObj->destroyIfLastRef();
-                        locker.relock();
-                    }
-                    c->deref();
+        int receiverCount = cd->signalVectorCount();
+        for (int signal = -1; signal < receiverCount; ++signal) {
+            QObjectPrivate::ConnectionList &connectionList = cd->connectionsForSignal(signal);
+
+            while (QObjectPrivate::Connection *c = connectionList.first.loadRelaxed()) {
+                Q_ASSERT(c->receiver.loadAcquire());
+
+                QBasicMutex *m = signalSlotLock(c->receiver.loadRelaxed());
+                bool needToUnlock = QOrderedMutexLocker::relock(signalSlotMutex, m);
+                if (c->receiver.loadAcquire()) {
+                    cd->removeConnection(c);
+                    Q_ASSERT(connectionList.first.loadRelaxed() != c);
                 }
+                if (needToUnlock)
+                    m->unlock();
             }
-
-            if (!--d->connectionLists->inUse) {
-                delete d->connectionLists;
-            } else {
-                d->connectionLists->orphaned = true;
-            }
-            d->connectionLists = 0;
         }
 
         /* Disconnect all senders:
-         * This loop basically just does
-         *     for (node = d->senders; node; node = node->next) { ... }
-         *
-         * We need to temporarily unlock the receiver mutex to destroy the functors or to lock the
-         * sender's mutex. And when the mutex is released, node->next might be destroyed by another
-         * thread. That's why we set node->prev to &node, that way, if node is destroyed, node will
-         * be updated.
          */
-        QObjectPrivate::Connection *node = d->senders;
-        while (node) {
+        while (QObjectPrivate::Connection *node = cd->senders) {
+            Q_ASSERT(node->receiver.loadAcquire());
             QObject *sender = node->sender;
             // Send disconnectNotify before removing the connection from sender's connection list.
             // This ensures any eventual destructor of sender will block on getting receiver's lock
             // and not finish until we release it.
             sender->disconnectNotify(QMetaObjectPrivate::signal(sender->metaObject(), node->signal_index));
-            QMutex *m = signalSlotLock(sender);
-            node->prev = &node;
+            QBasicMutex *m = signalSlotLock(sender);
             bool needToUnlock = QOrderedMutexLocker::relock(signalSlotMutex, m);
             //the node has maybe been removed while the mutex was unlocked in relock?
-            if (!node || node->sender != sender) {
+            if (node != cd->senders) {
                 // We hold the wrong mutex
                 Q_ASSERT(needToUnlock);
                 m->unlock();
                 continue;
             }
-            node->receiver = 0;
-            QObjectConnectionListVector *senderLists = sender->d_func()->connectionLists;
-            if (senderLists)
-                senderLists->dirty = true;
+
+            QObjectPrivate::ConnectionData *senderData = sender->d_func()->connections.loadRelaxed();
+            Q_ASSERT(senderData);
 
             QtPrivate::QSlotObjectBase *slotObj = nullptr;
             if (node->isSlotObject) {
@@ -1014,19 +1084,24 @@ QObject::~QObject()
                 node->isSlotObject = false;
             }
 
-            node = node->next;
+            senderData->removeConnection(node);
             if (needToUnlock)
                 m->unlock();
 
             if (slotObj) {
-                if (node)
-                    node->prev = &node;
                 locker.unlock();
                 slotObj->destroyIfLastRef();
                 locker.relock();
             }
         }
+
+        // invalidate all connections on the object and make sure
+        // activate() will skip them
+        cd->currentConnectionId.storeRelaxed(0);
     }
+    if (cd && !cd->ref.deref())
+        delete cd;
+    d->connections.storeRelaxed(nullptr);
 
     if (!d->children.isEmpty())
         d->deleteChildren();
@@ -1046,7 +1121,7 @@ QObject::~QObject()
 QObjectPrivate::Connection::~Connection()
 {
     if (ownArgumentTypes) {
-        const int *v = argumentTypes.load();
+        const int *v = argumentTypes.loadRelaxed();
         if (v != &DIRECT_CONNECTION_ONLY)
             delete [] v;
     }
@@ -1253,9 +1328,13 @@ bool QObject::event(QEvent *e)
 
     case QEvent::MetaCall:
         {
-            QMetaCallEvent *mce = static_cast<QMetaCallEvent*>(e);
+            QAbstractMetaCallEvent *mce = static_cast<QAbstractMetaCallEvent*>(e);
 
-            QConnectionSenderSwitcher sw(this, const_cast<QObject*>(mce->sender()), mce->signalId());
+            if (!d_func()->connections.loadRelaxed()) {
+                QBasicMutexLocker locker(signalSlotLock(this));
+                d_func()->ensureConnectionData();
+            }
+            QObjectPrivate::Sender sender(this, const_cast<QObject*>(mce->sender()), mce->signalId());
 
             mce->placeMetaCall(this);
             break;
@@ -1264,7 +1343,7 @@ bool QObject::event(QEvent *e)
     case QEvent::ThreadChange: {
         Q_D(QObject);
         QThreadData *threadData = d->threadData;
-        QAbstractEventDispatcher *eventDispatcher = threadData->eventDispatcher.load();
+        QAbstractEventDispatcher *eventDispatcher = threadData->eventDispatcher.loadRelaxed();
         if (eventDispatcher) {
             QList<QAbstractEventDispatcher::TimerInfo> timers = eventDispatcher->registeredTimers(this);
             if (!timers.isEmpty()) {
@@ -1415,7 +1494,7 @@ bool QObject::eventFilter(QObject * /* watched */, QEvent * /* event */)
     \sa signalsBlocked(), QSignalBlocker
 */
 
-bool QObject::blockSignals(bool block) Q_DECL_NOTHROW
+bool QObject::blockSignals(bool block) noexcept
 {
     Q_D(QObject);
     bool previous = d->blockSig;
@@ -1430,7 +1509,7 @@ bool QObject::blockSignals(bool block) Q_DECL_NOTHROW
 */
 QThread *QObject::thread() const
 {
-    return d_func()->threadData->thread;
+    return d_func()->threadData->thread.loadAcquire();
 }
 
 /*!
@@ -1477,7 +1556,7 @@ void QObject::moveToThread(QThread *targetThread)
 {
     Q_D(QObject);
 
-    if (d->threadData->thread == targetThread) {
+    if (d->threadData->thread.loadAcquire() == targetThread) {
         // object is already in this thread
         return;
     }
@@ -1493,13 +1572,13 @@ void QObject::moveToThread(QThread *targetThread)
 
     QThreadData *currentData = QThreadData::current();
     QThreadData *targetData = targetThread ? QThreadData::get2(targetThread) : nullptr;
-    if (d->threadData->thread == 0 && currentData == targetData) {
+    if (d->threadData->thread.loadAcquire() == 0 && currentData == targetData) {
         // one exception to the rule: we allow moving objects with no thread affinity to the current thread
         currentData = d->threadData;
     } else if (d->threadData != currentData) {
         qWarning("QObject::moveToThread: Current thread (%p) is not the object's thread (%p).\n"
                  "Cannot move to target thread (%p)\n",
-                 currentData->thread.load(), d->threadData->thread.load(), targetData ? targetData->thread.load() : nullptr);
+                 currentData->thread.loadRelaxed(), d->threadData->thread.loadRelaxed(), targetData ? targetData->thread.loadRelaxed() : nullptr);
 
 #ifdef Q_OS_MAC
         qWarning("You might be loading two sets of Qt binaries into the same process. "
@@ -1516,6 +1595,9 @@ void QObject::moveToThread(QThread *targetThread)
     if (!targetData)
         targetData = new QThreadData(0);
 
+    // make sure nobody adds/removes connections to this object while we're moving it
+    QMutexLocker l(signalSlotLock(this));
+
     QOrderedMutexLocker locker(&currentData->postEventList.mutex,
                                &targetData->postEventList.mutex);
 
@@ -1561,13 +1643,35 @@ void QObjectPrivate::setThreadData_helper(QThreadData *currentData, QThreadData
     }
     if (eventsMoved > 0 && targetData->hasEventDispatcher()) {
         targetData->canWait = false;
-        targetData->eventDispatcher.load()->wakeUp();
+        targetData->eventDispatcher.loadRelaxed()->wakeUp();
     }
 
     // the current emitting thread shouldn't restore currentSender after calling moveToThread()
-    if (currentSender)
-        currentSender->ref = 0;
-    currentSender = 0;
+    ConnectionData *cd = connections.loadRelaxed();
+    if (cd) {
+        if (cd->currentSender) {
+            cd->currentSender->receiverDeleted();
+            cd->currentSender = nullptr;
+        }
+
+        // adjust the receiverThreadId values in the Connections
+        if (cd) {
+            auto *c = cd->senders;
+            while (c) {
+                QObject *r = c->receiver.loadRelaxed();
+                if (r) {
+                    Q_ASSERT(r == q);
+                    targetData->ref();
+                    QThreadData *old = c->receiverThreadData.loadRelaxed();
+                    if (old)
+                        old->deref();
+                    c->receiverThreadData.storeRelaxed(targetData);
+                }
+                c = c->next;
+            }
+        }
+
+    }
 
     // set new thread data
     targetData->ref();
@@ -1584,7 +1688,7 @@ void QObjectPrivate::_q_reregisterTimers(void *pointer)
 {
     Q_Q(QObject);
     QList<QAbstractEventDispatcher::TimerInfo> *timerList = reinterpret_cast<QList<QAbstractEventDispatcher::TimerInfo> *>(pointer);
-    QAbstractEventDispatcher *eventDispatcher = threadData->eventDispatcher.load();
+    QAbstractEventDispatcher *eventDispatcher = threadData->eventDispatcher.loadRelaxed();
     for (int i = 0; i < timerList->size(); ++i) {
         const QAbstractEventDispatcher::TimerInfo &ti = timerList->at(i);
         eventDispatcher->registerTimer(ti.timerId, ti.interval, ti.timerType, q);
@@ -1650,7 +1754,7 @@ int QObject::startTimer(int interval, Qt::TimerType timerType)
         qWarning("QObject::startTimer: Timers cannot be started from another thread");
         return 0;
     }
-    int timerId = d->threadData->eventDispatcher.load()->registerTimer(interval, timerType, this);
+    int timerId = d->threadData->eventDispatcher.loadRelaxed()->registerTimer(interval, timerType, this);
     if (!d->extraData)
         d->extraData = new QObjectPrivate::ExtraData;
     d->extraData->runningTimers.append(timerId);
@@ -1716,16 +1820,16 @@ void QObject::killTimer(int id)
         int at = d->extraData ? d->extraData->runningTimers.indexOf(id) : -1;
         if (at == -1) {
             // timer isn't owned by this object
-            qWarning("QObject::killTimer(): Error: timer id %d is not valid for object %p (%s, %s), timer has not been killed",
+            qWarning("QObject::killTimer(): Error: timer id %d is not valid for object %p (%s, %ls), timer has not been killed",
                      id,
                      this,
                      metaObject()->className(),
-                     qPrintable(objectName()));
+                     qUtf16Printable(objectName()));
             return;
         }
 
         if (d->threadData->hasEventDispatcher())
-            d->threadData->eventDispatcher.load()->unregisterTimer(id);
+            d->threadData->eventDispatcher.loadRelaxed()->unregisterTimer(id);
 
         d->extraData->runningTimers.remove(at);
         QAbstractEventDispatcherPrivate::releaseTimerId(id);
@@ -2026,8 +2130,25 @@ void QObjectPrivate::deleteChildren()
 void QObjectPrivate::setParent_helper(QObject *o)
 {
     Q_Q(QObject);
+    Q_ASSERT_X(q != o, Q_FUNC_INFO, "Cannot parent a QObject to itself");
+#ifdef QT_DEBUG
+    const auto checkForParentChildLoops = qScopeGuard([&](){
+        int depth = 0;
+        auto p = parent;
+        while (p) {
+            if (++depth == CheckForParentChildLoopsWarnDepth) {
+                qWarning("QObject %p (class: '%s', object name: '%s') may have a loop in its parent-child chain; "
+                         "this is undefined behavior",
+                         q, q->metaObject()->className(), qPrintable(q->objectName()));
+            }
+            p = p->parent();
+        }
+    });
+#endif
+
     if (o == parent)
         return;
+
     if (parent) {
         QObjectPrivate *parentD = parent->d_func();
         if (parentD->isDeletingChildren && wasDeleted
@@ -2378,13 +2499,14 @@ QObject *QObject::sender() const
 {
     Q_D(const QObject);
 
-    QMutexLocker locker(signalSlotLock(this));
-    if (!d->currentSender)
-        return 0;
+    QBasicMutexLocker locker(signalSlotLock(this));
+    QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
+    if (!cd || !cd->currentSender)
+        return nullptr;
 
-    for (QObjectPrivate::Connection *c = d->senders; c; c = c->next) {
-        if (c->sender == d->currentSender->sender)
-            return d->currentSender->sender;
+    for (QObjectPrivate::Connection *c = cd->senders; c; c = c->next) {
+        if (c->sender == cd->currentSender->sender)
+            return cd->currentSender->sender;
     }
 
     return 0;
@@ -2419,14 +2541,15 @@ int QObject::senderSignalIndex() const
 {
     Q_D(const QObject);
 
-    QMutexLocker locker(signalSlotLock(this));
-    if (!d->currentSender)
+    QBasicMutexLocker locker(signalSlotLock(this));
+    QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
+    if (!cd || !cd->currentSender)
         return -1;
 
-    for (QObjectPrivate::Connection *c = d->senders; c; c = c->next) {
-        if (c->sender == d->currentSender->sender) {
+    for (QObjectPrivate::Connection *c = cd->senders; c; c = c->next) {
+        if (c->sender == cd->currentSender->sender) {
             // Convert from signal range to method range
-            return QMetaObjectPrivate::signal(c->sender->metaObject(), d->currentSender->signal).methodIndex();
+            return QMetaObjectPrivate::signal(c->sender->metaObject(), cd->currentSender->signal).methodIndex();
         }
     }
 
@@ -2482,15 +2605,13 @@ int QObject::receivers(const char *signal) const
                                                              signal_index);
         }
 
-        QMutexLocker locker(signalSlotLock(this));
-        if (d->connectionLists) {
-            if (signal_index < d->connectionLists->count()) {
-                const QObjectPrivate::Connection *c =
-                    d->connectionLists->at(signal_index).first;
-                while (c) {
-                    receivers += c->receiver ? 1 : 0;
-                    c = c->nextConnectionList;
-                }
+        QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
+        QBasicMutexLocker locker(signalSlotLock(this));
+        if (cd && signal_index < cd->signalVectorCount()) {
+            const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed();
+            while (c) {
+                receivers += c->receiver.loadRelaxed() ? 1 : 0;
+                c = c->nextConnectionList.loadRelaxed();
             }
         }
     }
@@ -2530,22 +2651,8 @@ bool QObject::isSignalConnected(const QMetaMethod &signal) const
 
     signalIndex += QMetaObjectPrivate::signalOffset(signal.mobj);
 
-    QMutexLocker locker(signalSlotLock(this));
-    if (d->connectionLists) {
-        if (signalIndex < sizeof(d->connectedSignals) * 8 && !d->connectionLists->dirty)
-            return d->isSignalConnected(signalIndex);
-
-        if (signalIndex < uint(d->connectionLists->count())) {
-            const QObjectPrivate::Connection *c =
-                d->connectionLists->at(signalIndex).first;
-            while (c) {
-                if (c->receiver)
-                    return true;
-                c = c->nextConnectionList;
-            }
-        }
-    }
-    return d->isDeclarativeSignalConnected(signalIndex);
+    QBasicMutexLocker locker(signalSlotLock(this));
+    return d->isSignalConnected(signalIndex, true);
 }
 
 /*!
@@ -3308,49 +3415,49 @@ QObjectPrivate::Connection *QMetaObjectPrivate::connect(const QObject *sender,
 
     int method_offset = rmeta ? rmeta->methodOffset() : 0;
     Q_ASSERT(!rmeta || QMetaObjectPrivate::get(rmeta)->revision >= 6);
-    QObjectPrivate::StaticMetaCallFunction callFunction =
-        rmeta ? rmeta->d.static_metacall : 0;
+    QObjectPrivate::StaticMetaCallFunction callFunction = rmeta ? rmeta->d.static_metacall : nullptr;
 
     QOrderedMutexLocker locker(signalSlotLock(sender),
                                signalSlotLock(receiver));
 
-    if (type & Qt::UniqueConnection) {
-        QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists;
-        if (connectionLists && connectionLists->count() > signal_index) {
-            const QObjectPrivate::Connection *c2 =
-                (*connectionLists)[signal_index].first;
+    QObjectPrivate::ConnectionData *scd  = QObjectPrivate::get(s)->connections.loadRelaxed();
+    if (type & Qt::UniqueConnection && scd) {
+        if (scd->signalVectorCount() > signal_index) {
+            const QObjectPrivate::Connection *c2 = scd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed();
 
             int method_index_absolute = method_index + method_offset;
 
             while (c2) {
-                if (!c2->isSlotObject && c2->receiver == receiver && c2->method() == method_index_absolute)
-                    return 0;
-                c2 = c2->nextConnectionList;
+                if (!c2->isSlotObject && c2->receiver.loadRelaxed() == receiver && c2->method() == method_index_absolute)
+                    return nullptr;
+                c2 = c2->nextConnectionList.loadRelaxed();
             }
         }
         type &= Qt::UniqueConnection - 1;
     }
 
-    QScopedPointer<QObjectPrivate::Connection> c(new QObjectPrivate::Connection);
+    std::unique_ptr<QObjectPrivate::Connection> c{new QObjectPrivate::Connection};
     c->sender = s;
     c->signal_index = signal_index;
-    c->receiver = r;
+    c->receiver.storeRelaxed(r);
+    QThreadData *td = r->d_func()->threadData;
+    td->ref();
+    c->receiverThreadData.storeRelaxed(td);
     c->method_relative = method_index;
     c->method_offset = method_offset;
     c->connectionType = type;
     c->isSlotObject = false;
-    c->argumentTypes.store(types);
-    c->nextConnectionList = 0;
+    c->argumentTypes.storeRelaxed(types);
     c->callFunction = callFunction;
 
-    QObjectPrivate::get(s)->addConnection(signal_index, c.data());
+    QObjectPrivate::get(s)->addConnection(signal_index, c.get());
 
     locker.unlock();
     QMetaMethod smethod = QMetaObjectPrivate::signal(smeta, signal_index);
     if (smethod.isValid())
         s->connectNotify(smethod);
 
-    return c.take();
+    return c.release();
 }
 
 /*!
@@ -3386,47 +3493,38 @@ bool QMetaObject::disconnectOne(const QObject *sender, int signal_index,
     \internal
     Helper function to remove the connection from the senders list and set the receivers to \nullptr
  */
-bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::Connection *c,
+bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::ConnectionData *connections, int signalIndex,
                                           const QObject *receiver, int method_index, void **slot,
-                                          QMutex *senderMutex, DisconnectType disconnectType)
+                                          QBasicMutex *senderMutex, DisconnectType disconnectType)
 {
     bool success = false;
+
+    auto &connectionList = connections->connectionsForSignal(signalIndex);
+    auto *c = connectionList.first.loadRelaxed();
     while (c) {
-        if (c->receiver
-            && (receiver == 0 || (c->receiver == receiver
+        QObject *r = c->receiver.loadRelaxed();
+        if (r && (receiver == nullptr || (r == receiver
                            && (method_index < 0 || (!c->isSlotObject && c->method() == method_index))
-                           && (slot == 0 || (c->isSlotObject && c->slotObj->compare(slot)))))) {
+                           && (slot == nullptr || (c->isSlotObject && c->slotObj->compare(slot)))))) {
             bool needToUnlock = false;
-            QMutex *receiverMutex = 0;
-            if (c->receiver) {
-                receiverMutex = signalSlotLock(c->receiver);
+            QBasicMutex *receiverMutex = nullptr;
+            if (r) {
+                receiverMutex = signalSlotLock(r);
                 // need to relock this receiver and sender in the correct order
                 needToUnlock = QOrderedMutexLocker::relock(senderMutex, receiverMutex);
             }
-            if (c->receiver) {
-                *c->prev = c->next;
-                if (c->next)
-                    c->next->prev = c->prev;
-            }
+            if (c->receiver.loadRelaxed())
+                connections->removeConnection(c);
 
             if (needToUnlock)
                 receiverMutex->unlock();
 
-            c->receiver = 0;
-
-            if (c->isSlotObject) {
-                c->isSlotObject = false;
-                senderMutex->unlock();
-                c->slotObj->destroyIfLastRef();
-                senderMutex->lock();
-            }
-
             success = true;
 
             if (disconnectType == DisconnectOne)
                 return success;
         }
-        c = c->nextConnectionList;
+        c = c->nextConnectionList.loadRelaxed();
     }
     return success;
 }
@@ -3445,43 +3543,34 @@ bool QMetaObjectPrivate::disconnect(const QObject *sender,
 
     QObject *s = const_cast<QObject *>(sender);
 
-    QMutex *senderMutex = signalSlotLock(sender);
-    QMutexLocker locker(senderMutex);
+    QBasicMutex *senderMutex = signalSlotLock(sender);
+    QBasicMutexLocker locker(senderMutex);
 
-    QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists;
-    if (!connectionLists)
+    QObjectPrivate::ConnectionData *scd  = QObjectPrivate::get(s)->connections.loadRelaxed();
+    if (!scd)
         return false;
 
-    // prevent incoming connections changing the connectionLists while unlocked
-    ++connectionLists->inUse;
-
     bool success = false;
-    if (signal_index < 0) {
-        // remove from all connection lists
-        for (int sig_index = -1; sig_index < connectionLists->count(); ++sig_index) {
-            QObjectPrivate::Connection *c =
-                (*connectionLists)[sig_index].first;
-            if (disconnectHelper(c, receiver, method_index, slot, senderMutex, disconnectType)) {
-                success = true;
-                connectionLists->dirty = true;
+    {
+        // prevent incoming connections changing the connections->receivers while unlocked
+        QObjectPrivate::ConnectionDataPointer connections(scd);
+
+        if (signal_index < 0) {
+            // remove from all connection lists
+            for (int sig_index = -1; sig_index < scd->signalVectorCount(); ++sig_index) {
+                if (disconnectHelper(connections.data(), sig_index, receiver, method_index, slot, senderMutex, disconnectType))
+                    success = true;
             }
-        }
-    } else if (signal_index < connectionLists->count()) {
-        QObjectPrivate::Connection *c =
-            (*connectionLists)[signal_index].first;
-        if (disconnectHelper(c, receiver, method_index, slot, senderMutex, disconnectType)) {
-            success = true;
-            connectionLists->dirty = true;
+        } else if (signal_index < scd->signalVectorCount()) {
+            if (disconnectHelper(connections.data(), signal_index, receiver, method_index, slot, senderMutex, disconnectType))
+                success = true;
         }
     }
 
-    --connectionLists->inUse;
-    Q_ASSERT(connectionLists->inUse >= 0);
-    if (connectionLists->orphaned && !connectionLists->inUse)
-        delete connectionLists;
-
     locker.unlock();
     if (success) {
+        scd->cleanOrphanedConnections(s);
+
         QMetaMethod smethod = QMetaObjectPrivate::signal(smeta, signal_index);
         if (smethod.isValid())
             s->disconnectNotify(smethod);
@@ -3597,10 +3686,9 @@ void QMetaObject::connectSlotsByName(QObject *o)
 
     \a signal must be in the signal index range (see QObjectPrivate::signalIndex()).
 */
-static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connection *c, void **argv,
-                            QMutexLocker &locker)
+static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connection *c, void **argv)
 {
-    const int *argumentTypes = c->argumentTypes.load();
+    const int *argumentTypes = c->argumentTypes.loadRelaxed();
     if (!argumentTypes) {
         QMetaMethod m = QMetaObjectPrivate::signal(sender->metaObject(), signal);
         argumentTypes = queuedConnectionTypes(m.parameterTypes());
@@ -3609,7 +3697,7 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect
         if (!c->argumentTypes.testAndSetOrdered(0, argumentTypes)) {
             if (argumentTypes != &DIRECT_CONNECTION_ONLY)
                 delete [] argumentTypes;
-            argumentTypes = c->argumentTypes.load();
+            argumentTypes = c->argumentTypes.loadRelaxed();
         }
     }
     if (argumentTypes == &DIRECT_CONNECTION_ONLY) // cannot activate
@@ -3617,142 +3705,129 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect
     int nargs = 1; // include return type
     while (argumentTypes[nargs-1])
         ++nargs;
-    int *types = (int *) malloc(nargs*sizeof(int));
-    Q_CHECK_PTR(types);
-    void **args = (void **) malloc(nargs*sizeof(void *));
-    Q_CHECK_PTR(args);
+
+    QBasicMutexLocker locker(signalSlotLock(c->receiver.loadRelaxed()));
+    if (!c->receiver.loadRelaxed()) {
+        // the connection has been disconnected before we got the lock
+        return;
+    }
+    if (c->isSlotObject)
+        c->slotObj->ref();
+    locker.unlock();
+
+    QMetaCallEvent *ev = c->isSlotObject ?
+        new QMetaCallEvent(c->slotObj, sender, signal, nargs) :
+        new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction, sender, signal, nargs);
+
+    void **args = ev->args();
+    int *types = ev->types();
+
     types[0] = 0; // return type
-    args[0] = 0; // return value
+    args[0] = nullptr; // return value
 
     if (nargs > 1) {
         for (int n = 1; n < nargs; ++n)
             types[n] = argumentTypes[n-1];
 
-        locker.unlock();
         for (int n = 1; n < nargs; ++n)
             args[n] = QMetaType::create(types[n], argv[n]);
-        locker.relock();
-
-        if (!c->receiver) {
-            locker.unlock();
-            // we have been disconnected while the mutex was unlocked
-            for (int n = 1; n < nargs; ++n)
-                QMetaType::destroy(types[n], args[n]);
-            free(types);
-            free(args);
-            locker.relock();
-            return;
-        }
     }
 
-    QMetaCallEvent *ev = c->isSlotObject ?
-        new QMetaCallEvent(c->slotObj, sender, signal, nargs, types, args) :
-        new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction, sender, signal, nargs, types, args);
-    QCoreApplication::postEvent(c->receiver, ev);
-}
+    locker.relock();
+    if (c->isSlotObject)
+        c->slotObj->destroyIfLastRef();
+    if (!c->receiver.loadRelaxed()) {
+        // the connection has been disconnected while we were unlocked
+        locker.unlock();
+        delete ev;
+        return;
+    }
 
-/*!
-    \internal
- */
-void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_signal_index,
-                           void **argv)
-{
-    activate(sender, QMetaObjectPrivate::signalOffset(m), local_signal_index, argv);
+    QCoreApplication::postEvent(c->receiver.loadRelaxed(), ev);
 }
 
-/*!
-    \internal
- */
-void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_index, void **argv)
+template <bool callbacks_enabled>
+void doActivate(QObject *sender, int signal_index, void **argv)
 {
-    int signal_index = signalOffset + local_signal_index;
+    QObjectPrivate *sp = QObjectPrivate::get(sender);
 
-    if (sender->d_func()->blockSig)
+    if (sp->blockSig)
         return;
 
     Q_TRACE_SCOPE(QMetaObject_activate, sender, signal_index);
 
-    if (sender->d_func()->isDeclarativeSignalConnected(signal_index)
+    if (sp->isDeclarativeSignalConnected(signal_index)
             && QAbstractDeclarativeData::signalEmitted) {
         Q_TRACE_SCOPE(QMetaObject_activate_declarative_signal, sender, signal_index);
-        QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender,
+        QAbstractDeclarativeData::signalEmitted(sp->declarativeData, sender,
                                                 signal_index, argv);
     }
 
-    if (!sender->d_func()->isSignalConnected(signal_index, /*checkDeclarative =*/ false)
-        && !qt_signal_spy_callback_set.signal_begin_callback
-        && !qt_signal_spy_callback_set.signal_end_callback) {
-        // The possible declarative connection is done, and nothing else is connected, so:
-        return;
-    }
+    const QSignalSpyCallbackSet *signal_spy_set = callbacks_enabled ? qt_signal_spy_callback_set.loadAcquire() : nullptr;
 
     void *empty_argv[] = { nullptr };
     if (!argv)
         argv = empty_argv;
 
-    if (qt_signal_spy_callback_set.signal_begin_callback != 0) {
-        qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index, argv);
+    if (!sp->maybeSignalConnected(signal_index)) {
+        // The possible declarative connection is done, and nothing else is connected
+        if (callbacks_enabled && signal_spy_set->signal_begin_callback != nullptr)
+            signal_spy_set->signal_begin_callback(sender, signal_index, argv);
+        if (callbacks_enabled && signal_spy_set->signal_end_callback != nullptr)
+            signal_spy_set->signal_end_callback(sender, signal_index);
+        return;
     }
 
-    {
-    QMutexLocker locker(signalSlotLock(sender));
-    struct ConnectionListsRef {
-        QObjectConnectionListVector *connectionLists;
-        ConnectionListsRef(QObjectConnectionListVector *connectionLists) : connectionLists(connectionLists)
-        {
-            if (connectionLists)
-                ++connectionLists->inUse;
-        }
-        ~ConnectionListsRef()
-        {
-            if (!connectionLists)
-                return;
-
-            --connectionLists->inUse;
-            Q_ASSERT(connectionLists->inUse >= 0);
-            if (connectionLists->orphaned) {
-                if (!connectionLists->inUse)
-                    delete connectionLists;
-            }
-        }
+    if (callbacks_enabled && signal_spy_set->signal_begin_callback != nullptr)
+        signal_spy_set->signal_begin_callback(sender, signal_index, argv);
 
-        QObjectConnectionListVector *operator->() const { return connectionLists; }
-    };
-    ConnectionListsRef connectionLists = sender->d_func()->connectionLists;
-    if (!connectionLists.connectionLists) {
-        locker.unlock();
-        if (qt_signal_spy_callback_set.signal_end_callback != 0)
-            qt_signal_spy_callback_set.signal_end_callback(sender, signal_index);
-        return;
-    }
+    bool senderDeleted = false;
+    {
+    Q_ASSERT(sp->connections.loadAcquire());
+    QObjectPrivate::ConnectionDataPointer connections(sp->connections.loadRelaxed());
+    QObjectPrivate::SignalVector *signalVector = connections->signalVector.loadRelaxed();
 
     const QObjectPrivate::ConnectionList *list;
-    if (signal_index < connectionLists->count())
-        list = &connectionLists->at(signal_index);
+    if (signal_index < signalVector->count())
+        list = &signalVector->at(signal_index);
     else
-        list = &connectionLists->allsignals;
+        list = &signalVector->at(-1);
 
     Qt::HANDLE currentThreadId = QThread::currentThreadId();
+    bool inSenderThread = currentThreadId == QObjectPrivate::get(sender)->threadData->threadId.loadRelaxed();
 
+    // We need to check against the highest connection id to ensure that signals added
+    // during the signal emission are not emitted in this emission.
+    uint highestConnectionId = connections->currentConnectionId.loadRelaxed();
     do {
-        QObjectPrivate::Connection *c = list->first;
-        if (!c) continue;
-        // We need to check against last here to ensure that signals added
-        // during the signal emission are not emitted in this emission.
-        QObjectPrivate::Connection *last = list->last;
+        QObjectPrivate::Connection *c = list->first.loadRelaxed();
+        if (!c)
+            continue;
 
         do {
-            if (!c->receiver)
+            QObject * const receiver = c->receiver.loadRelaxed();
+            if (!receiver)
                 continue;
 
-            QObject * const receiver = c->receiver;
-            const bool receiverInSameThread = currentThreadId == receiver->d_func()->threadData->threadId.load();
+            QThreadData *td = c->receiverThreadData.loadRelaxed();
+            if (!td)
+                continue;
+
+            bool receiverInSameThread;
+            if (inSenderThread) {
+                receiverInSameThread = currentThreadId == td->threadId.loadRelaxed();
+            } else {
+                // need to lock before reading the threadId, because moveToThread() could interfere
+                QMutexLocker lock(signalSlotLock(receiver));
+                receiverInSameThread = currentThreadId == td->threadId.loadRelaxed();
+            }
+
 
             // determine if this connection should be sent immediately or
             // put into the event queue
             if ((c->connectionType == Qt::AutoConnection && !receiverInSameThread)
                 || (c->connectionType == Qt::QueuedConnection)) {
-                queued_activate(sender, signal_index, c, argv, locker);
+                queued_activate(sender, signal_index, c, argv);
                 continue;
 #if QT_CONFIG(thread)
             } else if (c->connectionType == Qt::BlockingQueuedConnection) {
@@ -3763,92 +3838,113 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
                     receiver->metaObject()->className(), receiver);
                 }
                 QSemaphore semaphore;
-                QMetaCallEvent *ev = c->isSlotObject ?
-                    new QMetaCallEvent(c->slotObj, sender, signal_index, 0, 0, argv, &semaphore) :
-                    new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction, sender, signal_index, 0, 0, argv, &semaphore);
-                QCoreApplication::postEvent(receiver, ev);
-                locker.unlock();
+                {
+                    QBasicMutexLocker locker(signalSlotLock(sender));
+                    if (!c->receiver.loadAcquire())
+                        continue;
+                    QMetaCallEvent *ev = c->isSlotObject ?
+                        new QMetaCallEvent(c->slotObj, sender, signal_index, argv, &semaphore) :
+                        new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction,
+                                           sender, signal_index, argv, &semaphore);
+                    QCoreApplication::postEvent(receiver, ev);
+                }
                 semaphore.acquire();
-                locker.relock();
                 continue;
 #endif
             }
 
-            QConnectionSenderSwitcher sw;
+            QObjectPrivate::Sender senderData(receiverInSameThread ? receiver : nullptr, sender, signal_index);
 
-            if (receiverInSameThread) {
-                sw.switchSender(receiver, sender, signal_index);
-            }
             if (c->isSlotObject) {
                 c->slotObj->ref();
-                QScopedPointer<QtPrivate::QSlotObjectBase, QSlotObjectBaseDeleter> obj(c->slotObj);
-                locker.unlock();
+
+                struct Deleter {
+                    void operator()(QtPrivate::QSlotObjectBase *slot) const {
+                        if (slot) slot->destroyIfLastRef();
+                    }
+                };
+                const std::unique_ptr<QtPrivate::QSlotObjectBase, Deleter> obj{c->slotObj};
 
                 {
-                    Q_TRACE_SCOPE(QMetaObject_activate_slot_functor, obj.data());
+                    Q_TRACE_SCOPE(QMetaObject_activate_slot_functor, obj.get());
                     obj->call(receiver, argv);
                 }
-
-                // Make sure the slot object gets destroyed before the mutex is locked again, as the
-                // destructor of the slot object might also lock a mutex from the signalSlotLock() mutex pool,
-                // and that would deadlock if the pool happens to return the same mutex.
-                obj.reset();
-
-                locker.relock();
             } else if (c->callFunction && c->method_offset <= receiver->metaObject()->methodOffset()) {
                 //we compare the vtable to make sure we are not in the destructor of the object.
-                const int methodIndex = c->method();
                 const int method_relative = c->method_relative;
                 const auto callFunction = c->callFunction;
-                locker.unlock();
-                if (qt_signal_spy_callback_set.slot_begin_callback != 0)
-                    qt_signal_spy_callback_set.slot_begin_callback(receiver, methodIndex, argv);
+                const int methodIndex = (Q_HAS_TRACEPOINTS || callbacks_enabled) ? c->method() : 0;
+                if (callbacks_enabled && signal_spy_set->slot_begin_callback != nullptr)
+                    signal_spy_set->slot_begin_callback(receiver, methodIndex, argv);
 
                 {
                     Q_TRACE_SCOPE(QMetaObject_activate_slot, receiver, methodIndex);
                     callFunction(receiver, QMetaObject::InvokeMetaMethod, method_relative, argv);
                 }
 
-                if (qt_signal_spy_callback_set.slot_end_callback != 0)
-                    qt_signal_spy_callback_set.slot_end_callback(receiver, methodIndex);
-                locker.relock();
+                if (callbacks_enabled && signal_spy_set->slot_end_callback != nullptr)
+                    signal_spy_set->slot_end_callback(receiver, methodIndex);
             } else {
                 const int method = c->method_relative + c->method_offset;
-                locker.unlock();
 
-                if (qt_signal_spy_callback_set.slot_begin_callback != 0) {
-                    qt_signal_spy_callback_set.slot_begin_callback(receiver, method, argv);
+                if (callbacks_enabled && signal_spy_set->slot_begin_callback != nullptr) {
+                    signal_spy_set->slot_begin_callback(receiver, method, argv);
                 }
 
                 {
                     Q_TRACE_SCOPE(QMetaObject_activate_slot, receiver, method);
-                    metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv);
+                    QMetaObject::metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv);
                 }
 
-                if (qt_signal_spy_callback_set.slot_end_callback != 0)
-                    qt_signal_spy_callback_set.slot_end_callback(receiver, method);
-
-                locker.relock();
+                if (callbacks_enabled && signal_spy_set->slot_end_callback != nullptr)
+                    signal_spy_set->slot_end_callback(receiver, method);
             }
+        } while ((c = c->nextConnectionList.loadRelaxed()) != nullptr && c->id <= highestConnectionId);
 
-            if (connectionLists->orphaned)
-                break;
-        } while (c != last && (c = c->nextConnectionList) != 0);
-
-        if (connectionLists->orphaned)
-            break;
-    } while (list != &connectionLists->allsignals &&
+    } while (list != &signalVector->at(-1) &&
         //start over for all signals;
-        ((list = &connectionLists->allsignals), true));
+        ((list = &signalVector->at(-1)), true));
 
+        if (connections->currentConnectionId.loadRelaxed() == 0)
+            senderDeleted = true;
     }
+    if (!senderDeleted) {
+        sp->connections.loadRelaxed()->cleanOrphanedConnections(sender);
 
-    if (qt_signal_spy_callback_set.signal_end_callback != 0)
-        qt_signal_spy_callback_set.signal_end_callback(sender, signal_index);
+        if (callbacks_enabled && signal_spy_set->signal_end_callback != nullptr)
+            signal_spy_set->signal_end_callback(sender, signal_index);
+    }
 }
 
 /*!
     \internal
+ */
+void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_signal_index,
+                           void **argv)
+{
+    int signal_index = local_signal_index + QMetaObjectPrivate::signalOffset(m);
+
+    if (Q_UNLIKELY(qt_signal_spy_callback_set.loadRelaxed()))
+        doActivate<true>(sender, signal_index, argv);
+    else
+        doActivate<false>(sender, signal_index, argv);
+}
+
+/*!
+    \internal
+ */
+void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_index, void **argv)
+{
+    int signal_index = signalOffset + local_signal_index;
+
+    if (Q_UNLIKELY(qt_signal_spy_callback_set.loadRelaxed()))
+        doActivate<true>(sender, signal_index, argv);
+    else
+        doActivate<false>(sender, signal_index, argv);
+ }
+
+/*!
+    \internal
    signal_index comes from indexOfMethod()
 */
 void QMetaObject::activate(QObject *sender, int signal_index, void **argv)
@@ -3861,7 +3957,7 @@ void QMetaObject::activate(QObject *sender, int signal_index, void **argv)
 
 /*!
     \internal
-    Returns the signal index used in the internal connectionLists vector.
+    Returns the signal index used in the internal connections->receivers vector.
 
     It is different from QMetaObject::indexOfSignal():  indexOfSignal is the same as indexOfMethod
     while QObjectPrivate::signalIndex is smaller because it doesn't give index to slots.
@@ -4044,6 +4140,7 @@ static void dumpRecursive(int level, const QObject *object)
     }
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
     \overload
     \obsolete
@@ -4057,6 +4154,7 @@ void QObject::dumpObjectTree()
 {
     const_cast<const QObject *>(this)->dumpObjectTree();
 }
+#endif
 
 /*!
     Dumps a tree of children to the debug output.
@@ -4071,6 +4169,7 @@ void QObject::dumpObjectTree() const
     dumpRecursive(0, this);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
     \overload
     \obsolete
@@ -4085,6 +4184,7 @@ void QObject::dumpObjectInfo()
 {
     const_cast<const QObject *>(this)->dumpObjectInfo();
 }
+#endif
 
 /*!
     Dumps information about signal connections, etc. for this object
@@ -4101,37 +4201,40 @@ void QObject::dumpObjectInfo() const
            objectName().isEmpty() ? "unnamed" : objectName().toLocal8Bit().data());
 
     Q_D(const QObject);
-    QMutexLocker locker(signalSlotLock(this));
+    QBasicMutexLocker locker(signalSlotLock(this));
 
     // first, look for connections where this object is the sender
     qDebug("  SIGNALS OUT");
 
-    if (d->connectionLists) {
-        for (int signal_index = 0; signal_index < d->connectionLists->count(); ++signal_index) {
+    QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
+    if (cd && cd->signalVectorCount()) {
+        QObjectPrivate::SignalVector *signalVector = cd->signalVector.loadRelaxed();
+        for (int signal_index = 0; signal_index < signalVector->count(); ++signal_index) {
+            const QObjectPrivate::Connection *c = signalVector->at(signal_index).first.loadRelaxed();
+            if (!c)
+                continue;
             const QMetaMethod signal = QMetaObjectPrivate::signal(metaObject(), signal_index);
             qDebug("        signal: %s", signal.methodSignature().constData());
 
             // receivers
-            const QObjectPrivate::Connection *c =
-                d->connectionLists->at(signal_index).first;
             while (c) {
-                if (!c->receiver) {
+                if (!c->receiver.loadRelaxed()) {
                     qDebug("          <Disconnected receiver>");
-                    c = c->nextConnectionList;
+                    c = c->nextConnectionList.loadRelaxed();
                     continue;
                 }
                 if (c->isSlotObject) {
                     qDebug("          <functor or function pointer>");
-                    c = c->nextConnectionList;
+                    c = c->nextConnectionList.loadRelaxed();
                     continue;
                 }
-                const QMetaObject *receiverMetaObject = c->receiver->metaObject();
+                const QMetaObject *receiverMetaObject = c->receiver.loadRelaxed()->metaObject();
                 const QMetaMethod method = receiverMetaObject->method(c->method());
                 qDebug("          --> %s::%s %s",
                        receiverMetaObject->className(),
-                       c->receiver->objectName().isEmpty() ? "unnamed" : qPrintable(c->receiver->objectName()),
+                       c->receiver.loadRelaxed()->objectName().isEmpty() ? "unnamed" : qPrintable(c->receiver.loadRelaxed()->objectName()),
                        method.methodSignature().constData());
-                c = c->nextConnectionList;
+                c = c->nextConnectionList.loadRelaxed();
             }
         }
     } else {
@@ -4141,8 +4244,8 @@ void QObject::dumpObjectInfo() const
     // now look for connections where this object is the receiver
     qDebug("  SIGNALS IN");
 
-    if (d->senders) {
-        for (QObjectPrivate::Connection *s = d->senders; s; s = s->next) {
+    if (cd && cd->senders) {
+        for (QObjectPrivate::Connection *s = cd->senders; s; s = s->next) {
             QByteArray slotName = QByteArrayLiteral("<unknown>");
             if (!s->isSlotObject) {
                 const QMetaMethod slot = metaObject()->method(s->method());
@@ -4159,16 +4262,22 @@ void QObject::dumpObjectInfo() const
 }
 
 #ifndef QT_NO_USERDATA
+static QBasicAtomicInteger<uint> user_data_registration = Q_BASIC_ATOMIC_INITIALIZER(0);
+
 /*!
     \internal
  */
 uint QObject::registerUserData()
 {
-    static int user_data_registration = 0;
-    return user_data_registration++;
+    return user_data_registration.fetchAndAddRelaxed(1);
 }
 
 /*!
+    \fn QObjectUserData::QObjectUserData()
+    \internal
+ */
+
+/*!
     \internal
  */
 QObjectUserData::~QObjectUserData()
@@ -4489,6 +4598,24 @@ QDebug operator<<(QDebug dbg, const QObject *o)
     Q_NAMESPACE makes an external variable, \c{staticMetaObject}, available.
     \c{staticMetaObject} is of type QMetaObject and provides access to the
     enums declared with Q_ENUM_NS/Q_FLAG_NS.
+
+    \sa Q_NAMESPACE_EXPORT
+*/
+
+/*!
+    \macro Q_NAMESPACE_EXPORT(EXPORT_MACRO)
+    \relates QObject
+    \since 5.14
+
+    The Q_NAMESPACE_EXPORT macro can be used to add QMetaObject capabilities
+    to a namespace.
+
+    It works exactly like the Q_NAMESPACE macro. However, the external
+    \c{staticMetaObject} variable that gets defined in the namespace
+    is declared with the supplied \c{EXPORT_MACRO} qualifier. This is
+    useful if the object needs to be exported from a dynamic library.
+
+    \sa Q_NAMESPACE, {Creating Shared Libraries}
 */
 
 /*!
@@ -4873,37 +5000,39 @@ QMetaObject::Connection QObjectPrivate::connectImpl(const QObject *sender, int s
     QOrderedMutexLocker locker(signalSlotLock(sender),
                                signalSlotLock(receiver));
 
-    if (type & Qt::UniqueConnection && slot) {
-        QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists;
-        if (connectionLists && connectionLists->count() > signal_index) {
-            const QObjectPrivate::Connection *c2 =
-                (*connectionLists)[signal_index].first;
+    if (type & Qt::UniqueConnection && slot && QObjectPrivate::get(s)->connections.loadRelaxed()) {
+        QObjectPrivate::ConnectionData *connections = QObjectPrivate::get(s)->connections.loadRelaxed();
+        if (connections->signalVectorCount() > signal_index) {
+            const QObjectPrivate::Connection *c2 = connections->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed();
 
             while (c2) {
-                if (c2->receiver == receiver && c2->isSlotObject && c2->slotObj->compare(slot)) {
+                if (c2->receiver.loadRelaxed() == receiver && c2->isSlotObject && c2->slotObj->compare(slot)) {
                     slotObj->destroyIfLastRef();
                     return QMetaObject::Connection();
                 }
-                c2 = c2->nextConnectionList;
+                c2 = c2->nextConnectionList.loadRelaxed();
             }
         }
         type = static_cast<Qt::ConnectionType>(type ^ Qt::UniqueConnection);
     }
 
-    QScopedPointer<QObjectPrivate::Connection> c(new QObjectPrivate::Connection);
+    std::unique_ptr<QObjectPrivate::Connection> c{new QObjectPrivate::Connection};
     c->sender = s;
     c->signal_index = signal_index;
-    c->receiver = r;
+    QThreadData *td = r->d_func()->threadData;
+    td->ref();
+    c->receiverThreadData.storeRelaxed(td);
+    c->receiver.storeRelaxed(r);
     c->slotObj = slotObj;
     c->connectionType = type;
     c->isSlotObject = true;
     if (types) {
-        c->argumentTypes.store(types);
+        c->argumentTypes.storeRelaxed(types);
         c->ownArgumentTypes = false;
     }
 
-    QObjectPrivate::get(s)->addConnection(signal_index, c.data());
-    QMetaObject::Connection ret(c.take());
+    QObjectPrivate::get(s)->addConnection(signal_index, c.get());
+    QMetaObject::Connection ret(c.release());
     locker.unlock();
 
     QMetaMethod method = QMetaObjectPrivate::signal(senderMetaObject, signal_index);
@@ -4925,35 +5054,35 @@ bool QObject::disconnect(const QMetaObject::Connection &connection)
 {
     QObjectPrivate::Connection *c = static_cast<QObjectPrivate::Connection *>(connection.d_ptr);
 
-    if (!c || !c->receiver)
+    if (!c)
+        return false;
+    QObject *receiver = c->receiver.loadRelaxed();
+    if (!receiver)
         return false;
 
-    QMutex *senderMutex = signalSlotLock(c->sender);
-    QMutex *receiverMutex = signalSlotLock(c->receiver);
+    QBasicMutex *senderMutex = signalSlotLock(c->sender);
+    QBasicMutex *receiverMutex = signalSlotLock(receiver);
 
+    QObjectPrivate::ConnectionData *connections;
     {
         QOrderedMutexLocker locker(senderMutex, receiverMutex);
 
-        QObjectConnectionListVector *connectionLists = QObjectPrivate::get(c->sender)->connectionLists;
-        Q_ASSERT(connectionLists);
-        connectionLists->dirty = true;
+        // load receiver once again and recheck to ensure nobody else has removed the connection in the meantime
+        receiver = c->receiver.loadRelaxed();
+        if (!receiver)
+            return false;
 
-        *c->prev = c->next;
-        if (c->next)
-            c->next->prev = c->prev;
-        c->receiver = 0;
+        connections = QObjectPrivate::get(c->sender)->connections.loadRelaxed();
+        Q_ASSERT(connections);
+        connections->removeConnection(c);
     }
 
-    // destroy the QSlotObject, if possible
-    if (c->isSlotObject) {
-        c->slotObj->destroyIfLastRef();
-        c->isSlotObject = false;
-    }
+    connections->cleanOrphanedConnections(c->sender);
 
     c->sender->disconnectNotify(QMetaObjectPrivate::signal(c->sender->metaObject(),
                                                            c->signal_index));
 
-    const_cast<QMetaObject::Connection &>(connection).d_ptr = 0;
+    const_cast<QMetaObject::Connection &>(connection).d_ptr = nullptr;
     c->deref(); // has been removed from the QMetaObject::Connection object
 
     return true;
@@ -5036,7 +5165,7 @@ bool QObject::disconnectImpl(const QObject *sender, void **signal, const QObject
         }
         if (!senderMetaObject) {
             qWarning("QObject::disconnect: signal not found in %s", sender->metaObject()->className());
-            return QMetaObject::Connection(0);
+            return false;
         }
         signal_index += QMetaObjectPrivate::signalOffset(senderMetaObject);
     }
@@ -5135,7 +5264,7 @@ bool QMetaObject::Connection::isConnected_helper() const
     Q_ASSERT(d_ptr);    // we're only called from operator RestrictedBool() const
     QObjectPrivate::Connection *c = static_cast<QObjectPrivate::Connection *>(d_ptr);
 
-    return c->receiver;
+    return c->receiver.loadRelaxed();
 }
 
 
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index fc1d7c956c..540b8b32c1 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -71,12 +71,16 @@ class QObjectPrivate;
 class QObject;
 class QThread;
 class QWidget;
+class QAccessibleWidget;
 #ifndef QT_NO_REGEXP
 class QRegExp;
 #endif
 #if QT_CONFIG(regularexpression)
 class QRegularExpression;
 #endif
+#if !QT_DEPRECATED_SINCE(5, 14) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+# define QT_NO_USERDATA
+#endif
 #ifndef QT_NO_USERDATA
 class QObjectUserData;
 #endif
@@ -93,7 +97,9 @@ Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QRegular
 Q_CORE_EXPORT QObject *qt_qFindChild_helper(const QObject *parent, const QString &name, const QMetaObject &mo, Qt::FindChildOptions options);
 
 class Q_CORE_EXPORT QObjectData {
+    Q_DISABLE_COPY(QObjectData)
 public:
+    QObjectData() = default;
     virtual ~QObjectData() = 0;
     QObject *q_ptr;
     QObject *parent;
@@ -111,6 +117,10 @@ public:
     int postedEvents;
     QDynamicMetaObjectData *metaObject;
     QMetaObject *dynamicMetaObject() const;
+
+#ifdef QT_DEBUG
+    enum { CheckForParentChildLoopsWarnDepth = 4096 };
+#endif
 };
 
 
@@ -143,8 +153,8 @@ public:
     inline bool isWidgetType() const { return d_ptr->isWidget; }
     inline bool isWindowType() const { return d_ptr->isWindow; }
 
-    inline bool signalsBlocked() const Q_DECL_NOTHROW { return d_ptr->blockSig; }
-    bool blockSignals(bool b) Q_DECL_NOTHROW;
+    inline bool signalsBlocked() const noexcept { return d_ptr->blockSig; }
+    bool blockSignals(bool b) noexcept;
 
     QThread *thread() const;
     void moveToThread(QThread *thread);
@@ -399,8 +409,11 @@ public:
 #endif // QT_NO_PROPERTIES
 
 #ifndef QT_NO_USERDATA
+    QT_DEPRECATED_VERSION_5_14
     static uint registerUserData();
+    QT_DEPRECATED_VERSION_X_5_14("Use setProperty()")
     void setUserData(uint id, QObjectUserData* data);
+    QT_DEPRECATED_VERSION_X_5_14("Use property()")
     QObjectUserData* userData(uint id) const;
 #endif // QT_NO_USERDATA
 
@@ -437,7 +450,7 @@ protected:
     QScopedPointer<QObjectData> d_ptr;
 
     static const QMetaObject staticQtMetaObject;
-    friend inline const QMetaObject *qt_getQtMetaObject() Q_DECL_NOEXCEPT;
+    friend inline const QMetaObject *qt_getQtMetaObject() noexcept;
 
     friend struct QMetaObject;
     friend struct QMetaObjectPrivate;
@@ -447,6 +460,7 @@ protected:
     friend class QCoreApplication;
     friend class QCoreApplicationPrivate;
     friend class QWidget;
+    friend class QAccessibleWidget;
     friend class QThreadData;
 
 private:
@@ -468,12 +482,14 @@ inline QMetaObject::Connection QObject::connect(const QObject *asender, const ch
                                             const char *amember, Qt::ConnectionType atype) const
 { return connect(asender, asignal, this, amember, atype); }
 
-inline const QMetaObject *qt_getQtMetaObject() Q_DECL_NOEXCEPT
+inline const QMetaObject *qt_getQtMetaObject() noexcept
 { return &QObject::staticQtMetaObject; }
 
 #ifndef QT_NO_USERDATA
 class Q_CORE_EXPORT QObjectUserData {
+    Q_DISABLE_COPY(QObjectUserData)
 public:
+    QObjectUserData() = default;
     virtual ~QObjectUserData();
 };
 #endif
@@ -541,17 +557,15 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QObject *);
 class QSignalBlocker
 {
 public:
-    inline explicit QSignalBlocker(QObject *o) Q_DECL_NOTHROW;
-    inline explicit QSignalBlocker(QObject &o) Q_DECL_NOTHROW;
+    inline explicit QSignalBlocker(QObject *o) noexcept;
+    inline explicit QSignalBlocker(QObject &o) noexcept;
     inline ~QSignalBlocker();
 
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QSignalBlocker(QSignalBlocker &&other) Q_DECL_NOTHROW;
-    inline QSignalBlocker &operator=(QSignalBlocker &&other) Q_DECL_NOTHROW;
-#endif
+    inline QSignalBlocker(QSignalBlocker &&other) noexcept;
+    inline QSignalBlocker &operator=(QSignalBlocker &&other) noexcept;
 
-    inline void reblock() Q_DECL_NOTHROW;
-    inline void unblock() Q_DECL_NOTHROW;
+    inline void reblock() noexcept;
+    inline void unblock() noexcept;
 private:
     Q_DISABLE_COPY(QSignalBlocker)
     QObject * m_o;
@@ -559,20 +573,19 @@ private:
     bool m_inhibited;
 };
 
-QSignalBlocker::QSignalBlocker(QObject *o) Q_DECL_NOTHROW
+QSignalBlocker::QSignalBlocker(QObject *o) noexcept
     : m_o(o),
       m_blocked(o && o->blockSignals(true)),
       m_inhibited(false)
 {}
 
-QSignalBlocker::QSignalBlocker(QObject &o) Q_DECL_NOTHROW
+QSignalBlocker::QSignalBlocker(QObject &o) noexcept
     : m_o(&o),
       m_blocked(o.blockSignals(true)),
       m_inhibited(false)
 {}
 
-#ifdef Q_COMPILER_RVALUE_REFS
-QSignalBlocker::QSignalBlocker(QSignalBlocker &&other) Q_DECL_NOTHROW
+QSignalBlocker::QSignalBlocker(QSignalBlocker &&other) noexcept
     : m_o(other.m_o),
       m_blocked(other.m_blocked),
       m_inhibited(other.m_inhibited)
@@ -580,7 +593,7 @@ QSignalBlocker::QSignalBlocker(QSignalBlocker &&other) Q_DECL_NOTHROW
     other.m_o = nullptr;
 }
 
-QSignalBlocker &QSignalBlocker::operator=(QSignalBlocker &&other) Q_DECL_NOTHROW
+QSignalBlocker &QSignalBlocker::operator=(QSignalBlocker &&other) noexcept
 {
     if (this != &other) {
         // if both *this and other block the same object's signals:
@@ -595,7 +608,6 @@ QSignalBlocker &QSignalBlocker::operator=(QSignalBlocker &&other) Q_DECL_NOTHROW
     }
     return *this;
 }
-#endif
 
 QSignalBlocker::~QSignalBlocker()
 {
@@ -603,13 +615,13 @@ QSignalBlocker::~QSignalBlocker()
         m_o->blockSignals(m_blocked);
 }
 
-void QSignalBlocker::reblock() Q_DECL_NOTHROW
+void QSignalBlocker::reblock() noexcept
 {
     if (m_o) m_o->blockSignals(true);
     m_inhibited = false;
 }
 
-void QSignalBlocker::unblock() Q_DECL_NOTHROW
+void QSignalBlocker::unblock() noexcept
 {
     if (m_o) m_o->blockSignals(m_blocked);
     m_inhibited = true;
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index a762e6f529..feafcaf323 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2013 Olivier Goffart <ogoffart@woboq.com>
 ** Contact: https://www.qt.io/licensing/
 **
@@ -79,9 +79,9 @@ struct QSignalSpyCallbackSet
     EndCallback signal_end_callback,
                 slot_end_callback;
 };
-void Q_CORE_EXPORT qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set);
+void Q_CORE_EXPORT qt_register_signal_spy_callbacks(QSignalSpyCallbackSet *callback_set);
 
-extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
+extern Q_CORE_EXPORT QBasicAtomicPointer<QSignalSpyCallbackSet> qt_signal_spy_callback_set;
 
 enum { QObjectPrivateVersion = QT_VERSION };
 
@@ -124,54 +124,199 @@ public:
     };
 
     typedef void (*StaticMetaCallFunction)(QObject *, QMetaObject::Call, int, void **);
-    struct Connection
+    struct Connection;
+    struct SignalVector;
+
+    struct ConnectionOrSignalVector {
+        union {
+            // linked list of orphaned connections that need cleaning up
+            ConnectionOrSignalVector *nextInOrphanList;
+            // linked list of connections connected to slots in this object
+            Connection *next;
+        };
+
+        static SignalVector *asSignalVector(ConnectionOrSignalVector *c) {
+            if (reinterpret_cast<quintptr>(c) & 1)
+                return reinterpret_cast<SignalVector *>(reinterpret_cast<quintptr>(c) & ~quintptr(1u));
+            return nullptr;
+        }
+        static Connection *fromSignalVector(SignalVector *v) {
+            return reinterpret_cast<Connection *>(reinterpret_cast<quintptr>(v) | quintptr(1u));
+        }
+    };
+
+    struct Connection : public ConnectionOrSignalVector
     {
+        // linked list of connections connected to slots in this object, next is in base class
+        Connection **prev;
+        // linked list of connections connected to signals in this object
+        QAtomicPointer<Connection> nextConnectionList;
+        Connection *prevConnectionList;
+
         QObject *sender;
-        QObject *receiver;
+        QAtomicPointer<QObject> receiver;
+        QAtomicPointer<QThreadData> receiverThreadData;
         union {
             StaticMetaCallFunction callFunction;
             QtPrivate::QSlotObjectBase *slotObj;
         };
-        // The next pointer for the singly-linked ConnectionList
-        Connection *nextConnectionList;
-        //senders linked list
-        Connection *next;
-        Connection **prev;
         QAtomicPointer<const int> argumentTypes;
         QAtomicInt ref_;
+        uint id = 0;
         ushort method_offset;
         ushort method_relative;
-        uint signal_index : 27; // In signal range (see QObjectPrivate::signalIndex())
+        int signal_index : 27; // In signal range (see QObjectPrivate::signalIndex())
         ushort connectionType : 3; // 0 == auto, 1 == direct, 2 == queued, 4 == blocking
         ushort isSlotObject : 1;
         ushort ownArgumentTypes : 1;
-        Connection() : nextConnectionList(nullptr), ref_(2), ownArgumentTypes(true) {
+        Connection() : ref_(2), ownArgumentTypes(true) {
             //ref_ is 2 for the use in the internal lists, and for the use in QMetaObject::Connection
         }
         ~Connection();
         int method() const { Q_ASSERT(!isSlotObject); return method_offset + method_relative; }
         void ref() { ref_.ref(); }
+        void freeSlotObject()
+        {
+            if (isSlotObject) {
+                slotObj->destroyIfLastRef();
+                isSlotObject = false;
+            }
+        }
         void deref() {
             if (!ref_.deref()) {
-                Q_ASSERT(!receiver);
+                Q_ASSERT(!receiver.loadRelaxed());
+                Q_ASSERT(!isSlotObject);
                 delete this;
             }
         }
     };
     // ConnectionList is a singly-linked list
     struct ConnectionList {
-        ConnectionList() : first(nullptr), last(nullptr) {}
-        Connection *first;
-        Connection *last;
+        QAtomicPointer<Connection> first;
+        QAtomicPointer<Connection> last;
     };
 
     struct Sender
     {
+        Sender(QObject *receiver, QObject *sender, int signal)
+            : receiver(receiver), sender(sender), signal(signal)
+        {
+            if (receiver) {
+                ConnectionData *cd = receiver->d_func()->connections.loadRelaxed();
+                previous = cd->currentSender;
+                cd->currentSender = this;
+            }
+        }
+        ~Sender()
+        {
+            if (receiver)
+                receiver->d_func()->connections.loadRelaxed()->currentSender = previous;
+        }
+        void receiverDeleted()
+        {
+            Sender *s = this;
+            while (s) {
+                s->receiver = nullptr;
+                s = s->previous;
+            }
+        }
+        Sender *previous;
+        QObject *receiver;
         QObject *sender;
         int signal;
-        int ref;
     };
 
+    struct SignalVector : public ConnectionOrSignalVector {
+        quintptr allocated;
+        // ConnectionList signals[]
+        ConnectionList &at(int i)
+        {
+            return reinterpret_cast<ConnectionList *>(this + 1)[i + 1];
+        }
+        const ConnectionList &at(int i) const
+        {
+            return reinterpret_cast<const ConnectionList *>(this + 1)[i + 1];
+        }
+        int count() const { return static_cast<int>(allocated); }
+    };
+
+
+
+    /*
+        This contains the all connections from and to an object.
+
+        The signalVector contains the lists of connections for a given signal. The index in the vector correspond
+        to the signal index. The signal index is the one returned by QObjectPrivate::signalIndex (not
+        QMetaObject::indexOfSignal). allsignals contains a list of special connections that will get invoked on
+        any signal emission. This is done by connecting to signal index -1.
+
+        This vector is protected by the object mutex (signalSlotLock())
+
+        Each Connection is also part of a 'senders' linked list. This one contains all connections connected
+        to a slot in this object. The mutex of the receiver must be locked when touching the pointers of this
+        linked list.
+    */
+    struct ConnectionData {
+        // the id below is used to avoid activating new connections. When the object gets
+        // deleted it's set to 0, so that signal emission stops
+        QAtomicInteger<uint> currentConnectionId;
+        QAtomicInt ref;
+        QAtomicPointer<SignalVector> signalVector;
+        Connection *senders = nullptr;
+        Sender *currentSender = nullptr;   // object currently activating the object
+        QAtomicPointer<Connection> orphaned;
+
+        ~ConnectionData()
+        {
+            deleteOrphaned(orphaned.loadRelaxed());
+            SignalVector *v = signalVector.loadRelaxed();
+            if (v)
+                free(v);
+        }
+
+        // must be called on the senders connection data
+        // assumes the senders and receivers lock are held
+        void removeConnection(Connection *c);
+        void cleanOrphanedConnections(QObject *sender)
+        {
+            if (orphaned.loadRelaxed() && ref.loadAcquire() == 1)
+                cleanOrphanedConnectionsImpl(sender);
+        }
+        void cleanOrphanedConnectionsImpl(QObject *sender);
+
+        ConnectionList &connectionsForSignal(int signal)
+        {
+            return signalVector.loadRelaxed()->at(signal);
+        }
+
+        void resizeSignalVector(uint size) {
+            SignalVector *vector = this->signalVector.loadRelaxed();
+            if (vector && vector->allocated > size)
+                return;
+            size = (size + 7) & ~7;
+            SignalVector *newVector = reinterpret_cast<SignalVector *>(malloc(sizeof(SignalVector) + (size + 1) * sizeof(ConnectionList)));
+            int start = -1;
+            if (vector) {
+                memcpy(newVector, vector, sizeof(SignalVector) + (vector->allocated + 1) * sizeof(ConnectionList));
+                start = vector->count();
+            }
+            for (int i = start; i < int(size); ++i)
+                newVector->at(i) = ConnectionList();
+            newVector->next = nullptr;
+            newVector->allocated = size;
+
+            signalVector.storeRelaxed(newVector);
+            if (vector) {
+                vector->nextInOrphanList = orphaned.loadRelaxed();
+                orphaned.storeRelaxed(ConnectionOrSignalVector::fromSignalVector(vector));
+            }
+        }
+        int signalVectorCount() const {
+            return  signalVector.loadAcquire() ? signalVector.loadRelaxed()->count() : -1;
+        }
+
+        static void deleteOrphaned(ConnectionOrSignalVector *c);
+    };
 
     QObjectPrivate(int version = QObjectPrivateVersion);
     virtual ~QObjectPrivate();
@@ -187,13 +332,6 @@ public:
     QObjectList senderList() const;
 
     void addConnection(int signal, Connection *c);
-    void cleanConnectionLists();
-
-    static inline Sender *setCurrentSender(QObject *receiver,
-                                    Sender *sender);
-    static inline void resetCurrentSender(QObject *receiver,
-                                   Sender *currentSender,
-                                   Sender *previousSender);
 
     static QObjectPrivate *get(QObject *o) {
         return o->d_func();
@@ -201,7 +339,8 @@ public:
     static const QObjectPrivate *get(const QObject *o) { return o->d_func(); }
 
     int signalIndex(const char *signalName, const QMetaObject **meta = nullptr) const;
-    inline bool isSignalConnected(uint signalIdx, bool checkDeclarative = true) const;
+    bool isSignalConnected(uint signalIdx, bool checkDeclarative = true) const;
+    bool maybeSignalConnected(uint signalIndex) const;
     inline bool isDeclarativeSignalConnected(uint signalIdx) const;
 
     // To allow abitrary objects to call connectNotify()/disconnectNotify() without making
@@ -224,15 +363,21 @@ public:
                                                const int *types, const QMetaObject *senderMetaObject);
     static QMetaObject::Connection connect(const QObject *sender, int signal_index, QtPrivate::QSlotObjectBase *slotObj, Qt::ConnectionType type);
     static bool disconnect(const QObject *sender, int signal_index, void **slot);
+
+    void ensureConnectionData()
+    {
+        if (connections.loadRelaxed())
+            return;
+        ConnectionData *cd = new ConnectionData;
+        cd->ref.ref();
+        connections.storeRelaxed(cd);
+    }
 public:
     ExtraData *extraData;    // extra data set by the user
     QThreadData *threadData; // id of the thread that owns the object
 
-    QObjectConnectionListVector *connectionLists;
-
-    Connection *senders;     // linked list of connections connected to this object
-    Sender *currentSender;   // object currently activating the object
-    mutable quint32 connectedSignals[2];
+    using ConnectionDataPointer = QExplicitlySharedDataPointer<ConnectionData>;
+    QAtomicPointer<ConnectionData> connections;
 
     union {
         QObject *currentChildBeingDeleted; // should only be used when QObjectData::isDeletingChildren is set
@@ -246,47 +391,12 @@ public:
 
 Q_DECLARE_TYPEINFO(QObjectPrivate::ConnectionList, Q_MOVABLE_TYPE);
 
-/*! \internal
-
-  Returns \c true if the signal with index \a signal_index from object \a sender is connected.
-  Signals with indices above a certain range are always considered connected (see connectedSignals
-  in QObjectPrivate).
-
-  \a signal_index must be the index returned by QObjectPrivate::signalIndex;
-*/
-inline bool QObjectPrivate::isSignalConnected(uint signal_index, bool checkDeclarative) const
-{
-    return signal_index >= sizeof(connectedSignals) * 8
-        || (connectedSignals[signal_index >> 5] & (1 << (signal_index & 0x1f))
-        || (checkDeclarative && isDeclarativeSignalConnected(signal_index)));
-}
-
 inline bool QObjectPrivate::isDeclarativeSignalConnected(uint signal_index) const
 {
     return declarativeData && QAbstractDeclarativeData::isSignalConnected
             && QAbstractDeclarativeData::isSignalConnected(declarativeData, q_func(), signal_index);
 }
 
-inline QObjectPrivate::Sender *QObjectPrivate::setCurrentSender(QObject *receiver,
-                                                         Sender *sender)
-{
-    Sender *previousSender = receiver->d_func()->currentSender;
-    receiver->d_func()->currentSender = sender;
-    return previousSender;
-}
-
-inline void QObjectPrivate::resetCurrentSender(QObject *receiver,
-                                        Sender *currentSender,
-                                        Sender *previousSender)
-{
-    // ref is set to zero when this object is deleted during the metacall
-    if (currentSender->ref == 1)
-        receiver->d_func()->currentSender = previousSender;
-    // if we've recursed, we need to tell the caller about the objects deletion
-    if (previousSender)
-        previousSender->ref = currentSender->ref;
-}
-
 inline void QObjectPrivate::connectNotify(const QMetaMethod &signal)
 {
     q_ptr->connectNotify(signal);
@@ -372,37 +482,74 @@ Q_DECLARE_TYPEINFO(QObjectPrivate::Connection, Q_MOVABLE_TYPE);
 Q_DECLARE_TYPEINFO(QObjectPrivate::Sender, Q_MOVABLE_TYPE);
 
 class QSemaphore;
-class Q_CORE_EXPORT QMetaCallEvent : public QEvent
+class Q_CORE_EXPORT QAbstractMetaCallEvent : public QEvent
 {
 public:
-    QMetaCallEvent(ushort method_offset, ushort method_relative, QObjectPrivate::StaticMetaCallFunction callFunction , const QObject *sender, int signalId,
-                   int nargs = 0, int *types = nullptr, void **args = nullptr, QSemaphore *semaphore = nullptr);
-    /*! \internal
-        \a signalId is in the signal index range (see QObjectPrivate::signalIndex()).
-    */
-    QMetaCallEvent(QtPrivate::QSlotObjectBase *slotObj, const QObject *sender, int signalId,
-                   int nargs = 0, int *types = nullptr, void **args = nullptr, QSemaphore *semaphore = nullptr);
+    QAbstractMetaCallEvent(const QObject *sender, int signalId, QSemaphore *semaphore = nullptr)
+        : QEvent(MetaCall), signalId_(signalId), sender_(sender)
+#if QT_CONFIG(thread)
+        , semaphore_(semaphore)
+#endif
+    { Q_UNUSED(semaphore); }
+    ~QAbstractMetaCallEvent();
 
-    ~QMetaCallEvent();
+    virtual void placeMetaCall(QObject *object) = 0;
 
-    inline int id() const { return method_offset_ + method_relative_; }
     inline const QObject *sender() const { return sender_; }
     inline int signalId() const { return signalId_; }
-    inline void **args() const { return args_; }
-
-    virtual void placeMetaCall(QObject *object);
 
 private:
-    QtPrivate::QSlotObjectBase *slotObj_;
-    const QObject *sender_;
     int signalId_;
-    int nargs_;
-    int *types_;
-    void **args_;
+    const QObject *sender_;
+#if QT_CONFIG(thread)
     QSemaphore *semaphore_;
-    QObjectPrivate::StaticMetaCallFunction callFunction_;
-    ushort method_offset_;
-    ushort method_relative_;
+#endif
+};
+
+class Q_CORE_EXPORT QMetaCallEvent : public QAbstractMetaCallEvent
+{
+public:
+    // blocking queued with semaphore - args always owned by caller
+    QMetaCallEvent(ushort method_offset, ushort method_relative,
+                   QObjectPrivate::StaticMetaCallFunction callFunction,
+                   const QObject *sender, int signalId,
+                   void **args, QSemaphore *semaphore);
+    QMetaCallEvent(QtPrivate::QSlotObjectBase *slotObj,
+                   const QObject *sender, int signalId,
+                   void **args, QSemaphore *semaphore);
+
+    // queued - args allocated by event, copied by caller
+    QMetaCallEvent(ushort method_offset, ushort method_relative,
+                   QObjectPrivate::StaticMetaCallFunction callFunction,
+                   const QObject *sender, int signalId,
+                   int nargs);
+    QMetaCallEvent(QtPrivate::QSlotObjectBase *slotObj,
+                   const QObject *sender, int signalId,
+                   int nargs);
+
+    ~QMetaCallEvent() override;
+
+    inline int id() const { return d.method_offset_ + d.method_relative_; }
+    inline const void * const* args() const { return d.args_; }
+    inline void ** args() { return d.args_; }
+    inline const int *types() const { return reinterpret_cast<int*>(d.args_ + d.nargs_); }
+    inline int *types() { return reinterpret_cast<int*>(d.args_ + d.nargs_); }
+
+    virtual void placeMetaCall(QObject *object) override;
+
+private:
+    inline void allocArgs();
+
+    struct Data {
+        QtPrivate::QSlotObjectBase *slotObj_;
+        void **args_;
+        QObjectPrivate::StaticMetaCallFunction callFunction_;
+        int nargs_;
+        ushort method_offset_;
+        ushort method_relative_;
+    } d;
+    // preallocate enough space for three arguments
+    char prealloc_[3*(sizeof(void*) + sizeof(int))];
 };
 
 class QBoolBlocker
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index b84e87959a..dc2d832fe5 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2016 Intel Corporation.
+** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2019 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -64,11 +64,7 @@ class QString;
 // The following macros can be defined by tools that understand Qt
 // to have the information from the macro.
 #ifndef QT_ANNOTATE_CLASS
-# ifndef Q_COMPILER_VARIADIC_MACROS
-#  define QT_ANNOTATE_CLASS(type, x)
-# else
-#  define QT_ANNOTATE_CLASS(type, ...)
-# endif
+# define QT_ANNOTATE_CLASS(type, ...)
 #endif
 #ifndef QT_ANNOTATE_CLASS2
 # define QT_ANNOTATE_CLASS2(type, a1, a2)
@@ -105,11 +101,7 @@ class QString;
 #endif
 #define Q_PLUGIN_METADATA(x) QT_ANNOTATE_CLASS(qt_plugin_metadata, x)
 #define Q_INTERFACES(x) QT_ANNOTATE_CLASS(qt_interfaces, x)
-#ifdef Q_COMPILER_VARIADIC_MACROS
-# define Q_PROPERTY(...) QT_ANNOTATE_CLASS(qt_property, __VA_ARGS__)
-#else
-# define Q_PROPERTY(text) QT_ANNOTATE_CLASS(qt_property, text)
-#endif
+#define Q_PROPERTY(...) QT_ANNOTATE_CLASS(qt_property, __VA_ARGS__)
 #define Q_PRIVATE_PROPERTY(d, text) QT_ANNOTATE_CLASS2(qt_private_property, d, text)
 #ifndef Q_REVISION
 # define Q_REVISION(v)
@@ -119,13 +111,13 @@ class QString;
 #define Q_ENUMS(x) QT_ANNOTATE_CLASS(qt_enums, x)
 #define Q_FLAGS(x) QT_ANNOTATE_CLASS(qt_enums, x)
 #define Q_ENUM_IMPL(ENUM) \
-    friend Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) Q_DECL_NOEXCEPT { return &staticMetaObject; } \
-    friend Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) Q_DECL_NOEXCEPT { return #ENUM; }
+    friend Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return &staticMetaObject; } \
+    friend Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; }
 #define Q_ENUM(x) Q_ENUMS(x) Q_ENUM_IMPL(x)
 #define Q_FLAG(x) Q_FLAGS(x) Q_ENUM_IMPL(x)
 #define Q_ENUM_NS_IMPL(ENUM) \
-    inline Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) Q_DECL_NOEXCEPT { return &staticMetaObject; } \
-    inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) Q_DECL_NOEXCEPT { return #ENUM; }
+    inline Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return &staticMetaObject; } \
+    inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; }
 #define Q_ENUM_NS(x) Q_ENUMS(x) Q_ENUM_NS_IMPL(x)
 #define Q_FLAG_NS(x) Q_FLAGS(x) Q_ENUM_NS_IMPL(x)
 #define Q_SCRIPTABLE QT_ANNOTATE_FUNCTION(qt_scriptable)
@@ -209,12 +201,16 @@ private: \
     QT_ANNOTATE_CLASS(qt_qgadget, "") \
     /*end*/
 
-/* qmake ignore Q_NAMESPACE */
-#define Q_NAMESPACE \
-    extern const QMetaObject staticMetaObject; \
+/* qmake ignore Q_NAMESPACE_EXPORT */
+#define Q_NAMESPACE_EXPORT(...) \
+    extern __VA_ARGS__ const QMetaObject staticMetaObject; \
     QT_ANNOTATE_CLASS(qt_qnamespace, "") \
     /*end*/
 
+/* qmake ignore Q_NAMESPACE */
+#define Q_NAMESPACE Q_NAMESPACE_EXPORT() \
+    /*end*/
+
 #endif // QT_NO_META_MACROS
 
 #else // Q_MOC_RUN
@@ -344,7 +340,7 @@ struct Q_CORE_EXPORT QMetaObject
     const char *className() const;
     const QMetaObject *superClass() const;
 
-    bool inherits(const QMetaObject *metaObject) const Q_DECL_NOEXCEPT;
+    bool inherits(const QMetaObject *metaObject) const noexcept;
     QObject *cast(QObject *obj) const;
     const QObject *cast(const QObject *obj) const;
 
@@ -576,18 +572,48 @@ struct Q_CORE_EXPORT QMetaObject
     int static_metacall(Call, int, void **) const;
     static int metacall(QObject *, Call, int, void **);
 
+    template <const QMetaObject &MO> static constexpr const QMetaObject *staticMetaObject()
+    {
+        return &MO;
+    }
+
+    struct SuperData {
+        const QMetaObject *direct;
+        SuperData() = default;
+        constexpr SuperData(std::nullptr_t) : direct(nullptr) {}
+        constexpr SuperData(const QMetaObject *mo) : direct(mo) {}
+
+        constexpr const QMetaObject *operator->() const { return operator const QMetaObject *(); }
+
+#ifdef QT_NO_DATA_RELOCATION
+        using Getter = const QMetaObject *(*)();
+        Getter indirect = nullptr;
+        constexpr SuperData(Getter g) : direct(nullptr), indirect(g) {}
+        constexpr operator const QMetaObject *() const
+        { return indirect ? indirect() : direct; }
+        template <const QMetaObject &MO> static constexpr SuperData link()
+        { return SuperData(QMetaObject::staticMetaObject<MO>); }
+#else
+        constexpr operator const QMetaObject *() const
+        { return direct; }
+        template <const QMetaObject &MO> static constexpr SuperData link()
+        { return SuperData(QMetaObject::staticMetaObject<MO>()); }
+#endif
+    };
+
     struct { // private data
-        const QMetaObject *superdata;
+        SuperData superdata;
         const QByteArrayData *stringdata;
         const uint *data;
         typedef void (*StaticMetacallFunction)(QObject *, QMetaObject::Call, int, void **);
         StaticMetacallFunction static_metacall;
-        const QMetaObject * const *relatedMetaObjects;
+        const SuperData *relatedMetaObjects;
         void *extradata; //reserved for future use
     } d;
 
 private:
     static bool invokeMethodImpl(QObject *object, QtPrivate::QSlotObjectBase *slot, Qt::ConnectionType type, void *ret);
+    friend class QTimer;
 };
 
 class Q_CORE_EXPORT QMetaObject::Connection {
@@ -609,8 +635,8 @@ public:
     operator RestrictedBool() const { return d_ptr && isConnected_helper() ? &Connection::d_ptr : nullptr; }
 #endif
 
-    Connection(Connection &&o) Q_DECL_NOTHROW : d_ptr(o.d_ptr) { o.d_ptr = nullptr; }
-    Connection &operator=(Connection &&other) Q_DECL_NOTHROW
+    Connection(Connection &&o) noexcept : d_ptr(o.d_ptr) { o.d_ptr = nullptr; }
+    Connection &operator=(Connection &&other) noexcept
     { qSwap(d_ptr, other.d_ptr); return *this; }
 };
 
diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h
index aa6bd84e95..31ecc8b20d 100644
--- a/src/corelib/kernel/qobjectdefs_impl.h
+++ b/src/corelib/kernel/qobjectdefs_impl.h
@@ -386,8 +386,8 @@ namespace QtPrivate {
     public:
         explicit QSlotObjectBase(ImplFn fn) : m_ref(1), m_impl(fn) {}
 
-        inline int ref() Q_DECL_NOTHROW { return m_ref.ref(); }
-        inline void destroyIfLastRef() Q_DECL_NOTHROW
+        inline int ref() noexcept { return m_ref.ref(); }
+        inline void destroyIfLastRef() noexcept
         { if (!m_ref.deref()) m_impl(Destroy, this, nullptr, nullptr, nullptr); }
 
         inline bool compare(void **a) { bool ret = false; m_impl(Compare, this, nullptr, a, &ret); return ret; }
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h
index b2b3cda4ab..5efdb0b395 100644
--- a/src/corelib/kernel/qpointer.h
+++ b/src/corelib/kernel/qpointer.h
@@ -54,20 +54,11 @@ class QPointer
 {
     Q_STATIC_ASSERT_X(!std::is_pointer<T>::value, "QPointer's template type must not be a pointer type");
 
-    template<typename U>
-    struct TypeSelector
-    {
-        typedef QObject Type;
-    };
-    template<typename U>
-    struct TypeSelector<const U>
-    {
-        typedef const QObject Type;
-    };
-    typedef typename TypeSelector<T>::Type QObjectType;
+    using QObjectType =
+        typename std::conditional<std::is_const<T>::value, const QObject, QObject>::type;
     QWeakPointer<QObjectType> wp;
 public:
-    inline QPointer() { }
+    QPointer() = default;
     inline QPointer(T *p) : wp(p, true) { }
     // compiler-generated copy/move ctor/assignment operators are fine!
     // compiler-generated dtor is fine!
@@ -77,13 +68,13 @@ public:
     ~QPointer();
 #endif
 
-    inline void swap(QPointer &other) { wp.swap(other.wp); }
+    inline void swap(QPointer &other) noexcept { wp.swap(other.wp); }
 
     inline QPointer<T> &operator=(T* p)
     { wp.assign(static_cast<QObjectType*>(p)); return *this; }
 
     inline T* data() const
-    { return static_cast<T*>( wp.data()); }
+    { return static_cast<T*>(wp.internalData()); }
     inline T* operator->() const
     { return data(); }
     inline T& operator*() const
@@ -143,9 +134,14 @@ template<typename T>
 QPointer<T>
 qPointerFromVariant(const QVariant &variant)
 {
-    return QPointer<T>(qobject_cast<T*>(QtSharedPointer::weakPointerFromVariant_internal(variant).data()));
+    const auto wp = QtSharedPointer::weakPointerFromVariant_internal(variant);
+    return QPointer<T>{qobject_cast<T*>(QtPrivate::EnableInternalData::internalData(wp))};
 }
 
+template <class T>
+inline void swap(QPointer<T> &p1, QPointer<T> &p2) noexcept
+{ p1.swap(p2); }
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_QOBJECT
diff --git a/src/corelib/kernel/qpoll.cpp b/src/corelib/kernel/qpoll.cpp
index 8e93c4d363..8b87bfe79d 100644
--- a/src/corelib/kernel/qpoll.cpp
+++ b/src/corelib/kernel/qpoll.cpp
@@ -39,6 +39,10 @@
 
 #include "qcore_unix_p.h"
 
+#ifdef Q_OS_RTEMS
+#include <rtems/rtems_bsdnet_internal.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 #define QT_POLL_READ_MASK   (POLLIN | POLLRDNORM)
@@ -135,6 +139,11 @@ static inline int qt_poll_sweep(struct pollfd *fds, nfds_t nfds,
 
 static inline bool qt_poll_is_bad_fd(int fd)
 {
+#ifdef Q_OS_RTEMS
+    if (!rtems_bsdnet_fdToSocket(fd))
+        return true;
+#endif
+
     int ret;
     EINTR_LOOP(ret, fcntl(fd, F_GETFD));
     return (ret == -1 && errno == EBADF);
diff --git a/src/corelib/kernel/qppsattribute.cpp b/src/corelib/kernel/qppsattribute.cpp
index 6be462edb5..166d590872 100644
--- a/src/corelib/kernel/qppsattribute.cpp
+++ b/src/corelib/kernel/qppsattribute.cpp
@@ -145,7 +145,6 @@ QPpsAttribute &QPpsAttribute::operator=(const QPpsAttribute &other)
     return *this;
 }
 
-#ifdef Q_COMPILER_RVALUE_REFS
 QPpsAttribute::QPpsAttribute(QPpsAttribute &&other) : d(other.d)
 {
     other.d->type = QPpsAttribute::None;
@@ -156,7 +155,6 @@ QPpsAttribute &QPpsAttribute::operator=(QPpsAttribute &&other)
     qSwap(d, other.d);
     return *this;
 }
-#endif
 
 bool QPpsAttribute::operator==(const QPpsAttribute &other) const
 {
diff --git a/src/corelib/kernel/qppsattribute_p.h b/src/corelib/kernel/qppsattribute_p.h
index b59dcd5851..d6611cb675 100644
--- a/src/corelib/kernel/qppsattribute_p.h
+++ b/src/corelib/kernel/qppsattribute_p.h
@@ -96,10 +96,8 @@ public:
     bool operator==(const QPpsAttribute &other) const;
     bool operator!=(const QPpsAttribute &other) const;
 
-#ifdef Q_COMPILER_RVALUE_REFS
     QPpsAttribute(QPpsAttribute &&other);
     QPpsAttribute &operator=(QPpsAttribute &&other);
-#endif
 
     bool isValid() const;
     Type type() const;
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index c952655cb8..39f3002394 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -150,11 +150,18 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
 
   \sa setKey()
  */
+
+#ifndef QT_NO_QOBJECT
 QSharedMemory::QSharedMemory(QObject *parent)
   : QObject(*new QSharedMemoryPrivate, parent)
 {
 }
-
+#else
+QSharedMemory::QSharedMemory()
+    : d_ptr(new QSharedMemoryPrivate)
+{
+}
+#endif
 /*!
   Constructs a shared memory object with the given \a parent and with
   its key set to \a key. Because its key is set, its create() and
@@ -162,11 +169,19 @@ QSharedMemory::QSharedMemory(QObject *parent)
 
   \sa setKey(), create(), attach()
  */
+#ifndef QT_NO_QOBJECT
 QSharedMemory::QSharedMemory(const QString &key, QObject *parent)
     : QObject(*new QSharedMemoryPrivate, parent)
 {
     setKey(key);
 }
+#else
+QSharedMemory::QSharedMemory(const QString &key)
+    : d_ptr(new QSharedMemoryPrivate)
+{
+    setKey(key);
+}
+#endif
 
 /*!
   The destructor clears the key, which forces the shared memory object
@@ -604,4 +619,6 @@ QString QSharedMemory::errorString() const
 
 QT_END_NAMESPACE
 
+#ifndef QT_NO_QOBJECT
 #include "moc_qsharedmemory.cpp"
+#endif
diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h
index 67cf52ac17..6236c6aa4c 100644
--- a/src/corelib/kernel/qsharedmemory.h
+++ b/src/corelib/kernel/qsharedmemory.h
@@ -40,8 +40,14 @@
 #ifndef QSHAREDMEMORY_H
 #define QSHAREDMEMORY_H
 
-#include <QtCore/qobject.h>
-
+#include <QtCore/qglobal.h>
+#ifndef QT_NO_QOBJECT
+# include <QtCore/qobject.h>
+#else
+# include <QtCore/qobjectdefs.h>
+# include <QtCore/qscopedpointer.h>
+# include <QtCore/qstring.h>
+#endif
 QT_BEGIN_NAMESPACE
 
 
@@ -49,9 +55,14 @@ QT_BEGIN_NAMESPACE
 
 class QSharedMemoryPrivate;
 
-class Q_CORE_EXPORT QSharedMemory : public QObject
+class Q_CORE_EXPORT QSharedMemory
+#ifndef QT_NO_QOBJECT
+    : public QObject
+#endif
 {
+#ifndef QT_NO_QOBJECT
     Q_OBJECT
+#endif
     Q_DECLARE_PRIVATE(QSharedMemory)
 
 public:
@@ -74,8 +85,17 @@ public:
         UnknownError
     };
 
+#ifndef QT_NO_QOBJECT
     QSharedMemory(QObject *parent = nullptr);
     QSharedMemory(const QString &key, QObject *parent = nullptr);
+#else
+    QSharedMemory();
+    QSharedMemory(const QString &key);
+    static QString tr(const char * str)
+    {
+        return QString::fromLatin1(str);
+    }
+#endif
     ~QSharedMemory();
 
     void setKey(const QString &key);
@@ -104,6 +124,9 @@ public:
 
 private:
     Q_DISABLE_COPY(QSharedMemory)
+#ifdef QT_NO_QOBJECT
+    QScopedPointer<QSharedMemoryPrivate> d_ptr;
+#endif
 };
 
 #endif // QT_NO_SHAREDMEMORY
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index 95fe0d1083..e6e989abda 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -67,9 +67,12 @@ namespace QSharedMemoryPrivate
 #else
 
 #include "qsystemsemaphore.h"
-#include "private/qobject_p.h"
 
-#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY)
+#ifndef QT_NO_QOBJECT
+# include "private/qobject_p.h"
+#endif
+
+#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS)
 #  include <sys/sem.h>
 #endif
 
@@ -98,7 +101,7 @@ public:
     {
         if (q_sm && q_sm->lock())
             return true;
-        q_sm = 0;
+        q_sm = nullptr;
         return false;
     }
 
@@ -107,9 +110,14 @@ private:
 };
 #endif // QT_NO_SYSTEMSEMAPHORE
 
-class Q_AUTOTEST_EXPORT QSharedMemoryPrivate : public QObjectPrivate
+class Q_AUTOTEST_EXPORT QSharedMemoryPrivate
+#ifndef QT_NO_QOBJECT
+        : public QObjectPrivate
+#endif
 {
+#ifndef QT_NO_QOBJECT
     Q_DECLARE_PUBLIC(QSharedMemory)
+#endif
 
 public:
     QSharedMemoryPrivate();
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index d1d44747e0..f6d7e78441 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -64,8 +64,11 @@
 #ifndef QT_NO_SHAREDMEMORY
 QT_BEGIN_NAMESPACE
 
-QSharedMemoryPrivate::QSharedMemoryPrivate()
-    : QObjectPrivate(), memory(0), size(0), error(QSharedMemory::NoError),
+QSharedMemoryPrivate::QSharedMemoryPrivate() :
+#ifndef QT_NO_QOBJECT
+    QObjectPrivate(),
+#endif
+    memory(0), size(0), error(QSharedMemory::NoError),
 #ifndef QT_NO_SYSTEMSEMAPHORE
       systemSemaphore(QString()), lockedByMe(false),
 #endif
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp
index c1dba30e2b..02de2339a5 100644
--- a/src/corelib/kernel/qsharedmemory_win.cpp
+++ b/src/corelib/kernel/qsharedmemory_win.cpp
@@ -47,7 +47,10 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_SHAREDMEMORY
 
-QSharedMemoryPrivate::QSharedMemoryPrivate() : QObjectPrivate(),
+QSharedMemoryPrivate::QSharedMemoryPrivate() :
+#ifndef QT_NO_QOBJECT
+    QObjectPrivate(),
+#endif
         memory(0), size(0), error(QSharedMemory::NoError),
            systemSemaphore(QString()), lockedByMe(false), hand(0)
 {
diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp
index 34fea861cd..24b174972f 100644
--- a/src/corelib/kernel/qsignalmapper.cpp
+++ b/src/corelib/kernel/qsignalmapper.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qglobal.h"
-#if QT_DEPRECATED_SINCE(5, 10)
 
 #include "qsignalmapper.h"
 #include "qhash.h"
@@ -64,7 +63,6 @@ public:
 /*!
     \class QSignalMapper
     \inmodule QtCore
-    \obsolete The recommended solution is connecting the signal to a lambda.
     \brief The QSignalMapper class bundles signals from identifiable senders.
 
     \ingroup objectmodel
@@ -72,7 +70,9 @@ public:
 
     This class collects a set of parameterless signals, and re-emits
     them with integer, string or widget parameters corresponding to
-    the object that sent the signal.
+    the object that sent the signal. Note that in most cases you can
+    use lambdas for passing custom parameters to slots. This is less
+    costly and will simplify the code.
 
     The class supports the mapping of particular strings or integers
     with particular objects using setMapping(). The objects' signals
@@ -314,5 +314,3 @@ void QSignalMapper::map(QObject *sender)
 QT_END_NAMESPACE
 
 #include "moc_qsignalmapper.cpp"
-
-#endif
diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h
index 6c4cfa9627..0da1e8f87d 100644
--- a/src/corelib/kernel/qsignalmapper.h
+++ b/src/corelib/kernel/qsignalmapper.h
@@ -42,8 +42,6 @@
 
 #include <QtCore/qobject.h>
 
-#if QT_DEPRECATED_SINCE(5, 10)
-
 QT_BEGIN_NAMESPACE
 
 class QSignalMapperPrivate;
@@ -53,7 +51,7 @@ class Q_CORE_EXPORT QSignalMapper : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QSignalMapper)
 public:
-    QT_DEPRECATED explicit QSignalMapper(QObject *parent = nullptr);
+    explicit QSignalMapper(QObject *parent = nullptr);
     ~QSignalMapper();
 
     void setMapping(QObject *sender, int id);
@@ -84,6 +82,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif
-
 #endif // QSIGNALMAPPER_H
diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp
index 6ff8268978..2a246b1204 100644
--- a/src/corelib/kernel/qsocketnotifier.cpp
+++ b/src/corelib/kernel/qsocketnotifier.cpp
@@ -152,7 +152,7 @@ QSocketNotifier::QSocketNotifier(qintptr socket, Type type, QObject *parent)
     else if (!d->threadData->hasEventDispatcher())
         qWarning("QSocketNotifier: Can only be used with threads started with QThread");
     else
-        d->threadData->eventDispatcher.load()->registerSocketNotifier(this);
+        d->threadData->eventDispatcher.loadRelaxed()->registerSocketNotifier(this);
 }
 
 /*!
@@ -241,9 +241,9 @@ void QSocketNotifier::setEnabled(bool enable)
         return;
     }
     if (d->snenabled)
-        d->threadData->eventDispatcher.load()->registerSocketNotifier(this);
+        d->threadData->eventDispatcher.loadRelaxed()->registerSocketNotifier(this);
     else
-        d->threadData->eventDispatcher.load()->unregisterSocketNotifier(this);
+        d->threadData->eventDispatcher.loadRelaxed()->unregisterSocketNotifier(this);
 }
 
 
diff --git a/src/corelib/kernel/qsystemerror.cpp b/src/corelib/kernel/qsystemerror.cpp
index 9d0394e4a5..a735e12925 100644
--- a/src/corelib/kernel/qsystemerror.cpp
+++ b/src/corelib/kernel/qsystemerror.cpp
@@ -112,7 +112,7 @@ static QString windowsErrorString(int errorCode)
 
 static QString standardLibraryErrorString(int errorCode)
 {
-    const char *s = 0;
+    const char *s = nullptr;
     QString ret;
     switch (errorCode) {
     case 0:
diff --git a/src/corelib/kernel/qsystemsemaphore_systemv.cpp b/src/corelib/kernel/qsystemsemaphore_systemv.cpp
index 9e438ae2a6..2c38d74d2d 100644
--- a/src/corelib/kernel/qsystemsemaphore_systemv.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_systemv.cpp
@@ -76,7 +76,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
 #if QT_CONFIG(translation)
             QCoreApplication::tr("%1: key is empty", "QSystemSemaphore")
 #else
-            QString::fromLatin1("%1: key is empty")
+            QLatin1String("%1: key is empty")
 #endif
                 .arg(QLatin1String("QSystemSemaphore::handle:"));
         error = QSystemSemaphore::KeyError;
@@ -94,7 +94,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
 #if QT_CONFIG(translation)
             QCoreApplication::tr("%1: unable to make key", "QSystemSemaphore")
 #else
-            QString::fromLatin1("%1: unable to make key")
+            QLatin1String("%1: unable to make key")
 #endif
                 .arg(QLatin1String("QSystemSemaphore::handle:"));
         error = QSystemSemaphore::KeyError;
@@ -111,7 +111,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
 #if QT_CONFIG(translation)
             QCoreApplication::tr("%1: ftok failed", "QSystemSemaphore")
 #else
-            QString::fromLatin1("%1: ftok failed")
+            QLatin1String("%1: ftok failed")
 #endif
                 .arg(QLatin1String("QSystemSemaphore::handle:"));
         error = QSystemSemaphore::KeyError;
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp
deleted file mode 100644
index 5437210699..0000000000
--- a/src/corelib/kernel/qtcore_eval.cpp
+++ /dev/null
@@ -1,560 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qcoreevent.h>
-#include <qdatetime.h>
-#include <qlibraryinfo.h>
-#include <qobject.h>
-#include <qcoreapplication.h>
-#include <private/qcoreapplication_p.h>
-
-#include "stdio.h"
-#include "stdlib.h"
-
-QT_BEGIN_NAMESPACE
-
-#include "qconfig_eval.cpp"
-
-static const char boilerplate_supported_but_time_limited[] =
-    "\nQt %1 Evaluation License\n"
-    "Copyright (C) 2016 The Qt Company Ltd.\n"
-    "This trial version may only be used for evaluation purposes\n"
-    "and will shut down after 120 minutes.\n"
-    "Registered to:\n"
-    "   Licensee: %2\n\n"
-    "The evaluation expires in %4 days\n\n"
-    "Contact http://www.qt.io/contact-us for pricing and purchasing information.\n";
-
-static const char boilerplate_supported[] =
-    "\nQt %1 Evaluation License\n"
-    "Copyright (C) 2016 The Qt Company Ltd.\n"
-    "This trial version may only be used for evaluation purposes\n"
-    "Registered to:\n"
-    "   Licensee: %2\n\n"
-    "The evaluation expires in %4 days\n\n"
-    "Contact http://www.qt.io/contact-us for pricing and purchasing information.\n";
-
-static const char boilerplate_expired[] =
-    "This software is using the trial version of the Qt GUI toolkit.\n"
-    "The trial period has expired. If you need more time to\n"
-    "evaluate Qt, or if you have any questions about Qt, contact us\n"
-    "at: http://www.qt.io/contact-us.\n\n";
-
-static const char will_shutdown_1min[] =
-    "\nThe evaluation of Qt will SHUT DOWN in 1 minute.\n"
-    "Contact http://www.qt.io/contact-us for pricing and purchasing information.\n";
-
-static const char will_shutdown_now[] =
-    "\nThe evaluation of Qt has now reached its automatic\n"
-    "timeout and will shut down.\n"
-    "Contact http://www.qt.io/contact-us for pricing and purchasing information.\n";
-
-enum EvaluationStatus {
-    EvaluationNotSupported = 0,
-    EvaluationSupportedButTimeLimited,
-    EvaluationSupported
-};
-
-static EvaluationStatus qt_eval_is_supported()
-{
-    const volatile char *const license_key = qt_eval_key_data + 12;
-
-    // fast fail
-    if (!qt_eval_key_data[0] || !*license_key)
-        return EvaluationNotSupported;
-
-    // is this an unsupported evaluation?
-    const volatile char *typecode = license_key;
-    int field = 2;
-    for ( ; field && *typecode; ++typecode)
-        if (*typecode == '-')
-            --field;
-
-    if (!field && typecode[1] == '4' && typecode[2] == 'M') {
-        if (typecode[0] == 'Q')
-            return EvaluationSupportedButTimeLimited;
-        else if (typecode[0] == 'R' || typecode[0] == 'Z')
-            return EvaluationSupported;
-    }
-    return EvaluationNotSupported;
-}
-
-static int qt_eval_days_left()
-{
-    const volatile char *const expiry_date = qt_eval_expiry_date + 12;
-
-    QDate today = QDate::currentDate();
-    QDate lastday = QDate::fromString(
-                QString::fromLatin1(const_cast<const char*>(expiry_date)), Qt::ISODate);
-    return today.daysTo(lastday);
-}
-
-static bool qt_eval_is_expired()
-{
-    return qt_eval_days_left() < 0;
-}
-
-static QString qt_eval_string()
-{
-    const char *msg;
-    switch (qt_eval_is_supported()) {
-    case EvaluationSupportedButTimeLimited:
-        msg = boilerplate_supported_but_time_limited;
-        break;
-    case EvaluationSupported:
-        msg = boilerplate_supported;
-        break;
-    default:
-        return QString();
-    }
-
-    return QString::fromLatin1(msg)
-        .arg(QLatin1String(QT_VERSION_STR))
-        .arg(QLibraryInfo::licensee())
-        .arg(qt_eval_days_left());
-}
-
-#define WARN_TIMEOUT 60 * 1000 * 119
-#define KILL_DELAY 60 * 1000 * 1
-
-class QCoreFuriCuri : public QObject
-{
-public:
-
-    int warn;
-    int kill;
-
-    QCoreFuriCuri() : QObject(), warn(-1), kill(-1)
-    {
-        if (qt_eval_is_supported() == EvaluationSupportedButTimeLimited) {
-            warn = startTimer(WARN_TIMEOUT);
-            kill = 0;
-        }
-    }
-
-    void timerEvent(QTimerEvent *e) override {
-        if (e->timerId() == warn) {
-            killTimer(warn);
-            fprintf(stderr, "%s\n", will_shutdown_1min);
-            kill = startTimer(KILL_DELAY);
-        } else if (e->timerId() == kill) {
-            fprintf(stderr, "%s\n", will_shutdown_now);
-            QCoreApplication::instance()->quit();
-        }
-    }
-};
-
-#if defined(QT_BUILD_CORE_LIB) || defined (QT_BOOTSTRAPPED)
-
-void qt_core_eval_init(QCoreApplicationPrivate::Type type)
-{
-    if (type != QCoreApplicationPrivate::Tty)
-        return;
-
-    if (!qt_eval_is_supported())
-        return;
-
-    if (qt_eval_is_expired()) {
-        fprintf(stderr, "%s\n", boilerplate_expired);
-        exit(0);
-    } else {
-        fprintf(stderr, "%s\n", qPrintable(qt_eval_string()));
-        Q_UNUSED(new QCoreFuriCuri());
-    }
-}
-#endif
-
-#ifdef QT_BUILD_WIDGETS_LIB
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <qdialog.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qmessagebox.h>
-#if QT_CONFIG(pushbutton)
-#include <qpushbutton.h>
-#endif
-#include <qtimer.h>
-#include <qapplication.h>
-QT_END_INCLUDE_NAMESPACE
-
-
-static const char * const qtlogo_eval_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"46 55 174 2",
-"   c #002E02",
-".  c #00370D",
-"X  c #003A0E",
-"o  c #003710",
-"O  c #013C13",
-"+  c #043E1A",
-"@  c #084F0A",
-"#  c #0B520C",
-"$  c #054413",
-"%  c #0C4C17",
-"&  c #07421D",
-"*  c #09451D",
-"=  c #0D491E",
-"-  c #125515",
-";  c #13541A",
-":  c #17591B",
-">  c #1B5C1D",
-",  c #1F611F",
-"<  c #20621E",
-"1  c #337B1E",
-"2  c #0B4521",
-"3  c #0F4923",
-"4  c #114B24",
-"5  c #154D2A",
-"6  c #175323",
-"7  c #1C5924",
-"8  c #1C532F",
-"9  c #1E5432",
-"0  c #245936",
-"q  c #265938",
-"w  c #295C3B",
-"e  c #246324",
-"r  c #266823",
-"t  c #2A6C24",
-"y  c #276628",
-"u  c #2D7026",
-"i  c #327427",
-"p  c #367927",
-"a  c #37782A",
-"s  c #397C2A",
-"d  c #2E613E",
-"f  c #336C37",
-"g  c #2F6040",
-"h  c #356545",
-"j  c #3C6B4E",
-"k  c #3F6C51",
-"l  c #406E4F",
-"z  c #406D52",
-"x  c #477457",
-"c  c #497557",
-"v  c #4B7857",
-"b  c #517B5E",
-"n  c #3C8423",
-"m  c #3E812C",
-"M  c #53A61D",
-"N  c #41862C",
-"B  c #458A2D",
-"V  c #498F2D",
-"C  c #479324",
-"Z  c #489226",
-"A  c #4D952C",
-"S  c #478B30",
-"D  c #488C30",
-"F  c #4D9232",
-"G  c #509632",
-"H  c #549A33",
-"J  c #589F35",
-"K  c #56A526",
-"L  c #57A821",
-"P  c #5BAA27",
-"I  c #57A32A",
-"U  c #5CA72E",
-"Y  c #5DAB2A",
-"T  c #5CA336",
-"R  c #60AD2E",
-"E  c #63B12D",
-"W  c #65AF35",
-"Q  c #62A53F",
-"!  c #65AE39",
-"~  c #66B036",
-"^  c #6AB437",
-"/  c #67B138",
-"(  c #6AB339",
-")  c #6DB838",
-"_  c #70BA3C",
-"`  c #4D8545",
-"'  c #4E8942",
-"]  c #548851",
-"[  c #6FAF4A",
-"{  c #6DB243",
-"}  c #71B546",
-"|  c #70B840",
-" . c #73B648",
-".. c #79BA4E",
-"X. c #7CBB53",
-"o. c #598266",
-"O. c #62886D",
-"+. c #6A8F75",
-"@. c #6B9173",
-"#. c #70937A",
-"$. c #799F79",
-"%. c #7BAF66",
-"&. c #81BD5B",
-"*. c #85BF60",
-"=. c #85AC7F",
-"-. c #8DBA7B",
-";. c #87C061",
-":. c #8AC364",
-">. c #8DC46A",
-",. c #90C56E",
-"<. c #93C771",
-"1. c #96CA73",
-"2. c #9ACB7C",
-"3. c #9FD07D",
-"4. c #779981",
-"5. c #7F9F89",
-"6. c #809F88",
-"7. c #82A18B",
-"8. c #86A192",
-"9. c #8DA994",
-"0. c #8FA998",
-"q. c #94AF9B",
-"w. c #97B991",
-"e. c #97B19E",
-"r. c #9DB6A3",
-"t. c #A3BCA7",
-"y. c #A6BCAB",
-"u. c #A9BEB1",
-"i. c #9ECD81",
-"p. c #A2CF85",
-"a. c #A5D284",
-"s. c #A6D189",
-"d. c #A9D28E",
-"f. c #ABD491",
-"g. c #B1D797",
-"h. c #B1D699",
-"j. c #B5D89E",
-"k. c #ADC5AC",
-"l. c #B1CAAE",
-"z. c #B9DAA3",
-"x. c #BDDDA8",
-"c. c #ADC1B4",
-"v. c #B2C6B6",
-"b. c #B5C6BC",
-"n. c #B6C9BA",
-"m. c #BCD1BA",
-"M. c #C6E1B4",
-"N. c #CDE5BD",
-"B. c #C2D2C6",
-"V. c #CADEC2",
-"C. c #C6D3CC",
-"Z. c #C8D7CB",
-"A. c #CEDAD2",
-"S. c #D2DDD4",
-"D. c #D3E9C6",
-"F. c #D7EBC9",
-"G. c #D9EBCD",
-"H. c #DEEED4",
-"J. c #D6E0D9",
-"K. c #DAE4DC",
-"L. c #E0EFD7",
-"P. c #E5F2DD",
-"I. c #DFE8E0",
-"U. c #E4EBE5",
-"Y. c #E9EFEA",
-"T. c #EDF4EB",
-"R. c #F0FAE6",
-"E. c #F1F8EC",
-"W. c #EDF0F0",
-"Q. c #F4F7F3",
-"!. c #F6F9F4",
-"~. c #F8FAF7",
-"^. c #FEFEFE",
-"/. c None",
-/* pixels */
-"/././././.c h ' Q / W _ &.p././././././././././././././././././././././././././././././././.",
-"/././.4 O % Z ~ ~ W ~ W R U R R ( X.>.p././././././././././././././././././././././././././.",
-"/./.. * = J _ ~ ~ ~ ~ ~ / / / / W W U P P U W  .;.2././././././././././././././././././././.",
-"/.= = & a ) W ~ ~ ~ ~ ~ / W / ~ ~ ~ ^ ( ( ^ ~ R R U P Y ~  .;.2././././././././././././././.",
-"O.O = = T ^ W ~ ~ ~ ~ ~ ~ W W / W ~ ~ ~ ~ ~ ~ ~ ( ( ( ( ~ W Y Y Y Y W { &.1././././././././.",
-"0 = * 7 ~ ~ ~ ~ ~ ~ ~ ~ ~ / / W ~ ~ ~ ~ ~ ~ ~ ~ W W W ~ ~ ~ ~ ( ( ( W W R U P U W { X.1.f./.",
-"= = & e ^ W ~ ~ ~ ~ ~ ~ ~ ~ / / ~ ~ ~ ~ ~ ~ ~ ~ W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ^ ( ( / ~ W R U U Y ",
-"= = & e ^ W ~ ~ ~ ~ ~ ~ ~ ~ W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ( W ~ ~ ~ ^ ^ ( ",
-"= = * e ^ W ~ ~ ~ ~ ~ ~ / W / W ! ( / ~ W ^ ( ( ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ~ W W ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ ! ~ ~ ~ ~ ~ ~ W W ^ _ ~ K Y W W R P Y W ( ~ ~ ~ ~ ~ ~ ~ W / ~ ~ ~ ^ W ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W ~ ~ ~ ~ ~ ~ W ) W 1 ` w.V.L.H.D.z.,.~ Y ^ ~ ~ ~ ~ ~ W ~ ~ ~ ( ~ W W ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W ~ ~ ~ ~ ~ W ) V = 8.~.^.^.^.^.^.^.^.U.<.Y ~ ~ ~ ~ ~ W W ! ~ Y W ^ W ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W ~ ~ ~ ~ W ^ B O u.^.~.^.^.^.^.~.~.^.^.^.h.Y ^ ~ ~ ^ F $ k.R.G.1.Y / ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ ~ ~ ~ / W ( J X 7.^.~.^.^.^.^.^.^.^.^.^.^.^.s.Y / W ) a 2 U.^.^.d.U ( ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W / ~ ~ ~ ^ > w ~.^.^.^.^.^.F.%.v c.^.^.^.^.~.X.W ~ ^ > h ^.^.^.d.P ( ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W ~ ~ W ^ H o e.^.^.^.^.^.G.Y E n . y.^.^.^.^.M.Y ( ! $ @.^.~.^.f.U ( / ~ ~ W ~ ~ ",
-"= = & e ^ W ~ W ! ) t 4 U.^.^.^.^.^.>.U ( _ , 9 ~.^.^.^.~...^ A   y.^.~.^.s.M W Y ~ ~ ~ ~ ~ ",
-"= 3 & e ^ W ~ ( ^ ( $ c ^.^.^.^.^.E.) ~ ~ ^ S o n.^.^.^.^.=.- l.v.Y.^.^.^.M.:.:.X.~ ~ ~ ~ ~ ",
-"= = & e ^ ! W W ( J X 7.^.^.^.^.^.F.Y ( W ^ T X 6.^.^.~.^.c.. J.^.^.^.^.^.^.^.^.P.~ ~ ~ ~ ~ ",
-"= = & r ^ W / W ) B o v.^.~.^.^.^.M.U / ~ ~ ! $ o.^.^.^.^.K.* S.^.^.^.^.^.^.^.^.P.~ ~ ~ ~ ~ ",
-"= = & e ^ ! ~ W ) a + S.^.^.^.^.^.z.P ( W ~ ( % z ^.^.^.^.~.f t.U.^.^.^.^.~.^.^.P.~ ~ ~ ~ ~ ",
-"* = & e ^ W ~ W ) t 3 Y.^.^.^.^.^.f.P ( ~ ~ ^ ; h ^.^.^.^.^.:.@ j ^.^.^.^.h.{ X.&.~ ~ ~ ~ ~ ",
-"3 = & e ^ W ~ ~ ^ e 8 Q.^.^.^.^.^.s.P ~ ~ W ^ > 0 ~.^.^.^.^.1.# z ^.^.^.^.d.L W R ~ ~ ~ ~ ~ ",
-"= = & e ^ W ~ ~ ^ > q ~.^.^.^.^.^.p.U ^ ~ W ) e 9 ~.^.^.^.^.3.# k ^.^.^.^.f.Y ( / ~ ~ ~ ~ ~ ",
-"= = & e ^ W / W ^ > w ~.^.^.^.^.^.i.Y / ~ W ^ e 8 Q.^.^.^.^.a.# z ^.^.^.^.f.Y / ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W / W ^ > w ^.^.^.^.^.^.2.Y / ~ ~ ) e 8 Q.^.^.^.^.s.# z ^.^.^.^.d.P ( ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W W W ^ > q ^.^.^.^.^.^.p.Y / ~ ~ ^ e 9 Q.^.^.^.^.a.@ z ^.^.^.^.f.U / ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W / W ) 7 9 Q.^.^.^.^.^.a.P / ~ W ) , 9 Q.^.^.^.^.3.# z ^.^.~.^.f.P ^ ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W / W ) r 5 T.^.^.^.^.^.d.Y / ~ W ) > q ~.^.^.^.^.1.# k ^.^.^.^.f.Y ( ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ / / W ) i 2 I.^.^.^.^.^.h.P ( ~ W ( > g ^.^.^.^.^.:.# z ^.^.^.^.f.P / ~ ~ ~ ~ ~ ~ ",
-"= = & e ( W / W ) m O Z.^.^.^.^.^.x.P / ~ ~ ( ; j ^.^.^.^.~.&.- k ^.^.~.^.f.P / ~ ~ ~ ~ ~ ~ ",
-"= = & e ( W / W ) F o y.^.~.^.^.^.N.U ( ~ ~ W $ b ^.^.^.^.R._ - k ^.^.^.^.f.Y ( ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ W ~ ~ ^ J X 4.^.^.^.^.^.L.~ ~ W ^ T X #.^.^.^.^.F.~ ; j ^.^.^.^.f.U ( ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ ~ ~ ~ / ^ % l ^.^.^.^.^.!. .R ^ ^ G . r.^.~.^.^.j.E : j ^.^.^.^.f.P ) ( ~ ~ ~ ~ ~ ",
-"= = & e ^ W ~ ~ W ) u = U.^.^.^.^.^.1.Y ! ) a & K.^.^.^.^.;.~ : j ^.^.~.^.z.M I I / ~ ~ W ~ ",
-"= = & e ( W ~ ~ W ( G . q.^.^.^.^.^.D.U ^ ! X o.^.^.^.^.P.~ ^ > g ^.^.^.^.E.-.$.m.X.W ~ ~ ~ ",
-"= = & e ^ / ~ ~ ^ ! ( > w ~.^.^.^.^.^.h.T > j T.^.^.~.^.a.Y _ i 3 U.^.^.^.^.^.^.^.X.R ~ ~ ~ ",
-"= = & e ^ / ~ ~ W W ^ H . 9.^.~.^.^.^.^.K.C.~.^.^.^.^.H.W W ^ T . q.^.~.^.^.^.^.^.X.R ~ ~ ~ ",
-"= = + e ^ W / ~ W W W ) m + B.^.~.^.^.^.^.^.^.^.^.^.E.X.Y ( W ^ B 6 y.^.^.^.E.D.2.( ~ ~ ~ ~ ",
-"= = * e ^ ! / ! W ^ W W ) a 4 b.^.^.^.^.^.^.^.^.^.P...Y ( ! W ! ^ W Z [ *.X.{ Y U ~ ~ ~ ~ ~ ",
-"= = & e ( W ~ ~ W / W / W ) A < +.A.~.^.^.^.^.!.p.W R ~ ~ ~ ~ ~ W / ) E U W W / ^ ~ ~ ~ ~ ~ ",
-"= = & e ^ W ~ ~ / W / / / W ( _ Z X 6.^.^.^.^.E.W ~ ^ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ / ~ ~ ~ ~ ~ ~ ~ ~ ",
-"= = & e ^ ~ ~ ~ W W / W ~ ~ ~ ~ ) ; h ^.^.^.^.^.d.M U ~ / ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ",
-"= = & e ^ W ~ ~ ^ W W / ~ ~ ~ W ) p + S.^.^.^.^.~.M.f. .W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~  .",
-"= = & e ^ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ( T O +.^.~.^.^.^.^.^.&.Y ( ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ( Y 2.",
-"= = & e ( W ~ ~ ~ ~ ~ ~ ~ ~ ~ / W ) N + b.^.^.^.^.^.^.&.R ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W /.",
-"= = & e ^ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ^ N 7 r.W.^.^.^.!.X.W ~ ~ W ~ W ~ ~ ~ ~ ~ ~ / ( ( K p./.",
-"= = & e ( W ~ ~ W ~ ~ ~ ~ ~ ~ ~ ~ ~ W ( W C Q &.:.X.| ~ ~ ~ ~ W ~ / ~ ( / ( ~ W E U P 1././.",
-"= = + e ^ / / / ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W / ) ^ R Y W W ~ ~ ( / ( / W R Y Y U R ( X.,././././.",
-"= = * e ( / ~ / ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W ! ( ( ( W W E U P Y W ( X.,.d./././././././././.",
-"= = * e ( W ~ ~ ~ ~ W ! ~ W ~ W ~ ( ( / ^ W W U Y P W ( X.,.d./././././././././././././././.",
-"8 $ * e ( W ~ ~ ~ ! ( ( ( / ( W R Y Y Y R ( X.>.d./././././././././././././././././././././.",
-"/.d . y ^ / / / ( W Y Y P P W ( X.>.d./././././././././././././././././././././././././././.",
-"/./.h : ^ R R R W ( X.<.f./././././././././././././././././././././././././././././././././.",
-"/././.] _ *.3./././././././././././././././././././././././././././././././././././././././."
-};
-
-class EvalMessageBox : public QDialog
-{
-public:
-    EvalMessageBox(bool expired)
-    {
-        setWindowTitle(QLatin1String(" "));
-
-        QString str = expired ? QLatin1String(boilerplate_expired) : qt_eval_string();
-        str = str.trimmed();
-
-        QFrame *border = new QFrame(this);
-
-        QLabel *pixmap_label = new QLabel(border);
-        pixmap_label->setPixmap(QPixmap(qtlogo_eval_xpm));
-        pixmap_label->setAlignment(Qt::AlignTop);
-
-        QLabel *text_label = new QLabel(str, border);
-
-        QHBoxLayout *pm_and_text_layout = new QHBoxLayout();
-        pm_and_text_layout->addWidget(pixmap_label);
-        pm_and_text_layout->addWidget(text_label);
-
-        QVBoxLayout *master_layout = new QVBoxLayout(border);
-        master_layout->addLayout(pm_and_text_layout);
-
-        QVBoxLayout *border_layout = new QVBoxLayout(this);
-        border_layout->setMargin(0);
-        border_layout->addWidget(border);
-
-        if (expired) {
-            QPushButton *cmd = new QPushButton(QLatin1String("OK"), border);
-            cmd->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-            cmd->setDefault(true);
-
-            QHBoxLayout *button_layout = new QHBoxLayout();
-            master_layout->addLayout(button_layout);
-            button_layout->addWidget(cmd);
-
-            connect(cmd, SIGNAL(clicked()), this, SLOT(close()));
-        } else {
-            border->setFrameShape(QFrame::WinPanel);
-            border->setFrameShadow(QFrame::Raised);
-            setParent(parentWidget(), Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-            QTimer::singleShot(7000, this, SLOT(close()));
-            setAttribute(Qt::WA_DeleteOnClose);
-            setAttribute(Qt::WA_QuitOnClose, false);
-        }
-
-        setFixedSize(sizeHint());
-    }
-};
-
-class QGuiFuriCuri : public QCoreFuriCuri
-{
-public:
-    void timerEvent(QTimerEvent *e) {
-        if (e->timerId() == warn) {
-            killTimer(warn);
-            QMessageBox::information(0, QLatin1String("Automatic Timeout"), QLatin1String(will_shutdown_1min));
-            kill = startTimer(KILL_DELAY);
-        } else if (e->timerId() == kill) {
-            killTimer(kill);
-            QMessageBox::information(0, QLatin1String("Automatic Timeout"), QLatin1String(will_shutdown_now));
-            qApp->quit();
-        }
-    }
-};
-
-
-void qt_gui_eval_init(QCoreApplicationPrivate::Type type)
-{
-    Q_UNUSED(type);
-
-    if (!qt_eval_is_supported())
-        return;
-
-    if (qt_eval_is_expired()) {
-        EvalMessageBox box(true);
-        box.exec();
-        ::exit(0);
-    } else {
-        Q_UNUSED(new QGuiFuriCuri());
-    }
-}
-
-static QString qt_eval_title_prefix()
-{
-    return QLatin1String("[Qt Evaluation] ");
-}
-
-QString qt_eval_adapt_window_title(const QString &title)
-{
-    if (!qt_eval_is_supported())
-        return title;
-    return qt_eval_title_prefix() + title;
-}
-
-void qt_eval_init_widget(QWidget *w)
-{
-    if (!qt_eval_is_supported())
-        return;
-    if (w->isTopLevel() && w->windowTitle().isEmpty() && w->windowType() != Qt::Desktop ) {
-        w->setWindowTitle(QLatin1String(" "));
-    }
-}
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qtestsupport_core.cpp b/src/corelib/kernel/qtestsupport_core.cpp
index c54b933f94..7bd81ed498 100644
--- a/src/corelib/kernel/qtestsupport_core.cpp
+++ b/src/corelib/kernel/qtestsupport_core.cpp
@@ -102,7 +102,7 @@ Q_CORE_EXPORT void QTest::qWait(int ms)
     int remaining = ms;
     do {
         QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);
-        QCoreApplication::sendPostedEvents(Q_NULLPTR, QEvent::DeferredDelete);
+        QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
         remaining = timer.remainingTime();
         if (remaining <= 0)
             break;
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 9d3bd5fdbf..948f697dc5 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -42,6 +42,8 @@
 #include "qabstracteventdispatcher.h"
 #include "qcoreapplication.h"
 #include "qobject_p.h"
+#include "qthread.h"
+#include "qcoreapplication_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -343,6 +345,33 @@ void QTimer::singleShotImpl(int msec, Qt::TimerType timerType,
                             const QObject *receiver,
                             QtPrivate::QSlotObjectBase *slotObj)
 {
+    if (msec == 0) {
+        bool deleteReceiver = false;
+        // Optimize: set a receiver context when none is given, such that we can use
+        // QMetaObject::invokeMethod which is more efficient than going through a timer.
+        // We need a QObject living in the current thread. But the QThread itself lives
+        // in a different thread - with the exception of the main QThread which lives in
+        // itself. And QThread::currentThread() is among the few QObjects we know that will
+        // most certainly be there. Note that one can actually call singleShot before the
+        // QApplication is created!
+        if (!receiver && QThread::currentThread() == QCoreApplicationPrivate::mainThread()) {
+            // reuse main thread as context object
+            receiver = QThread::currentThread();
+        } else if (!receiver) {
+            // Create a receiver context object on-demand. According to the benchmarks,
+            // this is still more efficient than going through a timer.
+            receiver = new QObject;
+            deleteReceiver = true;
+        }
+
+        QMetaObject::invokeMethodImpl(const_cast<QObject *>(receiver), slotObj,
+                                      Qt::QueuedConnection, nullptr);
+
+        if (deleteReceiver)
+            const_cast<QObject *>(receiver)->deleteLater();
+        return;
+    }
+
     new QSingleShotTimer(msec, timerType, receiver, slotObj);
 }
 
@@ -575,8 +604,8 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv
     \since 5.12
     \overload
 
-    Creates a connection from the timeout() signal to \a slot, and returns a
-    handle to the connection.
+    Creates a connection of type \a connectionType from the timeout() signal
+    to \a slot, and returns a handle to the connection.
 
     This method is provided for convenience.
     It's equivalent to calling \c {QObject::connect(timer, &QTimer::timeout, timer, slot, connectionType)}.
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h
index 336b814b27..eb7185c12d 100644
--- a/src/corelib/kernel/qtimer.h
+++ b/src/corelib/kernel/qtimer.h
@@ -218,7 +218,7 @@ private:
     inline int startTimer(int){ return -1;}
     inline void killTimer(int){}
 
-    static Q_DECL_CONSTEXPR Qt::TimerType defaultTypeFor(int msecs) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR Qt::TimerType defaultTypeFor(int msecs) noexcept
     { return msecs >= 2000 ? Qt::CoarseTimer : Qt::PreciseTimer; }
     static void singleShotImpl(int msec, Qt::TimerType timerType,
                                const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj);
diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
index c3b8c86063..39010c19cb 100644
--- a/src/corelib/kernel/qtimerinfo_unix.cpp
+++ b/src/corelib/kernel/qtimerinfo_unix.cpp
@@ -215,7 +215,7 @@ static timespec roundToMillisecond(timespec val)
 QDebug operator<<(QDebug s, timeval tv)
 {
     QDebugStateSaver saver(s);
-    s.nospace() << tv.tv_sec << "." << qSetFieldWidth(6) << qSetPadChar(QChar(48)) << tv.tv_usec << reset;
+    s.nospace() << tv.tv_sec << "." << qSetFieldWidth(6) << qSetPadChar(QChar(48)) << tv.tv_usec << Qt::reset;
     return s;
 }
 QDebug operator<<(QDebug s, Qt::TimerType t)
@@ -373,7 +373,7 @@ static void calculateNextTimeout(QTimerInfo *t, timespec currentTime)
 
 #ifdef QTIMERINFO_DEBUG
     if (t->timerType != Qt::PreciseTimer)
-    qDebug() << "timer" << t->timerType << hex << t->id << dec << "interval" << t->interval
+    qDebug() << "timer" << t->timerType << Qt::hex << t->id << Qt::dec << "interval" << t->interval
             << "originally expected at" << t->expected << "will fire at" << t->timeout
             << "or" << (t->timeout - t->expected) << "s late";
 #endif
@@ -500,7 +500,7 @@ void QTimerInfoList::registerTimer(int timerId, int interval, Qt::TimerType time
     t->cumulativeError = 0;
     t->count = 0;
     if (t->timerType != Qt::PreciseTimer)
-    qDebug() << "timer" << t->timerType << hex <<t->id << dec << "interval" << t->interval << "expected at"
+    qDebug() << "timer" << t->timerType << Qt::hex <<t->id << Qt::dec << "interval" << t->interval << "expected at"
             << t->expected << "will fire first at" << t->timeout;
 #endif
 }
@@ -620,7 +620,7 @@ int QTimerInfoList::activateTimers()
         currentTimerInfo->cumulativeError += diff;
         ++currentTimerInfo->count;
         if (currentTimerInfo->timerType != Qt::PreciseTimer)
-        qDebug() << "timer" << currentTimerInfo->timerType << hex << currentTimerInfo->id << dec << "interval"
+        qDebug() << "timer" << currentTimerInfo->timerType << Qt::hex << currentTimerInfo->id << Qt::dec << "interval"
                 << currentTimerInfo->interval << "firing at" << currentTime
                 << "(orig" << currentTimerInfo->expected << "scheduled at" << currentTimerInfo->timeout
                 << ") off by" << diff << "activation" << currentTimerInfo->count
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 637ef84d21..ddb96ecad6 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -528,7 +528,8 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo
         // memory, so no need to use QFile to copy it again.
         Q_ASSERT(!d->resource);
         d->resource = new QResource(realname);
-        if (resource->isValid() && !resource->isCompressed() && resource->size() >= MagicLength
+        if (resource->isValid() && resource->compressionAlgorithm() == QResource::NoCompression
+                && resource->size() >= MagicLength
                 && !memcmp(resource->data(), magic, MagicLength)) {
             d->unmapLength = resource->size();
             d->unmapPointer = reinterpret_cast<char *>(const_cast<uchar *>(resource->data()));
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 3b7be3d12f..43a3fb1db0 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2018 Intel Corporation.
 ** Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com>
 ** Contact: https://www.qt.io/licensing/
@@ -46,7 +46,9 @@
 #include "qdebug.h"
 #include "qmap.h"
 #include "qdatetime.h"
+#if QT_CONFIG(easingcurve)
 #include "qeasingcurve.h"
+#endif
 #include "qlist.h"
 #if QT_CONFIG(regularexpression)
 #include "qregularexpression.h"
@@ -55,6 +57,7 @@
 #include "qstringlist.h"
 #include "qurl.h"
 #include "qlocale.h"
+#include "qregexp.h"
 #include "quuid.h"
 #if QT_CONFIG(itemmodel)
 #include "qabstractitemmodel.h"
@@ -118,19 +121,19 @@ namespace { // annonymous used to hide QVariant handlers
 static void construct(QVariant::Private *x, const void *copy)
 {
     QVariantConstructor<CoreTypesFilter> constructor(x, copy);
-    QMetaTypeSwitcher::switcher<void>(constructor, x->type, 0);
+    QMetaTypeSwitcher::switcher<void>(constructor, x->type);
 }
 
 static void clear(QVariant::Private *d)
 {
     QVariantDestructor<CoreTypesFilter> cleaner(d);
-    QMetaTypeSwitcher::switcher<void>(cleaner, d->type, 0);
+    QMetaTypeSwitcher::switcher<void>(cleaner, d->type);
 }
 
 static bool isNull(const QVariant::Private *d)
 {
     QVariantIsNull<CoreTypesFilter> isNull(d);
-    return QMetaTypeSwitcher::switcher<bool>(isNull, d->type, 0);
+    return QMetaTypeSwitcher::switcher<bool>(isNull, d->type);
 }
 
 /*!
@@ -142,7 +145,7 @@ static bool isNull(const QVariant::Private *d)
 static bool compare(const QVariant::Private *a, const QVariant::Private *b)
 {
     QVariantComparator<CoreTypesFilter> comparator(a, b);
-    return QMetaTypeSwitcher::switcher<bool>(comparator, a->type, 0);
+    return QMetaTypeSwitcher::switcher<bool>(comparator, a->type);
 }
 
 /*!
@@ -1400,7 +1403,7 @@ static void streamDebug(QDebug dbg, const QVariant &v)
 {
     QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr());
     QVariantDebugStream<CoreTypesFilter> stream(dbg, d);
-    QMetaTypeSwitcher::switcher<void>(stream, d->type, 0);
+    QMetaTypeSwitcher::switcher<void>(stream, d->type);
 }
 #endif
 
@@ -1409,16 +1412,16 @@ const QVariant::Handler qt_kernel_variant_handler = {
     clear,
     isNull,
 #ifndef QT_NO_DATASTREAM
-    0,
-    0,
+    nullptr,
+    nullptr,
 #endif
     compare,
     convert,
-    0,
+    nullptr,
 #if !defined(QT_NO_DEBUG_STREAM)
     streamDebug
 #else
-    0
+    nullptr
 #endif
 };
 
@@ -1435,16 +1438,16 @@ const QVariant::Handler qt_dummy_variant_handler = {
     dummyClear,
     dummyIsNull,
 #ifndef QT_NO_DATASTREAM
-    0,
-    0,
+    nullptr,
+    nullptr,
 #endif
     dummyCompare,
     dummyConvert,
-    0,
+    nullptr,
 #if !defined(QT_NO_DEBUG_STREAM)
     dummyStreamDebug
 #else
-    0
+    nullptr
 #endif
 };
 
@@ -1462,6 +1465,7 @@ static void customConstruct(QVariant::Private *d, const void *copy)
     if (size <= sizeof(QVariant::Private::Data)
             && (type.flags() & (QMetaType::MovableType | QMetaType::IsEnumeration))) {
         type.construct(&d->data.ptr, copy);
+        d->is_null = d->data.ptr == nullptr;
         d->is_shared = false;
     } else {
         // Private::Data contains long long, and long double is the biggest standard type.
@@ -1472,6 +1476,7 @@ static void customConstruct(QVariant::Private *d, const void *copy)
         void *data = operator new(offset + size);
         void *ptr = static_cast<char *>(data) + offset;
         type.construct(ptr, copy);
+        d->is_null = ptr == nullptr;
         d->is_shared = true;
         d->data.shared = new (data) QVariant::PrivateShared(ptr);
     }
@@ -1552,16 +1557,16 @@ const QVariant::Handler qt_custom_variant_handler = {
     customClear,
     customIsNull,
 #ifndef QT_NO_DATASTREAM
-    0,
-    0,
+    nullptr,
+    nullptr,
 #endif
     customCompare,
     customConvert,
-    0,
+    nullptr,
 #if !defined(QT_NO_DEBUG_STREAM)
     customStreamDebug
 #else
-    0
+    nullptr
 #endif
 };
 
@@ -2122,7 +2127,7 @@ QVariant::QVariant(const char *val)
 */
 
 QVariant::QVariant(Type type)
-{ create(type, 0); }
+{ create(type, nullptr); }
 QVariant::QVariant(int typeId, const void *copy)
 { create(typeId, copy); d.is_null = false; }
 
@@ -2191,7 +2196,7 @@ QVariant::QVariant(const QTime &val)
 QVariant::QVariant(const QDateTime &val)
     : d(DateTime)
 { v_construct<QDateTime>(&d, val); }
-#ifndef QT_BOOTSTRAPPED
+#if QT_CONFIG(easingcurve)
 QVariant::QVariant(const QEasingCurve &val)
     : d(EasingCurve)
 { v_construct<QEasingCurve>(&d, val); }
@@ -2363,7 +2368,7 @@ QVariant& QVariant::operator=(const QVariant &variant)
 
 void QVariant::detach()
 {
-    if (!d.is_shared || d.data.shared->ref.load() == 1)
+    if (!d.is_shared || d.data.shared->ref.loadRelaxed() == 1)
         return;
 
     Private dd;
@@ -2468,7 +2473,9 @@ static const ushort mapIdFromQt3ToCurrent[MapFromThreeCount] =
     QVariant::Pen,
     QVariant::LongLong,
     QVariant::ULongLong,
+#if QT_CONFIG(easingcurve)
     QVariant::EasingCurve
+#endif
 };
 
 /*!
@@ -2664,7 +2671,7 @@ inline T qVariantToHelper(const QVariant::Private &d, const HandlersManager &han
             return ret;
     }
 
-    handlerManager[d.type]->convert(&d, targetType, &ret, 0);
+    handlerManager[d.type]->convert(&d, targetType, &ret, nullptr);
     return ret;
 }
 
@@ -2785,7 +2792,7 @@ QDateTime QVariant::toDateTime() const
 
     \sa canConvert(int targetTypeId), convert()
 */
-#ifndef QT_BOOTSTRAPPED
+#if QT_CONFIG(easingcurve)
 QEasingCurve QVariant::toEasingCurve() const
 {
     return qVariantToHelper<QEasingCurve>(d, handlerManager);
@@ -3214,7 +3221,7 @@ bool QVariant::toBool() const
         return d.data.b;
 
     bool res = false;
-    handlerManager[d.type]->convert(&d, Bool, &res, 0);
+    handlerManager[d.type]->convert(&d, Bool, &res, nullptr);
 
     return res;
 }
@@ -3732,7 +3739,7 @@ bool QVariant::convert(int targetTypeId)
     if (!oldValue.canConvert(targetTypeId))
         return false;
 
-    create(targetTypeId, 0);
+    create(targetTypeId, nullptr);
     // Fail if the value is not initialized or was forced null by a previous failed convert.
     if (oldValue.d.is_null && oldValue.d.type != QMetaType::Nullptr)
         return false;
@@ -3757,7 +3764,7 @@ bool QVariant::convert(int targetTypeId)
 */
 bool QVariant::convert(const int type, void *ptr) const
 {
-    return handlerManager[type]->convert(&d, type, ptr, 0);
+    return handlerManager[type]->convert(&d, type, ptr, nullptr);
 }
 
 
@@ -4002,8 +4009,8 @@ static int numericCompare(const QVariant::Private *d1, const QVariant::Private *
         return 0;
 
     // only do fuzzy comparisons for finite, non-zero numbers
-    int c1 = std::fpclassify(r1);
-    int c2 = std::fpclassify(r2);
+    int c1 = qFpClassify(r1);
+    int c2 = qFpClassify(r2);
     if ((c1 == FP_NORMAL || c1 == FP_SUBNORMAL) && (c2 == FP_NORMAL || c2 == FP_SUBNORMAL)) {
         if (qFuzzyCompare(r1, r2))
             return 0;
@@ -4280,6 +4287,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p)
     \sa fromValue()
 */
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
     \fn template<typename T> QVariant qVariantFromValue(const T &value)
     \relates QVariant
@@ -4317,6 +4325,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p)
 
     \sa QVariant::setValue()
 */
+#endif
 
 /*!
     \fn template<typename T> T qvariant_cast(const QVariant &value)
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index bb9db3d1ad..e7d3d9c835 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -66,7 +66,9 @@ class QBitArray;
 class QDataStream;
 class QDate;
 class QDateTime;
+#if QT_CONFIG(easingcurve)
 class QEasingCurve;
+#endif
 class QLine;
 class QLineF;
 class QLocale;
@@ -92,9 +94,6 @@ class QUrl;
 class QVariant;
 class QVariantComparisonHelper;
 
-template <typename T>
-inline QVariant qVariantFromValue(const T &);
-
 template<typename T>
 inline T qvariant_cast(const QVariant &);
 
@@ -165,7 +164,9 @@ class Q_CORE_EXPORT QVariant
         RegExp = QMetaType::QRegExp,
         RegularExpression = QMetaType::QRegularExpression,
         Hash = QMetaType::QVariantHash,
+#if QT_CONFIG(easingcurve)
         EasingCurve = QMetaType::QEasingCurve,
+#endif
         Uuid = QMetaType::QUuid,
 #if QT_CONFIG(itemmodel)
         ModelIndex = QMetaType::QModelIndex,
@@ -204,7 +205,7 @@ class Q_CORE_EXPORT QVariant
         LastType = 0xffffffff // need this so that gcc >= 3.4 allocates 32 bits for Type
     };
 
-    QVariant() Q_DECL_NOTHROW : d() {}
+    QVariant() noexcept : d() {}
     ~QVariant();
     QVariant(Type type);
     QVariant(int typeId, const void *copy);
@@ -257,7 +258,9 @@ class Q_CORE_EXPORT QVariant
 #endif // QT_CONFIG(regularexpression)
 #ifndef QT_BOOTSTRAPPED
     QVariant(const QUrl &url);
+#if QT_CONFIG(easingcurve)
     QVariant(const QEasingCurve &easing);
+#endif
     QVariant(const QUuid &uuid);
     QVariant(const QJsonValue &jsonValue);
     QVariant(const QJsonObject &jsonObject);
@@ -270,14 +273,12 @@ class Q_CORE_EXPORT QVariant
 #endif
 
     QVariant& operator=(const QVariant &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QVariant(QVariant &&other) Q_DECL_NOTHROW : d(other.d)
+    inline QVariant(QVariant &&other) noexcept : d(other.d)
     { other.d = Private(); }
-    inline QVariant &operator=(QVariant &&other) Q_DECL_NOTHROW
+    inline QVariant &operator=(QVariant &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
 
-    inline void swap(QVariant &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    inline void swap(QVariant &other) noexcept { qSwap(d, other.d); }
 
     Type type() const;
     int userType() const;
@@ -333,7 +334,9 @@ class Q_CORE_EXPORT QVariant
 #endif // QT_CONFIG(regularexpression)
 #ifndef QT_BOOTSTRAPPED
     QUrl toUrl() const;
+#if QT_CONFIG(easingcurve)
     QEasingCurve toEasingCurve() const;
+#endif
     QUuid toUuid() const;
     QJsonValue toJsonValue() const;
     QJsonObject toJsonObject() const;
@@ -365,7 +368,7 @@ class Q_CORE_EXPORT QVariant
 
     template<typename T>
     static inline QVariant fromValue(const T &value)
-    { return qVariantFromValue(value); }
+    { return QVariant(qMetaTypeId<T>(), &value, QTypeInfo<T>::isPointer); }
 
 #if (QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L) || defined(Q_CLANG_QDOC)
     template<typename... Types>
@@ -390,20 +393,20 @@ class Q_CORE_EXPORT QVariant
     };
     struct Private
     {
-        inline Private() Q_DECL_NOTHROW : type(Invalid), is_shared(false), is_null(true)
+        inline Private() noexcept : type(Invalid), is_shared(false), is_null(true)
         { data.ptr = nullptr; }
 
         // Internal constructor for initialized variants.
-        explicit inline Private(uint variantType) Q_DECL_NOTHROW
+        explicit inline Private(uint variantType) noexcept
             : type(variantType), is_shared(false), is_null(false)
         {}
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        Private(const Private &other) Q_DECL_NOTHROW
+        Private(const Private &other) noexcept
             : data(other.data), type(other.type),
               is_shared(other.is_shared), is_null(other.is_null)
         {}
-        Private &operator=(const Private &other) Q_DECL_NOTHROW = default;
+        Private &operator=(const Private &other) noexcept = default;
 #endif
         union Data
         {
@@ -491,27 +494,27 @@ public:
 
 private:
     // force compile error, prevent QVariant(bool) to be called
-    inline QVariant(void *) Q_DECL_EQ_DELETE;
+    inline QVariant(void *) = delete;
     // QVariant::Type is marked as \obsolete, but we don't want to
     // provide a constructor from its intended replacement,
     // QMetaType::Type, instead, because the idea behind these
     // constructors is flawed in the first place. But we also don't
     // want QVariant(QMetaType::String) to compile and falsely be an
     // int variant, so delete this constructor:
-    QVariant(QMetaType::Type) Q_DECL_EQ_DELETE;
+    QVariant(QMetaType::Type) = delete;
 
     // These constructors don't create QVariants of the type associcated
     // with the enum, as expected, but they would create a QVariant of
     // type int with the value of the enum value.
     // Use QVariant v = QColor(Qt::red) instead of QVariant v = Qt::red for
     // example.
-    QVariant(Qt::GlobalColor) Q_DECL_EQ_DELETE;
-    QVariant(Qt::BrushStyle) Q_DECL_EQ_DELETE;
-    QVariant(Qt::PenStyle) Q_DECL_EQ_DELETE;
-    QVariant(Qt::CursorShape) Q_DECL_EQ_DELETE;
+    QVariant(Qt::GlobalColor) = delete;
+    QVariant(Qt::BrushStyle) = delete;
+    QVariant(Qt::PenStyle) = delete;
+    QVariant(Qt::CursorShape) = delete;
 #ifdef QT_NO_CAST_FROM_ASCII
     // force compile error when implicit conversion is not wanted
-    inline QVariant(const char *) Q_DECL_EQ_DELETE;
+    inline QVariant(const char *) = delete;
 #endif
 public:
     typedef Private DataPtr;
@@ -519,50 +522,61 @@ public:
     inline const DataPtr &data_ptr() const { return d; }
 };
 
+#if QT_DEPRECATED_SINCE(5, 14)
 template <typename T>
+QT_DEPRECATED_X("Use QVariant::fromValue() instead.")
 inline QVariant qVariantFromValue(const T &t)
 {
-    return QVariant(qMetaTypeId<T>(), &t, QTypeInfo<T>::isPointer);
+    return QVariant::fromValue(t);
 }
 
-template <>
-inline QVariant qVariantFromValue(const QVariant &t) { return t; }
+template <typename T>
+QT_DEPRECATED_X("Use QVariant::setValue() instead.")
+inline void qVariantSetValue(QVariant &v, const T &t)
+{
+    v.setValue(t);
+}
+#endif
+
+template<>
+inline QVariant QVariant::fromValue(const QVariant &value)
+{
+    return value;
+}
 
 #if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L
-template <>
-inline QVariant qVariantFromValue(const std::monostate &) { return QVariant(); }
+template<>
+inline QVariant QVariant::fromValue(const std::monostate &)
+{
+    return QVariant();
+}
 #endif
 
-template <typename T>
-inline void qVariantSetValue(QVariant &v, const T &t)
+inline bool QVariant::isValid() const { return d.type != Invalid; }
+
+template<typename T>
+inline void QVariant::setValue(const T &avalue)
 {
-    //if possible we reuse the current QVariant private
+    // If possible we reuse the current QVariant private.
     const uint type = qMetaTypeId<T>();
-    QVariant::Private &d = v.data_ptr();
-    if (v.isDetached() && (type == d.type || (type <= uint(QVariant::Char) && d.type <= uint(QVariant::Char)))) {
+    if (isDetached() && (type == d.type || (type <= uint(QVariant::Char) && d.type <= uint(QVariant::Char)))) {
         d.type = type;
         d.is_null = false;
         T *old = reinterpret_cast<T*>(d.is_shared ? d.data.shared->ptr : &d.data.ptr);
         if (QTypeInfo<T>::isComplex)
             old->~T();
-        new (old) T(t); //call the copy constructor
+        new (old) T(avalue); // call the copy constructor
     } else {
-        v = QVariant(type, &t, QTypeInfo<T>::isPointer);
+        *this = QVariant(type, &avalue, QTypeInfo<T>::isPointer);
     }
 }
 
-template <>
-inline void qVariantSetValue<QVariant>(QVariant &v, const QVariant &t)
+template<>
+inline void QVariant::setValue(const QVariant &avalue)
 {
-    v = t;
+    *this = avalue;
 }
 
-inline bool QVariant::isValid() const { return d.type != Invalid; }
-
-template<typename T>
-inline void QVariant::setValue(const T &avalue)
-{ qVariantSetValue(*this, avalue); }
-
 #ifndef QT_NO_DATASTREAM
 Q_CORE_EXPORT QDataStream& operator>> (QDataStream& s, QVariant& p);
 Q_CORE_EXPORT QDataStream& operator<< (QDataStream& s, const QVariant& p);
@@ -571,7 +585,7 @@ Q_CORE_EXPORT QDataStream& operator<< (QDataStream& s, const QVariant::Type p);
 #endif
 
 inline bool QVariant::isDetached() const
-{ return !d.is_shared || d.data.shared->ref.load() == 1; }
+{ return !d.is_shared || d.data.shared->ref.loadRelaxed() == 1; }
 
 
 #ifdef Q_QDOC
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h
index b22b7c231e..3d87beac83 100644
--- a/src/corelib/kernel/qvariant_p.h
+++ b/src/corelib/kernel/qvariant_p.h
@@ -88,7 +88,7 @@ inline T *v_cast(const QVariant::Private *nd, T * = 0)
 #else // every other compiler in this world
 
 template <typename T>
-inline const T *v_cast(const QVariant::Private *d, T * = 0)
+inline const T *v_cast(const QVariant::Private *d, T * = nullptr)
 {
     return !QVariantIntegrator<T>::CanUseInternalSpace
             ? static_cast<const T *>(d->data.shared->ptr)
@@ -96,7 +96,7 @@ inline const T *v_cast(const QVariant::Private *d, T * = 0)
 }
 
 template <typename T>
-inline T *v_cast(QVariant::Private *d, T * = 0)
+inline T *v_cast(QVariant::Private *d, T * = nullptr)
 {
     return !QVariantIntegrator<T>::CanUseInternalSpace
             ? static_cast<T *>(d->data.shared->ptr)
@@ -154,7 +154,7 @@ inline void v_construct(QVariant::Private *x, const T &t)
 
 // constructs a new variant if copy is 0, otherwise copy-constructs
 template <class T>
-inline void v_construct(QVariant::Private *x, const void *copy, T * = 0)
+inline void v_construct(QVariant::Private *x, const void *copy, T * = nullptr)
 {
     if (copy)
         v_construct<T>(x, *static_cast<const T *>(copy));
@@ -164,7 +164,7 @@ inline void v_construct(QVariant::Private *x, const void *copy, T * = 0)
 
 // deletes the internal structures
 template <class T>
-inline void v_clear(QVariant::Private *d, T* = 0)
+inline void v_clear(QVariant::Private *d, T* = nullptr)
 {
 
     if (!QVariantIntegrator<T>::CanUseInternalSpace) {
@@ -264,7 +264,7 @@ class QVariantIsNull
         struct No { char unused[2]; };
         Q_STATIC_ASSERT(sizeof(Yes) != sizeof(No));
 
-        template<class C> static decltype(static_cast<const C*>(0)->isNull(), Yes()) test(int);
+        template<class C> static decltype(static_cast<const C*>(nullptr)->isNull(), Yes()) test(int);
         template<class C> static No test(...);
     public:
         static const bool Value = (sizeof(test<T>(0)) == sizeof(Yes));
diff --git a/src/corelib/kernel/qwineventnotifier.cpp b/src/corelib/kernel/qwineventnotifier.cpp
index 3c73c0b851..d2ae9668fe 100644
--- a/src/corelib/kernel/qwineventnotifier.cpp
+++ b/src/corelib/kernel/qwineventnotifier.cpp
@@ -124,7 +124,7 @@ QWinEventNotifier::QWinEventNotifier(HANDLE hEvent, QObject *parent)
  : QObject(*new QWinEventNotifierPrivate(hEvent, false), parent)
 {
     Q_D(QWinEventNotifier);
-    QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.load();
+    QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.loadRelaxed();
     if (Q_UNLIKELY(!eventDispatcher)) {
         qWarning("QWinEventNotifier: Can only be used with threads started with QThread");
         return;
@@ -197,7 +197,7 @@ void QWinEventNotifier::setEnabled(bool enable)
         return;
     d->enabled = enable;
 
-    QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.load();
+    QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.loadRelaxed();
     if (!eventDispatcher) { // perhaps application is shutting down
         if (!enable && d->waitHandle != nullptr)
             d->unregisterWaitObject();
@@ -256,7 +256,7 @@ void QWinEventNotifierPrivate::unregisterWaitObject()
 static void CALLBACK wfsoCallback(void *context, BOOLEAN /*ignore*/)
 {
     QWinEventNotifierPrivate *nd = reinterpret_cast<QWinEventNotifierPrivate *>(context);
-    QAbstractEventDispatcher *eventDispatcher = nd->threadData->eventDispatcher.load();
+    QAbstractEventDispatcher *eventDispatcher = nd->threadData->eventDispatcher.loadRelaxed();
 
     // Happens when Q(Core)Application is destroyed before QWinEventNotifier.
     // https://bugreports.qt.io/browse/QTBUG-70214
diff --git a/src/corelib/kernel/qwinregistry.cpp b/src/corelib/kernel/qwinregistry.cpp
new file mode 100644
index 0000000000..6566dd3c76
--- /dev/null
+++ b/src/corelib/kernel/qwinregistry.cpp
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwinregistry_p.h"
+
+#include <QtCore/qvarlengtharray.h>
+
+#include <algorithm>
+
+QT_BEGIN_NAMESPACE
+
+QWinRegistryKey::QWinRegistryKey() :
+    m_key(nullptr)
+{
+}
+
+// Open a key with the specified permissions (KEY_READ/KEY_WRITE).
+// "access" is to explicitly use the 32- or 64-bit branch.
+QWinRegistryKey::QWinRegistryKey(HKEY parentHandle, QStringView subKey,
+                                 REGSAM permissions, REGSAM access)
+{
+    if (RegOpenKeyEx(parentHandle, reinterpret_cast<const wchar_t *>(subKey.utf16()),
+                     0, permissions | access, &m_key) != ERROR_SUCCESS) {
+        m_key = nullptr;
+    }
+}
+
+QWinRegistryKey::~QWinRegistryKey()
+{
+    close();
+}
+
+void QWinRegistryKey::close()
+{
+    if (isValid()) {
+        RegCloseKey(m_key);
+        m_key = nullptr;
+    }
+}
+
+QString QWinRegistryKey::stringValue(QStringView subKey) const
+{
+    QString result;
+    if (!isValid())
+        return result;
+    DWORD type;
+    DWORD size;
+    auto subKeyC = reinterpret_cast<const wchar_t *>(subKey.utf16());
+    if (RegQueryValueEx(m_key, subKeyC, nullptr, &type, nullptr, &size) != ERROR_SUCCESS
+        || (type != REG_SZ && type != REG_EXPAND_SZ) || size <= 2) {
+        return result;
+    }
+    // Reserve more for rare cases where trailing '\0' are missing in registry,
+    // otherwise chop off the '\0' received.
+    QString buffer(int(size / sizeof(wchar_t)), Qt::Uninitialized);
+    if (RegQueryValueEx(m_key, subKeyC, nullptr, &type,
+                        reinterpret_cast<LPBYTE>(buffer.data()), &size) == ERROR_SUCCESS) {
+        if (buffer.endsWith(QChar::Null))
+            buffer.chop(1);
+    } else {
+        buffer.clear();
+    }
+    return buffer;
+}
+
+QPair<DWORD, bool> QWinRegistryKey::dwordValue(QStringView subKey) const
+{
+    if (!isValid())
+        return qMakePair(0, false);
+    DWORD type;
+    auto subKeyC = reinterpret_cast<const wchar_t *>(subKey.utf16());
+    if (RegQueryValueEx(m_key, subKeyC, nullptr, &type, nullptr, nullptr) != ERROR_SUCCESS
+        || type != REG_DWORD) {
+        return qMakePair(0, false);
+    }
+    DWORD value = 0;
+    DWORD size = sizeof(value);
+    const bool ok =
+        RegQueryValueEx(m_key, subKeyC, nullptr, nullptr,
+                        reinterpret_cast<unsigned char *>(&value), &size) == ERROR_SUCCESS;
+    return qMakePair(value, ok);
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/thread/qmutexpool_p.h b/src/corelib/kernel/qwinregistry_p.h
index 00710199b8..d249a97988 100644
--- a/src/corelib/thread/qmutexpool_p.h
+++ b/src/corelib/kernel/qwinregistry_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMUTEXPOOL_P_H
-#define QMUTEXPOOL_P_H
+#ifndef QWINREGISTRY_H
+#define QWINREGISTRY_H
 
 //
 //  W A R N I N G
@@ -51,38 +51,39 @@
 // We mean it.
 //
 
-#include <QtCore/private/qglobal_p.h>
-#include "QtCore/qatomic.h"
-#include "QtCore/qmutex.h"
-#include "QtCore/qvarlengtharray.h"
-
-QT_REQUIRE_CONFIG(thread);
+#include <QtCore/qpair.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringview.h>
+#include <QtCore/qt_windows.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_CORE_EXPORT QMutexPool
+class Q_CORE_EXPORT QWinRegistryKey
 {
 public:
-    explicit QMutexPool(QMutex::RecursionMode recursionMode = QMutex::NonRecursive, int size = 131);
-    ~QMutexPool();
+    Q_DISABLE_COPY(QWinRegistryKey)
+
+    QWinRegistryKey();
+    explicit QWinRegistryKey(HKEY parentHandle, QStringView subKey,
+                             REGSAM permissions = KEY_READ, REGSAM access = 0);
+    ~QWinRegistryKey();
+
+    QWinRegistryKey(QWinRegistryKey &&other) noexcept { swap(other); }
+    QWinRegistryKey &operator=(QWinRegistryKey &&other) noexcept { swap(other); return *this; }
+
+    void swap(QWinRegistryKey &other) noexcept { qSwap(m_key, other.m_key); }
+
+    bool isValid() const { return m_key != nullptr; }
+    operator HKEY() const { return m_key; }
+    void close();
 
-    inline QMutex *get(const void *address) {
-        int index = uint(quintptr(address)) % mutexes.count();
-        QMutex *m = mutexes[index].loadAcquire();
-        if (m)
-            return m;
-        else
-            return createMutex(index);
-    }
-    static QMutexPool *instance();
-    static QMutex *globalInstanceGet(const void *address);
+    QString stringValue(QStringView subKey) const;
+    QPair<DWORD, bool> dwordValue(QStringView subKey) const;
 
 private:
-    QMutex *createMutex(int index);
-    QVarLengthArray<QAtomicPointer<QMutex>, 131> mutexes;
-    QMutex::RecursionMode recursionMode;
+    HKEY m_key;
 };
 
 QT_END_NAMESPACE
 
-#endif // QMUTEXPOOL_P_H
+#endif // QWINREGISTRY_H
diff --git a/src/corelib/mimetypes/qmimeglobpattern.cpp b/src/corelib/mimetypes/qmimeglobpattern.cpp
index e353ba10cc..ad78cd9ffa 100644
--- a/src/corelib/mimetypes/qmimeglobpattern.cpp
+++ b/src/corelib/mimetypes/qmimeglobpattern.cpp
@@ -39,7 +39,9 @@
 
 #include "qmimeglobpattern_p.h"
 
+#if QT_CONFIG(regularexpression)
 #include <QRegularExpression>
+#endif
 #include <QStringList>
 #include <QDebug>
 
@@ -142,8 +144,12 @@ bool QMimeGlobPattern::matchFileName(const QString &inputFilename) const
         return (m_pattern == filename);
 
     // Other (quite rare) patterns, like "*.anim[1-9j]": use slow but correct method
+#if QT_CONFIG(regularexpression)
     QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(m_pattern));
     return rx.match(filename).hasMatch();
+#else
+    return false;
+#endif
 }
 
 static bool isFastPattern(const QString &pattern)
diff --git a/src/corelib/mimetypes/qmimeglobpattern_p.h b/src/corelib/mimetypes/qmimeglobpattern_p.h
index bb6f64320b..cf27d6ab30 100644
--- a/src/corelib/mimetypes/qmimeglobpattern_p.h
+++ b/src/corelib/mimetypes/qmimeglobpattern_p.h
@@ -88,7 +88,7 @@ public:
     {
     }
 
-    void swap(QMimeGlobPattern &other) Q_DECL_NOTHROW
+    void swap(QMimeGlobPattern &other) noexcept
     {
         qSwap(m_pattern,         other.m_pattern);
         qSwap(m_mimeType,        other.m_mimeType);
diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h
index 6962a6ca59..5091d483b6 100644
--- a/src/corelib/mimetypes/qmimemagicrule_p.h
+++ b/src/corelib/mimetypes/qmimemagicrule_p.h
@@ -69,7 +69,7 @@ public:
     QMimeMagicRule(const QString &typeStr, const QByteArray &value, const QString &offsets,
                    const QByteArray &mask, QString *errorString);
 
-    void swap(QMimeMagicRule &other) Q_DECL_NOTHROW
+    void swap(QMimeMagicRule &other) noexcept
     {
         qSwap(m_type,          other.m_type);
         qSwap(m_value,         other.m_value);
diff --git a/src/corelib/mimetypes/qmimemagicrulematcher_p.h b/src/corelib/mimetypes/qmimemagicrulematcher_p.h
index 5e74e2e3fc..fe714987e6 100644
--- a/src/corelib/mimetypes/qmimemagicrulematcher_p.h
+++ b/src/corelib/mimetypes/qmimemagicrulematcher_p.h
@@ -66,7 +66,7 @@ class QMimeMagicRuleMatcher
 public:
     explicit QMimeMagicRuleMatcher(const QString &mime, unsigned priority = 65535);
 
-    void swap(QMimeMagicRuleMatcher &other) Q_DECL_NOTHROW
+    void swap(QMimeMagicRuleMatcher &other) noexcept
     {
         qSwap(m_list,     other.m_list);
         qSwap(m_priority, other.m_priority);
diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp
index 37c8e3b157..a3a6b9615c 100644
--- a/src/corelib/mimetypes/qmimeprovider.cpp
+++ b/src/corelib/mimetypes/qmimeprovider.cpp
@@ -460,6 +460,7 @@ void QMimeBinaryProvider::addAllMimeTypes(QList<QMimeType> &result)
 void QMimeBinaryProvider::loadMimeTypePrivate(QMimeTypePrivate &data)
 {
 #ifdef QT_NO_XMLSTREAMREADER
+    Q_UNUSED(data);
     qWarning("Cannot load mime type since QXmlStreamReader is not available.");
     return;
 #else
@@ -672,7 +673,7 @@ void QMimeXMLProvider::load(const QString &fileName)
 {
     QString errorMessage;
     if (!load(fileName, &errorMessage))
-        qWarning("QMimeDatabase: Error loading %s\n%s", qPrintable(fileName), qPrintable(errorMessage));
+        qWarning("QMimeDatabase: Error loading %ls\n%ls", qUtf16Printable(fileName), qUtf16Printable(errorMessage));
 }
 
 bool QMimeXMLProvider::load(const QString &fileName, QString *errorMessage)
diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp
index 55c7de0c87..de450c68f4 100644
--- a/src/corelib/mimetypes/qmimetype.cpp
+++ b/src/corelib/mimetypes/qmimetype.cpp
@@ -192,7 +192,7 @@ bool QMimeType::operator==(const QMimeType &other) const
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
  */
-uint qHash(const QMimeType &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QMimeType &key, uint seed) noexcept
 {
     return qHash(key.d->name, seed);
 }
@@ -253,7 +253,7 @@ QString QMimeType::name() const
  */
 QString QMimeType::comment() const
 {
-    QMimeDatabasePrivate::instance()->loadMimeTypePrivate(*d);
+    QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d));
 
     QStringList languageList;
     languageList << QLocale().name();
@@ -294,7 +294,7 @@ QString QMimeType::comment() const
  */
 QString QMimeType::genericIconName() const
 {
-    QMimeDatabasePrivate::instance()->loadGenericIcon(*d);
+    QMimeDatabasePrivate::instance()->loadGenericIcon(const_cast<QMimeTypePrivate&>(*d));
     if (d->genericIconName.isEmpty()) {
         // From the spec:
         // If the generic icon name is empty (not specified by the mimetype definition)
@@ -311,6 +311,14 @@ QString QMimeType::genericIconName() const
     return d->genericIconName;
 }
 
+static QString make_default_icon_name_from_mimetype_name(QString iconName)
+{
+    const int slashindex = iconName.indexOf(QLatin1Char('/'));
+    if (slashindex != -1)
+        iconName[slashindex] = QLatin1Char('-');
+    return iconName;
+}
+
 /*!
     \property QMimeType::iconName
     \brief the file name of an icon image that represents the MIME type
@@ -322,13 +330,9 @@ QString QMimeType::genericIconName() const
  */
 QString QMimeType::iconName() const
 {
-    QMimeDatabasePrivate::instance()->loadIcon(*d);
+    QMimeDatabasePrivate::instance()->loadIcon(const_cast<QMimeTypePrivate&>(*d));
     if (d->iconName.isEmpty()) {
-        // Make default icon name from the mimetype name
-        d->iconName = name();
-        const int slashindex = d->iconName.indexOf(QLatin1Char('/'));
-        if (slashindex != -1)
-            d->iconName[slashindex] = QLatin1Char('-');
+        return make_default_icon_name_from_mimetype_name(name());
     }
     return d->iconName;
 }
@@ -342,7 +346,7 @@ QString QMimeType::iconName() const
  */
 QStringList QMimeType::globPatterns() const
 {
-    QMimeDatabasePrivate::instance()->loadMimeTypePrivate(*d);
+    QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d));
     return d->globPatterns;
 }
 
@@ -437,7 +441,7 @@ QStringList QMimeType::aliases() const
  */
 QStringList QMimeType::suffixes() const
 {
-    QMimeDatabasePrivate::instance()->loadMimeTypePrivate(*d);
+    QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d));
 
     QStringList result;
     for (const QString &pattern : qAsConst(d->globPatterns)) {
@@ -480,7 +484,7 @@ QString QMimeType::preferredSuffix() const
 */
 QString QMimeType::filterString() const
 {
-    QMimeDatabasePrivate::instance()->loadMimeTypePrivate(*d);
+    QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d));
     QString filter;
 
     if (!d->globPatterns.empty()) {
diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h
index 8287f1434b..df1b60f2ce 100644
--- a/src/corelib/mimetypes/qmimetype.h
+++ b/src/corelib/mimetypes/qmimetype.h
@@ -48,14 +48,14 @@ QT_REQUIRE_CONFIG(mimetype);
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
 class QMimeTypePrivate;
-class QStringList;
 class QMimeType;
 
-Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed = 0) noexcept;
 
 class Q_CORE_EXPORT QMimeType
 {
@@ -78,10 +78,8 @@ public:
     QMimeType();
     QMimeType(const QMimeType &other);
     QMimeType &operator=(const QMimeType &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QMimeType &operator=(QMimeType &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
-    void swap(QMimeType &other) Q_DECL_NOTHROW
+    QMimeType &operator=(QMimeType &&other) noexcept { swap(other); return *this; }
+    void swap(QMimeType &other) noexcept
     {
         qSwap(d, other.d);
     }
@@ -121,7 +119,7 @@ protected:
     friend class QMimeXMLProvider;
     friend class QMimeBinaryProvider;
     friend class QMimeTypePrivate;
-    friend Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed) Q_DECL_NOTHROW;
+    friend Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed) noexcept;
 
     QExplicitlySharedDataPointer<QMimeTypePrivate> d;
 };
diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h
index 5a36e6613c..0d6b4b4b12 100644
--- a/src/corelib/mimetypes/qmimetype_p.h
+++ b/src/corelib/mimetypes/qmimetype_p.h
@@ -84,26 +84,6 @@ public:
 
 QT_END_NAMESPACE
 
-#define QMIMETYPE_BUILDER \
-    QT_BEGIN_NAMESPACE \
-    static QMimeType buildQMimeType ( \
-                         const QString &name, \
-                         const QString &genericIconName, \
-                         const QString &iconName, \
-                         const QStringList &globPatterns \
-                     ) \
-    { \
-        QMimeTypePrivate qMimeTypeData; \
-        qMimeTypeData.name = name; \
-        qMimeTypeData.loaded = true; \
-        qMimeTypeData.genericIconName = genericIconName; \
-        qMimeTypeData.iconName = iconName; \
-        qMimeTypeData.globPatterns = globPatterns; \
-        return QMimeType(qMimeTypeData); \
-    } \
-    QT_END_NAMESPACE
-
-#ifdef Q_COMPILER_RVALUE_REFS
 #define QMIMETYPE_BUILDER_FROM_RVALUE_REFS \
     QT_BEGIN_NAMESPACE \
     static QMimeType buildQMimeType ( \
@@ -122,6 +102,5 @@ QT_END_NAMESPACE
         return QMimeType(qMimeTypeData); \
     } \
     QT_END_NAMESPACE
-#endif
 
 #endif   // QMIMETYPE_P_H
diff --git a/src/corelib/mimetypes/qmimetypeparser.cpp b/src/corelib/mimetypes/qmimetypeparser.cpp
index d10575cfe9..815e0aa03b 100644
--- a/src/corelib/mimetypes/qmimetypeparser.cpp
+++ b/src/corelib/mimetypes/qmimetypeparser.cpp
@@ -194,8 +194,9 @@ static CreateMagicMatchRuleResult createMagicMatchRule(const QXmlStreamAttribute
 bool QMimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString *errorMessage)
 {
 #ifdef QT_NO_XMLSTREAMREADER
+    Q_UNUSED(dev);
     if (errorMessage)
-        *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse.");
+        *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName);
     return false;
 #else
     QMimeTypePrivate data;
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index 35c64180d4..18f10c9b43 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -170,7 +170,7 @@ public:
 
 Q_GLOBAL_STATIC(QList<QFactoryLoader *>, qt_factory_loaders)
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_factoryloader_mutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, qt_factoryloader_mutex)
 
 QFactoryLoaderPrivate::~QFactoryLoaderPrivate()
 {
@@ -193,7 +193,11 @@ void QFactoryLoader::update()
             continue;
         d->loadedPaths << pluginDir;
 
+#ifdef Q_OS_ANDROID
+        QString path = pluginDir;
+#else
         QString path = pluginDir + d->suffix;
+#endif
 
         if (qt_debug_component())
             qDebug() << "QFactoryLoader::QFactoryLoader() checking directory path" << path << "...";
@@ -202,8 +206,10 @@ void QFactoryLoader::update()
             continue;
 
         QStringList plugins = QDir(path).entryList(
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
                     QStringList(QStringLiteral("*.dll")),
+#elif defined(Q_OS_ANDROID)
+                    QStringList(QLatin1String("libplugins_%1_*.so").arg(d->suffix)),
 #endif
                     QDir::Files);
         QLibraryPrivate *library = 0;
@@ -239,7 +245,7 @@ void QFactoryLoader::update()
             library = QLibraryPrivate::findOrCreate(QFileInfo(fileName).canonicalFilePath());
             if (!library->isPlugin()) {
                 if (qt_debug_component()) {
-                    qDebug() << library->errorString << endl
+                    qDebug() << library->errorString << Qt::endl
                              << "         not a plugin";
                 }
                 library->release();
@@ -339,6 +345,10 @@ QFactoryLoader::QFactoryLoader(const char *iid,
 #if QT_CONFIG(library)
     d->cs = cs;
     d->suffix = suffix;
+# ifdef Q_OS_ANDROID
+    if (!d->suffix.isEmpty() && d->suffix.at(0) == QLatin1Char('/'))
+        d->suffix.remove(0, 1);
+# endif
 
     QMutexLocker locker(qt_factoryloader_mutex());
     update();
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 0e32776c71..eeaa3c18ec 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
 #  define QLIBRARY_AS_DEBUG true
 #endif
 
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) || (defined(Q_CC_MINGW) && !QT_CONFIG(debug_and_release))
 // We don't use separate debug and release libs on UNIX, so we want
 // to allow loading plugins, regardless of how they were built.
 #  define QT_NO_DEBUG_PLUGIN_CHECK
@@ -241,8 +241,8 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib)
         if (lib)
             lib->errorString = file.errorString();
         if (qt_debug_component()) {
-            qWarning("%s: %s", QFile::encodeName(library).constData(),
-                qPrintable(QSystemError::stdString()));
+            qWarning("%s: %ls", QFile::encodeName(library).constData(),
+                     qUtf16Printable(QSystemError::stdString()));
         }
         return false;
     }
@@ -275,7 +275,7 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib)
     int r = QElfParser().parse(filedata, fdlen, library, lib, &pos, &fdlen);
     if (r == QElfParser::Corrupt || r == QElfParser::NotElf) {
             if (lib && qt_debug_component()) {
-                qWarning("QElfParser: %s",qPrintable(lib->errorString));
+                qWarning("QElfParser: %ls", qUtf16Printable(lib->errorString));
             }
             return false;
     } else if (r == QElfParser::QtMetaDataSection) {
@@ -292,7 +292,7 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib)
         int r = QMachOParser::parse(filedata, fdlen, library, &errorString, &pos, &fdlen);
         if (r == QMachOParser::NotSuitable) {
             if (qt_debug_component())
-                qWarning("QMachOParser: %s", qPrintable(errorString));
+                qWarning("QMachOParser: %ls", qUtf16Printable(errorString));
             if (lib)
                 lib->errorString = errorString;
             return false;
@@ -319,8 +319,8 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib)
         QString errMsg;
         QJsonDocument doc = qJsonFromRawLibraryMetaData(data, fdlen, &errMsg);
         if (doc.isNull()) {
-            qWarning("Found invalid metadata in lib %s: %s",
-                     qPrintable(library), qPrintable(errMsg));
+            qWarning("Found invalid metadata in lib %ls: %ls",
+                     qUtf16Printable(library), qUtf16Printable(errMsg));
         } else {
             lib->metaData = doc.object();
             if (qt_debug_component())
@@ -356,11 +356,11 @@ static void installCoverageTool(QLibraryPrivate *libPrivate)
 
     if (qt_debug_component()) {
         if (ret >= 0) {
-            qDebug("coverage data for %s registered",
-                     qPrintable(libPrivate->fileName));
+            qDebug("coverage data for %ls registered",
+                   qUtf16Printable(libPrivate->fileName));
         } else {
-            qWarning("could not register %s: error %d; coverage data may be incomplete",
-                     qPrintable(libPrivate->fileName),
+            qWarning("could not register %ls: error %d; coverage data may be incomplete",
+                     qUtf16Printable(libPrivate->fileName),
                      ret);
         }
     }
@@ -405,10 +405,10 @@ inline void QLibraryStore::cleanup()
     LibraryMap::Iterator it = data->libraryMap.begin();
     for (; it != data->libraryMap.end(); ++it) {
         QLibraryPrivate *lib = it.value();
-        if (lib->libraryRefCount.load() == 1) {
-            if (lib->libraryUnloadCount.load() > 0) {
+        if (lib->libraryRefCount.loadRelaxed() == 1) {
+            if (lib->libraryUnloadCount.loadRelaxed() > 0) {
                 Q_ASSERT(lib->pHnd);
-                lib->libraryUnloadCount.store(1);
+                lib->libraryUnloadCount.storeRelaxed(1);
 #ifdef __GLIBC__
                 // glibc has a bug in unloading from global destructors
                 // see https://bugzilla.novell.com/show_bug.cgi?id=622977
@@ -428,7 +428,7 @@ inline void QLibraryStore::cleanup()
         for (QLibraryPrivate *lib : qAsConst(data->libraryMap)) {
             if (lib)
                 qDebug() << "On QtCore unload," << lib->fileName << "was leaked, with"
-                         << lib->libraryRefCount.load() << "users";
+                         << lib->libraryRefCount.loadRelaxed() << "users";
         }
     }
 
@@ -487,7 +487,7 @@ inline void QLibraryStore::releaseLibrary(QLibraryPrivate *lib)
     }
 
     // no one else is using
-    Q_ASSERT(lib->libraryUnloadCount.load() == 0);
+    Q_ASSERT(lib->libraryUnloadCount.loadRelaxed() == 0);
 
     if (Q_LIKELY(data) && !lib->fileName.isEmpty()) {
         QLibraryPrivate *that = data->libraryMap.take(lib->fileName);
@@ -501,7 +501,7 @@ QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString
     : pHnd(0), fileName(canonicalFileName), fullVersion(version), instance(0),
       libraryRefCount(0), libraryUnloadCount(0), pluginState(MightBeAPlugin)
 {
-    loadHintsInt.store(loadHints);
+    loadHintsInt.storeRelaxed(loadHints);
     if (canonicalFileName.isEmpty())
         errorString = QLibrary::tr("The shared library was not found.");
 }
@@ -522,7 +522,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh)
     if (pHnd)
         return;
 
-    loadHintsInt.store(lh);
+    loadHintsInt.storeRelaxed(lh);
 }
 
 QFunctionPointer QLibraryPrivate::resolve(const char *symbol)
@@ -575,7 +575,7 @@ bool QLibraryPrivate::unload(UnloadFlag flag)
 {
     if (!pHnd)
         return false;
-    if (libraryUnloadCount.load() > 0 && !libraryUnloadCount.deref()) { // only unload if ALL QLibrary instance wanted to
+    if (libraryUnloadCount.loadRelaxed() > 0 && !libraryUnloadCount.deref()) { // only unload if ALL QLibrary instance wanted to
         delete inst.data();
         if (flag == NoUnloadSys || unload_sys()) {
             if (qt_debug_component())
diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h
index 3f650501c8..db5afac98e 100644
--- a/src/corelib/plugin/qlibrary_p.h
+++ b/src/corelib/plugin/qlibrary_p.h
@@ -92,11 +92,11 @@ public:
     QFunctionPointer resolve(const char *);
 
     QLibrary::LoadHints loadHints() const
-    { return QLibrary::LoadHints(loadHintsInt.load()); }
+    { return QLibrary::LoadHints(loadHintsInt.loadRelaxed()); }
     void setLoadHints(QLibrary::LoadHints lh);
 
     static QLibraryPrivate *findOrCreate(const QString &fileName, const QString &version = QString(),
-                                         QLibrary::LoadHints loadHints = 0);
+                                         QLibrary::LoadHints loadHints = nullptr);
     static QStringList suffixes_sys(const QString &fullVersion);
     static QStringList prefixes_sys();
 
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
index e03814984c..f0de1010d7 100644
--- a/src/corelib/plugin/qlibrary_unix.cpp
+++ b/src/corelib/plugin/qlibrary_unix.cpp
@@ -52,6 +52,10 @@
 #  include <private/qcore_mac_p.h>
 #endif
 
+#ifdef Q_OS_ANDROID
+#  include <private/qjnihelpers_p.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 static QString qdlerror()
@@ -77,14 +81,14 @@ QStringList QLibraryPrivate::suffixes_sys(const QString& fullVersion)
     // .so is preferred.
 # if defined(__ia64)
     if (!fullVersion.isEmpty()) {
-        suffixes << QString::fromLatin1(".so.%1").arg(fullVersion);
+        suffixes << QLatin1String(".so.%1").arg(fullVersion);
     } else {
         suffixes << QLatin1String(".so");
     }
 # endif
     if (!fullVersion.isEmpty()) {
-        suffixes << QString::fromLatin1(".sl.%1").arg(fullVersion);
-        suffixes << QString::fromLatin1(".%1").arg(fullVersion);
+        suffixes << QLatin1String(".sl.%1").arg(fullVersion);
+        suffixes << QLatin1String(".%1").arg(fullVersion);
     } else {
         suffixes << QLatin1String(".sl");
     }
@@ -93,15 +97,18 @@ QStringList QLibraryPrivate::suffixes_sys(const QString& fullVersion)
 
 #else
     if (!fullVersion.isEmpty()) {
-        suffixes << QString::fromLatin1(".so.%1").arg(fullVersion);
+        suffixes << QLatin1String(".so.%1").arg(fullVersion);
     } else {
         suffixes << QLatin1String(".so");
+# ifdef Q_OS_ANDROID
+        suffixes << QStringLiteral(LIBS_SUFFIX);
+# endif
     }
 #endif
 # ifdef Q_OS_MAC
     if (!fullVersion.isEmpty()) {
-        suffixes << QString::fromLatin1(".%1.bundle").arg(fullVersion);
-        suffixes << QString::fromLatin1(".%1.dylib").arg(fullVersion);
+        suffixes << QLatin1String(".%1.bundle").arg(fullVersion);
+        suffixes << QLatin1String(".%1.dylib").arg(fullVersion);
     } else {
         suffixes << QLatin1String(".bundle") << QLatin1String(".dylib");
     }
@@ -157,9 +164,12 @@ bool QLibraryPrivate::load_sys()
     // Do not unload the library during dlclose(). Consequently, the
     // library's specific static variables are not reinitialized if the
     // library is reloaded with dlopen() at a later time.
-#if defined(RTLD_NODELETE) && !defined(Q_OS_ANDROID)
+#if defined(RTLD_NODELETE)
     if (loadHints & QLibrary::PreventUnloadHint) {
-        dlFlags |= RTLD_NODELETE;
+#   ifdef Q_OS_ANDROID // RTLD_NODELETE flag is supported by Android 23+
+        if (QtAndroidPrivate::androidSdkVersion() > 22)
+#   endif
+            dlFlags |= RTLD_NODELETE;
     }
 #endif
 
@@ -219,7 +229,22 @@ bool QLibraryPrivate::load_sys()
             } else {
                 attempt = path + prefixes.at(prefix) + name + suffixes.at(suffix);
             }
+
             pHnd = dlopen(QFile::encodeName(attempt), dlFlags);
+#ifdef Q_OS_ANDROID
+            if (!pHnd) {
+                auto attemptFromBundle = attempt;
+                pHnd = dlopen(QFile::encodeName(attemptFromBundle.replace(QLatin1Char('/'), QLatin1Char('_'))), dlFlags);
+            }
+            if (pHnd) {
+                using JniOnLoadPtr = jint (*)(JavaVM *vm, void *reserved);
+                JniOnLoadPtr jniOnLoad = reinterpret_cast<JniOnLoadPtr>(dlsym(pHnd, "JNI_OnLoad"));
+                if (jniOnLoad && jniOnLoad(QtAndroidPrivate::javaVM(), nullptr) == JNI_ERR) {
+                    dlclose(pHnd);
+                    pHnd = nullptr;
+                }
+            }
+#endif
 
             if (!pHnd && fileName.startsWith(QLatin1Char('/')) && QFile::exists(attempt)) {
                 // We only want to continue if dlopen failed due to that the shared library did not exist.
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h
index 676b5047d6..c176155c28 100644
--- a/src/corelib/plugin/qplugin.h
+++ b/src/corelib/plugin/qplugin.h
@@ -75,7 +75,12 @@ typedef QObject *(*QtPluginInstanceFunction)();
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 typedef const char *(*QtPluginMetaDataFunction)();
 #else
-typedef QPair<const uchar *, size_t> (*QtPluginMetaDataFunction)();
+struct QPluginMetaData
+{
+    const uchar *data;
+    size_t size;
+};
+typedef QPluginMetaData (*QtPluginMetaDataFunction)();
 #endif
 
 
@@ -84,12 +89,14 @@ struct Q_CORE_EXPORT QStaticPlugin
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 public:
     constexpr QStaticPlugin(QtPluginInstanceFunction i, QtPluginMetaDataFunction m)
-        : instance(i), rawMetaData(m().first), rawMetaDataSize(m().second)
+        : instance(i), rawMetaData(m().data), rawMetaDataSize(m().size)
+    {}
     QtPluginInstanceFunction instance;
 private:
     // ### Qt 6: revise, as this is not standard-layout
     const void *rawMetaData;
-    qsizetype rawMetaDataSize
+    qsizetype rawMetaDataSize;
+public:
 #elif !defined(Q_QDOC)
     // Note: This struct is initialized using an initializer list.
     // As such, it cannot have any new constructors or variables.
@@ -154,6 +161,16 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin);
 
 #if defined(QT_STATICPLUGIN)
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#  define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS, PLUGINCLASSNAME) \
+    static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##PLUGINCLASSNAME() \
+    Q_PLUGIN_INSTANCE(PLUGINCLASS) \
+    static QPluginMetaData qt_plugin_query_metadata_##PLUGINCLASSNAME() \
+        { return { qt_pluginMetaData, sizeof qt_pluginMetaData }; } \
+    const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_##PLUGINCLASSNAME() { \
+        return { qt_plugin_instance_##PLUGINCLASSNAME, qt_plugin_query_metadata_##PLUGINCLASSNAME}; \
+    }
+#else
 #  define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS, PLUGINCLASSNAME) \
     static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##PLUGINCLASSNAME() \
     Q_PLUGIN_INSTANCE(PLUGINCLASS) \
@@ -162,13 +179,15 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin);
         QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance_##PLUGINCLASSNAME, qt_plugin_query_metadata_##PLUGINCLASSNAME}; \
         return plugin; \
     }
+#endif
 
-#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#else
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 
 #  define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS, PLUGINCLASSNAME)      \
             Q_EXTERN_C Q_DECL_EXPORT \
-            auto qt_plugin_query_metadata() \
-            { return qMakePair<const void *, size_t>(qt_pluginMetaData, sizeof qt_pluginMetaData); } \
+            QPluginMetaData qt_plugin_query_metadata() \
+            { return { qt_pluginMetaData, sizeof qt_pluginMetaData }; } \
             Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance() \
             Q_PLUGIN_INSTANCE(PLUGINCLASS)
 
@@ -183,6 +202,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin);
 
 #endif
 
+#endif
 
 #define Q_EXPORT_PLUGIN(PLUGIN) \
             Q_EXPORT_PLUGIN2(PLUGIN, PLUGIN)
diff --git a/src/corelib/plugin/qplugin_p.h b/src/corelib/plugin/qplugin_p.h
index 717129268b..ce45ebf700 100644
--- a/src/corelib/plugin/qplugin_p.h
+++ b/src/corelib/plugin/qplugin_p.h
@@ -60,7 +60,8 @@ enum class QtPluginMetaDataKeys {
     Requirements,
     IID,
     ClassName,
-    MetaData
+    MetaData,
+    URI
 };
 
 // F(IntKey, StringKey, Description)
@@ -68,7 +69,8 @@ enum class QtPluginMetaDataKeys {
 #define QT_PLUGIN_FOREACH_METADATA(F) \
     F(QtPluginMetaDataKeys::IID, "IID", "Plugin's Interface ID")                \
     F(QtPluginMetaDataKeys::ClassName, "className", "Plugin class name")        \
-    F(QtPluginMetaDataKeys::MetaData, "MetaData", "Other meta data")
+    F(QtPluginMetaDataKeys::MetaData, "MetaData", "Other meta data")            \
+    F(QtPluginMetaDataKeys::URI, "URI", "Plugin URI")
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index 4e0c3a511b..cadff4f32b 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -311,6 +311,16 @@ static QString locatePlugin(const QString& fileName)
     for (const QString &path : qAsConst(paths)) {
         for (const QString &prefix : qAsConst(prefixes)) {
             for (const QString &suffix : qAsConst(suffixes)) {
+#ifdef Q_OS_ANDROID
+                {
+                    QString pluginPath = basePath + prefix + baseName + suffix;
+                    const QString fn = path + QLatin1String("/lib") + pluginPath.replace(QLatin1Char('/'), QLatin1Char('_'));
+                    if (debug)
+                        qDebug() << "Trying..." << fn;
+                    if (QFileInfo(fn).isFile())
+                        return fn;
+                }
+#endif
                 const QString fn = path + QLatin1Char('/') + basePath + prefix + baseName + suffix;
                 if (debug)
                     qDebug() << "Trying..." << fn;
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 8bb5e1463a..83873edf6f 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -397,7 +397,7 @@ QUuid::QUuid(const QString &text)
 
     \sa toString(), QUuid()
 */
-QUuid QUuid::fromString(QStringView text) Q_DECL_NOTHROW
+QUuid QUuid::fromString(QStringView text) noexcept
 {
     if (text.size() > MaxStringUuidLength)
         text = text.left(MaxStringUuidLength); // text.truncate(MaxStringUuidLength);
@@ -427,7 +427,7 @@ QUuid QUuid::fromString(QStringView text) Q_DECL_NOTHROW
 
     \sa toString(), QUuid()
 */
-QUuid QUuid::fromString(QLatin1String text) Q_DECL_NOTHROW
+QUuid QUuid::fromString(QLatin1String text) noexcept
 {
     if (Q_UNLIKELY(text.size() < MaxStringUuidLength - 2
                    || (text.front() == QLatin1Char('{') && text.size() < MaxStringUuidLength - 1))) {
@@ -864,7 +864,7 @@ QDataStream &operator>>(QDataStream &s, QUuid &id)
     Returns \c true if this is the null UUID
     {00000000-0000-0000-0000-000000000000}; otherwise returns \c false.
 */
-bool QUuid::isNull() const Q_DECL_NOTHROW
+bool QUuid::isNull() const noexcept
 {
     return data4[0] == 0 && data4[1] == 0 && data4[2] == 0 && data4[3] == 0 &&
            data4[4] == 0 && data4[5] == 0 && data4[6] == 0 && data4[7] == 0 &&
@@ -913,7 +913,7 @@ bool QUuid::isNull() const Q_DECL_NOTHROW
 
     \sa version()
 */
-QUuid::Variant QUuid::variant() const Q_DECL_NOTHROW
+QUuid::Variant QUuid::variant() const noexcept
 {
     if (isNull())
         return VarUnknown;
@@ -934,7 +934,7 @@ QUuid::Variant QUuid::variant() const Q_DECL_NOTHROW
 
     \sa variant()
 */
-QUuid::Version QUuid::version() const Q_DECL_NOTHROW
+QUuid::Version QUuid::version() const noexcept
 {
     // Check the 4 MSB of data3
     Version ver = (Version)(data3>>12);
@@ -957,7 +957,7 @@ QUuid::Version QUuid::version() const Q_DECL_NOTHROW
 
     \sa variant()
 */
-bool QUuid::operator<(const QUuid &other) const Q_DECL_NOTHROW
+bool QUuid::operator<(const QUuid &other) const noexcept
 {
     if (variant() != other.variant())
         return variant() < other.variant();
@@ -984,7 +984,7 @@ bool QUuid::operator<(const QUuid &other) const Q_DECL_NOTHROW
 
     \sa variant()
 */
-bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW
+bool QUuid::operator>(const QUuid &other) const noexcept
 {
     return other < *this;
 }
@@ -1089,7 +1089,7 @@ QDebug operator<<(QDebug dbg, const QUuid &id)
     \relates QUuid
     Returns a hash of the UUID \a uuid, using \a seed to seed the calculation.
 */
-uint qHash(const QUuid &uuid, uint seed) Q_DECL_NOTHROW
+uint qHash(const QUuid &uuid, uint seed) noexcept
 {
     return uuid.data1 ^ uuid.data2 ^ (uuid.data3 << 16)
             ^ ((uuid.data4[0] << 24) | (uuid.data4[1] << 16) | (uuid.data4[2] << 8) | uuid.data4[3])
diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h
index 08a1843640..713ca070c8 100644
--- a/src/corelib/plugin/quuid.h
+++ b/src/corelib/plugin/quuid.h
@@ -93,13 +93,13 @@ public:
 
 #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_CLANG_QDOC)
 
-    Q_DECL_CONSTEXPR QUuid() Q_DECL_NOTHROW : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {}
+    Q_DECL_CONSTEXPR QUuid() noexcept : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {}
 
     Q_DECL_CONSTEXPR QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3,
-                           uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) Q_DECL_NOTHROW
+                           uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) noexcept
         : data1(l), data2(w1), data3(w2), data4{b1, b2, b3, b4, b5, b6, b7, b8} {}
 #else
-    QUuid() Q_DECL_NOTHROW
+    QUuid() noexcept
     {
         data1 = 0;
         data2 = 0;
@@ -107,7 +107,7 @@ public:
         for(int i = 0; i < 8; i++)
             data4[i] = 0;
     }
-    QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) Q_DECL_NOTHROW
+    QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) noexcept
     {
         data1 = l;
         data2 = w1;
@@ -124,8 +124,8 @@ public:
 #endif
 
     QUuid(const QString &);
-    static QUuid fromString(QStringView string) Q_DECL_NOTHROW;
-    static QUuid fromString(QLatin1String string) Q_DECL_NOTHROW;
+    static QUuid fromString(QStringView string) noexcept;
+    static QUuid fromString(QLatin1String string) noexcept;
     QUuid(const char *);
     QString toString() const;
     QString toString(StringFormat mode) const; // ### Qt6: merge with previous
@@ -134,9 +134,9 @@ public:
     QByteArray toByteArray(StringFormat mode) const; // ### Qt6: merge with previous
     QByteArray toRfc4122() const;
     static QUuid fromRfc4122(const QByteArray &);
-    bool isNull() const Q_DECL_NOTHROW;
+    bool isNull() const noexcept;
 
-    Q_DECL_RELAXED_CONSTEXPR bool operator==(const QUuid &orig) const Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR bool operator==(const QUuid &orig) const noexcept
     {
         if (data1 != orig.data1 || data2 != orig.data2 ||
              data3 != orig.data3)
@@ -149,24 +149,24 @@ public:
         return true;
     }
 
-    Q_DECL_RELAXED_CONSTEXPR bool operator!=(const QUuid &orig) const Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR bool operator!=(const QUuid &orig) const noexcept
     {
         return !(*this == orig);
     }
 
-    bool operator<(const QUuid &other) const Q_DECL_NOTHROW;
-    bool operator>(const QUuid &other) const Q_DECL_NOTHROW;
+    bool operator<(const QUuid &other) const noexcept;
+    bool operator>(const QUuid &other) const noexcept;
 
 #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
     // On Windows we have a type GUID that is used by the platform API, so we
     // provide convenience operators to cast from and to this type.
 #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_CLANG_QDOC)
-    Q_DECL_CONSTEXPR QUuid(const GUID &guid) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QUuid(const GUID &guid) noexcept
         : data1(guid.Data1), data2(guid.Data2), data3(guid.Data3),
           data4{guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3],
                 guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]} {}
 #else
-    QUuid(const GUID &guid) Q_DECL_NOTHROW
+    QUuid(const GUID &guid) noexcept
     {
         data1 = guid.Data1;
         data2 = guid.Data2;
@@ -176,24 +176,24 @@ public:
     }
 #endif
 
-    Q_DECL_RELAXED_CONSTEXPR QUuid &operator=(const GUID &guid) Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR QUuid &operator=(const GUID &guid) noexcept
     {
         *this = QUuid(guid);
         return *this;
     }
 
-    Q_DECL_RELAXED_CONSTEXPR operator GUID() const Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR operator GUID() const noexcept
     {
         GUID guid = { data1, data2, data3, { data4[0], data4[1], data4[2], data4[3], data4[4], data4[5], data4[6], data4[7] } };
         return guid;
     }
 
-    Q_DECL_RELAXED_CONSTEXPR bool operator==(const GUID &guid) const Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR bool operator==(const GUID &guid) const noexcept
     {
         return *this == QUuid(guid);
     }
 
-    Q_DECL_RELAXED_CONSTEXPR bool operator!=(const GUID &guid) const Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR bool operator!=(const GUID &guid) const noexcept
     {
         return !(*this == guid);
     }
@@ -216,8 +216,8 @@ public:
     }
 
 
-    QUuid::Variant variant() const Q_DECL_NOTHROW;
-    QUuid::Version version() const Q_DECL_NOTHROW;
+    QUuid::Variant variant() const noexcept;
+    QUuid::Version version() const noexcept;
 
 #if defined(Q_OS_DARWIN) || defined(Q_CLANG_QDOC)
     static QUuid fromCFUUID(CFUUIDRef uuid);
@@ -243,11 +243,11 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QUuid &);
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QUuid &);
 #endif
 
-Q_CORE_EXPORT uint qHash(const QUuid &uuid, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT uint qHash(const QUuid &uuid, uint seed = 0) noexcept;
 
-inline bool operator<=(const QUuid &lhs, const QUuid &rhs) Q_DECL_NOTHROW
+inline bool operator<=(const QUuid &lhs, const QUuid &rhs) noexcept
 { return !(rhs < lhs); }
-inline bool operator>=(const QUuid &lhs, const QUuid &rhs) Q_DECL_NOTHROW
+inline bool operator>=(const QUuid &lhs, const QUuid &rhs) noexcept
 { return !(lhs < rhs); }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp
index 288446878c..9053618014 100644
--- a/src/corelib/serialization/qcborvalue.cpp
+++ b/src/corelib/serialization/qcborvalue.cpp
@@ -766,8 +766,8 @@ static void writeDoubleToCbor(QCborStreamWriter &writer, double d, QCborValue::E
     if (qt_is_nan(d)) {
         if (opt & QCborValue::UseFloat16) {
             if ((opt & QCborValue::UseFloat16) == QCborValue::UseFloat16)
-                return writer.append(qfloat16(qt_qnan()));
-            return writer.append(float(qt_qnan()));
+                return writer.append(std::numeric_limits<qfloat16>::quiet_NaN());
+            return writer.append(std::numeric_limits<float>::quiet_NaN());
         }
         return writer.append(qt_qnan());
     }
@@ -849,7 +849,7 @@ QCborContainerPrivate *QCborContainerPrivate::clone(QCborContainerPrivate *d, qs
 
 QCborContainerPrivate *QCborContainerPrivate::detach(QCborContainerPrivate *d, qsizetype reserved)
 {
-    if (!d || d->ref.load() != 1)
+    if (!d || d->ref.loadRelaxed() != 1)
         return clone(d, reserved);
     return d;
 }
@@ -884,12 +884,12 @@ void QCborContainerPrivate::replaceAt_complex(Element &e, const QCborValue &valu
 
         // detect self-assignment
         if (Q_UNLIKELY(this == value.container)) {
-            Q_ASSERT(ref.load() >= 2);
+            Q_ASSERT(ref.loadRelaxed() >= 2);
             if (disp == MoveContainer)
                 ref.deref();    // not deref() because it can't drop to 0
             QCborContainerPrivate *d = QCborContainerPrivate::clone(this);
             d->elements.detach();
-            d->ref.store(1);
+            d->ref.storeRelaxed(1);
             e.container = d;
         } else {
             e.container = value.container;
@@ -915,7 +915,7 @@ void QCborContainerPrivate::replaceAt_complex(Element &e, const QCborValue &valu
 // in qstring.cpp
 void qt_to_latin1_unchecked(uchar *dst, const ushort *uc, qsizetype len);
 
-Q_NEVER_INLINE void QCborContainerPrivate::appendAsciiString(const QString &s)
+Q_NEVER_INLINE void QCborContainerPrivate::appendAsciiString(QStringView s)
 {
     qsizetype len = s.size();
     QtCbor::Element e;
@@ -926,7 +926,7 @@ Q_NEVER_INLINE void QCborContainerPrivate::appendAsciiString(const QString &s)
 
     char *ptr = data.data() + e.value + sizeof(ByteData);
     uchar *l = reinterpret_cast<uchar *>(ptr);
-    const ushort *uc = (const ushort *)s.unicode();
+    const ushort *uc = (const ushort *)s.utf16();
     qt_to_latin1_unchecked(l, uc, len);
 }
 
@@ -1368,7 +1368,7 @@ static Element decodeBasicValueFromCbor(QCborStreamReader &reader)
 static inline QCborContainerPrivate *createContainerFromCbor(QCborStreamReader &reader)
 {
     auto d = new QCborContainerPrivate;
-    d->ref.store(1);
+    d->ref.storeRelaxed(1);
     d->decodeFromCbor(reader);
     return d;
 }
@@ -1643,20 +1643,30 @@ QCborValue::QCborValue(const QByteArray &ba)
     : n(0), container(new QCborContainerPrivate), t(ByteArray)
 {
     container->appendByteData(ba.constData(), ba.size(), t);
-    container->ref.store(1);
+    container->ref.storeRelaxed(1);
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Creates a QCborValue with string value \a s. The value can later be
     retrieved using toString().
 
     \sa toString(), isString(), isByteArray()
  */
-QCborValue::QCborValue(const QString &s)
+QCborValue::QCborValue(const QString &s) : QCborValue(qToStringViewIgnoringNull(s)) {}
+#endif
+
+/*!
+    Creates a QCborValue with string value \a s. The value can later be
+    retrieved using toString().
+
+    \sa toString(), isString(), isByteArray()
+*/
+QCborValue::QCborValue(QStringView s)
     : n(0), container(new QCborContainerPrivate), t(String)
 {
     container->append(s);
-    container->ref.store(1);
+    container->ref.storeRelaxed(1);
 }
 
 /*!
@@ -1671,7 +1681,7 @@ QCborValue::QCborValue(QLatin1String s)
     : n(0), container(new QCborContainerPrivate), t(String)
 {
     container->append(s);
-    container->ref.store(1);
+    container->ref.storeRelaxed(1);
 }
 
 /*!
@@ -1719,7 +1729,7 @@ QCborValue::QCborValue(const QCborMap &m)
 QCborValue::QCborValue(QCborTag t, const QCborValue &tv)
     : n(-1), container(new QCborContainerPrivate), t(Tag)
 {
-    container->ref.store(1);
+    container->ref.storeRelaxed(1);
     container->append(t);
     container->append(tv);
 }
@@ -2941,7 +2951,7 @@ static QDebug debugContents(QDebug &dbg, const QCborValue &v)
     }
     if (v.isSimpleType())
         return dbg << v.toSimpleType();
-    return dbg << "<unknown type " << hex << int(v.type()) << dec << '>';
+    return dbg << "<unknown type " << Qt::hex << int(v.type()) << Qt::dec << '>';
 }
 QDebug operator<<(QDebug dbg, const QCborValue &v)
 {
diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h
index f542e44c47..f79fc572c4 100644
--- a/src/corelib/serialization/qcborvalue.h
+++ b/src/corelib/serialization/qcborvalue.h
@@ -143,7 +143,10 @@ public:
     QCborValue(QCborSimpleType st) : t(type_helper(st)) {}
 
     QCborValue(const QByteArray &ba);
+#if QT_STRINGVIEW_LEVEL < 2
     QCborValue(const QString &s);
+#endif
+    QCborValue(QStringView s);
     QCborValue(QLatin1String s);
 #ifndef QT_NO_CAST_FROM_ASCII
     QT_ASCII_CAST_WARN QCborValue(const char *s) : QCborValue(QString::fromUtf8(s)) {}
diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h
index 4050d18fa9..590c2d6e05 100644
--- a/src/corelib/serialization/qcborvalue_p.h
+++ b/src/corelib/serialization/qcborvalue_p.h
@@ -245,13 +245,21 @@ public:
         appendByteData(s.latin1(), s.size(), QCborValue::String,
                        QtCbor::Element::StringIsAscii);
     }
-    void appendAsciiString(const QString &s);
+    void appendAsciiString(QStringView s);
+
+#if QT_STRINGVIEW_LEVEL < 2
     void append(const QString &s)
     {
+        append(qToStringViewIgnoringNull(s));
+    }
+#endif
+
+    void append(QStringView s)
+    {
         if (QtPrivate::isAscii(s))
             appendAsciiString(s);
         else
-            appendByteData(reinterpret_cast<const char *>(s.constData()), s.size() * 2,
+            appendByteData(reinterpret_cast<const char *>(s.utf16()), s.size() * 2,
                            QCborValue::String, QtCbor::Element::StringIsUtf16);
     }
     void append(const QCborValue &v)
@@ -345,33 +353,41 @@ public:
         return e;
     }
 
-    bool stringEqualsElement(qsizetype idx, QLatin1String s) const
+    static int compareUtf8(const QtCbor::ByteData *b, const QLatin1String &s)
     {
-        const auto &e = elements.at(idx);
-        if (e.type != QCborValue::String)
-            return false;
-
-        const QtCbor::ByteData *b = byteData(idx);
-        if (!b)
-            return s.isEmpty();
+        return QUtf8::compareUtf8(b->byte(), b->len, s);
+    }
 
-        if (e.flags & QtCbor::Element::StringIsUtf16)
-            return QtPrivate::compareStrings(b->asStringView(), s) == 0;
-        return QUtf8::compareUtf8(b->byte(), b->len, s) == 0;
+    static int compareUtf8(const QtCbor::ByteData *b, QStringView s)
+    {
+        return QUtf8::compareUtf8(b->byte(), b->len, s.data(), s.size());
     }
-    bool stringEqualsElement(qsizetype idx, const QString &s) const
+
+    template<typename String>
+    int stringCompareElement(const QtCbor::Element &e, String s) const
     {
-        const auto &e = elements.at(idx);
         if (e.type != QCborValue::String)
-            return false;
+            return int(e.type) - int(QCborValue::String);
 
-        const QtCbor::ByteData *b = byteData(idx);
+        const QtCbor::ByteData *b = byteData(e);
         if (!b)
-            return s.isEmpty();
+            return s.isEmpty() ? 0 : -1;
 
         if (e.flags & QtCbor::Element::StringIsUtf16)
-            return QtPrivate::compareStrings(b->asStringView(), s) == 0;
-        return QUtf8::compareUtf8(b->byte(), b->len, s.data(), s.size()) == 0;
+            return QtPrivate::compareStrings(b->asStringView(), s);
+        return compareUtf8(b, s);
+    }
+
+    template<typename String>
+    bool stringEqualsElement(const QtCbor::Element &e, String s) const
+    {
+        return stringCompareElement(e, s) == 0;
+    }
+
+    template<typename String>
+    bool stringEqualsElement(qsizetype idx, String s) const
+    {
+        return stringEqualsElement(elements.at(idx), s);
     }
 
     static int compareElement_helper(const QCborContainerPrivate *c1, QtCbor::Element e1,
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index 02c1d1c573..b3330d6cea 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -98,6 +98,10 @@ QT_BEGIN_NAMESPACE
     ensures that you get integers of the size you want and insulates
     you from compiler and platform differences.
 
+    Enumerations can be serialized through QDataStream without the
+    need of manually defining streaming operators. Enum classes are
+    serialized using the declared size.
+
     To take one example, a \c{char *} string is written as a 32-bit
     integer equal to the length of the string including the '\\0' byte,
     followed by all the characters of the string including the
@@ -273,7 +277,7 @@ QT_BEGIN_NAMESPACE
 
 QDataStream::QDataStream()
 {
-    dev = 0;
+    dev = nullptr;
     owndev = false;
     byteorder = BigEndian;
     ver = Qt_DefaultCompiledVersion;
@@ -429,7 +433,7 @@ bool QDataStream::atEnd() const
 */
 QDataStream::FloatingPointPrecision QDataStream::floatingPointPrecision() const
 {
-    return d == 0 ? QDataStream::DoublePrecision : d->floatingPointPrecision;
+    return d ? d->floatingPointPrecision : QDataStream::DoublePrecision;
 }
 
 /*!
@@ -454,7 +458,7 @@ QDataStream::FloatingPointPrecision QDataStream::floatingPointPrecision() const
 */
 void QDataStream::setFloatingPointPrecision(QDataStream::FloatingPointPrecision precision)
 {
-    if (d == 0)
+    if (!d)
         d.reset(new QDataStreamPrivate());
     d->floatingPointPrecision = precision;
 }
@@ -561,6 +565,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
     \value Qt_5_11 Same as Qt_5_6
     \value Qt_5_12 Version 18 (Qt 5.12)
     \value Qt_5_13 Version 19 (Qt 5.13)
+    \value Qt_5_14 Same as Qt_5_13
     \omitvalue Qt_DefaultCompiledVersion
 
     \sa setVersion(), version()
@@ -634,7 +639,7 @@ void QDataStream::startTransaction()
 {
     CHECK_STREAM_PRECOND(Q_VOID)
 
-    if (d == 0)
+    if (!d)
         d.reset(new QDataStreamPrivate());
 
     if (++d->transactionDepth == 1) {
@@ -1038,7 +1043,7 @@ QDataStream &QDataStream::operator>>(char *&s)
 
 QDataStream &QDataStream::readBytes(char *&s, uint &l)
 {
-    s = 0;
+    s = nullptr;
     l = 0;
     CHECK_STREAM_PRECOND(*this)
 
@@ -1049,8 +1054,8 @@ QDataStream &QDataStream::readBytes(char *&s, uint &l)
 
     const quint32 Step = 1024 * 1024;
     quint32 allocated = 0;
-    char *prevBuf = 0;
-    char *curBuf = 0;
+    char *prevBuf = nullptr;
+    char *curBuf = nullptr;
 
     do {
         int blockSize = qMin(Step, len - allocated);
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index 81134f74b0..cfcd89333b 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -55,7 +55,6 @@ class QByteArray;
 class QIODevice;
 
 template <typename T> class QList;
-template <typename T> class QLinkedList;
 template <typename T> class QVector;
 template <typename T> class QSet;
 template <class Key, class T> class QHash;
@@ -100,10 +99,19 @@ public:
         Qt_5_11 = Qt_5_10,
         Qt_5_12 = 18,
         Qt_5_13 = 19,
-#if QT_VERSION >= 0x050e00
+        Qt_5_14 = Qt_5_13,
+#if QT_VERSION >= 0x050f00
+        Qt_5_15 = Qt_5_14,
+        Qt_DefaultCompiledVersion = Qt_5_15
+#elif QT_VERSION >= 0x060000
+        Qt_6_0 = Qt_5_15,
+        Qt_DefaultCompiledVersion = Qt_6_0
+#else
+        Qt_DefaultCompiledVersion = Qt_5_14
+#endif
+#if QT_VERSION >= 0x060100
 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
 #endif
-        Qt_DefaultCompiledVersion = Qt_5_13
     };
 
     enum ByteOrder {
@@ -377,25 +385,23 @@ inline QDataStream &operator>>(QDataStream &s, QFlags<Enum> &e)
 { return s >> e.i; }
 
 template <typename T>
-inline QDataStream &operator>>(QDataStream &s, QList<T> &l)
-{
-    return QtPrivate::readArrayBasedContainer(s, l);
-}
+typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
+operator<<(QDataStream &s, const T &t)
+{ return s << static_cast<typename std::underlying_type<T>::type>(t); }
 
 template <typename T>
-inline QDataStream &operator<<(QDataStream &s, const QList<T> &l)
-{
-    return QtPrivate::writeSequentialContainer(s, l);
-}
+typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
+operator>>(QDataStream &s, T &t)
+{ return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); }
 
 template <typename T>
-inline QDataStream &operator>>(QDataStream &s, QLinkedList<T> &l)
+inline QDataStream &operator>>(QDataStream &s, QList<T> &l)
 {
-    return QtPrivate::readListBasedContainer(s, l);
+    return QtPrivate::readArrayBasedContainer(s, l);
 }
 
 template <typename T>
-inline QDataStream &operator<<(QDataStream &s, const QLinkedList<T> &l)
+inline QDataStream &operator<<(QDataStream &s, const QList<T> &l)
 {
     return QtPrivate::writeSequentialContainer(s, l);
 }
diff --git a/src/corelib/serialization/qjson.cpp b/src/corelib/serialization/qjson.cpp
index d74ffb2a20..76f1eae1ce 100644
--- a/src/corelib/serialization/qjson.cpp
+++ b/src/corelib/serialization/qjson.cpp
@@ -175,7 +175,7 @@ void Base::removeItems(int pos, int numItems)
     length -= numItems;
 }
 
-int Object::indexOf(const QString &key, bool *exists) const
+int Object::indexOf(QStringView key, bool *exists) const
 {
     int min = 0;
     int n = length;
@@ -257,7 +257,7 @@ bool Array::isValid(int maxSize) const
 }
 
 
-bool Entry::operator ==(const QString &key) const
+bool Entry::operator ==(QStringView key) const
 {
     if (value.latinKey)
         return (shallowLatin1Key() == key);
@@ -270,7 +270,7 @@ bool Entry::operator==(QLatin1String key) const
     if (value.latinKey)
         return shallowLatin1Key() == key;
     else
-        return shallowKey() == key;
+        return shallowKey() == QString(key); // ### conversion to QString
 }
 
 bool Entry::operator ==(const Entry &other) const
diff --git a/src/corelib/serialization/qjson_p.h b/src/corelib/serialization/qjson_p.h
index 40b2414e4a..7978bed7da 100644
--- a/src/corelib/serialization/qjson_p.h
+++ b/src/corelib/serialization/qjson_p.h
@@ -66,11 +66,13 @@
 
 #include <limits.h>
 #include <limits>
+#include <type_traits>
 
 QT_BEGIN_NAMESPACE
 
 // in qstring.cpp
 void qt_to_latin1_unchecked(uchar *dst, const ushort *uc, qsizetype len);
+void qt_from_latin1(ushort *dst, const char *str, size_t size) noexcept;
 
 /*
   This defines a binary data structure for Json data. The data structure is optimised for fast reading
@@ -153,16 +155,24 @@ typedef qle_uint offset;
 // round the size up to the next 4 byte boundary
 inline int alignedSize(int size) { return (size + 3) & ~3; }
 
-static inline bool useCompressed(const QString &s)
+const int MaxLatin1Length = 0x7fff;
+
+static inline bool useCompressed(QStringView s)
 {
-    if (s.length() >= 0x8000)
+    if (s.length() > MaxLatin1Length)
         return false;
     return QtPrivate::isLatin1(s);
 }
 
-static inline int qStringSize(const QString &string, bool compress)
+static inline bool useCompressed(QLatin1String s)
+{
+    return s.size() <= MaxLatin1Length;
+}
+
+template <typename T>
+static inline int qStringSize(T string, bool compress)
 {
-    int l = 2 + string.length();
+    int l = 2 + string.size();
     if (!compress)
         l *= 2;
     return alignedSize(l);
@@ -214,37 +224,49 @@ public:
         return maxSize >= 0 && uint(d->length) <= maxSize / sizeof(ushort);
     }
 
-    inline String &operator=(const QString &str)
+    inline String &operator=(QStringView str)
     {
         d->length = str.length();
+        qToLittleEndian<quint16>(str.utf16(), str.length(), d->utf16);
+        fillTrailingZeros();
+        return *this;
+    }
+
+    inline String &operator=(QLatin1String str)
+    {
+        d->length = str.size();
 #if Q_BYTE_ORDER == Q_BIG_ENDIAN
-        const ushort *uc = (const ushort *)str.unicode();
-        for (int i = 0; i < str.length(); ++i)
-            d->utf16[i] = uc[i];
+        for (int i = 0; i < str.size(); ++i)
+            d->utf16[i] = str[i].unicode();
 #else
-        memcpy(d->utf16, str.unicode(), str.length()*sizeof(ushort));
+        qt_from_latin1((ushort *)d->utf16, str.data(), str.size());
 #endif
-        if (str.length() & 1)
-            d->utf16[str.length()] = 0;
+        fillTrailingZeros();
         return *this;
     }
 
-    inline bool operator ==(const QString &str) const {
+    void fillTrailingZeros()
+    {
+        if (d->length & 1)
+            d->utf16[d->length] = 0;
+    }
+
+    inline bool operator ==(QStringView str) const {
         int slen = str.length();
         int l = d->length;
         if (slen != l)
             return false;
-        const ushort *s = (const ushort *)str.constData();
+        const ushort *s = (const ushort *)str.utf16();
         const qle_ushort *a = d->utf16;
         const ushort *b = s;
         while (l-- && *a == *b)
             a++,b++;
         return (l == -1);
     }
-    inline bool operator !=(const QString &str) const {
+    inline bool operator !=(QStringView str) const {
         return !operator ==(str);
     }
-    inline bool operator >=(const QString &str) const {
+    inline bool operator >=(QStringView str) const {
         // ###
         return toString() >= str;
     }
@@ -292,19 +314,35 @@ public:
         return byteSize() <= maxSize;
     }
 
-    inline Latin1String &operator=(const QString &str)
+    inline Latin1String &operator=(QStringView str)
     {
         int len = d->length = str.length();
         uchar *l = (uchar *)d->latin1;
-        const ushort *uc = (const ushort *)str.unicode();
+        const ushort *uc = (const ushort *)str.utf16();
         qt_to_latin1_unchecked(l, uc, len);
 
-        for ( ; (quintptr)(l+len) & 0x3; ++len)
-            l[len] = 0;
+        fillTrailingZeros();
         return *this;
     }
 
-    QLatin1String toQLatin1String() const Q_DECL_NOTHROW {
+    inline Latin1String &operator=(QLatin1String str)
+    {
+        int len = d->length = str.size();
+        uchar *l = (uchar *)d->latin1;
+        memcpy(l, str.data(), len);
+
+        fillTrailingZeros();
+        return *this;
+    }
+
+    void fillTrailingZeros()
+    {
+        uchar *l = (uchar *)d->latin1;
+        for (int len = d->length; (quintptr)(l + len) & 0x3; ++len)
+            l[len] = 0;
+    }
+
+    QLatin1String toQLatin1String() const noexcept {
         return QLatin1String(d->latin1, d->length);
     }
 
@@ -339,23 +377,23 @@ public:
 };
 
 #define DEF_OP(op) \
-    inline bool operator op(Latin1String lhs, Latin1String rhs) Q_DECL_NOTHROW \
+    inline bool operator op(Latin1String lhs, Latin1String rhs) noexcept \
     { \
         return lhs.toQLatin1String() op rhs.toQLatin1String(); \
     } \
-    inline bool operator op(QLatin1String lhs, Latin1String rhs) Q_DECL_NOTHROW \
+    inline bool operator op(QLatin1String lhs, Latin1String rhs) noexcept \
     { \
         return lhs op rhs.toQLatin1String(); \
     } \
-    inline bool operator op(Latin1String lhs, QLatin1String rhs) Q_DECL_NOTHROW \
+    inline bool operator op(Latin1String lhs, QLatin1String rhs) noexcept \
     { \
         return lhs.toQLatin1String() op rhs; \
     } \
-    inline bool operator op(const QString &lhs, Latin1String rhs) Q_DECL_NOTHROW \
+    inline bool operator op(QStringView lhs, Latin1String rhs) noexcept \
     { \
         return lhs op rhs.toQLatin1String(); \
     } \
-    inline bool operator op(Latin1String lhs, const QString &rhs) Q_DECL_NOTHROW \
+    inline bool operator op(Latin1String lhs, QStringView rhs) noexcept \
     { \
         return lhs.toQLatin1String() op rhs; \
     } \
@@ -419,7 +457,8 @@ inline bool String::operator<(const Latin1String &str) const
 
 }
 
-static inline void copyString(char *dest, const QString &str, bool compress)
+template <typename T>
+static inline void copyString(char *dest, T str, bool compress)
 {
     if (compress) {
         Latin1String string(dest);
@@ -469,7 +508,7 @@ public:
     Entry *entryAt(int i) const {
         return reinterpret_cast<Entry *>(((char *)this) + table()[i]);
     }
-    int indexOf(const QString &key, bool *exists) const;
+    int indexOf(QStringView key, bool *exists) const;
     int indexOf(QLatin1String key, bool *exists) const;
 
     bool isValid(int maxSize) const;
@@ -577,9 +616,9 @@ public:
         return shallowKey().isValid(maxSize);
     }
 
-    bool operator ==(const QString &key) const;
-    inline bool operator !=(const QString &key) const { return !operator ==(key); }
-    inline bool operator >=(const QString &key) const;
+    bool operator ==(QStringView key) const;
+    inline bool operator !=(QStringView key) const { return !operator ==(key); }
+    inline bool operator >=(QStringView key) const;
 
     bool operator==(QLatin1String key) const;
     inline bool operator!=(QLatin1String key) const { return !operator ==(key); }
@@ -589,7 +628,7 @@ public:
     bool operator >=(const Entry &other) const;
 };
 
-inline bool Entry::operator >=(const QString &key) const
+inline bool Entry::operator >=(QStringView key) const
 {
     if (value.latinKey)
         return (shallowLatin1Key() >= key);
@@ -602,10 +641,10 @@ inline bool Entry::operator >=(QLatin1String key) const
     if (value.latinKey)
         return shallowLatin1Key() >= key;
     else
-        return shallowKey() >= key;
+        return shallowKey() >= QString(key); // ### conversion to QString
 }
 
-inline bool operator <(const QString &key, const Entry &e)
+inline bool operator <(QStringView key, const Entry &e)
 { return e >= key; }
 
 inline bool operator<(QLatin1String key, const Entry &e)
@@ -686,7 +725,7 @@ public:
     {
     }
     inline Data(int reserved, QJsonValue::Type valueType)
-        : rawData(0), compactionCounter(0), ownsData(true)
+        : rawData(nullptr), compactionCounter(0), ownsData(true)
     {
         Q_ASSERT(valueType == QJsonValue::Array || valueType == QJsonValue::Object);
 
@@ -719,7 +758,7 @@ public:
     Data *clone(Base *b, int reserve = 0)
     {
         int size = sizeof(Header) + b->size;
-        if (b == header->root() && ref.load() == 1 && alloc >= size + reserve)
+        if (b == header->root() && ref.loadRelaxed() == 1 && alloc >= size + reserve)
             return this;
 
         if (reserve) {
@@ -728,7 +767,7 @@ public:
             size = qMax(size + reserve, qMin(size *2, (int)Value::MaxSize));
             if (size > Value::MaxSize) {
                 qWarning("QJson: Document too large to store in data structure");
-                return 0;
+                return nullptr;
             }
         }
         char *raw = (char *)malloc(size);
diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp
index f5f02b886a..9636ac5856 100644
--- a/src/corelib/serialization/qjsonarray.cpp
+++ b/src/corelib/serialization/qjsonarray.cpp
@@ -132,7 +132,7 @@ QT_BEGIN_NAMESPACE
     Creates an empty array.
  */
 QJsonArray::QJsonArray()
-    : d(0), a(0)
+    : d(nullptr), a(nullptr)
 {
 }
 
@@ -168,8 +168,8 @@ QJsonArray::QJsonArray(QJsonPrivate::Data *data, QJsonPrivate::Array *array)
  */
 void QJsonArray::initialize()
 {
-    d = 0;
-    a = 0;
+    d = nullptr;
+    a = nullptr;
 }
 
 /*!
@@ -1226,7 +1226,7 @@ bool QJsonArray::detach2(uint reserve)
         d->ref.ref();
         return true;
     }
-    if (reserve == 0 && d->ref.load() == 1)
+    if (reserve == 0 && d->ref.loadRelaxed() == 1)
         return true;
 
     QJsonPrivate::Data *x = d->clone(a, reserve);
diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h
index ba346fb848..983a6753b5 100644
--- a/src/corelib/serialization/qjsonarray.h
+++ b/src/corelib/serialization/qjsonarray.h
@@ -42,9 +42,7 @@
 
 #include <QtCore/qjsonvalue.h>
 #include <QtCore/qiterator.h>
-#if defined(Q_COMPILER_INITIALIZER_LISTS)
 #include <initializer_list>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -58,21 +56,19 @@ class Q_CORE_EXPORT QJsonArray
 public:
     QJsonArray();
 
-#if defined(Q_COMPILER_INITIALIZER_LISTS) || defined(Q_QDOC)
     QJsonArray(std::initializer_list<QJsonValue> args)
     {
         initialize();
         for (std::initializer_list<QJsonValue>::const_iterator i = args.begin(); i != args.end(); ++i)
             append(*i);
     }
-#endif
 
     ~QJsonArray();
 
     QJsonArray(const QJsonArray &other);
     QJsonArray &operator =(const QJsonArray &other);
 
-    QJsonArray(QJsonArray &&other) Q_DECL_NOTHROW
+    QJsonArray(QJsonArray &&other) noexcept
         : d(other.d),
           a(other.a)
     {
@@ -80,7 +76,7 @@ public:
         other.a = nullptr;
     }
 
-    QJsonArray &operator =(QJsonArray &&other) Q_DECL_NOTHROW
+    QJsonArray &operator =(QJsonArray &&other) noexcept
     {
         swap(other);
         return *this;
@@ -115,7 +111,7 @@ public:
     bool operator==(const QJsonArray &other) const;
     bool operator!=(const QJsonArray &other) const;
 
-    void swap(QJsonArray &other) Q_DECL_NOTHROW
+    void swap(QJsonArray &other) noexcept
     {
         qSwap(d, other.d);
         qSwap(a, other.a);
diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp
index ed7c3f21f1..8c3818caff 100644
--- a/src/corelib/serialization/qjsondocument.cpp
+++ b/src/corelib/serialization/qjsondocument.cpp
@@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE
  * Constructs an empty and invalid document.
  */
 QJsonDocument::QJsonDocument()
-    : d(0)
+    : d(nullptr)
 {
 }
 
@@ -92,7 +92,7 @@ QJsonDocument::QJsonDocument()
  * Creates a QJsonDocument from \a object.
  */
 QJsonDocument::QJsonDocument(const QJsonObject &object)
-    : d(0)
+    : d(nullptr)
 {
     setObject(object);
 }
@@ -101,7 +101,7 @@ QJsonDocument::QJsonDocument(const QJsonObject &object)
  * Constructs a QJsonDocument from \a array.
  */
 QJsonDocument::QJsonDocument(const QJsonArray &array)
-    : d(0)
+    : d(nullptr)
 {
     setArray(array);
 }
@@ -236,7 +236,7 @@ const char *QJsonDocument::rawData(int *size) const
 {
     if (!d) {
         *size = 0;
-        return 0;
+        return nullptr;
     }
     *size = d->alloc;
     return d->rawData;
@@ -544,6 +544,7 @@ void QJsonDocument::setArray(const QJsonArray &array)
     d->ref.ref();
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Returns a QJsonValue representing the value for the key \a key.
 
@@ -558,6 +559,16 @@ void QJsonDocument::setArray(const QJsonArray &array)
  */
 const QJsonValue QJsonDocument::operator[](const QString &key) const
 {
+    return (*this)[QStringView(key)];
+}
+#endif
+
+/*!
+    \overload
+    \since 5.14
+*/
+const QJsonValue QJsonDocument::operator[](QStringView key) const
+{
     if (!isObject())
         return QJsonValue(QJsonValue::Undefined);
 
@@ -635,7 +646,7 @@ bool QJsonDocument::operator==(const QJsonDocument &other) const
  */
 bool QJsonDocument::isNull() const
 {
-    return (d == 0);
+    return (d == nullptr);
 }
 
 #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY)
diff --git a/src/corelib/serialization/qjsondocument.h b/src/corelib/serialization/qjsondocument.h
index a749439b7d..a8e7485f5d 100644
--- a/src/corelib/serialization/qjsondocument.h
+++ b/src/corelib/serialization/qjsondocument.h
@@ -93,19 +93,19 @@ public:
     QJsonDocument(const QJsonDocument &other);
     QJsonDocument &operator =(const QJsonDocument &other);
 
-    QJsonDocument(QJsonDocument &&other) Q_DECL_NOTHROW
+    QJsonDocument(QJsonDocument &&other) noexcept
         : d(other.d)
     {
         other.d = nullptr;
     }
 
-    QJsonDocument &operator =(QJsonDocument &&other) Q_DECL_NOTHROW
+    QJsonDocument &operator =(QJsonDocument &&other) noexcept
     {
         swap(other);
         return *this;
     }
 
-    void swap(QJsonDocument &other) Q_DECL_NOTHROW
+    void swap(QJsonDocument &other) noexcept
     {
         qSwap(d, other.d);
     }
@@ -146,7 +146,10 @@ public:
     void setObject(const QJsonObject &object);
     void setArray(const QJsonArray &array);
 
+#if QT_STRINGVIEW_LEVEL < 2
     const QJsonValue operator[](const QString &key) const;
+#endif
+    const QJsonValue operator[](QStringView key) const;
     const QJsonValue operator[](QLatin1String key) const;
     const QJsonValue operator[](int i) const;
 
diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp
index a9f25a119c..329bc4d2c9 100644
--- a/src/corelib/serialization/qjsonobject.cpp
+++ b/src/corelib/serialization/qjsonobject.cpp
@@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE
     \sa isEmpty()
  */
 QJsonObject::QJsonObject()
-    : d(0), o(0)
+    : d(nullptr), o(nullptr)
 {
 }
 
@@ -149,8 +149,8 @@ QJsonObject::QJsonObject(QJsonPrivate::Data *data, QJsonPrivate::Object *object)
 
 void QJsonObject::initialize()
 {
-    d = 0;
-    o = 0;
+    d = nullptr;
+    o = nullptr;
 }
 
 /*!
@@ -377,6 +377,7 @@ bool QJsonObject::isEmpty() const
     return !o->length;
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Returns a QJsonValue representing the value for the key \a key.
 
@@ -386,14 +387,17 @@ bool QJsonObject::isEmpty() const
  */
 QJsonValue QJsonObject::value(const QString &key) const
 {
-    if (!d)
-        return QJsonValue(QJsonValue::Undefined);
+    return value(QStringView(key));
+}
+#endif
 
-    bool keyExists;
-    int i = o->indexOf(key, &keyExists);
-    if (!keyExists)
-        return QJsonValue(QJsonValue::Undefined);
-    return QJsonValue(d, o, o->entryAt(i)->value);
+/*!
+    \overload
+    \since 5.14
+*/
+QJsonValue QJsonObject::value(QStringView key) const
+{
+    return valueImpl(key);
 }
 
 /*!
@@ -402,6 +406,15 @@ QJsonValue QJsonObject::value(const QString &key) const
 */
 QJsonValue QJsonObject::value(QLatin1String key) const
 {
+    return valueImpl(key);
+}
+
+/*!
+    \internal
+*/
+template <typename T>
+QJsonValue QJsonObject::valueImpl(T key) const
+{
     if (!d)
         return QJsonValue(QJsonValue::Undefined);
 
@@ -412,6 +425,7 @@ QJsonValue QJsonObject::value(QLatin1String key) const
     return QJsonValue(d, o, o->entryAt(i)->value);
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Returns a QJsonValue representing the value for the key \a key.
 
@@ -423,8 +437,16 @@ QJsonValue QJsonObject::value(QLatin1String key) const
  */
 QJsonValue QJsonObject::operator [](const QString &key) const
 {
-    return value(key);
+    return (*this)[QStringView(key)];
 }
+#endif
+
+/*!
+    \fn QJsonValue QJsonObject::operator [](QStringView key) const
+
+    \overload
+    \since 5.14
+*/
 
 /*!
     \fn QJsonValue QJsonObject::operator [](QLatin1String key) const
@@ -433,6 +455,7 @@ QJsonValue QJsonObject::operator [](const QString &key) const
     \since 5.7
 */
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Returns a reference to the value for \a key.
 
@@ -446,14 +469,17 @@ QJsonValue QJsonObject::operator [](const QString &key) const
  */
 QJsonValueRef QJsonObject::operator [](const QString &key)
 {
-    // ### somewhat inefficient, as we lookup the key twice if it doesn't yet exist
-    bool keyExists = false;
-    int index = o ? o->indexOf(key, &keyExists) : -1;
-    if (!keyExists) {
-        iterator i = insert(key, QJsonValue());
-        index = i.i;
-    }
-    return QJsonValueRef(this, index);
+    return (*this)[QStringView(key)];
+}
+#endif
+
+/*!
+    \overload
+    \since 5.14
+*/
+QJsonValueRef QJsonObject::operator [](QStringView key)
+{
+    return atImpl(key);
 }
 
 /*!
@@ -462,10 +488,25 @@ QJsonValueRef QJsonObject::operator [](const QString &key)
 */
 QJsonValueRef QJsonObject::operator [](QLatin1String key)
 {
-    // ### optimize me
-    return operator[](QString(key));
+    return atImpl(key);
+}
+
+/*!
+    \internal
+*/
+template <typename T>
+QJsonValueRef QJsonObject::atImpl(T key)
+{
+    bool keyExists = false;
+    int index = o ? o->indexOf(key, &keyExists) : 0;
+    if (!keyExists) {
+        iterator i = insertAt(index, key, QJsonValue(), false);
+        index = i.i;
+    }
+    return QJsonValueRef(this, index);
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Inserts a new item with the key \a key and a value of \a value.
 
@@ -481,10 +522,49 @@ QJsonValueRef QJsonObject::operator [](QLatin1String key)
  */
 QJsonObject::iterator QJsonObject::insert(const QString &key, const QJsonValue &value)
 {
+    return insert(QStringView(key), value);
+}
+#endif
+
+/*!
+    \overload
+    \since 5.14
+*/
+QJsonObject::iterator QJsonObject::insert(QStringView key, const QJsonValue &value)
+{
+    return insertImpl(key, value);
+}
+
+/*!
+    \overload
+    \since 5.14
+*/
+QJsonObject::iterator QJsonObject::insert(QLatin1String key, const QJsonValue &value)
+{
+    return insertImpl(key, value);
+}
+
+/*!
+    \internal
+*/
+template <typename T>
+QJsonObject::iterator QJsonObject::insertImpl(T key, const QJsonValue &value)
+{
     if (value.t == QJsonValue::Undefined) {
         remove(key);
         return end();
     }
+    bool keyExists = false;
+    int pos = o ? o->indexOf(key, &keyExists) : 0;
+    return insertAt(pos, key, value, keyExists);
+}
+
+/*!
+    \internal
+ */
+template <typename T>
+QJsonObject::iterator QJsonObject::insertAt(int pos, T key, const QJsonValue &value, bool keyExists)
+{
     QJsonValue val = value;
 
     bool latinOrIntValue;
@@ -500,8 +580,6 @@ QJsonObject::iterator QJsonObject::insert(const QString &key, const QJsonValue &
     if (!o->length)
         o->tableOffset = sizeof(QJsonPrivate::Object);
 
-    bool keyExists = false;
-    int pos = o->indexOf(key, &keyExists);
     if (keyExists)
         ++d->compactionCounter;
 
@@ -518,12 +596,12 @@ QJsonObject::iterator QJsonObject::insert(const QString &key, const QJsonValue &
     if (valueSize)
         QJsonPrivate::Value::copyData(val, (char *)e + valueOffset, latinOrIntValue);
 
-    if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(o->length) / 2u)
-        compact();
+    compactIfNeeded();
 
     return iterator(this, pos);
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Removes \a key from the object.
 
@@ -531,6 +609,34 @@ QJsonObject::iterator QJsonObject::insert(const QString &key, const QJsonValue &
  */
 void QJsonObject::remove(const QString &key)
 {
+    remove(QStringView(key));
+}
+#endif
+
+/*!
+    \overload
+    \since 5.14
+*/
+void QJsonObject::remove(QStringView key)
+{
+    removeImpl(key);
+}
+
+/*!
+    \overload
+    \since 5.14
+*/
+void QJsonObject::remove(QLatin1String key)
+{
+    removeImpl(key);
+}
+
+/*!
+    \internal
+*/
+template <typename T>
+void QJsonObject::removeImpl(T key)
+{
     if (!d)
         return;
 
@@ -539,13 +645,10 @@ void QJsonObject::remove(const QString &key)
     if (!keyExists)
         return;
 
-    detach2();
-    o->removeItems(index, 1);
-    ++d->compactionCounter;
-    if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(o->length) / 2u)
-        compact();
+    removeAt(index);
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Removes \a key from the object.
 
@@ -557,6 +660,34 @@ void QJsonObject::remove(const QString &key)
  */
 QJsonValue QJsonObject::take(const QString &key)
 {
+    return take(QStringView(key));
+}
+#endif
+
+/*!
+    \overload
+    \since 5.14
+*/
+QJsonValue QJsonObject::take(QStringView key)
+{
+    return takeImpl(key);
+}
+
+/*!
+    \overload
+    \since 5.14
+*/
+QJsonValue QJsonObject::take(QLatin1String key)
+{
+    return takeImpl(key);
+}
+
+/*!
+    \internal
+*/
+template <typename T>
+QJsonValue QJsonObject::takeImpl(T key)
+{
     if (!o)
         return QJsonValue(QJsonValue::Undefined);
 
@@ -566,15 +697,12 @@ QJsonValue QJsonObject::take(const QString &key)
         return QJsonValue(QJsonValue::Undefined);
 
     QJsonValue v(d, o, o->entryAt(index)->value);
-    detach2();
-    o->removeItems(index, 1);
-    ++d->compactionCounter;
-    if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(o->length) / 2u)
-        compact();
+    removeAt(index);
 
     return v;
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Returns \c true if the object contains key \a key.
 
@@ -582,12 +710,17 @@ QJsonValue QJsonObject::take(const QString &key)
  */
 bool QJsonObject::contains(const QString &key) const
 {
-    if (!o)
-        return false;
+    return contains(QStringView(key));
+}
+#endif
 
-    bool keyExists;
-    o->indexOf(key, &keyExists);
-    return keyExists;
+/*!
+    \overload
+    \since 5.14
+*/
+bool QJsonObject::contains(QStringView key) const
+{
+    return containsImpl(key);
 }
 
 /*!
@@ -596,6 +729,15 @@ bool QJsonObject::contains(const QString &key) const
 */
 bool QJsonObject::contains(QLatin1String key) const
 {
+    return containsImpl(key);
+}
+
+/*!
+    \internal
+*/
+template <typename T>
+bool QJsonObject::containsImpl(T key) const
+{
     if (!o)
         return false;
 
@@ -646,21 +788,19 @@ bool QJsonObject::operator!=(const QJsonObject &other) const
  */
 QJsonObject::iterator QJsonObject::erase(QJsonObject::iterator it)
 {
-    Q_ASSERT(d && d->ref.load() == 1);
+    Q_ASSERT(d && d->ref.loadRelaxed() == 1);
     if (it.o != this || it.i < 0 || it.i >= (int)o->length)
         return iterator(this, o->length);
 
     int index = it.i;
 
-    o->removeItems(index, 1);
-    ++d->compactionCounter;
-    if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(o->length) / 2u)
-        compact();
+    removeAt(index);
 
     // iterator hasn't changed
     return it;
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Returns an iterator pointing to the item with key \a key in the
     map.
@@ -670,12 +810,17 @@ QJsonObject::iterator QJsonObject::erase(QJsonObject::iterator it)
  */
 QJsonObject::iterator QJsonObject::find(const QString &key)
 {
-    bool keyExists = false;
-    int index = o ? o->indexOf(key, &keyExists) : 0;
-    if (!keyExists)
-        return end();
-    detach2();
-    return iterator(this, index);
+    return find(QStringView(key));
+}
+#endif
+
+/*!
+    \overload
+    \since 5.14
+*/
+QJsonObject::iterator QJsonObject::find(QStringView key)
+{
+    return findImpl(key);
 }
 
 /*!
@@ -684,6 +829,15 @@ QJsonObject::iterator QJsonObject::find(const QString &key)
 */
 QJsonObject::iterator QJsonObject::find(QLatin1String key)
 {
+    return findImpl(key);
+}
+
+/*!
+    \internal
+*/
+template <typename T>
+QJsonObject::iterator QJsonObject::findImpl(T key)
+{
     bool keyExists = false;
     int index = o ? o->indexOf(key, &keyExists) : 0;
     if (!keyExists)
@@ -692,10 +846,18 @@ QJsonObject::iterator QJsonObject::find(QLatin1String key)
     return iterator(this, index);
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*! \fn QJsonObject::const_iterator QJsonObject::find(const QString &key) const
 
     \overload
 */
+#endif
+
+/*! \fn QJsonObject::const_iterator QJsonObject::find(QStringView key) const
+
+    \overload
+    \since 5.14
+*/
 
 /*! \fn QJsonObject::const_iterator QJsonObject::find(QLatin1String key) const
 
@@ -703,6 +865,7 @@ QJsonObject::iterator QJsonObject::find(QLatin1String key)
     \since 5.7
 */
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Returns a const iterator pointing to the item with key \a key in the
     map.
@@ -712,11 +875,17 @@ QJsonObject::iterator QJsonObject::find(QLatin1String key)
  */
 QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const
 {
-    bool keyExists = false;
-    int index = o ? o->indexOf(key, &keyExists) : 0;
-    if (!keyExists)
-        return end();
-    return const_iterator(this, index);
+    return constFind(QStringView(key));
+}
+#endif
+
+/*!
+    \overload
+    \since 5.14
+*/
+QJsonObject::const_iterator QJsonObject::constFind(QStringView key) const
+{
+    return constFindImpl(key);
 }
 
 /*!
@@ -725,6 +894,15 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const
 */
 QJsonObject::const_iterator QJsonObject::constFind(QLatin1String key) const
 {
+    return constFindImpl(key);
+}
+
+/*!
+    \internal
+*/
+template <typename T>
+QJsonObject::const_iterator QJsonObject::constFindImpl(T key) const
+{
     bool keyExists = false;
     int index = o ? o->indexOf(key, &keyExists) : 0;
     if (!keyExists)
@@ -1231,7 +1409,7 @@ bool QJsonObject::detach2(uint reserve)
         d->ref.ref();
         return true;
     }
-    if (reserve == 0 && d->ref.load() == 1)
+    if (reserve == 0 && d->ref.loadRelaxed() == 1)
         return true;
 
     QJsonPrivate::Data *x = d->clone(o, reserve);
@@ -1261,6 +1439,15 @@ void QJsonObject::compact()
 /*!
     \internal
  */
+void QJsonObject::compactIfNeeded()
+{
+    if (d->compactionCounter > 32u && d->compactionCounter >= unsigned(o->length) / 2u)
+        compact();
+}
+
+/*!
+    \internal
+ */
 QString QJsonObject::keyAt(int i) const
 {
     Q_ASSERT(o && i >= 0 && i < (int)o->length);
@@ -1289,7 +1476,21 @@ void QJsonObject::setValueAt(int i, const QJsonValue &val)
     Q_ASSERT(o && i >= 0 && i < (int)o->length);
 
     QJsonPrivate::Entry *e = o->entryAt(i);
-    insert(e->key(), val);
+    if (val.t == QJsonValue::Undefined)
+        removeAt(i);
+    else
+        insertAt(i, e->key(), val, true);
+}
+
+/*!
+    \internal
+ */
+void QJsonObject::removeAt(int index)
+{
+    detach2();
+    o->removeItems(index, 1);
+    ++d->compactionCounter;
+    compactIfNeeded();
 }
 
 uint qHash(const QJsonObject &object, uint seed)
diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h
index 80fe6b2f3f..05463f6f36 100644
--- a/src/corelib/serialization/qjsonobject.h
+++ b/src/corelib/serialization/qjsonobject.h
@@ -42,10 +42,8 @@
 
 #include <QtCore/qjsonvalue.h>
 #include <QtCore/qiterator.h>
-#ifdef Q_COMPILER_INITIALIZER_LISTS
 #include <QtCore/qpair.h>
 #include <initializer_list>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -60,34 +58,32 @@ class Q_CORE_EXPORT QJsonObject
 public:
     QJsonObject();
 
-#if defined(Q_COMPILER_INITIALIZER_LISTS) || defined(Q_QDOC)
     QJsonObject(std::initializer_list<QPair<QString, QJsonValue> > args)
     {
         initialize();
         for (std::initializer_list<QPair<QString, QJsonValue> >::const_iterator i = args.begin(); i != args.end(); ++i)
             insert(i->first, i->second);
     }
-#endif
 
     ~QJsonObject();
 
     QJsonObject(const QJsonObject &other);
     QJsonObject &operator =(const QJsonObject &other);
 
-    QJsonObject(QJsonObject &&other) Q_DECL_NOTHROW
+    QJsonObject(QJsonObject &&other) noexcept
         : d(other.d), o(other.o)
     {
         other.d = nullptr;
         other.o = nullptr;
     }
 
-    QJsonObject &operator =(QJsonObject &&other) Q_DECL_NOTHROW
+    QJsonObject &operator =(QJsonObject &&other) noexcept
     {
         swap(other);
         return *this;
     }
 
-    void swap(QJsonObject &other) Q_DECL_NOTHROW
+    void swap(QJsonObject &other) noexcept
     {
         qSwap(d, other.d);
         qSwap(o, other.o);
@@ -104,16 +100,28 @@ public:
     inline int length() const { return size(); }
     bool isEmpty() const;
 
+#if QT_STRINGVIEW_LEVEL < 2
     QJsonValue value(const QString &key) const;
-    QJsonValue value(QLatin1String key) const;
     QJsonValue operator[] (const QString &key) const;
-    QJsonValue operator[] (QLatin1String key) const { return value(key); }
     QJsonValueRef operator[] (const QString &key);
+#endif
+    QJsonValue value(QStringView key) const;
+    QJsonValue value(QLatin1String key) const;
+    QJsonValue operator[] (QStringView key) const { return value(key); }
+    QJsonValue operator[] (QLatin1String key) const { return value(key); }
+    QJsonValueRef operator[] (QStringView key);
     QJsonValueRef operator[] (QLatin1String key);
 
+#if QT_STRINGVIEW_LEVEL < 2
     void remove(const QString &key);
     QJsonValue take(const QString &key);
     bool contains(const QString &key) const;
+#endif
+    void remove(QStringView key);
+    void remove(QLatin1String key);
+    QJsonValue take(QStringView key);
+    QJsonValue take(QLatin1String key);
+    bool contains(QStringView key) const;
     bool contains(QLatin1String key) const;
 
     bool operator==(const QJsonObject &other) const;
@@ -222,13 +230,20 @@ public:
     // more Qt
     typedef iterator Iterator;
     typedef const_iterator ConstIterator;
+#if QT_STRINGVIEW_LEVEL < 2
     iterator find(const QString &key);
-    iterator find(QLatin1String key);
     const_iterator find(const QString &key) const { return constFind(key); }
-    const_iterator find(QLatin1String key) const { return constFind(key); }
     const_iterator constFind(const QString &key) const;
-    const_iterator constFind(QLatin1String key) const;
     iterator insert(const QString &key, const QJsonValue &value);
+#endif
+    iterator find(QStringView key);
+    iterator find(QLatin1String key);
+    const_iterator find(QStringView key) const { return constFind(key); }
+    const_iterator find(QLatin1String key) const { return constFind(key); }
+    const_iterator constFind(QStringView key) const;
+    const_iterator constFind(QLatin1String key) const;
+    iterator insert(QStringView key, const QJsonValue &value);
+    iterator insert(QLatin1String key, const QJsonValue &value);
 
     // STL compatibility
     typedef QJsonValue mapped_type;
@@ -251,10 +266,22 @@ private:
     void detach(uint reserve = 0);
     bool detach2(uint reserve = 0);
     void compact();
+    void compactIfNeeded();
+
+    template <typename T> QJsonValue valueImpl(T key) const;
+    template <typename T> QJsonValueRef atImpl(T key);
+    template <typename T> void removeImpl(T key);
+    template <typename T> QJsonValue takeImpl(T key);
+    template <typename T> bool containsImpl(T key) const;
+    template <typename T> iterator findImpl(T key);
+    template <typename T> const_iterator constFindImpl(T key) const;
+    template <typename T> iterator insertImpl(T key, const QJsonValue &value);
 
     QString keyAt(int i) const;
     QJsonValue valueAt(int i) const;
     void setValueAt(int i, const QJsonValue &val);
+    void removeAt(int i);
+    template <typename T> iterator insertAt(int i, T key, const QJsonValue &val, bool exists);
 
     QJsonPrivate::Data *d;
     QJsonPrivate::Object *o;
diff --git a/src/corelib/serialization/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp
index bfba95520e..cd36bd5a5b 100644
--- a/src/corelib/serialization/qjsonparser.cpp
+++ b/src/corelib/serialization/qjsonparser.cpp
@@ -198,7 +198,9 @@ QString QJsonParseError::errorString() const
 using namespace QJsonPrivate;
 
 Parser::Parser(const char *json, int length)
-    : head(json), json(json), data(0), dataLength(0), current(0), nestingLevel(0), lastError(QJsonParseError::NoError)
+    : head(json), json(json), data(nullptr)
+    , dataLength(0), current(0), nestingLevel(0)
+    , lastError(QJsonParseError::NoError)
 {
     end = json + length;
 }
@@ -316,7 +318,7 @@ QJsonDocument Parser::parse(QJsonParseError *error)
     eatBOM();
     char token = nextToken();
 
-    DEBUG << hex << (uint)token;
+    DEBUG << Qt::hex << (uint)token;
     if (token == BeginArray) {
         if (!parseArray())
             goto error;
diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp
index 1fc610d7c7..5f07a6a03e 100644
--- a/src/corelib/serialization/qjsonvalue.cpp
+++ b/src/corelib/serialization/qjsonvalue.cpp
@@ -112,7 +112,7 @@ QT_BEGIN_NAMESPACE
     The default is to create a Null value.
  */
 QJsonValue::QJsonValue(Type type)
-    : ui(0), d(0), t(type)
+    : ui(0), d(nullptr), t(type)
 {
 }
 
@@ -120,7 +120,7 @@ QJsonValue::QJsonValue(Type type)
     \internal
  */
 QJsonValue::QJsonValue(QJsonPrivate::Data *data, QJsonPrivate::Base *base, const QJsonPrivate::Value &v)
-    : d(0)
+    : d(nullptr)
 {
     t = (Type)(uint)v.type;
     switch (t) {
@@ -154,7 +154,7 @@ QJsonValue::QJsonValue(QJsonPrivate::Data *data, QJsonPrivate::Base *base, const
     Creates a value of type Bool, with value \a b.
  */
 QJsonValue::QJsonValue(bool b)
-    : d(0), t(Bool)
+    : d(nullptr), t(Bool)
 {
     this->b = b;
 }
@@ -163,7 +163,7 @@ QJsonValue::QJsonValue(bool b)
     Creates a value of type Double, with value \a n.
  */
 QJsonValue::QJsonValue(double n)
-    : d(0), t(Double)
+    : d(nullptr), t(Double)
 {
     this->dbl = n;
 }
@@ -173,7 +173,7 @@ QJsonValue::QJsonValue(double n)
     Creates a value of type Double, with value \a n.
  */
 QJsonValue::QJsonValue(int n)
-    : d(0), t(Double)
+    : d(nullptr), t(Double)
 {
     this->dbl = n;
 }
@@ -185,7 +185,7 @@ QJsonValue::QJsonValue(int n)
     If you pass in values outside this range expect a loss of precision to occur.
  */
 QJsonValue::QJsonValue(qint64 n)
-    : d(0), t(Double)
+    : d(nullptr), t(Double)
 {
     this->dbl = double(n);
 }
@@ -194,7 +194,7 @@ QJsonValue::QJsonValue(qint64 n)
     Creates a value of type String, with value \a s.
  */
 QJsonValue::QJsonValue(const QString &s)
-    : d(0), t(String)
+    : d(nullptr), t(String)
 {
     stringDataFromQStringHelper(s);
 }
@@ -221,7 +221,7 @@ void QJsonValue::stringDataFromQStringHelper(const QString &string)
     Creates a value of type String, with value \a s.
  */
 QJsonValue::QJsonValue(QLatin1String s)
-    : d(0), t(String)
+    : d(nullptr), t(String)
 {
     // ### FIXME: Avoid creating the temp QString below
     QString str(s);
@@ -694,6 +694,7 @@ QJsonObject QJsonValue::toObject() const
     return toObject(QJsonObject());
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     Returns a QJsonValue representing the value for the key \a key.
 
@@ -708,6 +709,16 @@ QJsonObject QJsonValue::toObject() const
  */
 const QJsonValue QJsonValue::operator[](const QString &key) const
 {
+    return (*this)[QStringView(key)];
+}
+#endif
+
+/*!
+    \overload
+    \since 5.14
+*/
+const QJsonValue QJsonValue::operator[](QStringView key) const
+{
     if (!isObject())
         return QJsonValue(QJsonValue::Undefined);
 
diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h
index 5235ba1969..8ade18509b 100644
--- a/src/corelib/serialization/qjsonvalue.h
+++ b/src/corelib/serialization/qjsonvalue.h
@@ -92,7 +92,7 @@ public:
     QJsonValue(const QJsonValue &other);
     QJsonValue &operator =(const QJsonValue &other);
 
-    QJsonValue(QJsonValue &&other) Q_DECL_NOTHROW
+    QJsonValue(QJsonValue &&other) noexcept
         : ui(other.ui),
           d(other.d),
           t(other.t)
@@ -102,13 +102,13 @@ public:
         other.t = Null;
     }
 
-    QJsonValue &operator =(QJsonValue &&other) Q_DECL_NOTHROW
+    QJsonValue &operator =(QJsonValue &&other) noexcept
     {
         swap(other);
         return *this;
     }
 
-    void swap(QJsonValue &other) Q_DECL_NOTHROW
+    void swap(QJsonValue &other) noexcept
     {
         qSwap(ui, other.ui);
         qSwap(d, other.d);
@@ -137,7 +137,10 @@ public:
     QJsonObject toObject() const;
     QJsonObject toObject(const QJsonObject &defaultValue) const;
 
+#if QT_STRINGVIEW_LEVEL < 2
     const QJsonValue operator[](const QString &key) const;
+#endif
+    const QJsonValue operator[](QStringView key) const;
     const QJsonValue operator[](QLatin1String key) const;
     const QJsonValue operator[](int i) const;
 
diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp
index c9ba183a50..cf59cc54c7 100644
--- a/src/corelib/serialization/qtextstream.cpp
+++ b/src/corelib/serialization/qtextstream.cpp
@@ -135,30 +135,30 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
 
     \table
     \header \li Manipulator        \li Description
-    \row    \li \c bin             \li Same as setIntegerBase(2).
-    \row    \li \c oct             \li Same as setIntegerBase(8).
-    \row    \li \c dec             \li Same as setIntegerBase(10).
-    \row    \li \c hex             \li Same as setIntegerBase(16).
-    \row    \li \c showbase        \li Same as setNumberFlags(numberFlags() | ShowBase).
-    \row    \li \c forcesign       \li Same as setNumberFlags(numberFlags() | ForceSign).
-    \row    \li \c forcepoint      \li Same as setNumberFlags(numberFlags() | ForcePoint).
-    \row    \li \c noshowbase      \li Same as setNumberFlags(numberFlags() & ~ShowBase).
-    \row    \li \c noforcesign     \li Same as setNumberFlags(numberFlags() & ~ForceSign).
-    \row    \li \c noforcepoint    \li Same as setNumberFlags(numberFlags() & ~ForcePoint).
-    \row    \li \c uppercasebase   \li Same as setNumberFlags(numberFlags() | UppercaseBase).
-    \row    \li \c uppercasedigits \li Same as setNumberFlags(numberFlags() | UppercaseDigits).
-    \row    \li \c lowercasebase   \li Same as setNumberFlags(numberFlags() & ~UppercaseBase).
-    \row    \li \c lowercasedigits \li Same as setNumberFlags(numberFlags() & ~UppercaseDigits).
-    \row    \li \c fixed           \li Same as setRealNumberNotation(FixedNotation).
-    \row    \li \c scientific      \li Same as setRealNumberNotation(ScientificNotation).
-    \row    \li \c left            \li Same as setFieldAlignment(AlignLeft).
-    \row    \li \c right           \li Same as setFieldAlignment(AlignRight).
-    \row    \li \c center          \li Same as setFieldAlignment(AlignCenter).
-    \row    \li \c endl            \li Same as operator<<('\\n') and flush().
-    \row    \li \c flush           \li Same as flush().
-    \row    \li \c reset           \li Same as reset().
-    \row    \li \c ws              \li Same as skipWhiteSpace().
-    \row    \li \c bom             \li Same as setGenerateByteOrderMark(true).
+    \row    \li \c Qt::bin             \li Same as setIntegerBase(2).
+    \row    \li \c Qt::oct             \li Same as setIntegerBase(8).
+    \row    \li \c Qt::dec             \li Same as setIntegerBase(10).
+    \row    \li \c Qt::hex             \li Same as setIntegerBase(16).
+    \row    \li \c Qt::showbase        \li Same as setNumberFlags(numberFlags() | ShowBase).
+    \row    \li \c Qt::forcesign       \li Same as setNumberFlags(numberFlags() | ForceSign).
+    \row    \li \c Qt::forcepoint      \li Same as setNumberFlags(numberFlags() | ForcePoint).
+    \row    \li \c Qt::noshowbase      \li Same as setNumberFlags(numberFlags() & ~ShowBase).
+    \row    \li \c Qt::noforcesign     \li Same as setNumberFlags(numberFlags() & ~ForceSign).
+    \row    \li \c Qt::noforcepoint    \li Same as setNumberFlags(numberFlags() & ~ForcePoint).
+    \row    \li \c Qt::uppercasebase   \li Same as setNumberFlags(numberFlags() | UppercaseBase).
+    \row    \li \c Qt::uppercasedigits \li Same as setNumberFlags(numberFlags() | UppercaseDigits).
+    \row    \li \c Qt::lowercasebase   \li Same as setNumberFlags(numberFlags() & ~UppercaseBase).
+    \row    \li \c Qt::lowercasedigits \li Same as setNumberFlags(numberFlags() & ~UppercaseDigits).
+    \row    \li \c Qt::fixed           \li Same as setRealNumberNotation(FixedNotation).
+    \row    \li \c Qt::scientific      \li Same as setRealNumberNotation(ScientificNotation).
+    \row    \li \c Qt::left            \li Same as setFieldAlignment(AlignLeft).
+    \row    \li \c Qt::right           \li Same as setFieldAlignment(AlignRight).
+    \row    \li \c Qt::center          \li Same as setFieldAlignment(AlignCenter).
+    \row    \li \c Qt::endl            \li Same as operator<<('\\n') and flush().
+    \row    \li \c Qt::flush           \li Same as flush().
+    \row    \li \c Qt::reset           \li Same as reset().
+    \row    \li \c Qt::ws              \li Same as skipWhiteSpace().
+    \row    \li \c Qt::bom             \li Same as setGenerateByteOrderMark(true).
     \endtable
 
     In addition, Qt provides three global manipulators that take a
@@ -327,7 +327,7 @@ QT_BEGIN_NAMESPACE
 QTextStreamPrivate::QTextStreamPrivate(QTextStream *q_ptr)
     :
 #if QT_CONFIG(textcodec)
-    readConverterSavedState(0),
+    readConverterSavedState(nullptr),
 #endif
     readConverterSavedStateOffset(0),
     locale(QLocale::c())
@@ -381,7 +381,7 @@ void QTextStreamPrivate::Params::reset()
     padChar = QLatin1Char(' ');
     fieldAlignment = QTextStream::AlignRight;
     realNumberNotation = QTextStream::SmartNotation;
-    numberFlags = 0;
+    numberFlags = { };
 }
 
 /*!
@@ -391,9 +391,9 @@ void QTextStreamPrivate::reset()
 {
     params.reset();
 
-    device = 0;
+    device = nullptr;
     deleteDevice = false;
-    string = 0;
+    string = nullptr;
     stringOffset = 0;
     stringOpenMode = QIODevice::NotOpen;
 
@@ -406,7 +406,7 @@ void QTextStreamPrivate::reset()
     resetCodecConverterStateHelper(&readConverterState);
     resetCodecConverterStateHelper(&writeConverterState);
     delete readConverterSavedState;
-    readConverterSavedState = 0;
+    readConverterSavedState = nullptr;
     writeConverterState.flags |= QTextCodec::IgnoreHeader;
     autoDetectUnicode = true;
 #endif
@@ -888,7 +888,7 @@ inline bool QTextStreamPrivate::getChar(QChar *ch)
     if ((string && stringOffset == string->size())
         || (device && readBuffer.isEmpty() && !fillReadBuffer())) {
         if (ch)
-            *ch = 0;
+            *ch = QChar();
         return false;
     }
     if (ch)
@@ -1207,7 +1207,7 @@ bool QTextStream::seek(qint64 pos)
         resetCodecConverterStateHelper(&d->readConverterState);
         resetCodecConverterStateHelper(&d->writeConverterState);
         delete d->readConverterSavedState;
-        d->readConverterSavedState = 0;
+        d->readConverterSavedState = nullptr;
         d->writeConverterState.flags |= QTextCodec::IgnoreHeader;
 #endif
         return true;
@@ -1295,7 +1295,7 @@ void QTextStream::skipWhiteSpace()
 {
     Q_D(QTextStream);
     CHECK_VALID_STREAM(Q_VOID);
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     d->consumeLastToken();
 }
 
@@ -1751,7 +1751,7 @@ QString QTextStream::read(qint64 maxlen)
 */
 QTextStreamPrivate::NumberParsingStatus QTextStreamPrivate::getNumber(qulonglong *ret)
 {
-    scan(0, 0, 0, NotSpace);
+    scan(nullptr, nullptr, 0, NotSpace);
     consumeLastToken();
 
     // detect int encoding
@@ -1980,7 +1980,7 @@ bool QTextStreamPrivate::getReal(double *f)
     ParserState state = Init;
     InputToken input = None;
 
-    scan(0, 0, 0, NotSpace);
+    scan(nullptr, nullptr, 0, NotSpace);
     consumeLastToken();
 
     const int BufferSize = 128;
@@ -2056,7 +2056,7 @@ bool QTextStreamPrivate::getReal(double *f)
     // nan/+inf/-inf, so here we also check for uppercase and mixed
     // case versions.
     if (!qstricmp(buf, "nan") || !qstricmp(buf, "+nan") || !qstricmp(buf, "-nan")) {
-        *f = qSNaN();
+        *f = qQNaN();
         return true;
     } else if (!qstricmp(buf, "+inf") || !qstricmp(buf, "inf")) {
         *f = qInf();
@@ -2084,7 +2084,7 @@ QTextStream &QTextStream::operator>>(QChar &c)
 {
     Q_D(QTextStream);
     CHECK_VALID_STREAM(*this);
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     if (!d->getChar(&c))
         setStatus(ReadPastEnd);
     return *this;
@@ -2245,7 +2245,7 @@ QTextStream &QTextStream::operator>>(QString &str)
     CHECK_VALID_STREAM(*this);
 
     str.clear();
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     d->consumeLastToken();
 
     const QChar *ptr;
@@ -2273,7 +2273,7 @@ QTextStream &QTextStream::operator>>(QByteArray &array)
     CHECK_VALID_STREAM(*this);
 
     array.clear();
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     d->consumeLastToken();
 
     const QChar *ptr;
@@ -2308,7 +2308,7 @@ QTextStream &QTextStream::operator>>(char *c)
     Q_D(QTextStream);
     *c = 0;
     CHECK_VALID_STREAM(*this);
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     d->consumeLastToken();
 
     const QChar *ptr;
@@ -2356,7 +2356,7 @@ void QTextStreamPrivate::putNumber(qulonglong number, bool negative)
     } else if (negative) {
         // Workaround for backward compatibility for writing negative
         // numbers in octal and hex:
-        // QTextStream(result) << showbase << hex << -1 << oct << -1
+        // QTextStream(result) << Qt::showbase << Qt::hex << -1 << oct << -1
         // should output: -0x1 -0b1
         result = dd->unsLongLongToString(number, -1, base, -1, flags);
         result.prepend(locale.negativeSign());
@@ -2689,6 +2689,11 @@ QTextStream &QTextStream::operator<<(const void *ptr)
     d->params.numberFlags = oldFlags;
     return *this;
 }
+#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+namespace Qt {
+#else
+namespace QTextStreamFunctions {
+#endif
 
 /*!
     \relates QTextStream
@@ -2973,7 +2978,7 @@ QTextStream &center(QTextStream &stream)
 */
 QTextStream &endl(QTextStream &stream)
 {
-    return stream << QLatin1Char('\n') << flush;
+    return stream << QLatin1Char('\n') << Qt::flush;
 }
 
 /*!
@@ -3015,6 +3020,8 @@ QTextStream &ws(QTextStream &stream)
     return stream;
 }
 
+} // namespace QTextStreamFunctions
+
 /*!
     \fn QTextStreamManipulator qSetFieldWidth(int width)
     \relates QTextStream
@@ -3037,6 +3044,12 @@ QTextStream &ws(QTextStream &stream)
 */
 
 #if QT_CONFIG(textcodec)
+
+#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+namespace Qt {
+#else
+namespace QTextStreamFunctions {
+#endif
 /*!
     \relates QTextStream
 
@@ -3051,6 +3064,8 @@ QTextStream &bom(QTextStream &stream)
     return stream;
 }
 
+} // namespace QTextStreamFunctions
+
 /*!
     Sets the codec for this stream to \a codec. The codec is used for
     decoding any data that is read from the assigned device, and for
@@ -3200,6 +3215,43 @@ QLocale QTextStream::locale() const
     return d->locale;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC)
+// Binary compatible definitions for Qt<5.14
+Q_CORE_EXPORT QTextStream &bin(QTextStream &s) { return Qt::bin(s); }
+Q_CORE_EXPORT QTextStream &oct(QTextStream &s) { return Qt::oct(s); }
+Q_CORE_EXPORT QTextStream &dec(QTextStream &s) { return Qt::dec(s); }
+Q_CORE_EXPORT QTextStream &hex(QTextStream &s) { return Qt::hex(s); }
+
+Q_CORE_EXPORT QTextStream &showbase(QTextStream &s) { return Qt::showbase(s); }
+Q_CORE_EXPORT QTextStream &forcesign(QTextStream &s) { return Qt::forcesign(s); }
+Q_CORE_EXPORT QTextStream &forcepoint(QTextStream &s) { return Qt::forcepoint(s); }
+Q_CORE_EXPORT QTextStream &noshowbase(QTextStream &s) { return Qt::noshowbase(s); }
+Q_CORE_EXPORT QTextStream &noforcesign(QTextStream &s) { return Qt::noforcesign(s); }
+Q_CORE_EXPORT QTextStream &noforcepoint(QTextStream &s) { return Qt::noforcepoint(s); }
+
+Q_CORE_EXPORT QTextStream &uppercasebase(QTextStream &s) { return Qt::uppercasebase(s); }
+Q_CORE_EXPORT QTextStream &uppercasedigits(QTextStream &s) { return Qt::uppercasedigits(s); }
+Q_CORE_EXPORT QTextStream &lowercasebase(QTextStream &s) { return Qt::lowercasebase(s); }
+Q_CORE_EXPORT QTextStream &lowercasedigits(QTextStream &s) { return Qt::lowercasedigits(s); }
+
+Q_CORE_EXPORT QTextStream &fixed(QTextStream &s) { return Qt::fixed(s); }
+Q_CORE_EXPORT QTextStream &scientific(QTextStream &s) { return Qt::scientific(s); }
+
+Q_CORE_EXPORT QTextStream &left(QTextStream &s) { return Qt::left(s); }
+Q_CORE_EXPORT QTextStream &right(QTextStream &s) { return Qt::right(s); }
+Q_CORE_EXPORT QTextStream &center(QTextStream &s) { return Qt::center(s); }
+
+Q_CORE_EXPORT QTextStream &endl(QTextStream &s) { return Qt::endl(s); }
+Q_CORE_EXPORT QTextStream &flush(QTextStream &s) { return Qt::flush(s); }
+Q_CORE_EXPORT QTextStream &reset(QTextStream &s) { return Qt::reset(s); }
+
+Q_CORE_EXPORT QTextStream &ws(QTextStream &s) { return Qt::ws(s); }
+
+#if QT_CONFIG(textcodec)
+Q_CORE_EXPORT QTextStream &bom(QTextStream &s) { return Qt::bom(s); }
+#endif
+#endif
+
 QT_END_NAMESPACE
 
 #ifndef QT_NO_QOBJECT
diff --git a/src/corelib/serialization/qtextstream.h b/src/corelib/serialization/qtextstream.h
index 1d86a18b9c..4efa84f1f1 100644
--- a/src/corelib/serialization/qtextstream.h
+++ b/src/corelib/serialization/qtextstream.h
@@ -213,8 +213,8 @@ typedef void (QTextStream::*QTSMFC)(QChar); // manipulator w/QChar argument
 class Q_CORE_EXPORT QTextStreamManipulator
 {
 public:
-    Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFI m, int a) Q_DECL_NOTHROW : mf(m), mc(nullptr), arg(a), ch() {}
-    Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFC m, QChar c) Q_DECL_NOTHROW : mf(nullptr), mc(m), arg(-1), ch(c) {}
+    Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFI m, int a) noexcept : mf(m), mc(nullptr), arg(a), ch() {}
+    Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFC m, QChar c) noexcept : mf(nullptr), mc(m), arg(-1), ch(c) {}
     void exec(QTextStream &s) { if (mf) { (s.*mf)(arg); } else { (s.*mc)(ch); } }
 
 private:
@@ -233,6 +233,13 @@ inline QTextStream &operator<<(QTextStream &s, QTextStreamFunction f)
 inline QTextStream &operator<<(QTextStream &s, QTextStreamManipulator m)
 { m.exec(s); return s; }
 
+#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+namespace Qt {
+#else
+// This namespace only exists for 'using namespace' declarations.
+namespace QTextStreamFunctions {
+#endif
+
 Q_CORE_EXPORT QTextStream &bin(QTextStream &s);
 Q_CORE_EXPORT QTextStream &oct(QTextStream &s);
 Q_CORE_EXPORT QTextStream &dec(QTextStream &s);
@@ -265,6 +272,18 @@ Q_CORE_EXPORT QTextStream &bom(QTextStream &s);
 
 Q_CORE_EXPORT QTextStream &ws(QTextStream &s);
 
+} // namespace QTextStreamFunctions
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC)
+namespace Qt {
+using namespace QTextStreamFunctions;
+}
+
+// We use 'using namespace' as that doesn't cause
+// conflicting definitions compiler errors.
+using namespace QTextStreamFunctions;
+#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC)
+
 inline QTextStreamManipulator qSetFieldWidth(int width)
 {
     QTSMFI func = &QTextStream::setFieldWidth;
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
index 0170be7602..500e0aa6be 100644
--- a/src/corelib/serialization/qxmlstream.cpp
+++ b/src/corelib/serialization/qxmlstream.cpp
@@ -58,9 +58,9 @@
 // case for most bootstrapped applications.
 #define Q_DECLARE_TR_FUNCTIONS(context) \
 public: \
-    static inline QString tr(const char *sourceText, const char *comment = 0) \
+    static inline QString tr(const char *sourceText, const char *comment = nullptr) \
         { Q_UNUSED(comment); return QString::fromLatin1(sourceText); } \
-    static inline QString trUtf8(const char *sourceText, const char *comment = 0) \
+    static inline QString trUtf8(const char *sourceText, const char *comment = nullptr) \
         { Q_UNUSED(comment); return QString::fromLatin1(sourceText); } \
     static inline QString tr(const char *sourceText, const char*, int) \
         { return QString::fromLatin1(sourceText); } \
@@ -548,7 +548,7 @@ void QXmlStreamReader::clear()
     if (d->device) {
         if (d->deleteDevice)
             delete d->device;
-        d->device = 0;
+        d->device = nullptr;
     }
 }
 
@@ -782,8 +782,8 @@ QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack()
     tagStackStringStorage.reserve(32);
     tagStackStringStorageSize = 0;
     NamespaceDeclaration &namespaceDeclaration = namespaceDeclarations.push();
-    namespaceDeclaration.prefix = addToStringStorage(QStringViewLiteral("xml"));
-    namespaceDeclaration.namespaceUri = addToStringStorage(QStringViewLiteral("http://www.w3.org/XML/1998/namespace"));
+    namespaceDeclaration.prefix = addToStringStorage(u"xml");
+    namespaceDeclaration.namespaceUri = addToStringStorage(u"http://www.w3.org/XML/1998/namespace");
     initialTagStackStringStorageSize = tagStackStringStorageSize;
 }
 
@@ -792,16 +792,16 @@ QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack()
 QXmlStreamReaderPrivate::QXmlStreamReaderPrivate(QXmlStreamReader *q)
     :q_ptr(q)
 {
-    device = 0;
+    device = nullptr;
     deleteDevice = false;
 #if QT_CONFIG(textcodec)
-    decoder = 0;
+    decoder = nullptr;
 #endif
     stack_size = 64;
-    sym_stack = 0;
-    state_stack = 0;
+    sym_stack = nullptr;
+    state_stack = nullptr;
     reallocateStack();
-    entityResolver = 0;
+    entityResolver = nullptr;
     init();
 #define ADD_PREDEFINED(n, v) \
     do { \
@@ -843,11 +843,11 @@ void QXmlStreamReaderPrivate::init()
 #if QT_CONFIG(textcodec)
     codec = QTextCodec::codecForMib(106); // utf8
     delete decoder;
-    decoder = 0;
+    decoder = nullptr;
 #endif
     attributeStack.clear();
     attributeStack.reserve(16);
-    entityParser = 0;
+    entityParser = nullptr;
     hasCheckedStartDocument = false;
     normalizeLiterals = false;
     hasSeenTag = false;
@@ -1423,7 +1423,7 @@ inline int QXmlStreamReaderPrivate::fastScanNMTOKEN()
     int n = 0;
     uint c;
     while ((c = getChar()) != StreamEOF) {
-        if (fastDetermineNameChar(c) == NotName) {
+        if (fastDetermineNameChar(QChar(c)) == NotName) {
             putChar(c);
             return n;
         } else {
@@ -2285,12 +2285,14 @@ QXmlStreamAttribute::QXmlStreamAttribute()
     m_isDefault = false;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Destructs an attribute.
  */
 QXmlStreamAttribute::~QXmlStreamAttribute()
 {
 }
+#endif
 
 /*!  Constructs an attribute in the namespace described with \a
   namespaceUri with \a name and value \a value.
@@ -2366,6 +2368,7 @@ QXmlStreamAttribute::QXmlStreamAttribute(const QString &qualifiedName, const QSt
  */
 
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Creates a copy of \a other.
  */
@@ -2386,7 +2389,7 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o
     m_isDefault = other.m_isDefault;
     return *this;
 }
-
+#endif
 
 /*!
     \class QXmlStreamAttributes
@@ -2442,6 +2445,8 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o
 QXmlStreamNotationDeclaration::QXmlStreamNotationDeclaration()
 {
 }
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Creates a copy of \a other.
  */
@@ -2467,6 +2472,7 @@ Destructs this notation declaration.
 QXmlStreamNotationDeclaration::~QXmlStreamNotationDeclaration()
 {
 }
+#endif
 
 /*! \fn QStringRef QXmlStreamNotationDeclaration::name() const
 
@@ -2539,6 +2545,7 @@ QXmlStreamNamespaceDeclaration::QXmlStreamNamespaceDeclaration(const QString &pr
     m_namespaceUri = namespaceUri;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Creates a copy of \a other.
  */
@@ -2562,6 +2569,7 @@ Destructs this namespace declaration.
 QXmlStreamNamespaceDeclaration::~QXmlStreamNamespaceDeclaration()
 {
 }
+#endif
 
 /*! \fn QStringRef QXmlStreamNamespaceDeclaration::prefix() const
 
@@ -2609,6 +2617,7 @@ QXmlStreamEntityDeclaration::QXmlStreamEntityDeclaration()
 {
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Creates a copy of \a other.
  */
@@ -2636,6 +2645,7 @@ QXmlStreamEntityDeclaration& QXmlStreamEntityDeclaration::operator=(const QXmlSt
 QXmlStreamEntityDeclaration::~QXmlStreamEntityDeclaration()
 {
 }
+#endif
 
 /*! \fn QXmlStreamStringRef::swap(QXmlStreamStringRef &other)
     \since 5.6
@@ -3014,8 +3024,8 @@ QXmlStreamWriterPrivate::QXmlStreamWriterPrivate(QXmlStreamWriter *q)
     :autoFormattingIndent(4, ' ')
 {
     q_ptr = q;
-    device = 0;
-    stringDevice = 0;
+    device = nullptr;
+    stringDevice = nullptr;
     deleteDevice = false;
 #if QT_CONFIG(textcodec)
     codec = QTextCodec::codecForMib(106); // utf8
@@ -3305,7 +3315,7 @@ void QXmlStreamWriter::setDevice(QIODevice *device)
     Q_D(QXmlStreamWriter);
     if (device == d->device)
         return;
-    d->stringDevice = 0;
+    d->stringDevice = nullptr;
     if (d->deleteDevice) {
         delete d->device;
         d->deleteDevice = false;
diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g
index e6328a11ac..12ecc9bdb2 100644
--- a/src/corelib/serialization/qxmlstream.g
+++ b/src/corelib/serialization/qxmlstream.g
@@ -506,7 +506,7 @@ public:
     int fastScanLiteralContent();
     int fastScanSpace();
     int fastScanContentCharList();
-    int fastScanName(int *prefix = 0);
+    int fastScanName(int *prefix = nullptr);
     inline int fastScanNMTOKEN();
 
 
diff --git a/src/corelib/serialization/qxmlstream.h b/src/corelib/serialization/qxmlstream.h
index d30c6bc01f..7d0aa64570 100644
--- a/src/corelib/serialization/qxmlstream.h
+++ b/src/corelib/serialization/qxmlstream.h
@@ -59,19 +59,15 @@ public:
     inline QXmlStreamStringRef(const QStringRef &aString)
         :m_string(aString.string()?*aString.string():QString()), m_position(aString.position()), m_size(aString.size()){}
     QXmlStreamStringRef(const QString &aString) : m_string(aString), m_position(0), m_size(m_string.size()) {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    QXmlStreamStringRef(QString &&aString) Q_DECL_NOTHROW : m_string(std::move(aString)), m_position(0), m_size(m_string.size()) {}
-#endif
+    QXmlStreamStringRef(QString &&aString) noexcept : m_string(std::move(aString)), m_position(0), m_size(m_string.size()) {}
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     QXmlStreamStringRef(const QXmlStreamStringRef &other) // = default
         : m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    QXmlStreamStringRef(QXmlStreamStringRef &&other) Q_DECL_NOTHROW // = default
+    QXmlStreamStringRef(QXmlStreamStringRef &&other) noexcept // = default
         : m_string(std::move(other.m_string)), m_position(other.m_position), m_size(other.m_size) {}
-    QXmlStreamStringRef &operator=(QXmlStreamStringRef &&other) Q_DECL_NOTHROW // = default
+    QXmlStreamStringRef &operator=(QXmlStreamStringRef &&other) noexcept // = default
     { swap(other); return *this; }
-#endif
     QXmlStreamStringRef &operator=(const QXmlStreamStringRef &other) // = default
     { m_string = other.m_string; m_position = other.m_position; m_size = other.m_size; return *this; }
     inline ~QXmlStreamStringRef() {} // ### this prevents (or deprecates) all the move/copy special member functions,
@@ -79,7 +75,7 @@ public:
                                      // ### Qt 5, since that would change the way its passed to functions. In Qt 6, remove all.
 #endif // Qt < 6.0
 
-    void swap(QXmlStreamStringRef &other) Q_DECL_NOTHROW
+    void swap(QXmlStreamStringRef &other) noexcept
     {
         qSwap(m_string, other.m_string);
         qSwap(m_position, other.m_position);
@@ -108,11 +104,10 @@ class Q_CORE_EXPORT QXmlStreamAttribute {
 public:
     QXmlStreamAttribute();
     QXmlStreamAttribute(const QString &qualifiedName, const QString &value);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QXmlStreamAttribute(const QString &namespaceUri, const QString &name, const QString &value);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QXmlStreamAttribute(const QXmlStreamAttribute &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QXmlStreamAttribute(QXmlStreamAttribute &&other) Q_DECL_NOTHROW // = default;
+    QXmlStreamAttribute(QXmlStreamAttribute &&other) noexcept // = default;
         : m_name(std::move(other.m_name)),
           m_namespaceUri(std::move(other.m_namespaceUri)),
           m_qualifiedName(std::move(other.m_qualifiedName)),
@@ -122,7 +117,7 @@ public:
     {
         other.reserved = nullptr;
     }
-    QXmlStreamAttribute &operator=(QXmlStreamAttribute &&other) Q_DECL_NOTHROW // = default;
+    QXmlStreamAttribute &operator=(QXmlStreamAttribute &&other) noexcept // = default;
     {
         m_name = std::move(other.m_name);
         m_namespaceUri = std::move(other.m_namespaceUri);
@@ -132,7 +127,6 @@ public:
         m_isDefault = other.m_isDefault;
         return *this;
     }
-#endif
     QXmlStreamAttribute& operator=(const QXmlStreamAttribute &);
     ~QXmlStreamAttribute();
 #endif // < Qt 6
@@ -197,23 +191,23 @@ class Q_CORE_EXPORT QXmlStreamNamespaceDeclaration {
     friend class QXmlStreamReaderPrivate;
 public:
     QXmlStreamNamespaceDeclaration();
+    QXmlStreamNamespaceDeclaration(const QString &prefix, const QString &namespaceUri);
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QXmlStreamNamespaceDeclaration(const QXmlStreamNamespaceDeclaration &);
-    QXmlStreamNamespaceDeclaration(QXmlStreamNamespaceDeclaration &&other) Q_DECL_NOTHROW // = default
+    QXmlStreamNamespaceDeclaration(QXmlStreamNamespaceDeclaration &&other) noexcept // = default
         : m_prefix(std::move(other.m_prefix)),
           m_namespaceUri(std::move(other.m_namespaceUri)),
           reserved(other.reserved)
     {
         other.reserved = nullptr;
     }
-    QXmlStreamNamespaceDeclaration &operator=(QXmlStreamNamespaceDeclaration &&other) Q_DECL_NOTHROW // = default
+    QXmlStreamNamespaceDeclaration &operator=(QXmlStreamNamespaceDeclaration &&other) noexcept // = default
     {
         m_prefix = std::move(other.m_prefix);
         m_namespaceUri = std::move(other.m_namespaceUri);
         qSwap(reserved, other.reserved);
         return *this;
     }
-    QXmlStreamNamespaceDeclaration(const QString &prefix, const QString &namespaceUri);
     ~QXmlStreamNamespaceDeclaration();
     QXmlStreamNamespaceDeclaration& operator=(const QXmlStreamNamespaceDeclaration &);
 #endif // < Qt 6
@@ -242,7 +236,7 @@ public:
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     ~QXmlStreamNotationDeclaration();
     QXmlStreamNotationDeclaration(const QXmlStreamNotationDeclaration &);
-    QXmlStreamNotationDeclaration(QXmlStreamNotationDeclaration &&other) Q_DECL_NOTHROW // = default
+    QXmlStreamNotationDeclaration(QXmlStreamNotationDeclaration &&other) noexcept // = default
         : m_name(std::move(other.m_name)),
           m_systemId(std::move(other.m_systemId)),
           m_publicId(std::move(other.m_publicId)),
@@ -251,7 +245,7 @@ public:
         other.reserved = nullptr;
     }
     QXmlStreamNotationDeclaration& operator=(const QXmlStreamNotationDeclaration &);
-    QXmlStreamNotationDeclaration &operator=(QXmlStreamNotationDeclaration &&other) Q_DECL_NOTHROW // = default
+    QXmlStreamNotationDeclaration &operator=(QXmlStreamNotationDeclaration &&other) noexcept // = default
     {
         m_name = std::move(other.m_name);
         m_systemId = std::move(other.m_systemId);
@@ -287,7 +281,7 @@ public:
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     ~QXmlStreamEntityDeclaration();
     QXmlStreamEntityDeclaration(const QXmlStreamEntityDeclaration &);
-    QXmlStreamEntityDeclaration(QXmlStreamEntityDeclaration &&other) Q_DECL_NOTHROW // = default
+    QXmlStreamEntityDeclaration(QXmlStreamEntityDeclaration &&other) noexcept // = default
         : m_name(std::move(other.m_name)),
           m_notationName(std::move(other.m_notationName)),
           m_systemId(std::move(other.m_systemId)),
@@ -298,7 +292,7 @@ public:
         other.reserved = nullptr;
     }
     QXmlStreamEntityDeclaration& operator=(const QXmlStreamEntityDeclaration &);
-    QXmlStreamEntityDeclaration &operator=(QXmlStreamEntityDeclaration &&other) Q_DECL_NOTHROW // = default
+    QXmlStreamEntityDeclaration &operator=(QXmlStreamEntityDeclaration &&other) noexcept // = default
     {
         m_name = std::move(other.m_name);
         m_notationName = std::move(other.m_notationName);
diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h
index 61f501f81b..cde66a48a3 100644
--- a/src/corelib/serialization/qxmlstream_p.h
+++ b/src/corelib/serialization/qxmlstream_p.h
@@ -162,12 +162,12 @@ public:
 
 
 const char *const QXmlStreamReader_Table::spell [] = {
-  "end of file", 0, " ", "<", ">", "&", "#", "\'", "\"", "[", 
+  "end of file", nullptr, " ", "<", ">", "&", "#", "\'", "\"", "[",
   "]", "(", ")", "|", "=", "%", "/", ":", ";", ",", 
   "-", "+", "*", ".", "?", "!", "[a-zA-Z]", "[0-9]", "[CDATA[", "DOCTYPE", 
   "ELEMENT", "ATTLIST", "ENTITY", "NOTATION", "SYSTEM", "PUBLIC", "NDATA", "REQUIRED", "IMPLIED", "FIXED", 
-  "EMPTY", "ANY", "PCDATA", 0, 0, 0, 0, "CDATA", "ID", "IDREF", 
-  "IDREFS", "ENTITIES", "NMTOKEN", "NMTOKENS", "<?xml", "version", 0};
+  "EMPTY", "ANY", "PCDATA", nullptr, nullptr, nullptr, nullptr, "CDATA", "ID", "IDREF",
+  "IDREFS", "ENTITIES", "NMTOKEN", "NMTOKENS", "<?xml", "version", nullptr};
 
 const short QXmlStreamReader_Table::lhs [] = {
   57, 57, 59, 59, 59, 59, 59, 59, 59, 59, 
@@ -645,7 +645,7 @@ template <typename T> class QXmlStreamSimpleStack {
     T *data;
     int tos, cap;
 public:
-    inline QXmlStreamSimpleStack():data(0), tos(-1), cap(0){}
+    inline QXmlStreamSimpleStack():data(nullptr), tos(-1), cap(0){}
     inline ~QXmlStreamSimpleStack(){ if (data) free(data); }
 
     inline void reserve(int extraCapacity) {
@@ -995,7 +995,7 @@ public:
     int fastScanLiteralContent();
     int fastScanSpace();
     int fastScanContentCharList();
-    int fastScanName(int *prefix = 0);
+    int fastScanName(int *prefix = nullptr);
     inline int fastScanNMTOKEN();
 
 
diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h
index 7fb40392e7..ec746caae1 100644
--- a/src/corelib/statemachine/qstate_p.h
+++ b/src/corelib/statemachine/qstate_p.h
@@ -68,14 +68,14 @@ QT_BEGIN_NAMESPACE
 struct QPropertyAssignment
 {
     QPropertyAssignment()
-        : object(0), explicitlySet(true) {}
+        : object(nullptr), explicitlySet(true) {}
     QPropertyAssignment(QObject *o, const QByteArray &n,
                         const QVariant &v, bool es = true)
         : object(o), propertyName(n), value(v), explicitlySet(es)
         {}
 
     bool objectDeleted() const { return !object; }
-    void write() const { Q_ASSERT(object != 0); object->setProperty(propertyName, value); }
+    void write() const { Q_ASSERT(object != nullptr); object->setProperty(propertyName, value); }
     bool hasTarget(QObject *o, const QByteArray &pn) const
     { return object == o && propertyName == pn; }
 
@@ -99,8 +99,8 @@ public:
     QStatePrivate();
     ~QStatePrivate();
 
-    static QStatePrivate *get(QState *q) { return q ? q->d_func() : 0; }
-    static const QStatePrivate *get(const QState *q) { return q? q->d_func() : 0; }
+    static QStatePrivate *get(QState *q) { return q ? q->d_func() : nullptr; }
+    static const QStatePrivate *get(const QState *q) { return q? q->d_func() : nullptr; }
 
     QList<QAbstractState*> childStates() const;
     QList<QHistoryState*> historyStates() const;
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index ee3f7be279..945e36968f 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -140,6 +140,10 @@ QT_BEGIN_NAMESPACE
     no error state applies to the erroneous state, the machine will stop
     executing and an error message will be printed to the console.
 
+    \note Important: setting the \l{ChildMode} of a state machine to parallel (\l{ParallelStates})
+          results in an invalid state machine. It can only be set to (or kept as)
+          \l{ExclusiveStates}.
+
     \sa QAbstractState, QAbstractTransition, QState, {The State Machine Framework}
 */
 
@@ -370,10 +374,11 @@ static QList<QAbstractState *> getEffectiveTargetStates(QAbstractTransition *tra
             QList<QAbstractState*> historyConfiguration = QHistoryStatePrivate::get(historyState)->configuration;
             if (!historyConfiguration.isEmpty()) {
                 // There is a saved history, so apply that.
-                targets.unite(historyConfiguration.toSet());
+                targets.unite(QSet<QAbstractState *>(historyConfiguration.constBegin(), historyConfiguration.constEnd()));
             } else if (QAbstractTransition *defaultTransition = historyState->defaultTransition()) {
                 // No saved history, take all default transition targets.
-                targets.unite(defaultTransition->targetStates().toSet());
+                const auto &targetStates = defaultTransition->targetStates();
+                targets.unite(QSet<QAbstractState *>(targetStates.constBegin(), targetStates.constEnd()));
             } else {
                 // Woops, we found a history state without a default state. That's not valid!
                 QStateMachinePrivate *m = QStateMachinePrivate::get(historyState->machine());
@@ -384,7 +389,7 @@ static QList<QAbstractState *> getEffectiveTargetStates(QAbstractTransition *tra
         }
     }
 
-    targetsList = targets.toList();
+    targetsList = targets.values();
     cache->insert(transition, targetsList);
     return targetsList;
 }
@@ -518,7 +523,7 @@ bool QStateMachinePrivate::stateExitLessThan(QAbstractState *s1, QAbstractState
     }
 }
 
-QState *QStateMachinePrivate::findLCA(const QList<QAbstractState*> &states, bool onlyCompound) const
+QState *QStateMachinePrivate::findLCA(const QList<QAbstractState*> &states, bool onlyCompound)
 {
     if (states.isEmpty())
         return 0;
@@ -537,10 +542,16 @@ QState *QStateMachinePrivate::findLCA(const QList<QAbstractState*> &states, bool
         if (ok)
             return anc;
     }
-    return 0;
+
+    // Oops, this should never happen! The state machine itself is a common ancestor of all states,
+    // no matter what. But, for the onlyCompound case: we probably have a state machine whose
+    // childMode is set to parallel, which is illegal. However, we're stuck with it (and with
+    // exposing this invalid/dangerous API to users), so recover in the least horrible way.
+    setError(QStateMachine::StateMachineChildModeSetToParallelError, q_func());
+    return q_func(); // make the statemachine the LCA/LCCA (which it should have been anyway)
 }
 
-QState *QStateMachinePrivate::findLCCA(const QList<QAbstractState*> &states) const
+QState *QStateMachinePrivate::findLCCA(const QList<QAbstractState*> &states)
 {
     return findLCA(states, true);
 }
@@ -740,7 +751,7 @@ QList<QAbstractState*> QStateMachinePrivate::computeExitSet(const QList<QAbstrac
 {
     Q_ASSERT(cache);
 
-    QList<QAbstractState*> statesToExit_sorted = computeExitSet_Unordered(enabledTransitions, cache).toList();
+    QList<QAbstractState*> statesToExit_sorted = computeExitSet_Unordered(enabledTransitions, cache).values();
     std::sort(statesToExit_sorted.begin(), statesToExit_sorted.end(), stateExitLessThan);
     return statesToExit_sorted;
 }
@@ -777,7 +788,7 @@ QSet<QAbstractState*> QStateMachinePrivate::computeExitSet_Unordered(QAbstractTr
         // makes the state machine invalid.
         if (error == QStateMachine::NoError)
             setError(QStateMachine::NoCommonAncestorForTransitionError, t->sourceState());
-        QList<QAbstractState *> lst = pendingErrorStates.toList();
+        QList<QAbstractState *> lst = pendingErrorStates.values();
         lst.prepend(t->sourceState());
 
         domain = findLCCA(lst);
@@ -879,7 +890,7 @@ QList<QAbstractState*> QStateMachinePrivate::computeEntrySet(const QList<QAbstra
         pendingErrorStatesForDefaultEntry.clear();
     }
 
-    QList<QAbstractState*> statesToEnter_sorted = statesToEnter.toList();
+    QList<QAbstractState*> statesToEnter_sorted = statesToEnter.values();
     std::sort(statesToEnter_sorted.begin(), statesToEnter_sorted.end(), stateEntryLessThan);
     return statesToEnter_sorted;
 }
@@ -902,7 +913,7 @@ function getTransitionDomain(t)
 */
 QAbstractState *QStateMachinePrivate::getTransitionDomain(QAbstractTransition *t,
                                                           const QList<QAbstractState *> &effectiveTargetStates,
-                                                          CalculationCache *cache) const
+                                                          CalculationCache *cache)
 {
     Q_ASSERT(cache);
 
@@ -1483,6 +1494,14 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta
         errorString = QStateMachine::tr("No common ancestor for targets and source of transition from state '%1'")
                         .arg(currentContext->objectName());
         break;
+
+    case QStateMachine::StateMachineChildModeSetToParallelError:
+        Q_ASSERT(currentContext != nullptr);
+
+        errorString = QStateMachine::tr("Child mode of state machine '%1' is not 'ExclusiveStates'!")
+                        .arg(currentContext->objectName());
+        break;
+
     default:
         errorString = QStateMachine::tr("Unknown error");
     };
@@ -1507,8 +1526,8 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta
         addAncestorStatesToEnter(currentErrorState, rootState(), pendingErrorStates, pendingErrorStatesForDefaultEntry);
         pendingErrorStates -= configuration;
     } else {
-        qWarning("Unrecoverable error detected in running state machine: %s",
-                 qPrintable(errorString));
+        qWarning("Unrecoverable error detected in running state machine: %ls",
+                 qUtf16Printable(errorString));
         q->stop();
     }
 }
@@ -2444,9 +2463,13 @@ QStateMachine::QStateMachine(QObject *parent)
 
 /*!
   \since 5.0
+  \deprecated
 
   Constructs a new state machine with the given \a childMode
   and \a parent.
+
+  \warning Do not set the \a childMode to anything else than \l{ExclusiveStates}, otherwise the
+           state machine is invalid, and might work incorrectly!
 */
 QStateMachine::QStateMachine(QState::ChildMode childMode, QObject *parent)
     : QState(*new QStateMachinePrivate, /*parentState=*/0)
@@ -2454,6 +2477,18 @@ QStateMachine::QStateMachine(QState::ChildMode childMode, QObject *parent)
     Q_D(QStateMachine);
     d->childMode = childMode;
     setParent(parent); // See comment in constructor above
+
+    if (childMode != ExclusiveStates) {
+        //### FIXME for Qt6: remove this constructor completely, and hide the childMode property.
+        // Yes, the StateMachine itself is conceptually a state, but it should only expose a limited
+        // number of properties. The execution algorithm (in the URL below) treats a state machine
+        // as a state, but from an API point of view, it's questionable if the QStateMachine should
+        // inherit from QState.
+        //
+        // See function findLCCA in https://www.w3.org/TR/2014/WD-scxml-20140529/#AlgorithmforSCXMLInterpretation
+        // to see where setting childMode to parallel will break down.
+        qWarning() << "Invalid childMode for QStateMachine" << this;
+    }
 }
 
 /*!
@@ -2503,6 +2538,10 @@ QStateMachine::~QStateMachine()
            state machine. Commonly, this could mean that one of the states has not been given
            any parent or added to any machine. The context of this error is the source state of
            the transition.
+    \value StateMachineChildModeSetToParallelError The machine's \l childMode
+           property was set to \l{QState::ParallelStates}. This is illegal.
+           Only states may be declared as parallel, not the state machine
+           itself. This enum value was added in Qt 5.14.
 
     \sa setErrorState()
 */
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index e520285437..07781d09a4 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -106,7 +106,8 @@ public:
         NoError,
         NoInitialStateError,
         NoDefaultStateInHistoryStateError,
-        NoCommonAncestorForTransitionError
+        NoCommonAncestorForTransitionError,
+        StateMachineChildModeSetToParallelError
     };
 
     explicit QStateMachine(QObject *parent = nullptr);
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index f3366ca5f7..f140023e31 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -108,10 +108,10 @@ public:
     ~QStateMachinePrivate();
 
     static QStateMachinePrivate *get(QStateMachine *q)
-    { return q ? q->d_func() : 0; }
+    { return q ? q->d_func() : nullptr; }
 
-    QState *findLCA(const QList<QAbstractState*> &states, bool onlyCompound = false) const;
-    QState *findLCCA(const QList<QAbstractState*> &states) const;
+    QState *findLCA(const QList<QAbstractState*> &states, bool onlyCompound = false);
+    QState *findLCCA(const QList<QAbstractState*> &states);
 
     static bool transitionStateEntryLessThan(QAbstractTransition *t1, QAbstractTransition *t2);
     static bool stateEntryLessThan(QAbstractState *s1, QAbstractState *s2);
@@ -160,7 +160,7 @@ public:
                                            QSet<QAbstractState*> &statesForDefaultEntry, CalculationCache *cache);
     QAbstractState *getTransitionDomain(QAbstractTransition *t,
                                         const QList<QAbstractState *> &effectiveTargetStates,
-                                        CalculationCache *cache) const;
+                                        CalculationCache *cache);
     void addDescendantStatesToEnter(QAbstractState *state,
                                     QSet<QAbstractState*> &statesToEnter,
                                     QSet<QAbstractState*> &statesForDefaultEntry);
@@ -218,18 +218,18 @@ public:
         QByteArray prop;
         // two overloads because friends can't have default arguments
         friend uint qHash(const RestorableId &key, uint seed)
-            Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(std::declval<QByteArray>())))
+            noexcept(noexcept(qHash(std::declval<QByteArray>())))
         { return qHash(qMakePair(key.obj, key.prop), seed); }
-        friend uint qHash(const RestorableId &key) Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(key, 0U)))
+        friend uint qHash(const RestorableId &key) noexcept(noexcept(qHash(key, 0U)))
         { return qHash(key, 0U); }
-        friend bool operator==(const RestorableId &lhs, const RestorableId &rhs) Q_DECL_NOTHROW
+        friend bool operator==(const RestorableId &lhs, const RestorableId &rhs) noexcept
         { return lhs.obj == rhs.obj && lhs.prop == rhs.prop; }
-        friend bool operator!=(const RestorableId &lhs, const RestorableId &rhs) Q_DECL_NOTHROW
+        friend bool operator!=(const RestorableId &lhs, const RestorableId &rhs) noexcept
         { return !operator==(lhs, rhs); }
     public:
-        explicit RestorableId(QObject *o, QByteArray p) Q_DECL_NOTHROW : guard(o), obj(o), prop(qMove(p)) {}
-        QObject *object() const Q_DECL_NOTHROW { return guard; }
-        QByteArray propertyName() const Q_DECL_NOTHROW { return prop; }
+        explicit RestorableId(QObject *o, QByteArray p) noexcept : guard(o), obj(o), prop(std::move(p)) {}
+        QObject *object() const noexcept { return guard; }
+        QByteArray propertyName() const noexcept { return prop; }
     };
     QHash<QAbstractState*, QHash<RestorableId, QVariant> > registeredRestorablesForState;
     bool hasRestorable(QAbstractState *state, QObject *object, const QByteArray &propertyName) const;
@@ -271,7 +271,7 @@ public:
         QList<QAbstractAnimation*> handledAnimations;
         QList<QAbstractAnimation*> localResetEndValues;
 
-        void swap(InitializeAnimationResult &other) Q_DECL_NOTHROW
+        void swap(InitializeAnimationResult &other) noexcept
         {
             qSwap(handledAnimations,   other.handledAnimations);
             qSwap(localResetEndValues, other.localResetEndValues);
@@ -313,7 +313,7 @@ public:
         DelayedEvent(QEvent *e, int tid)
             : event(e), timerId(tid) {}
         DelayedEvent()
-            : event(0), timerId(0) {}
+            : event(nullptr), timerId(0) {}
     };
     QHash<int, DelayedEvent> delayedEvents;
     QHash<int, int> timerIdToDelayedEventId;
diff --git a/src/corelib/tools/UNICODE_LICENSE.txt b/src/corelib/text/UNICODE_LICENSE.txt
index 1c73202b74..1c73202b74 100644
--- a/src/corelib/tools/UNICODE_LICENSE.txt
+++ b/src/corelib/text/UNICODE_LICENSE.txt
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index 2337d9f9c6..c50e087c10 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -40,7 +40,7 @@
 
 #include "qbytearray.h"
 #include "qbytearraymatcher.h"
-#include "qtools_p.h"
+#include "private/qtools_p.h"
 #include "qstring.h"
 #include "qlist.h"
 #include "qlocale.h"
@@ -130,106 +130,6 @@ int qFindByteArray(
     const char *haystack0, int haystackLen, int from,
     const char *needle0, int needleLen);
 
-/*
- * This pair of functions is declared in qtools_p.h and is used by the Qt
- * containers to allocate memory and grow the memory block during append
- * operations.
- *
- * They take size_t parameters and return size_t so they will change sizes
- * according to the pointer width. However, knowing Qt containers store the
- * container size and element indexes in ints, these functions never return a
- * size larger than INT_MAX. This is done by casting the element count and
- * memory block size to int in several comparisons: the check for negative is
- * very fast on most platforms as the code only needs to check the sign bit.
- *
- * These functions return SIZE_MAX on overflow, which can be passed to malloc()
- * and will surely cause a NULL return (there's no way you can allocate a
- * memory block the size of your entire VM space).
- */
-
-/*!
-    \internal
-    \since 5.7
-
-    Returns the memory block size for a container containing \a elementCount
-    elements, each of \a elementSize bytes, plus a header of \a headerSize
-    bytes. That is, this function returns \c
-      {elementCount * elementSize + headerSize}
-
-    but unlike the simple calculation, it checks for overflows during the
-    multiplication and the addition.
-
-    Both \a elementCount and \a headerSize can be zero, but \a elementSize
-    cannot.
-
-    This function returns SIZE_MAX (~0) on overflow or if the memory block size
-    would not fit an int.
-*/
-size_t qCalculateBlockSize(size_t elementCount, size_t elementSize, size_t headerSize) Q_DECL_NOTHROW
-{
-    unsigned count = unsigned(elementCount);
-    unsigned size = unsigned(elementSize);
-    unsigned header = unsigned(headerSize);
-    Q_ASSERT(elementSize);
-    Q_ASSERT(size == elementSize);
-    Q_ASSERT(header == headerSize);
-
-    if (Q_UNLIKELY(count != elementCount))
-        return std::numeric_limits<size_t>::max();
-
-    unsigned bytes;
-    if (Q_UNLIKELY(mul_overflow(size, count, &bytes)) ||
-            Q_UNLIKELY(add_overflow(bytes, header, &bytes)))
-        return std::numeric_limits<size_t>::max();
-    if (Q_UNLIKELY(int(bytes) < 0))     // catches bytes >= 2GB
-        return std::numeric_limits<size_t>::max();
-
-    return bytes;
-}
-
-/*!
-    \internal
-    \since 5.7
-
-    Returns the memory block size and the number of elements that will fit in
-    that block for a container containing \a elementCount elements, each of \a
-    elementSize bytes, plus a header of \a headerSize bytes. This function
-    assumes the container will grow and pre-allocates a growth factor.
-
-    Both \a elementCount and \a headerSize can be zero, but \a elementSize
-    cannot.
-
-    This function returns SIZE_MAX (~0) on overflow or if the memory block size
-    would not fit an int.
-
-    \note The memory block may contain up to \a elementSize - 1 bytes more than
-    needed.
-*/
-CalculateGrowingBlockSizeResult
-qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t headerSize) Q_DECL_NOTHROW
-{
-    CalculateGrowingBlockSizeResult result = {
-        std::numeric_limits<size_t>::max(),std::numeric_limits<size_t>::max()
-    };
-
-    unsigned bytes = unsigned(qCalculateBlockSize(elementCount, elementSize, headerSize));
-    if (int(bytes) < 0)     // catches std::numeric_limits<size_t>::max()
-        return result;
-
-    unsigned morebytes = qNextPowerOfTwo(bytes);
-    if (Q_UNLIKELY(int(morebytes) < 0)) {
-        // catches morebytes == 2GB
-        // grow by half the difference between bytes and morebytes
-        bytes += (morebytes - bytes) / 2;
-    } else {
-        bytes = morebytes;
-    }
-
-    result.elementCount = (bytes - unsigned(headerSize)) / unsigned(elementSize);
-    result.size = bytes;
-    return result;
-}
-
 /*****************************************************************************
   Safe and portable C string functions; extensions to standard string.h
  *****************************************************************************/
@@ -1297,7 +1197,7 @@ QByteArray qUncompress(const uchar* data, int nbytes)
     Assigns \a other to this byte array and returns a reference to
     this byte array.
 */
-QByteArray &QByteArray::operator=(const QByteArray & other) Q_DECL_NOTHROW
+QByteArray &QByteArray::operator=(const QByteArray & other) noexcept
 {
     other.d->ref.ref();
     if (!d->ref.deref())
@@ -1553,6 +1453,15 @@ QByteArray &QByteArray::operator=(const char *str)
     will apply to the character in the QByteArray from which you got
     the reference.
 
+    \note Before Qt 5.14 it was possible to use this operator to access
+    a character at an out-of-bounds position in the byte array, and
+    then assign to such a position, causing the byte array to be
+    automatically resized. Furthermore, assigning a value to the
+    returned QByteRef would cause a detach of the byte array, even if the
+    byte array has been copied in the meanwhile (and the QByteRef kept
+    alive while the copy was taken). These behaviors are deprecated,
+    and will be changed in a future version of Qt.
+
     \sa at()
 */
 
@@ -2179,7 +2088,7 @@ static inline QByteArray &qbytearray_insert(QByteArray *ba,
 {
     Q_ASSERT(pos >= 0);
 
-    if (pos < 0 || len <= 0 || arr == 0)
+    if (pos < 0 || len <= 0 || arr == nullptr)
         return *ba;
 
     int oldsize = ba->size();
@@ -3298,10 +3207,10 @@ static QByteArray toCase_template(T &input, const uchar * table)
     }
 
     if (firstBad == e)
-        return qMove(input);
+        return std::move(input);
 
     // transform the rest
-    QByteArray s = qMove(input);    // will copy if T is const QByteArray
+    QByteArray s = std::move(input);    // will copy if T is const QByteArray
     char *b = s.begin();            // will detach if necessary
     char *p = b + (firstBad - orig_begin);
     e = b + s.size();
@@ -4152,10 +4061,9 @@ ushort QByteArray::toUShort(bool *ok, int base) const
 
 double QByteArray::toDouble(bool *ok) const
 {
-    QByteArray nulled = nulTerminated();
     bool nonNullOk = false;
     int processed = 0;
-    double d = qt_asciiToDouble(nulled.constData(), nulled.length(),
+    double d = qt_asciiToDouble(constData(), size(),
                                 nonNullOk, processed, WhitespacesAllowed);
     if (ok)
         *ok = nonNullOk;
@@ -4883,7 +4791,7 @@ static void q_toPercentEncoding(QByteArray *ba, const char *dontEncode, const ch
     QByteArray input = *ba;
     int len = input.count();
     const char *inputData = input.constData();
-    char *output = 0;
+    char *output = nullptr;
     int length = 0;
 
     for (int i = 0; i < len; ++i) {
@@ -4923,7 +4831,7 @@ void q_toPercentEncoding(QByteArray *ba, const char *exclude, const char *includ
 void q_normalizePercentEncoding(QByteArray *ba, const char *exclude)
 {
     q_fromPercentEncoding(ba, '%');
-    q_toPercentEncoding(ba, exclude, 0, '%');
+    q_toPercentEncoding(ba, exclude, nullptr, '%');
 }
 
 /*!
@@ -5071,4 +4979,41 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA
     \sa QStringLiteral
 */
 
+namespace QtPrivate {
+namespace DeprecatedRefClassBehavior {
+void warn(WarningType w, EmittingClass c)
+{
+    static const char deprecatedBehaviorString[] =
+            "The corresponding behavior is deprecated, and will be changed"
+             " in a future version of Qt.";
+
+    const char *emittingClassName = nullptr;
+    const char *containerClassName = nullptr;
+
+    switch (c) {
+    case EmittingClass::QByteRef:
+        emittingClassName = "QByteRef";
+        containerClassName = "QByteArray";
+        break;
+    case EmittingClass::QCharRef:
+        emittingClassName = "QCharRef";
+        containerClassName = "QString";
+        break;
+    }
+
+    switch (w) {
+    case WarningType::OutOfRange:
+        qWarning("Using %s with an index pointing outside the valid range of a %s. %s",
+                 emittingClassName, containerClassName, deprecatedBehaviorString);
+        break;
+    case WarningType::DelayedDetach:
+        qWarning("Using %s with on a %s that is not already detached. %s",
+                 emittingClassName, containerClassName, deprecatedBehaviorString);
+        break;
+    }
+}
+} // namespace DeprecatedRefClassBehavior
+} // namespace QtPrivate
+
+
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/text/qbytearray.h
index 8ee3a29ecc..7c571706d8 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/text/qbytearray.h
@@ -168,22 +168,20 @@ public:
     };
     Q_DECLARE_FLAGS(Base64Options, Base64Option)
 
-    inline QByteArray() Q_DECL_NOTHROW;
+    inline QByteArray() noexcept;
     QByteArray(const char *, int size = -1);
     QByteArray(int size, char c);
     QByteArray(int size, Qt::Initialization);
-    inline QByteArray(const QByteArray &) Q_DECL_NOTHROW;
+    inline QByteArray(const QByteArray &) noexcept;
     inline ~QByteArray();
 
-    QByteArray &operator=(const QByteArray &) Q_DECL_NOTHROW;
+    QByteArray &operator=(const QByteArray &) noexcept;
     QByteArray &operator=(const char *str);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QByteArray(QByteArray && other) Q_DECL_NOTHROW : d(other.d) { other.d = Data::sharedNull(); }
-    inline QByteArray &operator=(QByteArray &&other) Q_DECL_NOTHROW
+    inline QByteArray(QByteArray && other) noexcept : d(other.d) { other.d = Data::sharedNull(); }
+    inline QByteArray &operator=(QByteArray &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
 
-    inline void swap(QByteArray &other) Q_DECL_NOTHROW
+    inline void swap(QByteArray &other) noexcept
     { qSwap(d, other.d); }
 
     inline int size() const;
@@ -211,8 +209,8 @@ public:
     inline char at(int i) const;
     inline char operator[](int i) const;
     inline char operator[](uint i) const;
-    inline QByteRef operator[](int i);
-    inline QByteRef operator[](uint i);
+    Q_REQUIRED_RESULT inline QByteRef operator[](int i);
+    Q_REQUIRED_RESULT inline QByteRef operator[](uint i);
     Q_REQUIRED_RESULT char front() const { return at(0); }
     Q_REQUIRED_RESULT inline QByteRef front();
     Q_REQUIRED_RESULT char back() const { return at(size() - 1); }
@@ -472,7 +470,7 @@ public:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QByteArray::Base64Options)
 
-inline QByteArray::QByteArray() Q_DECL_NOTHROW : d(Data::sharedNull()) { }
+inline QByteArray::QByteArray() noexcept : d(Data::sharedNull()) { }
 inline QByteArray::~QByteArray() { if (!d->ref.deref()) Data::deallocate(d); }
 inline int QByteArray::size() const
 { return d->size; }
@@ -502,7 +500,7 @@ inline void QByteArray::detach()
 { if (d->ref.isShared() || (d->offset != sizeof(QByteArrayData))) reallocData(uint(d->size) + 1u, d->detachFlags()); }
 inline bool QByteArray::isDetached() const
 { return !d->ref.isShared(); }
-inline QByteArray::QByteArray(const QByteArray &a) Q_DECL_NOTHROW : d(a.d)
+inline QByteArray::QByteArray(const QByteArray &a) noexcept : d(a.d)
 { d->ref.ref(); }
 
 inline int QByteArray::capacity() const
@@ -530,7 +528,27 @@ inline void QByteArray::squeeze()
     }
 }
 
-class Q_CORE_EXPORT QByteRef {
+namespace QtPrivate {
+namespace DeprecatedRefClassBehavior {
+    enum class EmittingClass {
+        QByteRef,
+        QCharRef,
+    };
+
+    enum class WarningType {
+        OutOfRange,
+        DelayedDetach,
+    };
+
+    Q_CORE_EXPORT Q_DECL_COLD_FUNCTION void warn(WarningType w, EmittingClass c);
+} // namespace DeprecatedAssignmentOperatorBehavior
+} // namespace QtPrivate
+
+class
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+Q_CORE_EXPORT
+#endif
+QByteRef {  // ### Qt 7: remove
     QByteArray &a;
     int i;
     inline QByteRef(QByteArray &array, int idx)
@@ -538,13 +556,37 @@ class Q_CORE_EXPORT QByteRef {
     friend class QByteArray;
 public:
     inline operator char() const
-        { return i < a.d->size ? a.d->data()[i] : char(0); }
+    {
+        using namespace QtPrivate::DeprecatedRefClassBehavior;
+        if (Q_LIKELY(i < a.d->size))
+            return a.d->data()[i];
+#ifdef QT_DEBUG
+        warn(WarningType::OutOfRange, EmittingClass::QByteRef);
+#endif
+        return char(0);
+    }
     inline QByteRef &operator=(char c)
-        { if (i >= a.d->size) a.expand(i); else a.detach();
-          a.d->data()[i] = c;  return *this; }
+    {
+        using namespace QtPrivate::DeprecatedRefClassBehavior;
+        if (Q_UNLIKELY(i >= a.d->size)) {
+#ifdef QT_DEBUG
+            warn(WarningType::OutOfRange, EmittingClass::QByteRef);
+#endif
+            a.expand(i);
+        } else {
+#ifdef QT_DEBUG
+            if (Q_UNLIKELY(!a.isDetached()))
+                warn(WarningType::DelayedDetach, EmittingClass::QByteRef);
+#endif
+            a.detach();
+        }
+        a.d->data()[i] = c;
+        return *this;
+    }
     inline QByteRef &operator=(const QByteRef &c)
-        { if (i >= a.d->size) a.expand(i); else a.detach();
-          a.d->data()[i] = c.a.d->data()[c.i];  return *this; }
+    {
+        return operator=(char(c));
+    }
     inline bool operator==(char c) const
     { return a.d->data()[i] == c; }
     inline bool operator!=(char c) const
@@ -560,9 +602,9 @@ public:
 };
 
 inline QByteRef QByteArray::operator[](int i)
-{ Q_ASSERT(i >= 0); return QByteRef(*this, i); }
+{ Q_ASSERT(i >= 0); detach(); return QByteRef(*this, i); }
 inline QByteRef QByteArray::operator[](uint i)
-{ return QByteRef(*this, i); }
+{  detach(); return QByteRef(*this, i); }
 inline QByteRef QByteArray::front() { return operator[](0); }
 inline QByteRef QByteArray::back() { return operator[](size() - 1); }
 inline QByteArray::iterator QByteArray::begin()
@@ -617,41 +659,41 @@ inline int QByteArray::compare(const QByteArray &a, Qt::CaseSensitivity cs) cons
     return cs == Qt::CaseSensitive ? qstrcmp(*this, a) :
                                      qstrnicmp(data(), size(), a.data(), a.size());
 }
-inline bool operator==(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator==(const QByteArray &a1, const QByteArray &a2) noexcept
 { return (a1.size() == a2.size()) && (memcmp(a1.constData(), a2.constData(), a1.size())==0); }
-inline bool operator==(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW
+inline bool operator==(const QByteArray &a1, const char *a2) noexcept
 { return a2 ? qstrcmp(a1,a2) == 0 : a1.isEmpty(); }
-inline bool operator==(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator==(const char *a1, const QByteArray &a2) noexcept
 { return a1 ? qstrcmp(a1,a2) == 0 : a2.isEmpty(); }
-inline bool operator!=(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator!=(const QByteArray &a1, const QByteArray &a2) noexcept
 { return !(a1==a2); }
-inline bool operator!=(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW
+inline bool operator!=(const QByteArray &a1, const char *a2) noexcept
 { return a2 ? qstrcmp(a1,a2) != 0 : !a1.isEmpty(); }
-inline bool operator!=(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator!=(const char *a1, const QByteArray &a2) noexcept
 { return a1 ? qstrcmp(a1,a2) != 0 : !a2.isEmpty(); }
-inline bool operator<(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator<(const QByteArray &a1, const QByteArray &a2) noexcept
 { return qstrcmp(a1, a2) < 0; }
- inline bool operator<(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW
+ inline bool operator<(const QByteArray &a1, const char *a2) noexcept
 { return qstrcmp(a1, a2) < 0; }
-inline bool operator<(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator<(const char *a1, const QByteArray &a2) noexcept
 { return qstrcmp(a1, a2) < 0; }
-inline bool operator<=(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator<=(const QByteArray &a1, const QByteArray &a2) noexcept
 { return qstrcmp(a1, a2) <= 0; }
-inline bool operator<=(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW
+inline bool operator<=(const QByteArray &a1, const char *a2) noexcept
 { return qstrcmp(a1, a2) <= 0; }
-inline bool operator<=(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator<=(const char *a1, const QByteArray &a2) noexcept
 { return qstrcmp(a1, a2) <= 0; }
-inline bool operator>(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator>(const QByteArray &a1, const QByteArray &a2) noexcept
 { return qstrcmp(a1, a2) > 0; }
-inline bool operator>(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW
+inline bool operator>(const QByteArray &a1, const char *a2) noexcept
 { return qstrcmp(a1, a2) > 0; }
-inline bool operator>(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator>(const char *a1, const QByteArray &a2) noexcept
 { return qstrcmp(a1, a2) > 0; }
-inline bool operator>=(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator>=(const QByteArray &a1, const QByteArray &a2) noexcept
 { return qstrcmp(a1, a2) >= 0; }
-inline bool operator>=(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW
+inline bool operator>=(const QByteArray &a1, const char *a2) noexcept
 { return qstrcmp(a1, a2) >= 0; }
-inline bool operator>=(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW
+inline bool operator>=(const char *a1, const QByteArray &a2) noexcept
 { return qstrcmp(a1, a2) >= 0; }
 #if !defined(QT_USE_QSTRINGBUILDER)
 inline const QByteArray operator+(const QByteArray &a1, const QByteArray &a2)
diff --git a/src/corelib/tools/qbytearray_p.h b/src/corelib/text/qbytearray_p.h
index 6ebff739cd..3c6257f786 100644
--- a/src/corelib/tools/qbytearray_p.h
+++ b/src/corelib/text/qbytearray_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qbytearray.h>
-#include "qtools_p.h"
+#include "private/qtools_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/tools/qbytearraylist.cpp b/src/corelib/text/qbytearraylist.cpp
index d04555ed4d..d04555ed4d 100644
--- a/src/corelib/tools/qbytearraylist.cpp
+++ b/src/corelib/text/qbytearraylist.cpp
diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/text/qbytearraylist.h
index 1261e1757c..0250b649b8 100644
--- a/src/corelib/tools/qbytearraylist.h
+++ b/src/corelib/text/qbytearraylist.h
@@ -48,8 +48,11 @@
 
 QT_BEGIN_NAMESPACE
 
+#if !defined(QT_NO_JAVA_STYLE_ITERATORS)
 typedef QListIterator<QByteArray> QByteArrayListIterator;
 typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator;
+#endif
+
 #ifndef Q_CLANG_QDOC
 typedef QList<QByteArray> QByteArrayList;
 
diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/text/qbytearraymatcher.cpp
index 72f0e0519d..72e09226af 100644
--- a/src/corelib/tools/qbytearraymatcher.cpp
+++ b/src/corelib/text/qbytearraymatcher.cpp
@@ -116,9 +116,9 @@ static inline int bm_find(const uchar *cc, int l, int index, const uchar *puc, u
     Call setPattern() to give it a pattern to match.
 */
 QByteArrayMatcher::QByteArrayMatcher()
-    : d(0)
+    : d(nullptr)
 {
-    p.p = 0;
+    p.p = nullptr;
     p.l = 0;
     memset(p.q_skiptable, 0, sizeof(p.q_skiptable));
 }
@@ -129,7 +129,7 @@ QByteArrayMatcher::QByteArrayMatcher()
   the destructor does not delete \a pattern.
  */
 QByteArrayMatcher::QByteArrayMatcher(const char *pattern, int length)
-    : d(0)
+    : d(nullptr)
 {
     p.p = reinterpret_cast<const uchar *>(pattern);
     p.l = length;
@@ -141,7 +141,7 @@ QByteArrayMatcher::QByteArrayMatcher(const char *pattern, int length)
     Call indexIn() to perform a search.
 */
 QByteArrayMatcher::QByteArrayMatcher(const QByteArray &pattern)
-    : d(0), q_pattern(pattern)
+    : d(nullptr), q_pattern(pattern)
 {
     p.p = reinterpret_cast<const uchar *>(pattern.constData());
     p.l = pattern.size();
@@ -152,7 +152,7 @@ QByteArrayMatcher::QByteArrayMatcher(const QByteArray &pattern)
     Copies the \a other byte array matcher to this byte array matcher.
 */
 QByteArrayMatcher::QByteArrayMatcher(const QByteArrayMatcher &other)
-    : d(0)
+    : d(nullptr)
 {
     operator=(other);
 }
@@ -404,7 +404,7 @@ int qFindByteArray(
 /*!
     \internal
 */
-int QStaticByteArrayMatcherBase::indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const Q_DECL_NOTHROW
+int QStaticByteArrayMatcherBase::indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const noexcept
 {
     if (from < 0)
         from = 0;
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
index dafaea9c12..0eedfc1d20 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/text/qbytearraymatcher.h
@@ -90,15 +90,15 @@ class QStaticByteArrayMatcherBase
         uchar data[256];
     } m_skiptable;
 protected:
-    explicit Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcherBase(const char *pattern, uint n) Q_DECL_NOTHROW
+    explicit Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcherBase(const char *pattern, uint n) noexcept
         : m_skiptable(generate(pattern, n)) {}
     // compiler-generated copy/more ctors/assignment operators are ok!
     // compiler-generated dtor is ok!
 
-    Q_CORE_EXPORT int indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const Q_DECL_NOTHROW;
+    Q_CORE_EXPORT int indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const noexcept;
 
 private:
-    static Q_DECL_RELAXED_CONSTEXPR Skiptable generate(const char *pattern, uint n) Q_DECL_NOTHROW
+    static Q_DECL_RELAXED_CONSTEXPR Skiptable generate(const char *pattern, uint n) noexcept
     {
         const auto uchar_max = (std::numeric_limits<uchar>::max)();
         uchar max = n > uchar_max ? uchar_max : n;
@@ -140,23 +140,23 @@ class QStaticByteArrayMatcher : QStaticByteArrayMatcherBase
     char m_pattern[N];
     Q_STATIC_ASSERT_X(N > 2, "QStaticByteArrayMatcher makes no sense for finding a single-char pattern");
 public:
-    explicit Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher(const char (&patternToMatch)[N]) Q_DECL_NOTHROW
+    explicit Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher(const char (&patternToMatch)[N]) noexcept
         : QStaticByteArrayMatcherBase(patternToMatch, N - 1), m_pattern()
     {
         for (uint i = 0; i < N; ++i)
             m_pattern[i] = patternToMatch[i];
     }
 
-    int indexIn(const QByteArray &haystack, int from = 0) const Q_DECL_NOTHROW
+    int indexIn(const QByteArray &haystack, int from = 0) const noexcept
     { return this->indexOfIn(m_pattern, N - 1, haystack.data(), haystack.size(), from); }
-    int indexIn(const char *haystack, int hlen, int from = 0) const Q_DECL_NOTHROW
+    int indexIn(const char *haystack, int hlen, int from = 0) const noexcept
     { return this->indexOfIn(m_pattern, N - 1, haystack, hlen, from); }
 
     QByteArray pattern() const { return QByteArray(m_pattern, int(N - 1)); }
 };
 
 template <uint N>
-Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher<N> qMakeStaticByteArrayMatcher(const char (&pattern)[N]) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher<N> qMakeStaticByteArrayMatcher(const char (&pattern)[N]) noexcept
 { return QStaticByteArrayMatcher<N>(pattern); }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/text/qbytedata_p.h
index 8331be112d..b319d75811 100644
--- a/src/corelib/tools/qbytedata_p.h
+++ b/src/corelib/text/qbytedata_p.h
@@ -199,7 +199,7 @@ public:
     }
 
     // the number of QByteArrays
-    inline qint64 bufferCount() const
+    inline int bufferCount() const
     {
         return buffers.length();
     }
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/text/qchar.cpp
index 47c853084b..9b03a93278 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/text/qchar.cpp
@@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QLatin1Char
     \inmodule QtCore
+    \reentrant
     \brief The QLatin1Char class provides an 8-bit ASCII/Latin-1 character.
 
     \ingroup string-processing
@@ -572,6 +573,7 @@ QT_BEGIN_NAMESPACE
     \value Null A QChar with this value isNull().
     \value Tabulation Character tabulation.
     \value LineFeed
+    \value FormFeed
     \value CarriageReturn
     \value Space
     \value Nbsp Non-breaking space.
@@ -733,7 +735,7 @@ QT_BEGIN_NAMESPACE
     Note that this gives no indication of whether the character is
     available in a particular font.
 */
-bool QChar::isPrint(uint ucs4) Q_DECL_NOTHROW
+bool QChar::isPrint(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -766,7 +768,7 @@ bool QChar::isPrint(uint ucs4) Q_DECL_NOTHROW
 /*!
     \internal
 */
-bool QT_FASTCALL QChar::isSpace_helper(uint ucs4) Q_DECL_NOTHROW
+bool QT_FASTCALL QChar::isSpace_helper(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -792,7 +794,7 @@ bool QT_FASTCALL QChar::isSpace_helper(uint ucs4) Q_DECL_NOTHROW
     Returns \c true if the UCS-4-encoded character specified by \a ucs4 is
     a mark (Mark_* categories); otherwise returns \c false.
 */
-bool QChar::isMark(uint ucs4) Q_DECL_NOTHROW
+bool QChar::isMark(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -816,7 +818,7 @@ bool QChar::isMark(uint ucs4) Q_DECL_NOTHROW
     Returns \c true if the UCS-4-encoded character specified by \a ucs4 is
     a punctuation mark (Punctuation_* categories); otherwise returns \c false.
 */
-bool QChar::isPunct(uint ucs4) Q_DECL_NOTHROW
+bool QChar::isPunct(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -844,7 +846,7 @@ bool QChar::isPunct(uint ucs4) Q_DECL_NOTHROW
     Returns \c true if the UCS-4-encoded character specified by \a ucs4 is
     a symbol (Symbol_* categories); otherwise returns \c false.
 */
-bool QChar::isSymbol(uint ucs4) Q_DECL_NOTHROW
+bool QChar::isSymbol(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -874,7 +876,7 @@ bool QChar::isSymbol(uint ucs4) Q_DECL_NOTHROW
 /*!
     \internal
 */
-bool QT_FASTCALL QChar::isLetter_helper(uint ucs4) Q_DECL_NOTHROW
+bool QT_FASTCALL QChar::isLetter_helper(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -909,7 +911,7 @@ bool QT_FASTCALL QChar::isLetter_helper(uint ucs4) Q_DECL_NOTHROW
 /*!
     \internal
 */
-bool QT_FASTCALL QChar::isNumber_helper(uint ucs4) Q_DECL_NOTHROW
+bool QT_FASTCALL QChar::isNumber_helper(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -938,7 +940,7 @@ bool QT_FASTCALL QChar::isNumber_helper(uint ucs4) Q_DECL_NOTHROW
 /*!
     \internal
 */
-bool QT_FASTCALL QChar::isLetterOrNumber_helper(uint ucs4) Q_DECL_NOTHROW
+bool QT_FASTCALL QChar::isLetterOrNumber_helper(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -1101,7 +1103,7 @@ bool QT_FASTCALL QChar::isLetterOrNumber_helper(uint ucs4) Q_DECL_NOTHROW
     Returns the numeric value of the digit specified by the UCS-4-encoded
     character, \a ucs4, or -1 if the character is not a digit.
 */
-int QChar::digitValue(uint ucs4) Q_DECL_NOTHROW
+int QChar::digitValue(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return -1;
@@ -1118,7 +1120,7 @@ int QChar::digitValue(uint ucs4) Q_DECL_NOTHROW
     \overload
     Returns the category of the UCS-4-encoded character specified by \a ucs4.
 */
-QChar::Category QChar::category(uint ucs4) Q_DECL_NOTHROW
+QChar::Category QChar::category(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return QChar::Other_NotAssigned;
@@ -1135,7 +1137,7 @@ QChar::Category QChar::category(uint ucs4) Q_DECL_NOTHROW
     \overload
     Returns the direction of the UCS-4-encoded character specified by \a ucs4.
 */
-QChar::Direction QChar::direction(uint ucs4) Q_DECL_NOTHROW
+QChar::Direction QChar::direction(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return QChar::DirL;
@@ -1158,7 +1160,7 @@ QChar::Direction QChar::direction(uint ucs4) Q_DECL_NOTHROW
     character specified by \a ucs4
     (needed for certain languages such as Arabic or Syriac).
 */
-QChar::JoiningType QChar::joiningType(uint ucs4) Q_DECL_NOTHROW
+QChar::JoiningType QChar::joiningType(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return QChar::Joining_None;
@@ -1181,7 +1183,7 @@ QChar::JoiningType QChar::joiningType(uint ucs4) Q_DECL_NOTHROW
     Returns information about the joining properties of the UCS-4-encoded
     character specified by \a ucs4 (needed for certain languages such as Arabic).
 */
-QChar::Joining QChar::joining(uint ucs4) Q_DECL_NOTHROW
+QChar::Joining QChar::joining(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return QChar::OtherJoining;
@@ -1217,7 +1219,7 @@ QChar::Joining QChar::joining(uint ucs4) Q_DECL_NOTHROW
 
     \sa mirroredChar()
 */
-bool QChar::hasMirrored(uint ucs4) Q_DECL_NOTHROW
+bool QChar::hasMirrored(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return false;
@@ -1299,7 +1301,7 @@ bool QChar::hasMirrored(uint ucs4) Q_DECL_NOTHROW
 
     \sa hasMirrored()
 */
-uint QChar::mirroredChar(uint ucs4) Q_DECL_NOTHROW
+uint QChar::mirroredChar(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return ucs4;
@@ -1339,7 +1341,7 @@ static const unsigned short * QT_FASTCALL decompositionHelper
     if (index == 0xffff) {
         *length = 0;
         *tag = QChar::NoDecomposition;
-        return 0;
+        return nullptr;
     }
 
     const unsigned short *decomposition = uc_decomposition_map+index;
@@ -1383,7 +1385,7 @@ QString QChar::decomposition(uint ucs4)
     Returns the tag defining the composition of the UCS-4-encoded character
     specified by \a ucs4. Returns QChar::NoDecomposition if no decomposition exists.
 */
-QChar::Decomposition QChar::decompositionTag(uint ucs4) Q_DECL_NOTHROW
+QChar::Decomposition QChar::decompositionTag(uint ucs4) noexcept
 {
     if (ucs4 >= Hangul_SBase && ucs4 < Hangul_SBase + Hangul_SCount)
         return QChar::Canonical;
@@ -1409,7 +1411,7 @@ QChar::Decomposition QChar::decompositionTag(uint ucs4) Q_DECL_NOTHROW
     Returns the combining class for the UCS-4-encoded character specified by
     \a ucs4, as defined in the Unicode standard.
 */
-unsigned char QChar::combiningClass(uint ucs4) Q_DECL_NOTHROW
+unsigned char QChar::combiningClass(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return 0;
@@ -1430,7 +1432,7 @@ unsigned char QChar::combiningClass(uint ucs4) Q_DECL_NOTHROW
     Returns the Unicode script property value for the character specified in
     its UCS-4-encoded form as \a ucs4.
 */
-QChar::Script QChar::script(uint ucs4) Q_DECL_NOTHROW
+QChar::Script QChar::script(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return QChar::Script_Unknown;
@@ -1448,7 +1450,7 @@ QChar::Script QChar::script(uint ucs4) Q_DECL_NOTHROW
     Returns the Unicode version that introduced the character specified in
     its UCS-4-encoded form as \a ucs4.
 */
-QChar::UnicodeVersion QChar::unicodeVersion(uint ucs4) Q_DECL_NOTHROW
+QChar::UnicodeVersion QChar::unicodeVersion(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return QChar::Unicode_Unassigned;
@@ -1458,24 +1460,24 @@ QChar::UnicodeVersion QChar::unicodeVersion(uint ucs4) Q_DECL_NOTHROW
 /*!
     Returns the most recent supported Unicode version.
 */
-QChar::UnicodeVersion QChar::currentUnicodeVersion() Q_DECL_NOTHROW
+QChar::UnicodeVersion QChar::currentUnicodeVersion() noexcept
 {
     return UNICODE_DATA_VERSION;
 }
 
 
-template <typename Traits, typename T>
-Q_DECL_CONST_FUNCTION static inline T convertCase_helper(T uc) Q_DECL_NOTHROW
+template <typename T>
+Q_DECL_CONST_FUNCTION static inline T convertCase_helper(T uc, QUnicodeTables::Case which) noexcept
 {
-    const QUnicodeTables::Properties *prop = qGetProp(uc);
+    const auto fold = qGetProp(uc)->cases[which];
 
-    if (Q_UNLIKELY(Traits::caseSpecial(prop))) {
-        const ushort *specialCase = specialCaseMap + Traits::caseDiff(prop);
+    if (Q_UNLIKELY(fold.special)) {
+        const ushort *specialCase = specialCaseMap + fold.diff;
         // so far, there are no special cases beyond BMP (guaranteed by the qunicodetables generator)
         return *specialCase == 1 ? specialCase[1] : uc;
     }
 
-    return uc + Traits::caseDiff(prop);
+    return uc + fold.diff;
 }
 
 /*!
@@ -1491,11 +1493,11 @@ Q_DECL_CONST_FUNCTION static inline T convertCase_helper(T uc) Q_DECL_NOTHROW
     by \a ucs4 if the character is uppercase or titlecase; otherwise returns
     the character itself.
 */
-uint QChar::toLower(uint ucs4) Q_DECL_NOTHROW
+uint QChar::toLower(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return ucs4;
-    return convertCase_helper<QUnicodeTables::LowercaseTraits>(ucs4);
+    return convertCase_helper(ucs4, QUnicodeTables::LowerCase);
 }
 
 /*!
@@ -1511,11 +1513,11 @@ uint QChar::toLower(uint ucs4) Q_DECL_NOTHROW
     by \a ucs4 if the character is lowercase or titlecase; otherwise returns
     the character itself.
 */
-uint QChar::toUpper(uint ucs4) Q_DECL_NOTHROW
+uint QChar::toUpper(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return ucs4;
-    return convertCase_helper<QUnicodeTables::UppercaseTraits>(ucs4);
+    return convertCase_helper(ucs4, QUnicodeTables::UpperCase);
 }
 
 /*!
@@ -1531,11 +1533,11 @@ uint QChar::toUpper(uint ucs4) Q_DECL_NOTHROW
     by \a ucs4 if the character is lowercase or uppercase; otherwise returns
     the character itself.
 */
-uint QChar::toTitleCase(uint ucs4) Q_DECL_NOTHROW
+uint QChar::toTitleCase(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return ucs4;
-    return convertCase_helper<QUnicodeTables::TitlecaseTraits>(ucs4);
+    return convertCase_helper(ucs4, QUnicodeTables::TitleCase);
 }
 
 static inline uint foldCase(const ushort *ch, const ushort *start)
@@ -1543,24 +1545,24 @@ static inline uint foldCase(const ushort *ch, const ushort *start)
     uint ucs4 = *ch;
     if (QChar::isLowSurrogate(ucs4) && ch > start && QChar::isHighSurrogate(*(ch - 1)))
         ucs4 = QChar::surrogateToUcs4(*(ch - 1), ucs4);
-    return convertCase_helper<QUnicodeTables::CasefoldTraits>(ucs4);
+    return convertCase_helper(ucs4, QUnicodeTables::CaseFold);
 }
 
-static inline uint foldCase(uint ch, uint &last) Q_DECL_NOTHROW
+static inline uint foldCase(uint ch, uint &last) noexcept
 {
     uint ucs4 = ch;
     if (QChar::isLowSurrogate(ucs4) && QChar::isHighSurrogate(last))
         ucs4 = QChar::surrogateToUcs4(last, ucs4);
     last = ch;
-    return convertCase_helper<QUnicodeTables::CasefoldTraits>(ucs4);
+    return convertCase_helper(ucs4, QUnicodeTables::CaseFold);
 }
 
-static inline ushort foldCase(ushort ch) Q_DECL_NOTHROW
+static inline ushort foldCase(ushort ch) noexcept
 {
-    return convertCase_helper<QUnicodeTables::CasefoldTraits>(ch);
+    return convertCase_helper(ch, QUnicodeTables::CaseFold);
 }
 
-static inline QChar foldCase(QChar ch) Q_DECL_NOTHROW
+static inline QChar foldCase(QChar ch) noexcept
 {
     return QChar(foldCase(ch.unicode()));
 }
@@ -1577,11 +1579,11 @@ static inline QChar foldCase(QChar ch) Q_DECL_NOTHROW
     Returns the case folded equivalent of the UCS-4-encoded character specified
     by \a ucs4. For most Unicode characters this is the same as toLower().
 */
-uint QChar::toCaseFolded(uint ucs4) Q_DECL_NOTHROW
+uint QChar::toCaseFolded(uint ucs4) noexcept
 {
     if (ucs4 > LastValidCodePoint)
         return ucs4;
-    return convertCase_helper<QUnicodeTables::CasefoldTraits>(ucs4);
+    return convertCase_helper(ucs4, QUnicodeTables::CaseFold);
 }
 
 /*!
@@ -1885,11 +1887,11 @@ static void composeHelper(QString *str, QChar::UnicodeVersion version, int from)
                 QChar *d = s.data();
                 // ligatureHelper() never changes planes
                 if (QChar::requiresSurrogates(ligature)) {
-                    d[starter] = QChar::highSurrogate(ligature);
-                    d[starter + 1] = QChar::lowSurrogate(ligature);
+                    d[starter] = QChar(QChar::highSurrogate(ligature));
+                    d[starter + 1] = QChar(QChar::lowSurrogate(ligature));
                     s.remove(i, 2);
                 } else {
-                    d[starter] = ligature;
+                    d[starter] = QChar(ligature);
                     s.remove(i, 1);
                 }
                 continue;
@@ -1962,16 +1964,16 @@ static void canonicalOrderHelper(QString *str, QChar::UnicodeVersion version, in
             int p = pos;
             // exchange characters
             if (!QChar::requiresSurrogates(u2)) {
-                uc[p++] = u2;
+                uc[p++] = QChar(u2);
             } else {
-                uc[p++] = QChar::highSurrogate(u2);
-                uc[p++] = QChar::lowSurrogate(u2);
+                uc[p++] = QChar(QChar::highSurrogate(u2));
+                uc[p++] = QChar(QChar::lowSurrogate(u2));
             }
             if (!QChar::requiresSurrogates(u1)) {
-                uc[p++] = u1;
+                uc[p++] = QChar(u1);
             } else {
-                uc[p++] = QChar::highSurrogate(u1);
-                uc[p++] = QChar::lowSurrogate(u1);
+                uc[p++] = QChar(QChar::highSurrogate(u1));
+                uc[p++] = QChar(QChar::lowSurrogate(u1));
             }
             if (pos > 0)
                 --pos;
diff --git a/src/corelib/tools/qchar.h b/src/corelib/text/qchar.h
index 8590b91ba3..f67a7ea90a 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/text/qchar.h
@@ -50,14 +50,27 @@ class QString;
 struct QLatin1Char
 {
 public:
-    Q_DECL_CONSTEXPR inline explicit QLatin1Char(char c) Q_DECL_NOTHROW : ch(c) {}
-    Q_DECL_CONSTEXPR inline char toLatin1() const Q_DECL_NOTHROW { return ch; }
-    Q_DECL_CONSTEXPR inline ushort unicode() const Q_DECL_NOTHROW { return ushort(uchar(ch)); }
+    Q_DECL_CONSTEXPR inline explicit QLatin1Char(char c) noexcept : ch(c) {}
+    Q_DECL_CONSTEXPR inline char toLatin1() const noexcept { return ch; }
+    Q_DECL_CONSTEXPR inline ushort unicode() const noexcept { return ushort(uchar(ch)); }
 
 private:
     char ch;
 };
 
+Q_DECL_CONSTEXPR inline bool operator==(char lhs, QLatin1Char rhs) noexcept { return lhs == rhs.toLatin1(); }
+Q_DECL_CONSTEXPR inline bool operator!=(char lhs, QLatin1Char rhs) noexcept { return lhs != rhs.toLatin1(); }
+Q_DECL_CONSTEXPR inline bool operator<=(char lhs, QLatin1Char rhs) noexcept { return lhs <= rhs.toLatin1(); }
+Q_DECL_CONSTEXPR inline bool operator>=(char lhs, QLatin1Char rhs) noexcept { return lhs >= rhs.toLatin1(); }
+Q_DECL_CONSTEXPR inline bool operator< (char lhs, QLatin1Char rhs) noexcept { return lhs <  rhs.toLatin1(); }
+Q_DECL_CONSTEXPR inline bool operator> (char lhs, QLatin1Char rhs) noexcept { return lhs >  rhs.toLatin1(); }
+
+Q_DECL_CONSTEXPR inline bool operator==(QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() == rhs; }
+Q_DECL_CONSTEXPR inline bool operator!=(QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() != rhs; }
+Q_DECL_CONSTEXPR inline bool operator<=(QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() <= rhs; }
+Q_DECL_CONSTEXPR inline bool operator>=(QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() >= rhs; }
+Q_DECL_CONSTEXPR inline bool operator< (QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() <  rhs; }
+Q_DECL_CONSTEXPR inline bool operator> (QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() >  rhs; }
 
 class Q_CORE_EXPORT QChar {
 public:
@@ -65,6 +78,7 @@ public:
         Null = 0x0000,
         Tabulation = 0x0009,
         LineFeed = 0x000a,
+        FormFeed = 0x000c,
         CarriageReturn = 0x000d,
         Space = 0x0020,
         Nbsp = 0x00a0,
@@ -78,30 +92,30 @@ public:
         LastValidCodePoint = 0x10ffff
     };
 
-    Q_DECL_CONSTEXPR QChar() Q_DECL_NOTHROW : ucs(0) {}
-    Q_DECL_CONSTEXPR QChar(ushort rc) Q_DECL_NOTHROW : ucs(rc) {} // implicit
-    Q_DECL_CONSTEXPR QChar(uchar c, uchar r) Q_DECL_NOTHROW : ucs(ushort((r << 8) | c)) {}
-    Q_DECL_CONSTEXPR QChar(short rc) Q_DECL_NOTHROW : ucs(ushort(rc)) {} // implicit
-    Q_DECL_CONSTEXPR QChar(uint rc) Q_DECL_NOTHROW : ucs(ushort(rc & 0xffff)) {}
-    Q_DECL_CONSTEXPR QChar(int rc) Q_DECL_NOTHROW : ucs(ushort(rc & 0xffff)) {}
-    Q_DECL_CONSTEXPR QChar(SpecialCharacter s) Q_DECL_NOTHROW : ucs(ushort(s)) {} // implicit
-    Q_DECL_CONSTEXPR QChar(QLatin1Char ch) Q_DECL_NOTHROW : ucs(ch.unicode()) {} // implicit
+    Q_DECL_CONSTEXPR QChar() noexcept : ucs(0) {}
+    Q_DECL_CONSTEXPR QChar(ushort rc) noexcept : ucs(rc) {} // implicit
+    Q_DECL_CONSTEXPR QChar(uchar c, uchar r) noexcept : ucs(ushort((r << 8) | c)) {}
+    Q_DECL_CONSTEXPR QChar(short rc) noexcept : ucs(ushort(rc)) {} // implicit
+    Q_DECL_CONSTEXPR QChar(uint rc) noexcept : ucs(ushort(rc & 0xffff)) {}
+    Q_DECL_CONSTEXPR QChar(int rc) noexcept : ucs(ushort(rc & 0xffff)) {}
+    Q_DECL_CONSTEXPR QChar(SpecialCharacter s) noexcept : ucs(ushort(s)) {} // implicit
+    Q_DECL_CONSTEXPR QChar(QLatin1Char ch) noexcept : ucs(ch.unicode()) {} // implicit
 #if defined(Q_COMPILER_UNICODE_STRINGS)
-    Q_DECL_CONSTEXPR QChar(char16_t ch) Q_DECL_NOTHROW : ucs(ushort(ch)) {} // implicit
+    Q_DECL_CONSTEXPR QChar(char16_t ch) noexcept : ucs(ushort(ch)) {} // implicit
 #endif
 #if defined(Q_OS_WIN)
     Q_STATIC_ASSERT(sizeof(wchar_t) == sizeof(ushort));
 #endif
 #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
 #   if !defined(_WCHAR_T_DEFINED) || defined(_NATIVE_WCHAR_T_DEFINED)
-    Q_DECL_CONSTEXPR QChar(wchar_t ch) Q_DECL_NOTHROW : ucs(ushort(ch)) {} // implicit
+    Q_DECL_CONSTEXPR QChar(wchar_t ch) noexcept : ucs(ushort(ch)) {} // implicit
 #   endif
 #endif
 
 #ifndef QT_NO_CAST_FROM_ASCII
-    QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(char c) Q_DECL_NOTHROW : ucs(uchar(c)) { }
+    QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(char c) noexcept : ucs(uchar(c)) { }
 #ifndef QT_RESTRICTED_CAST_FROM_ASCII
-    QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(uchar c) Q_DECL_NOTHROW : ucs(c) { }
+    QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(uchar c) noexcept : ucs(c) { }
 #endif
 #endif
     // Unicode information
@@ -411,11 +425,11 @@ public:
     };
     // ****** WHEN ADDING FUNCTIONS, CONSIDER ADDING TO QCharRef TOO
 
-    inline Category category() const Q_DECL_NOTHROW { return QChar::category(ucs); }
-    inline Direction direction() const Q_DECL_NOTHROW { return QChar::direction(ucs); }
-    inline JoiningType joiningType() const Q_DECL_NOTHROW { return QChar::joiningType(ucs); }
+    inline Category category() const noexcept { return QChar::category(ucs); }
+    inline Direction direction() const noexcept { return QChar::direction(ucs); }
+    inline JoiningType joiningType() const noexcept { return QChar::joiningType(ucs); }
 #if QT_DEPRECATED_SINCE(5, 3)
-    QT_DEPRECATED inline Joining joining() const Q_DECL_NOTHROW
+    QT_DEPRECATED inline Joining joining() const noexcept
     {
         switch (QChar::joiningType(ucs)) {
         case QChar::Joining_Causing: return QChar::Center;
@@ -428,198 +442,198 @@ public:
         }
     }
 #endif
-    inline unsigned char combiningClass() const Q_DECL_NOTHROW { return QChar::combiningClass(ucs); }
+    inline unsigned char combiningClass() const noexcept { return QChar::combiningClass(ucs); }
 
-    inline QChar mirroredChar() const Q_DECL_NOTHROW { return QChar::mirroredChar(ucs); }
-    inline bool hasMirrored() const Q_DECL_NOTHROW { return QChar::hasMirrored(ucs); }
+    inline QChar mirroredChar() const noexcept { return QChar(QChar::mirroredChar(ucs)); }
+    inline bool hasMirrored() const noexcept { return QChar::hasMirrored(ucs); }
 
     QString decomposition() const;
-    inline Decomposition decompositionTag() const Q_DECL_NOTHROW { return QChar::decompositionTag(ucs); }
+    inline Decomposition decompositionTag() const noexcept { return QChar::decompositionTag(ucs); }
 
-    inline int digitValue() const Q_DECL_NOTHROW { return QChar::digitValue(ucs); }
-    inline QChar toLower() const Q_DECL_NOTHROW { return QChar::toLower(ucs); }
-    inline QChar toUpper() const Q_DECL_NOTHROW { return QChar::toUpper(ucs); }
-    inline QChar toTitleCase() const Q_DECL_NOTHROW { return QChar::toTitleCase(ucs); }
-    inline QChar toCaseFolded() const Q_DECL_NOTHROW { return QChar::toCaseFolded(ucs); }
+    inline int digitValue() const noexcept { return QChar::digitValue(ucs); }
+    inline QChar toLower() const noexcept { return QChar(QChar::toLower(ucs)); }
+    inline QChar toUpper() const noexcept { return QChar(QChar::toUpper(ucs)); }
+    inline QChar toTitleCase() const noexcept { return QChar(QChar::toTitleCase(ucs)); }
+    inline QChar toCaseFolded() const noexcept { return QChar(QChar::toCaseFolded(ucs)); }
 
-    inline Script script() const Q_DECL_NOTHROW { return QChar::script(ucs); }
+    inline Script script() const noexcept { return QChar::script(ucs); }
 
-    inline UnicodeVersion unicodeVersion() const Q_DECL_NOTHROW { return QChar::unicodeVersion(ucs); }
+    inline UnicodeVersion unicodeVersion() const noexcept { return QChar::unicodeVersion(ucs); }
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED Q_DECL_CONSTEXPR inline char toAscii() const Q_DECL_NOTHROW { return toLatin1(); }
+    QT_DEPRECATED Q_DECL_CONSTEXPR inline char toAscii() const noexcept { return toLatin1(); }
 #endif
-    Q_DECL_CONSTEXPR inline char toLatin1() const Q_DECL_NOTHROW { return ucs > 0xff ? '\0' : char(ucs); }
-    Q_DECL_CONSTEXPR inline ushort unicode() const Q_DECL_NOTHROW { return ucs; }
-    Q_DECL_RELAXED_CONSTEXPR inline ushort &unicode() Q_DECL_NOTHROW { return ucs; }
+    Q_DECL_CONSTEXPR inline char toLatin1() const noexcept { return ucs > 0xff ? '\0' : char(ucs); }
+    Q_DECL_CONSTEXPR inline ushort unicode() const noexcept { return ucs; }
+    Q_DECL_RELAXED_CONSTEXPR inline ushort &unicode() noexcept { return ucs; }
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED static Q_DECL_CONSTEXPR inline QChar fromAscii(char c) Q_DECL_NOTHROW
+    QT_DEPRECATED static Q_DECL_CONSTEXPR inline QChar fromAscii(char c) noexcept
     { return fromLatin1(c); }
 #endif
-    static Q_DECL_CONSTEXPR inline QChar fromLatin1(char c) Q_DECL_NOTHROW { return QChar(ushort(uchar(c))); }
-
-    Q_DECL_CONSTEXPR inline bool isNull() const Q_DECL_NOTHROW { return ucs == 0; }
-
-    inline bool isPrint() const Q_DECL_NOTHROW { return QChar::isPrint(ucs); }
-    Q_DECL_CONSTEXPR inline bool isSpace() const Q_DECL_NOTHROW { return QChar::isSpace(ucs); }
-    inline bool isMark() const Q_DECL_NOTHROW { return QChar::isMark(ucs); }
-    inline bool isPunct() const Q_DECL_NOTHROW { return QChar::isPunct(ucs); }
-    inline bool isSymbol() const Q_DECL_NOTHROW { return QChar::isSymbol(ucs); }
-    Q_DECL_CONSTEXPR inline bool isLetter() const Q_DECL_NOTHROW { return QChar::isLetter(ucs); }
-    Q_DECL_CONSTEXPR inline bool isNumber() const Q_DECL_NOTHROW { return QChar::isNumber(ucs); }
-    Q_DECL_CONSTEXPR inline bool isLetterOrNumber() const Q_DECL_NOTHROW { return QChar::isLetterOrNumber(ucs); }
-    Q_DECL_CONSTEXPR inline bool isDigit() const Q_DECL_NOTHROW { return QChar::isDigit(ucs); }
-    Q_DECL_CONSTEXPR inline bool isLower() const Q_DECL_NOTHROW { return QChar::isLower(ucs); }
-    Q_DECL_CONSTEXPR inline bool isUpper() const Q_DECL_NOTHROW { return QChar::isUpper(ucs); }
-    Q_DECL_CONSTEXPR inline bool isTitleCase() const Q_DECL_NOTHROW { return QChar::isTitleCase(ucs); }
-
-    Q_DECL_CONSTEXPR inline bool isNonCharacter() const Q_DECL_NOTHROW { return QChar::isNonCharacter(ucs); }
-    Q_DECL_CONSTEXPR inline bool isHighSurrogate() const Q_DECL_NOTHROW { return QChar::isHighSurrogate(ucs); }
-    Q_DECL_CONSTEXPR inline bool isLowSurrogate() const Q_DECL_NOTHROW { return QChar::isLowSurrogate(ucs); }
-    Q_DECL_CONSTEXPR inline bool isSurrogate() const Q_DECL_NOTHROW { return QChar::isSurrogate(ucs); }
-
-    Q_DECL_CONSTEXPR inline uchar cell() const Q_DECL_NOTHROW { return uchar(ucs & 0xff); }
-    Q_DECL_CONSTEXPR inline uchar row() const Q_DECL_NOTHROW { return uchar((ucs>>8)&0xff); }
-    Q_DECL_RELAXED_CONSTEXPR inline void setCell(uchar acell) Q_DECL_NOTHROW { ucs = ushort((ucs & 0xff00) + acell); }
-    Q_DECL_RELAXED_CONSTEXPR inline void setRow(uchar arow) Q_DECL_NOTHROW { ucs = ushort((ushort(arow)<<8) + (ucs&0xff)); }
-
-    static Q_DECL_CONSTEXPR inline bool isNonCharacter(uint ucs4) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline QChar fromLatin1(char c) noexcept { return QChar(ushort(uchar(c))); }
+
+    Q_DECL_CONSTEXPR inline bool isNull() const noexcept { return ucs == 0; }
+
+    inline bool isPrint() const noexcept { return QChar::isPrint(ucs); }
+    Q_DECL_CONSTEXPR inline bool isSpace() const noexcept { return QChar::isSpace(ucs); }
+    inline bool isMark() const noexcept { return QChar::isMark(ucs); }
+    inline bool isPunct() const noexcept { return QChar::isPunct(ucs); }
+    inline bool isSymbol() const noexcept { return QChar::isSymbol(ucs); }
+    Q_DECL_CONSTEXPR inline bool isLetter() const noexcept { return QChar::isLetter(ucs); }
+    Q_DECL_CONSTEXPR inline bool isNumber() const noexcept { return QChar::isNumber(ucs); }
+    Q_DECL_CONSTEXPR inline bool isLetterOrNumber() const noexcept { return QChar::isLetterOrNumber(ucs); }
+    Q_DECL_CONSTEXPR inline bool isDigit() const noexcept { return QChar::isDigit(ucs); }
+    Q_DECL_CONSTEXPR inline bool isLower() const noexcept { return QChar::isLower(ucs); }
+    Q_DECL_CONSTEXPR inline bool isUpper() const noexcept { return QChar::isUpper(ucs); }
+    Q_DECL_CONSTEXPR inline bool isTitleCase() const noexcept { return QChar::isTitleCase(ucs); }
+
+    Q_DECL_CONSTEXPR inline bool isNonCharacter() const noexcept { return QChar::isNonCharacter(ucs); }
+    Q_DECL_CONSTEXPR inline bool isHighSurrogate() const noexcept { return QChar::isHighSurrogate(ucs); }
+    Q_DECL_CONSTEXPR inline bool isLowSurrogate() const noexcept { return QChar::isLowSurrogate(ucs); }
+    Q_DECL_CONSTEXPR inline bool isSurrogate() const noexcept { return QChar::isSurrogate(ucs); }
+
+    Q_DECL_CONSTEXPR inline uchar cell() const noexcept { return uchar(ucs & 0xff); }
+    Q_DECL_CONSTEXPR inline uchar row() const noexcept { return uchar((ucs>>8)&0xff); }
+    Q_DECL_RELAXED_CONSTEXPR inline void setCell(uchar acell) noexcept { ucs = ushort((ucs & 0xff00) + acell); }
+    Q_DECL_RELAXED_CONSTEXPR inline void setRow(uchar arow) noexcept { ucs = ushort((ushort(arow)<<8) + (ucs&0xff)); }
+
+    static Q_DECL_CONSTEXPR inline bool isNonCharacter(uint ucs4) noexcept
     {
         return ucs4 >= 0xfdd0 && (ucs4 <= 0xfdef || (ucs4 & 0xfffe) == 0xfffe);
     }
-    static Q_DECL_CONSTEXPR inline bool isHighSurrogate(uint ucs4) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline bool isHighSurrogate(uint ucs4) noexcept
     {
         return ((ucs4 & 0xfffffc00) == 0xd800);
     }
-    static Q_DECL_CONSTEXPR inline bool isLowSurrogate(uint ucs4) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline bool isLowSurrogate(uint ucs4) noexcept
     {
         return ((ucs4 & 0xfffffc00) == 0xdc00);
     }
-    static Q_DECL_CONSTEXPR inline bool isSurrogate(uint ucs4) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline bool isSurrogate(uint ucs4) noexcept
     {
         return (ucs4 - 0xd800u < 2048u);
     }
-    static Q_DECL_CONSTEXPR inline bool requiresSurrogates(uint ucs4) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline bool requiresSurrogates(uint ucs4) noexcept
     {
         return (ucs4 >= 0x10000);
     }
-    static Q_DECL_CONSTEXPR inline uint surrogateToUcs4(ushort high, ushort low) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline uint surrogateToUcs4(ushort high, ushort low) noexcept
     {
         return (uint(high)<<10) + low - 0x35fdc00;
     }
-    static Q_DECL_CONSTEXPR inline uint surrogateToUcs4(QChar high, QChar low) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline uint surrogateToUcs4(QChar high, QChar low) noexcept
     {
         return surrogateToUcs4(high.ucs, low.ucs);
     }
-    static Q_DECL_CONSTEXPR inline ushort highSurrogate(uint ucs4) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline ushort highSurrogate(uint ucs4) noexcept
     {
         return ushort((ucs4>>10) + 0xd7c0);
     }
-    static Q_DECL_CONSTEXPR inline ushort lowSurrogate(uint ucs4) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR inline ushort lowSurrogate(uint ucs4) noexcept
     {
         return ushort(ucs4%0x400 + 0xdc00);
     }
 
-    static Category QT_FASTCALL category(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static Direction QT_FASTCALL direction(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static JoiningType QT_FASTCALL joiningType(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static Category QT_FASTCALL category(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static Direction QT_FASTCALL direction(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static JoiningType QT_FASTCALL joiningType(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 #if QT_DEPRECATED_SINCE(5, 3)
-    QT_DEPRECATED static Joining QT_FASTCALL joining(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    QT_DEPRECATED static Joining QT_FASTCALL joining(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 #endif
-    static unsigned char QT_FASTCALL combiningClass(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static unsigned char QT_FASTCALL combiningClass(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 
-    static uint QT_FASTCALL mirroredChar(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static bool QT_FASTCALL hasMirrored(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static uint QT_FASTCALL mirroredChar(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static bool QT_FASTCALL hasMirrored(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 
     static QString QT_FASTCALL decomposition(uint ucs4);
-    static Decomposition QT_FASTCALL decompositionTag(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static Decomposition QT_FASTCALL decompositionTag(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 
-    static int QT_FASTCALL digitValue(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static uint QT_FASTCALL toLower(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static uint QT_FASTCALL toUpper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static uint QT_FASTCALL toTitleCase(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static uint QT_FASTCALL toCaseFolded(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static int QT_FASTCALL digitValue(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static uint QT_FASTCALL toLower(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static uint QT_FASTCALL toUpper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static uint QT_FASTCALL toTitleCase(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static uint QT_FASTCALL toCaseFolded(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 
-    static Script QT_FASTCALL script(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static Script QT_FASTCALL script(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 
-    static UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 
-    static UnicodeVersion QT_FASTCALL currentUnicodeVersion() Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static UnicodeVersion QT_FASTCALL currentUnicodeVersion() noexcept Q_DECL_CONST_FUNCTION;
 
-    static bool QT_FASTCALL isPrint(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static Q_DECL_CONSTEXPR inline bool isSpace(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION
+    static bool QT_FASTCALL isPrint(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static Q_DECL_CONSTEXPR inline bool isSpace(uint ucs4) noexcept Q_DECL_CONST_FUNCTION
     {
         // note that [0x09..0x0d] + 0x85 are exceptional Cc-s and must be handled explicitly
         return ucs4 == 0x20 || (ucs4 <= 0x0d && ucs4 >= 0x09)
                 || (ucs4 > 127 && (ucs4 == 0x85 || ucs4 == 0xa0 || QChar::isSpace_helper(ucs4)));
     }
-    static bool QT_FASTCALL isMark(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static bool QT_FASTCALL isPunct(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static bool QT_FASTCALL isSymbol(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static Q_DECL_CONSTEXPR inline bool isLetter(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION
+    static bool QT_FASTCALL isMark(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static bool QT_FASTCALL isPunct(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static bool QT_FASTCALL isSymbol(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static Q_DECL_CONSTEXPR inline bool isLetter(uint ucs4) noexcept Q_DECL_CONST_FUNCTION
     {
         return (ucs4 >= 'A' && ucs4 <= 'z' && (ucs4 >= 'a' || ucs4 <= 'Z'))
                 || (ucs4 > 127 && QChar::isLetter_helper(ucs4));
     }
-    static Q_DECL_CONSTEXPR inline bool isNumber(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION
+    static Q_DECL_CONSTEXPR inline bool isNumber(uint ucs4) noexcept Q_DECL_CONST_FUNCTION
     { return (ucs4 <= '9' && ucs4 >= '0') || (ucs4 > 127 && QChar::isNumber_helper(ucs4)); }
-    static Q_DECL_CONSTEXPR inline bool isLetterOrNumber(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION
+    static Q_DECL_CONSTEXPR inline bool isLetterOrNumber(uint ucs4) noexcept Q_DECL_CONST_FUNCTION
     {
         return (ucs4 >= 'A' && ucs4 <= 'z' && (ucs4 >= 'a' || ucs4 <= 'Z'))
                 || (ucs4 >= '0' && ucs4 <= '9')
                 || (ucs4 > 127 && QChar::isLetterOrNumber_helper(ucs4));
     }
-    static Q_DECL_CONSTEXPR inline bool isDigit(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION
+    static Q_DECL_CONSTEXPR inline bool isDigit(uint ucs4) noexcept Q_DECL_CONST_FUNCTION
     { return (ucs4 <= '9' && ucs4 >= '0') || (ucs4 > 127 && QChar::category(ucs4) == Number_DecimalDigit); }
-    static Q_DECL_CONSTEXPR inline bool isLower(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION
+    static Q_DECL_CONSTEXPR inline bool isLower(uint ucs4) noexcept Q_DECL_CONST_FUNCTION
     { return (ucs4 <= 'z' && ucs4 >= 'a') || (ucs4 > 127 && QChar::category(ucs4) == Letter_Lowercase); }
-    static Q_DECL_CONSTEXPR inline bool isUpper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION
+    static Q_DECL_CONSTEXPR inline bool isUpper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION
     { return (ucs4 <= 'Z' && ucs4 >= 'A') || (ucs4 > 127 && QChar::category(ucs4) == Letter_Uppercase); }
-    static Q_DECL_CONSTEXPR inline bool isTitleCase(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION
+    static Q_DECL_CONSTEXPR inline bool isTitleCase(uint ucs4) noexcept Q_DECL_CONST_FUNCTION
     { return ucs4 > 127 && QChar::category(ucs4) == Letter_Titlecase; }
 
 private:
-    static bool QT_FASTCALL isSpace_helper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static bool QT_FASTCALL isLetter_helper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static bool QT_FASTCALL isNumber_helper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
-    static bool QT_FASTCALL isLetterOrNumber_helper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
+    static bool QT_FASTCALL isSpace_helper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static bool QT_FASTCALL isLetter_helper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static bool QT_FASTCALL isNumber_helper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
+    static bool QT_FASTCALL isLetterOrNumber_helper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION;
 
 #ifdef QT_NO_CAST_FROM_ASCII
-    QChar(char c) Q_DECL_NOTHROW;
-    QChar(uchar c) Q_DECL_NOTHROW;
+    QChar(char c) noexcept;
+    QChar(uchar c) noexcept;
 #endif
 
-    friend Q_DECL_CONSTEXPR bool operator==(QChar, QChar) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR bool operator< (QChar, QChar) Q_DECL_NOTHROW;
+    friend Q_DECL_CONSTEXPR bool operator==(QChar, QChar) noexcept;
+    friend Q_DECL_CONSTEXPR bool operator< (QChar, QChar) noexcept;
     ushort ucs;
 };
 
 Q_DECLARE_TYPEINFO(QChar, Q_MOVABLE_TYPE);
 
-Q_DECL_CONSTEXPR inline bool operator==(QChar c1, QChar c2) Q_DECL_NOTHROW { return c1.ucs == c2.ucs; }
-Q_DECL_CONSTEXPR inline bool operator< (QChar c1, QChar c2) Q_DECL_NOTHROW { return c1.ucs <  c2.ucs; }
+Q_DECL_CONSTEXPR inline bool operator==(QChar c1, QChar c2) noexcept { return c1.ucs == c2.ucs; }
+Q_DECL_CONSTEXPR inline bool operator< (QChar c1, QChar c2) noexcept { return c1.ucs <  c2.ucs; }
 
-Q_DECL_CONSTEXPR inline bool operator!=(QChar c1, QChar c2) Q_DECL_NOTHROW { return !operator==(c1, c2); }
-Q_DECL_CONSTEXPR inline bool operator>=(QChar c1, QChar c2) Q_DECL_NOTHROW { return !operator< (c1, c2); }
-Q_DECL_CONSTEXPR inline bool operator> (QChar c1, QChar c2) Q_DECL_NOTHROW { return  operator< (c2, c1); }
-Q_DECL_CONSTEXPR inline bool operator<=(QChar c1, QChar c2) Q_DECL_NOTHROW { return !operator< (c2, c1); }
+Q_DECL_CONSTEXPR inline bool operator!=(QChar c1, QChar c2) noexcept { return !operator==(c1, c2); }
+Q_DECL_CONSTEXPR inline bool operator>=(QChar c1, QChar c2) noexcept { return !operator< (c1, c2); }
+Q_DECL_CONSTEXPR inline bool operator> (QChar c1, QChar c2) noexcept { return  operator< (c2, c1); }
+Q_DECL_CONSTEXPR inline bool operator<=(QChar c1, QChar c2) noexcept { return !operator< (c2, c1); }
 
 
-Q_DECL_CONSTEXPR inline bool operator==(QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return lhs.isNull(); }
-Q_DECL_CONSTEXPR inline bool operator< (QChar,     std::nullptr_t) Q_DECL_NOTHROW { return false; }
-Q_DECL_CONSTEXPR inline bool operator==(std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return rhs.isNull(); }
-Q_DECL_CONSTEXPR inline bool operator< (std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return !rhs.isNull(); }
+Q_DECL_CONSTEXPR inline bool operator==(QChar lhs, std::nullptr_t) noexcept { return lhs.isNull(); }
+Q_DECL_CONSTEXPR inline bool operator< (QChar,     std::nullptr_t) noexcept { return false; }
+Q_DECL_CONSTEXPR inline bool operator==(std::nullptr_t, QChar rhs) noexcept { return rhs.isNull(); }
+Q_DECL_CONSTEXPR inline bool operator< (std::nullptr_t, QChar rhs) noexcept { return !rhs.isNull(); }
 
-Q_DECL_CONSTEXPR inline bool operator!=(QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return !operator==(lhs, nullptr); }
-Q_DECL_CONSTEXPR inline bool operator>=(QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return !operator< (lhs, nullptr); }
-Q_DECL_CONSTEXPR inline bool operator> (QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return  operator< (nullptr, lhs); }
-Q_DECL_CONSTEXPR inline bool operator<=(QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return !operator< (nullptr, lhs); }
+Q_DECL_CONSTEXPR inline bool operator!=(QChar lhs, std::nullptr_t) noexcept { return !operator==(lhs, nullptr); }
+Q_DECL_CONSTEXPR inline bool operator>=(QChar lhs, std::nullptr_t) noexcept { return !operator< (lhs, nullptr); }
+Q_DECL_CONSTEXPR inline bool operator> (QChar lhs, std::nullptr_t) noexcept { return  operator< (nullptr, lhs); }
+Q_DECL_CONSTEXPR inline bool operator<=(QChar lhs, std::nullptr_t) noexcept { return !operator< (nullptr, lhs); }
 
-Q_DECL_CONSTEXPR inline bool operator!=(std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return !operator==(nullptr, rhs); }
-Q_DECL_CONSTEXPR inline bool operator>=(std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return !operator< (nullptr, rhs); }
-Q_DECL_CONSTEXPR inline bool operator> (std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return  operator< (rhs, nullptr); }
-Q_DECL_CONSTEXPR inline bool operator<=(std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return !operator< (rhs, nullptr); }
+Q_DECL_CONSTEXPR inline bool operator!=(std::nullptr_t, QChar rhs) noexcept { return !operator==(nullptr, rhs); }
+Q_DECL_CONSTEXPR inline bool operator>=(std::nullptr_t, QChar rhs) noexcept { return !operator< (nullptr, rhs); }
+Q_DECL_CONSTEXPR inline bool operator> (std::nullptr_t, QChar rhs) noexcept { return  operator< (rhs, nullptr); }
+Q_DECL_CONSTEXPR inline bool operator<=(std::nullptr_t, QChar rhs) noexcept { return !operator< (rhs, nullptr); }
 
 #ifndef QT_NO_DATASTREAM
 Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QChar);
diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/text/qcollator.cpp
index 76dcf35833..958216bde8 100644
--- a/src/corelib/tools/qcollator.cpp
+++ b/src/corelib/text/qcollator.cpp
@@ -46,7 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
 /*!
     \class QCollator
     \inmodule QtCore
@@ -59,20 +58,32 @@ QT_BEGIN_NAMESPACE
     \ingroup string-processing
     \ingroup shared
 
-    QCollator is initialized with a QLocale and an optional collation strategy. It tries to
-    initialize the collator with the specified values. The collator can then be used to compare
-    and sort strings in a locale dependent fashion.
+    QCollator is initialized with a QLocale and an optional collation strategy.
+    It tries to initialize the collator with the specified values. The collator
+    can then be used to compare and sort strings in a locale dependent fashion.
 
-    A QCollator object can be used together with template based sorting algorithms such as std::sort
-    to sort a list of QStrings.
+    A QCollator object can be used together with template based sorting
+    algorithms such as std::sort to sort a list of QStrings.
 
-    In addition to the locale and collation strategy, several optional flags can be set that influence
-    the result of the collation.
+    In addition to the locale and collation strategy, several optional flags can
+    be set that influence the result of the collation.
 */
 
 /*!
-    Constructs a QCollator from \a locale. If \a locale is not specified
-    the system's default locale is used.
+  \since 5.13
+
+  Constructs a QCollator using the system's default collation locale.
+
+  \sa setLocale(), QLocale::collation()
+*/
+QCollator::QCollator()
+    : d(new QCollatorPrivate(QLocale::system().collation()))
+{
+    d->init();
+}
+
+/*!
+    Constructs a QCollator from \a locale.
 
     \sa setLocale()
  */
@@ -128,9 +139,9 @@ QCollator &QCollator::operator=(const QCollator &other)
 
     Move constructor. Moves from \a other into this collator.
 
-    Note that a moved-from QCollator can only be destroyed or assigned
-    to. The effect of calling other functions than the destructor or
-    one of the assignment operators is undefined.
+    Note that a moved-from QCollator can only be destroyed or assigned to.
+    The effect of calling other functions than the destructor or one of the
+    assignment operators is undefined.
 */
 
 /*!
@@ -138,9 +149,9 @@ QCollator &QCollator::operator=(const QCollator &other)
 
     Move-assigns from \a other to this collator.
 
-    Note that a moved-from QCollator can only be destroyed or assigned
-    to. The effect of calling other functions than the destructor or
-    one of the assignment operators is undefined.
+    Note that a moved-from QCollator can only be destroyed or assigned to.
+    The effect of calling other functions than the destructor or one of the
+    assignment operators is undefined.
 */
 
 /*!
@@ -155,7 +166,7 @@ QCollator &QCollator::operator=(const QCollator &other)
  */
 void QCollator::detach()
 {
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         QCollatorPrivate *x = new QCollatorPrivate(d->locale);
         if (!d->ref.deref())
             delete d;
@@ -218,7 +229,8 @@ Qt::CaseSensitivity QCollator::caseSensitivity() const
 
     Enables numeric sorting mode when \a on is set to true.
 
-    This will enable proper sorting of numeric digits, so that e.g. 100 sorts after 99.
+    This will enable proper sorting of numeric digits, so that e.g. 100 sorts
+    after 99.
 
     By default this mode is off.
 
@@ -248,11 +260,13 @@ bool QCollator::numericMode() const
 /*!
     \fn void QCollator::setIgnorePunctuation(bool on)
 
-    If \a on is set to true, punctuation characters and symbols are ignored when determining sort order.
+    If \a on is set to true, punctuation characters and symbols are ignored when
+    determining sort order.
 
     The default is locale dependent.
 
-    \note This method is not currently supported if Qt is configured to not use ICU on Linux.
+    \note This method is not currently supported if Qt is configured to not use
+    ICU on Linux.
 
     \sa ignorePunctuation()
  */
@@ -268,7 +282,8 @@ void QCollator::setIgnorePunctuation(bool on)
 /*!
     \fn bool QCollator::ignorePunctuation() const
 
-    Returns \c true if punctuation characters and symbols are ignored when determining sort order.
+    Returns \c true if punctuation characters and symbols are ignored when
+    determining sort order.
 
     \sa setIgnorePunctuation()
  */
@@ -278,35 +293,66 @@ bool QCollator::ignorePunctuation() const
 }
 
 /*!
-    \fn int QCollator::compare(const QString &s1, const QString &s2) const
+    \since 5.13
+    \fn bool QCollator::operator()(QStringView s1, QStringView s2) const
+    \internal
+*/
 
-    Compares \a s1 with \a s2. Returns an integer less than, equal to, or greater than zero
-    depending on whether \a s1 is smaller, equal or larger than \a s2.
- */
+/*!
+    \since 5.13
+    \fn int QCollator::compare(QStringView s1, QStringView s2) const
+
+    Compares \a s1 with \a s2.
 
+    Returns an integer less than, equal to, or greater than zero depending on
+    whether \a s1 sorts before, with or after \a s2.
+*/
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     \fn bool QCollator::operator()(const QString &s1, const QString &s2) const
     \internal
 */
 
 /*!
-    \fn int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const
     \overload
 
-    Compares \a s1 with \a s2. Returns an integer less than, equal to, or greater than zero
-    depending on whether \a s1 is smaller, equal or larger than \a s2.
+    Compares \a s1 with \a s2.
+
+    Returns an integer less than, equal to, or greater than zero depending on
+    whether \a s1 sorts before, with or after \a s2.
+*/
+int QCollator::compare(const QString &s1, const QString &s2) const
+{
+    return compare(QStringView(s1), QStringView(s2));
+}
+
+/*!
+    \overload
+
+    Compares \a s1 with \a s2.
+
+    Returns an integer less than, equal to, or greater than zero depending on
+    whether \a s1 sorts before, with or after \a s2.
  */
+int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const
+{
+    return compare(QStringView(s1), QStringView(s2));
+}
 
 /*!
-    \fn int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
     \overload
 
-    Compares \a s1 with \a s2. \a len1 and \a len2 specify the length of the
-    QChar arrays pointer to by \a s1 and \a s2.
+    Compares \a s1 with \a s2. \a len1 and \a len2 specify the lengths of the
+    QChar arrays pointed to by \a s1 and \a s2.
 
-    Returns an integer less than, equal to, or greater than zero
-    depending on whether \a s1 is smaller, equal or larger than \a s2.
+    Returns an integer less than, equal to, or greater than zero depending on
+    whether \a s1 sorts before, with or after \a s2.
 */
+int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
+{
+    return compare(QStringView(s1, len1), QStringView(s2, len2));
+}
+#endif // QT_STRINGVIEW_LEVEL < 2
 
 /*!
     \fn QCollatorSortKey QCollator::sortKey(const QString &string) const
@@ -314,9 +360,9 @@ bool QCollator::ignorePunctuation() const
     Returns a sortKey for \a string.
 
     Creating the sort key is usually somewhat slower, than using the compare()
-    methods directly. But if the string is compared repeatedly (e.g. when sorting
-    a whole list of strings), it's usually faster to create the sort keys for each
-    string and then sort using the keys.
+    methods directly. But if the string is compared repeatedly (e.g. when
+    sorting a whole list of strings), it's usually faster to create the sort
+    keys for each string and then sort using the keys.
 
     \note Not supported with the C (a.k.a. POSIX) locale on Darwin.
  */
@@ -328,8 +374,8 @@ bool QCollator::ignorePunctuation() const
 
     \since 5.2
 
-    The QCollatorSortKey class is always created by QCollator::sortKey()
-    and is used for fast strings collation, for example when collating many strings.
+    The QCollatorSortKey class is always created by QCollator::sortKey() and is
+    used for fast strings collation, for example when collating many strings.
 
     \reentrant
     \ingroup i18n
@@ -398,9 +444,11 @@ QCollatorSortKey& QCollatorSortKey::operator=(const QCollatorSortKey &other)
 /*!
     \fn int QCollatorSortKey::compare(const QCollatorSortKey &otherKey) const
 
-    Compares the key to \a otherKey. Returns a negative value if the key
-    is less than \a otherKey, 0 if the key is equal to \a otherKey or a
-    positive value if the key is greater than \a otherKey.
+    Compares this key to \a otherKey.
+
+    Returns a negative value if the key is less than \a otherKey, 0 if the key
+    is equal to \a otherKey or a positive value if the key is greater than \a
+    otherKey.
 
     \sa operator<()
  */
diff --git a/src/corelib/tools/qcollator.h b/src/corelib/text/qcollator.h
index 6fa199cb0f..6bb5038371 100644
--- a/src/corelib/tools/qcollator.h
+++ b/src/corelib/text/qcollator.h
@@ -57,11 +57,9 @@ public:
     QCollatorSortKey(const QCollatorSortKey &other);
     ~QCollatorSortKey();
     QCollatorSortKey &operator=(const QCollatorSortKey &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QCollatorSortKey &operator=(QCollatorSortKey &&other) Q_DECL_NOTHROW
+    inline QCollatorSortKey &operator=(QCollatorSortKey &&other) noexcept
     { swap(other); return *this; }
-#endif
-    void swap(QCollatorSortKey &other) Q_DECL_NOTHROW
+    void swap(QCollatorSortKey &other) noexcept
     { d.swap(other.d); }
 
     int compare(const QCollatorSortKey &key) const;
@@ -83,18 +81,17 @@ inline bool operator<(const QCollatorSortKey &lhs, const QCollatorSortKey &rhs)
 class Q_CORE_EXPORT QCollator
 {
 public:
-    explicit QCollator(const QLocale &locale = QLocale());
+    QCollator();
+    explicit QCollator(const QLocale &locale);
     QCollator(const QCollator &);
     ~QCollator();
     QCollator &operator=(const QCollator &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QCollator(QCollator &&other) Q_DECL_NOTHROW
+    QCollator(QCollator &&other) noexcept
         : d(other.d) { other.d = nullptr; }
-    QCollator &operator=(QCollator &&other) Q_DECL_NOTHROW
+    QCollator &operator=(QCollator &&other) noexcept
     { swap(other); return *this; }
-#endif
 
-    void swap(QCollator &other) Q_DECL_NOTHROW
+    void swap(QCollator &other) noexcept
     { qSwap(d, other.d); }
 
     void setLocale(const QLocale &locale);
@@ -109,12 +106,18 @@ public:
     void setIgnorePunctuation(bool on);
     bool ignorePunctuation() const;
 
+#if QT_STRINGVIEW_LEVEL < 2
     int compare(const QString &s1, const QString &s2) const;
     int compare(const QStringRef &s1, const QStringRef &s2) const;
     int compare(const QChar *s1, int len1, const QChar *s2, int len2) const;
 
     bool operator()(const QString &s1, const QString &s2) const
     { return compare(s1, s2) < 0; }
+#endif
+    int compare(QStringView s1, QStringView s2) const;
+
+    bool operator()(QStringView s1, QStringView s2) const
+    { return compare(s1, s2) < 0; }
 
     QCollatorSortKey sortKey(const QString &string) const;
 
diff --git a/src/corelib/tools/qcollator_icu.cpp b/src/corelib/text/qcollator_icu.cpp
index ab45b9a1a1..8acda45070 100644
--- a/src/corelib/tools/qcollator_icu.cpp
+++ b/src/corelib/text/qcollator_icu.cpp
@@ -78,7 +78,8 @@ void QCollatorPrivate::init()
     // and does case sensitive comparison.
     // UCOL_QUATERNARY is used as default in a few languages such as Japanese to take care of some
     // additional differences in those languages.
-    UColAttributeValue val = (caseSensitivity == Qt::CaseSensitive) ? UCOL_DEFAULT_STRENGTH : UCOL_SECONDARY;
+    UColAttributeValue val = (caseSensitivity == Qt::CaseSensitive)
+        ? UCOL_DEFAULT_STRENGTH : UCOL_SECONDARY;
 
     status = U_ZERO_ERROR;
     ucol_setAttribute(collator, UCOL_STRENGTH, val, &status);
@@ -91,7 +92,8 @@ void QCollatorPrivate::init()
         qWarning("ucol_setAttribute: numeric collation failed: %d", status);
 
     status = U_ZERO_ERROR;
-    ucol_setAttribute(collator, UCOL_ALTERNATE_HANDLING, ignorePunctuation ? UCOL_SHIFTED : UCOL_NON_IGNORABLE, &status);
+    ucol_setAttribute(collator, UCOL_ALTERNATE_HANDLING,
+                      ignorePunctuation ? UCOL_SHIFTED : UCOL_NON_IGNORABLE, &status);
     if (U_FAILURE(status))
         qWarning("ucol_setAttribute: Alternate handling failed: %d", status);
 
@@ -105,37 +107,20 @@ void QCollatorPrivate::cleanup()
     collator = nullptr;
 }
 
-int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
+int QCollator::compare(QStringView s1, QStringView s2) const
 {
     if (d->dirty)
         d->init();
 
-    if (d->collator)
-        return ucol_strcoll(d->collator, (const UChar *)s1, len1, (const UChar *)s2, len2);
-
-    return QString::compare_helper(s1, len1, s2, len2, d->caseSensitivity);
-}
-
-int QCollator::compare(const QString &s1, const QString &s2) const
-{
-    if (d->dirty)
-        d->init();
-
-    if (d->collator)
-        return compare(s1.constData(), s1.size(), s2.constData(), s2.size());
-
-    return QString::compare(s1, s2, d->caseSensitivity);
-}
-
-int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const
-{
-    if (d->dirty)
-        d->init();
-
-    if (d->collator)
-        return compare(s1.constData(), s1.size(), s2.constData(), s2.size());
+    if (d->collator) {
+        return ucol_strcoll(d->collator,
+                            reinterpret_cast<const UChar *>(s1.data()), s1.size(),
+                            reinterpret_cast<const UChar *>(s2.data()), s2.size());
+    }
 
-    return QStringRef::compare(s1, s2, d->caseSensitivity);
+    return QString::compare_helper(s1.data(), s1.size(),
+                                   s2.data(), s2.size(),
+                                   d->caseSensitivity);
 }
 
 QCollatorSortKey QCollator::sortKey(const QString &string) const
diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/text/qcollator_macx.cpp
index 42e67e0c12..071d7c048f 100644
--- a/src/corelib/tools/qcollator_macx.cpp
+++ b/src/corelib/text/qcollator_macx.cpp
@@ -65,12 +65,12 @@ void QCollatorPrivate::init()
         return;
 
     LocaleRef localeRef;
-    int rc = LocaleRefFromLocaleString(QLocalePrivate::get(locale)->bcp47Name().constData(), &localeRef);
-    if (rc != 0)
-        qWarning("couldn't initialize the locale");
+    OSStatus status =
+        LocaleRefFromLocaleString(QLocalePrivate::get(locale)->bcp47Name().constData(), &localeRef);
+    if (status != 0)
+        qWarning("Couldn't initialize the locale (%d)", int(status));
 
     UInt32 options = 0;
-
     if (caseSensitivity == Qt::CaseInsensitive)
         options |= kUCCollateCaseInsensitiveMask;
     if (numericMode)
@@ -78,14 +78,9 @@ void QCollatorPrivate::init()
     if (!ignorePunctuation)
         options |= kUCCollatePunctuationSignificantMask;
 
-    OSStatus status = UCCreateCollator(
-        localeRef,
-        0,
-        options,
-        &collator
-    );
+    status = UCCreateCollator(localeRef, 0, options, &collator);
     if (status != 0)
-        qWarning("Couldn't initialize the collator");
+        qWarning("Couldn't initialize the collator (%d)", int(status));
 
     dirty = false;
 }
@@ -97,18 +92,18 @@ void QCollatorPrivate::cleanup()
     collator = 0;
 }
 
-int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
+int QCollator::compare(QStringView s1, QStringView s2) const
 {
     if (d->dirty)
         d->init();
     if (!d->collator)
-        return QStringView(s1, len1).compare(QStringView(s2, len2), caseSensitivity());
+        return s1.compare(s2, caseSensitivity());
 
     SInt32 result;
     Boolean equivalent;
     UCCompareText(d->collator,
-                  reinterpret_cast<const UniChar *>(s1), len1,
-                  reinterpret_cast<const UniChar *>(s2), len2,
+                  reinterpret_cast<const UniChar *>(s1.data()), s1.size(),
+                  reinterpret_cast<const UniChar *>(s2.data()), s2.size(),
                   &equivalent,
                   &result);
     if (equivalent)
@@ -116,16 +111,6 @@ int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) con
     return result < 0 ? -1 : 1;
 }
 
-int QCollator::compare(const QString &str1, const QString &str2) const
-{
-    return compare(str1.constData(), str1.size(), str2.constData(), str2.size());
-}
-
-int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const
-{
-    return compare(s1.constData(), s1.size(), s2.constData(), s2.size());
-}
-
 QCollatorSortKey QCollator::sortKey(const QString &string) const
 {
     if (d->dirty)
@@ -139,13 +124,14 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
     //Documentation recommends having it 5 times as big as the input
     QVector<UCCollationValue> ret(string.size() * 5);
     ItemCount actualSize;
-    int status = UCGetCollationKey(d->collator, reinterpret_cast<const UniChar *>(string.constData()), string.count(),
-                                   ret.size(), &actualSize, ret.data());
+    int status = UCGetCollationKey(d->collator,
+                                   reinterpret_cast<const UniChar *>(string.constData()),
+                                   string.count(), ret.size(), &actualSize, ret.data());
 
-    ret.resize(actualSize+1);
+    ret.resize(actualSize + 1);
     if (status == kUCOutputBufferTooSmall) {
-        UCGetCollationKey(d->collator, reinterpret_cast<const UniChar *>(string.constData()), string.count(),
-                          ret.size(), &actualSize, ret.data());
+        UCGetCollationKey(d->collator, reinterpret_cast<const UniChar *>(string.constData()),
+                          string.count(), ret.size(), &actualSize, ret.data());
     }
     ret[actualSize] = 0;
     return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret)));
diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/text/qcollator_p.h
index fc2d434a8d..fc2d434a8d 100644
--- a/src/corelib/tools/qcollator_p.h
+++ b/src/corelib/text/qcollator_p.h
diff --git a/src/corelib/tools/qcollator_posix.cpp b/src/corelib/text/qcollator_posix.cpp
index 81f97a02e1..9cbc539ebe 100644
--- a/src/corelib/tools/qcollator_posix.cpp
+++ b/src/corelib/text/qcollator_posix.cpp
@@ -65,7 +65,7 @@ void QCollatorPrivate::cleanup()
 {
 }
 
-static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, const QString &string)
+static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, QStringView string)
 {
     ret.resize(string.length());
     int len = string.toWCharArray(ret.data());
@@ -73,12 +73,7 @@ static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, const QString &str
     ret[len] = 0;
 }
 
-int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
-{
-    return compare(QString::fromRawData(s1, len1), QString::fromRawData(s2, len2));
-}
-
-int QCollator::compare(const QString &s1, const QString &s2) const
+int QCollator::compare(QStringView s1, QStringView s2) const
 {
     if (d->isC())
         return s1.compare(s2, caseSensitivity());
@@ -91,11 +86,6 @@ int QCollator::compare(const QString &s1, const QString &s2) const
     return std::wcscoll(array1.constData(), array2.constData());
 }
 
-int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const
-{
-    return compare(s1.toString(), s2.toString());
-}
-
 QCollatorSortKey QCollator::sortKey(const QString &string) const
 {
     if (d->dirty)
diff --git a/src/corelib/tools/qcollator_win.cpp b/src/corelib/text/qcollator_win.cpp
index 10cfdaa264..9d81de882f 100644
--- a/src/corelib/tools/qcollator_win.cpp
+++ b/src/corelib/text/qcollator_win.cpp
@@ -87,30 +87,30 @@ void QCollatorPrivate::cleanup()
 {
 }
 
-
-int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
+int QCollator::compare(QStringView s1, QStringView s2) const
 {
     if (d->isC())
-        return QString::compare_helper(s1, len1, s2, len2, d->caseSensitivity);
+        return s1.compare(s2, d->caseSensitivity);
 
     if (d->dirty)
         d->init();
 
     //* from Windows documentation *
-    // Returns one of the following values if successful. To maintain the C runtime convention of
-    // comparing strings, the value 2 can be subtracted from a nonzero return value. Then, the
-    // meaning of <0, ==0, and >0 is consistent with the C runtime.
+    // Returns one of the following values if successful. To maintain the C
+    // runtime convention of comparing strings, the value 2 can be subtracted
+    // from a nonzero return value. Then, the meaning of <0, ==0, and >0 is
+    // consistent with the C runtime.
     // [...] The function returns 0 if it does not succeed.
     // https://docs.microsoft.com/en-us/windows/desktop/api/stringapiset/nf-stringapiset-comparestringex#return-value
 
 #ifndef USE_COMPARESTRINGEX
     const int ret = CompareString(d->localeID, d->collator,
-                                  reinterpret_cast<const wchar_t*>(s1), len1,
-                                  reinterpret_cast<const wchar_t*>(s2), len2);
+                                  reinterpret_cast<const wchar_t *>(s1.data()), s1.size(),
+                                  reinterpret_cast<const wchar_t *>(s2.data()), s2.size());
 #else
     const int ret = CompareStringEx(LPCWSTR(d->localeName.utf16()), d->collator,
-                                    reinterpret_cast<LPCWSTR>(s1), len1,
-                                    reinterpret_cast<LPCWSTR>(s2), len2,
+                                    reinterpret_cast<LPCWSTR>(s1.data()), s1.size(),
+                                    reinterpret_cast<LPCWSTR>(s2.data()), s2.size(),
                                     nullptr, nullptr, 0);
 #endif
     if (Q_LIKELY(ret))
@@ -132,16 +132,6 @@ int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) con
     return 0;
 }
 
-int QCollator::compare(const QString &str1, const QString &str2) const
-{
-    return compare(str1.constData(), str1.size(), str2.constData(), str2.size());
-}
-
-int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const
-{
-    return compare(s1.constData(), s1.size(), s2.constData(), s2.size());
-}
-
 QCollatorSortKey QCollator::sortKey(const QString &string) const
 {
     if (d->dirty)
@@ -170,7 +160,9 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
                            NULL, NULL, 0);
 #endif
     if (finalSize == 0) {
-        qWarning() << "there were problems when generating the ::sortKey by LCMapStringW with error:" << GetLastError();
+        qWarning()
+            << "there were problems when generating the ::sortKey by LCMapStringW with error:"
+            << GetLastError();
     }
     return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret)));
 }
diff --git a/src/corelib/tools/qdoublescanprint_p.h b/src/corelib/text/qdoublescanprint_p.h
index 3865c69a99..3865c69a99 100644
--- a/src/corelib/tools/qdoublescanprint_p.h
+++ b/src/corelib/text/qdoublescanprint_p.h
diff --git a/src/corelib/tools/qharfbuzz.cpp b/src/corelib/text/qharfbuzz.cpp
index a3e266ccd2..a3e266ccd2 100644
--- a/src/corelib/tools/qharfbuzz.cpp
+++ b/src/corelib/text/qharfbuzz.cpp
diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/text/qharfbuzz_p.h
index 2a0307d35f..2a0307d35f 100644
--- a/src/corelib/tools/qharfbuzz_p.h
+++ b/src/corelib/text/qharfbuzz_p.h
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/text/qlocale.cpp
index 152c2edb50..75a5bc802e 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2019 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -55,7 +55,7 @@
 #include "qlocale_p.h"
 #include "qlocale_tools_p.h"
 #if QT_CONFIG(datetimeparser)
-#include "qdatetimeparser_p.h"
+#include "private/qdatetimeparser_p.h"
 #endif
 #include "qnamespace.h"
 #include "qdatetime.h"
@@ -72,6 +72,10 @@
 #   include <time.h>
 #endif
 
+#include "private/qcalendarbackend_p.h"
+#include "private/qgregoriancalendar_p.h"
+#include "qcalendar.h"
+
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_SYSTEMLOCALE
@@ -94,7 +98,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #include "qlocale_data_p.h"
 QT_END_INCLUDE_NAMESPACE
 
-QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) Q_DECL_NOTHROW
+QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) noexcept
 {
     const auto len = code.size();
     if (len != 2 && len != 3)
@@ -138,7 +142,7 @@ QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) Q_DECL_NOTHRO
     return QLocale::C;
 }
 
-QLocale::Script QLocalePrivate::codeToScript(QStringView code) Q_DECL_NOTHROW
+QLocale::Script QLocalePrivate::codeToScript(QStringView code) noexcept
 {
     const auto len = code.size();
     if (len != 4)
@@ -158,7 +162,7 @@ QLocale::Script QLocalePrivate::codeToScript(QStringView code) Q_DECL_NOTHROW
     return QLocale::AnyScript;
 }
 
-QLocale::Country QLocalePrivate::codeToCountry(QStringView code) Q_DECL_NOTHROW
+QLocale::Country QLocalePrivate::codeToCountry(QStringView code) noexcept
 {
     const auto len = code.size();
     if (len != 2 && len != 3)
@@ -301,10 +305,11 @@ QByteArray QLocaleId::name(char separator) const
 
     const unsigned char *lang = language_code_list + 3 * language_id;
     const unsigned char *script =
-            (script_id != QLocale::AnyScript ? script_code_list + 4 * script_id : 0);
+            (script_id != QLocale::AnyScript ? script_code_list + 4 * script_id : nullptr);
     const unsigned char *country =
-            (country_id != QLocale::AnyCountry ? country_code_list + 3 * country_id : 0);
-    char len = (lang[2] != 0 ? 3 : 2) + (script ? 4+1 : 0) + (country ? (country[2] != 0 ? 3 : 2)+1 : 0);
+            (country_id != QLocale::AnyCountry ? country_code_list + 3 * country_id : nullptr);
+    char len = (lang[2] != 0 ? 3 : 2) + (script ? 4 + 1 : 0)
+        + (country ? (country[2] != 0 ? 3 : 2) + 1 : 0);
     QByteArray name(len, Qt::Uninitialized);
     char *uc = name.data();
     *uc++ = lang[0];
@@ -335,12 +340,32 @@ QByteArray QLocalePrivate::bcp47Name(char separator) const
     if (m_data->m_language_id == QLocale::C)
         return QByteArrayLiteral("en");
 
-    QLocaleId localeId = QLocaleId::fromIds(m_data->m_language_id, m_data->m_script_id, m_data->m_country_id);
+    QLocaleId localeId = QLocaleId::fromIds(m_data->m_language_id, m_data->m_script_id,
+                                            m_data->m_country_id);
     return localeId.withLikelySubtagsRemoved().name(separator);
 }
 
-static const QLocaleData *findLocaleDataById(const QLocaleId &localeId)
+/*!
+  \internal
+ */
+QByteArray QLocalePrivate::rawName(char separator) const
+{
+    QByteArrayList parts;
+    if (m_data->m_language_id != QLocale::AnyLanguage)
+        parts.append(languageCode().latin1());
+    if (m_data->m_script_id != QLocale::AnyScript)
+        parts.append(scriptCode().latin1());
+    if (m_data->m_country_id != QLocale::AnyCountry)
+        parts.append(countryCode().latin1());
+
+    return parts.join(separator);
+}
+
+
+static const QLocaleData *findLocaleDataById(const QLocaleId &lid)
 {
+    QLocaleId localeId = lid.withLikelySubtagsAdded();
+
     const uint idx = locale_index[localeId.language_id];
 
     const QLocaleData *data = locale_data + idx;
@@ -367,16 +392,19 @@ static const QLocaleData *findLocaleDataById(const QLocaleId &localeId)
         } while (data->m_language_id && data->m_language_id == localeId.language_id);
     } else {
         do {
-            if (data->m_script_id == localeId.script_id && data->m_country_id == localeId.country_id)
+            if (data->m_script_id == localeId.script_id
+                && data->m_country_id == localeId.country_id) {
                 return data;
+            }
             ++data;
         } while (data->m_language_id && data->m_language_id == localeId.language_id);
     }
 
-    return 0;
+    return nullptr;
 }
 
-const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLocale::Script script, QLocale::Country country)
+const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLocale::Script script,
+                                               QLocale::Country country)
 {
     QLocaleId localeId = QLocaleId::fromIds(language, script, country);
     QLocaleId likelyId = localeId.withLikelySubtagsAdded();
@@ -438,7 +466,14 @@ const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLoca
     return locale_data + idx;
 }
 
-static bool parse_locale_tag(const QString &input, int &i, QString *result, const QString &separators)
+uint QLocaleData::findLocaleOffset(QLocale::Language language, QLocale::Script script,
+                                   QLocale::Country country)
+{
+    return findLocaleData(language, script, country) - locale_data;
+}
+
+static bool parse_locale_tag(const QString &input, int &i, QString *result,
+                             const QString &separators)
 {
     *result = QString(8, Qt::Uninitialized); // worst case according to BCP47
     QChar *pch = result->data();
@@ -487,7 +522,8 @@ bool qt_splitLocaleName(const QString &name, QString &lang, QString &script, QSt
             state = ScriptState;
             break;
         case ScriptState: {
-            QString scripts = QString::fromLatin1((const char *)script_code_list, sizeof(script_code_list) - 1);
+            QString scripts = QString::fromLatin1((const char *)script_code_list,
+                                                  sizeof(script_code_list) - 1);
             if (value.length() == 4 && scripts.indexOf(value) % 4 == 0) {
                 // script name is always 4 characters
                 script = value;
@@ -543,6 +579,16 @@ static const QLocaleData *findLocaleData(const QString &name)
     return QLocaleData::findLocaleData(lang, script, cntry);
 }
 
+static uint findLocaleOffset(const QString &name)
+{
+    QLocale::Language lang;
+    QLocale::Script script;
+    QLocale::Country cntry;
+    QLocalePrivate::getLangAndCountry(name, lang, script, cntry);
+
+    return QLocaleData::findLocaleOffset(lang, script, cntry);
+}
+
 QString qt_readEscapedFormatString(QStringView format, int *idx)
 {
     int &i = *idx;
@@ -560,8 +606,8 @@ QString qt_readEscapedFormatString(QStringView format, int *idx)
 
     while (i < format.size()) {
         if (format.at(i).unicode() == '\'') {
-            if (i + 1 < format.size() && format.at(i + 1).unicode() == '\'') {
-                // "''" inside of a quoted string
+            if (format.mid(i + 1).startsWith(QLatin1Char('\''))) {
+                // "''" inside a quoted string
                 result.append(QLatin1Char('\''));
                 i += 2;
             } else {
@@ -604,13 +650,14 @@ int qt_repeatCount(QStringView s)
     return int(j);
 }
 
-static const QLocaleData *default_data = 0;
+static const QLocaleData *default_data = nullptr;
 static QLocale::NumberOptions default_number_options = QLocale::DefaultNumberOptions;
 
 static const QLocaleData *const c_data = locale_data;
 static QLocalePrivate *c_private()
 {
-    static QLocalePrivate c_locale = { c_data, Q_BASIC_ATOMIC_INITIALIZER(1), QLocale::OmitGroupSeparator };
+    static QLocalePrivate c_locale{
+            c_data, Q_BASIC_ATOMIC_INITIALIZER(1), 0, QLocale::OmitGroupSeparator };
     return &c_locale;
 }
 
@@ -795,9 +842,11 @@ static QLocalePrivate *localePrivateByName(const QString &name)
 {
     if (name == QLatin1String("C"))
         return c_private();
+    // TODO: Remove this version, and use offset everywhere
     const QLocaleData *data = findLocaleData(name);
-    return QLocalePrivate::create(data, data->m_language_id == QLocale::C ?
-                                      QLocale::OmitGroupSeparator : QLocale::DefaultNumberOptions);
+    return QLocalePrivate::create(data, findLocaleOffset(name),
+                                  data->m_language_id == QLocale::C
+                                  ? QLocale::OmitGroupSeparator : QLocale::DefaultNumberOptions);
 }
 
 static QLocalePrivate *findLocalePrivate(QLocale::Language language, QLocale::Script script,
@@ -806,7 +855,9 @@ static QLocalePrivate *findLocalePrivate(QLocale::Language language, QLocale::Sc
     if (language == QLocale::C)
         return c_private();
 
+    // TODO: Remove pointer, use index instead
     const QLocaleData *data = QLocaleData::findLocaleData(language, script, country);
+    const uint offset = QLocaleData::findLocaleOffset(language, script, country);
 
     QLocale::NumberOptions numberOptions = QLocale::DefaultNumberOptions;
 
@@ -815,7 +866,7 @@ static QLocalePrivate *findLocalePrivate(QLocale::Language language, QLocale::Sc
         numberOptions = default_number_options;
         data = defaultData();
     }
-    return QLocalePrivate::create(data, numberOptions);
+    return QLocalePrivate::create(data, offset, numberOptions);
 }
 
 
@@ -833,9 +884,11 @@ QLocale::QLocale(QLocalePrivate &dd)
     "language[_script][_country][.codeset][@modifier]" or "C", where:
 
     \list
-    \li language is a lowercase, two-letter, ISO 639 language code (also some three-letter codes),
+    \li language is a lowercase, two-letter, ISO 639 language code (also some
+        three-letter codes),
     \li script is a titlecase, four-letter, ISO 15924 script code,
-    \li country is an uppercase, two-letter, ISO 3166 country code (also "419" as defined by United Nations),
+    \li country is an uppercase, two-letter, ISO 3166 country code
+        (also "419" as defined by United Nations),
     \li and codeset and modifier are ignored.
     \endlist
 
@@ -982,7 +1035,7 @@ bool QLocale::operator!=(const QLocale &other) const
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
 */
-uint qHash(const QLocale &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QLocale &key, uint seed) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.d->m_data);
@@ -1036,9 +1089,11 @@ QString QLocale::quoteString(const QStringRef &str, QuotationStyle style) const
     if (d->m_data == systemData()) {
         QVariant res;
         if (style == QLocale::AlternateQuotation)
-            res = systemLocale()->query(QSystemLocale::StringToAlternateQuotation, QVariant::fromValue(str));
+            res = systemLocale()->query(QSystemLocale::StringToAlternateQuotation,
+                                        QVariant::fromValue(str));
         if (res.isNull() || style == QLocale::StandardQuotation)
-            res = systemLocale()->query(QSystemLocale::StringToStandardQuotation, QVariant::fromValue(str));
+            res = systemLocale()->query(QSystemLocale::StringToStandardQuotation,
+                                        QVariant::fromValue(str));
         if (!res.isNull())
             return res.toString();
     }
@@ -1046,8 +1101,9 @@ QString QLocale::quoteString(const QStringRef &str, QuotationStyle style) const
 
     if (style == QLocale::StandardQuotation)
         return QChar(d->m_data->m_quotation_start) % str % QChar(d->m_data->m_quotation_end);
-    else
-        return QChar(d->m_data->m_alternate_quotation_start) % str % QChar(d->m_data->m_alternate_quotation_end);
+
+    return QChar(d->m_data->m_alternate_quotation_start)
+        % str % QChar(d->m_data->m_alternate_quotation_end);
 }
 
 /*!
@@ -1060,8 +1116,8 @@ QString QLocale::createSeparatedList(const QStringList &list) const
 {
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
-        QVariant res;
-        res = systemLocale()->query(QSystemLocale::ListToSeparatedString, QVariant::fromValue(list));
+        QVariant res =
+            systemLocale()->query(QSystemLocale::ListToSeparatedString, QVariant::fromValue(list));
 
         if (!res.isNull())
             return res.toString();
@@ -1072,12 +1128,20 @@ QString QLocale::createSeparatedList(const QStringList &list) const
     if (size == 1) {
         return list.at(0);
     } else if (size == 2) {
-        QString format = getLocaleData(list_pattern_part_data + d->m_data->m_list_pattern_part_two_idx, d->m_data->m_list_pattern_part_two_size);
+        QString format = getLocaleData(
+            list_pattern_part_data + d->m_data->m_list_pattern_part_two_idx,
+            d->m_data->m_list_pattern_part_two_size);
         return format.arg(list.at(0), list.at(1));
     } else if (size > 2) {
-        QString formatStart = getLocaleData(list_pattern_part_data + d->m_data->m_list_pattern_part_start_idx, d->m_data->m_list_pattern_part_start_size);
-        QString formatMid = getLocaleData(list_pattern_part_data + d->m_data->m_list_pattern_part_mid_idx, d->m_data->m_list_pattern_part_mid_size);
-        QString formatEnd = getLocaleData(list_pattern_part_data + d->m_data->m_list_pattern_part_end_idx, d->m_data->m_list_pattern_part_end_size);
+        QString formatStart = getLocaleData(
+            list_pattern_part_data + d->m_data->m_list_pattern_part_start_idx,
+            d->m_data->m_list_pattern_part_start_size);
+        QString formatMid = getLocaleData(
+            list_pattern_part_data + d->m_data->m_list_pattern_part_mid_idx,
+            d->m_data->m_list_pattern_part_mid_size);
+        QString formatEnd = getLocaleData(
+            list_pattern_part_data + d->m_data->m_list_pattern_part_end_idx,
+            d->m_data->m_list_pattern_part_end_size);
         QString result = formatStart.arg(list.at(0), list.at(1));
         for (int i = 2; i < size - 1; ++i)
             result = formatMid.arg(result, list.at(i));
@@ -1187,7 +1251,8 @@ static qulonglong toIntegral_helper(const QLocaleData *d, QStringView str, bool
 template <typename T> static inline
 T toIntegral_helper(const QLocalePrivate *d, QStringView str, bool *ok)
 {
-    using Int64 = typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type;
+    using Int64 =
+        typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type;
 
     // we select the right overload by the last, unused parameter
     Int64 val = toIntegral_helper(d->m_data, str, ok, d->m_numberOptions, Int64());
@@ -1203,8 +1268,8 @@ T toIntegral_helper(const QLocalePrivate *d, QStringView str, bool *ok)
 /*!
     \since 4.8
 
-    Returns the dash-separated language, script and country (and possibly other BCP47 fields)
-    of this locale as a string.
+    Returns the dash-separated language, script and country (and possibly other
+    BCP47 fields) of this locale as a string.
 
     Unlike the uiLanguages() the returned value of the bcp47Name() represents
     the locale name of the QLocale data but not the language the user-interface
@@ -1935,7 +2000,7 @@ QString QLocale::toString(qulonglong i) const
 
 QString QLocale::toString(const QDate &date, const QString &format) const
 {
-    return d->dateTimeToString(format, QDateTime(), date, QTime(), this);
+    return QCalendar().dateTimeToString(format, QDateTime(), date, QTime(), *this);
 }
 #endif
 
@@ -1950,7 +2015,7 @@ QString QLocale::toString(const QDate &date, const QString &format) const
 */
 QString QLocale::toString(const QDate &date, QStringView format) const
 {
-    return d->dateTimeToString(format, QDateTime(), date, QTime(), this);
+    return QCalendar().dateTimeToString(format, QDateTime(), date, QTime(), *this);
 }
 
 /*!
@@ -1966,7 +2031,8 @@ QString QLocale::toString(const QDate &date, FormatType format) const
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
         QVariant res = systemLocale()->query(format == LongFormat
-                                             ? QSystemLocale::DateToStringLong : QSystemLocale::DateToStringShort,
+                                             ? QSystemLocale::DateToStringLong
+                                             : QSystemLocale::DateToStringShort,
                                              date);
         if (!res.isNull())
             return res.toString();
@@ -2004,7 +2070,7 @@ static bool timeFormatContainsAP(QStringView format)
 */
 QString QLocale::toString(const QTime &time, const QString &format) const
 {
-    return d->dateTimeToString(format, QDateTime(), QDate(), time, this);
+    return QCalendar().dateTimeToString(format, QDateTime(), QDate(), time, *this);
 }
 #endif
 
@@ -2019,7 +2085,7 @@ QString QLocale::toString(const QTime &time, const QString &format) const
 */
 QString QLocale::toString(const QTime &time, QStringView format) const
 {
-    return d->dateTimeToString(format, QDateTime(), QDate(), time, this);
+    return QCalendar().dateTimeToString(format, QDateTime(), QDate(), time, *this);
 }
 
 #if QT_STRINGVIEW_LEVEL < 2
@@ -2035,7 +2101,7 @@ QString QLocale::toString(const QTime &time, QStringView format) const
 
 QString QLocale::toString(const QDateTime &dateTime, const QString &format) const
 {
-    return d->dateTimeToString(format, dateTime, QDate(), QTime(), this);
+    return QCalendar().dateTimeToString(format, dateTime, QDate(), QTime(), *this);
 }
 #endif
 
@@ -2050,7 +2116,58 @@ QString QLocale::toString(const QDateTime &dateTime, const QString &format) cons
 */
 QString QLocale::toString(const QDateTime &dateTime, QStringView format) const
 {
-    return d->dateTimeToString(format, dateTime, QDate(), QTime(), this);
+    return QCalendar().dateTimeToString(format, dateTime, QDate(), QTime(), *this);
+}
+
+QString QLocale::toString(const QDate &date, QStringView format, QCalendar cal) const
+{
+    return cal.dateTimeToString(format, QDateTime(), date, QTime(), *this);
+}
+
+QString QLocale::toString(const QDate &date, QLocale::FormatType format, QCalendar cal) const
+{
+    if (!date.isValid())
+        return QString();
+
+#ifndef QT_NO_SYSTEMLOCALE
+    if (cal.isGregorian() && d->m_data == systemData()) {
+        QVariant res = systemLocale()->query(format == LongFormat
+                                             ? QSystemLocale::DateToStringLong
+                                             : QSystemLocale::DateToStringShort,
+                                             date);
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
+
+    QString format_str = dateFormat(format);
+    return toString(date, format_str, cal);
+}
+
+QString QLocale::toString(const QDateTime &dateTime, QLocale::FormatType format,
+                          QCalendar cal) const
+{
+    if (!dateTime.isValid())
+        return QString();
+
+#ifndef QT_NO_SYSTEMLOCALE
+    if (cal.isGregorian() && d->m_data == systemData()) {
+        QVariant res = systemLocale()->query(format == LongFormat
+                                             ? QSystemLocale::DateTimeToStringLong
+                                             : QSystemLocale::DateTimeToStringShort,
+                                             dateTime);
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
+
+    const QString format_str = dateTimeFormat(format);
+    return toString(dateTime, format_str, cal);
+}
+
+QString QLocale::toString(const QDateTime &dateTime, QStringView format, QCalendar cal) const
+{
+    return cal.dateTimeToString(format, dateTime, QDate(), QTime(), *this);
 }
 
 /*!
@@ -2094,7 +2211,8 @@ QString QLocale::toString(const QTime &time, FormatType format) const
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
         QVariant res = systemLocale()->query(format == LongFormat
-                                             ? QSystemLocale::TimeToStringLong : QSystemLocale::TimeToStringShort,
+                                             ? QSystemLocale::TimeToStringLong
+                                             : QSystemLocale::TimeToStringShort,
                                              time);
         if (!res.isNull())
             return res.toString();
@@ -2121,7 +2239,8 @@ QString QLocale::dateFormat(FormatType format) const
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
         QVariant res = systemLocale()->query(format == LongFormat
-                                             ? QSystemLocale::DateFormatLong : QSystemLocale::DateFormatShort,
+                                             ? QSystemLocale::DateFormatLong
+                                             : QSystemLocale::DateFormatShort,
                                              QVariant());
         if (!res.isNull())
             return res.toString();
@@ -2158,7 +2277,8 @@ QString QLocale::timeFormat(FormatType format) const
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
         QVariant res = systemLocale()->query(format == LongFormat
-                                             ? QSystemLocale::TimeFormatLong : QSystemLocale::TimeFormatShort,
+                                             ? QSystemLocale::TimeFormatLong
+                                             : QSystemLocale::TimeFormatShort,
                                              QVariant());
         if (!res.isNull())
             return res.toString();
@@ -2206,6 +2326,7 @@ QString QLocale::dateTimeFormat(FormatType format) const
     return dateFormat(format) + QLatin1Char(' ') + timeFormat(format);
 }
 
+#if QT_CONFIG(datestring)
 /*!
     \since 4.4
 
@@ -2217,12 +2338,19 @@ QString QLocale::dateTimeFormat(FormatType format) const
 
     \sa timeFormat(), toDate(), toDateTime(), QTime::fromString()
 */
-#if QT_CONFIG(datestring)
 QTime QLocale::toTime(const QString &string, FormatType format) const
 {
     return toTime(string, timeFormat(format));
 }
-#endif
+
+/*!
+    \since 5.14
+    \overload
+*/
+QTime QLocale::toTime(const QString &string, FormatType format, QCalendar cal) const
+{
+    return toTime(string, timeFormat(format), cal);
+}
 
 /*!
     \since 4.4
@@ -2235,12 +2363,19 @@ QTime QLocale::toTime(const QString &string, FormatType format) const
 
     \sa dateFormat(), toTime(), toDateTime(), QDate::fromString()
 */
-#if QT_CONFIG(datestring)
 QDate QLocale::toDate(const QString &string, FormatType format) const
 {
     return toDate(string, dateFormat(format));
 }
-#endif
+
+/*!
+    \since 5.14
+    \overload
+*/
+QDate QLocale::toDate(const QString &string, FormatType format, QCalendar cal) const
+{
+    return toDate(string, dateFormat(format), cal);
+}
 
 /*!
     \since 4.4
@@ -2253,13 +2388,19 @@ QDate QLocale::toDate(const QString &string, FormatType format) const
 
     \sa dateTimeFormat(), toTime(), toDate(), QDateTime::fromString()
 */
-
-#if QT_CONFIG(datestring)
 QDateTime QLocale::toDateTime(const QString &string, FormatType format) const
 {
     return toDateTime(string, dateTimeFormat(format));
 }
-#endif
+
+/*!
+    \since 5.14
+    \overload
+*/
+QDateTime QLocale::toDateTime(const QString &string, FormatType format, QCalendar cal) const
+{
+    return toDateTime(string, dateTimeFormat(format), cal);
+}
 
 /*!
     \since 4.4
@@ -2272,22 +2413,30 @@ QDateTime QLocale::toDateTime(const QString &string, FormatType format) const
 
     \sa timeFormat(), toDate(), toDateTime(), QTime::fromString()
 */
-#if QT_CONFIG(datestring)
 QTime QLocale::toTime(const QString &string, const QString &format) const
 {
+    return toTime(string, format, QCalendar());
+}
+
+/*!
+    \since 5.14
+    \overload
+*/
+QTime QLocale::toTime(const QString &string, const QString &format, QCalendar cal) const
+{
     QTime time;
 #if QT_CONFIG(datetimeparser)
-    QDateTimeParser dt(QVariant::Time, QDateTimeParser::FromString);
+    QDateTimeParser dt(QVariant::Time, QDateTimeParser::FromString, cal);
     dt.setDefaultLocale(*this);
     if (dt.parseFormat(format))
         dt.fromString(string, 0, &time);
 #else
+    Q_UNUSED(cal);
     Q_UNUSED(string);
     Q_UNUSED(format);
 #endif
     return time;
 }
-#endif
 
 /*!
     \since 4.4
@@ -2303,22 +2452,30 @@ QTime QLocale::toTime(const QString &string, const QString &format) const
 
     \sa dateFormat(), toTime(), toDateTime(), QDate::fromString()
 */
-#if QT_CONFIG(datestring)
 QDate QLocale::toDate(const QString &string, const QString &format) const
 {
+    return toDate(string, format, QCalendar());
+}
+
+/*!
+    \since 5.14
+    \overload
+*/
+QDate QLocale::toDate(const QString &string, const QString &format, QCalendar cal) const
+{
     QDate date;
 #if QT_CONFIG(datetimeparser)
-    QDateTimeParser dt(QVariant::Date, QDateTimeParser::FromString);
+    QDateTimeParser dt(QVariant::Date, QDateTimeParser::FromString, cal);
     dt.setDefaultLocale(*this);
     if (dt.parseFormat(format))
         dt.fromString(string, &date, 0);
 #else
     Q_UNUSED(string);
     Q_UNUSED(format);
+    Q_UNUSED(cal);
 #endif
     return date;
 }
-#endif
 
 /*!
     \since 4.4
@@ -2334,25 +2491,33 @@ QDate QLocale::toDate(const QString &string, const QString &format) const
 
     \sa dateTimeFormat(), toTime(), toDate(), QDateTime::fromString()
 */
-#if QT_CONFIG(datestring)
 QDateTime QLocale::toDateTime(const QString &string, const QString &format) const
 {
+    return toDateTime(string, format, QCalendar());
+}
+
+/*!
+    \since 5.14
+    \overload
+*/
+QDateTime QLocale::toDateTime(const QString &string, const QString &format, QCalendar cal) const
+{
 #if QT_CONFIG(datetimeparser)
     QTime time;
     QDate date;
 
-    QDateTimeParser dt(QVariant::DateTime, QDateTimeParser::FromString);
+    QDateTimeParser dt(QVariant::DateTime, QDateTimeParser::FromString, cal);
     dt.setDefaultLocale(*this);
     if (dt.parseFormat(format) && dt.fromString(string, &date, &time))
         return QDateTime(date, time);
 #else
     Q_UNUSED(string);
     Q_UNUSED(format);
+    Q_UNUSED(cal);
 #endif
     return QDateTime(QDate(), QTime(-1, -1, -1));
 }
-#endif
-
+#endif // datestring
 
 /*!
     \since 4.1
@@ -2499,8 +2664,8 @@ QString QLocale::toString(double i, char f, int prec) const
 /*!
     Returns a QLocale object initialized to the system locale.
 
-    On Windows and Mac, this locale will use the decimal/grouping characters and date/time
-    formats specified in the system configuration panel.
+    On Windows and Mac, this locale will use the decimal/grouping characters and
+    date/time formats specified in the system configuration panel.
 
     \sa c()
 */
@@ -2521,10 +2686,12 @@ QLocale QLocale::system()
     script and \a country.
 
     Getting a list of all locales:
-    QList<QLocale> allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);
+    QList<QLocale> allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript,
+                                                         QLocale::AnyCountry);
 
     Getting a list of locales suitable for Russia:
-    QList<QLocale> locales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::Russia);
+    QList<QLocale> locales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript,
+                                                      QLocale::Russia);
 */
 QList<QLocale> QLocale::matchingLocales(QLocale::Language language,
                                         QLocale::Script script,
@@ -2538,8 +2705,10 @@ QList<QLocale> QLocale::matchingLocales(QLocale::Language language,
         return QList<QLocale>() << QLocale(QLocale::C);
 
     QList<QLocale> result;
-    if (language == QLocale::AnyLanguage && script == QLocale::AnyScript && country == QLocale::AnyCountry)
+    if (language == QLocale::AnyLanguage && script == QLocale::AnyScript
+        && country == QLocale::AnyCountry) {
         result.reserve(locale_data_size);
+    }
     const QLocaleData *data = locale_data + locale_index[language];
     while ( (data != locale_data + locale_data_size)
             && (language == QLocale::AnyLanguage || data->m_language_id == uint(language))) {
@@ -2593,37 +2762,7 @@ QList<QLocale::Country> QLocale::countriesForLanguage(Language language)
 */
 QString QLocale::monthName(int month, FormatType type) const
 {
-    if (month < 1 || month > 12)
-        return QString();
-
-#ifndef QT_NO_SYSTEMLOCALE
-    if (d->m_data == systemData()) {
-        QVariant res = systemLocale()->query(type == LongFormat
-                                             ? QSystemLocale::MonthNameLong : QSystemLocale::MonthNameShort,
-                                             month);
-        if (!res.isNull())
-            return res.toString();
-    }
-#endif
-
-    quint32 idx, size;
-    switch (type) {
-    case QLocale::LongFormat:
-        idx = d->m_data->m_long_month_names_idx;
-        size = d->m_data->m_long_month_names_size;
-        break;
-    case QLocale::ShortFormat:
-        idx = d->m_data->m_short_month_names_idx;
-        size = d->m_data->m_short_month_names_size;
-        break;
-    case QLocale::NarrowFormat:
-        idx = d->m_data->m_narrow_month_names_idx;
-        size = d->m_data->m_narrow_month_names_size;
-        break;
-    default:
-        return QString();
-    }
-    return getLocaleListData(months_data + idx, size, month - 1);
+    return QCalendar().monthName(*this, month, QCalendar::Unspecified, type);
 }
 
 /*!
@@ -2639,140 +2778,254 @@ QString QLocale::monthName(int month, FormatType type) const
 */
 QString QLocale::standaloneMonthName(int month, FormatType type) const
 {
-    if (month < 1 || month > 12)
-        return QString();
+    return QCalendar().standaloneMonthName(*this, month, QCalendar::Unspecified, type);
+}
 
-#ifndef QT_NO_SYSTEMLOCALE
-    if (d->m_data == systemData()) {
-        QVariant res = systemLocale()->query(type == LongFormat
-                                             ? QSystemLocale::StandaloneMonthNameLong : QSystemLocale::StandaloneMonthNameShort,
-                                             month);
-        if (!res.isNull())
-            return res.toString();
+/*!
+    \since 4.2
+
+    Returns the localized name of the \a day (where 1 represents
+    Monday, 2 represents Tuesday and so on), in the format specified
+    by \a type.
+
+    \sa monthName(), standaloneDayName()
+*/
+QString QLocale::dayName(int day, FormatType type) const
+{
+    return QCalendar().weekDayName(*this, day, type);
+}
+
+/*!
+    \since 4.5
+
+    Returns the localized name of the \a day (where 1 represents
+    Monday, 2 represents Tuesday and so on) that is used as a
+    standalone text, in the format specified by \a type.
+
+    If the locale information does not specify the standalone day
+    name then return value is the same as in dayName().
+
+    \sa dayName(), standaloneMonthName()
+*/
+QString QLocale::standaloneDayName(int day, FormatType type) const
+{
+    return QCalendar().standaloneWeekDayName(*this, day, type);
+}
+
+// Calendar look-up of month and day names:
+
+/*!
+  \internal
+ */
+
+static QString rawMonthName(const QCalendarLocale &localeData,
+                            const ushort *monthsData, int month,
+                            QLocale::FormatType type)
+{
+    quint32 idx, size;
+    switch (type) {
+    case QLocale::LongFormat:
+       idx = localeData.m_long.index;
+       size = localeData.m_long.size;
+       break;
+    case QLocale::ShortFormat:
+       idx = localeData.m_short.index;
+       size = localeData.m_short.size;
+       break;
+    case QLocale::NarrowFormat:
+       idx = localeData.m_narrow.index;
+       size = localeData.m_narrow.size;
+       break;
+    default:
+       return QString();
     }
-#endif
+    return getLocaleListData(monthsData + idx, size, month - 1);
+}
 
+/*!
+  \internal
+ */
+
+static QString rawStandaloneMonthName(const QCalendarLocale &localeData,
+                                      const ushort *monthsData, int month,
+                                      QLocale::FormatType type)
+{
     quint32 idx, size;
     switch (type) {
     case QLocale::LongFormat:
-        idx = d->m_data->m_standalone_long_month_names_idx;
-        size = d->m_data->m_standalone_long_month_names_size;
+        idx = localeData.m_standalone_long.index;
+        size = localeData.m_standalone_long.size;
         break;
     case QLocale::ShortFormat:
-        idx = d->m_data->m_standalone_short_month_names_idx;
-        size = d->m_data->m_standalone_short_month_names_size;
+        idx = localeData.m_standalone_short.index;
+        size = localeData.m_standalone_short.size;
         break;
     case QLocale::NarrowFormat:
-        idx = d->m_data->m_standalone_narrow_month_names_idx;
-        size = d->m_data->m_standalone_narrow_month_names_size;
+        idx = localeData.m_standalone_narrow.index;
+        size = localeData.m_standalone_narrow.size;
         break;
     default:
         return QString();
     }
-    QString name = getLocaleListData(months_data + idx, size, month - 1);
-    if (name.isEmpty())
-        return monthName(month, type);
-    return name;
+    QString name = getLocaleListData(monthsData + idx, size, month - 1);
+    return name.isEmpty() ? rawMonthName(localeData, monthsData, month, type) : name;
 }
 
 /*!
-    \since 4.2
-
-    Returns the localized name of the \a day (where 1 represents
-    Monday, 2 represents Tuesday and so on), in the format specified
-    by \a type.
+  \internal
+ */
 
-    \sa monthName(), standaloneDayName()
-*/
-QString QLocale::dayName(int day, FormatType type) const
+static QString rawWeekDayName(const QLocaleData *data, const int day,
+                              QLocale::FormatType type)
 {
-    if (day < 1 || day > 7)
+    quint32 idx, size;
+    switch (type) {
+    case QLocale::LongFormat:
+        idx = data->m_long_day_names_idx;
+        size = data->m_long_day_names_size;
+        break;
+    case QLocale::ShortFormat:
+        idx = data->m_short_day_names_idx;
+        size = data->m_short_day_names_size;
+        break;
+    case QLocale::NarrowFormat:
+        idx = data->m_narrow_day_names_idx;
+        size = data->m_narrow_day_names_size;
+        break;
+    default:
         return QString();
-
-#ifndef QT_NO_SYSTEMLOCALE
-    if (d->m_data == systemData()) {
-        QVariant res = systemLocale()->query(type == LongFormat
-                                             ? QSystemLocale::DayNameLong : QSystemLocale::DayNameShort,
-                                             day);
-        if (!res.isNull())
-            return res.toString();
     }
-#endif
-    if (day == 7)
-        day = 0;
+    return getLocaleListData(days_data + idx, size, day == 7 ? 0 : day);
+}
+
+/*!
+  \internal
+ */
 
+static QString rawStandaloneWeekDayName(const QLocaleData *data, const int day,
+                                        QLocale::FormatType type)
+{
     quint32 idx, size;
     switch (type) {
     case QLocale::LongFormat:
-        idx = d->m_data->m_long_day_names_idx;
-        size = d->m_data->m_long_day_names_size;
+        idx = data->m_standalone_long_day_names_idx;
+        size = data->m_standalone_long_day_names_size;
         break;
     case QLocale::ShortFormat:
-        idx = d->m_data->m_short_day_names_idx;
-        size = d->m_data->m_short_day_names_size;
+        idx = data->m_standalone_short_day_names_idx;
+        size = data->m_standalone_short_day_names_size;
         break;
     case QLocale::NarrowFormat:
-        idx = d->m_data->m_narrow_day_names_idx;
-        size = d->m_data->m_narrow_day_names_size;
+        idx = data->m_standalone_narrow_day_names_idx;
+        size = data->m_standalone_narrow_day_names_size;
         break;
     default:
         return QString();
     }
-    return getLocaleListData(days_data + idx, size, day);
+    QString name = getLocaleListData(days_data + idx, size, day == 7 ? 0 : day);
+    if (name.isEmpty())
+        return rawWeekDayName(data, day, type);
+    return name;
 }
 
-/*!
-    \since 4.5
+// Refugees from qcalendar.cpp that need functions above:
 
-    Returns the localized name of the \a day (where 1 represents
-    Monday, 2 represents Tuesday and so on) that is used as a
-    standalone text, in the format specified by \a type.
+QString QCalendarBackend::monthName(const QLocale &locale, int month, int,
+                                    QLocale::FormatType format) const
+{
+    Q_ASSERT(month >= 1 && month <= maximumMonthsInYear());
+    return rawMonthName(localeMonthIndexData()[locale.d->m_data_offset],
+                        localeMonthData(), month, format);
+}
 
-    If the locale information does not specify the standalone day
-    name then return value is the same as in dayName().
+QString QGregorianCalendar::monthName(const QLocale &locale, int month, int year,
+                                      QLocale::FormatType format) const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (locale.d->m_data == systemData()) {
+        Q_ASSERT(month >= 1 && month <= 12);
+        QVariant res = systemLocale()->query(format == QLocale::LongFormat
+                                             ? QSystemLocale::MonthNameLong
+                                             : QSystemLocale::MonthNameShort,
+                                             month);
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
 
-    \sa dayName(), standaloneMonthName()
-*/
-QString QLocale::standaloneDayName(int day, FormatType type) const
+    return QCalendarBackend::monthName(locale, month, year, format);
+}
+
+QString QCalendarBackend::standaloneMonthName(const QLocale &locale, int month, int,
+                                              QLocale::FormatType format) const
+{
+    Q_ASSERT(month >= 1 && month <= maximumMonthsInYear());
+    return rawStandaloneMonthName(localeMonthIndexData()[locale.d->m_data_offset],
+                                  localeMonthData(), month, format);
+}
+
+QString QGregorianCalendar::standaloneMonthName(const QLocale &locale, int month, int year,
+                                                QLocale::FormatType format) const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (locale.d->m_data == systemData()) {
+        Q_ASSERT(month >= 1 && month <= 12);
+        QVariant res = systemLocale()->query(format == QLocale::LongFormat
+                                             ? QSystemLocale::StandaloneMonthNameLong
+                                             : QSystemLocale::StandaloneMonthNameShort,
+                                             month);
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
+
+    return QCalendarBackend::standaloneMonthName(locale, month, year, format);
+}
+
+// Most calendars share the common week-day naming, modulo locale.
+// Calendars that don't must override these methods.
+QString QCalendarBackend::weekDayName(const QLocale &locale, int day,
+                                      QLocale::FormatType format) const
 {
     if (day < 1 || day > 7)
         return QString();
 
 #ifndef QT_NO_SYSTEMLOCALE
-    if (d->m_data == systemData()) {
-        QVariant res = systemLocale()->query(type == LongFormat
-                                             ? QSystemLocale::DayNameLong : QSystemLocale::DayNameShort,
+    if (locale.d->m_data == systemData()) {
+        QVariant res = systemLocale()->query(format == QLocale::LongFormat
+                                             ? QSystemLocale::DayNameLong
+                                             : QSystemLocale::DayNameShort,
                                              day);
         if (!res.isNull())
             return res.toString();
     }
 #endif
-    if (day == 7)
-        day = 0;
 
-    quint32 idx, size;
-    switch (type) {
-    case QLocale::LongFormat:
-        idx = d->m_data->m_standalone_long_day_names_idx;
-        size = d->m_data->m_standalone_long_day_names_size;
-        break;
-    case QLocale::ShortFormat:
-        idx = d->m_data->m_standalone_short_day_names_idx;
-        size = d->m_data->m_standalone_short_day_names_size;
-        break;
-    case QLocale::NarrowFormat:
-        idx = d->m_data->m_standalone_narrow_day_names_idx;
-        size = d->m_data->m_standalone_narrow_day_names_size;
-        break;
-    default:
+    return rawWeekDayName(locale.d->m_data, day, format);
+}
+
+QString QCalendarBackend::standaloneWeekDayName(const QLocale &locale, int day,
+                                                QLocale::FormatType format) const
+{
+    if (day < 1 || day > 7)
         return QString();
+
+#ifndef QT_NO_SYSTEMLOCALE
+    if (locale.d->m_data == systemData()) {
+        QVariant res = systemLocale()->query(format == QLocale::LongFormat
+                                             ? QSystemLocale::DayNameLong
+                                             : QSystemLocale::DayNameShort,
+                                             day);
+        if (!res.isNull())
+            return res.toString();
     }
-    QString name = getLocaleListData(days_data + idx, size, day);
-    if (name.isEmpty())
-        return dayName(day == 0 ? 7 : day, type);
-    return name;
+#endif
+
+    return rawStandaloneWeekDayName(locale.d->m_data, day, format);
 }
 
+// End of this block of qcalendar.cpp refugees.  (One more follows.)
+
 /*!
     \since 4.8
 
@@ -2976,10 +3229,11 @@ QString QLocale::pmText() const
     return getLocaleData(pm_data + d->m_data->m_pm_idx, d->m_data->m_pm_size);
 }
 
+// Another intrusion from QCalendar, using some of the tools above:
 
-QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &datetime,
-                                         const QDate &dateOnly, const QTime &timeOnly,
-                                         const QLocale *q) const
+QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &datetime,
+                                           const QDate &dateOnly, const QTime &timeOnly,
+                                           const QLocale &locale) const
 {
     QDate date;
     QTime time;
@@ -3001,6 +3255,15 @@ QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &da
     }
 
     QString result;
+    int year = 0, month = 0, day = 0;
+    if (formatDate) {
+        const auto parts = julianDayToDate(date.toJulianDay());
+        if (!parts.isValid())
+            return QString();
+        year = parts.year;
+        month = parts.month;
+        day = parts.day;
+    }
 
     int i = 0;
     while (i < format.size()) {
@@ -3023,14 +3286,14 @@ QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &da
 
                 switch (repeat) {
                 case 4: {
-                    const int yr = date.year();
-                    const int len = (yr < 0) ? 5 : 4;
-                    result.append(m_data->longLongToString(yr, -1, 10, len, QLocaleData::ZeroPadded));
+                    const int len = (year < 0) ? 5 : 4;
+                    result.append(locale.d->m_data->longLongToString(year, -1, 10, len,
+                                                                     QLocaleData::ZeroPadded));
                     break;
                 }
                 case 2:
-                    result.append(m_data->longLongToString(date.year() % 100, -1, 10, 2,
-                                                   QLocaleData::ZeroPadded));
+                    result.append(locale.d->m_data->longLongToString(year % 100, -1, 10, 2,
+                                                                     QLocaleData::ZeroPadded));
                     break;
                 default:
                     repeat = 1;
@@ -3044,16 +3307,17 @@ QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &da
                 repeat = qMin(repeat, 4);
                 switch (repeat) {
                 case 1:
-                    result.append(m_data->longLongToString(date.month()));
+                    result.append(locale.d->m_data->longLongToString(month));
                     break;
                 case 2:
-                    result.append(m_data->longLongToString(date.month(), -1, 10, 2, QLocaleData::ZeroPadded));
+                    result.append(locale.d->m_data->longLongToString(month, -1, 10, 2,
+                                                                     QLocaleData::ZeroPadded));
                     break;
                 case 3:
-                    result.append(q->monthName(date.month(), QLocale::ShortFormat));
+                    result.append(monthName(locale, month, year, QLocale::ShortFormat));
                     break;
                 case 4:
-                    result.append(q->monthName(date.month(), QLocale::LongFormat));
+                    result.append(monthName(locale, month, year, QLocale::LongFormat));
                     break;
                 }
                 break;
@@ -3063,16 +3327,19 @@ QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &da
                 repeat = qMin(repeat, 4);
                 switch (repeat) {
                 case 1:
-                    result.append(m_data->longLongToString(date.day()));
+                    result.append(locale.d->m_data->longLongToString(day));
                     break;
                 case 2:
-                    result.append(m_data->longLongToString(date.day(), -1, 10, 2, QLocaleData::ZeroPadded));
+                    result.append(locale.d->m_data->longLongToString(day, -1, 10, 2,
+                                                                     QLocaleData::ZeroPadded));
                     break;
                 case 3:
-                    result.append(q->dayName(date.dayOfWeek(), QLocale::ShortFormat));
+                    result.append(locale.dayName(
+                                      dayOfWeek(date.toJulianDay()), QLocale::ShortFormat));
                     break;
                 case 4:
-                    result.append(q->dayName(date.dayOfWeek(), QLocale::LongFormat));
+                    result.append(locale.dayName(
+                                      dayOfWeek(date.toJulianDay()), QLocale::LongFormat));
                     break;
                 }
                 break;
@@ -3096,10 +3363,11 @@ QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &da
 
                 switch (repeat) {
                 case 1:
-                    result.append(m_data->longLongToString(hour));
+                    result.append(locale.d->m_data->longLongToString(hour));
                     break;
                 case 2:
-                    result.append(m_data->longLongToString(hour, -1, 10, 2, QLocaleData::ZeroPadded));
+                    result.append(locale.d->m_data->longLongToString(hour, -1, 10, 2,
+                                                                     QLocaleData::ZeroPadded));
                     break;
                 }
                 break;
@@ -3109,10 +3377,11 @@ QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &da
                 repeat = qMin(repeat, 2);
                 switch (repeat) {
                 case 1:
-                    result.append(m_data->longLongToString(time.hour()));
+                    result.append(locale.d->m_data->longLongToString(time.hour()));
                     break;
                 case 2:
-                    result.append(m_data->longLongToString(time.hour(), -1, 10, 2, QLocaleData::ZeroPadded));
+                    result.append(locale.d->m_data->longLongToString(time.hour(), -1, 10, 2,
+                                                                     QLocaleData::ZeroPadded));
                     break;
                 }
                 break;
@@ -3122,10 +3391,11 @@ QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &da
                 repeat = qMin(repeat, 2);
                 switch (repeat) {
                 case 1:
-                    result.append(m_data->longLongToString(time.minute()));
+                    result.append(locale.d->m_data->longLongToString(time.minute()));
                     break;
                 case 2:
-                    result.append(m_data->longLongToString(time.minute(), -1, 10, 2, QLocaleData::ZeroPadded));
+                    result.append(locale.d->m_data->longLongToString(time.minute(), -1, 10, 2,
+                                                                     QLocaleData::ZeroPadded));
                     break;
                 }
                 break;
@@ -3135,78 +3405,67 @@ QString QLocalePrivate::dateTimeToString(QStringView format, const QDateTime &da
                 repeat = qMin(repeat, 2);
                 switch (repeat) {
                 case 1:
-                    result.append(m_data->longLongToString(time.second()));
+                    result.append(locale.d->m_data->longLongToString(time.second()));
                     break;
                 case 2:
-                    result.append(m_data->longLongToString(time.second(), -1, 10, 2, QLocaleData::ZeroPadded));
+                    result.append(locale.d->m_data->longLongToString(time.second(), -1, 10, 2,
+                                                                     QLocaleData::ZeroPadded));
                     break;
                 }
                 break;
 
             case 'a':
                 used = true;
-                if (i + 1 < format.size() && format.at(i + 1).unicode() == 'p') {
-                    repeat = 2;
-                } else {
-                    repeat = 1;
-                }
-                result.append(time.hour() < 12 ? q->amText().toLower() : q->pmText().toLower());
+                repeat = format.mid(i + 1).startsWith(QLatin1Char('p')) ? 2 : 1;
+                result.append(time.hour() < 12 ? locale.amText().toLower()
+                                               : locale.pmText().toLower());
                 break;
 
             case 'A':
                 used = true;
-                if (i + 1 < format.size() && format.at(i + 1).unicode() == 'P') {
-                    repeat = 2;
-                } else {
-                    repeat = 1;
-                }
-                result.append(time.hour() < 12 ? q->amText().toUpper() : q->pmText().toUpper());
+                repeat = format.mid(i + 1).startsWith(QLatin1Char('P')) ? 2 : 1;
+                result.append(time.hour() < 12 ? locale.amText().toUpper()
+                                                : locale.pmText().toUpper());
                 break;
 
             case 'z':
                 used = true;
-                if (repeat >= 3) {
-                    repeat = 3;
-                } else {
-                    repeat = 1;
-                }
+                repeat = (repeat >= 3) ? 3 : 1;
 
                 // note: the millisecond component is treated like the decimal part of the seconds
                 // so ms == 2 is always printed as "002", but ms == 200 can be either "2" or "200"
-                result.append(m_data->longLongToString(time.msec(), -1, 10, 3, QLocaleData::ZeroPadded));
+                result.append(locale.d->m_data->longLongToString(time.msec(), -1, 10, 3,
+                                                                 QLocaleData::ZeroPadded));
                 if (repeat == 1) {
-                    if (result.endsWith(zero()))
+                    if (result.endsWith(locale.d->zero()))
                         result.chop(1);
-                    if (result.endsWith(zero()))
+                    if (result.endsWith(locale.d->zero()))
                         result.chop(1);
                 }
-
                 break;
 
             case 't':
                 used = true;
                 repeat = 1;
                 // If we have a QDateTime use the time spec otherwise use the current system tzname
-                if (formatDate) {
-                    result.append(datetime.timeZoneAbbreviation());
-                } else {
-                    result.append(QDateTime::currentDateTime().timeZoneAbbreviation());
-                }
+                result.append(formatDate ? datetime.timeZoneAbbreviation()
+                                         : QDateTime::currentDateTime().timeZoneAbbreviation());
                 break;
 
             default:
                 break;
             }
         }
-        if (!used) {
+        if (!used)
             result.append(QString(repeat, c));
-        }
         i += repeat;
     }
 
     return result;
 }
 
+// End of QCalendar intrustions
+
 QString QLocaleData::doubleToString(double d, int precision, DoubleForm form,
                                     int width, unsigned flags) const
 {
@@ -3216,7 +3475,8 @@ QString QLocaleData::doubleToString(double d, int precision, DoubleForm form,
 
 QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const QChar minus,
                                     const QChar exponential, const QChar group, const QChar decimal,
-                                    double d, int precision, DoubleForm form, int width, unsigned flags)
+                                    double d, int precision, DoubleForm form, int width,
+                                    unsigned flags)
 {
     if (precision != QLocale::FloatingPointShortest && precision < 0)
         precision = 6;
@@ -3589,11 +3849,14 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
                     return false;
 
                 // check distance from the last separator or from the beginning of the digits
-                // ### FIXME: Some locales allow other groupings! See https://en.wikipedia.org/wiki/Thousands_separator
+                // ### FIXME: Some locales allow other groupings!
+                // See https://en.wikipedia.org/wiki/Thousands_separator
                 if (last_separator_idx != -1 && idx - last_separator_idx != 4)
                     return false;
-                if (last_separator_idx == -1 && (start_of_digits_idx == -1 || idx - start_of_digits_idx > 3))
+                if (last_separator_idx == -1
+                    && (start_of_digits_idx == -1 || idx - start_of_digits_idx > 3)) {
                     return false;
+                }
 
                 last_separator_idx = idx;
                 ++group_cnt;
@@ -3603,7 +3866,8 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
                 continue;
             } else if (out == '.' || out == 'e' || out == 'E') {
                 // check distance from the last separator
-                // ### FIXME: Some locales allow other groupings! See https://en.wikipedia.org/wiki/Thousands_separator
+                // ### FIXME: Some locales allow other groupings!
+                // See https://en.wikipedia.org/wiki/Thousands_separator
                 if (last_separator_idx != -1 && idx - last_separator_idx != 4)
                     return false;
 
@@ -3663,9 +3927,10 @@ bool QLocaleData::validateChars(QStringView str, NumberMode numMode, QByteArray
 
             // The only non-digit character after the 'e' can be '+' or '-'.
             // If a zero is directly after that, then the exponent is zero-padded.
-            if ((number_options & QLocale::RejectLeadingZeroInExponent) && c == '0' && eCnt > 0 &&
-                    !lastWasDigit)
+            if ((number_options & QLocale::RejectLeadingZeroInExponent)
+                && c == '0' && eCnt > 0 && !lastWasDigit) {
                 return false;
+            }
 
             lastWasDigit = true;
         } else {
@@ -3917,7 +4182,8 @@ QString QLocale::toCurrencyString(qlonglong value, const QString &symbol) const
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
         QSystemLocale::CurrencyToStringArgument arg(value, symbol);
-        QVariant res = systemLocale()->query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));
+        QVariant res =
+            systemLocale()->query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));
         if (!res.isNull())
             return res.toString();
     }
@@ -3947,7 +4213,8 @@ QString QLocale::toCurrencyString(qulonglong value, const QString &symbol) const
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
         QSystemLocale::CurrencyToStringArgument arg(value, symbol);
-        QVariant res = systemLocale()->query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));
+        QVariant res =
+            systemLocale()->query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));
         if (!res.isNull())
             return res.toString();
     }
@@ -3989,7 +4256,8 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
         QSystemLocale::CurrencyToStringArgument arg(value, symbol);
-        QVariant res = systemLocale()->query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));
+        QVariant res =
+            systemLocale()->query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));
         if (!res.isNull())
             return res.toString();
     }
@@ -4116,33 +4384,90 @@ QString QLocale::formattedDataSize(qint64 bytes, int precision, DataSizeFormats
 */
 QStringList QLocale::uiLanguages() const
 {
+    QStringList uiLanguages;
+    QVector<QLocale> locales;
 #ifndef QT_NO_SYSTEMLOCALE
     if (d->m_data == systemData()) {
         QVariant res = systemLocale()->query(QSystemLocale::UILanguages, QVariant());
         if (!res.isNull()) {
-            QStringList result = res.toStringList();
-            if (!result.isEmpty())
-                return result;
+            uiLanguages = res.toStringList();
+            // ... but we need to include likely-adjusted forms of each of those, too:
+            for (const auto entry : qAsConst(uiLanguages))
+                locales.append(QLocale(entry));
         }
-    }
+    } else
 #endif
-    QLocaleId id = QLocaleId::fromIds(d->m_data->m_language_id, d->m_data->m_script_id, d->m_data->m_country_id);
-    const QLocaleId max = id.withLikelySubtagsAdded();
-    const QLocaleId min = max.withLikelySubtagsRemoved();
+    {
+        locales.append(*this);
+    }
+    for (int i = locales.size(); i-- > 0; ) {
+        const QLocale &locale = locales.at(i);
+        int j;
+        QByteArray prior;
+        if (i < uiLanguages.size()) {
+            // Adding likely-adjusted forms to system locale's list.
+            // Name the locale is derived from:
+            const QString &name = uiLanguages.at(i);
+            prior = name.toLatin1();
+            // Don't try to likely-adjust if construction's likely-adjustments
+            // were so drastic the result doesn't match the prior name:
+            if (locale.name() != name && locale.d->rawName() != prior)
+                continue;
+            // Insert just after prior:
+            j = i + 1;
+        } else {
+            // Plain locale, not system locale; just append.
+            j = uiLanguages.size();
+        }
+        const auto data = locale.d->m_data;
+
+        QLocaleId id
+            = QLocaleId::fromIds(data->m_language_id, data->m_script_id, data->m_country_id);
+        const QLocaleId max = id.withLikelySubtagsAdded();
+        const QLocaleId min = max.withLikelySubtagsRemoved();
+        id.script_id = 0; // For re-use as script-less variant.
+
+        // Include version with all likely sub-tags (last) if distinct from the rest:
+        if (max != min && max != id && max.name() != prior)
+            uiLanguages.insert(j, QString::fromLatin1(max.name()));
+
+        // Include scriptless version if likely-equivalent and distinct:
+        if (data->m_script_id && id != min && id.name() != prior
+            && id.withLikelySubtagsAdded() == max) {
+            uiLanguages.insert(j, QString::fromLatin1(id.name()));
+        }
 
-    QStringList uiLanguages;
-    uiLanguages.append(QString::fromLatin1(min.name()));
-    if (id.script_id) {
-        id.script_id = 0;
-        if (id != min && id.withLikelySubtagsAdded() == max)
-            uiLanguages.append(QString::fromLatin1(id.name()));
+        // Include minimal version (first) unless it's what our locale is derived from:
+        if (min.name() != prior)
+            uiLanguages.insert(j, QString::fromLatin1(min.name()));
     }
-    if (max != min && max != id)
-        uiLanguages.append(QString::fromLatin1(max.name()));
     return uiLanguages;
 }
 
 /*!
+  \since 5.13
+
+  Returns the locale to use for collation.
+
+  The result is usually this locale; however, the system locale (which is
+  commonly the default locale) will return the system collation locale.
+  The result is suitable for passing to QCollator's constructor.
+
+  \sa QCollator
+*/
+QLocale QLocale::collation() const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (d->m_data == systemData()) {
+        QString res = systemLocale()->query(QSystemLocale::Collation, QVariant()).toString();
+        if (!res.isEmpty())
+            return QLocale(res);
+    }
+#endif
+    return *this;
+}
+
+/*!
     \since 4.8
 
     Returns a native name of the language for the locale. For example
@@ -4159,7 +4484,8 @@ QString QLocale::nativeLanguageName() const
             return res.toString();
     }
 #endif
-    return getLocaleData(endonyms_data + d->m_data->m_language_endonym_idx, d->m_data->m_language_endonym_size);
+    return getLocaleData(endonyms_data + d->m_data->m_language_endonym_idx,
+                         d->m_data->m_language_endonym_size);
 }
 
 /*!
@@ -4179,7 +4505,8 @@ QString QLocale::nativeCountryName() const
             return res.toString();
     }
 #endif
-    return getLocaleData(endonyms_data + d->m_data->m_country_endonym_idx, d->m_data->m_country_endonym_size);
+    return getLocaleData(endonyms_data + d->m_data->m_country_endonym_idx,
+                         d->m_data->m_country_endonym_size);
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/text/qlocale.h
index 2b4f131552..87966b266b 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/text/qlocale.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-
+class QCalendar;
 class QDataStream;
 class QDate;
 class QDateTime;
@@ -59,7 +59,7 @@ class QTextStreamPrivate;
 
 class QLocalePrivate;
 
-Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed = 0) noexcept;
 
 class Q_CORE_EXPORT QLocale
 {
@@ -441,6 +441,8 @@ public:
         Sicilian = 362,
         SouthernKurdish = 363,
         WesternBalochi = 364,
+        Cebuano = 365,
+        Erzya = 366,
 
         Afan = Oromo,
         Bhutani = Dzongkha,
@@ -457,7 +459,7 @@ public:
         Twi = Akan,
         Uigur = Uighur,
 
-        LastLanguage = WesternBalochi
+        LastLanguage = Erzya
     };
 
     enum Script {
@@ -939,13 +941,11 @@ public:
     QLocale(Language language, Country country = AnyCountry);
     QLocale(Language language, Script script, Country country);
     QLocale(const QLocale &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QLocale &operator=(QLocale &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QLocale &operator=(QLocale &&other) noexcept { swap(other); return *this; }
     QLocale &operator=(const QLocale &other);
     ~QLocale();
 
-    void swap(QLocale &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QLocale &other) noexcept { qSwap(d, other.d); }
 
     Language language() const;
     Script script() const;
@@ -1013,6 +1013,14 @@ public:
     QString toString(const QDate &date, FormatType format = LongFormat) const;
     QString toString(const QTime &time, FormatType format = LongFormat) const;
     QString toString(const QDateTime &dateTime, FormatType format = LongFormat) const;
+    /* Removing default value for `format' is done intentionally,
+     * after all tests we will remove non-calendar-aware version of these functions,
+     * and add a default value for both calendar instance, and format
+     */
+    QString toString(const QDate &date, QStringView formatStr, QCalendar cal) const;
+    QString toString(const QDate &date, FormatType format, QCalendar cal) const;
+    QString toString(const QDateTime &dateTime, FormatType format, QCalendar cal) const;
+    QString toString(const QDateTime &dateTime, QStringView formatStr, QCalendar cal) const;
 
     QString dateFormat(FormatType format = LongFormat) const;
     QString timeFormat(FormatType format = LongFormat) const;
@@ -1024,6 +1032,13 @@ public:
     QDate toDate(const QString &string, const QString &format) const;
     QTime toTime(const QString &string, const QString &format) const;
     QDateTime toDateTime(const QString &string, const QString &format) const;
+    // Calendar-aware API
+    QDate toDate(const QString &string, FormatType format, QCalendar cal) const;
+    QTime toTime(const QString &string, FormatType format, QCalendar cal) const;
+    QDateTime toDateTime(const QString &string, FormatType format, QCalendar cal) const;
+    QDate toDate(const QString &string, const QString &format, QCalendar cal) const;
+    QTime toTime(const QString &string, const QString &format, QCalendar cal) const;
+    QDateTime toDateTime(const QString &string, const QString &format, QCalendar cal) const;
 #endif
 
     // ### Qt 5: We need to return QString from these function since
@@ -1048,7 +1063,7 @@ public:
     QString pmText() const;
 
     MeasurementSystem measurementSystem() const;
-
+    QLocale collation() const;
     Qt::LayoutDirection textDirection() const;
 
     QString toUpper(const QString &str) const;
@@ -1108,7 +1123,9 @@ private:
     QLocale(QLocalePrivate &dd);
     friend class QLocalePrivate;
     friend class QSystemLocale;
-    friend Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed) Q_DECL_NOTHROW;
+    friend class QCalendarBackend;
+    friend class QGregorianCalendar;
+    friend Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed) noexcept;
 
     QSharedDataPointer<QLocalePrivate> d;
 };
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/text/qlocale.qdoc
index 484987c40b..426cb9dbeb 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/text/qlocale.qdoc
@@ -164,6 +164,7 @@
     \value Cantonese Since Qt 5.7
     \value Carian Since Qt 5.1
     \value Catalan
+    \value Cebuano Since Qt 5.14
     \value CentralKurdish Since Qt 5.5
     \value CentralMoroccoTamazight
     \value Chakma Since Qt 5.1
@@ -194,6 +195,7 @@
     \value EasternKayah Since Qt 5.1
     \value Embu
     \value English
+    \value Erzya Since Qt 5.14
     \value Esperanto
     \value Estonian
     \value Etruscan Since Qt 5.1
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h
index cc9f99ae20..b846f0b768 100644
--- a/src/corelib/tools/qlocale_data_p.h
+++ b/src/corelib/text/qlocale_data_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -77,14 +77,14 @@ static const int ImperialMeasurementSystemsCount =
 // GENERATED PART STARTS HERE
 
 /*
-    This part of the file was generated on 2019-05-09 from the
+    This part of the file was generated on 2019-05-27 from the
     Common Locale Data Repository v35.1
 
     http://www.unicode.org/cldr/
 
     Do not edit this section: instead regenerate it using
     cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or
-    edited) CLDR data; see qtbase/util/local_database/.
+    edited) CLDR data; see qtbase/util/locale_database/.
 */
 
 static const QLocaleId likely_subtags[] = {
@@ -141,6 +141,7 @@ static const QLocaleId likely_subtags[] = {
     { 156,   0,   0 }, { 156,   7, 157 }, // cch -> cch_Latn_NG
     { 272,   0,   0 }, { 272,  46,  18 }, // ccp -> ccp_Cakm_BD
     { 218,   0,   0 }, { 218,   2, 178 }, // ce -> ce_Cyrl_RU
+    { 365,   0,   0 }, { 365,   7, 170 }, // ceb -> ceb_Latn_PH
     { 211,   0,   0 }, { 211,   7, 221 }, // cgg -> cgg_Latn_UG
     { 217,   0,   0 }, { 217,   7,  89 }, // ch -> ch_Latn_GU
     { 190,   0,   0 }, { 190,  12, 225 }, // chr -> chr_Cher_US
@@ -327,6 +328,7 @@ static const QLocaleId likely_subtags[] = {
     {  78,   0,   0 }, {  78,   7, 133 }, // mt -> mt_Latn_MT
     { 245,   0,   0 }, { 245,   7,  37 }, // mua -> mua_Latn_CM
     {  21,   0,   0 }, {  21,  25, 147 }, // my -> my_Mymr_MM
+    { 366,   0,   0 }, { 366,   2, 178 }, // myv -> myv_Cyrl_RU
     { 273,   0,   0 }, { 273,  71, 102 }, // myz -> myz_Mand_IR
     { 346,   0,   0 }, { 346,   1, 102 }, // mzn -> mzn_Arab_IR
     {  83,   0,   0 }, {  83,   7, 149 }, // na -> na_Latn_NR
@@ -1262,595 +1264,599 @@ static const quint16 locale_index[] = {
    580, // Sicilian
    581, // Southern Kurdish
    582, // Western Balochi
+   583, // Cebuano
+   584, // Erzya
      0 // trailing 0
 };
 
 static const QLocaleData locale_data[] = {
-   //  lang  script   terr   dec   group  list   prcnt   zero  minus  plus    exp   quotOpn  quotEnd altQtOpn altQtEnd   lpStart      lpMid       lpEnd       lpTwo       sDtFmt      lDtFmt      sTmFmt      lTmFmt     ssMonth     slMonth     snMonth      sMonth      lMonth      nMonth      ssDays      slDays      snDays       sDays       lDays       nDays        am          pm       byte    siQuant iecQuant    currISO     currSym    currDsply    currFmt    currFmtNeg   endoLang    endoCntry curDgt curRnd dow1st  wknd+  wknd-
-    {      1,     0,     0,    46,    44,    59,    37,    48,    45,    43,   101,      34,      34,      39,      39,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      0,10 ,     10,17 ,       0,8 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    158,27 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     99,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,       0,7 ,       0,4 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // C/AnyScript/AnyCountry
-    {      3,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     35,18 ,      18,7 ,     25,12 ,    185,48 ,   233,111 ,    134,24 ,    185,48 ,   233,111 ,    134,24 ,    113,28 ,    141,55 ,     85,14 ,    113,28 ,    141,55 ,     85,14 ,       2,2 ,       2,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,2 ,      7,24 ,       4,4 ,       4,0 ,       0,6 ,      6,10 ,     2,     1,     7,     6,     7 }, // Oromo/Latin/Ethiopia
-    {      3,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     35,18 ,      37,5 ,      8,10 ,    185,48 ,   233,111 ,    344,24 ,    185,48 ,   233,111 ,    134,24 ,    113,28 ,    141,55 ,    196,14 ,    113,28 ,    141,55 ,    196,14 ,       2,2 ,       2,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,       0,7 ,       4,4 ,       4,0 ,       0,6 ,      16,8 ,     2,     1,     7,     6,     7 }, // Oromo/Latin/Kenya
-    {      4,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Afar/Latin/Ethiopia
-    {      5,     7,   195,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     53,10 ,     80,17 ,      37,5 ,      8,10 ,    416,59 ,    475,92 ,    134,24 ,    416,59 ,    475,92 ,    134,24 ,    210,28 ,    238,58 ,    296,14 ,    210,28 ,    238,58 ,    296,14 ,       4,3 ,       4,3 ,   49,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,     31,67 ,       4,4 ,       4,0 ,      24,9 ,     33,11 ,     2,     1,     7,     6,     7 }, // Afrikaans/Latin/South Africa
-    {      5,     7,   148,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     53,10 ,     97,16 ,      18,7 ,     25,12 ,    416,59 ,    475,92 ,    134,24 ,    416,59 ,    475,92 ,    134,24 ,    210,28 ,    238,58 ,    296,14 ,    210,28 ,    238,58 ,    296,14 ,       4,3 ,       4,3 ,   49,5 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,     98,55 ,       4,4 ,       4,0 ,      24,9 ,      44,7 ,     2,     1,     1,     6,     7 }, // Afrikaans/Latin/Namibia
-    {      6,     7,     2,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      18,7 ,     42,13 ,    567,50 ,    617,78 ,    695,27 ,    567,50 ,    617,78 ,    695,27 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {65,76,76},        7,4 ,    153,45 ,      13,5 ,       4,0 ,      51,5 ,      56,8 ,     0,     0,     1,     6,     7 }, // Albanian/Latin/Albania
-    {      6,     7,   127,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      37,5 ,      8,10 ,    567,50 ,    617,78 ,    695,27 ,    567,50 ,    617,78 ,    695,27 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {77,75,68},       11,3 ,    198,54 ,      13,5 ,       4,0 ,      51,5 ,     64,18 ,     2,     1,     1,     6,     7 }, // Albanian/Latin/Macedonia
-    {      6,     7,   257,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      37,5 ,      8,10 ,    567,50 ,    617,78 ,    695,27 ,    567,50 ,    617,78 ,    695,27 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,    252,21 ,      13,5 ,       4,0 ,      51,5 ,      82,6 ,     2,     1,     1,     6,     7 }, // Albanian/Latin/Kosovo
-    {      7,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,      23,6 ,      23,6 ,      29,9 ,      38,8 ,    119,10 ,     63,17 ,      18,7 ,     25,12 ,    722,46 ,    768,61 ,    829,24 ,    722,46 ,    768,61 ,    829,24 ,    439,27 ,    466,28 ,    494,14 ,    439,27 ,    466,28 ,    494,14 ,      18,3 ,      17,4 ,   58,3 ,  61,23 ,  22,23 , {69,84,66},       15,2 ,    273,34 ,       4,4 ,       4,0 ,      88,4 ,      92,5 ,     2,     1,     7,     6,     7 }, // Amharic/Ethiopic/Ethiopia
-    {      8,     1,    64,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {69,71,80},       17,5 ,    307,81 ,      13,5 ,       4,0 ,      97,7 ,     104,3 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Egypt
-    {      8,     1,     3,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    952,71 ,    952,71 ,   1023,24 ,    952,71 ,    952,71 ,   1023,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {68,90,68},       22,5 ,   388,102 ,      13,5 ,       4,0 ,      97,7 ,     107,7 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Algeria
-    {      8,     1,    17,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {66,72,68},       27,5 ,    490,91 ,      13,5 ,       4,0 ,      97,7 ,     114,7 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Bahrain
-    {      8,     1,    42,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {88,65,70},       32,4 ,   581,112 ,      13,5 ,       4,0 ,      97,7 ,     121,4 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Chad
-    {      8,     1,    48,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      37,5 ,      8,10 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {75,77,70},       36,2 ,   693,105 ,      13,5 ,       4,0 ,      97,7 ,     125,9 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Comoros
-    {      8,     1,    59,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {68,74,70},       38,3 ,    798,84 ,      13,5 ,       4,0 ,      97,7 ,     134,6 ,     0,     0,     6,     6,     7 }, // Arabic/Arabic/Djibouti
-    {      8,     1,    67,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {69,82,78},       41,3 ,    882,91 ,      13,5 ,       4,0 ,      97,7 ,     140,7 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Eritrea
-    {      8,     1,   103,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,   1047,92 ,   1047,92 ,   1139,24 ,   1163,92 ,   1047,92 ,   1139,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,81,68},       44,5 ,    973,84 ,      13,5 ,       4,0 ,      97,7 ,     147,6 ,     0,     0,     6,     5,     6 }, // Arabic/Arabic/Iraq
-    {      8,     1,   105,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      55,4 ,      59,9 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,76,83},       49,1 ,  1057,133 ,      13,5 ,       4,0 ,      97,7 ,     153,7 ,     2,     1,     7,     5,     6 }, // Arabic/Arabic/Israel
-    {      8,     1,   109,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,   1047,92 ,   1047,92 ,   1139,24 ,   1047,92 ,   1047,92 ,   1139,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {74,79,68},       50,5 ,   1190,84 ,      13,5 ,       4,0 ,      97,7 ,     160,6 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Jordan
-    {      8,     1,   115,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {75,87,68},       55,5 ,   1274,84 ,      13,5 ,       4,0 ,      97,7 ,     166,6 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Kuwait
-    {      8,     1,   119,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,   1047,92 ,   1047,92 ,   1139,24 ,   1047,92 ,   1047,92 ,   1139,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {76,66,80},       60,5 ,   1358,84 ,      13,5 ,       4,0 ,      97,7 ,     172,5 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Lebanon
-    {      8,     1,   122,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {76,89,68},       65,5 ,   1442,88 ,      13,5 ,       4,0 ,      97,7 ,     177,5 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Libya
-    {      8,     1,   136,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,   1255,72 ,   1255,72 ,   1327,24 ,   1255,72 ,   1255,72 ,   1327,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,82,85},       70,4 ,  1530,112 ,      13,5 ,       4,0 ,      97,7 ,     182,9 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Mauritania
-    {      8,     1,   145,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      37,5 ,      8,10 ,   1351,70 ,   1351,70 ,   1421,24 ,   1351,70 ,   1351,70 ,   1421,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,65,68},       74,5 ,   1642,87 ,      13,5 ,       4,0 ,      97,7 ,     191,6 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Morocco
-    {      8,     1,   162,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {79,77,82},       79,5 ,   1729,77 ,      13,5 ,       4,0 ,      97,7 ,     197,5 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Oman
-    {      8,     1,   165,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,   1047,92 ,   1047,92 ,   1139,24 ,   1047,92 ,   1047,92 ,   1139,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,76,83},       49,1 ,  1057,133 ,      13,5 ,       4,0 ,      97,7 ,    202,18 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Palestinian Territories
-    {      8,     1,   175,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {81,65,82},       84,5 ,   1806,70 ,      13,5 ,       4,0 ,      97,7 ,     220,3 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Qatar
-    {      8,     1,   186,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,65,82},       89,5 ,   1876,77 ,      13,5 ,       4,0 ,      97,7 ,    223,24 ,     2,     1,     7,     5,     6 }, // Arabic/Arabic/Saudi Arabia
-    {      8,     1,   194,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,79,83},       94,1 ,   1953,77 ,      13,5 ,       4,0 ,      97,7 ,     247,7 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Somalia
-    {      8,     1,   201,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,68,71},       95,4 ,   2030,91 ,      13,5 ,       4,0 ,      97,7 ,     254,7 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Sudan
-    {      8,     1,   207,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,   1047,92 ,   1047,92 ,   1139,24 ,   1047,92 ,   1047,92 ,   1139,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,89,80},       99,5 ,   2121,77 ,      13,5 ,       4,0 ,      97,7 ,     261,5 ,     0,     0,     6,     5,     6 }, // Arabic/Arabic/Syria
-    {      8,     1,   216,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    952,71 ,    952,71 ,   1023,24 ,    952,71 ,    952,71 ,   1023,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {84,78,68},      104,5 ,   2198,95 ,      13,5 ,       4,0 ,      97,7 ,     266,4 ,     3,     0,     1,     6,     7 }, // Arabic/Arabic/Tunisia
-    {      8,     1,   223,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {65,69,68},      109,5 ,   2293,91 ,      13,5 ,       4,0 ,      97,7 ,    270,24 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/United Arab Emirates
-    {      8,     1,   236,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,65,68},       74,5 ,   1642,87 ,      13,5 ,       4,0 ,      97,7 ,    294,15 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Western Sahara
-    {      8,     1,   237,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {89,69,82},      114,5 ,   2384,70 ,      13,5 ,       4,0 ,      97,7 ,     309,5 ,     0,     0,     7,     5,     6 }, // Arabic/Arabic/Yemen
-    {      8,     1,   254,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,83,80},      119,1 ,  2454,132 ,      13,5 ,       4,0 ,      97,7 ,    314,12 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/South Sudan
-    {      8,     1,   260,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    853,75 ,    853,75 ,    928,24 ,    853,75 ,    853,75 ,    928,24 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,    326,23 ,     349,6 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/World
-    {      9,    10,    11,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,      65,7 ,      65,7 ,     156,8 ,    164,20 ,      37,5 ,      8,10 ,   1445,48 ,   1493,94 ,   1587,24 ,   1445,48 ,  1611,106 ,   1587,24 ,    574,28 ,    602,62 ,    664,14 ,    574,28 ,    602,62 ,    664,14 ,       0,2 ,       0,2 ,  135,6 , 141,17 ,  22,23 , {65,77,68},      120,1 ,   2586,46 ,      13,5 ,       4,0 ,     355,7 ,     362,8 ,     2,     0,     1,     6,     7 }, // Armenian/Armenian/Armenia
-    {     10,    11,   100,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      72,9 ,      72,9 ,     184,8 ,    192,18 ,      68,7 ,     75,12 ,   1717,64 ,   1781,89 ,   1870,24 ,   1717,64 ,   1781,89 ,   1870,24 ,    678,32 ,    710,58 ,    768,14 ,    678,32 ,    710,58 ,    768,14 ,      22,9 ,      22,7 ,  158,4 , 162,37 ,  22,23 , {73,78,82},      121,1 ,   2632,43 ,       8,5 ,       4,0 ,     370,7 ,     377,4 ,     2,     1,     7,     7,     7 }, // Assamese/Bengali/India
-    {     12,     7,    15,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      81,8 ,      81,8 ,     156,8 ,    210,17 ,      37,5 ,      8,10 ,   1894,48 ,   1942,77 ,    158,27 ,   1894,48 ,   2019,77 ,    158,27 ,    782,27 ,    809,67 ,     99,14 ,    782,27 ,    809,67 ,     99,14 ,       0,2 ,       0,2 ,  199,4 ,   5,17 ,  22,23 , {65,90,78},      122,1 ,   2675,58 ,      13,5 ,       4,0 ,    381,10 ,    391,10 ,     2,     1,     1,     6,     7 }, // Azerbaijani/Latin/Azerbaijan
-    {     12,     1,   102,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     5 }, // Azerbaijani/Arabic/Iran
-    {     12,     2,    15,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     156,8 ,    210,17 ,      37,5 ,      8,10 ,   2096,48 ,   2144,77 ,    158,27 ,   2096,48 ,   2221,77 ,    158,27 ,    876,27 ,    903,67 ,     99,14 ,    876,27 ,    903,67 ,     99,14 ,      31,2 ,      29,2 ,   45,4 ,   5,17 ,  22,23 , {65,90,78},      122,1 ,   2733,12 ,      13,5 ,       4,0 ,    401,10 ,    411,10 ,     2,     1,     1,     6,     7 }, // Azerbaijani/Cyrillic/Azerbaijan
-    {     13,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Bashkir/Cyrillic/Russia
-    {     14,     7,   197,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8220,    8221,       0,6 ,       0,6 ,      89,9 ,      89,9 ,     227,6 ,    233,36 ,      37,5 ,     87,12 ,   2298,60 ,   2358,93 ,   2451,24 ,   2298,60 ,   2358,93 ,   2451,24 ,    970,28 ,    998,68 ,   1066,14 ,    970,28 ,    998,68 ,   1066,14 ,       0,2 ,       0,2 ,  203,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   2745,20 ,      13,5 ,       4,0 ,     421,7 ,     428,8 ,     2,     1,     1,     6,     7 }, // Basque/Latin/Spain
-    {     15,    11,    18,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      98,9 ,      98,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,   2475,90 ,   2475,90 ,   2565,33 ,   2598,77 ,   2475,90 ,   2565,33 ,   1080,37 ,   1117,58 ,   1175,18 ,   1080,37 ,   1117,58 ,   1175,18 ,       0,2 ,       0,2 ,  158,4 ,   5,17 ,  22,23 , {66,68,84},      124,1 ,   2765,49 ,       0,4 ,       4,0 ,     436,5 ,     441,8 ,     2,     1,     7,     6,     7 }, // Bengali/Bengali/Bangladesh
-    {     15,    11,   100,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      98,9 ,      98,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,   2475,90 ,   2475,90 ,   2565,33 ,   2598,77 ,   2475,90 ,   2565,33 ,   1080,37 ,   1117,58 ,   1175,18 ,   1080,37 ,   1117,58 ,   1175,18 ,       0,2 ,       0,2 ,  158,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   2814,43 ,       0,4 ,       4,0 ,     436,5 ,     449,4 ,     2,     1,     7,     7,     7 }, // Bengali/Bengali/India
-    {     16,    31,    25,    46,    44,    59,    37,  3872,    45,    43,   101,    8220,    8221,    8216,    8217,     107,9 ,     107,9 ,     107,9 ,     107,9 ,     53,10 ,    275,30 ,     99,22 ,    121,27 ,   2675,63 ,  2738,191 ,   2929,27 ,   2956,27 ,  2983,132 ,   3115,27 ,   1193,34 ,   1227,79 ,   1306,27 ,   1193,34 ,   1227,79 ,   1306,27 ,      33,5 ,      31,6 ,   45,4 ,   5,17 ,  22,23 , {66,84,78},      125,3 ,   2857,15 ,       4,4 ,       4,0 ,     453,6 ,     459,5 ,     2,     1,     7,     6,     7 }, // Dzongkha/Tibetan/Bhutan
-    {     19,     7,    74,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3142,63 ,   3205,78 ,   3283,36 ,   3142,63 ,   3205,78 ,   3283,36 ,   1333,33 ,   1366,43 ,   1409,18 ,   1333,33 ,   1366,43 ,   1409,18 ,      38,4 ,      37,4 ,  210,7 , 217,17 ,  22,23 , {69,85,82},       14,1 ,   2872,36 ,      13,5 ,       4,0 ,     464,9 ,     473,5 ,     2,     1,     1,     6,     7 }, // Breton/Latin/France
-    {     20,     2,    33,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    305,12 ,    317,22 ,     148,9 ,    157,14 ,   3319,49 ,   3368,82 ,   3450,24 ,   3319,49 ,   3368,82 ,   3450,24 ,   1427,21 ,   1448,55 ,   1503,14 ,   1427,21 ,   1448,55 ,   1503,14 ,      42,6 ,      41,6 ,  234,7 ,   5,17 ,  22,23 , {66,71,78},      128,3 ,   2908,47 ,      13,5 ,       4,0 ,     478,9 ,     487,8 ,     2,     1,     1,     6,     7 }, // Bulgarian/Cyrillic/Bulgaria
-    {     21,    25,   147,    46,    44,  4170,    37,  4160,    45,    43,   101,    8220,    8221,    8216,    8217,     123,5 ,     123,5 ,    128,10 ,    128,10 ,     339,8 ,    347,18 ,     171,6 ,    177,10 ,   3474,43 ,   3517,88 ,   3605,24 ,   3474,43 ,   3517,88 ,   3605,24 ,   1517,54 ,   1517,54 ,   1571,14 ,   1517,54 ,   1517,54 ,   1571,14 ,      48,5 ,      47,3 ,  241,5 ,   5,17 ,  22,23 , {77,77,75},      131,1 ,   2955,29 ,      13,5 ,       4,0 ,     495,6 ,     495,6 ,     0,     0,     7,     6,     7 }, // Burmese/Myanmar/Myanmar
-    {     22,     2,    20,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     138,7 ,     138,7 ,     365,7 ,    317,22 ,      37,5 ,    187,11 ,   3629,48 ,   3677,95 ,   3772,24 ,   3796,48 ,   3844,98 ,   3772,24 ,   1585,21 ,   1606,56 ,   1662,14 ,   1585,21 ,   1606,56 ,   1662,14 ,       0,2 ,       0,2 ,  246,5 , 251,17 ,  22,23 , {66,89,78},        0,2 ,   2984,89 ,      13,5 ,       4,0 ,    501,10 ,     511,8 ,     2,     0,     1,     6,     7 }, // Belarusian/Cyrillic/Belarus
-    {     23,    20,    36,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     145,9 ,     154,9 ,     269,6 ,     97,16 ,      18,7 ,     25,12 ,   3942,71 ,   3942,71 ,   4013,24 ,   3942,71 ,   3942,71 ,   4013,24 ,   1676,40 ,   1716,46 ,   1762,14 ,   1676,40 ,   1776,47 ,   1762,14 ,       0,2 ,       0,2 ,  268,2 ,   5,17 ,  22,23 , {75,72,82},      132,1 ,   3073,29 ,       0,4 ,       4,0 ,     519,5 ,     524,7 ,     2,     1,     7,     6,     7 }, // Khmer/Khmer/Cambodia
-    {     24,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   4037,60 ,   4097,82 ,   4179,36 ,   4215,93 ,  4308,115 ,   4179,36 ,   1823,28 ,   1851,60 ,   1911,21 ,   1823,28 ,   1851,60 ,   1911,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     531,6 ,     537,7 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Spain
-    {     24,     7,     5,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   4037,60 ,   4097,82 ,   4179,36 ,   4215,93 ,  4308,115 ,   4179,36 ,   1823,28 ,   1851,60 ,   1911,21 ,   1823,28 ,   1851,60 ,   1911,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     531,6 ,     544,7 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Andorra
-    {     24,     7,    74,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   4037,60 ,   4097,82 ,   4179,36 ,   4215,93 ,  4308,115 ,   4179,36 ,   1823,28 ,   1851,60 ,   1911,21 ,   1823,28 ,   1851,60 ,   1911,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     531,6 ,     551,6 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/France
-    {     24,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   4037,60 ,   4097,82 ,   4179,36 ,   4215,93 ,  4308,115 ,   4179,36 ,   1823,28 ,   1851,60 ,   1911,21 ,   1823,28 ,   1851,60 ,   1911,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     531,6 ,     557,6 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Italy
-    {     25,     5,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,     175,5 ,     175,5 ,     394,8 ,    402,13 ,     198,6 ,    204,11 ,   4423,39 ,   4462,38 ,    158,27 ,   4423,39 ,   4462,38 ,    158,27 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  270,2 , 272,21 ,  22,23 , {67,78,89},      133,1 ,   3122,13 ,       4,4 ,       4,0 ,     563,4 ,     567,2 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/China
-    {     25,     5,    97,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,     175,5 ,     175,5 ,     269,6 ,    402,13 ,     198,6 ,    204,11 ,   4423,39 ,   4462,38 ,    158,27 ,   4423,39 ,   4462,38 ,    158,27 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  270,2 , 272,21 ,  22,23 , {72,75,68},        6,1 ,   3135,11 ,       4,4 ,       4,0 ,     563,4 ,     569,9 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Hong Kong
-    {     25,     5,   126,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,     175,5 ,     175,5 ,     269,6 ,    402,13 ,     198,6 ,    204,11 ,   4423,39 ,   4462,38 ,    158,27 ,   4423,39 ,   4462,38 ,    158,27 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  270,2 , 272,21 ,  22,23 , {77,79,80},      134,4 ,   3146,13 ,       4,4 ,       4,0 ,     563,4 ,     578,9 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Macau
-    {     25,     5,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,     175,5 ,     175,5 ,      27,8 ,    402,13 ,     198,6 ,    204,11 ,   4423,39 ,   4462,38 ,    158,27 ,   4423,39 ,   4462,38 ,    158,27 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  270,2 , 272,21 ,  22,23 , {83,71,68},        6,1 ,   3159,15 ,       4,4 ,       4,0 ,     563,4 ,     587,3 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Singapore
-    {     25,     6,    97,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,     180,5 ,     180,5 ,     415,8 ,    402,13 ,     198,6 ,    215,13 ,   4423,39 ,   4423,39 ,    158,27 ,   4423,39 ,   4423,39 ,    158,27 ,   1995,21 ,   1953,28 ,   1981,14 ,   1995,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  293,3 ,   5,17 ,  22,23 , {72,75,68},        6,1 ,   3135,11 ,      18,5 ,       4,0 ,     590,4 ,     594,9 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Hong Kong
-    {     25,     6,   126,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,     180,5 ,     180,5 ,     415,8 ,    402,13 ,     198,6 ,    215,13 ,   4423,39 ,   4423,39 ,    158,27 ,   4423,39 ,   4423,39 ,    158,27 ,   1995,21 ,   1953,28 ,   1981,14 ,   1995,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  293,3 ,   5,17 ,  22,23 , {77,79,80},      134,4 ,   3174,13 ,      18,5 ,       4,0 ,     590,4 ,     603,9 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Macau
-    {     25,     6,   208,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,     175,5 ,     175,5 ,     394,8 ,    423,14 ,     198,6 ,    215,13 ,   4423,39 ,   4423,39 ,    158,27 ,   4423,39 ,   4423,39 ,    158,27 ,   1995,21 ,   1953,28 ,   1981,14 ,   1995,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {84,87,68},        6,1 ,   3187,13 ,      13,5 ,       4,0 ,     590,4 ,     612,2 ,     2,     0,     7,     6,     7 }, // Chinese/Traditional Han/Taiwan
-    {     26,     7,    74,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Corsican/Latin/France
-    {     27,     7,    54,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    437,13 ,    450,19 ,      37,5 ,     87,12 ,   4500,49 ,   4549,94 ,   4643,39 ,   4500,49 ,   4682,98 ,   4643,39 ,   2016,28 ,   2044,58 ,   2102,14 ,   2016,28 ,   2044,58 ,   2116,14 ,       0,2 ,       0,2 ,  296,7 ,   5,17 ,  22,23 , {72,82,75},      138,2 ,   3200,60 ,      13,5 ,       4,0 ,     614,8 ,     622,8 ,     2,     1,     1,     6,     7 }, // Croatian/Latin/Croatia
-    {     27,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     469,9 ,    450,19 ,      37,5 ,     87,12 ,   4500,49 ,   4549,94 ,   4643,39 ,   4500,49 ,   4682,98 ,   4643,39 ,   2016,28 ,   2044,58 ,   2116,14 ,   2016,28 ,   2044,58 ,   2116,14 ,       0,2 ,       0,2 ,  296,7 ,   5,17 ,  22,23 , {66,65,77},      140,2 ,   3260,85 ,      13,5 ,       4,0 ,     614,8 ,    630,19 ,     2,     1,     1,     6,     7 }, // Croatian/Latin/Bosnia And Herzegowina
-    {     28,     7,    57,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     185,7 ,     185,7 ,     156,8 ,    478,17 ,      55,4 ,      59,9 ,   4780,48 ,   4828,82 ,    158,27 ,   4780,48 ,   4910,84 ,    158,27 ,   2130,21 ,   2151,49 ,   2200,14 ,   2130,21 ,   2151,49 ,   2200,14 ,      60,4 ,      57,4 ,  303,5 ,   5,17 ,  22,23 , {67,90,75},      142,2 ,   3345,68 ,      13,5 ,       4,0 ,     649,7 ,     656,5 ,     2,     0,     1,     6,     7 }, // Czech/Latin/Czech Republic
-    {     29,     7,    58,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    505,23 ,     228,5 ,    233,10 ,   4994,59 ,   5053,84 ,    134,24 ,   4994,59 ,   5053,84 ,    134,24 ,   2214,28 ,   2242,51 ,   2293,14 ,   2307,35 ,   2242,51 ,   2293,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   3413,42 ,      13,5 ,       4,0 ,     661,5 ,     666,7 ,     2,     0,     1,     6,     7 }, // Danish/Latin/Denmark
-    {     29,     7,    86,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    505,23 ,     228,5 ,    233,10 ,   4994,59 ,   5053,84 ,    134,24 ,   4994,59 ,   5053,84 ,    134,24 ,   2214,28 ,   2242,51 ,   2293,14 ,   2307,35 ,   2242,51 ,   2293,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   3413,42 ,      13,5 ,       4,0 ,     661,5 ,     673,8 ,     2,     0,     1,     6,     7 }, // Danish/Latin/Greenland
-    {     30,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   5137,59 ,   5196,88 ,    134,24 ,   5137,59 ,   5196,88 ,    134,24 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,       8,5 ,      23,6 ,    681,10 ,     691,9 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Netherlands
-    {     30,     7,    12,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   5137,59 ,   5196,88 ,    134,24 ,   5137,59 ,   5196,88 ,    134,24 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,87,71},      147,4 ,   3474,55 ,       8,5 ,      23,6 ,    681,10 ,     700,5 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Aruba
-    {     30,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     538,9 ,     97,16 ,      37,5 ,      8,10 ,   5137,59 ,   5196,88 ,    134,24 ,   5137,59 ,   5196,88 ,    134,24 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,       8,5 ,      23,6 ,    681,10 ,     705,6 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Belgium
-    {     30,     7,   152,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   5137,59 ,   5196,88 ,    134,24 ,   5137,59 ,   5196,88 ,    134,24 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,78,71},      151,4 ,   3529,97 ,       8,5 ,      23,6 ,    681,10 ,     711,7 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Cura Sao
-    {     30,     7,   202,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   5137,59 ,   5196,88 ,    134,24 ,   5137,59 ,   5196,88 ,    134,24 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {83,82,68},        6,1 ,   3626,58 ,       8,5 ,      23,6 ,    681,10 ,     718,8 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Suriname
-    {     30,     7,   255,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   5137,59 ,   5196,88 ,    134,24 ,   5137,59 ,   5196,88 ,    134,24 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3684,61 ,       8,5 ,      23,6 ,    681,10 ,    726,19 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Bonaire
-    {     30,     7,   256,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   5137,59 ,   5196,88 ,    134,24 ,   5137,59 ,   5196,88 ,    134,24 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,78,71},      151,4 ,   3529,97 ,       8,5 ,      23,6 ,    681,10 ,    745,12 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Sint Maarten
-    {     31,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,    757,16 ,    773,13 ,     2,     1,     7,     6,     7 }, // English/Latin/United States
-    {     31,     3,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // English/Deseret/United States
-    {     31,     7,     4,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    793,14 ,     2,     1,     7,     6,     7 }, // English/Latin/American Samoa
-    {     31,     7,     7,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,     807,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Anguilla
-    {     31,     7,     9,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,    815,17 ,     2,     1,     7,     6,     7 }, // English/Latin/Antigua And Barbuda
-    {     31,     7,    13,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     210,9 ,     210,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,   2436,25 ,      0,28 ,     28,57 ,   2436,25 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,    832,18 ,     850,9 ,     2,     1,     7,     6,     7 }, // English/Latin/Australia
-    {     31,     7,    14,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       8,5 ,       4,0 ,     786,7 ,     859,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Austria
-    {     31,     7,    16,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,83,68},        6,1 ,   3930,53 ,       4,4 ,       4,0 ,     786,7 ,     866,7 ,     2,     1,     7,     6,     7 }, // English/Latin/Bahamas
-    {     31,     7,    19,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,66,68},        6,1 ,   3983,56 ,       4,4 ,       4,0 ,     786,7 ,     873,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Barbados
-    {     31,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,      27,8 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     786,7 ,     881,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Belgium
-    {     31,     7,    22,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,90,68},        6,1 ,   4039,47 ,       4,4 ,       4,0 ,     786,7 ,     888,6 ,     2,     1,     7,     6,     7 }, // English/Latin/Belize
-    {     31,     7,    24,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,77,68},        6,1 ,   4086,53 ,       4,4 ,       4,0 ,     786,7 ,     894,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Bermuda
-    {     31,     7,    28,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,87,80},      158,1 ,   4139,50 ,       4,4 ,       4,0 ,     786,7 ,     901,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Botswana
-    {     31,     7,    31,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    909,30 ,     2,     1,     1,     6,     7 }, // English/Latin/British Indian Ocean Territory
-    {     31,     7,    35,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {66,73,70},      159,3 ,   4189,53 ,       4,4 ,       4,0 ,     786,7 ,     939,7 ,     0,     0,     1,     6,     7 }, // English/Latin/Burundi
-    {     31,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   4242,83 ,       4,4 ,       4,0 ,     786,7 ,     946,8 ,     0,     0,     1,     6,     7 }, // English/Latin/Cameroon
-    {     31,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     53,10 ,     35,18 ,      18,7 ,     25,12 ,   5284,59 ,     48,86 ,    134,24 ,   5284,59 ,     48,86 ,    134,24 ,   2461,35 ,     28,57 ,     85,14 ,   2461,35 ,     28,57 ,     85,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {67,65,68},        6,1 ,   4325,53 ,       4,4 ,       4,0 ,    954,16 ,     970,6 ,     2,     0,     7,     6,     7 }, // English/Latin/Canada
-    {     31,     7,    40,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {75,89,68},        6,1 ,   4378,71 ,       4,4 ,       4,0 ,     786,7 ,    976,14 ,     2,     1,     1,     6,     7 }, // English/Latin/Cayman Islands
-    {     31,     7,    45,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,    990,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Christmas Island
-    {     31,     7,    46,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,   1006,23 ,     2,     1,     1,     6,     7 }, // English/Latin/Cocos Islands
-    {     31,     7,    51,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,   1029,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Cook Islands
-    {     31,     7,    56,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     786,7 ,    1041,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Cyprus
-    {     31,     7,    58,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,     228,5 ,    233,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   4511,44 ,      13,5 ,       4,0 ,     786,7 ,    1047,7 ,     2,     0,     1,     6,     7 }, // English/Latin/Denmark
-    {     31,     7,    60,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,    1054,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Dominica
-    {     31,     7,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,82,78},       41,3 ,   4555,50 ,       4,4 ,       4,0 ,     786,7 ,    1062,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Eritrea
-    {     31,     7,    70,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {70,75,80},      119,1 ,   4605,74 ,       4,4 ,       4,0 ,     786,7 ,   1069,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Falkland Islands
-    {     31,     7,    72,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {70,74,68},        6,1 ,   4679,47 ,       4,4 ,       4,0 ,     786,7 ,    1085,4 ,     2,     1,     1,     6,     7 }, // English/Latin/Fiji
-    {     31,     7,    73,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,     243,4 ,     247,9 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     786,7 ,    1089,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Finland
-    {     31,     7,    75,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     786,7 ,    1096,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Guernsey
-    {     31,     7,    80,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,77,68},      162,1 ,   4758,50 ,       4,4 ,       4,0 ,     786,7 ,    1104,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Gambia
-    {     31,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     786,7 ,    1110,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Germany
-    {     31,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,   4808,47 ,       4,4 ,       4,0 ,     786,7 ,    1117,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Ghana
-    {     31,     7,    84,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,73,80},      119,1 ,   4855,53 ,       4,4 ,       4,0 ,     786,7 ,    1122,9 ,     2,     1,     1,     6,     7 }, // English/Latin/Gibraltar
-    {     31,     7,    87,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,    1131,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Grenada
-    {     31,     7,    89,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    1138,4 ,     2,     1,     7,     6,     7 }, // English/Latin/Guam
-    {     31,     7,    93,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,89,68},        6,1 ,   4908,56 ,       4,4 ,       4,0 ,     786,7 ,    1142,6 ,     2,     0,     1,     6,     7 }, // English/Latin/Guyana
-    {     31,     7,    97,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     415,8 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {72,75,68},      166,3 ,   4964,56 ,       4,4 ,       4,0 ,     786,7 ,   1148,19 ,     2,     1,     7,     6,     7 }, // English/Latin/Hong Kong
-    {     31,     7,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,      27,8 ,    192,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   5020,44 ,       8,5 ,       4,0 ,     786,7 ,    1167,5 ,     2,     1,     7,     7,     7 }, // English/Latin/India
-    {     31,     7,   104,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     786,7 ,    1172,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Ireland
-    {     31,     7,   105,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      55,4 ,      59,9 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {73,76,83},       49,1 ,   5064,62 ,       4,4 ,       4,0 ,     786,7 ,    1179,6 ,     2,     1,     7,     5,     6 }, // English/Latin/Israel
-    {     31,     7,   107,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {74,77,68},        6,1 ,   5126,53 ,       4,4 ,       4,0 ,     786,7 ,    1185,7 ,     2,     1,     7,     6,     7 }, // English/Latin/Jamaica
-    {     31,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,   5179,53 ,       4,4 ,       4,0 ,     786,7 ,    1192,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Kenya
-    {     31,     7,   112,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,    1197,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Kiribati
-    {     31,     7,   120,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,   5232,61 ,       4,4 ,       4,0 ,     786,7 ,    1205,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Lesotho
-    {     31,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,   5293,53 ,       4,4 ,       4,0 ,     786,7 ,    1212,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Liberia
-    {     31,     7,   126,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,79,80},      134,4 ,   5346,53 ,       4,4 ,       4,0 ,     786,7 ,   1219,15 ,     2,     1,     7,     6,     7 }, // English/Latin/Macau
-    {     31,     7,   128,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,71,65},      169,2 ,   5399,54 ,       4,4 ,       4,0 ,     786,7 ,   1234,10 ,     0,     0,     1,     6,     7 }, // English/Latin/Madagascar
-    {     31,     7,   129,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,87,75},      171,2 ,   5453,53 ,       4,4 ,       4,0 ,     786,7 ,    1244,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Malawi
-    {     31,     7,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,89,82},      173,2 ,   5506,59 ,       4,4 ,       4,0 ,     786,7 ,    1250,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Malaysia
-    {     31,     7,   133,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     786,7 ,    1258,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Malta
-    {     31,     7,   134,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1263,16 ,     2,     1,     7,     6,     7 }, // English/Latin/Marshall Islands
-    {     31,     7,   137,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,85,82},      175,2 ,   5565,53 ,       4,4 ,       4,0 ,     786,7 ,    1279,9 ,     2,     0,     1,     6,     7 }, // English/Latin/Mauritius
-    {     31,     7,   140,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1288,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Micronesia
-    {     31,     7,   144,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,   1298,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Montserrat
-    {     31,     7,   148,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,   5618,53 ,       4,4 ,       4,0 ,     786,7 ,    1308,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Namibia
-    {     31,     7,   149,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,    1315,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Nauru
-    {     31,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       8,5 ,      23,6 ,     786,7 ,   1320,11 ,     2,     1,     1,     6,     7 }, // English/Latin/Netherlands
-    {     31,     7,   154,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,   1331,11 ,     2,     1,     1,     6,     7 }, // English/Latin/New Zealand
-    {     31,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,   5671,50 ,       4,4 ,       4,0 ,     786,7 ,    1342,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Nigeria
-    {     31,     7,   158,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,    1349,4 ,     2,     1,     1,     6,     7 }, // English/Latin/Niue
-    {     31,     7,   159,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,   1353,14 ,     2,     1,     1,     6,     7 }, // English/Latin/Norfolk Island
-    {     31,     7,   160,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1367,24 ,     2,     1,     1,     6,     7 }, // English/Latin/Northern Mariana Islands
-    {     31,     7,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,75,82},      175,2 ,   5721,53 ,       4,4 ,       4,0 ,     786,7 ,    1391,8 ,     2,     0,     7,     6,     7 }, // English/Latin/Pakistan
-    {     31,     7,   164,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    1399,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Palau
-    {     31,     7,   167,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,71,75},      131,1 ,   5774,73 ,       4,4 ,       4,0 ,     786,7 ,   1404,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Papua New Guinea
-    {     31,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      178,1 ,   5847,53 ,       4,4 ,       4,0 ,     786,7 ,   1420,11 ,     2,     1,     7,     6,     7 }, // English/Latin/Philippines
-    {     31,     7,   171,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,   1431,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Pitcairn
-    {     31,     7,   174,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1447,11 ,     2,     1,     7,     6,     7 }, // English/Latin/Puerto Rico
-    {     31,     7,   179,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {82,87,70},      179,2 ,   5900,47 ,       4,4 ,       4,0 ,     786,7 ,    1458,6 ,     0,     0,     1,     6,     7 }, // English/Latin/Rwanda
-    {     31,     7,   180,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,   1464,17 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Kitts And Nevis
-    {     31,     7,   181,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,    1481,9 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Lucia
-    {     31,     7,   182,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,   1490,24 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Vincent And The Grenadines
-    {     31,     7,   183,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {87,83,84},      181,3 ,   5947,40 ,       4,4 ,       4,0 ,     786,7 ,    1514,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Samoa
-    {     31,     7,   188,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,67,82},      184,2 ,   5987,59 ,       4,4 ,       4,0 ,     786,7 ,   1519,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Seychelles
-    {     31,     7,   189,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,76,76},      186,2 ,   6046,68 ,       4,4 ,       4,0 ,     786,7 ,   1529,12 ,     0,     0,     1,     6,     7 }, // English/Latin/Sierra Leone
-    {     31,     7,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,   6114,56 ,       4,4 ,       4,0 ,     786,7 ,    1541,9 ,     2,     1,     7,     6,     7 }, // English/Latin/Singapore
-    {     31,     7,   192,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,      29,7 ,     786,7 ,    1550,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Slovenia
-    {     31,     7,   193,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,66,68},        6,1 ,   6170,74 ,       4,4 ,       4,0 ,     786,7 ,   1558,15 ,     2,     1,     1,     6,     7 }, // English/Latin/Solomon Islands
-    {     31,     7,   195,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    578,10 ,    553,18 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,   5232,61 ,       4,4 ,       4,0 ,     786,7 ,   1573,12 ,     2,     1,     7,     6,     7 }, // English/Latin/South Africa
-    {     31,     7,   199,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,72,80},      119,1 ,   6244,56 ,       4,4 ,       4,0 ,     786,7 ,   1585,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Helena
-    {     31,     7,   201,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,68,71},        0,0 ,   6300,50 ,       4,4 ,       4,0 ,     786,7 ,    1595,5 ,     2,     1,     6,     5,     6 }, // English/Latin/Sudan
-    {     31,     7,   204,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,90,76},      188,1 ,   6350,53 ,       4,4 ,       4,0 ,     786,7 ,    1600,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Swaziland
-    {     31,     7,   205,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     53,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,   6403,47 ,      13,5 ,       4,0 ,     786,7 ,    1608,6 ,     2,     0,     1,     6,     7 }, // English/Latin/Sweden
-    {     31,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,   6450,41 ,       8,5 ,      36,5 ,     786,7 ,   1614,11 ,     2,     0,     1,     6,     7 }, // English/Latin/Switzerland
-    {     31,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,   6491,62 ,       4,4 ,       4,0 ,     786,7 ,    1625,8 ,     2,     0,     1,     6,     7 }, // English/Latin/Tanzania
-    {     31,     7,   213,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,    1633,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Tokelau
-    {     31,     7,   214,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,79,80},      194,2 ,   6553,49 ,       4,4 ,       4,0 ,     786,7 ,    1640,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Tonga
-    {     31,     7,   215,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,84,68},        6,1 ,   6602,80 ,       4,4 ,       4,0 ,     786,7 ,   1645,17 ,     2,     1,     7,     6,     7 }, // English/Latin/Trinidad And Tobago
-    {     31,     7,   219,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1662,22 ,     2,     1,     1,     6,     7 }, // English/Latin/Turks And Caicos Islands
-    {     31,     7,   220,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,    1684,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Tuvalu
-    {     31,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,   6682,56 ,       4,4 ,       4,0 ,     786,7 ,    1690,6 ,     0,     0,     1,     6,     7 }, // English/Latin/Uganda
-    {     31,     7,   223,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {65,69,68},      199,3 ,   6738,55 ,       4,4 ,       4,0 ,     786,7 ,   1696,20 ,     2,     1,     6,     5,     6 }, // English/Latin/United Arab Emirates
-    {     31,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     210,9 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   6793,47 ,       4,4 ,       4,0 ,   1716,15 ,   1731,14 ,     2,     1,     1,     6,     7 }, // English/Latin/United Kingdom
-    {     31,     7,   226,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1745,21 ,     2,     1,     7,     6,     7 }, // English/Latin/United States Minor Outlying Islands
-    {     31,     7,   229,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {86,85,86},      202,2 ,   6840,44 ,       4,4 ,       4,0 ,     786,7 ,    1766,7 ,     0,     0,     1,     6,     7 }, // English/Latin/Vanuatu
-    {     31,     7,   233,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1773,22 ,     2,     1,     1,     6,     7 }, // English/Latin/British Virgin Islands
-    {     31,     7,   234,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1795,19 ,     2,     1,     7,     6,     7 }, // English/Latin/United States Virgin Islands
-    {     31,     7,   239,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,77,87},      131,1 ,   6884,50 ,       4,4 ,       4,0 ,     786,7 ,    1814,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Zambia
-    {     31,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     415,8 ,    553,18 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    1820,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Zimbabwe
-    {     31,     7,   249,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1828,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Diego Garcia
-    {     31,     7,   251,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     786,7 ,   1840,11 ,     2,     1,     1,     6,     7 }, // English/Latin/Isle Of Man
-    {     31,     7,   252,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     786,7 ,    1851,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Jersey
-    {     31,     7,   254,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,83,80},      119,1 ,   6934,68 ,       4,4 ,       4,0 ,     786,7 ,   1857,11 ,     2,     1,     1,     6,     7 }, // English/Latin/South Sudan
-    {     31,     7,   256,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,78,71},      151,4 ,   7002,95 ,       4,4 ,       4,0 ,     786,7 ,   1868,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Sint Maarten
-    {     31,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       4,4 ,       4,0 ,     786,7 ,    1880,5 ,     2,     1,     1,     6,     7 }, // English/Latin/World
-    {     31,     7,   261,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,48 ,     48,86 ,    134,24 ,      0,48 ,     48,86 ,    134,24 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,     786,7 ,    1885,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Europe
-    {     32,     7,   260,    44,   160,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     219,9 ,     219,9 ,     588,8 ,    596,26 ,      37,5 ,    256,25 ,   5343,48 ,   5391,91 ,    134,24 ,   5343,48 ,   5391,91 ,    134,24 ,   2496,21 ,   2517,51 ,   2568,14 ,   2496,21 ,   2517,51 ,   2568,14 ,      70,3 ,      67,3 ,  308,6 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      41,6 ,       4,0 ,    1891,9 ,    1900,5 ,     2,     1,     1,     6,     7 }, // Esperanto/Latin/World
-    {     33,     7,    68,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     228,8 ,     228,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   5482,59 ,   5541,91 ,   5632,24 ,   5482,59 ,   5541,91 ,   5632,24 ,   2582,14 ,   2596,63 ,   2582,14 ,   2582,14 ,   2596,63 ,   2582,14 ,       0,2 ,       0,2 ,  314,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   7097,20 ,      13,5 ,       4,0 ,    1905,5 ,    1910,5 ,     2,     1,     1,     6,     7 }, // Estonian/Latin/Estonia
-    {     34,     7,    71,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   5656,48 ,   5704,83 ,    134,24 ,   5787,59 ,   5704,83 ,    134,24 ,   2659,28 ,   2687,74 ,   2761,14 ,   2775,35 ,   2687,74 ,   2761,14 ,       0,2 ,       0,2 ,  320,3 ,   5,17 ,  22,23 , {68,75,75},      189,2 ,   7117,43 ,      13,5 ,       4,0 ,    1915,8 ,    1923,7 ,     2,     0,     1,     6,     7 }, // Faroese/Latin/Faroe Islands
-    {     34,     7,    58,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   5656,48 ,   5704,83 ,    134,24 ,   5787,59 ,   5704,83 ,    134,24 ,   2659,28 ,   2687,74 ,   2761,14 ,   2775,35 ,   2687,74 ,   2761,14 ,       0,2 ,       0,2 ,  320,3 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   7117,43 ,      13,5 ,       4,0 ,    1915,8 ,     666,7 ,     2,     0,     1,     6,     7 }, // Faroese/Latin/Denmark
-    {     36,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     228,8 ,     228,8 ,     640,8 ,    478,17 ,     243,4 ,     247,9 ,   5846,69 ,  5915,105 ,   6020,24 ,   6044,93 ,  6137,129 ,   6020,24 ,   2810,21 ,   2831,67 ,   2898,14 ,   2810,21 ,   2912,81 ,   2898,14 ,      73,3 ,      70,3 ,  323,5 , 328,17 , 345,23 , {69,85,82},       14,1 ,   7160,20 ,      13,5 ,       4,0 ,    1930,5 ,    1935,5 ,     2,     1,     1,     6,     7 }, // Finnish/Latin/Finland
-    {     37,     7,    74,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,    1948,6 ,     2,     1,     1,     6,     7 }, // French/Latin/France
-    {     37,     7,     3,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {68,90,68},      204,2 ,   7180,51 ,      13,5 ,       4,0 ,    1940,8 ,    1954,7 ,     2,     1,     6,     5,     6 }, // French/Latin/Algeria
-    {     37,     7,    21,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,     571,7 ,     97,16 ,      37,5 ,    281,23 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,    1961,8 ,     2,     1,     1,     6,     7 }, // French/Latin/Belgium
-    {     37,     7,    23,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    1969,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Benin
-    {     37,     7,    34,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,   1974,12 ,     0,     0,     1,     6,     7 }, // French/Latin/Burkina Faso
-    {     37,     7,    35,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {66,73,70},      159,3 ,   7290,53 ,      13,5 ,       4,0 ,    1940,8 ,     939,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Burundi
-    {     37,     7,    37,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,      76,5 ,      73,4 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,    1986,8 ,     0,     0,     1,     6,     7 }, // French/Latin/Cameroon
-    {     37,     7,    38,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8221,    8220,       0,6 ,       0,6 ,     236,8 ,     236,8 ,     588,8 ,     97,16 ,     304,9 ,    313,24 ,   6414,64 ,   6329,85 ,    134,24 ,   6414,64 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,      64,4 ,      61,4 ,  368,6 , 374,17 , 391,23 , {67,65,68},        6,1 ,   7399,54 ,      47,6 ,       4,0 ,   1994,17 ,     970,6 ,     2,     0,     7,     6,     7 }, // French/Latin/Canada
-    {     37,     7,    41,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,   2011,25 ,     0,     0,     1,     6,     7 }, // French/Latin/Central African Republic
-    {     37,     7,    42,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,    2036,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Chad
-    {     37,     7,    48,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {75,77,70},       36,2 ,   7453,51 ,      13,5 ,       4,0 ,    1940,8 ,    2041,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Comoros
-    {     37,     7,    49,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {67,68,70},      209,2 ,   7504,53 ,      13,5 ,       4,0 ,    1940,8 ,   2048,14 ,     2,     1,     1,     6,     7 }, // French/Latin/Congo Kinshasa
-    {     37,     7,    50,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,   2062,17 ,     0,     0,     1,     6,     7 }, // French/Latin/Congo Brazzaville
-    {     37,     7,    53,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,   2079,13 ,     0,     0,     1,     6,     7 }, // French/Latin/Ivory Coast
-    {     37,     7,    59,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {68,74,70},       38,3 ,   7557,57 ,      13,5 ,       4,0 ,    1940,8 ,    2092,8 ,     0,     0,     6,     6,     7 }, // French/Latin/Djibouti
-    {     37,     7,    66,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,   2100,18 ,     0,     0,     1,     6,     7 }, // French/Latin/Equatorial Guinea
-    {     37,     7,    76,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2118,16 ,     2,     1,     1,     6,     7 }, // French/Latin/French Guiana
-    {     37,     7,    77,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,80,70},      211,4 ,   7614,35 ,      13,5 ,       4,0 ,    1940,8 ,   2134,19 ,     0,     0,     1,     6,     7 }, // French/Latin/French Polynesia
-    {     37,     7,    79,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,    2153,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Gabon
-    {     37,     7,    88,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2158,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Guadeloupe
-    {     37,     7,    91,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {71,78,70},      215,2 ,   7649,48 ,      13,5 ,       4,0 ,    1940,8 ,    2168,6 ,     0,     0,     1,     6,     7 }, // French/Latin/Guinea
-    {     37,     7,    94,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {72,84,71},      217,1 ,   7697,57 ,      13,5 ,       4,0 ,    1940,8 ,    2174,5 ,     2,     1,     1,     6,     7 }, // French/Latin/Haiti
-    {     37,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2179,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Luxembourg
-    {     37,     7,   128,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {77,71,65},      169,2 ,   7754,54 ,      13,5 ,       4,0 ,    1940,8 ,   1234,10 ,     0,     0,     1,     6,     7 }, // French/Latin/Madagascar
-    {     37,     7,   132,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    2189,4 ,     0,     0,     1,     6,     7 }, // French/Latin/Mali
-    {     37,     7,   135,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2193,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Martinique
-    {     37,     7,   136,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {77,82,85},      218,2 ,   7808,66 ,      13,5 ,       4,0 ,    1940,8 ,   2203,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Mauritania
-    {     37,     7,   137,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {77,85,82},      175,2 ,   7874,63 ,      13,5 ,       4,0 ,    1940,8 ,    2213,7 ,     2,     0,     1,     6,     7 }, // French/Latin/Mauritius
-    {     37,     7,   138,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,    2220,7 ,     2,     1,     1,     6,     7 }, // French/Latin/Mayotte
-    {     37,     7,   142,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,    2227,6 ,     2,     1,     1,     6,     7 }, // French/Latin/Monaco
-    {     37,     7,   145,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6478,61 ,   6329,85 ,    134,24 ,   6478,61 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,      64,4 ,      61,4 ,  368,6 , 374,17 , 391,23 , {77,65,68},        0,0 ,   7937,54 ,      13,5 ,       4,0 ,    1940,8 ,    2233,5 ,     2,     1,     1,     6,     7 }, // French/Latin/Morocco
-    {     37,     7,   153,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,80,70},      211,4 ,   7614,35 ,      13,5 ,       4,0 ,    1940,8 ,   2238,18 ,     0,     0,     1,     6,     7 }, // French/Latin/New Caledonia
-    {     37,     7,   156,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    2256,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Niger
-    {     37,     7,   176,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2261,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Reunion
-    {     37,     7,   179,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {82,87,70},      179,2 ,   7991,50 ,      13,5 ,       4,0 ,    1940,8 ,    1458,6 ,     0,     0,     1,     6,     7 }, // French/Latin/Rwanda
-    {     37,     7,   187,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    2271,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Senegal
-    {     37,     7,   188,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {83,67,82},      184,2 ,   8041,71 ,      13,5 ,       4,0 ,    1940,8 ,   1519,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Seychelles
-    {     37,     7,   200,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2278,24 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Pierre And Miquelon
-    {     37,     7,   206,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     236,8 ,     236,8 ,     156,8 ,     10,17 ,      37,5 ,    337,14 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {67,72,70},        0,0 ,   8112,45 ,      13,5 ,       4,0 ,   2302,15 ,    2317,6 ,     2,     0,     1,     6,     7 }, // French/Latin/Switzerland
-    {     37,     7,   207,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {83,89,80},      220,2 ,   8157,51 ,      13,5 ,       4,0 ,    1940,8 ,    2323,5 ,     0,     0,     6,     5,     6 }, // French/Latin/Syria
-    {     37,     7,   212,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    2328,4 ,     0,     0,     1,     6,     7 }, // French/Latin/Togo
-    {     37,     7,   216,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {84,78,68},      222,2 ,   8208,51 ,      13,5 ,       4,0 ,    1940,8 ,    2332,7 ,     3,     0,     1,     6,     7 }, // French/Latin/Tunisia
-    {     37,     7,   229,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {86,85,86},      202,2 ,   8259,51 ,      13,5 ,       4,0 ,    1940,8 ,    1766,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Vanuatu
-    {     37,     7,   235,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,80,70},      211,4 ,   7614,35 ,      13,5 ,       4,0 ,    1940,8 ,   2339,16 ,     0,     0,     1,     6,     7 }, // French/Latin/Wallis And Futuna Islands
-    {     37,     7,   244,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2355,16 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Barthelemy
-    {     37,     7,   245,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   6266,63 ,   6329,85 ,    134,24 ,   6266,63 ,   6329,85 ,    134,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2371,12 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Martin
-    {     38,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     339,8 ,     97,16 ,      37,5 ,      8,10 ,   6539,48 ,   6587,95 ,    134,24 ,   6539,48 ,   6587,95 ,    134,24 ,   3094,21 ,   3115,54 ,     85,14 ,   3094,21 ,   3115,54 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,       8,5 ,      53,6 ,    2383,5 ,    2388,8 ,     2,     1,     1,     6,     7 }, // Western Frisian/Latin/Netherlands
-    {     39,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    244,10 ,    244,10 ,    119,10 ,    648,21 ,      37,5 ,      8,10 ,   6682,61 ,  6743,142 ,   6885,24 ,   6682,61 ,  6909,167 ,   6885,24 ,   3169,28 ,   3197,69 ,   3266,14 ,   3169,28 ,   3197,69 ,   3266,14 ,      81,1 ,      77,1 ,  414,6 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   8310,86 ,       4,4 ,       4,0 ,    2396,8 ,   2404,22 ,     2,     1,     1,     6,     7 }, // Gaelic/Latin/United Kingdom
-    {     40,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   7076,60 ,   7136,87 ,   7223,24 ,   7247,60 ,   7307,87 ,   7394,36 ,   3280,35 ,   3315,49 ,   3364,14 ,   3378,35 ,   3413,49 ,   3462,21 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,    2426,6 ,    2432,6 ,     2,     1,     1,     6,     7 }, // Galician/Latin/Spain
-    {     41,    15,    81,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,     171,     187,       0,6 ,       0,6 ,     261,8 ,     261,8 ,     156,8 ,    696,19 ,      37,5 ,      8,10 ,   7430,48 ,   7478,99 ,   7577,24 ,   7430,48 ,   7478,99 ,   7577,24 ,   3483,28 ,   3511,62 ,   3573,14 ,   3483,28 ,   3511,62 ,   3573,14 ,       0,2 ,       0,2 ,  420,5 , 425,37 ,  22,23 , {71,69,76},      224,1 ,   8396,43 ,      13,5 ,       4,0 ,    2438,7 ,   2445,10 ,     2,     1,     1,     6,     7 }, // Georgian/Georgian/Georgia
-    {     42,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7601,48 ,   7649,83 ,    134,24 ,   7732,60 ,   7649,83 ,    134,24 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,    2455,7 ,   2462,11 ,     2,     1,     1,     6,     7 }, // German/Latin/Germany
-    {     42,     7,    14,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7792,48 ,   7840,83 ,    134,24 ,   7923,59 ,   7840,83 ,    134,24 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,       8,5 ,       4,0 ,   2473,24 ,   2497,10 ,     2,     1,     1,     6,     7 }, // German/Latin/Austria
-    {     42,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7601,48 ,   7649,83 ,    134,24 ,   7732,60 ,   7649,83 ,    134,24 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,    2455,7 ,    2507,7 ,     2,     1,     1,     6,     7 }, // German/Latin/Belgium
-    {     42,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7792,48 ,   7840,83 ,    134,24 ,   7923,59 ,   7840,83 ,    134,24 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,    2455,7 ,    2514,7 ,     2,     1,     1,     6,     7 }, // German/Latin/Italy
-    {     42,     7,   123,    46,  8217,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7601,48 ,   7649,83 ,    134,24 ,   7732,60 ,   7649,83 ,    134,24 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,   8458,58 ,       8,5 ,       4,0 ,    2455,7 ,   2521,13 ,     2,     0,     1,     6,     7 }, // German/Latin/Liechtenstein
-    {     42,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7601,48 ,   7649,83 ,    134,24 ,   7732,60 ,   7649,83 ,    134,24 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,    2455,7 ,    2534,9 ,     2,     1,     1,     6,     7 }, // German/Latin/Luxembourg
-    {     42,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7601,48 ,   7649,83 ,    134,24 ,   7732,60 ,   7649,83 ,    134,24 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,   8458,58 ,       8,5 ,      36,5 ,   2543,21 ,    2564,7 ,     2,     0,     1,     6,     7 }, // German/Latin/Switzerland
-    {     43,    16,    85,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     278,9 ,     278,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   7982,50 ,  8032,115 ,   8147,24 ,   8171,50 ,  8221,115 ,   8147,24 ,   3710,28 ,   3738,55 ,   3793,14 ,   3710,28 ,   3738,55 ,   3793,14 ,      82,4 ,      78,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8516,19 ,      13,5 ,       4,0 ,    2571,8 ,    2579,6 ,     2,     1,     1,     6,     7 }, // Greek/Greek/Greece
-    {     43,    16,    56,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     278,9 ,     278,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   7982,50 ,  8032,115 ,   8147,24 ,   8171,50 ,  8221,115 ,   8147,24 ,   3710,28 ,   3738,55 ,   3793,14 ,   3710,28 ,   3738,55 ,   3793,14 ,      82,4 ,      78,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8516,19 ,      13,5 ,       4,0 ,    2571,8 ,    2585,6 ,     2,     1,     1,     6,     7 }, // Greek/Greek/Cyprus
-    {     44,     7,    86,    44,    46,    59,    37,    48,  8722,    43,   101,     187,     171,    8250,    8249,       0,6 ,       0,6 ,    287,11 ,    287,11 ,     53,10 ,     80,17 ,     228,5 ,    233,10 ,   8336,48 ,   8384,96 ,    134,24 ,   8336,48 ,   8384,96 ,    134,24 ,   3807,28 ,   3835,98 ,   3933,14 ,   3807,28 ,   3835,98 ,   3933,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   8535,62 ,       4,4 ,      59,5 ,   2591,11 ,   2602,16 ,     2,     0,     1,     6,     7 }, // Greenlandic/Latin/Greenland
-    {     45,     7,   168,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,89,71},      228,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     7,     6,     7 }, // Guarani/Latin/Paraguay
-    {     46,    17,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     298,9 ,     298,9 ,     269,6 ,    192,18 ,     351,8 ,    359,13 ,   8480,67 ,   8547,87 ,   8634,31 ,   8480,67 ,   8547,87 ,   8634,31 ,   3947,32 ,   3979,53 ,   4032,19 ,   3947,32 ,   3979,53 ,   4032,19 ,       0,2 ,       0,2 ,  467,4 , 471,19 ,  22,23 , {73,78,82},      121,1 ,   8597,46 ,       4,4 ,       4,0 ,    2618,7 ,    2625,4 ,     2,     1,     7,     7,     7 }, // Gujarati/Gujarati/India
-    {     47,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     307,8 ,     307,8 ,     269,6 ,    715,17 ,      37,5 ,      8,10 ,   8665,48 ,   8713,85 ,   8798,24 ,   8665,48 ,   8713,85 ,   8798,24 ,   4051,28 ,   4079,52 ,   4131,14 ,   4051,28 ,   4079,52 ,   4131,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,   8643,12 ,       8,5 ,       4,0 ,    2629,5 ,    2634,8 ,     2,     1,     1,     6,     7 }, // Hausa/Latin/Nigeria
-    {     47,     1,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Hausa/Arabic/Nigeria
-    {     47,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     307,8 ,     307,8 ,     269,6 ,    715,17 ,      18,7 ,     25,12 ,   8665,48 ,   8713,85 ,   8798,24 ,   8665,48 ,   8713,85 ,   8798,24 ,   4051,28 ,   4079,52 ,   4131,14 ,   4051,28 ,   4079,52 ,   4131,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,       0,7 ,       8,5 ,       4,0 ,    2629,5 ,    2642,4 ,     2,     1,     1,     6,     7 }, // Hausa/Latin/Ghana
-    {     47,     7,   156,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     307,8 ,     307,8 ,     269,6 ,    715,17 ,      37,5 ,      8,10 ,   8665,48 ,   8713,85 ,   8798,24 ,   8665,48 ,   8713,85 ,   8798,24 ,   4051,28 ,   4079,52 ,   4131,14 ,   4051,28 ,   4079,52 ,   4131,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,   8655,36 ,       8,5 ,       4,0 ,    2629,5 ,    2646,5 ,     0,     0,     1,     6,     7 }, // Hausa/Latin/Niger
-    {     48,    18,   105,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     315,6 ,     315,6 ,     640,8 ,    732,18 ,      55,4 ,      59,9 ,   8822,58 ,   8880,72 ,    158,27 ,   8822,58 ,   8880,72 ,    158,27 ,   4145,46 ,   4191,65 ,   4256,21 ,   4145,46 ,   4191,65 ,   4256,21 ,      92,6 ,      87,5 ,  490,4 ,   5,17 ,  22,23 , {73,76,83},       49,1 ,   8691,54 ,      64,6 ,      70,8 ,    2651,5 ,    2656,5 ,     2,     1,     7,     5,     6 }, // Hebrew/Hebrew/Israel
-    {     49,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     321,9 ,     330,8 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   8952,59 ,   9011,73 ,   9084,30 ,   8952,59 ,   9011,73 ,   9084,30 ,   4277,32 ,   4309,53 ,   4362,19 ,   4277,32 ,   4309,53 ,   4362,19 ,      68,2 ,      65,2 ,  494,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   8745,42 ,       4,4 ,       4,0 ,    2661,6 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Hindi/Devanagari/India
-    {     50,     7,    98,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     187,     171,       0,6 ,       0,6 ,     338,8 ,     338,8 ,    750,13 ,    763,19 ,      55,4 ,      59,9 ,   9114,64 ,   9178,98 ,   9276,25 ,   9114,64 ,   9178,98 ,   9276,25 ,   4381,19 ,   4400,52 ,   4452,17 ,   4381,19 ,   4400,52 ,   4452,17 ,      98,3 ,      92,3 ,  498,4 ,   5,17 ,  22,23 , {72,85,70},      229,2 ,   8787,46 ,      13,5 ,       4,0 ,    2671,6 ,   2677,12 ,     2,     0,     1,     6,     7 }, // Hungarian/Latin/Hungary
-    {     51,     7,    99,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     192,8 ,     192,8 ,     640,8 ,    622,18 ,      37,5 ,      8,10 ,   9301,59 ,   9360,82 ,   9442,24 ,   9301,59 ,   9360,82 ,   9442,24 ,   4469,35 ,   4504,81 ,   4585,14 ,   4469,35 ,   4504,81 ,   4585,14 ,     101,4 ,      95,4 ,  502,4 ,   5,17 ,  22,23 , {73,83,75},      189,2 ,   8833,49 ,      13,5 ,       4,0 ,    2689,8 ,    2697,6 ,     0,     0,     1,     6,     7 }, // Icelandic/Latin/Iceland
-    {     52,     7,   101,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    346,10 ,     356,9 ,      27,8 ,    553,18 ,     228,5 ,    233,10 ,   9466,48 ,   9514,87 ,    134,24 ,   9466,48 ,   9514,87 ,    134,24 ,   4599,28 ,   4627,43 ,   4670,14 ,   4599,28 ,   4627,43 ,   4670,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,68,82},      231,2 ,   8882,39 ,       4,4 ,       4,0 ,    2703,9 ,    2703,9 ,     2,     0,     7,     6,     7 }, // Indonesian/Latin/Indonesia
-    {     53,     7,   260,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,    528,10 ,    782,26 ,      37,5 ,      8,10 ,   9601,48 ,   9649,93 ,    158,27 ,   9601,48 ,   9649,93 ,   9742,24 ,   4684,28 ,   4712,57 ,   4769,14 ,   4684,28 ,   4712,57 ,   4769,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,   2712,11 ,    2723,5 ,     2,     1,     1,     6,     7 }, // Interlingua/Latin/World
-    {     55,    44,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      233,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Inuktitut/Canadian Aboriginal/Canada
-    {     55,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      233,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Inuktitut/Latin/Canada
-    {     57,     7,   104,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    365,11 ,    244,10 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   9766,62 ,  9828,107 ,   9935,24 ,   9766,62 ,  9828,107 ,   9935,24 ,   4783,37 ,   4820,75 ,   4895,14 ,   4783,37 ,   4820,75 ,   4895,14 ,     105,4 ,      99,4 ,  506,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8921,31 ,       4,4 ,       4,0 ,    2728,7 ,    2735,4 ,     2,     1,     1,     6,     7 }, // Irish/Latin/Ireland
-    {     58,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   9959,48 ,  10007,94 ,  10101,24 ,   9959,48 ,  10007,94 ,  10101,24 ,   4909,28 ,   4937,57 ,   4994,14 ,   4909,28 ,   4937,57 ,   4994,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    2739,8 ,    2747,6 ,     2,     1,     1,     6,     7 }, // Italian/Latin/Italy
-    {     58,     7,   184,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   9959,48 ,  10007,94 ,  10101,24 ,   9959,48 ,  10007,94 ,  10101,24 ,   4909,28 ,   4937,57 ,   4994,14 ,   4909,28 ,   4937,57 ,   4994,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    2739,8 ,   2753,10 ,     2,     1,     1,     6,     7 }, // Italian/Latin/San Marino
-    {     58,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     254,7 ,     254,7 ,     156,8 ,     10,17 ,      37,5 ,      8,10 ,   9959,48 ,  10007,94 ,  10101,24 ,   9959,48 ,  10007,94 ,  10101,24 ,   4909,28 ,   4937,57 ,   4994,14 ,   4909,28 ,   4937,57 ,   4994,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,   8971,53 ,       8,5 ,      36,5 ,    2739,8 ,    2763,8 ,     2,     0,     1,     6,     7 }, // Italian/Latin/Switzerland
-    {     58,     7,   230,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   9959,48 ,  10007,94 ,  10101,24 ,   9959,48 ,  10007,94 ,  10101,24 ,   4909,28 ,   4937,57 ,   4994,14 ,   4909,28 ,   4937,57 ,   4994,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    2739,8 ,   2771,18 ,     2,     1,     1,     6,     7 }, // Italian/Latin/Vatican City State
-    {     59,    19,   108,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,     170,5 ,     170,5 ,    578,10 ,    402,13 ,      55,4 ,    372,10 ,   4423,39 ,   4423,39 ,    158,27 ,   4423,39 ,   4423,39 ,    158,27 ,   5008,14 ,   5022,28 ,   5008,14 ,   5008,14 ,   5022,28 ,   5008,14 ,     109,2 ,     103,2 ,  512,3 ,   5,17 ,  22,23 , {74,80,89},      133,1 ,   9024,11 ,       4,4 ,       4,0 ,    2789,3 ,    2792,2 ,     0,     0,     7,     6,     7 }, // Japanese/Japanese/Japan
-    {     60,     7,   101,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    376,10 ,     386,9 ,    528,10 ,     10,17 ,      37,5 ,      8,10 ,  10125,48 ,   9514,87 ,    134,24 ,  10125,48 ,   9514,87 ,    134,24 ,   5050,28 ,   5078,41 ,   5119,14 ,   5050,28 ,   5078,41 ,   5119,14 ,     111,4 ,     105,5 ,  515,4 ,   5,17 ,  22,23 , {73,68,82},      231,2 ,   8882,39 ,       8,5 ,       4,0 ,    2794,4 ,    2798,9 ,     2,     0,     7,     6,     7 }, // Javanese/Latin/Indonesia
-    {     61,    21,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    395,12 ,    407,11 ,     269,6 ,     35,18 ,     351,8 ,    359,13 ,  10173,63 ,  10236,87 ,  10323,31 ,  10354,69 ,  10236,87 ,  10323,31 ,   5133,33 ,   5166,54 ,   5220,20 ,   5133,33 ,   5166,54 ,   5220,20 ,     115,9 ,     110,7 ,  519,8 , 527,35 ,  22,23 , {73,78,82},      121,1 ,   9035,49 ,       4,4 ,       4,0 ,    2807,5 ,    2812,4 ,     2,     1,     7,     7,     7 }, // Kannada/Kannada/India
-    {     62,     1,   100,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  10423,72 ,  10423,72 ,  10495,24 ,  10423,72 ,  10423,72 ,  10495,24 ,   5240,50 ,   5290,52 ,   5342,14 ,   5240,50 ,   5290,52 ,   5342,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   9084,23 ,       8,5 ,       4,0 ,    2816,5 ,    2821,9 ,     2,     1,     7,     7,     7 }, // Kashmiri/Arabic/India
-    {     63,     2,   110,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,    418,10 ,     156,8 ,    808,22 ,      37,5 ,      8,10 ,  10519,60 ,  10579,83 ,  10662,24 ,  10519,60 ,  10686,83 ,  10662,24 ,   5356,21 ,   5377,56 ,   5433,14 ,   5356,21 ,   5377,56 ,   5433,14 ,       0,2 ,       0,2 ,  562,4 , 566,17 , 583,23 , {75,90,84},      236,1 ,   9107,58 ,      13,5 ,       4,0 ,   2830,10 ,    2840,9 ,     2,     1,     1,     6,     7 }, // Kazakh/Cyrillic/Kazakhstan
-    {     64,     7,   179,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  10769,60 , 10829,101 ,    158,27 ,  10769,60 , 10829,101 ,    158,27 ,   5447,35 ,   5482,84 ,     85,14 ,   5447,35 ,   5482,84 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,87,70},      179,2 ,       0,7 ,       8,5 ,       4,0 ,   2849,11 ,    2860,8 ,     0,     0,     1,     6,     7 }, // Kinyarwanda/Latin/Rwanda
-    {     65,     2,   116,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,    428,10 ,    428,10 ,     269,6 ,    830,23 ,      37,5 ,      8,10 ,  10930,48 ,  10978,80 ,  11058,24 ,  11082,59 ,  11141,80 ,  11058,24 ,   5566,38 ,   5604,57 ,   5661,14 ,   5566,38 ,   5604,57 ,   5661,14 ,     124,5 ,    117,14 ,  562,4 , 606,18 ,  22,23 , {75,71,83},      237,3 ,   9165,52 ,      13,5 ,       4,0 ,    2868,8 ,   2876,10 ,     2,     1,     1,     6,     7 }, // Kirghiz/Cyrillic/Kyrgyzstan
-    {     66,    22,   114,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     438,7 ,     438,7 ,     853,9 ,    862,16 ,     382,7 ,    389,13 ,  11221,39 ,  11221,39 ,  11221,39 ,  11221,39 ,  11221,39 ,  11221,39 ,   5675,14 ,   5689,28 ,   5675,14 ,   5675,14 ,   5689,28 ,   5675,14 ,     129,2 ,     131,2 ,  624,3 ,   5,17 ,  22,23 , {75,82,87},      240,1 ,   9217,19 ,       4,4 ,       4,0 ,    2886,3 ,    2889,4 ,     0,     0,     7,     6,     7 }, // Korean/Korean/South Korea
-    {     66,    22,   113,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     438,7 ,     438,7 ,     853,9 ,    862,16 ,     382,7 ,    389,13 ,  11221,39 ,  11221,39 ,  11221,39 ,  11221,39 ,  11221,39 ,  11221,39 ,   5675,14 ,   5689,28 ,   5675,14 ,   5675,14 ,   5689,28 ,   5675,14 ,     129,2 ,     131,2 ,  624,3 ,   5,17 ,  22,23 , {75,80,87},      240,1 ,   9236,39 ,       4,4 ,       4,0 ,    2886,3 ,   2893,11 ,     0,     0,     1,     6,     7 }, // Korean/Korean/North Korea
-    {     67,     7,   217,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     445,7 ,     445,7 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  11260,48 ,  11308,88 ,  11396,24 ,  11260,48 , 11420,101 ,  11396,24 ,   5717,20 ,   5737,42 ,   5779,14 ,   5717,20 ,   5737,42 ,   5779,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {84,82,89},      241,1 ,       0,7 ,      13,5 ,       4,0 ,    2904,5 ,    2909,7 ,     2,     1,     1,     6,     7 }, // Kurdish/Latin/Turkey
-    {     68,     7,    35,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  11521,60 , 11581,106 ,    158,27 ,  11521,60 , 11581,106 ,    158,27 ,   5793,34 ,   5827,89 ,     85,14 ,   5793,34 ,   5827,89 ,     85,14 ,     131,5 ,     133,5 ,   45,4 ,   5,17 ,  22,23 , {66,73,70},      159,3 ,   9275,27 ,       0,4 ,       4,0 ,    2916,8 ,    2924,8 ,     0,     0,     1,     6,     7 }, // Rundi/Latin/Burundi
-    {     69,    23,   117,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,     452,9 ,     415,8 ,    878,19 ,      55,4 ,    402,24 ,  11687,61 ,  11748,75 ,    158,27 ,  11687,61 ,  11748,75 ,    158,27 ,   5916,36 ,   5952,57 ,   6009,17 ,   5916,36 ,   5952,57 ,   6009,17 ,     136,8 ,     138,8 ,   45,4 ,   5,17 ,  22,23 , {76,65,75},      242,1 ,   9302,21 ,       4,4 ,      36,5 ,    2932,3 ,    2932,3 ,     0,     0,     7,     6,     7 }, // Lao/Lao/Laos
-    {     71,     7,   118,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     461,8 ,     461,8 ,     156,8 ,    897,26 ,      37,5 ,      8,10 ,  11823,65 , 11888,101 ,    134,24 ,  11823,65 , 11888,101 ,    134,24 ,   6026,51 ,   6077,72 ,   6149,14 ,   6163,51 ,   6214,72 ,   6149,14 ,    144,14 ,    146,11 ,  627,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9323,23 ,      13,5 ,       4,0 ,    2935,8 ,    2943,7 ,     2,     1,     1,     6,     7 }, // Latvian/Latin/Latvia
-    {     72,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     469,9 ,     469,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  11989,48 , 12037,203 ,  12240,24 ,  11989,48 , 12037,203 ,  12240,24 ,   6286,28 ,  6314,100 ,   6414,14 ,   6286,28 ,  6314,100 ,   6414,14 ,     158,8 ,     157,6 ,   45,4 ,   5,17 ,  22,23 , {67,68,70},      209,2 ,   9346,23 ,      13,5 ,       4,0 ,    2950,7 ,   2957,30 ,     2,     1,     1,     6,     7 }, // Lingala/Latin/Congo Kinshasa
-    {     72,     7,     6,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     469,9 ,     469,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  11989,48 , 12037,203 ,  12240,24 ,  11989,48 , 12037,203 ,  12240,24 ,   6286,28 ,  6314,100 ,   6414,14 ,   6286,28 ,  6314,100 ,   6414,14 ,     158,8 ,     157,6 ,   45,4 ,   5,17 ,  22,23 , {65,79,65},      243,2 ,   9369,23 ,      13,5 ,       4,0 ,    2950,7 ,    2987,6 ,     2,     1,     1,     6,     7 }, // Lingala/Latin/Angola
-    {     72,     7,    41,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     469,9 ,     469,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  11989,48 , 12037,203 ,  12240,24 ,  11989,48 , 12037,203 ,  12240,24 ,   6286,28 ,  6314,100 ,   6414,14 ,   6286,28 ,  6314,100 ,   6414,14 ,     158,8 ,     157,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   9392,23 ,      13,5 ,       4,0 ,    2950,7 ,   2993,26 ,     0,     0,     1,     6,     7 }, // Lingala/Latin/Central African Republic
-    {     72,     7,    50,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     469,9 ,     469,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  11989,48 , 12037,203 ,  12240,24 ,  11989,48 , 12037,203 ,  12240,24 ,   6286,28 ,  6314,100 ,   6414,14 ,   6286,28 ,  6314,100 ,   6414,14 ,     158,8 ,     157,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   9392,23 ,      13,5 ,       4,0 ,    2950,7 ,    3019,5 ,     0,     0,     1,     6,     7 }, // Lingala/Latin/Congo Brazzaville
-    {     73,     7,   124,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,     478,8 ,     478,8 ,     53,10 ,    923,27 ,      37,5 ,      8,10 ,  12264,70 ,  12334,96 ,  12430,24 ,  12264,70 ,  12454,98 ,  12430,24 ,   6428,21 ,   6449,89 ,   6538,14 ,   6428,21 ,   6449,89 ,   6538,14 ,     166,9 ,     163,6 ,  632,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9415,30 ,      13,5 ,       4,0 ,    3024,8 ,    3032,7 ,     2,     1,     1,     6,     7 }, // Lithuanian/Latin/Lithuania
-    {     74,     2,   127,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,     950,7 ,    553,18 ,      37,5 ,      8,10 ,  12552,61 ,  12613,85 ,  12698,24 ,  12552,61 ,  12613,85 ,  12698,24 ,   6552,35 ,   6587,54 ,   1503,14 ,   6641,34 ,   6587,54 ,   1503,14 ,    175,10 ,     169,8 ,  638,5 ,   5,17 ,  22,23 , {77,75,68},      245,3 ,   9445,56 ,      13,5 ,       4,0 ,   3039,10 ,   3049,18 ,     2,     1,     1,     6,     7 }, // Macedonian/Cyrillic/Macedonia
-    {     75,     7,   128,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     97,16 ,      37,5 ,      8,10 ,  12722,48 ,  12770,92 ,    134,24 ,  12722,48 ,  12770,92 ,    134,24 ,   6675,34 ,   6709,60 ,   6769,14 ,   6675,34 ,   6709,60 ,   6769,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,71,65},      169,2 ,   9501,13 ,       8,5 ,       4,0 ,    3067,8 ,   3075,12 ,     0,     0,     1,     6,     7 }, // Malagasy/Latin/Madagascar
-    {     76,     7,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     356,9 ,     356,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,  12862,48 ,  12910,82 ,  12992,24 ,  12862,48 ,  12910,82 ,  12992,24 ,   6783,28 ,   6811,43 ,   6854,14 ,   6783,28 ,   6811,43 ,   6854,14 ,     185,2 ,     177,3 ,  643,4 ,   5,17 ,  22,23 , {77,89,82},      173,2 ,   9514,39 ,       4,4 ,       4,0 ,    3087,6 ,    1250,8 ,     2,     1,     1,     6,     7 }, // Malay/Latin/Malaysia
-    {     76,     1,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,89,82},      173,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Malay/Arabic/Malaysia
-    {     76,     7,    32,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     356,9 ,     356,9 ,     571,7 ,    957,12 ,      18,7 ,     25,12 ,  12862,48 ,  12910,82 ,  12992,24 ,  12862,48 ,  12910,82 ,  12992,24 ,   6783,28 ,   6811,43 ,   6854,14 ,   6783,28 ,   6811,43 ,   6854,14 ,     185,2 ,     177,3 ,  643,4 ,   5,17 ,  22,23 , {66,78,68},        6,1 ,   9553,31 ,       8,5 ,       4,0 ,    3087,6 ,    3093,6 ,     2,     1,     1,     6,     7 }, // Malay/Latin/Brunei
-    {     76,     7,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     356,9 ,     356,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,  12862,48 ,  12910,82 ,  12992,24 ,  12862,48 ,  12910,82 ,  12992,24 ,   6783,28 ,   6811,43 ,   6854,14 ,   6783,28 ,   6811,43 ,   6854,14 ,     185,2 ,     177,3 ,  643,4 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,   9584,37 ,       4,4 ,       4,0 ,    3087,6 ,    3099,9 ,     2,     1,     7,     6,     7 }, // Malay/Latin/Singapore
-    {     77,    24,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    486,13 ,    499,12 ,     269,6 ,    969,18 ,      18,7 ,     25,12 ,  13016,62 ,  13078,88 ,  13166,32 ,  13016,62 ,  13078,88 ,  13166,32 ,   6868,41 ,   6909,77 ,   6986,22 ,   6868,41 ,   7008,76 ,   7084,21 ,       0,2 ,       0,2 ,  647,6 , 653,27 ,  22,23 , {73,78,82},      121,1 ,   9621,40 ,       4,4 ,       4,0 ,    3108,6 ,    3114,6 ,     2,     1,     7,     7,     7 }, // Malayalam/Malayalam/India
-    {     78,     7,   133,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     511,8 ,     519,7 ,    119,10 ,    987,23 ,      37,5 ,      8,10 ,  13198,48 ,  13246,86 ,  13332,36 ,  13198,48 ,  13246,86 ,  13368,24 ,   7105,28 ,   7133,63 ,   7196,21 ,   7105,28 ,   7133,63 ,   7217,20 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9661,27 ,       4,4 ,       4,0 ,    3120,5 ,    1258,5 ,     2,     1,     7,     6,     7 }, // Maltese/Latin/Malta
-    {     79,     7,   154,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,     426,4 ,     25,12 ,  13392,59 , 13451,133 ,  13584,24 ,  13392,59 , 13451,133 ,  13584,24 ,   7237,27 ,   7264,47 ,   7311,14 ,   7237,27 ,   7264,47 ,   7311,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   9688,41 ,       8,5 ,       4,0 ,    3125,5 ,    3130,8 ,     2,     1,     1,     6,     7 }, // Maori/Latin/New Zealand
-    {     80,    13,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     526,9 ,     526,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,  13608,66 ,  13674,86 ,  13760,32 ,  13608,66 ,  13674,86 ,  13760,32 ,   7325,32 ,   7357,53 ,   4362,19 ,   7325,32 ,   7357,53 ,   4362,19 ,     187,5 ,     180,4 ,  494,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   9729,43 ,       4,4 ,       4,0 ,    3138,5 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Marathi/Devanagari/India
-    {     82,     2,   143,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,   1010,10 ,   1020,16 ,      37,5 ,     87,12 ,  13792,99 , 13891,192 ,  14083,38 ,  13792,99 , 14121,192 ,  14083,38 ,   7410,21 ,   7431,43 ,   7410,21 ,   7410,21 ,   7474,43 ,   7410,21 ,     192,4 ,     184,4 ,  562,4 , 680,17 ,  22,23 , {77,78,84},      248,1 ,   9772,25 ,       8,5 ,       4,0 ,    3143,6 ,    3149,6 ,     2,     0,     1,     6,     7 }, // Mongolian/Cyrillic/Mongolia
-    {     82,     8,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      249,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Mongolian/Mongolian/China
-    {     84,    13,   150,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,     535,5 ,       0,6 ,     540,7 ,     540,7 ,     227,6 ,     63,17 ,      37,5 ,      8,10 ,  14313,85 ,  14313,85 ,  14398,53 ,  14313,85 ,  14313,85 ,  14451,52 ,   7517,33 ,   7550,54 ,   7604,18 ,   7517,33 ,   7550,54 ,   7604,18 ,     196,9 ,     188,7 ,  494,4 , 697,19 ,  22,23 , {78,80,82},      252,4 ,   9797,49 ,       8,5 ,       4,0 ,    3155,6 ,    3161,5 ,     2,     1,     7,     6,     7 }, // Nepali/Devanagari/Nepal
-    {     84,    13,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,     535,5 ,       0,6 ,     540,7 ,     540,7 ,     227,6 ,     63,17 ,      18,7 ,     25,12 ,  14313,85 ,  14313,85 ,  14398,53 ,  14313,85 ,  14313,85 ,  14451,52 ,   7517,33 ,   7550,54 ,   7604,18 ,   7517,33 ,   7550,54 ,   7604,18 ,     196,9 ,     188,7 ,  494,4 , 697,19 ,  22,23 , {73,78,82},      121,1 ,   9846,49 ,       8,5 ,       4,0 ,    3155,6 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Nepali/Devanagari/India
-    {     85,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    478,17 ,     228,5 ,    233,10 ,   5656,48 ,  14503,83 ,    134,24 ,   5787,59 ,  14503,83 ,    134,24 ,   2307,35 ,   2242,51 ,   2293,14 ,   2307,35 ,   2242,51 ,   2293,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      189,2 ,   9895,44 ,       8,5 ,       4,0 ,   3166,12 ,    3178,5 ,     2,     0,     1,     6,     7 }, // Norwegian Bokmal/Latin/Norway
-    {     85,     7,   203,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    478,17 ,     228,5 ,    233,10 ,   5656,48 ,  14503,83 ,    134,24 ,   5787,59 ,  14503,83 ,    134,24 ,   2307,35 ,   2242,51 ,   2293,14 ,   2307,35 ,   2242,51 ,   2293,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      189,2 ,   9895,44 ,       8,5 ,       4,0 ,   3166,12 ,   3183,21 ,     2,     0,     1,     6,     7 }, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
-    {     86,     7,    74,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Occitan/Latin/France
-    {     87,    26,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     547,8 ,     555,7 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  14586,86 ,  14586,86 ,  14672,32 ,  14586,86 ,  14586,86 ,  14672,32 ,   7622,33 ,   7655,54 ,   7709,18 ,   7622,33 ,   7655,54 ,   7709,18 ,       0,2 ,       0,2 ,  716,5 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   9939,43 ,       4,4 ,       4,0 ,    3204,5 ,    3209,4 ,     2,     1,     7,     7,     7 }, // Oriya/Oriya/India
-    {     88,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,      46,6 ,      46,6 ,     562,9 ,     571,8 ,     394,8 ,   1036,20 ,      55,4 ,    430,11 ,  14704,68 ,  14772,69 ,    158,27 ,  14841,69 ,  14841,69 ,  14910,24 ,   7727,39 ,   7727,39 ,     85,14 ,   7727,39 ,   7727,39 ,     85,14 ,     205,4 ,     195,4 ,  721,5 ,   5,17 ,  22,23 , {65,70,78},      256,1 ,   9982,25 ,      13,5 ,       4,0 ,    3213,4 ,    3217,9 ,     0,     0,     6,     4,     5 }, // Pashto/Arabic/Afghanistan
-    {     88,     1,   163,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,      46,6 ,      46,6 ,     562,9 ,     571,8 ,     394,8 ,   1036,20 ,      18,7 ,     25,12 ,  14704,68 ,  14772,69 ,    158,27 ,  14841,69 ,  14841,69 ,  14910,24 ,   7727,39 ,   7727,39 ,     85,14 ,   7727,39 ,   7727,39 ,     85,14 ,     205,4 ,     195,4 ,  721,5 ,   5,17 ,  22,23 , {80,75,82},      175,2 ,  10007,52 ,      13,5 ,       4,0 ,    3213,4 ,    3226,7 ,     2,     0,     7,     6,     7 }, // Pashto/Arabic/Pakistan
-    {     89,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,     579,7 ,     579,7 ,     586,8 ,     594,7 ,     394,8 ,     97,16 ,      55,4 ,    430,11 ,  14934,70 ,  14934,70 ,  15004,24 ,  15028,74 ,  15028,74 ,  15004,24 ,   7766,49 ,   7766,49 ,   7815,14 ,   7766,49 ,   7766,49 ,   7815,14 ,     209,9 ,     199,8 ,  726,4 , 730,44 ,  22,23 , {73,82,82},      257,4 ,  10059,37 ,      78,5 ,       4,0 ,    3233,5 ,    3238,5 ,     0,     0,     6,     5,     5 }, // Persian/Arabic/Iran
-    {     89,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,     579,7 ,     579,7 ,     586,8 ,     594,7 ,     394,8 ,     97,16 ,      55,4 ,    430,11 ,  15102,68 ,  15102,68 ,  14910,24 ,  15170,62 ,  15102,68 ,  14910,24 ,   7766,49 ,   7766,49 ,   7815,14 ,   7766,49 ,   7766,49 ,   7815,14 ,     209,9 ,     199,8 ,  726,4 , 730,44 ,  22,23 , {65,70,78},      256,1 ,  10096,55 ,       8,5 ,       4,0 ,    3243,3 ,    3217,9 ,     0,     0,     6,     4,     5 }, // Persian/Arabic/Afghanistan
-    {     90,     7,   172,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,  15232,48 ,  15280,97 ,  15377,24 ,  15232,48 ,  15401,99 ,  15500,24 ,   7829,34 ,   7863,59 ,   7922,14 ,   7829,34 ,   7863,59 ,   7936,14 ,       0,2 ,       0,2 ,  303,5 ,   5,17 ,  22,23 , {80,76,78},      261,2 ,  10151,77 ,      13,5 ,       4,0 ,    3246,6 ,    3252,6 ,     2,     1,     1,     6,     7 }, // Polish/Latin/Poland
-    {     91,     7,    30,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     254,7 ,     254,7 ,    119,10 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   7950,28 ,   7978,79 ,   8057,14 ,   7950,28 ,   7978,79 ,   8057,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {66,82,76},      263,2 ,  10228,54 ,       8,5 ,       4,0 ,    3258,9 ,    3267,6 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Brazil
-    {     91,     7,     6,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {65,79,65},      243,2 ,  10282,54 ,      13,5 ,       4,0 ,    3258,9 ,    3273,6 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Angola
-    {     91,     7,    39,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {67,86,69},      265,1 ,  10336,69 ,      13,5 ,       4,0 ,    3258,9 ,   3279,10 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Cape Verde
-    {     91,     7,    62,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,  10405,81 ,      13,5 ,       4,0 ,    3258,9 ,   3289,11 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/East Timor
-    {     91,     7,    66,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  10486,59 ,      13,5 ,       4,0 ,    3258,9 ,   3300,16 ,     0,     0,     1,     6,     7 }, // Portuguese/Latin/Equatorial Guinea
-    {     91,     7,    92,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  10545,62 ,      13,5 ,       4,0 ,    3258,9 ,   3316,12 ,     0,     0,     1,     6,     7 }, // Portuguese/Latin/Guinea Bissau
-    {     91,     7,   125,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3258,9 ,   3328,10 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Luxembourg
-    {     91,     7,   126,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      18,7 ,     25,12 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {77,79,80},      134,4 ,  10607,53 ,      13,5 ,       4,0 ,    3258,9 ,   3338,19 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Macau
-    {     91,     7,   146,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {77,90,78},      266,3 ,  10660,66 ,      13,5 ,       4,0 ,    3258,9 ,   3357,10 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Mozambique
-    {     91,     7,   173,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,   3367,17 ,    3384,8 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Portugal
-    {     91,     7,   185,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {83,84,78},      269,2 ,  10726,92 ,      13,5 ,       4,0 ,    3258,9 ,   3392,19 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Sao Tome And Principe
-    {     91,     7,   206,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,  15524,48 ,  15572,89 ,    134,24 ,  15524,48 ,  15572,89 ,    134,24 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,  10818,45 ,      13,5 ,       4,0 ,    3258,9 ,    3411,5 ,     2,     0,     1,     6,     7 }, // Portuguese/Latin/Switzerland
-    {     92,     4,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     601,9 ,     601,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,  15661,50 ,  15711,68 ,  15779,28 ,  15661,50 ,  15711,68 ,  15779,28 ,   8120,36 ,   8156,57 ,   8213,23 ,   8120,36 ,   8156,57 ,   8213,23 ,     226,6 ,     215,6 ,  774,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  10863,39 ,       4,4 ,       4,0 ,    3416,6 ,    3422,4 ,     2,     1,     7,     7,     7 }, // Punjabi/Gurmukhi/India
-    {     92,     1,   163,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    553,18 ,      18,7 ,     25,12 ,  15807,67 ,  15807,67 ,    158,27 ,  15807,67 ,  15807,67 ,    158,27 ,   8236,37 ,   8236,37 ,     85,14 ,   8236,37 ,   8236,37 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,75,82},      271,1 ,  10902,13 ,      41,6 ,       4,0 ,    3426,6 ,    3226,7 ,     2,     0,     7,     6,     7 }, // Punjabi/Arabic/Pakistan
-    {     93,     7,   169,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,  15874,48 ,  15922,88 ,    158,27 ,  15874,48 ,  15922,88 ,    158,27 ,   8273,28 ,   8301,53 ,   8354,14 ,   8273,28 ,   8301,53 ,   8354,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {80,69,78},      272,2 ,       0,7 ,       8,5 ,       4,0 ,    3432,8 ,    3440,4 ,     2,     1,     7,     6,     7 }, // Quechua/Latin/Peru
-    {     93,     7,    26,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,  15874,48 ,  15922,88 ,    158,27 ,  15874,48 ,  15922,88 ,    158,27 ,   8273,28 ,   8301,53 ,   8354,14 ,   8273,28 ,   8301,53 ,   8354,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {66,79,66},      274,2 ,       0,7 ,       8,5 ,       4,0 ,    3432,8 ,    3444,7 ,     2,     1,     1,     6,     7 }, // Quechua/Latin/Bolivia
-    {     93,     7,    63,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,  15874,48 ,  15922,88 ,    158,27 ,  15874,48 ,  15922,88 ,    158,27 ,   8273,28 ,   8301,53 ,   8354,14 ,   8273,28 ,   8301,53 ,   8354,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,       0,7 ,       8,5 ,       4,0 ,    3432,8 ,    3451,7 ,     2,     1,     1,     6,     7 }, // Quechua/Latin/Ecuador
-    {     94,     7,   206,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     339,8 ,   1056,28 ,      37,5 ,      8,10 ,  16010,67 ,  16077,92 ,  16169,24 ,  16010,67 ,  16077,92 ,  16169,24 ,   8368,23 ,   8391,56 ,   8447,14 ,   8368,23 ,   8391,56 ,   8447,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,  10915,46 ,      13,5 ,       4,0 ,    3458,9 ,    3467,6 ,     2,     0,     1,     6,     7 }, // Romansh/Latin/Switzerland
-    {     95,     7,   177,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     610,8 ,     610,8 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,  16193,60 ,  16253,98 ,  16351,24 ,  16193,60 ,  16253,98 ,  16351,24 ,   8461,34 ,   8495,48 ,   3080,14 ,   8461,34 ,   8495,48 ,   3080,14 ,      64,4 ,      61,4 ,  778,4 ,   5,17 ,  22,23 , {82,79,78},      276,3 ,  10961,57 ,      13,5 ,       4,0 ,    3473,6 ,    3479,7 ,     2,     1,     1,     6,     7 }, // Romanian/Latin/Romania
-    {     95,     7,   141,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     610,8 ,     610,8 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,  16193,60 ,  16253,98 ,  16351,24 ,  16193,60 ,  16253,98 ,  16351,24 ,   8543,28 ,   8495,48 ,   8571,16 ,   8543,28 ,   8495,48 ,   8571,16 ,      64,4 ,      61,4 ,  778,4 ,   5,17 ,  22,23 , {77,68,76},      279,1 ,  11018,69 ,      13,5 ,       4,0 ,    3473,6 ,   3486,17 ,     2,     1,     1,     6,     7 }, // Romanian/Latin/Moldova
-    {     96,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,  16375,62 ,  11141,80 ,  11058,24 ,  16437,62 ,  16499,82 ,  11058,24 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {82,85,66},      123,1 ,  11087,89 ,      13,5 ,       4,0 ,    3503,7 ,    3510,6 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Russia
-    {     96,     2,    20,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,  16375,62 ,  11141,80 ,  11058,24 ,  16437,62 ,  16499,82 ,  11058,24 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {66,89,78},        0,2 ,  11176,94 ,      13,5 ,       4,0 ,    3503,7 ,     511,8 ,     2,     0,     1,     6,     7 }, // Russian/Cyrillic/Belarus
-    {     96,     2,   110,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,  16375,62 ,  11141,80 ,  11058,24 ,  16437,62 ,  16499,82 ,  11058,24 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {75,90,84},      236,1 ,  11270,83 ,      13,5 ,       4,0 ,    3503,7 ,    3516,9 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Kazakhstan
-    {     96,     2,   116,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,  16375,62 ,  11141,80 ,  11058,24 ,  16437,62 ,  16499,82 ,  11058,24 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {75,71,83},      237,3 ,  11353,82 ,      13,5 ,       4,0 ,    3503,7 ,    3525,8 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Kyrgyzstan
-    {     96,     2,   141,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,  16375,62 ,  11141,80 ,  11058,24 ,  16437,62 ,  16499,82 ,  11058,24 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {77,68,76},      279,1 ,  11435,79 ,      13,5 ,       4,0 ,    3503,7 ,    3533,7 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Moldova
-    {     96,     2,   222,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,  16375,62 ,  11141,80 ,  11058,24 ,  16437,62 ,  16499,82 ,  11058,24 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {85,65,72},      280,1 ,  11514,92 ,      13,5 ,       4,0 ,    3503,7 ,    3540,7 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Ukraine
-    {     98,     7,    41,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  16581,48 ,  16629,91 ,  16720,24 ,  16581,48 ,  16629,91 ,  16720,24 ,   8684,28 ,   8712,66 ,   8778,14 ,   8684,28 ,   8712,66 ,   8778,14 ,     232,2 ,     221,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  11606,25 ,       4,4 ,      36,5 ,    3547,5 ,   3552,22 ,     0,     0,     1,     6,     7 }, // Sango/Latin/Central African Republic
-    {     99,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     7,     7 }, // Sanskrit/Devanagari/India
-    {    100,     2,   243,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  16744,48 ,  16792,81 ,  12698,24 ,  16744,48 ,  16792,81 ,  12698,24 ,   8792,28 ,   8820,52 ,   8872,14 ,   8792,28 ,   8820,52 ,   8872,14 ,     234,9 ,     223,8 ,  782,7 ,   5,17 ,  22,23 , {82,83,68},        0,0 ,  11631,58 ,      13,5 ,       4,0 ,    3574,6 ,    3580,6 ,     0,     0,     1,     6,     7 }, // Serbian/Cyrillic/Serbia
-    {    100,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  16873,50 ,  16923,81 ,   9742,24 ,  17004,48 ,  16923,81 ,   9742,24 ,   8886,26 ,   8912,57 ,   2102,14 ,   8886,26 ,   8912,57 ,   2102,14 ,    243,11 ,     231,8 ,  296,7 ,   5,17 ,  22,23 , {66,65,77},      140,2 , 11689,174 ,      13,5 ,       4,0 ,    3586,6 ,    630,19 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Bosnia And Herzegowina
-    {    100,     7,   242,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  17052,58 ,  16923,81 ,   9742,24 ,  17052,58 ,  16923,81 ,   9742,24 ,   8969,33 ,   8912,57 ,   2102,14 ,   8969,33 ,   8912,57 ,   2102,14 ,    243,11 ,     231,8 ,  296,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  11863,23 ,      13,5 ,       4,0 ,    3586,6 ,    3592,9 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Montenegro
-    {    100,     7,   243,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  17004,48 ,  16923,81 ,   9742,24 ,  17004,48 ,  16923,81 ,   9742,24 ,   9002,28 ,   9030,54 ,   2102,14 ,   9002,28 ,   9030,54 ,   2102,14 ,     254,9 ,     231,8 ,  296,7 ,   5,17 ,  22,23 , {82,83,68},        0,0 ,  11886,58 ,      13,5 ,       4,0 ,    3586,6 ,    3601,6 ,     0,     0,     1,     6,     7 }, // Serbian/Latin/Serbia
-    {    100,     2,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  17110,50 ,  16792,81 ,  12698,24 ,  16744,48 ,  16792,81 ,  12698,24 ,   9084,26 ,   9110,55 ,   8872,14 ,   9084,26 ,   9110,55 ,   8872,14 ,    263,11 ,     223,8 ,  782,7 ,   5,17 ,  22,23 , {66,65,77},      281,2 , 11944,174 ,      13,5 ,       4,0 ,    3574,6 ,   3607,19 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Bosnia And Herzegowina
-    {    100,     2,   242,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  17110,50 ,  16792,81 ,  12698,24 ,  17110,50 ,  16792,81 ,  12698,24 ,   8792,28 ,   9110,55 ,   8872,14 ,   8792,28 ,   9110,55 ,   8872,14 ,    263,11 ,     223,8 ,  782,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12118,23 ,      13,5 ,       4,0 ,    3574,6 ,    3626,9 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Montenegro
-    {    100,     2,   257,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  17110,50 ,  16792,81 ,  12698,24 ,  17110,50 ,  16792,81 ,  12698,24 ,   8792,28 ,   8820,52 ,   8872,14 ,   8792,28 ,   8820,52 ,   8872,14 ,     234,9 ,     223,8 ,  782,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12118,23 ,      13,5 ,       4,0 ,    3574,6 ,    3635,6 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Kosovo
-    {    100,     7,   257,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  17052,58 ,  16923,81 ,   9742,24 ,  17052,58 ,  16923,81 ,   9742,24 ,   8969,33 ,   9030,54 ,   2102,14 ,   8969,33 ,   9030,54 ,   2102,14 ,     254,9 ,     231,8 ,  296,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  11863,23 ,      13,5 ,       4,0 ,    3586,6 ,    3641,6 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Kosovo
-    {    101,     2,    81,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     618,9 ,     618,9 ,     156,8 ,   1111,23 ,      37,5 ,      8,10 ,  17160,63 ,  17223,82 ,  11058,24 ,  17305,60 ,  17365,86 ,  11058,24 ,   9165,28 ,   9193,61 ,   9254,14 ,   9268,28 ,   9296,61 ,   9254,14 ,    274,15 ,    239,15 ,   45,4 ,   5,17 ,  22,23 , {71,69,76},      224,1 ,  12141,17 ,       8,5 ,       4,0 ,    3647,4 ,   3651,11 ,     2,     1,     1,     6,     7 }, // Ossetic/Cyrillic/Georgia
-    {    101,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     618,9 ,     618,9 ,     156,8 ,   1111,23 ,      37,5 ,      8,10 ,  17160,63 ,  17223,82 ,  11058,24 ,  17305,60 ,  17365,86 ,  11058,24 ,   9165,28 ,   9193,61 ,   9254,14 ,   9268,28 ,   9296,61 ,   9254,14 ,    274,15 ,    239,15 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  12158,17 ,       8,5 ,       4,0 ,    3647,4 ,    3662,6 ,     2,     1,     1,     6,     7 }, // Ossetic/Cyrillic/Russia
-    {    102,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Southern Sotho/Latin/South Africa
-    {    103,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Tswana/Latin/South Africa
-    {    104,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  17451,48 , 17499,100 ,  17599,24 ,  17451,48 , 17499,100 ,  17599,24 ,   9357,28 ,   9385,55 ,   9440,14 ,   9357,28 ,   9385,55 ,   9440,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,  12175,22 ,       4,4 ,       4,0 ,    3668,8 ,    1820,8 ,     2,     1,     7,     6,     7 }, // Shona/Latin/Zimbabwe
-    {    105,     1,   163,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     627,8 ,     635,7 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,  17623,72 ,  17623,72 ,    134,24 ,  17623,72 ,  17623,72 ,    134,24 ,   9454,35 ,   9454,35 ,   9489,31 ,   9454,35 ,   9454,35 ,   9489,31 ,    289,11 ,    254,11 ,  789,6 , 795,61 ,  22,23 , {80,75,82},      175,2 ,  12197,43 ,       8,5 ,       4,0 ,    3676,4 ,    3680,7 ,     2,     0,     7,     6,     7 }, // Sindhi/Arabic/Pakistan
-    {    106,    32,   198,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     642,9 ,     651,8 ,     53,10 ,     63,17 ,     228,5 ,    233,10 ,  17695,59 ,  17754,96 ,  17850,32 ,  17882,61 ,  17754,96 ,  17850,32 ,   9520,39 ,   9559,62 ,   9621,19 ,   9520,39 ,   9559,62 ,   9621,19 ,     300,5 ,     265,4 ,  856,5 , 861,42 ,  22,23 , {76,75,82},      283,3 ,  12240,58 ,       4,4 ,       4,0 ,    3687,5 ,   3692,11 ,     2,     1,     1,     6,     7 }, // Sinhala/Sinhala/Sri Lanka
-    {    107,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Swati/Latin/South Africa
-    {    108,     7,   191,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     185,7 ,     659,7 ,   1134,10 ,    478,17 ,      55,4 ,      59,9 ,  17943,48 ,  17991,82 ,   9742,24 ,  17943,48 ,  18073,89 ,   9742,24 ,   9640,21 ,   9661,52 ,   9713,14 ,   9640,21 ,   9661,52 ,   9713,14 ,       0,2 ,       0,2 ,  303,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12298,26 ,      13,5 ,       4,0 ,   3703,10 ,    3713,9 ,     2,     1,     1,     6,     7 }, // Slovak/Latin/Slovakia
-    {    109,     7,   192,    44,    46,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     666,8 ,     666,8 ,    1144,9 ,   1153,19 ,      37,5 ,      8,10 ,  18162,59 ,  18221,86 ,   9742,24 ,  18162,59 ,  18221,86 ,   9742,24 ,   9727,35 ,   9762,52 ,   9814,14 ,   9727,35 ,   9762,52 ,   9814,14 ,      60,4 ,     269,4 ,   54,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12324,28 ,      13,5 ,       4,0 ,   3722,11 ,    3733,9 ,     2,     1,     1,     6,     7 }, // Slovenian/Latin/Slovenia
-    {    110,     7,   194,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     674,9 ,     674,9 ,      27,8 ,   1172,19 ,      18,7 ,     25,12 ,  18307,48 ,  18355,92 ,  18447,24 ,  18307,48 , 18471,189 ,  18447,24 ,   9828,32 ,   9860,47 ,   9907,15 ,   9828,32 ,   9860,47 ,   9907,15 ,     305,2 ,     273,2 ,  903,6 , 909,17 ,  22,23 , {83,79,83},       94,1 ,  12352,27 ,       4,4 ,       4,0 ,    3742,8 ,   3750,10 ,     0,     0,     1,     6,     7 }, // Somali/Latin/Somalia
-    {    110,     7,    59,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     674,9 ,     674,9 ,      27,8 ,   1172,19 ,      18,7 ,     25,12 ,  18307,48 ,  18355,92 ,  18447,24 ,  18307,48 , 18471,189 ,  18447,24 ,   9828,32 ,   9860,47 ,   9907,15 ,   9828,32 ,   9860,47 ,   9907,15 ,     305,2 ,     273,2 ,  903,6 , 909,17 ,  22,23 , {68,74,70},       38,3 ,  12379,50 ,       4,4 ,       4,0 ,    3742,8 ,    3760,7 ,     0,     0,     6,     6,     7 }, // Somali/Latin/Djibouti
-    {    110,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     674,9 ,     674,9 ,      27,8 ,   1172,19 ,      18,7 ,     25,12 ,  18307,48 ,  18355,92 ,  18447,24 ,  18307,48 , 18471,189 ,  18447,24 ,   9828,32 ,   9860,47 ,   9907,15 ,   9828,32 ,   9860,47 ,   9907,15 ,     305,2 ,     273,2 ,  903,6 , 909,17 ,  22,23 , {69,84,66},        0,2 ,  12429,52 ,       4,4 ,       4,0 ,    3742,8 ,    3767,8 ,     2,     1,     7,     6,     7 }, // Somali/Latin/Ethiopia
-    {    110,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     674,9 ,     674,9 ,      27,8 ,   1172,19 ,      37,5 ,      8,10 ,  18307,48 ,  18355,92 ,  18447,24 ,  18307,48 , 18471,189 ,  18447,24 ,   9828,32 ,   9860,47 ,   9907,15 ,   9828,32 ,   9860,47 ,   9907,15 ,     305,2 ,     273,2 ,  903,6 , 909,17 ,  22,23 , {75,69,83},        2,3 ,  12481,52 ,       4,4 ,       4,0 ,    3742,8 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Somali/Latin/Kenya
-    {    111,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      55,4 ,    430,11 ,  18660,61 ,  18721,89 ,  18810,24 ,  18660,61 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,   3775,17 ,    2432,6 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Spain
-    {    111,     7,    10,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {65,82,83},        6,1 ,  12533,51 ,       8,5 ,       4,0 ,    3792,7 ,    3799,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Argentina
-    {    111,     7,    22,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {66,90,68},        6,1 ,  12584,52 ,       4,4 ,       4,0 ,    3792,7 ,    3808,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Belize
-    {    111,     7,    26,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {66,79,66},      274,2 ,  12636,35 ,       4,4 ,       4,0 ,    3792,7 ,    3444,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Bolivia
-    {    111,     7,    30,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {66,82,76},      263,2 ,  12671,52 ,       4,4 ,       4,0 ,    3792,7 ,    3267,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Brazil
-    {    111,     7,    43,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     339,8 ,    669,27 ,      37,5 ,      8,10 ,  18660,61 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,76,80},        6,1 ,  12723,45 ,       4,4 ,      36,5 ,    3792,7 ,    3814,5 ,     0,     0,     1,     6,     7 }, // Spanish/Latin/Chile
-    {    111,     7,    47,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     571,7 ,    669,27 ,      18,7 ,     25,12 ,  18660,61 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   4769,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,79,80},        6,1 ,  12768,54 ,       8,5 ,       4,0 ,    3792,7 ,    3819,8 ,     2,     0,     7,     6,     7 }, // Spanish/Latin/Colombia
-    {    111,     7,    52,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,82,67},      286,1 ,  12822,67 ,       4,4 ,       4,0 ,    3792,7 ,   3827,10 ,     2,     0,     1,     6,     7 }, // Spanish/Latin/Costa Rica
-    {    111,     7,    55,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {67,85,80},        6,1 ,  12889,42 ,       4,4 ,       4,0 ,    3792,7 ,    3837,4 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Cuba
-    {    111,     7,    61,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {68,79,80},      287,3 ,  12931,54 ,       4,4 ,      83,6 ,    3792,7 ,   3841,20 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Dominican Republic
-    {    111,     7,    63,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  12985,70 ,       4,4 ,      36,5 ,    3792,7 ,    3451,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Ecuador
-    {    111,     7,    65,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  12985,70 ,       4,4 ,       4,0 ,    3792,7 ,   3861,11 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/El Salvador
-    {    111,     7,    66,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      55,4 ,    430,11 ,  18660,61 ,  18721,89 ,  18810,24 ,  18660,61 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  13055,92 ,       4,4 ,       4,0 ,    3792,7 ,   3872,17 ,     0,     0,     1,     6,     7 }, // Spanish/Latin/Equatorial Guinea
-    {    111,     7,    90,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     571,7 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {71,84,81},      290,1 ,  13147,30 ,      18,5 ,       4,0 ,    3792,7 ,    3889,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Guatemala
-    {    111,     7,    96,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,   1191,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {72,78,76},      279,1 ,  13177,60 ,       4,4 ,       4,0 ,    3792,7 ,    3898,8 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Honduras
-    {    111,     7,   139,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,      27,8 ,    669,27 ,      55,4 ,      59,9 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {77,88,78},        6,1 ,  13237,48 ,      47,6 ,       4,0 ,   3906,17 ,    3923,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Mexico
-    {    111,     7,   155,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {78,73,79},      291,2 ,  13285,69 ,       4,4 ,       4,0 ,    3792,7 ,    3929,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Nicaragua
-    {    111,     7,   166,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,    1218,8 ,    669,27 ,      18,7 ,     25,12 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,65,66},      293,3 ,  13354,54 ,       4,4 ,       4,0 ,    3792,7 ,    3938,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Panama
-    {    111,     7,   168,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18660,61 ,  18721,89 ,  18810,24 ,  18660,61 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,89,71},      296,3 ,  13408,61 ,       8,5 ,      23,6 ,    3792,7 ,    3944,8 ,     0,     0,     7,     6,     7 }, // Spanish/Latin/Paraguay
-    {    111,     7,   169,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     571,7 ,    669,27 ,      37,5 ,      8,10 ,  18894,60 ,  15922,88 ,  18810,24 ,  18954,60 ,  19014,88 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,69,78},      272,2 ,  13469,43 ,       8,5 ,       4,0 ,    3792,7 ,    3440,4 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Peru
-    {    111,     7,   170,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,  18660,61 ,  18721,89 ,  18810,24 ,  18660,61 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      178,1 ,  13512,48 ,      13,5 ,       4,0 ,    3792,7 ,    3952,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Philippines
-    {    111,     7,   174,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,    1218,8 ,    669,27 ,      18,7 ,     25,12 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  12985,70 ,       4,4 ,       4,0 ,    3792,7 ,   1447,11 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Puerto Rico
-    {    111,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     415,8 ,    669,27 ,      18,7 ,     25,12 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  12985,70 ,      89,7 ,       4,0 ,    3792,7 ,   3961,14 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/United States
-    {    111,     7,   227,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18894,60 ,  15922,88 ,  18810,24 ,  18954,60 ,  19014,88 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,89,85},        6,1 ,  13560,48 ,       8,5 ,       4,0 ,    3792,7 ,    3975,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Uruguay
-    {    111,     7,   231,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,  18660,61 ,  18721,89 ,  18810,24 ,  18660,61 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {86,69,83},      299,4 ,  13608,58 ,       4,4 ,      36,5 ,    3792,7 ,    3982,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Venezuela
-    {    111,     7,   238,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      55,4 ,    430,11 ,  18660,61 ,  18721,89 ,  18810,24 ,  18660,61 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3792,7 ,    3991,8 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Canary Islands
-    {    111,     7,   246,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,  18834,60 ,  18721,89 ,  18810,24 ,  18834,60 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       4,4 ,       4,0 ,   3999,23 ,   4022,13 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Latin America
-    {    111,     7,   250,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      55,4 ,    430,11 ,  18660,61 ,  18721,89 ,  18810,24 ,  18660,61 ,  18721,89 ,  18810,24 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3792,7 ,   4035,15 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Ceuta And Melilla
-    {    113,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     690,8 ,     690,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 ,  19150,84 ,    134,24 ,  19102,48 ,  19150,84 ,    134,24 ,  10010,60 ,  10010,60 ,     85,14 ,  10010,60 ,  10010,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {84,90,83},      191,3 ,  13666,67 ,       8,5 ,       4,0 ,    4050,9 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Swahili/Latin/Tanzania
-    {    113,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     690,8 ,     690,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 ,  19150,84 ,    134,24 ,  19102,48 ,  19150,84 ,    134,24 ,  10010,60 ,  10010,60 ,     85,14 ,  10010,60 ,  10010,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {67,68,70},      209,2 ,  13733,55 ,       8,5 ,       4,0 ,    4050,9 ,   4059,32 ,     2,     1,     1,     6,     7 }, // Swahili/Latin/Congo Kinshasa
-    {    113,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     690,8 ,     690,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 ,  19150,84 ,    134,24 ,  19102,48 ,  19150,84 ,    134,24 ,  10010,60 ,  10010,60 ,     85,14 ,  10010,60 ,  10010,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {75,69,83},        2,3 ,  13788,58 ,       8,5 ,       4,0 ,    4050,9 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Swahili/Latin/Kenya
-    {    113,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     690,8 ,     690,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 ,  19150,84 ,    134,24 ,  19102,48 ,  19150,84 ,    134,24 ,  10010,60 ,  10010,60 ,     85,14 ,  10010,60 ,  10010,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {85,71,88},      196,3 ,  13846,61 ,       8,5 ,       4,0 ,    4050,9 ,    1690,6 ,     0,     0,     1,     6,     7 }, // Swahili/Latin/Uganda
-    {    114,     7,   205,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     698,9 ,     698,9 ,     53,10 ,     97,16 ,     228,5 ,    441,16 ,  19234,59 ,  19293,86 ,    134,24 ,  19234,59 ,  19293,86 ,    134,24 ,  10070,29 ,  10099,50 ,   2293,14 ,  10070,29 ,  10099,50 ,   2293,14 ,     307,2 ,     275,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,  13907,45 ,      13,5 ,       4,0 ,    4091,7 ,    4098,7 ,     2,     0,     1,     6,     7 }, // Swedish/Latin/Sweden
-    {    114,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     698,9 ,     698,9 ,    528,10 ,     97,16 ,     228,5 ,    441,16 ,  19234,59 ,  19293,86 ,    134,24 ,  19234,59 ,  19293,86 ,    134,24 ,  10070,29 ,  10099,50 ,   2293,14 ,  10070,29 ,  10099,50 ,   2293,14 ,     307,2 ,     275,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    4091,7 ,    1089,7 ,     2,     1,     1,     6,     7 }, // Swedish/Latin/Finland
-    {    114,     7,   248,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     698,9 ,     698,9 ,     53,10 ,     97,16 ,     228,5 ,    441,16 ,  19234,59 ,  19293,86 ,    134,24 ,  19234,59 ,  19293,86 ,    134,24 ,  10070,29 ,  10099,50 ,   2293,14 ,  10070,29 ,  10099,50 ,   2293,14 ,     307,2 ,     275,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    4091,7 ,    4105,5 ,     2,     1,     1,     6,     7 }, // Swedish/Latin/Aland Islands
-    {    115,     7,   106,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Sardinian/Latin/Italy
-    {    116,     2,   209,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,  10930,48 ,  19379,71 ,  11058,24 ,  10930,48 ,  19379,71 ,  11058,24 ,  10149,28 ,  10177,55 ,  10232,14 ,  10149,28 ,  10177,55 ,  10232,14 ,     309,7 ,     277,7 ,   45,4 ,   5,17 ,  22,23 , {84,74,83},      303,4 ,  13952,19 ,      13,5 ,       4,0 ,    4110,6 ,   4116,10 ,     2,     1,     1,     6,     7 }, // Tajik/Cyrillic/Tajikistan
-    {    117,    27,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    707,13 ,    707,13 ,     269,6 ,    192,18 ,     382,7 ,    457,12 ,  19450,58 ,  19508,86 ,  19594,31 ,  19450,58 ,  19508,86 ,  19594,31 ,  10246,39 ,  10285,49 ,  10334,20 ,  10246,39 ,  10285,49 ,  10334,20 ,     316,8 ,     284,8 ,  977,7 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  13971,49 ,       8,5 ,       4,0 ,    4126,5 ,    4131,7 ,     2,     1,     7,     7,     7 }, // Tamil/Tamil/India
-    {    117,    27,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    707,13 ,    707,13 ,     269,6 ,    192,18 ,     382,7 ,    457,12 ,  19450,58 ,  19508,86 ,  19594,31 ,  19450,58 ,  19508,86 ,  19594,31 ,  10246,39 ,  10285,49 ,  10334,20 ,  10246,39 ,  10285,49 ,  10334,20 ,     316,8 ,     284,8 ,  977,7 ,   5,17 ,  22,23 , {77,89,82},      173,2 ,  14020,61 ,       8,5 ,       4,0 ,    4126,5 ,    4138,7 ,     2,     1,     1,     6,     7 }, // Tamil/Tamil/Malaysia
-    {    117,    27,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    707,13 ,    707,13 ,     269,6 ,    192,18 ,     382,7 ,    457,12 ,  19450,58 ,  19508,86 ,  19594,31 ,  19450,58 ,  19508,86 ,  19594,31 ,  10246,39 ,  10285,49 ,  10334,20 ,  10246,39 ,  10285,49 ,  10334,20 ,     316,8 ,     284,8 ,  977,7 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,  14081,61 ,       8,5 ,       4,0 ,    4126,5 ,   4145,11 ,     2,     1,     7,     6,     7 }, // Tamil/Tamil/Singapore
-    {    117,    27,   198,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    707,13 ,    707,13 ,     269,6 ,    192,18 ,      37,5 ,      8,10 ,  19450,58 ,  19508,86 ,  19594,31 ,  19450,58 ,  19508,86 ,  19594,31 ,  10246,39 ,  10285,49 ,  10334,20 ,  10246,39 ,  10285,49 ,  10334,20 ,     316,8 ,     284,8 ,  977,7 ,   5,17 ,  22,23 , {76,75,82},      307,3 ,  14142,49 ,       8,5 ,       4,0 ,    4126,5 ,    4156,6 ,     2,     1,     1,     6,     7 }, // Tamil/Tamil/Sri Lanka
-    {    118,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     720,9 ,     720,9 ,    495,10 ,   1226,23 ,      55,4 ,      59,9 ,  19625,62 ,  19687,81 ,    158,27 ,  19625,62 ,  19687,81 ,    158,27 ,  10354,36 ,  10390,56 ,  10446,14 ,  10354,36 ,  10390,56 ,  10446,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  14191,21 ,       0,4 ,       4,0 ,    4162,5 ,    3510,6 ,     2,     1,     1,     6,     7 }, // Tatar/Cyrillic/Russia
-    {    119,    28,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    729,11 ,    729,11 ,     339,8 ,   1249,18 ,      18,7 ,     25,12 ,  19768,62 ,  19830,86 ,  19916,31 ,  19768,62 ,  19830,86 ,  19916,31 ,  10460,32 ,  10492,60 ,  10552,18 ,  10460,32 ,  10492,60 ,  10552,18 ,       0,2 ,       0,2 ,  984,7 , 991,29 ,  22,23 , {73,78,82},      121,1 ,  14212,26 ,       4,4 ,       4,0 ,    4167,6 ,    4173,8 ,     2,     1,     7,     7,     7 }, // Telugu/Telugu/India
-    {    120,    30,   211,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     123,5 ,     123,5 ,     740,8 ,     748,7 ,     269,6 ,   1267,19 ,      37,5 ,    469,28 ,  19947,63 ,  20010,98 ,  19947,63 ,  19947,63 ,  20010,98 ,  19947,63 ,  10570,23 ,  10593,68 ,  10661,16 ,  10570,23 ,  10593,68 ,  10661,16 ,    324,10 ,    292,10 , 1020,4 ,   5,17 ,  22,23 , {84,72,66},      310,1 ,  14238,16 ,       4,4 ,       4,0 ,    4181,3 ,    4181,3 ,     2,     1,     7,     6,     7 }, // Thai/Thai/Thailand
-    {    121,    31,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1286,23 ,      18,7 ,     25,12 ,   2675,63 , 20108,159 ,    158,27 ,   2675,63 , 20267,147 ,    158,27 ,  10677,51 ,  10728,79 ,  10807,27 ,  10677,51 ,  10728,79 ,  10807,27 ,     334,7 ,     302,8 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      311,1 ,  14254,13 ,       8,5 ,       4,0 ,    4184,8 ,    4192,6 ,     2,     1,     7,     6,     7 }, // Tibetan/Tibetan/China
-    {    121,    31,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1286,23 ,      18,7 ,     25,12 ,   2675,63 , 20108,159 ,    158,27 ,   2675,63 , 20267,147 ,    158,27 ,  10677,51 ,  10728,79 ,  10807,27 ,  10677,51 ,  10728,79 ,  10807,27 ,     334,7 ,     302,8 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  14267,19 ,       8,5 ,       4,0 ,    4184,8 ,    4198,7 ,     2,     1,     7,     7,     7 }, // Tibetan/Tibetan/India
-    {    122,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1309,23 ,      18,7 ,     25,12 ,  20414,36 ,  20450,54 ,  20504,24 ,  20414,36 ,  20450,54 ,  20504,24 ,  10834,21 ,  10855,29 ,  10884,14 ,  10834,21 ,  10855,29 ,  10898,14 ,     341,7 ,     310,7 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,2 ,  14286,16 ,       4,4 ,       4,0 ,    4205,4 ,      92,5 ,     2,     1,     7,     6,     7 }, // Tigrinya/Ethiopic/Ethiopia
-    {    122,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1309,23 ,      18,7 ,     25,12 ,  20414,36 ,  20450,54 ,  20504,24 ,  20414,36 ,  20450,54 ,  20504,24 ,  10834,21 ,  10855,29 ,  10898,14 ,  10834,21 ,  10855,29 ,  10898,14 ,     341,7 ,     310,7 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},       41,3 ,       0,7 ,       4,4 ,       4,0 ,    4205,4 ,    4209,4 ,     2,     1,     1,     6,     7 }, // Tigrinya/Ethiopic/Eritrea
-    {    123,     7,   214,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     755,8 ,     755,8 ,     755,8 ,     755,8 ,     269,6 ,     97,16 ,      18,7 ,     25,12 ,  20528,51 ,  20579,87 ,  20666,24 ,  20528,51 ,  20579,87 ,  20666,24 ,  10912,29 ,  10941,60 ,  11001,14 ,  10912,29 ,  10941,60 ,  11001,14 ,    348,10 ,     317,6 , 1024,5 , 1029,59 , 1088,65 , {84,79,80},      194,2 ,  14302,41 ,      13,5 ,       4,0 ,   4213,13 ,    1640,5 ,     2,     1,     1,     6,     7 }, // Tongan/Latin/Tonga
-    {    124,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Tsonga/Latin/South Africa
-    {    125,     7,   217,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     763,8 ,     763,8 ,    1332,9 ,   1341,16 ,      37,5 ,      8,10 ,  20690,48 ,  20738,75 ,  20813,24 ,  20690,48 ,  20738,75 ,  20813,24 ,  11015,28 ,  11043,54 ,  11097,14 ,  11015,28 ,  11043,54 ,  11097,14 ,     358,2 ,     323,2 ,  199,4 ,   5,17 ,  22,23 , {84,82,89},      241,1 ,  14343,40 ,       4,4 ,       4,0 ,    4226,6 ,    4232,7 ,     2,     1,     1,     6,     7 }, // Turkish/Latin/Turkey
-    {    125,     7,    56,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     763,8 ,     763,8 ,    1332,9 ,   1341,16 ,      18,7 ,     25,12 ,  20690,48 ,  20738,75 ,  20813,24 ,  20690,48 ,  20738,75 ,  20813,24 ,  11015,28 ,  11043,54 ,  11097,14 ,  11015,28 ,  11043,54 ,  11097,14 ,     358,2 ,     323,2 ,  199,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,       4,4 ,       4,0 ,    4226,6 ,    4239,6 ,     2,     1,     1,     6,     7 }, // Turkish/Latin/Cyprus
-    {    126,     7,   218,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8220,    8221,       0,6 ,       0,6 ,     771,8 ,     771,8 ,    495,10 ,   1341,16 ,      37,5 ,      8,10 ,  20837,50 ,  20887,77 ,  20964,24 ,  20988,51 ,  21039,77 ,  20964,24 ,  11111,28 ,  11139,54 ,  11193,14 ,  11207,28 ,  11235,54 ,  11193,14 ,    360,13 ,    325,14 , 1153,4 ,   5,17 ,  22,23 , {84,77,84},      312,3 ,  14383,49 ,      13,5 ,       4,0 ,   4245,12 ,   4257,12 ,     2,     1,     1,     6,     7 }, // Turkmen/Latin/Turkmenistan
-    {    128,     1,    44,    46,    44,    59,    37,    48,    45,    43,   101,     187,     171,    8250,    8249,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     53,10 ,   1357,17 ,      18,7 ,     25,12 ,  21116,84 ,  21116,84 ,    158,27 ,  21116,84 ,  21116,84 ,    158,27 ,  11289,21 ,  11310,55 ,  11365,14 ,  11289,21 ,  11310,55 ,  11365,14 ,    373,12 ,    339,12 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      133,1 ,  14432,40 ,       4,4 ,       4,0 ,    4269,8 ,    4277,5 ,     2,     1,     7,     6,     7 }, // Uighur/Arabic/China
-    {    129,     2,   222,    44,   160,    59,    37,    48,    45,    43,  1077,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     138,7 ,     138,7 ,     156,8 ,   1374,22 ,      37,5 ,      8,10 ,  21200,48 ,  21248,95 ,  21343,24 ,  21367,67 ,  21434,87 ,  21521,24 ,   1427,21 ,  11379,56 ,  11435,14 ,   1427,21 ,  11379,56 ,  11435,14 ,     385,2 ,     351,2 , 1157,5 , 680,17 ,  22,23 , {85,65,72},      280,1 ,  14472,49 ,      13,5 ,       4,0 ,   4282,10 ,    4292,7 ,     2,     1,     1,     6,     7 }, // Ukrainian/Cyrillic/Ukraine
-    {    130,     1,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,    779,10 ,     789,9 ,     269,6 ,   1396,18 ,      18,7 ,     25,12 ,  21545,68 ,  21545,68 ,    134,24 ,  21545,68 ,  21545,68 ,    134,24 ,  11449,36 ,  11449,36 ,     85,14 ,  11449,36 ,  11449,36 ,     85,14 ,       0,2 ,       0,2 , 1162,4 , 1166,20 ,  22,23 , {80,75,82},      175,2 ,  14521,49 ,       4,4 ,       4,0 ,    4299,4 ,    3226,7 ,     2,     0,     7,     6,     7 }, // Urdu/Arabic/Pakistan
-    {    130,     1,   100,  1643,  1644,    59,    37,  1776,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,     798,6 ,     798,6 ,     269,6 ,   1396,18 ,      18,7 ,     25,12 ,  21545,68 ,  21545,68 ,    134,24 ,  21545,68 ,  21545,68 ,    134,24 ,  11449,36 ,  11449,36 ,     85,14 ,  11449,36 ,  11449,36 ,     85,14 ,       0,2 ,       0,2 , 1162,4 , 1166,20 ,  22,23 , {73,78,82},      121,1 ,  14570,42 ,       8,5 ,       4,0 ,    4299,4 ,    4303,5 ,     2,     1,     7,     7,     7 }, // Urdu/Arabic/India
-    {    131,     7,   228,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8217,    8216,       0,6 ,       0,6 ,     804,8 ,     804,8 ,      27,8 ,   1414,18 ,      37,5 ,    430,11 ,  21613,48 ,  21661,75 ,  21736,24 ,  21760,48 ,  21808,75 ,  21736,24 ,  11485,32 ,  11517,61 ,  11578,14 ,  11485,32 ,  11517,61 ,  11578,14 ,     387,2 ,     353,2 ,  199,4 ,   5,17 ,  22,23 , {85,90,83},      315,4 ,  14612,58 ,      13,5 ,       4,0 ,    4308,6 ,   4314,11 ,     2,     0,     1,     6,     7 }, // Uzbek/Latin/Uzbekistan
-    {    131,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     394,8 ,   1432,33 ,      55,4 ,    430,11 ,  21883,47 ,  15102,68 ,    158,27 ,  21883,47 ,  15102,68 ,    158,27 ,  11592,21 ,   7766,49 ,     85,14 ,  11592,21 ,   7766,49 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {65,70,78},      256,1 ,  14670,13 ,      13,5 ,       4,0 ,    4325,6 ,    3217,9 ,     0,     0,     6,     4,     5 }, // Uzbek/Arabic/Afghanistan
-    {    131,     2,   228,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,    696,19 ,      37,5 ,     87,12 ,  21930,48 ,  21978,71 ,  11058,24 ,  21930,48 ,  21978,71 ,  11058,24 ,  11613,28 ,  11641,53 ,  11694,14 ,  11613,28 ,  11641,53 ,  11694,14 ,     389,2 ,     355,2 ,   45,4 ,   5,17 ,  22,23 , {85,90,83},      319,3 ,  14683,49 ,      13,5 ,       4,0 ,    4331,7 ,   4338,10 ,     2,     0,     1,     6,     7 }, // Uzbek/Cyrillic/Uzbekistan
-    {    132,     7,   232,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     812,8 ,     812,8 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,  22049,75 ,  22124,99 ,    158,27 ,  22223,75 ,  22298,99 ,    158,27 ,  11708,33 ,  11741,55 ,  11796,21 ,  11708,33 ,  11741,55 ,  11796,21 ,     391,2 ,     357,2 ,   45,4 ,   5,17 ,  22,23 , {86,78,68},      322,1 ,  14732,33 ,      13,5 ,       4,0 ,   4348,10 ,    4358,8 ,     0,     0,     1,     6,     7 }, // Vietnamese/Latin/Vietnam
-    {    133,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1465,23 ,      37,5 ,      8,10 ,  22397,48 ,  22445,74 ,  22519,24 ,  22543,48 ,  22445,74 ,  22519,24 ,  11817,21 ,  11838,43 ,  11881,14 ,  11895,28 ,  11838,43 ,  11881,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,    4366,7 ,       0,0 ,     2,     1,     1,     6,     7 }, // Volapuk/Latin/World
-    {    134,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    820,11 ,    831,10 ,      27,8 ,     10,17 ,      37,5 ,      8,10 ,  22591,52 ,  22643,87 ,  22730,26 ,  22756,59 ,  22643,87 ,  22730,26 ,  11923,29 ,  11952,77 ,  12029,15 ,  12044,30 ,  11952,77 ,  12029,15 ,     393,2 ,     359,2 , 1186,7 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,  14765,92 ,       4,4 ,       4,0 ,    4373,7 ,   4380,16 ,     2,     1,     1,     6,     7 }, // Welsh/Latin/United Kingdom
-    {    135,     7,   187,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    528,10 ,   1488,17 ,      37,5 ,      8,10 ,  22815,47 ,  22862,84 ,    158,27 ,  22815,47 ,  22862,84 ,    158,27 ,  12074,28 ,  12102,50 ,  12074,28 ,  12074,28 ,  12102,50 ,  12074,28 ,     395,3 ,     361,3 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  14857,65 ,       8,5 ,       4,0 ,    4396,5 ,    4401,8 ,     0,     0,     1,     6,     7 }, // Wolof/Latin/Senegal
-    {    136,     7,   195,    46,   160,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  22946,48 ,  22994,91 ,    158,27 ,  22946,48 ,  22994,91 ,    158,27 ,  12152,28 ,  12180,61 ,     85,14 ,  12152,28 ,  12180,61 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,  14922,79 ,       4,4 ,       4,0 ,    4409,8 ,   4417,15 ,     2,     1,     7,     6,     7 }, // Xhosa/Latin/South Africa
-    {    137,    18,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     841,9 ,     841,9 ,      27,8 ,   1505,19 ,      37,5 ,      8,10 ,  23085,58 ,  23143,92 ,    158,27 ,  23143,92 ,  23143,92 ,    158,27 ,  12241,54 ,  12241,54 ,     85,14 ,  12241,54 ,  12241,54 ,     85,14 ,    398,11 ,    364,10 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      41,6 ,       4,0 ,    4432,6 ,    4438,5 ,     2,     1,     1,     6,     7 }, // Yiddish/Hebrew/World
-    {    138,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,   1524,16 ,     497,3 ,      8,10 ,  23235,40 ,  23275,73 ,  23348,27 ,  23375,55 , 23430,121 ,  23348,27 ,  12295,33 ,  12328,44 ,  12372,14 ,  12295,33 ,  12386,69 ,  12372,14 ,     409,5 ,     374,5 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,  15001,35 ,       4,4 ,       4,0 ,   4443,10 ,   4453,19 ,     2,     1,     1,     6,     7 }, // Yoruba/Latin/Nigeria
-    {    138,     7,    23,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,   1524,16 ,     497,3 ,      8,10 ,  23551,41 ,  23592,74 ,  23666,27 ,  23693,56 , 23749,134 ,  23666,27 ,  12455,33 ,  12488,44 ,  12532,14 ,  12455,33 ,  12546,69 ,  12532,14 ,     414,5 ,     379,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15036,34 ,       4,4 ,       4,0 ,   4443,10 ,   4472,16 ,     0,     0,     1,     6,     7 }, // Yoruba/Latin/Benin
-    {    140,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     850,9 ,     859,8 ,     547,6 ,     35,18 ,      37,5 ,      8,10 ,  23883,48 ,  23931,91 ,    134,24 ,  23883,48 ,  23931,91 ,  24022,24 ,  12615,28 ,  12643,74 ,  12717,14 ,  12615,28 ,  12643,74 ,  12717,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,  15070,67 ,       4,4 ,       4,0 ,    4488,7 ,   4495,17 ,     2,     1,     7,     6,     7 }, // Zulu/Latin/South Africa
-    {    141,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    478,17 ,      37,5 ,    441,16 ,   5656,48 ,  14503,83 ,    134,24 ,  24046,59 ,  14503,83 ,    134,24 ,  12731,28 ,  12759,51 ,   2293,14 ,  12810,28 ,  12759,51 ,   2293,14 ,     419,9 ,    384,11 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      189,2 ,   9895,44 ,      13,5 ,       4,0 ,    4512,7 ,    4519,5 ,     2,     0,     1,     6,     7 }, // Norwegian Nynorsk/Latin/Norway
-    {    142,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,    8216,    8217,       0,6 ,       0,6 ,     163,7 ,     163,7 ,   1540,11 ,    450,19 ,      37,5 ,      8,10 ,   8336,48 ,  24105,83 ,   9742,24 ,   8336,48 ,  24105,83 ,   9742,24 ,   2016,28 ,   2044,58 ,   2102,14 ,   2016,28 ,   2044,58 ,   2116,14 ,    428,10 ,     395,7 ,  296,7 ,   5,17 ,  22,23 , {66,65,77},      140,2 , 15137,170 ,      13,5 ,       4,0 ,    4524,8 ,    630,19 ,     2,     1,     1,     6,     7 }, // Bosnian/Latin/Bosnia And Herzegowina
-    {    142,     2,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  24188,48 ,  24236,83 ,  12698,24 ,  24188,48 ,  24236,83 ,  12698,24 ,  12838,28 ,  12866,56 ,   8872,14 ,  12838,28 ,  12866,56 ,   8872,14 ,     234,9 ,     402,7 ,   45,4 ,   5,17 ,  22,23 , {66,65,77},      281,2 , 15307,151 ,      13,5 ,       4,0 ,    4532,8 ,   3607,19 ,     2,     1,     1,     6,     7 }, // Bosnian/Cyrillic/Bosnia And Herzegowina
-    {    143,    29,   131,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,86,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     5,     6,     7 }, // Divehi/Thaana/Maldives
-    {    144,     7,   251,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     80,17 ,      37,5 ,      8,10 , 24319,102 , 24421,140 ,    158,27 , 24319,102 , 24421,140 ,    158,27 ,  12922,30 ,  12952,57 ,     85,14 ,  12922,30 ,  12952,57 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    4540,5 ,   4545,12 ,     2,     1,     1,     6,     7 }, // Manx/Latin/Isle Of Man
-    {    145,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,  24561,46 , 24607,130 ,    158,27 ,  24561,46 , 24607,130 ,    158,27 ,  13009,28 ,  13037,61 ,     85,14 ,  13009,28 ,  13037,61 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    4557,8 ,   4565,14 ,     2,     1,     1,     6,     7 }, // Cornish/Latin/United Kingdom
-    {    146,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    1551,8 ,   1559,18 ,      18,7 ,     25,12 ,  24737,48 , 24785,192 ,    158,27 ,  24737,48 , 24785,192 ,    158,27 ,  13098,28 ,  13126,49 ,  13175,14 ,  13098,28 ,  13126,49 ,  13175,14 ,     438,2 ,     409,2 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,  15458,17 ,       4,4 ,       4,0 ,    4579,4 ,    4583,5 ,     2,     1,     1,     6,     7 }, // Akan/Latin/Ghana
-    {    147,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    1577,6 ,     97,16 ,      18,7 ,     25,12 ,  24977,88 ,  24977,88 ,    158,27 ,  24977,88 ,  24977,88 ,    158,27 ,  13189,49 ,  13189,49 ,  13238,20 ,  13189,49 ,  13189,49 ,  13238,20 ,     187,5 ,     411,5 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  15475,13 ,       8,5 ,       4,0 ,    4588,6 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Konkani/Devanagari/India
-    {    148,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Ga/Latin/Ghana
-    {    149,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     867,9 ,     690,8 ,     269,6 ,     10,17 ,      37,5 ,      8,10 ,  25065,48 ,  25113,87 ,  25200,24 ,  25065,48 ,  25113,87 ,  25200,24 ,  13258,33 ,  13291,58 ,     85,14 ,  13258,33 ,  13291,58 ,     85,14 ,     440,7 ,     416,7 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,  15488,12 ,       4,4 ,       4,0 ,   4594,10 ,    4604,8 ,     2,     1,     1,     6,     7 }, // Igbo/Latin/Nigeria
-    {    150,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  25224,48 , 25272,189 ,  25461,24 ,  25224,48 , 25272,189 ,  25461,24 ,  13349,28 ,  13377,74 ,  13451,14 ,  13349,28 ,  13377,74 ,  13451,14 ,     447,9 ,     423,7 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15500,23 ,       4,4 ,       4,0 ,    4612,7 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Kamba/Latin/Kenya
-    {    151,    33,   103,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     6 }, // Syriac/Syriac/Iraq
-    {    152,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Blin/Ethiopic/Eritrea
-    {    153,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Geez/Ethiopic/Ethiopia
-    {    155,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Sidamo/Latin/Ethiopia
-    {    156,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Atsam/Latin/Nigeria
-    {    157,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Tigre/Ethiopic/Eritrea
-    {    158,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Jju/Latin/Nigeria
-    {    159,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,   1583,27 ,      37,5 ,      8,10 ,  25485,48 ,  25533,77 ,  25610,24 ,  25485,48 ,  25533,77 ,  25610,24 ,  13465,28 ,  13493,50 ,   3080,14 ,  13465,28 ,  13493,50 ,   3080,14 ,     456,2 ,     430,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,       8,5 ,       4,0 ,    4619,6 ,    4625,6 ,     2,     1,     1,     6,     7 }, // Friulian/Latin/Italy
-    {    160,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Venda/Latin/South Africa
-    {    161,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    876,11 ,    887,10 ,     547,6 ,   1610,23 ,    500,12 ,    512,17 ,  25634,48 ,  25682,87 ,  25769,24 ,  25634,48 ,  25682,87 ,  25769,24 ,  13543,28 ,  13571,44 ,  13615,14 ,  13543,28 ,  13571,44 ,  13615,14 ,     458,3 ,     432,5 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,  15523,37 ,       4,4 ,       4,0 ,    4631,6 ,   4637,12 ,     2,     1,     1,     6,     7 }, // Ewe/Latin/Ghana
-    {    161,     7,   212,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    876,11 ,    887,10 ,     547,6 ,   1610,23 ,      37,5 ,      8,10 ,  25634,48 ,  25682,87 ,  25769,24 ,  25634,48 ,  25682,87 ,  25769,24 ,  13543,28 ,  13571,44 ,  13615,14 ,  13543,28 ,  13571,44 ,  13615,14 ,     458,3 ,     432,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 , 15560,106 ,       4,4 ,       4,0 ,    4631,6 ,   4649,11 ,     0,     0,     1,     6,     7 }, // Ewe/Latin/Togo
-    {    162,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Walamo/Ethiopic/Ethiopia
-    {    163,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,  25793,59 ,  25852,95 ,    158,27 ,  25793,59 ,  25852,95 ,    158,27 ,  13629,21 ,  13650,57 ,     85,14 ,  13629,21 ,  13650,57 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,       0,7 ,       4,4 ,       4,0 ,   4660,14 ,   4674,19 ,     2,     1,     7,     6,     7 }, // Hawaiian/Latin/United States
-    {    164,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Tyap/Latin/Nigeria
-    {    165,     7,   129,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,87,75},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Nyanja/Latin/Malawi
-    {    166,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     897,9 ,     906,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  25947,48 ,  25995,88 ,  26083,38 ,  25947,48 ,  25995,88 ,  25947,48 ,  13707,28 ,  13735,55 ,  13707,28 ,  13707,28 ,  13735,55 ,  13707,28 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      178,1 ,  15666,58 ,       4,4 ,       4,0 ,    4693,8 ,    4701,9 ,     2,     1,     7,     6,     7 }, // Filipino/Latin/Philippines
-    {    167,     7,   206,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7601,48 ,  26121,86 ,    134,24 ,   7601,48 ,  26121,86 ,    134,24 ,  13790,28 ,  13818,63 ,   3668,14 ,  13790,28 ,  13818,63 ,   3668,14 ,    461,12 ,    437,11 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,  15724,55 ,      13,5 ,       4,0 ,   4710,16 ,    4726,7 ,     2,     0,     1,     6,     7 }, // Swiss German/Latin/Switzerland
-    {    167,     7,    74,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7601,48 ,  26121,86 ,    134,24 ,   7601,48 ,  26121,86 ,    134,24 ,  13790,28 ,  13818,63 ,   3668,14 ,  13790,28 ,  13818,63 ,   3668,14 ,    461,12 ,    437,11 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,   4710,16 ,   4733,10 ,     2,     1,     1,     6,     7 }, // Swiss German/Latin/France
-    {    167,     7,   123,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   7601,48 ,  26121,86 ,    134,24 ,   7601,48 ,  26121,86 ,    134,24 ,  13790,28 ,  13818,63 ,   3668,14 ,  13790,28 ,  13818,63 ,   3668,14 ,    461,12 ,    437,11 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,  15724,55 ,      13,5 ,       4,0 ,   4710,16 ,   4743,13 ,     2,     0,     1,     6,     7 }, // Swiss German/Latin/Liechtenstein
-    {    168,    34,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,  26207,38 ,  26207,38 ,    158,27 ,  26207,38 ,  26207,38 ,    158,27 ,  13881,21 ,  13902,28 ,  13930,14 ,  13881,21 ,  13902,28 ,  13930,14 ,     473,2 ,     448,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      311,1 ,       0,7 ,       8,5 ,       4,0 ,    4756,3 ,    4759,2 ,     2,     1,     7,     6,     7 }, // Sichuan Yi/Yi/China
-    {    169,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Kpelle/Latin/Liberia
-    {    170,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     461,8 ,     461,8 ,     365,7 ,   1633,23 ,    529,10 ,    539,19 ,  26245,59 ,  26304,85 ,    134,24 ,  26245,59 ,  26304,85 ,    134,24 ,  13944,28 ,  13972,65 ,   3668,14 ,  13944,28 ,  13972,65 ,   3668,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  15779,15 ,      13,5 ,       4,0 ,   4761,14 ,   4775,11 ,     2,     1,     1,     6,     7 }, // Low German/Latin/Germany
-    {    170,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     461,8 ,     461,8 ,     365,7 ,   1633,23 ,    529,10 ,    539,19 ,  26245,59 ,  26304,85 ,    134,24 ,  26245,59 ,  26304,85 ,    134,24 ,  13944,28 ,  13972,65 ,   3668,14 ,  13944,28 ,  13972,65 ,   3668,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  15779,15 ,      13,5 ,       4,0 ,   4761,14 ,   4786,12 ,     2,     1,     1,     6,     7 }, // Low German/Latin/Netherlands
-    {    171,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // South Ndebele/Latin/South Africa
-    {    172,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Northern Sotho/Latin/South Africa
-    {    173,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     228,8 ,     228,8 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  26389,59 , 26448,145 ,  26593,24 ,  26389,59 , 26448,145 ,  26593,24 ,  14037,33 ,  14070,75 ,  14145,14 ,  14037,33 ,  14070,75 ,  14145,14 ,    475,11 ,    450,13 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      189,2 ,  15794,63 ,      13,5 ,       4,0 ,   4798,15 ,    4813,5 ,     2,     0,     1,     6,     7 }, // Northern Sami/Latin/Norway
-    {    173,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     228,8 ,     228,8 ,    495,10 ,     97,16 ,      37,5 ,      8,10 ,  26617,60 , 26448,145 ,  26593,24 ,  26617,60 , 26448,145 ,  26593,24 ,  14159,21 ,  14180,70 ,  14250,14 ,  14159,21 ,  14180,70 ,  14250,14 ,     486,2 ,     463,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  15857,23 ,      13,5 ,       4,0 ,   4798,15 ,    4818,6 ,     2,     1,     1,     6,     7 }, // Northern Sami/Latin/Finland
-    {    173,     7,   205,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     228,8 ,     228,8 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  26389,59 , 26448,145 ,  26593,24 ,  26389,59 , 26448,145 ,  26593,24 ,  14037,33 ,  14070,75 ,  14145,14 ,  14037,33 ,  14070,75 ,  14145,14 ,    475,11 ,    450,13 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,  15880,63 ,      13,5 ,       4,0 ,   4798,15 ,    4824,6 ,     2,     0,     1,     6,     7 }, // Northern Sami/Latin/Sweden
-    {    174,     7,   208,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {84,87,68},      323,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Taroko/Latin/Taiwan
-    {    175,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  26677,48 ,  26725,88 ,  26813,24 ,  26677,48 ,  26725,88 ,  26813,24 ,  14264,28 ,  14292,62 ,  14354,14 ,  14264,28 ,  14292,62 ,  14354,14 ,     488,6 ,     465,3 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15943,24 ,       4,4 ,       4,0 ,    4830,8 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Gusii/Latin/Kenya
-    {    176,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  26837,48 , 26885,221 ,  27106,24 ,  26837,48 , 26885,221 ,  27106,24 ,  14368,28 , 14396,105 ,  14501,14 ,  14368,28 , 14396,105 ,  14501,14 ,    494,10 ,    468,10 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15943,24 ,       4,4 ,       4,0 ,    4838,7 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Taita/Latin/Kenya
-    {    177,     7,   187,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15967,26 ,      13,5 ,       4,0 ,    4845,6 ,    4401,8 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Senegal
-    {    177,     7,    34,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15967,26 ,      13,5 ,       4,0 ,    4845,6 ,   4851,14 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Burkina Faso
-    {    177,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  15993,25 ,      13,5 ,       4,0 ,    4845,6 ,    4865,8 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Cameroon
-    {    177,     7,    80,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {71,77,68},      162,1 ,  16018,20 ,      13,5 ,       4,0 ,    4845,6 ,    4873,6 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Gambia
-    {    177,     7,    83,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,       0,7 ,      13,5 ,       4,0 ,    4845,6 ,    4879,5 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Ghana
-    {    177,     7,    91,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      215,2 ,       0,7 ,      13,5 ,       4,0 ,    4845,6 ,    4884,4 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Guinea
-    {    177,     7,    92,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15967,26 ,      13,5 ,       4,0 ,    4845,6 ,   4888,12 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Guinea Bissau
-    {    177,     7,   121,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  16038,23 ,      13,5 ,       4,0 ,    4845,6 ,    4900,9 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Liberia
-    {    177,     7,   136,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {77,82,85},      218,2 ,  16061,22 ,      13,5 ,       4,0 ,    4845,6 ,    4909,8 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Mauritania
-    {    177,     7,   156,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15967,26 ,      13,5 ,       4,0 ,    4845,6 ,    4917,6 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Niger
-    {    177,     7,   157,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,  16083,23 ,      13,5 ,       4,0 ,    4845,6 ,    4923,9 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Nigeria
-    {    177,     7,   189,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  27130,48 ,  27178,77 ,  27255,24 ,  27130,48 ,  27178,77 ,  27255,24 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {83,76,76},      186,2 ,  16106,25 ,      13,5 ,       4,0 ,    4845,6 ,   4932,11 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Sierra Leone
-    {    177,   134,    91,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      215,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Fulah/Adlam/Guinea
-    {    178,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  27279,48 , 27327,185 ,  27512,24 ,  27279,48 , 27327,185 ,  27512,24 ,  14616,28 ,  14644,63 ,  14707,14 ,  14616,28 ,  14644,63 ,  14707,14 ,     510,6 ,     485,8 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16131,23 ,       4,4 ,       4,0 ,    4943,6 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Kikuyu/Latin/Kenya
-    {    179,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  27536,48 , 27584,173 ,  27757,24 ,  27536,48 , 27584,173 ,  27757,24 ,  14721,28 , 14749,105 ,  14854,14 ,  14721,28 , 14749,105 ,  14854,14 ,     516,7 ,     493,5 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16154,25 ,       4,4 ,       4,0 ,    4949,8 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Samburu/Latin/Kenya
-    {    180,     7,   146,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,    669,27 ,      37,5 ,      8,10 ,  27781,48 ,  27829,88 ,    134,24 ,  27781,48 ,  27829,88 ,    134,24 ,  14868,28 ,  14896,55 ,  14951,14 ,  14868,28 ,  14896,55 ,  14951,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,90,78},      266,3 ,  16179,28 ,       0,4 ,       4,0 ,    4957,4 ,   3357,10 ,     2,     1,     7,     6,     7 }, // Sena/Latin/Mozambique
-    {    181,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  27917,52 , 27969,112 ,  28081,24 ,  27917,52 , 27969,112 ,  28081,24 ,  14965,28 ,  14993,50 ,  15043,14 ,  14965,28 ,  14993,50 ,  15043,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,  16207,24 ,       4,4 ,       4,0 ,   4961,10 ,    1820,8 ,     2,     1,     7,     6,     7 }, // North Ndebele/Latin/Zimbabwe
-    {    182,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  28105,39 , 28144,194 ,  28338,24 ,  28105,39 , 28144,194 ,  28338,24 ,  15057,29 ,  15086,65 ,  15151,14 ,  15057,29 ,  15086,65 ,  15151,14 ,     523,8 ,     498,7 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16231,25 ,       4,4 ,       4,0 ,    4971,9 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Rombo/Latin/Tanzania
-    {    183,     9,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  28362,48 ,  28410,81 ,  28491,24 ,  28362,48 ,  28410,81 ,  28491,24 ,  15165,30 ,  15195,47 ,     85,14 ,  15165,30 ,  15195,47 ,     85,14 ,     531,6 ,     505,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16256,21 ,       0,4 ,       4,0 ,    4980,7 ,    4987,6 ,     2,     1,     1,     6,     7 }, // Tachelhit/Tifinagh/Morocco
-    {    183,     7,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  28515,48 ,  28563,81 ,  28644,24 ,  28515,48 ,  28563,81 ,  28644,24 ,  15242,30 ,  15272,48 ,     85,14 ,  15242,30 ,  15272,48 ,     85,14 ,     537,6 ,     513,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16277,21 ,       0,4 ,       4,0 ,   4993,10 ,    5003,6 ,     2,     1,     1,     6,     7 }, // Tachelhit/Latin/Morocco
-    {    184,     7,     3,    44,   160,    59,    37,    48,    45,    43,   122,     171,     187,    8220,    8221,       0,6 ,       0,6 ,    914,12 ,    926,11 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  28668,48 ,  28716,82 ,  28798,24 ,  28822,48 ,  28870,84 ,  28954,24 ,  15320,28 ,  15348,34 ,  15382,14 ,  15396,30 ,  15426,51 ,  15477,14 ,     543,7 ,     521,9 , 1193,7 , 1200,21 ,  22,23 , {68,90,68},      204,2 ,  16298,53 ,       0,4 ,       4,0 ,    5009,9 ,    5018,8 ,     2,     1,     6,     5,     6 }, // Kabyle/Latin/Algeria
-    {    185,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  28978,48 , 29026,152 ,    134,24 ,  28978,48 , 29026,152 ,    134,24 ,  15491,28 ,  15519,74 ,  15593,14 ,  15491,28 ,  15519,74 ,  15593,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16351,26 ,       4,4 ,       4,0 ,   5026,10 ,    1690,6 ,     0,     0,     1,     6,     7 }, // Nyankole/Latin/Uganda
-    {    186,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  29178,48 , 29226,254 ,  29480,24 ,  29178,48 , 29226,254 ,  29480,24 ,  15607,28 ,  15635,82 ,  15717,14 ,  15607,28 ,  15635,82 ,  15717,14 ,     550,7 ,     530,7 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16377,29 ,       0,4 ,       4,0 ,    5036,6 ,   5042,10 ,     2,     0,     1,     6,     7 }, // Bena/Latin/Tanzania
-    {    187,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 ,  29504,87 ,    134,24 ,  19102,48 ,  29504,87 ,    134,24 ,  15731,28 ,  15759,62 ,  15821,14 ,  15731,28 ,  15759,62 ,  15821,14 ,     557,5 ,     537,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16406,27 ,       4,4 ,       4,0 ,    5052,8 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Vunjo/Latin/Tanzania
-    {    188,     7,   132,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  29591,47 ,  29638,92 ,  29730,24 ,  29591,47 ,  29638,92 ,  29730,24 ,  15835,28 ,  15863,44 ,  15907,14 ,  15835,28 ,  15863,44 ,  15907,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16433,24 ,       4,4 ,       4,0 ,    5060,9 ,    2189,4 ,     0,     0,     1,     6,     7 }, // Bambara/Latin/Mali
-    {    188,    75,   132,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Bambara/Nko/Mali
-    {    189,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  29754,48 , 29802,207 ,  30009,24 ,  29754,48 , 29802,207 ,  30009,24 ,  15921,28 ,  15949,64 ,  16013,14 ,  15921,28 ,  15949,64 ,  16013,14 ,     562,2 ,     546,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15943,24 ,       4,4 ,       4,0 ,    5069,6 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Embu/Latin/Kenya
-    {    190,    12,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     937,9 ,     946,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  30033,36 ,  30069,58 ,  30127,24 ,  30033,36 ,  30069,58 ,  30127,24 ,  16027,28 ,  16055,49 ,  16104,14 ,  16027,28 ,  16055,49 ,  16104,14 ,     564,3 ,     548,6 , 1221,6 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  16457,25 ,       4,4 ,       4,0 ,    5075,3 ,   5078,15 ,     2,     1,     7,     6,     7 }, // Cherokee/Cherokee/United States
-    {    191,     7,   137,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  30151,47 ,  30198,68 ,  30266,24 ,  30151,47 ,  30198,68 ,  30266,24 ,  16118,27 ,  16145,48 ,  16193,14 ,  16118,27 ,  16145,48 ,  16193,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,85,82},      175,2 ,  16482,21 ,      41,6 ,       4,0 ,   5093,14 ,    5107,5 ,     2,     0,     1,     6,     7 }, // Morisyen/Latin/Mauritius
-    {    192,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 , 30290,264 ,    134,24 ,  19102,48 , 30290,264 ,    134,24 ,  16207,28 , 16235,133 ,  15151,14 ,  16207,28 , 16235,133 ,  15151,14 ,     567,4 ,     554,5 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16406,27 ,       4,4 ,       4,0 ,   5112,10 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Makonde/Latin/Tanzania
-    {    193,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  30554,83 , 30637,111 ,  30748,24 ,  30554,83 , 30637,111 ,  30748,24 ,  16368,36 ,  16404,63 ,  16467,14 ,  16368,36 ,  16404,63 ,  16467,14 ,     571,3 ,     559,3 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16503,29 ,      41,6 ,       4,0 ,    5122,8 ,    5130,9 ,     2,     0,     1,     6,     7 }, // Langi/Latin/Tanzania
-    {    194,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  30772,48 ,  30820,97 ,    134,24 ,  30772,48 ,  30820,97 ,    134,24 ,  16481,28 ,  16509,66 ,  16575,14 ,  16481,28 ,  16509,66 ,  16575,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16532,26 ,       0,4 ,       4,0 ,    5139,7 ,    5146,7 ,     0,     0,     1,     6,     7 }, // Ganda/Latin/Uganda
-    {    195,     7,   239,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  30917,48 ,  30965,83 ,  31048,24 ,  30917,48 ,  30965,83 ,  31048,24 ,  16589,80 ,  16589,80 ,     85,14 ,  16589,80 ,  16589,80 ,     85,14 ,     574,8 ,     562,7 ,   45,4 ,   5,17 ,  22,23 , {90,77,87},      131,1 ,       0,7 ,       4,4 ,       4,0 ,    5153,9 ,    1814,6 ,     2,     1,     1,     6,     7 }, // Bemba/Latin/Zambia
-    {    196,     7,    39,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     415,8 ,   1656,27 ,      37,5 ,      8,10 ,  31072,48 ,  31120,85 ,    134,24 ,  31072,48 ,  31120,85 ,    134,24 ,  16669,28 ,  16697,73 ,  16770,14 ,  16669,28 ,  16784,73 ,  16770,14 ,      68,2 ,      65,2 ,   45,4 ,   5,17 ,  22,23 , {67,86,69},      265,1 ,  16558,43 ,      13,5 ,       4,0 ,   5162,12 ,   5174,10 ,     2,     1,     1,     6,     7 }, // Kabuverdianu/Latin/Cape Verde
-    {    197,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  31205,48 ,  31253,86 ,  31339,24 ,  31205,48 ,  31253,86 ,  31339,24 ,  16857,28 ,  16885,51 ,  16936,14 ,  16857,28 ,  16885,51 ,  16936,14 ,     582,2 ,     569,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15943,24 ,       4,4 ,       4,0 ,    5184,6 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Meru/Latin/Kenya
-    {    198,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  31363,49 , 31412,121 ,  31533,24 ,  31363,49 , 31412,121 ,  31533,24 ,  16950,28 ,  16978,53 ,  17031,14 ,  16950,28 ,  16978,53 ,  17031,14 ,     584,6 ,    571,10 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16601,26 ,       4,4 ,       4,0 ,    5190,8 ,   5198,12 ,     2,     1,     7,     6,     7 }, // Kalenjin/Latin/Kenya
-    {    199,     7,   148,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,48 , 31557,136 ,    134,24 ,      0,48 , 31557,136 ,    134,24 ,  17045,23 ,  17068,92 ,  17160,14 ,  17045,23 ,  17068,92 ,  17160,14 ,     590,7 ,     581,5 ,   45,4 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,  16627,22 ,       4,4 ,       4,0 ,   5210,13 ,    5223,8 ,     2,     1,     1,     6,     7 }, // Nama/Latin/Namibia
-    {    200,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 ,  29504,87 ,    134,24 ,  19102,48 ,  29504,87 ,    134,24 ,  15731,28 ,  15759,62 ,  15821,14 ,  15731,28 ,  15759,62 ,  15821,14 ,     557,5 ,     537,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16406,27 ,       4,4 ,       4,0 ,    5231,9 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Machame/Latin/Tanzania
-    {    201,     7,    82,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     461,8 ,     461,8 ,   1134,10 ,   1683,23 ,      37,5 ,      8,10 ,  31693,59 ,  31752,87 ,  12992,24 ,  31839,48 ,  31752,87 ,  12992,24 ,  17174,28 ,  17202,72 ,   3668,14 ,  17174,28 ,  17202,72 ,   3668,14 ,    597,16 ,    586,16 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  16649,11 ,      13,5 ,       4,0 ,    5240,6 ,   5246,11 ,     2,     1,     1,     6,     7 }, // Colognian/Latin/Germany
-    {    202,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  31887,51 , 31938,132 ,    158,27 ,  31887,51 , 31938,132 ,    158,27 ,  15731,28 ,  17274,58 ,  15151,14 ,  15731,28 ,  17274,58 ,  15151,14 ,     613,9 ,     602,6 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16660,25 ,       4,4 ,       4,0 ,    5257,3 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Masai/Latin/Kenya
-    {    202,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  31887,51 , 31938,132 ,    158,27 ,  31887,51 , 31938,132 ,    158,27 ,  15731,28 ,  17274,58 ,  15151,14 ,  15731,28 ,  17274,58 ,  15151,14 ,     613,9 ,     602,6 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16685,28 ,       4,4 ,       4,0 ,    5257,3 ,    5260,8 ,     2,     0,     1,     6,     7 }, // Masai/Latin/Tanzania
-    {    203,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  30772,48 ,  30820,97 ,    134,24 ,  30772,48 ,  30820,97 ,    134,24 ,  17332,35 ,  17367,65 ,  17432,14 ,  17332,35 ,  17367,65 ,  17432,14 ,     622,6 ,     608,6 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16532,26 ,      13,5 ,       4,0 ,    5268,7 ,    5146,7 ,     0,     0,     1,     6,     7 }, // Soga/Latin/Uganda
-    {    204,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  32070,48 ,  19150,84 ,    134,24 ,  32070,48 ,  19150,84 ,    134,24 ,  17446,21 ,  17467,75 ,     85,14 ,  17446,21 ,  17467,75 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16713,23 ,       4,4 ,      96,6 ,    5275,7 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Luyia/Latin/Kenya
-    {    205,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  32118,48 ,  19150,84 ,    134,24 ,  32118,48 ,  19150,84 ,    134,24 ,  17542,28 ,  10010,60 ,  15821,14 ,  17542,28 ,  10010,60 ,  15821,14 ,     628,9 ,     614,8 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16736,28 ,      13,5 ,       4,0 ,    5282,6 ,    5288,8 ,     2,     0,     1,     6,     7 }, // Asu/Latin/Tanzania
-    {    206,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  32166,48 ,  32214,94 ,  32308,24 ,  32166,48 ,  32214,94 ,  32308,24 ,  17570,28 ,  17598,69 ,  17667,14 ,  17570,28 ,  17598,69 ,  17667,14 ,     637,9 ,     622,6 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16764,28 ,       4,4 ,       4,0 ,    5296,6 ,    1690,6 ,     0,     0,     1,     6,     7 }, // Teso/Latin/Uganda
-    {    206,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  32166,48 ,  32214,94 ,  32308,24 ,  32166,48 ,  32214,94 ,  32308,24 ,  17570,28 ,  17598,69 ,  17667,14 ,  17570,28 ,  17598,69 ,  17667,14 ,     637,9 ,     622,6 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16792,27 ,       4,4 ,       4,0 ,    5296,6 ,    5302,5 ,     2,     1,     7,     6,     7 }, // Teso/Latin/Kenya
-    {    207,     7,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Saho/Latin/Eritrea
-    {    208,     7,   132,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  32332,46 ,  32378,88 ,  32466,24 ,  32332,46 ,  32378,88 ,  32466,24 ,  17681,28 ,  17709,53 ,  17762,14 ,  17681,28 ,  17709,53 ,  17762,14 ,     646,6 ,     628,6 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16819,23 ,       0,4 ,       4,0 ,   5307,11 ,    5318,5 ,     0,     0,     1,     6,     7 }, // Koyra Chiini/Latin/Mali
-    {    209,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 ,  29504,87 ,    134,24 ,  19102,48 ,  29504,87 ,    134,24 ,  15731,28 ,  15759,62 ,  15821,14 ,  15731,28 ,  15759,62 ,  15821,14 ,     557,5 ,     537,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16406,27 ,       0,4 ,       4,0 ,    5323,6 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Rwa/Latin/Tanzania
-    {    210,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  32490,48 , 32538,186 ,  32724,24 ,  32490,48 , 32538,186 ,  32724,24 ,  17776,28 ,  17804,69 ,  17873,14 ,  17776,28 ,  17804,69 ,  17873,14 ,     652,2 ,     634,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16842,23 ,       0,4 ,       4,0 ,    5329,6 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Luo/Latin/Kenya
-    {    211,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  28978,48 , 29026,152 ,    134,24 ,  28978,48 , 29026,152 ,    134,24 ,  15491,28 ,  15519,74 ,  15593,14 ,  15491,28 ,  15519,74 ,  15593,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16351,26 ,       4,4 ,       4,0 ,    5335,6 ,    1690,6 ,     0,     0,     1,     6,     7 }, // Chiga/Latin/Uganda
-    {    212,     7,   145,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  32748,48 ,  32796,86 ,  32882,24 ,  32748,48 ,  32796,86 ,  32882,24 ,  17887,28 ,  17915,48 ,  17963,14 ,  17887,28 ,  17915,48 ,  17963,14 ,     654,9 ,    636,10 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16865,22 ,      13,5 ,       4,0 ,   5341,17 ,    5358,6 ,     2,     1,     1,     6,     7 }, // Central Morocco Tamazight/Latin/Morocco
-    {    213,     7,   132,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  32332,46 ,  32378,88 ,  32466,24 ,  32332,46 ,  32378,88 ,  32466,24 ,  17977,28 ,  18005,54 ,  17762,14 ,  17977,28 ,  18005,54 ,  17762,14 ,     646,6 ,     628,6 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16819,23 ,       0,4 ,       4,0 ,   5364,15 ,    5318,5 ,     0,     0,     1,     6,     7 }, // Koyraboro Senni/Latin/Mali
-    {    214,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19102,48 ,  32906,84 ,    134,24 ,  19102,48 ,  32906,84 ,    134,24 ,  18059,28 ,  18087,63 ,  18150,14 ,  18059,28 ,  18087,63 ,  18150,14 ,     663,5 ,     646,8 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16887,27 ,       0,4 ,       4,0 ,    5379,9 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Shambala/Latin/Tanzania
-    {    215,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  32990,88 ,  32990,88 ,  33078,31 ,  32990,88 ,  32990,88 ,  33078,31 ,  18164,33 ,  18197,54 ,  18251,19 ,  18164,33 ,  18197,54 ,  18251,19 ,     668,3 ,     654,6 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  16914,10 ,       8,5 ,       4,0 ,    5388,4 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Bodo/Devanagari/India
-    {    218,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  21930,48 ,  11141,80 ,  11058,24 ,  21930,48 ,  11141,80 ,  11058,24 ,  18270,25 ,  18295,45 ,  18340,17 ,  18270,25 ,  18295,45 ,  18270,25 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  16924,43 ,      13,5 ,       4,0 ,    5392,7 ,    5399,5 ,     2,     1,     1,     6,     7 }, // Chechen/Cyrillic/Russia
-    {    219,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     954,8 ,     954,8 ,   1010,10 ,   1706,23 ,      37,5 ,      8,10 ,  33109,65 , 33174,117 ,  33291,30 ,  33109,65 , 33321,117 ,  33291,30 ,  18357,37 ,  18394,68 ,  11435,14 ,  18357,37 ,  18394,68 ,  11435,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  16967,44 ,      13,5 ,       4,0 ,   5404,19 ,    5423,7 ,     2,     1,     1,     6,     7 }, // Church/Cyrillic/Russia
-    {    220,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Chuvash/Cyrillic/Russia
-    {    230,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  33438,49 ,  33487,99 ,  33586,24 ,  33438,49 ,  33487,99 ,  33586,24 ,  18462,28 ,  18490,50 ,  18540,14 ,  18462,28 ,  18490,50 ,  18540,14 ,     671,5 ,     660,6 ,   45,4 ,   5,17 ,  22,23 , {67,68,70},      209,2 ,  17011,24 ,       0,4 ,       4,0 ,    5430,8 ,   5438,16 ,     2,     1,     1,     6,     7 }, // Luba Katanga/Latin/Congo Kinshasa
-    {    231,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,    962,10 ,    962,10 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  33610,48 ,  33658,85 ,    134,24 ,  33743,59 ,  33658,85 ,    134,24 ,  18554,28 ,  18582,65 ,   3668,14 ,  18647,35 ,  18582,65 ,   3668,14 ,     676,5 ,     666,8 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,   5454,14 ,   5468,10 ,     2,     1,     1,     6,     7 }, // Luxembourgish/Latin/Luxembourg
-    {    236,     7,    21,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Walloon/Latin/Belgium
-    {    237,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  33802,48 , 33850,195 ,  34045,24 ,  33802,48 , 33850,195 ,  34045,24 ,  18682,28 ,  18710,72 ,  18782,14 ,  18682,28 ,  18710,72 ,  18782,14 ,     681,3 ,     674,3 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17035,21 ,       0,4 ,       4,0 ,    5478,5 ,    5483,7 ,     0,     0,     1,     6,     7 }, // Aghem/Latin/Cameroon
-    {    238,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  34069,48 ,  34117,90 ,  34207,24 ,  34069,48 ,  34117,90 ,  34207,24 ,  18796,28 ,  18824,70 ,  18894,14 ,  18796,28 ,  18824,70 ,  18894,14 ,    684,10 ,     677,9 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17056,22 ,      13,5 ,       4,0 ,    5490,5 ,    5495,8 ,     0,     0,     1,     6,     7 }, // Basaa/Latin/Cameroon
-    {    239,     7,   156,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  32332,46 ,  32378,88 ,  32466,24 ,  32332,46 ,  32378,88 ,  32466,24 ,  17977,28 ,  18908,53 ,  18961,14 ,  17977,28 ,  18908,53 ,  18961,14 ,     694,8 ,    686,10 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16819,23 ,       0,4 ,       4,0 ,   5503,10 ,    5513,5 ,     0,     0,     1,     6,     7 }, // Zarma/Latin/Niger
-    {    240,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  34231,49 ,  34280,99 ,  34379,24 ,  34231,49 ,  34280,99 ,  34379,24 ,  18975,28 ,  19003,45 ,  19048,14 ,  18975,28 ,  19003,45 ,  19048,14 ,     702,5 ,     696,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,      13,5 ,       4,0 ,    5518,5 ,    1986,8 ,     0,     0,     1,     6,     7 }, // Duala/Latin/Cameroon
-    {    241,     7,   187,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  34403,36 ,  34439,82 ,  34521,24 ,  34403,36 ,  34439,82 ,  34521,24 ,  19062,28 ,  19090,50 ,  19140,14 ,  19062,28 ,  19090,50 ,  19140,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  17078,23 ,      13,5 ,       4,0 ,    5523,5 ,    5528,7 ,     0,     0,     1,     6,     7 }, // Jola Fonyi/Latin/Senegal
-    {    242,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  34545,50 , 34595,141 ,  34736,24 ,  34545,50 , 34595,141 ,  34736,24 ,  19154,30 ,  19184,85 ,  19269,14 ,  19154,30 ,  19184,85 ,  19269,14 ,     707,7 ,     702,9 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17101,23 ,      13,5 ,       4,0 ,    5535,6 ,    5541,7 ,     0,     0,     1,     6,     7 }, // Ewondo/Latin/Cameroon
-    {    243,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  34760,39 , 34799,191 ,    158,27 ,  34760,39 , 34799,191 ,    158,27 ,  19283,29 ,  19312,45 ,  19357,14 ,  19283,29 ,  19312,45 ,  19357,14 ,     714,6 ,     711,7 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17124,11 ,      13,5 ,       4,0 ,    5548,5 ,    5553,7 ,     0,     0,     1,     6,     7 }, // Bafia/Latin/Cameroon
-    {    244,     7,   146,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  34990,48 , 35038,213 ,  35251,24 ,  34990,48 , 35038,213 ,  35251,24 ,  19371,28 ,  19399,59 ,  19458,14 ,  19371,28 ,  19399,59 ,  19458,14 ,     720,8 ,    718,10 ,   45,4 ,   5,17 ,  22,23 , {77,90,78},      266,3 ,       0,7 ,      41,6 ,       4,0 ,    5560,5 ,   5565,10 ,     2,     1,     7,     6,     7 }, // Makhuwa Meetto/Latin/Mozambique
-    {    245,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  35275,48 , 35323,139 ,  35462,24 ,  35275,48 , 35323,139 ,  35462,24 ,  19472,28 ,  19500,74 ,  19574,14 ,  19472,28 ,  19500,74 ,  19574,14 ,     728,5 ,     728,5 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17135,17 ,       4,4 ,       4,0 ,    5575,6 ,    5581,7 ,     0,     0,     1,     6,     7 }, // Mundang/Latin/Cameroon
-    {    246,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  35486,51 , 35537,143 ,    158,27 ,  35486,51 , 35537,143 ,    158,27 ,  19588,30 ,  19618,89 ,  19707,14 ,  19588,30 ,  19618,89 ,  19707,14 ,     733,4 ,     733,4 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17152,20 ,      13,5 ,       4,0 ,    5588,6 ,    5594,7 ,     0,     0,     1,     6,     7 }, // Kwasio/Latin/Cameroon
-    {    247,     7,   254,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     538,9 ,     97,16 ,      18,7 ,    558,12 ,  35680,54 ,  35734,96 ,  35830,24 ,  35680,54 ,  35734,96 ,  35830,24 ,  19721,38 ,  19759,79 ,  19838,14 ,  19721,38 ,  19759,79 ,  19838,14 ,     737,2 ,     737,2 ,   45,4 ,   5,17 ,  22,23 , {83,83,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    5601,9 ,       0,0 ,     2,     1,     1,     6,     7 }, // Nuer/Latin/South Sudan
-    {    248,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,    972,11 ,    972,11 ,     227,6 ,   1729,30 ,      37,5 ,      8,10 ,  35854,50 , 35904,116 ,  36020,24 ,  35854,50 , 36044,121 ,  36020,24 ,  19852,21 ,  19873,71 ,  19944,14 ,  19852,21 ,  19873,71 ,  19944,14 ,     739,2 ,     739,2 , 1227,5 , 1232,17 ,  22,23 , {82,85,66},      123,1 ,  17172,47 ,      13,5 ,       4,0 ,    5610,9 ,    5619,9 ,     2,     1,     1,     6,     7 }, // Sakha/Cyrillic/Russia
-    {    249,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  36165,48 , 36213,117 ,    158,27 ,  36165,48 , 36213,117 ,    158,27 ,  19958,28 ,  19986,60 ,  20046,14 ,  19958,28 ,  19986,60 ,  20046,14 ,     741,9 ,     741,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  17219,25 ,       0,4 ,       4,0 ,    5628,9 ,    5637,9 ,     2,     0,     1,     6,     7 }, // Sangu/Latin/Tanzania
-    {    251,     7,   156,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  32332,46 ,  32378,88 ,  32466,24 ,  32332,46 ,  32378,88 ,  32466,24 ,  17977,28 ,  18005,54 ,  17762,14 ,  17977,28 ,  18005,54 ,  17762,14 ,     694,8 ,    686,10 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16819,23 ,       0,4 ,       4,0 ,   5646,13 ,    5513,5 ,     0,     0,     1,     6,     7 }, // Tasawaq/Latin/Niger
-    {    252,    35,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  36330,38 ,  36368,61 ,    158,27 ,  36330,38 ,  36368,61 ,    158,27 ,  20060,30 ,  20060,30 ,     85,14 ,  20060,30 ,  20060,30 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  17244,15 ,       4,4 ,       4,0 ,    5659,2 ,    5661,4 ,     2,     1,     1,     6,     7 }, // Vai/Vai/Liberia
-    {    252,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  36429,81 ,  36429,81 ,    158,27 ,  36429,81 ,  36429,81 ,    158,27 ,  20090,48 ,  20090,48 ,     85,14 ,  20090,48 ,  20090,48 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  17259,20 ,       4,4 ,       4,0 ,    5665,3 ,    5668,8 ,     2,     1,     1,     6,     7 }, // Vai/Latin/Liberia
-    {    253,     7,   206,    44,  8217,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     53,10 ,    622,18 ,      37,5 ,      8,10 ,  36510,48 ,  36558,99 ,  36657,24 ,  36510,48 ,  36558,99 ,  36657,24 ,  20138,28 ,  20166,53 ,  20219,14 ,  20138,28 ,  20166,53 ,  20219,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,       0,7 ,      41,6 ,       4,0 ,    5676,6 ,    5682,6 ,     2,     0,     1,     6,     7 }, // Walser/Latin/Switzerland
-    {    254,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  36681,51 , 36732,191 ,    158,27 ,  36681,51 , 36732,191 ,    158,27 ,  20233,21 ,  20254,71 ,  20325,14 ,  20233,21 ,  20254,71 ,  20325,14 ,     750,8 ,     750,8 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,      13,5 ,       4,0 ,    5688,6 ,    5694,7 ,     0,     0,     1,     6,     7 }, // Yangben/Latin/Cameroon
-    {    256,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    372,22 ,      37,5 ,      8,10 ,  36923,48 ,  36971,85 ,  37056,24 ,  37080,48 , 37128,117 ,  37056,24 ,  20339,28 ,  20367,54 ,   3364,14 ,  20339,28 ,  20367,54 ,   3364,14 ,    758,12 ,    758,11 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    5701,9 ,    2432,6 ,     2,     1,     1,     6,     7 }, // Asturian/Latin/Spain
-    {    257,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,    983,11 ,    983,11 ,    994,16 ,    1010,9 ,     53,10 ,   1559,18 ,      37,5 ,      8,10 , 37245,174 , 37245,174 ,    158,27 , 37245,174 , 37245,174 ,    158,27 ,  20421,60 ,  20421,60 ,  20481,25 ,  20421,60 ,  20421,60 ,  20481,25 ,     770,8 ,    769,13 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17279,12 ,       8,5 ,       4,0 ,    5710,5 ,    5715,7 ,     0,     0,     1,     6,     7 }, // Ngomba/Latin/Cameroon
-    {    258,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,   1759,10 ,     80,17 ,      37,5 ,      8,10 , 37419,102 , 37419,102 ,    158,27 , 37419,102 , 37419,102 ,    158,27 ,  20506,54 ,  20506,54 ,  20560,21 ,  20506,54 ,  20506,54 ,  20560,21 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17291,16 ,      41,6 ,       4,0 ,    5722,4 ,    5726,7 ,     0,     0,     1,     6,     7 }, // Kako/Latin/Cameroon
-    {    259,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1559,18 ,      37,5 ,      8,10 , 37521,137 , 37658,142 ,  37800,36 , 37521,137 , 37658,142 ,  37800,36 ,  20581,49 ,  20581,49 ,  20630,21 ,  20581,49 ,  20581,49 ,  20630,21 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17307,12 ,       8,5 ,       4,0 ,    5733,5 ,    5738,7 ,     0,     0,     1,     6,     7 }, // Meta/Latin/Cameroon
-    {    260,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1769,32 ,      37,5 ,      8,10 , 37836,165 , 37836,165 ,    158,27 , 37836,165 , 37836,165 ,    158,27 , 20651,111 , 20651,111 ,     85,14 , 20651,111 , 20651,111 ,     85,14 ,     778,9 ,     782,8 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17319,16 ,       8,5 ,       4,0 ,   5745,16 ,    5761,7 ,     0,     0,     1,     6,     7 }, // Ngiemboon/Latin/Cameroon
-    {    290,    11,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     7,     7 }, // Manipuri/Bengali/India
-    {    309,   100,   232,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {86,78,68},      322,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Tai Dam/Tai Viet/Vietnam
-    {    312,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Akoose/Latin/Cameroon
-    {    313,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 , 38001,180 , 38001,180 ,    158,27 , 38001,180 , 38001,180 ,    158,27 ,  20762,87 ,  20762,87 ,     85,14 ,  20762,87 ,  20762,87 ,  20849,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,       0,7 ,      41,6 ,       4,0 ,   5768,12 ,   5780,22 ,     2,     1,     7,     6,     7 }, // Lakota/Latin/United States
-    {    314,     9,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  28362,48 ,  28410,81 ,  28491,24 ,  28362,48 ,  28410,81 ,  28491,24 ,  15165,30 ,  20863,48 ,     85,14 ,  15165,30 ,  20863,48 ,     85,14 ,     531,6 ,     505,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16256,21 ,       0,4 ,       4,0 ,    5802,8 ,    4987,6 ,     2,     1,     1,     6,     7 }, // Standard Moroccan Tamazight/Tifinagh/Morocco
-    {    315,     7,    43,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,76,80},        6,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Mapuche/Latin/Chile
-    {    316,     1,   103,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 , 38181,105 , 38181,105 ,  38286,24 , 38181,105 , 38181,105 ,  38286,24 ,  20911,58 ,  20911,58 ,  20969,14 ,  20911,58 ,  20911,58 ,  20969,14 ,     787,3 ,     790,3 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},       44,5 ,  17335,20 ,      13,5 ,       4,0 ,   5810,14 ,    5824,5 ,     0,     0,     6,     5,     6 }, // Central Kurdish/Arabic/Iraq
-    {    316,     1,   102,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 , 38181,105 , 38181,105 ,  38286,24 , 38181,105 , 38181,105 ,  38286,24 ,  20911,58 ,  20911,58 ,  20969,14 ,  20911,58 ,  20911,58 ,  20969,14 ,     787,3 ,     790,3 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,  17355,19 ,      13,5 ,       4,0 ,   5810,14 ,    5829,5 ,     0,     0,     6,     5,     5 }, // Central Kurdish/Arabic/Iran
-    {    317,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     185,7 ,     185,7 ,     113,6 ,    622,18 ,      55,4 ,      59,9 ,  38310,48 ,  38358,85 ,   9742,24 ,  38443,60 ,  38503,93 ,   9742,24 ,  20983,28 ,  21011,53 ,  21064,14 ,  20983,28 ,  21011,53 ,  21064,14 ,     790,9 ,    793,10 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17374,27 ,      13,5 ,       4,0 ,   5834,14 ,    5848,6 ,     2,     1,     1,     6,     7 }, // Lower Sorbian/Latin/Germany
-    {    318,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     185,7 ,     185,7 ,     113,6 ,    622,18 ,    570,12 ,      59,9 ,  38596,48 ,  38644,86 ,   9742,24 ,  38730,60 ,  38790,93 ,   9742,24 ,  21078,28 ,  21106,53 ,  21159,14 ,  21078,28 ,  21106,53 ,  21159,14 ,     790,9 ,     803,9 , 1249,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17401,29 ,      13,5 ,       4,0 ,   5854,15 ,    5869,6 ,     2,     1,     1,     6,     7 }, // Upper Sorbian/Latin/Germany
-    {    319,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Kenyang/Latin/Cameroon
-    {    320,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      233,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Mohawk/Latin/Canada
-    {    321,    75,    91,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      215,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Nko/Nko/Guinea
-    {    322,     7,   260,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,    1019,8 ,    1019,8 ,     156,8 ,   1801,27 ,      37,5 ,      8,10 ,  38883,48 ,  38931,91 ,  39022,24 ,  38883,48 ,  38931,91 ,  39022,24 ,  21173,28 ,  21201,69 ,  21270,14 ,  21173,28 ,  21201,69 ,  21270,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,    5875,9 ,    5884,6 ,     2,     1,     1,     6,     7 }, // Prussian/Latin/World
-    {    323,     7,    90,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,84,81},      290,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Kiche/Latin/Guatemala
-    {    324,     7,   205,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     1,     6,     7 }, // Southern Sami/Latin/Sweden
-    {    325,     7,   205,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     1,     6,     7 }, // Lule Sami/Latin/Sweden
-    {    326,     7,    73,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     640,8 ,   1828,18 ,     243,4 ,     247,9 ,  39046,77 , 39123,140 ,  39263,25 ,  39046,77 , 39123,140 ,  39263,25 ,  21284,28 ,  21312,70 ,     85,14 ,  21284,28 ,  21382,73 ,  21455,14 ,     799,3 ,     812,3 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17430,11 ,      13,5 ,       4,0 ,   5890,11 ,    5901,5 ,     2,     1,     1,     6,     7 }, // Inari Sami/Latin/Finland
-    {    327,     7,    73,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Skolt Sami/Latin/Finland
-    {    328,     7,    13,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {65,85,68},      326,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Warlpiri/Latin/Australia
-    {    346,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  14934,70 ,  14934,70 ,    158,27 ,  14934,70 ,  14934,70 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,  726,4 , 1254,39 ,  22,23 , {73,82,82},      328,3 ,  17441,27 ,       8,5 ,       4,0 ,    5906,7 ,    3238,5 ,     0,     0,     6,     5,     5 }, // Mazanderani/Arabic/Iran
-    {    349,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  39288,77 ,  39288,77 ,    158,27 ,  39288,77 ,  39288,77 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,   5913,11 ,       0,0 ,     0,     0,     6,     5,     5 }, // Northern Luri/Arabic/Iran
-    {    349,     1,   103,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,  39288,77 ,  39288,77 ,    158,27 ,  39288,77 ,  39288,77 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},       44,5 ,       0,7 ,       8,5 ,       4,0 ,   5913,11 ,       0,0 ,     0,     0,     6,     5,     6 }, // Northern Luri/Arabic/Iraq
-    {    357,     6,    97,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,    1027,5 ,    1027,5 ,     394,8 ,    423,14 ,     198,6 ,    215,13 ,   4423,39 ,   4423,39 ,    158,27 ,   4423,39 ,   4423,39 ,    158,27 ,   1953,28 ,   1953,28 ,   1981,14 ,   1953,28 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {72,75,68},      166,3 ,  17468,11 ,       4,4 ,       4,0 ,    5924,2 ,   5926,14 ,     2,     1,     7,     6,     7 }, // Cantonese/Traditional Han/Hong Kong
-    {    357,     5,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,    1027,5 ,    1027,5 ,     394,8 ,    402,13 ,     198,6 ,    204,11 ,   4423,39 ,   4462,38 ,    158,27 ,   4423,39 ,   4462,38 ,    158,27 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      133,1 ,   3122,13 ,       4,4 ,       4,0 ,    5940,2 ,    5942,7 ,     2,     1,     7,     6,     7 }, // Cantonese/Simplified Han/China
-    {    360,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Ido/Latin/World
-    {    361,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Lojban/Latin/World
-    {    362,     7,   106,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Sicilian/Latin/Italy
-    {    363,     1,   102,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     5 }, // Southern Kurdish/Arabic/Iran
-    {    364,     1,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,75,82},      175,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Western Balochi/Arabic/Pakistan
-    {      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,       0,       0,       0,       0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,     0,0,     0,0,     0,0,    {0,0,0},         0,0,        0,0,        0,0,        0,0,        0,0,        0,0,     0,     0,     0,     0,     0 } // trailing 0s
+   //  lang  script   terr   dec   group  list   prcnt   zero  minus  plus    exp   quotOpn  quotEnd altQtOpn altQtEnd   lpStart      lpMid       lpEnd       lpTwo       sDtFmt      lDtFmt      sTmFmt      lTmFmt      ssDays      slDays      snDays       sDays       lDays       nDays        am          pm       byte    siQuant iecQuant    currISO     currSym    currDsply    currFmt    currFmtNeg   endoLang    endoCntry curDgt curRnd dow1st  wknd+  wknd-
+    {      1,     0,     0,    46,    44,    59,    37,    48,    45,    43,   101,      34,      34,      39,      39,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      0,10 ,     10,17 ,       0,8 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     99,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,       0,7 ,       0,4 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // C/AnyScript/AnyCountry
+    {      3,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     35,18 ,      18,7 ,     25,12 ,    113,28 ,    141,55 ,     85,14 ,    113,28 ,    141,55 ,     85,14 ,       2,2 ,       2,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,2 ,      7,24 ,       4,4 ,       4,0 ,       0,6 ,      6,10 ,     2,     1,     7,     6,     7 }, // Oromo/Latin/Ethiopia
+    {      3,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     35,18 ,      37,5 ,      8,10 ,    113,28 ,    141,55 ,    196,14 ,    113,28 ,    141,55 ,    196,14 ,       2,2 ,       2,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,       0,7 ,       4,4 ,       4,0 ,       0,6 ,      16,8 ,     2,     1,     7,     6,     7 }, // Oromo/Latin/Kenya
+    {      4,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Afar/Latin/Ethiopia
+    {      5,     7,   195,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     53,10 ,     80,17 ,      37,5 ,      8,10 ,    210,28 ,    238,58 ,    296,14 ,    210,28 ,    238,58 ,    296,14 ,       4,3 ,       4,3 ,   49,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,     31,67 ,       4,4 ,       4,0 ,      24,9 ,     33,11 ,     2,     1,     7,     6,     7 }, // Afrikaans/Latin/South Africa
+    {      5,     7,   148,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     53,10 ,     97,16 ,      18,7 ,     25,12 ,    210,28 ,    238,58 ,    296,14 ,    210,28 ,    238,58 ,    296,14 ,       4,3 ,       4,3 ,   49,5 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,     98,55 ,       4,4 ,       4,0 ,      24,9 ,      44,7 ,     2,     1,     1,     6,     7 }, // Afrikaans/Latin/Namibia
+    {      6,     7,     2,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      18,7 ,     42,13 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {65,76,76},        7,4 ,    153,45 ,      13,5 ,       4,0 ,      51,5 ,      56,8 ,     0,     0,     1,     6,     7 }, // Albanian/Latin/Albania
+    {      6,     7,   127,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      37,5 ,      8,10 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {77,75,68},       11,3 ,    198,54 ,      13,5 ,       4,0 ,      51,5 ,     64,18 ,     2,     1,     1,     6,     7 }, // Albanian/Latin/Macedonia
+    {      6,     7,   257,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      37,5 ,      8,10 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,    252,21 ,      13,5 ,       4,0 ,      51,5 ,      82,6 ,     2,     1,     1,     6,     7 }, // Albanian/Latin/Kosovo
+    {      7,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,      23,6 ,      23,6 ,      29,9 ,      38,8 ,    119,10 ,     63,17 ,      18,7 ,     25,12 ,    439,27 ,    466,28 ,    494,14 ,    439,27 ,    466,28 ,    494,14 ,      18,3 ,      17,4 ,   58,3 ,  61,23 ,  22,23 , {69,84,66},       15,2 ,    273,34 ,       4,4 ,       4,0 ,      88,4 ,      92,5 ,     2,     1,     7,     6,     7 }, // Amharic/Ethiopic/Ethiopia
+    {      8,     1,    64,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {69,71,80},       17,5 ,    307,81 ,      13,5 ,       4,0 ,      97,7 ,     104,3 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Egypt
+    {      8,     1,     3,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {68,90,68},       22,5 ,   388,102 ,      13,5 ,       4,0 ,      97,7 ,     107,7 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Algeria
+    {      8,     1,    17,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {66,72,68},       27,5 ,    490,91 ,      13,5 ,       4,0 ,      97,7 ,     114,7 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Bahrain
+    {      8,     1,    42,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {88,65,70},       32,4 ,   581,112 ,      13,5 ,       4,0 ,      97,7 ,     121,4 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Chad
+    {      8,     1,    48,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      37,5 ,      8,10 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {75,77,70},       36,2 ,   693,105 ,      13,5 ,       4,0 ,      97,7 ,     125,9 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Comoros
+    {      8,     1,    59,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {68,74,70},       38,3 ,    798,84 ,      13,5 ,       4,0 ,      97,7 ,     134,6 ,     0,     0,     6,     6,     7 }, // Arabic/Arabic/Djibouti
+    {      8,     1,    67,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {69,82,78},       41,3 ,    882,91 ,      13,5 ,       4,0 ,      97,7 ,     140,7 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Eritrea
+    {      8,     1,   103,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,81,68},       44,5 ,    973,84 ,      13,5 ,       4,0 ,      97,7 ,     147,6 ,     0,     0,     6,     5,     6 }, // Arabic/Arabic/Iraq
+    {      8,     1,   105,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      55,4 ,      59,9 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,76,83},       49,1 ,  1057,133 ,      13,5 ,       4,0 ,      97,7 ,     153,7 ,     2,     1,     7,     5,     6 }, // Arabic/Arabic/Israel
+    {      8,     1,   109,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {74,79,68},       50,5 ,   1190,84 ,      13,5 ,       4,0 ,      97,7 ,     160,6 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Jordan
+    {      8,     1,   115,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {75,87,68},       55,5 ,   1274,84 ,      13,5 ,       4,0 ,      97,7 ,     166,6 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Kuwait
+    {      8,     1,   119,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {76,66,80},       60,5 ,   1358,84 ,      13,5 ,       4,0 ,      97,7 ,     172,5 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Lebanon
+    {      8,     1,   122,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {76,89,68},       65,5 ,   1442,88 ,      13,5 ,       4,0 ,      97,7 ,     177,5 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Libya
+    {      8,     1,   136,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,82,85},       70,4 ,  1530,112 ,      13,5 ,       4,0 ,      97,7 ,     182,9 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Mauritania
+    {      8,     1,   145,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      37,5 ,      8,10 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,65,68},       74,5 ,   1642,87 ,      13,5 ,       4,0 ,      97,7 ,     191,6 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Morocco
+    {      8,     1,   162,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {79,77,82},       79,5 ,   1729,77 ,      13,5 ,       4,0 ,      97,7 ,     197,5 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Oman
+    {      8,     1,   165,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,76,83},       49,1 ,  1057,133 ,      13,5 ,       4,0 ,      97,7 ,    202,18 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Palestinian Territories
+    {      8,     1,   175,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {81,65,82},       84,5 ,   1806,70 ,      13,5 ,       4,0 ,      97,7 ,     220,3 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Qatar
+    {      8,     1,   186,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,65,82},       89,5 ,   1876,77 ,      13,5 ,       4,0 ,      97,7 ,    223,24 ,     2,     1,     7,     5,     6 }, // Arabic/Arabic/Saudi Arabia
+    {      8,     1,   194,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,79,83},       94,1 ,   1953,77 ,      13,5 ,       4,0 ,      97,7 ,     247,7 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Somalia
+    {      8,     1,   201,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,68,71},       95,4 ,   2030,91 ,      13,5 ,       4,0 ,      97,7 ,     254,7 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Sudan
+    {      8,     1,   207,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,89,80},       99,5 ,   2121,77 ,      13,5 ,       4,0 ,      97,7 ,     261,5 ,     0,     0,     6,     5,     6 }, // Arabic/Arabic/Syria
+    {      8,     1,   216,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {84,78,68},      104,5 ,   2198,95 ,      13,5 ,       4,0 ,      97,7 ,     266,4 ,     3,     0,     1,     6,     7 }, // Arabic/Arabic/Tunisia
+    {      8,     1,   223,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {65,69,68},      109,5 ,   2293,91 ,      13,5 ,       4,0 ,      97,7 ,    270,24 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/United Arab Emirates
+    {      8,     1,   236,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,65,68},       74,5 ,   1642,87 ,      13,5 ,       4,0 ,      97,7 ,    294,15 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Western Sahara
+    {      8,     1,   237,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {89,69,82},      114,5 ,   2384,70 ,      13,5 ,       4,0 ,      97,7 ,     309,5 ,     0,     0,     7,     5,     6 }, // Arabic/Arabic/Yemen
+    {      8,     1,   254,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,83,80},      119,1 ,  2454,132 ,      13,5 ,       4,0 ,      97,7 ,    314,12 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/South Sudan
+    {      8,     1,   260,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      52,7 ,      59,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,    326,23 ,     349,6 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/World
+    {      9,    10,    11,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,      65,7 ,      65,7 ,     156,8 ,    164,20 ,      37,5 ,      8,10 ,    574,28 ,    602,62 ,    664,14 ,    574,28 ,    602,62 ,    664,14 ,       0,2 ,       0,2 ,  135,6 , 141,17 ,  22,23 , {65,77,68},      120,1 ,   2586,46 ,      13,5 ,       4,0 ,     355,7 ,     362,8 ,     2,     0,     1,     6,     7 }, // Armenian/Armenian/Armenia
+    {     10,    11,   100,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      72,9 ,      72,9 ,     184,8 ,    192,18 ,      68,7 ,     75,12 ,    678,32 ,    710,58 ,    768,14 ,    678,32 ,    710,58 ,    768,14 ,      22,9 ,      22,7 ,  158,4 , 162,37 ,  22,23 , {73,78,82},      121,1 ,   2632,43 ,       8,5 ,       4,0 ,     370,7 ,     377,4 ,     2,     1,     7,     7,     7 }, // Assamese/Bengali/India
+    {     12,     7,    15,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      81,8 ,      81,8 ,     156,8 ,    210,17 ,      37,5 ,      8,10 ,    782,27 ,    809,67 ,     99,14 ,    782,27 ,    809,67 ,     99,14 ,       0,2 ,       0,2 ,  199,4 ,   5,17 ,  22,23 , {65,90,78},      122,1 ,   2675,58 ,      13,5 ,       4,0 ,    381,10 ,    391,10 ,     2,     1,     1,     6,     7 }, // Azerbaijani/Latin/Azerbaijan
+    {     12,     1,   102,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     5 }, // Azerbaijani/Arabic/Iran
+    {     12,     2,    15,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     156,8 ,    210,17 ,      37,5 ,      8,10 ,    876,27 ,    903,67 ,     99,14 ,    876,27 ,    903,67 ,     99,14 ,      31,2 ,      29,2 ,   45,4 ,   5,17 ,  22,23 , {65,90,78},      122,1 ,   2733,12 ,      13,5 ,       4,0 ,    401,10 ,    411,10 ,     2,     1,     1,     6,     7 }, // Azerbaijani/Cyrillic/Azerbaijan
+    {     13,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Bashkir/Cyrillic/Russia
+    {     14,     7,   197,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8220,    8221,       0,6 ,       0,6 ,      89,9 ,      89,9 ,     227,6 ,    233,36 ,      37,5 ,     87,12 ,    970,28 ,    998,68 ,   1066,14 ,    970,28 ,    998,68 ,   1066,14 ,       0,2 ,       0,2 ,  203,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   2745,20 ,      13,5 ,       4,0 ,     421,7 ,     428,8 ,     2,     1,     1,     6,     7 }, // Basque/Latin/Spain
+    {     15,    11,    18,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      98,9 ,      98,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,   1080,37 ,   1117,58 ,   1175,18 ,   1080,37 ,   1117,58 ,   1175,18 ,       0,2 ,       0,2 ,  158,4 ,   5,17 ,  22,23 , {66,68,84},      124,1 ,   2765,49 ,       0,4 ,       4,0 ,     436,5 ,     441,8 ,     2,     1,     7,     6,     7 }, // Bengali/Bengali/Bangladesh
+    {     15,    11,   100,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      98,9 ,      98,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,   1080,37 ,   1117,58 ,   1175,18 ,   1080,37 ,   1117,58 ,   1175,18 ,       0,2 ,       0,2 ,  158,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   2814,43 ,       0,4 ,       4,0 ,     436,5 ,     449,4 ,     2,     1,     7,     7,     7 }, // Bengali/Bengali/India
+    {     16,    31,    25,    46,    44,    59,    37,  3872,    45,    43,   101,    8220,    8221,    8216,    8217,     107,9 ,     107,9 ,     107,9 ,     107,9 ,     53,10 ,    275,30 ,     99,22 ,    121,27 ,   1193,34 ,   1227,79 ,   1306,27 ,   1193,34 ,   1227,79 ,   1306,27 ,      33,5 ,      31,6 ,   45,4 ,   5,17 ,  22,23 , {66,84,78},      125,3 ,   2857,15 ,       4,4 ,       4,0 ,     453,6 ,     459,5 ,     2,     1,     7,     6,     7 }, // Dzongkha/Tibetan/Bhutan
+    {     19,     7,    74,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   1333,33 ,   1366,43 ,   1409,18 ,   1333,33 ,   1366,43 ,   1409,18 ,      38,4 ,      37,4 ,  210,7 , 217,17 ,  22,23 , {69,85,82},       14,1 ,   2872,36 ,      13,5 ,       4,0 ,     464,9 ,     473,5 ,     2,     1,     1,     6,     7 }, // Breton/Latin/France
+    {     20,     2,    33,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    305,12 ,    317,22 ,     148,9 ,    157,14 ,   1427,21 ,   1448,55 ,   1503,14 ,   1427,21 ,   1448,55 ,   1503,14 ,      42,6 ,      41,6 ,  234,7 ,   5,17 ,  22,23 , {66,71,78},      128,3 ,   2908,47 ,      13,5 ,       4,0 ,     478,9 ,     487,8 ,     2,     1,     1,     6,     7 }, // Bulgarian/Cyrillic/Bulgaria
+    {     21,    25,   147,    46,    44,  4170,    37,  4160,    45,    43,   101,    8220,    8221,    8216,    8217,     123,5 ,     123,5 ,    128,10 ,    128,10 ,     339,8 ,    347,18 ,     171,6 ,    177,10 ,   1517,54 ,   1517,54 ,   1571,14 ,   1517,54 ,   1517,54 ,   1571,14 ,      48,5 ,      47,3 ,  241,5 ,   5,17 ,  22,23 , {77,77,75},      131,1 ,   2955,29 ,      13,5 ,       4,0 ,     495,6 ,     495,6 ,     0,     0,     7,     6,     7 }, // Burmese/Myanmar/Myanmar
+    {     22,     2,    20,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     138,7 ,     138,7 ,     365,7 ,    317,22 ,      37,5 ,    187,11 ,   1585,21 ,   1606,56 ,   1662,14 ,   1585,21 ,   1606,56 ,   1662,14 ,       0,2 ,       0,2 ,  246,5 , 251,17 ,  22,23 , {66,89,78},        0,2 ,   2984,89 ,      13,5 ,       4,0 ,    501,10 ,     511,8 ,     2,     0,     1,     6,     7 }, // Belarusian/Cyrillic/Belarus
+    {     23,    20,    36,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     145,9 ,     154,9 ,     269,6 ,     97,16 ,      18,7 ,     25,12 ,   1676,40 ,   1716,46 ,   1762,14 ,   1676,40 ,   1776,47 ,   1762,14 ,       0,2 ,       0,2 ,  268,2 ,   5,17 ,  22,23 , {75,72,82},      132,1 ,   3073,29 ,       0,4 ,       4,0 ,     519,5 ,     524,7 ,     2,     1,     7,     6,     7 }, // Khmer/Khmer/Cambodia
+    {     24,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   1823,28 ,   1851,60 ,   1911,21 ,   1823,28 ,   1851,60 ,   1911,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     531,6 ,     537,7 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Spain
+    {     24,     7,     5,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   1823,28 ,   1851,60 ,   1911,21 ,   1823,28 ,   1851,60 ,   1911,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     531,6 ,     544,7 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Andorra
+    {     24,     7,    74,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   1823,28 ,   1851,60 ,   1911,21 ,   1823,28 ,   1851,60 ,   1911,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     531,6 ,     551,6 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/France
+    {     24,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   1823,28 ,   1851,60 ,   1911,21 ,   1823,28 ,   1851,60 ,   1911,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     531,6 ,     557,6 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Italy
+    {     25,     5,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,     175,5 ,     175,5 ,     394,8 ,    402,13 ,     198,6 ,    204,11 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  270,2 , 272,21 ,  22,23 , {67,78,89},      133,1 ,   3122,13 ,       4,4 ,       4,0 ,     563,4 ,     567,2 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/China
+    {     25,     5,    97,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,     175,5 ,     175,5 ,     269,6 ,    402,13 ,     198,6 ,    204,11 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  270,2 , 272,21 ,  22,23 , {72,75,68},        6,1 ,   3135,11 ,       4,4 ,       4,0 ,     563,4 ,     569,9 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Hong Kong
+    {     25,     5,   126,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,     175,5 ,     175,5 ,     269,6 ,    402,13 ,     198,6 ,    204,11 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  270,2 , 272,21 ,  22,23 , {77,79,80},      134,4 ,   3146,13 ,       4,4 ,       4,0 ,     563,4 ,     578,9 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Macau
+    {     25,     5,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,     175,5 ,     175,5 ,      27,8 ,    402,13 ,     198,6 ,    204,11 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  270,2 , 272,21 ,  22,23 , {83,71,68},        6,1 ,   3159,15 ,       4,4 ,       4,0 ,     563,4 ,     587,3 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Singapore
+    {     25,     6,    97,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,     180,5 ,     180,5 ,     415,8 ,    402,13 ,     198,6 ,    215,13 ,   1995,21 ,   1953,28 ,   1981,14 ,   1995,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  293,3 ,   5,17 ,  22,23 , {72,75,68},        6,1 ,   3135,11 ,      18,5 ,       4,0 ,     590,4 ,     594,9 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Hong Kong
+    {     25,     6,   126,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,     180,5 ,     180,5 ,     415,8 ,    402,13 ,     198,6 ,    215,13 ,   1995,21 ,   1953,28 ,   1981,14 ,   1995,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,  293,3 ,   5,17 ,  22,23 , {77,79,80},      134,4 ,   3174,13 ,      18,5 ,       4,0 ,     590,4 ,     603,9 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Macau
+    {     25,     6,   208,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,     175,5 ,     175,5 ,     394,8 ,    423,14 ,     198,6 ,    215,13 ,   1995,21 ,   1953,28 ,   1981,14 ,   1995,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {84,87,68},        6,1 ,   3187,13 ,      13,5 ,       4,0 ,     590,4 ,     612,2 ,     2,     0,     7,     6,     7 }, // Chinese/Traditional Han/Taiwan
+    {     26,     7,    74,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Corsican/Latin/France
+    {     27,     7,    54,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    437,13 ,    450,19 ,      37,5 ,     87,12 ,   2016,28 ,   2044,58 ,   2102,14 ,   2016,28 ,   2044,58 ,   2116,14 ,       0,2 ,       0,2 ,  296,7 ,   5,17 ,  22,23 , {72,82,75},      138,2 ,   3200,60 ,      13,5 ,       4,0 ,     614,8 ,     622,8 ,     2,     1,     1,     6,     7 }, // Croatian/Latin/Croatia
+    {     27,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     469,9 ,    450,19 ,      37,5 ,     87,12 ,   2016,28 ,   2044,58 ,   2116,14 ,   2016,28 ,   2044,58 ,   2116,14 ,       0,2 ,       0,2 ,  296,7 ,   5,17 ,  22,23 , {66,65,77},      140,2 ,   3260,85 ,      13,5 ,       4,0 ,     614,8 ,    630,19 ,     2,     1,     1,     6,     7 }, // Croatian/Latin/Bosnia And Herzegowina
+    {     28,     7,    57,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     185,7 ,     185,7 ,     156,8 ,    478,17 ,      55,4 ,      59,9 ,   2130,21 ,   2151,49 ,   2200,14 ,   2130,21 ,   2151,49 ,   2200,14 ,      60,4 ,      57,4 ,  303,5 ,   5,17 ,  22,23 , {67,90,75},      142,2 ,   3345,68 ,      13,5 ,       4,0 ,     649,7 ,     656,5 ,     2,     0,     1,     6,     7 }, // Czech/Latin/Czech Republic
+    {     29,     7,    58,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    505,23 ,     228,5 ,    233,10 ,   2214,28 ,   2242,51 ,   2293,14 ,   2307,35 ,   2242,51 ,   2293,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   3413,42 ,      13,5 ,       4,0 ,     661,5 ,     666,7 ,     2,     0,     1,     6,     7 }, // Danish/Latin/Denmark
+    {     29,     7,    86,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    505,23 ,     228,5 ,    233,10 ,   2214,28 ,   2242,51 ,   2293,14 ,   2307,35 ,   2242,51 ,   2293,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   3413,42 ,      13,5 ,       4,0 ,     661,5 ,     673,8 ,     2,     0,     1,     6,     7 }, // Danish/Latin/Greenland
+    {     30,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,       8,5 ,      23,6 ,    681,10 ,     691,9 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Netherlands
+    {     30,     7,    12,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,87,71},      147,4 ,   3474,55 ,       8,5 ,      23,6 ,    681,10 ,     700,5 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Aruba
+    {     30,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     538,9 ,     97,16 ,      37,5 ,      8,10 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,       8,5 ,      23,6 ,    681,10 ,     705,6 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Belgium
+    {     30,     7,   152,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,78,71},      151,4 ,   3529,97 ,       8,5 ,      23,6 ,    681,10 ,     711,7 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Cura Sao
+    {     30,     7,   202,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {83,82,68},        6,1 ,   3626,58 ,       8,5 ,      23,6 ,    681,10 ,     718,8 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Suriname
+    {     30,     7,   255,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3684,61 ,       8,5 ,      23,6 ,    681,10 ,    726,19 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Bonaire
+    {     30,     7,   256,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2342,21 ,   2363,59 ,   2422,14 ,   2342,21 ,   2363,59 ,   2422,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,78,71},      151,4 ,   3529,97 ,       8,5 ,      23,6 ,    681,10 ,    745,12 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Sint Maarten
+    {     31,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,    757,16 ,    773,13 ,     2,     1,     7,     6,     7 }, // English/Latin/United States
+    {     31,     3,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // English/Deseret/United States
+    {     31,     7,     4,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    793,14 ,     2,     1,     7,     6,     7 }, // English/Latin/American Samoa
+    {     31,     7,     7,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,     807,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Anguilla
+    {     31,     7,     9,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,    815,17 ,     2,     1,     7,     6,     7 }, // English/Latin/Antigua And Barbuda
+    {     31,     7,    13,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     210,9 ,     210,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,   2436,25 ,      0,28 ,     28,57 ,   2436,25 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,    832,18 ,     850,9 ,     2,     1,     7,     6,     7 }, // English/Latin/Australia
+    {     31,     7,    14,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       8,5 ,       4,0 ,     786,7 ,     859,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Austria
+    {     31,     7,    16,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,83,68},        6,1 ,   3930,53 ,       4,4 ,       4,0 ,     786,7 ,     866,7 ,     2,     1,     7,     6,     7 }, // English/Latin/Bahamas
+    {     31,     7,    19,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,66,68},        6,1 ,   3983,56 ,       4,4 ,       4,0 ,     786,7 ,     873,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Barbados
+    {     31,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,      27,8 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     786,7 ,     881,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Belgium
+    {     31,     7,    22,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,90,68},        6,1 ,   4039,47 ,       4,4 ,       4,0 ,     786,7 ,     888,6 ,     2,     1,     7,     6,     7 }, // English/Latin/Belize
+    {     31,     7,    24,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,77,68},        6,1 ,   4086,53 ,       4,4 ,       4,0 ,     786,7 ,     894,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Bermuda
+    {     31,     7,    28,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,87,80},      158,1 ,   4139,50 ,       4,4 ,       4,0 ,     786,7 ,     901,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Botswana
+    {     31,     7,    31,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    909,30 ,     2,     1,     1,     6,     7 }, // English/Latin/British Indian Ocean Territory
+    {     31,     7,    35,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {66,73,70},      159,3 ,   4189,53 ,       4,4 ,       4,0 ,     786,7 ,     939,7 ,     0,     0,     1,     6,     7 }, // English/Latin/Burundi
+    {     31,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   4242,83 ,       4,4 ,       4,0 ,     786,7 ,     946,8 ,     0,     0,     1,     6,     7 }, // English/Latin/Cameroon
+    {     31,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     53,10 ,     35,18 ,      18,7 ,     25,12 ,   2461,35 ,     28,57 ,     85,14 ,   2461,35 ,     28,57 ,     85,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {67,65,68},        6,1 ,   4325,53 ,       4,4 ,       4,0 ,    954,16 ,     970,6 ,     2,     0,     7,     6,     7 }, // English/Latin/Canada
+    {     31,     7,    40,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {75,89,68},        6,1 ,   4378,71 ,       4,4 ,       4,0 ,     786,7 ,    976,14 ,     2,     1,     1,     6,     7 }, // English/Latin/Cayman Islands
+    {     31,     7,    45,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,    990,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Christmas Island
+    {     31,     7,    46,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,   1006,23 ,     2,     1,     1,     6,     7 }, // English/Latin/Cocos Islands
+    {     31,     7,    51,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,   1029,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Cook Islands
+    {     31,     7,    56,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     786,7 ,    1041,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Cyprus
+    {     31,     7,    58,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,     228,5 ,    233,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   4511,44 ,      13,5 ,       4,0 ,     786,7 ,    1047,7 ,     2,     0,     1,     6,     7 }, // English/Latin/Denmark
+    {     31,     7,    60,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,    1054,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Dominica
+    {     31,     7,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,82,78},       41,3 ,   4555,50 ,       4,4 ,       4,0 ,     786,7 ,    1062,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Eritrea
+    {     31,     7,    70,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {70,75,80},      119,1 ,   4605,74 ,       4,4 ,       4,0 ,     786,7 ,   1069,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Falkland Islands
+    {     31,     7,    72,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {70,74,68},        6,1 ,   4679,47 ,       4,4 ,       4,0 ,     786,7 ,    1085,4 ,     2,     1,     1,     6,     7 }, // English/Latin/Fiji
+    {     31,     7,    73,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,     243,4 ,     247,9 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     786,7 ,    1089,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Finland
+    {     31,     7,    75,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     786,7 ,    1096,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Guernsey
+    {     31,     7,    80,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,77,68},      162,1 ,   4758,50 ,       4,4 ,       4,0 ,     786,7 ,    1104,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Gambia
+    {     31,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     786,7 ,    1110,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Germany
+    {     31,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,   4808,47 ,       4,4 ,       4,0 ,     786,7 ,    1117,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Ghana
+    {     31,     7,    84,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,73,80},      119,1 ,   4855,53 ,       4,4 ,       4,0 ,     786,7 ,    1122,9 ,     2,     1,     1,     6,     7 }, // English/Latin/Gibraltar
+    {     31,     7,    87,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,    1131,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Grenada
+    {     31,     7,    89,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    1138,4 ,     2,     1,     7,     6,     7 }, // English/Latin/Guam
+    {     31,     7,    93,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,89,68},        6,1 ,   4908,56 ,       4,4 ,       4,0 ,     786,7 ,    1142,6 ,     2,     0,     1,     6,     7 }, // English/Latin/Guyana
+    {     31,     7,    97,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     415,8 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {72,75,68},      166,3 ,   4964,56 ,       4,4 ,       4,0 ,     786,7 ,   1148,19 ,     2,     1,     7,     6,     7 }, // English/Latin/Hong Kong
+    {     31,     7,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,      27,8 ,    192,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   5020,44 ,       8,5 ,       4,0 ,     786,7 ,    1167,5 ,     2,     1,     7,     7,     7 }, // English/Latin/India
+    {     31,     7,   104,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     786,7 ,    1172,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Ireland
+    {     31,     7,   105,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      55,4 ,      59,9 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {73,76,83},       49,1 ,   5064,62 ,       4,4 ,       4,0 ,     786,7 ,    1179,6 ,     2,     1,     7,     5,     6 }, // English/Latin/Israel
+    {     31,     7,   107,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {74,77,68},        6,1 ,   5126,53 ,       4,4 ,       4,0 ,     786,7 ,    1185,7 ,     2,     1,     7,     6,     7 }, // English/Latin/Jamaica
+    {     31,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,   5179,53 ,       4,4 ,       4,0 ,     786,7 ,    1192,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Kenya
+    {     31,     7,   112,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,    1197,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Kiribati
+    {     31,     7,   120,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,   5232,61 ,       4,4 ,       4,0 ,     786,7 ,    1205,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Lesotho
+    {     31,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,   5293,53 ,       4,4 ,       4,0 ,     786,7 ,    1212,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Liberia
+    {     31,     7,   126,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,79,80},      134,4 ,   5346,53 ,       4,4 ,       4,0 ,     786,7 ,   1219,15 ,     2,     1,     7,     6,     7 }, // English/Latin/Macau
+    {     31,     7,   128,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,71,65},      169,2 ,   5399,54 ,       4,4 ,       4,0 ,     786,7 ,   1234,10 ,     0,     0,     1,     6,     7 }, // English/Latin/Madagascar
+    {     31,     7,   129,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,87,75},      171,2 ,   5453,53 ,       4,4 ,       4,0 ,     786,7 ,    1244,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Malawi
+    {     31,     7,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,89,82},      173,2 ,   5506,59 ,       4,4 ,       4,0 ,     786,7 ,    1250,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Malaysia
+    {     31,     7,   133,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     786,7 ,    1258,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Malta
+    {     31,     7,   134,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1263,16 ,     2,     1,     7,     6,     7 }, // English/Latin/Marshall Islands
+    {     31,     7,   137,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,85,82},      175,2 ,   5565,53 ,       4,4 ,       4,0 ,     786,7 ,    1279,9 ,     2,     0,     1,     6,     7 }, // English/Latin/Mauritius
+    {     31,     7,   140,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1288,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Micronesia
+    {     31,     7,   144,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,   1298,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Montserrat
+    {     31,     7,   148,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,   5618,53 ,       4,4 ,       4,0 ,     786,7 ,    1308,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Namibia
+    {     31,     7,   149,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,    1315,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Nauru
+    {     31,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       8,5 ,      23,6 ,     786,7 ,   1320,11 ,     2,     1,     1,     6,     7 }, // English/Latin/Netherlands
+    {     31,     7,   154,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,   1331,11 ,     2,     1,     1,     6,     7 }, // English/Latin/New Zealand
+    {     31,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,   5671,50 ,       4,4 ,       4,0 ,     786,7 ,    1342,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Nigeria
+    {     31,     7,   158,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,    1349,4 ,     2,     1,     1,     6,     7 }, // English/Latin/Niue
+    {     31,     7,   159,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,   1353,14 ,     2,     1,     1,     6,     7 }, // English/Latin/Norfolk Island
+    {     31,     7,   160,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1367,24 ,     2,     1,     1,     6,     7 }, // English/Latin/Northern Mariana Islands
+    {     31,     7,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,75,82},      175,2 ,   5721,53 ,       4,4 ,       4,0 ,     786,7 ,    1391,8 ,     2,     0,     7,     6,     7 }, // English/Latin/Pakistan
+    {     31,     7,   164,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    1399,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Palau
+    {     31,     7,   167,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,71,75},      131,1 ,   5774,73 ,       4,4 ,       4,0 ,     786,7 ,   1404,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Papua New Guinea
+    {     31,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      178,1 ,   5847,53 ,       4,4 ,       4,0 ,     786,7 ,   1420,11 ,     2,     1,     7,     6,     7 }, // English/Latin/Philippines
+    {     31,     7,   171,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,   1431,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Pitcairn
+    {     31,     7,   174,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1447,11 ,     2,     1,     7,     6,     7 }, // English/Latin/Puerto Rico
+    {     31,     7,   179,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {82,87,70},      179,2 ,   5900,47 ,       4,4 ,       4,0 ,     786,7 ,    1458,6 ,     0,     0,     1,     6,     7 }, // English/Latin/Rwanda
+    {     31,     7,   180,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,   1464,17 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Kitts And Nevis
+    {     31,     7,   181,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,    1481,9 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Lucia
+    {     31,     7,   182,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     786,7 ,   1490,24 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Vincent And The Grenadines
+    {     31,     7,   183,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {87,83,84},      181,3 ,   5947,40 ,       4,4 ,       4,0 ,     786,7 ,    1514,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Samoa
+    {     31,     7,   188,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,67,82},      184,2 ,   5987,59 ,       4,4 ,       4,0 ,     786,7 ,   1519,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Seychelles
+    {     31,     7,   189,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,76,76},      186,2 ,   6046,68 ,       4,4 ,       4,0 ,     786,7 ,   1529,12 ,     0,     0,     1,     6,     7 }, // English/Latin/Sierra Leone
+    {     31,     7,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,   6114,56 ,       4,4 ,       4,0 ,     786,7 ,    1541,9 ,     2,     1,     7,     6,     7 }, // English/Latin/Singapore
+    {     31,     7,   192,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,      29,7 ,     786,7 ,    1550,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Slovenia
+    {     31,     7,   193,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,66,68},        6,1 ,   6170,74 ,       4,4 ,       4,0 ,     786,7 ,   1558,15 ,     2,     1,     1,     6,     7 }, // English/Latin/Solomon Islands
+    {     31,     7,   195,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    578,10 ,    553,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,   5232,61 ,       4,4 ,       4,0 ,     786,7 ,   1573,12 ,     2,     1,     7,     6,     7 }, // English/Latin/South Africa
+    {     31,     7,   199,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,72,80},      119,1 ,   6244,56 ,       4,4 ,       4,0 ,     786,7 ,   1585,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Helena
+    {     31,     7,   201,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,68,71},        0,0 ,   6300,50 ,       4,4 ,       4,0 ,     786,7 ,    1595,5 ,     2,     1,     6,     5,     6 }, // English/Latin/Sudan
+    {     31,     7,   204,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,90,76},      188,1 ,   6350,53 ,       4,4 ,       4,0 ,     786,7 ,    1600,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Swaziland
+    {     31,     7,   205,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     53,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,   6403,47 ,      13,5 ,       4,0 ,     786,7 ,    1608,6 ,     2,     0,     1,     6,     7 }, // English/Latin/Sweden
+    {     31,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,   6450,41 ,       8,5 ,      36,5 ,     786,7 ,   1614,11 ,     2,     0,     1,     6,     7 }, // English/Latin/Switzerland
+    {     31,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,   6491,62 ,       4,4 ,       4,0 ,     786,7 ,    1625,8 ,     2,     0,     1,     6,     7 }, // English/Latin/Tanzania
+    {     31,     7,   213,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     786,7 ,    1633,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Tokelau
+    {     31,     7,   214,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,79,80},      194,2 ,   6553,49 ,       4,4 ,       4,0 ,     786,7 ,    1640,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Tonga
+    {     31,     7,   215,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,84,68},        6,1 ,   6602,80 ,       4,4 ,       4,0 ,     786,7 ,   1645,17 ,     2,     1,     7,     6,     7 }, // English/Latin/Trinidad And Tobago
+    {     31,     7,   219,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1662,22 ,     2,     1,     1,     6,     7 }, // English/Latin/Turks And Caicos Islands
+    {     31,     7,   220,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     786,7 ,    1684,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Tuvalu
+    {     31,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,   6682,56 ,       4,4 ,       4,0 ,     786,7 ,    1690,6 ,     0,     0,     1,     6,     7 }, // English/Latin/Uganda
+    {     31,     7,   223,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {65,69,68},      199,3 ,   6738,55 ,       4,4 ,       4,0 ,     786,7 ,   1696,20 ,     2,     1,     6,     5,     6 }, // English/Latin/United Arab Emirates
+    {     31,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     210,9 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   6793,47 ,       4,4 ,       4,0 ,   1716,15 ,   1731,14 ,     2,     1,     1,     6,     7 }, // English/Latin/United Kingdom
+    {     31,     7,   226,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1745,21 ,     2,     1,     7,     6,     7 }, // English/Latin/United States Minor Outlying Islands
+    {     31,     7,   229,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {86,85,86},      202,2 ,   6840,44 ,       4,4 ,       4,0 ,     786,7 ,    1766,7 ,     0,     0,     1,     6,     7 }, // English/Latin/Vanuatu
+    {     31,     7,   233,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1773,22 ,     2,     1,     1,     6,     7 }, // English/Latin/British Virgin Islands
+    {     31,     7,   234,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1795,19 ,     2,     1,     7,     6,     7 }, // English/Latin/United States Virgin Islands
+    {     31,     7,   239,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,77,87},      131,1 ,   6884,50 ,       4,4 ,       4,0 ,     786,7 ,    1814,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Zambia
+    {     31,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     415,8 ,    553,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,    1820,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Zimbabwe
+    {     31,     7,   249,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,   3745,35 ,       4,4 ,       4,0 ,     786,7 ,   1828,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Diego Garcia
+    {     31,     7,   251,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     786,7 ,   1840,11 ,     2,     1,     1,     6,     7 }, // English/Latin/Isle Of Man
+    {     31,     7,   252,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     786,7 ,    1851,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Jersey
+    {     31,     7,   254,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,83,80},      119,1 ,   6934,68 ,       4,4 ,       4,0 ,     786,7 ,   1857,11 ,     2,     1,     1,     6,     7 }, // English/Latin/South Sudan
+    {     31,     7,   256,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,78,71},      151,4 ,   7002,95 ,       4,4 ,       4,0 ,     786,7 ,   1868,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Sint Maarten
+    {     31,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       4,4 ,       4,0 ,     786,7 ,    1880,5 ,     2,     1,     1,     6,     7 }, // English/Latin/World
+    {     31,     7,   261,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    200,10 ,     210,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,     786,7 ,    1885,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Europe
+    {     32,     7,   260,    44,   160,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     219,9 ,     219,9 ,     588,8 ,    596,26 ,      37,5 ,    256,25 ,   2496,21 ,   2517,51 ,   2568,14 ,   2496,21 ,   2517,51 ,   2568,14 ,      70,3 ,      67,3 ,  308,6 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      41,6 ,       4,0 ,    1891,9 ,    1900,5 ,     2,     1,     1,     6,     7 }, // Esperanto/Latin/World
+    {     33,     7,    68,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     228,8 ,     228,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   2582,14 ,   2596,63 ,   2582,14 ,   2582,14 ,   2596,63 ,   2582,14 ,       0,2 ,       0,2 ,  314,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   7097,20 ,      13,5 ,       4,0 ,    1905,5 ,    1910,5 ,     2,     1,     1,     6,     7 }, // Estonian/Latin/Estonia
+    {     34,     7,    71,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   2659,28 ,   2687,74 ,   2761,14 ,   2775,35 ,   2687,74 ,   2761,14 ,       0,2 ,       0,2 ,  320,3 ,   5,17 ,  22,23 , {68,75,75},      189,2 ,   7117,43 ,      13,5 ,       4,0 ,    1915,8 ,    1923,7 ,     2,     0,     1,     6,     7 }, // Faroese/Latin/Faroe Islands
+    {     34,     7,    58,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   2659,28 ,   2687,74 ,   2761,14 ,   2775,35 ,   2687,74 ,   2761,14 ,       0,2 ,       0,2 ,  320,3 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   7117,43 ,      13,5 ,       4,0 ,    1915,8 ,     666,7 ,     2,     0,     1,     6,     7 }, // Faroese/Latin/Denmark
+    {     36,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     228,8 ,     228,8 ,     640,8 ,    478,17 ,     243,4 ,     247,9 ,   2810,21 ,   2831,67 ,   2898,14 ,   2810,21 ,   2912,81 ,   2898,14 ,      73,3 ,      70,3 ,  323,5 , 328,17 , 345,23 , {69,85,82},       14,1 ,   7160,20 ,      13,5 ,       4,0 ,    1930,5 ,    1935,5 ,     2,     1,     1,     6,     7 }, // Finnish/Latin/Finland
+    {     37,     7,    74,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,    1948,6 ,     2,     1,     1,     6,     7 }, // French/Latin/France
+    {     37,     7,     3,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {68,90,68},      204,2 ,   7180,51 ,      13,5 ,       4,0 ,    1940,8 ,    1954,7 ,     2,     1,     6,     5,     6 }, // French/Latin/Algeria
+    {     37,     7,    21,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,     571,7 ,     97,16 ,      37,5 ,    281,23 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,    1961,8 ,     2,     1,     1,     6,     7 }, // French/Latin/Belgium
+    {     37,     7,    23,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    1969,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Benin
+    {     37,     7,    34,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,   1974,12 ,     0,     0,     1,     6,     7 }, // French/Latin/Burkina Faso
+    {     37,     7,    35,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {66,73,70},      159,3 ,   7290,53 ,      13,5 ,       4,0 ,    1940,8 ,     939,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Burundi
+    {     37,     7,    37,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,      76,5 ,      73,4 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,    1986,8 ,     0,     0,     1,     6,     7 }, // French/Latin/Cameroon
+    {     37,     7,    38,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8221,    8220,       0,6 ,       0,6 ,     236,8 ,     236,8 ,     588,8 ,     97,16 ,     304,9 ,    313,24 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,      64,4 ,      61,4 ,  368,6 , 374,17 , 391,23 , {67,65,68},        6,1 ,   7399,54 ,      47,6 ,       4,0 ,   1994,17 ,     970,6 ,     2,     0,     7,     6,     7 }, // French/Latin/Canada
+    {     37,     7,    41,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,   2011,25 ,     0,     0,     1,     6,     7 }, // French/Latin/Central African Republic
+    {     37,     7,    42,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,    2036,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Chad
+    {     37,     7,    48,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {75,77,70},       36,2 ,   7453,51 ,      13,5 ,       4,0 ,    1940,8 ,    2041,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Comoros
+    {     37,     7,    49,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {67,68,70},      209,2 ,   7504,53 ,      13,5 ,       4,0 ,    1940,8 ,   2048,14 ,     2,     1,     1,     6,     7 }, // French/Latin/Congo Kinshasa
+    {     37,     7,    50,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,   2062,17 ,     0,     0,     1,     6,     7 }, // French/Latin/Congo Brazzaville
+    {     37,     7,    53,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,   2079,13 ,     0,     0,     1,     6,     7 }, // French/Latin/Ivory Coast
+    {     37,     7,    59,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {68,74,70},       38,3 ,   7557,57 ,      13,5 ,       4,0 ,    1940,8 ,    2092,8 ,     0,     0,     6,     6,     7 }, // French/Latin/Djibouti
+    {     37,     7,    66,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,   2100,18 ,     0,     0,     1,     6,     7 }, // French/Latin/Equatorial Guinea
+    {     37,     7,    76,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2118,16 ,     2,     1,     1,     6,     7 }, // French/Latin/French Guiana
+    {     37,     7,    77,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,80,70},      211,4 ,   7614,35 ,      13,5 ,       4,0 ,    1940,8 ,   2134,19 ,     0,     0,     1,     6,     7 }, // French/Latin/French Polynesia
+    {     37,     7,    79,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,65,70},       32,4 ,   7343,56 ,      13,5 ,       4,0 ,    1940,8 ,    2153,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Gabon
+    {     37,     7,    88,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2158,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Guadeloupe
+    {     37,     7,    91,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {71,78,70},      215,2 ,   7649,48 ,      13,5 ,       4,0 ,    1940,8 ,    2168,6 ,     0,     0,     1,     6,     7 }, // French/Latin/Guinea
+    {     37,     7,    94,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {72,84,71},      217,1 ,   7697,57 ,      13,5 ,       4,0 ,    1940,8 ,    2174,5 ,     2,     1,     1,     6,     7 }, // French/Latin/Haiti
+    {     37,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2179,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Luxembourg
+    {     37,     7,   128,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {77,71,65},      169,2 ,   7754,54 ,      13,5 ,       4,0 ,    1940,8 ,   1234,10 ,     0,     0,     1,     6,     7 }, // French/Latin/Madagascar
+    {     37,     7,   132,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    2189,4 ,     0,     0,     1,     6,     7 }, // French/Latin/Mali
+    {     37,     7,   135,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2193,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Martinique
+    {     37,     7,   136,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {77,82,85},      218,2 ,   7808,66 ,      13,5 ,       4,0 ,    1940,8 ,   2203,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Mauritania
+    {     37,     7,   137,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {77,85,82},      175,2 ,   7874,63 ,      13,5 ,       4,0 ,    1940,8 ,    2213,7 ,     2,     0,     1,     6,     7 }, // French/Latin/Mauritius
+    {     37,     7,   138,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,    2220,7 ,     2,     1,     1,     6,     7 }, // French/Latin/Mayotte
+    {     37,     7,   142,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,    2227,6 ,     2,     1,     1,     6,     7 }, // French/Latin/Monaco
+    {     37,     7,   145,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,      64,4 ,      61,4 ,  368,6 , 374,17 , 391,23 , {77,65,68},        0,0 ,   7937,54 ,      13,5 ,       4,0 ,    1940,8 ,    2233,5 ,     2,     1,     1,     6,     7 }, // French/Latin/Morocco
+    {     37,     7,   153,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,80,70},      211,4 ,   7614,35 ,      13,5 ,       4,0 ,    1940,8 ,   2238,18 ,     0,     0,     1,     6,     7 }, // French/Latin/New Caledonia
+    {     37,     7,   156,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    2256,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Niger
+    {     37,     7,   176,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2261,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Reunion
+    {     37,     7,   179,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {82,87,70},      179,2 ,   7991,50 ,      13,5 ,       4,0 ,    1940,8 ,    1458,6 ,     0,     0,     1,     6,     7 }, // French/Latin/Rwanda
+    {     37,     7,   187,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    2271,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Senegal
+    {     37,     7,   188,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {83,67,82},      184,2 ,   8041,71 ,      13,5 ,       4,0 ,    1940,8 ,   1519,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Seychelles
+    {     37,     7,   200,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2278,24 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Pierre And Miquelon
+    {     37,     7,   206,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     236,8 ,     236,8 ,     156,8 ,     10,17 ,      37,5 ,    337,14 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {67,72,70},        0,0 ,   8112,45 ,      13,5 ,       4,0 ,   2302,15 ,    2317,6 ,     2,     0,     1,     6,     7 }, // French/Latin/Switzerland
+    {     37,     7,   207,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {83,89,80},      220,2 ,   8157,51 ,      13,5 ,       4,0 ,    1940,8 ,    2323,5 ,     0,     0,     6,     5,     6 }, // French/Latin/Syria
+    {     37,     7,   212,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,79,70},      206,3 ,   7231,59 ,      13,5 ,       4,0 ,    1940,8 ,    2328,4 ,     0,     0,     1,     6,     7 }, // French/Latin/Togo
+    {     37,     7,   216,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {84,78,68},      222,2 ,   8208,51 ,      13,5 ,       4,0 ,    1940,8 ,    2332,7 ,     3,     0,     1,     6,     7 }, // French/Latin/Tunisia
+    {     37,     7,   229,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {86,85,86},      202,2 ,   8259,51 ,      13,5 ,       4,0 ,    1940,8 ,    1766,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Vanuatu
+    {     37,     7,   235,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {88,80,70},      211,4 ,   7614,35 ,      13,5 ,       4,0 ,    1940,8 ,   2339,16 ,     0,     0,     1,     6,     7 }, // French/Latin/Wallis And Futuna Islands
+    {     37,     7,   244,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2355,16 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Barthelemy
+    {     37,     7,   245,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     236,8 ,     236,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   2993,35 ,   3028,52 ,   3080,14 ,   2993,35 ,   3028,52 ,   3080,14 ,       0,2 ,       0,2 ,  368,6 , 374,17 , 391,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1940,8 ,   2371,12 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Martin
+    {     38,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     339,8 ,     97,16 ,      37,5 ,      8,10 ,   3094,21 ,   3115,54 ,     85,14 ,   3094,21 ,   3115,54 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,       8,5 ,      53,6 ,    2383,5 ,    2388,8 ,     2,     1,     1,     6,     7 }, // Western Frisian/Latin/Netherlands
+    {     39,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    244,10 ,    244,10 ,    119,10 ,    648,21 ,      37,5 ,      8,10 ,   3169,28 ,   3197,69 ,   3266,14 ,   3169,28 ,   3197,69 ,   3266,14 ,      81,1 ,      77,1 ,  414,6 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   8310,86 ,       4,4 ,       4,0 ,    2396,8 ,   2404,22 ,     2,     1,     1,     6,     7 }, // Gaelic/Latin/United Kingdom
+    {     40,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   3280,35 ,   3315,49 ,   3364,14 ,   3378,35 ,   3413,49 ,   3462,21 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,    2426,6 ,    2432,6 ,     2,     1,     1,     6,     7 }, // Galician/Latin/Spain
+    {     41,    15,    81,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,     171,     187,       0,6 ,       0,6 ,     261,8 ,     261,8 ,     156,8 ,    696,19 ,      37,5 ,      8,10 ,   3483,28 ,   3511,62 ,   3573,14 ,   3483,28 ,   3511,62 ,   3573,14 ,       0,2 ,       0,2 ,  420,5 , 425,37 ,  22,23 , {71,69,76},      224,1 ,   8396,43 ,      13,5 ,       4,0 ,    2438,7 ,   2445,10 ,     2,     1,     1,     6,     7 }, // Georgian/Georgian/Georgia
+    {     42,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,    2455,7 ,   2462,11 ,     2,     1,     1,     6,     7 }, // German/Latin/Germany
+    {     42,     7,    14,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,       8,5 ,       4,0 ,   2473,24 ,   2497,10 ,     2,     1,     1,     6,     7 }, // German/Latin/Austria
+    {     42,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,    2455,7 ,    2507,7 ,     2,     1,     1,     6,     7 }, // German/Latin/Belgium
+    {     42,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,    2455,7 ,    2514,7 ,     2,     1,     1,     6,     7 }, // German/Latin/Italy
+    {     42,     7,   123,    46,  8217,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,   8458,58 ,       8,5 ,       4,0 ,    2455,7 ,   2521,13 ,     2,     0,     1,     6,     7 }, // German/Latin/Liechtenstein
+    {     42,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,    2455,7 ,    2534,9 ,     2,     1,     1,     6,     7 }, // German/Latin/Luxembourg
+    {     42,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3587,21 ,   3608,60 ,   3668,14 ,   3682,28 ,   3608,60 ,   3668,14 ,       0,2 ,       0,2 ,  462,5 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,   8458,58 ,       8,5 ,      36,5 ,   2543,21 ,    2564,7 ,     2,     0,     1,     6,     7 }, // German/Latin/Switzerland
+    {     43,    16,    85,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     278,9 ,     278,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   3710,28 ,   3738,55 ,   3793,14 ,   3710,28 ,   3738,55 ,   3793,14 ,      82,4 ,      78,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8516,19 ,      13,5 ,       4,0 ,    2571,8 ,    2579,6 ,     2,     1,     1,     6,     7 }, // Greek/Greek/Greece
+    {     43,    16,    56,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     278,9 ,     278,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   3710,28 ,   3738,55 ,   3793,14 ,   3710,28 ,   3738,55 ,   3793,14 ,      82,4 ,      78,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8516,19 ,      13,5 ,       4,0 ,    2571,8 ,    2585,6 ,     2,     1,     1,     6,     7 }, // Greek/Greek/Cyprus
+    {     44,     7,    86,    44,    46,    59,    37,    48,  8722,    43,   101,     187,     171,    8250,    8249,       0,6 ,       0,6 ,    287,11 ,    287,11 ,     53,10 ,     80,17 ,     228,5 ,    233,10 ,   3807,28 ,   3835,98 ,   3933,14 ,   3807,28 ,   3835,98 ,   3933,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {68,75,75},      144,3 ,   8535,62 ,       4,4 ,      59,5 ,   2591,11 ,   2602,16 ,     2,     0,     1,     6,     7 }, // Greenlandic/Latin/Greenland
+    {     45,     7,   168,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,89,71},      228,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     7,     6,     7 }, // Guarani/Latin/Paraguay
+    {     46,    17,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     298,9 ,     298,9 ,     269,6 ,    192,18 ,     351,8 ,    359,13 ,   3947,32 ,   3979,53 ,   4032,19 ,   3947,32 ,   3979,53 ,   4032,19 ,       0,2 ,       0,2 ,  467,4 , 471,19 ,  22,23 , {73,78,82},      121,1 ,   8597,46 ,       4,4 ,       4,0 ,    2618,7 ,    2625,4 ,     2,     1,     7,     7,     7 }, // Gujarati/Gujarati/India
+    {     47,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     307,8 ,     307,8 ,     269,6 ,    715,17 ,      37,5 ,      8,10 ,   4051,28 ,   4079,52 ,   4131,14 ,   4051,28 ,   4079,52 ,   4131,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,   8643,12 ,       8,5 ,       4,0 ,    2629,5 ,    2634,8 ,     2,     1,     1,     6,     7 }, // Hausa/Latin/Nigeria
+    {     47,     1,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Hausa/Arabic/Nigeria
+    {     47,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     307,8 ,     307,8 ,     269,6 ,    715,17 ,      18,7 ,     25,12 ,   4051,28 ,   4079,52 ,   4131,14 ,   4051,28 ,   4079,52 ,   4131,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,       0,7 ,       8,5 ,       4,0 ,    2629,5 ,    2642,4 ,     2,     1,     1,     6,     7 }, // Hausa/Latin/Ghana
+    {     47,     7,   156,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     307,8 ,     307,8 ,     269,6 ,    715,17 ,      37,5 ,      8,10 ,   4051,28 ,   4079,52 ,   4131,14 ,   4051,28 ,   4079,52 ,   4131,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,   8655,36 ,       8,5 ,       4,0 ,    2629,5 ,    2646,5 ,     0,     0,     1,     6,     7 }, // Hausa/Latin/Niger
+    {     48,    18,   105,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     315,6 ,     315,6 ,     640,8 ,    732,18 ,      55,4 ,      59,9 ,   4145,46 ,   4191,65 ,   4256,21 ,   4145,46 ,   4191,65 ,   4256,21 ,      92,6 ,      87,5 ,  490,4 ,   5,17 ,  22,23 , {73,76,83},       49,1 ,   8691,54 ,      64,6 ,      70,8 ,    2651,5 ,    2656,5 ,     2,     1,     7,     5,     6 }, // Hebrew/Hebrew/Israel
+    {     49,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     321,9 ,     330,8 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   4277,32 ,   4309,53 ,   4362,19 ,   4277,32 ,   4309,53 ,   4362,19 ,      68,2 ,      65,2 ,  494,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   8745,42 ,       4,4 ,       4,0 ,    2661,6 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Hindi/Devanagari/India
+    {     50,     7,    98,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     187,     171,       0,6 ,       0,6 ,     338,8 ,     338,8 ,    750,13 ,    763,19 ,      55,4 ,      59,9 ,   4381,19 ,   4400,52 ,   4452,17 ,   4381,19 ,   4400,52 ,   4452,17 ,      98,3 ,      92,3 ,  498,4 ,   5,17 ,  22,23 , {72,85,70},      229,2 ,   8787,46 ,      13,5 ,       4,0 ,    2671,6 ,   2677,12 ,     2,     0,     1,     6,     7 }, // Hungarian/Latin/Hungary
+    {     51,     7,    99,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     192,8 ,     192,8 ,     640,8 ,    622,18 ,      37,5 ,      8,10 ,   4469,35 ,   4504,81 ,   4585,14 ,   4469,35 ,   4504,81 ,   4585,14 ,     101,4 ,      95,4 ,  502,4 ,   5,17 ,  22,23 , {73,83,75},      189,2 ,   8833,49 ,      13,5 ,       4,0 ,    2689,8 ,    2697,6 ,     0,     0,     1,     6,     7 }, // Icelandic/Latin/Iceland
+    {     52,     7,   101,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    346,10 ,     356,9 ,      27,8 ,    553,18 ,     228,5 ,    233,10 ,   4599,28 ,   4627,43 ,   4670,14 ,   4599,28 ,   4627,43 ,   4670,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,68,82},      231,2 ,   8882,39 ,       4,4 ,       4,0 ,    2703,9 ,    2703,9 ,     2,     0,     7,     6,     7 }, // Indonesian/Latin/Indonesia
+    {     53,     7,   260,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,    528,10 ,    782,26 ,      37,5 ,      8,10 ,   4684,28 ,   4712,57 ,   4769,14 ,   4684,28 ,   4712,57 ,   4769,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,   2712,11 ,    2723,5 ,     2,     1,     1,     6,     7 }, // Interlingua/Latin/World
+    {     55,    44,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      233,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Inuktitut/Canadian Aboriginal/Canada
+    {     55,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      233,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Inuktitut/Latin/Canada
+    {     57,     7,   104,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    365,11 ,    244,10 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   4783,37 ,   4820,75 ,   4895,14 ,   4783,37 ,   4820,75 ,   4895,14 ,     105,4 ,      99,4 ,  506,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8921,31 ,       4,4 ,       4,0 ,    2728,7 ,    2735,4 ,     2,     1,     1,     6,     7 }, // Irish/Latin/Ireland
+    {     58,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   4909,28 ,   4937,57 ,   4994,14 ,   4909,28 ,   4937,57 ,   4994,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    2739,8 ,    2747,6 ,     2,     1,     1,     6,     7 }, // Italian/Latin/Italy
+    {     58,     7,   184,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   4909,28 ,   4937,57 ,   4994,14 ,   4909,28 ,   4937,57 ,   4994,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    2739,8 ,   2753,10 ,     2,     1,     1,     6,     7 }, // Italian/Latin/San Marino
+    {     58,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     254,7 ,     254,7 ,     156,8 ,     10,17 ,      37,5 ,      8,10 ,   4909,28 ,   4937,57 ,   4994,14 ,   4909,28 ,   4937,57 ,   4994,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,   8971,53 ,       8,5 ,      36,5 ,    2739,8 ,    2763,8 ,     2,     0,     1,     6,     7 }, // Italian/Latin/Switzerland
+    {     58,     7,   230,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   4909,28 ,   4937,57 ,   4994,14 ,   4909,28 ,   4937,57 ,   4994,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    2739,8 ,   2771,18 ,     2,     1,     1,     6,     7 }, // Italian/Latin/Vatican City State
+    {     59,    19,   108,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,     170,5 ,     170,5 ,    578,10 ,    402,13 ,      55,4 ,    372,10 ,   5008,14 ,   5022,28 ,   5008,14 ,   5008,14 ,   5022,28 ,   5008,14 ,     109,2 ,     103,2 ,  512,3 ,   5,17 ,  22,23 , {74,80,89},      133,1 ,   9024,11 ,       4,4 ,       4,0 ,    2789,3 ,    2792,2 ,     0,     0,     7,     6,     7 }, // Japanese/Japanese/Japan
+    {     60,     7,   101,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    376,10 ,     386,9 ,    528,10 ,     10,17 ,      37,5 ,      8,10 ,   5050,28 ,   5078,41 ,   5119,14 ,   5050,28 ,   5078,41 ,   5119,14 ,     111,4 ,     105,5 ,  515,4 ,   5,17 ,  22,23 , {73,68,82},      231,2 ,   8882,39 ,       8,5 ,       4,0 ,    2794,4 ,    2798,9 ,     2,     0,     7,     6,     7 }, // Javanese/Latin/Indonesia
+    {     61,    21,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    395,12 ,    407,11 ,     269,6 ,     35,18 ,     351,8 ,    359,13 ,   5133,33 ,   5166,54 ,   5220,20 ,   5133,33 ,   5166,54 ,   5220,20 ,     115,9 ,     110,7 ,  519,8 , 527,35 ,  22,23 , {73,78,82},      121,1 ,   9035,49 ,       4,4 ,       4,0 ,    2807,5 ,    2812,4 ,     2,     1,     7,     7,     7 }, // Kannada/Kannada/India
+    {     62,     1,   100,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,   5240,50 ,   5290,52 ,   5342,14 ,   5240,50 ,   5290,52 ,   5342,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   9084,23 ,       8,5 ,       4,0 ,    2816,5 ,    2821,9 ,     2,     1,     7,     7,     7 }, // Kashmiri/Arabic/India
+    {     63,     2,   110,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,    418,10 ,     156,8 ,    808,22 ,      37,5 ,      8,10 ,   5356,21 ,   5377,56 ,   5433,14 ,   5356,21 ,   5377,56 ,   5433,14 ,       0,2 ,       0,2 ,  562,4 , 566,17 , 583,23 , {75,90,84},      236,1 ,   9107,58 ,      13,5 ,       4,0 ,   2830,10 ,    2840,9 ,     2,     1,     1,     6,     7 }, // Kazakh/Cyrillic/Kazakhstan
+    {     64,     7,   179,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,   5447,35 ,   5482,84 ,     85,14 ,   5447,35 ,   5482,84 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,87,70},      179,2 ,       0,7 ,       8,5 ,       4,0 ,   2849,11 ,    2860,8 ,     0,     0,     1,     6,     7 }, // Kinyarwanda/Latin/Rwanda
+    {     65,     2,   116,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,    428,10 ,    428,10 ,     269,6 ,    830,23 ,      37,5 ,      8,10 ,   5566,38 ,   5604,57 ,   5661,14 ,   5566,38 ,   5604,57 ,   5661,14 ,     124,5 ,    117,14 ,  562,4 , 606,18 ,  22,23 , {75,71,83},      237,3 ,   9165,52 ,      13,5 ,       4,0 ,    2868,8 ,   2876,10 ,     2,     1,     1,     6,     7 }, // Kirghiz/Cyrillic/Kyrgyzstan
+    {     66,    22,   114,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     438,7 ,     438,7 ,     853,9 ,    862,16 ,     382,7 ,    389,13 ,   5675,14 ,   5689,28 ,   5675,14 ,   5675,14 ,   5689,28 ,   5675,14 ,     129,2 ,     131,2 ,  624,3 ,   5,17 ,  22,23 , {75,82,87},      240,1 ,   9217,19 ,       4,4 ,       4,0 ,    2886,3 ,    2889,4 ,     0,     0,     7,     6,     7 }, // Korean/Korean/South Korea
+    {     66,    22,   113,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     438,7 ,     438,7 ,     853,9 ,    862,16 ,     382,7 ,    389,13 ,   5675,14 ,   5689,28 ,   5675,14 ,   5675,14 ,   5689,28 ,   5675,14 ,     129,2 ,     131,2 ,  624,3 ,   5,17 ,  22,23 , {75,80,87},      240,1 ,   9236,39 ,       4,4 ,       4,0 ,    2886,3 ,   2893,11 ,     0,     0,     1,     6,     7 }, // Korean/Korean/North Korea
+    {     67,     7,   217,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     445,7 ,     445,7 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,   5717,20 ,   5737,42 ,   5779,14 ,   5717,20 ,   5737,42 ,   5779,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {84,82,89},      241,1 ,       0,7 ,      13,5 ,       4,0 ,    2904,5 ,    2909,7 ,     2,     1,     1,     6,     7 }, // Kurdish/Latin/Turkey
+    {     68,     7,    35,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   5793,34 ,   5827,89 ,     85,14 ,   5793,34 ,   5827,89 ,     85,14 ,     131,5 ,     133,5 ,   45,4 ,   5,17 ,  22,23 , {66,73,70},      159,3 ,   9275,27 ,       0,4 ,       4,0 ,    2916,8 ,    2924,8 ,     0,     0,     1,     6,     7 }, // Rundi/Latin/Burundi
+    {     69,    23,   117,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,     452,9 ,     415,8 ,    878,19 ,      55,4 ,    402,24 ,   5916,36 ,   5952,57 ,   6009,17 ,   5916,36 ,   5952,57 ,   6009,17 ,     136,8 ,     138,8 ,   45,4 ,   5,17 ,  22,23 , {76,65,75},      242,1 ,   9302,21 ,       4,4 ,      36,5 ,    2932,3 ,    2932,3 ,     0,     0,     7,     6,     7 }, // Lao/Lao/Laos
+    {     71,     7,   118,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     461,8 ,     461,8 ,     156,8 ,    897,26 ,      37,5 ,      8,10 ,   6026,51 ,   6077,72 ,   6149,14 ,   6163,51 ,   6214,72 ,   6149,14 ,    144,14 ,    146,11 ,  627,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9323,23 ,      13,5 ,       4,0 ,    2935,8 ,    2943,7 ,     2,     1,     1,     6,     7 }, // Latvian/Latin/Latvia
+    {     72,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     469,9 ,     469,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   6286,28 ,  6314,100 ,   6414,14 ,   6286,28 ,  6314,100 ,   6414,14 ,     158,8 ,     157,6 ,   45,4 ,   5,17 ,  22,23 , {67,68,70},      209,2 ,   9346,23 ,      13,5 ,       4,0 ,    2950,7 ,   2957,30 ,     2,     1,     1,     6,     7 }, // Lingala/Latin/Congo Kinshasa
+    {     72,     7,     6,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     469,9 ,     469,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   6286,28 ,  6314,100 ,   6414,14 ,   6286,28 ,  6314,100 ,   6414,14 ,     158,8 ,     157,6 ,   45,4 ,   5,17 ,  22,23 , {65,79,65},      243,2 ,   9369,23 ,      13,5 ,       4,0 ,    2950,7 ,    2987,6 ,     2,     1,     1,     6,     7 }, // Lingala/Latin/Angola
+    {     72,     7,    41,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     469,9 ,     469,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   6286,28 ,  6314,100 ,   6414,14 ,   6286,28 ,  6314,100 ,   6414,14 ,     158,8 ,     157,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   9392,23 ,      13,5 ,       4,0 ,    2950,7 ,   2993,26 ,     0,     0,     1,     6,     7 }, // Lingala/Latin/Central African Republic
+    {     72,     7,    50,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     469,9 ,     469,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   6286,28 ,  6314,100 ,   6414,14 ,   6286,28 ,  6314,100 ,   6414,14 ,     158,8 ,     157,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   9392,23 ,      13,5 ,       4,0 ,    2950,7 ,    3019,5 ,     0,     0,     1,     6,     7 }, // Lingala/Latin/Congo Brazzaville
+    {     73,     7,   124,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,     478,8 ,     478,8 ,     53,10 ,    923,27 ,      37,5 ,      8,10 ,   6428,21 ,   6449,89 ,   6538,14 ,   6428,21 ,   6449,89 ,   6538,14 ,     166,9 ,     163,6 ,  632,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9415,30 ,      13,5 ,       4,0 ,    3024,8 ,    3032,7 ,     2,     1,     1,     6,     7 }, // Lithuanian/Latin/Lithuania
+    {     74,     2,   127,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,     950,7 ,    553,18 ,      37,5 ,      8,10 ,   6552,35 ,   6587,54 ,   1503,14 ,   6641,34 ,   6587,54 ,   1503,14 ,    175,10 ,     169,8 ,  638,5 ,   5,17 ,  22,23 , {77,75,68},      245,3 ,   9445,56 ,      13,5 ,       4,0 ,   3039,10 ,   3049,18 ,     2,     1,     1,     6,     7 }, // Macedonian/Cyrillic/Macedonia
+    {     75,     7,   128,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     97,16 ,      37,5 ,      8,10 ,   6675,34 ,   6709,60 ,   6769,14 ,   6675,34 ,   6709,60 ,   6769,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,71,65},      169,2 ,   9501,13 ,       8,5 ,       4,0 ,    3067,8 ,   3075,12 ,     0,     0,     1,     6,     7 }, // Malagasy/Latin/Madagascar
+    {     76,     7,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     356,9 ,     356,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,   6783,28 ,   6811,43 ,   6854,14 ,   6783,28 ,   6811,43 ,   6854,14 ,     185,2 ,     177,3 ,  643,4 ,   5,17 ,  22,23 , {77,89,82},      173,2 ,   9514,39 ,       4,4 ,       4,0 ,    3087,6 ,    1250,8 ,     2,     1,     1,     6,     7 }, // Malay/Latin/Malaysia
+    {     76,     1,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,89,82},      173,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Malay/Arabic/Malaysia
+    {     76,     7,    32,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     356,9 ,     356,9 ,     571,7 ,    957,12 ,      18,7 ,     25,12 ,   6783,28 ,   6811,43 ,   6854,14 ,   6783,28 ,   6811,43 ,   6854,14 ,     185,2 ,     177,3 ,  643,4 ,   5,17 ,  22,23 , {66,78,68},        6,1 ,   9553,31 ,       8,5 ,       4,0 ,    3087,6 ,    3093,6 ,     2,     1,     1,     6,     7 }, // Malay/Latin/Brunei
+    {     76,     7,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     356,9 ,     356,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,   6783,28 ,   6811,43 ,   6854,14 ,   6783,28 ,   6811,43 ,   6854,14 ,     185,2 ,     177,3 ,  643,4 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,   9584,37 ,       4,4 ,       4,0 ,    3087,6 ,    3099,9 ,     2,     1,     7,     6,     7 }, // Malay/Latin/Singapore
+    {     77,    24,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    486,13 ,    499,12 ,     269,6 ,    969,18 ,      18,7 ,     25,12 ,   6868,41 ,   6909,77 ,   6986,22 ,   6868,41 ,   7008,76 ,   7084,21 ,       0,2 ,       0,2 ,  647,6 , 653,27 ,  22,23 , {73,78,82},      121,1 ,   9621,40 ,       4,4 ,       4,0 ,    3108,6 ,    3114,6 ,     2,     1,     7,     7,     7 }, // Malayalam/Malayalam/India
+    {     78,     7,   133,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     511,8 ,     519,7 ,    119,10 ,    987,23 ,      37,5 ,      8,10 ,   7105,28 ,   7133,63 ,   7196,21 ,   7105,28 ,   7133,63 ,   7217,20 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9661,27 ,       4,4 ,       4,0 ,    3120,5 ,    1258,5 ,     2,     1,     7,     6,     7 }, // Maltese/Latin/Malta
+    {     79,     7,   154,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,     426,4 ,     25,12 ,   7237,27 ,   7264,47 ,   7311,14 ,   7237,27 ,   7264,47 ,   7311,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   9688,41 ,       8,5 ,       4,0 ,    3125,5 ,    3130,8 ,     2,     1,     1,     6,     7 }, // Maori/Latin/New Zealand
+    {     80,    13,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     526,9 ,     526,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,   7325,32 ,   7357,53 ,   4362,19 ,   7325,32 ,   7357,53 ,   4362,19 ,     187,5 ,     180,4 ,  494,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   9729,43 ,       4,4 ,       4,0 ,    3138,5 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Marathi/Devanagari/India
+    {     82,     2,   143,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,   1010,10 ,   1020,16 ,      37,5 ,     87,12 ,   7410,21 ,   7431,43 ,   7410,21 ,   7410,21 ,   7474,43 ,   7410,21 ,     192,4 ,     184,4 ,  562,4 , 680,17 ,  22,23 , {77,78,84},      248,1 ,   9772,25 ,       8,5 ,       4,0 ,    3143,6 ,    3149,6 ,     2,     0,     1,     6,     7 }, // Mongolian/Cyrillic/Mongolia
+    {     82,     8,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      249,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Mongolian/Mongolian/China
+    {     84,    13,   150,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,     535,5 ,       0,6 ,     540,7 ,     540,7 ,     227,6 ,     63,17 ,      37,5 ,      8,10 ,   7517,33 ,   7550,54 ,   7604,18 ,   7517,33 ,   7550,54 ,   7604,18 ,     196,9 ,     188,7 ,  494,4 , 697,19 ,  22,23 , {78,80,82},      252,4 ,   9797,49 ,       8,5 ,       4,0 ,    3155,6 ,    3161,5 ,     2,     1,     7,     6,     7 }, // Nepali/Devanagari/Nepal
+    {     84,    13,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,     535,5 ,       0,6 ,     540,7 ,     540,7 ,     227,6 ,     63,17 ,      18,7 ,     25,12 ,   7517,33 ,   7550,54 ,   7604,18 ,   7517,33 ,   7550,54 ,   7604,18 ,     196,9 ,     188,7 ,  494,4 , 697,19 ,  22,23 , {73,78,82},      121,1 ,   9846,49 ,       8,5 ,       4,0 ,    3155,6 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Nepali/Devanagari/India
+    {     85,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    478,17 ,     228,5 ,    233,10 ,   2307,35 ,   2242,51 ,   2293,14 ,   2307,35 ,   2242,51 ,   2293,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      189,2 ,   9895,44 ,       8,5 ,       4,0 ,   3166,12 ,    3178,5 ,     2,     0,     1,     6,     7 }, // Norwegian Bokmal/Latin/Norway
+    {     85,     7,   203,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    478,17 ,     228,5 ,    233,10 ,   2307,35 ,   2242,51 ,   2293,14 ,   2307,35 ,   2242,51 ,   2293,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      189,2 ,   9895,44 ,       8,5 ,       4,0 ,   3166,12 ,   3183,21 ,     2,     0,     1,     6,     7 }, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
+    {     86,     7,    74,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Occitan/Latin/France
+    {     87,    26,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     547,8 ,     555,7 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,   7622,33 ,   7655,54 ,   7709,18 ,   7622,33 ,   7655,54 ,   7709,18 ,       0,2 ,       0,2 ,  716,5 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   9939,43 ,       4,4 ,       4,0 ,    3204,5 ,    3209,4 ,     2,     1,     7,     7,     7 }, // Oriya/Oriya/India
+    {     88,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,      46,6 ,      46,6 ,     562,9 ,     571,8 ,     394,8 ,   1036,20 ,      55,4 ,    430,11 ,   7727,39 ,   7727,39 ,     85,14 ,   7727,39 ,   7727,39 ,     85,14 ,     205,4 ,     195,4 ,  721,5 ,   5,17 ,  22,23 , {65,70,78},      256,1 ,   9982,25 ,      13,5 ,       4,0 ,    3213,4 ,    3217,9 ,     0,     0,     6,     4,     5 }, // Pashto/Arabic/Afghanistan
+    {     88,     1,   163,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,      46,6 ,      46,6 ,     562,9 ,     571,8 ,     394,8 ,   1036,20 ,      18,7 ,     25,12 ,   7727,39 ,   7727,39 ,     85,14 ,   7727,39 ,   7727,39 ,     85,14 ,     205,4 ,     195,4 ,  721,5 ,   5,17 ,  22,23 , {80,75,82},      175,2 ,  10007,52 ,      13,5 ,       4,0 ,    3213,4 ,    3226,7 ,     2,     0,     7,     6,     7 }, // Pashto/Arabic/Pakistan
+    {     89,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,     579,7 ,     579,7 ,     586,8 ,     594,7 ,     394,8 ,     97,16 ,      55,4 ,    430,11 ,   7766,49 ,   7766,49 ,   7815,14 ,   7766,49 ,   7766,49 ,   7815,14 ,     209,9 ,     199,8 ,  726,4 , 730,44 ,  22,23 , {73,82,82},      257,4 ,  10059,37 ,      78,5 ,       4,0 ,    3233,5 ,    3238,5 ,     0,     0,     6,     5,     5 }, // Persian/Arabic/Iran
+    {     89,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,     579,7 ,     579,7 ,     586,8 ,     594,7 ,     394,8 ,     97,16 ,      55,4 ,    430,11 ,   7766,49 ,   7766,49 ,   7815,14 ,   7766,49 ,   7766,49 ,   7815,14 ,     209,9 ,     199,8 ,  726,4 , 730,44 ,  22,23 , {65,70,78},      256,1 ,  10096,55 ,       8,5 ,       4,0 ,    3243,3 ,    3217,9 ,     0,     0,     6,     4,     5 }, // Persian/Arabic/Afghanistan
+    {     90,     7,   172,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,   7829,34 ,   7863,59 ,   7922,14 ,   7829,34 ,   7863,59 ,   7936,14 ,       0,2 ,       0,2 ,  303,5 ,   5,17 ,  22,23 , {80,76,78},      261,2 ,  10151,77 ,      13,5 ,       4,0 ,    3246,6 ,    3252,6 ,     2,     1,     1,     6,     7 }, // Polish/Latin/Poland
+    {     91,     7,    30,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     254,7 ,     254,7 ,    119,10 ,    669,27 ,      37,5 ,      8,10 ,   7950,28 ,   7978,79 ,   8057,14 ,   7950,28 ,   7978,79 ,   8057,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {66,82,76},      263,2 ,  10228,54 ,       8,5 ,       4,0 ,    3258,9 ,    3267,6 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Brazil
+    {     91,     7,     6,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {65,79,65},      243,2 ,  10282,54 ,      13,5 ,       4,0 ,    3258,9 ,    3273,6 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Angola
+    {     91,     7,    39,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {67,86,69},      265,1 ,  10336,69 ,      13,5 ,       4,0 ,    3258,9 ,   3279,10 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Cape Verde
+    {     91,     7,    62,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,  10405,81 ,      13,5 ,       4,0 ,    3258,9 ,   3289,11 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/East Timor
+    {     91,     7,    66,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  10486,59 ,      13,5 ,       4,0 ,    3258,9 ,   3300,16 ,     0,     0,     1,     6,     7 }, // Portuguese/Latin/Equatorial Guinea
+    {     91,     7,    92,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  10545,62 ,      13,5 ,       4,0 ,    3258,9 ,   3316,12 ,     0,     0,     1,     6,     7 }, // Portuguese/Latin/Guinea Bissau
+    {     91,     7,   125,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3258,9 ,   3328,10 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Luxembourg
+    {     91,     7,   126,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      18,7 ,     25,12 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {77,79,80},      134,4 ,  10607,53 ,      13,5 ,       4,0 ,    3258,9 ,   3338,19 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Macau
+    {     91,     7,   146,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {77,90,78},      266,3 ,  10660,66 ,      13,5 ,       4,0 ,    3258,9 ,   3357,10 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Mozambique
+    {     91,     7,   173,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,   3367,17 ,    3384,8 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Portugal
+    {     91,     7,   185,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {83,84,78},      269,2 ,  10726,92 ,      13,5 ,       4,0 ,    3258,9 ,   3392,19 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Sao Tome And Principe
+    {     91,     7,   206,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8071,49 ,   7978,79 ,   8057,14 ,   8071,49 ,   7978,79 ,   8057,14 ,     218,8 ,     207,8 ,    0,5 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,  10818,45 ,      13,5 ,       4,0 ,    3258,9 ,    3411,5 ,     2,     0,     1,     6,     7 }, // Portuguese/Latin/Switzerland
+    {     92,     4,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     601,9 ,     601,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   8120,36 ,   8156,57 ,   8213,23 ,   8120,36 ,   8156,57 ,   8213,23 ,     226,6 ,     215,6 ,  774,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  10863,39 ,       4,4 ,       4,0 ,    3416,6 ,    3422,4 ,     2,     1,     7,     7,     7 }, // Punjabi/Gurmukhi/India
+    {     92,     1,   163,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    553,18 ,      18,7 ,     25,12 ,   8236,37 ,   8236,37 ,     85,14 ,   8236,37 ,   8236,37 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,75,82},      271,1 ,  10902,13 ,      41,6 ,       4,0 ,    3426,6 ,    3226,7 ,     2,     0,     7,     6,     7 }, // Punjabi/Arabic/Pakistan
+    {     93,     7,   169,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,   8273,28 ,   8301,53 ,   8354,14 ,   8273,28 ,   8301,53 ,   8354,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {80,69,78},      272,2 ,       0,7 ,       8,5 ,       4,0 ,    3432,8 ,    3440,4 ,     2,     1,     7,     6,     7 }, // Quechua/Latin/Peru
+    {     93,     7,    26,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,   8273,28 ,   8301,53 ,   8354,14 ,   8273,28 ,   8301,53 ,   8354,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {66,79,66},      274,2 ,       0,7 ,       8,5 ,       4,0 ,    3432,8 ,    3444,7 ,     2,     1,     1,     6,     7 }, // Quechua/Latin/Bolivia
+    {     93,     7,    63,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,   8273,28 ,   8301,53 ,   8354,14 ,   8273,28 ,   8301,53 ,   8354,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,       0,7 ,       8,5 ,       4,0 ,    3432,8 ,    3451,7 ,     2,     1,     1,     6,     7 }, // Quechua/Latin/Ecuador
+    {     94,     7,   206,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     339,8 ,   1056,28 ,      37,5 ,      8,10 ,   8368,23 ,   8391,56 ,   8447,14 ,   8368,23 ,   8391,56 ,   8447,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,  10915,46 ,      13,5 ,       4,0 ,    3458,9 ,    3467,6 ,     2,     0,     1,     6,     7 }, // Romansh/Latin/Switzerland
+    {     95,     7,   177,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     610,8 ,     610,8 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,   8461,34 ,   8495,48 ,   3080,14 ,   8461,34 ,   8495,48 ,   3080,14 ,      64,4 ,      61,4 ,  778,4 ,   5,17 ,  22,23 , {82,79,78},      276,3 ,  10961,57 ,      13,5 ,       4,0 ,    3473,6 ,    3479,7 ,     2,     1,     1,     6,     7 }, // Romanian/Latin/Romania
+    {     95,     7,   141,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     610,8 ,     610,8 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,   8543,28 ,   8495,48 ,   8571,16 ,   8543,28 ,   8495,48 ,   8571,16 ,      64,4 ,      61,4 ,  778,4 ,   5,17 ,  22,23 , {77,68,76},      279,1 ,  11018,69 ,      13,5 ,       4,0 ,    3473,6 ,   3486,17 ,     2,     1,     1,     6,     7 }, // Romanian/Latin/Moldova
+    {     96,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {82,85,66},      123,1 ,  11087,89 ,      13,5 ,       4,0 ,    3503,7 ,    3510,6 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Russia
+    {     96,     2,    20,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {66,89,78},        0,2 ,  11176,94 ,      13,5 ,       4,0 ,    3503,7 ,     511,8 ,     2,     0,     1,     6,     7 }, // Russian/Cyrillic/Belarus
+    {     96,     2,   110,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {75,90,84},      236,1 ,  11270,83 ,      13,5 ,       4,0 ,    3503,7 ,    3516,9 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Kazakhstan
+    {     96,     2,   116,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {75,71,83},      237,3 ,  11353,82 ,      13,5 ,       4,0 ,    3503,7 ,    3525,8 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Kyrgyzstan
+    {     96,     2,   141,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {77,68,76},      279,1 ,  11435,79 ,      13,5 ,       4,0 ,    3503,7 ,    3533,7 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Moldova
+    {     96,     2,   222,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8587,21 ,   8608,62 ,   8670,14 ,   8587,21 ,   8608,62 ,   8587,21 ,       0,2 ,       0,2 ,  246,5 , 680,17 ,  22,23 , {85,65,72},      280,1 ,  11514,92 ,      13,5 ,       4,0 ,    3503,7 ,    3540,7 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Ukraine
+    {     98,     7,    41,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   8684,28 ,   8712,66 ,   8778,14 ,   8684,28 ,   8712,66 ,   8778,14 ,     232,2 ,     221,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  11606,25 ,       4,4 ,      36,5 ,    3547,5 ,   3552,22 ,     0,     0,     1,     6,     7 }, // Sango/Latin/Central African Republic
+    {     99,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     7,     7 }, // Sanskrit/Devanagari/India
+    {    100,     2,   243,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,   8792,28 ,   8820,52 ,   8872,14 ,   8792,28 ,   8820,52 ,   8872,14 ,     234,9 ,     223,8 ,  782,7 ,   5,17 ,  22,23 , {82,83,68},        0,0 ,  11631,58 ,      13,5 ,       4,0 ,    3574,6 ,    3580,6 ,     0,     0,     1,     6,     7 }, // Serbian/Cyrillic/Serbia
+    {    100,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,   8886,26 ,   8912,57 ,   2102,14 ,   8886,26 ,   8912,57 ,   2102,14 ,    243,11 ,     231,8 ,  296,7 ,   5,17 ,  22,23 , {66,65,77},      140,2 , 11689,174 ,      13,5 ,       4,0 ,    3586,6 ,    630,19 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Bosnia And Herzegowina
+    {    100,     7,   242,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,   8969,33 ,   8912,57 ,   2102,14 ,   8969,33 ,   8912,57 ,   2102,14 ,    243,11 ,     231,8 ,  296,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  11863,23 ,      13,5 ,       4,0 ,    3586,6 ,    3592,9 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Montenegro
+    {    100,     7,   243,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,   9002,28 ,   9030,54 ,   2102,14 ,   9002,28 ,   9030,54 ,   2102,14 ,     254,9 ,     231,8 ,  296,7 ,   5,17 ,  22,23 , {82,83,68},        0,0 ,  11886,58 ,      13,5 ,       4,0 ,    3586,6 ,    3601,6 ,     0,     0,     1,     6,     7 }, // Serbian/Latin/Serbia
+    {    100,     2,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,   9084,26 ,   9110,55 ,   8872,14 ,   9084,26 ,   9110,55 ,   8872,14 ,    263,11 ,     223,8 ,  782,7 ,   5,17 ,  22,23 , {66,65,77},      281,2 , 11944,174 ,      13,5 ,       4,0 ,    3574,6 ,   3607,19 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Bosnia And Herzegowina
+    {    100,     2,   242,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,   8792,28 ,   9110,55 ,   8872,14 ,   8792,28 ,   9110,55 ,   8872,14 ,    263,11 ,     223,8 ,  782,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12118,23 ,      13,5 ,       4,0 ,    3574,6 ,    3626,9 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Montenegro
+    {    100,     2,   257,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,   8792,28 ,   8820,52 ,   8872,14 ,   8792,28 ,   8820,52 ,   8872,14 ,     234,9 ,     223,8 ,  782,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12118,23 ,      13,5 ,       4,0 ,    3574,6 ,    3635,6 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Kosovo
+    {    100,     7,   257,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     163,7 ,     163,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,   8969,33 ,   9030,54 ,   2102,14 ,   8969,33 ,   9030,54 ,   2102,14 ,     254,9 ,     231,8 ,  296,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  11863,23 ,      13,5 ,       4,0 ,    3586,6 ,    3641,6 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Kosovo
+    {    101,     2,    81,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     618,9 ,     618,9 ,     156,8 ,   1111,23 ,      37,5 ,      8,10 ,   9165,28 ,   9193,61 ,   9254,14 ,   9268,28 ,   9296,61 ,   9254,14 ,    274,15 ,    239,15 ,   45,4 ,   5,17 ,  22,23 , {71,69,76},      224,1 ,  12141,17 ,       8,5 ,       4,0 ,    3647,4 ,   3651,11 ,     2,     1,     1,     6,     7 }, // Ossetic/Cyrillic/Georgia
+    {    101,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     618,9 ,     618,9 ,     156,8 ,   1111,23 ,      37,5 ,      8,10 ,   9165,28 ,   9193,61 ,   9254,14 ,   9268,28 ,   9296,61 ,   9254,14 ,    274,15 ,    239,15 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  12158,17 ,       8,5 ,       4,0 ,    3647,4 ,    3662,6 ,     2,     1,     1,     6,     7 }, // Ossetic/Cyrillic/Russia
+    {    102,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Southern Sotho/Latin/South Africa
+    {    103,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Tswana/Latin/South Africa
+    {    104,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,   9357,28 ,   9385,55 ,   9440,14 ,   9357,28 ,   9385,55 ,   9440,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,  12175,22 ,       4,4 ,       4,0 ,    3668,8 ,    1820,8 ,     2,     1,     7,     6,     7 }, // Shona/Latin/Zimbabwe
+    {    105,     1,   163,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     627,8 ,     635,7 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,   9454,35 ,   9454,35 ,   9489,31 ,   9454,35 ,   9454,35 ,   9489,31 ,    289,11 ,    254,11 ,  789,6 , 795,61 ,  22,23 , {80,75,82},      175,2 ,  12197,43 ,       8,5 ,       4,0 ,    3676,4 ,    3680,7 ,     2,     0,     7,     6,     7 }, // Sindhi/Arabic/Pakistan
+    {    106,    32,   198,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     642,9 ,     651,8 ,     53,10 ,     63,17 ,     228,5 ,    233,10 ,   9520,39 ,   9559,62 ,   9621,19 ,   9520,39 ,   9559,62 ,   9621,19 ,     300,5 ,     265,4 ,  856,5 , 861,42 ,  22,23 , {76,75,82},      283,3 ,  12240,58 ,       4,4 ,       4,0 ,    3687,5 ,   3692,11 ,     2,     1,     1,     6,     7 }, // Sinhala/Sinhala/Sri Lanka
+    {    107,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Swati/Latin/South Africa
+    {    108,     7,   191,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     185,7 ,     659,7 ,   1134,10 ,    478,17 ,      55,4 ,      59,9 ,   9640,21 ,   9661,52 ,   9713,14 ,   9640,21 ,   9661,52 ,   9713,14 ,       0,2 ,       0,2 ,  303,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12298,26 ,      13,5 ,       4,0 ,   3703,10 ,    3713,9 ,     2,     1,     1,     6,     7 }, // Slovak/Latin/Slovakia
+    {    109,     7,   192,    44,    46,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     666,8 ,     666,8 ,    1144,9 ,   1153,19 ,      37,5 ,      8,10 ,   9727,35 ,   9762,52 ,   9814,14 ,   9727,35 ,   9762,52 ,   9814,14 ,      60,4 ,     269,4 ,   54,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12324,28 ,      13,5 ,       4,0 ,   3722,11 ,    3733,9 ,     2,     1,     1,     6,     7 }, // Slovenian/Latin/Slovenia
+    {    110,     7,   194,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     674,9 ,     674,9 ,      27,8 ,   1172,19 ,      18,7 ,     25,12 ,   9828,32 ,   9860,47 ,   9907,15 ,   9828,32 ,   9860,47 ,   9907,15 ,     305,2 ,     273,2 ,  903,6 , 909,17 ,  22,23 , {83,79,83},       94,1 ,  12352,27 ,       4,4 ,       4,0 ,    3742,8 ,   3750,10 ,     0,     0,     1,     6,     7 }, // Somali/Latin/Somalia
+    {    110,     7,    59,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     674,9 ,     674,9 ,      27,8 ,   1172,19 ,      18,7 ,     25,12 ,   9828,32 ,   9860,47 ,   9907,15 ,   9828,32 ,   9860,47 ,   9907,15 ,     305,2 ,     273,2 ,  903,6 , 909,17 ,  22,23 , {68,74,70},       38,3 ,  12379,50 ,       4,4 ,       4,0 ,    3742,8 ,    3760,7 ,     0,     0,     6,     6,     7 }, // Somali/Latin/Djibouti
+    {    110,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     674,9 ,     674,9 ,      27,8 ,   1172,19 ,      18,7 ,     25,12 ,   9828,32 ,   9860,47 ,   9907,15 ,   9828,32 ,   9860,47 ,   9907,15 ,     305,2 ,     273,2 ,  903,6 , 909,17 ,  22,23 , {69,84,66},        0,2 ,  12429,52 ,       4,4 ,       4,0 ,    3742,8 ,    3767,8 ,     2,     1,     7,     6,     7 }, // Somali/Latin/Ethiopia
+    {    110,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     674,9 ,     674,9 ,      27,8 ,   1172,19 ,      37,5 ,      8,10 ,   9828,32 ,   9860,47 ,   9907,15 ,   9828,32 ,   9860,47 ,   9907,15 ,     305,2 ,     273,2 ,  903,6 , 909,17 ,  22,23 , {75,69,83},        2,3 ,  12481,52 ,       4,4 ,       4,0 ,    3742,8 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Somali/Latin/Kenya
+    {    111,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      55,4 ,    430,11 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,   3775,17 ,    2432,6 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Spain
+    {    111,     7,    10,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {65,82,83},        6,1 ,  12533,51 ,       8,5 ,       4,0 ,    3792,7 ,    3799,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Argentina
+    {    111,     7,    22,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {66,90,68},        6,1 ,  12584,52 ,       4,4 ,       4,0 ,    3792,7 ,    3808,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Belize
+    {    111,     7,    26,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {66,79,66},      274,2 ,  12636,35 ,       4,4 ,       4,0 ,    3792,7 ,    3444,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Bolivia
+    {    111,     7,    30,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {66,82,76},      263,2 ,  12671,52 ,       4,4 ,       4,0 ,    3792,7 ,    3267,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Brazil
+    {    111,     7,    43,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     339,8 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,76,80},        6,1 ,  12723,45 ,       4,4 ,      36,5 ,    3792,7 ,    3814,5 ,     0,     0,     1,     6,     7 }, // Spanish/Latin/Chile
+    {    111,     7,    47,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     571,7 ,    669,27 ,      18,7 ,     25,12 ,   9922,35 ,   9957,53 ,   4769,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,79,80},        6,1 ,  12768,54 ,       8,5 ,       4,0 ,    3792,7 ,    3819,8 ,     2,     0,     7,     6,     7 }, // Spanish/Latin/Colombia
+    {    111,     7,    52,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,82,67},      286,1 ,  12822,67 ,       4,4 ,       4,0 ,    3792,7 ,   3827,10 ,     2,     0,     1,     6,     7 }, // Spanish/Latin/Costa Rica
+    {    111,     7,    55,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {67,85,80},        6,1 ,  12889,42 ,       4,4 ,       4,0 ,    3792,7 ,    3837,4 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Cuba
+    {    111,     7,    61,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {68,79,80},      287,3 ,  12931,54 ,       4,4 ,      83,6 ,    3792,7 ,   3841,20 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Dominican Republic
+    {    111,     7,    63,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  12985,70 ,       4,4 ,      36,5 ,    3792,7 ,    3451,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Ecuador
+    {    111,     7,    65,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  12985,70 ,       4,4 ,       4,0 ,    3792,7 ,   3861,11 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/El Salvador
+    {    111,     7,    66,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      55,4 ,    430,11 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  13055,92 ,       4,4 ,       4,0 ,    3792,7 ,   3872,17 ,     0,     0,     1,     6,     7 }, // Spanish/Latin/Equatorial Guinea
+    {    111,     7,    90,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     571,7 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {71,84,81},      290,1 ,  13147,30 ,      18,5 ,       4,0 ,    3792,7 ,    3889,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Guatemala
+    {    111,     7,    96,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,   1191,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {72,78,76},      279,1 ,  13177,60 ,       4,4 ,       4,0 ,    3792,7 ,    3898,8 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Honduras
+    {    111,     7,   139,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,      27,8 ,    669,27 ,      55,4 ,      59,9 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {77,88,78},        6,1 ,  13237,48 ,      47,6 ,       4,0 ,   3906,17 ,    3923,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Mexico
+    {    111,     7,   155,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {78,73,79},      291,2 ,  13285,69 ,       4,4 ,       4,0 ,    3792,7 ,    3929,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Nicaragua
+    {    111,     7,   166,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,    1218,8 ,    669,27 ,      18,7 ,     25,12 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,65,66},      293,3 ,  13354,54 ,       4,4 ,       4,0 ,    3792,7 ,    3938,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Panama
+    {    111,     7,   168,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,89,71},      296,3 ,  13408,61 ,       8,5 ,      23,6 ,    3792,7 ,    3944,8 ,     0,     0,     7,     6,     7 }, // Spanish/Latin/Paraguay
+    {    111,     7,   169,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     571,7 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,69,78},      272,2 ,  13469,43 ,       8,5 ,       4,0 ,    3792,7 ,    3440,4 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Peru
+    {    111,     7,   170,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      178,1 ,  13512,48 ,      13,5 ,       4,0 ,    3792,7 ,    3952,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Philippines
+    {    111,     7,   174,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,    1218,8 ,    669,27 ,      18,7 ,     25,12 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  12985,70 ,       4,4 ,       4,0 ,    3792,7 ,   1447,11 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Puerto Rico
+    {    111,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     415,8 ,    669,27 ,      18,7 ,     25,12 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   3080,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  12985,70 ,      89,7 ,       4,0 ,    3792,7 ,   3961,14 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/United States
+    {    111,     7,   227,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,89,85},        6,1 ,  13560,48 ,       8,5 ,       4,0 ,    3792,7 ,    3975,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Uruguay
+    {    111,     7,   231,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {86,69,83},      299,4 ,  13608,58 ,       4,4 ,      36,5 ,    3792,7 ,    3982,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Venezuela
+    {    111,     7,   238,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      55,4 ,    430,11 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3792,7 ,    3991,8 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Canary Islands
+    {    111,     7,   246,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9922,35 ,   9957,53 ,   3080,14 ,   9922,35 ,   9957,53 ,   4769,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       4,4 ,       4,0 ,   3999,23 ,   4022,13 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Latin America
+    {    111,     7,   250,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    669,27 ,      55,4 ,    430,11 ,   9922,35 ,   9957,53 ,   8354,14 ,   9922,35 ,   9957,53 ,   8354,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3792,7 ,   4035,15 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Ceuta And Melilla
+    {    113,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     690,8 ,     690,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  10010,60 ,  10010,60 ,     85,14 ,  10010,60 ,  10010,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {84,90,83},      191,3 ,  13666,67 ,       8,5 ,       4,0 ,    4050,9 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Swahili/Latin/Tanzania
+    {    113,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     690,8 ,     690,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  10010,60 ,  10010,60 ,     85,14 ,  10010,60 ,  10010,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {67,68,70},      209,2 ,  13733,55 ,       8,5 ,       4,0 ,    4050,9 ,   4059,32 ,     2,     1,     1,     6,     7 }, // Swahili/Latin/Congo Kinshasa
+    {    113,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     690,8 ,     690,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  10010,60 ,  10010,60 ,     85,14 ,  10010,60 ,  10010,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {75,69,83},        2,3 ,  13788,58 ,       8,5 ,       4,0 ,    4050,9 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Swahili/Latin/Kenya
+    {    113,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     690,8 ,     690,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  10010,60 ,  10010,60 ,     85,14 ,  10010,60 ,  10010,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {85,71,88},      196,3 ,  13846,61 ,       8,5 ,       4,0 ,    4050,9 ,    1690,6 ,     0,     0,     1,     6,     7 }, // Swahili/Latin/Uganda
+    {    114,     7,   205,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     698,9 ,     698,9 ,     53,10 ,     97,16 ,     228,5 ,    441,16 ,  10070,29 ,  10099,50 ,   2293,14 ,  10070,29 ,  10099,50 ,   2293,14 ,     307,2 ,     275,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,  13907,45 ,      13,5 ,       4,0 ,    4091,7 ,    4098,7 ,     2,     0,     1,     6,     7 }, // Swedish/Latin/Sweden
+    {    114,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     698,9 ,     698,9 ,    528,10 ,     97,16 ,     228,5 ,    441,16 ,  10070,29 ,  10099,50 ,   2293,14 ,  10070,29 ,  10099,50 ,   2293,14 ,     307,2 ,     275,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    4091,7 ,    1089,7 ,     2,     1,     1,     6,     7 }, // Swedish/Latin/Finland
+    {    114,     7,   248,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     698,9 ,     698,9 ,     53,10 ,     97,16 ,     228,5 ,    441,16 ,  10070,29 ,  10099,50 ,   2293,14 ,  10070,29 ,  10099,50 ,   2293,14 ,     307,2 ,     275,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8952,19 ,      13,5 ,       4,0 ,    4091,7 ,    4105,5 ,     2,     1,     1,     6,     7 }, // Swedish/Latin/Aland Islands
+    {    115,     7,   106,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Sardinian/Latin/Italy
+    {    116,     2,   209,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,  10149,28 ,  10177,55 ,  10232,14 ,  10149,28 ,  10177,55 ,  10232,14 ,     309,7 ,     277,7 ,   45,4 ,   5,17 ,  22,23 , {84,74,83},      303,4 ,  13952,19 ,      13,5 ,       4,0 ,    4110,6 ,   4116,10 ,     2,     1,     1,     6,     7 }, // Tajik/Cyrillic/Tajikistan
+    {    117,    27,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    707,13 ,    707,13 ,     269,6 ,    192,18 ,     382,7 ,    457,12 ,  10246,39 ,  10285,49 ,  10334,20 ,  10246,39 ,  10285,49 ,  10334,20 ,     316,8 ,     284,8 ,  977,7 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  13971,49 ,       8,5 ,       4,0 ,    4126,5 ,    4131,7 ,     2,     1,     7,     7,     7 }, // Tamil/Tamil/India
+    {    117,    27,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    707,13 ,    707,13 ,     269,6 ,    192,18 ,     382,7 ,    457,12 ,  10246,39 ,  10285,49 ,  10334,20 ,  10246,39 ,  10285,49 ,  10334,20 ,     316,8 ,     284,8 ,  977,7 ,   5,17 ,  22,23 , {77,89,82},      173,2 ,  14020,61 ,       8,5 ,       4,0 ,    4126,5 ,    4138,7 ,     2,     1,     1,     6,     7 }, // Tamil/Tamil/Malaysia
+    {    117,    27,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    707,13 ,    707,13 ,     269,6 ,    192,18 ,     382,7 ,    457,12 ,  10246,39 ,  10285,49 ,  10334,20 ,  10246,39 ,  10285,49 ,  10334,20 ,     316,8 ,     284,8 ,  977,7 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,  14081,61 ,       8,5 ,       4,0 ,    4126,5 ,   4145,11 ,     2,     1,     7,     6,     7 }, // Tamil/Tamil/Singapore
+    {    117,    27,   198,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    707,13 ,    707,13 ,     269,6 ,    192,18 ,      37,5 ,      8,10 ,  10246,39 ,  10285,49 ,  10334,20 ,  10246,39 ,  10285,49 ,  10334,20 ,     316,8 ,     284,8 ,  977,7 ,   5,17 ,  22,23 , {76,75,82},      307,3 ,  14142,49 ,       8,5 ,       4,0 ,    4126,5 ,    4156,6 ,     2,     1,     1,     6,     7 }, // Tamil/Tamil/Sri Lanka
+    {    118,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     720,9 ,     720,9 ,    495,10 ,   1226,23 ,      55,4 ,      59,9 ,  10354,36 ,  10390,56 ,  10446,14 ,  10354,36 ,  10390,56 ,  10446,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  14191,21 ,       0,4 ,       4,0 ,    4162,5 ,    3510,6 ,     2,     1,     1,     6,     7 }, // Tatar/Cyrillic/Russia
+    {    119,    28,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    729,11 ,    729,11 ,     339,8 ,   1249,18 ,      18,7 ,     25,12 ,  10460,32 ,  10492,60 ,  10552,18 ,  10460,32 ,  10492,60 ,  10552,18 ,       0,2 ,       0,2 ,  984,7 , 991,29 ,  22,23 , {73,78,82},      121,1 ,  14212,26 ,       4,4 ,       4,0 ,    4167,6 ,    4173,8 ,     2,     1,     7,     7,     7 }, // Telugu/Telugu/India
+    {    120,    30,   211,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     123,5 ,     123,5 ,     740,8 ,     748,7 ,     269,6 ,   1267,19 ,      37,5 ,    469,28 ,  10570,23 ,  10593,68 ,  10661,16 ,  10570,23 ,  10593,68 ,  10661,16 ,    324,10 ,    292,10 , 1020,4 ,   5,17 ,  22,23 , {84,72,66},      310,1 ,  14238,16 ,       4,4 ,       4,0 ,    4181,3 ,    4181,3 ,     2,     1,     7,     6,     7 }, // Thai/Thai/Thailand
+    {    121,    31,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1286,23 ,      18,7 ,     25,12 ,  10677,51 ,  10728,79 ,  10807,27 ,  10677,51 ,  10728,79 ,  10807,27 ,     334,7 ,     302,8 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      311,1 ,  14254,13 ,       8,5 ,       4,0 ,    4184,8 ,    4192,6 ,     2,     1,     7,     6,     7 }, // Tibetan/Tibetan/China
+    {    121,    31,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1286,23 ,      18,7 ,     25,12 ,  10677,51 ,  10728,79 ,  10807,27 ,  10677,51 ,  10728,79 ,  10807,27 ,     334,7 ,     302,8 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  14267,19 ,       8,5 ,       4,0 ,    4184,8 ,    4198,7 ,     2,     1,     7,     7,     7 }, // Tibetan/Tibetan/India
+    {    122,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1309,23 ,      18,7 ,     25,12 ,  10834,21 ,  10855,29 ,  10884,14 ,  10834,21 ,  10855,29 ,  10898,14 ,     341,7 ,     310,7 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,2 ,  14286,16 ,       4,4 ,       4,0 ,    4205,4 ,      92,5 ,     2,     1,     7,     6,     7 }, // Tigrinya/Ethiopic/Ethiopia
+    {    122,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1309,23 ,      18,7 ,     25,12 ,  10834,21 ,  10855,29 ,  10898,14 ,  10834,21 ,  10855,29 ,  10898,14 ,     341,7 ,     310,7 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},       41,3 ,       0,7 ,       4,4 ,       4,0 ,    4205,4 ,    4209,4 ,     2,     1,     1,     6,     7 }, // Tigrinya/Ethiopic/Eritrea
+    {    123,     7,   214,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     755,8 ,     755,8 ,     755,8 ,     755,8 ,     269,6 ,     97,16 ,      18,7 ,     25,12 ,  10912,29 ,  10941,60 ,  11001,14 ,  10912,29 ,  10941,60 ,  11001,14 ,    348,10 ,     317,6 , 1024,5 , 1029,59 , 1088,65 , {84,79,80},      194,2 ,  14302,41 ,      13,5 ,       4,0 ,   4213,13 ,    1640,5 ,     2,     1,     1,     6,     7 }, // Tongan/Latin/Tonga
+    {    124,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Tsonga/Latin/South Africa
+    {    125,     7,   217,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     763,8 ,     763,8 ,    1332,9 ,   1341,16 ,      37,5 ,      8,10 ,  11015,28 ,  11043,54 ,  11097,14 ,  11015,28 ,  11043,54 ,  11097,14 ,     358,2 ,     323,2 ,  199,4 ,   5,17 ,  22,23 , {84,82,89},      241,1 ,  14343,40 ,       4,4 ,       4,0 ,    4226,6 ,    4232,7 ,     2,     1,     1,     6,     7 }, // Turkish/Latin/Turkey
+    {    125,     7,    56,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     763,8 ,     763,8 ,    1332,9 ,   1341,16 ,      18,7 ,     25,12 ,  11015,28 ,  11043,54 ,  11097,14 ,  11015,28 ,  11043,54 ,  11097,14 ,     358,2 ,     323,2 ,  199,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,       4,4 ,       4,0 ,    4226,6 ,    4239,6 ,     2,     1,     1,     6,     7 }, // Turkish/Latin/Cyprus
+    {    126,     7,   218,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8220,    8221,       0,6 ,       0,6 ,     771,8 ,     771,8 ,    495,10 ,   1341,16 ,      37,5 ,      8,10 ,  11111,28 ,  11139,54 ,  11193,14 ,  11207,28 ,  11235,54 ,  11193,14 ,    360,13 ,    325,14 , 1153,4 ,   5,17 ,  22,23 , {84,77,84},      312,3 ,  14383,49 ,      13,5 ,       4,0 ,   4245,12 ,   4257,12 ,     2,     1,     1,     6,     7 }, // Turkmen/Latin/Turkmenistan
+    {    128,     1,    44,    46,    44,    59,    37,    48,    45,    43,   101,     187,     171,    8250,    8249,       0,6 ,       0,6 ,    200,10 ,     210,9 ,     53,10 ,   1357,17 ,      18,7 ,     25,12 ,  11289,21 ,  11310,55 ,  11365,14 ,  11289,21 ,  11310,55 ,  11365,14 ,    373,12 ,    339,12 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      133,1 ,  14432,40 ,       4,4 ,       4,0 ,    4269,8 ,    4277,5 ,     2,     1,     7,     6,     7 }, // Uighur/Arabic/China
+    {    129,     2,   222,    44,   160,    59,    37,    48,    45,    43,  1077,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     138,7 ,     138,7 ,     156,8 ,   1374,22 ,      37,5 ,      8,10 ,   1427,21 ,  11379,56 ,  11435,14 ,   1427,21 ,  11379,56 ,  11435,14 ,     385,2 ,     351,2 , 1157,5 , 680,17 ,  22,23 , {85,65,72},      280,1 ,  14472,49 ,      13,5 ,       4,0 ,   4282,10 ,    4292,7 ,     2,     1,     1,     6,     7 }, // Ukrainian/Cyrillic/Ukraine
+    {    130,     1,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,    779,10 ,     789,9 ,     269,6 ,   1396,18 ,      18,7 ,     25,12 ,  11449,36 ,  11449,36 ,     85,14 ,  11449,36 ,  11449,36 ,     85,14 ,       0,2 ,       0,2 , 1162,4 , 1166,20 ,  22,23 , {80,75,82},      175,2 ,  14521,49 ,       4,4 ,       4,0 ,    4299,4 ,    3226,7 ,     2,     0,     7,     6,     7 }, // Urdu/Arabic/Pakistan
+    {    130,     1,   100,  1643,  1644,    59,    37,  1776,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,     798,6 ,     798,6 ,     269,6 ,   1396,18 ,      18,7 ,     25,12 ,  11449,36 ,  11449,36 ,     85,14 ,  11449,36 ,  11449,36 ,     85,14 ,       0,2 ,       0,2 , 1162,4 , 1166,20 ,  22,23 , {73,78,82},      121,1 ,  14570,42 ,       8,5 ,       4,0 ,    4299,4 ,    4303,5 ,     2,     1,     7,     7,     7 }, // Urdu/Arabic/India
+    {    131,     7,   228,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8217,    8216,       0,6 ,       0,6 ,     804,8 ,     804,8 ,      27,8 ,   1414,18 ,      37,5 ,    430,11 ,  11485,32 ,  11517,61 ,  11578,14 ,  11485,32 ,  11517,61 ,  11578,14 ,     387,2 ,     353,2 ,  199,4 ,   5,17 ,  22,23 , {85,90,83},      315,4 ,  14612,58 ,      13,5 ,       4,0 ,    4308,6 ,   4314,11 ,     2,     0,     1,     6,     7 }, // Uzbek/Latin/Uzbekistan
+    {    131,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     394,8 ,   1432,33 ,      55,4 ,    430,11 ,  11592,21 ,   7766,49 ,     85,14 ,  11592,21 ,   7766,49 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {65,70,78},      256,1 ,  14670,13 ,      13,5 ,       4,0 ,    4325,6 ,    3217,9 ,     0,     0,     6,     4,     5 }, // Uzbek/Arabic/Afghanistan
+    {    131,     2,   228,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,    696,19 ,      37,5 ,     87,12 ,  11613,28 ,  11641,53 ,  11694,14 ,  11613,28 ,  11641,53 ,  11694,14 ,     389,2 ,     355,2 ,   45,4 ,   5,17 ,  22,23 , {85,90,83},      319,3 ,  14683,49 ,      13,5 ,       4,0 ,    4331,7 ,   4338,10 ,     2,     0,     1,     6,     7 }, // Uzbek/Cyrillic/Uzbekistan
+    {    132,     7,   232,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     812,8 ,     812,8 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,  11708,33 ,  11741,55 ,  11796,21 ,  11708,33 ,  11741,55 ,  11796,21 ,     391,2 ,     357,2 ,   45,4 ,   5,17 ,  22,23 , {86,78,68},      322,1 ,  14732,33 ,      13,5 ,       4,0 ,   4348,10 ,    4358,8 ,     0,     0,     1,     6,     7 }, // Vietnamese/Latin/Vietnam
+    {    133,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1465,23 ,      37,5 ,      8,10 ,  11817,21 ,  11838,43 ,  11881,14 ,  11895,28 ,  11838,43 ,  11881,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,    4366,7 ,       0,0 ,     2,     1,     1,     6,     7 }, // Volapuk/Latin/World
+    {    134,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    820,11 ,    831,10 ,      27,8 ,     10,17 ,      37,5 ,      8,10 ,  11923,29 ,  11952,77 ,  12029,15 ,  12044,30 ,  11952,77 ,  12029,15 ,     393,2 ,     359,2 , 1186,7 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,  14765,92 ,       4,4 ,       4,0 ,    4373,7 ,   4380,16 ,     2,     1,     1,     6,     7 }, // Welsh/Latin/United Kingdom
+    {    135,     7,   187,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    528,10 ,   1488,17 ,      37,5 ,      8,10 ,  12074,28 ,  12102,50 ,  12074,28 ,  12074,28 ,  12102,50 ,  12074,28 ,     395,3 ,     361,3 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  14857,65 ,       8,5 ,       4,0 ,    4396,5 ,    4401,8 ,     0,     0,     1,     6,     7 }, // Wolof/Latin/Senegal
+    {    136,     7,   195,    46,   160,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  12152,28 ,  12180,61 ,     85,14 ,  12152,28 ,  12180,61 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,  14922,79 ,       4,4 ,       4,0 ,    4409,8 ,   4417,15 ,     2,     1,     7,     6,     7 }, // Xhosa/Latin/South Africa
+    {    137,    18,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     841,9 ,     841,9 ,      27,8 ,   1505,19 ,      37,5 ,      8,10 ,  12241,54 ,  12241,54 ,     85,14 ,  12241,54 ,  12241,54 ,     85,14 ,    398,11 ,    364,10 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      41,6 ,       4,0 ,    4432,6 ,    4438,5 ,     2,     1,     1,     6,     7 }, // Yiddish/Hebrew/World
+    {    138,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,   1524,16 ,     497,3 ,      8,10 ,  12295,33 ,  12328,44 ,  12372,14 ,  12295,33 ,  12386,69 ,  12372,14 ,     409,5 ,     374,5 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,  15001,35 ,       4,4 ,       4,0 ,   4443,10 ,   4453,19 ,     2,     1,     1,     6,     7 }, // Yoruba/Latin/Nigeria
+    {    138,     7,    23,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,   1524,16 ,     497,3 ,      8,10 ,  12455,33 ,  12488,44 ,  12532,14 ,  12455,33 ,  12546,69 ,  12532,14 ,     414,5 ,     379,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15036,34 ,       4,4 ,       4,0 ,   4443,10 ,   4472,16 ,     0,     0,     1,     6,     7 }, // Yoruba/Latin/Benin
+    {    140,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     850,9 ,     859,8 ,     547,6 ,     35,18 ,      37,5 ,      8,10 ,  12615,28 ,  12643,74 ,  12717,14 ,  12615,28 ,  12643,74 ,  12717,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,  15070,67 ,       4,4 ,       4,0 ,    4488,7 ,   4495,17 ,     2,     1,     7,     6,     7 }, // Zulu/Latin/South Africa
+    {    141,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     192,8 ,     192,8 ,    495,10 ,    478,17 ,      37,5 ,    441,16 ,  12731,28 ,  12759,51 ,   2293,14 ,  12810,28 ,  12759,51 ,   2293,14 ,     419,9 ,    384,11 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      189,2 ,   9895,44 ,      13,5 ,       4,0 ,    4512,7 ,    4519,5 ,     2,     0,     1,     6,     7 }, // Norwegian Nynorsk/Latin/Norway
+    {    142,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,    8216,    8217,       0,6 ,       0,6 ,     163,7 ,     163,7 ,   1540,11 ,    450,19 ,      37,5 ,      8,10 ,   2016,28 ,   2044,58 ,   2102,14 ,   2016,28 ,   2044,58 ,   2116,14 ,    428,10 ,     395,7 ,  296,7 ,   5,17 ,  22,23 , {66,65,77},      140,2 , 15137,170 ,      13,5 ,       4,0 ,    4524,8 ,    630,19 ,     2,     1,     1,     6,     7 }, // Bosnian/Latin/Bosnia And Herzegowina
+    {    142,     2,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     116,7 ,     116,7 ,    1084,7 ,   1091,20 ,      37,5 ,      8,10 ,  12838,28 ,  12866,56 ,   8872,14 ,  12838,28 ,  12866,56 ,   8872,14 ,     234,9 ,     402,7 ,   45,4 ,   5,17 ,  22,23 , {66,65,77},      281,2 , 15307,151 ,      13,5 ,       4,0 ,    4532,8 ,   3607,19 ,     2,     1,     1,     6,     7 }, // Bosnian/Cyrillic/Bosnia And Herzegowina
+    {    143,    29,   131,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,86,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     5,     6,     7 }, // Divehi/Thaana/Maldives
+    {    144,     7,   251,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     80,17 ,      37,5 ,      8,10 ,  12922,30 ,  12952,57 ,     85,14 ,  12922,30 ,  12952,57 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    4540,5 ,   4545,12 ,     2,     1,     1,     6,     7 }, // Manx/Latin/Isle Of Man
+    {    145,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,  13009,28 ,  13037,61 ,     85,14 ,  13009,28 ,  13037,61 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    4557,8 ,   4565,14 ,     2,     1,     1,     6,     7 }, // Cornish/Latin/United Kingdom
+    {    146,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    1551,8 ,   1559,18 ,      18,7 ,     25,12 ,  13098,28 ,  13126,49 ,  13175,14 ,  13098,28 ,  13126,49 ,  13175,14 ,     438,2 ,     409,2 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,  15458,17 ,       4,4 ,       4,0 ,    4579,4 ,    4583,5 ,     2,     1,     1,     6,     7 }, // Akan/Latin/Ghana
+    {    147,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    1577,6 ,     97,16 ,      18,7 ,     25,12 ,  13189,49 ,  13189,49 ,  13238,20 ,  13189,49 ,  13189,49 ,  13238,20 ,     187,5 ,     411,5 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  15475,13 ,       8,5 ,       4,0 ,    4588,6 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Konkani/Devanagari/India
+    {    148,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Ga/Latin/Ghana
+    {    149,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     867,9 ,     690,8 ,     269,6 ,     10,17 ,      37,5 ,      8,10 ,  13258,33 ,  13291,58 ,     85,14 ,  13258,33 ,  13291,58 ,     85,14 ,     440,7 ,     416,7 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,  15488,12 ,       4,4 ,       4,0 ,   4594,10 ,    4604,8 ,     2,     1,     1,     6,     7 }, // Igbo/Latin/Nigeria
+    {    150,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  13349,28 ,  13377,74 ,  13451,14 ,  13349,28 ,  13377,74 ,  13451,14 ,     447,9 ,     423,7 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15500,23 ,       4,4 ,       4,0 ,    4612,7 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Kamba/Latin/Kenya
+    {    151,    33,   103,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     6 }, // Syriac/Syriac/Iraq
+    {    152,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Blin/Ethiopic/Eritrea
+    {    153,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Geez/Ethiopic/Ethiopia
+    {    155,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Sidamo/Latin/Ethiopia
+    {    156,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Atsam/Latin/Nigeria
+    {    157,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Tigre/Ethiopic/Eritrea
+    {    158,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Jju/Latin/Nigeria
+    {    159,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,     254,7 ,     254,7 ,      27,8 ,   1583,27 ,      37,5 ,      8,10 ,  13465,28 ,  13493,50 ,   3080,14 ,  13465,28 ,  13493,50 ,   3080,14 ,     456,2 ,     430,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,       8,5 ,       4,0 ,    4619,6 ,    4625,6 ,     2,     1,     1,     6,     7 }, // Friulian/Latin/Italy
+    {    160,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Venda/Latin/South Africa
+    {    161,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    876,11 ,    887,10 ,     547,6 ,   1610,23 ,    500,12 ,    512,17 ,  13543,28 ,  13571,44 ,  13615,14 ,  13543,28 ,  13571,44 ,  13615,14 ,     458,3 ,     432,5 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,  15523,37 ,       4,4 ,       4,0 ,    4631,6 ,   4637,12 ,     2,     1,     1,     6,     7 }, // Ewe/Latin/Ghana
+    {    161,     7,   212,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    876,11 ,    887,10 ,     547,6 ,   1610,23 ,      37,5 ,      8,10 ,  13543,28 ,  13571,44 ,  13615,14 ,  13543,28 ,  13571,44 ,  13615,14 ,     458,3 ,     432,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 , 15560,106 ,       4,4 ,       4,0 ,    4631,6 ,   4649,11 ,     0,     0,     1,     6,     7 }, // Ewe/Latin/Togo
+    {    162,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Walamo/Ethiopic/Ethiopia
+    {    163,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,  13629,21 ,  13650,57 ,     85,14 ,  13629,21 ,  13650,57 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,       0,7 ,       4,4 ,       4,0 ,   4660,14 ,   4674,19 ,     2,     1,     7,     6,     7 }, // Hawaiian/Latin/United States
+    {    164,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Tyap/Latin/Nigeria
+    {    165,     7,   129,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,87,75},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Nyanja/Latin/Malawi
+    {    166,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     897,9 ,     906,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  13707,28 ,  13735,55 ,  13707,28 ,  13707,28 ,  13735,55 ,  13707,28 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      178,1 ,  15666,58 ,       4,4 ,       4,0 ,    4693,8 ,    4701,9 ,     2,     1,     7,     6,     7 }, // Filipino/Latin/Philippines
+    {    167,     7,   206,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  13790,28 ,  13818,63 ,   3668,14 ,  13790,28 ,  13818,63 ,   3668,14 ,    461,12 ,    437,11 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,  15724,55 ,      13,5 ,       4,0 ,   4710,16 ,    4726,7 ,     2,     0,     1,     6,     7 }, // Swiss German/Latin/Switzerland
+    {    167,     7,    74,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  13790,28 ,  13818,63 ,   3668,14 ,  13790,28 ,  13818,63 ,   3668,14 ,    461,12 ,    437,11 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,   4710,16 ,   4733,10 ,     2,     1,     1,     6,     7 }, // Swiss German/Latin/France
+    {    167,     7,   123,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  13790,28 ,  13818,63 ,   3668,14 ,  13790,28 ,  13818,63 ,   3668,14 ,    461,12 ,    437,11 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      225,3 ,  15724,55 ,      13,5 ,       4,0 ,   4710,16 ,   4743,13 ,     2,     0,     1,     6,     7 }, // Swiss German/Latin/Liechtenstein
+    {    168,    34,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,  13881,21 ,  13902,28 ,  13930,14 ,  13881,21 ,  13902,28 ,  13930,14 ,     473,2 ,     448,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      311,1 ,       0,7 ,       8,5 ,       4,0 ,    4756,3 ,    4759,2 ,     2,     1,     7,     6,     7 }, // Sichuan Yi/Yi/China
+    {    169,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Kpelle/Latin/Liberia
+    {    170,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     461,8 ,     461,8 ,     365,7 ,   1633,23 ,    529,10 ,    539,19 ,  13944,28 ,  13972,65 ,   3668,14 ,  13944,28 ,  13972,65 ,   3668,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  15779,15 ,      13,5 ,       4,0 ,   4761,14 ,   4775,11 ,     2,     1,     1,     6,     7 }, // Low German/Latin/Germany
+    {    170,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     461,8 ,     461,8 ,     365,7 ,   1633,23 ,    529,10 ,    539,19 ,  13944,28 ,  13972,65 ,   3668,14 ,  13944,28 ,  13972,65 ,   3668,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  15779,15 ,      13,5 ,       4,0 ,   4761,14 ,   4786,12 ,     2,     1,     1,     6,     7 }, // Low German/Latin/Netherlands
+    {    171,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // South Ndebele/Latin/South Africa
+    {    172,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Northern Sotho/Latin/South Africa
+    {    173,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     228,8 ,     228,8 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  14037,33 ,  14070,75 ,  14145,14 ,  14037,33 ,  14070,75 ,  14145,14 ,    475,11 ,    450,13 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      189,2 ,  15794,63 ,      13,5 ,       4,0 ,   4798,15 ,    4813,5 ,     2,     0,     1,     6,     7 }, // Northern Sami/Latin/Norway
+    {    173,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     228,8 ,     228,8 ,    495,10 ,     97,16 ,      37,5 ,      8,10 ,  14159,21 ,  14180,70 ,  14250,14 ,  14159,21 ,  14180,70 ,  14250,14 ,     486,2 ,     463,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  15857,23 ,      13,5 ,       4,0 ,   4798,15 ,    4818,6 ,     2,     1,     1,     6,     7 }, // Northern Sami/Latin/Finland
+    {    173,     7,   205,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     228,8 ,     228,8 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  14037,33 ,  14070,75 ,  14145,14 ,  14037,33 ,  14070,75 ,  14145,14 ,    475,11 ,    450,13 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,  15880,63 ,      13,5 ,       4,0 ,   4798,15 ,    4824,6 ,     2,     0,     1,     6,     7 }, // Northern Sami/Latin/Sweden
+    {    174,     7,   208,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {84,87,68},      323,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Taroko/Latin/Taiwan
+    {    175,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14264,28 ,  14292,62 ,  14354,14 ,  14264,28 ,  14292,62 ,  14354,14 ,     488,6 ,     465,3 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15943,24 ,       4,4 ,       4,0 ,    4830,8 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Gusii/Latin/Kenya
+    {    176,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14368,28 , 14396,105 ,  14501,14 ,  14368,28 , 14396,105 ,  14501,14 ,    494,10 ,    468,10 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15943,24 ,       4,4 ,       4,0 ,    4838,7 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Taita/Latin/Kenya
+    {    177,     7,   187,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15967,26 ,      13,5 ,       4,0 ,    4845,6 ,    4401,8 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Senegal
+    {    177,     7,    34,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15967,26 ,      13,5 ,       4,0 ,    4845,6 ,   4851,14 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Burkina Faso
+    {    177,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  15993,25 ,      13,5 ,       4,0 ,    4845,6 ,    4865,8 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Cameroon
+    {    177,     7,    80,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {71,77,68},      162,1 ,  16018,20 ,      13,5 ,       4,0 ,    4845,6 ,    4873,6 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Gambia
+    {    177,     7,    83,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      163,3 ,       0,7 ,      13,5 ,       4,0 ,    4845,6 ,    4879,5 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Ghana
+    {    177,     7,    91,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      215,2 ,       0,7 ,      13,5 ,       4,0 ,    4845,6 ,    4884,4 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Guinea
+    {    177,     7,    92,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15967,26 ,      13,5 ,       4,0 ,    4845,6 ,   4888,12 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Guinea Bissau
+    {    177,     7,   121,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  16038,23 ,      13,5 ,       4,0 ,    4845,6 ,    4900,9 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Liberia
+    {    177,     7,   136,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {77,82,85},      218,2 ,  16061,22 ,      13,5 ,       4,0 ,    4845,6 ,    4909,8 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Mauritania
+    {    177,     7,   156,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  15967,26 ,      13,5 ,       4,0 ,    4845,6 ,    4917,6 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Niger
+    {    177,     7,   157,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      177,1 ,  16083,23 ,      13,5 ,       4,0 ,    4845,6 ,    4923,9 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Nigeria
+    {    177,     7,   189,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14515,28 ,  14543,59 ,  14602,14 ,  14515,28 ,  14543,59 ,  14602,14 ,     504,6 ,     478,7 ,   45,4 ,   5,17 ,  22,23 , {83,76,76},      186,2 ,  16106,25 ,      13,5 ,       4,0 ,    4845,6 ,   4932,11 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Sierra Leone
+    {    177,   134,    91,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      215,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Fulah/Adlam/Guinea
+    {    178,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14616,28 ,  14644,63 ,  14707,14 ,  14616,28 ,  14644,63 ,  14707,14 ,     510,6 ,     485,8 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16131,23 ,       4,4 ,       4,0 ,    4943,6 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Kikuyu/Latin/Kenya
+    {    179,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14721,28 , 14749,105 ,  14854,14 ,  14721,28 , 14749,105 ,  14854,14 ,     516,7 ,     493,5 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16154,25 ,       4,4 ,       4,0 ,    4949,8 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Samburu/Latin/Kenya
+    {    180,     7,   146,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,    669,27 ,      37,5 ,      8,10 ,  14868,28 ,  14896,55 ,  14951,14 ,  14868,28 ,  14896,55 ,  14951,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,90,78},      266,3 ,  16179,28 ,       0,4 ,       4,0 ,    4957,4 ,   3357,10 ,     2,     1,     7,     6,     7 }, // Sena/Latin/Mozambique
+    {    181,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14965,28 ,  14993,50 ,  15043,14 ,  14965,28 ,  14993,50 ,  15043,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      155,3 ,  16207,24 ,       4,4 ,       4,0 ,   4961,10 ,    1820,8 ,     2,     1,     7,     6,     7 }, // North Ndebele/Latin/Zimbabwe
+    {    182,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15057,29 ,  15086,65 ,  15151,14 ,  15057,29 ,  15086,65 ,  15151,14 ,     523,8 ,     498,7 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16231,25 ,       4,4 ,       4,0 ,    4971,9 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Rombo/Latin/Tanzania
+    {    183,     9,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  15165,30 ,  15195,47 ,     85,14 ,  15165,30 ,  15195,47 ,     85,14 ,     531,6 ,     505,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16256,21 ,       0,4 ,       4,0 ,    4980,7 ,    4987,6 ,     2,     1,     1,     6,     7 }, // Tachelhit/Tifinagh/Morocco
+    {    183,     7,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  15242,30 ,  15272,48 ,     85,14 ,  15242,30 ,  15272,48 ,     85,14 ,     537,6 ,     513,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16277,21 ,       0,4 ,       4,0 ,   4993,10 ,    5003,6 ,     2,     1,     1,     6,     7 }, // Tachelhit/Latin/Morocco
+    {    184,     7,     3,    44,   160,    59,    37,    48,    45,    43,   122,     171,     187,    8220,    8221,       0,6 ,       0,6 ,    914,12 ,    926,11 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  15320,28 ,  15348,34 ,  15382,14 ,  15396,30 ,  15426,51 ,  15477,14 ,     543,7 ,     521,9 , 1193,7 , 1200,21 ,  22,23 , {68,90,68},      204,2 ,  16298,53 ,       0,4 ,       4,0 ,    5009,9 ,    5018,8 ,     2,     1,     6,     5,     6 }, // Kabyle/Latin/Algeria
+    {    185,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15491,28 ,  15519,74 ,  15593,14 ,  15491,28 ,  15519,74 ,  15593,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16351,26 ,       4,4 ,       4,0 ,   5026,10 ,    1690,6 ,     0,     0,     1,     6,     7 }, // Nyankole/Latin/Uganda
+    {    186,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15607,28 ,  15635,82 ,  15717,14 ,  15607,28 ,  15635,82 ,  15717,14 ,     550,7 ,     530,7 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16377,29 ,       0,4 ,       4,0 ,    5036,6 ,   5042,10 ,     2,     0,     1,     6,     7 }, // Bena/Latin/Tanzania
+    {    187,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15731,28 ,  15759,62 ,  15821,14 ,  15731,28 ,  15759,62 ,  15821,14 ,     557,5 ,     537,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16406,27 ,       4,4 ,       4,0 ,    5052,8 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Vunjo/Latin/Tanzania
+    {    188,     7,   132,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  15835,28 ,  15863,44 ,  15907,14 ,  15835,28 ,  15863,44 ,  15907,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16433,24 ,       4,4 ,       4,0 ,    5060,9 ,    2189,4 ,     0,     0,     1,     6,     7 }, // Bambara/Latin/Mali
+    {    188,    75,   132,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Bambara/Nko/Mali
+    {    189,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15921,28 ,  15949,64 ,  16013,14 ,  15921,28 ,  15949,64 ,  16013,14 ,     562,2 ,     546,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15943,24 ,       4,4 ,       4,0 ,    5069,6 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Embu/Latin/Kenya
+    {    190,    12,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     937,9 ,     946,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  16027,28 ,  16055,49 ,  16104,14 ,  16027,28 ,  16055,49 ,  16104,14 ,     564,3 ,     548,6 , 1221,6 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  16457,25 ,       4,4 ,       4,0 ,    5075,3 ,   5078,15 ,     2,     1,     7,     6,     7 }, // Cherokee/Cherokee/United States
+    {    191,     7,   137,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  16118,27 ,  16145,48 ,  16193,14 ,  16118,27 ,  16145,48 ,  16193,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,85,82},      175,2 ,  16482,21 ,      41,6 ,       4,0 ,   5093,14 ,    5107,5 ,     2,     0,     1,     6,     7 }, // Morisyen/Latin/Mauritius
+    {    192,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16207,28 , 16235,133 ,  15151,14 ,  16207,28 , 16235,133 ,  15151,14 ,     567,4 ,     554,5 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16406,27 ,       4,4 ,       4,0 ,   5112,10 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Makonde/Latin/Tanzania
+    {    193,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16368,36 ,  16404,63 ,  16467,14 ,  16368,36 ,  16404,63 ,  16467,14 ,     571,3 ,     559,3 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16503,29 ,      41,6 ,       4,0 ,    5122,8 ,    5130,9 ,     2,     0,     1,     6,     7 }, // Langi/Latin/Tanzania
+    {    194,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16481,28 ,  16509,66 ,  16575,14 ,  16481,28 ,  16509,66 ,  16575,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16532,26 ,       0,4 ,       4,0 ,    5139,7 ,    5146,7 ,     0,     0,     1,     6,     7 }, // Ganda/Latin/Uganda
+    {    195,     7,   239,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  16589,80 ,  16589,80 ,     85,14 ,  16589,80 ,  16589,80 ,     85,14 ,     574,8 ,     562,7 ,   45,4 ,   5,17 ,  22,23 , {90,77,87},      131,1 ,       0,7 ,       4,4 ,       4,0 ,    5153,9 ,    1814,6 ,     2,     1,     1,     6,     7 }, // Bemba/Latin/Zambia
+    {    196,     7,    39,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     163,7 ,     163,7 ,     415,8 ,   1656,27 ,      37,5 ,      8,10 ,  16669,28 ,  16697,73 ,  16770,14 ,  16669,28 ,  16784,73 ,  16770,14 ,      68,2 ,      65,2 ,   45,4 ,   5,17 ,  22,23 , {67,86,69},      265,1 ,  16558,43 ,      13,5 ,       4,0 ,   5162,12 ,   5174,10 ,     2,     1,     1,     6,     7 }, // Kabuverdianu/Latin/Cape Verde
+    {    197,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16857,28 ,  16885,51 ,  16936,14 ,  16857,28 ,  16885,51 ,  16936,14 ,     582,2 ,     569,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15943,24 ,       4,4 ,       4,0 ,    5184,6 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Meru/Latin/Kenya
+    {    198,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16950,28 ,  16978,53 ,  17031,14 ,  16950,28 ,  16978,53 ,  17031,14 ,     584,6 ,    571,10 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16601,26 ,       4,4 ,       4,0 ,    5190,8 ,   5198,12 ,     2,     1,     7,     6,     7 }, // Kalenjin/Latin/Kenya
+    {    199,     7,   148,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  17045,23 ,  17068,92 ,  17160,14 ,  17045,23 ,  17068,92 ,  17160,14 ,     590,7 ,     581,5 ,   45,4 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,  16627,22 ,       4,4 ,       4,0 ,   5210,13 ,    5223,8 ,     2,     1,     1,     6,     7 }, // Nama/Latin/Namibia
+    {    200,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15731,28 ,  15759,62 ,  15821,14 ,  15731,28 ,  15759,62 ,  15821,14 ,     557,5 ,     537,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16406,27 ,       4,4 ,       4,0 ,    5231,9 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Machame/Latin/Tanzania
+    {    201,     7,    82,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     461,8 ,     461,8 ,   1134,10 ,   1683,23 ,      37,5 ,      8,10 ,  17174,28 ,  17202,72 ,   3668,14 ,  17174,28 ,  17202,72 ,   3668,14 ,    597,16 ,    586,16 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  16649,11 ,      13,5 ,       4,0 ,    5240,6 ,   5246,11 ,     2,     1,     1,     6,     7 }, // Colognian/Latin/Germany
+    {    202,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15731,28 ,  17274,58 ,  15151,14 ,  15731,28 ,  17274,58 ,  15151,14 ,     613,9 ,     602,6 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16660,25 ,       4,4 ,       4,0 ,    5257,3 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Masai/Latin/Kenya
+    {    202,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15731,28 ,  17274,58 ,  15151,14 ,  15731,28 ,  17274,58 ,  15151,14 ,     613,9 ,     602,6 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16685,28 ,       4,4 ,       4,0 ,    5257,3 ,    5260,8 ,     2,     0,     1,     6,     7 }, // Masai/Latin/Tanzania
+    {    203,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17332,35 ,  17367,65 ,  17432,14 ,  17332,35 ,  17367,65 ,  17432,14 ,     622,6 ,     608,6 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16532,26 ,      13,5 ,       4,0 ,    5268,7 ,    5146,7 ,     0,     0,     1,     6,     7 }, // Soga/Latin/Uganda
+    {    204,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17446,21 ,  17467,75 ,     85,14 ,  17446,21 ,  17467,75 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16713,23 ,       4,4 ,      96,6 ,    5275,7 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Luyia/Latin/Kenya
+    {    205,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17542,28 ,  10010,60 ,  15821,14 ,  17542,28 ,  10010,60 ,  15821,14 ,     628,9 ,     614,8 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16736,28 ,      13,5 ,       4,0 ,    5282,6 ,    5288,8 ,     2,     0,     1,     6,     7 }, // Asu/Latin/Tanzania
+    {    206,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17570,28 ,  17598,69 ,  17667,14 ,  17570,28 ,  17598,69 ,  17667,14 ,     637,9 ,     622,6 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16764,28 ,       4,4 ,       4,0 ,    5296,6 ,    1690,6 ,     0,     0,     1,     6,     7 }, // Teso/Latin/Uganda
+    {    206,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17570,28 ,  17598,69 ,  17667,14 ,  17570,28 ,  17598,69 ,  17667,14 ,     637,9 ,     622,6 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16792,27 ,       4,4 ,       4,0 ,    5296,6 ,    5302,5 ,     2,     1,     7,     6,     7 }, // Teso/Latin/Kenya
+    {    207,     7,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Saho/Latin/Eritrea
+    {    208,     7,   132,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  17681,28 ,  17709,53 ,  17762,14 ,  17681,28 ,  17709,53 ,  17762,14 ,     646,6 ,     628,6 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16819,23 ,       0,4 ,       4,0 ,   5307,11 ,    5318,5 ,     0,     0,     1,     6,     7 }, // Koyra Chiini/Latin/Mali
+    {    209,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15731,28 ,  15759,62 ,  15821,14 ,  15731,28 ,  15759,62 ,  15821,14 ,     557,5 ,     537,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16406,27 ,       0,4 ,       4,0 ,    5323,6 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Rwa/Latin/Tanzania
+    {    210,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17776,28 ,  17804,69 ,  17873,14 ,  17776,28 ,  17804,69 ,  17873,14 ,     652,2 ,     634,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16842,23 ,       0,4 ,       4,0 ,    5329,6 ,    1192,5 ,     2,     1,     7,     6,     7 }, // Luo/Latin/Kenya
+    {    211,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15491,28 ,  15519,74 ,  15593,14 ,  15491,28 ,  15519,74 ,  15593,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      196,3 ,  16351,26 ,       4,4 ,       4,0 ,    5335,6 ,    1690,6 ,     0,     0,     1,     6,     7 }, // Chiga/Latin/Uganda
+    {    212,     7,   145,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17887,28 ,  17915,48 ,  17963,14 ,  17887,28 ,  17915,48 ,  17963,14 ,     654,9 ,    636,10 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16865,22 ,      13,5 ,       4,0 ,   5341,17 ,    5358,6 ,     2,     1,     1,     6,     7 }, // Central Morocco Tamazight/Latin/Morocco
+    {    213,     7,   132,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  17977,28 ,  18005,54 ,  17762,14 ,  17977,28 ,  18005,54 ,  17762,14 ,     646,6 ,     628,6 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16819,23 ,       0,4 ,       4,0 ,   5364,15 ,    5318,5 ,     0,     0,     1,     6,     7 }, // Koyraboro Senni/Latin/Mali
+    {    214,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  18059,28 ,  18087,63 ,  18150,14 ,  18059,28 ,  18087,63 ,  18150,14 ,     663,5 ,     646,8 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  16887,27 ,       0,4 ,       4,0 ,    5379,9 ,    1625,8 ,     2,     0,     1,     6,     7 }, // Shambala/Latin/Tanzania
+    {    215,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  18164,33 ,  18197,54 ,  18251,19 ,  18164,33 ,  18197,54 ,  18251,19 ,     668,3 ,     654,6 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  16914,10 ,       8,5 ,       4,0 ,    5388,4 ,    2667,4 ,     2,     1,     7,     7,     7 }, // Bodo/Devanagari/India
+    {    218,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  18270,25 ,  18295,45 ,  18340,17 ,  18270,25 ,  18295,45 ,  18270,25 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  16924,43 ,      13,5 ,       4,0 ,    5392,7 ,    5399,5 ,     2,     1,     1,     6,     7 }, // Chechen/Cyrillic/Russia
+    {    219,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     954,8 ,     954,8 ,   1010,10 ,   1706,23 ,      37,5 ,      8,10 ,  18357,37 ,  18394,68 ,  11435,14 ,  18357,37 ,  18394,68 ,  11435,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  16967,44 ,      13,5 ,       4,0 ,   5404,19 ,    5423,7 ,     2,     1,     1,     6,     7 }, // Church/Cyrillic/Russia
+    {    220,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Chuvash/Cyrillic/Russia
+    {    230,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  18462,28 ,  18490,50 ,  18540,14 ,  18462,28 ,  18490,50 ,  18540,14 ,     671,5 ,     660,6 ,   45,4 ,   5,17 ,  22,23 , {67,68,70},      209,2 ,  17011,24 ,       0,4 ,       4,0 ,    5430,8 ,   5438,16 ,     2,     1,     1,     6,     7 }, // Luba Katanga/Latin/Congo Kinshasa
+    {    231,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,    962,10 ,    962,10 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  18554,28 ,  18582,65 ,   3668,14 ,  18647,35 ,  18582,65 ,   3668,14 ,     676,5 ,     666,8 ,  462,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8439,19 ,      13,5 ,       4,0 ,   5454,14 ,   5468,10 ,     2,     1,     1,     6,     7 }, // Luxembourgish/Latin/Luxembourg
+    {    236,     7,    21,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Walloon/Latin/Belgium
+    {    237,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  18682,28 ,  18710,72 ,  18782,14 ,  18682,28 ,  18710,72 ,  18782,14 ,     681,3 ,     674,3 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17035,21 ,       0,4 ,       4,0 ,    5478,5 ,    5483,7 ,     0,     0,     1,     6,     7 }, // Aghem/Latin/Cameroon
+    {    238,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  18796,28 ,  18824,70 ,  18894,14 ,  18796,28 ,  18824,70 ,  18894,14 ,    684,10 ,     677,9 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17056,22 ,      13,5 ,       4,0 ,    5490,5 ,    5495,8 ,     0,     0,     1,     6,     7 }, // Basaa/Latin/Cameroon
+    {    239,     7,   156,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  17977,28 ,  18908,53 ,  18961,14 ,  17977,28 ,  18908,53 ,  18961,14 ,     694,8 ,    686,10 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16819,23 ,       0,4 ,       4,0 ,   5503,10 ,    5513,5 ,     0,     0,     1,     6,     7 }, // Zarma/Latin/Niger
+    {    240,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  18975,28 ,  19003,45 ,  19048,14 ,  18975,28 ,  19003,45 ,  19048,14 ,     702,5 ,     696,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,      13,5 ,       4,0 ,    5518,5 ,    1986,8 ,     0,     0,     1,     6,     7 }, // Duala/Latin/Cameroon
+    {    241,     7,   187,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19062,28 ,  19090,50 ,  19140,14 ,  19062,28 ,  19090,50 ,  19140,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  17078,23 ,      13,5 ,       4,0 ,    5523,5 ,    5528,7 ,     0,     0,     1,     6,     7 }, // Jola Fonyi/Latin/Senegal
+    {    242,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19154,30 ,  19184,85 ,  19269,14 ,  19154,30 ,  19184,85 ,  19269,14 ,     707,7 ,     702,9 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17101,23 ,      13,5 ,       4,0 ,    5535,6 ,    5541,7 ,     0,     0,     1,     6,     7 }, // Ewondo/Latin/Cameroon
+    {    243,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19283,29 ,  19312,45 ,  19357,14 ,  19283,29 ,  19312,45 ,  19357,14 ,     714,6 ,     711,7 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17124,11 ,      13,5 ,       4,0 ,    5548,5 ,    5553,7 ,     0,     0,     1,     6,     7 }, // Bafia/Latin/Cameroon
+    {    244,     7,   146,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19371,28 ,  19399,59 ,  19458,14 ,  19371,28 ,  19399,59 ,  19458,14 ,     720,8 ,    718,10 ,   45,4 ,   5,17 ,  22,23 , {77,90,78},      266,3 ,       0,7 ,      41,6 ,       4,0 ,    5560,5 ,   5565,10 ,     2,     1,     7,     6,     7 }, // Makhuwa Meetto/Latin/Mozambique
+    {    245,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19472,28 ,  19500,74 ,  19574,14 ,  19472,28 ,  19500,74 ,  19574,14 ,     728,5 ,     728,5 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17135,17 ,       4,4 ,       4,0 ,    5575,6 ,    5581,7 ,     0,     0,     1,     6,     7 }, // Mundang/Latin/Cameroon
+    {    246,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19588,30 ,  19618,89 ,  19707,14 ,  19588,30 ,  19618,89 ,  19707,14 ,     733,4 ,     733,4 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17152,20 ,      13,5 ,       4,0 ,    5588,6 ,    5594,7 ,     0,     0,     1,     6,     7 }, // Kwasio/Latin/Cameroon
+    {    247,     7,   254,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     538,9 ,     97,16 ,      18,7 ,    558,12 ,  19721,38 ,  19759,79 ,  19838,14 ,  19721,38 ,  19759,79 ,  19838,14 ,     737,2 ,     737,2 ,   45,4 ,   5,17 ,  22,23 , {83,83,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    5601,9 ,       0,0 ,     2,     1,     1,     6,     7 }, // Nuer/Latin/South Sudan
+    {    248,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,    972,11 ,    972,11 ,     227,6 ,   1729,30 ,      37,5 ,      8,10 ,  19852,21 ,  19873,71 ,  19944,14 ,  19852,21 ,  19873,71 ,  19944,14 ,     739,2 ,     739,2 , 1227,5 , 1232,17 ,  22,23 , {82,85,66},      123,1 ,  17172,47 ,      13,5 ,       4,0 ,    5610,9 ,    5619,9 ,     2,     1,     1,     6,     7 }, // Sakha/Cyrillic/Russia
+    {    249,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19958,28 ,  19986,60 ,  20046,14 ,  19958,28 ,  19986,60 ,  20046,14 ,     741,9 ,     741,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      191,3 ,  17219,25 ,       0,4 ,       4,0 ,    5628,9 ,    5637,9 ,     2,     0,     1,     6,     7 }, // Sangu/Latin/Tanzania
+    {    251,     7,   156,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  17977,28 ,  18005,54 ,  17762,14 ,  17977,28 ,  18005,54 ,  17762,14 ,     694,8 ,    686,10 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      206,3 ,  16819,23 ,       0,4 ,       4,0 ,   5646,13 ,    5513,5 ,     0,     0,     1,     6,     7 }, // Tasawaq/Latin/Niger
+    {    252,    35,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  20060,30 ,  20060,30 ,     85,14 ,  20060,30 ,  20060,30 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  17244,15 ,       4,4 ,       4,0 ,    5659,2 ,    5661,4 ,     2,     1,     1,     6,     7 }, // Vai/Vai/Liberia
+    {    252,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  20090,48 ,  20090,48 ,     85,14 ,  20090,48 ,  20090,48 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  17259,20 ,       4,4 ,       4,0 ,    5665,3 ,    5668,8 ,     2,     1,     1,     6,     7 }, // Vai/Latin/Liberia
+    {    253,     7,   206,    44,  8217,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     269,9 ,     269,9 ,     53,10 ,    622,18 ,      37,5 ,      8,10 ,  20138,28 ,  20166,53 ,  20219,14 ,  20138,28 ,  20166,53 ,  20219,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,       0,7 ,      41,6 ,       4,0 ,    5676,6 ,    5682,6 ,     2,     0,     1,     6,     7 }, // Walser/Latin/Switzerland
+    {    254,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  20233,21 ,  20254,71 ,  20325,14 ,  20233,21 ,  20254,71 ,  20325,14 ,     750,8 ,     750,8 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,      13,5 ,       4,0 ,    5688,6 ,    5694,7 ,     0,     0,     1,     6,     7 }, // Yangben/Latin/Cameroon
+    {    256,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     683,7 ,     683,7 ,     269,6 ,    372,22 ,      37,5 ,      8,10 ,  20339,28 ,  20367,54 ,   3364,14 ,  20339,28 ,  20367,54 ,   3364,14 ,    758,12 ,    758,11 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    5701,9 ,    2432,6 ,     2,     1,     1,     6,     7 }, // Asturian/Latin/Spain
+    {    257,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,    983,11 ,    983,11 ,    994,16 ,    1010,9 ,     53,10 ,   1559,18 ,      37,5 ,      8,10 ,  20421,60 ,  20421,60 ,  20481,25 ,  20421,60 ,  20421,60 ,  20481,25 ,     770,8 ,    769,13 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17279,12 ,       8,5 ,       4,0 ,    5710,5 ,    5715,7 ,     0,     0,     1,     6,     7 }, // Ngomba/Latin/Cameroon
+    {    258,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,   1759,10 ,     80,17 ,      37,5 ,      8,10 ,  20506,54 ,  20506,54 ,  20560,21 ,  20506,54 ,  20506,54 ,  20560,21 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17291,16 ,      41,6 ,       4,0 ,    5722,4 ,    5726,7 ,     0,     0,     1,     6,     7 }, // Kako/Latin/Cameroon
+    {    259,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1559,18 ,      37,5 ,      8,10 ,  20581,49 ,  20581,49 ,  20630,21 ,  20581,49 ,  20581,49 ,  20630,21 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17307,12 ,       8,5 ,       4,0 ,    5733,5 ,    5738,7 ,     0,     0,     1,     6,     7 }, // Meta/Latin/Cameroon
+    {    260,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1769,32 ,      37,5 ,      8,10 , 20651,111 , 20651,111 ,     85,14 , 20651,111 , 20651,111 ,     85,14 ,     778,9 ,     782,8 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17319,16 ,       8,5 ,       4,0 ,   5745,16 ,    5761,7 ,     0,     0,     1,     6,     7 }, // Ngiemboon/Latin/Cameroon
+    {    290,    11,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     7,     7 }, // Manipuri/Bengali/India
+    {    309,   100,   232,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {86,78,68},      322,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Tai Dam/Tai Viet/Vietnam
+    {    312,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Akoose/Latin/Cameroon
+    {    313,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  20762,87 ,  20762,87 ,     85,14 ,  20762,87 ,  20762,87 ,  20849,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,       0,7 ,      41,6 ,       4,0 ,   5768,12 ,   5780,22 ,     2,     1,     7,     6,     7 }, // Lakota/Latin/United States
+    {    314,     9,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  15165,30 ,  20863,48 ,     85,14 ,  15165,30 ,  20863,48 ,     85,14 ,     531,6 ,     505,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16256,21 ,       0,4 ,       4,0 ,    5802,8 ,    4987,6 ,     2,     1,     1,     6,     7 }, // Standard Moroccan Tamazight/Tifinagh/Morocco
+    {    315,     7,    43,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,76,80},        6,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Mapuche/Latin/Chile
+    {    316,     1,   103,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,  20911,58 ,  20911,58 ,  20969,14 ,  20911,58 ,  20911,58 ,  20969,14 ,     787,3 ,     790,3 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},       44,5 ,  17335,20 ,      13,5 ,       4,0 ,   5810,14 ,    5824,5 ,     0,     0,     6,     5,     6 }, // Central Kurdish/Arabic/Iraq
+    {    316,     1,   102,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  20911,58 ,  20911,58 ,  20969,14 ,  20911,58 ,  20911,58 ,  20969,14 ,     787,3 ,     790,3 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,  17355,19 ,      13,5 ,       4,0 ,   5810,14 ,    5829,5 ,     0,     0,     6,     5,     5 }, // Central Kurdish/Arabic/Iran
+    {    317,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     185,7 ,     185,7 ,     113,6 ,    622,18 ,      55,4 ,      59,9 ,  20983,28 ,  21011,53 ,  21064,14 ,  20983,28 ,  21011,53 ,  21064,14 ,     790,9 ,    793,10 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17374,27 ,      13,5 ,       4,0 ,   5834,14 ,    5848,6 ,     2,     1,     1,     6,     7 }, // Lower Sorbian/Latin/Germany
+    {    318,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     185,7 ,     185,7 ,     113,6 ,    622,18 ,    570,12 ,      59,9 ,  21078,28 ,  21106,53 ,  21159,14 ,  21078,28 ,  21106,53 ,  21159,14 ,     790,9 ,     803,9 , 1249,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17401,29 ,      13,5 ,       4,0 ,   5854,15 ,    5869,6 ,     2,     1,     1,     6,     7 }, // Upper Sorbian/Latin/Germany
+    {    319,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Kenyang/Latin/Cameroon
+    {    320,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      233,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Mohawk/Latin/Canada
+    {    321,    75,    91,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      215,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Nko/Nko/Guinea
+    {    322,     7,   260,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,    1019,8 ,    1019,8 ,     156,8 ,   1801,27 ,      37,5 ,      8,10 ,  21173,28 ,  21201,69 ,  21270,14 ,  21173,28 ,  21201,69 ,  21270,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,    5875,9 ,    5884,6 ,     2,     1,     1,     6,     7 }, // Prussian/Latin/World
+    {    323,     7,    90,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,84,81},      290,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Kiche/Latin/Guatemala
+    {    324,     7,   205,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     1,     6,     7 }, // Southern Sami/Latin/Sweden
+    {    325,     7,   205,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      189,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     1,     6,     7 }, // Lule Sami/Latin/Sweden
+    {    326,     7,    73,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     640,8 ,   1828,18 ,     243,4 ,     247,9 ,  21284,28 ,  21312,70 ,     85,14 ,  21284,28 ,  21382,73 ,  21455,14 ,     799,3 ,     812,3 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17430,11 ,      13,5 ,       4,0 ,   5890,11 ,    5901,5 ,     2,     1,     1,     6,     7 }, // Inari Sami/Latin/Finland
+    {    327,     7,    73,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Skolt Sami/Latin/Finland
+    {    328,     7,    13,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {65,85,68},      326,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Warlpiri/Latin/Australia
+    {    346,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,  726,4 , 1254,39 ,  22,23 , {73,82,82},      328,3 ,  17441,27 ,       8,5 ,       4,0 ,    5906,7 ,    3238,5 ,     0,     0,     6,     5,     5 }, // Mazanderani/Arabic/Iran
+    {    349,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,   5913,11 ,       0,0 ,     0,     0,     6,     5,     5 }, // Northern Luri/Arabic/Iran
+    {    349,     1,   103,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},       44,5 ,       0,7 ,       8,5 ,       4,0 ,   5913,11 ,       0,0 ,     0,     0,     6,     5,     6 }, // Northern Luri/Arabic/Iraq
+    {    357,     6,    97,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     170,5 ,     170,5 ,    1027,5 ,    1027,5 ,     394,8 ,    423,14 ,     198,6 ,    215,13 ,   1953,28 ,   1953,28 ,   1981,14 ,   1953,28 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {72,75,68},      166,3 ,  17468,11 ,       4,4 ,       4,0 ,    5924,2 ,   5926,14 ,     2,     1,     7,     6,     7 }, // Cantonese/Traditional Han/Hong Kong
+    {    357,     5,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     170,5 ,     170,5 ,    1027,5 ,    1027,5 ,     394,8 ,    402,13 ,     198,6 ,    204,11 ,   1932,21 ,   1953,28 ,   1981,14 ,   1932,21 ,   1953,28 ,   1981,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      133,1 ,   3122,13 ,       4,4 ,       4,0 ,    5940,2 ,    5942,7 ,     2,     1,     7,     6,     7 }, // Cantonese/Simplified Han/China
+    {    360,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Ido/Latin/World
+    {    361,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Lojban/Latin/World
+    {    362,     7,   106,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Sicilian/Latin/Italy
+    {    363,     1,   102,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     5 }, // Southern Kurdish/Arabic/Iran
+    {    364,     1,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,75,82},      175,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Western Balochi/Arabic/Pakistan
+    {    365,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     897,9 ,     906,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  21469,25 ,  21494,56 ,  21550,14 ,  21469,25 ,  21494,56 ,  21550,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,72,80},      178,1 ,       0,7 ,       4,4 ,       4,0 ,    5949,7 ,    4701,9 ,     2,     1,     7,     6,     7 }, // Cebuano/Latin/Philippines
+    {    366,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Erzya/Cyrillic/Russia
+    {      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,       0,       0,       0,       0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,     0,0,     0,0,     0,0,    {0,0,0},         0,0,        0,0,        0,0,        0,0,        0,0,        0,0,     0,     0,     0,     0,     0 } // trailing 0s
 };
 
 static const ushort list_pattern_part_data[] = {
@@ -2037,1978 +2043,6 @@ static const ushort time_format_data[] = {
 0x27, 0x2e
 };
 
-static const ushort months_data[] = {
-0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,
-0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x63, 0x74, 0x3b,
-0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72,
-0x75, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x68, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79,
-0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65,
-0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65,
-0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,
-0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x31, 0x3b,
-0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31,
-0x31, 0x3b, 0x31, 0x32, 0x3b, 0x41, 0x6d, 0x61, 0x3b, 0x47, 0x75, 0x72, 0x3b, 0x42, 0x69, 0x74, 0x3b, 0x45, 0x6c, 0x62,
-0x3b, 0x43, 0x61, 0x6d, 0x3b, 0x57, 0x61, 0x78, 0x3b, 0x41, 0x64, 0x6f, 0x3b, 0x48, 0x61, 0x67, 0x3b, 0x46, 0x75, 0x6c,
-0x3b, 0x4f, 0x6e, 0x6b, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x4d, 0x75, 0x64, 0x3b, 0x41, 0x6d, 0x61, 0x6a, 0x6a, 0x69, 0x69,
-0x3b, 0x47, 0x75, 0x72, 0x61, 0x61, 0x6e, 0x64, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x42, 0x69, 0x74, 0x6f, 0x6f, 0x74, 0x65,
-0x65, 0x73, 0x73, 0x61, 0x3b, 0x45, 0x6c, 0x62, 0x61, 0x3b, 0x43, 0x61, 0x61, 0x6d, 0x73, 0x61, 0x3b, 0x57, 0x61, 0x78,
-0x61, 0x62, 0x61, 0x6a, 0x6a, 0x69, 0x69, 0x3b, 0x41, 0x64, 0x6f, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x48,
-0x61, 0x67, 0x61, 0x79, 0x79, 0x61, 0x3b, 0x46, 0x75, 0x75, 0x6c, 0x62, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6e, 0x6b, 0x6f,
-0x6c, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x53, 0x61, 0x64, 0x61, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x75, 0x64,
-0x64, 0x65, 0x65, 0x3b, 0x41, 0x3b, 0x47, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x43, 0x3b, 0x57, 0x3b, 0x41, 0x3b, 0x48, 0x3b,
-0x46, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x4d, 0x30, 0x31, 0x3b, 0x4d, 0x30, 0x32, 0x3b, 0x4d, 0x30, 0x33, 0x3b,
-0x4d, 0x30, 0x34, 0x3b, 0x4d, 0x30, 0x35, 0x3b, 0x4d, 0x30, 0x36, 0x3b, 0x4d, 0x30, 0x37, 0x3b, 0x4d, 0x30, 0x38, 0x3b,
-0x4d, 0x30, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32, 0x3b, 0x4a, 0x61, 0x6e, 0x2e,
-0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x72, 0x74, 0x2e, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b,
-0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b,
-0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x73, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61,
-0x72, 0x69, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x3b,
-0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x69,
-0x65, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65,
-0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x6b, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x70,
-0x72, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x3b, 0x6b, 0x6f, 0x72, 0x72, 0x3b, 0x67, 0x75, 0x73, 0x68,
-0x3b, 0x73, 0x68, 0x74, 0x3b, 0x74, 0x65, 0x74, 0x3b, 0x6e, 0xeb, 0x6e, 0x3b, 0x64, 0x68, 0x6a, 0x3b, 0x6a, 0x61, 0x6e,
-0x61, 0x72, 0x3b, 0x73, 0x68, 0x6b, 0x75, 0x72, 0x74, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x6c,
-0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x73, 0x68, 0x6f, 0x72, 0x3b, 0x6b, 0x6f, 0x72, 0x72, 0x69, 0x6b, 0x3b,
-0x67, 0x75, 0x73, 0x68, 0x74, 0x3b, 0x73, 0x68, 0x74, 0x61, 0x74, 0x6f, 0x72, 0x3b, 0x74, 0x65, 0x74, 0x6f, 0x72, 0x3b,
-0x6e, 0xeb, 0x6e, 0x74, 0x6f, 0x72, 0x3b, 0x64, 0x68, 0x6a, 0x65, 0x74, 0x6f, 0x72, 0x3b, 0x6a, 0x3b, 0x73, 0x68, 0x3b,
-0x6d, 0x3b, 0x70, 0x3b, 0x6d, 0x3b, 0x71, 0x3b, 0x6b, 0x3b, 0x67, 0x3b, 0x73, 0x68, 0x3b, 0x74, 0x3b, 0x6e, 0x3b, 0x64,
-0x68, 0x3b, 0x1303, 0x1295, 0x12e9, 0x3b, 0x134c, 0x1265, 0x1229, 0x3b, 0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x122a, 0x3b, 0x121c, 0x12ed,
-0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235, 0x3b, 0x1234, 0x1355, 0x1274, 0x3b, 0x12a6, 0x12ad, 0x1276, 0x3b,
-0x1296, 0x126c, 0x121d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x3b, 0x1303, 0x1295, 0x12e9, 0x12c8, 0x122a, 0x3b, 0x134c, 0x1265, 0x1229, 0x12c8, 0x122a, 0x3b,
-0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x122a, 0x120d, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6,
-0x1308, 0x1235, 0x1275, 0x3b, 0x1234, 0x1355, 0x1274, 0x121d, 0x1260, 0x122d, 0x3b, 0x12a6, 0x12ad, 0x1276, 0x1260, 0x122d, 0x3b, 0x1296, 0x126c, 0x121d,
-0x1260, 0x122d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x1260, 0x122d, 0x3b, 0x1303, 0x3b, 0x134c, 0x3b, 0x121b, 0x3b, 0x12a4, 0x3b, 0x121c, 0x3b, 0x1301,
-0x3b, 0x1301, 0x3b, 0x12a6, 0x3b, 0x1234, 0x3b, 0x12a6, 0x3b, 0x1296, 0x3b, 0x12f2, 0x3b, 0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641,
-0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a,
-0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x3b, 0x623, 0x63a, 0x633, 0x637, 0x633, 0x3b,
-0x633, 0x628, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631,
-0x3b, 0x62f, 0x64a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x648, 0x3b, 0x646, 0x3b,
-0x644, 0x3b, 0x63a, 0x3b, 0x633, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x3b, 0x62c, 0x627, 0x646, 0x641, 0x64a, 0x3b, 0x641, 0x64a,
-0x641, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x641, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x62c,
-0x648, 0x627, 0x646, 0x3b, 0x62c, 0x648, 0x64a, 0x644, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x62a, 0x3b, 0x633, 0x628, 0x62a, 0x645, 0x628,
-0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a, 0x633, 0x645,
-0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x623, 0x3b, 0x633,
-0x3b, 0x623, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b,
-0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646, 0x64a, 0x633, 0x627, 0x646, 0x3b, 0x623, 0x64a, 0x627, 0x631,
-0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648, 0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a, 0x644, 0x648,
-0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20,
-0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x643,
-0x3b, 0x634, 0x3b, 0x622, 0x3b, 0x646, 0x3b, 0x623, 0x3b, 0x62d, 0x3b, 0x62a, 0x3b, 0x622, 0x3b, 0x623, 0x3b, 0x62a, 0x3b, 0x62a,
-0x3b, 0x643, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637,
-0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646, 0x64a, 0x633, 0x627, 0x646, 0x3b, 0x623, 0x64a, 0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a,
-0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648, 0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a, 0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634,
-0x631, 0x64a, 0x646, 0xa0, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627,
-0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x64a, 0x646, 0x627, 0x64a, 0x631,
-0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x625, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645,
-0x627, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x3b, 0x623, 0x63a, 0x634, 0x62a,
-0x3b, 0x634, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631,
-0x3b, 0x62f, 0x62c, 0x645, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x625, 0x3b, 0x648, 0x3b, 0x646, 0x3b, 0x644,
-0x3b, 0x63a, 0x3b, 0x634, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x3b, 0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631,
-0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x64a,
-0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x632, 0x3b, 0x63a, 0x634, 0x62a, 0x3b, 0x634, 0x62a, 0x646, 0x628,
-0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x646, 0x628, 0x631, 0x3b, 0x62f, 0x62c, 0x646, 0x628, 0x631,
-0x3b, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x645, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x634, 0x3b, 0x643,
-0x3b, 0x628, 0x3b, 0x62f, 0x3b, 0x570, 0x576, 0x57e, 0x3b, 0x583, 0x57f, 0x57e, 0x3b, 0x574, 0x580, 0x57f, 0x3b, 0x561, 0x57a, 0x580,
-0x3b, 0x574, 0x575, 0x57d, 0x3b, 0x570, 0x576, 0x57d, 0x3b, 0x570, 0x56c, 0x57d, 0x3b, 0x585, 0x563, 0x57d, 0x3b, 0x57d, 0x565, 0x57a,
-0x3b, 0x570, 0x578, 0x56f, 0x3b, 0x576, 0x578, 0x575, 0x3b, 0x564, 0x565, 0x56f, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580,
-0x3b, 0x583, 0x565, 0x57f, 0x580, 0x57e, 0x561, 0x580, 0x3b, 0x574, 0x561, 0x580, 0x57f, 0x3b, 0x561, 0x57a, 0x580, 0x56b, 0x56c, 0x3b,
-0x574, 0x561, 0x575, 0x56b, 0x57d, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x56b, 0x57d, 0x3b, 0x570, 0x578, 0x582, 0x56c, 0x56b, 0x57d, 0x3b,
-0x585, 0x563, 0x578, 0x57d, 0x57f, 0x578, 0x57d, 0x3b, 0x57d, 0x565, 0x57a, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x570, 0x578,
-0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x576, 0x578, 0x575, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x564, 0x565, 0x56f,
-0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x540, 0x3b, 0x553, 0x3b, 0x544, 0x3b, 0x531, 0x3b, 0x544, 0x3b, 0x540, 0x3b, 0x540,
-0x3b, 0x555, 0x3b, 0x54d, 0x3b, 0x540, 0x3b, 0x546, 0x3b, 0x534, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580, 0x56b, 0x3b,
-0x583, 0x565, 0x57f, 0x580, 0x57e, 0x561, 0x580, 0x56b, 0x3b, 0x574, 0x561, 0x580, 0x57f, 0x56b, 0x3b, 0x561, 0x57a, 0x580, 0x56b, 0x56c,
-0x56b, 0x3b, 0x574, 0x561, 0x575, 0x56b, 0x57d, 0x56b, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x56b, 0x57d, 0x56b, 0x3b, 0x570, 0x578, 0x582,
-0x56c, 0x56b, 0x57d, 0x56b, 0x3b, 0x585, 0x563, 0x578, 0x57d, 0x57f, 0x578, 0x57d, 0x56b, 0x3b, 0x57d, 0x565, 0x57a, 0x57f, 0x565, 0x574,
-0x562, 0x565, 0x580, 0x56b, 0x3b, 0x570, 0x578, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x576, 0x578, 0x575, 0x565,
-0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x564, 0x565, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x99c, 0x9be, 0x9a8,
-0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0, 0x9bf,
-0x9b2, 0x3b, 0x9ae, 0x9c7, 0x2019, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x3b, 0x99b,
-0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x3b, 0x9a8, 0x9f1, 0x9c7, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7,
-0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0,
-0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x2019, 0x3b, 0x99c, 0x9c1,
-0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b7, 0x9cd, 0x99f, 0x3b, 0x99b, 0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7,
-0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9f0, 0x3b, 0x9a8, 0x9f1, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0,
-0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x99c, 0x3b, 0x9ab, 0x3b, 0x9ae, 0x3b, 0x98f, 0x3b, 0x9ae, 0x3b,
-0x99c, 0x3b, 0x99c, 0x3b, 0x986, 0x3b, 0x99b, 0x3b, 0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65,
-0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79,
-0x6c, 0x3b, 0x61, 0x76, 0x71, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65,
-0x6b, 0x3b, 0x59, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74,
-0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x130, 0x79, 0x75, 0x6e, 0x3b, 0x130, 0x79, 0x75, 0x6c,
-0x3b, 0x41, 0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74,
-0x79, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0x79,
-0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70,
-0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x75, 0x6e, 0x3b, 0x69, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x76,
-0x71, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x79, 0x61, 0x62,
-0x72, 0x3b, 0x6e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0x458, 0x430, 0x43d, 0x3b,
-0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x458, 0x43d, 0x3b,
-0x438, 0x458, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43d, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x458, 0x3b,
-0x434, 0x435, 0x43a, 0x3b, 0x408, 0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430,
-0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x458, 0x443, 0x43d, 0x3b, 0x418, 0x458,
-0x443, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x41e,
-0x43a, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440,
-0x3b, 0x458, 0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b,
-0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x458, 0x443, 0x43d, 0x3b, 0x438, 0x458, 0x443, 0x43b, 0x3b,
-0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x458,
-0x430, 0x431, 0x440, 0x3b, 0x43d, 0x43e, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0x75, 0x72,
-0x74, 0x2e, 0x3b, 0x6f, 0x74, 0x73, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x69, 0x2e, 0x3b, 0x6d, 0x61,
-0x69, 0x2e, 0x3b, 0x65, 0x6b, 0x61, 0x2e, 0x3b, 0x75, 0x7a, 0x74, 0x2e, 0x3b, 0x61, 0x62, 0x75, 0x2e, 0x3b, 0x69, 0x72,
-0x61, 0x2e, 0x3b, 0x75, 0x72, 0x72, 0x2e, 0x3b, 0x61, 0x7a, 0x61, 0x2e, 0x3b, 0x61, 0x62, 0x65, 0x2e, 0x3b, 0x75, 0x72,
-0x74, 0x61, 0x72, 0x72, 0x69, 0x6c, 0x61, 0x3b, 0x6f, 0x74, 0x73, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x74,
-0x78, 0x6f, 0x61, 0x3b, 0x61, 0x70, 0x69, 0x72, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x69, 0x61, 0x74, 0x7a, 0x61, 0x3b,
-0x65, 0x6b, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x75, 0x7a, 0x74, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x61, 0x62, 0x75, 0x7a, 0x74,
-0x75, 0x61, 0x3b, 0x69, 0x72, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x75, 0x72, 0x72, 0x69, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72,
-0x6f, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x6e, 0x64, 0x75, 0x61, 0x3b, 0x55, 0x3b, 0x4f, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d,
-0x3b, 0x45, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9af,
-0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9b0, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9b0,
-0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2,
-0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b,
-0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7,
-0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x99c, 0x9be, 0x3b, 0x9ab, 0x9c7, 0x3b, 0x9ae, 0x9be, 0x3b, 0x98f, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c,
-0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x3b, 0x986, 0x3b, 0x9b8, 0x9c7, 0x3b, 0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x9bf, 0x3b, 0x99c, 0x9be,
-0x9a8, 0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b,
-0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8,
-0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad,
-0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0x3b,
-0xf5f, 0xfb3, 0xf0b, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf25, 0x3b,
-0xf5f, 0xfb3, 0xf0b, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf28, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf29, 0x3b,
-0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf22, 0x3b, 0xf66, 0xfa4,
-0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf42,
-0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b,
-0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0x3b, 0xf66, 0xfa4, 0xfb1,
-0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51,
-0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54,
-0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66,
-0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f,
-0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74,
-0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74,
-0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf21, 0x3b, 0xf22, 0x3b, 0xf23, 0x3b, 0xf24, 0x3b, 0xf25, 0x3b, 0xf26,
-0x3b, 0xf27, 0x3b, 0xf28, 0x3b, 0xf29, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b, 0xf21, 0xf22, 0x3b, 0xf21, 0x3b, 0xf22, 0x3b,
-0xf23, 0x3b, 0xf24, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28, 0x3b, 0xf29, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b,
-0x31, 0x32, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54,
-0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b,
-0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b,
-0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1,
-0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45,
-0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b,
-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf21, 0x3b, 0xf22, 0x3b, 0xf23,
-0x3b, 0x34, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28, 0x3b, 0x39, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b, 0xf21,
-0xf22, 0x3b, 0x47, 0x65, 0x6e, 0x2e, 0x3b, 0x43, 0x2bc, 0x68, 0x77, 0x65, 0x2e, 0x3b, 0x4d, 0x65, 0x75, 0x72, 0x2e, 0x3b,
-0x45, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x65, 0x3b, 0x4d, 0x65, 0x7a, 0x68, 0x2e, 0x3b, 0x47, 0x6f, 0x75, 0x65, 0x2e,
-0x3b, 0x45, 0x6f, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x2e, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x44, 0x75, 0x3b,
-0x4b, 0x7a, 0x75, 0x2e, 0x3b, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x43, 0x2bc, 0x68, 0x77, 0x65, 0x76, 0x72, 0x65,
-0x72, 0x3b, 0x4d, 0x65, 0x75, 0x72, 0x7a, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x65, 0x3b, 0x4d,
-0x65, 0x7a, 0x68, 0x65, 0x76, 0x65, 0x6e, 0x3b, 0x47, 0x6f, 0x75, 0x65, 0x72, 0x65, 0x3b, 0x45, 0x6f, 0x73, 0x74, 0x3b,
-0x47, 0x77, 0x65, 0x6e, 0x67, 0x6f, 0x6c, 0x6f, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x72,
-0x7a, 0x75, 0x3b, 0x30, 0x31, 0x3b, 0x30, 0x32, 0x3b, 0x30, 0x33, 0x3b, 0x30, 0x34, 0x3b, 0x30, 0x35, 0x3b, 0x30, 0x36,
-0x3b, 0x30, 0x37, 0x3b, 0x30, 0x38, 0x3b, 0x30, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x44f,
-0x43d, 0x443, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b,
-0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b,
-0x43d, 0x43e, 0x435, 0x3b, 0x434, 0x435, 0x43a, 0x3b, 0x44f, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443,
-0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e,
-0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c,
-0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438,
-0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x44f, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b,
-0x44e, 0x3b, 0x44e, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x1007, 0x1014, 0x103a, 0x3b, 0x1016, 0x1031,
-0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x3b, 0x1029, 0x3b,
-0x1005, 0x1000, 0x103a, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x3b, 0x1014, 0x102d, 0x102f, 0x3b, 0x1012, 0x102e, 0x3b, 0x1007, 0x1014, 0x103a,
-0x1014, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1016, 0x1031, 0x1016, 0x1031, 0x102c, 0x103a, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1019, 0x1010, 0x103a,
-0x3b, 0x1027, 0x1015, 0x103c, 0x102e, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x101c, 0x102d, 0x102f, 0x1004,
-0x103a, 0x3b, 0x1029, 0x1002, 0x102f, 0x1010, 0x103a, 0x3b, 0x1005, 0x1000, 0x103a, 0x1010, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1021, 0x1031, 0x102c,
-0x1000, 0x103a, 0x1010, 0x102d, 0x102f, 0x1018, 0x102c, 0x3b, 0x1014, 0x102d, 0x102f, 0x101d, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1012, 0x102e, 0x1007,
-0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1007, 0x3b, 0x1016, 0x3b, 0x1019, 0x3b, 0x1027, 0x3b, 0x1019, 0x3b, 0x1007, 0x3b, 0x1007, 0x3b, 0x1029,
-0x3b, 0x1005, 0x3b, 0x1021, 0x3b, 0x1014, 0x3b, 0x1012, 0x3b, 0x441, 0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430, 0x43a,
-0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447, 0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d, 0x456,
-0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435, 0x3b, 0x441, 0x442, 0x443,
-0x434, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x44b, 0x3b, 0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43a,
-0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b,
-0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43d, 0x456, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441,
-0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447, 0x43d, 0x456, 0x43a, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430,
-0x43f, 0x430, 0x434, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x430, 0x43d, 0x44c, 0x3b, 0x441, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x43a, 0x3b,
-0x43c, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x436, 0x3b, 0x432, 0x3b, 0x43a, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x441, 0x442, 0x443, 0x3b,
-0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x447, 0x44d, 0x440, 0x3b,
-0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b,
-0x441, 0x43d, 0x435, 0x3b, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d, 0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x430, 0x433, 0x430, 0x3b,
-0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x430, 0x3b, 0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x430, 0x3b, 0x43c,
-0x430, 0x44f, 0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44f, 0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44f, 0x3b, 0x436, 0x43d,
-0x456, 0x45e, 0x43d, 0x44f, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441, 0x43d, 0x44f, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447,
-0x43d, 0x456, 0x43a, 0x430, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f, 0x430, 0x434, 0x430, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x43d,
-0x44f, 0x3b, 0x1798, 0x1780, 0x179a, 0x17b6, 0x3b, 0x1780, 0x17bb, 0x1798, 0x17d2, 0x1797, 0x17c8, 0x3b, 0x1798, 0x17b8, 0x1793, 0x17b6, 0x3b, 0x1798,
-0x17c1, 0x179f, 0x17b6, 0x3b, 0x17a7, 0x179f, 0x1797, 0x17b6, 0x3b, 0x1798, 0x17b7, 0x1790, 0x17bb, 0x1793, 0x17b6, 0x3b, 0x1780, 0x1780, 0x17d2, 0x1780,
-0x178a, 0x17b6, 0x3b, 0x179f, 0x17b8, 0x17a0, 0x17b6, 0x3b, 0x1780, 0x1789, 0x17d2, 0x1789, 0x17b6, 0x3b, 0x178f, 0x17bb, 0x179b, 0x17b6, 0x3b, 0x179c,
-0x17b7, 0x1785, 0x17d2, 0x1786, 0x17b7, 0x1780, 0x17b6, 0x3b, 0x1792, 0x17d2, 0x1793, 0x17bc, 0x3b, 0x1798, 0x3b, 0x1780, 0x3b, 0x1798, 0x3b, 0x1798,
-0x3b, 0x17a7, 0x3b, 0x1798, 0x3b, 0x1780, 0x3b, 0x179f, 0x3b, 0x1780, 0x3b, 0x178f, 0x3b, 0x179c, 0x3b, 0x1792, 0x3b, 0x67, 0x65, 0x6e,
-0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61,
-0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x74,
-0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x67, 0x65, 0x6e,
-0x65, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c,
-0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x61, 0x67,
-0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65,
-0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47,
-0x4e, 0x3b, 0x46, 0x42, 0x3b, 0x4d, 0xc7, 0x3b, 0x41, 0x42, 0x3b, 0x4d, 0x47, 0x3b, 0x4a, 0x4e, 0x3b, 0x4a, 0x4c, 0x3b,
-0x41, 0x47, 0x3b, 0x53, 0x54, 0x3b, 0x4f, 0x43, 0x3b, 0x4e, 0x56, 0x3b, 0x44, 0x53, 0x3b, 0x64, 0x65, 0x20, 0x67, 0x65,
-0x6e, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b,
-0x64, 0x2019, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75,
-0x6e, 0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x2e, 0x3b, 0x64, 0x65, 0x20,
-0x73, 0x65, 0x74, 0x2e, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x2e, 0x3b,
-0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20,
-0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72,
-0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x64,
-0x65, 0x20, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x64, 0x65, 0x20,
-0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x64,
-0x65, 0x20, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62,
-0x72, 0x65, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36, 0x6708,
-0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31, 0x32,
-0x6708, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b, 0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708, 0x3b,
-0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708, 0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708, 0x3b,
-0x73, 0x69, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x3b, 0x6f, 0x17e, 0x75, 0x3b, 0x74, 0x72, 0x61, 0x3b, 0x73, 0x76, 0x69,
-0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x6b, 0x6f, 0x6c, 0x3b, 0x72, 0x75, 0x6a, 0x3b, 0x6c, 0x69, 0x73,
-0x3b, 0x73, 0x74, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x73, 0x69, 0x6a, 0x65, 0x10d, 0x61, 0x6e, 0x6a, 0x3b, 0x76, 0x65,
-0x6c, 0x6a, 0x61, 0x10d, 0x61, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x61, 0x6b, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x6a,
-0x3b, 0x73, 0x76, 0x69, 0x62, 0x61, 0x6e, 0x6a, 0x3b, 0x6c, 0x69, 0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x72, 0x70, 0x61,
-0x6e, 0x6a, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x3b, 0x72, 0x75, 0x6a, 0x61, 0x6e, 0x3b, 0x6c, 0x69, 0x73,
-0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x69, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e,
-0x61, 0x63, 0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e,
-0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32,
-0x2e, 0x3b, 0x73, 0x69, 0x6a, 0x65, 0x10d, 0x6e, 0x6a, 0x61, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x65, 0x3b, 0x6f,
-0x17e, 0x75, 0x6a, 0x6b, 0x61, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x6e, 0x6a,
-0x61, 0x3b, 0x6c, 0x69, 0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x72, 0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f,
-0x76, 0x6f, 0x7a, 0x61, 0x3b, 0x72, 0x75, 0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61,
-0x3b, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x6f, 0x67, 0x61, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x61, 0x3b,
-0x6c, 0x65, 0x64, 0x3b, 0xfa, 0x6e, 0x6f, 0x3b, 0x62, 0x159, 0x65, 0x3b, 0x64, 0x75, 0x62, 0x3b, 0x6b, 0x76, 0x11b, 0x3b,
-0x10d, 0x76, 0x6e, 0x3b, 0x10d, 0x76, 0x63, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x7a, 0xe1, 0x159, 0x3b, 0x159, 0xed, 0x6a, 0x3b,
-0x6c, 0x69, 0x73, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x6c, 0x65, 0x64, 0x65, 0x6e, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x3b, 0x62,
-0x159, 0x65, 0x7a, 0x65, 0x6e, 0x3b, 0x64, 0x75, 0x62, 0x65, 0x6e, 0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x65, 0x6e, 0x3b, 0x10d,
-0x65, 0x72, 0x76, 0x65, 0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x65, 0x63, 0x3b, 0x73, 0x72, 0x70, 0x65, 0x6e,
-0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed, 0x6a, 0x65, 0x6e, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64,
-0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x65, 0x63, 0x3b, 0x6c, 0x65, 0x64, 0x6e, 0x61, 0x3b, 0xfa, 0x6e, 0x6f, 0x72,
-0x61, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x6e, 0x61, 0x3b, 0x64, 0x75, 0x62, 0x6e, 0x61, 0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x6e,
-0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x6e, 0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x63, 0x65, 0x3b, 0x73, 0x72,
-0x70, 0x6e, 0x61, 0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed, 0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f,
-0x70, 0x61, 0x64, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66,
-0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75,
-0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b,
-0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,
-0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b,
-0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,
-0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e,
-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e,
-0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x72, 0x74, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x69,
-0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e,
-0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75,
-0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x61,
-0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61,
-0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b,
-0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d,
-0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41,
-0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x75,
-0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x63, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65,
-0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d,
-0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x16d, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f,
-0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x6f, 0x3b, 0x66,
-0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6f,
-0x3b, 0x6d, 0x61, 0x6a, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x16d,
-0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,
-0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72,
-0x6f, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61,
-0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61,
-0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x74, 0x73,
-0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0xe4,
-0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69,
-0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d,
-0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65,
-0x72, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,
-0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b,
-0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b,
-0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b,
-0x64, 0x65, 0x73, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d,
-0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a,
-0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65,
-0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
-0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e,
-0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e,
-0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x3b, 0x6d, 0x61,
-0x61, 0x6c, 0x69, 0x73, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x3b, 0x6b, 0x65, 0x73,
-0xe4, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x3b, 0x65, 0x6c, 0x6f, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x3b, 0x6c, 0x6f, 0x6b,
-0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69,
-0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b,
-0x75, 0x75, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75,
-0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x6c,
-0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75,
-0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x3b,
-0x54, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x48, 0x3b, 0x45, 0x3b, 0x53, 0x3b, 0x4c, 0x3b,
-0x4d, 0x3b, 0x4a, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x2e, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x2e, 0x3b,
-0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x2e, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x2e, 0x3b, 0x74, 0x6f, 0x75,
-0x6b, 0x6f, 0x6b, 0x2e, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x2e, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x2e, 0x3b,
-0x65, 0x6c, 0x6f, 0x6b, 0x2e, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x2e, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x2e, 0x3b,
-0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x2e, 0x3b, 0x74, 0x61, 0x6d,
-0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d,
-0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x74,
-0x61, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75,
-0x74, 0x61, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75,
-0x74, 0x61, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75,
-0x74, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75,
-0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61,
-0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69,
-0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e,
-0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x72, 0x3b, 0x66, 0xe9, 0x76,
-0x72, 0x69, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b,
-0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x65, 0x74, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65,
-0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65,
-0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0xe9, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b,
-0x66, 0xe9, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b,
-0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70,
-0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61,
-0x6e, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61,
-0x69, 0x3b, 0x6a, 0x75, 0x69, 0x2e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65,
-0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x4a,
-0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a,
-0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
-0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x65, 0x77, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x46, 0x65,
-0x62, 0x72, 0x65, 0x77, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,
-0x3b, 0x4d, 0x61, 0x61, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x79, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67,
-0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f,
-0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x69, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x69, 0x6d, 0x62, 0x65,
-0x72, 0x3b, 0x46, 0x61, 0x6f, 0x69, 0x3b, 0x47, 0x65, 0x61, 0x72, 0x72, 0x3b, 0x4d, 0xe0, 0x72, 0x74, 0x3b, 0x47, 0x69,
-0x62, 0x6c, 0x3b, 0x43, 0xe8, 0x69, 0x74, 0x3b, 0xd2, 0x67, 0x6d, 0x68, 0x3b, 0x49, 0x75, 0x63, 0x68, 0x3b, 0x4c, 0xf9,
-0x6e, 0x61, 0x3b, 0x53, 0x75, 0x6c, 0x74, 0x3b, 0x44, 0xe0, 0x6d, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x44, 0xf9,
-0x62, 0x68, 0x3b, 0x41, 0x6d, 0x20, 0x46, 0x61, 0x6f, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x63, 0x68, 0x3b, 0x41, 0x6e, 0x20,
-0x47, 0x65, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x3b, 0x41, 0x6d, 0x20, 0x4d, 0xe0, 0x72, 0x74, 0x3b, 0x41, 0x6e, 0x20, 0x47,
-0x69, 0x62, 0x6c, 0x65, 0x61, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x43, 0xe8, 0x69, 0x74, 0x65, 0x61, 0x6e, 0x3b, 0x41, 0x6e,
-0x20, 0x74, 0x2d, 0xd2, 0x67, 0x6d, 0x68, 0x69, 0x6f, 0x73, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0x49, 0x75, 0x63, 0x68,
-0x61, 0x72, 0x3b, 0x41, 0x6e, 0x20, 0x4c, 0xf9, 0x6e, 0x61, 0x73, 0x74, 0x61, 0x6c, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d,
-0x53, 0x75, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x44, 0xe0, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x41,
-0x6e, 0x20, 0x74, 0x2d, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x44, 0xf9, 0x62, 0x68, 0x6c,
-0x61, 0x63, 0x68, 0x64, 0x3b, 0x46, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x43, 0x3b, 0xd2, 0x3b, 0x49, 0x3b, 0x4c,
-0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x46, 0x68, 0x61, 0x6f, 0x69, 0x6c,
-0x6c, 0x65, 0x61, 0x63, 0x68, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x47, 0x68, 0x65, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x3b,
-0x64, 0x68, 0x65, 0x6e, 0x20, 0x4d, 0x68, 0xe0, 0x72, 0x74, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x47, 0x68, 0x69, 0x62,
-0x6c, 0x65, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x43, 0x68, 0xe8, 0x69, 0x74, 0x65, 0x61, 0x6e, 0x3b, 0x64,
-0x68, 0x65, 0x6e, 0x20, 0xd2, 0x67, 0x6d, 0x68, 0x69, 0x6f, 0x73, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x49, 0x75, 0x63,
-0x68, 0x61, 0x72, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x4c, 0xf9, 0x6e, 0x61, 0x73, 0x74, 0x61, 0x6c, 0x3b, 0x64, 0x68,
-0x65, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x75, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x44, 0xe0,
-0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e,
-0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x44, 0xf9, 0x62, 0x68, 0x6c, 0x61, 0x63, 0x68, 0x64, 0x3b, 0x58, 0x61, 0x6e, 0x2e,
-0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x6f,
-0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x67, 0x6f, 0x2e, 0x3b, 0x53, 0x65, 0x74, 0x2e,
-0x3b, 0x4f, 0x75, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x63, 0x2e, 0x3b, 0x58, 0x61, 0x6e, 0x65,
-0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41,
-0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x6c, 0x6f,
-0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74,
-0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62,
-0x72, 0x6f, 0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53,
-0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x78, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
-0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x78, 0x75, 0xf1, 0x6f, 0x3b, 0x78, 0x75, 0x6c,
-0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x75, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,
-0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x78, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65,
-0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f,
-0x3b, 0x78, 0x75, 0xf1, 0x6f, 0x3b, 0x78, 0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73,
-0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65,
-0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x78, 0x2e, 0x3b, 0x66, 0x2e, 0x3b,
-0x6d, 0x2e, 0x3b, 0x61, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x78, 0x2e, 0x3b, 0x78, 0x2e, 0x3b, 0x61, 0x2e, 0x3b, 0x73, 0x2e,
-0x3b, 0x6f, 0x2e, 0x3b, 0x6e, 0x2e, 0x3b, 0x64, 0x2e, 0x3b, 0x10d8, 0x10d0, 0x10dc, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x3b, 0x10db, 0x10d0,
-0x10e0, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x3b, 0x10d0, 0x10d2,
-0x10d5, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x3b, 0x10d8, 0x10d0,
-0x10dc, 0x10d5, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x10d4, 0x10e0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x10e2,
-0x10d8, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x10d8, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x10d8, 0x10e1,
-0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x10d8, 0x10e1, 0x10e2, 0x10dd, 0x3b, 0x10e1, 0x10d4, 0x10e5,
-0x10e2, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x10dd, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dc, 0x10dd,
-0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d7,
-0x3b, 0x10db, 0x3b, 0x10d0, 0x3b, 0x10db, 0x3b, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d0, 0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10dc, 0x3b, 0x10d3,
-0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69,
-0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74,
-0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72,
-0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a,
-0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62,
-0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69,
-0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x4f, 0x6b, 0x74,
-0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x4a, 0xe4, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,
-0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b,
-0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b,
-0x4a, 0xe4, 0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b,
-0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b,
-0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74,
-0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x4a, 0xe4, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70,
-0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67,
-0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a,
-0x2e, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c, 0x3ac, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3ac,
-0x3b9, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb, 0x3b, 0x391, 0x3cd, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b,
-0x39f, 0x3ba, 0x3c4, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9,
-0x3bf, 0x3c2, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39c, 0x3ac, 0x3c1, 0x3c4, 0x3b9,
-0x3bf, 0x3c2, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3af, 0x3bb, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39c, 0x3ac, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf,
-0x3cd, 0x3bd, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x391, 0x3cd, 0x3b3, 0x3bf, 0x3c5, 0x3c3,
-0x3c4, 0x3bf, 0x3c2, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3ce,
-0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3ad,
-0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3b, 0x3a6, 0x3b, 0x39c, 0x3b, 0x391, 0x3b, 0x39c, 0x3b, 0x399, 0x3b, 0x399,
-0x3b, 0x391, 0x3b, 0x3a3, 0x3b, 0x39f, 0x3b, 0x39d, 0x3b, 0x394, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c,
-0x3b1, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3b1, 0x390, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb,
-0x3b, 0x391, 0x3c5, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3b, 0x394, 0x3b5, 0x3ba,
-0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3b1, 0x3c1,
-0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3c4, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b9, 0x3bb, 0x3af, 0x3bf, 0x3c5,
-0x3b, 0x39c, 0x3b1, 0x390, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3af,
-0x3bf, 0x3c5, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3bf, 0x3cd, 0x3c3, 0x3c4, 0x3bf, 0x3c5, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3b5, 0x3bc, 0x3b2,
-0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3c9, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3bc, 0x3b2,
-0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x6a, 0x61, 0x6e, 0x3b,
-0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b,
-0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b,
-0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69,
-0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x69, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x69, 0x3b,
-0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x69, 0x3b,
-0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x69, 0x3b,
-0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b,
-0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b,
-0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b,
-0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacb, 0x3b, 0xaa8, 0xab5,
-0xac7, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaab, 0xac7, 0xaac,
-0xacd, 0xab0, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b,
-0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8,
-0xaaa, 0xacd, 0xa9f, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacb, 0xaac, 0xab0, 0x3b, 0xaa8, 0xab5, 0xac7,
-0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa9c, 0xabe, 0x3b, 0xaab, 0xac7, 0x3b,
-0xaae, 0xabe, 0x3b, 0xa8f, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0x3b, 0xa9c, 0xac1, 0x3b, 0xa91, 0x3b, 0xab8, 0x3b, 0xa91, 0x3b,
-0xaa8, 0x3b, 0xaa1, 0xabf, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x61, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x66, 0x69,
-0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x61, 0x74,
-0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x75, 0x77, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x69, 0x72, 0x75,
-0x3b, 0x46, 0x61, 0x62, 0x75, 0x72, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x41, 0x66, 0x69,
-0x72, 0x69, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x69, 0x3b, 0x59, 0x75, 0x6c, 0x69, 0x3b,
-0x41, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,
-0x61, 0x3b, 0x4e, 0x75, 0x77, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b,
-0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b,
-0x44, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5f3, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5f3, 0x3b, 0x5de, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5f3,
-0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5f3, 0x3b,
-0x5e1, 0x5e4, 0x5d8, 0x5f3, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5f3, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5f3, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5f3, 0x3b,
-0x5d9, 0x5e0, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5de, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5e4, 0x5e8,
-0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2,
-0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5d8, 0x5d5, 0x5d1, 0x5e8, 0x3b, 0x5e0,
-0x5d5, 0x5d1, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x91c, 0x928, 0x970, 0x3b, 0x92b, 0x93c, 0x930, 0x970,
-0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928,
-0x3b, 0x91c, 0x941, 0x932, 0x970, 0x3b, 0x905, 0x917, 0x970, 0x3b, 0x938, 0x93f, 0x924, 0x970, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942,
-0x970, 0x3b, 0x928, 0x935, 0x970, 0x3b, 0x926, 0x93f, 0x938, 0x970, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x93c, 0x930,
-0x935, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b,
-0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x93f, 0x924, 0x902,
-0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942, 0x92c, 0x930, 0x3b, 0x928, 0x935, 0x902, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938,
-0x902, 0x92c, 0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x93c, 0x3b, 0x92e, 0x93e, 0x3b, 0x905, 0x3b, 0x92e, 0x3b, 0x91c, 0x942, 0x3b, 0x91c,
-0x941, 0x3b, 0x905, 0x3b, 0x938, 0x93f, 0x3b, 0x905, 0x3b, 0x928, 0x3b, 0x926, 0x93f, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66,
-0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x2e, 0x3b, 0xe1, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x6a, 0x2e,
-0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x7a, 0x65, 0x70,
-0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61,
-0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x69, 0x75, 0x73,
-0x3b, 0xe1, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0xe1, 0x6a, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6e, 0x69, 0x75,
-0x73, 0x3b, 0x6a, 0xfa, 0x6c, 0x69, 0x75, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x7a, 0x74, 0x75, 0x73, 0x3b, 0x73,
-0x7a, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f,
-0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b,
-0x4d, 0x3b, 0xc1, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x7a, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44,
-0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e,
-0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b, 0xe1, 0x67, 0xfa, 0x2e, 0x3b,
-0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0xf3, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b,
-0x6a, 0x61, 0x6e, 0xfa, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0xfa, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b,
-0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0xed, 0x3b, 0x6a, 0xfa, 0x6c, 0xed, 0x3b,
-0xe1, 0x67, 0xfa, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3,
-0x62, 0x65, 0x72, 0x3b, 0x6e, 0xf3, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65,
-0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0xc1, 0x3b, 0x53, 0x3b,
-0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70,
-0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65,
-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,
-0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x72, 0x65, 0x74, 0x3b, 0x41, 0x70, 0x72,
-0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75,
-0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,
-0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69,
-0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x63, 0x74,
-0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x66, 0x65,
-0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c,
-0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x75,
-0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f,
-0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72,
-0x65, 0x3b, 0x6a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x61, 0x3b, 0x73, 0x3b,
-0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x45, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x3b, 0x4d, 0xe1, 0x72, 0x74,
-0x61, 0x3b, 0x41, 0x69, 0x62, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x3b, 0x49, 0xfa, 0x69,
-0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x3b, 0x4d, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x44, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x53, 0x61,
-0x6d, 0x68, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x3b, 0x45, 0x61, 0x6e, 0xe1, 0x69, 0x72, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68,
-0x72, 0x61, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x72, 0x65, 0xe1, 0x6e, 0x3b, 0x42, 0x65, 0x61,
-0x6c, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x65, 0x61, 0x6d, 0x68, 0x3b, 0x49, 0xfa, 0x69,
-0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x65, 0xe1, 0x6e, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69,
-0x72, 0x3b, 0x44, 0x65, 0x69, 0x72, 0x65, 0x61, 0x64, 0x68, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x53,
-0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x61, 0x69, 0x67, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d,
-0x3b, 0x41, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x67,
-0x65, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x67, 0x3b, 0x67,
-0x69, 0x75, 0x3b, 0x6c, 0x75, 0x67, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x74, 0x74, 0x3b, 0x6e,
-0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b, 0x67, 0x65, 0x6e, 0x6e, 0x61, 0x69, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x62, 0x72,
-0x61, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x65, 0x3b, 0x6d, 0x61, 0x67,
-0x67, 0x69, 0x6f, 0x3b, 0x67, 0x69, 0x75, 0x67, 0x6e, 0x6f, 0x3b, 0x6c, 0x75, 0x67, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67,
-0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x74, 0x74, 0x6f, 0x62,
-0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65,
-0x3b, 0x47, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,
-0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72,
-0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70,
-0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0xc9c, 0xca8, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd,
-0xcb0, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2,
-0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0x3b, 0xcb8, 0xcc6, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0x3b, 0xc85,
-0xc95, 0xccd, 0xc9f, 0xccb, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0x3b, 0xc9c, 0xca8, 0xcb5, 0xcb0,
-0xcbf, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa,
-0xccd, 0xcb0, 0xcbf, 0xcb2, 0xccd, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86,
-0xc97, 0xcb8, 0xccd, 0xc9f, 0xccd, 0x3b, 0xcb8, 0xcc6, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc85, 0xc95, 0xccd,
-0xc9f, 0xccb, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0xcac,
-0xcb0, 0xccd, 0x3b, 0xc9c, 0x3b, 0xcab, 0xcc6, 0x3b, 0xcae, 0xcbe, 0x3b, 0xc8f, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0x3b, 0xc9c,
-0xcc1, 0x3b, 0xc86, 0x3b, 0xcb8, 0xcc6, 0x3b, 0xc85, 0x3b, 0xca8, 0x3b, 0xca1, 0xcbf, 0x3b, 0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcbf, 0x3b,
-0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0,
-0xcbf, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0x3b, 0xcb8, 0xcc6,
-0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0x3b, 0xca1, 0xcbf, 0xcb8,
-0xcc6, 0xc82, 0x3b, 0x62c, 0x646, 0x624, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x624, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x655, 0x686,
-0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x654, 0x3b, 0x62c, 0x648, 0x657, 0x646, 0x3b, 0x62c, 0x648, 0x657, 0x644,
-0x627, 0x6cc, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x657,
-0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645,
-0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x49b,
-0x430, 0x4a3, 0x2e, 0x3b, 0x430, 0x49b, 0x43f, 0x2e, 0x3b, 0x43d, 0x430, 0x443, 0x2e, 0x3b, 0x441, 0x4d9, 0x443, 0x2e, 0x3b, 0x43c,
-0x430, 0x43c, 0x2e, 0x3b, 0x43c, 0x430, 0x443, 0x2e, 0x3b, 0x448, 0x456, 0x43b, 0x2e, 0x3b, 0x442, 0x430, 0x43c, 0x2e, 0x3b, 0x49b,
-0x44b, 0x440, 0x2e, 0x3b, 0x49b, 0x430, 0x437, 0x2e, 0x3b, 0x49b, 0x430, 0x440, 0x2e, 0x3b, 0x436, 0x435, 0x43b, 0x2e, 0x3b, 0x49a,
-0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x410, 0x49b, 0x43f, 0x430, 0x43d, 0x3b, 0x41d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x421,
-0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x41c, 0x430, 0x43c, 0x44b, 0x440, 0x3b, 0x41c, 0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x428, 0x456,
-0x43b, 0x434, 0x435, 0x3b, 0x422, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49a, 0x44b, 0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49a,
-0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49a, 0x430, 0x440, 0x430, 0x448, 0x430, 0x3b, 0x416, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430,
-0x43d, 0x3b, 0x49a, 0x3b, 0x410, 0x3b, 0x41d, 0x3b, 0x421, 0x3b, 0x41c, 0x3b, 0x41c, 0x3b, 0x428, 0x3b, 0x422, 0x3b, 0x49a, 0x3b,
-0x49a, 0x3b, 0x49a, 0x3b, 0x416, 0x3b, 0x49b, 0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x430, 0x49b, 0x43f, 0x430, 0x43d, 0x3b, 0x43d,
-0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x441, 0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x43c, 0x430, 0x43c, 0x44b, 0x440, 0x3b, 0x43c, 0x430,
-0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x448, 0x456, 0x43b, 0x434, 0x435, 0x3b, 0x442, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49b, 0x44b, 0x440,
-0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49b, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49b, 0x430, 0x440, 0x430, 0x448, 0x430, 0x3b, 0x436,
-0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x3b, 0x6d, 0x75, 0x74, 0x2e, 0x3b, 0x67, 0x61, 0x73, 0x2e, 0x3b, 0x77,
-0x65, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x2e, 0x3b, 0x67, 0x69, 0x63, 0x2e, 0x3b, 0x6b, 0x61, 0x6d, 0x2e, 0x3b, 0x6e,
-0x79, 0x61, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x6e, 0x7a, 0x65, 0x2e, 0x3b, 0x75, 0x6b, 0x77, 0x2e, 0x3b, 0x75,
-0x67, 0x75, 0x2e, 0x3b, 0x75, 0x6b, 0x75, 0x2e, 0x3b, 0x4d, 0x75, 0x74, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x3b, 0x47, 0x61,
-0x73, 0x68, 0x79, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x3b, 0x57, 0x65, 0x72, 0x75, 0x72, 0x77, 0x65, 0x3b, 0x4d, 0x61,
-0x74, 0x61, 0x3b, 0x47, 0x69, 0x63, 0x75, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x3b, 0x4b, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x3b,
-0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x61, 0x6e, 0x61, 0x6d, 0x61, 0x3b, 0x4e, 0x7a, 0x65, 0x6c,
-0x69, 0x3b, 0x55, 0x6b, 0x77, 0x61, 0x6b, 0x69, 0x72, 0x61, 0x3b, 0x55, 0x67, 0x75, 0x73, 0x68, 0x79, 0x69, 0x6e, 0x67,
-0x6f, 0x3b, 0x55, 0x6b, 0x75, 0x62, 0x6f, 0x7a, 0x61, 0x3b, 0x42f, 0x43d, 0x432, 0x3b, 0x424, 0x435, 0x432, 0x3b, 0x41c, 0x430,
-0x440, 0x3b, 0x410, 0x43f, 0x440, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432,
-0x433, 0x3b, 0x421, 0x435, 0x43d, 0x3b, 0x41e, 0x43a, 0x442, 0x3b, 0x41d, 0x43e, 0x44f, 0x3b, 0x414, 0x435, 0x43a, 0x3b, 0x42f, 0x43d,
-0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f,
-0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410,
-0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431,
-0x440, 0x44c, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0x42f, 0x3b,
-0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x3b, 0x41c, 0x3b, 0x418, 0x3b, 0x418, 0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x41e, 0x3b, 0x41d, 0x3b,
-0x414, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440,
-0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x2e, 0x3b, 0x438, 0x44e, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e,
-0x3b, 0x441, 0x435, 0x43d, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e,
-0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x440, 0x442,
-0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b,
-0x44c, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43e, 0x43a,
-0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c,
-0x3b, 0x31, 0xc6d4, 0x3b, 0x32, 0xc6d4, 0x3b, 0x33, 0xc6d4, 0x3b, 0x34, 0xc6d4, 0x3b, 0x35, 0xc6d4, 0x3b, 0x36, 0xc6d4, 0x3b, 0x37,
-0xc6d4, 0x3b, 0x38, 0xc6d4, 0x3b, 0x39, 0xc6d4, 0x3b, 0x31, 0x30, 0xc6d4, 0x3b, 0x31, 0x31, 0xc6d4, 0x3b, 0x31, 0x32, 0xc6d4, 0x3b,
-0x72, 0xea, 0x62, 0x3b, 0x72, 0x65, 0x15f, 0x3b, 0x61, 0x64, 0x61, 0x3b, 0x61, 0x76, 0x72, 0x3b, 0x67, 0x75, 0x6c, 0x3b,
-0x70, 0xfb, 0x15f, 0x3b, 0x74, 0xee, 0x72, 0x3b, 0x67, 0x65, 0x6c, 0x3b, 0x72, 0x65, 0x7a, 0x3b, 0x6b, 0x65, 0x77, 0x3b,
-0x73, 0x65, 0x72, 0x3b, 0x62, 0x65, 0x72, 0x3b, 0x72, 0xea, 0x62, 0x65, 0x6e, 0x64, 0x61, 0x6e, 0x3b, 0x72, 0x65, 0x15f,
-0x65, 0x6d, 0xee, 0x3b, 0x61, 0x64, 0x61, 0x72, 0x3b, 0x61, 0x76, 0x72, 0xea, 0x6c, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e,
-0x3b, 0x70, 0xfb, 0x15f, 0x70, 0x65, 0x72, 0x3b, 0x74, 0xee, 0x72, 0x6d, 0x65, 0x68, 0x3b, 0x67, 0x65, 0x6c, 0x61, 0x77,
-0xea, 0x6a, 0x3b, 0x72, 0x65, 0x7a, 0x62, 0x65, 0x72, 0x3b, 0x6b, 0x65, 0x77, 0xe7, 0xea, 0x72, 0x3b, 0x73, 0x65, 0x72,
-0x6d, 0x61, 0x77, 0x65, 0x7a, 0x3b, 0x62, 0x65, 0x72, 0x66, 0x61, 0x6e, 0x62, 0x61, 0x72, 0x3b, 0x52, 0x3b, 0x52, 0x3b,
-0x41, 0x3b, 0x41, 0x3b, 0x47, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x47, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x42, 0x3b,
-0x72, 0xea, 0x62, 0x65, 0x6e, 0x64, 0x61, 0x6e, 0xea, 0x3b, 0x72, 0x65, 0x15f, 0x65, 0x6d, 0x69, 0x79, 0xea, 0x3b, 0x61,
-0x64, 0x61, 0x72, 0xea, 0x3b, 0x61, 0x76, 0x72, 0xea, 0x6c, 0xea, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e, 0xea, 0x3b, 0x70,
-0xfb, 0x15f, 0x70, 0x65, 0x72, 0xea, 0x3b, 0x74, 0xee, 0x72, 0x6d, 0x65, 0x68, 0xea, 0x3b, 0x67, 0x65, 0x6c, 0x61, 0x77,
-0xea, 0x6a, 0xea, 0x3b, 0x72, 0x65, 0x7a, 0x62, 0x65, 0x72, 0xea, 0x3b, 0x6b, 0x65, 0x77, 0xe7, 0xea, 0x72, 0xea, 0x3b,
-0x73, 0x65, 0x72, 0x6d, 0x61, 0x77, 0x65, 0x7a, 0xea, 0x3b, 0x62, 0x65, 0x72, 0x66, 0x61, 0x6e, 0x62, 0x61, 0x72, 0xea,
-0x3b, 0x4d, 0x75, 0x74, 0x2e, 0x3b, 0x47, 0x61, 0x73, 0x2e, 0x3b, 0x57, 0x65, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x74, 0x2e,
-0x3b, 0x47, 0x69, 0x63, 0x2e, 0x3b, 0x4b, 0x61, 0x6d, 0x2e, 0x3b, 0x4e, 0x79, 0x61, 0x2e, 0x3b, 0x4b, 0x61, 0x6e, 0x2e,
-0x3b, 0x4e, 0x7a, 0x65, 0x2e, 0x3b, 0x55, 0x6b, 0x77, 0x2e, 0x3b, 0x55, 0x67, 0x75, 0x2e, 0x3b, 0x55, 0x6b, 0x75, 0x2e,
-0x3b, 0x4e, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x52, 0x75, 0x68, 0x75, 0x68, 0x75, 0x6d, 0x61, 0x3b, 0x4e, 0x74, 0x77, 0x61,
-0x72, 0x61, 0x6e, 0x74, 0x65, 0x3b, 0x4e, 0x64, 0x61, 0x6d, 0x75, 0x6b, 0x69, 0x7a, 0x61, 0x3b, 0x52, 0x75, 0x73, 0x61,
-0x6d, 0x61, 0x3b, 0x52, 0x75, 0x68, 0x65, 0x73, 0x68, 0x69, 0x3b, 0x4d, 0x75, 0x6b, 0x61, 0x6b, 0x61, 0x72, 0x6f, 0x3b,
-0x4e, 0x79, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x61, 0x72, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b,
-0x47, 0x69, 0x74, 0x75, 0x67, 0x75, 0x74, 0x75, 0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x6f, 0x6e, 0x79, 0x6f, 0x3b, 0x4b, 0x69,
-0x67, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x3b, 0xea1, 0x2e, 0xe81, 0x2e, 0x3b, 0xe81, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0x2e, 0xe99,
-0x2e, 0x3b, 0xea1, 0x2e, 0xeaa, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb4, 0x2e, 0xe96, 0x2e, 0x3b, 0xe81, 0x2e,
-0xea5, 0x2e, 0x3b, 0xeaa, 0x2e, 0xeab, 0x2e, 0x3b, 0xe81, 0x2e, 0xe8d, 0x2e, 0x3b, 0xe95, 0x2e, 0xea5, 0x2e, 0x3b, 0xe9e, 0x2e,
-0xe88, 0x2e, 0x3b, 0xe97, 0x2e, 0xea7, 0x2e, 0x3b, 0xea1, 0xeb1, 0xe87, 0xe81, 0xead, 0xe99, 0x3b, 0xe81, 0xeb8, 0xea1, 0xe9e, 0xeb2,
-0x3b, 0xea1, 0xeb5, 0xe99, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeaa, 0xeb2, 0x3b, 0xe9e, 0xeb6, 0xe94, 0xeaa, 0xeb0, 0xe9e, 0xeb2, 0x3b, 0xea1,
-0xeb4, 0xe96, 0xeb8, 0xe99, 0xeb2, 0x3b, 0xe81, 0xecd, 0xea5, 0xeb0, 0xe81, 0xebb, 0xe94, 0x3b, 0xeaa, 0xeb4, 0xe87, 0xeab, 0xeb2, 0x3b,
-0xe81, 0xeb1, 0xe99, 0xe8d, 0xeb2, 0x3b, 0xe95, 0xeb8, 0xea5, 0xeb2, 0x3b, 0xe9e, 0xeb0, 0xe88, 0xeb4, 0xe81, 0x3b, 0xe97, 0xeb1, 0xe99,
-0xea7, 0xeb2, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73,
-0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x2e, 0x3b, 0x6a, 0x16b, 0x6c,
-0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f,
-0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x66, 0x65, 0x62,
-0x72, 0x75, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x12b, 0x6c, 0x69, 0x73,
-0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6c, 0x69, 0x6a, 0x73,
-0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b,
-0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x64,
-0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x62, 0x6c, 0x3b, 0x6d, 0x73, 0x69,
-0x3b, 0x61, 0x70, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x74,
-0x3b, 0x73, 0x74, 0x62, 0x3b, 0x254, 0x74, 0x62, 0x3b, 0x6e, 0x76, 0x62, 0x3b, 0x64, 0x73, 0x62, 0x3b, 0x73, 0xe1, 0x6e,
-0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x79, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61,
-0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x73,
-0xe1, 0x74, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x6e, 0x65, 0x69, 0x3b, 0x73,
-0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1,
-0x20, 0x79, 0x61, 0x20, 0x6d, 0x6f, 0x74, 0xf3, 0x62, 0xe1, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20,
-0x6e, 0x73, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x77, 0x61, 0x6d,
-0x62, 0x65, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69, 0x62, 0x77, 0x61, 0x3b, 0x73, 0xe1,
-0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61,
-0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x254, 0x30c, 0x6b, 0x254, 0x301, 0x3b, 0x73, 0xe1, 0x6e, 0x7a,
-0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b,
-0x79, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x61, 0x3b, 0x73, 0x3b, 0x254, 0x3b,
-0x6e, 0x3b, 0x64, 0x3b, 0x73, 0x61, 0x75, 0x73, 0x2e, 0x3b, 0x76, 0x61, 0x73, 0x2e, 0x3b, 0x6b, 0x6f, 0x76, 0x2e, 0x3b,
-0x62, 0x61, 0x6c, 0x2e, 0x3b, 0x67, 0x65, 0x67, 0x2e, 0x3b, 0x62, 0x69, 0x72, 0x17e, 0x2e, 0x3b, 0x6c, 0x69, 0x65, 0x70,
-0x2e, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x2e, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x2e, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x2e, 0x3b,
-0x6c, 0x61, 0x70, 0x6b, 0x72, 0x2e, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x2e, 0x3b, 0x73, 0x61, 0x75, 0x73, 0x69, 0x73,
-0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x6b, 0x6f, 0x76, 0x61, 0x73, 0x3b, 0x62, 0x61, 0x6c, 0x61, 0x6e,
-0x64, 0x69, 0x73, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x3b, 0x62, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x73, 0x3b,
-0x6c, 0x69, 0x65, 0x70, 0x61, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x6a, 0x16b, 0x74, 0x69, 0x73, 0x3b, 0x72, 0x75, 0x67, 0x73,
-0x117, 0x6a, 0x69, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69, 0x73, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x74, 0x69,
-0x73, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x69, 0x73, 0x3b, 0x53, 0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x42, 0x3b, 0x47, 0x3b,
-0x42, 0x3b, 0x4c, 0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x47, 0x3b, 0x73, 0x61, 0x75, 0x73, 0x69, 0x6f,
-0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x6b, 0x6f, 0x76, 0x6f, 0x3b, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x64,
-0x17e, 0x69, 0x6f, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x73, 0x3b, 0x62, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x6f,
-0x3b, 0x6c, 0x69, 0x65, 0x70, 0x6f, 0x73, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x6a, 0x16b, 0x10d, 0x69, 0x6f, 0x3b, 0x72, 0x75,
-0x67, 0x73, 0x117, 0x6a, 0x6f, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69, 0x6f, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x10d,
-0x69, 0x6f, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x17e, 0x69, 0x6f, 0x3b, 0x458, 0x430, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432,
-0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x2e,
-0x3b, 0x458, 0x443, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442,
-0x2e, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x438,
-0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b,
-0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441,
-0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438,
-0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x458, 0x3b,
-0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x458, 0x3b, 0x458, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b,
-0x434, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65,
-0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x41, 0x6f, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b,
-0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65,
-0x62, 0x72, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x73, 0x61, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x79,
-0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x61, 0x3b, 0x4a, 0x6f, 0x6c, 0x61, 0x79, 0x3b, 0x41, 0x6f, 0x67, 0x6f,
-0x73, 0x69, 0x74, 0x72, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f,
-0x62, 0x72, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x61, 0x6d, 0x62, 0x72,
-0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65,
-0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b,
-0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65,
-0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69,
-0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,
-0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0xd1c, 0xd28, 0xd41, 0x3b,
-0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0x3b, 0xd2e, 0xd3e, 0xd7c, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd47, 0xd2f,
-0xd4d, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d,
-0xd31, 0xd02, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0x3b, 0xd28, 0xd35, 0xd02, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0x3b, 0xd1c, 0xd28,
-0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd3e, 0xd7c, 0xd1a, 0xd4d,
-0xd1a, 0xd4d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0xd7d, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c,
-0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0xd38, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd4d, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31,
-0xd02, 0xd2c, 0xd7c, 0x3b, 0xd12, 0xd15, 0xd4d, 0x200c, 0xd1f, 0xd4b, 0xd2c, 0xd7c, 0x3b, 0xd28, 0xd35, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd21,
-0xd3f, 0xd38, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd1c, 0x3b, 0xd2b, 0xd46, 0x3b, 0xd2e, 0xd3e, 0x3b, 0xd0f, 0x3b, 0xd2e, 0xd46, 0x3b, 0xd1c,
-0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd13, 0x3b, 0xd38, 0xd46, 0x3b, 0xd12, 0x3b, 0xd28, 0x3b, 0xd21, 0xd3f, 0x3b, 0x4a, 0x61,
-0x6e, 0x3b, 0x46, 0x72, 0x61, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x6a, 0x3b, 0x120, 0x75,
-0x6e, 0x3b, 0x4c, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x77, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x74, 0x3b, 0x4e, 0x6f,
-0x76, 0x3b, 0x44, 0x69, 0x10b, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61, 0x72, 0x3b, 0x46, 0x72, 0x61, 0x72, 0x3b, 0x4d, 0x61,
-0x72, 0x7a, 0x75, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x6a, 0x6a, 0x75, 0x3b, 0x120, 0x75, 0x6e, 0x6a,
-0x75, 0x3b, 0x4c, 0x75, 0x6c, 0x6a, 0x75, 0x3b, 0x41, 0x77, 0x77, 0x69, 0x73, 0x73, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x74,
-0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x72, 0x75, 0x3b, 0x44, 0x69, 0x10b, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x6e, 0x3b, 0x46, 0x72, 0x3b, 0x4d, 0x7a,
-0x3b, 0x41, 0x70, 0x3b, 0x4d, 0x6a, 0x3b, 0x120, 0x6e, 0x3b, 0x4c, 0x6a, 0x3b, 0x41, 0x77, 0x3b, 0x53, 0x74, 0x3b, 0x4f,
-0x62, 0x3b, 0x4e, 0x76, 0x3b, 0x44, 0x10b, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x120, 0x3b,
-0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4b, 0x6f, 0x68, 0x69, 0x3b, 0x48, 0x75, 0x69,
-0x3b, 0x50, 0x6f, 0x75, 0x3b, 0x50, 0x61, 0x65, 0x3b, 0x48, 0x61, 0x72, 0x61, 0x3b, 0x50, 0x69, 0x70, 0x69, 0x3b, 0x48,
-0x14d, 0x6e, 0x67, 0x6f, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x61, 0x68, 0x75, 0x3b, 0x4e, 0x75, 0x6b, 0x75, 0x3b,
-0x52, 0x61, 0x6e, 0x67, 0x69, 0x3b, 0x48, 0x61, 0x6b, 0x69, 0x3b, 0x4b, 0x6f, 0x68, 0x69, 0x74, 0x101, 0x74, 0x65, 0x61,
-0x3b, 0x48, 0x75, 0x69, 0x74, 0x61, 0x6e, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x50, 0x6f, 0x75, 0x74, 0x16b, 0x74, 0x65, 0x72,
-0x61, 0x6e, 0x67, 0x69, 0x3b, 0x50, 0x61, 0x65, 0x6e, 0x67, 0x61, 0x77, 0x68, 0x101, 0x77, 0x68, 0x101, 0x3b, 0x48, 0x61,
-0x72, 0x61, 0x74, 0x75, 0x61, 0x3b, 0x50, 0x69, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x48, 0x14d, 0x6e, 0x67, 0x6f, 0x6e, 0x67,
-0x6f, 0x69, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x74, 0x75, 0x72, 0x69, 0x6b, 0x14d, 0x6b, 0x101, 0x3b, 0x4d, 0x61, 0x68, 0x75,
-0x72, 0x75, 0x3b, 0x57, 0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x61, 0x2d, 0x101, 0x2d, 0x6e, 0x75, 0x6b, 0x75, 0x3b, 0x57,
-0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x61, 0x2d, 0x101, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x69, 0x3b, 0x48, 0x61, 0x6b, 0x69,
-0x68, 0x65, 0x61, 0x3b, 0x4b, 0x3b, 0x48, 0x3b, 0x50, 0x3b, 0x50, 0x3b, 0x48, 0x3b, 0x50, 0x3b, 0x48, 0x3b, 0x48, 0x3b,
-0x4d, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x48, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x3b,
-0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c,
-0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x3b,
-0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e,
-0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b,
-0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x911,
-0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x92c,
-0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b,
-0x91c, 0x93e, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b,
-0x911, 0x3b, 0x938, 0x3b, 0x911, 0x3b, 0x928, 0x94b, 0x3b, 0x921, 0x93f, 0x3b, 0x31, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b,
-0x32, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x33, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x34, 0x2d, 0x440, 0x20,
-0x441, 0x430, 0x440, 0x3b, 0x35, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x36, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b,
-0x37, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x38, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x39, 0x2d, 0x440, 0x20,
-0x441, 0x430, 0x440, 0x3b, 0x31, 0x30, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x31, 0x31, 0x2d, 0x440, 0x20, 0x441, 0x430,
-0x440, 0x3b, 0x31, 0x32, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x41d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440,
-0x20, 0x441, 0x430, 0x440, 0x3b, 0x425, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b,
-0x413, 0x443, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x414, 0x4e9, 0x440, 0x4e9,
-0x432, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x422, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430,
-0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x417, 0x443, 0x440, 0x433, 0x430, 0x430, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441,
-0x430, 0x440, 0x3b, 0x414, 0x43e, 0x43b, 0x43e, 0x43e, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x41d,
-0x430, 0x439, 0x43c, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x415, 0x441, 0x434, 0x4af, 0x433, 0x44d,
-0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x410, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430,
-0x440, 0x3b, 0x410, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430,
-0x440, 0x3b, 0x410, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x445, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441,
-0x430, 0x440, 0x3b, 0x49, 0x3b, 0x49, 0x49, 0x3b, 0x49, 0x49, 0x49, 0x3b, 0x49, 0x56, 0x3b, 0x56, 0x3b, 0x56, 0x49, 0x3b,
-0x56, 0x49, 0x49, 0x3b, 0x56, 0x49, 0x49, 0x49, 0x3b, 0x49, 0x58, 0x3b, 0x58, 0x3b, 0x58, 0x49, 0x3b, 0x58, 0x49, 0x49,
-0x3b, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x445, 0x43e, 0x451, 0x440, 0x434,
-0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x433, 0x443, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430,
-0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x434, 0x4e9, 0x440, 0x4e9, 0x432, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430,
-0x440, 0x3b, 0x442, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x437, 0x443, 0x440, 0x433,
-0x430, 0x430, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x434, 0x43e, 0x43b, 0x43e, 0x43e, 0x434, 0x443,
-0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x43d, 0x430, 0x439, 0x43c, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20,
-0x441, 0x430, 0x440, 0x3b, 0x435, 0x441, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x430,
-0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x43d, 0x44d,
-0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x445, 0x43e,
-0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b,
-0x947, 0x92c, 0x94d, 0x930, 0x941, 0x905, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f,
-0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x91f,
-0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b,
-0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x91c, 0x928,
-0x3b, 0x92b, 0x947, 0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x3b, 0x92e, 0x947, 0x3b,
-0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x3b, 0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b,
-0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x3b, 0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x92c, 0x3b, 0x92e, 0x93e,
-0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x3b,
-0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f,
-0x938, 0x947, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61,
-0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75,
-0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
-0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xb1c, 0xb3e, 0xb28, 0xb41, 0xb06, 0xb30, 0xb40, 0x3b, 0xb2b, 0xb47, 0xb2c, 0xb43, 0xb06, 0xb30,
-0xb40, 0x3b, 0xb2e, 0xb3e, 0xb30, 0xb4d, 0xb1a, 0xb4d, 0xb1a, 0x3b, 0xb05, 0xb2a, 0xb4d, 0xb30, 0xb47, 0xb32, 0x3b, 0xb2e, 0xb07, 0x3b,
-0xb1c, 0xb41, 0xb28, 0x3b, 0xb1c, 0xb41, 0xb32, 0xb3e, 0xb07, 0x3b, 0xb05, 0xb17, 0xb37, 0xb4d, 0xb1f, 0x3b, 0xb38, 0xb47, 0xb2a, 0xb4d,
-0xb1f, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb05, 0xb15, 0xb4d, 0xb1f, 0xb4b, 0xb2c, 0xb30, 0x3b, 0xb28, 0xb2d, 0xb47, 0xb2e, 0xb4d,
-0xb2c, 0xb30, 0x3b, 0xb21, 0xb3f, 0xb38, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb1c, 0xb3e, 0x3b, 0xb2b, 0xb47, 0x3b, 0xb2e, 0xb3e,
-0x3b, 0xb05, 0x3b, 0xb2e, 0xb07, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb05, 0x3b, 0xb38, 0xb47, 0x3b, 0xb05, 0x3b, 0xb28,
-0x3b, 0xb21, 0xb3f, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631,
-0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc,
-0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b,
-0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x6d0,
-0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b,
-0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628,
-0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631,
-0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627,
-0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af,
-0x633, 0x62a, 0x3b, 0x633, 0x6d0, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,
-0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645, 0x3b,
-0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647,
-0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x647,
-0x3b, 0x698, 0x648, 0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627,
-0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627,
-0x645, 0x628, 0x631, 0x3b, 0x698, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x645, 0x3b, 0x698, 0x3b, 0x698, 0x3b, 0x627, 0x3b,
-0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648, 0x631, 0x6cc,
-0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x647, 0x654, 0x3b, 0x698, 0x648,
-0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x654, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628,
-0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628,
-0x631, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b,
-0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627,
-0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,
-0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc,
-0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c,
-0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628,
-0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x73, 0x74, 0x79, 0x3b, 0x6c, 0x75, 0x74, 0x3b,
-0x6d, 0x61, 0x72, 0x3b, 0x6b, 0x77, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x3b, 0x6c, 0x69, 0x70, 0x3b,
-0x73, 0x69, 0x65, 0x3b, 0x77, 0x72, 0x7a, 0x3b, 0x70, 0x61, 0x17a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x3b,
-0x73, 0x74, 0x79, 0x63, 0x7a, 0x65, 0x144, 0x3b, 0x6c, 0x75, 0x74, 0x79, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x65, 0x63, 0x3b,
-0x6b, 0x77, 0x69, 0x65, 0x63, 0x69, 0x65, 0x144, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x72, 0x77, 0x69, 0x65,
-0x63, 0x3b, 0x6c, 0x69, 0x70, 0x69, 0x65, 0x63, 0x3b, 0x73, 0x69, 0x65, 0x72, 0x70, 0x69, 0x65, 0x144, 0x3b, 0x77, 0x72,
-0x7a, 0x65, 0x73, 0x69, 0x65, 0x144, 0x3b, 0x70, 0x61, 0x17a, 0x64, 0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69, 0x6b, 0x3b, 0x6c,
-0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x67, 0x72, 0x75, 0x64, 0x7a, 0x69, 0x65, 0x144, 0x3b, 0x53, 0x3b, 0x4c,
-0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x43, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x4c, 0x3b, 0x47,
-0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x6e, 0x69, 0x61, 0x3b, 0x6c, 0x75, 0x74, 0x65, 0x67, 0x6f, 0x3b, 0x6d, 0x61, 0x72,
-0x63, 0x61, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x74, 0x6e, 0x69, 0x61, 0x3b, 0x6d, 0x61, 0x6a, 0x61, 0x3b, 0x63, 0x7a, 0x65,
-0x72, 0x77, 0x63, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x63, 0x61, 0x3b, 0x73, 0x69, 0x65, 0x72, 0x70, 0x6e, 0x69, 0x61, 0x3b,
-0x77, 0x72, 0x7a, 0x65, 0x15b, 0x6e, 0x69, 0x61, 0x3b, 0x70, 0x61, 0x17a, 0x64, 0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69, 0x6b,
-0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x67, 0x72, 0x75, 0x64, 0x6e, 0x69, 0x61, 0x3b,
-0x73, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x63, 0x3b, 0x6c, 0x3b, 0x73, 0x3b, 0x77, 0x3b, 0x70, 0x3b,
-0x6c, 0x3b, 0x67, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b,
-0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b,
-0x6f, 0x75, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x7a, 0x3b, 0x6a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b,
-0x66, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69,
-0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x61,
-0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74, 0x75, 0x62,
-0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f,
-0x3b, 0xa1c, 0xa28, 0x3b, 0xa2b, 0xa3c, 0xa30, 0x3b, 0xa2e, 0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0x3b, 0xa2e,
-0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32, 0xa3e, 0x3b, 0xa05, 0xa17, 0x3b, 0xa38, 0xa24, 0xa70, 0x3b, 0xa05, 0xa15,
-0xa24, 0xa42, 0x3b, 0xa28, 0xa35, 0xa70, 0x3b, 0xa26, 0xa38, 0xa70, 0x3b, 0xa1c, 0xa28, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2b, 0xa3c, 0xa30,
-0xa35, 0xa30, 0xa40, 0x3b, 0xa2e, 0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0xa32, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c,
-0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32, 0xa3e, 0xa08, 0x3b, 0xa05, 0xa17, 0xa38, 0xa24, 0x3b, 0xa38, 0xa24, 0xa70, 0xa2c, 0xa30, 0x3b,
-0xa05, 0xa15, 0xa24, 0xa42, 0xa2c, 0xa30, 0x3b, 0xa28, 0xa35, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa26, 0xa38, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa1c,
-0x3b, 0xa2b, 0xa3c, 0x3b, 0xa2e, 0xa3e, 0x3b, 0xa05, 0x3b, 0xa2e, 0x3b, 0xa1c, 0xa42, 0x3b, 0xa1c, 0xa41, 0x3b, 0xa05, 0x3b, 0xa38,
-0x3b, 0xa05, 0x3b, 0xa28, 0x3b, 0xa26, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645,
-0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644,
-0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628,
-0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x45, 0x6e, 0x65, 0x3b, 0x46, 0x65,
-0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75,
-0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x63, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69,
-0x63, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a,
-0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x4a,
-0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72,
-0x65, 0x3b, 0x4f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,
-0x44, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x61, 0x76,
-0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65,
-0x72, 0x63, 0x6c, 0x2e, 0x3b, 0x66, 0x61, 0x6e, 0x2e, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74,
-0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x73, 0x63, 0x68,
-0x61, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72,
-0x69, 0x67, 0x6c, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x66,
-0x61, 0x6e, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
-0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a,
-0x3b, 0x46, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x69, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65,
-0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e,
-0x2e, 0x3b, 0x69, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63,
-0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x69, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69,
-0x65, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x65, 0x3b, 0x61,
-0x70, 0x72, 0x69, 0x6c, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x69, 0x75, 0x6c,
-0x69, 0x65, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65,
-0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6e, 0x6f, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65,
-0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d,
-0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b,
-0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b,
-0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e,
-0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432,
-0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430,
-0x44f, 0x3b, 0x438, 0x44e, 0x43d, 0x2e, 0x3b, 0x438, 0x44e, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d,
-0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f,
-0x43d, 0x432, 0x430, 0x440, 0x44f, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x430, 0x3b,
-0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x438, 0x44e, 0x43d, 0x44f, 0x3b, 0x438, 0x44e, 0x43b, 0x44f,
-0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x430, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43e, 0x43a,
-0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44f,
-0x3b, 0x4e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4d, 0x62, 0xe4, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x42, 0xea, 0x6c,
-0x3b, 0x46, 0xf6, 0x6e, 0x3b, 0x4c, 0x65, 0x6e, 0x3b, 0x4b, 0xfc, 0x6b, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x4e, 0x67, 0x62,
-0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6b, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x75,
-0x6e, 0x64, 0xef, 0x67, 0x69, 0x3b, 0x4d, 0x62, 0xe4, 0x6e, 0x67, 0xfc, 0x3b, 0x4e, 0x67, 0x75, 0x62, 0xf9, 0x65, 0x3b,
-0x42, 0xea, 0x6c, 0xe4, 0x77, 0xfc, 0x3b, 0x46, 0xf6, 0x6e, 0x64, 0x6f, 0x3b, 0x4c, 0x65, 0x6e, 0x67, 0x75, 0x61, 0x3b,
-0x4b, 0xfc, 0x6b, 0xfc, 0x72, 0xfc, 0x3b, 0x4d, 0x76, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x67, 0x62, 0x65, 0x72, 0x65, 0x72,
-0x65, 0x3b, 0x4e, 0x61, 0x62, 0xe4, 0x6e, 0x64, 0xfc, 0x72, 0x75, 0x3b, 0x4b, 0x61, 0x6b, 0x61, 0x75, 0x6b, 0x61, 0x3b,
-0x4e, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b,
-0x4e, 0x3b, 0x4b, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b,
-0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b,
-0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444,
-0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430,
-0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f,
-0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c,
-0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62,
-0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75,
-0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64,
-0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61,
-0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c,
-0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b,
-0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d,
-0x62, 0x61, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b,
-0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b,
-0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62,
-0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b,
-0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b,
-0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430,
-0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430,
-0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b,
-0x42f, 0x43d, 0x432, 0x2e, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x2e, 0x3b, 0x410, 0x43f, 0x440,
-0x2e, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x2e,
-0x3b, 0x421, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x41e, 0x43a, 0x442, 0x2e, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x414, 0x435,
-0x43a, 0x2e, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x41c, 0x430,
-0x440, 0x442, 0x44a, 0x438, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c,
-0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440,
-0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x414, 0x435, 0x43a,
-0x430, 0x431, 0x440, 0x44c, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b,
-0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x44b, 0x3b, 0x438, 0x44e, 0x43d, 0x44b, 0x3b, 0x438, 0x44e, 0x43b, 0x44b, 0x3b,
-0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x2e, 0x3b,
-0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44b, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44b, 0x3b,
-0x43c, 0x430, 0x440, 0x442, 0x44a, 0x438, 0x439, 0x44b, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44b, 0x3b, 0x43c, 0x430, 0x439, 0x44b,
-0x3b, 0x438, 0x44e, 0x43d, 0x44b, 0x3b, 0x438, 0x44e, 0x43b, 0x44b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x44b, 0x3b, 0x441,
-0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x43d, 0x43e, 0x44f, 0x431,
-0x440, 0x44b, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44b, 0x3b, 0x4e, 0x64, 0x69, 0x3b, 0x4b, 0x75, 0x6b, 0x3b, 0x4b,
-0x75, 0x72, 0x3b, 0x4b, 0x75, 0x62, 0x3b, 0x43, 0x68, 0x76, 0x3b, 0x43, 0x68, 0x6b, 0x3b, 0x43, 0x68, 0x67, 0x3b, 0x4e,
-0x79, 0x61, 0x3b, 0x47, 0x75, 0x6e, 0x3b, 0x47, 0x75, 0x6d, 0x3b, 0x4d, 0x62, 0x75, 0x3b, 0x5a, 0x76, 0x69, 0x3b, 0x4e,
-0x64, 0x69, 0x72, 0x61, 0x3b, 0x4b, 0x75, 0x6b, 0x61, 0x64, 0x7a, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x75, 0x6d, 0x65, 0x3b,
-0x4b, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x62, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x76, 0x61, 0x62, 0x76, 0x75, 0x3b, 0x43, 0x68,
-0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6e, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4e, 0x79, 0x61,
-0x6d, 0x61, 0x76, 0x68, 0x75, 0x76, 0x68, 0x75, 0x3b, 0x47, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x61, 0x3b, 0x47, 0x75, 0x6d,
-0x69, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4d, 0x62, 0x75, 0x64, 0x7a, 0x69, 0x3b, 0x5a, 0x76, 0x69, 0x74, 0x61, 0x3b, 0x4e,
-0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4e, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d,
-0x3b, 0x5a, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x64a, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631,
-0x686, 0x3b, 0x627, 0x67e, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x626, 0x64a, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627,
-0x621, 0x650, 0x3b, 0x622, 0x6af, 0x633, 0x67d, 0x3b, 0x633, 0x64a, 0x67e, 0x67d, 0x645, 0x628, 0x631, 0x3b, 0x622, 0x6aa, 0x67d, 0x648,
-0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x68a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9,
-0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2,
-0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0x3b,
-0xd94, 0xd9a, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0x3b, 0xda2, 0xdb1, 0xdc0, 0xdcf, 0xdbb, 0xdd2,
-0x3b, 0xdb4, 0xdd9, 0xdb6, 0xdbb, 0xdc0, 0xdcf, 0xdbb, 0xdd2, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0xdd4, 0x3b, 0xd85, 0xdb4, 0xdca,
-0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2,
-0x3b, 0xd85, 0xd9c, 0xddd, 0xdc3, 0xdca, 0xdad, 0xdd4, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0xdad, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca,
-0x3b, 0xd94, 0xd9a, 0xdca, 0xdad, 0xddd, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b,
-0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xda2, 0x3b, 0xdb4, 0xdd9, 0x3b, 0xdb8, 0xdcf, 0x3b, 0xd85, 0x3b,
-0xdb8, 0xdd0, 0x3b, 0xda2, 0xdd6, 0x3b, 0xda2, 0xdd6, 0x3b, 0xd85, 0x3b, 0xdc3, 0xdd0, 0x3b, 0xd94, 0x3b, 0xdb1, 0xdd9, 0x3b, 0xdaf,
-0xdd9, 0x3b, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0xdd4, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d,
-0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b,
-0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0x3b, 0xdaf, 0xdd9,
-0xdc3, 0xdd0, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d,
-0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f,
-0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65,
-0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0xe1,
-0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70,
-0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d,
-0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x61,
-0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0xed,
-0x6c, 0x61, 0x3b, 0x6d, 0xe1, 0x6a, 0x61, 0x3b, 0x6a, 0xfa, 0x6e, 0x61, 0x3b, 0x6a, 0xfa, 0x6c, 0x61, 0x3b, 0x61, 0x75,
-0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0xf3,
-0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72,
-0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72,
-0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x76, 0x67, 0x2e,
-0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e,
-0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65,
-0x63, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75,
-0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65,
-0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41,
-0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x73, 0x3b, 0x53,
-0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x66, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61,
-0x61, 0x79, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x61, 0x61, 0x79, 0x6f, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x73, 0x6f, 0x3b,
-0x41, 0x62, 0x72, 0x69, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x75, 0x6c,
-0x69, 0x79, 0x6f, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x62, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b,
-0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x66, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65,
-0x73, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c,
-0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x6f,
-0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69,
-0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x64, 0x64, 0x65, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20,
-0x41, 0x66, 0x72, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x68, 0x61, 0x6e, 0x61, 0x61, 0x64,
-0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x69, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20,
-0x54, 0x6f, 0x64, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x69, 0x64, 0x65, 0x65,
-0x64, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x67, 0x61, 0x61, 0x6c, 0x61, 0x61, 0x64,
-0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61,
-0x20, 0x4b, 0x6f, 0x77, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73,
-0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b,
-0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b,
-0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b,
-0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e,
-0x3b, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f,
-0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75,
-0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72,
-0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,
-0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,
-0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66,
-0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a,
-0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f,
-0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e, 0x3b, 0x45, 0x6e, 0x65, 0x2e, 0x3b, 0x46,
-0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x79, 0x2e, 0x3b, 0x4a,
-0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x67, 0x6f, 0x2e, 0x3b, 0x53, 0x65, 0x74, 0x2e, 0x3b, 0x4f,
-0x63, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x69, 0x63, 0x2e, 0x3b, 0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66,
-0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a,
-0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f,
-0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e, 0x3b, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b,
-0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b,
-0x6d, 0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f,
-0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72,
-0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72,
-0x65, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65,
-0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b,
-0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65,
-0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b,
-0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74,
-0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f,
-0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66,
-0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75,
-0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b,
-0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69,
-0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c,
-0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73,
-0x74, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72,
-0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x42f,
-0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440,
-0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441,
-0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x44f,
-0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0xb9c, 0xba9, 0x2e, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0x2e, 0x3b,
-0xbae, 0xbbe, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c,
-0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0x2e, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xb85, 0xb95, 0xbcd, 0x2e, 0x3b, 0xba8,
-0xbb5, 0x2e, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0x2e, 0x3b, 0xb9c, 0xba9, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0xbb0, 0xbb5,
-0xbb0, 0xbbf, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0xb9a, 0xbcd, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0xbb0, 0xbb2, 0xbcd, 0x3b, 0xbae, 0xbc7, 0x3b,
-0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0xbb8, 0xbcd, 0xb9f, 0xbcd, 0x3b, 0xb9a, 0xbc6, 0xbaa,
-0xbcd, 0xb9f, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb85, 0xb95, 0xbcd, 0xb9f, 0xbcb, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xba8, 0xbb5, 0xbae,
-0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9c, 0x3b, 0xbaa, 0xbbf, 0x3b, 0xbae,
-0xbbe, 0x3b, 0xb8f, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb86, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xb85, 0x3b,
-0xba8, 0x3b, 0xb9f, 0xbbf, 0x3b, 0x433, 0x44b, 0x439, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e,
-0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b,
-0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431,
-0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x433, 0x44b, 0x439, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430,
-0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438,
-0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442,
-0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b,
-0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0xc1c, 0xc28, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0x3b, 0xc2e, 0xc3e, 0xc30,
-0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc41,
-0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0x3b, 0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b, 0x3b,
-0xc28, 0xc35, 0xc02, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02, 0x3b, 0xc1c, 0xc28, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d,
-0xc30, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0xc32, 0xc4d, 0x3b,
-0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc41, 0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0xc38, 0xc4d, 0xc1f, 0xc41, 0x3b,
-0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b, 0xc2c, 0xc30, 0xc4d, 0x3b,
-0xc28, 0xc35, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc1c, 0x3b, 0xc2b, 0xc3f,
-0x3b, 0xc2e, 0xc3e, 0x3b, 0xc0f, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0x3b, 0xc1c, 0xc41, 0x3b, 0xc06, 0x3b, 0xc38, 0xc46, 0x3b,
-0xc05, 0x3b, 0xc28, 0x3b, 0xc21, 0xc3f, 0x3b, 0xe21, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe1e, 0x2e, 0x3b, 0xe21, 0xe35, 0x2e,
-0xe04, 0x2e, 0x3b, 0xe40, 0xe21, 0x2e, 0xe22, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe34, 0x2e, 0xe22, 0x2e, 0x3b,
-0xe01, 0x2e, 0xe04, 0x2e, 0x3b, 0xe2a, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe22, 0x2e, 0x3b, 0xe15, 0x2e, 0xe04, 0x2e, 0x3b,
-0xe1e, 0x2e, 0xe22, 0x2e, 0x3b, 0xe18, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe01, 0xe23, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe38, 0xe21,
-0xe20, 0xe32, 0xe1e, 0xe31, 0xe19, 0xe18, 0xe4c, 0x3b, 0xe21, 0xe35, 0xe19, 0xe32, 0xe04, 0xe21, 0x3b, 0xe40, 0xe21, 0xe29, 0xe32, 0xe22,
-0xe19, 0x3b, 0xe1e, 0xe24, 0xe29, 0xe20, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21, 0xe34, 0xe16, 0xe38, 0xe19, 0xe32, 0xe22, 0xe19, 0x3b, 0xe01,
-0xe23, 0xe01, 0xe0e, 0xe32, 0xe04, 0xe21, 0x3b, 0xe2a, 0xe34, 0xe07, 0xe2b, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe31, 0xe19, 0xe22, 0xe32,
-0xe22, 0xe19, 0x3b, 0xe15, 0xe38, 0xe25, 0xe32, 0xe04, 0xe21, 0x3b, 0xe1e, 0xe24, 0xe28, 0xe08, 0xe34, 0xe01, 0xe32, 0xe22, 0xe19, 0x3b,
-0xe18, 0xe31, 0xe19, 0xe27, 0xe32, 0xe04, 0xe21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0xf0b, 0x3b,
-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf66,
-0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3,
-0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54,
-0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,
-0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b,
-0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45,
-0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42,
-0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0x3b, 0xf5f, 0xfb3,
-0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b,
-0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94,
-0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,
-0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0x3b,
-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b,
-0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3,
-0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x3b,
-0x1218, 0x130b, 0x3b, 0x121a, 0x12eb, 0x3b, 0x130d, 0x1295, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x3b, 0x1290, 0x1213, 0x3b, 0x1218, 0x1235,
-0x3b, 0x1325, 0x1245, 0x3b, 0x1215, 0x12f3, 0x3b, 0x1273, 0x1215, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x1275, 0x3b, 0x1218, 0x130b,
-0x1262, 0x1275, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x12eb, 0x3b, 0x130d, 0x1295, 0x1266, 0x1275, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x1208, 0x3b,
-0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x1228, 0x121d, 0x3b, 0x1325, 0x1245, 0x121d, 0x1272, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b, 0x1273,
-0x1215, 0x1233, 0x1235, 0x3b, 0x1325, 0x3b, 0x1208, 0x3b, 0x1218, 0x3b, 0x121a, 0x3b, 0x130d, 0x3b, 0x1230, 0x3b, 0x1213, 0x3b, 0x1290, 0x3b,
-0x1218, 0x3b, 0x1325, 0x3b, 0x1215, 0x3b, 0x1273, 0x3b, 0x53, 0x101, 0x6e, 0x3b, 0x46, 0x113, 0x70, 0x3b, 0x4d, 0x61, 0x2bb, 0x61,
-0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x53, 0x69, 0x75, 0x3b, 0x2bb, 0x41, 0x6f,
-0x6b, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x3b, 0x54, 0x12b, 0x73, 0x3b, 0x53,
-0x101, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x113, 0x70, 0x75, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x73,
-0x69, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x6c, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x65, 0x3b, 0x53,
-0x69, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x69, 0x74, 0x65,
-0x6d, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x65, 0x6d, 0x61, 0x3b, 0x54,
-0x12b, 0x73, 0x65, 0x6d, 0x61, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b,
-0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4f, 0x63, 0x61, 0x3b, 0x15e, 0x75, 0x62, 0x3b, 0x4d, 0x61,
-0x72, 0x3b, 0x4e, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x61, 0x7a, 0x3b, 0x54, 0x65, 0x6d, 0x3b, 0x41, 0x11f,
-0x75, 0x3b, 0x45, 0x79, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x41, 0x72, 0x61, 0x3b, 0x4f, 0x63,
-0x61, 0x6b, 0x3b, 0x15e, 0x75, 0x62, 0x61, 0x74, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x4e, 0x69, 0x73, 0x61, 0x6e, 0x3b,
-0x4d, 0x61, 0x79, 0x131, 0x73, 0x3b, 0x48, 0x61, 0x7a, 0x69, 0x72, 0x61, 0x6e, 0x3b, 0x54, 0x65, 0x6d, 0x6d, 0x75, 0x7a,
-0x3b, 0x41, 0x11f, 0x75, 0x73, 0x74, 0x6f, 0x73, 0x3b, 0x45, 0x79, 0x6c, 0xfc, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x6d, 0x3b,
-0x4b, 0x61, 0x73, 0x131, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6c, 0x131, 0x6b, 0x3b, 0x4f, 0x3b, 0x15e, 0x3b, 0x4d, 0x3b, 0x4e,
-0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x45, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x41, 0x3b, 0xdd, 0x61, 0x6e,
-0x3b, 0x46, 0x65, 0x77, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0xfd, 0x3b, 0x49, 0xfd, 0x75,
-0x6e, 0x3b, 0x49, 0xfd, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x67, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
-0x6f, 0xfd, 0x3b, 0x44, 0x65, 0x6b, 0x3b, 0xdd, 0x61, 0x6e, 0x77, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x77, 0x72, 0x61, 0x6c,
-0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0xfd, 0x3b, 0x49, 0xfd, 0x75, 0x6e,
-0x3b, 0x49, 0xfd, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0xfd, 0x61, 0x62,
-0x72, 0x3b, 0x4f, 0x6b, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65, 0x6b,
-0x61, 0x62, 0x72, 0x3b, 0xdd, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b,
-0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0xfd, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x77, 0x3b, 0x6d, 0x61, 0x72, 0x74,
-0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0xfd, 0x3b, 0x69, 0xfd, 0x75, 0x6e, 0x3b, 0x69, 0xfd, 0x75, 0x6c, 0x3b, 0x61,
-0x77, 0x67, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0xfd, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0xfd,
-0x61, 0x6e, 0x77, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x77, 0x72, 0x61, 0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70,
-0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0xfd, 0x3b, 0x69, 0xfd, 0x75, 0x6e, 0x3b, 0x69, 0xfd, 0x75, 0x6c, 0x3b, 0x61, 0x77,
-0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xfd, 0x61, 0x62,
-0x72, 0x3b, 0x6e, 0x6f, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0x64a, 0x627, 0x646, 0x6cb,
-0x627, 0x631, 0x3b, 0x641, 0x6d0, 0x6cb, 0x631, 0x627, 0x644, 0x3b, 0x645, 0x627, 0x631, 0x62a, 0x3b, 0x626, 0x627, 0x67e, 0x631, 0x6d0,
-0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x626, 0x649, 0x64a, 0x6c7, 0x646, 0x3b, 0x626, 0x649, 0x64a, 0x6c7, 0x644, 0x3b, 0x626, 0x627,
-0x6cb, 0x63a, 0x6c7, 0x633, 0x62a, 0x3b, 0x633, 0x6d0, 0x646, 0x62a, 0x6d5, 0x628, 0x649, 0x631, 0x3b, 0x626, 0x6c6, 0x643, 0x62a, 0x6d5,
-0x628, 0x649, 0x631, 0x3b, 0x646, 0x648, 0x64a, 0x627, 0x628, 0x649, 0x631, 0x3b, 0x62f, 0x6d0, 0x643, 0x627, 0x628, 0x649, 0x631, 0x3b,
-0x441, 0x456, 0x447, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x431, 0x435, 0x440, 0x3b, 0x43a, 0x432, 0x456, 0x3b, 0x442, 0x440, 0x430, 0x3b,
-0x447, 0x435, 0x440, 0x3b, 0x43b, 0x438, 0x43f, 0x3b, 0x441, 0x435, 0x440, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x436, 0x43e, 0x432, 0x3b,
-0x43b, 0x438, 0x441, 0x3b, 0x433, 0x440, 0x443, 0x3b, 0x441, 0x456, 0x447, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x438, 0x439,
-0x3b, 0x431, 0x435, 0x440, 0x435, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x435, 0x43d, 0x44c, 0x3b, 0x442, 0x440,
-0x430, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x438, 0x43f, 0x435, 0x43d, 0x44c,
-0x3b, 0x441, 0x435, 0x440, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43e,
-0x432, 0x442, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x435,
-0x43d, 0x44c, 0x3b, 0x421, 0x3b, 0x41b, 0x3b, 0x411, 0x3b, 0x41a, 0x3b, 0x422, 0x3b, 0x427, 0x3b, 0x41b, 0x3b, 0x421, 0x3b, 0x412,
-0x3b, 0x416, 0x3b, 0x41b, 0x3b, 0x413, 0x3b, 0x441, 0x456, 0x447, 0x2e, 0x3b, 0x43b, 0x44e, 0x442, 0x2e, 0x3b, 0x431, 0x435, 0x440,
-0x2e, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x2e, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x2e, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x2e, 0x3b,
-0x43b, 0x438, 0x43f, 0x2e, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x2e, 0x3b, 0x432, 0x435, 0x440, 0x2e, 0x3b, 0x436, 0x43e, 0x432, 0x442,
-0x2e, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x2e, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x2e, 0x3b, 0x441, 0x456, 0x447, 0x43d, 0x44f, 0x3b,
-0x43b, 0x44e, 0x442, 0x43e, 0x433, 0x43e, 0x3b, 0x431, 0x435, 0x440, 0x435, 0x437, 0x43d, 0x44f, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x43d,
-0x44f, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x43d, 0x44f, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x43f, 0x43d,
-0x44f, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x43d, 0x44f, 0x3b, 0x432, 0x435, 0x440, 0x435, 0x441, 0x43d, 0x44f, 0x3b, 0x436, 0x43e, 0x432,
-0x442, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x430, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x43d, 0x44f,
-0x3b, 0x441, 0x3b, 0x43b, 0x3b, 0x431, 0x3b, 0x43a, 0x3b, 0x442, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x432, 0x3b, 0x436,
-0x3b, 0x43b, 0x3b, 0x433, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631,
-0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627,
-0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631,
-0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x59, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76,
-0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x49, 0x79, 0x6e, 0x3b, 0x49, 0x79, 0x6c,
-0x3b, 0x41, 0x76, 0x67, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x79, 0x3b, 0x44, 0x65, 0x6b,
-0x3b, 0x59, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b,
-0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x49, 0x79, 0x75, 0x6e, 0x3b, 0x49, 0x79, 0x75, 0x6c, 0x3b,
-0x41, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x61, 0x62,
-0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0x59, 0x3b, 0x46, 0x3b,
-0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b,
-0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b,
-0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b,
-0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x79, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x61,
-0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x75,
-0x6e, 0x3b, 0x69, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0x61, 0x62,
-0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61,
-0x62, 0x72, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x3b, 0x627, 0x67e, 0x631, 0x3b, 0x645,
-0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x3b, 0x633, 0x67e, 0x62a, 0x3b, 0x627, 0x6a9,
-0x62a, 0x3b, 0x646, 0x648, 0x645, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x44f, 0x43d, 0x432, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430,
-0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x3b, 0x438, 0x44e, 0x43b, 0x3b, 0x430, 0x432,
-0x433, 0x3b, 0x441, 0x435, 0x43d, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x44f, 0x3b, 0x434, 0x435, 0x43a, 0x3b, 0x44f, 0x43d,
-0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435,
-0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x3b, 0x438, 0x44e, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442,
-0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x43d, 0x43e, 0x44f, 0x431,
-0x440, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x32,
-0x3b, 0x54, 0x68, 0x67, 0x20, 0x33, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x54,
-0x68, 0x67, 0x20, 0x36, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x37, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x54, 0x68, 0x67,
-0x20, 0x39, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x54, 0x68, 0x67,
-0x20, 0x31, 0x32, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x32, 0x3b,
-0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x33, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x34, 0x3b, 0x54, 0x68, 0xe1, 0x6e,
-0x67, 0x20, 0x35, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x36, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x37, 0x3b,
-0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x38, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x39, 0x3b, 0x54, 0x68, 0xe1, 0x6e,
-0x67, 0x20, 0x31, 0x30, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20,
-0x31, 0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x33,
-0x3b, 0x74, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x74,
-0x68, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0x67,
-0x20, 0x31, 0x30, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x74, 0x68,
-0xe1, 0x6e, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x32, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20,
-0x33, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68,
-0xe1, 0x6e, 0x67, 0x20, 0x36, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20,
-0x38, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x74,
-0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x79, 0x61, 0x6e,
-0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0xe4, 0x7a, 0x3b, 0x70, 0x72, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e,
-0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x67, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x74, 0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76,
-0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x79, 0x61, 0x6e, 0x75, 0x6c, 0x3b, 0x66, 0x65, 0x62, 0x75, 0x6c, 0x3b, 0x6d, 0xe4, 0x7a,
-0x75, 0x6c, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x75, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x75, 0x6c, 0x3b, 0x79, 0x75, 0x6e, 0x75,
-0x6c, 0x3b, 0x79, 0x75, 0x6c, 0x75, 0x6c, 0x3b, 0x67, 0x75, 0x73, 0x74, 0x75, 0x6c, 0x3b, 0x73, 0x65, 0x74, 0x75, 0x6c,
-0x3b, 0x74, 0x6f, 0x62, 0x75, 0x6c, 0x3b, 0x6e, 0x6f, 0x76, 0x75, 0x6c, 0x3b, 0x64, 0x65, 0x6b, 0x75, 0x6c, 0x3b, 0x59,
-0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4e,
-0x3b, 0x44, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0xe4, 0x7a, 0x3b, 0x70, 0x72, 0x6c, 0x3b, 0x6d,
-0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x67, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x74,
-0x6f, 0x6e, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x3b, 0x4d,
-0x61, 0x77, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x41,
-0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x3b, 0x52, 0x68,
-0x61, 0x67, 0x3b, 0x49, 0x6f, 0x6e, 0x61, 0x77, 0x72, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x72, 0x6f, 0x72, 0x3b, 0x4d,
-0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68,
-0x65, 0x66, 0x69, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x65, 0x6e, 0x6e, 0x61, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74,
-0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x72, 0x65, 0x66, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x77, 0x65, 0x64,
-0x64, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x66, 0x79, 0x72, 0x3b, 0x49, 0x3b, 0x43, 0x68, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d,
-0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x52, 0x68, 0x3b, 0x49, 0x6f, 0x6e, 0x3b,
-0x43, 0x68, 0x77, 0x65, 0x66, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69,
-0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69,
-0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x3b, 0x46,
-0x65, 0x77, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x77, 0x3b, 0x53,
-0x75, 0x6c, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0xe0, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x77, 0x3b, 0x44, 0x65,
-0x73, 0x3b, 0x53, 0x61, 0x6d, 0x77, 0x69, 0x79, 0x65, 0x65, 0x3b, 0x46, 0x65, 0x77, 0x72, 0x69, 0x79, 0x65, 0x65, 0x3b,
-0x4d, 0x61, 0x72, 0x73, 0x3b, 0x41, 0x77, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x77, 0x65, 0x3b,
-0x53, 0x75, 0x6c, 0x65, 0x74, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0xe0, 0x74, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f,
-0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x77, 0xe0, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x73,
-0xe0, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x45, 0x70,
-0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65,
-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x79, 0x75, 0x77,
-0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x74, 0x73, 0x68, 0x69,
-0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75,
-0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61,
-0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73,
-0x65, 0x6d, 0x62, 0x61, 0x3b, 0x5d9, 0x5d0, 0x5b7, 0x5e0, 0x3b, 0x5e4, 0x5bf, 0x5e2, 0x5d1, 0x3b, 0x5de, 0x5e2, 0x5e8, 0x5e5, 0x3b,
-0x5d0, 0x5b7, 0x5e4, 0x5bc, 0x5e8, 0x3b, 0x5de, 0x5d9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b,
-0x5d0, 0x5d5, 0x5d9, 0x5d2, 0x3b, 0x5e1, 0x5e2, 0x5e4, 0x5bc, 0x3b, 0x5d0, 0x5e7, 0x5d8, 0x3b, 0x5e0, 0x5d0, 0x5d5, 0x5d5, 0x3b, 0x5d3,
-0x5e2, 0x5e6, 0x3b, 0x5d9, 0x5d0, 0x5b7, 0x5e0, 0x5d5, 0x5d0, 0x5b7, 0x5e8, 0x3b, 0x5e4, 0x5bf, 0x5e2, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5b7,
-0x5e8, 0x3b, 0x5de, 0x5e2, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5b7, 0x5e4, 0x5bc, 0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d9, 0x5d9, 0x3b, 0x5d9,
-0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d9, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e2, 0x5e4,
-0x5bc, 0x5d8, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5d0, 0x5e7, 0x5d8, 0x5d0, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5e0, 0x5d0, 0x5d5, 0x5d5,
-0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5d3, 0x5e2, 0x5e6, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x3b, 0xc8,
-0x72, 0x3b, 0x1eb8, 0x72, 0x3b, 0xcc, 0x67, 0x3b, 0x1eb8, 0x300, 0x62, 0x3b, 0xd2, 0x6b, 0x3b, 0x41, 0x67, 0x3b, 0xd2, 0x67,
-0x3b, 0x4f, 0x77, 0x3b, 0x1ecc, 0x300, 0x77, 0x3b, 0x42, 0xe9, 0x3b, 0x1ecc, 0x300, 0x70, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9,
-0x301, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9, 0x3b,
-0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0xd2,
-0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9, 0x6c,
-0xfa, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x53, 0x3b, 0xc8, 0x3b, 0x1eb8, 0x3b, 0xcc, 0x3b, 0x1eb8, 0x300, 0x3b, 0xd2,
-0x3b, 0x41, 0x3b, 0xd2, 0x3b, 0x4f, 0x3b, 0x1ecc, 0x300, 0x3b, 0x42, 0x3b, 0x1ecc, 0x300, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72, 0x3b,
-0xc8, 0x72, 0xe8, 0x6c, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0x3b, 0xcc, 0x67, 0x62, 0x3b, 0x1eb8, 0x300, 0x62, 0x69, 0x3b,
-0xd2, 0x6b, 0xfa, 0x3b, 0x41, 0x67, 0x1eb9, 0x3b, 0xd2, 0x67, 0xfa, 0x3b, 0x4f, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77, 0xe0,
-0x3b, 0x42, 0xe9, 0x6c, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9, 0x301,
-0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e,
-0xe0, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1eb8, 0x300, 0x62, 0x69, 0x62,
-0x69, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x41, 0x67, 0x1eb9, 0x6d,
-0x1ecd, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65,
-0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa,
-0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x53, 0x68, 0x25b, 0x301, 0x3b, 0xc8, 0x72, 0x3b, 0x190,
-0x72, 0x3b, 0xcc, 0x67, 0x3b, 0x190, 0x300, 0x62, 0x3b, 0xd2, 0x6b, 0x3b, 0x41, 0x67, 0x3b, 0xd2, 0x67, 0x3b, 0x4f, 0x77,
-0x3b, 0x186, 0x300, 0x77, 0x3b, 0x42, 0xe9, 0x3b, 0x186, 0x300, 0x70, 0x3b, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x25b, 0x301, 0x3b,
-0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x190, 0x72, 0x25b, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x190, 0x300,
-0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x25b, 0x6d, 0x254, 0x3b, 0xd2, 0x67, 0xfa,
-0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x186, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0xfa, 0x3b,
-0x186, 0x300, 0x70, 0x25b, 0x300, 0x3b, 0x53, 0x3b, 0xc8, 0x3b, 0x190, 0x3b, 0xcc, 0x3b, 0x190, 0x300, 0x3b, 0xd2, 0x3b, 0x41,
-0x3b, 0xd2, 0x3b, 0x4f, 0x3b, 0x186, 0x300, 0x3b, 0x42, 0x3b, 0x186, 0x300, 0x3b, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x3b, 0xc8,
-0x72, 0xe8, 0x6c, 0x3b, 0x190, 0x72, 0x25b, 0x300, 0x6e, 0x3b, 0xcc, 0x67, 0x62, 0x3b, 0x190, 0x300, 0x62, 0x69, 0x3b, 0xd2,
-0x6b, 0xfa, 0x3b, 0x41, 0x67, 0x25b, 0x3b, 0xd2, 0x67, 0xfa, 0x3b, 0x4f, 0x77, 0x65, 0x3b, 0x186, 0x300, 0x77, 0xe0, 0x3b,
-0x42, 0xe9, 0x6c, 0x3b, 0x186, 0x300, 0x70, 0x25b, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x25b,
-0x301, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x190, 0x72,
-0x25b, 0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20,
-0x190, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x73,
-0x68, 0xf9, 0x20, 0x41, 0x67, 0x25b, 0x6d, 0x254, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f,
-0x73, 0x68, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x186, 0x300, 0x77, 0xe0, 0x72,
-0xe0, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x186, 0x300, 0x70,
-0x25b, 0x300, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x45, 0x70, 0x68, 0x3b, 0x4d,
-0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f,
-0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b,
-0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x68, 0x72,
-0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69,
-0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b,
-0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62,
-0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b,
-0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73,
-0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b,
-0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b,
-0x64, 0x65, 0x73, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b,
-0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b,
-0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61,
-0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64,
-0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b,
-0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x443, 0x433, 0x3b,
-0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443,
-0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438,
-0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x443, 0x433, 0x443,
-0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440,
-0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x4a,
-0x2d, 0x67, 0x75, 0x65, 0x72, 0x3b, 0x54, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74,
-0x3b, 0x41, 0x76, 0x72, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x73, 0x6f,
-0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73,
-0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69,
-0x72, 0x3b, 0x4d, 0x2d, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x2d, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b,
-0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x67, 0x65, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x54, 0x6f, 0x73, 0x68, 0x69,
-0x61, 0x67, 0x68, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76,
-0x65, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x73, 0x6f,
-0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c,
-0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72,
-0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x48,
-0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x6e, 0x79, 0x20, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b,
-0x3b, 0x47, 0x65, 0x6e, 0x3b, 0x48, 0x77, 0x65, 0x3b, 0x4d, 0x65, 0x75, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x3b,
-0x4d, 0x65, 0x74, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x45, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x6e, 0x3b, 0x48, 0x65, 0x64, 0x3b,
-0x44, 0x75, 0x3b, 0x4b, 0x65, 0x76, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x6d, 0x69,
-0x73, 0x20, 0x48, 0x77, 0x65, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x75, 0x72, 0x74, 0x68,
-0x3b, 0x6d, 0x69, 0x73, 0x20, 0x45, 0x62, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x3b, 0x6d, 0x69,
-0x73, 0x20, 0x4d, 0x65, 0x74, 0x68, 0x65, 0x76, 0x65, 0x6e, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x47, 0x6f, 0x72, 0x74, 0x68,
-0x65, 0x72, 0x65, 0x6e, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x45, 0x73, 0x74, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x47, 0x77, 0x79,
-0x6e, 0x6e, 0x67, 0x61, 0x6c, 0x61, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x48, 0x65, 0x64, 0x72, 0x61, 0x3b, 0x6d, 0x69, 0x73,
-0x20, 0x44, 0x75, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4b, 0x65, 0x76, 0x61, 0x72, 0x64, 0x68, 0x75, 0x3b, 0x53, 0x2d, 0x186,
-0x3b, 0x4b, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x4f, 0x3b, 0x45, 0x2d, 0x4b, 0x3b, 0x4f, 0x2d, 0x41,
-0x3b, 0x41, 0x2d, 0x4b, 0x3b, 0x44, 0x2d, 0x186, 0x3b, 0x46, 0x2d, 0x190, 0x3b, 0x186, 0x2d, 0x41, 0x3b, 0x186, 0x2d, 0x4f,
-0x3b, 0x4d, 0x2d, 0x186, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x61, 0x2d, 0x186, 0x70, 0x25b, 0x70, 0x254, 0x6e, 0x3b, 0x4b, 0x77,
-0x61, 0x6b, 0x77, 0x61, 0x72, 0x2d, 0x186, 0x67, 0x79, 0x65, 0x66, 0x75, 0x6f, 0x3b, 0x45, 0x62, 0x254, 0x77, 0x2d, 0x186,
-0x62, 0x65, 0x6e, 0x65, 0x6d, 0x3b, 0x45, 0x62, 0x254, 0x62, 0x69, 0x72, 0x61, 0x2d, 0x4f, 0x66, 0x6f, 0x72, 0x69, 0x73,
-0x75, 0x6f, 0x3b, 0x45, 0x73, 0x75, 0x73, 0x6f, 0x77, 0x20, 0x41, 0x6b, 0x65, 0x74, 0x73, 0x65, 0x61, 0x62, 0x61, 0x2d,
-0x4b, 0x254, 0x74, 0x254, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x62, 0x69, 0x72, 0x61, 0x64, 0x65, 0x2d, 0x41, 0x79,
-0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x6d, 0x75, 0x6d, 0x75, 0x3b, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x2d, 0x4b, 0x69,
-0x74, 0x61, 0x77, 0x6f, 0x6e, 0x73, 0x61, 0x3b, 0x44, 0x69, 0x66, 0x75, 0x75, 0x2d, 0x186, 0x73, 0x61, 0x6e, 0x64, 0x61,
-0x61, 0x3b, 0x46, 0x61, 0x6e, 0x6b, 0x77, 0x61, 0x2d, 0x190, 0x62, 0x254, 0x3b, 0x186, 0x62, 0x25b, 0x73, 0x25b, 0x2d, 0x41,
-0x68, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x3b, 0x186, 0x62, 0x65, 0x72, 0x25b, 0x66, 0x25b, 0x77, 0x2d, 0x4f, 0x62, 0x75, 0x62,
-0x75, 0x6f, 0x3b, 0x4d, 0x75, 0x6d, 0x75, 0x2d, 0x186, 0x70, 0x25b, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x91c, 0x93e, 0x928,
-0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930,
-0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932,
-0x93e, 0x92f, 0x3b, 0x906, 0x917, 0x94b, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911,
-0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938,
-0x947, 0x902, 0x92c, 0x930, 0x3b, 0x4a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x45, 0x70, 0x72,
-0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x3b, 0x53, 0x65, 0x70,
-0x3b, 0x1ecc, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x65, 0x6e, 0x1ee5, 0x77, 0x61, 0x72,
-0x1ecb, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x4d, 0x61, 0x61, 0x63, 0x68, 0x1ecb, 0x3b, 0x45,
-0x70, 0x72, 0x65, 0x65, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x1ecb,
-0x3b, 0x1ecc, 0x67, 0x1ecd, 0x1ecd, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1ecc, 0x6b, 0x74,
-0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b,
-0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x1ecc, 0x3b, 0x53, 0x3b, 0x1ecc, 0x3b,
-0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x65, 0x6c, 0x3b, 0x4b, 0x74, 0x169, 0x3b, 0x4b, 0x61, 0x6e, 0x3b,
-0x4b, 0x74, 0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x4b, 0x6e, 0x64, 0x3b,
-0x128, 0x6b, 0x75, 0x3b, 0x128, 0x6b, 0x6d, 0x3b, 0x128, 0x6b, 0x6c, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20,
-0x6d, 0x62, 0x65, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x4d, 0x77,
-0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61,
-0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f,
-0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d,
-0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x75, 0x6f, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77,
-0x61, 0x20, 0x6e, 0x79, 0x61, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65,
-0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77,
-0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x129, 0x6d, 0x77, 0x65, 0x3b,
-0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6c, 0x129,
-0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x128,
-0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x5a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x76, 0x72,
-0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x3b, 0x53, 0x65, 0x74,
-0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x63, 0x3b, 0x5a, 0x65, 0x6e, 0xe2, 0x72, 0x3b, 0x46,
-0x65, 0x76, 0x72, 0xe2, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0xe7, 0x3b, 0x41, 0x76, 0x72, 0xee, 0x6c, 0x3b, 0x4d, 0x61, 0x69,
-0x3b, 0x4a, 0x75, 0x67, 0x6e, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x65,
-0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72,
-0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,
-0x4a, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a,
-0x64, 0x3b, 0x74, 0x65, 0x64, 0x3b, 0x61, 0x66, 0x254, 0x3b, 0x64, 0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69,
-0x61, 0x3b, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x6e, 0x79, 0x3b, 0x6b, 0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a,
-0x6d, 0x3b, 0x64, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78,
-0x65, 0x3b, 0x61, 0x66, 0x254, 0x66, 0x129, 0x65, 0x3b, 0x64, 0x61, 0x6d, 0x61, 0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73,
-0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e,
-0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b, 0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254,
-0x78, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x6d, 0x65, 0x3b, 0x64, 0x3b, 0x64, 0x3b, 0x74, 0x3b, 0x61, 0x3b, 0x64, 0x3b, 0x6d,
-0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x61, 0x3b, 0x6b, 0x3b, 0x61, 0x3b, 0x64, 0x3b, 0x49, 0x61, 0x6e, 0x2e, 0x3b, 0x50, 0x65,
-0x70, 0x2e, 0x3b, 0x4d, 0x61, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x70, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e,
-0x2e, 0x3b, 0x49, 0x75, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x75, 0x2e, 0x3b, 0x4b, 0x65, 0x70, 0x2e, 0x3b, 0x2bb, 0x4f, 0x6b,
-0x2e, 0x3b, 0x4e, 0x6f, 0x77, 0x2e, 0x3b, 0x4b, 0x65, 0x6b, 0x2e, 0x3b, 0x49, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b,
-0x50, 0x65, 0x70, 0x65, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x6b, 0x69, 0x3b, 0x2bb, 0x41, 0x70,
-0x65, 0x6c, 0x69, 0x6c, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x65, 0x3b, 0x49, 0x75, 0x6c, 0x61, 0x69,
-0x3b, 0x2bb, 0x41, 0x75, 0x6b, 0x61, 0x6b, 0x65, 0x3b, 0x4b, 0x65, 0x70, 0x61, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b,
-0x2bb, 0x4f, 0x6b, 0x61, 0x6b, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x6f, 0x77, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4b, 0x65,
-0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x45, 0x6e, 0x65, 0x3b, 0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41,
-0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53,
-0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f,
-0x3b, 0x50, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c,
-0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67,
-0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62,
-0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62,
-0x72, 0x65, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c,
-0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73,
-0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a,
-0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69,
-0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x63, 0x68, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b,
-0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65,
-0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xa2cd, 0xa1aa, 0x3b, 0xa44d, 0xa1aa, 0x3b, 0xa315, 0xa1aa, 0x3b, 0xa1d6, 0xa1aa, 0x3b, 0xa26c,
-0xa1aa, 0x3b, 0xa0d8, 0xa1aa, 0x3b, 0xa3c3, 0xa1aa, 0x3b, 0xa246, 0xa1aa, 0x3b, 0xa22c, 0xa1aa, 0x3b, 0xa2b0, 0xa1aa, 0x3b, 0xa2b0, 0xa2aa, 0xa1aa,
-0x3b, 0xa2b0, 0xa44b, 0xa1aa, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b,
-0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41,
-0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44,
-0x65, 0x7a, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x61, 0x72,
-0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69,
-0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x76, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
-0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e,
-0x6a, 0x75, 0x6b, 0x3b, 0x63, 0x75, 0x6f, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75,
-0x6f, 0x69, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b,
-0xe1, 0x62, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x3b, 0x6f, 0x111, 0x111, 0x61, 0x6a, 0x61, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e,
-0x75, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61,
-0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6d, 0x69, 0x65,
-0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75,
-0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x6d,
-0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x6f, 0x6c, 0x67,
-0x67, 0x6f, 0x74, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x6d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75,
-0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x4f, 0x3b, 0x47, 0x3b, 0x4e, 0x3b, 0x43,
-0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x10c, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x6f, 0x111, 0x111,
-0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x3b, 0x6d, 0x69, 0x65,
-0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b,
-0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x3b, 0x43, 0x61, 0x6e,
-0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e,
-0x3b, 0x43, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62,
-0x3b, 0x44, 0x69, 0x73, 0x3b, 0x43, 0x68, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x61,
-0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x69, 0x72, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x65, 0x69,
-0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b,
-0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x62,
-0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x43, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41,
-0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x49, 0x6d, 0x62,
-0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4b, 0x61, 0x72,
-0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x57, 0x75, 0x6e, 0x3b, 0x49, 0x6b, 0x65, 0x3b, 0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77,
-0x3b, 0x49, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6d, 0x62, 0x69, 0x72,
-0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72,
-0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,
-0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b,
-0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x72, 0x61,
-0x6e, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6d, 0x66, 0x75, 0x6e,
-0x67, 0x61, 0x64, 0x65, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x77, 0x75, 0x6e, 0x79, 0x61,
-0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x65, 0x6e, 0x64, 0x61,
-0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x6f, 0x72,
-0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6d, 0x77, 0x65,
-0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e,
-0x61, 0x20, 0x69, 0x77, 0x69, 0x3b, 0x49, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b,
-0x57, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x73, 0x69, 0x69, 0x3b, 0x63, 0x6f, 0x6c, 0x3b, 0x6d, 0x62,
-0x6f, 0x3b, 0x73, 0x65, 0x65, 0x3b, 0x64, 0x75, 0x75, 0x3b, 0x6b, 0x6f, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x3b, 0x6a, 0x75,
-0x6b, 0x3b, 0x73, 0x6c, 0x74, 0x3b, 0x79, 0x61, 0x72, 0x3b, 0x6a, 0x6f, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x3b, 0x73, 0x69,
-0x69, 0x6c, 0x6f, 0x3b, 0x63, 0x6f, 0x6c, 0x74, 0x65, 0x3b, 0x6d, 0x62, 0x6f, 0x6f, 0x79, 0x3b, 0x73, 0x65, 0x65, 0x257,
-0x74, 0x6f, 0x3b, 0x64, 0x75, 0x75, 0x6a, 0x61, 0x6c, 0x3b, 0x6b, 0x6f, 0x72, 0x73, 0x65, 0x3b, 0x6d, 0x6f, 0x72, 0x73,
-0x6f, 0x3b, 0x6a, 0x75, 0x6b, 0x6f, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x74, 0x6f, 0x3b, 0x79, 0x61, 0x72, 0x6b, 0x6f, 0x6d,
-0x61, 0x61, 0x3b, 0x6a, 0x6f, 0x6c, 0x61, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x74, 0x65, 0x3b, 0x73, 0x3b, 0x63, 0x3b, 0x6d,
-0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x73, 0x3b, 0x79, 0x3b, 0x6a, 0x3b, 0x62, 0x3b, 0x4a,
-0x45, 0x4e, 0x3b, 0x57, 0x4b, 0x52, 0x3b, 0x57, 0x47, 0x54, 0x3b, 0x57, 0x4b, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b, 0x57,
-0x54, 0x44, 0x3b, 0x57, 0x4d, 0x4a, 0x3b, 0x57, 0x4e, 0x4e, 0x3b, 0x57, 0x4b, 0x44, 0x3b, 0x57, 0x49, 0x4b, 0x3b, 0x57,
-0x4d, 0x57, 0x3b, 0x44, 0x49, 0x54, 0x3b, 0x4e, 0x6a, 0x65, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72,
-0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67,
-0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b,
-0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72,
-0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65,
-0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77,
-0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65,
-0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d,
-0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77,
-0x65, 0x3b, 0x4e, 0x64, 0x69, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x4b, 0x3b,
-0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x44, 0x3b, 0x4f, 0x62, 0x6f, 0x3b,
-0x57, 0x61, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4f, 0x6e, 0x67, 0x3b, 0x49, 0x6d, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b,
-0x53, 0x61, 0x70, 0x3b, 0x49, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x3b, 0x54, 0x6f, 0x6d, 0x3b, 0x54, 0x6f, 0x62, 0x3b,
-0x54, 0x6f, 0x77, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61,
-0x20, 0x6c, 0x65, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6b,
-0x75, 0x6e, 0x69, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6e, 0x67, 0x2019, 0x77, 0x61, 0x6e, 0x3b,
-0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6d, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,
-0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4c, 0x61,
-0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x73, 0x69, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20,
-0x73, 0x61, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x3b, 0x4c,
-0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70,
-0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4f, 0x3b, 0x57,
-0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54,
-0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69,
-0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75,
-0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x76,
-0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61,
-0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73,
-0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e,
-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x5a, 0x69, 0x62,
-0x3b, 0x4e, 0x68, 0x6c, 0x6f, 0x3b, 0x4d, 0x62, 0x69, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x77, 0x3b, 0x4e, 0x68,
-0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x3b, 0x4e, 0x63, 0x77, 0x3b, 0x4d, 0x70, 0x61, 0x6e, 0x3b, 0x4d, 0x66, 0x75, 0x3b,
-0x4c, 0x77, 0x65, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x3b, 0x5a, 0x69, 0x62, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x6c, 0x61, 0x3b,
-0x4e, 0x68, 0x6c, 0x6f, 0x6c, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x62, 0x69, 0x6d, 0x62, 0x69, 0x74, 0x68, 0x6f, 0x3b,
-0x4d, 0x61, 0x62, 0x61, 0x73, 0x61, 0x3b, 0x4e, 0x6b, 0x77, 0x65, 0x6e, 0x6b, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4e, 0x68,
-0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x6c, 0x69, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4e, 0x63,
-0x77, 0x61, 0x62, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6e, 0x64, 0x75, 0x6c, 0x61, 0x3b, 0x4d, 0x66,
-0x75, 0x6d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x61, 0x6b, 0x61, 0x7a, 0x69,
-0x3b, 0x5a, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d,
-0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x31, 0x3b, 0x4d, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4d, 0x34, 0x3b, 0x4d, 0x35, 0x3b,
-0x4d, 0x36, 0x3b, 0x4d, 0x37, 0x3b, 0x4d, 0x38, 0x3b, 0x4d, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b,
-0x4d, 0x31, 0x32, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b,
-0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69,
-0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,
-0x6b, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x61, 0x6e, 0x75, 0x3b,
-0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
-0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e,
-0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72,
-0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,
-0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
-0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4b, 0x3b,
-0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x49, 0x3b,
-0x49, 0x3b, 0x2d49, 0x2d4f, 0x2d4f, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x3b, 0x2d4e, 0x2d30, 0x2d55, 0x3b, 0x2d49, 0x2d31, 0x2d54, 0x3b, 0x2d4e, 0x2d30,
-0x2d62, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x3b, 0x2d3d, 0x2d5c,
-0x2d53, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x3b, 0x2d49, 0x2d4f, 0x2d4f, 0x2d30, 0x2d62, 0x2d54, 0x3b, 0x2d31, 0x2d55, 0x2d30,
-0x2d62, 0x2d55, 0x3b, 0x2d4e, 0x2d30, 0x2d55, 0x2d5a, 0x3b, 0x2d49, 0x2d31, 0x2d54, 0x2d49, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x2d62, 0x2d53, 0x3b,
-0x2d62, 0x2d53, 0x2d4f, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x2d62, 0x2d53, 0x2d63, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x2d5c, 0x3b, 0x2d5b, 0x2d53,
-0x2d5c, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x2d31, 0x2d54, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x2d30, 0x2d4f, 0x2d31, 0x2d49,
-0x2d54, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d49, 0x3b, 0x2d31, 0x3b, 0x2d4e, 0x3b, 0x2d49, 0x3b, 0x2d4e,
-0x3b, 0x2d62, 0x3b, 0x2d62, 0x3b, 0x2d56, 0x3b, 0x2d5b, 0x3b, 0x2d3d, 0x3b, 0x2d4f, 0x3b, 0x2d37, 0x3b, 0x69, 0x6e, 0x6e, 0x3b, 0x62,
-0x1e5b, 0x61, 0x3b, 0x6d, 0x61, 0x1e5b, 0x3b, 0x69, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79,
-0x75, 0x6c, 0x3b, 0x263, 0x75, 0x63, 0x3b, 0x63, 0x75, 0x74, 0x3b, 0x6b, 0x74, 0x75, 0x3b, 0x6e, 0x75, 0x77, 0x3b, 0x64,
-0x75, 0x6a, 0x3b, 0x69, 0x6e, 0x6e, 0x61, 0x79, 0x72, 0x3b, 0x62, 0x1e5b, 0x61, 0x79, 0x1e5b, 0x3b, 0x6d, 0x61, 0x1e5b, 0x1e63,
-0x3b, 0x69, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x79,
-0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x263, 0x75, 0x63, 0x74, 0x3b, 0x63, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b,
-0x6b, 0x74, 0x75, 0x62, 0x72, 0x3b, 0x6e, 0x75, 0x77, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x64, 0x75, 0x6a, 0x61, 0x6e,
-0x62, 0x69, 0x72, 0x3b, 0x69, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x69, 0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x263, 0x3b,
-0x63, 0x3b, 0x6b, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x3b,
-0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b,
-0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x57, 0x61, 0x6d, 0x3b, 0x44, 0x75, 0x6a, 0x3b, 0x59, 0x65, 0x6e, 0x6e,
-0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65, 0x73, 0x3b, 0x59, 0x65,
-0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c,
-0x79, 0x75, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54, 0x75, 0x62, 0x65,
-0x1e5b, 0x3b, 0x57, 0x61, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x44, 0x75, 0x1e7, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x59, 0x3b,
-0x46, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b,
-0x44, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61,
-0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75,
-0x62, 0x3b, 0x4e, 0x75, 0x6e, 0x3b, 0x44, 0x75, 0x1e7, 0x3b, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46,
-0x75, 0x1e5b, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65, 0x73, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d,
-0x61, 0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194, 0x75, 0x63,
-0x74, 0x3b, 0x43, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54, 0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x4e, 0x75, 0x6e, 0x65,
-0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x44, 0x75, 0x1e7, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x194, 0x3b,
-0x42, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4c, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x52, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x4b, 0x42,
-0x5a, 0x3b, 0x4b, 0x42, 0x52, 0x3b, 0x4b, 0x53, 0x54, 0x3b, 0x4b, 0x4b, 0x4e, 0x3b, 0x4b, 0x54, 0x4e, 0x3b, 0x4b, 0x4d,
-0x4b, 0x3b, 0x4b, 0x4d, 0x53, 0x3b, 0x4b, 0x4d, 0x4e, 0x3b, 0x4b, 0x4d, 0x57, 0x3b, 0x4b, 0x4b, 0x4d, 0x3b, 0x4b, 0x4e,
-0x4b, 0x3b, 0x4b, 0x4e, 0x42, 0x3b, 0x4f, 0x6b, 0x77, 0x6f, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4f, 0x6b,
-0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x73, 0x68, 0x61, 0x74, 0x75,
-0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x74, 0x61, 0x61, 0x6e,
-0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75,
-0x73, 0x68, 0x61, 0x6e, 0x6a, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6e, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4f,
-0x6b, 0x77, 0x61, 0x6d, 0x77, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b,
-0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x77, 0x65, 0x3b, 0x4f,
-0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x48, 0x75,
-0x74, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x44, 0x61, 0x74, 0x3b, 0x54, 0x61, 0x69, 0x3b, 0x48, 0x61, 0x6e, 0x3b, 0x53, 0x69,
-0x74, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b, 0x4b, 0x6d,
-0x6a, 0x3b, 0x4b, 0x6d, 0x62, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20,
-0x68, 0x75, 0x74, 0x61, 0x6c, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61,
-0x20, 0x77, 0x75, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77,
-0x61, 0x20, 0x77, 0x75, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67,
-0x77, 0x61, 0x20, 0x77, 0x75, 0x74, 0x61, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67,
-0x77, 0x61, 0x20, 0x77, 0x75, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20,
-0x67, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67,
-0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77,
-0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61,
-0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20,
-0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b,
-0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a,
-0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b,
-0x48, 0x3b, 0x56, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b,
-0x4b, 0x3b, 0x4b, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69,
-0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x79, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,
-0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x53,
-0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d,
-0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d,
-0x61, 0x72, 0x3b, 0x61, 0x77, 0x69, 0x3b, 0x6d, 0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x3b, 0x7a, 0x75, 0x6c, 0x3b, 0x75, 0x74,
-0x69, 0x3b, 0x73, 0x25b, 0x74, 0x3b, 0x254, 0x6b, 0x75, 0x3b, 0x6e, 0x6f, 0x77, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x7a, 0x61,
-0x6e, 0x77, 0x75, 0x79, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x75, 0x72, 0x75, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x69, 0x73,
-0x69, 0x3b, 0x61, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d, 0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x25b, 0x6e, 0x3b, 0x7a,
-0x75, 0x6c, 0x75, 0x79, 0x65, 0x3b, 0x75, 0x74, 0x69, 0x3b, 0x73, 0x25b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b,
-0x254, 0x6b, 0x75, 0x74, 0x254, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x6e, 0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b,
-0x64, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,
-0x5a, 0x3b, 0x5a, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x186, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x61,
-0x69, 0x3b, 0x4b, 0x61, 0x74, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x47, 0x61, 0x74, 0x3b, 0x47, 0x61, 0x6e, 0x3b, 0x4d, 0x75,
-0x67, 0x3b, 0x4b, 0x6e, 0x6e, 0x3b, 0x4b, 0x65, 0x6e, 0x3b, 0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x67,
-0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x77, 0x65,
-0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x129, 0x72, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,
-0x20, 0x6b, 0x61, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61,
-0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d,
-0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77,
-0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72,
-0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,
-0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d,
-0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20,
-0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20,
-0x6e, 0x61, 0x20, 0x4b, 0x61, 0x129, 0x72, 0x129, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47,
-0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x13a4, 0x13c3, 0x3b, 0x13a7, 0x13a6, 0x3b, 0x13a0,
-0x13c5, 0x3b, 0x13a7, 0x13ec, 0x3b, 0x13a0, 0x13c2, 0x3b, 0x13d5, 0x13ad, 0x3b, 0x13ab, 0x13f0, 0x3b, 0x13a6, 0x13b6, 0x3b, 0x13da, 0x13b5, 0x3b,
-0x13da, 0x13c2, 0x3b, 0x13c5, 0x13d3, 0x3b, 0x13a5, 0x13cd, 0x3b, 0x13a4, 0x13c3, 0x13b8, 0x13d4, 0x13c5, 0x3b, 0x13a7, 0x13a6, 0x13b5, 0x3b, 0x13a0,
-0x13c5, 0x13f1, 0x3b, 0x13a7, 0x13ec, 0x13c2, 0x3b, 0x13a0, 0x13c2, 0x13cd, 0x13ac, 0x13d8, 0x3b, 0x13d5, 0x13ad, 0x13b7, 0x13f1, 0x3b, 0x13ab, 0x13f0,
-0x13c9, 0x13c2, 0x3b, 0x13a6, 0x13b6, 0x13c2, 0x3b, 0x13da, 0x13b5, 0x13cd, 0x13d7, 0x3b, 0x13da, 0x13c2, 0x13c5, 0x13d7, 0x3b, 0x13c5, 0x13d3, 0x13d5,
-0x13c6, 0x3b, 0x13a5, 0x13cd, 0x13a9, 0x13f1, 0x3b, 0x13a4, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13d5, 0x3b, 0x13ab,
-0x3b, 0x13a6, 0x3b, 0x13da, 0x3b, 0x13da, 0x3b, 0x13c5, 0x3b, 0x13a5, 0x3b, 0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d,
-0x61, 0x72, 0x3b, 0x61, 0x76, 0x72, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69, 0x6e, 0x3b, 0x7a, 0x69, 0x6c, 0x3b, 0x6f, 0x75,
-0x74, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x7a, 0x61,
-0x6e, 0x76, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x69, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76,
-0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69, 0x6e, 0x3b, 0x7a, 0x69, 0x6c, 0x79, 0x65, 0x3b, 0x6f, 0x75, 0x74,
-0x3b, 0x73, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76, 0x61, 0x6d, 0x3b,
-0x64, 0x65, 0x73, 0x61, 0x6d, 0x3b, 0x7a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b, 0x7a, 0x3b,
-0x6f, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x4e, 0x74, 0x61, 0x6e,
-0x64, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65,
-0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x54, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20,
-0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79,
-0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20,
-0x6e, 0x61, 0x20, 0x55, 0x6d, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61,
-0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x69, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77,
-0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d,
-0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x63,
-0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e,
-0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61,
-0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61,
-0x20, 0x55, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e,
-0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x3b, 0x46, 0xfa, 0x6e, 0x67, 0x61, 0x74,
-0x268, 0x3b, 0x4e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x65, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x49, 0x6b, 0xfa, 0x6d, 0x69,
-0x3b, 0x49, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0x61, 0x6c, 0x61, 0x3b, 0x49, 0x64, 0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4d,
-0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x56, 0x268, 0x268, 0x72, 0x268, 0x3b, 0x53, 0x61, 0x61, 0x74, 0x289, 0x3b, 0x49,
-0x6e, 0x79, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x53, 0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x289, 0x66,
-0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4b, 0x289, 0x6e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x289, 0x6b, 0x65, 0x65,
-0x6e, 0x64, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x61,
-0x6d, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x64, 0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4b, 0x289, 0x6d,
-0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x4b, 0x289, 0x76, 0x268, 0x268, 0x72, 0x268, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61,
-0x74, 0x289, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x69, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4b,
-0x289, 0x73, 0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x46, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b,
-0x4d, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,
-0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x75, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b,
-0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x69, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b,
-0x4a, 0x61, 0x6e, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b,
-0x4d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x41, 0x70, 0x75, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x61, 0x79, 0x69, 0x3b, 0x4a,
-0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x69, 0x74, 0x6f,
-0x3b, 0x53, 0x65, 0x62, 0x75, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x62, 0x61,
-0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e,
-0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e,
-0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76,
-0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,
-0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,
-0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74,
-0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b,
-0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b,
-0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,
-0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b,
-0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x75, 0x76, 0x3b, 0x44, 0x69, 0x7a, 0x3b,
-0x4a, 0x61, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x75,
-0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x75, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x75, 0x3b, 0x4a, 0x75,
-0x6c, 0x68, 0x75, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b,
-0x4f, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x75, 0x76, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x7a, 0x65,
-0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x41, 0x4e, 0x3b, 0x46, 0x45, 0x42, 0x3b, 0x4d, 0x41, 0x43, 0x3b, 0x128, 0x50, 0x55,
-0x3b, 0x4d, 0x128, 0x128, 0x3b, 0x4e, 0x4a, 0x55, 0x3b, 0x4e, 0x4a, 0x52, 0x3b, 0x41, 0x47, 0x41, 0x3b, 0x53, 0x50, 0x54,
-0x3b, 0x4f, 0x4b, 0x54, 0x3b, 0x4e, 0x4f, 0x56, 0x3b, 0x44, 0x45, 0x43, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x129,
-0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x128, 0x70, 0x75,
-0x72, 0x169, 0x3b, 0x4d, 0x129, 0x129, 0x3b, 0x4e, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x72, 0x61, 0x129, 0x3b,
-0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x169,
-0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a,
-0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x128, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e,
-0x3b, 0x44, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x61, 0x74, 0x3b, 0x54, 0x61, 0x61, 0x3b, 0x49, 0x77, 0x6f, 0x3b,
-0x4d, 0x61, 0x6d, 0x3b, 0x50, 0x61, 0x61, 0x3b, 0x4e, 0x67, 0x65, 0x3b, 0x52, 0x6f, 0x6f, 0x3b, 0x42, 0x75, 0x72, 0x3b,
-0x45, 0x70, 0x65, 0x3b, 0x4b, 0x70, 0x74, 0x3b, 0x4b, 0x70, 0x61, 0x3b, 0x4d, 0x75, 0x6c, 0x67, 0x75, 0x6c, 0x3b, 0x4e,
-0x67, 0x2019, 0x61, 0x74, 0x79, 0x61, 0x61, 0x74, 0x6f, 0x3b, 0x4b, 0x69, 0x70, 0x74, 0x61, 0x61, 0x6d, 0x6f, 0x3b, 0x49,
-0x77, 0x6f, 0x6f, 0x74, 0x6b, 0x75, 0x75, 0x74, 0x3b, 0x4d, 0x61, 0x6d, 0x75, 0x75, 0x74, 0x3b, 0x50, 0x61, 0x61, 0x67,
-0x69, 0x3b, 0x4e, 0x67, 0x2019, 0x65, 0x69, 0x79, 0x65, 0x65, 0x74, 0x3b, 0x52, 0x6f, 0x6f, 0x70, 0x74, 0x75, 0x69, 0x3b,
-0x42, 0x75, 0x72, 0x65, 0x65, 0x74, 0x3b, 0x45, 0x70, 0x65, 0x65, 0x73, 0x6f, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x75,
-0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x20, 0x74, 0x61, 0x61, 0x69, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x75, 0x6e, 0x64,
-0x65, 0x20, 0x6e, 0x65, 0x62, 0x6f, 0x20, 0x61, 0x65, 0x6e, 0x67, 0x2019, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49,
-0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x1c3, 0x4b, 0x68,
-0x61, 0x6e, 0x6e, 0x69, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e, 0x1c0, 0x67, 0xf4, 0x61, 0x62, 0x3b, 0x1c0, 0x4b, 0x68, 0x75,
-0x75, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c3, 0x48, 0xf4, 0x61, 0x1c2, 0x6b, 0x68, 0x61, 0x69, 0x62, 0x3b, 0x1c3, 0x4b,
-0x68, 0x61, 0x69, 0x74, 0x73, 0xe2, 0x62, 0x3b, 0x47, 0x61, 0x6d, 0x61, 0x1c0, 0x61, 0x65, 0x62, 0x3b, 0x1c2, 0x4b, 0x68,
-0x6f, 0x65, 0x73, 0x61, 0x6f, 0x62, 0x3b, 0x41, 0x6f, 0x1c1, 0x6b, 0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2,
-0x62, 0x3b, 0x54, 0x61, 0x72, 0x61, 0x1c0, 0x6b, 0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c2,
-0x4e, 0xfb, 0x1c1, 0x6e, 0xe2, 0x69, 0x73, 0x65, 0x62, 0x3b, 0x1c0, 0x48, 0x6f, 0x6f, 0x1c2, 0x67, 0x61, 0x65, 0x62, 0x3b,
-0x48, 0xf4, 0x61, 0x73, 0x6f, 0x72, 0x65, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0xe4,
-0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x7a, 0x2e, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e,
-0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x4f, 0x75, 0x6a, 0x2e, 0x3b, 0x53, 0xe4, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74,
-0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x65, 0x77, 0x61, 0x3b,
-0x46, 0xe4, 0x62, 0x72, 0x6f, 0x77, 0x61, 0x3b, 0x4d, 0xe4, 0xe4, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x6c, 0x3b,
-0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x4f, 0x75, 0x6a, 0x6f,
-0xdf, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x68, 0x62, 0x65, 0x72,
-0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a,
-0x61, 0x6e, 0x3b, 0x46, 0xe4, 0x62, 0x3b, 0x4d, 0xe4, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a,
-0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x75, 0x6a, 0x3b, 0x53, 0xe4, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
-0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x44, 0x61, 0x6c, 0x3b, 0x41, 0x72, 0xe1, 0x3b, 0x186, 0x25b, 0x6e, 0x3b, 0x44,
-0x6f, 0x79, 0x3b, 0x4c, 0xe9, 0x70, 0x3b, 0x52, 0x6f, 0x6b, 0x3b, 0x53, 0xe1, 0x73, 0x3b, 0x42, 0x254, 0x301, 0x72, 0x3b,
-0x4b, 0xfa, 0x73, 0x3b, 0x47, 0xed, 0x73, 0x3b, 0x53, 0x68, 0x289, 0x301, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x3b, 0x4f, 0x6c,
-0x61, 0x64, 0x61, 0x6c, 0x289, 0x301, 0x3b, 0x41, 0x72, 0xe1, 0x74, 0x3b, 0x186, 0x25b, 0x6e, 0x268, 0x301, 0x254, 0x268, 0x14b,
-0x254, 0x6b, 0x3b, 0x4f, 0x6c, 0x6f, 0x64, 0x6f, 0x79, 0xed, 0xf3, 0x72, 0xed, 0xea, 0x20, 0x69, 0x6e, 0x6b, 0xf3, 0x6b,
-0xfa, 0xe2, 0x3b, 0x4f, 0x6c, 0x6f, 0x69, 0x6c, 0xe9, 0x70, 0x16b, 0x6e, 0x79, 0x12b, 0x113, 0x20, 0x69, 0x6e, 0x6b, 0xf3,
-0x6b, 0xfa, 0xe2, 0x3b, 0x4b, 0xfa, 0x6a, 0xfa, 0x254, 0x72, 0x254, 0x6b, 0x3b, 0x4d, 0xf3, 0x72, 0x75, 0x73, 0xe1, 0x73,
-0x69, 0x6e, 0x3b, 0x186, 0x6c, 0x254, 0x301, 0x268, 0x301, 0x62, 0x254, 0x301, 0x72, 0xe1, 0x72, 0x25b, 0x3b, 0x4b, 0xfa, 0x73,
-0x68, 0xee, 0x6e, 0x3b, 0x4f, 0x6c, 0x67, 0xed, 0x73, 0x61, 0x6e, 0x3b, 0x50, 0x289, 0x73, 0x68, 0x289, 0x301, 0x6b, 0x61,
-0x3b, 0x4e, 0x74, 0x289, 0x301, 0x14b, 0x289, 0x301, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61,
-0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67,
-0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61,
-0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,
-0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f,
-0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4d, 0x75, 0x6b, 0x3b, 0x4b, 0x77, 0x61, 0x3b, 0x44, 0x75,
-0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x6f, 0x64, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x50, 0x65, 0x64, 0x3b, 0x53, 0x6f,
-0x6b, 0x3b, 0x54, 0x69, 0x62, 0x3b, 0x4c, 0x61, 0x62, 0x3b, 0x50, 0x6f, 0x6f, 0x3b, 0x4f, 0x72, 0x61, 0x72, 0x61, 0x3b,
-0x4f, 0x6d, 0x75, 0x6b, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x67, 0x2019, 0x3b, 0x4f, 0x64, 0x75, 0x6e, 0x67, 0x2019, 0x65,
-0x6c, 0x3b, 0x4f, 0x6d, 0x61, 0x72, 0x75, 0x6b, 0x3b, 0x4f, 0x6d, 0x6f, 0x64, 0x6f, 0x6b, 0x2019, 0x6b, 0x69, 0x6e, 0x67,
-0x2019, 0x6f, 0x6c, 0x3b, 0x4f, 0x6a, 0x6f, 0x6c, 0x61, 0x3b, 0x4f, 0x70, 0x65, 0x64, 0x65, 0x6c, 0x3b, 0x4f, 0x73, 0x6f,
-0x6b, 0x6f, 0x73, 0x6f, 0x6b, 0x6f, 0x6d, 0x61, 0x3b, 0x4f, 0x74, 0x69, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6c, 0x61, 0x62,
-0x6f, 0x72, 0x3b, 0x4f, 0x70, 0x6f, 0x6f, 0x3b, 0x52, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b,
-0x4a, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x50, 0x3b, 0x17d, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x65, 0x3b,
-0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x69, 0x3b, 0x4d, 0x65, 0x3b, 0x17d, 0x75, 0x77, 0x3b, 0x17d, 0x75, 0x79, 0x3b, 0x55,
-0x74, 0x3b, 0x53, 0x65, 0x6b, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x6f, 0x3b, 0x44, 0x65, 0x65, 0x3b, 0x17d, 0x61,
-0x6e, 0x77, 0x69, 0x79, 0x65, 0x3b, 0x46, 0x65, 0x65, 0x77, 0x69, 0x72, 0x69, 0x79, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73,
-0x69, 0x3b, 0x41, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x3b, 0x17d, 0x75, 0x77, 0x65, 0x14b, 0x3b, 0x17d, 0x75,
-0x79, 0x79, 0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x4f, 0x6b, 0x74,
-0x6f, 0x6f, 0x62, 0x75, 0x72, 0x3b, 0x4e, 0x6f, 0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x44, 0x65, 0x65, 0x73,
-0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x17d, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x17d, 0x3b, 0x17d, 0x3b,
-0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44, 0x41, 0x43, 0x3b, 0x44, 0x41, 0x52, 0x3b, 0x44, 0x41,
-0x44, 0x3b, 0x44, 0x41, 0x4e, 0x3b, 0x44, 0x41, 0x48, 0x3b, 0x44, 0x41, 0x55, 0x3b, 0x44, 0x41, 0x4f, 0x3b, 0x44, 0x41,
-0x42, 0x3b, 0x44, 0x4f, 0x43, 0x3b, 0x44, 0x41, 0x50, 0x3b, 0x44, 0x47, 0x49, 0x3b, 0x44, 0x41, 0x47, 0x3b, 0x44, 0x77,
-0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72,
-0x20, 0x41, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x64, 0x65, 0x6b, 0x3b,
-0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x6e, 0x67, 0x2019, 0x77, 0x65, 0x6e, 0x3b, 0x44, 0x77, 0x65, 0x20,
-0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x63, 0x68, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x75,
-0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x72, 0x69, 0x79,
-0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x6f, 0x72, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20,
-0x6d, 0x61, 0x72, 0x20, 0x4f, 0x63, 0x68, 0x69, 0x6b, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41,
-0x70, 0x61, 0x72, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61, 0x63, 0x68, 0x69, 0x65,
-0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61, 0x72,
-0x69, 0x79, 0x6f, 0x3b, 0x43, 0x3b, 0x52, 0x3b, 0x44, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x55, 0x3b, 0x42, 0x3b, 0x42, 0x3b,
-0x43, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b,
-0x49, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b,
-0x43, 0x75, 0x74, 0x3b, 0x4b, 0x1e6d, 0x75, 0x3b, 0x4e, 0x77, 0x61, 0x3b, 0x44, 0x75, 0x6a, 0x3b, 0x59, 0x65, 0x6e, 0x6e,
-0x61, 0x79, 0x65, 0x72, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x49,
-0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c,
-0x79, 0x75, 0x7a, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x4b, 0x1e6d,
-0x75, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x77, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x44, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69,
-0x72, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194, 0x3b, 0x43, 0x3b,
-0x4b, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x6c, 0x75, 0x61,
-0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x6c, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b,
-0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65,
-0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b,
-0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x938, 0x3b, 0x90f, 0x92b, 0x94d, 0x930,
-0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x907, 0x3b, 0x906, 0x917, 0x938, 0x94d,
-0x925, 0x3b, 0x938, 0x947, 0x92c, 0x925, 0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x905, 0x916, 0x925, 0x92c, 0x930, 0x3b, 0x928,
-0x92c, 0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x91c, 0x3b,
-0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x3b, 0x91c, 0x941, 0x3b, 0x906, 0x3b, 0x938,
-0x947, 0x3b, 0x905, 0x3b, 0x928, 0x3b, 0x926, 0x93f, 0x3b, 0x456, 0x486, 0x430, 0x2de9, 0x487, 0x3b, 0x444, 0x435, 0x2de1, 0x487, 0x3b,
-0x43c, 0x430, 0x2dec, 0x487, 0x3b, 0x430, 0x486, 0x43f, 0x2dec, 0x487, 0x3b, 0x43c, 0x430, 0xa675, 0x3b, 0x456, 0x486, 0xa64b, 0x2de9, 0x487,
-0x3b, 0x456, 0x486, 0xa64b, 0x2de7, 0x487, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x2de2, 0x487, 0x3b, 0x441, 0x435, 0x2deb, 0x487, 0x3b, 0x47b,
-0x486, 0x43a, 0x2dee, 0x3b, 0x43d, 0x43e, 0x435, 0x2de8, 0x3b, 0x434, 0x435, 0x2de6, 0x487, 0x3b, 0x456, 0x486, 0x430, 0x43d, 0x43d, 0xa64b,
-0x430, 0x301, 0x440, 0x457, 0x439, 0x3b, 0x444, 0x435, 0x432, 0x440, 0xa64b, 0x430, 0x301, 0x440, 0x457, 0x439, 0x3b, 0x43c, 0x430, 0x301,
-0x440, 0x442, 0x44a, 0x3b, 0x430, 0x486, 0x43f, 0x440, 0x456, 0x301, 0x43b, 0x43b, 0x457, 0x439, 0x3b, 0x43c, 0x430, 0x301, 0x457, 0x439,
-0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43d, 0x457, 0x439, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43b, 0x457, 0x439, 0x3b, 0x430, 0x486, 0x301,
-0x475, 0x433, 0xa64b, 0x441, 0x442, 0x44a, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x47b,
-0x486, 0x43a, 0x442, 0x461, 0x301, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x43d, 0x43e, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b,
-0x434, 0x435, 0x43a, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x406, 0x486, 0x3b, 0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x486,
-0x3b, 0x41c, 0x3b, 0x406, 0x486, 0x3b, 0x406, 0x486, 0x3b, 0x410, 0x486, 0x3b, 0x421, 0x3b, 0x47a, 0x486, 0x3b, 0x41d, 0x3b, 0x414,
-0x3b, 0x456, 0x486, 0x430, 0x43d, 0x43d, 0xa64b, 0x430, 0x301, 0x440, 0x457, 0x430, 0x3b, 0x444, 0x435, 0x432, 0x440, 0xa64b, 0x430, 0x301,
-0x440, 0x457, 0x430, 0x3b, 0x43c, 0x430, 0x301, 0x440, 0x442, 0x430, 0x3b, 0x430, 0x486, 0x43f, 0x440, 0x456, 0x301, 0x43b, 0x43b, 0x457,
-0x430, 0x3b, 0x43c, 0x430, 0x301, 0x457, 0x430, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43d, 0x457, 0x430, 0x3b, 0x456, 0x486, 0xa64b, 0x301,
-0x43b, 0x457, 0x430, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x433, 0xa64b, 0x441, 0x442, 0x430, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x301,
-0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x47b, 0x486, 0x43a, 0x442, 0x461, 0x301, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x43d, 0x43e, 0x435,
-0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x43, 0x69,
-0x6f, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x4c, 0x75, 0x73, 0x3b, 0x4d, 0x75, 0x75, 0x3b, 0x4c, 0x75, 0x6d, 0x3b, 0x4c, 0x75,
-0x66, 0x3b, 0x4b, 0x61, 0x62, 0x3b, 0x4c, 0x75, 0x73, 0x68, 0x3b, 0x4c, 0x75, 0x74, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4b,
-0x61, 0x73, 0x3b, 0x43, 0x69, 0x73, 0x3b, 0x43, 0x69, 0x6f, 0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0xf9, 0x69, 0x73, 0x68, 0x69,
-0x3b, 0x4c, 0x75, 0x73, 0xf2, 0x6c, 0x6f, 0x3b, 0x4d, 0xf9, 0x75, 0x79, 0xe0, 0x3b, 0x4c, 0x75, 0x6d, 0xf9, 0x6e, 0x67,
-0xf9, 0x6c, 0xf9, 0x3b, 0x4c, 0x75, 0x66, 0x75, 0x69, 0x6d, 0x69, 0x3b, 0x4b, 0x61, 0x62, 0xe0, 0x6c, 0xe0, 0x73, 0x68,
-0xec, 0x70, 0xf9, 0x3b, 0x4c, 0xf9, 0x73, 0x68, 0xec, 0x6b, 0xe0, 0x3b, 0x4c, 0x75, 0x74, 0x6f, 0x6e, 0x67, 0x6f, 0x6c,
-0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x67, 0xf9, 0x64, 0x69, 0x3b, 0x4b, 0x61, 0x73, 0x77, 0xe8, 0x6b, 0xe8, 0x73, 0xe8, 0x3b,
-0x43, 0x69, 0x73, 0x77, 0xe0, 0x3b, 0x43, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b,
-0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4,
-0x65, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75,
-0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61,
-0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x65, 0x72, 0x7a, 0x3b, 0x41,
-0x62, 0x72, 0xeb, 0x6c, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b,
-0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74,
-0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x65, 0x2e, 0x3b, 0x41, 0x62,
-0x72, 0x2e, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67,
-0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a,
-0x2e, 0x3b, 0x6e, 0xf9, 0x6d, 0x3b, 0x6b, 0x268, 0x7a, 0x3b, 0x74, 0x268, 0x64, 0x3b, 0x74, 0x61, 0x61, 0x3b, 0x73, 0x65,
-0x65, 0x3b, 0x6e, 0x7a, 0x75, 0x3b, 0x64, 0x75, 0x6d, 0x3b, 0x66, 0x254, 0x65, 0x3b, 0x64, 0x7a, 0x75, 0x3b, 0x6c, 0x254,
-0x6d, 0x3b, 0x6b, 0x61, 0x61, 0x3b, 0x66, 0x77, 0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6e, 0xf9,
-0x6d, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6b, 0x197, 0x300, 0x7a, 0xf9, 0x294, 0x3b, 0x6e, 0x64, 0x7a,
-0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x197, 0x300, 0x64, 0x289, 0x300, 0x67, 0x68, 0xe0, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300,
-0x14b, 0x254, 0x300, 0x74, 0x1ce, 0x61, 0x66, 0x289, 0x304, 0x67, 0x68, 0x101, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0xe8,
-0x73, 0xe8, 0x65, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6e, 0x7a, 0xf9, 0x67, 0x68, 0xf2, 0x3b, 0x6e,
-0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x64, 0xf9, 0x6d, 0x6c, 0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254,
-0x300, 0x6b, 0x77, 0xee, 0x66, 0x254, 0x300, 0x65, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x197, 0x300,
-0x66, 0x289, 0x300, 0x67, 0x68, 0xe0, 0x64, 0x7a, 0x75, 0x67, 0x68, 0xf9, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254,
-0x300, 0x67, 0x68, 0x1d4, 0x75, 0x77, 0x65, 0x6c, 0x254, 0x300, 0x6d, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300,
-0x63, 0x68, 0x77, 0x61, 0x294, 0xe0, 0x6b, 0x61, 0x61, 0x20, 0x77, 0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0xe8,
-0x66, 0x77, 0xf2, 0x6f, 0x3b, 0x6e, 0x3b, 0x6b, 0x3b, 0x74, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x6b, 0x3b, 0x66,
-0x3b, 0x64, 0x3b, 0x6c, 0x3b, 0x63, 0x3b, 0x66, 0x3b, 0x6b, 0x254, 0x6e, 0x3b, 0x6d, 0x61, 0x63, 0x3b, 0x6d, 0x61, 0x74,
-0x3b, 0x6d, 0x74, 0x6f, 0x3b, 0x6d, 0x70, 0x75, 0x3b, 0x68, 0x69, 0x6c, 0x3b, 0x6e, 0x6a, 0x65, 0x3b, 0x68, 0x69, 0x6b,
-0x3b, 0x64, 0x69, 0x70, 0x3b, 0x62, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x6c, 0x69, 0x253, 0x3b, 0x4b, 0x254, 0x6e,
-0x64, 0x254, 0x14b, 0x3b, 0x4d, 0xe0, 0x63, 0x25b, 0x302, 0x6c, 0x3b, 0x4d, 0xe0, 0x74, 0xf9, 0x6d, 0x62, 0x3b, 0x4d, 0xe0,
-0x74, 0x6f, 0x70, 0x3b, 0x4d, 0x300, 0x70, 0x75, 0x79, 0x25b, 0x3b, 0x48, 0xec, 0x6c, 0xf2, 0x6e, 0x64, 0x25b, 0x300, 0x3b,
-0x4e, 0x6a, 0xe8, 0x62, 0xe0, 0x3b, 0x48, 0xec, 0x6b, 0x61, 0x14b, 0x3b, 0x44, 0xec, 0x70, 0x254, 0x300, 0x73, 0x3b, 0x42,
-0xec, 0xf2, 0xf4, 0x6d, 0x3b, 0x4d, 0xe0, 0x79, 0x25b, 0x73, 0xe8, 0x70, 0x3b, 0x4c, 0xec, 0x62, 0x75, 0x79, 0x20, 0x6c,
-0x69, 0x20, 0x144, 0x79, 0xe8, 0x65, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x68, 0x3b, 0x6e,
-0x3b, 0x68, 0x3b, 0x64, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x6c, 0x3b, 0x64, 0x69, 0x3b, 0x14b, 0x67, 0x254, 0x6e, 0x3b, 0x73,
-0x254, 0x14b, 0x3b, 0x64, 0x69, 0x253, 0x3b, 0x65, 0x6d, 0x69, 0x3b, 0x65, 0x73, 0x254, 0x3b, 0x6d, 0x61, 0x64, 0x3b, 0x64,
-0x69, 0x14b, 0x3b, 0x6e, 0x79, 0x25b, 0x74, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x74, 0x69, 0x6e, 0x3b, 0x65, 0x6c, 0xe1, 0x3b,
-0x64, 0x69, 0x6d, 0x254, 0x301, 0x64, 0x69, 0x3b, 0x14b, 0x67, 0x254, 0x6e, 0x64, 0x25b, 0x3b, 0x73, 0x254, 0x14b, 0x25b, 0x3b,
-0x64, 0x69, 0x253, 0xe1, 0x253, 0xe1, 0x3b, 0x65, 0x6d, 0x69, 0x61, 0x73, 0x65, 0x6c, 0x65, 0x3b, 0x65, 0x73, 0x254, 0x70,
-0x25b, 0x73, 0x254, 0x70, 0x25b, 0x3b, 0x6d, 0x61, 0x64, 0x69, 0x253, 0x25b, 0x301, 0x64, 0xed, 0x253, 0x25b, 0x301, 0x3b, 0x64,
-0x69, 0x14b, 0x67, 0x69, 0x6e, 0x64, 0x69, 0x3b, 0x6e, 0x79, 0x25b, 0x74, 0x25b, 0x6b, 0x69, 0x3b, 0x6d, 0x61, 0x79, 0xe9,
-0x73, 0x25b, 0x301, 0x3b, 0x74, 0x69, 0x6e, 0xed, 0x6e, 0xed, 0x3b, 0x65, 0x6c, 0xe1, 0x14b, 0x67, 0x25b, 0x301, 0x3b, 0x64,
-0x3b, 0x14b, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x65, 0x3b, 0x65, 0x3b, 0x6d, 0x3b, 0x64, 0x3b, 0x6e, 0x3b, 0x6d, 0x3b, 0x74,
-0x3b, 0x65, 0x3b, 0x53, 0x61, 0x3b, 0x46, 0x65, 0x3b, 0x4d, 0x61, 0x3b, 0x41, 0x62, 0x3b, 0x4d, 0x65, 0x3b, 0x53, 0x75,
-0x3b, 0x53, 0xfa, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x3b, 0x4f, 0x6b, 0x3b, 0x4e, 0x6f, 0x3b, 0x44, 0x65, 0x3b, 0x53,
-0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x46, 0xe9, 0x62, 0x69, 0x72, 0x69, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x41,
-0x62, 0x75, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x65, 0x14b, 0x3b, 0x53, 0xfa, 0x75, 0x79, 0x65,
-0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,
-0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x72,
-0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f,
-0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6e, 0x67, 0x6f, 0x3b, 0x6e, 0x67, 0x62, 0x3b, 0x6e, 0x67, 0x6c, 0x3b, 0x6e, 0x67, 0x6e,
-0x3b, 0x6e, 0x67, 0x74, 0x3b, 0x6e, 0x67, 0x73, 0x3b, 0x6e, 0x67, 0x7a, 0x3b, 0x6e, 0x67, 0x6d, 0x3b, 0x6e, 0x67, 0x65,
-0x3b, 0x6e, 0x67, 0x61, 0x3b, 0x6e, 0x67, 0x61, 0x64, 0x3b, 0x6e, 0x67, 0x61, 0x62, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20,
-0x6f, 0x73, 0xfa, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x62, 0x25b, 0x30c, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6c, 0xe1,
-0x6c, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6e, 0x79, 0x69, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x74,
-0xe1, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x73, 0x61, 0x6d, 0x259, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e,
-0x20, 0x7a, 0x61, 0x6d, 0x67, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6d, 0x77, 0x6f, 0x6d, 0x3b,
-0x6e, 0x67, 0x254, 0x6e, 0x20, 0x65, 0x62, 0x75, 0x6c, 0xfa, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d,
-0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x20, 0x61, 0x69, 0x20, 0x64, 0x7a, 0x69, 0xe1, 0x3b, 0x6e,
-0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x20, 0x61, 0x69, 0x20, 0x62, 0x25b, 0x30c, 0x3b, 0x6f, 0x3b, 0x62, 0x3b,
-0x6c, 0x3b, 0x6e, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x6d, 0x3b, 0x65, 0x3b, 0x61, 0x3b, 0x64, 0x3b, 0x62, 0x3b,
-0x14b, 0x31, 0x3b, 0x14b, 0x32, 0x3b, 0x14b, 0x33, 0x3b, 0x14b, 0x34, 0x3b, 0x14b, 0x35, 0x3b, 0x14b, 0x36, 0x3b, 0x14b, 0x37,
-0x3b, 0x14b, 0x38, 0x3b, 0x14b, 0x39, 0x3b, 0x14b, 0x31, 0x30, 0x3b, 0x14b, 0x31, 0x31, 0x3b, 0x14b, 0x31, 0x32, 0x3b, 0x14b,
-0x77, 0xed, 0xed, 0x20, 0x61, 0x20, 0x6e, 0x74, 0x254, 0x301, 0x6e, 0x74, 0x254, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61,
-0x6b, 0x1dd, 0x20, 0x62, 0x25b, 0x301, 0x25b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x72, 0xe1, 0xe1,
-0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x69, 0x6e, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61,
-0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x6e, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61,
-0x66, 0x254, 0x6b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x62, 0x25b, 0x25b, 0x3b,
-0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x72, 0x61, 0x61, 0x3b, 0x14b, 0x77, 0xed, 0xed,
-0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x6e, 0x69, 0x6e, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd,
-0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x20,
-0x64, 0x69, 0x20, 0x62, 0x254, 0x301, 0x6b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b,
-0x6b, 0x20, 0x64, 0x69, 0x20, 0x62, 0x25b, 0x301, 0x25b, 0x3b, 0x4b, 0x77, 0x61, 0x3b, 0x55, 0x6e, 0x61, 0x3b, 0x52, 0x61,
-0x72, 0x3b, 0x43, 0x68, 0x65, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f, 0x63, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61,
-0x6e, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b, 0x4d, 0x6f, 0x6a, 0x3b, 0x59, 0x65, 0x6c, 0x3b, 0x4d, 0x77,
-0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
-0x77, 0x6f, 0x20, 0x75, 0x6e, 0x61, 0x79, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20,
-0x75, 0x6e, 0x65, 0x72, 0x61, 0x72, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65,
-0x63, 0x68, 0x65, 0x73, 0x68, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65, 0x74,
-0x68, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x75, 0x20,
-0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x63, 0x68, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x73, 0x61,
-0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x77, 0x65,
-0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20,
-0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e,
-0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69,
-0x20, 0x6e, 0x61, 0x20, 0x79, 0x65, 0x6c, 0x2019, 0x6c, 0x69, 0x3b, 0x4b, 0x3b, 0x55, 0x3b, 0x52, 0x3b, 0x43, 0x3b, 0x54,
-0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x46, 0x4c, 0x4f, 0x3b, 0x43,
-0x4c, 0x41, 0x3b, 0x43, 0x4b, 0x49, 0x3b, 0x46, 0x4d, 0x46, 0x3b, 0x4d, 0x41, 0x44, 0x3b, 0x4d, 0x42, 0x49, 0x3b, 0x4d,
-0x4c, 0x49, 0x3b, 0x4d, 0x41, 0x4d, 0x3b, 0x46, 0x44, 0x45, 0x3b, 0x46, 0x4d, 0x55, 0x3b, 0x46, 0x47, 0x57, 0x3b, 0x46,
-0x59, 0x55, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4c, 0x6f, 0x6f, 0x3b, 0x43, 0x6f, 0x6b, 0x63, 0x77, 0x61, 0x6b, 0x6c, 0x61,
-0x14b, 0x6e, 0x65, 0x3b, 0x43, 0x6f, 0x6b, 0x63, 0x77, 0x61, 0x6b, 0x6c, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4d,
-0x61, 0x72, 0x66, 0x6f, 0x6f, 0x3b, 0x4d, 0x61, 0x64, 0x1dd, 0x1dd, 0x75, 0x75, 0x74, 0x1dd, 0x62, 0x69, 0x6a, 0x61, 0x14b,
-0x3b, 0x4d, 0x61, 0x6d, 0x1dd, 0x14b, 0x67, 0x77, 0xe3, 0x61, 0x66, 0x61, 0x68, 0x62, 0x69, 0x69, 0x3b, 0x4d, 0x61, 0x6d,
-0x1dd, 0x14b, 0x67, 0x77, 0xe3, 0x61, 0x6c, 0x69, 0x69, 0x3b, 0x4d, 0x61, 0x64, 0x1dd, 0x6d, 0x62, 0x69, 0x69, 0x3b, 0x46,
-0x129, 0x69, 0x20, 0x44, 0x1dd, 0x253, 0x6c, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4d, 0x75, 0x6e, 0x64, 0x61, 0x14b,
-0x3b, 0x46, 0x129, 0x69, 0x20, 0x47, 0x77, 0x61, 0x68, 0x6c, 0x6c, 0x65, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x59, 0x75, 0x72,
-0x75, 0x3b, 0x4f, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x45, 0x3b,
-0x55, 0x3b, 0x57, 0x3b, 0x59, 0x3b, 0x6e, 0x67, 0x31, 0x3b, 0x6e, 0x67, 0x32, 0x3b, 0x6e, 0x67, 0x33, 0x3b, 0x6e, 0x67,
-0x34, 0x3b, 0x6e, 0x67, 0x35, 0x3b, 0x6e, 0x67, 0x36, 0x3b, 0x6e, 0x67, 0x37, 0x3b, 0x6e, 0x67, 0x38, 0x3b, 0x6e, 0x67,
-0x39, 0x3b, 0x6e, 0x67, 0x31, 0x30, 0x3b, 0x6e, 0x67, 0x31, 0x31, 0x3b, 0x6b, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x67, 0x77,
-0x25b, 0x6e, 0x20, 0x6d, 0x61, 0x74, 0xe1, 0x68, 0x72, 0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6d, 0x62,
-0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6c, 0x61, 0x6c, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144,
-0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x74, 0x61, 0x6e, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20,
-0x144, 0x74, 0x75, 0xf3, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x68, 0x25b, 0x6d, 0x62, 0x75, 0x25b, 0x72, 0xed, 0x3b,
-0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x6c, 0x254, 0x6d, 0x62, 0x69, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x72, 0x25b,
-0x62, 0x76, 0x75, 0xe2, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x77, 0x75, 0x6d, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e,
-0x20, 0x77, 0x75, 0x6d, 0x20, 0x6e, 0x61, 0x76, 0x1d4, 0x72, 0x3b, 0x6b, 0x72, 0xed, 0x73, 0x69, 0x6d, 0x69, 0x6e, 0x3b,
-0x54, 0x69, 0x6f, 0x70, 0x3b, 0x50, 0x25b, 0x74, 0x3b, 0x44, 0x75, 0x254, 0x331, 0x254, 0x331, 0x3b, 0x47, 0x75, 0x61, 0x6b,
-0x3b, 0x44, 0x75, 0xe4, 0x3b, 0x4b, 0x6f, 0x72, 0x3b, 0x50, 0x61, 0x79, 0x3b, 0x54, 0x68, 0x6f, 0x6f, 0x3b, 0x54, 0x25b,
-0x25b, 0x3b, 0x4c, 0x61, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x54, 0x69, 0x64, 0x3b, 0x54, 0x69, 0x6f, 0x70, 0x20, 0x74,
-0x68, 0x61, 0x72, 0x20, 0x70, 0x25b, 0x74, 0x3b, 0x50, 0x25b, 0x74, 0x3b, 0x44, 0x75, 0x254, 0x331, 0x254, 0x331, 0x14b, 0x3b,
-0x47, 0x75, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0xe4, 0x74, 0x3b, 0x4b, 0x6f, 0x72, 0x6e, 0x79, 0x6f, 0x6f, 0x74, 0x3b, 0x50,
-0x61, 0x79, 0x20, 0x79, 0x69, 0x65, 0x331, 0x74, 0x6e, 0x69, 0x3b, 0x54, 0x68, 0x6f, 0x331, 0x6f, 0x331, 0x72, 0x3b, 0x54,
-0x25b, 0x25b, 0x72, 0x3b, 0x4c, 0x61, 0x61, 0x74, 0x68, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x54, 0x69, 0x6f, 0x331, 0x70, 0x20,
-0x69, 0x6e, 0x20, 0x64, 0x69, 0x331, 0x69, 0x331, 0x74, 0x3b, 0x54, 0x3b, 0x50, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x44, 0x3b,
-0x4b, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x422, 0x43e, 0x445, 0x441, 0x3b, 0x41e,
-0x43b, 0x443, 0x43d, 0x3b, 0x41a, 0x43b, 0x43d, 0x3b, 0x41c, 0x441, 0x443, 0x3b, 0x42b, 0x430, 0x43c, 0x3b, 0x411, 0x44d, 0x441, 0x3b,
-0x41e, 0x442, 0x439, 0x3b, 0x410, 0x442, 0x440, 0x3b, 0x411, 0x43b, 0x495, 0x3b, 0x410, 0x43b, 0x442, 0x3b, 0x421, 0x44d, 0x442, 0x3b,
-0x410, 0x445, 0x441, 0x3b, 0x442, 0x43e, 0x445, 0x441, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x3b, 0x43e, 0x43b, 0x443, 0x43d, 0x43d, 0x44c,
-0x443, 0x3b, 0x43a, 0x443, 0x43b, 0x443, 0x43d, 0x20, 0x442, 0x443, 0x442, 0x430, 0x440, 0x3b, 0x43c, 0x443, 0x443, 0x441, 0x20, 0x443,
-0x441, 0x442, 0x430, 0x440, 0x3b, 0x44b, 0x430, 0x43c, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x431, 0x44d, 0x441, 0x20, 0x44b, 0x439, 0x430,
-0x3b, 0x43e, 0x442, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x430, 0x442, 0x44b, 0x440, 0x434, 0x44c, 0x44b, 0x445, 0x20, 0x44b, 0x439, 0x430,
-0x3b, 0x431, 0x430, 0x43b, 0x430, 0x495, 0x430, 0x43d, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x430, 0x43b, 0x442, 0x44b, 0x43d, 0x43d, 0x44c,
-0x44b, 0x3b, 0x441, 0x44d, 0x442, 0x438, 0x43d, 0x43d, 0x44c, 0x438, 0x3b, 0x430, 0x445, 0x441, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b,
-0x422, 0x3b, 0x41e, 0x3b, 0x41a, 0x3b, 0x41c, 0x3b, 0x42b, 0x3b, 0x411, 0x3b, 0x41e, 0x3b, 0x410, 0x3b, 0x411, 0x3b, 0x410, 0x3b,
-0x421, 0x3b, 0x410, 0x3b, 0x422, 0x43e, 0x445, 0x441, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x3b, 0x41e, 0x43b, 0x443, 0x43d, 0x43d, 0x44c,
-0x443, 0x3b, 0x41a, 0x443, 0x43b, 0x443, 0x43d, 0x20, 0x442, 0x443, 0x442, 0x430, 0x440, 0x3b, 0x41c, 0x443, 0x443, 0x441, 0x20, 0x443,
-0x441, 0x442, 0x430, 0x440, 0x3b, 0x42b, 0x430, 0x43c, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x411, 0x44d, 0x441, 0x20, 0x44b, 0x439,
-0x44b, 0x43d, 0x3b, 0x41e, 0x442, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x410, 0x442, 0x44b, 0x440, 0x434, 0x44c, 0x44b, 0x445, 0x20,
-0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x411, 0x430, 0x43b, 0x430, 0x495, 0x430, 0x43d, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x410, 0x43b,
-0x442, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x421, 0x44d, 0x442, 0x438, 0x43d, 0x43d, 0x44c, 0x438, 0x3b, 0x430, 0x445, 0x441, 0x44b,
-0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x4d, 0x75, 0x70, 0x3b, 0x4d, 0x77, 0x69, 0x3b, 0x4d, 0x73, 0x68, 0x3b, 0x4d, 0x75, 0x6e,
-0x3b, 0x4d, 0x61, 0x67, 0x3b, 0x4d, 0x75, 0x6a, 0x3b, 0x4d, 0x73, 0x70, 0x3b, 0x4d, 0x70, 0x67, 0x3b, 0x4d, 0x79, 0x65,
-0x3b, 0x4d, 0x6f, 0x6b, 0x3b, 0x4d, 0x75, 0x73, 0x3b, 0x4d, 0x75, 0x68, 0x3b, 0x4d, 0x75, 0x70, 0x61, 0x6c, 0x61, 0x6e,
-0x67, 0x75, 0x6c, 0x77, 0x61, 0x3b, 0x4d, 0x77, 0x69, 0x74, 0x6f, 0x70, 0x65, 0x3b, 0x4d, 0x75, 0x73, 0x68, 0x65, 0x6e,
-0x64, 0x65, 0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4d, 0x75, 0x73, 0x68, 0x65, 0x6e, 0x64, 0x65, 0x20, 0x4d, 0x61,
-0x67, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x75, 0x6a, 0x69, 0x6d, 0x62, 0x69, 0x3b, 0x4d, 0x75, 0x73, 0x68, 0x69, 0x70, 0x65,
-0x70, 0x6f, 0x3b, 0x4d, 0x75, 0x70, 0x75, 0x67, 0x75, 0x74, 0x6f, 0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x65, 0x6e, 0x73, 0x65,
-0x3b, 0x4d, 0x6f, 0x6b, 0x68, 0x75, 0x3b, 0x4d, 0x75, 0x73, 0x6f, 0x6e, 0x67, 0x61, 0x6e, 0x64, 0x65, 0x6d, 0x62, 0x77,
-0x65, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0xa5a8, 0xa595, 0xa51e, 0x3b, 0xa552, 0xa561, 0x3b, 0xa57e, 0xa5ba, 0x3b,
-0xa5a2, 0xa595, 0x3b, 0xa591, 0xa571, 0x3b, 0xa5b1, 0xa60b, 0x3b, 0xa5b1, 0xa55e, 0x3b, 0xa5db, 0xa515, 0x3b, 0xa562, 0xa54c, 0x3b, 0xa56d, 0xa583,
-0x3b, 0xa51e, 0xa60b, 0x3b, 0xa5a8, 0xa595, 0xa5cf, 0x3b, 0xa5a8, 0xa595, 0x20, 0xa56a, 0xa574, 0x20, 0xa51e, 0xa500, 0xa56e, 0xa54a, 0x3b, 0xa552,
-0xa561, 0xa59d, 0xa595, 0x3b, 0xa57e, 0xa5ba, 0x3b, 0xa5a2, 0xa595, 0x3b, 0xa591, 0xa571, 0x3b, 0xa5b1, 0xa60b, 0x3b, 0xa5b1, 0xa55e, 0xa524, 0x3b,
-0xa5db, 0xa515, 0x3b, 0xa562, 0xa54c, 0x3b, 0xa56d, 0xa583, 0x3b, 0xa51e, 0xa60b, 0xa554, 0xa57f, 0x20, 0xa578, 0xa583, 0xa5cf, 0x3b, 0xa5a8, 0xa595,
-0x20, 0xa56a, 0xa574, 0x20, 0xa5cf, 0xa5ba, 0xa56e, 0xa54a, 0x3b, 0x6c, 0x75, 0x75, 0x6b, 0x61, 0x6f, 0x20, 0x6b, 0x65, 0x6d, 0xe3,
-0x3b, 0x253, 0x61, 0x6e, 0x64, 0x61, 0x253, 0x75, 0x3b, 0x76, 0x254, 0x254, 0x3b, 0x66, 0x75, 0x6c, 0x75, 0x3b, 0x67, 0x6f,
-0x6f, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x6b, 0x254, 0x6e, 0x64, 0x65, 0x3b, 0x73, 0x61, 0x61, 0x68, 0x3b, 0x67, 0x61, 0x6c,
-0x6f, 0x3b, 0x6b, 0x65, 0x6e, 0x70, 0x6b, 0x61, 0x74, 0x6f, 0x20, 0x253, 0x6f, 0x6c, 0x6f, 0x6c, 0x254, 0x3b, 0x6c, 0x75,
-0x75, 0x6b, 0x61, 0x6f, 0x20, 0x6c, 0x254, 0x6d, 0x61, 0x3b, 0x4a, 0x65, 0x6e, 0x3b, 0x48, 0x6f, 0x72, 0x3b, 0x4d, 0xe4,
-0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x42, 0x72, 0xe1, 0x3b, 0x48, 0x65, 0x69, 0x3b, 0xd6, 0x69,
-0x67, 0x3b, 0x48, 0x65, 0x72, 0x3b, 0x57, 0xed, 0x6d, 0x3b, 0x57, 0x69, 0x6e, 0x3b, 0x43, 0x68, 0x72, 0x3b, 0x4a, 0x65,
-0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x48, 0x6f, 0x72, 0x6e, 0x69, 0x67, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x65, 0x3b, 0x41, 0x62,
-0x72, 0x69, 0x6c, 0x6c, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x6a, 0x65, 0x3b, 0x42, 0x72, 0xe1, 0x10d, 0x65, 0x74, 0x3b, 0x48,
-0x65, 0x69, 0x77, 0x65, 0x74, 0x3b, 0xd6, 0x69, 0x67, 0x161, 0x74, 0x65, 0x3b, 0x48, 0x65, 0x72, 0x62, 0x161, 0x74, 0x6d,
-0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x57, 0xed, 0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x57, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d,
-0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x43, 0x68, 0x72, 0x69, 0x161, 0x74, 0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x4a, 0x3b, 0x48,
-0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x42, 0x3b, 0x48, 0x3b, 0xd6, 0x3b, 0x48, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x43,
-0x3b, 0x6f, 0x2e, 0x31, 0x3b, 0x6f, 0x2e, 0x32, 0x3b, 0x6f, 0x2e, 0x33, 0x3b, 0x6f, 0x2e, 0x34, 0x3b, 0x6f, 0x2e, 0x35,
-0x3b, 0x6f, 0x2e, 0x36, 0x3b, 0x6f, 0x2e, 0x37, 0x3b, 0x6f, 0x2e, 0x38, 0x3b, 0x6f, 0x2e, 0x39, 0x3b, 0x6f, 0x2e, 0x31,
-0x30, 0x3b, 0x6f, 0x2e, 0x31, 0x31, 0x3b, 0x6f, 0x2e, 0x31, 0x32, 0x3b, 0x70, 0x69, 0x6b, 0xed, 0x74, 0xed, 0x6b, 0xed,
-0x74, 0x69, 0x65, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0xed, 0x20, 0xfa, 0x20, 0x6b, 0x75, 0x74, 0xfa, 0x61, 0x6e, 0x3b, 0x73,
-0x69, 0x25b, 0x79, 0x25b, 0x301, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x6e, 0x64, 0xed, 0x25b,
-0x3b, 0x254, 0x6e, 0x73, 0xfa, 0x6d, 0x62, 0x254, 0x6c, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1,
-0x74, 0xe1, 0x74, 0xfa, 0x25b, 0x3b, 0x6d, 0x65, 0x73, 0x69, 0x14b, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20,
-0x6b, 0xe9, 0x6e, 0x69, 0x65, 0x3b, 0x65, 0x6e, 0x73, 0x69, 0x6c, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20,
-0x6b, 0xe1, 0x74, 0xe1, 0x6e, 0x75, 0x25b, 0x3b, 0x254, 0x73, 0x254, 0x6e, 0x3b, 0x65, 0x66, 0x75, 0x74, 0x65, 0x3b, 0x70,
-0x69, 0x73, 0x75, 0x79, 0xfa, 0x3b, 0x69, 0x6d, 0x25b, 0x14b, 0x20, 0x69, 0x20, 0x70, 0x75, 0x254, 0x73, 0x3b, 0x69, 0x6d,
-0x25b, 0x14b, 0x20, 0x69, 0x20, 0x70, 0x75, 0x74, 0xfa, 0x6b, 0x2c, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1,
-0x74, 0xed, 0x25b, 0x3b, 0x6d, 0x61, 0x6b, 0x61, 0x6e, 0x64, 0x69, 0x6b, 0x25b, 0x3b, 0x70, 0x69, 0x6c, 0x254, 0x6e, 0x64,
-0x254, 0x301, 0x3b, 0x58, 0x69, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d,
-0x61, 0x79, 0x3b, 0x58, 0x75, 0x6e, 0x3b, 0x58, 0x6e, 0x74, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f,
-0x63, 0x68, 0x3b, 0x50, 0x61, 0x79, 0x3b, 0x41, 0x76, 0x69, 0x3b, 0x78, 0x69, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x66, 0x65,
-0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61,
-0x79, 0x75, 0x3b, 0x78, 0x75, 0x6e, 0x75, 0x3b, 0x78, 0x75, 0x6e, 0x65, 0x74, 0x75, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74,
-0x75, 0x3b, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x68, 0x6f, 0x62, 0x72, 0x65, 0x3b,
-0x70, 0x61, 0x79, 0x61, 0x72, 0x65, 0x73, 0x3b, 0x61, 0x76, 0x69, 0x65, 0x6e, 0x74, 0x75, 0x3b, 0x58, 0x3b, 0x46, 0x3b,
-0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x50, 0x3b, 0x41, 0x3b,
-0x78, 0x69, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b,
-0x78, 0x75, 0x6e, 0x3b, 0x78, 0x6e, 0x74, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x63, 0x68, 0x3b,
-0x70, 0x61, 0x79, 0x3b, 0x61, 0x76, 0x69, 0x3b, 0x64, 0x65, 0x20, 0x78, 0x69, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x64, 0x65,
-0x20, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x64, 0x2019,
-0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x79, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x78, 0x75, 0x6e,
-0x75, 0x3b, 0x64, 0x65, 0x20, 0x78, 0x75, 0x6e, 0x65, 0x74, 0x75, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x75,
-0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x68, 0x6f,
-0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x70, 0x61, 0x79, 0x61, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x2019, 0x61, 0x76, 0x69,
-0x65, 0x6e, 0x74, 0x75, 0x3b, 0x4e, 0x64, 0x75, 0x14b, 0x6d, 0x62, 0x69, 0x20, 0x53, 0x61, 0x14b, 0x3b, 0x50, 0x25b, 0x73,
-0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x70, 0xe1, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x74, 0xe1,
-0x74, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x6b, 0x77, 0x61, 0x3b, 0x50, 0x25b,
-0x73, 0x61, 0x14b, 0x20, 0x50, 0x61, 0x74, 0x61, 0x61, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e,
-0x25b, 0x301, 0x6e, 0x74, 0xfa, 0x6b, 0xfa, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x53, 0x61, 0x61, 0x6d, 0x62, 0xe1,
-0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x66, 0x254, 0x6d, 0x3b, 0x50, 0x25b, 0x73,
-0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x70, 0x66, 0xfa, 0xa78b, 0xfa, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b,
-0x20, 0x4e, 0x25b, 0x67, 0x25b, 0x301, 0x6d, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e, 0x74, 0x73, 0x254, 0x30c, 0x70,
-0x6d, 0x254, 0x301, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e, 0x74, 0x73, 0x254, 0x30c, 0x70, 0x70, 0xe1, 0x3b, 0x70,
-0x61, 0x6d, 0x62, 0x61, 0x3b, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x6d, 0x62, 0x69, 0x79, 0x254, 0x20, 0x6d, 0x25b, 0x6e,
-0x64, 0x6f, 0x14b, 0x67, 0x254, 0x3b, 0x4e, 0x79, 0x254, 0x6c, 0x254, 0x6d, 0x62, 0x254, 0x14b, 0x67, 0x254, 0x3b, 0x4d, 0x254,
-0x6e, 0x254, 0x20, 0x14b, 0x67, 0x62, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x14b, 0x67, 0x77, 0x25b, 0x20, 0x14b,
-0x67, 0x62, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x75, 0x14b, 0x67, 0x77, 0x25b, 0x3b, 0x66, 0x25b, 0x3b, 0x6e, 0x6a, 0x61,
-0x70, 0x69, 0x3b, 0x6e, 0x79, 0x75, 0x6b, 0x75, 0x6c, 0x3b, 0x31, 0x31, 0x3b, 0x253, 0x75, 0x6c, 0x253, 0x75, 0x73, 0x25b,
-0x3b, 0x6d, 0x62, 0x65, 0x67, 0x74, 0x75, 0x67, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0xe0, 0x62, 0xf9, 0x62, 0xec, 0x3b,
-0x69, 0x6d, 0x65, 0x67, 0x20, 0x6d, 0x62, 0x259, 0x14b, 0x63, 0x68, 0x75, 0x62, 0x69, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20,
-0x6e, 0x67, 0x77, 0x259, 0x300, 0x74, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x66, 0x6f, 0x67, 0x3b, 0x69, 0x6d, 0x259, 0x67,
-0x20, 0x69, 0x63, 0x68, 0x69, 0x69, 0x62, 0x254, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0xe0, 0x64, 0xf9, 0x6d, 0x62,
-0x259, 0x300, 0x14b, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x6b, 0x61, 0x3b, 0x69, 0x6d, 0x259, 0x67,
-0x20, 0x6b, 0x75, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x74, 0xe8, 0x73, 0x69, 0x2bc, 0x65, 0x3b, 0x69, 0x6d, 0x259,
-0x67, 0x20, 0x7a, 0xf2, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x72, 0x69, 0x7a, 0x6d, 0x65, 0x64, 0x3b, 0x69, 0x6d,
-0x259, 0x67, 0x20, 0x6d, 0x62, 0x65, 0x67, 0x74, 0x75, 0x67, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0xe0, 0x62, 0xf9, 0x62,
-0xec, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0x6d, 0x62, 0x259, 0x14b, 0x63, 0x68, 0x75, 0x62, 0x69, 0x3b, 0x69, 0x6d, 0x259,
-0x67, 0x20, 0x6e, 0x67, 0x77, 0x259, 0x300, 0x74, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x66, 0x6f, 0x67, 0x3b, 0x69, 0x6d,
-0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x69, 0x62, 0x254, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0xe0, 0x64, 0xf9,
-0x6d, 0x62, 0x259, 0x300, 0x14b, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x6b, 0x61, 0x3b, 0x69, 0x6d,
-0x259, 0x67, 0x20, 0x6b, 0x75, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x74, 0xe8, 0x73, 0x69, 0x2bc, 0x65, 0x3b, 0x69,
-0x6d, 0x259, 0x67, 0x20, 0x7a, 0xf2, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x72, 0x69, 0x7a, 0x6d, 0x65, 0x64, 0x3b,
-0x4d, 0x31, 0x3b, 0x41, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4e, 0x34, 0x3b, 0x46, 0x35, 0x3b, 0x49, 0x36, 0x3b, 0x41, 0x37,
-0x3b, 0x49, 0x38, 0x3b, 0x4b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x73, 0x61, 0x14b, 0x20,
-0x74, 0x73, 0x65, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x6c, 0xf9, 0x6d, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6b, 0xe0, 0x67,
-0x20, 0x6e, 0x67, 0x77, 0xf3, 0x14b, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6c, 0x65, 0x70, 0x79, 0xe8, 0x20, 0x73, 0x68, 0xfa,
-0x6d, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x63, 0xff, 0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20,
-0x63, 0xff, 0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6e, 0x6a, 0xff, 0x6f, 0x6c, 0xe1, 0x2bc, 0x3b, 0x73, 0x61, 0x14b, 0x20,
-0x74, 0x79, 0x25b, 0x300, 0x62, 0x20, 0x74, 0x79, 0x25b, 0x300, 0x62, 0x20, 0x6d, 0x62, 0x289, 0x300, 0x14b, 0x3b, 0x73, 0x61,
-0x14b, 0x20, 0x6d, 0x62, 0x289, 0x300, 0x14b, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6e, 0x67, 0x77, 0x254, 0x300, 0x2bc, 0x20, 0x6d,
-0x62, 0xff, 0x25b, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0xe0, 0x14b, 0x61, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0xe1, 0x2bc,
-0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6d, 0x65, 0x6a, 0x77, 0x6f, 0x14b, 0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6c, 0xf9, 0x6d,
-0x3b, 0x57, 0x69, 0xf3, 0x74, 0x68, 0x65, 0x21f, 0x69, 0x6b, 0x61, 0x20, 0x57, 0xed, 0x3b, 0x54, 0x68, 0x69, 0x79, 0xf3,
-0x21f, 0x65, 0x79, 0x75, 0x14b, 0x6b, 0x61, 0x20, 0x57, 0xed, 0x3b, 0x49, 0x161, 0x74, 0xe1, 0x77, 0x69, 0x10d, 0x68, 0x61,
-0x79, 0x61, 0x7a, 0x61, 0x14b, 0x20, 0x57, 0xed, 0x3b, 0x50, 0x21f, 0x65, 0x17e, 0xed, 0x74, 0x21f, 0x6f, 0x20, 0x57, 0xed,
-0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x74, 0x21f, 0x6f, 0x20, 0x57, 0xed, 0x3b, 0x57, 0xed, 0x70, 0x61,
-0x7a, 0x75, 0x6b, 0x21f, 0x61, 0x2d, 0x77, 0x61, 0x161, 0x74, 0xe9, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x70,
-0x21f, 0xe1, 0x73, 0x61, 0x70, 0x61, 0x20, 0x57, 0xed, 0x3b, 0x57, 0x61, 0x73, 0xfa, 0x74, 0x21f, 0x75, 0x14b, 0x20, 0x57,
-0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x1e7, 0x69, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b,
-0x77, 0xe1, 0x70, 0x65, 0x2d, 0x6b, 0x61, 0x73, 0x6e, 0xe1, 0x20, 0x57, 0xed, 0x3b, 0x57, 0x61, 0x6e, 0xed, 0x79, 0x65,
-0x74, 0x75, 0x20, 0x57, 0xed, 0x3b, 0x54, 0x21f, 0x61, 0x68, 0xe9, 0x6b, 0x61, 0x70, 0x161, 0x75, 0x14b, 0x20, 0x57, 0xed,
-0x3b, 0x6a9, 0x627, 0x646, 0x648, 0x648, 0x646, 0x6cc, 0x20, 0x62f, 0x648, 0x648, 0x6d5, 0x645, 0x3b, 0x634, 0x648, 0x628, 0x627, 0x62a,
-0x3b, 0x626, 0x627, 0x632, 0x627, 0x631, 0x3b, 0x646, 0x6cc, 0x633, 0x627, 0x646, 0x3b, 0x626, 0x627, 0x6cc, 0x627, 0x631, 0x3b, 0x62d,
-0x648, 0x632, 0x6d5, 0x6cc, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x6d5, 0x645, 0x648, 0x648, 0x632, 0x3b, 0x626, 0x627, 0x628, 0x3b, 0x626,
-0x6d5, 0x6cc, 0x644, 0x648, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x6cc, 0x646, 0x6cc, 0x20, 0x6cc, 0x6d5, 0x6a9, 0x6d5, 0x645, 0x3b,
-0x62a, 0x634, 0x631, 0x6cc, 0x646, 0x6cc, 0x20, 0x62f, 0x648, 0x648, 0x6d5, 0x645, 0x3b, 0x6a9, 0x627, 0x646, 0x648, 0x646, 0x6cc, 0x20,
-0x6cc, 0x6d5, 0x6a9, 0x6d5, 0x645, 0x3b, 0x6a9, 0x3b, 0x634, 0x3b, 0x626, 0x3b, 0x646, 0x3b, 0x626, 0x3b, 0x62d, 0x3b, 0x62a, 0x3b,
-0x626, 0x3b, 0x626, 0x3b, 0x62a, 0x3b, 0x62a, 0x3b, 0x6a9, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x11b,
-0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x77,
-0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x77, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61,
-0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x3b, 0x61, 0x70,
-0x72, 0x79, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b,
-0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74,
-0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x11b, 0x72, 0x2e, 0x3b, 0x61, 0x70,
-0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x77,
-0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x77, 0x2e, 0x3b, 0x64, 0x65,
-0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x61, 0x3b,
-0x6d, 0x11b, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x6a, 0x61, 0x3b, 0x6a, 0x75,
-0x6e, 0x69, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x61, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b,
-0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f,
-0x77, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x3b,
-0x66, 0x65, 0x62, 0x3b, 0x6d, 0x11b, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x65, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b,
-0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x77, 0x3b,
-0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d,
-0x11b, 0x72, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x3b, 0x6d, 0x65, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a,
-0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d,
-0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b,
-0x6d, 0x11b, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x6a, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b,
-0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x77, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b,
-0x6e, 0x6f, 0x77, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x66, 0x65,
-0x62, 0x72, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x61, 0x3b,
-0x6d, 0x65, 0x6a, 0x65, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x61, 0x3b, 0x61,
-0x77, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74,
-0x6f, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,
-0x72, 0x61, 0x3b, 0x72, 0x61, 0x67, 0x3b, 0x77, 0x61, 0x73, 0x3b, 0x70, 0x16b, 0x6c, 0x3b, 0x73, 0x61, 0x6b, 0x3b, 0x7a,
-0x61, 0x6c, 0x3b, 0x73, 0x12b, 0x6d, 0x3b, 0x6c, 0x12b, 0x70, 0x3b, 0x64, 0x61, 0x67, 0x3b, 0x73, 0x69, 0x6c, 0x3b, 0x73,
-0x70, 0x61, 0x3b, 0x6c, 0x61, 0x70, 0x3b, 0x73, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x67, 0x73, 0x3b, 0x77, 0x61, 0x73, 0x73,
-0x61, 0x72, 0x69, 0x6e, 0x73, 0x3b, 0x70, 0x16b, 0x6c, 0x69, 0x73, 0x3b, 0x73, 0x61, 0x6b, 0x6b, 0x69, 0x73, 0x3b, 0x7a,
-0x61, 0x6c, 0x6c, 0x61, 0x77, 0x73, 0x3b, 0x73, 0x12b, 0x6d, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x6c, 0x12b, 0x70, 0x61, 0x3b,
-0x64, 0x61, 0x67, 0x67, 0x69, 0x73, 0x3b, 0x73, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x6c,
-0x69, 0x6e, 0x73, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x16b, 0x74, 0x69, 0x73, 0x3b, 0x73, 0x61, 0x6c, 0x6c, 0x61, 0x77,
-0x73, 0x3b, 0x52, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x5a, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x44, 0x3b, 0x53, 0x3b,
-0x53, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x75, 0x111, 0x69, 0x76, 0x3b, 0x6b, 0x75, 0x6f, 0x76, 0xe2, 0x3b, 0x6e, 0x6a, 0x75,
-0x68, 0x10d, 0xe2, 0x3b, 0x63, 0x75, 0xe1, 0x14b, 0x75, 0x69, 0x3b, 0x76, 0x79, 0x65, 0x73, 0x69, 0x3b, 0x6b, 0x65, 0x73,
-0x69, 0x3b, 0x73, 0x79, 0x65, 0x69, 0x6e, 0x69, 0x3b, 0x70, 0x6f, 0x72, 0x67, 0x65, 0x3b, 0x10d, 0x6f, 0x68, 0x10d, 0xe2,
-0x3b, 0x72, 0x6f, 0x6f, 0x76, 0x76, 0xe2, 0x64, 0x3b, 0x73, 0x6b, 0x61, 0x6d, 0x6d, 0xe2, 0x3b, 0x6a, 0x75, 0x6f, 0x76,
-0x6c, 0xe2, 0x3b, 0x75, 0x111, 0x111, 0xe2, 0x69, 0x76, 0x65, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6b, 0x75, 0x6f, 0x76,
-0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x68, 0x10d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x63,
-0x75, 0xe1, 0x14b, 0x75, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x76, 0x79, 0x65, 0x73, 0x69, 0x6d, 0xe1, 0xe1, 0x6e,
-0x75, 0x3b, 0x6b, 0x65, 0x73, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x73, 0x79, 0x65, 0x69, 0x6e, 0x69, 0x6d, 0xe1,
-0xe1, 0x6e, 0x75, 0x3b, 0x70, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x10d, 0x6f, 0x68, 0x10d, 0xe2,
-0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x72, 0x6f, 0x6f, 0x76, 0x76, 0xe2, 0x64, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x73,
-0x6b, 0x61, 0x6d, 0x6d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0xe2, 0x6d, 0xe1, 0xe1,
-0x6e, 0x75, 0x3b, 0x55, 0x3b, 0x4b, 0x3b, 0x4e, 0x4a, 0x3b, 0x43, 0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x50, 0x3b,
-0x10c, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x62c, 0x627, 0x646, 0x6a4, 0x6cc, 0x6d5, 0x3b, 0x641, 0x626, 0x6a4, 0x631, 0x6cc,
-0x6d5, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x6a4, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x659,
-0x623, 0x646, 0x3b, 0x62c, 0x648, 0x659, 0x644, 0x627, 0x3b, 0x622, 0x6af, 0x648, 0x633, 0x62a, 0x3b, 0x633, 0x626, 0x67e, 0x62a, 0x627,
-0x645, 0x631, 0x3b, 0x626, 0x648, 0x6a9, 0x62a, 0x648, 0x6a4, 0x631, 0x3b, 0x646, 0x648, 0x6a4, 0x627, 0x645, 0x631, 0x3b, 0x62f, 0x626,
-0x633, 0x627, 0x645, 0x631, 0x3b
-};
-
 static const ushort days_data[] = {
 0x53, 0x75, 0x6e, 0x3b, 0x4d, 0x6f, 0x6e, 0x3b, 0x54, 0x75, 0x65, 0x3b, 0x57, 0x65, 0x64, 0x3b, 0x54, 0x68, 0x75, 0x3b,
 0x46, 0x72, 0x69, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x53, 0x75, 0x6e, 0x64, 0x61, 0x79, 0x3b, 0x4d, 0x6f, 0x6e, 0x64, 0x61,
@@ -5083,7 +3117,12 @@ static const ushort days_data[] = {
 0x72, 0x67, 0xe2, 0x3b, 0x6d, 0x61, 0x6a, 0x65, 0x62, 0x61, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6b, 0x6f, 0x73, 0x6b, 0x6f,
 0x68, 0x6f, 0x3b, 0x74, 0x75, 0x6f, 0x72, 0xe2, 0x73, 0x74, 0x75, 0x76, 0x3b, 0x76, 0xe1, 0x73, 0x74, 0x75, 0x70, 0x70,
 0x65, 0x65, 0x69, 0x76, 0x69, 0x3b, 0x6c, 0xe1, 0x76, 0x75, 0x72, 0x64, 0x75, 0x76, 0x3b, 0x70, 0x3b, 0x56, 0x3b, 0x4d,
-0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x56, 0x3b, 0x4c, 0x3b
+0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x56, 0x3b, 0x4c, 0x3b, 0x44, 0x6f, 0x6d, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72,
+0x3b, 0x4d, 0x6b, 0x73, 0x3b, 0x48, 0x75, 0x3b, 0x42, 0x69, 0x3b, 0x53, 0x61, 0x3b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67,
+0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65, 0x72,
+0x6b, 0x75, 0x6c, 0x65, 0x73, 0x3b, 0x48, 0x75, 0x77, 0x65, 0x62, 0x65, 0x73, 0x3b, 0x42, 0x69, 0x79, 0x65, 0x72, 0x6e,
+0x65, 0x73, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x48, 0x3b,
+0x42, 0x3b, 0x53, 0x3b
 };
 
 static const ushort byte_unit_data[] = {
@@ -6446,7 +4485,7 @@ static const ushort endonyms_data[] = {
 0x73, 0x6b, 0x61, 0x6e, 0x73, 0x77, 0x12b, 0x74, 0x61, 0x69, 0x61, 0x6e, 0x61, 0x72, 0xe2, 0x161, 0x6b, 0x69, 0x65, 0x6c,
 0xe2, 0x53, 0x75, 0x6f, 0x6d, 0xe2, 0x645, 0x627, 0x632, 0x631, 0x648, 0x646, 0x6cc, 0x644, 0x6ca, 0x631, 0x6cc, 0x20, 0x634, 0x648,
 0x645, 0x627, 0x644, 0x6cc, 0x7cb5, 0x8a9e, 0x4e2d, 0x83ef, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x570b, 0x9999, 0x6e2f, 0x7279, 0x5225, 0x884c, 0x653f, 0x5340,
-0x7ca4, 0x8bed, 0x4e2d, 0x534e, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x56fd
+0x7ca4, 0x8bed, 0x4e2d, 0x534e, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x56fd, 0x43, 0x65, 0x62, 0x75, 0x61, 0x6e, 0x6f
 };
 
 static const char language_name_list[] =
@@ -6815,6 +4854,8 @@ static const char language_name_list[] =
 "Sicilian\0"
 "Southern Kurdish\0"
 "Western Balochi\0"
+"Cebuano\0"
+"Erzya\0"
 ;
 
 static const quint16 language_name_index[] = {
@@ -7183,6 +5224,8 @@ static const quint16 language_name_index[] = {
   3084, // Sicilian
   3093, // Southern Kurdish
   3110, // Western Balochi
+  3126, // Cebuano
+  3134, // Erzya
 };
 
 static const char script_name_list[] =
@@ -8371,6 +6414,8 @@ static const unsigned char language_code_list[] =
 "scn" // Sicilian
 "sdh" // Southern Kurdish
 "bgn" // Western Balochi
+"ceb" // Cebuano
+"myv" // Erzya
 ;
 
 static const unsigned char script_code_list[] =
diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/text/qlocale_icu.cpp
index afe0aae583..afe0aae583 100644
--- a/src/corelib/tools/qlocale_icu.cpp
+++ b/src/corelib/text/qlocale_icu.cpp
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/text/qlocale_mac.mm
index 574cb0714c..9719278426 100644
--- a/src/corelib/tools/qlocale_mac.mm
+++ b/src/corelib/text/qlocale_mac.mm
@@ -44,10 +44,8 @@
 #include "qdatetime.h"
 
 #ifdef Q_OS_DARWIN
-#include "qtimezone.h"
 #include "private/qcore_mac_p.h"
 #include <CoreFoundation/CoreFoundation.h>
-QT_REQUIRE_CONFIG(timezone);
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -147,7 +145,7 @@ static QString macTimeToString(const QTime &time, bool short_format)
 
 // Mac uses the Unicode CLDR format codes
 // http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
-// See also qtbase/util/local_database/dateconverter.py
+// See also qtbase/util/locale_database/dateconverter.py
 // Makes the assumption that input formats are always well formed and consecutive letters
 // never exceed the maximum for the format code.
 static QString macToQtFormat(QStringView sys_fmt)
@@ -491,8 +489,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
         } else if (typeId == CFStringGetTypeID()) {
             result = QStringList(QString::fromCFString(languages.as<CFStringRef>()));
         } else {
-            qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%s\"; please report to http://bugreports.qt.io",
-                     qPrintable(QString::fromCFString(CFCopyTypeIDDescription(typeId))));
+            qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%ls\"; please report to http://bugreports.qt.io",
+                     qUtf16Printable(QString::fromCFString(CFCopyTypeIDDescription(typeId))));
         }
         return QVariant(result);
     }
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/text/qlocale_p.h
index 70430beb00..edee3a89c7 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/text/qlocale_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -57,6 +57,7 @@
 #include "QtCore/qvarlengtharray.h"
 #include "QtCore/qvariant.h"
 #include "QtCore/qnumeric.h"
+#include <QtCore/qcalendar.h>
 
 #include "qlocale.h"
 
@@ -113,6 +114,7 @@ public:
         Weekdays, // QList<Qt::DayOfWeek>
         CurrencySymbol, // QString in: CurrencyToStringArgument
         CurrencyToString, // QString in: qlonglong, qulonglong or double
+        Collation, // QString
         UILanguages, // QStringList
         StringToStandardQuotation, // QString in: QStringRef to quote
         StringToAlternateQuotation, // QString in: QStringRef to quote
@@ -170,9 +172,14 @@ Q_DECLARE_TYPEINFO(QLocaleId, Q_PRIMITIVE_TYPE);
 struct QLocaleData
 {
 public:
+    // TODO: Remove this?
     static const QLocaleData *findLocaleData(QLocale::Language language,
                                              QLocale::Script script,
                                              QLocale::Country country);
+    // Having an offset of current locale, enables us to have multiple sources of data, i.e. user-provided calendar locales
+    static uint findLocaleOffset(QLocale::Language language,
+                                 QLocale::Script script,
+                                 QLocale::Country country);
     static const QLocaleData *c();
 
     // Maximum number of significant digits needed to represent a double.
@@ -249,14 +256,14 @@ public:
         if (qIsInf(d))
             return float(d);
         if (std::fabs(d) > std::numeric_limits<float>::max()) {
-            if (ok != 0)
+            if (ok)
                 *ok = false;
             const float huge = std::numeric_limits<float>::infinity();
             return d < 0 ? -huge : huge;
         }
         if (d != 0 && float(d) == 0) {
             // Values that underflow double already failed. Match them:
-            if (ok != 0)
+            if (ok)
                 *ok = false;
             return 0;
         }
@@ -284,9 +291,9 @@ public:
     quint16 m_language_id, m_script_id, m_country_id;
 
     // FIXME QTBUG-69324: not all unicode code-points map to single-token UTF-16 :-(
-    quint16 m_decimal, m_group, m_list, m_percent, m_zero, m_minus, m_plus, m_exponential;
-    quint16 m_quotation_start, m_quotation_end;
-    quint16 m_alternate_quotation_start, m_alternate_quotation_end;
+    char16_t m_decimal, m_group, m_list, m_percent, m_zero, m_minus, m_plus, m_exponential;
+    char16_t m_quotation_start, m_quotation_end;
+    char16_t m_alternate_quotation_start, m_alternate_quotation_end;
 
     quint16 m_list_pattern_part_start_idx, m_list_pattern_part_start_size;
     quint16 m_list_pattern_part_mid_idx, m_list_pattern_part_mid_size;
@@ -296,12 +303,6 @@ public:
     quint16 m_long_date_format_idx, m_long_date_format_size;
     quint16 m_short_time_format_idx, m_short_time_format_size;
     quint16 m_long_time_format_idx, m_long_time_format_size;
-    quint16 m_standalone_short_month_names_idx, m_standalone_short_month_names_size;
-    quint16 m_standalone_long_month_names_idx, m_standalone_long_month_names_size;
-    quint16 m_standalone_narrow_month_names_idx, m_standalone_narrow_month_names_size;
-    quint16 m_short_month_names_idx, m_short_month_names_size;
-    quint16 m_long_month_names_idx, m_long_month_names_size;
-    quint16 m_narrow_month_names_idx, m_narrow_month_names_size;
     quint16 m_standalone_short_day_names_idx, m_standalone_short_day_names_size;
     quint16 m_standalone_long_day_names_idx, m_standalone_long_day_names_size;
     quint16 m_standalone_narrow_day_names_idx, m_standalone_narrow_day_names_size;
@@ -327,22 +328,23 @@ public:
     quint16 m_weekend_end : 3;
 };
 
-class Q_CORE_EXPORT QLocalePrivate
+class Q_CORE_EXPORT QLocalePrivate // A POD type
 {
 public:
     static QLocalePrivate *create(
-            const QLocaleData *data,
+            const QLocaleData *data, const uint data_offset = 0,
             QLocale::NumberOptions numberOptions = QLocale::DefaultNumberOptions)
     {
-        QLocalePrivate *retval = new QLocalePrivate;
+        auto *retval = new QLocalePrivate;
         retval->m_data = data;
-        retval->ref.store(0);
+        retval->ref.storeRelaxed(0);
+        retval->m_data_offset = data_offset;
         retval->m_numberOptions = numberOptions;
         return retval;
     }
 
     static QLocalePrivate *get(QLocale &l) { return l.d; }
-    static const    QLocalePrivate *get(const QLocale &l) { return l.d; }
+    static const QLocalePrivate *get(const QLocale &l) { return l.d; }
 
     QChar decimal() const { return QChar(m_data->m_decimal); }
     QChar group() const { return QChar(m_data->m_group); }
@@ -357,28 +359,26 @@ public:
     quint16 countryId() const { return m_data->m_country_id; }
 
     QByteArray bcp47Name(char separator = '-') const;
+    QByteArray rawName(char separator = '-') const;
 
-    inline QLatin1String languageCode() const { return QLocalePrivate::languageToCode(QLocale::Language(m_data->m_language_id)); }
-    inline QLatin1String scriptCode() const { return QLocalePrivate::scriptToCode(QLocale::Script(m_data->m_script_id)); }
-    inline QLatin1String countryCode() const { return QLocalePrivate::countryToCode(QLocale::Country(m_data->m_country_id)); }
+    inline QLatin1String languageCode() const { return languageToCode(QLocale::Language(m_data->m_language_id)); }
+    inline QLatin1String scriptCode() const { return scriptToCode(QLocale::Script(m_data->m_script_id)); }
+    inline QLatin1String countryCode() const { return countryToCode(QLocale::Country(m_data->m_country_id)); }
 
     static QLatin1String languageToCode(QLocale::Language language);
     static QLatin1String scriptToCode(QLocale::Script script);
     static QLatin1String countryToCode(QLocale::Country country);
-    static QLocale::Language codeToLanguage(QStringView code) Q_DECL_NOTHROW;
-    static QLocale::Script codeToScript(QStringView code) Q_DECL_NOTHROW;
-    static QLocale::Country codeToCountry(QStringView code) Q_DECL_NOTHROW;
+    static QLocale::Language codeToLanguage(QStringView code) noexcept;
+    static QLocale::Script codeToScript(QStringView code) noexcept;
+    static QLocale::Country codeToCountry(QStringView code) noexcept;
     static void getLangAndCountry(const QString &name, QLocale::Language &lang,
                                   QLocale::Script &script, QLocale::Country &cntry);
 
     QLocale::MeasurementSystem measurementSystem() const;
 
-    QString dateTimeToString(QStringView format, const QDateTime &datetime,
-                             const QDate &dateOnly, const QTime &timeOnly,
-                             const QLocale *q) const;
-
     const QLocaleData *m_data;
     QBasicAtomicInt ref;
+    uint m_data_offset;
     QLocale::NumberOptions m_numberOptions;
 };
 
@@ -391,7 +391,7 @@ inline QLocalePrivate *QSharedDataPointer<QLocalePrivate>::clone()
 {
     // cannot use QLocalePrivate's copy constructor
     // since it is deleted in C++11
-    return QLocalePrivate::create(d->m_data, d->m_numberOptions);
+    return QLocalePrivate::create(d->m_data, d->m_data_offset, d->m_numberOptions);
 }
 
 inline char QLocaleData::digitToCLocale(QChar in) const
@@ -416,7 +416,7 @@ inline char QLocaleData::digitToCLocale(QChar in) const
     if (in == m_group)
         return ',';
 
-    if (in == m_exponential || in == QChar::toUpper(m_exponential))
+    if (in == m_exponential || in == QChar(QChar::toUpper(m_exponential)))
         return 'e';
 
     // In several languages group() is a non-breaking space (U+00A0) or its thin
diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/text/qlocale_tools.cpp
index 53258bec3e..c246028b4d 100644
--- a/src/corelib/tools/qlocale_tools.cpp
+++ b/src/corelib/text/qlocale_tools.cpp
@@ -293,7 +293,7 @@ double qt_asciiToDouble(const char *num, int numLen, bool &ok, int &processed,
     // "-nan" or "+nan"
     if (qstrcmp(num, "nan") == 0) {
         processed = 3;
-        return qt_snan();
+        return qt_qnan();
     } else if ((num[0] == '-' || num[0] == '+') && qstrcmp(num + 1, "nan") == 0) {
         processed = 0;
         ok = false;
@@ -322,7 +322,7 @@ double qt_asciiToDouble(const char *num, int numLen, bool &ok, int &processed,
         conv_flags = double_conversion::StringToDoubleConverter::ALLOW_LEADING_SPACES
                 | double_conversion::StringToDoubleConverter::ALLOW_TRAILING_SPACES;
     }
-    double_conversion::StringToDoubleConverter conv(conv_flags, 0.0, qt_snan(), 0, 0);
+    double_conversion::StringToDoubleConverter conv(conv_flags, 0.0, qt_qnan(), 0, 0);
     d = conv.StringToDouble(num, numLen, &processed);
 
     if (!qIsFinite(d)) {
@@ -398,7 +398,7 @@ qstrtoull(const char * nptr, const char **endptr, int base, bool *ok)
 
     *ok = true;
     errno = 0;
-    char *endptr2 = 0;
+    char *endptr2 = nullptr;
     unsigned long long result = qt_strtoull(nptr, &endptr2, base);
     if (endptr)
         *endptr = endptr2;
@@ -415,7 +415,7 @@ qstrtoll(const char * nptr, const char **endptr, int base, bool *ok)
 {
     *ok = true;
     errno = 0;
-    char *endptr2 = 0;
+    char *endptr2 = nullptr;
     long long result = qt_strtoll(nptr, &endptr2, base);
     if (endptr)
         *endptr = endptr2;
diff --git a/src/corelib/tools/qlocale_tools_p.h b/src/corelib/text/qlocale_tools_p.h
index 594331ae37..594331ae37 100644
--- a/src/corelib/tools/qlocale_tools_p.h
+++ b/src/corelib/text/qlocale_tools_p.h
diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/text/qlocale_unix.cpp
index f202082213..ff4274d932 100644
--- a/src/corelib/tools/qlocale_unix.cpp
+++ b/src/corelib/text/qlocale_unix.cpp
@@ -69,6 +69,7 @@ struct QSystemLocaleData
     QLocale lc_messages;
     QByteArray lc_messages_var;
     QByteArray lc_measurement_var;
+    QByteArray lc_collate_var;
     QStringList uiLanguages;
 };
 
@@ -82,6 +83,7 @@ void QSystemLocaleData::readEnvironment()
     QByteArray monetary = all.isEmpty() ? qgetenv("LC_MONETARY") : all;
     lc_messages_var     = all.isEmpty() ? qgetenv("LC_MESSAGES") : all;
     lc_measurement_var  = all.isEmpty() ? qgetenv("LC_MEASUREMENT") : all;
+    lc_collate_var      = all.isEmpty() ? qgetenv("LC_COLLATE") : all;
     QByteArray lang = qgetenv("LANG");
     if (lang.isEmpty())
         lang = QByteArray("C");
@@ -95,6 +97,8 @@ void QSystemLocaleData::readEnvironment()
         lc_messages_var = lang;
     if (lc_measurement_var.isEmpty())
         lc_measurement_var = lang;
+    if (lc_collate_var.isEmpty())
+        lc_collate_var = lang;
     lc_numeric = QLocale(QString::fromLatin1(numeric));
     lc_time = QLocale(QString::fromLatin1(time));
     lc_monetary = QLocale(QString::fromLatin1(monetary));
@@ -247,13 +251,15 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const
         return QString();
     }
     case MeasurementSystem: {
-        const QString meas_locale = QString::fromLatin1(d->lc_measurement_var.constData(), d->lc_measurement_var.size());
+        const QString meas_locale = QString::fromLatin1(d->lc_measurement_var);
         if (meas_locale.compare(QLatin1String("Metric"), Qt::CaseInsensitive) == 0)
             return QLocale::MetricSystem;
         if (meas_locale.compare(QLatin1String("Other"), Qt::CaseInsensitive) == 0)
             return QLocale::MetricSystem;
         return QVariant((int)QLocale(meas_locale).measurementSystem());
     }
+    case Collation:
+        return QString::fromLatin1(d->lc_collate_var);
     case UILanguages: {
         if (!d->uiLanguages.isEmpty())
             return d->uiLanguages;
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp
index ebc4430046..79ea67f966 100644
--- a/src/corelib/tools/qlocale_win.cpp
+++ b/src/corelib/text/qlocale_win.cpp
@@ -116,10 +116,11 @@ struct QSystemLocalePrivate
     QVariant dateTimeFormat(QLocale::FormatType);
     QVariant dayName(int, QLocale::FormatType);
     QVariant monthName(int, QLocale::FormatType);
-    QVariant toString(const QDate &, QLocale::FormatType);
-    QVariant toString(const QTime &, QLocale::FormatType);
+    QVariant toString(QDate, QLocale::FormatType);
+    QVariant toString(QTime, QLocale::FormatType);
     QVariant toString(const QDateTime &, QLocale::FormatType);
     QVariant measurementSystem();
+    QVariant collation();
     QVariant amText();
     QVariant pmText();
     QVariant firstDayOfWeek();
@@ -393,7 +394,7 @@ QVariant QSystemLocalePrivate::monthName(int month, QLocale::FormatType type)
     return getLocaleInfo(lctype);
 }
 
-QVariant QSystemLocalePrivate::toString(const QDate &date, QLocale::FormatType type)
+QVariant QSystemLocalePrivate::toString(QDate date, QLocale::FormatType type)
 {
     SYSTEMTIME st;
     memset(&st, 0, sizeof(SYSTEMTIME));
@@ -412,7 +413,7 @@ QVariant QSystemLocalePrivate::toString(const QDate &date, QLocale::FormatType t
     return QString();
 }
 
-QVariant QSystemLocalePrivate::toString(const QTime &time, QLocale::FormatType type)
+QVariant QSystemLocalePrivate::toString(QTime time, QLocale::FormatType type)
 {
     SYSTEMTIME st;
     memset(&st, 0, sizeof(SYSTEMTIME));
@@ -455,6 +456,11 @@ QVariant QSystemLocalePrivate::measurementSystem()
     return QLocale::MetricSystem;
 }
 
+QVariant QSystemLocalePrivate::collation()
+{
+    return getLocaleInfo(LOCALE_SSORTLOCALE);
+}
+
 QVariant QSystemLocalePrivate::amText()
 {
     wchar_t output[15]; // maximum length including  terminating zero character for Win2003+
@@ -808,6 +814,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
         return QVariant(QLocale::AnyScript);
     case MeasurementSystem:
         return d->measurementSystem();
+    case Collation:
+        return d->collation();
     case AMText:
         return d->amText();
     case PMText:
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/text/qregexp.cpp
index adca8624f9..ac4d9bbc36 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/text/qregexp.cpp
@@ -52,15 +52,13 @@
 #include "qstringlist.h"
 #include "qstringmatcher.h"
 #include "qvector.h"
+#include "private/qlocking_p.h"
 
 #include <limits.h>
 #include <algorithm>
 
 QT_BEGIN_NAMESPACE
 
-int qFindString(const QChar *haystack, int haystackLen, int from,
-    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
-
 // error strings for the regexp parser
 #define RXERR_OK         QT_TRANSLATE_NOOP("QRegExp", "no error occurred")
 #define RXERR_DISABLED   QT_TRANSLATE_NOOP("QRegExp", "disabled feature used")
@@ -893,7 +891,7 @@ static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key
            && key1.cs == key2.cs;
 }
 
-static uint qHash(const QRegExpEngineKey &key, uint seed = 0) Q_DECL_NOTHROW
+static uint qHash(const QRegExpEngineKey &key, uint seed = 0) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.pattern);
@@ -940,10 +938,10 @@ struct QRegExpMatchState
 
     const QRegExpEngine *eng;
 
-    inline QRegExpMatchState() : bigArray(0), captured(0) {}
+    inline QRegExpMatchState() : bigArray(nullptr), captured(nullptr) {}
     inline ~QRegExpMatchState() { free(bigArray); }
 
-    void drain() { free(bigArray); bigArray = 0; captured = 0; } // to save memory
+    void drain() { free(bigArray); bigArray = nullptr; captured = nullptr; } // to save memory
     void prepareForMatch(QRegExpEngine *eng);
     void match(const QChar *str, int len, int pos, bool minimal,
         bool oneTest, int caretIndex);
@@ -1423,14 +1421,15 @@ void QRegExpMatchState::match(const QChar *str0, int len0, int pos0,
 
 #ifndef QT_NO_REGEXP_OPTIM
     if (eng->trivial && !oneTest) {
-        pos = qFindString(str0, len0, pos0, eng->goodStr.unicode(), eng->goodStr.length(), eng->cs);
+        // ### Qt6: qsizetype
+        pos = int(QtPrivate::findString(QStringView(str0, len0), pos0, QStringView(eng->goodStr.unicode(), eng->goodStr.length()), eng->cs));
         matchLen = eng->goodStr.length();
         matched = (pos != -1);
     } else
 #endif
     {
         in = str0;
-        if (in == 0)
+        if (in == nullptr)
             in = &char_null;
         pos = pos0;
         caretPos = caretIndex;
@@ -1709,7 +1708,7 @@ void QRegExpEngine::dump() const
 
 void QRegExpEngine::setup()
 {
-    ref.store(1);
+    ref.storeRelaxed(1);
 #ifndef QT_NO_REGEXP_CAPTURE
     f.resize(32);
     nf = 0;
@@ -2037,7 +2036,7 @@ bool QRegExpMatchState::matchHere()
 #ifndef QT_NO_REGEXP_CCLASS
                         const QRegExpCharClass &cc = eng->cl.at(m ^ QRegExpEngine::CharClassBit);
                         if (eng->cs)
-                            inside = cc.in(ch);
+                            inside = cc.in(QChar(ch));
                         else if (cc.negative())
                             inside = cc.in(QChar(ch).toLower()) &&
                                      cc.in(QChar(ch).toUpper());
@@ -2912,7 +2911,7 @@ int QRegExpEngine::getEscape()
 #ifndef QT_NO_REGEXP_ESCAPE
     if ((prevCh & ~0xff) == 0) {
         const char *p = strchr(tab, prevCh);
-        if (p != 0)
+        if (p != nullptr)
             return Tok_Char | backTab[p - tab];
     }
 #endif
@@ -3526,7 +3525,7 @@ int QRegExpEngine::parse(const QChar *pattern, int len)
 #endif
     box.cat(middleBox);
     box.cat(rightBox);
-    yyCharClass.reset(0);
+    yyCharClass.reset();
 
 #ifndef QT_NO_REGEXP_CAPTURE
     for (int i = 0; i < nf; ++i) {
@@ -3604,7 +3603,7 @@ int QRegExpEngine::parse(const QChar *pattern, int len)
 void QRegExpEngine::parseAtom(Box *box)
 {
 #ifndef QT_NO_REGEXP_LOOKAHEAD
-    QRegExpEngine *eng = 0;
+    QRegExpEngine *eng = nullptr;
     bool neg;
     int len;
 #endif
@@ -3801,9 +3800,9 @@ struct QRegExpPrivate
     QRegExpMatchState matchState;
 
     inline QRegExpPrivate()
-        : eng(0), engineKey(QString(), QRegExp::RegExp, Qt::CaseSensitive), minimal(false) { }
+        : eng(nullptr), engineKey(QString(), QRegExp::RegExp, Qt::CaseSensitive), minimal(false) { }
     inline QRegExpPrivate(const QRegExpEngineKey &key)
-        : eng(0), engineKey(key), minimal(false) {}
+        : eng(nullptr), engineKey(key), minimal(false) {}
 };
 
 #if !defined(QT_NO_REGEXP_OPTIM)
@@ -3821,7 +3820,7 @@ static QBasicMutex engineCacheMutex;
 static void derefEngine(QRegExpEngine *eng, const QRegExpEngineKey &key)
 {
 #if !defined(QT_NO_REGEXP_OPTIM)
-    QMutexLocker locker(&engineCacheMutex);
+    const auto locker = qt_scoped_lock(engineCacheMutex);
     if (!eng->ref.deref()) {
         if (QRECache *c = engineCache()) {
             c->unusedEngines.insert(key, eng, 4 + key.pattern.length() / 4);
@@ -3842,7 +3841,7 @@ static void prepareEngine_helper(QRegExpPrivate *priv)
     Q_ASSERT(!priv->eng);
 
 #if !defined(QT_NO_REGEXP_OPTIM)
-    QMutexLocker locker(&engineCacheMutex);
+    const auto locker = qt_scoped_lock(engineCacheMutex);
     if (QRECache *c = engineCache()) {
         priv->eng = c->unusedEngines.take(priv->engineKey);
         if (!priv->eng)
@@ -3882,9 +3881,9 @@ static void prepareEngineForMatch(QRegExpPrivate *priv, const QString &str)
 
 static void invalidateEngine(QRegExpPrivate *priv)
 {
-    if (priv->eng != 0) {
+    if (priv->eng) {
         derefEngine(priv->eng, priv->engineKey);
-        priv->eng = 0;
+        priv->eng = nullptr;
         priv->matchState.drain();
     }
 }
@@ -4042,7 +4041,7 @@ bool QRegExp::operator==(const QRegExp &rx) const
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
 */
-uint qHash(const QRegExp &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QRegExp &key, uint seed) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.priv->engineKey);
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/text/qregexp.h
index b3fa242168..8f6de24c74 100644
--- a/src/corelib/tools/qregexp.h
+++ b/src/corelib/text/qregexp.h
@@ -53,7 +53,7 @@ struct QRegExpPrivate;
 class QStringList;
 class QRegExp;
 
-Q_CORE_EXPORT uint qHash(const QRegExp &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT uint qHash(const QRegExp &key, uint seed = 0) noexcept;
 
 class Q_CORE_EXPORT QRegExp
 {
@@ -73,10 +73,8 @@ public:
     QRegExp(const QRegExp &rx);
     ~QRegExp();
     QRegExp &operator=(const QRegExp &rx);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QRegExp &operator=(QRegExp &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
-    void swap(QRegExp &other) Q_DECL_NOTHROW { qSwap(priv, other.priv); }
+    QRegExp &operator=(QRegExp &&other) noexcept { swap(other); return *this; }
+    void swap(QRegExp &other) noexcept { qSwap(priv, other.priv); }
 
     bool operator==(const QRegExp &rx) const;
     inline bool operator!=(const QRegExp &rx) const { return !operator==(rx); }
@@ -112,7 +110,7 @@ public:
 
     static QString escape(const QString &str);
 
-    friend Q_CORE_EXPORT uint qHash(const QRegExp &key, uint seed) Q_DECL_NOTHROW;
+    friend Q_CORE_EXPORT uint qHash(const QRegExp &key, uint seed) noexcept;
 
 private:
     QRegExpPrivate *priv;
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index bdaa2d3243..8d2187eb28 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -460,34 +460,13 @@ QT_BEGIN_NAMESPACE
     \row    \li \c{"[a-z]+\\d+"} \li \b true               \li \b true
     \endtable
 
-    Exact matching is not reflected in QRegularExpression. If you want to be
-    sure that the subject string matches the regular expression exactly, you can wrap the
-    pattern between a couple of anchoring expressions. Simply
-    putting the pattern between the \c{^} and the \c{$} anchors is enough
-    in most cases:
+    Exact matching is not reflected in QRegularExpression. If you want
+    to be sure that the subject string matches the regular expression
+    exactly, you can wrap the pattern using the anchoredPattern()
+    function:
 
     \snippet code/src_corelib_tools_qregularexpression.cpp 24
 
-    However, remember that the \c{$} anchor not only matches at the end of the
-    string, but also at a newline character right before the end of the string;
-    that is, the previous pattern matches against the string "this pattern must
-    match exactly\\n". Also, the behaviour of both the \c{^} and the \c{$}
-    anchors changes if the MultiLineOption is set either explicitly (as a
-    pattern option) or implicitly (as a directive inside the pattern string).
-
-    Therefore, in the most general case, you should wrap the pattern between
-    the \c{\A} and the \c{\z} anchors:
-
-    \snippet code/src_corelib_tools_qregularexpression.cpp 25
-
-    Note the usage of the non-capturing group in order to preserve the meaning
-    of the branch operator inside the pattern.
-
-    The QRegularExpression::anchoredPattern() helper method does exactly that for
-    you.
-
-    \sa anchoredPattern
-
     \section3 Porting from QRegExp's Partial Matching
 
     When using QRegExp::exactMatch(), if an exact match was not found, one
@@ -552,7 +531,7 @@ QT_BEGIN_NAMESPACE
     optimize the execution of the matching algorithm. The JIT makes extensive
     usage of self-modifying code, which can lead debugging tools such as
     Valgrind to crash. You must enable all checks for self-modifying code if
-    you want to debug programs using QRegularExpression (f.i., see Valgrind's
+    you want to debug programs using QRegularExpression (for instance, Valgrind's
     \c{--smc-check} command line option). The downside of enabling such checks
     is that your program will run considerably slower.
 
@@ -1048,8 +1027,8 @@ void QRegularExpressionPrivate::getPatternInfo()
     unsigned int hasJOptionChanged;
     pcre2_pattern_info_16(compiledPattern, PCRE2_INFO_JCHANGED, &hasJOptionChanged);
     if (Q_UNLIKELY(hasJOptionChanged)) {
-        qWarning("QRegularExpressionPrivate::getPatternInfo(): the pattern '%s'\n    is using the (?J) option; duplicate capturing group names are not supported by Qt",
-                 qPrintable(pattern));
+        qWarning("QRegularExpressionPrivate::getPatternInfo(): the pattern '%ls'\n    is using the (?J) option; duplicate capturing group names are not supported by Qt",
+                 qUtf16Printable(pattern));
     }
 }
 
@@ -1810,7 +1789,7 @@ bool QRegularExpression::operator==(const QRegularExpression &re) const
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
 */
-uint qHash(const QRegularExpression &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QRegularExpression &key, uint seed) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.d->pattern);
diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/text/qregularexpression.h
index f9e7029550..f799a38ae4 100644
--- a/src/corelib/tools/qregularexpression.h
+++ b/src/corelib/text/qregularexpression.h
@@ -59,7 +59,7 @@ class QRegularExpressionMatchIterator;
 struct QRegularExpressionPrivate;
 class QRegularExpression;
 
-Q_CORE_EXPORT uint qHash(const QRegularExpression &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT uint qHash(const QRegularExpression &key, uint seed = 0) noexcept;
 
 class Q_CORE_EXPORT QRegularExpression
 {
@@ -86,13 +86,10 @@ public:
     QRegularExpression(const QRegularExpression &re);
     ~QRegularExpression();
     QRegularExpression &operator=(const QRegularExpression &re);
-
-#ifdef Q_COMPILER_RVALUE_REFS
-    QRegularExpression &operator=(QRegularExpression &&re) Q_DECL_NOTHROW
+    QRegularExpression &operator=(QRegularExpression &&re) noexcept
     { d.swap(re.d); return *this; }
-#endif
 
-    void swap(QRegularExpression &other) Q_DECL_NOTHROW { d.swap(other.d); }
+    void swap(QRegularExpression &other) noexcept { d.swap(other.d); }
 
     QString pattern() const;
     void setPattern(const QString &pattern);
@@ -157,7 +154,7 @@ private:
     friend class QRegularExpressionMatch;
     friend struct QRegularExpressionMatchPrivate;
     friend class QRegularExpressionMatchIterator;
-    friend Q_CORE_EXPORT uint qHash(const QRegularExpression &key, uint seed) Q_DECL_NOTHROW;
+    friend Q_CORE_EXPORT uint qHash(const QRegularExpression &key, uint seed) noexcept;
 
     QRegularExpression(QRegularExpressionPrivate &dd);
     QExplicitlySharedDataPointer<QRegularExpressionPrivate> d;
@@ -186,12 +183,9 @@ public:
     ~QRegularExpressionMatch();
     QRegularExpressionMatch(const QRegularExpressionMatch &match);
     QRegularExpressionMatch &operator=(const QRegularExpressionMatch &match);
-
-#ifdef Q_COMPILER_RVALUE_REFS
-    QRegularExpressionMatch &operator=(QRegularExpressionMatch &&match) Q_DECL_NOTHROW
+    QRegularExpressionMatch &operator=(QRegularExpressionMatch &&match) noexcept
     { d.swap(match.d); return *this; }
-#endif
-    void swap(QRegularExpressionMatch &other) Q_DECL_NOTHROW { d.swap(other.d); }
+    void swap(QRegularExpressionMatch &other) noexcept { d.swap(other.d); }
 
     QRegularExpression regularExpression() const;
     QRegularExpression::MatchType matchType() const;
@@ -257,11 +251,9 @@ public:
     ~QRegularExpressionMatchIterator();
     QRegularExpressionMatchIterator(const QRegularExpressionMatchIterator &iterator);
     QRegularExpressionMatchIterator &operator=(const QRegularExpressionMatchIterator &iterator);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QRegularExpressionMatchIterator &operator=(QRegularExpressionMatchIterator &&iterator) Q_DECL_NOTHROW
+    QRegularExpressionMatchIterator &operator=(QRegularExpressionMatchIterator &&iterator) noexcept
     { d.swap(iterator.d); return *this; }
-#endif
-    void swap(QRegularExpressionMatchIterator &other) Q_DECL_NOTHROW { d.swap(other.d); }
+    void swap(QRegularExpressionMatchIterator &other) noexcept { d.swap(other.d); }
 
     bool isValid() const;
 
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/text/qstring.cpp
index b25685923c..51aa0b7512 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -2,6 +2,7 @@
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2018 Intel Corporation.
+** Copyright (C) 2019 Mail.ru Group.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -48,8 +49,8 @@
 #include <qtextcodec.h>
 #endif
 #include <private/qutfcodec_p.h>
-#include <private/qlocale_tools_p.h>
-#include "qsimd_p.h"
+#include "qlocale_tools_p.h"
+#include "private/qsimd_p.h"
 #include <qnumeric.h>
 #include <qdatastream.h>
 #include <qlist.h>
@@ -58,7 +59,6 @@
 #include "qstringbuilder.h"
 #include "qstringmatcher.h"
 #include "qvarlengtharray.h"
-#include "qtools_p.h"
 #include "qdebug.h"
 #include "qendian.h"
 #include "qcollator.h"
@@ -142,19 +142,13 @@ extern "C" void qt_toLatin1_mips_dsp_asm(uchar *dst, const ushort *src, int leng
 #endif
 
 // internal
-int qFindString(const QChar *haystack, int haystackLen, int from,
-    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
-int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,
-    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
-static inline int qt_last_index_of(const QChar *haystack, int haystackLen, QChar needle,
-                                   int from, Qt::CaseSensitivity cs);
-static inline int qt_string_count(const QChar *haystack, int haystackLen,
-                                  const QChar *needle, int needleLen,
-                                  Qt::CaseSensitivity cs);
-static inline int qt_string_count(const QChar *haystack, int haystackLen,
-                                  QChar needle, Qt::CaseSensitivity cs);
-static inline int qt_find_latin1_string(const QChar *hay, int size, QLatin1String needle,
-                                        int from, Qt::CaseSensitivity cs);
+qsizetype qFindStringBoyerMoore(QStringView haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs);
+static inline qsizetype qFindChar(QStringView str, QChar ch, qsizetype from, Qt::CaseSensitivity cs) noexcept;
+template <typename Haystack>
+static inline qsizetype qLastIndexOf(Haystack haystack, QChar needle, qsizetype from, Qt::CaseSensitivity cs) noexcept;
+static inline qsizetype qt_string_count(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs);
+static inline qsizetype qt_string_count(QStringView haystack, QChar needle, Qt::CaseSensitivity cs);
+
 static inline bool qt_starts_with(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs);
 static inline bool qt_starts_with(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs);
 static inline bool qt_starts_with(QStringView haystack, QChar needle, Qt::CaseSensitivity cs);
@@ -162,7 +156,7 @@ static inline bool qt_ends_with(QStringView haystack, QStringView needle, Qt::Ca
 static inline bool qt_ends_with(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs);
 static inline bool qt_ends_with(QStringView haystack, QChar needle, Qt::CaseSensitivity cs);
 
-qsizetype QtPrivate::qustrlen(const ushort *str) Q_DECL_NOTHROW
+qsizetype QtPrivate::qustrlen(const ushort *str) noexcept
 {
     qsizetype result = 0;
 
@@ -208,7 +202,7 @@ qsizetype QtPrivate::qustrlen(const ushort *str) Q_DECL_NOTHROW
     return result;
 }
 
-#if defined(Q_COMPILER_LAMBDA) && !defined(__OPTIMIZE_SIZE__)
+#if !defined(__OPTIMIZE_SIZE__)
 namespace {
 template <uint MaxCount> struct UnrollTailLoop
 {
@@ -460,7 +454,7 @@ static Q_ALWAYS_INLINE __m128i mm_load8_zero_extend(const void *ptr)
 
 // Note: ptr on output may be off by one and point to a preceding US-ASCII
 // character. Usually harmless.
-bool qt_is_ascii(const char *&ptr, const char *end) Q_DECL_NOTHROW
+bool qt_is_ascii(const char *&ptr, const char *end) noexcept
 {
 #if defined(__SSE2__)
     // Testing for the high bit can be done efficiently with just PMOVMSKB
@@ -520,7 +514,7 @@ bool qt_is_ascii(const char *&ptr, const char *end) Q_DECL_NOTHROW
     return true;
 }
 
-bool QtPrivate::isAscii(QLatin1String s) Q_DECL_NOTHROW
+bool QtPrivate::isAscii(QLatin1String s) noexcept
 {
     const char *ptr = s.begin();
     const char *end = s.end();
@@ -547,7 +541,7 @@ static bool isAscii(const QChar *&ptr, const QChar *end)
     return true;
 }
 
-bool QtPrivate::isAscii(QStringView s) Q_DECL_NOTHROW
+bool QtPrivate::isAscii(QStringView s) noexcept
 {
     const QChar *ptr = s.begin();
     const QChar *end = s.end();
@@ -555,7 +549,7 @@ bool QtPrivate::isAscii(QStringView s) Q_DECL_NOTHROW
     return isAscii(ptr, end);
 }
 
-bool QtPrivate::isLatin1(QStringView s) Q_DECL_NOTHROW
+bool QtPrivate::isLatin1(QStringView s) noexcept
 {
     const QChar *ptr = s.begin();
     const QChar *end = s.end();
@@ -595,7 +589,7 @@ bool QtPrivate::isLatin1(QStringView s) Q_DECL_NOTHROW
 }
 
 // conversion between Latin 1 and UTF-16
-void qt_from_latin1(ushort *dst, const char *str, size_t size) Q_DECL_NOTHROW
+void qt_from_latin1(ushort *dst, const char *str, size_t size) noexcept
 {
     /* SIMD:
      * Unpacking with SSE has been shown to improve performance on recent CPUs
@@ -638,7 +632,7 @@ void qt_from_latin1(ushort *dst, const char *str, size_t size) Q_DECL_NOTHROW
     size = size % 8;
     dst += offset;
     str += offset;
-#  if defined(Q_COMPILER_LAMBDA) && !defined(__OPTIMIZE_SIZE__)
+#  if !defined(__OPTIMIZE_SIZE__)
     return UnrollTailLoop<7>::exec(int(size), [=](int i) { dst[i] = (uchar)str[i]; });
 #  endif
 #endif
@@ -833,9 +827,9 @@ static int ucstricmp(const QChar *a, const QChar *ae, const QChar *b, const QCha
     uint alast = 0;
     uint blast = 0;
     while (a < e) {
-//         qDebug() << hex << alast << blast;
-//         qDebug() << hex << "*a=" << *a << "alast=" << alast << "folded=" << foldCase (*a, alast);
-//         qDebug() << hex << "*b=" << *b << "blast=" << blast << "folded=" << foldCase (*b, blast);
+//         qDebug() << Qt::hex << alast << blast;
+//         qDebug() << Qt::hex << "*a=" << *a << "alast=" << alast << "folded=" << foldCase (*a, alast);
+//         qDebug() << Qt::hex << "*b=" << *b << "blast=" << blast << "folded=" << foldCase (*b, blast);
         int diff = foldCase(a->unicode(), alast) - foldCase(b->unicode(), blast);
         if ((diff))
             return diff;
@@ -1152,7 +1146,7 @@ static int ucstrncmp(const QChar *a, const uchar *c, size_t l)
 }
 
 template <typename Number>
-Q_DECL_CONSTEXPR int lencmp(Number lhs, Number rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR int lencmp(Number lhs, Number rhs) noexcept
 {
     return lhs == rhs ? 0 :
            lhs >  rhs ? 1 :
@@ -1176,7 +1170,7 @@ static int ucstrcmp(const QChar *a, size_t alen, const char *b, size_t blen)
     return cmp ? cmp : lencmp(alen, blen);
 }
 
-static int qt_compare_strings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+static int qt_compare_strings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs) noexcept
 {
     if (cs == Qt::CaseSensitive)
         return ucstrcmp(lhs.begin(), lhs.size(), rhs.begin(), rhs.size());
@@ -1184,7 +1178,7 @@ static int qt_compare_strings(QStringView lhs, QStringView rhs, Qt::CaseSensitiv
         return ucstricmp(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
 }
 
-static int qt_compare_strings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+static int qt_compare_strings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs) noexcept
 {
     if (cs == Qt::CaseSensitive)
         return ucstrcmp(lhs.begin(), lhs.size(), rhs.begin(), rhs.size());
@@ -1192,12 +1186,12 @@ static int qt_compare_strings(QStringView lhs, QLatin1String rhs, Qt::CaseSensit
         return ucstricmp(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
 }
 
-static int qt_compare_strings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+static int qt_compare_strings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs) noexcept
 {
     return -qt_compare_strings(rhs, lhs, cs);
 }
 
-static int qt_compare_strings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+static int qt_compare_strings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs) noexcept
 {
     if (lhs.isEmpty())
         return lencmp(0, rhs.size());
@@ -1222,7 +1216,7 @@ static int qt_compare_strings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSens
     of the characters and is very fast, but is not what a human would expect.
     Consider sorting user-visible strings with QString::localeAwareCompare().
 */
-int QtPrivate::compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+int QtPrivate::compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs) noexcept
 {
     return qt_compare_strings(lhs, rhs, cs);
 }
@@ -1242,7 +1236,7 @@ int QtPrivate::compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitiv
     of the characters and is very fast, but is not what a human would expect.
     Consider sorting user-visible strings with QString::localeAwareCompare().
 */
-int QtPrivate::compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+int QtPrivate::compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs) noexcept
 {
     return qt_compare_strings(lhs, rhs, cs);
 }
@@ -1262,7 +1256,7 @@ int QtPrivate::compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensit
     of the characters and is very fast, but is not what a human would expect.
     Consider sorting user-visible strings with QString::localeAwareCompare().
 */
-int QtPrivate::compareStrings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+int QtPrivate::compareStrings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs) noexcept
 {
     return qt_compare_strings(lhs, rhs, cs);
 }
@@ -1282,47 +1276,14 @@ int QtPrivate::compareStrings(QLatin1String lhs, QStringView rhs, Qt::CaseSensit
     of the characters and is very fast, but is not what a human would expect.
     Consider sorting user-visible strings with QString::localeAwareCompare().
 */
-int QtPrivate::compareStrings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+int QtPrivate::compareStrings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs) noexcept
 {
     return qt_compare_strings(lhs, rhs, cs);
 }
 
-/*!
-    \internal
-
-    Returns the index position of the first occurrence of the
-    character \a ch in the string given by \a str and \a len,
-    searching forward from index
-    position \a from. Returns -1 if \a ch could not be found.
-*/
-static int findChar(const QChar *str, int len, QChar ch, int from,
-    Qt::CaseSensitivity cs)
-{
-    const ushort *s = (const ushort *)str;
-    ushort c = ch.unicode();
-    if (from < 0)
-        from = qMax(from + len, 0);
-    if (from < len) {
-        const ushort *n = s + from;
-        const ushort *e = s + len;
-        if (cs == Qt::CaseSensitive) {
-            n = QtPrivate::qustrchr(QStringView(n, e), c);
-            if (n != e)
-                return n - s;
-        } else {
-            c = foldCase(c);
-            --n;
-            while (++n != e)
-                if (foldCase(*n) == c)
-                    return  n - s;
-        }
-    }
-    return -1;
-}
-
 #define REHASH(a) \
-    if (sl_minus_1 < sizeof(uint) * CHAR_BIT)  \
-        hashHaystack -= uint(a) << sl_minus_1; \
+    if (sl_minus_1 < sizeof(std::size_t) * CHAR_BIT)  \
+        hashHaystack -= std::size_t(a) << sl_minus_1; \
     hashHaystack <<= 1
 
 inline bool qIsUpper(char ch)
@@ -2107,7 +2068,7 @@ int QString::toUcs4_helper(const ushort *uc, int length, uint *out)
 
   \note This function does not append a null character to the array.
 
-  \sa utf16(), toUcs4(), toLatin1(), toUtf8(), toLocal8Bit(), toStdWString()
+  \sa utf16(), toUcs4(), toLatin1(), toUtf8(), toLocal8Bit(), toStdWString(), QStringView::toWCharArray()
 */
 
 /*! \fn QString::QString(const QString &other)
@@ -2428,7 +2389,7 @@ void QString::expand(int i)
     string.
 */
 
-QString &QString::operator=(const QString &other) Q_DECL_NOTHROW
+QString &QString::operator=(const QString &other) noexcept
 {
     other.d->ref.ref();
     if (!d->ref.deref())
@@ -3101,7 +3062,7 @@ void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar
 {
     // Copy after if it lies inside our own d->data() area (which we could
     // possibly invalidate via a realloc or modify by replacement).
-    QChar *afterBuffer = 0;
+    QChar *afterBuffer = nullptr;
     if (pointsIntoRange(after, d->data(), d->size)) // Use copy in place of vulnerable original:
         after = afterBuffer = textCopy(after, alen);
 
@@ -3186,7 +3147,7 @@ QString &QString::replace(const QChar *before, int blen,
         return *this;
 
     QStringMatcher matcher(before, blen, cs);
-    QChar *beforeBuffer = 0, *afterBuffer = 0;
+    QChar *beforeBuffer = nullptr, *afterBuffer = nullptr;
 
     int index = 0;
     while (1) {
@@ -3246,7 +3207,7 @@ QString& QString::replace(QChar ch, const QString &after, Qt::CaseSensitivity cs
         return remove(ch, cs);
 
     if (after.d->size == 1)
-        return replace(ch, after.d->data()[0], cs);
+        return replace(ch, after.front(), cs);
 
     if (d->size == 0)
         return *this;
@@ -3414,7 +3375,7 @@ QString &QString::replace(QChar c, QLatin1String after, Qt::CaseSensitivity cs)
   expect. Consider sorting user-interface strings with
   localeAwareCompare().
 */
-bool operator==(const QString &s1, const QString &s2) Q_DECL_NOTHROW
+bool operator==(const QString &s1, const QString &s2) noexcept
 {
     if (s1.d->size != s2.d->size)
         return false;
@@ -3427,7 +3388,7 @@ bool operator==(const QString &s1, const QString &s2) Q_DECL_NOTHROW
     Returns \c true if this string is equal to \a other; otherwise
     returns \c false.
 */
-bool QString::operator==(QLatin1String other) const Q_DECL_NOTHROW
+bool QString::operator==(QLatin1String other) const noexcept
 {
     if (d->size != other.size())
         return false;
@@ -3479,7 +3440,7 @@ bool QString::operator==(QLatin1String other) const Q_DECL_NOTHROW
     expect. Consider sorting user-interface strings using the
     QString::localeAwareCompare() function.
 */
-bool operator<(const QString &s1, const QString &s2) Q_DECL_NOTHROW
+bool operator<(const QString &s1, const QString &s2) noexcept
 {
     return qt_compare_strings(s1, s2, Qt::CaseSensitive) < 0;
 }
@@ -3490,7 +3451,7 @@ bool operator<(const QString &s1, const QString &s2) Q_DECL_NOTHROW
     Returns \c true if this string is lexically less than the parameter
     string called \a other; otherwise returns \c false.
 */
-bool QString::operator<(QLatin1String other) const Q_DECL_NOTHROW
+bool QString::operator<(QLatin1String other) const noexcept
 {
     return qt_compare_strings(*this, other, Qt::CaseSensitive) < 0;
 }
@@ -3599,7 +3560,7 @@ bool QString::operator<(QLatin1String other) const Q_DECL_NOTHROW
     Returns \c true if this string is lexically greater than the parameter
     string \a other; otherwise returns \c false.
 */
-bool QString::operator>(QLatin1String other) const Q_DECL_NOTHROW
+bool QString::operator>(QLatin1String other) const noexcept
 {
     return qt_compare_strings(*this, other, Qt::CaseSensitive) > 0;
 }
@@ -3737,6 +3698,7 @@ bool QString::operator>(QLatin1String other) const Q_DECL_NOTHROW
     \sa QT_NO_CAST_FROM_ASCII
 */
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
   Returns the index position of the first occurrence of the string \a
   str in this string, searching forward from index position \a
@@ -3756,8 +3718,28 @@ bool QString::operator>(QLatin1String other) const Q_DECL_NOTHROW
 */
 int QString::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) const
 {
-    return qFindString(unicode(), length(), from, str.unicode(), str.length(), cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::findString(QStringView(unicode(), length()), from, QStringView(str.unicode(), str.length()), cs));
 }
+#endif  // QT_STRINGVIEW_LEVEL < 2
+
+/*!
+    \fn int QString::indexOf(QStringView str, int from, Qt::CaseSensitivity cs) const
+    \since 5.14
+    \overload indexOf()
+
+    Returns the index position of the first occurrence of the string view \a str
+    in this string, searching forward from index position \a from.
+    Returns -1 if \a str is not found.
+
+    If \a cs is Qt::CaseSensitive (default), the search is case
+    sensitive; otherwise the search is case insensitive.
+
+    If \a from is -1, the search starts at the last character; if it is
+    -2, at the next to last character and so on.
+
+    \sa QStringView::indexOf(), lastIndexOf(), contains(), count()
+*/
 
 /*!
   \since 4.5
@@ -3780,85 +3762,8 @@ int QString::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) const
 
 int QString::indexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const
 {
-    return qt_find_latin1_string(unicode(), size(), str, from, cs);
-}
-
-int qFindString(
-    const QChar *haystack0, int haystackLen, int from,
-    const QChar *needle0, int needleLen, Qt::CaseSensitivity cs)
-{
-    const int l = haystackLen;
-    const int sl = needleLen;
-    if (from < 0)
-        from += l;
-    if (uint(sl + from) > (uint)l)
-        return -1;
-    if (!sl)
-        return from;
-    if (!l)
-        return -1;
-
-    if (sl == 1)
-        return findChar(haystack0, haystackLen, needle0[0], from, cs);
-
-    /*
-        We use the Boyer-Moore algorithm in cases where the overhead
-        for the skip table should pay off, otherwise we use a simple
-        hash function.
-    */
-    if (l > 500 && sl > 5)
-        return qFindStringBoyerMoore(haystack0, haystackLen, from,
-            needle0, needleLen, cs);
-
-    auto sv = [sl](const ushort *v) { return QStringView(v, sl); };
-    /*
-        We use some hashing for efficiency's sake. Instead of
-        comparing strings, we compare the hash value of str with that
-        of a part of this QString. Only if that matches, we call
-        qt_string_compare().
-    */
-    const ushort *needle = (const ushort *)needle0;
-    const ushort *haystack = (const ushort *)haystack0 + from;
-    const ushort *end = (const ushort *)haystack0 + (l-sl);
-    const uint sl_minus_1 = sl - 1;
-    uint hashNeedle = 0, hashHaystack = 0;
-    int idx;
-
-    if (cs == Qt::CaseSensitive) {
-        for (idx = 0; idx < sl; ++idx) {
-            hashNeedle = ((hashNeedle<<1) + needle[idx]);
-            hashHaystack = ((hashHaystack<<1) + haystack[idx]);
-        }
-        hashHaystack -= haystack[sl_minus_1];
-
-        while (haystack <= end) {
-            hashHaystack += haystack[sl_minus_1];
-            if (hashHaystack == hashNeedle
-                 && qt_compare_strings(sv(needle), sv(haystack), Qt::CaseSensitive) == 0)
-                return haystack - (const ushort *)haystack0;
-
-            REHASH(*haystack);
-            ++haystack;
-        }
-    } else {
-        const ushort *haystack_start = (const ushort *)haystack0;
-        for (idx = 0; idx < sl; ++idx) {
-            hashNeedle = (hashNeedle<<1) + foldCase(needle + idx, needle);
-            hashHaystack = (hashHaystack<<1) + foldCase(haystack + idx, haystack_start);
-        }
-        hashHaystack -= foldCase(haystack + sl_minus_1, haystack_start);
-
-        while (haystack <= end) {
-            hashHaystack += foldCase(haystack + sl_minus_1, haystack_start);
-            if (hashHaystack == hashNeedle
-                 && qt_compare_strings(sv(needle), sv(haystack), Qt::CaseInsensitive) == 0)
-                return haystack - (const ushort *)haystack0;
-
-            REHASH(foldCase(haystack, haystack_start));
-            ++haystack;
-        }
-    }
-    return -1;
+    // ### Qt6: qsizetype
+    return int(QtPrivate::findString(QStringView(unicode(), size()), from, str, cs));
 }
 
 /*!
@@ -3870,9 +3775,11 @@ int qFindString(
 */
 int QString::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const
 {
-    return findChar(unicode(), length(), ch, from, cs);
+    // ### Qt6: qsizetype
+    return int(qFindChar(QStringView(unicode(), length()), ch, from, cs));
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     \since 4.8
 
@@ -3887,74 +3794,8 @@ int QString::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const
 */
 int QString::indexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) const
 {
-    return qFindString(unicode(), length(), from, str.unicode(), str.length(), cs);
-}
-
-static int lastIndexOfHelper(const ushort *haystack, int from, const ushort *needle, int sl, Qt::CaseSensitivity cs)
-{
-    /*
-        See indexOf() for explanations.
-    */
-
-    auto sv = [sl](const ushort *v) { return QStringView(v, sl); };
-
-    const ushort *end = haystack;
-    haystack += from;
-    const uint sl_minus_1 = sl - 1;
-    const ushort *n = needle+sl_minus_1;
-    const ushort *h = haystack+sl_minus_1;
-    uint hashNeedle = 0, hashHaystack = 0;
-    int idx;
-
-    if (cs == Qt::CaseSensitive) {
-        for (idx = 0; idx < sl; ++idx) {
-            hashNeedle = ((hashNeedle<<1) + *(n-idx));
-            hashHaystack = ((hashHaystack<<1) + *(h-idx));
-        }
-        hashHaystack -= *haystack;
-
-        while (haystack >= end) {
-            hashHaystack += *haystack;
-            if (hashHaystack == hashNeedle
-                 && qt_compare_strings(sv(needle), sv(haystack), Qt::CaseSensitive) == 0)
-                return haystack - end;
-            --haystack;
-            REHASH(haystack[sl]);
-        }
-    } else {
-        for (idx = 0; idx < sl; ++idx) {
-            hashNeedle = ((hashNeedle<<1) + foldCase(n-idx, needle));
-            hashHaystack = ((hashHaystack<<1) + foldCase(h-idx, end));
-        }
-        hashHaystack -= foldCase(haystack, end);
-
-        while (haystack >= end) {
-            hashHaystack += foldCase(haystack, end);
-            if (hashHaystack == hashNeedle
-                 && qt_compare_strings(sv(haystack), sv(needle), Qt::CaseInsensitive) == 0)
-                return haystack - end;
-            --haystack;
-            REHASH(foldCase(haystack + sl, end));
-        }
-    }
-    return -1;
-}
-
-static inline int lastIndexOfHelper(
-        const QStringRef &haystack, int from, const QStringRef &needle, Qt::CaseSensitivity cs)
-{
-    return lastIndexOfHelper(reinterpret_cast<const ushort*>(haystack.unicode()), from,
-                             reinterpret_cast<const ushort*>(needle.unicode()), needle.size(), cs);
-}
-
-static inline int lastIndexOfHelper(
-        const QStringRef &haystack, int from, QLatin1String needle, Qt::CaseSensitivity cs)
-{
-    const int size = needle.size();
-    QVarLengthArray<ushort> s(size);
-    qt_from_latin1(s.data(), needle.latin1(), size);
-    return lastIndexOfHelper(reinterpret_cast<const ushort*>(haystack.unicode()), from,
-                             s.data(), size, cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::findString(QStringView(unicode(), length()), from, QStringView(str.unicode(), str.length()), cs));
 }
 
 /*!
@@ -3975,9 +3816,12 @@ static inline int lastIndexOfHelper(
 */
 int QString::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs) const
 {
-    return QStringRef(this).lastIndexOf(QStringRef(&str), from, cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::lastIndexOf(*this, from, str, cs));
 }
 
+#endif // QT_STRINGVIEW_LEVEL < 2
+
 /*!
   \since 4.5
   \overload lastIndexOf()
@@ -3999,7 +3843,8 @@ int QString::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs) c
 */
 int QString::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const
 {
-    return QStringRef(this).lastIndexOf(str, from, cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::lastIndexOf(*this, from, str, cs));
 }
 
 /*!
@@ -4010,9 +3855,11 @@ int QString::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) co
 */
 int QString::lastIndexOf(QChar ch, int from, Qt::CaseSensitivity cs) const
 {
-    return qt_last_index_of(unicode(), size(), ch, from, cs);
+    // ### Qt6: qsizetype
+    return int(qLastIndexOf(*this, ch, from, cs));
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
   \since 4.8
   \overload lastIndexOf()
@@ -4030,8 +3877,27 @@ int QString::lastIndexOf(QChar ch, int from, Qt::CaseSensitivity cs) const
 */
 int QString::lastIndexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) const
 {
-    return QStringRef(this).lastIndexOf(str, from, cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::lastIndexOf(*this, from, str, cs));
 }
+#endif // QT_STRINGVIEW_LEVEL < 2
+
+/*!
+  \fn int QString::lastIndexOf(QStringView str, int from, Qt::CaseSensitivity cs) const
+  \since 5.14
+  \overload lastIndexOf()
+
+  Returns the index position of the last occurrence of the string view \a
+  str in this string, searching backward from index position \a
+  from. If \a from is -1 (default), the search starts at the last
+  character; if \a from is -2, at the next to last character and so
+  on. Returns -1 if \a str is not found.
+
+  If \a cs is Qt::CaseSensitive (default), the search is case
+  sensitive; otherwise the search is case insensitive.
+
+  \sa indexOf(), contains(), count()
+*/
 
 
 #if !(defined(QT_NO_REGEXP) && !QT_CONFIG(regularexpression))
@@ -4343,7 +4209,8 @@ QString &QString::replace(const QRegularExpression &re, const QString &after)
 
 int QString::count(const QString &str, Qt::CaseSensitivity cs) const
 {
-    return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs);
+    // ### Qt6: qsizetype
+    return int(qt_string_count(QStringView(unicode(), size()), QStringView(str.unicode(), str.size()), cs));
 }
 
 /*!
@@ -4359,8 +4226,9 @@ int QString::count(const QString &str, Qt::CaseSensitivity cs) const
 
 int QString::count(QChar ch, Qt::CaseSensitivity cs) const
 {
-    return qt_string_count(unicode(), size(), ch, cs);
-    }
+    // ### Qt6: qsizetype
+    return int(qt_string_count(QStringView(unicode(), size()), ch, cs));
+}
 
 /*!
     \since 4.8
@@ -4375,10 +4243,11 @@ int QString::count(QChar ch, Qt::CaseSensitivity cs) const
 */
 int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const
 {
-    return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs);
+    // ### Qt6: qsizetype
+    return int(qt_string_count(QStringView(unicode(), size()), QStringView(str.unicode(), str.size()), cs));
 }
 
-
+#if QT_STRINGVIEW_LEVEL < 2
 /*! \fn bool QString::contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
 
     Returns \c true if this string contains an occurrence of the string
@@ -4392,6 +4261,7 @@ int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const
 
     \sa indexOf(), count()
 */
+#endif // QT_STRINGVIEW_LEVEL < 2
 
 /*! \fn bool QString::contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
     \since 5.3
@@ -4410,6 +4280,7 @@ int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const
     character \a ch; otherwise returns \c false.
 */
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*! \fn bool QString::contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
     \since 4.8
 
@@ -4421,6 +4292,20 @@ int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const
 
     \sa indexOf(), count()
 */
+#endif // QT_STRINGVIEW_LEVEL < 2
+
+/*! \fn bool QString::contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
+    \since 5.14
+    \overload contains()
+
+    Returns \c true if this string contains an occurrence of the string view
+    \a str; otherwise returns \c false.
+
+    If \a cs is Qt::CaseSensitive (default), the search is
+    case sensitive; otherwise the search is case insensitive.
+
+    \sa indexOf(), count()
+*/
 
 /*! \fn bool QString::contains(const QRegExp &rx) const
 
@@ -4589,7 +4474,7 @@ int QString::indexOf(const QRegularExpression &re, int from, QRegularExpressionM
     if (match.hasMatch()) {
         const int ret = match.capturedStart();
         if (rmatch)
-            *rmatch = qMove(match);
+            *rmatch = std::move(match);
         return ret;
     }
 
@@ -4645,7 +4530,7 @@ int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpress
         if (start < endpos) {
             lastIndex = start;
             if (rmatch)
-                *rmatch = qMove(match);
+                *rmatch = std::move(match);
         } else {
             break;
         }
@@ -4688,7 +4573,7 @@ bool QString::contains(const QRegularExpression &re, QRegularExpressionMatch *rm
     QRegularExpressionMatch m = re.match(*this);
     bool hasMatch = m.hasMatch();
     if (hasMatch && rmatch)
-        *rmatch = qMove(m);
+        *rmatch = std::move(m);
     return hasMatch;
 }
 
@@ -4848,7 +4733,7 @@ QString QString::section(const QString &sep, int start, int end, SectionFlags fl
 class qt_section_chunk {
 public:
     qt_section_chunk() {}
-    qt_section_chunk(int l, QStringRef s) : length(l), string(qMove(s)) {}
+    qt_section_chunk(int l, QStringRef s) : length(l), string(std::move(s)) {}
     int length;
     QStringRef string;
 };
@@ -5680,7 +5565,7 @@ QString QString::fromUtf16(const ushort *unicode, int size)
         while (unicode[size] != 0)
             ++size;
     }
-    return QUtf16::convertToUnicode((const char *)unicode, size*2, 0);
+    return QUtf16::convertToUnicode((const char *)unicode, size*2, nullptr);
 }
 
 /*!
@@ -5734,7 +5619,7 @@ QString QString::fromUcs4(const uint *unicode, int size)
         while (unicode[size] != 0)
             ++size;
     }
-    return QUtf32::convertToUnicode((const char *)unicode, size*4, 0);
+    return QUtf32::convertToUnicode((const char *)unicode, size*4, nullptr);
 }
 
 
@@ -5799,7 +5684,7 @@ QString QString::simplified_helper(QString &str)
 
 namespace {
     template <typename StringView>
-    StringView qt_trimmed(StringView s) Q_DECL_NOTHROW
+    StringView qt_trimmed(StringView s) noexcept
     {
         auto begin = s.begin();
         auto end = s.end();
@@ -5823,12 +5708,12 @@ namespace {
 
     \sa QString::trimmed(), QStringView::trimmed(), QLatin1String::trimmed()
 */
-QStringView QtPrivate::trimmed(QStringView s) Q_DECL_NOTHROW
+QStringView QtPrivate::trimmed(QStringView s) noexcept
 {
     return qt_trimmed(s);
 }
 
-QLatin1String QtPrivate::trimmed(QLatin1String s) Q_DECL_NOTHROW
+QLatin1String QtPrivate::trimmed(QLatin1String s) noexcept
 {
     return qt_trimmed(s);
 }
@@ -5887,6 +5772,15 @@ QString QString::trimmed_helper(QString &str)
     were a reference to a QChar. If you assign to it, the assignment will apply to
     the character in the QString from which you got the reference.
 
+    \note Before Qt 5.14 it was possible to use this operator to access
+    a character at an out-of-bounds position in the string, and
+    then assign to such a position, causing the string to be
+    automatically resized. Furthermore, assigning a value to the
+    returned QCharRef would cause a detach of the string, even if the
+    string has been copied in the meanwhile (and the QCharRef kept
+    alive while the copy was taken). These behaviors are deprecated,
+    and will be changed in a future version of Qt.
+
     \sa at()
 */
 
@@ -6366,7 +6260,7 @@ QString& QString::fill(QChar ch, int size)
 
     Same as compare(*this, \a other, \a cs).
 */
-int QString::compare(const QString &other, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+int QString::compare(const QString &other, Qt::CaseSensitivity cs) const noexcept
 {
     return qt_compare_strings(*this, other, cs);
 }
@@ -6377,7 +6271,7 @@ int QString::compare(const QString &other, Qt::CaseSensitivity cs) const Q_DECL_
     \since 4.5
 */
 int QString::compare_helper(const QChar *data1, int length1, const QChar *data2, int length2,
-                            Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+                            Qt::CaseSensitivity cs) noexcept
 {
     Q_ASSERT(length1 >= 0);
     Q_ASSERT(length2 >= 0);
@@ -6392,7 +6286,7 @@ int QString::compare_helper(const QChar *data1, int length1, const QChar *data2,
 
     Same as compare(*this, \a other, \a cs).
 */
-int QString::compare(QLatin1String other, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+int QString::compare(QLatin1String other, Qt::CaseSensitivity cs) const noexcept
 {
     return qt_compare_strings(*this, other, cs);
 }
@@ -6438,7 +6332,7 @@ int QString::compare_helper(const QChar *data1, int length1, const char *data2,
     \since 4.5
 */
 int QString::compare_helper(const QChar *data1, int length1, QLatin1String s2,
-                            Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+                            Qt::CaseSensitivity cs) noexcept
 {
     Q_ASSERT(length1 >= 0);
     Q_ASSERT(data1 || length1 == 0);
@@ -6735,21 +6629,21 @@ namespace QUnicodeTables {
     reallocate memory to grow the buffer. In that case, we need to adjust the \a
     it pointer.
  */
-template <typename Traits, typename T>
+template <typename T>
 Q_NEVER_INLINE
-static QString detachAndConvertCase(T &str, QStringIterator it)
+static QString detachAndConvertCase(T &str, QStringIterator it, QUnicodeTables::Case which)
 {
     Q_ASSERT(!str.isEmpty());
-    QString s = qMove(str);             // will copy if T is const QString
+    QString s = std::move(str);             // will copy if T is const QString
     QChar *pp = s.begin() + it.index(); // will detach if necessary
 
     do {
         uint uc = it.nextUnchecked();
 
-        const QUnicodeTables::Properties *prop = qGetProp(uc);
-        signed short caseDiff = Traits::caseDiff(prop);
+        const auto fold = qGetProp(uc)->cases[which];
+        signed short caseDiff = fold.diff;
 
-        if (Q_UNLIKELY(Traits::caseSpecial(prop))) {
+        if (Q_UNLIKELY(fold.special)) {
             const ushort *specialCase = specialCaseMap + caseDiff;
             ushort length = *specialCase++;
 
@@ -6771,7 +6665,7 @@ static QString detachAndConvertCase(T &str, QStringIterator it)
         } else if (Q_UNLIKELY(QChar::requiresSurrogates(uc))) {
             // so far, case convertion never changes planes (guaranteed by the qunicodetables generator)
             pp++;
-            *pp++ = QChar::lowSurrogate(uc + caseDiff);
+            *pp++ = QChar(QChar::lowSurrogate(uc + caseDiff));
         } else {
             *pp++ = QChar(uc + caseDiff);
         }
@@ -6780,8 +6674,8 @@ static QString detachAndConvertCase(T &str, QStringIterator it)
     return s;
 }
 
-template <typename Traits, typename T>
-static QString convertCase(T &str)
+template <typename T>
+static QString convertCase(T &str, QUnicodeTables::Case which)
 {
     const QChar *p = str.constBegin();
     const QChar *e = p + str.size();
@@ -6793,23 +6687,23 @@ static QString convertCase(T &str)
     QStringIterator it(p, e);
     while (it.hasNext()) {
         uint uc = it.nextUnchecked();
-        if (Traits::caseDiff(qGetProp(uc))) {
+        if (qGetProp(uc)->cases[which].diff) {
             it.recedeUnchecked();
-            return detachAndConvertCase<Traits>(str, it);
+            return detachAndConvertCase(str, it, which);
         }
     }
-    return qMove(str);
+    return std::move(str);
 }
 } // namespace QUnicodeTables
 
 QString QString::toLower_helper(const QString &str)
 {
-    return QUnicodeTables::convertCase<QUnicodeTables::LowercaseTraits>(str);
+    return QUnicodeTables::convertCase(str, QUnicodeTables::LowerCase);
 }
 
 QString QString::toLower_helper(QString &str)
 {
-    return QUnicodeTables::convertCase<QUnicodeTables::LowercaseTraits>(str);
+    return QUnicodeTables::convertCase(str, QUnicodeTables::LowerCase);
 }
 
 /*!
@@ -6821,12 +6715,12 @@ QString QString::toLower_helper(QString &str)
 
 QString QString::toCaseFolded_helper(const QString &str)
 {
-    return QUnicodeTables::convertCase<QUnicodeTables::CasefoldTraits>(str);
+    return QUnicodeTables::convertCase(str, QUnicodeTables::CaseFold);
 }
 
 QString QString::toCaseFolded_helper(QString &str)
 {
-    return QUnicodeTables::convertCase<QUnicodeTables::CasefoldTraits>(str);
+    return QUnicodeTables::convertCase(str, QUnicodeTables::CaseFold);
 }
 
 /*!
@@ -6844,14 +6738,15 @@ QString QString::toCaseFolded_helper(QString &str)
 
 QString QString::toUpper_helper(const QString &str)
 {
-    return QUnicodeTables::convertCase<QUnicodeTables::UppercaseTraits>(str);
+    return QUnicodeTables::convertCase(str, QUnicodeTables::UpperCase);
 }
 
 QString QString::toUpper_helper(QString &str)
 {
-    return QUnicodeTables::convertCase<QUnicodeTables::UppercaseTraits>(str);
+    return QUnicodeTables::convertCase(str, QUnicodeTables::UpperCase);
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
     \obsolete
 
@@ -6865,6 +6760,7 @@ QString &QString::sprintf(const char *cformat, ...)
     va_end(ap);
     return *this;
 }
+#endif
 
 // ### Qt 6: Consider whether this function shouldn't be removed See task 202871.
 /*!
@@ -6910,6 +6806,7 @@ QString QString::asprintf(const char *cformat, ...)
     return s;
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
     \obsolete
 
@@ -6919,6 +6816,7 @@ QString &QString::vsprintf(const char *cformat, va_list ap)
 {
     return *this = vasprintf(cformat, ap);
 }
+#endif
 
 static void append_utf8(QString &qs, const char *cs, int len)
 {
@@ -6928,7 +6826,7 @@ static void append_utf8(QString &qs, const char *cs, int len)
     qs.resize(newEnd - qs.constData());
 }
 
-static uint parse_flag_characters(const char * &c) Q_DECL_NOTHROW
+static uint parse_flag_characters(const char * &c) noexcept
 {
     uint flags = QLocaleData::ZeroPadExponent;
     while (true) {
@@ -6965,7 +6863,7 @@ static int parse_field_width(const char * &c)
 
 enum LengthMod { lm_none, lm_hh, lm_h, lm_l, lm_ll, lm_L, lm_j, lm_z, lm_t };
 
-static inline bool can_consume(const char * &c, char ch) Q_DECL_NOTHROW
+static inline bool can_consume(const char * &c, char ch) noexcept
 {
     if (*c == ch) {
         ++c;
@@ -6974,7 +6872,7 @@ static inline bool can_consume(const char * &c, char ch) Q_DECL_NOTHROW
     return false;
 }
 
-static LengthMod parse_length_modifier(const char * &c) Q_DECL_NOTHROW
+static LengthMod parse_length_modifier(const char * &c) noexcept
 {
     switch (*c++) {
     case 'h': return can_consume(c, 'h') ? lm_hh : lm_h;
@@ -7799,10 +7697,10 @@ static ResultList splitString(const StringSource &source, const QChar *sep,
                               QString::SplitBehavior behavior, Qt::CaseSensitivity cs, const int separatorSize)
 {
     ResultList list;
-    int start = 0;
-    int end;
-    int extra = 0;
-    while ((end = qFindString(source.constData(), source.size(), start + extra, sep, separatorSize, cs)) != -1) {
+    typename StringSource::size_type start = 0;
+    typename StringSource::size_type end;
+    typename StringSource::size_type extra = 0;
+    while ((end = QtPrivate::findString(QStringView(source.constData(), source.size()), start + extra, QStringView(sep, separatorSize), cs)) != -1) {
         if (start != end || behavior == QString::KeepEmptyParts)
             list.append(source.mid(start, end - start));
         start = end + separatorSize;
@@ -8136,7 +8034,7 @@ void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::
         version = QChar::currentUnicodeVersion();
     } else if (int(version) <= NormalizationCorrectionsVersionMax) {
         const QString &s = *data;
-        QChar *d = 0;
+        QChar *d = nullptr;
         for (int i = 0; i < NumNormalizationCorrections; ++i) {
             const NormalizationCorrection &n = uc_normalization_corrections[i];
             if (n.version > version) {
@@ -8873,19 +8771,23 @@ QString QString::arg(double a, int fieldWidth, char fmt, int prec, QChar fillCha
     return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar);
 }
 
-static int getEscape(const QChar *uc, int *pos, int len, int maxNumber = 999)
+static inline ushort to_unicode(const QChar c) { return c.unicode(); }
+static inline ushort to_unicode(const char c) { return QLatin1Char{c}.unicode(); }
+
+template <typename Char>
+static int getEscape(const Char *uc, qsizetype *pos, qsizetype len, int maxNumber = 999)
 {
     int i = *pos;
     ++i;
     if (i < len && uc[i] == QLatin1Char('L'))
         ++i;
     if (i < len) {
-        int escape = uc[i].unicode() - '0';
+        int escape = to_unicode(uc[i]) - '0';
         if (uint(escape) >= 10U)
             return -1;
         ++i;
         while (i < len) {
-            int digit = uc[i].unicode() - '0';
+            int digit = to_unicode(uc[i]) - '0';
             if (uint(digit) >= 10U)
                 break;
             escape = (escape * 10) + digit;
@@ -8936,18 +8838,23 @@ static int getEscape(const QChar *uc, int *pos, int len, int maxNumber = 999)
 namespace {
 struct Part
 {
-    Part() : stringRef(), number(0) {}
-    Part(const QString &s, int pos, int len, int num = -1) Q_DECL_NOTHROW
-        : stringRef(&s, pos, len), number(num) {}
+    Part() = default; // for QVarLengthArray; do not use
+    Q_DECL_CONSTEXPR Part(QStringView s, int num = -1)
+        : tag{QtPrivate::ArgBase::U16}, number{num}, data{s.utf16()}, size{s.size()} {}
+    Q_DECL_CONSTEXPR Part(QLatin1String s, int num = -1)
+        : tag{QtPrivate::ArgBase::L1}, number{num}, data{s.data()}, size{s.size()} {}
 
-    QStringRef stringRef;
+    void reset(QStringView s) noexcept { *this = {s, number}; }
+    void reset(QLatin1String s) noexcept { *this = {s, number}; }
+
+    QtPrivate::ArgBase::Tag tag;
     int number;
+    const void *data;
+    qsizetype size;
 };
 } // unnamed namespace
 
-template <>
-class QTypeInfo<Part> : public QTypeInfoMerger<Part, QStringRef, int> {}; // Q_DECLARE_METATYPE
-
+Q_DECLARE_TYPEINFO(Part, Q_PRIMITIVE_TYPE);
 
 namespace {
 
@@ -8956,24 +8863,25 @@ enum { ExpectedParts = 32 };
 typedef QVarLengthArray<Part, ExpectedParts> ParseResult;
 typedef QVarLengthArray<int, ExpectedParts/2> ArgIndexToPlaceholderMap;
 
-static ParseResult parseMultiArgFormatString(const QString &s)
+template <typename StringView>
+static ParseResult parseMultiArgFormatString(StringView s)
 {
     ParseResult result;
 
-    const QChar *uc = s.constData();
-    const int len = s.size();
-    const int end = len - 1;
-    int i = 0;
-    int last = 0;
+    const auto uc = s.data();
+    const auto len = s.size();
+    const auto end = len - 1;
+    qsizetype i = 0;
+    qsizetype last = 0;
 
     while (i < end) {
         if (uc[i] == QLatin1Char('%')) {
-            int percent = i;
+            qsizetype percent = i;
             int number = getEscape(uc, &i, len);
             if (number != -1) {
                 if (last != percent)
-                    result.push_back(Part(s, last, percent - last)); // literal text (incl. failed placeholders)
-                result.push_back(Part(s, percent, i - percent, number));  // parsed placeholder
+                    result.push_back(Part{s.mid(last, percent - last)}); // literal text (incl. failed placeholders)
+                result.push_back(Part{s.mid(percent, i - percent), number});  // parsed placeholder
                 last = i;
                 continue;
             }
@@ -8982,7 +8890,7 @@ static ParseResult parseMultiArgFormatString(const QString &s)
     }
 
     if (last < len)
-        result.push_back(Part(s, last, len - last)); // trailing literal text
+        result.push_back(Part{s.mid(last, len - last)}); // trailing literal text
 
     return result;
 }
@@ -8991,9 +8899,9 @@ static ArgIndexToPlaceholderMap makeArgIndexToPlaceholderMap(const ParseResult &
 {
     ArgIndexToPlaceholderMap result;
 
-    for (ParseResult::const_iterator it = parts.begin(), end = parts.end(); it != end; ++it) {
-        if (it->number >= 0)
-            result.push_back(it->number);
+    for (Part part : parts) {
+        if (part.number >= 0)
+            result.push_back(part.number);
     }
 
     std::sort(result.begin(), result.end());
@@ -9003,54 +8911,107 @@ static ArgIndexToPlaceholderMap makeArgIndexToPlaceholderMap(const ParseResult &
     return result;
 }
 
-static int resolveStringRefsAndReturnTotalSize(ParseResult &parts, const ArgIndexToPlaceholderMap &argIndexToPlaceholderMap, const QString *args[])
+static qsizetype resolveStringRefsAndReturnTotalSize(ParseResult &parts, const ArgIndexToPlaceholderMap &argIndexToPlaceholderMap, const QtPrivate::ArgBase *args[])
 {
-    int totalSize = 0;
-    for (ParseResult::iterator pit = parts.begin(), end = parts.end(); pit != end; ++pit) {
-        if (pit->number != -1) {
-            const ArgIndexToPlaceholderMap::const_iterator ait
-                    = std::find(argIndexToPlaceholderMap.begin(), argIndexToPlaceholderMap.end(), pit->number);
-            if (ait != argIndexToPlaceholderMap.end())
-                pit->stringRef = QStringRef(args[ait - argIndexToPlaceholderMap.begin()]);
+    using namespace QtPrivate;
+    qsizetype totalSize = 0;
+    for (Part &part : parts) {
+        if (part.number != -1) {
+            const auto it = std::find(argIndexToPlaceholderMap.begin(), argIndexToPlaceholderMap.end(), part.number);
+            if (it != argIndexToPlaceholderMap.end()) {
+                const auto &arg = *args[it - argIndexToPlaceholderMap.begin()];
+                switch (arg.tag) {
+                case ArgBase::L1:
+                    part.reset(static_cast<const QLatin1StringArg&>(arg).string);
+                    break;
+                case ArgBase::U8:
+                    Q_UNREACHABLE(); // waiting for QUtf8String...
+                    break;
+                case ArgBase::U16:
+                    part.reset(static_cast<const QStringViewArg&>(arg).string);
+                    break;
+                }
+            }
         }
-        totalSize += pit->stringRef.size();
+        totalSize += part.size;
     }
     return totalSize;
 }
 
 } // unnamed namespace
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 QString QString::multiArg(int numArgs, const QString **args) const
 {
+    QVarLengthArray<QtPrivate::QStringViewArg, 9> sva;
+    sva.reserve(numArgs);
+    QVarLengthArray<const QtPrivate::ArgBase *, 9> pointers;
+    pointers.reserve(numArgs);
+    for (int i = 0; i < numArgs; ++i) {
+        sva.push_back(QtPrivate::qStringLikeToArg(*args[i]));
+        pointers.push_back(&sva.back());
+    }
+    return QtPrivate::argToQString(qToStringViewIgnoringNull(*this), static_cast<size_t>(numArgs), pointers.data());
+}
+#endif
+
+Q_ALWAYS_INLINE QString to_string(QLatin1String s) noexcept { return s; }
+Q_ALWAYS_INLINE QString to_string(QStringView s) noexcept { return s.toString(); }
+
+template <typename StringView>
+static QString argToQStringImpl(StringView pattern, size_t numArgs, const QtPrivate::ArgBase **args)
+{
     // Step 1-2 above
-    ParseResult parts = parseMultiArgFormatString(*this);
+    ParseResult parts = parseMultiArgFormatString(pattern);
 
     // 3-4
     ArgIndexToPlaceholderMap argIndexToPlaceholderMap = makeArgIndexToPlaceholderMap(parts);
 
-    if (argIndexToPlaceholderMap.size() > numArgs) // 3a
-        argIndexToPlaceholderMap.resize(numArgs);
-    else if (argIndexToPlaceholderMap.size() < numArgs) // 3b
-        qWarning("QString::arg: %d argument(s) missing in %s",
-                 numArgs - argIndexToPlaceholderMap.size(), toLocal8Bit().data());
+    if (static_cast<size_t>(argIndexToPlaceholderMap.size()) > numArgs) // 3a
+        argIndexToPlaceholderMap.resize(int(numArgs));
+    else if (Q_UNLIKELY(static_cast<size_t>(argIndexToPlaceholderMap.size()) < numArgs)) // 3b
+        qWarning("QString::arg: %d argument(s) missing in %ls",
+                 int(numArgs - argIndexToPlaceholderMap.size()), qUtf16Printable(to_string(pattern)));
 
     // 5
-    const int totalSize = resolveStringRefsAndReturnTotalSize(parts, argIndexToPlaceholderMap, args);
+    const qsizetype totalSize = resolveStringRefsAndReturnTotalSize(parts, argIndexToPlaceholderMap, args);
 
     // 6:
     QString result(totalSize, Qt::Uninitialized);
-    QChar *out = result.data();
-
-    for (ParseResult::const_iterator it = parts.begin(), end = parts.end(); it != end; ++it) {
-        if (const int sz = it->stringRef.size()) {
-            memcpy(out, it->stringRef.constData(), sz * sizeof(QChar));
-            out += sz;
+    auto out = const_cast<QChar*>(result.constData());
+
+    for (Part part : parts) {
+        switch (part.tag) {
+        case QtPrivate::ArgBase::L1:
+            if (part.size) {
+                qt_from_latin1(reinterpret_cast<ushort*>(out),
+                               reinterpret_cast<const char*>(part.data), part.size);
+            }
+            break;
+        case QtPrivate::ArgBase::U8:
+            Q_UNREACHABLE(); // waiting for QUtf8String
+            break;
+        case QtPrivate::ArgBase::U16:
+            if (part.size)
+                memcpy(out, part.data, part.size * sizeof(QChar));
+            break;
         }
+        out += part.size;
     }
 
     return result;
 }
 
+QString QtPrivate::argToQString(QStringView pattern, size_t n, const ArgBase **args)
+{
+    return argToQStringImpl(pattern, n, args);
+}
+
+QString QtPrivate::argToQString(QLatin1String pattern, size_t n, const ArgBase **args)
+{
+    return argToQStringImpl(pattern, n, args);
+}
+
 /*! \fn bool QString::isSimpleText() const
 
     \internal
@@ -9604,6 +9565,58 @@ QString &QString::setRawData(const QChar *unicode, int size)
 */
 
 /*!
+    \fn int QLatin1String::indexOf(QStringView str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
+    \fn int QLatin1String::indexOf(QLatin1String l1, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
+    \fn int QLatin1String::indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
+    \since 5.14
+
+    Returns the index position of the first occurrence of the string-view \a str,
+    Latin-1 string \a l1, or character \a ch, respectively, in this Latin-1 string,
+    searching forward from index position \a from. Returns -1 if \a str is not found.
+
+    If \a cs is Qt::CaseSensitive (default), the search is case
+    sensitive; otherwise the search is case insensitive.
+
+    If \a from is -1, the search starts at the last character; if it is
+    -2, at the next to last character and so on.
+
+    \sa QString::indexOf()
+*/
+
+/*!
+    \fn bool QLatin1String::contains(QStringView str, Qt::CaseSensitivity cs) const
+    \fn bool QLatin1String::contains(QLatin1String l1, Qt::CaseSensitivity cs) const
+    \fn bool QLatin1String::contains(QChar c, Qt::CaseSensitivity cs) const
+    \since 5.14
+
+    Returns \c true if this Latin-1 string contains an occurrence of the string-view
+    \a str, Latin-1 string \a l1, or character \a ch; otherwise returns \c false.
+
+    If \a cs is Qt::CaseSensitive (the default), the search is
+    case-sensitive; otherwise the search is case-insensitive.
+
+    \sa indexOf(), QStringView::contains(), QStringView::indexOf(), QString::indexOf()
+*/
+
+/*!
+    \fn int QLatin1String::lastIndexOf(QStringView str, int from, Qt::CaseSensitivity cs) const
+    \fn int QLatin1String::lastIndexOf(QLatin1String l1, int from, Qt::CaseSensitivity cs) const
+    \fn int QLatin1String::lastIndexOf(QChar c, int from, Qt::CaseSensitivity cs) const
+    \since 5.14
+
+    Returns the index position of the last occurrence of the string-view \a str,
+    Latin-1 string \a l1, or character \a ch, respectively, in this Latin-1 string,
+    searching backward from index position \a from. If \a from is -1 (default),
+    the search starts at the last character; if \a from is -2, at the next to last
+    character and so on. Returns -1 if \a str is not found.
+
+    If \a cs is Qt::CaseSensitive (default), the search is case
+    sensitive; otherwise the search is case insensitive.
+
+    \sa indexOf(), QStringView::lastIndexOf(), QStringView::indexOf(), QString::indexOf()
+*/
+
+/*!
     \fn QLatin1String::const_iterator QLatin1String::begin() const
     \since 5.10
 
@@ -10506,7 +10519,7 @@ QString QStringRef::toString() const {
    Returns \c true if string reference \a s1 is lexically equal to string reference \a s2; otherwise
    returns \c false.
 */
-bool operator==(const QStringRef &s1,const QStringRef &s2) Q_DECL_NOTHROW
+bool operator==(const QStringRef &s1,const QStringRef &s2) noexcept
 {
     return s1.size() == s2.size() && qt_compare_strings(s1, s2, Qt::CaseSensitive) == 0;
 }
@@ -10516,7 +10529,7 @@ bool operator==(const QStringRef &s1,const QStringRef &s2) Q_DECL_NOTHROW
    Returns \c true if string \a s1 is lexically equal to string reference \a s2; otherwise
    returns \c false.
 */
-bool operator==(const QString &s1,const QStringRef &s2) Q_DECL_NOTHROW
+bool operator==(const QString &s1,const QStringRef &s2) noexcept
 {
     return s1.size() == s2.size() && qt_compare_strings(s1, s2, Qt::CaseSensitive) == 0;
 }
@@ -10526,7 +10539,7 @@ bool operator==(const QString &s1,const QStringRef &s2) Q_DECL_NOTHROW
    Returns \c true if string  \a s1 is lexically equal to string reference \a s2; otherwise
    returns \c false.
 */
-bool operator==(QLatin1String s1, const QStringRef &s2) Q_DECL_NOTHROW
+bool operator==(QLatin1String s1, const QStringRef &s2) noexcept
 {
     if (s1.size() != s2.size())
         return false;
@@ -10545,7 +10558,7 @@ bool operator==(QLatin1String s1, const QStringRef &s2) Q_DECL_NOTHROW
     expect. Consider sorting user-interface strings using the
     QString::localeAwareCompare() function.
 */
-bool operator<(const QStringRef &s1,const QStringRef &s2) Q_DECL_NOTHROW
+bool operator<(const QStringRef &s1,const QStringRef &s2) noexcept
 {
     return qt_compare_strings(s1, s2, Qt::CaseSensitive) < 0;
 }
@@ -11158,6 +11171,7 @@ QStringRef QString::midRef(int position, int n) const
     \sa QString::chop(), truncate()
 */
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
   \since 4.8
 
@@ -11175,8 +11189,28 @@ QStringRef QString::midRef(int position, int n) const
 */
 int QStringRef::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) const
 {
-    return qFindString(unicode(), length(), from, str.unicode(), str.length(), cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::findString(QStringView(unicode(), length()), from, QStringView(str.unicode(), str.length()), cs));
 }
+#endif // QT_STRINGVIEW_LEVEL < 2
+
+/*!
+    \fn int QStringRef::indexOf(QStringView str, int from, Qt::CaseSensitivity cs) const
+    \since 5.14
+    \overload indexOf()
+
+    Returns the index position of the first occurrence of the string view \a str
+    in this string reference, searching forward from index position \a from.
+    Returns -1 if \a str is not found.
+
+    If \a cs is Qt::CaseSensitive (default), the search is case
+    sensitive; otherwise the search is case insensitive.
+
+    If \a from is -1, the search starts at the last character; if it is
+    -2, at the next to last character and so on.
+
+    \sa QString::indexOf(), QStringView::indexOf(), lastIndexOf(), contains(), count()
+*/
 
 /*!
     \since 4.8
@@ -11190,7 +11224,8 @@ int QStringRef::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) co
 */
 int QStringRef::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const
 {
-    return findChar(unicode(), length(), ch, from, cs);
+    // ### Qt6: qsizetype
+    return int(qFindChar(QStringView(unicode(), length()), ch, from, cs));
 }
 
 /*!
@@ -11210,9 +11245,11 @@ int QStringRef::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const
 */
 int QStringRef::indexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const
 {
-    return qt_find_latin1_string(unicode(), size(), str, from, cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::findString(QStringView(unicode(), size()), from, str, cs));
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     \since 4.8
 
@@ -11229,8 +11266,10 @@ int QStringRef::indexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) con
 */
 int QStringRef::indexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) const
 {
-    return qFindString(unicode(), size(), from, str.unicode(), str.size(), cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::findString(QStringView(unicode(), size()), from, QStringView(str.unicode(), str.size()), cs));
 }
+#endif // QT_STRINGVIEW_LEVEL < 2
 
 /*!
   \since 4.8
@@ -11248,7 +11287,8 @@ int QStringRef::indexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs)
 */
 int QStringRef::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs) const
 {
-    return lastIndexOf(QStringRef(&str), from, cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::lastIndexOf(*this, from, str, cs));
 }
 
 /*!
@@ -11262,28 +11302,8 @@ int QStringRef::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs
 */
 int QStringRef::lastIndexOf(QChar ch, int from, Qt::CaseSensitivity cs) const
 {
-    return qt_last_index_of(unicode(), size(), ch, from, cs);
-}
-
-template<typename T>
-static int last_index_of_impl(const QStringRef &haystack, int from, const T &needle, Qt::CaseSensitivity cs)
-{
-    const int sl = needle.size();
-    if (sl == 1)
-        return haystack.lastIndexOf(needle.at(0), from, cs);
-
-    const int l = haystack.size();
-    if (from < 0)
-        from += l;
-    int delta = l - sl;
-    if (from == l && sl == 0)
-        return from;
-    if (uint(from) >= uint(l) || delta < 0)
-        return -1;
-    if (from > delta)
-        from = delta;
-
-    return lastIndexOfHelper(haystack, from, needle, cs);
+    // ### Qt6: qsizetype
+    return int(qLastIndexOf(*this, ch, from, cs));
 }
 
 /*!
@@ -11303,7 +11323,8 @@ static int last_index_of_impl(const QStringRef &haystack, int from, const T &nee
 */
 int QStringRef::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const
 {
-    return last_index_of_impl(*this, from, str, cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::lastIndexOf(*this, from, str, cs));
 }
 
 /*!
@@ -11323,10 +11344,28 @@ int QStringRef::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs)
 */
 int QStringRef::lastIndexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) const
 {
-    return last_index_of_impl(*this, from, str, cs);
+    // ### Qt6: qsizetype
+    return int(QtPrivate::lastIndexOf(*this, from, str, cs));
 }
 
 /*!
+  \fn int QStringRef::lastIndexOf(QStringView str, int from, Qt::CaseSensitivity cs) const
+  \since 5.14
+  \overload lastIndexOf()
+
+  Returns the index position of the last occurrence of the string view \a
+  str in this string, searching backward from index position \a
+  from. If \a from is -1 (default), the search starts at the last
+  character; if \a from is -2, at the next to last character and so
+  on. Returns -1 if \a str is not found.
+
+  If \a cs is Qt::CaseSensitive (default), the search is case
+  sensitive; otherwise the search is case insensitive.
+
+  \sa indexOf(), contains(), count()
+*/
+
+/*!
     \since 4.8
     Returns the number of (potentially overlapping) occurrences of
     the string \a str in this string reference.
@@ -11338,7 +11377,8 @@ int QStringRef::lastIndexOf(const QStringRef &str, int from, Qt::CaseSensitivity
 */
 int QStringRef::count(const QString &str, Qt::CaseSensitivity cs) const
 {
-    return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs);
+    // ### Qt6: qsizetype
+    return int(qt_string_count(QStringView(unicode(), size()), QStringView(str.unicode(), str.size()), cs));
 }
 
 /*!
@@ -11355,7 +11395,8 @@ int QStringRef::count(const QString &str, Qt::CaseSensitivity cs) const
 */
 int QStringRef::count(QChar ch, Qt::CaseSensitivity cs) const
 {
-    return qt_string_count(unicode(), size(), ch, cs);
+    // ### Qt6: qsizetype
+    return int(qt_string_count(QStringView(unicode(), size()), ch, cs));
 }
 
 /*!
@@ -11372,7 +11413,8 @@ int QStringRef::count(QChar ch, Qt::CaseSensitivity cs) const
 */
 int QStringRef::count(const QStringRef &str, Qt::CaseSensitivity cs) const
 {
-    return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs);
+    // ### Qt6: qsizetype
+    return int(qt_string_count(QStringView(unicode(), size()), QStringView(str.unicode(), str.size()), cs));
 }
 
 /*!
@@ -11396,7 +11438,7 @@ bool QStringRef::isRightToLeft() const
 
     \sa QString::isRightToLeft()
 */
-bool QtPrivate::isRightToLeft(QStringView string)
+bool QtPrivate::isRightToLeft(QStringView string) noexcept
 {
     const ushort *p = reinterpret_cast<const ushort*>(string.data());
     const ushort * const end = p + string.size();
@@ -11557,7 +11599,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const
     return qt_ends_with(*this, str, cs);
 }
 
-
+#if QT_STRINGVIEW_LEVEL < 2
 /*! \fn bool QStringRef::contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
 
     \since 4.8
@@ -11569,6 +11611,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const
 
     \sa indexOf(), count()
 */
+#endif // QT_STRINGVIEW_LEVEL < 2
 
 /*! \fn bool QStringRef::contains(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
 
@@ -11583,6 +11626,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const
 
 */
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*! \fn bool QStringRef::contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
     \overload contains()
     \since 4.8
@@ -11595,6 +11639,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const
 
     \sa indexOf(), count()
 */
+#endif // QT_STRINGVIEW_LEVEL < 2
 
 /*! \fn bool QStringRef::contains(QLatin1String str, Qt::CaseSensitivity cs) const
     \since 4.8
@@ -11609,57 +11654,41 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const
     \sa indexOf(), count()
 */
 
-static inline int qt_last_index_of(const QChar *haystack, int haystackLen, QChar needle,
-                                   int from, Qt::CaseSensitivity cs)
-{
-    ushort c = needle.unicode();
-    if (from < 0)
-        from += haystackLen;
-    if (uint(from) >= uint(haystackLen))
-        return -1;
-    if (from >= 0) {
-        const ushort *b = reinterpret_cast<const ushort*>(haystack);
-        const ushort *n = b + from;
-        if (cs == Qt::CaseSensitive) {
-            for (; n >= b; --n)
-                if (*n == c)
-                    return n - b;
-        } else {
-            c = foldCase(c);
-            for (; n >= b; --n)
-                if (foldCase(*n) == c)
-                    return n - b;
-        }
-    }
-    return -1;
+/*! \fn bool QStringRef::contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
+    \since 5.14
+    \overload contains()
 
+    Returns \c true if this string reference contains an occurrence of
+    the string view \a str; otherwise returns \c false.
 
-}
+    If \a cs is Qt::CaseSensitive (default), the search is
+    case sensitive; otherwise the search is case insensitive.
 
-static inline int qt_string_count(const QChar *haystack, int haystackLen,
-                                  const QChar *needle, int needleLen,
-                                  Qt::CaseSensitivity cs)
+    \sa indexOf(), count()
+*/
+
+static inline qsizetype qt_string_count(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs)
 {
-    int num = 0;
-    int i = -1;
-    if (haystackLen > 500 && needleLen > 5) {
-        QStringMatcher matcher(needle, needleLen, cs);
-        while ((i = matcher.indexIn(haystack, haystackLen, i + 1)) != -1)
+    qsizetype num = 0;
+    qsizetype i = -1;
+    if (haystack.size() > 500 && needle.size() > 5) {
+        QStringMatcher matcher(needle, cs);
+        while ((i = matcher.indexIn(haystack, i + 1)) != -1)
             ++num;
     } else {
-        while ((i = qFindString(haystack, haystackLen, i + 1, needle, needleLen, cs)) != -1)
+        while ((i = QtPrivate::findString(haystack, i + 1, needle, cs)) != -1)
             ++num;
     }
     return num;
 }
 
-static inline int qt_string_count(const QChar *unicode, int size, QChar ch,
+static inline qsizetype qt_string_count(QStringView haystack, QChar ch,
                                   Qt::CaseSensitivity cs)
 {
     ushort c = ch.unicode();
-    int num = 0;
-    const ushort *b = reinterpret_cast<const ushort*>(unicode);
-    const ushort *i = b + size;
+    qsizetype num = 0;
+    const ushort *b = reinterpret_cast<const ushort*>(haystack.data());
+    const ushort *i = b + haystack.size();
     if (cs == Qt::CaseSensitive) {
         while (i != b)
             if (*--i == c)
@@ -11673,24 +11702,8 @@ static inline int qt_string_count(const QChar *unicode, int size, QChar ch,
     return num;
 }
 
-static inline int qt_find_latin1_string(const QChar *haystack, int size,
-                                        QLatin1String needle,
-                                        int from, Qt::CaseSensitivity cs)
-{
-    if (size < needle.size())
-        return -1;
-
-    const char *latin1 = needle.latin1();
-    int len = needle.size();
-    QVarLengthArray<ushort> s(len);
-    qt_from_latin1(s.data(), latin1, len);
-
-    return qFindString(haystack, size, from,
-                       reinterpret_cast<const QChar*>(s.constData()), len, cs);
-}
-
 template <typename Haystack, typename Needle>
-bool qt_starts_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool qt_starts_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) noexcept
 {
     if (haystack.isNull())
         return needle.isNull(); // historical behavior, consider changing in ### Qt 6.
@@ -11742,28 +11755,28 @@ static inline bool qt_starts_with(QStringView haystack, QChar needle, Qt::CaseSe
     \sa QtPrivate::endsWith(), QString::endsWith(), QStringView::endsWith(), QLatin1String::endsWith()
 */
 
-bool QtPrivate::startsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool QtPrivate::startsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) noexcept
 {
     return qt_starts_with_impl(haystack, needle, cs);
 }
 
-bool QtPrivate::startsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool QtPrivate::startsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs) noexcept
 {
     return qt_starts_with_impl(haystack, needle, cs);
 }
 
-bool QtPrivate::startsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool QtPrivate::startsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs) noexcept
 {
     return qt_starts_with_impl(haystack, needle, cs);
 }
 
-bool QtPrivate::startsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool QtPrivate::startsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs) noexcept
 {
     return qt_starts_with_impl(haystack, needle, cs);
 }
 
 template <typename Haystack, typename Needle>
-bool qt_ends_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool qt_ends_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) noexcept
 {
     if (haystack.isNull())
         return needle.isNull(); // historical behavior, consider changing in ### Qt 6.
@@ -11815,26 +11828,310 @@ static inline bool qt_ends_with(QStringView haystack, QChar needle, Qt::CaseSens
     \sa QtPrivate::startsWith(), QString::endsWith(), QStringView::endsWith(), QLatin1String::endsWith()
 */
 
-bool QtPrivate::endsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool QtPrivate::endsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) noexcept
 {
     return qt_ends_with_impl(haystack, needle, cs);
 }
 
-bool QtPrivate::endsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool QtPrivate::endsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs) noexcept
 {
     return qt_ends_with_impl(haystack, needle, cs);
 }
 
-bool QtPrivate::endsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool QtPrivate::endsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs) noexcept
 {
     return qt_ends_with_impl(haystack, needle, cs);
 }
 
-bool QtPrivate::endsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+bool QtPrivate::endsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs) noexcept
 {
     return qt_ends_with_impl(haystack, needle, cs);
 }
 
+namespace {
+template <typename Pointer>
+uint foldCaseHelper(Pointer ch, Pointer start) = delete;
+
+template <>
+uint foldCaseHelper<const QChar*>(const QChar* ch, const QChar* start)
+{
+    return foldCase(reinterpret_cast<const ushort*>(ch), reinterpret_cast<const ushort*>(start));
+}
+
+template <>
+uint foldCaseHelper<const char*>(const char* ch, const char*)
+{
+    return foldCase(ushort(uchar(*ch)));
+}
+
+template <typename T>
+ushort valueTypeToUtf16(T t) = delete;
+
+template <>
+ushort valueTypeToUtf16<QChar>(QChar t)
+{
+    return t.unicode();
+}
+
+template <>
+ushort valueTypeToUtf16<char>(char t)
+{
+    return ushort(uchar(t));
+}
+}
+
+/*!
+    \internal
+
+    Returns the index position of the first occurrence of the
+    character \a ch in the string given by \a str and \a len,
+    searching forward from index
+    position \a from. Returns -1 if \a ch could not be found.
+*/
+
+static inline qsizetype qFindChar(QStringView str, QChar ch, qsizetype from, Qt::CaseSensitivity cs) noexcept
+{
+    if (from < 0)
+        from = qMax(from + str.size(), qsizetype(0));
+    if (from < str.size()) {
+        const ushort *s = (const ushort *)str.data();
+        ushort c = ch.unicode();
+        const ushort *n = s + from;
+        const ushort *e = s + str.size();
+        if (cs == Qt::CaseSensitive) {
+            n = QtPrivate::qustrchr(QStringView(n, e), c);
+            if (n != e)
+                return n - s;
+        } else {
+            c = foldCase(c);
+            --n;
+            while (++n != e)
+                if (foldCase(*n) == c)
+                    return n - s;
+        }
+    }
+    return -1;
+}
+
+qsizetype QtPrivate::findString(QStringView haystack0, qsizetype from, QStringView needle0, Qt::CaseSensitivity cs) noexcept
+{
+    const qsizetype l = haystack0.size();
+    const qsizetype sl = needle0.size();
+    if (from < 0)
+        from += l;
+    if (std::size_t(sl + from) > std::size_t(l))
+        return -1;
+    if (!sl)
+        return from;
+    if (!l)
+        return -1;
+
+    if (sl == 1)
+        return qFindChar(haystack0, needle0[0], from, cs);
+
+    /*
+        We use the Boyer-Moore algorithm in cases where the overhead
+        for the skip table should pay off, otherwise we use a simple
+        hash function.
+    */
+    if (l > 500 && sl > 5)
+        return qFindStringBoyerMoore(haystack0, from, needle0, cs);
+
+    auto sv = [sl](const ushort *v) { return QStringView(v, sl); };
+    /*
+        We use some hashing for efficiency's sake. Instead of
+        comparing strings, we compare the hash value of str with that
+        of a part of this QString. Only if that matches, we call
+        qt_string_compare().
+    */
+    const ushort *needle = (const ushort *)needle0.data();
+    const ushort *haystack = (const ushort *)(haystack0.data()) + from;
+    const ushort *end = (const ushort *)(haystack0.data()) + (l - sl);
+    const std::size_t sl_minus_1 = sl - 1;
+    std::size_t hashNeedle = 0, hashHaystack = 0;
+    qsizetype idx;
+
+    if (cs == Qt::CaseSensitive) {
+        for (idx = 0; idx < sl; ++idx) {
+            hashNeedle = ((hashNeedle<<1) + needle[idx]);
+            hashHaystack = ((hashHaystack<<1) + haystack[idx]);
+        }
+        hashHaystack -= haystack[sl_minus_1];
+
+        while (haystack <= end) {
+            hashHaystack += haystack[sl_minus_1];
+            if (hashHaystack == hashNeedle
+                 && qt_compare_strings(needle0, sv(haystack), Qt::CaseSensitive) == 0)
+                return haystack - (const ushort *)haystack0.data();
+
+            REHASH(*haystack);
+            ++haystack;
+        }
+    } else {
+        const ushort *haystack_start = (const ushort *)haystack0.data();
+        for (idx = 0; idx < sl; ++idx) {
+            hashNeedle = (hashNeedle<<1) + foldCase(needle + idx, needle);
+            hashHaystack = (hashHaystack<<1) + foldCase(haystack + idx, haystack_start);
+        }
+        hashHaystack -= foldCase(haystack + sl_minus_1, haystack_start);
+
+        while (haystack <= end) {
+            hashHaystack += foldCase(haystack + sl_minus_1, haystack_start);
+            if (hashHaystack == hashNeedle
+                 && qt_compare_strings(needle0, sv(haystack), Qt::CaseInsensitive) == 0)
+                return haystack - (const ushort *)haystack0.data();
+
+            REHASH(foldCase(haystack, haystack_start));
+            ++haystack;
+        }
+    }
+    return -1;
+}
+
+template <typename Haystack>
+static inline qsizetype qLastIndexOf(Haystack haystack, QChar needle,
+                                     qsizetype from, Qt::CaseSensitivity cs) noexcept
+{
+    if (from < 0)
+        from += haystack.size();
+    if (std::size_t(from) >= std::size_t(haystack.size()))
+        return -1;
+    if (from >= 0) {
+        ushort c = needle.unicode();
+        const auto b = haystack.data();
+        auto n = b + from;
+        if (cs == Qt::CaseSensitive) {
+            for (; n >= b; --n)
+                if (valueTypeToUtf16(*n) == c)
+                    return n - b;
+        } else {
+            c = foldCase(c);
+            for (; n >= b; --n)
+                if (foldCase(valueTypeToUtf16(*n)) == c)
+                    return n - b;
+        }
+    }
+    return -1;
+}
+
+template<typename Haystack, typename Needle>
+static qsizetype qLastIndexOf(Haystack haystack0, qsizetype from,
+                              Needle needle0, Qt::CaseSensitivity cs) noexcept
+{
+    const qsizetype sl = needle0.size();
+    if (sl == 1)
+        return qLastIndexOf(haystack0, needle0.front(), from, cs);
+
+    const qsizetype l = haystack0.size();
+    if (from < 0)
+        from += l;
+    if (from == l && sl == 0)
+        return from;
+    const qsizetype delta = l - sl;
+    if (std::size_t(from) >= std::size_t(l) || delta < 0)
+        return -1;
+    if (from > delta)
+        from = delta;
+
+    auto sv = [sl](const typename Haystack::value_type *v) { return Haystack(v, sl); };
+
+    auto haystack = haystack0.data();
+    const auto needle = needle0.data();
+    const auto *end = haystack;
+    haystack += from;
+    const std::size_t sl_minus_1 = sl - 1;
+    const auto *n = needle + sl_minus_1;
+    const auto *h = haystack + sl_minus_1;
+    std::size_t hashNeedle = 0, hashHaystack = 0;
+    qsizetype idx;
+
+    if (cs == Qt::CaseSensitive) {
+        for (idx = 0; idx < sl; ++idx) {
+            hashNeedle = (hashNeedle << 1) + valueTypeToUtf16(*(n - idx));
+            hashHaystack = (hashHaystack << 1) + valueTypeToUtf16(*(h - idx));
+        }
+        hashHaystack -= valueTypeToUtf16(*haystack);
+
+        while (haystack >= end) {
+            hashHaystack += valueTypeToUtf16(*haystack);
+            if (hashHaystack == hashNeedle
+                 && qt_compare_strings(needle0, sv(haystack), Qt::CaseSensitive) == 0)
+                return haystack - end;
+            --haystack;
+            REHASH(valueTypeToUtf16(haystack[sl]));
+        }
+    } else {
+        for (idx = 0; idx < sl; ++idx) {
+            hashNeedle = (hashNeedle << 1) + foldCaseHelper(n - idx, needle);
+            hashHaystack = (hashHaystack << 1) + foldCaseHelper(h - idx, end);
+        }
+        hashHaystack -= foldCaseHelper(haystack, end);
+
+        while (haystack >= end) {
+            hashHaystack += foldCaseHelper(haystack, end);
+            if (hashHaystack == hashNeedle
+                 && qt_compare_strings(sv(haystack), needle0, Qt::CaseInsensitive) == 0)
+                return haystack - end;
+            --haystack;
+            REHASH(foldCaseHelper(haystack + sl, end));
+        }
+    }
+    return -1;
+}
+
+qsizetype QtPrivate::findString(QStringView haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs) noexcept
+{
+    if (haystack.size() < needle.size())
+        return -1;
+
+    QVarLengthArray<ushort> s(needle.size());
+    qt_from_latin1(s.data(), needle.latin1(), needle.size());
+    return QtPrivate::findString(haystack, from, QStringView(reinterpret_cast<const QChar*>(s.constData()), s.size()), cs);
+}
+
+qsizetype QtPrivate::findString(QLatin1String haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs) noexcept
+{
+    if (haystack.size() < needle.size())
+        return -1;
+
+    QVarLengthArray<ushort> s(haystack.size());
+    qt_from_latin1(s.data(), haystack.latin1(), haystack.size());
+    return QtPrivate::findString(QStringView(reinterpret_cast<const QChar*>(s.constData()), s.size()), from, needle, cs);
+}
+
+qsizetype QtPrivate::findString(QLatin1String haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs) noexcept
+{
+    if (haystack.size() < needle.size())
+        return -1;
+
+    QVarLengthArray<ushort> h(haystack.size());
+    qt_from_latin1(h.data(), haystack.latin1(), haystack.size());
+    QVarLengthArray<ushort> n(needle.size());
+    qt_from_latin1(n.data(), needle.latin1(), needle.size());
+    return QtPrivate::findString(QStringView(reinterpret_cast<const QChar*>(h.constData()), h.size()), from,
+                                 QStringView(reinterpret_cast<const QChar*>(n.constData()), n.size()), cs);
+}
+
+qsizetype QtPrivate::lastIndexOf(QStringView haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs) noexcept
+{
+    return qLastIndexOf(haystack, from, needle, cs);
+}
+
+qsizetype QtPrivate::lastIndexOf(QStringView haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs) noexcept
+{
+    return qLastIndexOf(haystack, from, needle, cs);
+}
+
+qsizetype QtPrivate::lastIndexOf(QLatin1String haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs) noexcept
+{
+    return qLastIndexOf(haystack, from, needle, cs);
+}
+
+qsizetype QtPrivate::lastIndexOf(QLatin1String haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs) noexcept
+{
+    return qLastIndexOf(haystack, from, needle, cs);
+}
+
 /*!
     \since 4.8
 
@@ -12287,7 +12584,7 @@ QString QString::toHtmlEscaped() const
 /*!
     \internal
  */
-void QAbstractConcatenable::appendLatin1To(const char *a, int len, QChar *out) Q_DECL_NOTHROW
+void QAbstractConcatenable::appendLatin1To(const char *a, int len, QChar *out) noexcept
 {
     qt_from_latin1(reinterpret_cast<ushort *>(out), a, uint(len));
 }
diff --git a/src/corelib/tools/qstring.h b/src/corelib/text/qstring.h
index b138c3f140..5def2c81a1 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -2,6 +2,7 @@
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
+** Copyright (C) 2019 Mail.ru Group.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -56,15 +57,6 @@
 #include <string>
 #include <iterator>
 
-#if defined(Q_OS_ANDROID) && !defined(ANDROID_HAS_WSTRING)
-// std::wstring is disabled on android's glibc, as bionic lacks certain features
-// that libstdc++ checks for (like mbcslen).
-namespace std
-{
-    typedef basic_string<wchar_t> wstring;
-}
-#endif
-
 #include <stdarg.h>
 
 #ifdef truncate
@@ -88,22 +80,29 @@ class QTextCodec;
 class QStringRef;
 template <typename T> class QVector;
 
+namespace QtPrivate {
+template <bool...B> class BoolList;
+}
+
 class QLatin1String
 {
 public:
-    Q_DECL_CONSTEXPR inline QLatin1String() Q_DECL_NOTHROW : m_size(0), m_data(nullptr) {}
-    Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s) Q_DECL_NOTHROW : m_size(s ? int(strlen(s)) : 0), m_data(s) {}
+    Q_DECL_CONSTEXPR inline QLatin1String() noexcept : m_size(0), m_data(nullptr) {}
+    Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s) noexcept : m_size(s ? int(strlen(s)) : 0), m_data(s) {}
     Q_DECL_CONSTEXPR explicit QLatin1String(const char *f, const char *l)
         : QLatin1String(f, int(l - f)) {}
-    Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s, int sz) Q_DECL_NOTHROW : m_size(sz), m_data(s) {}
-    inline explicit QLatin1String(const QByteArray &s) Q_DECL_NOTHROW : m_size(int(qstrnlen(s.constData(), s.size()))), m_data(s.constData()) {}
+    Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s, int sz) noexcept : m_size(sz), m_data(s) {}
+    inline explicit QLatin1String(const QByteArray &s) noexcept : m_size(int(qstrnlen(s.constData(), s.size()))), m_data(s.constData()) {}
 
-    Q_DECL_CONSTEXPR const char *latin1() const Q_DECL_NOTHROW { return m_data; }
-    Q_DECL_CONSTEXPR int size() const Q_DECL_NOTHROW { return m_size; }
-    Q_DECL_CONSTEXPR const char *data() const Q_DECL_NOTHROW { return m_data; }
+    Q_DECL_CONSTEXPR const char *latin1() const noexcept { return m_data; }
+    Q_DECL_CONSTEXPR int size() const noexcept { return m_size; }
+    Q_DECL_CONSTEXPR const char *data() const noexcept { return m_data; }
 
-    Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW { return !data(); }
-    Q_DECL_CONSTEXPR bool isEmpty() const Q_DECL_NOTHROW { return !size(); }
+    Q_DECL_CONSTEXPR bool isNull() const noexcept { return !data(); }
+    Q_DECL_CONSTEXPR bool isEmpty() const noexcept { return !size(); }
+
+    template <typename...Args>
+    Q_REQUIRED_RESULT inline QString arg(Args &&...args) const;
 
     Q_DECL_CONSTEXPR QLatin1Char at(int i) const
     { return Q_ASSERT(i >= 0), Q_ASSERT(i < size()), QLatin1Char(m_data[i]); }
@@ -112,24 +111,45 @@ public:
     Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QLatin1Char front() const { return at(0); }
     Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QLatin1Char back() const { return at(size() - 1); }
 
-    Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::startsWith(*this, s, cs); }
-    Q_REQUIRED_RESULT bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::startsWith(*this, s, cs); }
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool startsWith(QChar c) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool startsWith(QChar c) const noexcept
     { return !isEmpty() && front() == c; }
-    Q_REQUIRED_RESULT inline bool startsWith(QChar c, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline bool startsWith(QChar c, Qt::CaseSensitivity cs) const noexcept
     { return QtPrivate::startsWith(*this, QStringView(&c, 1), cs); }
 
-    Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::endsWith(*this, s, cs); }
-    Q_REQUIRED_RESULT bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::endsWith(*this, s, cs); }
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool endsWith(QChar c) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool endsWith(QChar c) const noexcept
     { return !isEmpty() && back() == c; }
-    Q_REQUIRED_RESULT inline bool endsWith(QChar c, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline bool endsWith(QChar c, Qt::CaseSensitivity cs) const noexcept
     { return QtPrivate::endsWith(*this, QStringView(&c, 1), cs); }
 
+    Q_REQUIRED_RESULT int indexOf(QStringView s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::findString(*this, from, s, cs)); } // ### Qt6: qsizetype
+    Q_REQUIRED_RESULT int indexOf(QLatin1String s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::findString(*this, from, s, cs)); } // ### Qt6: qsizetype
+    Q_REQUIRED_RESULT inline int indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::findString(*this, from, QStringView(&c, 1), cs)); } // ### Qt6: qsizetype
+
+    Q_REQUIRED_RESULT bool contains(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return indexOf(s, 0, cs) != -1; }
+    Q_REQUIRED_RESULT bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return indexOf(s, 0, cs) != -1; }
+    Q_REQUIRED_RESULT inline bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return indexOf(QStringView(&c, 1), 0, cs) != -1; }
+
+    Q_REQUIRED_RESULT int lastIndexOf(QStringView s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsizetype
+    Q_REQUIRED_RESULT int lastIndexOf(QLatin1String s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsizetype
+    Q_REQUIRED_RESULT inline int lastIndexOf(QChar c, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::lastIndexOf(*this, from, QStringView(&c, 1), cs)); } // ### Qt6: qsizetype
+
     using value_type = const char;
     using reference = value_type&;
     using const_reference = reference;
@@ -138,18 +158,18 @@ public:
     using difference_type = int; // violates Container concept requirements
     using size_type = int;       // violates Container concept requirements
 
-    Q_DECL_CONSTEXPR const_iterator begin() const Q_DECL_NOTHROW { return data(); }
-    Q_DECL_CONSTEXPR const_iterator cbegin() const Q_DECL_NOTHROW { return data(); }
-    Q_DECL_CONSTEXPR const_iterator end() const Q_DECL_NOTHROW { return data() + size(); }
-    Q_DECL_CONSTEXPR const_iterator cend() const Q_DECL_NOTHROW { return data() + size(); }
+    Q_DECL_CONSTEXPR const_iterator begin() const noexcept { return data(); }
+    Q_DECL_CONSTEXPR const_iterator cbegin() const noexcept { return data(); }
+    Q_DECL_CONSTEXPR const_iterator end() const noexcept { return data() + size(); }
+    Q_DECL_CONSTEXPR const_iterator cend() const noexcept { return data() + size(); }
 
     using reverse_iterator = std::reverse_iterator<iterator>;
     using const_reverse_iterator = reverse_iterator;
 
-    const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
+    const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); }
 
     Q_DECL_CONSTEXPR QLatin1String mid(int pos) const
     { return Q_ASSERT(pos >= 0), Q_ASSERT(pos <= size()), QLatin1String(m_data + pos, m_size - pos); }
@@ -167,14 +187,14 @@ public:
     Q_DECL_RELAXED_CONSTEXPR void truncate(int n)
     { Q_ASSERT(n >= 0); Q_ASSERT(n <= size()); m_size = n; }
 
-    Q_REQUIRED_RESULT QLatin1String trimmed() const Q_DECL_NOTHROW { return QtPrivate::trimmed(*this); }
+    Q_REQUIRED_RESULT QLatin1String trimmed() const noexcept { return QtPrivate::trimmed(*this); }
 
-    inline bool operator==(const QString &s) const Q_DECL_NOTHROW;
-    inline bool operator!=(const QString &s) const Q_DECL_NOTHROW;
-    inline bool operator>(const QString &s) const Q_DECL_NOTHROW;
-    inline bool operator<(const QString &s) const Q_DECL_NOTHROW;
-    inline bool operator>=(const QString &s) const Q_DECL_NOTHROW;
-    inline bool operator<=(const QString &s) const Q_DECL_NOTHROW;
+    inline bool operator==(const QString &s) const noexcept;
+    inline bool operator!=(const QString &s) const noexcept;
+    inline bool operator>(const QString &s) const noexcept;
+    inline bool operator<(const QString &s) const noexcept;
+    inline bool operator>=(const QString &s) const noexcept;
+    inline bool operator<=(const QString &s) const noexcept;
 
 #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
     inline QT_ASCII_CAST_WARN bool operator==(const char *s) const;
@@ -199,43 +219,50 @@ private:
 Q_DECLARE_TYPEINFO(QLatin1String, Q_MOVABLE_TYPE);
 
 // Qt 4.x compatibility
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_DEPRECATED_X("Use QLatin1String")
 typedef QLatin1String QLatin1Literal;
+#endif
 
 //
 // QLatin1String inline implementations
 //
-inline bool QtPrivate::isLatin1(QLatin1String) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR bool QtPrivate::isLatin1(QLatin1String) noexcept
 { return true; }
 
 //
 // QStringView members that require QLatin1String:
 //
-bool QStringView::startsWith(QLatin1String s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+bool QStringView::startsWith(QLatin1String s, Qt::CaseSensitivity cs) const noexcept
 { return QtPrivate::startsWith(*this, s, cs); }
-bool QStringView::endsWith(QLatin1String s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+bool QStringView::endsWith(QLatin1String s, Qt::CaseSensitivity cs) const noexcept
 { return QtPrivate::endsWith(*this, s, cs); }
+qsizetype QStringView::indexOf(QLatin1String s, qsizetype from, Qt::CaseSensitivity cs) const noexcept
+{ return QtPrivate::findString(*this, from, s, cs); }
+bool QStringView::contains(QLatin1String s, Qt::CaseSensitivity cs) const noexcept
+{ return indexOf(s, 0, cs) != qsizetype(-1); }
+qsizetype QStringView::lastIndexOf(QLatin1String s, qsizetype from, Qt::CaseSensitivity cs) const noexcept
+{ return QtPrivate::lastIndexOf(*this, from, s, cs); }
 
 class Q_CORE_EXPORT QString
 {
 public:
     typedef QStringData Data;
 
-    inline QString() Q_DECL_NOTHROW;
+    inline QString() noexcept;
     explicit QString(const QChar *unicode, int size = -1);
     QString(QChar c);
     QString(int size, QChar c);
     inline QString(QLatin1String latin1);
-    inline QString(const QString &) Q_DECL_NOTHROW;
+    inline QString(const QString &) noexcept;
     inline ~QString();
     QString &operator=(QChar c);
-    QString &operator=(const QString &) Q_DECL_NOTHROW;
+    QString &operator=(const QString &) noexcept;
     QString &operator=(QLatin1String latin1);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QString(QString && other) Q_DECL_NOTHROW : d(other.d) { other.d = Data::sharedNull(); }
-    inline QString &operator=(QString &&other) Q_DECL_NOTHROW
+    inline QString(QString && other) noexcept : d(other.d) { other.d = Data::sharedNull(); }
+    inline QString &operator=(QString &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
-    inline void swap(QString &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    inline void swap(QString &other) noexcept { qSwap(d, other.d); }
     inline int size() const { return d->size; }
     inline int count() const { return d->size; }
     inline int length() const;
@@ -263,9 +290,9 @@ public:
 
     inline const QChar at(int i) const;
     const QChar operator[](int i) const;
-    QCharRef operator[](int i);
+    Q_REQUIRED_RESULT QCharRef operator[](int i);
     const QChar operator[](uint i) const;
-    QCharRef operator[](uint i);
+    Q_REQUIRED_RESULT QCharRef operator[](uint i);
 
     Q_REQUIRED_RESULT inline QChar front() const { return at(0); }
     Q_REQUIRED_RESULT inline QCharRef front();
@@ -302,6 +329,7 @@ public:
                 QChar fillChar = QLatin1Char(' ')) const;
     Q_REQUIRED_RESULT QString arg(QLatin1String a, int fieldWidth = 0,
                 QChar fillChar = QLatin1Char(' ')) const;
+#if QT_STRINGVIEW_LEVEL < 2
     Q_REQUIRED_RESULT QString arg(const QString &a1, const QString &a2) const;
     Q_REQUIRED_RESULT QString arg(const QString &a1, const QString &a2, const QString &a3) const;
     Q_REQUIRED_RESULT QString arg(const QString &a1, const QString &a2, const QString &a3,
@@ -319,25 +347,68 @@ public:
     Q_REQUIRED_RESULT QString arg(const QString &a1, const QString &a2, const QString &a3,
                 const QString &a4, const QString &a5, const QString &a6,
                 const QString &a7, const QString &a8, const QString &a9) const;
+#endif
+private:
+    template <typename T>
+    struct is_convertible_to_view_or_qstring_helper
+        : std::integral_constant<bool,
+            std::is_convertible<T, QString>::value ||
+            std::is_convertible<T, QStringView>::value ||
+            std::is_convertible<T, QLatin1String>::value> {};
+    template <typename T>
+    struct is_convertible_to_view_or_qstring
+        : is_convertible_to_view_or_qstring_helper<typename std::decay<T>::type> {};
+public:
+    template <typename...Args>
+    Q_REQUIRED_RESULT
+#ifdef Q_CLANG_QDOC
+    QString
+#else
+    typename std::enable_if<
+        sizeof...(Args) >= 2 && std::is_same<
+            QtPrivate::BoolList<is_convertible_to_view_or_qstring<Args>::value..., true>,
+            QtPrivate::BoolList<true, is_convertible_to_view_or_qstring<Args>::value...>
+        >::value,
+        QString
+    >::type
+#endif
+    arg(Args &&...args) const
+    { return qToStringViewIgnoringNull(*this).arg(std::forward<Args>(args)...); }
 
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use vasprintf(), arg() or QTextStream instead")
     QString &vsprintf(const char *format, va_list ap) Q_ATTRIBUTE_FORMAT_PRINTF(2, 0);
+    QT_DEPRECATED_X("Use asprintf(), arg() or QTextStream instead")
     QString &sprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(2, 3);
+#endif
     static QString vasprintf(const char *format, va_list ap) Q_ATTRIBUTE_FORMAT_PRINTF(1, 0);
     static QString asprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(1, 2);
 
     int indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int indexOf(const QString &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int indexOf(QLatin1String s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#if QT_STRINGVIEW_LEVEL < 2
+    int indexOf(const QString &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int indexOf(const QStringRef &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#endif
+    Q_REQUIRED_RESULT int indexOf(QStringView s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::findString(*this, from, s, cs)); } // ### Qt6: qsizetype
     int lastIndexOf(QChar c, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int lastIndexOf(const QString &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int lastIndexOf(QLatin1String s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#if QT_STRINGVIEW_LEVEL < 2
+    int lastIndexOf(const QString &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int lastIndexOf(const QStringRef &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#endif
+
+    Q_REQUIRED_RESULT int lastIndexOf(QStringView s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsizetype
 
     inline bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#if QT_STRINGVIEW_LEVEL < 2
     inline bool contains(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    inline bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     inline bool contains(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#endif
+    inline bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    inline bool contains(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
     int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int count(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int count(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
@@ -395,7 +466,7 @@ public:
     bool startsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     bool startsWith(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
 #endif
-    Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::startsWith(*this, s, cs); }
     bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     bool startsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
@@ -404,7 +475,7 @@ public:
     bool endsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     bool endsWith(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
 #endif
-    Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::endsWith(*this, s, cs); }
     bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     bool endsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
@@ -529,6 +600,30 @@ public:
     Q_REQUIRED_RESULT QStringList split(const QRegularExpression &sep, SplitBehavior behavior = KeepEmptyParts) const;
     Q_REQUIRED_RESULT QVector<QStringRef> splitRef(const QRegularExpression &sep, SplitBehavior behavior = KeepEmptyParts) const;
 #endif
+
+private:
+    static Q_DECL_CONSTEXPR SplitBehavior _sb(Qt::SplitBehavior sb) Q_DECL_NOTHROW
+    { return sb & Qt::SkipEmptyParts ? SkipEmptyParts : KeepEmptyParts; }
+public:
+
+    Q_REQUIRED_RESULT inline QStringList split(const QString &sep, Qt::SplitBehavior behavior,
+                                               Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    Q_REQUIRED_RESULT inline QVector<QStringRef> splitRef(const QString &sep, Qt::SplitBehavior behavior,
+                                                          Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    Q_REQUIRED_RESULT inline QStringList split(QChar sep, Qt::SplitBehavior behavior,
+                                               Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    Q_REQUIRED_RESULT inline QVector<QStringRef> splitRef(QChar sep, Qt::SplitBehavior behavior,
+                                                          Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#ifndef QT_NO_REGEXP
+    Q_REQUIRED_RESULT inline QStringList split(const QRegExp &sep, Qt::SplitBehavior behavior) const;
+    Q_REQUIRED_RESULT inline QVector<QStringRef> splitRef(const QRegExp &sep, Qt::SplitBehavior behavior) const;
+#endif
+#ifndef QT_NO_REGULAREXPRESSION
+    Q_REQUIRED_RESULT inline QStringList split(const QRegularExpression &sep, Qt::SplitBehavior behavior) const;
+    Q_REQUIRED_RESULT inline QVector<QStringRef> splitRef(const QRegularExpression &sep, Qt::SplitBehavior behavior) const;
+#endif
+
+
     enum NormalizationForm {
         NormalizationForm_D,
         NormalizationForm_C,
@@ -609,25 +704,25 @@ public:
     inline QString &setUtf16(const ushort *utf16, int size);
 
 #if QT_STRINGVIEW_LEVEL < 2
-    int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
-    inline int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
+    int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+    inline int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
 #endif
-    int compare(QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
-    inline int compare(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
+    int compare(QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+    inline int compare(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
 
     static inline int compare(const QString &s1, const QString &s2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW
+                              Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept
     { return s1.compare(s2, cs); }
 
     static inline int compare(const QString &s1, QLatin1String s2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW
+                              Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept
     { return s1.compare(s2, cs); }
     static inline int compare(QLatin1String s1, const QString &s2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW
+                              Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept
     { return -s2.compare(s1, cs); }
 
     static int compare(const QString &s1, const QStringRef &s2,
-                       Qt::CaseSensitivity = Qt::CaseSensitive) Q_DECL_NOTHROW;
+                       Qt::CaseSensitivity = Qt::CaseSensitive) noexcept;
 
     int localeAwareCompare(const QString& s) const;
     static int localeAwareCompare(const QString& s1, const QString& s2)
@@ -667,19 +762,19 @@ public:
     static QString number(qulonglong, int base=10);
     static QString number(double, char f='g', int prec=6);
 
-    friend Q_CORE_EXPORT bool operator==(const QString &s1, const QString &s2) Q_DECL_NOTHROW;
-    friend Q_CORE_EXPORT bool operator<(const QString &s1, const QString &s2) Q_DECL_NOTHROW;
-    friend inline bool operator>(const QString &s1, const QString &s2) Q_DECL_NOTHROW { return s2 < s1; }
-    friend inline bool operator!=(const QString &s1, const QString &s2) Q_DECL_NOTHROW { return !(s1 == s2); }
-    friend inline bool operator<=(const QString &s1, const QString &s2) Q_DECL_NOTHROW { return !(s1 > s2); }
-    friend inline bool operator>=(const QString &s1, const QString &s2) Q_DECL_NOTHROW { return !(s1 < s2); }
+    friend Q_CORE_EXPORT bool operator==(const QString &s1, const QString &s2) noexcept;
+    friend Q_CORE_EXPORT bool operator<(const QString &s1, const QString &s2) noexcept;
+    friend inline bool operator>(const QString &s1, const QString &s2) noexcept { return s2 < s1; }
+    friend inline bool operator!=(const QString &s1, const QString &s2) noexcept { return !(s1 == s2); }
+    friend inline bool operator<=(const QString &s1, const QString &s2) noexcept { return !(s1 > s2); }
+    friend inline bool operator>=(const QString &s1, const QString &s2) noexcept { return !(s1 < s2); }
 
-    bool operator==(QLatin1String s) const Q_DECL_NOTHROW;
-    bool operator<(QLatin1String s) const Q_DECL_NOTHROW;
-    bool operator>(QLatin1String s) const Q_DECL_NOTHROW;
-    inline bool operator!=(QLatin1String s) const Q_DECL_NOTHROW { return !operator==(s); }
-    inline bool operator<=(QLatin1String s) const Q_DECL_NOTHROW { return !operator>(s); }
-    inline bool operator>=(QLatin1String s) const Q_DECL_NOTHROW { return !operator<(s); }
+    bool operator==(QLatin1String s) const noexcept;
+    bool operator<(QLatin1String s) const noexcept;
+    bool operator>(QLatin1String s) const noexcept;
+    inline bool operator!=(QLatin1String s) const noexcept { return !operator==(s); }
+    inline bool operator<=(QLatin1String s) const noexcept { return !operator>(s); }
+    inline bool operator>=(QLatin1String s) const noexcept { return !operator<(s); }
 
     // ASCII compatibility
 #if defined(QT_RESTRICTED_CAST_FROM_ASCII)
@@ -840,30 +935,30 @@ private:
 
     Data *d;
 
-    friend inline bool operator==(QChar, const QString &) Q_DECL_NOTHROW;
-    friend inline bool operator< (QChar, const QString &) Q_DECL_NOTHROW;
-    friend inline bool operator> (QChar, const QString &) Q_DECL_NOTHROW;
-    friend inline bool operator==(QChar, const QStringRef &) Q_DECL_NOTHROW;
-    friend inline bool operator< (QChar, const QStringRef &) Q_DECL_NOTHROW;
-    friend inline bool operator> (QChar, const QStringRef &) Q_DECL_NOTHROW;
-    friend inline bool operator==(QChar, QLatin1String) Q_DECL_NOTHROW;
-    friend inline bool operator< (QChar, QLatin1String) Q_DECL_NOTHROW;
-    friend inline bool operator> (QChar, QLatin1String) Q_DECL_NOTHROW;
+    friend inline bool operator==(QChar, const QString &) noexcept;
+    friend inline bool operator< (QChar, const QString &) noexcept;
+    friend inline bool operator> (QChar, const QString &) noexcept;
+    friend inline bool operator==(QChar, const QStringRef &) noexcept;
+    friend inline bool operator< (QChar, const QStringRef &) noexcept;
+    friend inline bool operator> (QChar, const QStringRef &) noexcept;
+    friend inline bool operator==(QChar, QLatin1String) noexcept;
+    friend inline bool operator< (QChar, QLatin1String) noexcept;
+    friend inline bool operator> (QChar, QLatin1String) noexcept;
 
     void reallocData(uint alloc, bool grow = false);
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     void expand(int i);
-#endif
     QString multiArg(int numArgs, const QString **args) const;
+#endif
     static int compare_helper(const QChar *data1, int length1,
                               const QChar *data2, int length2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
+                              Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
     static int compare_helper(const QChar *data1, int length1,
                               const char *data2, int length2,
                               Qt::CaseSensitivity cs = Qt::CaseSensitive);
     static int compare_helper(const QChar *data1, int length1,
                               QLatin1String s2,
-                              Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
+                              Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
     static int localeAwareCompare_helper(const QChar *data1, int length1,
                                          const QChar *data2, int length2);
     static QString toLower_helper(const QString &str);
@@ -931,11 +1026,11 @@ inline QString::QString(QLatin1String aLatin1) : d(fromLatin1_helper(aLatin1.lat
 inline int QString::length() const
 { return d->size; }
 inline const QChar QString::at(int i) const
-{ Q_ASSERT(uint(i) < uint(size())); return d->data()[i]; }
+{ Q_ASSERT(uint(i) < uint(size())); return QChar(d->data()[i]); }
 inline const QChar QString::operator[](int i) const
-{ Q_ASSERT(uint(i) < uint(size())); return d->data()[i]; }
+{ Q_ASSERT(uint(i) < uint(size())); return QChar(d->data()[i]); }
 inline const QChar QString::operator[](uint i) const
-{ Q_ASSERT(i < uint(size())); return d->data()[i]; }
+{ Q_ASSERT(i < uint(size())); return QChar(d->data()[i]); }
 inline bool QString::isEmpty() const
 { return d->size == 0; }
 inline const QChar *QString::unicode() const
@@ -952,7 +1047,7 @@ inline bool QString::isDetached() const
 { return !d->ref.isShared(); }
 inline void QString::clear()
 { if (!isNull()) *this = QString(); }
-inline QString::QString(const QString &other) Q_DECL_NOTHROW : d(other.d)
+inline QString::QString(const QString &other) noexcept : d(other.d)
 { Q_ASSERT(&other != this); d->ref.ref(); }
 inline int QString::capacity() const
 { return d->alloc ? d->alloc - 1 : 0; }
@@ -982,31 +1077,33 @@ inline QString QString::arg(short a, int fieldWidth, int base, QChar fillChar) c
 { return arg(qlonglong(a), fieldWidth, base, fillChar); }
 inline QString QString::arg(ushort a, int fieldWidth, int base, QChar fillChar) const
 { return arg(qulonglong(a), fieldWidth, base, fillChar); }
+#if QT_STRINGVIEW_LEVEL < 2
 inline QString QString::arg(const QString &a1, const QString &a2) const
-{ const QString *args[2] = { &a1, &a2 }; return multiArg(2, args); }
+{ return qToStringViewIgnoringNull(*this).arg(a1, a2); }
 inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3) const
-{ const QString *args[3] = { &a1, &a2, &a3 }; return multiArg(3, args); }
+{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3); }
 inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
                             const QString &a4) const
-{ const QString *args[4] = { &a1, &a2, &a3, &a4 }; return multiArg(4, args); }
+{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4); }
 inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
                             const QString &a4, const QString &a5) const
-{ const QString *args[5] = { &a1, &a2, &a3, &a4, &a5 }; return multiArg(5, args); }
+{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5); }
 inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
                             const QString &a4, const QString &a5, const QString &a6) const
-{ const QString *args[6] = { &a1, &a2, &a3, &a4, &a5, &a6 }; return multiArg(6, args); }
+{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5, a6); }
 inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
                             const QString &a4, const QString &a5, const QString &a6,
                             const QString &a7) const
-{ const QString *args[7] = { &a1, &a2, &a3, &a4, &a5, &a6,  &a7 }; return multiArg(7, args); }
+{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5, a6, a7); }
 inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
                             const QString &a4, const QString &a5, const QString &a6,
                             const QString &a7, const QString &a8) const
-{ const QString *args[8] = { &a1, &a2, &a3, &a4, &a5, &a6,  &a7, &a8 }; return multiArg(8, args); }
+{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5, a6, a7, a8); }
 inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3,
                             const QString &a4, const QString &a5, const QString &a6,
                             const QString &a7, const QString &a8, const QString &a9) const
-{ const QString *args[9] = { &a1, &a2, &a3, &a4, &a5, &a6,  &a7, &a8, &a9 }; return multiArg(9, args); }
+{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5, a6, a7, a8, a9); }
+#endif
 
 inline QString QString::section(QChar asep, int astart, int aend, SectionFlags aflags) const
 { return section(QString(asep), astart, aend, aflags); }
@@ -1017,11 +1114,18 @@ QT_WARNING_DISABLE_INTEL(111)   // "statement is unreachable"
 
 inline int QString::toWCharArray(wchar_t *array) const
 {
+    return qToStringViewIgnoringNull(*this).toWCharArray(array);
+}
+
+int QStringView::toWCharArray(wchar_t *array) const
+{
     if (sizeof(wchar_t) == sizeof(QChar)) {
-        memcpy(array, d->data(), sizeof(QChar) * size());
+        if (auto src = data())
+            memcpy(array, src, sizeof(QChar) * size());
         return size();
     } else {
-        return toUcs4_helper(d->data(), size(), reinterpret_cast<uint *>(array));
+        return QString::toUcs4_helper(reinterpret_cast<const ushort *>(data()), int(size()),
+                                      reinterpret_cast<uint *>(array));
     }
 }
 
@@ -1033,8 +1137,11 @@ inline QString QString::fromWCharArray(const wchar_t *string, int size)
                                             : fromUcs4(reinterpret_cast<const uint *>(string), size);
 }
 
-
-class Q_CORE_EXPORT QCharRef {
+class
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+Q_CORE_EXPORT
+#endif
+QCharRef { // ### Qt 7: remove
     QString &s;
     int i;
     inline QCharRef(QString &str, int idx)
@@ -1046,10 +1153,33 @@ public:
 
     // all this is not documented: We just say "like QChar" and let it be.
     inline operator QChar() const
-    { return i < s.d->size ? s.d->data()[i] : 0; }
+    {
+        using namespace QtPrivate::DeprecatedRefClassBehavior;
+        if (Q_LIKELY(i < s.d->size))
+            return QChar(s.d->data()[i]);
+#ifdef QT_DEBUG
+        warn(WarningType::OutOfRange, EmittingClass::QCharRef);
+#endif
+        return QChar();
+    }
     inline QCharRef &operator=(QChar c)
-    { if (i >= s.d->size) s.resize(i + 1, QLatin1Char(' ')); else s.detach();
-      s.d->data()[i] = c.unicode(); return *this; }
+    {
+        using namespace QtPrivate::DeprecatedRefClassBehavior;
+        if (Q_UNLIKELY(i >= s.d->size)) {
+#ifdef QT_DEBUG
+            warn(WarningType::OutOfRange, EmittingClass::QCharRef);
+#endif
+            s.resize(i + 1, QLatin1Char(' '));
+        } else {
+#ifdef QT_DEBUG
+            if (Q_UNLIKELY(!s.isDetached()))
+                warn(WarningType::DelayedDetach, EmittingClass::QCharRef);
+#endif
+            s.detach();
+        }
+        s.d->data()[i] = c.unicode();
+        return *this;
+    }
 
     // An operator= for each QChar cast constructors
 #ifndef QT_NO_CAST_FROM_ASCII
@@ -1129,7 +1259,7 @@ inline void QCharRef::setRow(uchar arow) { QChar(*this).setRow(arow); }
 inline void QCharRef::setCell(uchar acell) { QChar(*this).setCell(acell); }
 
 
-inline QString::QString() Q_DECL_NOTHROW : d(Data::sharedNull()) {}
+inline QString::QString() noexcept : d(Data::sharedNull()) {}
 inline QString::~QString() { if (!d->ref.deref()) Data::deallocate(d); }
 
 inline void QString::reserve(int asize)
@@ -1158,9 +1288,9 @@ inline void QString::squeeze()
 inline QString &QString::setUtf16(const ushort *autf16, int asize)
 { return setUnicode(reinterpret_cast<const QChar *>(autf16), asize); }
 inline QCharRef QString::operator[](int i)
-{ Q_ASSERT(i >= 0); return QCharRef(*this, i); }
+{ Q_ASSERT(i >= 0); detach(); return QCharRef(*this, i); }
 inline QCharRef QString::operator[](uint i)
-{ return QCharRef(*this, i); }
+{  detach(); return QCharRef(*this, i); }
 inline QCharRef QString::front() { return operator[](0); }
 inline QCharRef QString::back() { return operator[](size() - 1); }
 inline QString::iterator QString::begin()
@@ -1179,14 +1309,18 @@ inline QString::const_iterator QString::cend() const
 { return reinterpret_cast<const QChar*>(d->data() + d->size); }
 inline QString::const_iterator QString::constEnd() const
 { return reinterpret_cast<const QChar*>(d->data() + d->size); }
+#if QT_STRINGVIEW_LEVEL < 2
 inline bool QString::contains(const QString &s, Qt::CaseSensitivity cs) const
 { return indexOf(s, 0, cs) != -1; }
 inline bool QString::contains(const QStringRef &s, Qt::CaseSensitivity cs) const
 { return indexOf(s, 0, cs) != -1; }
+#endif
 inline bool QString::contains(QLatin1String s, Qt::CaseSensitivity cs) const
 { return indexOf(s, 0, cs) != -1; }
 inline bool QString::contains(QChar c, Qt::CaseSensitivity cs) const
 { return indexOf(c, 0, cs) != -1; }
+inline bool QString::contains(QStringView s, Qt::CaseSensitivity cs) const noexcept
+{ return indexOf(s, 0, cs) != -1; }
 
 #if QT_DEPRECATED_SINCE(5, 9)
 inline bool operator==(QString::Null, QString::Null) { return true; }
@@ -1201,34 +1335,34 @@ QT_DEPRECATED_X("use !QString::isNull()")
 inline bool operator!=(const QString &s, QString::Null) { return !s.isNull(); }
 #endif
 
-inline bool operator==(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
+inline bool operator==(QLatin1String s1, QLatin1String s2) noexcept
 { return s1.size() == s2.size() && (!s1.size() || !memcmp(s1.latin1(), s2.latin1(), s1.size())); }
-inline bool operator!=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
+inline bool operator!=(QLatin1String s1, QLatin1String s2) noexcept
 { return !operator==(s1, s2); }
-inline bool operator<(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
+inline bool operator<(QLatin1String s1, QLatin1String s2) noexcept
 {
     const int len = qMin(s1.size(), s2.size());
     const int r = len ? memcmp(s1.latin1(), s2.latin1(), len) : 0;
     return r < 0 || (r == 0 && s1.size() < s2.size());
 }
-inline bool operator>(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
+inline bool operator>(QLatin1String s1, QLatin1String s2) noexcept
 { return operator<(s2, s1); }
-inline bool operator<=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
+inline bool operator<=(QLatin1String s1, QLatin1String s2) noexcept
 { return !operator>(s1, s2); }
-inline bool operator>=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW
+inline bool operator>=(QLatin1String s1, QLatin1String s2) noexcept
 { return !operator<(s1, s2); }
 
-inline bool QLatin1String::operator==(const QString &s) const Q_DECL_NOTHROW
+inline bool QLatin1String::operator==(const QString &s) const noexcept
 { return s == *this; }
-inline bool QLatin1String::operator!=(const QString &s) const Q_DECL_NOTHROW
+inline bool QLatin1String::operator!=(const QString &s) const noexcept
 { return s != *this; }
-inline bool QLatin1String::operator>(const QString &s) const Q_DECL_NOTHROW
+inline bool QLatin1String::operator>(const QString &s) const noexcept
 { return s < *this; }
-inline bool QLatin1String::operator<(const QString &s) const Q_DECL_NOTHROW
+inline bool QLatin1String::operator<(const QString &s) const noexcept
 { return s > *this; }
-inline bool QLatin1String::operator>=(const QString &s) const Q_DECL_NOTHROW
+inline bool QLatin1String::operator>=(const QString &s) const noexcept
 { return s <= *this; }
-inline bool QLatin1String::operator<=(const QString &s) const Q_DECL_NOTHROW
+inline bool QLatin1String::operator<=(const QString &s) const noexcept
 { return s >= *this; }
 
 #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
@@ -1376,14 +1510,12 @@ inline std::wstring QString::toStdWString() const
 {
     std::wstring str;
     str.resize(length());
-
-#ifdef Q_CC_MSVC
-    // VS2005 crashes if the string is empty
-    if (!length())
-        return str;
+#if __cplusplus >= 201703L
+    str.resize(toWCharArray(str.data()));
+#else
+    if (length())
+        str.resize(toWCharArray(&str.front()));
 #endif
-
-    str.resize(toWCharArray(&(*str.begin())));
     return str;
 }
 
@@ -1437,14 +1569,12 @@ public:
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     // ### Qt 6: remove all of these, the implicit ones are fine
-    QStringRef(const QStringRef &other) Q_DECL_NOTHROW
+    QStringRef(const QStringRef &other) noexcept
         :m_string(other.m_string), m_position(other.m_position), m_size(other.m_size)
         {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    QStringRef(QStringRef &&other) Q_DECL_NOTHROW : m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {}
-    QStringRef &operator=(QStringRef &&other) Q_DECL_NOTHROW { return *this = other; }
-#endif
-    QStringRef &operator=(const QStringRef &other) Q_DECL_NOTHROW
+    QStringRef(QStringRef &&other) noexcept : m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {}
+    QStringRef &operator=(QStringRef &&other) noexcept { return *this = other; }
+    QStringRef &operator=(const QStringRef &other) noexcept
     {
         m_string = other.m_string; m_position = other.m_position;
         m_size = other.m_size; return *this;
@@ -1458,19 +1588,30 @@ public:
     inline int count() const { return m_size; }
     inline int length() const { return m_size; }
 
+#if QT_STRINGVIEW_LEVEL < 2
     int indexOf(const QString &str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    int indexOf(const QStringRef &str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#endif
+    Q_REQUIRED_RESULT int indexOf(QStringView s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::findString(*this, from, s, cs)); } // ### Qt6: qsizetype
     int indexOf(QChar ch, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int indexOf(QLatin1String str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int indexOf(const QStringRef &str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#if QT_STRINGVIEW_LEVEL < 2
+    int lastIndexOf(const QStringRef &str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int lastIndexOf(const QString &str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#endif
     int lastIndexOf(QChar ch, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int lastIndexOf(QLatin1String str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    int lastIndexOf(const QStringRef &str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    Q_REQUIRED_RESULT int lastIndexOf(QStringView s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsizetype
 
+#if QT_STRINGVIEW_LEVEL < 2
     inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    inline bool contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+#endif
     inline bool contains(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     inline bool contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
-    inline bool contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    inline bool contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
 
     int count(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
@@ -1481,14 +1622,19 @@ public:
     Q_REQUIRED_RESULT QVector<QStringRef> split(QChar sep, QString::SplitBehavior behavior = QString::KeepEmptyParts,
                       Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
 
+    Q_REQUIRED_RESULT inline QVector<QStringRef> split(const QString &sep, Qt::SplitBehavior behavior,
+                                                       Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    Q_REQUIRED_RESULT inline QVector<QStringRef> split(QChar sep, Qt::SplitBehavior behavior,
+                                                       Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+
     Q_REQUIRED_RESULT QStringRef left(int n) const;
     Q_REQUIRED_RESULT QStringRef right(int n) const;
     Q_REQUIRED_RESULT QStringRef mid(int pos, int n = -1) const;
     Q_REQUIRED_RESULT QStringRef chopped(int n) const
     { Q_ASSERT(n >= 0); Q_ASSERT(n <= size()); return left(size() - n); }
 
-    void truncate(int pos) Q_DECL_NOTHROW { m_size = qBound(0, pos, m_size); }
-    void chop(int n) Q_DECL_NOTHROW
+    void truncate(int pos) noexcept { m_size = qBound(0, pos, m_size); }
+    void chop(int n) noexcept
     {
         if (n >= m_size)
             m_size = 0;
@@ -1498,7 +1644,7 @@ public:
 
     bool isRightToLeft() const;
 
-    Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::startsWith(*this, s, cs); }
     bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     bool startsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
@@ -1507,7 +1653,7 @@ public:
     bool startsWith(const QStringRef &c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
 #endif
 
-    Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::endsWith(*this, s, cs); }
     bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     bool endsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
@@ -1570,19 +1716,19 @@ public:
     inline QT_ASCII_CAST_WARN bool operator>=(const char *s) const;
 #endif
 
-    int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
-    int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
-    int compare(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
+    int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+    int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+    int compare(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
 #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
     int compare(const QByteArray &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
     { return QString::compare_helper(unicode(), size(), s.data(), qstrnlen(s.data(), s.size()), cs); }
 #endif
     static int compare(const QStringRef &s1, const QString &s2,
-                       Qt::CaseSensitivity = Qt::CaseSensitive) Q_DECL_NOTHROW;
+                       Qt::CaseSensitivity = Qt::CaseSensitive) noexcept;
     static int compare(const QStringRef &s1, const QStringRef &s2,
-                       Qt::CaseSensitivity = Qt::CaseSensitive) Q_DECL_NOTHROW;
+                       Qt::CaseSensitivity = Qt::CaseSensitive) noexcept;
     static int compare(const QStringRef &s1, QLatin1String s2,
-                       Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
+                       Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
 
     int localeAwareCompare(const QString &s) const;
     int localeAwareCompare(const QStringRef &s) const;
@@ -1613,162 +1759,162 @@ inline QStringRef::QStringRef(const QString *aString)
     :m_string(aString), m_position(0), m_size(aString?aString->size() : 0){}
 
 // QStringRef <> QStringRef
-Q_CORE_EXPORT bool operator==(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW;
-inline bool operator!=(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW
+Q_CORE_EXPORT bool operator==(const QStringRef &s1, const QStringRef &s2) noexcept;
+inline bool operator!=(const QStringRef &s1, const QStringRef &s2) noexcept
 { return !(s1 == s2); }
-Q_CORE_EXPORT bool operator<(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW;
-inline bool operator>(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW
+Q_CORE_EXPORT bool operator<(const QStringRef &s1, const QStringRef &s2) noexcept;
+inline bool operator>(const QStringRef &s1, const QStringRef &s2) noexcept
 { return s2 < s1; }
-inline bool operator<=(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW
+inline bool operator<=(const QStringRef &s1, const QStringRef &s2) noexcept
 { return !(s1 > s2); }
-inline bool operator>=(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW
+inline bool operator>=(const QStringRef &s1, const QStringRef &s2) noexcept
 { return !(s1 < s2); }
 
 // QString <> QStringRef
-Q_CORE_EXPORT bool operator==(const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW;
-inline bool operator!=(const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) != 0; }
-inline bool operator< (const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) <  0; }
-inline bool operator> (const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) >  0; }
-inline bool operator<=(const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) <= 0; }
-inline bool operator>=(const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) >= 0; }
-
-inline bool operator==(const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs == lhs; }
-inline bool operator!=(const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs != lhs; }
-inline bool operator< (const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs >  lhs; }
-inline bool operator> (const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs <  lhs; }
-inline bool operator<=(const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs >= lhs; }
-inline bool operator>=(const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs <= lhs; }
+Q_CORE_EXPORT bool operator==(const QString &lhs, const QStringRef &rhs) noexcept;
+inline bool operator!=(const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) != 0; }
+inline bool operator< (const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) <  0; }
+inline bool operator> (const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) >  0; }
+inline bool operator<=(const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) <= 0; }
+inline bool operator>=(const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) >= 0; }
+
+inline bool operator==(const QStringRef &lhs, const QString &rhs) noexcept { return rhs == lhs; }
+inline bool operator!=(const QStringRef &lhs, const QString &rhs) noexcept { return rhs != lhs; }
+inline bool operator< (const QStringRef &lhs, const QString &rhs) noexcept { return rhs >  lhs; }
+inline bool operator> (const QStringRef &lhs, const QString &rhs) noexcept { return rhs <  lhs; }
+inline bool operator<=(const QStringRef &lhs, const QString &rhs) noexcept { return rhs >= lhs; }
+inline bool operator>=(const QStringRef &lhs, const QString &rhs) noexcept { return rhs <= lhs; }
 
 #if QT_STRINGVIEW_LEVEL < 2
-inline int QString::compare(const QStringRef &s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+inline int QString::compare(const QStringRef &s, Qt::CaseSensitivity cs) const noexcept
 { return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); }
 #endif
-inline int QString::compare(QStringView s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+inline int QString::compare(QStringView s, Qt::CaseSensitivity cs) const noexcept
 { return -s.compare(*this, cs); }
-inline int QString::compare(const QString &s1, const QStringRef &s2, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+inline int QString::compare(const QString &s1, const QStringRef &s2, Qt::CaseSensitivity cs) noexcept
 { return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); }
-inline int QStringRef::compare(const QString &s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+inline int QStringRef::compare(const QString &s, Qt::CaseSensitivity cs) const noexcept
 { return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); }
-inline int QStringRef::compare(const QStringRef &s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+inline int QStringRef::compare(const QStringRef &s, Qt::CaseSensitivity cs) const noexcept
 { return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); }
-inline int QStringRef::compare(QLatin1String s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+inline int QStringRef::compare(QLatin1String s, Qt::CaseSensitivity cs) const noexcept
 { return QString::compare_helper(constData(), length(), s, cs); }
-inline int QStringRef::compare(const QStringRef &s1, const QString &s2, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+inline int QStringRef::compare(const QStringRef &s1, const QString &s2, Qt::CaseSensitivity cs) noexcept
 { return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); }
-inline int QStringRef::compare(const QStringRef &s1, const QStringRef &s2, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+inline int QStringRef::compare(const QStringRef &s1, const QStringRef &s2, Qt::CaseSensitivity cs) noexcept
 { return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); }
-inline int QStringRef::compare(const QStringRef &s1, QLatin1String s2, Qt::CaseSensitivity cs) Q_DECL_NOTHROW
+inline int QStringRef::compare(const QStringRef &s1, QLatin1String s2, Qt::CaseSensitivity cs) noexcept
 { return QString::compare_helper(s1.constData(), s1.length(), s2, cs); }
 
 // QLatin1String <> QStringRef
-Q_CORE_EXPORT bool operator==(QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW;
-inline bool operator!=(QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) != 0; }
-inline bool operator< (QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) >  0; }
-inline bool operator> (QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) <  0; }
-inline bool operator<=(QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) >= 0; }
-inline bool operator>=(QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) <= 0; }
-
-inline bool operator==(const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs == lhs; }
-inline bool operator!=(const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs != lhs; }
-inline bool operator< (const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs >  lhs; }
-inline bool operator> (const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs <  lhs; }
-inline bool operator<=(const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs >= lhs; }
-inline bool operator>=(const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs <= lhs; }
+Q_CORE_EXPORT bool operator==(QLatin1String lhs, const QStringRef &rhs) noexcept;
+inline bool operator!=(QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) != 0; }
+inline bool operator< (QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) >  0; }
+inline bool operator> (QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) <  0; }
+inline bool operator<=(QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) >= 0; }
+inline bool operator>=(QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) <= 0; }
+
+inline bool operator==(const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs == lhs; }
+inline bool operator!=(const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs != lhs; }
+inline bool operator< (const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs >  lhs; }
+inline bool operator> (const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs <  lhs; }
+inline bool operator<=(const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs >= lhs; }
+inline bool operator>=(const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs <= lhs; }
 
 // QChar <> QString
-inline bool operator==(QChar lhs, const QString &rhs) Q_DECL_NOTHROW
+inline bool operator==(QChar lhs, const QString &rhs) noexcept
 { return rhs.size() == 1 && lhs == rhs.front(); }
-inline bool operator< (QChar lhs, const QString &rhs) Q_DECL_NOTHROW
+inline bool operator< (QChar lhs, const QString &rhs) noexcept
 { return QString::compare_helper(&lhs, 1, rhs.data(), rhs.size()) <  0; }
-inline bool operator> (QChar lhs, const QString &rhs) Q_DECL_NOTHROW
+inline bool operator> (QChar lhs, const QString &rhs) noexcept
 { return QString::compare_helper(&lhs, 1, rhs.data(), rhs.size()) >  0; }
 
-inline bool operator!=(QChar lhs, const QString &rhs) Q_DECL_NOTHROW { return !(lhs == rhs); }
-inline bool operator<=(QChar lhs, const QString &rhs) Q_DECL_NOTHROW { return !(lhs >  rhs); }
-inline bool operator>=(QChar lhs, const QString &rhs) Q_DECL_NOTHROW { return !(lhs <  rhs); }
+inline bool operator!=(QChar lhs, const QString &rhs) noexcept { return !(lhs == rhs); }
+inline bool operator<=(QChar lhs, const QString &rhs) noexcept { return !(lhs >  rhs); }
+inline bool operator>=(QChar lhs, const QString &rhs) noexcept { return !(lhs <  rhs); }
 
-inline bool operator==(const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs == lhs; }
-inline bool operator!=(const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs == lhs); }
-inline bool operator< (const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs >  lhs; }
-inline bool operator> (const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs <  lhs; }
-inline bool operator<=(const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs <  lhs); }
-inline bool operator>=(const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs >  lhs); }
+inline bool operator==(const QString &lhs, QChar rhs) noexcept { return   rhs == lhs; }
+inline bool operator!=(const QString &lhs, QChar rhs) noexcept { return !(rhs == lhs); }
+inline bool operator< (const QString &lhs, QChar rhs) noexcept { return   rhs >  lhs; }
+inline bool operator> (const QString &lhs, QChar rhs) noexcept { return   rhs <  lhs; }
+inline bool operator<=(const QString &lhs, QChar rhs) noexcept { return !(rhs <  lhs); }
+inline bool operator>=(const QString &lhs, QChar rhs) noexcept { return !(rhs >  lhs); }
 
 // QChar <> QStringRef
-inline bool operator==(QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW
+inline bool operator==(QChar lhs, const QStringRef &rhs) noexcept
 { return rhs.size() == 1 && lhs == rhs.front(); }
-inline bool operator< (QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW
+inline bool operator< (QChar lhs, const QStringRef &rhs) noexcept
 { return QString::compare_helper(&lhs, 1, rhs.data(), rhs.size()) <  0; }
-inline bool operator> (QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW
+inline bool operator> (QChar lhs, const QStringRef &rhs) noexcept
 { return QString::compare_helper(&lhs, 1, rhs.data(), rhs.size()) >  0; }
 
-inline bool operator!=(QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return !(lhs == rhs); }
-inline bool operator<=(QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return !(lhs >  rhs); }
-inline bool operator>=(QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return !(lhs <  rhs); }
+inline bool operator!=(QChar lhs, const QStringRef &rhs) noexcept { return !(lhs == rhs); }
+inline bool operator<=(QChar lhs, const QStringRef &rhs) noexcept { return !(lhs >  rhs); }
+inline bool operator>=(QChar lhs, const QStringRef &rhs) noexcept { return !(lhs <  rhs); }
 
-inline bool operator==(const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs == lhs; }
-inline bool operator!=(const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs == lhs); }
-inline bool operator< (const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs >  lhs; }
-inline bool operator> (const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs <  lhs; }
-inline bool operator<=(const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs <  lhs); }
-inline bool operator>=(const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs >  lhs); }
+inline bool operator==(const QStringRef &lhs, QChar rhs) noexcept { return   rhs == lhs; }
+inline bool operator!=(const QStringRef &lhs, QChar rhs) noexcept { return !(rhs == lhs); }
+inline bool operator< (const QStringRef &lhs, QChar rhs) noexcept { return   rhs >  lhs; }
+inline bool operator> (const QStringRef &lhs, QChar rhs) noexcept { return   rhs <  lhs; }
+inline bool operator<=(const QStringRef &lhs, QChar rhs) noexcept { return !(rhs <  lhs); }
+inline bool operator>=(const QStringRef &lhs, QChar rhs) noexcept { return !(rhs >  lhs); }
 
 // QChar <> QLatin1String
-inline bool operator==(QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW
+inline bool operator==(QChar lhs, QLatin1String rhs) noexcept
 { return rhs.size() == 1 && lhs == rhs.front(); }
-inline bool operator< (QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW
+inline bool operator< (QChar lhs, QLatin1String rhs) noexcept
 { return QString::compare_helper(&lhs, 1, rhs) <  0; }
-inline bool operator> (QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW
+inline bool operator> (QChar lhs, QLatin1String rhs) noexcept
 { return QString::compare_helper(&lhs, 1, rhs) >  0; }
 
-inline bool operator!=(QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW { return !(lhs == rhs); }
-inline bool operator<=(QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW { return !(lhs >  rhs); }
-inline bool operator>=(QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW { return !(lhs <  rhs); }
+inline bool operator!=(QChar lhs, QLatin1String rhs) noexcept { return !(lhs == rhs); }
+inline bool operator<=(QChar lhs, QLatin1String rhs) noexcept { return !(lhs >  rhs); }
+inline bool operator>=(QChar lhs, QLatin1String rhs) noexcept { return !(lhs <  rhs); }
 
-inline bool operator==(QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs == lhs; }
-inline bool operator!=(QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs == lhs); }
-inline bool operator< (QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs >  lhs; }
-inline bool operator> (QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return   rhs <  lhs; }
-inline bool operator<=(QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs <  lhs); }
-inline bool operator>=(QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs >  lhs); }
+inline bool operator==(QLatin1String lhs, QChar rhs) noexcept { return   rhs == lhs; }
+inline bool operator!=(QLatin1String lhs, QChar rhs) noexcept { return !(rhs == lhs); }
+inline bool operator< (QLatin1String lhs, QChar rhs) noexcept { return   rhs >  lhs; }
+inline bool operator> (QLatin1String lhs, QChar rhs) noexcept { return   rhs <  lhs; }
+inline bool operator<=(QLatin1String lhs, QChar rhs) noexcept { return !(rhs <  lhs); }
+inline bool operator>=(QLatin1String lhs, QChar rhs) noexcept { return !(rhs >  lhs); }
 
 // QStringView <> QStringView
-inline bool operator==(QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; }
-inline bool operator!=(QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return !(lhs == rhs); }
-inline bool operator< (QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <  0; }
-inline bool operator<=(QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <= 0; }
-inline bool operator> (QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >  0; }
-inline bool operator>=(QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >= 0; }
+inline bool operator==(QStringView lhs, QStringView rhs) noexcept { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; }
+inline bool operator!=(QStringView lhs, QStringView rhs) noexcept { return !(lhs == rhs); }
+inline bool operator< (QStringView lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <  0; }
+inline bool operator<=(QStringView lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <= 0; }
+inline bool operator> (QStringView lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >  0; }
+inline bool operator>=(QStringView lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >= 0; }
 
 // QStringView <> QChar
-inline bool operator==(QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs == QStringView(&rhs, 1); }
-inline bool operator!=(QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs != QStringView(&rhs, 1); }
-inline bool operator< (QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs <  QStringView(&rhs, 1); }
-inline bool operator<=(QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs <= QStringView(&rhs, 1); }
-inline bool operator> (QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs >  QStringView(&rhs, 1); }
-inline bool operator>=(QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs >= QStringView(&rhs, 1); }
-
-inline bool operator==(QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) == rhs; }
-inline bool operator!=(QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) != rhs; }
-inline bool operator< (QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) <  rhs; }
-inline bool operator<=(QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) <= rhs; }
-inline bool operator> (QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) >  rhs; }
-inline bool operator>=(QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) >= rhs; }
+inline bool operator==(QStringView lhs, QChar rhs) noexcept { return lhs == QStringView(&rhs, 1); }
+inline bool operator!=(QStringView lhs, QChar rhs) noexcept { return lhs != QStringView(&rhs, 1); }
+inline bool operator< (QStringView lhs, QChar rhs) noexcept { return lhs <  QStringView(&rhs, 1); }
+inline bool operator<=(QStringView lhs, QChar rhs) noexcept { return lhs <= QStringView(&rhs, 1); }
+inline bool operator> (QStringView lhs, QChar rhs) noexcept { return lhs >  QStringView(&rhs, 1); }
+inline bool operator>=(QStringView lhs, QChar rhs) noexcept { return lhs >= QStringView(&rhs, 1); }
+
+inline bool operator==(QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) == rhs; }
+inline bool operator!=(QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) != rhs; }
+inline bool operator< (QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) <  rhs; }
+inline bool operator<=(QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) <= rhs; }
+inline bool operator> (QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) >  rhs; }
+inline bool operator>=(QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) >= rhs; }
 
 // QStringView <> QLatin1String
-inline bool operator==(QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; }
-inline bool operator!=(QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return !(lhs == rhs); }
-inline bool operator< (QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <  0; }
-inline bool operator<=(QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <= 0; }
-inline bool operator> (QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >  0; }
-inline bool operator>=(QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >= 0; }
-
-inline bool operator==(QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; }
-inline bool operator!=(QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return !(lhs == rhs); }
-inline bool operator< (QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <  0; }
-inline bool operator<=(QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <= 0; }
-inline bool operator> (QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >  0; }
-inline bool operator>=(QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >= 0; }
+inline bool operator==(QStringView lhs, QLatin1String rhs) noexcept { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; }
+inline bool operator!=(QStringView lhs, QLatin1String rhs) noexcept { return !(lhs == rhs); }
+inline bool operator< (QStringView lhs, QLatin1String rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <  0; }
+inline bool operator<=(QStringView lhs, QLatin1String rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <= 0; }
+inline bool operator> (QStringView lhs, QLatin1String rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >  0; }
+inline bool operator>=(QStringView lhs, QLatin1String rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >= 0; }
+
+inline bool operator==(QLatin1String lhs, QStringView rhs) noexcept { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; }
+inline bool operator!=(QLatin1String lhs, QStringView rhs) noexcept { return !(lhs == rhs); }
+inline bool operator< (QLatin1String lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <  0; }
+inline bool operator<=(QLatin1String lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <= 0; }
+inline bool operator> (QLatin1String lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >  0; }
+inline bool operator>=(QLatin1String lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >= 0; }
 
 #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
 // QStringRef <> QByteArray
@@ -1827,13 +1973,17 @@ inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QString &s
 inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QStringRef &s2)
 { return QString::localeAwareCompare_helper(s1.constData(), s1.length(), s2.constData(), s2.length()); }
 
+#if QT_STRINGVIEW_LEVEL < 2
 inline bool QStringRef::contains(const QString &s, Qt::CaseSensitivity cs) const
 { return indexOf(s, 0, cs) != -1; }
+inline bool QStringRef::contains(const QStringRef &s, Qt::CaseSensitivity cs) const
+{ return indexOf(s, 0, cs) != -1; }
+#endif
 inline bool QStringRef::contains(QLatin1String s, Qt::CaseSensitivity cs) const
 { return indexOf(s, 0, cs) != -1; }
 inline bool QStringRef::contains(QChar c, Qt::CaseSensitivity cs) const
 { return indexOf(c, 0, cs) != -1; }
-inline bool QStringRef::contains(const QStringRef &s, Qt::CaseSensitivity cs) const
+inline bool QStringRef::contains(QStringView s, Qt::CaseSensitivity cs) const noexcept
 { return indexOf(s, 0, cs) != -1; }
 
 inline QString &QString::insert(int i, const QStringRef &s)
@@ -1870,6 +2020,59 @@ inline const QString &asString(const QString &s)    { return s; }
 inline QString &&asString(QString &&s)              { return std::move(s); }
 }
 
+//
+// QStringView::arg() implementation
+//
+
+namespace QtPrivate {
+
+struct ArgBase {
+    enum Tag : uchar { L1, U8, U16 } tag;
+};
+
+struct QStringViewArg : ArgBase {
+    QStringView string;
+    QStringViewArg() = default;
+    Q_DECL_CONSTEXPR explicit QStringViewArg(QStringView v) noexcept : ArgBase{U16}, string{v} {}
+};
+
+struct QLatin1StringArg : ArgBase {
+    QLatin1String string;
+    QLatin1StringArg() = default;
+    Q_DECL_CONSTEXPR explicit QLatin1StringArg(QLatin1String v) noexcept : ArgBase{L1}, string{v} {}
+};
+
+Q_REQUIRED_RESULT Q_CORE_EXPORT QString argToQString(QStringView pattern, size_t n, const ArgBase **args);
+Q_REQUIRED_RESULT Q_CORE_EXPORT QString argToQString(QLatin1String pattern, size_t n, const ArgBase **args);
+
+template <typename StringView, typename...Args>
+Q_REQUIRED_RESULT Q_ALWAYS_INLINE QString argToQStringDispatch(StringView pattern, const Args &...args)
+{
+    const ArgBase *argBases[] = {&args..., /* avoid zero-sized array */ nullptr};
+    return QtPrivate::argToQString(pattern, sizeof...(Args), argBases);
+}
+
+                 inline QStringViewArg   qStringLikeToArg(const QString &s) noexcept { return QStringViewArg{qToStringViewIgnoringNull(s)}; }
+Q_DECL_CONSTEXPR inline QStringViewArg   qStringLikeToArg(QStringView s) noexcept { return QStringViewArg{s}; }
+                 inline QStringViewArg   qStringLikeToArg(const QChar &c) noexcept { return QStringViewArg{QStringView{&c, 1}}; }
+Q_DECL_CONSTEXPR inline QLatin1StringArg qStringLikeToArg(QLatin1String s) noexcept { return QLatin1StringArg{s}; }
+
+} // namespace QtPrivate
+
+template <typename...Args>
+Q_ALWAYS_INLINE
+QString QStringView::arg(Args &&...args) const
+{
+    return QtPrivate::argToQStringDispatch(*this, QtPrivate::qStringLikeToArg(args)...);
+}
+
+template <typename...Args>
+Q_ALWAYS_INLINE
+QString QLatin1String::arg(Args &&...args) const
+{
+    return QtPrivate::argToQStringDispatch(*this, QtPrivate::qStringLikeToArg(args)...);
+}
+
 QT_END_NAMESPACE
 
 #if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER)
diff --git a/src/corelib/tools/qstring_compat.cpp b/src/corelib/text/qstring_compat.cpp
index 45bb816e4b..45bb816e4b 100644
--- a/src/corelib/tools/qstring_compat.cpp
+++ b/src/corelib/text/qstring_compat.cpp
diff --git a/src/corelib/tools/qstring_mips_dsp_asm.S b/src/corelib/text/qstring_mips_dsp_asm.S
index 202f322310..202f322310 100644
--- a/src/corelib/tools/qstring_mips_dsp_asm.S
+++ b/src/corelib/text/qstring_mips_dsp_asm.S
diff --git a/src/corelib/tools/qstringalgorithms.h b/src/corelib/text/qstringalgorithms.h
index cc0eda71f3..d54e376aa9 100644
--- a/src/corelib/tools/qstringalgorithms.h
+++ b/src/corelib/text/qstringalgorithms.h
@@ -51,42 +51,54 @@ QT_BEGIN_NAMESPACE
 class QByteArray;
 class QLatin1String;
 class QStringView;
+class QChar;
 template <typename T> class QVector;
 
 namespace QtPrivate {
 
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype qustrlen(const ushort *str) Q_DECL_NOTHROW;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype qustrlen(const ushort *str) noexcept;
 Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION const ushort *qustrchr(QStringView str, ushort ch) noexcept;
 
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView   lhs, QStringView   rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView   lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QLatin1String lhs, QStringView   rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView   lhs, QStringView   rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView   lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QLatin1String lhs, QStringView   rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
 
 
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QStringView   haystack, QStringView   needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QStringView   haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QLatin1String haystack, QStringView   needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QStringView   haystack, QStringView   needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QStringView   haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QLatin1String haystack, QStringView   needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
 
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QStringView   haystack, QStringView   needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QStringView   haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QLatin1String haystack, QStringView   needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QStringView   haystack, QStringView   needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QStringView   haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QLatin1String haystack, QStringView   needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
 
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION QStringView   trimmed(QStringView   s) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION QLatin1String trimmed(QLatin1String s) Q_DECL_NOTHROW;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype findString(QStringView haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype findString(QStringView haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype findString(QLatin1String haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype findString(QLatin1String haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype lastIndexOf(QStringView haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype lastIndexOf(QStringView haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype lastIndexOf(QLatin1String haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype lastIndexOf(QLatin1String haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept;
+
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION QStringView   trimmed(QStringView   s) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION QLatin1String trimmed(QLatin1String s) noexcept;
 
 Q_REQUIRED_RESULT Q_CORE_EXPORT QByteArray convertToLatin1(QStringView str);
 Q_REQUIRED_RESULT Q_CORE_EXPORT QByteArray convertToUtf8(QStringView str);
 Q_REQUIRED_RESULT Q_CORE_EXPORT QByteArray convertToLocal8Bit(QStringView str);
 Q_REQUIRED_RESULT Q_CORE_EXPORT QVector<uint> convertToUcs4(QStringView str);
-Q_REQUIRED_RESULT Q_CORE_EXPORT bool isRightToLeft(QStringView string);
 
-Q_REQUIRED_RESULT Q_CORE_EXPORT bool isAscii(QLatin1String s) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT Q_CORE_EXPORT bool isAscii(QStringView   s) Q_DECL_NOTHROW;
-Q_REQUIRED_RESULT               bool isLatin1(QLatin1String s) Q_DECL_NOTHROW; // in qstring.h
-Q_REQUIRED_RESULT Q_CORE_EXPORT bool isLatin1(QStringView   s) Q_DECL_NOTHROW;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isRightToLeft(QStringView string) noexcept;
+
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isAscii(QLatin1String s) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isAscii(QStringView   s) noexcept;
+Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline            bool isLatin1(QLatin1String s) noexcept;
+Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isLatin1(QStringView   s) noexcept;
 
 } // namespace QtPRivate
 
diff --git a/src/corelib/tools/qstringalgorithms_p.h b/src/corelib/text/qstringalgorithms_p.h
index 4bcf697f78..64d9f2e676 100644
--- a/src/corelib/tools/qstringalgorithms_p.h
+++ b/src/corelib/text/qstringalgorithms_p.h
@@ -77,7 +77,7 @@ template <typename StringType> struct QStringAlgorithms
         if (begin != data)
             memmove(data, begin, (end - begin) * sizeof(Char));
         str.resize(end - begin);
-        return qMove(str);
+        return std::move(str);
     }
 
     static inline StringType trimmed_helper_inplace(const NakedStringType &, const Char *, const Char *)
@@ -118,7 +118,7 @@ template <typename StringType> struct QStringAlgorithms
         const Char *end = str.cend();
         NakedStringType result = isConst || !str.isDetached() ?
                                      StringType(str.size(), Qt::Uninitialized) :
-                                     qMove(str);
+                                     std::move(str);
 
         Char *dst = const_cast<Char *>(result.cbegin());
         Char *ptr = dst;
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/text/qstringbuilder.cpp
index 8afc83819b..cf443ec369 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/text/qstringbuilder.cpp
@@ -124,7 +124,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \internal
  */
-void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out) Q_DECL_NOTHROW
+void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out) noexcept
 {
     if (Q_UNLIKELY(len == -1)) {
         if (!a)
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/text/qstringbuilder.h
index 1d96d70637..288d98d633 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/text/qstringbuilder.h
@@ -58,12 +58,12 @@ QT_BEGIN_NAMESPACE
 struct Q_CORE_EXPORT QAbstractConcatenable
 {
 protected:
-    static void convertFromAscii(const char *a, int len, QChar *&out) Q_DECL_NOTHROW;
-    static inline void convertFromAscii(char a, QChar *&out) Q_DECL_NOTHROW
+    static void convertFromAscii(const char *a, int len, QChar *&out) noexcept;
+    static inline void convertFromAscii(char a, QChar *&out) noexcept
     {
         *out++ = QLatin1Char(a);
     }
-    static void appendLatin1To(const char *a, int len, QChar *out) Q_DECL_NOTHROW;
+    static void appendLatin1To(const char *a, int len, QChar *out) noexcept;
 };
 
 template <typename T> struct QConcatenable {};
@@ -150,7 +150,7 @@ class QStringBuilder <QString, QString> : public QStringBuilderBase<QStringBuild
         const QString &b;
 
     private:
-        QStringBuilder &operator=(const QStringBuilder &) Q_DECL_EQ_DELETE;
+        QStringBuilder &operator=(const QStringBuilder &) = delete;
 };
 
 template <>
@@ -167,7 +167,7 @@ class QStringBuilder <QByteArray, QByteArray> : public QStringBuilderBase<QStrin
         const QByteArray &b;
 
     private:
-        QStringBuilder &operator=(const QStringBuilder &) Q_DECL_EQ_DELETE;
+        QStringBuilder &operator=(const QStringBuilder &) = delete;
 };
 
 
@@ -375,7 +375,7 @@ template <> struct QConcatenable<const char16_t *> : private QAbstractConcatenab
     using type = const char16_t *;
     using ConvertTo = QString;
     enum { ExactSize = true };
-    static int size(const char16_t *a) { return QStringView(a).length(); };
+    static int size(const char16_t *a) { return QStringView(a).length(); }
     static inline void QT_ASCII_CAST_WARN appendTo(const char16_t *a, QChar *&out)
     {
         if (!a)
diff --git a/src/corelib/tools/qstringiterator.qdoc b/src/corelib/text/qstringiterator.qdoc
index 9d7c54ce9f..9d7c54ce9f 100644
--- a/src/corelib/tools/qstringiterator.qdoc
+++ b/src/corelib/text/qstringiterator.qdoc
diff --git a/src/corelib/tools/qstringiterator_p.h b/src/corelib/text/qstringiterator_p.h
index 219589b6e4..219589b6e4 100644
--- a/src/corelib/tools/qstringiterator_p.h
+++ b/src/corelib/text/qstringiterator_p.h
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/text/qstringlist.cpp
index cc6eaf8ad2..4bbe424ed2 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/text/qstringlist.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include <qstringlist.h>
+#include <qregexp.h>
 #include <qset.h>
 #if QT_CONFIG(regularexpression)
 #  include <qregularexpression.h>
@@ -282,6 +283,7 @@ void QtPrivate::QStringList_sort(QStringList *that, Qt::CaseSensitivity cs)
 }
 
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     \fn QStringList QStringList::filter(const QString &str, Qt::CaseSensitivity cs) const
 
@@ -301,6 +303,26 @@ void QtPrivate::QStringList_sort(QStringList *that, Qt::CaseSensitivity cs)
 
     \sa contains()
 */
+#endif
+
+/*!
+    \fn QStringList QStringList::filter(QStringView str, Qt::CaseSensitivity cs) const
+    \overload
+    \since 5.14
+*/
+QStringList QtPrivate::QStringList_filter(const QStringList *that, QStringView str,
+                                          Qt::CaseSensitivity cs)
+{
+    QStringMatcher matcher(str, cs);
+    QStringList res;
+    for (int i = 0; i < that->size(); ++i)
+        if (matcher.indexIn(that->at(i)) != -1)
+            res << that->at(i);
+    return res;
+}
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+/// Not really needed anymore, but kept for binary compatibility
 QStringList QtPrivate::QStringList_filter(const QStringList *that, const QString &str,
                                           Qt::CaseSensitivity cs)
 {
@@ -311,6 +333,7 @@ QStringList QtPrivate::QStringList_filter(const QStringList *that, const QString
             res << that->at(i);
     return res;
 }
+#endif
 
 template<typename T>
 static bool stringList_contains(const QStringList &stringList, const T &str, Qt::CaseSensitivity cs)
@@ -465,6 +488,7 @@ QStringList QtPrivate::QStringList_filter(const QStringList *that, const QRegula
 }
 #endif // QT_CONFIG(regularexpression)
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     \fn QStringList &QStringList::replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs)
 
@@ -480,12 +504,41 @@ QStringList QtPrivate::QStringList_filter(const QStringList *that, const QRegula
 
     \sa QString::replace()
 */
+
+/*!
+    \fn QStringList &QStringList::replaceInStrings(QStringView before, const QString &after, Qt::CaseSensitivity cs)
+    \overload
+    \since 5.14
+*/
+
+/*!
+    \fn QStringList &QStringList::replaceInStrings(const QString &before, QStringView after, Qt::CaseSensitivity cs)
+    \overload
+    \since 5.14
+*/
+#endif
+
+/*!
+    \fn QStringList &QStringList::replaceInStrings(QStringView before, QStringView after, Qt::CaseSensitivity cs)
+    \overload
+    \since 5.14
+*/
+void QtPrivate::QStringList_replaceInStrings(QStringList *that, QStringView before,
+                                             QStringView after, Qt::CaseSensitivity cs)
+{
+    for (int i = 0; i < that->size(); ++i)
+        (*that)[i].replace(before.data(), before.length(), after.data(), after.length(), cs);
+}
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+/// Not really needed anymore, but kept for binary compatibility
 void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QString &before,
                                              const QString &after, Qt::CaseSensitivity cs)
 {
     for (int i = 0; i < that->size(); ++i)
         (*that)[i].replace(before, after, cs);
 }
+#endif
 
 
 #ifndef QT_NO_REGEXP
@@ -560,6 +613,7 @@ static int accumulatedSize(const QStringList &list, int seplen)
     return result;
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 /*!
     \fn QString QStringList::join(const QString &separator) const
 
@@ -569,6 +623,7 @@ static int accumulatedSize(const QStringList &list, int seplen)
 
     \sa QString::split()
 */
+#endif
 
 /*!
     \fn QString QStringList::join(QChar separator) const
@@ -614,6 +669,16 @@ QString QtPrivate::QStringList_join(const QStringList &list, QLatin1String sep)
 }
 
 /*!
+    \fn QString QStringList::join(QStringView separator) const
+    \overload
+    \since 5.14
+*/
+QString QtPrivate::QStringList_join(const QStringList *that, QStringView sep)
+{
+    return QStringList_join(that, sep.data(), sep.length());
+}
+
+/*!
     \fn QStringList QStringList::operator+(const QStringList &other) const
 
     Returns a string list that is the concatenation of this string
@@ -847,5 +912,12 @@ int QtPrivate::QStringList_removeDuplicates(QStringList *that)
     lists.
 */
 
+ /*! \fn template<typename InputIterator> QStringList::QStringList(InputIterator first, InputIterator last)
+     \since 5.14
+
+     Constructs a QStringList with the contents in the iterator range [\a first, \a last).
+
+     The value type of \c InputIterator must be convertible to \c QString.
+ */
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/text/qstringlist.h
index 6b04b7aef1..a464d443dc 100644
--- a/src/corelib/tools/qstringlist.h
+++ b/src/corelib/text/qstringlist.h
@@ -44,6 +44,7 @@
 #define QSTRINGLIST_H
 
 #include <QtCore/qalgorithms.h>
+#include <QtCore/qcontainertools_impl.h>
 #include <QtCore/qregexp.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringmatcher.h>
@@ -53,8 +54,10 @@ QT_BEGIN_NAMESPACE
 class QRegExp;
 class QRegularExpression;
 
+#if !defined(QT_NO_JAVA_STYLE_ITERATORS)
 typedef QListIterator<QString> QStringListIterator;
 typedef QMutableListIterator<QString> QMutableStringListIterator;
+#endif
 
 class QStringList;
 
@@ -72,12 +75,21 @@ public:
     inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive);
     inline int removeDuplicates();
 
+#if QT_STRINGVIEW_LEVEL < 2
     inline QString join(const QString &sep) const;
+#endif
+    inline QString join(QStringView sep) const;
     inline QString join(QLatin1String sep) const;
     inline QString join(QChar sep) const;
 
+    inline QStringList filter(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
+    inline QStringList &replaceInStrings(QStringView before, QStringView after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+#if QT_STRINGVIEW_LEVEL < 2
     inline QStringList filter(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
     inline QStringList &replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+    inline QStringList &replaceInStrings(const QString &before, QStringView after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+    inline QStringList &replaceInStrings(QStringView before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+#endif
 
 #ifndef QT_NO_REGEXP
     inline QStringList filter(const QRegExp &rx) const;
@@ -100,22 +112,19 @@ class QStringList : public QList<QString>
 {
 #endif
 public:
-    inline QStringList() Q_DECL_NOTHROW { }
+    inline QStringList() noexcept { }
     inline explicit QStringList(const QString &i) { append(i); }
     inline QStringList(const QList<QString> &l) : QList<QString>(l) { }
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QStringList(QList<QString> &&l) Q_DECL_NOTHROW : QList<QString>(std::move(l)) { }
-#endif
-#ifdef Q_COMPILER_INITIALIZER_LISTS
+    inline QStringList(QList<QString> &&l) noexcept : QList<QString>(std::move(l)) { }
     inline QStringList(std::initializer_list<QString> args) : QList<QString>(args) { }
-#endif
+    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
+    inline QStringList(InputIterator first, InputIterator last)
+        : QList<QString>(first, last) { }
 
     QStringList &operator=(const QList<QString> &other)
     { QList<QString>::operator=(other); return *this; }
-#ifdef Q_COMPILER_RVALUE_REFS
-    QStringList &operator=(QList<QString> &&other) Q_DECL_NOTHROW
+    QStringList &operator=(QList<QString> &&other) noexcept
     { QList<QString>::operator=(std::move(other)); return *this; }
-#endif
 
 #if QT_STRINGVIEW_LEVEL < 2
     inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
@@ -165,18 +174,27 @@ inline const QStringList *QListSpecialMethods<QString>::self() const
 namespace QtPrivate {
     void Q_CORE_EXPORT QStringList_sort(QStringList *that, Qt::CaseSensitivity cs);
     int Q_CORE_EXPORT QStringList_removeDuplicates(QStringList *that);
+    QString Q_CORE_EXPORT QStringList_join(const QStringList *that, QStringView sep);
     QString Q_CORE_EXPORT QStringList_join(const QStringList *that, const QChar *sep, int seplen);
     Q_CORE_EXPORT QString QStringList_join(const QStringList &list, QLatin1String sep);
+    QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, QStringView str,
+                                               Qt::CaseSensitivity cs);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, const QString &str,
                                                Qt::CaseSensitivity cs);
+#endif
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, const QString &str, Qt::CaseSensitivity cs);
 #endif
     bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QStringView str, Qt::CaseSensitivity cs);
     bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QLatin1String str, Qt::CaseSensitivity cs);
+    void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, QStringView before, QStringView after,
+                                      Qt::CaseSensitivity cs);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, const QString &before, const QString &after,
                                       Qt::CaseSensitivity cs);
+#endif
 
 #ifndef QT_NO_REGEXP
     void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, const QRegExp &rx, const QString &after);
@@ -205,10 +223,17 @@ inline int QListSpecialMethods<QString>::removeDuplicates()
     return QtPrivate::QStringList_removeDuplicates(self());
 }
 
+#if QT_STRINGVIEW_LEVEL < 2
 inline QString QListSpecialMethods<QString>::join(const QString &sep) const
 {
     return QtPrivate::QStringList_join(self(), sep.constData(), sep.length());
 }
+#endif
+
+inline QString QListSpecialMethods<QString>::join(QStringView sep) const
+{
+    return QtPrivate::QStringList_join(self(), sep);
+}
 
 QString QListSpecialMethods<QString>::join(QLatin1String sep) const
 {
@@ -220,10 +245,17 @@ inline QString QListSpecialMethods<QString>::join(QChar sep) const
     return QtPrivate::QStringList_join(self(), &sep, 1);
 }
 
+inline QStringList QListSpecialMethods<QString>::filter(QStringView str, Qt::CaseSensitivity cs) const
+{
+    return QtPrivate::QStringList_filter(self(), str, cs);
+}
+
+#if QT_STRINGVIEW_LEVEL < 2
 inline QStringList QListSpecialMethods<QString>::filter(const QString &str, Qt::CaseSensitivity cs) const
 {
     return QtPrivate::QStringList_filter(self(), str, cs);
 }
+#endif
 
 #if QT_STRINGVIEW_LEVEL < 2
 inline bool QStringList::contains(const QString &str, Qt::CaseSensitivity cs) const
@@ -242,12 +274,32 @@ inline bool QStringList::contains(QStringView str, Qt::CaseSensitivity cs) const
     return QtPrivate::QStringList_contains(this, str, cs);
 }
 
+inline QStringList &QListSpecialMethods<QString>::replaceInStrings(QStringView before, QStringView after, Qt::CaseSensitivity cs)
+{
+    QtPrivate::QStringList_replaceInStrings(self(), before, after, cs);
+    return *self();
+}
+
+#if QT_STRINGVIEW_LEVEL < 2
 inline QStringList &QListSpecialMethods<QString>::replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs)
 {
     QtPrivate::QStringList_replaceInStrings(self(), before, after, cs);
     return *self();
 }
 
+inline QStringList &QListSpecialMethods<QString>::replaceInStrings(QStringView before, const QString &after, Qt::CaseSensitivity cs)
+{
+    QtPrivate::QStringList_replaceInStrings(self(), before, qToStringViewIgnoringNull(after), cs);
+    return *self();
+}
+
+inline QStringList &QListSpecialMethods<QString>::replaceInStrings(const QString &before, QStringView after, Qt::CaseSensitivity cs)
+{
+    QtPrivate::QStringList_replaceInStrings(self(), QStringView(before), after, cs);
+    return *self();
+}
+#endif
+
 inline QStringList operator+(const QList<QString> &one, const QStringList &other)
 {
     QStringList n = one;
@@ -332,6 +384,23 @@ inline int QStringList::lastIndexOf(const QRegularExpression &rx, int from) cons
 #endif // QT_CONFIG(regularexpression)
 #endif // Q_QDOC
 
+//
+// QString inline functions:
+//
+
+QStringList QString::split(const QString &sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const
+{ return split(sep, _sb(behavior), cs); }
+QStringList QString::split(QChar sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const
+{ return split(sep, _sb(behavior), cs); }
+#ifndef QT_NO_REGEXP
+QStringList QString::split(const QRegExp &sep, Qt::SplitBehavior behavior) const
+{ return split(sep, _sb(behavior)); }
+#endif
+#if QT_CONFIG(regularexpression)
+QStringList QString::split(const QRegularExpression &sep, Qt::SplitBehavior behavior) const
+{ return split(sep, _sb(behavior)); }
+#endif
+
 QT_END_NAMESPACE
 
 #endif // QSTRINGLIST_H
diff --git a/src/corelib/tools/qstringliteral.h b/src/corelib/text/qstringliteral.h
index 64296b89fc..2a7e607c63 100644
--- a/src/corelib/tools/qstringliteral.h
+++ b/src/corelib/text/qstringliteral.h
@@ -63,7 +63,7 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2,
 
 #define QT_UNICODE_LITERAL(str) u"" str
 #define QStringLiteral(str) \
-    ([]() Q_DECL_NOEXCEPT -> QString { \
+    ([]() noexcept -> QString { \
         enum { Size = sizeof(QT_UNICODE_LITERAL(str))/2 - 1 }; \
         static const QStaticStringData<Size> qstring_literal = { \
             Q_STATIC_STRING_DATA_HEADER_INITIALIZER(Size), \
@@ -82,11 +82,8 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2,
     Q_STATIC_STRING_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, sizeof(QStringData)) \
     /**/
 
-#ifndef QT_NO_UNICODE_LITERAL
-# ifndef QT_UNICODE_LITERAL
-#  error "If you change QStringLiteral, please change QStringViewLiteral, too"
-# endif
-# define QStringViewLiteral(str) QStringView(QT_UNICODE_LITERAL(str))
+#if QT_DEPRECATED_SINCE(5, 14)
+# define QStringViewLiteral(str) QStringView(QT_UNICODE_LITERAL(str), QtPrivate::Deprecated)
 #endif
 
 template <int N>
diff --git a/src/corelib/tools/qstringmatcher.cpp b/src/corelib/text/qstringmatcher.cpp
index 67d3f0ebc8..167a467480 100644
--- a/src/corelib/tools/qstringmatcher.cpp
+++ b/src/corelib/text/qstringmatcher.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 Mail.ru Group.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -41,43 +42,43 @@
 
 QT_BEGIN_NAMESPACE
 
-static void bm_init_skiptable(const ushort *uc, int len, uchar *skiptable, Qt::CaseSensitivity cs)
+static void bm_init_skiptable(const ushort *uc, qsizetype len, uchar *skiptable, Qt::CaseSensitivity cs)
 {
-    int l = qMin(len, 255);
-    memset(skiptable, l, 256*sizeof(uchar));
+    int l = int(qMin(len, qsizetype(255)));
+    memset(skiptable, l, 256 * sizeof(uchar));
     uc += len - l;
     if (cs == Qt::CaseSensitive) {
         while (l--) {
             skiptable[*uc & 0xff] = l;
-            uc++;
+            ++uc;
         }
     } else {
         const ushort *start = uc;
         while (l--) {
             skiptable[foldCase(uc, start) & 0xff] = l;
-            uc++;
+            ++uc;
         }
     }
 }
 
-static inline int bm_find(const ushort *uc, uint l, int index, const ushort *puc, uint pl,
+static inline qsizetype bm_find(const ushort *uc, qsizetype l, qsizetype index, const ushort *puc, qsizetype pl,
                           const uchar *skiptable, Qt::CaseSensitivity cs)
 {
     if (pl == 0)
-        return index > (int)l ? -1 : index;
-    const uint pl_minus_one = pl - 1;
+        return index > l ? -1 : index;
+    const qsizetype pl_minus_one = pl - 1;
 
     const ushort *current = uc + index + pl_minus_one;
     const ushort *end = uc + l;
     if (cs == Qt::CaseSensitive) {
         while (current < end) {
-            uint skip = skiptable[*current & 0xff];
+            qsizetype skip = skiptable[*current & 0xff];
             if (!skip) {
                 // possible match
                 while (skip < pl) {
                     if (*(current - skip) != puc[pl_minus_one-skip])
                         break;
-                    skip++;
+                    ++skip;
                 }
                 if (skip > pl_minus_one) // we have a match
                     return (current - uc) - pl_minus_one;
@@ -95,13 +96,13 @@ static inline int bm_find(const ushort *uc, uint l, int index, const ushort *puc
         }
     } else {
         while (current < end) {
-            uint skip = skiptable[foldCase(current, uc) & 0xff];
+            qsizetype skip = skiptable[foldCase(current, uc) & 0xff];
             if (!skip) {
                 // possible match
                 while (skip < pl) {
                     if (foldCase(current - skip, uc) != foldCase(puc + pl_minus_one - skip, puc))
                         break;
-                    skip++;
+                    ++skip;
                 }
                 if (skip > pl_minus_one) // we have a match
                     return (current - uc) - pl_minus_one;
@@ -148,7 +149,7 @@ static inline int bm_find(const ushort *uc, uint l, int index, const ushort *puc
     Call setPattern() to give it a pattern to match.
 */
 QStringMatcher::QStringMatcher()
-    : d_ptr(0), q_cs(Qt::CaseSensitive)
+    : d_ptr(nullptr), q_cs(Qt::CaseSensitive)
 {
     memset(q_data, 0, sizeof(q_data));
 }
@@ -160,7 +161,7 @@ QStringMatcher::QStringMatcher()
     Call indexIn() to perform a search.
 */
 QStringMatcher::QStringMatcher(const QString &pattern, Qt::CaseSensitivity cs)
-    : d_ptr(0), q_pattern(pattern), q_cs(cs)
+    : d_ptr(nullptr), q_pattern(pattern), q_cs(cs)
 {
     p.uc = pattern.unicode();
     p.len = pattern.size();
@@ -175,18 +176,31 @@ QStringMatcher::QStringMatcher(const QString &pattern, Qt::CaseSensitivity cs)
     by \a uc with the given \a length and case sensitivity specified by \a cs.
 */
 QStringMatcher::QStringMatcher(const QChar *uc, int len, Qt::CaseSensitivity cs)
-    : d_ptr(0), q_cs(cs)
+    : QStringMatcher(QStringView(uc, len), cs)
 {
-    p.uc = uc;
-    p.len = len;
-    bm_init_skiptable((const ushort *)p.uc, len, p.q_skiptable, cs);
 }
 
 /*!
+    \fn QStringMatcher::QStringMatcher(QStringView pattern, Qt::CaseSensitivity cs = Qt::CaseSensitive)
+    \since 5.14
+
+    Constructs a string matcher that will search for \a pattern, with
+    case sensitivity \a cs.
+
+    Call indexIn() to perform a search.
+*/
+QStringMatcher::QStringMatcher(QStringView str, Qt::CaseSensitivity cs)
+    : d_ptr(nullptr), q_cs(cs)
+{
+    p.uc = str.data();
+    p.len = int(str.size());
+    bm_init_skiptable((const ushort *)p.uc, p.len, p.q_skiptable, cs);
+}
+/*!
     Copies the \a other string matcher to this string matcher.
 */
 QStringMatcher::QStringMatcher(const QStringMatcher &other)
-    : d_ptr(0)
+    : d_ptr(nullptr)
 {
     operator=(other);
 }
@@ -267,11 +281,7 @@ void QStringMatcher::setCaseSensitivity(Qt::CaseSensitivity cs)
 */
 int QStringMatcher::indexIn(const QString &str, int from) const
 {
-    if (from < 0)
-        from = 0;
-    return bm_find((const ushort *)str.unicode(), str.size(), from,
-                   (const ushort *)p.uc, p.len,
-                   p.q_skiptable, q_cs);
+    return int(indexIn(QStringView(str), from));
 }
 
 /*!
@@ -288,9 +298,25 @@ int QStringMatcher::indexIn(const QString &str, int from) const
 */
 int QStringMatcher::indexIn(const QChar *str, int length, int from) const
 {
+    return int(indexIn(QStringView(str, length), from));
+}
+
+/*!
+    \since 5.14
+
+    Searches the string \a str from character position \a from
+    (default 0, i.e. from the first character), for the string
+    pattern() that was set in the constructor or in the most recent
+    call to setPattern(). Returns the position where the pattern()
+    matched in \a str, or -1 if no match was found.
+
+    \sa setPattern(), setCaseSensitivity()
+*/
+qsizetype QStringMatcher::indexIn(QStringView str, qsizetype from) const
+{
     if (from < 0)
         from = 0;
-    return bm_find((const ushort *)str, length, from,
+    return bm_find((const ushort *)str.data(), str.size(), from,
                    (const ushort *)p.uc, p.len,
                    p.q_skiptable, q_cs);
 }
@@ -307,16 +333,16 @@ int QStringMatcher::indexIn(const QChar *str, int length, int from) const
     \internal
 */
 
-int qFindStringBoyerMoore(
-    const QChar *haystack, int haystackLen, int haystackOffset,
-    const QChar *needle, int needleLen, Qt::CaseSensitivity cs)
+qsizetype qFindStringBoyerMoore(
+    QStringView haystack, qsizetype haystackOffset,
+    QStringView needle, Qt::CaseSensitivity cs)
 {
     uchar skiptable[256];
-    bm_init_skiptable((const ushort *)needle, needleLen, skiptable, cs);
+    bm_init_skiptable((const ushort *)needle.data(), needle.size(), skiptable, cs);
     if (haystackOffset < 0)
         haystackOffset = 0;
-    return bm_find((const ushort *)haystack, haystackLen, haystackOffset,
-                   (const ushort *)needle, needleLen, skiptable, cs);
+    return bm_find((const ushort *)haystack.data(), haystack.size(), haystackOffset,
+                   (const ushort *)needle.data(), needle.size(), skiptable, cs);
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/text/qstringmatcher.h
index 549bff9f29..6de4353930 100644
--- a/src/corelib/tools/qstringmatcher.h
+++ b/src/corelib/text/qstringmatcher.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 Mail.ru Group.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -41,6 +42,7 @@
 #define QSTRINGMATCHER_H
 
 #include <QtCore/qstring.h>
+#include <QtCore/qstringview.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,6 +57,8 @@ public:
                    Qt::CaseSensitivity cs = Qt::CaseSensitive);
     QStringMatcher(const QChar *uc, int len,
                    Qt::CaseSensitivity cs = Qt::CaseSensitive);
+    QStringMatcher(QStringView pattern,
+                   Qt::CaseSensitivity cs = Qt::CaseSensitive);
     QStringMatcher(const QStringMatcher &other);
     ~QStringMatcher();
 
@@ -65,6 +69,7 @@ public:
 
     int indexIn(const QString &str, int from = 0) const;
     int indexIn(const QChar *str, int length, int from = 0) const;
+    qsizetype indexIn(QStringView str, qsizetype from = 0) const;
     QString pattern() const;
     inline Qt::CaseSensitivity caseSensitivity() const { return q_cs; }
 
diff --git a/src/corelib/tools/qstringview.cpp b/src/corelib/text/qstringview.cpp
index b97e989110..75de827583 100644
--- a/src/corelib/tools/qstringview.cpp
+++ b/src/corelib/text/qstringview.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qstringview.h"
+#include "qstring.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -56,9 +57,8 @@ QT_BEGIN_NAMESPACE
 
     The UTF-16 string may be represented as an array (or an array-compatible
     data-structure such as QString,
-    std::basic_string, etc.) of QChar, \c ushort, \c char16_t (on compilers that
-    support C++11 Unicode strings) or (on platforms, such as Windows,
-    where it is a 16-bit type) \c wchar_t.
+    std::basic_string, etc.) of QChar, \c ushort, \c char16_t or
+    (on platforms, such as Windows, where it is a 16-bit type) \c wchar_t.
 
     QStringView is designed as an interface type; its main use-case is
     as a function parameter type. When QStringViews are used as automatic
@@ -114,8 +114,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \typedef QStringView::storage_type
 
-    Alias for \c{char16_t} for non-Windows or if Q_COMPILER_UNICODE_STRINGS
-    is defined. Otherwise, alias for \c{wchar_t}.
+    Alias for \c{char16_t}.
 */
 
 /*!
@@ -529,6 +528,25 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \fn QString QStringView::arg(Args &&...args) const
+    \fn QString QLatin1String::arg(Args &&...args) const
+    \fn QString QString::arg(Args &&...args) const
+    \since 5.14
+
+    Replaces occurrences of \c{%N} in this string with the corresponding
+    argument from \a args. The arguments are not positional: the first of
+    the \a args replaces the \c{%N} with the lowest \c{N} (all of them), the
+    second of the \a args the \c{%N} with the next-lowest \c{N} etc.
+
+    \c Args can consist of anything that implicitly converts to QString,
+    QStringView or QLatin1String.
+
+    In addition, the following types are also supported: QChar, QLatin1Char.
+
+    \sa QString::arg()
+*/
+
+/*!
     \fn QChar QStringView::front() const
 
     Returns the first character in the string. Same as first().
@@ -720,6 +738,58 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \fn qsizetype QStringView::indexOf(QStringView str, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
+    \fn qsizetype QStringView::indexOf(QLatin1String l1, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
+    \fn qsizetype QStringView::indexOf(QChar c, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const
+    \since 5.14
+
+    Returns the index position of the first occurrence of the string-view \a str,
+    Latin-1 string \a l1, or character \a ch, respectively, in this string-view,
+    searching forward from index position \a from. Returns -1 if \a str is not found.
+
+    If \a cs is Qt::CaseSensitive (default), the search is case
+    sensitive; otherwise the search is case insensitive.
+
+    If \a from is -1, the search starts at the last character; if it is
+    -2, at the next to last character and so on.
+
+    \sa QString::indexOf()
+*/
+
+/*!
+    \fn bool QStringView::contains(QStringView str, Qt::CaseSensitivity cs) const
+    \fn bool QStringView::contains(QLatin1String l1, Qt::CaseSensitivity cs) const
+    \fn bool QStringView::contains(QChar c, Qt::CaseSensitivity cs) const
+    \since 5.14
+
+    Returns \c true if this string-view contains an occurrence of the string-view
+    \a str, Latin-1 string \a l1, or character \a ch; otherwise returns \c false.
+
+    If \a cs is Qt::CaseSensitive (the default), the search is
+    case-sensitive; otherwise the search is case-insensitive.
+
+    \sa indexOf()
+*/
+
+/*!
+    \fn qsizetype QStringView::lastIndexOf(QStringView str, qsizetype from, Qt::CaseSensitivity cs) const
+    \fn qsizetype QStringView::lastIndexOf(QLatin1String l1, qsizetype from, Qt::CaseSensitivity cs) const
+    \fn qsizetype QStringView::lastIndexOf(QChar c, qsizetype from, Qt::CaseSensitivity cs) const
+    \since 5.14
+
+    Returns the index position of the last occurrence of the string-view \a str,
+    Latin-1 string \a l1, or character \a ch, respectively, in this string-view,
+    searching backward from index position \a from. If \a from is -1 (default),
+    the search starts at the last character; if \a from is -2, at the next to last
+    character and so on. Returns -1 if \a str is not found.
+
+    If \a cs is Qt::CaseSensitive (default), the search is case
+    sensitive; otherwise the search is case insensitive.
+
+    \sa QString::lastIndexOf()
+*/
+
+/*!
     \fn QByteArray QStringView::toLatin1() const
 
     Returns a Latin-1 representation of the string as a QByteArray.
@@ -794,4 +864,24 @@ QT_BEGIN_NAMESPACE
     \sa QString::isRightToLeft()
 */
 
+/*!
+    \fn QStringView::toWCharArray(wchar_t *array) const
+    \since 5.14
+
+    Transcribes this string into the given \a array.
+
+    The caller is responsible for ensuring \a array is large enough to hold the
+    \c wchar_t encoding of this string (allocating the array with the same length
+    as the string is always sufficient). The array is encoded in UTF-16 on
+    platforms where \c wchar_t is 2 bytes wide (e.g. Windows); otherwise (Unix
+    systems), \c wchar_t is assumed to be 4 bytes wide and the data is written
+    in UCS-4.
+
+    \note This function writes no null terminator to the end of \a array.
+
+    Returns the number of \c wchar_t entries written to \a array.
+
+    \sa QString::toWCharArray()
+*/
+
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qstringview.h b/src/corelib/text/qstringview.h
index 2e95c2b218..4ab4d2570f 100644
--- a/src/corelib/tools/qstringview.h
+++ b/src/corelib/text/qstringview.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com>
+** Copyright (C) 2019 Mail.ru Group.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -61,9 +62,7 @@ struct IsCompatibleCharTypeHelper
     : std::integral_constant<bool,
                              std::is_same<Char, QChar>::value ||
                              std::is_same<Char, ushort>::value ||
-#if defined(Q_COMPILER_UNICODE_STRINGS)
                              std::is_same<Char, char16_t>::value ||
-#endif
                              (std::is_same<Char, wchar_t>::value && sizeof(wchar_t) == sizeof(QChar))> {};
 template <typename Char>
 struct IsCompatibleCharType
@@ -104,11 +103,7 @@ struct IsCompatibleStdBasicString
 class QStringView
 {
 public:
-#if defined(Q_OS_WIN) && !defined(Q_COMPILER_UNICODE_STRINGS)
-    typedef wchar_t storage_type;
-#else
     typedef char16_t storage_type;
-#endif
     typedef const QChar value_type;
     typedef std::ptrdiff_t difference_type;
     typedef qsizetype size_type;
@@ -139,13 +134,13 @@ private:
     using if_compatible_qstring_like = typename std::enable_if<std::is_same<T, QString>::value || std::is_same<T, QStringRef>::value, bool>::type;
 
     template <typename Char, size_t N>
-    static Q_DECL_CONSTEXPR qsizetype lengthHelperArray(const Char (&)[N]) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR qsizetype lengthHelperArray(const Char (&)[N]) noexcept
     {
         return qsizetype(N - 1);
     }
 
     template <typename Char>
-    static qsizetype lengthHelperPointer(const Char *str) Q_DECL_NOTHROW
+    static qsizetype lengthHelperPointer(const Char *str) noexcept
     {
 #if defined(Q_CC_GNU) && !defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
         if (__builtin_constant_p(*str)) {
@@ -157,21 +152,21 @@ private:
 #endif
         return QtPrivate::qustrlen(reinterpret_cast<const ushort *>(str));
     }
-    static qsizetype lengthHelperPointer(const QChar *str) Q_DECL_NOTHROW
+    static qsizetype lengthHelperPointer(const QChar *str) noexcept
     {
         return QtPrivate::qustrlen(reinterpret_cast<const ushort *>(str));
     }
 
     template <typename Char>
-    static const storage_type *castHelper(const Char *str) Q_DECL_NOTHROW
+    static const storage_type *castHelper(const Char *str) noexcept
     { return reinterpret_cast<const storage_type*>(str); }
-    static Q_DECL_CONSTEXPR const storage_type *castHelper(const storage_type *str) Q_DECL_NOTHROW
+    static Q_DECL_CONSTEXPR const storage_type *castHelper(const storage_type *str) noexcept
     { return str; }
 
 public:
-    Q_DECL_CONSTEXPR QStringView() Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QStringView() noexcept
         : m_size(0), m_data(nullptr) {}
-    Q_DECL_CONSTEXPR QStringView(std::nullptr_t) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QStringView(std::nullptr_t) noexcept
         : QStringView() {}
 
     template <typename Char, if_compatible_char<Char> = true>
@@ -185,38 +180,45 @@ public:
 
 #ifdef Q_CLANG_QDOC
     template <typename Char, size_t N>
-    Q_DECL_CONSTEXPR QStringView(const Char (&array)[N]) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QStringView(const Char (&array)[N]) noexcept;
 
     template <typename Char>
-    Q_DECL_CONSTEXPR QStringView(const Char *str) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QStringView(const Char *str) noexcept;
 #else
+#if QT_DEPRECATED_SINCE(5, 14)
+    template <typename Array, if_compatible_array<Array> = true>
+    QT_DEPRECATED_VERSION_X_5_14(R"(Use u"~~~" or QStringView(u"~~~") instead of QStringViewLiteral("~~~"))")
+    Q_DECL_CONSTEXPR QStringView(const Array &str, QtPrivate::Deprecated_t) noexcept
+        : QStringView(str, lengthHelperArray(str)) {}
+#endif // QT_DEPRECATED_SINCE
+
     template <typename Array, if_compatible_array<Array> = true>
-    Q_DECL_CONSTEXPR QStringView(const Array &str) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QStringView(const Array &str) noexcept
         : QStringView(str, lengthHelperArray(str)) {}
 
     template <typename Pointer, if_compatible_pointer<Pointer> = true>
-    Q_DECL_CONSTEXPR QStringView(const Pointer &str) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QStringView(const Pointer &str) noexcept
         : QStringView(str, str ? lengthHelperPointer(str) : 0) {}
 #endif
 
 #ifdef Q_CLANG_QDOC
-    QStringView(const QString &str) Q_DECL_NOTHROW;
-    QStringView(const QStringRef &str) Q_DECL_NOTHROW;
+    QStringView(const QString &str) noexcept;
+    QStringView(const QStringRef &str) noexcept;
 #else
     template <typename String, if_compatible_qstring_like<String> = true>
-    QStringView(const String &str) Q_DECL_NOTHROW
+    QStringView(const String &str) noexcept
         : QStringView(str.isNull() ? nullptr : str.data(), qsizetype(str.size())) {}
 #endif
 
     template <typename StdBasicString, if_compatible_string<StdBasicString> = true>
-    QStringView(const StdBasicString &str) Q_DECL_NOTHROW
+    QStringView(const StdBasicString &str) noexcept
         : QStringView(str.data(), qsizetype(str.size())) {}
 
     Q_REQUIRED_RESULT inline QString toString() const; // defined in qstring.h
 
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR qsizetype size() const Q_DECL_NOTHROW { return m_size; }
-    Q_REQUIRED_RESULT const_pointer data() const Q_DECL_NOTHROW { return reinterpret_cast<const_pointer>(m_data); }
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR const storage_type *utf16() const Q_DECL_NOTHROW { return m_data; }
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR qsizetype size() const noexcept { return m_size; }
+    Q_REQUIRED_RESULT const_pointer data() const noexcept { return reinterpret_cast<const_pointer>(m_data); }
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR const storage_type *utf16() const noexcept { return m_data; }
 
     Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QChar operator[](qsizetype n) const
     { return Q_ASSERT(n >= 0), Q_ASSERT(n < size()), QChar(m_data[n]); }
@@ -225,6 +227,9 @@ public:
     // QString API
     //
 
+    template <typename...Args>
+    Q_REQUIRED_RESULT inline QString arg(Args &&...args) const; // defined in qstring.h
+
     Q_REQUIRED_RESULT QByteArray toLatin1() const { return QtPrivate::convertToLatin1(*this); }
     Q_REQUIRED_RESULT QByteArray toUtf8() const { return QtPrivate::convertToUtf8(*this); }
     Q_REQUIRED_RESULT QByteArray toLocal8Bit() const { return QtPrivate::convertToLocal8Bit(*this); }
@@ -248,51 +253,71 @@ public:
     Q_DECL_RELAXED_CONSTEXPR void chop(qsizetype n)
     { Q_ASSERT(n >= 0); Q_ASSERT(n <= size()); m_size -= n; }
 
-    Q_REQUIRED_RESULT QStringView trimmed() const Q_DECL_NOTHROW { return QtPrivate::trimmed(*this); }
+    Q_REQUIRED_RESULT QStringView trimmed() const noexcept { return QtPrivate::trimmed(*this); }
 
-    Q_REQUIRED_RESULT int compare(QStringView other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT int compare(QStringView other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::compareStrings(*this, other, cs); }
 
-    Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::startsWith(*this, s, cs); }
-    Q_REQUIRED_RESULT inline bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT bool startsWith(QChar c) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+    Q_REQUIRED_RESULT bool startsWith(QChar c) const noexcept
     { return !empty() && front() == c; }
-    Q_REQUIRED_RESULT bool startsWith(QChar c, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool startsWith(QChar c, Qt::CaseSensitivity cs) const noexcept
     { return QtPrivate::startsWith(*this, QStringView(&c, 1), cs); }
 
-    Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
     { return QtPrivate::endsWith(*this, s, cs); }
-    Q_REQUIRED_RESULT inline bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT bool endsWith(QChar c) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+    Q_REQUIRED_RESULT bool endsWith(QChar c) const noexcept
     { return !empty() && back() == c; }
-    Q_REQUIRED_RESULT bool endsWith(QChar c, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT bool endsWith(QChar c, Qt::CaseSensitivity cs) const noexcept
     { return QtPrivate::endsWith(*this, QStringView(&c, 1), cs); }
 
-    Q_REQUIRED_RESULT bool isRightToLeft() const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT qsizetype indexOf(QChar c, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return QtPrivate::findString(*this, from, QStringView(&c, 1), cs); }
+    Q_REQUIRED_RESULT qsizetype indexOf(QStringView s, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return QtPrivate::findString(*this, from, s, cs); }
+    Q_REQUIRED_RESULT inline qsizetype indexOf(QLatin1String s, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+
+    Q_REQUIRED_RESULT bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return indexOf(QStringView(&c, 1), 0, cs) != qsizetype(-1); }
+    Q_REQUIRED_RESULT bool contains(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return indexOf(s, 0, cs) != qsizetype(-1); }
+    Q_REQUIRED_RESULT inline bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+
+    Q_REQUIRED_RESULT qsizetype lastIndexOf(QChar c, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return QtPrivate::lastIndexOf(*this, from, QStringView(&c, 1), cs); }
+    Q_REQUIRED_RESULT qsizetype lastIndexOf(QStringView s, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept
+    { return QtPrivate::lastIndexOf(*this, from, s, cs); }
+    Q_REQUIRED_RESULT inline qsizetype lastIndexOf(QLatin1String s, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept;
+
+    Q_REQUIRED_RESULT bool isRightToLeft() const noexcept
     { return QtPrivate::isRightToLeft(*this); }
 
+    Q_REQUIRED_RESULT inline int toWCharArray(wchar_t *array) const; // defined in qstring.h
+
     //
     // STL compatibility API:
     //
-    Q_REQUIRED_RESULT const_iterator begin()   const Q_DECL_NOTHROW { return data(); }
-    Q_REQUIRED_RESULT const_iterator end()     const Q_DECL_NOTHROW { return data() + size(); }
-    Q_REQUIRED_RESULT const_iterator cbegin()  const Q_DECL_NOTHROW { return begin(); }
-    Q_REQUIRED_RESULT const_iterator cend()    const Q_DECL_NOTHROW { return end(); }
-    Q_REQUIRED_RESULT const_reverse_iterator rbegin()  const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    Q_REQUIRED_RESULT const_reverse_iterator rend()    const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    Q_REQUIRED_RESULT const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
-    Q_REQUIRED_RESULT const_reverse_iterator crend()   const Q_DECL_NOTHROW { return rend(); }
-
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool empty() const Q_DECL_NOTHROW { return size() == 0; }
+    Q_REQUIRED_RESULT const_iterator begin()   const noexcept { return data(); }
+    Q_REQUIRED_RESULT const_iterator end()     const noexcept { return data() + size(); }
+    Q_REQUIRED_RESULT const_iterator cbegin()  const noexcept { return begin(); }
+    Q_REQUIRED_RESULT const_iterator cend()    const noexcept { return end(); }
+    Q_REQUIRED_RESULT const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
+    Q_REQUIRED_RESULT const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
+    Q_REQUIRED_RESULT const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+    Q_REQUIRED_RESULT const_reverse_iterator crend()   const noexcept { return rend(); }
+
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool empty() const noexcept { return size() == 0; }
     Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QChar front() const { return Q_ASSERT(!empty()), QChar(m_data[0]); }
     Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QChar back()  const { return Q_ASSERT(!empty()), QChar(m_data[m_size - 1]); }
 
     //
     // Qt compatibility API:
     //
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW { return !m_data; }
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool isEmpty() const Q_DECL_NOTHROW { return empty(); }
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool isNull() const noexcept { return !m_data; }
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool isEmpty() const noexcept { return empty(); }
     Q_REQUIRED_RESULT Q_DECL_CONSTEXPR int length() const /* not nothrow! */
     { return Q_ASSERT(int(size()) == size()), int(size()); }
     Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QChar first() const { return front(); }
@@ -306,7 +331,7 @@ Q_DECLARE_TYPEINFO(QStringView, Q_PRIMITIVE_TYPE);
 template <typename QStringLike, typename std::enable_if<
     std::is_same<QStringLike, QString>::value || std::is_same<QStringLike, QStringRef>::value,
     bool>::type = true>
-inline QStringView qToStringViewIgnoringNull(const QStringLike &s) Q_DECL_NOTHROW
+inline QStringView qToStringViewIgnoringNull(const QStringLike &s) noexcept
 { return QStringView(s.data(), s.size()); }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qt_attribution.json b/src/corelib/text/qt_attribution.json
index 912da3f22c..f91742d421 100644
--- a/src/corelib/tools/qt_attribution.json
+++ b/src/corelib/text/qt_attribution.json
@@ -22,7 +22,7 @@
     "Name": "Unicode Common Locale Data Repository (CLDR)",
     "QDocModule": "qtcore",
     "QtUsage": "Used in Qt Core (QTimeZone, QLocale).",
-    "Files": "For update, see qtbase/util/local_database/cldr2qlocalexml.py",
+    "Files": "For update, see qtbase/util/locale_database/cldr2qlocalexml.py",
     "Files": "qlocale_data_p.h qtimezoneprivate_data_p.h",
 
     "Description": "The Unicode CLDR provides key building blocks for software to support the
diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/text/qtextboundaryfinder.cpp
index 67dd15377b..67dd15377b 100644
--- a/src/corelib/tools/qtextboundaryfinder.cpp
+++ b/src/corelib/text/qtextboundaryfinder.cpp
diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/text/qtextboundaryfinder.h
index b1e5008f54..b1e5008f54 100644
--- a/src/corelib/tools/qtextboundaryfinder.h
+++ b/src/corelib/text/qtextboundaryfinder.h
diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/text/qunicodetables.cpp
index 4c4821802d..805a5a6e34 100644
--- a/src/corelib/tools/qunicodetables.cpp
+++ b/src/corelib/text/qunicodetables.cpp
@@ -6149,2696 +6149,2696 @@ static const unsigned short uc_property_trie[] = {
        (uc_property_trie[uc_property_trie[ucs2>>5] + (ucs2 & 0x1f)])
 
 static const Properties uc_properties[] = {
-    { 9, 18, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 21, 2 },
-    { 9, 8, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 5, 17, 2 },
-    { 9, 7, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 2, 2, 37, 2 },
-    { 9, 8, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 5, 38, 2 },
-    { 9, 9, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 5, 38, 2 },
-    { 9, 7, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 36, 2 },
-    { 9, 7, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 21, 2 },
-    { 9, 8, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 21, 2 },
-    { 6, 9, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 5, 35, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 12, 6, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 12, 13, 3, 2 },
-    { 25, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 9, 2 },
-    { 25, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 10, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 11, 13, 3, 2 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 2, 2 },
-    { 26, 3, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 9, 2 },
-    { 25, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 11, 8, 2 },
-    { 20, 3, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 11, 16, 2 },
-    { 25, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 10, 8, 2 },
-    { 25, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 7, 2 },
-    { 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 2 },
-    { 25, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 11, 8, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 0, 8, 2 },
-    { 26, 10, 0, 0, -1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 32, 1, 0, 0, 10, 7, 12, 3 },
-    { 21, 10, 0, 0, -1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 0, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 9, 2 },
-    { 22, 10, 0, 0, -1, -2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 2, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 19, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 17, 0, 12, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -32, 0, -32, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 17, 2 },
-    { 22, 10, 0, 0, -1, -2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 1, 2 },
-    { 9, 7, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 38, 2 },
-    { 6, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 5, 4, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 10, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 23, 10, 0, 0, -1, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 3, 2 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 17, 2 },
-    { 29, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 10, 2 },
-    { 26, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 9, 2 },
-    { 5, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 18, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 743, 0, 743, 0, 775, 1, 80, 0, 10, 6, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 14, 0, 12, 2 },
-    { 5, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 24, 10, 0, 0, -1, -16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 3, 2 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 32, 1, 17, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 410, 1, 407, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -32, 0, -32, 0, 0, 1, 17, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 121, 0, 121, 0, 0, 1, 17, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 17, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 1, 17, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 413, 0, 0, 0, 0, 0, 0, 1, 17, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -232, 0, -232, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 80, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 492, 1, 492, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, -121, 0, 0, 0, 0, 0, -121, 1, 17, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -300, 0, -300, 0, -268, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 195, 0, 195, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 210, 0, 0, 0, 0, 0, 210, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 206, 0, 0, 0, 0, 0, 206, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 205, 0, 0, 0, 0, 0, 205, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 79, 0, 0, 0, 0, 0, 79, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 202, 0, 0, 0, 0, 0, 202, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 203, 0, 0, 0, 0, 0, 203, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 207, 0, 0, 0, 0, 0, 207, 1, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 97, 0, 97, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 211, 0, 0, 0, 0, 0, 211, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 209, 0, 0, 0, 0, 0, 209, 1, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 163, 0, 163, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 213, 0, 0, 0, 0, 0, 213, 1, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 130, 0, 130, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 214, 0, 0, 0, 0, 0, 214, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 218, 0, 0, 0, 0, 0, 218, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 217, 0, 0, 0, 0, 0, 217, 1, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 219, 0, 0, 0, 0, 0, 219, 1, 0, 0, 10, 7, 12, 3 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 56, 0, 56, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 2, 0, 0, 0, 1, 0, 2, 1, 80, 0, 10, 7, 12, 3 },
-    { 16, 0, 0, 0, -1, 0, 0, 1, 0, -1, 0, 0, 0, 1, 1, 80, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -2, 0, -1, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -79, 0, -79, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 503, 1, 503, 0, 0, 1, 17, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, -97, 0, 0, 0, 0, 0, -97, 4, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, -56, 0, 0, 0, 0, 0, -56, 4, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 4, 17, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 4, 17, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 4, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 4, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, -130, 0, 0, 0, 0, 0, -130, 6, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 8, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 8, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 8, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, -163, 0, 0, 0, 0, 0, -163, 8, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 3, 0, 0, 0, 0, 1, 3, 8, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 5, 1, 5, 0, 0, 8, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 7, 1, 7, 0, 0, 8, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 9, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, -195, 0, 0, 0, 0, 0, -195, 9, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 69, 0, 0, 0, 0, 0, 69, 9, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 71, 0, 0, 0, 0, 0, 71, 9, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 9, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 9, 1, 9, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 11, 1, 11, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 13, 1, 13, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -210, 0, -210, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -206, 0, -206, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -205, 0, -205, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -202, 0, -202, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -203, 0, -203, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 15, 1, 15, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 17, 1, 17, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -207, 0, -207, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 19, 1, 19, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 21, 1, 21, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -209, 0, -209, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -211, 0, -211, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 23, 1, 23, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 25, 1, 25, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 27, 1, 27, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 29, 1, 29, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -213, 0, -213, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -214, 0, -214, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 31, 1, 31, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -218, 0, -218, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 33, 1, 33, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -69, 0, -69, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -217, 0, -217, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -71, 0, -71, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -219, 0, -219, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 35, 1, 35, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 37, 1, 37, 0, 0, 1, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 6, 12, 3 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 17, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 6, 12, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 0, 12, 2 },
-    { 17, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 18, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 0, 18, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 36 },
-    { 17, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 0, 12, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 0, 12, 2 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 232, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 216, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 1 },
-    { 0, 17, 202, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 1 },
-    { 0, 17, 202, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 1 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 4, 4, 4, 21, 1 },
-    { 0, 17, 240, 5, -1, 0, 0, 0, 0, 84, 0, 84, 0, 116, 1, 204, 4, 4, 4, 21, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 4, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 232, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 233, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 4, 1 },
-    { 0, 17, 234, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 4, 1 },
-    { 0, 17, 233, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 4, 1 },
-    { 0, 17, 234, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 4, 1 },
-    { 0, 17, 233, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 4, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 1 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 10, 0, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 10, 0, 0, 10, 6, 12, 4 },
-    { 17, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 10, 8, 12, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 4 },
-    { 13, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 130, 0, 130, 0, 0, 9, 0, 0, 10, 6, 12, 4 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 15, 0, 8, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 116, 0, 0, 0, 0, 0, 116, 16, 0, 0, 10, 7, 12, 4 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 4 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 81, 0, 0, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 38, 0, 0, 0, 0, 0, 38, 1, 17, 0, 10, 7, 12, 4 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 14, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 37, 0, 0, 0, 0, 0, 37, 1, 17, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 64, 0, 0, 0, 0, 0, 64, 1, 17, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 63, 0, 0, 0, 0, 0, 63, 1, 17, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 495, 1, 495, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 32, 1, 0, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 32, 1, 17, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -38, 0, -38, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -37, 0, -37, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 499, 1, 499, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -32, 0, -32, 0, 0, 1, 0, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -31, 0, -31, 0, 1, 1, 0, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -32, 0, -32, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -64, 0, -64, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -63, 0, -63, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 8, 0, 0, 0, 0, 0, 8, 10, 0, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -62, 0, -62, 0, -30, 1, 80, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -57, 0, -57, 0, -25, 1, 80, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 81, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -47, 0, -47, 0, -15, 1, 80, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -54, 0, -54, 0, -22, 1, 80, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -8, 0, -8, 0, 0, 4, 0, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 6, 0, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 6, 0, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 4, 0, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 10, 7, 12, 46 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 1, 0, 0, 10, 6, 12, 46 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -86, 0, -86, 0, -54, 1, 80, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -80, 0, -80, 0, -48, 1, 80, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 7, 0, 7, 0, 0, 1, 80, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -116, 0, -116, 0, 0, 1, 0, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -60, 0, 0, 0, 0, 0, -60, 5, 80, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -96, 0, -96, 0, -64, 5, 80, 0, 10, 6, 12, 4 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 7, 0, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 7, 0, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -7, 0, 0, 0, 0, 0, -7, 7, 80, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -130, 0, 0, 0, 0, 0, -130, 8, 0, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, 80, 0, 0, 0, 0, 0, 80, 4, 17, 0, 10, 7, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 80, 0, 0, 0, 0, 0, 80, 1, 17, 0, 10, 7, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 80, 0, 0, 0, 0, 0, 80, 1, 0, 0, 10, 7, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 32, 1, 0, 0, 10, 7, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 32, 1, 17, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -32, 0, -32, 0, 0, 1, 0, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -32, 0, -32, 0, 0, 1, 17, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -80, 0, -80, 0, 0, 4, 17, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -80, 0, -80, 0, 0, 1, 17, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -80, 0, -80, 0, 0, 1, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 1, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 17, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 1, 17, 0, 10, 6, 12, 5 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 5 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 5 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 5 },
-    { 2, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 6, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 6, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 4, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 4, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 15, 0, 0, 0, 0, 0, 15, 1, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -15, 0, -15, 0, 0, 9, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 4, 17, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 4, 17, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 8, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 8, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 9, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 9, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 10, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 10, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 11, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 11, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 12, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 12, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 16, 0, 0, 10, 7, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 16, 0, 0, 10, 6, 12, 5 },
-    { 14, 0, 0, 0, -1, 0, 0, 48, 0, 0, 0, 0, 0, 48, 1, 0, 0, 10, 7, 12, 6 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 6 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 6 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 11, 12, 6 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -48, 0, -48, 0, 0, 1, 0, 0, 10, 6, 12, 6 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 459, 1, 456, 0, 0, 1, 80, 0, 10, 6, 12, 6 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 12, 8, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 17, 6 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 6 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 9, 6 },
-    { 13, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 222, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 228, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 10, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 11, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 12, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 13, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 14, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 15, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 16, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 17, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 18, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 19, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 19, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 20, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 21, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 22, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 20, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 17, 7 },
-    { 0, 17, 23, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 7 },
-    { 0, 17, 24, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 0, 17, 25, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 6, 7 },
-    { 0, 17, 18, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 7 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 9, 8, 13, 7 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 7 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 14, 0, 12, 7 },
-    { 10, 5, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 6, 4, 12, 8 },
-    { 10, 5, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 7, 6, 4, 12, 8 },
-    { 10, 5, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 7, 6, 4, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 8 },
-    { 26, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 8 },
-    { 25, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 10, 8 },
-    { 27, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 10, 8 },
-    { 25, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 15, 11, 8, 8 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 8 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 30, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 31, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 32, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 8 },
-    { 25, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 6, 2 },
-    { 10, 13, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 3, 6, 4, 21, 8 },
-    { 13, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0 },
-    { 25, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 6, 8 },
-    { 25, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 12, 6, 2 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 8 },
-    { 17, 13, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 2 },
-    { 0, 17, 27, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 28, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 29, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 30, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 31, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 32, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 33, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 34, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 204, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 204, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 8 },
-    { 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 5, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 25, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 10, 8 },
-    { 25, 5, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 25, 5, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 9, 11, 8 },
-    { 25, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 12, 8 },
-    { 0, 17, 35, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 8 },
-    { 25, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 12, 6, 8 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 8 },
-    { 10, 5, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 7, 6, 4, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 8 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 8 },
-    { 17, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 8 },
-    { 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 3, 2, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 8 },
-    { 29, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 8 },
-    { 25, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 12, 12, 9 },
-    { 25, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 9 },
-    { 10, 13, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 7, 6, 4, 12, 9 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 9 },
-    { 0, 17, 36, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 9 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 9 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 9 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 9 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 9 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 9 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 10 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 10 },
-    { 18, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 12, 10 },
-    { 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 3, 1, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 66 },
-    { 18, 1, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 66 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 66 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 66 },
-    { 17, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 66 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 66 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 66 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 15, 11, 8, 66 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 12, 6, 66 },
-    { 17, 1, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 66 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 82 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 82 },
-    { 17, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 82 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 82 },
-    { 18, 1, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 95 },
-    { 18, 1, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 95 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 95 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 95 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 95 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 12, 9 },
-    { 18, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 12, 9 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 12, 9 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 10, 8, 12, 8 },
-    { 18, 13, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 10, 8, 12, 8 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 8 },
-    { 10, 5, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 7, 6, 4, 12, 2 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 27, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 28, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 29, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 8 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 11 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 11 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 10, 8, 12, 11 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 11 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 8, 4, 4, 21, 11 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 11 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 11 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 8, 4, 4, 21, 11 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 10, 8, 12, 11 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 12, 17, 2 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 11 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 11 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 12 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 12 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 12 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 12 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 12 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 12 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 12 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 8, 4, 4, 21, 12 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 12 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 12 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 10, 8, 12, 12 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 12 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 10, 12 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 12 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 10, 12 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 12 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 9, 12 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 12, 12 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 12, 12 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 13 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 13 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 8, 4, 4, 21, 13 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 13 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 10, 8, 12, 13 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 13 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 13 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 13 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 13 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 13 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 14 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 14 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 14 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 14 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 14 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 14 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 14 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 14 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 12, 14 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 9, 14 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 14 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 14 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 15 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 15 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 15 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 15 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 15 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 15 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 15 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 8, 4, 4, 21, 15 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 15 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 15 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 10, 8, 12, 15 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 15 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 15 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 15 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 16 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 16 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 10, 8, 12, 16 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 16 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 16 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 16 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 8, 4, 4, 21, 16 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 16 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 16 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 16 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 16 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 16 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 9, 16 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 17 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 17 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 17 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 17 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 17 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 17 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 4, 4, 4, 21, 17 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 17 },
-    { 0, 17, 84, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 17 },
-    { 0, 17, 91, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 17 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 17 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 17 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 17 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 17 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 17 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 10, 8, 12, 18 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 18 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 18 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 18 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 18 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 18 },
-    { 0, 0, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 18 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 8, 4, 4, 21, 18 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 18 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 18 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 18 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 18 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 18 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 18 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 19 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 19 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8, 4, 4, 21, 19 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 19 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 19 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 19 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 19 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 19 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 19 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 19 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 8, 4, 4, 21, 19 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 19 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 7, 10, 8, 12, 19 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 12, 19 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 10, 8, 12, 19 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 12, 19 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 19 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 19 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 19 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 10, 19 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 8, 4, 4, 21, 20 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 20 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 204, 4, 4, 4, 21, 20 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 204, 4, 4, 4, 21, 20 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 20 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 17, 8, 4, 4, 21, 20 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 20 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 20 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 33, 21 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 33, 21 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 8, 0, 8, 33, 21 },
-    { 0, 17, 103, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 33, 21 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 33, 21 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 33, 21 },
-    { 0, 17, 107, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 33, 21 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 21 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 21 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 17, 21 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 33, 22 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 33, 22 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 8, 0, 8, 33, 22 },
-    { 0, 17, 118, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 33, 22 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 33, 22 },
-    { 0, 17, 122, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 33, 22 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 16, 9, 11, 22 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 8, 33, 22 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 8, 33, 22 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 10, 8, 12, 23 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 18, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 18, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 12, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 4, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 17, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 80, 0, 0, 0, 4, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 6, 23 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 12, 23 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 23 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 16, 9, 11, 23 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 12, 23 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 17, 23 },
-    { 0, 17, 216, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 23 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 13, 0, 23 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 13, 1, 23 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 8, 4, 4, 21, 23 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 85, 0, 10, 8, 12, 23 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 23 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 23 },
-    { 0, 17, 129, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 23 },
-    { 0, 17, 130, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 23 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 85, 4, 4, 4, 21, 23 },
-    { 0, 17, 132, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 23 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 80, 4, 4, 4, 21, 23 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 23 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 8, 4, 4, 17, 23 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 23 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 4, 4, 21, 23 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 23 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 23 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 23 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 17, 23 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 23 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 23 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 18, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 17, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 18, 23 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 23 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 2 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 4, 23 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 8, 33, 24 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 8, 33, 24 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 17, 0, 0, 8, 33, 24 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 4, 4, 33, 24 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 4, 4, 33, 24 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 33, 24 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 204, 4, 4, 4, 33, 24 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 8, 4, 4, 33, 24 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 33, 24 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 33, 24 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 33, 24 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 33, 24 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 8, 4, 4, 33, 24 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 24 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 12, 17, 24 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 24 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 33, 24 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 24 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 4, 4, 33, 24 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 33, 24 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 33, 24 },
-    { 14, 0, 0, 0, -1, 0, 0, 7264, 0, 0, 0, 0, 0, 7264, 1, 0, 0, 10, 7, 12, 25 },
-    { 14, 0, 0, 0, -1, 0, 0, 7264, 0, 0, 0, 0, 0, 7264, 13, 0, 0, 10, 7, 12, 25 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 25 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 12, 25 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 25 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 10, 8, 12, 25 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 25 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 9, 10, 8, 25, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 9, 10, 8, 25, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 10, 10, 8, 26, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 10, 10, 8, 26, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 10, 10, 8, 26, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 11, 10, 8, 27, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 11, 10, 8, 27, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 11, 10, 8, 27, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 27 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 27 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 27 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 27 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 27 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 17, 27 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 12, 12, 27 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 27 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 27 },
-    { 14, 0, 0, 0, -1, 0, 1, 39, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 41, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 43, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 45, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 47, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 49, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 51, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 53, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 55, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 57, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 59, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 61, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 63, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 65, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 67, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 69, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 71, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 73, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 75, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 77, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 79, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 81, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 83, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 85, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 87, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 89, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 91, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 93, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 95, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 97, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 99, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 101, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 103, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 105, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 107, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 109, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 111, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 113, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 115, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 117, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 119, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 121, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 123, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 125, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 127, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 129, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 131, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 133, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 135, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 137, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 139, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 141, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 143, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 145, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 147, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 149, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 151, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 153, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 155, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 157, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 159, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 161, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 163, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 165, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 167, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 169, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 171, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 173, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 175, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 177, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 179, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 181, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 183, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 185, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 187, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 189, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 191, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 193, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 195, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 1, 197, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 7, 12, 28 },
-    { 14, 0, 0, 0, -1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 7, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -8, 0, -8, 0, -8, 17, 0, 0, 10, 6, 12, 28 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 17, 29 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 29 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 29 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 12, 12, 29 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 29 },
-    { 6, 9, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 5, 17, 30 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 30 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 13, 0, 30 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 13, 1, 30 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 31 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 17, 2 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 31 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 31 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 12, 42 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 42 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 42 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 12, 43 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 43 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 43 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 12, 17, 2 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 12, 44 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 44 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 12, 45 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 45 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 8, 33, 32 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 33, 32 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 8, 4, 4, 33, 32 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 33, 32 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 17, 32 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 5, 32 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 8, 33, 32 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 32 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 9, 32 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 33, 32 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 32 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 32 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 33 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 11, 6, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 12, 6, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 17, 33 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 17, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 18, 33 },
-    { 25, 10, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 33 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 11, 6, 33 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 12, 6, 33 },
-    { 25, 10, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 33 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 33 },
-    { 10, 18, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 3, 6, 4, 4, 33 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 16, 9, 11, 33 },
-    { 18, 0, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 33 },
-    { 17, 0, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 33 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 12, 33 },
-    { 0, 17, 228, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 33 },
-    { 18, 0, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 33 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 47 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 47 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 47 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 8, 4, 4, 21, 47 },
-    { 0, 17, 222, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 47 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 47 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 47 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 47 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 12, 6, 47 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 47 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 8, 33, 48 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 33, 56 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 8, 33, 56 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 16, 9, 11, 56 },
-    { 5, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 33, 56 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 33, 56 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 32 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 55 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 55 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 55 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 4, 4, 21, 55 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 55 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 55 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 8, 33, 78 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 8, 4, 4, 33, 78 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 33, 78 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 33, 78 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 4, 4, 33, 78 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 33, 78 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 78 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 78 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 33, 78 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 8, 33, 78 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 33, 78 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 1 },
-    { 2, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 62 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 8, 4, 4, 21, 62 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 62 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 17, 0, 10, 8, 12, 62 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 62 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 204, 8, 4, 4, 21, 62 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 17, 8, 4, 4, 21, 62 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 8, 4, 4, 21, 62 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 9, 11, 62 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 12, 17, 62 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 62 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 17, 62 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 62 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 62 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 62 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 67 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 8, 4, 4, 21, 67 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 67 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 8, 4, 4, 21, 67 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 67 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 67 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 67 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 67 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 93 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 93 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 8, 4, 4, 21, 93 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 93 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 8, 4, 4, 21, 93 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 93 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 68 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 8, 4, 4, 21, 68 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 68 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 68 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 12, 17, 68 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 17, 68 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 68 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 69 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 69 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 69 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 12, 17, 69 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -6254, 0, -6254, 0, -6222, 18, 0, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -6253, 0, -6253, 0, -6221, 18, 0, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -6244, 0, -6244, 0, -6212, 18, 0, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -6242, 0, -6242, 0, -6210, 18, 0, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -6243, 0, -6243, 0, -6211, 18, 0, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -6236, 0, -6236, 0, -6204, 18, 0, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -6181, 0, -6181, 0, -6180, 18, 0, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 199, 1, 199, 1, 711, 18, 0, 0, 10, 6, 12, 5 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 12, 67 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 1 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 2 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 1 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 8, 4, 4, 21, 2 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 2 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 8, 4, 4, 21, 2 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 1 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 2 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 8, 4, 4, 21, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 6, 12, 5 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 80, 0, 10, 6, 12, 3 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 6, 12, 3 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 80, 0, 10, 6, 12, 4 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 10, 6, 12, 5 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 201, 1, 201, 0, 0, 8, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 3814, 0, 3814, 0, 0, 8, 0, 0, 10, 6, 12, 3 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 10, 6, 12, 3 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 10, 6, 12, 4 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 234, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 214, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 202, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 232, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 228, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 233, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 1 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 506, 1, 506, 0, 0, 1, 17, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 509, 1, 509, 0, 0, 1, 17, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 512, 1, 512, 0, 0, 1, 17, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 515, 1, 515, 0, 0, 1, 17, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 518, 1, 518, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -59, 0, -59, 0, -58, 2, 81, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, -7615, 0, 0, 0, 0, 0, -7615, 10, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 10, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 10, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 8, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -8, 0, 0, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 521, 1, 521, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 524, 1, 524, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 528, 1, 528, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 532, 1, 532, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 74, 0, 74, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 74, 0, 74, 0, 0, 1, 85, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 86, 0, 86, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 86, 0, 86, 0, 0, 1, 85, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 100, 0, 100, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 100, 0, 100, 0, 0, 1, 85, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 128, 0, 128, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 128, 0, 128, 0, 0, 1, 85, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 112, 0, 112, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 112, 0, 112, 0, 0, 1, 85, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 126, 0, 126, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 126, 0, 126, 0, 0, 1, 85, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 570, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 573, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 576, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 579, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 582, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 585, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 588, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 591, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 570, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 573, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 576, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 579, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 582, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 585, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 588, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 591, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 594, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 597, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 600, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 603, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 606, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 609, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 612, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 615, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 594, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 597, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 600, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 603, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 606, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 609, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 612, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 615, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 618, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 621, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 624, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 627, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 630, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 633, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 636, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 639, 0, 8, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 618, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 621, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 624, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 627, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 630, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 633, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 636, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -8, 1, 639, 0, 0, 0, -8, 1, 17, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 654, 1, 651, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 642, 0, 9, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 660, 1, 657, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 536, 1, 536, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 691, 1, 687, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -74, 0, 0, 0, 0, 0, -74, 1, 17, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -74, 0, 0, 0, 0, 0, -74, 1, 85, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -9, 1, 642, 0, 0, 0, -9, 1, 17, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -7205, 0, -7205, 0, -7173, 1, 85, 0, 10, 6, 12, 4 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 81, 0, 0, 0, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 666, 1, 663, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 645, 0, 9, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 672, 1, 669, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 539, 1, 539, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 699, 1, 695, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -86, 0, 0, 0, 0, 0, -86, 1, 17, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -86, 0, 0, 0, 0, 0, -86, 1, 85, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -9, 1, 645, 0, 0, 0, -9, 1, 17, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 542, 1, 542, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 495, 1, 495, 0, 0, 1, 85, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 546, 1, 546, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 549, 1, 549, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -100, 0, 0, 0, 0, 0, -100, 1, 17, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -100, 0, 0, 0, 0, 0, -100, 1, 85, 0, 10, 7, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 553, 1, 553, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 499, 1, 499, 0, 0, 1, 85, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 557, 1, 557, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 7, 0, 7, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 560, 1, 560, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 563, 1, 563, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -112, 0, 0, 0, 0, 0, -112, 1, 17, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -112, 0, 0, 0, 0, 0, -112, 1, 85, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -7, 0, 0, 0, 0, 0, -7, 1, 17, 0, 10, 7, 12, 4 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 0, 0, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 678, 1, 675, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 648, 0, 9, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 684, 1, 681, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 567, 1, 567, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 707, 1, 703, 0, 0, 1, 17, 0, 10, 6, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -128, 0, 0, 0, 0, 0, -128, 1, 17, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -128, 0, 0, 0, 0, 0, -128, 1, 85, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -126, 0, 0, 0, 0, 0, -126, 1, 17, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 0, -126, 0, 0, 0, 0, 0, -126, 1, 85, 0, 10, 7, 12, 4 },
-    { 16, 0, 0, 0, -1, 0, 0, -9, 1, 648, 0, 0, 0, -9, 1, 17, 0, 10, 7, 12, 4 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 0, 0, 18, 4 },
-    { 6, 9, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 0, 5, 17, 2 },
-    { 6, 9, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 5, 17, 2 },
-    { 6, 9, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 5, 4, 2 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 4, 20, 2 },
-    { 10, 18, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 10, 18, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 5, 5, 4, 32, 1 },
-    { 10, 0, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 21, 2 },
-    { 10, 1, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 21, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 17, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 4, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 11, 17, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 11, 19, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 23, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 13, 13, 3, 2 },
-    { 24, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 13, 13, 3, 2 },
-    { 21, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 0, 2 },
-    { 23, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 3, 2 },
-    { 24, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 3, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 13, 10, 15, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 15, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 14, 0, 17, 2 },
-    { 7, 9, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 38, 2 },
-    { 8, 7, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 38, 2 },
-    { 10, 11, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 21, 2 },
-    { 10, 14, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 21, 2 },
-    { 10, 16, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 21, 2 },
-    { 10, 12, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 21, 2 },
-    { 10, 15, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 21, 2 },
-    { 6, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 80, 0, 17, 5, 4, 2 },
-    { 25, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 10, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 10, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 10, 2 },
-    { 23, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 3, 2 },
-    { 24, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 3, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 12, 5, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 12, 5, 2 },
-    { 26, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 0, 8, 2 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 12, 5, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 80, 0, 0, 12, 5, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 2 },
-    { 19, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 17, 0, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 17, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 0, 12, 2 },
-    { 6, 9, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 5, 17, 2 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 6, 4, 22, 2 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 6, 4, 12, 2 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 3, 6, 4, 12, 2 },
-    { 13, 18, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 12, 0 },
-    { 10, 19, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 3, 6, 4, 21, 2 },
-    { 10, 20, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 3, 6, 4, 21, 2 },
-    { 10, 21, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 3, 6, 4, 21, 2 },
-    { 10, 22, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 3, 6, 4, 21, 2 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 21, 2 },
-    { 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 10, 6, 12, 3 },
-    { 5, 2, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 26, 3, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 13, 1, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 80, 0, 10, 6, 12, 3 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 10, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 10, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 9, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 10, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 9, 2 },
-    { 13, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0 },
-    { 2, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 2, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 4, 4, 21, 1 },
-    { 2, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 1 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 7, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 10, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 6, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 9, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, -7517, 0, 0, 0, 0, 0, -7517, 1, 85, 0, 10, 7, 12, 4 },
-    { 14, 0, 0, 0, -1, 0, 1, 203, 0, 0, 0, 0, 1, 203, 1, 85, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 205, 0, 0, 0, 0, 1, 205, 1, 85, 0, 10, 7, 12, 3 },
-    { 29, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 28, 0, 0, 0, 0, 0, 28, 1, 0, 0, 10, 7, 12, 3 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 8, 12, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 80, 0, 10, 6, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 80, 0, 0, 0, 12, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 10, 6, 12, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 10, 6, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 10, 7, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -28, 0, -28, 0, 0, 9, 0, 0, 10, 6, 12, 3 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 4, 0, 0, 0, -1, 0, 0, 16, 0, 0, 0, 0, 0, 16, 1, 80, 0, 10, 7, 12, 3 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, -16, 0, -16, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 12, 3 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 3 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 2016, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 138, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 1824, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 2104, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 2108, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 2106, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -138, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 15, 2 },
-    { 26, 10, 0, 0, -1, 8, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 7, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -8, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -7, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 14, 2 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 0, 13, 1, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 26, 0, 0, 0, 0, 0, 26, 1, 80, 0, 10, 7, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, -26, 0, -26, 0, 0, 1, 80, 0, 10, 6, 12, 2 },
-    { 5, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 14, 18, 0, 30, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 16, 20, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 16, 20, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 14, 18, 0, 30, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 16, 20, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 14, 18, 0, 30, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 3, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 13, 3, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 6, 2 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 13, 1, 2 },
-    { 5, 10, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 2 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 13, 1, 2 },
-    { 26, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -2, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 13, 1, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 12, 54 },
-    { 21, 10, 0, 0, -1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 13, 1, 2 },
-    { 21, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -3, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 13, 1, 2 },
-    { 26, 10, 0, 0, -1, -1824, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -2016, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 85, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -2104, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -2106, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, -2108, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 48, 0, 0, 0, 0, 0, 48, 8, 0, 0, 10, 7, 12, 57 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -48, 0, -48, 0, 0, 8, 0, 0, 10, 6, 12, 57 },
-    { 14, 0, 0, 0, -1, 0, 1, 207, 0, 0, 0, 0, 1, 207, 9, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, -3814, 0, 0, 0, 0, 0, -3814, 9, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 209, 0, 0, 0, 0, 1, 209, 9, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 211, 1, 211, 0, 0, 9, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 213, 1, 213, 0, 0, 9, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 215, 0, 0, 0, 0, 1, 215, 10, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 217, 0, 0, 0, 0, 1, 217, 10, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 219, 0, 0, 0, 0, 1, 219, 10, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 221, 0, 0, 0, 0, 1, 221, 11, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 6, 12, 3 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 80, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 223, 0, 0, 0, 0, 1, 223, 11, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 225, 0, 0, 0, 0, 1, 225, 11, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 8, 0, 0, 10, 7, 12, 46 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 8, 0, 0, 10, 6, 12, 46 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 6, 12, 46 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 46 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 11, 0, 0, 10, 7, 12, 46 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 11, 0, 0, 10, 6, 12, 46 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 46 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 13, 0, 0, 10, 7, 12, 46 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 13, 0, 0, 10, 6, 12, 46 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 6, 46 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 17, 46 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 46 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -7264, 0, -7264, 0, 0, 8, 0, 0, 10, 6, 12, 25 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -7264, 0, -7264, 0, 0, 13, 0, 0, 10, 6, 12, 25 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 58 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 58 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 10, 8, 12, 58 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 17, 58 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 58 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 13, 3, 2 },
-    { 23, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 13, 3, 2 },
-    { 24, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 13, 3, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 17, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 17, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 2 },
-    { 23, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 13, 3, 2 },
-    { 24, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 13, 3, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 12, 6, 2 },
-    { 17, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 17, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 12, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 17, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 19, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 17, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 17, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 17, 2 },
-    { 21, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 13, 0, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 17, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 17, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 14, 37 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 80, 0, 0, 0, 14, 37 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 14, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 11, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 12, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 14, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 5, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 14, 2 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 14, 37 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 5, 2 },
-    { 22, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 13, 1, 2 },
-    { 0, 17, 218, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 228, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 222, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 1 },
-    { 1, 0, 224, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 26 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 14, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 8, 8, 14, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 8, 8, 21, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 80, 0, 0, 8, 14, 37 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 5, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 5, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 14, 2 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 5, 34 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 14, 34 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 0, 8, 14, 34 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 8, 5, 34 },
-    { 0, 17, 8, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 204, 4, 4, 4, 21, 1 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 8, 0, 5, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 5, 34 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 0, 8, 5, 34 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 8, 14, 34 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 8, 0, 5, 2 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 8, 8, 5, 35 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 8, 8, 14, 35 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 8, 8, 14, 35 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 5, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 8, 8, 5, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 8, 8, 5, 35 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 0, 8, 8, 5, 35 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 8, 8, 14, 35 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 10, 8, 14, 36 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 14, 36 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 14, 36 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 8, 14, 26 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 14, 2 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 14, 36 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 14, 36 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 8, 8, 5, 35 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 26 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 80, 0, 0, 0, 14, 26 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 14, 2 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 80, 0, 0, 0, 14, 2 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 0, 0, 14, 26 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 8, 0, 14, 35 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 8, 14, 37 },
-    { 13, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 14, 38 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 10, 8, 5, 38 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 14, 38 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 14, 38 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 83 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 83 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 17, 83 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 17, 83 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 70 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 70 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 17, 70 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 12, 6, 70 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 12, 17, 70 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 70 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 5 },
-    { 2, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 5 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 5 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 5 },
-    { 17, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 5 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 80, 0, 10, 6, 12, 5 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 21, 5 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 84 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 84 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 84 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 84 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 17, 84 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 17, 84 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 2 },
-    { 17, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 1, 227, 0, 0, 0, 0, 1, 227, 10, 0, 0, 10, 7, 12, 3 },
-    { 28, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 1, 229, 0, 0, 0, 0, 1, 229, 12, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 6, 12, 3 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 12, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 12, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 13, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 13, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 16, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 16, 0, 0, 10, 6, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 231, 0, 0, 0, 0, 1, 231, 13, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 233, 0, 0, 0, 0, 1, 233, 16, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 235, 0, 0, 0, 0, 1, 235, 16, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 237, 0, 0, 0, 0, 1, 237, 16, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 239, 0, 0, 0, 0, 1, 239, 18, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 241, 0, 0, 0, 0, 1, 241, 16, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 243, 0, 0, 0, 0, 1, 243, 16, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 1, 245, 0, 0, 0, 0, 1, 245, 17, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 928, 0, 0, 0, 0, 0, 928, 17, 0, 0, 10, 7, 12, 3 },
-    { 14, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 17, 0, 0, 10, 7, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 17, 0, 0, 10, 6, 12, 3 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 3 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 80, 0, 10, 6, 12, 3 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 3 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 59 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 59 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 59 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 4, 4, 21, 59 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 59 },
-    { 29, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 2 },
-    { 18, 0, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 65 },
-    { 18, 0, 0, 4, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 65 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 65 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 18, 65 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 12, 6, 65 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 8, 4, 4, 21, 71 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 71 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 71 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 71 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 12, 17, 71 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 71 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 11 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 11 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 18, 11 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 11 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 72 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 72 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 72 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 72 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 17, 2 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 12, 17, 72 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 73 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 73 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 8, 4, 4, 21, 73 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 8, 4, 4, 21, 73 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 73 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 85 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 8, 4, 4, 21, 85 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 85 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 85 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 8, 4, 4, 21, 85 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 85 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 17, 85 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 17, 85 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 2 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 85 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 8, 33, 24 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 33, 24 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 8, 33, 24 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 24 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 77 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 4, 4, 4, 21, 77 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 8, 4, 4, 21, 77 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 9, 11, 77 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 77 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 12, 17, 77 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 8, 33, 24 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 8, 33, 24 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 33, 24 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 4, 4, 33, 24 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 8, 33, 79 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 33, 79 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 33, 79 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 8, 33, 79 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 33, 79 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 86 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 8, 4, 4, 21, 86 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 86 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 12, 17, 86 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 86 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 86 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 27 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -928, 0, -928, 0, 0, 16, 0, 0, 10, 6, 12, 3 },
-    { 28, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 0, 12, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 6, 12, 4 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 247, 1, 247, 1, 247, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 249, 1, 249, 1, 249, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 251, 1, 251, 1, 251, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 253, 1, 253, 1, 253, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 255, 1, 255, 1, 255, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 257, 1, 257, 1, 257, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 259, 1, 259, 1, 259, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 261, 1, 261, 1, 261, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 263, 1, 263, 1, 263, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 265, 1, 265, 1, 265, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 267, 1, 267, 1, 267, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 269, 1, 269, 1, 269, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 271, 1, 271, 1, 271, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 273, 1, 273, 1, 273, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 275, 1, 275, 1, 275, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 277, 1, 277, 1, 277, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 279, 1, 279, 1, 279, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 281, 1, 281, 1, 281, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 283, 1, 283, 1, 283, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 285, 1, 285, 1, 285, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 287, 1, 287, 1, 287, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 289, 1, 289, 1, 289, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 291, 1, 291, 1, 291, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 293, 1, 293, 1, 293, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 295, 1, 295, 1, 295, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 297, 1, 297, 1, 297, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 299, 1, 299, 1, 299, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 301, 1, 301, 1, 301, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 303, 1, 303, 1, 303, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 305, 1, 305, 1, 305, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 307, 1, 307, 1, 307, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 309, 1, 309, 1, 309, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 311, 1, 311, 1, 311, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 313, 1, 313, 1, 313, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 315, 1, 315, 1, 315, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 317, 1, 317, 1, 317, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 319, 1, 319, 1, 319, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 321, 1, 321, 1, 321, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 323, 1, 323, 1, 323, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 325, 1, 325, 1, 325, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 327, 1, 327, 1, 327, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 329, 1, 329, 1, 329, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 331, 1, 331, 1, 331, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 333, 1, 333, 1, 333, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 335, 1, 335, 1, 335, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 337, 1, 337, 1, 337, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 339, 1, 339, 1, 339, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 341, 1, 341, 1, 341, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 343, 1, 343, 1, 343, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 345, 1, 345, 1, 345, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 347, 1, 347, 1, 347, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 349, 1, 349, 1, 349, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 351, 1, 351, 1, 351, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 353, 1, 353, 1, 353, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 355, 1, 355, 1, 355, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 357, 1, 357, 1, 357, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 359, 1, 359, 1, 359, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 361, 1, 361, 1, 361, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 363, 1, 363, 1, 363, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 365, 1, 365, 1, 365, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 367, 1, 367, 1, 367, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 369, 1, 369, 1, 369, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 371, 1, 371, 1, 371, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 373, 1, 373, 1, 373, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 375, 1, 375, 1, 375, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 377, 1, 377, 1, 377, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 379, 1, 379, 1, 379, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 381, 1, 381, 1, 381, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 383, 1, 383, 1, 383, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 385, 1, 385, 1, 385, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 387, 1, 387, 1, 387, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 389, 1, 389, 1, 389, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 391, 1, 391, 1, 391, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 393, 1, 393, 1, 393, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 395, 1, 395, 1, 395, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 397, 1, 397, 1, 397, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 399, 1, 399, 1, 399, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 401, 1, 401, 1, 401, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 403, 1, 403, 1, 403, 17, 0, 0, 10, 6, 12, 28 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 405, 1, 405, 1, 405, 17, 0, 0, 10, 6, 12, 28 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 86 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 8, 4, 4, 21, 86 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 86 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 17, 86 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 86 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 16, 9, 11, 86 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 17, 12, 10, 8, 23, 26 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 17, 13, 10, 8, 24, 26 },
-    { 11, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 0, 0, 34, 0 },
-    { 12, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 0 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 85, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 85, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 85, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 85, 0, 0, 8, 14, 37 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 419, 1, 416, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 425, 1, 422, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 431, 1, 428, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 438, 1, 434, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 446, 1, 442, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 453, 1, 450, 0, 0, 1, 80, 0, 10, 6, 12, 3 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 465, 1, 462, 0, 0, 1, 80, 0, 10, 6, 12, 6 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 471, 1, 468, 0, 0, 1, 80, 0, 10, 6, 12, 6 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 477, 1, 474, 0, 0, 1, 80, 0, 10, 6, 12, 6 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 483, 1, 480, 0, 0, 1, 80, 0, 10, 6, 12, 6 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 1, 489, 1, 486, 0, 0, 1, 80, 0, 10, 6, 12, 6 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 85, 0, 9, 8, 13, 7 },
-    { 0, 17, 26, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 4, 4, 4, 21, 7 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 85, 0, 9, 8, 13, 7 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 9, 8, 13, 7 },
-    { 26, 3, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 12, 7 },
-    { 18, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 10, 8, 12, 8 },
-    { 28, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 8 },
-    { 13, 18, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 12, 0 },
-    { 27, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 0, 10, 8 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 4, 4, 4, 21, 1 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 15, 11, 8, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 0, 11, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 0, 0, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 14, 11, 8, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 15, 0, 8, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 0, 0, 6, 2 },
-    { 21, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 0, 13, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 80, 0, 0, 0, 15, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 20, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 11, 14, 2 },
-    { 19, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 17, 0, 14, 2 },
-    { 21, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 13, 1, 2 },
-    { 21, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 80, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 80, 0, 0, 13, 1, 2 },
-    { 25, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 15, 11, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 11, 14, 2 },
-    { 25, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 13, 10, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 15, 0, 5, 2 },
-    { 25, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 14, 11, 5, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 12, 6, 2 },
-    { 25, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 26, 3, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 20, 3, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 11, 14, 2 },
-    { 26, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 26, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 18, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 10, 8, 12, 8 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 6, 4, 22, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 13, 0, 14, 2 },
-    { 25, 6, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 3, 2, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 26, 10, 0, 0, -1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 26, 10, 0, 0, -1, -2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 32, 1, 80, 0, 10, 7, 14, 3 },
-    { 21, 10, 0, 0, -1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 13, 1, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 14, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -32, 0, -32, 0, 0, 1, 80, 0, 10, 6, 14, 3 },
-    { 21, 10, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 13, 0, 2 },
-    { 22, 10, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 6, 80, 0, 0, 13, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 12, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 11, 1, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 5, 2 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 8, 8, 14, 35 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 8, 8, 5, 35 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 8, 8, 5, 2 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 4, 4, 4, 5, 2 },
-    { 27, 4, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 80, 0, 0, 0, 10, 2 },
-    { 10, 10, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 3, 6, 4, 21, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 29, 2 },
-    { 13, 18, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 12, 0 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 49 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 17, 2 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 17, 2 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 12, 2 },
-    { 4, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 4 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 4 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 4 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 4 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 4 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 12, 4 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 74 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 75 },
-    { 5, 2, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 2 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 10, 8, 12, 39 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 39 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 12, 39 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 12, 39 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 10, 8, 12, 40 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 10, 8, 12, 40 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 120 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 120 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 50 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 17, 50 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 60 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 17, 60 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 60 },
-    { 14, 0, 0, 0, -1, 0, 0, 40, 0, 0, 0, 0, 0, 40, 5, 0, 0, 10, 7, 12, 41 },
-    { 14, 0, 0, 0, -1, 0, 0, 40, 0, 0, 0, 0, 0, 40, 7, 0, 0, 10, 7, 12, 41 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -40, 0, -40, 0, 0, 5, 0, 0, 10, 6, 12, 41 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -40, 0, -40, 0, 0, 7, 0, 0, 10, 6, 12, 41 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 51 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 52 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 16, 9, 11, 52 },
-    { 14, 0, 0, 0, -1, 0, 0, 40, 0, 0, 0, 0, 0, 40, 18, 0, 0, 10, 7, 12, 136 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -40, 0, -40, 0, 0, 18, 0, 0, 10, 6, 12, 136 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 106 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 103 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 103 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 110 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 8, 12, 53 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 87 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 17, 87 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 87 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 118 },
-    { 29, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 118 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 118 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 117 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 117 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 128 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 12, 128 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 64 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 64 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 64 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 17, 64 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 10, 8, 12, 76 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 12, 76 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 98 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 97 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 12, 97 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 10, 8, 12, 61 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 61 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 61 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 61 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 61 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 61 },
-    { 5, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 61 },
-    { 5, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 61 },
-    { 5, 1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 61 },
-    { 5, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 61 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 61 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 17, 61 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 12, 17, 61 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 12, 61 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 88 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 88 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 88 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 116 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 116 },
-    { 18, 1, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 112 },
-    { 18, 1, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 112 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 112 },
-    { 29, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 112 },
-    { 18, 1, 0, 4, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 112 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 112 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 112 },
-    { 5, 1, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 112 },
-    { 5, 1, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 112 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 17, 112 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 15, 112 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 80 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 17, 80 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 89 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 89 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 90 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 90 },
-    { 18, 1, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 121 },
-    { 18, 1, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 121 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 121 },
-    { 5, 1, 0, 3, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 121 },
-    { 5, 1, 0, 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 121 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 121 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 91 },
-    { 14, 1, 0, 0, -1, 0, 0, 64, 0, 0, 0, 0, 0, 64, 17, 0, 0, 10, 7, 12, 130 },
-    { 15, 1, 0, 0, -1, 0, 0, 0, 0, -64, 0, -64, 0, 0, 17, 0, 0, 10, 6, 12, 130 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 12, 130 },
-    { 5, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 5, 5, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 8 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 8, 4, 4, 21, 94 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 94 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 94 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 4, 4, 4, 21, 94 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 12, 17, 94 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 94 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 16, 9, 11, 94 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 94 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 92 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 8, 4, 4, 21, 92 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 92 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 17, 0, 10, 8, 12, 92 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 4, 4, 4, 21, 92 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 204, 4, 4, 4, 21, 92 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 12, 92 },
-    { 10, 0, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 7, 6, 4, 12, 92 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 12, 17, 92 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 101 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 101 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 96 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 96 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 204, 4, 4, 4, 21, 96 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 96 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 8, 4, 4, 21, 96 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 17, 4, 4, 4, 21, 96 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 96 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 96 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 17, 96 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 12, 17, 96 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 111 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 111 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 111 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 18, 111 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 100 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 8, 4, 4, 21, 100 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 100 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 8, 4, 4, 21, 100 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 7, 10, 8, 12, 100 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 12, 17, 100 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 12, 100 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 17, 100 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 12, 100 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 21, 100 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 21, 100 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 12, 100 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 100 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 100 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 18, 100 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 100 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 17, 100 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 12, 17, 100 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 20 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 109 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 8, 4, 4, 21, 109 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 109 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 8, 4, 4, 21, 109 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 109 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 17, 109 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 109 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 109 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 129 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 12, 17, 129 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 123 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 123 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 8, 4, 4, 21, 123 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 123 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 123 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 123 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 21, 107 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 107 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 8, 4, 4, 21, 107 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 107 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 107 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 204, 4, 4, 4, 21, 107 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17, 8, 4, 4, 21, 107 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 8, 4, 4, 21, 107 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 107 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 107 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 10, 8, 12, 135 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 8, 4, 4, 21, 135 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 135 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 135 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 135 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 12, 17, 135 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 17, 135 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 12, 135 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 135 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 124 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 204, 4, 4, 4, 21, 124 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 8, 4, 4, 21, 124 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 124 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 204, 4, 4, 4, 21, 124 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17, 8, 4, 4, 21, 124 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 124 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 124 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 124 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 124 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 122 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 204, 4, 4, 4, 21, 122 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 8, 4, 4, 21, 122 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 122 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17, 8, 4, 4, 21, 122 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 122 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 122 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 18, 122 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 17, 122 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 6, 122 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 122 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 12, 17, 122 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 122 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 21, 122 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 114 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 8, 4, 4, 21, 114 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 114 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 114 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 17, 114 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 114 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 114 },
-    { 25, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 18, 33 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 102 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 102 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 8, 4, 4, 21, 102 },
-    { 1, 0, 9, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 8, 4, 4, 21, 102 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 102 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 16, 9, 11, 102 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 8, 33, 126 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 33, 126 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 8, 4, 4, 33, 126 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 33, 126 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 16, 9, 11, 126 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 33, 126 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 12, 17, 126 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 33, 126 },
-    { 14, 0, 0, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 32, 16, 0, 0, 10, 7, 12, 125 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, -32, 0, -32, 0, 0, 16, 0, 0, 10, 6, 12, 125 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 125 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 125 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 125 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 12, 141 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 141 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 8, 4, 4, 21, 141 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 141 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 7, 10, 8, 12, 141 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 18, 141 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 12, 141 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 17, 141 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 12, 17, 141 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 12, 140 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 140 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 8, 4, 4, 21, 140 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 7, 10, 8, 12, 140 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 140 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 17, 140 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 12, 17, 140 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 18, 140 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 119 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 10, 8, 12, 133 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 8, 4, 4, 21, 133 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 133 },
-    { 0, 0, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 133 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 12, 17, 133 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 17, 133 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 133 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 12, 133 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 18, 134 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 6, 134 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 10, 8, 12, 134 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 134 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 8, 4, 4, 21, 134 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 12, 138 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 138 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 138 },
-    { 0, 17, 9, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 4, 4, 4, 21, 138 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 7, 10, 8, 12, 138 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 16, 9, 11, 138 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 63 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 63 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 63 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 10, 8, 12, 63 },
-    { 4, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 63 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 17, 63 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 17, 63 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 12, 81 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 0, 81 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 8, 1, 81 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 12, 127 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 0, 127 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 10, 8, 1, 127 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 8, 12, 84 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 115 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 115 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 17, 115 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 104 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 104 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 17, 104 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 108 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 108 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 17, 108 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 17, 108 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 108 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 108 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 108 },
-    { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 3, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 9, 11, 108 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 108 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 99 },
-    { 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 8, 4, 4, 21, 99 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, 4, 4, 21, 99 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 10, 8, 12, 99 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 10, 8, 5, 137 },
-    { 17, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 10, 8, 5, 139 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 8, 14, 137 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 8, 8, 14, 35 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 8, 14, 34 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 8, 14, 34 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 8, 14, 139 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 105 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 105 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 105 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 105 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 12, 17, 105 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 3, 6, 4, 21, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 0, 0, 0, 12, 2 },
-    { 1, 0, 216, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 4, 4, 4, 21, 2 },
-    { 1, 0, 216, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 8, 4, 4, 21, 2 },
-    { 0, 17, 1, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 4, 4, 4, 21, 1 },
-    { 1, 0, 226, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 8, 4, 4, 21, 2 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 3, 6, 4, 21, 2 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 4, 4, 4, 21, 1 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 4, 4, 4, 21, 1 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 12, 2 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 4, 4, 4, 21, 4 },
-    { 5, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 10, 7, 12, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 10, 6, 12, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 80, 0, 10, 6, 12, 2 },
-    { 26, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 0, 0, 12, 2 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 0, 0, 12, 2 },
-    { 14, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 80, 0, 10, 7, 12, 2 },
-    { 15, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 80, 0, 10, 6, 12, 2 },
-    { 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 3, 2, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 80, 0, 16, 9, 11, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 12, 131 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 4, 4, 4, 21, 131 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 17, 131 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 12, 17, 131 },
-    { 25, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 12, 131 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 57 },
-    { 18, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 10, 8, 12, 113 },
-    { 5, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 113 },
-    { 0, 17, 220, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 4, 4, 21, 113 },
-    { 14, 1, 0, 2, -1, 0, 0, 34, 0, 0, 0, 0, 0, 34, 18, 0, 0, 10, 7, 12, 132 },
-    { 15, 1, 0, 2, -1, 0, 0, 0, 0, -34, 0, -34, 0, 0, 18, 0, 0, 10, 6, 12, 132 },
-    { 0, 17, 230, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 132 },
-    { 0, 17, 7, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 4, 4, 4, 21, 132 },
-    { 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 3, 1, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 9, 11, 132 },
-    { 25, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 132 },
-    { 18, 13, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 80, 0, 10, 8, 12, 8 },
-    { 26, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 12, 8 },
-    { 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 2, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 5, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 80, 0, 10, 7, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 10, 7, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 80, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 10, 7, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 10, 7, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 80, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 12, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 6, 7, 0, 28, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 80, 0, 0, 0, 14, 34 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 80, 0, 0, 0, 14, 2 },
-    { 29, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 80, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 16, 20, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 14, 18, 0, 30, 2 },
-    { 28, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 15, 19, 0, 31, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 17, 21, 0, 30, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 12, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 14, 18, 0, 30, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 16, 20, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 14, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 13, 3, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 5, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 14, 18, 0, 30, 2 },
-    { 29, 10, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 14, 18, 0, 30, 2 },
-    { 13, 18, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 12, 0 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 8, 14, 37 },
-    { 18, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 0, 0, 8, 14, 37 },
-    { 10, 18, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 4, 4, 4, 21, 2 },
-    { 0, 17, 0, 5, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 4, 4, 21, 1 },
-    { 12, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 12, 0 }
+    { 9, 18, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 21, 0, 2 },
+    { 9, 8, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 17, 5, 2 },
+    { 9, 7, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 2, 2, 37, 2, 2 },
+    { 9, 8, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 3, 38, 5, 2 },
+    { 9, 9, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 3, 38, 5, 2 },
+    { 9, 7, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 1, 1, 36, 1, 2 },
+    { 9, 7, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 21, 0, 2 },
+    { 9, 8, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 21, 0, 2 },
+    { 6, 9, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 35, 5, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 12, 3, 13, 2 },
+    { 25, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 25, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 11, 3, 13, 2 },
+    { 21, 10, 0, 0, -1, 1, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -1, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 2, 13, 2 },
+    { 26, 3, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 25, 6, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 11, 2 },
+    { 20, 3, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 16, 11, 2 },
+    { 25, 6, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 10, 2 },
+    { 25, 6, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 7, 0, 2 },
+    { 3, 2, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 25, 6, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 8, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 0, 2 },
+    { 26, 10, 0, 0, -1, 2, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -2, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 32}, {0, 0}, {0, 0}, {0, 32} }, 0, 10, 12, 7, 3 },
+    { 21, 10, 0, 0, -1, 2, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 22, 10, 0, 0, -1, -2, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 2, 13, 2 },
+    { 28, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 19, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 17, 12, 0, 2 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -32}, {0, -32}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 26, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 22, 10, 0, 0, -1, -2, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 9, 7, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 3, 38, 3, 2 },
+    { 6, 6, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 4, 5, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 28, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 18, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 23, 10, 0, 0, -1, 16, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 10, 18, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 17, 4, 2 },
+    { 29, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 26, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 5, 2, 0, 0, 2, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 3, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 28, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 2 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 743}, {0, 743}, {0, 775} }, 0, 10, 12, 6, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 14, 12, 0, 2 },
+    { 5, 2, 0, 0, 1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 24, 10, 0, 0, -1, -16, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 5, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 32}, {0, 0}, {0, 0}, {0, 32} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 410}, {1, 407}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -32}, {0, -32}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 121}, {0, 121}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {1, 413}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -232}, {0, -232}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 80,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 492}, {1, 492}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -121}, {0, 0}, {0, 0}, {0, -121} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -300}, {0, -300}, {0, -268} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 195}, {0, 195}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 210}, {0, 0}, {0, 0}, {0, 210} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 206}, {0, 0}, {0, 0}, {0, 206} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 205}, {0, 0}, {0, 0}, {0, 205} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 79}, {0, 0}, {0, 0}, {0, 79} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 202}, {0, 0}, {0, 0}, {0, 202} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 203}, {0, 0}, {0, 0}, {0, 203} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 207}, {0, 0}, {0, 0}, {0, 207} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 97}, {0, 97}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 211}, {0, 0}, {0, 0}, {0, 211} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 209}, {0, 0}, {0, 0}, {0, 209} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 163}, {0, 163}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 213}, {0, 0}, {0, 0}, {0, 213} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 130}, {0, 130}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 214}, {0, 0}, {0, 0}, {0, 214} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 218}, {0, 0}, {0, 0}, {0, 218} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 217}, {0, 0}, {0, 0}, {0, 217} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 219}, {0, 0}, {0, 0}, {0, 219} }, 0, 10, 12, 7, 3 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 56}, {0, 56}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 80,  { {0, 2}, {0, 0}, {0, 1}, {0, 2} }, 0, 10, 12, 7, 3 },
+    { 16, 0, 0, 0, -1, 0, 1, 80,  { {0, 1}, {0, -1}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -2}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -79}, {0, -79}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 503}, {1, 503}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {0, -97}, {0, 0}, {0, 0}, {0, -97} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {0, -56}, {0, 0}, {0, 0}, {0, -56} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 4, 17,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 4, 17,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 6, 0,  { {0, -130}, {0, 0}, {0, 0}, {0, -130} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 8, 0,  { {1, 1}, {0, 0}, {0, 0}, {1, 1} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 8, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 8, 0,  { {0, -163}, {0, 0}, {0, 0}, {0, -163} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 8, 0,  { {1, 3}, {0, 0}, {0, 0}, {1, 3} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {1, 5}, {1, 5}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {1, 7}, {1, 7}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 9, 0,  { {0, -195}, {0, 0}, {0, 0}, {0, -195} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 9, 0,  { {0, 69}, {0, 0}, {0, 0}, {0, 69} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 9, 0,  { {0, 71}, {0, 0}, {0, 0}, {0, 71} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 9, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 9}, {1, 9}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 11}, {1, 11}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 13}, {1, 13}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -210}, {0, -210}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -206}, {0, -206}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -205}, {0, -205}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -202}, {0, -202}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -203}, {0, -203}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 15}, {1, 15}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 17}, {1, 17}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -207}, {0, -207}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 19}, {1, 19}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 21}, {1, 21}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -209}, {0, -209}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -211}, {0, -211}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 23}, {1, 23}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 25}, {1, 25}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 27}, {1, 27}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 29}, {1, 29}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -213}, {0, -213}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -214}, {0, -214}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 31}, {1, 31}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -218}, {0, -218}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 33}, {1, 33}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -69}, {0, -69}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -217}, {0, -217}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -71}, {0, -71}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -219}, {0, -219}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 35}, {1, 35}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {1, 37}, {1, 37}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 17, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 17, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 28, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 0, 2 },
+    { 17, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 18, 8, 2 },
+    { 28, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 18, 0, 2 },
+    { 28, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 36 },
+    { 17, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 28, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 0, 2 },
+    { 17, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 28, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 0, 2 },
+    { 0, 17, 230, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 232, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 216, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 202, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 202, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 1, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 1, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 240, 5, -1, 0, 1, 204,  { {0, 0}, {0, 84}, {0, 84}, {0, 116} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 4, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 232, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 233, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 4, 4, 1 },
+    { 0, 17, 234, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 4, 4, 1 },
+    { 0, 17, 233, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 4, 4, 1 },
+    { 0, 17, 234, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 4, 4, 1 },
+    { 0, 17, 233, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 4, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 17, 10, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 28, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 13, 0, 0, 0, -1, 0, 0, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 0 },
+    { 17, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 130}, {0, 130}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 25, 10, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {0, 116}, {0, 0}, {0, 0}, {0, 116} }, 0, 10, 12, 7, 4 },
+    { 28, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 28, 10, 0, 0, -1, 0, 1, 81,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 38}, {0, 0}, {0, 0}, {0, 38} }, 0, 10, 12, 7, 4 },
+    { 25, 10, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 14, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 37}, {0, 0}, {0, 0}, {0, 37} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 64}, {0, 0}, {0, 0}, {0, 64} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 63}, {0, 0}, {0, 0}, {0, 63} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 495}, {1, 495}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 32}, {0, 0}, {0, 0}, {0, 32} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 32}, {0, 0}, {0, 0}, {0, 32} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -38}, {0, -38}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -37}, {0, -37}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 499}, {1, 499}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -32}, {0, -32}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -31}, {0, -31}, {0, 1} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -32}, {0, -32}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -64}, {0, -64}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -63}, {0, -63}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {0, 8}, {0, 0}, {0, 0}, {0, 8} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -62}, {0, -62}, {0, -30} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -57}, {0, -57}, {0, -25} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 81,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -47}, {0, -47}, {0, -15} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -54}, {0, -54}, {0, -22} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, -8}, {0, -8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 6, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 46 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 46 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -86}, {0, -86}, {0, -54} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -80}, {0, -80}, {0, -48} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 7}, {0, 7}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -116}, {0, -116}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 5, 80,  { {0, -60}, {0, 0}, {0, 0}, {0, -60} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 5, 80,  { {0, 0}, {0, -96}, {0, -96}, {0, -64} }, 0, 10, 12, 6, 4 },
+    { 26, 10, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 14, 0, 0, 0, -1, 0, 7, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 7, 80,  { {0, -7}, {0, 0}, {0, 0}, {0, -7} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 8, 0,  { {0, -130}, {0, 0}, {0, 0}, {0, -130} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 4, 17,  { {0, 80}, {0, 0}, {0, 0}, {0, 80} }, 0, 10, 12, 7, 5 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 80}, {0, 0}, {0, 0}, {0, 80} }, 0, 10, 12, 7, 5 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 80}, {0, 0}, {0, 0}, {0, 80} }, 0, 10, 12, 7, 5 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 32}, {0, 0}, {0, 0}, {0, 32} }, 0, 10, 12, 7, 5 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 32}, {0, 0}, {0, 0}, {0, 32} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -32}, {0, -32}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -32}, {0, -32}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 4, 17,  { {0, 0}, {0, -80}, {0, -80}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -80}, {0, -80}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -80}, {0, -80}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 29, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 5 },
+    { 0, 17, 230, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 5 },
+    { 0, 17, 230, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 5 },
+    { 2, 17, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 5 },
+    { 14, 0, 0, 0, -1, 0, 6, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 15}, {0, 0}, {0, 0}, {0, 15} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, -15}, {0, -15}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 4, 17,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 4, 17,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 8, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 9, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 11, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 12, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 5 },
+    { 15, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 48}, {0, 0}, {0, 0}, {0, 48} }, 0, 10, 12, 7, 6 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 6 },
+    { 25, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 6 },
+    { 25, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 11, 6 },
+    { 15, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, -48}, {0, -48}, {0, 0} }, 0, 10, 12, 6, 6 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 459}, {1, 456}, {0, 0} }, 0, 10, 12, 6, 6 },
+    { 25, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 12, 2 },
+    { 20, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 6 },
+    { 29, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 6 },
+    { 27, 4, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 6 },
+    { 13, 1, 0, 0, -1, 0, 0, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 0 },
+    { 0, 17, 220, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 230, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 222, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 220, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 228, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 10, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 11, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 12, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 13, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 14, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 15, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 16, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 17, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 18, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 19, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 19, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 20, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 21, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 22, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 20, 1, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 7 },
+    { 0, 17, 23, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 25, 1, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 7 },
+    { 0, 17, 24, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 0, 17, 25, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 25, 1, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 7 },
+    { 0, 17, 18, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 18, 1, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 9, 13, 8, 7 },
+    { 25, 1, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 7 },
+    { 25, 1, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 14, 12, 0, 7 },
+    { 10, 5, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 6, 12, 4, 8 },
+    { 10, 5, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 6, 12, 4, 8 },
+    { 10, 5, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 6, 12, 4, 2 },
+    { 26, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 26, 13, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 25, 4, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 8 },
+    { 27, 13, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 8 },
+    { 25, 13, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 11, 8 },
+    { 29, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 0, 17, 230, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 230, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 30, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 31, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 32, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 25, 13, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 2 },
+    { 10, 13, 0, 5, -1, 0, 15, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 8 },
+    { 13, 13, 0, 0, -1, 0, 0, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 0 },
+    { 25, 13, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 8 },
+    { 25, 13, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 2 },
+    { 18, 13, 0, 2, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 2, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 2, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 2, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 17, 13, 0, 1, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 0, 17, 27, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 28, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 29, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 30, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 31, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 32, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 33, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 34, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 4, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 4, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 230, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 220, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 220, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 3, 5, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 5, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 25, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 8 },
+    { 25, 5, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 25, 5, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 11, 9, 8 },
+    { 25, 13, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 18, 13, 0, 2, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 0, 17, 35, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 18, 13, 0, 3, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 2, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 2, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 25, 13, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 8 },
+    { 0, 17, 230, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 10, 5, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 6, 12, 4, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 0, 17, 220, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 17, 13, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 3, 2, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 3, 2, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 8 },
+    { 29, 13, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 18, 13, 0, 2, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 25, 13, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 12, 9 },
+    { 25, 13, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 9 },
+    { 10, 13, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 6, 12, 4, 9 },
+    { 18, 13, 0, 3, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 9 },
+    { 0, 17, 36, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 9 },
+    { 18, 13, 0, 2, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 9 },
+    { 18, 13, 0, 2, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 9 },
+    { 18, 13, 0, 3, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 9 },
+    { 0, 17, 230, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 9 },
+    { 0, 17, 220, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 9 },
+    { 18, 13, 0, 2, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 10 },
+    { 0, 17, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 10 },
+    { 18, 13, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 10 },
+    { 3, 1, 0, 0, 0, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 2, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 3, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 4, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 5, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 6, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 7, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 8, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 3, 1, 0, 0, 9, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 66 },
+    { 18, 1, 0, 2, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 66 },
+    { 0, 17, 230, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 66 },
+    { 0, 17, 220, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 66 },
+    { 17, 1, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 66 },
+    { 29, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 66 },
+    { 25, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 66 },
+    { 25, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 11, 66 },
+    { 25, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 66 },
+    { 17, 1, 0, 1, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 66 },
+    { 18, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 82 },
+    { 0, 17, 230, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 82 },
+    { 17, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 82 },
+    { 25, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 82 },
+    { 18, 1, 0, 3, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 95 },
+    { 18, 1, 0, 2, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 95 },
+    { 18, 1, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 95 },
+    { 0, 17, 220, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 95 },
+    { 25, 1, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 95 },
+    { 18, 13, 0, 2, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 9 },
+    { 18, 13, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 9 },
+    { 18, 13, 0, 3, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 9 },
+    { 18, 13, 0, 2, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 2, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 2, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 2, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 18, 13, 0, 3, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 0, 17, 230, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 10, 5, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 6, 12, 4, 2 },
+    { 0, 17, 220, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 230, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 220, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 27, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 28, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 29, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 230, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 8 },
+    { 0, 17, 0, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 11 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 11 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 11 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 0, 17, 0, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 11 },
+    { 1, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 11 },
+    { 0, 17, 7, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 11 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 11 },
+    { 1, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 11 },
+    { 0, 17, 230, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 11 },
+    { 18, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 25, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 2 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 11 },
+    { 25, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 11 },
+    { 17, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 12 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 12 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 12 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 12 },
+    { 0, 17, 7, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 12 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 12 },
+    { 1, 0, 0, 0, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 12 },
+    { 1, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 12 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 12 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 12 },
+    { 18, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 12 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 12 },
+    { 27, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 12 },
+    { 5, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 12 },
+    { 5, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 12 },
+    { 29, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 12 },
+    { 27, 4, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 12 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 12 },
+    { 25, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 12 },
+    { 0, 17, 0, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 13 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 13 },
+    { 1, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 13 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 13 },
+    { 18, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 13 },
+    { 0, 17, 7, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 13 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 13 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 13 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 13 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 13 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 14 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 14 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 14 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 14 },
+    { 0, 17, 7, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 14 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 14 },
+    { 0, 17, 0, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 14 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 14 },
+    { 25, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 14 },
+    { 27, 4, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 14 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 14 },
+    { 0, 17, 0, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 14 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 15 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 15 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 15 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 15 },
+    { 0, 17, 7, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 15 },
+    { 1, 0, 0, 0, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 15 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 15 },
+    { 1, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 15 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 15 },
+    { 0, 17, 0, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 15 },
+    { 18, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 15 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 15 },
+    { 29, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 15 },
+    { 5, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 15 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 16 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 16 },
+    { 18, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 16 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 16 },
+    { 1, 0, 0, 0, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 16 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 16 },
+    { 1, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 16 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 16 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 16 },
+    { 3, 0, 0, 0, 0, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 16 },
+    { 5, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 16 },
+    { 29, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 16 },
+    { 27, 4, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 16 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 17 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 17 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 17 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 17 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 17 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 17 },
+    { 0, 17, 0, 5, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 17 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 17 },
+    { 0, 17, 84, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 17 },
+    { 0, 17, 91, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 17 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 17 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 17 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 17 },
+    { 5, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 17 },
+    { 29, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 17 },
+    { 18, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 18 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 18 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 18 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 18 },
+    { 0, 17, 7, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 18 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 18 },
+    { 0, 0, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 18 },
+    { 1, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 18 },
+    { 1, 0, 0, 0, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 18 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 18 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 18 },
+    { 0, 17, 0, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 18 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 18 },
+    { 18, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 18 },
+    { 0, 17, 0, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 19 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 19 },
+    { 1, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 19 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 19 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 19 },
+    { 0, 17, 9, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 19 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 19 },
+    { 1, 0, 0, 0, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 19 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 19 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 19 },
+    { 1, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 19 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 19 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 10, 12, 8, 19 },
+    { 29, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 19 },
+    { 18, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 19 },
+    { 5, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 19 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 19 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 19 },
+    { 5, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 19 },
+    { 29, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 19 },
+    { 1, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 20 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 20 },
+    { 0, 17, 9, 5, -1, 0, 4, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 20 },
+    { 1, 0, 0, 0, -1, 0, 4, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 20 },
+    { 0, 17, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 20 },
+    { 1, 0, 0, 0, -1, 0, 4, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 20 },
+    { 3, 0, 0, 0, 0, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 2, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 3, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 4, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 5, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 6, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 7, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 8, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 3, 0, 0, 0, 9, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 20 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 20 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 21 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 21 },
+    { 18, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 0, 33, 8, 21 },
+    { 0, 17, 103, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 21 },
+    { 0, 17, 9, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 21 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 21 },
+    { 0, 17, 107, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 21 },
+    { 25, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 21 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 21 },
+    { 25, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 21 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 22 },
+    { 0, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 22 },
+    { 18, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 0, 33, 8, 22 },
+    { 0, 17, 118, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 22 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 22 },
+    { 0, 17, 122, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 22 },
+    { 3, 0, 0, 0, 0, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 3, 0, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 22 },
+    { 18, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 22 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 22 },
+    { 18, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 23 },
+    { 29, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 4, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 2, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 4, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 23 },
+    { 29, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 23 },
+    { 0, 17, 220, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 3, 0, 0, 0, 0, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 2, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 3, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 4, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 5, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 6, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 7, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 8, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 3, 0, 0, 0, 9, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 23 },
+    { 5, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 23 },
+    { 29, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 23 },
+    { 0, 17, 216, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 21, 10, 0, 0, -1, 1, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 23 },
+    { 22, 10, 0, 0, -1, -1, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 23 },
+    { 1, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 23 },
+    { 18, 0, 0, 0, -1, 0, 2, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 23 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 23 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 23 },
+    { 0, 17, 129, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 0, 17, 130, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 0, 17, 0, 5, -1, 0, 2, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 0, 17, 132, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 0, 17, 0, 5, -1, 0, 2, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 0, 17, 0, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 1, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 17, 4, 23 },
+    { 0, 17, 230, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 0, 17, 9, 5, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 23 },
+    { 0, 17, 0, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 0, 17, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 29, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 23 },
+    { 29, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 23 },
+    { 0, 17, 220, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 23 },
+    { 29, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 23 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 23 },
+    { 29, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 25, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 4, 0, 23 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 24 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 24 },
+    { 18, 0, 0, 0, -1, 0, 4, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 24 },
+    { 1, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 4, 33, 4, 24 },
+    { 1, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 4, 33, 4, 24 },
+    { 0, 17, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 0, 17, 0, 5, -1, 0, 4, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 1, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 33, 4, 24 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 0, 17, 7, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 0, 17, 9, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 0, 17, 9, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 1, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 33, 4, 24 },
+    { 3, 0, 0, 0, 0, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 2, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 3, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 4, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 5, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 6, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 7, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 8, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 9, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 24 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 24 },
+    { 0, 17, 220, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 3, 0, 0, 0, 0, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 2, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 3, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 4, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 5, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 6, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 7, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 8, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 9, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 1, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 4, 33, 4, 24 },
+    { 0, 17, 0, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 29, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 0, 24 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 7264}, {0, 0}, {0, 0}, {0, 7264} }, 0, 10, 12, 7, 25 },
+    { 14, 0, 0, 0, -1, 0, 13, 0,  { {0, 7264}, {0, 0}, {0, 0}, {0, 7264} }, 0, 10, 12, 7, 25 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 25 },
+    { 18, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 25 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 25 },
+    { 25, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 17, 0, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 25 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 25 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 9, 10, 25, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 9, 10, 25, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 10, 10, 26, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 10, 10, 26, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 10, 10, 26, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 11, 10, 27, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 11, 10, 27, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 11, 10, 27, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 27 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 27 },
+    { 0, 17, 230, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 27 },
+    { 0, 17, 230, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 27 },
+    { 25, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 27 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 12, 27 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 2, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 3, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 4, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 5, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 6, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 7, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 8, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, 9, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 5, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 29, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 27 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 39}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 41}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 43}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 45}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 47}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 49}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 51}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 53}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 55}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 57}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 59}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 61}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 63}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 65}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 67}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 69}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 71}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 73}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 75}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 77}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 79}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 81}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 83}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 85}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 87}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 89}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 91}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 93}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 95}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 97}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 99}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 101}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 103}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 105}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 107}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 109}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 111}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 113}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 115}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 117}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 119}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 121}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 123}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 125}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 127}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 129}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 131}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 133}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 135}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 137}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 139}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 141}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 143}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 145}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 147}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 149}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 151}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 153}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 155}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 157}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 159}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 161}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 163}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 165}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 167}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 169}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 171}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 173}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 175}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 177}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 179}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 181}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 183}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 185}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 187}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 189}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 191}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 193}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 195}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {1, 197}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 4, 0,  { {0, 8}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 14, 0, 0, 0, -1, 0, 17, 0,  { {0, 8}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, -8}, {0, -8}, {0, -8} }, 0, 10, 12, 6, 28 },
+    { 20, 10, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 29 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 29 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 29 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 12, 29 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 29 },
+    { 6, 9, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 5, 30 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 30 },
+    { 21, 10, 0, 0, -1, 1, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 30 },
+    { 22, 10, 0, 0, -1, -1, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 30 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 31 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 4, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 31 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 31 },
+    { 18, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 42 },
+    { 0, 17, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 42 },
+    { 0, 17, 9, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 42 },
+    { 18, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 43 },
+    { 0, 17, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 43 },
+    { 0, 17, 9, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 43 },
+    { 25, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 2 },
+    { 18, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 44 },
+    { 0, 17, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 44 },
+    { 18, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 45 },
+    { 0, 17, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 45 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 32 },
+    { 0, 17, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 32 },
+    { 1, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 33, 4, 32 },
+    { 0, 17, 9, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 32 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 32 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 0, 32 },
+    { 17, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 32 },
+    { 25, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 32 },
+    { 27, 4, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 32 },
+    { 0, 17, 230, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 32 },
+    { 3, 0, 0, 0, 0, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 2, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 3, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 4, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 5, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 6, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 7, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 8, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 3, 0, 0, 0, 9, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 32 },
+    { 5, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 32 },
+    { 25, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 33 },
+    { 25, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 2 },
+    { 25, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 33 },
+    { 25, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 20, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 33 },
+    { 25, 10, 0, 2, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 33 },
+    { 25, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 11, 33 },
+    { 25, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 33 },
+    { 25, 10, 0, 1, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 33 },
+    { 0, 17, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 33 },
+    { 10, 18, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 4, 4, 33 },
+    { 3, 0, 0, 0, 0, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 2, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 3, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 4, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 5, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 6, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 7, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 8, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 3, 0, 0, 0, 9, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 33 },
+    { 18, 0, 0, 2, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 33 },
+    { 17, 0, 0, 2, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 33 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 33 },
+    { 0, 17, 228, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 33 },
+    { 18, 0, 0, 2, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 33 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 47 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 47 },
+    { 0, 17, 0, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 47 },
+    { 1, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 47 },
+    { 0, 17, 222, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 47 },
+    { 0, 17, 230, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 47 },
+    { 0, 17, 220, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 47 },
+    { 29, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 47 },
+    { 25, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 47 },
+    { 3, 0, 0, 0, 0, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 2, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 3, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 4, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 5, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 6, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 7, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 8, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 3, 0, 0, 0, 9, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 47 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 48 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 56 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 56 },
+    { 3, 0, 0, 0, 0, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 2, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 3, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 4, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 5, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 6, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 7, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 8, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 3, 0, 0, 0, 9, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 56 },
+    { 5, 0, 0, 0, 1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 0, 56 },
+    { 29, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 0, 56 },
+    { 29, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 32 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 55 },
+    { 0, 17, 230, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 55 },
+    { 0, 17, 220, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 55 },
+    { 1, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 55 },
+    { 0, 17, 0, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 55 },
+    { 25, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 55 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 78 },
+    { 1, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 33, 4, 78 },
+    { 0, 17, 0, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 78 },
+    { 0, 17, 9, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 78 },
+    { 1, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 4, 33, 4, 78 },
+    { 0, 17, 230, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 78 },
+    { 0, 17, 220, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 78 },
+    { 3, 0, 0, 0, 0, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 2, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 3, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 4, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 5, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 6, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 7, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 8, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 3, 0, 0, 0, 9, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 78 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 0, 78 },
+    { 17, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 78 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 12, 78 },
+    { 0, 17, 230, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 2, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 0, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 62 },
+    { 1, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 62 },
+    { 18, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 62 },
+    { 18, 0, 0, 0, -1, 0, 9, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 62 },
+    { 0, 17, 7, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 62 },
+    { 1, 0, 0, 0, -1, 0, 9, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 62 },
+    { 1, 0, 0, 0, -1, 0, 9, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 62 },
+    { 1, 0, 9, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 62 },
+    { 3, 0, 0, 0, 0, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 2, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 3, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 4, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 5, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 6, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 7, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 8, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 3, 0, 0, 0, 9, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 62 },
+    { 25, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 62 },
+    { 25, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 62 },
+    { 25, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 62 },
+    { 29, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 62 },
+    { 0, 17, 230, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 62 },
+    { 0, 17, 220, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 62 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 67 },
+    { 1, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 67 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 67 },
+    { 1, 0, 9, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 67 },
+    { 0, 17, 9, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 67 },
+    { 0, 17, 0, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 67 },
+    { 3, 0, 0, 0, 0, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 2, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 3, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 4, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 5, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 6, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 7, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 8, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 3, 0, 0, 0, 9, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 67 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 67 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 93 },
+    { 0, 17, 7, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 93 },
+    { 1, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 93 },
+    { 0, 17, 0, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 93 },
+    { 1, 0, 9, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 93 },
+    { 25, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 93 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 68 },
+    { 1, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 68 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 68 },
+    { 0, 17, 7, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 68 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 68 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 68 },
+    { 3, 0, 0, 0, 0, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 2, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 3, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 4, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 5, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 6, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 7, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 8, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 9, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 68 },
+    { 3, 0, 0, 0, 0, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 2, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 3, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 4, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 5, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 6, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 7, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 8, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 3, 0, 0, 0, 9, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 69 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 69 },
+    { 17, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 69 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 69 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, -6254}, {0, -6254}, {0, -6222} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, -6253}, {0, -6253}, {0, -6221} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, -6244}, {0, -6244}, {0, -6212} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, -6242}, {0, -6242}, {0, -6210} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, -6243}, {0, -6243}, {0, -6211} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, -6236}, {0, -6236}, {0, -6204} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, -6181}, {0, -6181}, {0, -6180} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {1, 199}, {1, 199}, {1, 711} }, 0, 10, 12, 6, 5 },
+    { 25, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 67 },
+    { 0, 17, 230, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 0, 17, 1, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 1, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 2 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 1, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 2 },
+    { 0, 17, 230, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 1, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 2 },
+    { 15, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 17, 0, 0, 0, -1, 0, 7, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 17, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 17, 0, 0, 0, -1, 0, 7, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 17, 0, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {1, 201}, {1, 201}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 3814}, {0, 3814}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 17, 0, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 17, 0, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 0, 17, 230, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 234, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 214, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 202, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 232, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 228, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 233, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 506}, {1, 506}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 509}, {1, 509}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 512}, {1, 512}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 515}, {1, 515}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 518}, {1, 518}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 2, 81,  { {0, 0}, {0, -59}, {0, -59}, {0, -58} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {0, -7615}, {0, 0}, {0, 0}, {0, -7615} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 8}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {0, 0}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 521}, {1, 521}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 524}, {1, 524}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 528}, {1, 528}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 532}, {1, 532}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 74}, {0, 74}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 74}, {0, 74}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 86}, {0, 86}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 86}, {0, 86}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 100}, {0, 100}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 100}, {0, 100}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 128}, {0, 128}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 128}, {0, 128}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 112}, {0, 112}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 112}, {0, 112}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 126}, {0, 126}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 126}, {0, 126}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 570}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 573}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 576}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 579}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 582}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 585}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 588}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 591}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 570}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 573}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 576}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 579}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 582}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 585}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 588}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 591}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 594}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 597}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 600}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 603}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 606}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 609}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 612}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 615}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 594}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 597}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 600}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 603}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 606}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 609}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 612}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 615}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 618}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 621}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 624}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 627}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 630}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 633}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 636}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 639}, {0, 8}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 618}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 621}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 624}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 627}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 630}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 633}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 636}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -8}, {1, 639}, {0, 0}, {0, -8} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 654}, {1, 651}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 642}, {0, 9}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 660}, {1, 657}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 536}, {1, 536}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 691}, {1, 687}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -74}, {0, 0}, {0, 0}, {0, -74} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {0, -74}, {0, 0}, {0, 0}, {0, -74} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -9}, {1, 642}, {0, 0}, {0, -9} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, -7205}, {0, -7205}, {0, -7173} }, 0, 10, 12, 6, 4 },
+    { 28, 10, 0, 0, -1, 0, 1, 81,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 666}, {1, 663}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 645}, {0, 9}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 672}, {1, 669}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 539}, {1, 539}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 699}, {1, 695}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -86}, {0, 0}, {0, 0}, {0, -86} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {0, -86}, {0, 0}, {0, 0}, {0, -86} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -9}, {1, 645}, {0, 0}, {0, -9} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 542}, {1, 542}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {1, 495}, {1, 495}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 546}, {1, 546}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 549}, {1, 549}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -100}, {0, 0}, {0, 0}, {0, -100} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {0, -100}, {0, 0}, {0, 0}, {0, -100} }, 0, 10, 12, 7, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 553}, {1, 553}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {1, 499}, {1, 499}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 557}, {1, 557}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 7}, {0, 7}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 560}, {1, 560}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 563}, {1, 563}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -112}, {0, 0}, {0, 0}, {0, -112} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {0, -112}, {0, 0}, {0, 0}, {0, -112} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -7}, {0, 0}, {0, 0}, {0, -7} }, 0, 10, 12, 7, 4 },
+    { 28, 10, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 678}, {1, 675}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 648}, {0, 9}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 684}, {1, 681}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 567}, {1, 567}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {1, 707}, {1, 703}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -128}, {0, 0}, {0, 0}, {0, -128} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {0, -128}, {0, 0}, {0, 0}, {0, -128} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 17,  { {0, -126}, {0, 0}, {0, 0}, {0, -126} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {0, -126}, {0, 0}, {0, 0}, {0, -126} }, 0, 10, 12, 7, 4 },
+    { 16, 0, 0, 0, -1, 0, 1, 17,  { {0, -9}, {1, 648}, {0, 0}, {0, -9} }, 0, 10, 12, 7, 4 },
+    { 28, 10, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 4 },
+    { 6, 9, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 5, 2 },
+    { 6, 9, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 5, 2 },
+    { 6, 9, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 4, 5, 2 },
+    { 10, 18, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 20, 4, 2 },
+    { 10, 18, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 10, 18, 0, 1, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 5, 5, 32, 4, 1 },
+    { 10, 0, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 1, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 20, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 20, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 4, 0, 2 },
+    { 20, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 11, 2 },
+    { 20, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 19, 11, 2 },
+    { 20, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 23, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 13, 3, 13, 2 },
+    { 24, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 13, 3, 13, 2 },
+    { 21, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 23, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 24, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 13, 15, 10, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 15, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 14, 17, 0, 2 },
+    { 7, 9, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 3, 38, 3, 2 },
+    { 8, 7, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 3, 38, 3, 2 },
+    { 10, 11, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 14, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 16, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 12, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 15, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 6, 6, 0, 0, -1, 0, 4, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 17, 4, 5, 2 },
+    { 25, 4, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 23, 10, 0, 0, -1, 1, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 24, 10, 0, 0, -1, -1, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 12, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 12, 2 },
+    { 26, 6, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 0, 2 },
+    { 22, 10, 0, 0, -1, -1, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 25, 10, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 12, 2 },
+    { 25, 10, 0, 0, -1, 0, 4, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 12, 2 },
+    { 25, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 19, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 17, 12, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 6, 9, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 5, 2 },
+    { 10, 18, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 22, 4, 2 },
+    { 10, 18, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 12, 4, 2 },
+    { 10, 18, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 12, 4, 2 },
+    { 13, 18, 0, 0, -1, 0, 0, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 12, 0, 0 },
+    { 10, 19, 0, 0, -1, 0, 15, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 20, 0, 0, -1, 0, 15, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 21, 0, 0, -1, 0, 15, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 22, 0, 0, -1, 0, 15, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 10, 18, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 5, 2, 0, 0, 0, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 17, 0, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 5, 2, 0, 0, 4, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 5, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 6, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 7, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 8, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 9, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 3, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 21, 10, 0, 0, -1, 1, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -1, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 17, 0, 0, 0, -1, 0, 12, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 27, 4, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 3, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 14, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 27, 4, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 13, 4, 0, 0, -1, 0, 0, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 0 },
+    { 2, 17, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 2, 17, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 2, 17, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 1, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 220, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 1, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 29, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 9, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {0, -7517}, {0, 0}, {0, 0}, {0, -7517} }, 0, 10, 12, 7, 4 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {1, 203}, {0, 0}, {0, 0}, {1, 203} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 1, 85,  { {1, 205}, {0, 0}, {0, 0}, {1, 205} }, 0, 10, 12, 7, 3 },
+    { 29, 4, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 1, 0,  { {0, 28}, {0, 0}, {0, 0}, {0, 28} }, 0, 10, 12, 7, 3 },
+    { 18, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 15, 0, 0, 0, -1, 0, 4, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 29, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 7, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 15, 0, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 15, 0, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 14, 0, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 2 },
+    { 26, 10, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 15, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, -28}, {0, -28}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 29, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, -1, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 4, 0, 0, 0, -1, 0, 1, 80,  { {0, 16}, {0, 0}, {0, 0}, {0, 16} }, 0, 10, 12, 7, 3 },
+    { 4, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -16}, {0, -16}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 4, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 3 },
+    { 4, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 3 },
+    { 29, 10, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 3, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 3, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -3, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -3, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 2016, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 1, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -1, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 138, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 1, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -1, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 1824, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 2104, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 2108, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 2106, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -138, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 15, 0, 2 },
+    { 26, 10, 0, 0, -1, 8, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 7, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -8, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -7, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 21, 10, 0, 0, -1, 1, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -1, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 29, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 2, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 3, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 4, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 5, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 6, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 7, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 8, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 9, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 1, 80,  { {0, 26}, {0, 0}, {0, 0}, {0, 26} }, 0, 10, 12, 7, 2 },
+    { 29, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -26}, {0, -26}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 5, 10, 0, 0, 0, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 2, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 3, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 4, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 5, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 6, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 7, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 8, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 9, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 0, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 14, 18, 30, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 16, 20, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 16, 20, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 14, 18, 30, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 16, 20, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 14, 18, 30, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 29, 10, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 2 },
+    { 21, 10, 0, 0, -1, 1, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -1, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 5, 10, 0, 0, 1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 2, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 3, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 4, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 5, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 6, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 7, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 8, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, 9, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 1, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -1, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 21, 10, 0, 0, -1, 1, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -1, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 26, 10, 0, 0, -1, 1, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -1, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 2, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -2, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 1, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -1, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 21, 10, 0, 0, -1, 1, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -1, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 29, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 54 },
+    { 21, 10, 0, 0, -1, 3, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, 1, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 21, 10, 0, 0, -1, -1, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -3, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 26, 10, 0, 0, -1, -1824, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -2016, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 6, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -2104, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -2106, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, -2108, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 8, 0,  { {0, 48}, {0, 0}, {0, 0}, {0, 48} }, 0, 10, 12, 7, 57 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, -48}, {0, -48}, {0, 0} }, 0, 10, 12, 6, 57 },
+    { 14, 0, 0, 0, -1, 0, 9, 0,  { {1, 207}, {0, 0}, {0, 0}, {1, 207} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 9, 0,  { {0, -3814}, {0, 0}, {0, 0}, {0, -3814} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 9, 0,  { {1, 209}, {0, 0}, {0, 0}, {1, 209} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {1, 211}, {1, 211}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {1, 213}, {1, 213}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {1, 215}, {0, 0}, {0, 0}, {1, 215} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {1, 217}, {0, 0}, {0, 0}, {1, 217} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {1, 219}, {0, 0}, {0, 0}, {1, 219} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 11, 0,  { {1, 221}, {0, 0}, {0, 0}, {1, 221} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 17, 0, 0, 0, -1, 0, 10, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 11, 0,  { {1, 223}, {0, 0}, {0, 0}, {1, 223} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 11, 0,  { {1, 225}, {0, 0}, {0, 0}, {1, 225} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 8, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 46 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 46 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 46 },
+    { 29, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 46 },
+    { 14, 0, 0, 0, -1, 0, 11, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 46 },
+    { 15, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 46 },
+    { 0, 17, 230, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 46 },
+    { 14, 0, 0, 0, -1, 0, 13, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 46 },
+    { 15, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 46 },
+    { 25, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 46 },
+    { 25, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 46 },
+    { 5, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 46 },
+    { 15, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, -7264}, {0, -7264}, {0, 0} }, 0, 10, 12, 6, 25 },
+    { 15, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, -7264}, {0, -7264}, {0, 0} }, 0, 10, 12, 6, 25 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 58 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 58 },
+    { 17, 0, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 58 },
+    { 25, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 58 },
+    { 0, 17, 9, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 58 },
+    { 25, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 23, 10, 0, 0, -1, 1, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 24, 10, 0, 0, -1, -1, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 20, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 20, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 23, 10, 0, 0, -1, 1, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 24, 10, 0, 0, -1, -1, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 25, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 2 },
+    { 17, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 25, 10, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 20, 10, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 19, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 2 },
+    { 25, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 20, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 21, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 25, 10, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 37 },
+    { 29, 10, 0, 0, -1, 0, 4, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 37 },
+    { 29, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 12, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 5, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 2 },
+    { 4, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 20, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 0, 2 },
+    { 22, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 0, 17, 218, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 228, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 222, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 1, 0, 224, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 26 },
+    { 20, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 14, 8, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 21, 8, 2 },
+    { 29, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 4, 0, 0, 0, -1, 0, 4, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 17, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 5, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 5, 8, 2 },
+    { 25, 10, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 8, 34 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 34 },
+    { 18, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 34 },
+    { 18, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 8, 34 },
+    { 0, 17, 8, 5, -1, 0, 1, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 28, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 0, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 8, 34 },
+    { 17, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 8, 34 },
+    { 18, 0, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 34 },
+    { 20, 10, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 0, 2 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 8, 35 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 14, 8, 35 },
+    { 18, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 14, 8, 35 },
+    { 25, 10, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 0, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 8, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 8, 35 },
+    { 17, 0, 0, 0, -1, 0, 1, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 8, 35 },
+    { 18, 0, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 14, 8, 35 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 14, 8, 36 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 14, 8, 36 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 14, 8, 36 },
+    { 18, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 14, 8, 26 },
+    { 29, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 5, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 14, 8, 36 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 14, 8, 36 },
+    { 18, 0, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 8, 35 },
+    { 29, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 26 },
+    { 29, 10, 0, 0, -1, 0, 7, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 26 },
+    { 29, 0, 0, 0, -1, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 5, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 7, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 5, 10, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 26 },
+    { 29, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 14, 0, 35 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 13, 0, 0, 0, -1, 0, 0, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 0 },
+    { 18, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 14, 8, 38 },
+    { 17, 0, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 5, 8, 38 },
+    { 29, 10, 0, 0, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 38 },
+    { 29, 10, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 38 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 83 },
+    { 17, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 83 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 83 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 83 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 70 },
+    { 17, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 70 },
+    { 25, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 70 },
+    { 25, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 70 },
+    { 25, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 70 },
+    { 3, 0, 0, 0, 0, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 2, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 3, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 4, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 5, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 6, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 7, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 8, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 3, 0, 0, 0, 9, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 70 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 5 },
+    { 2, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 5 },
+    { 25, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 5 },
+    { 0, 17, 230, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 5 },
+    { 17, 10, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 5 },
+    { 17, 0, 0, 0, -1, 0, 16, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 5 },
+    { 0, 17, 230, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 5 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 84 },
+    { 4, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 84 },
+    { 0, 17, 230, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 84 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 84 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 84 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 84 },
+    { 28, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 17, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 28, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 10, 0,  { {1, 227}, {0, 0}, {0, 0}, {1, 227} }, 0, 10, 12, 7, 3 },
+    { 28, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 12, 0,  { {1, 229}, {0, 0}, {0, 0}, {1, 229} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 3 },
+    { 14, 0, 0, 0, -1, 0, 12, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 13, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 14, 0, 0, 0, -1, 0, 13, 0,  { {1, 231}, {0, 0}, {0, 0}, {1, 231} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {1, 233}, {0, 0}, {0, 0}, {1, 233} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {1, 235}, {0, 0}, {0, 0}, {1, 235} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {1, 237}, {0, 0}, {0, 0}, {1, 237} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 18, 0,  { {1, 239}, {0, 0}, {0, 0}, {1, 239} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {1, 241}, {0, 0}, {0, 0}, {1, 241} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {1, 243}, {0, 0}, {0, 0}, {1, 243} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 17, 0,  { {1, 245}, {0, 0}, {0, 0}, {1, 245} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 17, 0,  { {0, 928}, {0, 0}, {0, 0}, {0, 928} }, 0, 10, 12, 7, 3 },
+    { 14, 0, 0, 0, -1, 0, 17, 0,  { {0, 1}, {0, 0}, {0, 0}, {0, 1} }, 0, 10, 12, 7, 3 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, -1}, {0, -1}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 3 },
+    { 17, 0, 0, 0, -1, 0, 13, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 3 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 59 },
+    { 0, 17, 0, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 59 },
+    { 0, 17, 9, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 59 },
+    { 1, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 59 },
+    { 29, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 59 },
+    { 29, 4, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 18, 0, 0, 2, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 65 },
+    { 18, 0, 0, 4, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 65 },
+    { 18, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 65 },
+    { 25, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 65 },
+    { 25, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 65 },
+    { 1, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 71 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 71 },
+    { 0, 17, 9, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 71 },
+    { 0, 17, 0, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 71 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 71 },
+    { 3, 0, 0, 0, 0, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 2, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 3, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 4, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 5, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 6, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 7, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 8, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 3, 0, 0, 0, 9, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 71 },
+    { 0, 17, 230, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 11 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 11 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 11 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 11 },
+    { 3, 0, 0, 0, 0, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 2, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 3, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 4, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 5, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 6, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 7, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 8, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 3, 0, 0, 0, 9, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 72 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 72 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 72 },
+    { 0, 17, 220, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 72 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 72 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 73 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 73 },
+    { 1, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 73 },
+    { 1, 0, 9, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 73 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 73 },
+    { 0, 17, 0, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 85 },
+    { 1, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 85 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 85 },
+    { 0, 17, 7, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 85 },
+    { 1, 0, 9, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 85 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 85 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 85 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 85 },
+    { 17, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 2 },
+    { 3, 0, 0, 0, 0, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 2, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 3, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 4, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 5, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 6, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 7, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 8, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 3, 0, 0, 0, 9, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 85 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 24 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 24 },
+    { 17, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 24 },
+    { 3, 0, 0, 0, 0, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 2, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 3, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 4, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 5, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 6, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 7, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 8, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 3, 0, 0, 0, 9, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 24 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 77 },
+    { 0, 17, 0, 5, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 77 },
+    { 1, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 77 },
+    { 3, 0, 0, 0, 0, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 2, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 3, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 4, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 5, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 6, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 7, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 8, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 3, 0, 0, 0, 9, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 77 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 77 },
+    { 25, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 77 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 24 },
+    { 17, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 24 },
+    { 29, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 0, 24 },
+    { 1, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 4, 33, 4, 24 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 79 },
+    { 0, 17, 230, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 79 },
+    { 0, 17, 220, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 79 },
+    { 17, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 79 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 0, 79 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 86 },
+    { 1, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 86 },
+    { 0, 17, 0, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 86 },
+    { 25, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 86 },
+    { 17, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 86 },
+    { 0, 17, 9, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 86 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 27 },
+    { 15, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, -928}, {0, -928}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 28, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 0, 2 },
+    { 17, 0, 0, 0, -1, 0, 16, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 4 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 247}, {1, 247}, {1, 247} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 249}, {1, 249}, {1, 249} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 251}, {1, 251}, {1, 251} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 253}, {1, 253}, {1, 253} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 255}, {1, 255}, {1, 255} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 257}, {1, 257}, {1, 257} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 259}, {1, 259}, {1, 259} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 261}, {1, 261}, {1, 261} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 263}, {1, 263}, {1, 263} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 265}, {1, 265}, {1, 265} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 267}, {1, 267}, {1, 267} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 269}, {1, 269}, {1, 269} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 271}, {1, 271}, {1, 271} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 273}, {1, 273}, {1, 273} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 275}, {1, 275}, {1, 275} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 277}, {1, 277}, {1, 277} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 279}, {1, 279}, {1, 279} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 281}, {1, 281}, {1, 281} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 283}, {1, 283}, {1, 283} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 285}, {1, 285}, {1, 285} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 287}, {1, 287}, {1, 287} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 289}, {1, 289}, {1, 289} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 291}, {1, 291}, {1, 291} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 293}, {1, 293}, {1, 293} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 295}, {1, 295}, {1, 295} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 297}, {1, 297}, {1, 297} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 299}, {1, 299}, {1, 299} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 301}, {1, 301}, {1, 301} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 303}, {1, 303}, {1, 303} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 305}, {1, 305}, {1, 305} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 307}, {1, 307}, {1, 307} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 309}, {1, 309}, {1, 309} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 311}, {1, 311}, {1, 311} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 313}, {1, 313}, {1, 313} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 315}, {1, 315}, {1, 315} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 317}, {1, 317}, {1, 317} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 319}, {1, 319}, {1, 319} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 321}, {1, 321}, {1, 321} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 323}, {1, 323}, {1, 323} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 325}, {1, 325}, {1, 325} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 327}, {1, 327}, {1, 327} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 329}, {1, 329}, {1, 329} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 331}, {1, 331}, {1, 331} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 333}, {1, 333}, {1, 333} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 335}, {1, 335}, {1, 335} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 337}, {1, 337}, {1, 337} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 339}, {1, 339}, {1, 339} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 341}, {1, 341}, {1, 341} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 343}, {1, 343}, {1, 343} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 345}, {1, 345}, {1, 345} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 347}, {1, 347}, {1, 347} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 349}, {1, 349}, {1, 349} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 351}, {1, 351}, {1, 351} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 353}, {1, 353}, {1, 353} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 355}, {1, 355}, {1, 355} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 357}, {1, 357}, {1, 357} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 359}, {1, 359}, {1, 359} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 361}, {1, 361}, {1, 361} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 363}, {1, 363}, {1, 363} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 365}, {1, 365}, {1, 365} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 367}, {1, 367}, {1, 367} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 369}, {1, 369}, {1, 369} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 371}, {1, 371}, {1, 371} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 373}, {1, 373}, {1, 373} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 375}, {1, 375}, {1, 375} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 377}, {1, 377}, {1, 377} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 379}, {1, 379}, {1, 379} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 381}, {1, 381}, {1, 381} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 383}, {1, 383}, {1, 383} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 385}, {1, 385}, {1, 385} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 387}, {1, 387}, {1, 387} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 389}, {1, 389}, {1, 389} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 391}, {1, 391}, {1, 391} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 393}, {1, 393}, {1, 393} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 395}, {1, 395}, {1, 395} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 397}, {1, 397}, {1, 397} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 399}, {1, 399}, {1, 399} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 401}, {1, 401}, {1, 401} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 403}, {1, 403}, {1, 403} }, 0, 10, 12, 6, 28 },
+    { 15, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {1, 405}, {1, 405}, {1, 405} }, 0, 10, 12, 6, 28 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 86 },
+    { 1, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 86 },
+    { 0, 17, 0, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 86 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 86 },
+    { 0, 17, 9, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 86 },
+    { 3, 0, 0, 0, 0, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 2, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 3, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 4, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 5, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 6, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 7, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 8, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 3, 0, 0, 0, 9, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 86 },
+    { 18, 0, 0, 0, -1, 0, 2, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 12, 10, 23, 8, 26 },
+    { 18, 0, 0, 0, -1, 0, 2, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 13, 10, 24, 8, 26 },
+    { 11, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 34, 0, 0 },
+    { 12, 0, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 0 },
+    { 18, 0, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 13, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 6, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 11, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 8, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 419}, {1, 416}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 425}, {1, 422}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 431}, {1, 428}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 438}, {1, 434}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 446}, {1, 442}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 453}, {1, 450}, {0, 0} }, 0, 10, 12, 6, 3 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 465}, {1, 462}, {0, 0} }, 0, 10, 12, 6, 6 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 471}, {1, 468}, {0, 0} }, 0, 10, 12, 6, 6 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 477}, {1, 474}, {0, 0} }, 0, 10, 12, 6, 6 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 483}, {1, 480}, {0, 0} }, 0, 10, 12, 6, 6 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {1, 489}, {1, 486}, {0, 0} }, 0, 10, 12, 6, 6 },
+    { 18, 1, 0, 0, -1, 0, 4, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 9, 13, 8, 7 },
+    { 0, 17, 26, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 7 },
+    { 18, 1, 0, 0, -1, 0, 1, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 9, 13, 8, 7 },
+    { 18, 1, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 9, 13, 8, 7 },
+    { 26, 3, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 7 },
+    { 18, 13, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 28, 13, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 13, 18, 0, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 0 },
+    { 27, 13, 0, 0, -1, 0, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 8 },
+    { 0, 17, 0, 5, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 25, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 14, 8, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 8, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 2 },
+    { 21, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 25, 10, 0, 0, -1, 0, 8, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 15, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 20, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 11, 2 },
+    { 19, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 17, 14, 0, 2 },
+    { 21, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 21, 10, 0, 0, -1, 0, 7, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, 0, 7, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 25, 6, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 1, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 11, 2 },
+    { 25, 6, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 13, 1, 10, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 15, 5, 0, 2 },
+    { 25, 6, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 14, 5, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 12, 2 },
+    { 25, 4, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 26, 3, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 20, 3, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 11, 2 },
+    { 26, 10, 0, 0, -1, 1, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 26, 10, 0, 0, -1, -1, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 18, 13, 0, 0, -1, 0, 6, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 10, 18, 0, 5, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 22, 4, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 13, 14, 0, 2 },
+    { 25, 6, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 0, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 2, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 3, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 4, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 5, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 6, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 7, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 8, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 3, 2, 0, 0, 9, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 26, 10, 0, 0, -1, 2, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 26, 10, 0, 0, -1, -2, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 1, 80,  { {0, 32}, {0, 0}, {0, 0}, {0, 32} }, 0, 10, 14, 7, 3 },
+    { 21, 10, 0, 0, -1, 2, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -2, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 28, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 15, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, -32}, {0, -32}, {0, 0} }, 0, 10, 14, 6, 3 },
+    { 21, 10, 0, 0, -1, 1, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 13, 2 },
+    { 22, 10, 0, 0, -1, -1, 6, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 13, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 12, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 1, 11, 2 },
+    { 25, 10, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 0, 2 },
+    { 18, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 14, 8, 35 },
+    { 18, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 8, 35 },
+    { 17, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 5, 8, 2 },
+    { 17, 0, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 5, 4, 2 },
+    { 27, 4, 0, 0, -1, 0, 1, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 10, 0, 2 },
+    { 10, 10, 0, 5, -1, 0, 4, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 29, 10, 0, 0, -1, 0, 3, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 29, 0, 2 },
+    { 13, 18, 0, 0, -1, 0, 1, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 0 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 49 },
+    { 25, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 25, 10, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 2 },
+    { 5, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 4, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 4 },
+    { 5, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 29, 10, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 5, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 29, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 29, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 4 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 74 },
+    { 18, 0, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 75 },
+    { 5, 2, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 18, 0, 0, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 39 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 39 },
+    { 5, 0, 0, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 39 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 39 },
+    { 18, 0, 0, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 40 },
+    { 4, 0, 0, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 40 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 120 },
+    { 0, 17, 230, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 120 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 50 },
+    { 25, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 50 },
+    { 18, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 60 },
+    { 25, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 60 },
+    { 4, 0, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 60 },
+    { 14, 0, 0, 0, -1, 0, 5, 0,  { {0, 40}, {0, 0}, {0, 0}, {0, 40} }, 0, 10, 12, 7, 41 },
+    { 14, 0, 0, 0, -1, 0, 7, 0,  { {0, 40}, {0, 0}, {0, 0}, {0, 40} }, 0, 10, 12, 7, 41 },
+    { 15, 0, 0, 0, -1, 0, 5, 0,  { {0, 0}, {0, -40}, {0, -40}, {0, 0} }, 0, 10, 12, 6, 41 },
+    { 15, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, -40}, {0, -40}, {0, 0} }, 0, 10, 12, 6, 41 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 51 },
+    { 18, 0, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 52 },
+    { 3, 0, 0, 0, 0, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 2, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 3, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 4, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 5, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 6, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 7, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 8, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 3, 0, 0, 0, 9, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 52 },
+    { 14, 0, 0, 0, -1, 0, 18, 0,  { {0, 40}, {0, 0}, {0, 0}, {0, 40} }, 0, 10, 12, 7, 136 },
+    { 15, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, -40}, {0, -40}, {0, 0} }, 0, 10, 12, 6, 136 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 106 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 103 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 103 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 110 },
+    { 18, 1, 0, 0, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 53 },
+    { 18, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 87 },
+    { 25, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 87 },
+    { 5, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 87 },
+    { 18, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 118 },
+    { 29, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 118 },
+    { 5, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 118 },
+    { 18, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 117 },
+    { 5, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 117 },
+    { 18, 1, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 128 },
+    { 5, 1, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 128 },
+    { 18, 1, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 64 },
+    { 5, 1, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 64 },
+    { 5, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 64 },
+    { 25, 10, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 64 },
+    { 18, 1, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 76 },
+    { 25, 1, 0, 0, -1, 0, 10, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 76 },
+    { 18, 1, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 98 },
+    { 18, 1, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 97 },
+    { 5, 1, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 97 },
+    { 18, 1, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 61 },
+    { 0, 17, 0, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 61 },
+    { 0, 17, 220, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 61 },
+    { 0, 17, 230, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 61 },
+    { 0, 17, 1, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 61 },
+    { 0, 17, 9, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 61 },
+    { 5, 1, 0, 0, 1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 61 },
+    { 5, 1, 0, 0, 2, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 61 },
+    { 5, 1, 0, 0, 3, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 61 },
+    { 5, 1, 0, 0, 4, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 61 },
+    { 5, 1, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 61 },
+    { 25, 1, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 61 },
+    { 25, 1, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 61 },
+    { 25, 1, 0, 0, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 61 },
+    { 18, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 88 },
+    { 5, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 88 },
+    { 25, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 88 },
+    { 18, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 116 },
+    { 5, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 116 },
+    { 18, 1, 0, 2, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 112 },
+    { 18, 1, 0, 3, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 112 },
+    { 18, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 112 },
+    { 29, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 112 },
+    { 18, 1, 0, 4, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 112 },
+    { 0, 17, 230, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 112 },
+    { 0, 17, 220, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 112 },
+    { 5, 1, 0, 2, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 112 },
+    { 5, 1, 0, 3, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 112 },
+    { 25, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 112 },
+    { 25, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 15, 0, 112 },
+    { 18, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 80 },
+    { 25, 10, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 80 },
+    { 18, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 89 },
+    { 5, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 89 },
+    { 18, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 90 },
+    { 5, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 90 },
+    { 18, 1, 0, 2, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 121 },
+    { 18, 1, 0, 3, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 121 },
+    { 25, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 121 },
+    { 5, 1, 0, 3, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 121 },
+    { 5, 1, 0, 2, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 121 },
+    { 5, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 121 },
+    { 18, 1, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 91 },
+    { 14, 1, 0, 0, -1, 0, 17, 0,  { {0, 64}, {0, 0}, {0, 0}, {0, 64} }, 0, 10, 12, 7, 130 },
+    { 15, 1, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, -64}, {0, -64}, {0, 0} }, 0, 10, 12, 6, 130 },
+    { 5, 1, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 130 },
+    { 5, 5, 0, 0, 1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, 2, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, 3, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, 4, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, 5, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, 6, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, 7, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, 8, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, 9, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 5, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 1, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 94 },
+    { 0, 17, 0, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 94 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 94 },
+    { 0, 17, 9, 5, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 94 },
+    { 25, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 94 },
+    { 25, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 2, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 3, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 4, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 5, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 6, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 7, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 8, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, 9, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 5, 10, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 94 },
+    { 3, 0, 0, 0, 0, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 2, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 3, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 4, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 5, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 6, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 7, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 8, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 3, 0, 0, 0, 9, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 94 },
+    { 0, 17, 9, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 94 },
+    { 0, 17, 0, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 92 },
+    { 1, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 92 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 92 },
+    { 18, 0, 0, 0, -1, 0, 11, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 92 },
+    { 0, 17, 9, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 92 },
+    { 0, 17, 7, 5, -1, 0, 11, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 92 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 92 },
+    { 10, 0, 0, 5, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 6, 12, 4, 92 },
+    { 25, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 92 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 101 },
+    { 3, 0, 0, 0, 0, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 2, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 3, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 4, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 5, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 6, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 7, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 8, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 3, 0, 0, 0, 9, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 101 },
+    { 0, 17, 230, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 96 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 96 },
+    { 0, 17, 0, 5, -1, 0, 13, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 96 },
+    { 0, 17, 0, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 96 },
+    { 1, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 96 },
+    { 0, 17, 0, 5, -1, 0, 13, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 96 },
+    { 0, 17, 9, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 96 },
+    { 3, 0, 0, 0, 0, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 2, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 3, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 4, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 5, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 6, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 7, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 8, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 3, 0, 0, 0, 9, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 96 },
+    { 25, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 96 },
+    { 25, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 96 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 111 },
+    { 0, 17, 7, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 111 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 111 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 111 },
+    { 0, 17, 0, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 100 },
+    { 1, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 100 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 100 },
+    { 1, 0, 9, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 100 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 10, 12, 8, 100 },
+    { 25, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 100 },
+    { 25, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 100 },
+    { 25, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 100 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 100 },
+    { 0, 17, 7, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 100 },
+    { 0, 17, 0, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 100 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 12, 100 },
+    { 3, 0, 0, 0, 0, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 2, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 3, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 4, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 5, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 6, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 7, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 8, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 3, 0, 0, 0, 9, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 100 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 100 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 100 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 100 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 100 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 100 },
+    { 5, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 20 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 109 },
+    { 1, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 109 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 109 },
+    { 1, 0, 9, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 109 },
+    { 0, 17, 7, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 109 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 109 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 109 },
+    { 0, 17, 0, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 109 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 129 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 129 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 123 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 123 },
+    { 1, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 123 },
+    { 0, 17, 7, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 123 },
+    { 0, 17, 9, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 123 },
+    { 3, 0, 0, 0, 0, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 2, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 3, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 4, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 5, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 6, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 7, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 8, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 3, 0, 0, 0, 9, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 123 },
+    { 0, 17, 0, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 107 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 107 },
+    { 1, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 107 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 107 },
+    { 0, 17, 7, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 107 },
+    { 1, 0, 0, 0, -1, 0, 16, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 107 },
+    { 1, 0, 0, 0, -1, 0, 16, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 107 },
+    { 1, 0, 9, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 107 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 107 },
+    { 0, 17, 230, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 107 },
+    { 18, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 135 },
+    { 1, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 135 },
+    { 0, 17, 0, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 135 },
+    { 0, 17, 9, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 135 },
+    { 0, 17, 7, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 135 },
+    { 25, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 135 },
+    { 25, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 135 },
+    { 25, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 135 },
+    { 3, 0, 0, 0, 0, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 2, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 3, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 4, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 5, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 6, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 7, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 8, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 3, 0, 0, 0, 9, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 135 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 124 },
+    { 1, 0, 0, 0, -1, 0, 16, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 124 },
+    { 1, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 124 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 124 },
+    { 0, 17, 0, 5, -1, 0, 16, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 124 },
+    { 1, 0, 0, 0, -1, 0, 16, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 124 },
+    { 0, 17, 9, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 124 },
+    { 0, 17, 7, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 124 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 124 },
+    { 3, 0, 0, 0, 0, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 2, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 3, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 4, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 5, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 6, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 7, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 8, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 3, 0, 0, 0, 9, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 124 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 122 },
+    { 1, 0, 0, 0, -1, 0, 16, 204,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 122 },
+    { 1, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 122 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 122 },
+    { 1, 0, 0, 0, -1, 0, 16, 17,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 122 },
+    { 0, 17, 9, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 122 },
+    { 0, 17, 7, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 122 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 122 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 122 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 122 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 122 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 122 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 122 },
+    { 0, 17, 0, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 122 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 114 },
+    { 1, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 114 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 114 },
+    { 0, 17, 9, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 114 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 114 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 114 },
+    { 3, 0, 0, 0, 0, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 2, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 3, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 4, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 5, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 6, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 7, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 8, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 3, 0, 0, 0, 9, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 114 },
+    { 25, 10, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 33 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 102 },
+    { 0, 17, 0, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 102 },
+    { 1, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 102 },
+    { 1, 0, 9, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 102 },
+    { 0, 17, 7, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 102 },
+    { 3, 0, 0, 0, 0, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 2, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 3, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 4, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 5, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 6, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 7, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 8, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 3, 0, 0, 0, 9, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 102 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 8, 126 },
+    { 0, 17, 0, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 126 },
+    { 1, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 33, 4, 126 },
+    { 0, 17, 9, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 33, 4, 126 },
+    { 3, 0, 0, 0, 0, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 2, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 3, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 4, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 5, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 6, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 7, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 8, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 3, 0, 0, 0, 9, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 126 },
+    { 5, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 0, 126 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 126 },
+    { 29, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 33, 0, 126 },
+    { 14, 0, 0, 0, -1, 0, 16, 0,  { {0, 32}, {0, 0}, {0, 0}, {0, 32} }, 0, 10, 12, 7, 125 },
+    { 15, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, -32}, {0, -32}, {0, 0} }, 0, 10, 12, 6, 125 },
+    { 3, 0, 0, 0, 0, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 2, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 3, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 4, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 5, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 6, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 7, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 8, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 3, 0, 0, 0, 9, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 125 },
+    { 5, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 125 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 125 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 141 },
+    { 0, 17, 0, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 141 },
+    { 1, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 141 },
+    { 0, 17, 9, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 141 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 10, 12, 8, 141 },
+    { 25, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 141 },
+    { 25, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 141 },
+    { 25, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 141 },
+    { 25, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 141 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 140 },
+    { 0, 17, 0, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 140 },
+    { 1, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 140 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 10, 12, 8, 140 },
+    { 0, 17, 9, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 140 },
+    { 25, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 140 },
+    { 25, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 140 },
+    { 25, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 140 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 119 },
+    { 18, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 133 },
+    { 1, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 133 },
+    { 0, 17, 0, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 133 },
+    { 0, 0, 9, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 133 },
+    { 25, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 133 },
+    { 25, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 133 },
+    { 3, 0, 0, 0, 0, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 2, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 3, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 4, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 5, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 6, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 7, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 8, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 3, 0, 0, 0, 9, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 133 },
+    { 5, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 133 },
+    { 25, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 18, 0, 134 },
+    { 25, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 6, 0, 134 },
+    { 18, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 134 },
+    { 0, 17, 0, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 134 },
+    { 1, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 134 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 138 },
+    { 0, 17, 0, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 138 },
+    { 0, 17, 7, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 138 },
+    { 0, 17, 9, 5, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 138 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 7, 10, 12, 8, 138 },
+    { 3, 0, 0, 0, 0, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 2, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 3, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 4, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 5, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 6, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 7, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 8, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 3, 0, 0, 0, 9, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 138 },
+    { 18, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 63 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 63 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 63 },
+    { 4, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 63 },
+    { 4, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 63 },
+    { 25, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 63 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 63 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 81 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 0, 8, 81 },
+    { 18, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 1, 8, 81 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 127 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 0, 8, 127 },
+    { 18, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 1, 8, 127 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 84 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 115 },
+    { 3, 0, 0, 0, 0, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 2, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 3, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 4, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 5, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 6, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 7, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 8, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 3, 0, 0, 0, 9, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 115 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 115 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 104 },
+    { 0, 17, 1, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 104 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 104 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 108 },
+    { 0, 17, 230, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 108 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 108 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 108 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 108 },
+    { 29, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 108 },
+    { 17, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 108 },
+    { 3, 0, 0, 0, 0, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 2, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 3, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 4, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 5, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 6, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 7, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 8, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 3, 0, 0, 0, 9, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 108 },
+    { 5, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 108 },
+    { 18, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 99 },
+    { 1, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 99 },
+    { 0, 17, 0, 5, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 99 },
+    { 17, 0, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 99 },
+    { 17, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 5, 8, 137 },
+    { 17, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 5, 8, 139 },
+    { 18, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 137 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 8, 14, 8, 35 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 34 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 34 },
+    { 18, 0, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 139 },
+    { 18, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 105 },
+    { 29, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 105 },
+    { 0, 17, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 105 },
+    { 0, 17, 1, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 105 },
+    { 25, 0, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 105 },
+    { 10, 18, 0, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 29, 0, 0, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 5, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 1, 0, 216, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 2 },
+    { 1, 0, 216, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 2 },
+    { 0, 17, 1, 5, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 1, 0, 226, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 8, 4, 21, 4, 2 },
+    { 10, 18, 0, 5, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 6, 21, 4, 2 },
+    { 0, 17, 220, 5, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 0, 17, 230, 5, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 29, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 0, 17, 230, 5, -1, 0, 8, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 4 },
+    { 5, 0, 0, 0, -1, 0, 9, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 2 },
+    { 15, 0, 0, 0, -1, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 15, 0, 0, 0, -1, 0, 7, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 26, 0, 0, 0, -1, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 26, 10, 0, 0, -1, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 14, 0, 0, 0, -1, 0, 9, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 2 },
+    { 15, 0, 0, 0, -1, 0, 9, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 6, 2 },
+    { 3, 2, 0, 0, 0, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 1, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 2, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 3, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 4, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 5, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 6, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 7, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 8, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 3, 2, 0, 0, 9, 0, 5, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 2 },
+    { 29, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 131 },
+    { 0, 17, 0, 5, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 131 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 0, 131 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 17, 12, 131 },
+    { 25, 0, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 131 },
+    { 0, 17, 230, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 57 },
+    { 18, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 113 },
+    { 5, 1, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 113 },
+    { 0, 17, 220, 5, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 113 },
+    { 14, 1, 0, 2, -1, 0, 18, 0,  { {0, 34}, {0, 0}, {0, 0}, {0, 34} }, 0, 10, 12, 7, 132 },
+    { 15, 1, 0, 2, -1, 0, 18, 0,  { {0, 0}, {0, -34}, {0, -34}, {0, 0} }, 0, 10, 12, 6, 132 },
+    { 0, 17, 230, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 132 },
+    { 0, 17, 7, 5, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 132 },
+    { 3, 1, 0, 0, 0, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 2, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 3, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 4, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 5, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 6, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 7, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 8, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 3, 1, 0, 0, 9, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 16, 11, 9, 132 },
+    { 25, 1, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 0, 0, 132 },
+    { 18, 13, 0, 0, -1, 0, 13, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 8, 8 },
+    { 26, 10, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 8 },
+    { 5, 2, 0, 0, 0, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 1, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 2, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 3, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 4, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 5, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 6, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 7, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 8, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 2, 0, 0, 9, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 5, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 12, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 2 },
+    { 29, 0, 0, 0, -1, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 2 },
+    { 29, 0, 0, 0, -1, 0, 12, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 2 },
+    { 29, 0, 0, 0, -1, 0, 11, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 10, 12, 7, 2 },
+    { 29, 10, 0, 0, -1, 0, 13, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 6, 7, 28, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 11, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 34 },
+    { 29, 0, 0, 0, -1, 0, 12, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 0, 0, 0, -1, 0, 18, 80,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 16, 20, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 14, 18, 30, 0, 2 },
+    { 28, 10, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 15, 19, 31, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 17, 21, 30, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 14, 18, 30, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 18, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 16, 20, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 13, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 3, 13, 2 },
+    { 29, 10, 0, 0, -1, 0, 16, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 5, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 17, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 14, 18, 30, 0, 2 },
+    { 29, 10, 0, 0, -1, 0, 19, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 14, 18, 30, 0, 2 },
+    { 13, 18, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 0 },
+    { 18, 0, 0, 0, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 12, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 18, 0, 0, 0, -1, 0, 5, 85,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 14, 8, 37 },
+    { 10, 18, 0, 5, -1, 0, 5, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 2 },
+    { 0, 17, 0, 5, -1, 0, 7, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 4, 4, 21, 4, 1 },
+    { 12, 0, 0, 0, -1, 0, 2, 0,  { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 0, 0, 12, 0, 0 }
 };
 
-Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(uint ucs4) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(uint ucs4) noexcept
 {
     return uc_properties + GET_PROP_INDEX(ucs4);
 }
 
-Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(ushort ucs2) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(ushort ucs2) noexcept
 {
     return uc_properties + GET_PROP_INDEX_UCS2(ucs2);
 }
 
-Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) noexcept
 {
     return qGetProp(ucs4);
 }
 
-Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) noexcept
 {
     return qGetProp(ucs2);
 }
 
-Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) Q_DECL_NOTHROW
+Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) noexcept
 {
     return static_cast<GraphemeBreakClass>(qGetProp(ucs4)->graphemeBreakClass);
 }
 
-Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) Q_DECL_NOTHROW
+Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) noexcept
 {
     return static_cast<WordBreakClass>(qGetProp(ucs4)->wordBreakClass);
 }
 
-Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) Q_DECL_NOTHROW
+Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) noexcept
 {
     return static_cast<SentenceBreakClass>(qGetProp(ucs4)->sentenceBreakClass);
 }
 
-Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) Q_DECL_NOTHROW
+Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) noexcept
 {
     return static_cast<LineBreakClass>(qGetProp(ucs4)->lineBreakClass);
 }
diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/text/qunicodetables_p.h
index 3f2e91a9b2..c453ef53e7 100644
--- a/src/corelib/tools/qunicodetables_p.h
+++ b/src/corelib/text/qunicodetables_p.h
@@ -63,6 +63,15 @@ QT_BEGIN_NAMESPACE
 
 namespace QUnicodeTables {
 
+enum Case {
+    LowerCase,
+    UpperCase,
+    TitleCase,
+    CaseFold,
+
+    NumCases
+};
+
 struct Properties {
     ushort category            : 8; /* 5 used */
     ushort direction           : 8; /* 5 used */
@@ -70,63 +79,29 @@ struct Properties {
     ushort joining             : 3;
     signed short digitValue    : 5;
     signed short mirrorDiff    : 16;
-    ushort lowerCaseSpecial    : 1;
-    signed short lowerCaseDiff : 15;
+    ushort unicodeVersion      : 8; /* 5 used */
+    ushort nfQuickCheck        : 8;
 #ifdef Q_OS_WASM
     unsigned char              : 0; //wasm 64 packing trick
 #endif
-    ushort upperCaseSpecial    : 1;
-    signed short upperCaseDiff : 15;
-    ushort titleCaseSpecial    : 1;
-    signed short titleCaseDiff : 15;
-    ushort caseFoldSpecial     : 1;
-    signed short caseFoldDiff  : 15;
-    ushort unicodeVersion      : 8; /* 5 used */
-    ushort nfQuickCheck        : 8;
+    struct {
+        ushort special    : 1;
+        signed short diff : 15;
+    } cases[NumCases];
 #ifdef Q_OS_WASM
     unsigned char              : 0; //wasm 64 packing trick
 #endif
     ushort graphemeBreakClass  : 5; /* 5 used */
     ushort wordBreakClass      : 5; /* 5 used */
-    ushort sentenceBreakClass  : 8; /* 4 used */
     ushort lineBreakClass      : 6; /* 6 used */
+    ushort sentenceBreakClass  : 8; /* 4 used */
     ushort script              : 8;
 };
 
-Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) Q_DECL_NOTHROW;
-Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) Q_DECL_NOTHROW;
-
-struct LowercaseTraits
-{
-    static inline signed short caseDiff(const Properties *prop)
-    { return prop->lowerCaseDiff; }
-    static inline bool caseSpecial(const Properties *prop)
-    { return prop->lowerCaseSpecial; }
-};
-
-struct UppercaseTraits
-{
-    static inline signed short caseDiff(const Properties *prop)
-    { return prop->upperCaseDiff; }
-    static inline bool caseSpecial(const Properties *prop)
-    { return prop->upperCaseSpecial; }
-};
-
-struct TitlecaseTraits
-{
-    static inline signed short caseDiff(const Properties *prop)
-    { return prop->titleCaseDiff; }
-    static inline bool caseSpecial(const Properties *prop)
-    { return prop->titleCaseSpecial; }
-};
+Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) noexcept;
+Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) noexcept;
 
-struct CasefoldTraits
-{
-    static inline signed short caseDiff(const Properties *prop)
-    { return prop->caseFoldDiff; }
-    static inline bool caseSpecial(const Properties *prop)
-    { return prop->caseFoldSpecial; }
-};
+Q_STATIC_ASSERT(sizeof(Properties) == 20);
 
 enum GraphemeBreakClass {
     GraphemeBreak_Any,
@@ -209,20 +184,20 @@ enum LineBreakClass {
     NumLineBreakClasses
 };
 
-Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) Q_DECL_NOTHROW;
-inline GraphemeBreakClass graphemeBreakClass(QChar ch) Q_DECL_NOTHROW
+Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) noexcept;
+inline GraphemeBreakClass graphemeBreakClass(QChar ch) noexcept
 { return graphemeBreakClass(ch.unicode()); }
 
-Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) Q_DECL_NOTHROW;
-inline WordBreakClass wordBreakClass(QChar ch) Q_DECL_NOTHROW
+Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) noexcept;
+inline WordBreakClass wordBreakClass(QChar ch) noexcept
 { return wordBreakClass(ch.unicode()); }
 
-Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) Q_DECL_NOTHROW;
-inline SentenceBreakClass sentenceBreakClass(QChar ch) Q_DECL_NOTHROW
+Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) noexcept;
+inline SentenceBreakClass sentenceBreakClass(QChar ch) noexcept
 { return sentenceBreakClass(ch.unicode()); }
 
-Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) Q_DECL_NOTHROW;
-inline LineBreakClass lineBreakClass(QChar ch) Q_DECL_NOTHROW
+Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) noexcept;
+inline LineBreakClass lineBreakClass(QChar ch) noexcept
 { return lineBreakClass(ch.unicode()); }
 
 } // namespace QUnicodeTables
diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/text/qunicodetools.cpp
index 0a2bea28e2..08e1146c59 100644
--- a/src/corelib/tools/qunicodetools.cpp
+++ b/src/corelib/text/qunicodetools.cpp
@@ -542,7 +542,7 @@ static const uchar breakTable[QUnicodeTables::LineBreak_SA][QUnicodeTables::Line
 
 } // namespace LB
 
-static void getLineBreaks(const ushort *string, quint32 len, QCharAttributes *attributes)
+static void getLineBreaks(const ushort *string, quint32 len, QCharAttributes *attributes, QUnicodeTools::CharAttributeOptions options)
 {
     quint32 nestart = 0;
     LB::NS::Class nelast = LB::NS::XX;
@@ -564,6 +564,31 @@ static void getLineBreaks(const ushort *string, quint32 len, QCharAttributes *at
         QUnicodeTables::LineBreakClass ncls = (QUnicodeTables::LineBreakClass) prop->lineBreakClass;
         QUnicodeTables::LineBreakClass tcls;
 
+        if (options & QUnicodeTools::HangulLineBreakTailoring) {
+            if (Q_UNLIKELY((ncls >= QUnicodeTables::LineBreak_H2
+                        &&  ncls <= QUnicodeTables::LineBreak_JT)
+                        || (ucs4 >= 0x3130 && ucs4 <= 0x318F && ncls == QUnicodeTables::LineBreak_ID))
+                    ) {
+                // LB27: use SPACE for line breaking
+                // "When Korean uses SPACE for line breaking, the classes in rule LB26,
+                // as well as characters of class ID, are often tailored to AL; see Section 8, Customization."
+                // In case of Korean syllables: "3130..318F  HANGUL COMPATIBILITY JAMO"
+                ncls = QUnicodeTables::LineBreak_AL;
+            } else {
+                if (Q_UNLIKELY(ncls == QUnicodeTables::LineBreak_SA)) {
+                    // LB1: resolve SA to AL, except of those that have Category Mn or Mc be resolved to CM
+                    static const int test = FLAG(QChar::Mark_NonSpacing) | FLAG(QChar::Mark_SpacingCombining);
+                    if (FLAG(prop->category) & test)
+                        ncls = QUnicodeTables::LineBreak_CM;
+                }
+                if (Q_UNLIKELY(ncls == QUnicodeTables::LineBreak_CM)) {
+                    // LB10: treat CM that follows SP, BK, CR, LF, NL, or ZW as AL
+                    if (lcls == QUnicodeTables::LineBreak_ZW || lcls >= QUnicodeTables::LineBreak_SP)
+                        ncls = QUnicodeTables::LineBreak_AL;
+                }
+            }
+        }
+
         if (Q_UNLIKELY(ncls == QUnicodeTables::LineBreak_SA)) {
             // LB1: resolve SA to AL, except of those that have Category Mn or Mc be resolved to CM
             static const int test = FLAG(QChar::Mark_NonSpacing) | FLAG(QChar::Mark_SpacingCombining);
@@ -716,7 +741,7 @@ Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length,
     if (options & SentenceBreaks)
         getSentenceBreaks(string, length, attributes);
     if (options & LineBreaks)
-        getLineBreaks(string, length, attributes);
+        getLineBreaks(string, length, attributes, options);
     if (options & WhiteSpaces)
         getWhiteSpaces(string, length, attributes);
 
diff --git a/src/corelib/tools/qunicodetools_p.h b/src/corelib/text/qunicodetools_p.h
index 5e2d56a226..ed6fcb5d65 100644
--- a/src/corelib/tools/qunicodetools_p.h
+++ b/src/corelib/text/qunicodetools_p.h
@@ -88,6 +88,7 @@ enum CharAttributeOption {
     SentenceBreaks = 0x04,
     LineBreaks = 0x08,
     WhiteSpaces = 0x10,
+    HangulLineBreakTailoring = 0x20,
     DefaultOptionsCompat = GraphemeBreaks | LineBreaks | WhiteSpaces, // ### remove
 
     DontClearAttributes = 0x1000
diff --git a/src/corelib/tools/qvsnprintf.cpp b/src/corelib/text/qvsnprintf.cpp
index 43a21771a1..43a21771a1 100644
--- a/src/corelib/tools/qvsnprintf.cpp
+++ b/src/corelib/text/qvsnprintf.cpp
diff --git a/src/corelib/text/text.pri b/src/corelib/text/text.pri
new file mode 100644
index 0000000000..25e281f37a
--- /dev/null
+++ b/src/corelib/text/text.pri
@@ -0,0 +1,100 @@
+# Qt text / string / character / unicode / byte array module
+
+HEADERS +=  \
+        text/qbytearray.h \
+        text/qbytearray_p.h \
+        text/qbytearraylist.h \
+        text/qbytearraymatcher.h \
+        text/qbytedata_p.h \
+        text/qchar.h \
+        text/qcollator.h \
+        text/qcollator_p.h \
+        text/qdoublescanprint_p.h \
+        text/qlocale.h \
+        text/qlocale_p.h \
+        text/qlocale_tools_p.h \
+        text/qlocale_data_p.h \
+        text/qregexp.h \
+        text/qstring.h \
+        text/qstringalgorithms.h \
+        text/qstringalgorithms_p.h \
+        text/qstringbuilder.h \
+        text/qstringiterator_p.h \
+        text/qstringlist.h \
+        text/qstringliteral.h \
+        text/qstringmatcher.h \
+        text/qstringview.h \
+        text/qtextboundaryfinder.h \
+        text/qunicodetables_p.h \
+        text/qunicodetools_p.h
+
+
+SOURCES += \
+        text/qbytearray.cpp \
+        text/qbytearraylist.cpp \
+        text/qbytearraymatcher.cpp \
+        text/qcollator.cpp \
+        text/qlocale.cpp \
+        text/qlocale_tools.cpp \
+        text/qregexp.cpp \
+        text/qstring.cpp \
+        text/qstringbuilder.cpp \
+        text/qstringlist.cpp \
+        text/qstringview.cpp \
+        text/qtextboundaryfinder.cpp \
+        text/qunicodetools.cpp \
+        text/qvsnprintf.cpp
+
+NO_PCH_SOURCES += text/qstring_compat.cpp
+false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator
+
+!nacl:macos: {
+    SOURCES += text/qlocale_mac.mm
+}
+else:unix {
+    SOURCES += text/qlocale_unix.cpp
+}
+else:win32 {
+    SOURCES += text/qlocale_win.cpp
+} else:integrity {
+    SOURCES += text/qlocale_unix.cpp
+}
+
+qtConfig(icu) {
+    QMAKE_USE_PRIVATE += icu
+
+    SOURCES += text/qlocale_icu.cpp \
+               text/qcollator_icu.cpp
+} else: win32 {
+    SOURCES += text/qcollator_win.cpp
+} else: macos {
+    SOURCES += text/qcollator_macx.cpp
+} else {
+    SOURCES += text/qcollator_posix.cpp
+}
+
+qtConfig(regularexpression) {
+    QMAKE_USE_PRIVATE += pcre2
+
+    HEADERS += \
+        text/qregularexpression.h
+    SOURCES += text/qregularexpression.cpp
+}
+
+INCLUDEPATH += ../3rdparty/harfbuzz/src
+HEADERS += ../3rdparty/harfbuzz/src/harfbuzz.h
+SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \
+           ../3rdparty/harfbuzz/src/harfbuzz-gdef.c \
+           ../3rdparty/harfbuzz/src/harfbuzz-gsub.c \
+           ../3rdparty/harfbuzz/src/harfbuzz-gpos.c \
+           ../3rdparty/harfbuzz/src/harfbuzz-impl.c \
+           ../3rdparty/harfbuzz/src/harfbuzz-open.c \
+           ../3rdparty/harfbuzz/src/harfbuzz-stream.c \
+           ../3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp \
+           text/qharfbuzz.cpp
+HEADERS += text/qharfbuzz_p.h
+
+TR_EXCLUDE += ../3rdparty/*
+
+# MIPS DSP
+MIPS_DSP_ASM += text/qstring_mips_dsp_asm.S
diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp
index c161bec537..b1a7edad91 100644
--- a/src/corelib/thread/qatomic.cpp
+++ b/src/corelib/thread/qatomic.cpp
@@ -258,12 +258,26 @@
 
 /*!
     \fn template <typename T> T QAtomicInteger<T>::load() const
+    \obsolete
+
+    Use loadRelaxed() instead.
 
     Atomically loads the value of this QAtomicInteger using relaxed memory
     ordering. The value is not modified in any way, but note that there's no
     guarantee that it remains so.
 
-    \sa store(), loadAcquire()
+    \sa storeRelaxed(), loadAcquire()
+*/
+
+/*!
+    \fn template <typename T> T QAtomicInteger<T>::loadRelaxed() const
+    \since 5.14
+
+    Atomically loads the value of this QAtomicInteger using relaxed memory
+    ordering. The value is not modified in any way, but note that there's no
+    guarantee that it remains so.
+
+    \sa storeRelaxed(), loadAcquire()
 */
 
 /*!
@@ -273,16 +287,29 @@
     ordering. The value is not modified in any way, but note that there's no
     guarantee that it remains so.
 
-    \sa store(), load()
+    \sa storeRelaxed(), loadRelaxed()
 */
 
 /*!
     \fn template <typename T> void QAtomicInteger<T>::store(T newValue)
+    \obsolete
+
+    Use storeRelaxed() instead.
 
     Atomically stores the \a newValue value into this atomic type, using
     relaxed memory ordering.
 
-    \sa storeRelease(), load()
+    \sa storeRelease(), loadRelaxed()
+*/
+
+/*!
+    \fn template <typename T> void QAtomicInteger<T>::storeRelaxed(T newValue)
+    \since 5.14
+
+    Atomically stores the \a newValue value into this atomic type, using
+    relaxed memory ordering.
+
+    \sa storeRelease(), loadRelaxed()
 */
 
 /*!
@@ -291,7 +318,7 @@
     Atomically stores the \a newValue value into this atomic type, using
     the "Release" memory ordering.
 
-    \sa store(), load()
+    \sa store(), loadAcquire()
 */
 
 /*!
@@ -303,7 +330,7 @@
     value is not modified in any way, but note that there's no guarantee that
     it remains so.
 
-    \sa load(), loadAcquire()
+    \sa loadRelaxed(), loadAcquire()
 */
 
 /*!
@@ -314,7 +341,7 @@
     sequentially consistent memory ordering if possible; or "Release" ordering
     if not. This function returns a reference to this object.
 
-    \sa store(), storeRelease()
+    \sa storeRelaxed(), storeRelease()
 */
 
 /*! \fn template <typename T> bool QAtomicInteger<T>::isReferenceCountingNative()
@@ -1278,31 +1305,59 @@
 
 /*!
     \fn template <typename T> T *QAtomicPointer<T>::load() const
+    \obsolete
+
+    Use loadRelaxed() instead.
 
     Atomically loads the value of this QAtomicPointer using relaxed memory
     ordering. The value is not modified in any way, but note that there's no
     guarantee that it remains so.
 
-    \sa store(), loadAcquire()
+    \sa storeRelaxed(), loadAcquire()
 */
 
 /*!
+    \fn template <typename T> T *QAtomicPointer<T>::loadRelaxed() const
+    \since 5.14
+
+    Atomically loads the value of this QAtomicPointer using relaxed memory
+    ordering. The value is not modified in any way, but note that there's no
+    guarantee that it remains so.
+
+    \sa storeRelaxed(), loadAcquire()
+*/
+
+
+/*!
     \fn template <typename T> T *QAtomicPointer<T>::loadAcquire() const
 
     Atomically loads the value of this QAtomicPointer using the "Acquire" memory
     ordering. The value is not modified in any way, but note that there's no
     guarantee that it remains so.
 
-    \sa store(), load()
+    \sa storeRelease(), loadRelaxed()
 */
 
 /*!
     \fn template <typename T> void QAtomicPointer<T>::store(T *newValue)
+    \obsolete
+
+    Use storeRelaxed() instead.
+
+    Atomically stores the \a newValue value into this atomic type, using
+    relaxed memory ordering.
+
+    \sa storeRelease(), loadRelaxed()
+*/
+
+/*!
+    \fn template <typename T> void QAtomicPointer<T>::storeRelaxed(T *newValue)
+    \since 5.14
 
     Atomically stores the \a newValue value into this atomic type, using
     relaxed memory ordering.
 
-    \sa storeRelease(), load()
+    \sa storeRelease(), loadRelaxed()
 */
 
 /*!
@@ -1311,7 +1366,7 @@
     Atomically stores the \a newValue value into this atomic type, using
     the "Release" memory ordering.
 
-    \sa store(), load()
+    \sa storeRelaxed(), loadRelaxed()
 */
 
 /*! \fn template <typename T> bool QAtomicPointer<T>::isTestAndSetNative()
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h
index f842534c38..a3b9be0729 100644
--- a/src/corelib/thread/qatomic.h
+++ b/src/corelib/thread/qatomic.h
@@ -57,15 +57,15 @@ class QAtomicInteger : public QBasicAtomicInteger<T>
 public:
     // Non-atomic API
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
-    constexpr QAtomicInteger(T value = 0) Q_DECL_NOTHROW : QBasicAtomicInteger<T>(value) {}
+    constexpr QAtomicInteger(T value = 0) noexcept : QBasicAtomicInteger<T>(value) {}
 #else
-    inline QAtomicInteger(T value = 0) Q_DECL_NOTHROW
+    inline QAtomicInteger(T value = 0) noexcept
     {
         this->_q_value = value;
     }
 #endif
 
-    inline QAtomicInteger(const QAtomicInteger &other) Q_DECL_NOTHROW
+    inline QAtomicInteger(const QAtomicInteger &other) noexcept
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
         : QBasicAtomicInteger<T>()
 #endif
@@ -73,7 +73,7 @@ public:
         this->storeRelease(other.loadAcquire());
     }
 
-    inline QAtomicInteger &operator=(const QAtomicInteger &other) Q_DECL_NOTHROW
+    inline QAtomicInteger &operator=(const QAtomicInteger &other) noexcept
     {
         this->storeRelease(other.loadAcquire());
         return *this;
@@ -81,8 +81,10 @@ public:
 
 #ifdef Q_CLANG_QDOC
     T load() const;
+    T loadRelaxed() const;
     T loadAcquire() const;
     void store(T newValue);
+    void storeRelaxed(T newValue);
     void storeRelease(T newValue);
 
     operator T() const;
@@ -159,7 +161,7 @@ public:
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
     constexpr
 #endif
-    QAtomicInt(int value = 0) Q_DECL_NOTHROW : QAtomicInteger<int>(value) {}
+    QAtomicInt(int value = 0) noexcept : QAtomicInteger<int>(value) {}
 };
 
 // High-level atomic pointer operations
@@ -168,14 +170,14 @@ class QAtomicPointer : public QBasicAtomicPointer<T>
 {
 public:
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
-    constexpr QAtomicPointer(T *value = nullptr) Q_DECL_NOTHROW : QBasicAtomicPointer<T>(value) {}
+    constexpr QAtomicPointer(T *value = nullptr) noexcept : QBasicAtomicPointer<T>(value) {}
 #else
-    inline QAtomicPointer(T *value = nullptr) Q_DECL_NOTHROW
+    inline QAtomicPointer(T *value = nullptr) noexcept
     {
-        this->store(value);
+        this->storeRelaxed(value);
     }
 #endif
-    inline QAtomicPointer(const QAtomicPointer<T> &other) Q_DECL_NOTHROW
+    inline QAtomicPointer(const QAtomicPointer<T> &other) noexcept
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
         : QBasicAtomicPointer<T>()
 #endif
@@ -183,7 +185,7 @@ public:
         this->storeRelease(other.loadAcquire());
     }
 
-    inline QAtomicPointer<T> &operator=(const QAtomicPointer<T> &other) Q_DECL_NOTHROW
+    inline QAtomicPointer<T> &operator=(const QAtomicPointer<T> &other) noexcept
     {
         this->storeRelease(other.loadAcquire());
         return *this;
@@ -255,7 +257,7 @@ inline void qAtomicAssign(T *&d, T *x)
 template <typename T>
 inline void qAtomicDetach(T *&d)
 {
-    if (d->ref.load() == 1)
+    if (d->ref.loadRelaxed() == 1)
         return;
     T *x = d;
     d = new T(*d);
diff --git a/src/corelib/thread/qatomic_bootstrap.h b/src/corelib/thread/qatomic_bootstrap.h
index b463f817bd..c4279ee7b1 100644
--- a/src/corelib/thread/qatomic_bootstrap.h
+++ b/src/corelib/thread/qatomic_bootstrap.h
@@ -56,16 +56,16 @@ template <typename T> struct QAtomicOps: QGenericAtomicOps<QAtomicOps<T> >
 {
     typedef T Type;
 
-    static bool ref(T &_q_value) Q_DECL_NOTHROW
+    static bool ref(T &_q_value) noexcept
     {
         return ++_q_value != 0;
     }
-    static bool deref(T &_q_value) Q_DECL_NOTHROW
+    static bool deref(T &_q_value) noexcept
     {
         return --_q_value != 0;
     }
 
-    static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue = 0) Q_DECL_NOTHROW
+    static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept
     {
         if (currentValue)
             *currentValue = _q_value;
@@ -76,7 +76,7 @@ template <typename T> struct QAtomicOps: QGenericAtomicOps<QAtomicOps<T> >
         return false;
     }
 
-    static T fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW
+    static T fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept
     {
         T tmp = _q_value;
         _q_value = newValue;
@@ -84,7 +84,7 @@ template <typename T> struct QAtomicOps: QGenericAtomicOps<QAtomicOps<T> >
     }
 
     template <typename AdditiveType> static
-    T fetchAndAddRelaxed(T &_q_value, AdditiveType valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddRelaxed(T &_q_value, AdditiveType valueToAdd) noexcept
     {
         T returnValue = _q_value;
         _q_value += valueToAdd;
diff --git a/src/corelib/thread/qatomic_cxx11.h b/src/corelib/thread/qatomic_cxx11.h
index 2fc0bf5419..7386aee126 100644
--- a/src/corelib/thread/qatomic_cxx11.h
+++ b/src/corelib/thread/qatomic_cxx11.h
@@ -222,43 +222,61 @@ template <typename X> struct QAtomicOps
     typedef std::atomic<X> Type;
 
     template <typename T> static inline
-    T load(const std::atomic<T> &_q_value) Q_DECL_NOTHROW
+    T load(const std::atomic<T> &_q_value) noexcept
     {
         return _q_value.load(std::memory_order_relaxed);
     }
 
     template <typename T> static inline
-    T load(const volatile std::atomic<T> &_q_value) Q_DECL_NOTHROW
+    T load(const volatile std::atomic<T> &_q_value) noexcept
     {
         return _q_value.load(std::memory_order_relaxed);
     }
 
     template <typename T> static inline
-    T loadAcquire(const std::atomic<T> &_q_value) Q_DECL_NOTHROW
+    T loadRelaxed(const std::atomic<T> &_q_value) noexcept
+    {
+        return _q_value.load(std::memory_order_relaxed);
+    }
+
+    template <typename T> static inline
+    T loadRelaxed(const volatile std::atomic<T> &_q_value) noexcept
+    {
+        return _q_value.load(std::memory_order_relaxed);
+    }
+
+    template <typename T> static inline
+    T loadAcquire(const std::atomic<T> &_q_value) noexcept
     {
         return _q_value.load(std::memory_order_acquire);
     }
 
     template <typename T> static inline
-    T loadAcquire(const volatile std::atomic<T> &_q_value) Q_DECL_NOTHROW
+    T loadAcquire(const volatile std::atomic<T> &_q_value) noexcept
     {
         return _q_value.load(std::memory_order_acquire);
     }
 
     template <typename T> static inline
-    void store(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW
+    void store(std::atomic<T> &_q_value, T newValue) noexcept
+    {
+        _q_value.store(newValue, std::memory_order_relaxed);
+    }
+
+    template <typename T> static inline
+    void storeRelaxed(std::atomic<T> &_q_value, T newValue) noexcept
     {
         _q_value.store(newValue, std::memory_order_relaxed);
     }
 
     template <typename T> static inline
-    void storeRelease(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW
+    void storeRelease(std::atomic<T> &_q_value, T newValue) noexcept
     {
         _q_value.store(newValue, std::memory_order_release);
     }
 
-    static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return isTestAndSetNative(); }
-    static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW { return false; }
+    static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() noexcept { return isTestAndSetNative(); }
+    static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() noexcept { return false; }
     template <typename T>
     static inline bool ref(std::atomic<T> &_q_value)
     {
@@ -266,17 +284,17 @@ template <typename X> struct QAtomicOps
     }
 
     template <typename T>
-    static inline bool deref(std::atomic<T> &_q_value) Q_DECL_NOTHROW
+    static inline bool deref(std::atomic<T> &_q_value) noexcept
     {
         return --_q_value != 0;
     }
 
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW
+    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept
     { return QAtomicTraits<sizeof(X)>::isLockFree(); }
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; }
+    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return false; }
 
     template <typename T>
-    static bool testAndSetRelaxed(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) Q_DECL_NOTHROW
+    static bool testAndSetRelaxed(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept
     {
         bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed, std::memory_order_relaxed);
         if (currentValue)
@@ -285,7 +303,7 @@ template <typename X> struct QAtomicOps
     }
 
     template <typename T>
-    static bool testAndSetAcquire(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) Q_DECL_NOTHROW
+    static bool testAndSetAcquire(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept
     {
         bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire, std::memory_order_acquire);
         if (currentValue)
@@ -294,7 +312,7 @@ template <typename X> struct QAtomicOps
     }
 
     template <typename T>
-    static bool testAndSetRelease(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) Q_DECL_NOTHROW
+    static bool testAndSetRelease(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept
     {
         bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release, std::memory_order_relaxed);
         if (currentValue)
@@ -303,7 +321,7 @@ template <typename X> struct QAtomicOps
     }
 
     template <typename T>
-    static bool testAndSetOrdered(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) Q_DECL_NOTHROW
+    static bool testAndSetOrdered(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept
     {
         bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel, std::memory_order_acquire);
         if (currentValue)
@@ -311,158 +329,158 @@ template <typename X> struct QAtomicOps
         return tmp;
     }
 
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return isTestAndSetNative(); }
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return false; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return isTestAndSetNative(); }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return false; }
 
     template <typename T>
-    static T fetchAndStoreRelaxed(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW
+    static T fetchAndStoreRelaxed(std::atomic<T> &_q_value, T newValue) noexcept
     {
         return _q_value.exchange(newValue, std::memory_order_relaxed);
     }
 
     template <typename T>
-    static T fetchAndStoreAcquire(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW
+    static T fetchAndStoreAcquire(std::atomic<T> &_q_value, T newValue) noexcept
     {
         return _q_value.exchange(newValue, std::memory_order_acquire);
     }
 
     template <typename T>
-    static T fetchAndStoreRelease(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW
+    static T fetchAndStoreRelease(std::atomic<T> &_q_value, T newValue) noexcept
     {
         return _q_value.exchange(newValue, std::memory_order_release);
     }
 
     template <typename T>
-    static T fetchAndStoreOrdered(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW
+    static T fetchAndStoreOrdered(std::atomic<T> &_q_value, T newValue) noexcept
     {
         return _q_value.exchange(newValue, std::memory_order_acq_rel);
     }
 
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return isTestAndSetNative(); }
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return false; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return isTestAndSetNative(); }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return false; }
 
     template <typename T> static inline
-    T fetchAndAddRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_add(valueToAdd, std::memory_order_relaxed);
     }
 
     template <typename T> static inline
-    T fetchAndAddAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_add(valueToAdd, std::memory_order_acquire);
     }
 
     template <typename T> static inline
-    T fetchAndAddRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_add(valueToAdd, std::memory_order_release);
     }
 
     template <typename T> static inline
-    T fetchAndAddOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_add(valueToAdd, std::memory_order_acq_rel);
     }
 
     template <typename T> static inline
-    T fetchAndSubRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndSubRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_sub(valueToAdd, std::memory_order_relaxed);
     }
 
     template <typename T> static inline
-    T fetchAndSubAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndSubAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_sub(valueToAdd, std::memory_order_acquire);
     }
 
     template <typename T> static inline
-    T fetchAndSubRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndSubRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_sub(valueToAdd, std::memory_order_release);
     }
 
     template <typename T> static inline
-    T fetchAndSubOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndSubOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_sub(valueToAdd, std::memory_order_acq_rel);
     }
 
     template <typename T> static inline
-    T fetchAndAndRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAndRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_and(valueToAdd, std::memory_order_relaxed);
     }
 
     template <typename T> static inline
-    T fetchAndAndAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAndAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_and(valueToAdd, std::memory_order_acquire);
     }
 
     template <typename T> static inline
-    T fetchAndAndRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAndRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_and(valueToAdd, std::memory_order_release);
     }
 
     template <typename T> static inline
-    T fetchAndAndOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAndOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_and(valueToAdd, std::memory_order_acq_rel);
     }
 
     template <typename T> static inline
-    T fetchAndOrRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndOrRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_or(valueToAdd, std::memory_order_relaxed);
     }
 
     template <typename T> static inline
-    T fetchAndOrAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndOrAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_or(valueToAdd, std::memory_order_acquire);
     }
 
     template <typename T> static inline
-    T fetchAndOrRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndOrRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_or(valueToAdd, std::memory_order_release);
     }
 
     template <typename T> static inline
-    T fetchAndOrOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndOrOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_or(valueToAdd, std::memory_order_acq_rel);
     }
 
     template <typename T> static inline
-    T fetchAndXorRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndXorRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_xor(valueToAdd, std::memory_order_relaxed);
     }
 
     template <typename T> static inline
-    T fetchAndXorAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndXorAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_xor(valueToAdd, std::memory_order_acquire);
     }
 
     template <typename T> static inline
-    T fetchAndXorRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndXorRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_xor(valueToAdd, std::memory_order_release);
     }
 
     template <typename T> static inline
-    T fetchAndXorOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndXorOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         return _q_value.fetch_xor(valueToAdd, std::memory_order_acq_rel);
     }
 };
 
-#if defined(Q_COMPILER_CONSTEXPR) && defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS)
+#if defined(Q_COMPILER_CONSTEXPR)
 #  define Q_BASIC_ATOMIC_INITIALIZER(a)     { a }
 #else
 #  define Q_BASIC_ATOMIC_INITIALIZER(a)     { ATOMIC_VAR_INIT(a) }
diff --git a/src/corelib/thread/qatomic_msvc.h b/src/corelib/thread/qatomic_msvc.h
index 5eae2bdc48..67b5224cd7 100644
--- a/src/corelib/thread/qatomic_msvc.h
+++ b/src/corelib/thread/qatomic_msvc.h
@@ -269,24 +269,24 @@ template <> struct QAtomicWindowsType<4> { typedef long Type; };
 
 template <int N> struct QAtomicOpsBySize : QGenericAtomicOps<QAtomicOpsBySize<N> >
 {
-    static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return true; }
-    static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW { return true; }
-    template <typename T> static bool ref(T &_q_value) Q_DECL_NOTHROW;
-    template <typename T> static bool deref(T &_q_value) Q_DECL_NOTHROW;
-
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return true; }
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return true; }
-    template <typename T> static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW;
+    static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() noexcept { return true; }
+    static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() noexcept { return true; }
+    template <typename T> static bool ref(T &_q_value) noexcept;
+    template <typename T> static bool deref(T &_q_value) noexcept;
+
+    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return true; }
+    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return true; }
+    template <typename T> static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) noexcept;
     template <typename T>
-    static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW;
+    static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) noexcept;
 
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return true; }
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return true; }
-    template <typename T> static T fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW;
+    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return true; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return true; }
+    template <typename T> static T fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept;
 
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return true; }
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return true; }
-    template <typename T> static T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW;
+    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return true; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return true; }
+    template <typename T> static T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept;
 
 private:
     typedef typename QAtomicWindowsType<N>::Type Type;
@@ -303,76 +303,76 @@ struct QAtomicOps : QAtomicOpsBySize<sizeof(T)>
 };
 
 template<> template<typename T>
-inline bool QAtomicOpsBySize<4>::ref(T &_q_value) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<4>::ref(T &_q_value) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Increment)(atomic(&_q_value)) != 0;
 }
 
 template<> template<typename T>
-inline bool QAtomicOpsBySize<4>::deref(T &_q_value) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<4>::deref(T &_q_value) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Decrement)(atomic(&_q_value)) != 0;
 }
 
 template<> template<typename T>
-inline bool QAtomicOpsBySize<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(CompareExchange)(atomic(&_q_value), value(newValue), value(expectedValue)) == value(expectedValue);
 }
 
 template<> template <typename T>
-inline bool QAtomicOpsBySize<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) noexcept
 {
     *currentValue = T(QT_INTERLOCKED_FUNCTION(CompareExchange)(atomic(&_q_value), newValue, expectedValue));
     return *currentValue == expectedValue;
 }
 
 template<> template<typename T>
-inline T QAtomicOpsBySize<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW
+inline T QAtomicOpsBySize<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Exchange)(atomic(&_q_value), value(newValue));
 }
 
 template<> template<typename T>
-inline T QAtomicOpsBySize<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+inline T QAtomicOpsBySize<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(ExchangeAdd)(atomic(&_q_value), value<T>(valueToAdd * QAtomicAdditiveType<T>::AddScale));
 }
 
 #ifdef Q_ATOMIC_INT16_IS_SUPPORTED
 template<> template<typename T>
-inline bool QAtomicOpsBySize<2>::ref(T &_q_value) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<2>::ref(T &_q_value) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Increment16)(atomic(&_q_value)) != 0;
 }
 
 template<> template<typename T>
-inline bool QAtomicOpsBySize<2>::deref(T &_q_value) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<2>::deref(T &_q_value) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Decrement16)(atomic(&_q_value)) != 0;
 }
 
 template<> template<typename T>
-inline bool QAtomicOpsBySize<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(CompareExchange16)(atomic(&_q_value), value(newValue), value(expectedValue)) == value(expectedValue);
 }
 
 template<> template <typename T>
-inline bool QAtomicOpsBySize<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) noexcept
 {
     *currentValue = T(QT_INTERLOCKED_FUNCTION(CompareExchange16)(atomic(&_q_value), newValue, expectedValue));
     return *currentValue == expectedValue;
 }
 
 template<> template<typename T>
-inline T QAtomicOpsBySize<2>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW
+inline T QAtomicOpsBySize<2>::fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Exchange16)(atomic(&_q_value), value(newValue));
 }
 
 template<> template<typename T>
-inline T QAtomicOpsBySize<2>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+inline T QAtomicOpsBySize<2>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(ExchangeAdd16)(atomic(&_q_value), value<T>(valueToAdd * QAtomicAdditiveType<T>::AddScale));
 }
@@ -380,38 +380,38 @@ inline T QAtomicOpsBySize<2>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAd
 
 #ifdef Q_ATOMIC_INT64_IS_SUPPORTED
 template<> template<typename T>
-inline bool QAtomicOpsBySize<8>::ref(T &_q_value) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<8>::ref(T &_q_value) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Increment64)(atomic(&_q_value)) != 0;
 }
 
 template<> template<typename T>
-inline bool QAtomicOpsBySize<8>::deref(T &_q_value) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<8>::deref(T &_q_value) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Decrement64)(atomic(&_q_value)) != 0;
 }
 
 template<> template<typename T>
-inline bool QAtomicOpsBySize<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(CompareExchange64)(atomic(&_q_value), value(newValue), value(expectedValue)) == value(expectedValue);
 }
 
 template<> template <typename T>
-inline bool QAtomicOpsBySize<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
+inline bool QAtomicOpsBySize<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) noexcept
 {
     *currentValue = T(QT_INTERLOCKED_FUNCTION(CompareExchange64)(atomic(&_q_value), newValue, expectedValue));
     return *currentValue == expectedValue;
 }
 
 template<> template<typename T>
-inline T QAtomicOpsBySize<8>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW
+inline T QAtomicOpsBySize<8>::fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(Exchange64)(atomic(&_q_value), value(newValue));
 }
 
 template<> template<typename T>
-inline T QAtomicOpsBySize<8>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+inline T QAtomicOpsBySize<8>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
 {
     return QT_INTERLOCKED_FUNCTION(ExchangeAdd64)(atomic(&_q_value), value<T>(valueToAdd * QAtomicAdditiveType<T>::AddScale));
 }
@@ -423,41 +423,41 @@ struct QAtomicOps<T *> : QGenericAtomicOps<QAtomicOps<T *> >
 {
     typedef T *Type;
 
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return true; }
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return true; }
-    static bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) Q_DECL_NOTHROW;
-    static bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue, T **currentValue) Q_DECL_NOTHROW;
+    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return true; }
+    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return true; }
+    static bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) noexcept;
+    static bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue, T **currentValue) noexcept;
 
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return true; }
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return true; }
-    static T *fetchAndStoreRelaxed(T *&_q_value, T *newValue) Q_DECL_NOTHROW;
+    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return true; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return true; }
+    static T *fetchAndStoreRelaxed(T *&_q_value, T *newValue) noexcept;
 
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return true; }
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return true; }
-    static T *fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) Q_DECL_NOTHROW;
+    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return true; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return true; }
+    static T *fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) noexcept;
 };
 
 template <typename T>
-inline bool QAtomicOps<T *>::testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) Q_DECL_NOTHROW
+inline bool QAtomicOps<T *>::testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) noexcept
 {
     return QT_INTERLOCKED_COMPARE_EXCHANGE_POINTER(&_q_value, newValue, expectedValue) == expectedValue;
 }
 
 template <typename T>
-inline bool QAtomicOps<T *>::testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue, T **currentValue) Q_DECL_NOTHROW
+inline bool QAtomicOps<T *>::testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue, T **currentValue) noexcept
 {
     *currentValue = reinterpret_cast<T *>(QT_INTERLOCKED_COMPARE_EXCHANGE_POINTER(&_q_value, newValue, expectedValue));
     return *currentValue == expectedValue;
 }
 
 template <typename T>
-inline T *QAtomicOps<T *>::fetchAndStoreRelaxed(T *&_q_value, T *newValue) Q_DECL_NOTHROW
+inline T *QAtomicOps<T *>::fetchAndStoreRelaxed(T *&_q_value, T *newValue) noexcept
 {
     return reinterpret_cast<T *>(QT_INTERLOCKED_EXCHANGE_POINTER(&_q_value, newValue));
 }
 
 template <typename T>
-inline T *QAtomicOps<T *>::fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) Q_DECL_NOTHROW
+inline T *QAtomicOps<T *>::fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) noexcept
 {
     return reinterpret_cast<T *>(QT_INTERLOCKED_EXCHANGE_ADD_POINTER(&_q_value, valueToAdd * sizeof(T)));
 }
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index 6b6ac10713..9804e60119 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -75,7 +75,7 @@ QT_END_NAMESPACE
 
 // New atomics
 
-#if defined(Q_COMPILER_CONSTEXPR) && defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS)
+#if defined(Q_COMPILER_CONSTEXPR)
 # if defined(Q_CC_CLANG) && Q_CC_CLANG < 303
    /*
       Do not define QT_BASIC_ATOMIC_HAS_CONSTRUCTORS for Clang before version 3.3.
@@ -99,126 +99,130 @@ public:
     typename Ops::Type _q_value;
 
     // Everything below is either implemented in ../arch/qatomic_XXX.h or (as fallback) in qgenericatomic.h
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_VERSION_X_5_14("Use loadRelaxed") T load() const noexcept { return loadRelaxed(); }
+    QT_DEPRECATED_VERSION_X_5_14("Use storeRelaxed") void store(T newValue) noexcept { storeRelaxed(newValue); }
+#endif
 
-    T load() const Q_DECL_NOTHROW { return Ops::load(_q_value); }
-    void store(T newValue) Q_DECL_NOTHROW { Ops::store(_q_value, newValue); }
+    T loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); }
+    void storeRelaxed(T newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); }
 
-    T loadAcquire() const Q_DECL_NOTHROW { return Ops::loadAcquire(_q_value); }
-    void storeRelease(T newValue) Q_DECL_NOTHROW { Ops::storeRelease(_q_value, newValue); }
-    operator T() const Q_DECL_NOTHROW { return loadAcquire(); }
-    T operator=(T newValue) Q_DECL_NOTHROW { storeRelease(newValue); return newValue; }
+    T loadAcquire() const noexcept { return Ops::loadAcquire(_q_value); }
+    void storeRelease(T newValue) noexcept { Ops::storeRelease(_q_value, newValue); }
+    operator T() const noexcept { return loadAcquire(); }
+    T operator=(T newValue) noexcept { storeRelease(newValue); return newValue; }
 
-    static Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return Ops::isReferenceCountingNative(); }
-    static Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW { return Ops::isReferenceCountingWaitFree(); }
+    static Q_DECL_CONSTEXPR bool isReferenceCountingNative() noexcept { return Ops::isReferenceCountingNative(); }
+    static Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() noexcept { return Ops::isReferenceCountingWaitFree(); }
 
-    bool ref() Q_DECL_NOTHROW { return Ops::ref(_q_value); }
-    bool deref() Q_DECL_NOTHROW { return Ops::deref(_q_value); }
+    bool ref() noexcept { return Ops::ref(_q_value); }
+    bool deref() noexcept { return Ops::deref(_q_value); }
 
-    static Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return Ops::isTestAndSetNative(); }
-    static Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return Ops::isTestAndSetWaitFree(); }
+    static Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return Ops::isTestAndSetNative(); }
+    static Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return Ops::isTestAndSetWaitFree(); }
 
-    bool testAndSetRelaxed(T expectedValue, T newValue) Q_DECL_NOTHROW
+    bool testAndSetRelaxed(T expectedValue, T newValue) noexcept
     { return Ops::testAndSetRelaxed(_q_value, expectedValue, newValue); }
-    bool testAndSetAcquire(T expectedValue, T newValue) Q_DECL_NOTHROW
+    bool testAndSetAcquire(T expectedValue, T newValue) noexcept
     { return Ops::testAndSetAcquire(_q_value, expectedValue, newValue); }
-    bool testAndSetRelease(T expectedValue, T newValue) Q_DECL_NOTHROW
+    bool testAndSetRelease(T expectedValue, T newValue) noexcept
     { return Ops::testAndSetRelease(_q_value, expectedValue, newValue); }
-    bool testAndSetOrdered(T expectedValue, T newValue) Q_DECL_NOTHROW
+    bool testAndSetOrdered(T expectedValue, T newValue) noexcept
     { return Ops::testAndSetOrdered(_q_value, expectedValue, newValue); }
 
-    bool testAndSetRelaxed(T expectedValue, T newValue, T &currentValue) Q_DECL_NOTHROW
+    bool testAndSetRelaxed(T expectedValue, T newValue, T &currentValue) noexcept
     { return Ops::testAndSetRelaxed(_q_value, expectedValue, newValue, &currentValue); }
-    bool testAndSetAcquire(T expectedValue, T newValue, T &currentValue) Q_DECL_NOTHROW
+    bool testAndSetAcquire(T expectedValue, T newValue, T &currentValue) noexcept
     { return Ops::testAndSetAcquire(_q_value, expectedValue, newValue, &currentValue); }
-    bool testAndSetRelease(T expectedValue, T newValue, T &currentValue) Q_DECL_NOTHROW
+    bool testAndSetRelease(T expectedValue, T newValue, T &currentValue) noexcept
     { return Ops::testAndSetRelease(_q_value, expectedValue, newValue, &currentValue); }
-    bool testAndSetOrdered(T expectedValue, T newValue, T &currentValue) Q_DECL_NOTHROW
+    bool testAndSetOrdered(T expectedValue, T newValue, T &currentValue) noexcept
     { return Ops::testAndSetOrdered(_q_value, expectedValue, newValue, &currentValue); }
 
-    static Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return Ops::isFetchAndStoreNative(); }
-    static Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return Ops::isFetchAndStoreWaitFree(); }
+    static Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return Ops::isFetchAndStoreNative(); }
+    static Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return Ops::isFetchAndStoreWaitFree(); }
 
-    T fetchAndStoreRelaxed(T newValue) Q_DECL_NOTHROW
+    T fetchAndStoreRelaxed(T newValue) noexcept
     { return Ops::fetchAndStoreRelaxed(_q_value, newValue); }
-    T fetchAndStoreAcquire(T newValue) Q_DECL_NOTHROW
+    T fetchAndStoreAcquire(T newValue) noexcept
     { return Ops::fetchAndStoreAcquire(_q_value, newValue); }
-    T fetchAndStoreRelease(T newValue) Q_DECL_NOTHROW
+    T fetchAndStoreRelease(T newValue) noexcept
     { return Ops::fetchAndStoreRelease(_q_value, newValue); }
-    T fetchAndStoreOrdered(T newValue) Q_DECL_NOTHROW
+    T fetchAndStoreOrdered(T newValue) noexcept
     { return Ops::fetchAndStoreOrdered(_q_value, newValue); }
 
-    static Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return Ops::isFetchAndAddNative(); }
-    static Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return Ops::isFetchAndAddWaitFree(); }
+    static Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return Ops::isFetchAndAddNative(); }
+    static Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return Ops::isFetchAndAddWaitFree(); }
 
-    T fetchAndAddRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddRelaxed(T valueToAdd) noexcept
     { return Ops::fetchAndAddRelaxed(_q_value, valueToAdd); }
-    T fetchAndAddAcquire(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddAcquire(T valueToAdd) noexcept
     { return Ops::fetchAndAddAcquire(_q_value, valueToAdd); }
-    T fetchAndAddRelease(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddRelease(T valueToAdd) noexcept
     { return Ops::fetchAndAddRelease(_q_value, valueToAdd); }
-    T fetchAndAddOrdered(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddOrdered(T valueToAdd) noexcept
     { return Ops::fetchAndAddOrdered(_q_value, valueToAdd); }
 
-    T fetchAndSubRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndSubRelaxed(T valueToAdd) noexcept
     { return Ops::fetchAndSubRelaxed(_q_value, valueToAdd); }
-    T fetchAndSubAcquire(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndSubAcquire(T valueToAdd) noexcept
     { return Ops::fetchAndSubAcquire(_q_value, valueToAdd); }
-    T fetchAndSubRelease(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndSubRelease(T valueToAdd) noexcept
     { return Ops::fetchAndSubRelease(_q_value, valueToAdd); }
-    T fetchAndSubOrdered(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndSubOrdered(T valueToAdd) noexcept
     { return Ops::fetchAndSubOrdered(_q_value, valueToAdd); }
 
-    T fetchAndAndRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAndRelaxed(T valueToAdd) noexcept
     { return Ops::fetchAndAndRelaxed(_q_value, valueToAdd); }
-    T fetchAndAndAcquire(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAndAcquire(T valueToAdd) noexcept
     { return Ops::fetchAndAndAcquire(_q_value, valueToAdd); }
-    T fetchAndAndRelease(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAndRelease(T valueToAdd) noexcept
     { return Ops::fetchAndAndRelease(_q_value, valueToAdd); }
-    T fetchAndAndOrdered(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAndOrdered(T valueToAdd) noexcept
     { return Ops::fetchAndAndOrdered(_q_value, valueToAdd); }
 
-    T fetchAndOrRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndOrRelaxed(T valueToAdd) noexcept
     { return Ops::fetchAndOrRelaxed(_q_value, valueToAdd); }
-    T fetchAndOrAcquire(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndOrAcquire(T valueToAdd) noexcept
     { return Ops::fetchAndOrAcquire(_q_value, valueToAdd); }
-    T fetchAndOrRelease(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndOrRelease(T valueToAdd) noexcept
     { return Ops::fetchAndOrRelease(_q_value, valueToAdd); }
-    T fetchAndOrOrdered(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndOrOrdered(T valueToAdd) noexcept
     { return Ops::fetchAndOrOrdered(_q_value, valueToAdd); }
 
-    T fetchAndXorRelaxed(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndXorRelaxed(T valueToAdd) noexcept
     { return Ops::fetchAndXorRelaxed(_q_value, valueToAdd); }
-    T fetchAndXorAcquire(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndXorAcquire(T valueToAdd) noexcept
     { return Ops::fetchAndXorAcquire(_q_value, valueToAdd); }
-    T fetchAndXorRelease(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndXorRelease(T valueToAdd) noexcept
     { return Ops::fetchAndXorRelease(_q_value, valueToAdd); }
-    T fetchAndXorOrdered(T valueToAdd) Q_DECL_NOTHROW
+    T fetchAndXorOrdered(T valueToAdd) noexcept
     { return Ops::fetchAndXorOrdered(_q_value, valueToAdd); }
 
-    T operator++() Q_DECL_NOTHROW
+    T operator++() noexcept
     { return fetchAndAddOrdered(1) + 1; }
-    T operator++(int) Q_DECL_NOTHROW
+    T operator++(int) noexcept
     { return fetchAndAddOrdered(1); }
-    T operator--() Q_DECL_NOTHROW
+    T operator--() noexcept
     { return fetchAndSubOrdered(1) - 1; }
-    T operator--(int) Q_DECL_NOTHROW
+    T operator--(int) noexcept
     { return fetchAndSubOrdered(1); }
 
-    T operator+=(T v) Q_DECL_NOTHROW
+    T operator+=(T v) noexcept
     { return fetchAndAddOrdered(v) + v; }
-    T operator-=(T v) Q_DECL_NOTHROW
+    T operator-=(T v) noexcept
     { return fetchAndSubOrdered(v) - v; }
-    T operator&=(T v) Q_DECL_NOTHROW
+    T operator&=(T v) noexcept
     { return fetchAndAndOrdered(v) & v; }
-    T operator|=(T v) Q_DECL_NOTHROW
+    T operator|=(T v) noexcept
     { return fetchAndOrOrdered(v) | v; }
-    T operator^=(T v) Q_DECL_NOTHROW
+    T operator^=(T v) noexcept
     { return fetchAndXorOrdered(v) ^ v; }
 
 
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
     QBasicAtomicInteger() = default;
-    constexpr QBasicAtomicInteger(T value) Q_DECL_NOTHROW : _q_value(value) {}
+    constexpr QBasicAtomicInteger(T value) noexcept : _q_value(value) {}
     QBasicAtomicInteger(const QBasicAtomicInteger &) = delete;
     QBasicAtomicInteger &operator=(const QBasicAtomicInteger &) = delete;
     QBasicAtomicInteger &operator=(const QBasicAtomicInteger &) volatile = delete;
@@ -236,85 +240,91 @@ public:
 
     AtomicType _q_value;
 
-    Type load() const Q_DECL_NOTHROW { return Ops::load(_q_value); }
-    void store(Type newValue) Q_DECL_NOTHROW { Ops::store(_q_value, newValue); }
-    operator Type() const Q_DECL_NOTHROW { return loadAcquire(); }
-    Type operator=(Type newValue) Q_DECL_NOTHROW { storeRelease(newValue); return newValue; }
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_VERSION_X_5_14("Use loadRelaxed") Type load() const noexcept { return loadRelaxed(); }
+    QT_DEPRECATED_VERSION_X_5_14("Use storeRelaxed") void store(Type newValue) noexcept { storeRelaxed(newValue); }
+#endif
+
+    Type loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); }
+    void storeRelaxed(Type newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); }
+
+    operator Type() const noexcept { return loadAcquire(); }
+    Type operator=(Type newValue) noexcept { storeRelease(newValue); return newValue; }
 
     // Atomic API, implemented in qatomic_XXX.h
-    Type loadAcquire() const Q_DECL_NOTHROW { return Ops::loadAcquire(_q_value); }
-    void storeRelease(Type newValue) Q_DECL_NOTHROW { Ops::storeRelease(_q_value, newValue); }
+    Type loadAcquire() const noexcept { return Ops::loadAcquire(_q_value); }
+    void storeRelease(Type newValue) noexcept { Ops::storeRelease(_q_value, newValue); }
 
-    static Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return Ops::isTestAndSetNative(); }
-    static Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return Ops::isTestAndSetWaitFree(); }
+    static Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return Ops::isTestAndSetNative(); }
+    static Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return Ops::isTestAndSetWaitFree(); }
 
-    bool testAndSetRelaxed(Type expectedValue, Type newValue) Q_DECL_NOTHROW
+    bool testAndSetRelaxed(Type expectedValue, Type newValue) noexcept
     { return Ops::testAndSetRelaxed(_q_value, expectedValue, newValue); }
-    bool testAndSetAcquire(Type expectedValue, Type newValue) Q_DECL_NOTHROW
+    bool testAndSetAcquire(Type expectedValue, Type newValue) noexcept
     { return Ops::testAndSetAcquire(_q_value, expectedValue, newValue); }
-    bool testAndSetRelease(Type expectedValue, Type newValue) Q_DECL_NOTHROW
+    bool testAndSetRelease(Type expectedValue, Type newValue) noexcept
     { return Ops::testAndSetRelease(_q_value, expectedValue, newValue); }
-    bool testAndSetOrdered(Type expectedValue, Type newValue) Q_DECL_NOTHROW
+    bool testAndSetOrdered(Type expectedValue, Type newValue) noexcept
     { return Ops::testAndSetOrdered(_q_value, expectedValue, newValue); }
 
-    bool testAndSetRelaxed(Type expectedValue, Type newValue, Type &currentValue) Q_DECL_NOTHROW
+    bool testAndSetRelaxed(Type expectedValue, Type newValue, Type &currentValue) noexcept
     { return Ops::testAndSetRelaxed(_q_value, expectedValue, newValue, &currentValue); }
-    bool testAndSetAcquire(Type expectedValue, Type newValue, Type &currentValue) Q_DECL_NOTHROW
+    bool testAndSetAcquire(Type expectedValue, Type newValue, Type &currentValue) noexcept
     { return Ops::testAndSetAcquire(_q_value, expectedValue, newValue, &currentValue); }
-    bool testAndSetRelease(Type expectedValue, Type newValue, Type &currentValue) Q_DECL_NOTHROW
+    bool testAndSetRelease(Type expectedValue, Type newValue, Type &currentValue) noexcept
     { return Ops::testAndSetRelease(_q_value, expectedValue, newValue, &currentValue); }
-    bool testAndSetOrdered(Type expectedValue, Type newValue, Type &currentValue) Q_DECL_NOTHROW
+    bool testAndSetOrdered(Type expectedValue, Type newValue, Type &currentValue) noexcept
     { return Ops::testAndSetOrdered(_q_value, expectedValue, newValue, &currentValue); }
 
-    static Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return Ops::isFetchAndStoreNative(); }
-    static Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return Ops::isFetchAndStoreWaitFree(); }
+    static Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return Ops::isFetchAndStoreNative(); }
+    static Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return Ops::isFetchAndStoreWaitFree(); }
 
-    Type fetchAndStoreRelaxed(Type newValue) Q_DECL_NOTHROW
+    Type fetchAndStoreRelaxed(Type newValue) noexcept
     { return Ops::fetchAndStoreRelaxed(_q_value, newValue); }
-    Type fetchAndStoreAcquire(Type newValue) Q_DECL_NOTHROW
+    Type fetchAndStoreAcquire(Type newValue) noexcept
     { return Ops::fetchAndStoreAcquire(_q_value, newValue); }
-    Type fetchAndStoreRelease(Type newValue) Q_DECL_NOTHROW
+    Type fetchAndStoreRelease(Type newValue) noexcept
     { return Ops::fetchAndStoreRelease(_q_value, newValue); }
-    Type fetchAndStoreOrdered(Type newValue) Q_DECL_NOTHROW
+    Type fetchAndStoreOrdered(Type newValue) noexcept
     { return Ops::fetchAndStoreOrdered(_q_value, newValue); }
 
-    static Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return Ops::isFetchAndAddNative(); }
-    static Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return Ops::isFetchAndAddWaitFree(); }
+    static Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return Ops::isFetchAndAddNative(); }
+    static Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return Ops::isFetchAndAddWaitFree(); }
 
-    Type fetchAndAddRelaxed(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type fetchAndAddRelaxed(qptrdiff valueToAdd) noexcept
     { return Ops::fetchAndAddRelaxed(_q_value, valueToAdd); }
-    Type fetchAndAddAcquire(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type fetchAndAddAcquire(qptrdiff valueToAdd) noexcept
     { return Ops::fetchAndAddAcquire(_q_value, valueToAdd); }
-    Type fetchAndAddRelease(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type fetchAndAddRelease(qptrdiff valueToAdd) noexcept
     { return Ops::fetchAndAddRelease(_q_value, valueToAdd); }
-    Type fetchAndAddOrdered(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type fetchAndAddOrdered(qptrdiff valueToAdd) noexcept
     { return Ops::fetchAndAddOrdered(_q_value, valueToAdd); }
 
-    Type fetchAndSubRelaxed(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type fetchAndSubRelaxed(qptrdiff valueToAdd) noexcept
     { return Ops::fetchAndSubRelaxed(_q_value, valueToAdd); }
-    Type fetchAndSubAcquire(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type fetchAndSubAcquire(qptrdiff valueToAdd) noexcept
     { return Ops::fetchAndSubAcquire(_q_value, valueToAdd); }
-    Type fetchAndSubRelease(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type fetchAndSubRelease(qptrdiff valueToAdd) noexcept
     { return Ops::fetchAndSubRelease(_q_value, valueToAdd); }
-    Type fetchAndSubOrdered(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type fetchAndSubOrdered(qptrdiff valueToAdd) noexcept
     { return Ops::fetchAndSubOrdered(_q_value, valueToAdd); }
 
-    Type operator++() Q_DECL_NOTHROW
+    Type operator++() noexcept
     { return fetchAndAddOrdered(1) + 1; }
-    Type operator++(int) Q_DECL_NOTHROW
+    Type operator++(int) noexcept
     { return fetchAndAddOrdered(1); }
-    Type operator--() Q_DECL_NOTHROW
+    Type operator--() noexcept
     { return fetchAndSubOrdered(1) - 1; }
-    Type operator--(int) Q_DECL_NOTHROW
+    Type operator--(int) noexcept
     { return fetchAndSubOrdered(1); }
-    Type operator+=(qptrdiff valueToAdd) Q_DECL_NOTHROW
+    Type operator+=(qptrdiff valueToAdd) noexcept
     { return fetchAndAddOrdered(valueToAdd) + valueToAdd; }
-    Type operator-=(qptrdiff valueToSub) Q_DECL_NOTHROW
+    Type operator-=(qptrdiff valueToSub) noexcept
     { return fetchAndSubOrdered(valueToSub) - valueToSub; }
 
 #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS
     QBasicAtomicPointer() = default;
-    constexpr QBasicAtomicPointer(Type value) Q_DECL_NOTHROW : _q_value(value) {}
+    constexpr QBasicAtomicPointer(Type value) noexcept : _q_value(value) {}
     QBasicAtomicPointer(const QBasicAtomicPointer &) = delete;
     QBasicAtomicPointer &operator=(const QBasicAtomicPointer &) = delete;
     QBasicAtomicPointer &operator=(const QBasicAtomicPointer &) volatile = delete;
diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h
index 483664c783..7bec4554b7 100644
--- a/src/corelib/thread/qfutex_p.h
+++ b/src/corelib/thread/qfutex_p.h
@@ -81,15 +81,43 @@ QT_END_NAMESPACE
 // if not defined in linux/futex.h
 #  define FUTEX_PRIVATE_FLAG        128         // added in v2.6.22
 
+#  if QT_HAS_FEATURE(thread_sanitizer) || defined(__SANITIZE_THREAD__)
+#    include <sanitizer/tsan_interface.h>
+inline void _q_tsan_acquire(void *addr, void *addr2)
+{
+    __tsan_acquire(addr);
+    if (addr2)
+        __tsan_acquire(addr2);
+}
+inline void _q_tsan_release(void *addr, void *addr2)
+{
+    if (addr2)
+        __tsan_release(addr2);
+    __tsan_release(addr);
+}
+#  else
+inline void _q_tsan_acquire(void *, void *) {}
+inline void _q_tsan_release(void *, void *) {}
+#  endif // QT_HAS_FEATURE(thread_sanitizer) || defined(__SANITIZE_THREAD__)
+
 QT_BEGIN_NAMESPACE
 namespace QtLinuxFutex {
     constexpr inline bool futexAvailable() { return true; }
     inline int _q_futex(int *addr, int op, int val, quintptr val2 = 0,
-                        int *addr2 = nullptr, int val3 = 0) Q_DECL_NOTHROW
+                        int *addr2 = nullptr, int val3 = 0) noexcept
     {
+        // A futex call ensures total ordering on the futex words
+        // (in either success or failure of the call). Instruct TSAN accordingly,
+        // as TSAN does not understand the futex(2) syscall.
+        _q_tsan_release(addr, addr2);
+
         // we use __NR_futex because some libcs (like Android's bionic) don't
         // provide SYS_futex etc.
-        return syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3);
+        int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3);
+
+        _q_tsan_acquire(addr, addr2);
+
+        return result;
     }
     template <typename T> int *addr(T *ptr)
     {
diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h
index a456dd9139..d3135510b3 100644
--- a/src/corelib/thread/qfuture.h
+++ b/src/corelib/thread/qfuture.h
@@ -111,33 +111,79 @@ public:
         typedef const T &reference;
 
         inline const_iterator() {}
-        inline const_iterator(QFuture const * const _future, int _index) : future(_future), index(_index) {}
+        inline const_iterator(QFuture const * const _future, int _index)
+        : future(_future), index(advanceIndex(_index, 0)) { }
         inline const_iterator(const const_iterator &o) : future(o.future), index(o.index)  {}
         inline const_iterator &operator=(const const_iterator &o)
         { future = o.future; index = o.index; return *this; }
         inline const T &operator*() const { return future->d.resultReference(index); }
         inline const T *operator->() const { return future->d.resultPointer(index); }
-
-        inline bool operator!=(const const_iterator &other) const
+        inline bool operator!=(const const_iterator &other) const { return index != other.index; }
+        inline bool operator==(const const_iterator &o) const { return !operator!=(o); }
+        inline const_iterator &operator++()
+        { index = advanceIndex(index, 1); return *this; }
+        inline const_iterator &operator--()
+        { index = advanceIndex(index, -1); return *this; }
+        inline const_iterator operator++(int)
+        {
+            const_iterator r = *this;
+            index = advanceIndex(index, 1);
+            return r;
+        }
+        inline const_iterator operator--(int)
         {
-            if (index == -1 && other.index == -1) // comparing end != end?
-                return false;
-            if (other.index == -1)
-                return (future->isRunning() || (index < future->resultCount()));
-            return (index != other.index);
+            const_iterator r = *this;
+            index = advanceIndex(index, -1);
+            return r;
         }
+        inline const_iterator operator+(int j) const
+        { return const_iterator(future, advanceIndex(index, j)); }
+        inline const_iterator operator-(int j) const
+        { return const_iterator(future, advanceIndex(index, -j)); }
+        inline const_iterator &operator+=(int j)
+        { index = advanceIndex(index, j); return *this; }
+        inline const_iterator &operator-=(int j)
+        { index = advanceIndex(index, -j); return *this; }
+        friend inline const_iterator operator+(int j, const_iterator k)
+        { return const_iterator(k.future, k.advanceIndex(k.index, j)); }
 
-        inline bool operator==(const const_iterator &o) const { return !operator!=(o); }
-        inline const_iterator &operator++() { ++index; return *this; }
-        inline const_iterator operator++(int) { const_iterator r = *this; ++index; return r; }
-        inline const_iterator &operator--() { --index; return *this; }
-        inline const_iterator operator--(int) { const_iterator r = *this; --index; return r; }
-        inline const_iterator operator+(int j) const { return const_iterator(future, index + j); }
-        inline const_iterator operator-(int j) const { return const_iterator(future, index - j); }
-        inline const_iterator &operator+=(int j) { index += j; return *this; }
-        inline const_iterator &operator-=(int j) { index -= j; return *this; }
-        friend inline const_iterator operator+(int j, const_iterator k) { return k + j; }
     private:
+        /*! \internal
+
+            Advances the iterator index \a idx \a n steps, waits for the
+            result at the target index, and returns the target index.
+
+            The index may be -1, indicating the end iterator, either
+            as the argument or as the return value. The end iterator
+            may be decremented.
+
+            The caller is responsible for not advancing the iterator
+            before begin() or past end(), with the exception that
+            attempting to advance a non-end iterator past end() for
+            a running future is allowed and will return the end iterator.
+
+            Note that n == 0 is valid and will wait for the result
+            at the given index.
+        */
+        int advanceIndex(int idx, int n) const
+        {
+            // The end iterator can be decremented, leave as-is for other cases
+            if (idx == -1 && n >= 0)
+                return idx;
+
+            // Special case for decrementing the end iterator: wait for
+            // finished to get the total result count.
+            if (idx == -1 && future->isRunning())
+                future->d.waitForFinished();
+
+            // Wait for result at target index
+            const int targetIndex = (idx == -1) ? future->resultCount() + n : idx + n;
+            future->d.waitForResult(targetIndex);
+
+            // After waiting there is either a result or the end was reached
+            return (targetIndex < future->resultCount()) ? targetIndex : -1;
+        }
+
         QFuture const * future;
         int index;
     };
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp
index dfbed5fb0f..6430f38a3b 100644
--- a/src/corelib/thread/qfutureinterface.cpp
+++ b/src/corelib/thread/qfutureinterface.cpp
@@ -97,7 +97,7 @@ static inline int switch_off(QAtomicInt &a, int which)
 static inline int switch_from_to(QAtomicInt &a, int from, int to)
 {
     int newValue;
-    int expected = a.load();
+    int expected = a.loadRelaxed();
     do {
         newValue = (expected & ~from) | to;
     } while (!a.testAndSetRelaxed(expected, newValue, expected));
@@ -107,7 +107,7 @@ static inline int switch_from_to(QAtomicInt &a, int from, int to)
 void QFutureInterfaceBase::cancel()
 {
     QMutexLocker locker(&d->m_mutex);
-    if (d->state.load() & Canceled)
+    if (d->state.loadRelaxed() & Canceled)
         return;
 
     switch_from_to(d->state, Paused, Canceled);
@@ -132,7 +132,7 @@ void QFutureInterfaceBase::setPaused(bool paused)
 void QFutureInterfaceBase::togglePaused()
 {
     QMutexLocker locker(&d->m_mutex);
-    if (d->state.load() & Paused) {
+    if (d->state.loadRelaxed() & Paused) {
         switch_off(d->state, Paused);
         d->pausedWaitCondition.wakeAll();
         d->sendCallOut(QFutureCallOutEvent(QFutureCallOutEvent::Resumed));
@@ -149,7 +149,7 @@ void QFutureInterfaceBase::setThrottled(bool enable)
         switch_on(d->state, Throttled);
     } else {
         switch_off(d->state, Throttled);
-        if (!(d->state.load() & Paused))
+        if (!(d->state.loadRelaxed() & Paused))
             d->pausedWaitCondition.wakeAll();
     }
 }
@@ -201,13 +201,13 @@ void QFutureInterfaceBase::waitForResume()
 {
     // return early if possible to avoid taking the mutex lock.
     {
-        const int state = d->state.load();
+        const int state = d->state.loadRelaxed();
         if (!(state & Paused) || (state & Canceled))
             return;
     }
 
     QMutexLocker lock(&d->m_mutex);
-    const int state = d->state.load();
+    const int state = d->state.loadRelaxed();
     if (!(state & Paused) || (state & Canceled))
         return;
 
@@ -256,7 +256,7 @@ bool QFutureInterfaceBase::isProgressUpdateNeeded() const
 void QFutureInterfaceBase::reportStarted()
 {
     QMutexLocker locker(&d->m_mutex);
-    if (d->state.load() & (Started|Canceled|Finished))
+    if (d->state.loadRelaxed() & (Started|Canceled|Finished))
         return;
 
     d->setState(State(Started | Running));
@@ -272,7 +272,7 @@ void QFutureInterfaceBase::reportCanceled()
 void QFutureInterfaceBase::reportException(const QException &exception)
 {
     QMutexLocker locker(&d->m_mutex);
-    if (d->state.load() & (Canceled|Finished))
+    if (d->state.loadRelaxed() & (Canceled|Finished))
         return;
 
     d->m_exceptionStore.setException(exception);
@@ -307,7 +307,7 @@ int QFutureInterfaceBase::expectedResultCount()
 
 bool QFutureInterfaceBase::queryState(State state) const
 {
-    return d->state.load() & state;
+    return d->state.loadRelaxed() & state;
 }
 
 void QFutureInterfaceBase::waitForResult(int resultIndex)
@@ -352,7 +352,7 @@ void QFutureInterfaceBase::waitForFinished()
 
 void QFutureInterfaceBase::reportResultsReady(int beginIndex, int endIndex)
 {
-    if (beginIndex == endIndex || (d->state.load() & (Canceled|Finished)))
+    if (beginIndex == endIndex || (d->state.loadRelaxed() & (Canceled|Finished)))
         return;
 
     d->waitCondition.wakeAll();
@@ -414,7 +414,7 @@ void QFutureInterfaceBase::setProgressValueAndText(int progressValue,
     if (d->m_progressValue >= progressValue)
         return;
 
-    if (d->state.load() & (Canceled|Finished))
+    if (d->state.loadRelaxed() & (Canceled|Finished))
         return;
 
     if (d->internal_updateProgress(progressValue, progressText)) {
@@ -429,6 +429,11 @@ QMutex *QFutureInterfaceBase::mutex() const
     return &d->m_mutex;
 }
 
+QMutex &QFutureInterfaceBase::mutex(int) const
+{
+    return d->m_mutex;
+}
+
 QtPrivate::ExceptionStore &QFutureInterfaceBase::exceptionStore()
 {
     return d->m_exceptionStore;
@@ -486,10 +491,10 @@ bool QFutureInterfaceBasePrivate::internal_waitForNextResult()
     if (m_results.hasNextResult())
         return true;
 
-    while ((state.load() & QFutureInterfaceBase::Running) && m_results.hasNextResult() == false)
+    while ((state.loadRelaxed() & QFutureInterfaceBase::Running) && m_results.hasNextResult() == false)
         waitCondition.wait(&m_mutex);
 
-    return !(state.load() & QFutureInterfaceBase::Canceled) && m_results.hasNextResult();
+    return !(state.loadRelaxed() & QFutureInterfaceBase::Canceled) && m_results.hasNextResult();
 }
 
 bool QFutureInterfaceBasePrivate::internal_updateProgress(int progress,
@@ -512,8 +517,8 @@ bool QFutureInterfaceBasePrivate::internal_updateProgress(int progress,
 void QFutureInterfaceBasePrivate::internal_setThrottled(bool enable)
 {
     // bail out if we are not changing the state
-    if ((enable && (state.load() & QFutureInterfaceBase::Throttled))
-        || (!enable && !(state.load() & QFutureInterfaceBase::Throttled)))
+    if ((enable && (state.loadRelaxed() & QFutureInterfaceBase::Throttled))
+        || (!enable && !(state.loadRelaxed() & QFutureInterfaceBase::Throttled)))
         return;
 
     // change the state
@@ -521,7 +526,7 @@ void QFutureInterfaceBasePrivate::internal_setThrottled(bool enable)
         switch_on(state, QFutureInterfaceBase::Throttled);
     } else {
         switch_off(state, QFutureInterfaceBase::Throttled);
-        if (!(state.load() & QFutureInterfaceBase::Paused))
+        if (!(state.loadRelaxed() & QFutureInterfaceBase::Paused))
             pausedWaitCondition.wakeAll();
     }
 }
@@ -556,7 +561,7 @@ void QFutureInterfaceBasePrivate::connectOutputInterface(QFutureCallOutInterface
 {
     QMutexLocker locker(&m_mutex);
 
-    if (state.load() & QFutureInterfaceBase::Started) {
+    if (state.loadRelaxed() & QFutureInterfaceBase::Started) {
         interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::Started));
         interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::ProgressRange,
                                                         m_progressMinimum,
@@ -576,13 +581,13 @@ void QFutureInterfaceBasePrivate::connectOutputInterface(QFutureCallOutInterface
         it.batchedAdvance();
     }
 
-    if (state.load() & QFutureInterfaceBase::Paused)
+    if (state.loadRelaxed() & QFutureInterfaceBase::Paused)
         interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::Paused));
 
-    if (state.load() & QFutureInterfaceBase::Canceled)
+    if (state.loadRelaxed() & QFutureInterfaceBase::Canceled)
         interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::Canceled));
 
-    if (state.load() & QFutureInterfaceBase::Finished)
+    if (state.loadRelaxed() & QFutureInterfaceBase::Finished)
         interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::Finished));
 
     outputConnections.append(interface);
@@ -601,7 +606,7 @@ void QFutureInterfaceBasePrivate::disconnectOutputInterface(QFutureCallOutInterf
 
 void QFutureInterfaceBasePrivate::setState(QFutureInterfaceBase::State newState)
 {
-    state.store(newState);
+    state.storeRelaxed(newState);
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h
index d5e2401eee..bcdae24833 100644
--- a/src/corelib/thread/qfutureinterface.h
+++ b/src/corelib/thread/qfutureinterface.h
@@ -45,6 +45,8 @@
 #include <QtCore/qexception.h>
 #include <QtCore/qresultstore.h>
 
+#include <mutex>
+
 QT_REQUIRE_CONFIG(future);
 
 QT_BEGIN_NAMESPACE
@@ -118,6 +120,7 @@ public:
     void waitForResume();
 
     QMutex *mutex() const;
+    QMutex &mutex(int) const;
     QtPrivate::ExceptionStore &exceptionStore();
     QtPrivate::ResultStoreBase &resultStoreBase();
     const QtPrivate::ResultStoreBase &resultStoreBase() const;
@@ -188,7 +191,7 @@ public:
 template <typename T>
 inline void QFutureInterface<T>::reportResult(const T *result, int index)
 {
-    QMutexLocker locker(mutex());
+    std::lock_guard<QMutex> locker(mutex(0));
     if (this->queryState(Canceled) || this->queryState(Finished)) {
         return;
     }
@@ -214,7 +217,7 @@ inline void QFutureInterface<T>::reportResult(const T &result, int index)
 template <typename T>
 inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int beginIndex, int count)
 {
-    QMutexLocker locker(mutex());
+    std::lock_guard<QMutex> locker(mutex(0));
     if (this->queryState(Canceled) || this->queryState(Finished)) {
         return;
     }
@@ -242,14 +245,14 @@ inline void QFutureInterface<T>::reportFinished(const T *result)
 template <typename T>
 inline const T &QFutureInterface<T>::resultReference(int index) const
 {
-    QMutexLocker lock(mutex());
+    std::lock_guard<QMutex> locker(mutex(0));
     return resultStoreBase().resultAt(index).template value<T>();
 }
 
 template <typename T>
 inline const T *QFutureInterface<T>::resultPointer(int index) const
 {
-    QMutexLocker lock(mutex());
+    std::lock_guard<QMutex> locker(mutex(0));
     return resultStoreBase().resultAt(index).template pointer<T>();
 }
 
@@ -263,7 +266,7 @@ inline QList<T> QFutureInterface<T>::results()
     QFutureInterfaceBase::waitForResult(-1);
 
     QList<T> res;
-    QMutexLocker lock(mutex());
+    std::lock_guard<QMutex> locker(mutex(0));
 
     QtPrivate::ResultIteratorBase it = resultStoreBase().begin();
     while (it != resultStoreBase().end()) {
diff --git a/src/corelib/thread/qfutureinterface_p.h b/src/corelib/thread/qfutureinterface_p.h
index 63e534464f..b297dff633 100644
--- a/src/corelib/thread/qfutureinterface_p.h
+++ b/src/corelib/thread/qfutureinterface_p.h
@@ -144,11 +144,11 @@ public:
         // Default ref counter for QFIBP
         inline bool ref() { return m_refCount.ref(); }
         inline bool deref() { return m_refCount.deref(); }
-        inline int load() const { return m_refCount.load(); }
+        inline int load() const { return m_refCount.loadRelaxed(); }
         // Ref counter for type T
         inline bool refT() { return m_refCountT.ref(); }
         inline bool derefT() { return m_refCountT.deref(); }
-        inline int loadT() const { return m_refCountT.load(); }
+        inline int loadT() const { return m_refCountT.loadRelaxed(); }
 
     private:
         QAtomicInt m_refCount;
diff --git a/src/corelib/thread/qfuturewatcher.cpp b/src/corelib/thread/qfuturewatcher.cpp
index cf220bbd48..06bc4740f9 100644
--- a/src/corelib/thread/qfuturewatcher.cpp
+++ b/src/corelib/thread/qfuturewatcher.cpp
@@ -402,7 +402,7 @@ void QFutureWatcherBase::disconnectOutputInterface(bool pendingAssignment)
 {
     if (pendingAssignment) {
         Q_D(QFutureWatcherBase);
-        d->pendingResultsReady.store(0);
+        d->pendingResultsReady.storeRelaxed(0);
         qDeleteAll(d->pendingCallOutEvents);
         d->pendingCallOutEvents.clear();
         d->finished = false; /* May soon be amended, during connectOutputInterface() */
@@ -441,7 +441,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
             emit q->finished();
         break;
         case QFutureCallOutEvent::Canceled:
-            pendingResultsReady.store(0);
+            pendingResultsReady.storeRelaxed(0);
             emit q->canceled();
         break;
         case QFutureCallOutEvent::Paused:
@@ -466,7 +466,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
 
             emit q->resultsReadyAt(beginIndex, endIndex);
 
-            if (resultAtConnected.load() <= 0)
+            if (resultAtConnected.loadRelaxed() <= 0)
                 break;
 
             for (int i = beginIndex; i < endIndex; ++i)
diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h
index 89c4fe9a11..e9e5f3c74b 100644
--- a/src/corelib/thread/qgenericatomic.h
+++ b/src/corelib/thread/qgenericatomic.h
@@ -72,32 +72,44 @@ template <typename BaseClass> struct QGenericAtomicOps
 {
     template <typename T> struct AtomicType { typedef T Type; typedef T *PointerType; };
 
-    template <typename T> static void acquireMemoryFence(const T &_q_value) Q_DECL_NOTHROW
+    template <typename T> static void acquireMemoryFence(const T &_q_value) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
     }
-    template <typename T> static void releaseMemoryFence(const T &_q_value) Q_DECL_NOTHROW
+    template <typename T> static void releaseMemoryFence(const T &_q_value) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
     }
-    template <typename T> static void orderedMemoryFence(const T &) Q_DECL_NOTHROW
+    template <typename T> static void orderedMemoryFence(const T &) noexcept
     {
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T load(const T &_q_value) Q_DECL_NOTHROW
+    T load(const T &_q_value) noexcept
     {
         return _q_value;
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    void store(T &_q_value, X newValue) Q_DECL_NOTHROW
+    void store(T &_q_value, X newValue) noexcept
     {
         _q_value = newValue;
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T loadAcquire(const T &_q_value) Q_DECL_NOTHROW
+    T loadRelaxed(const T &_q_value) noexcept
+    {
+        return _q_value;
+    }
+
+    template <typename T, typename X> static Q_ALWAYS_INLINE
+    void storeRelaxed(T &_q_value, X newValue) noexcept
+    {
+        _q_value = newValue;
+    }
+
+    template <typename T> static Q_ALWAYS_INLINE
+    T loadAcquire(const T &_q_value) noexcept
     {
         T tmp = *static_cast<const volatile T *>(&_q_value);
         BaseClass::acquireMemoryFence(_q_value);
@@ -105,24 +117,24 @@ template <typename BaseClass> struct QGenericAtomicOps
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    void storeRelease(T &_q_value, X newValue) Q_DECL_NOTHROW
+    void storeRelease(T &_q_value, X newValue) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         *static_cast<volatile T *>(&_q_value) = newValue;
     }
 
-    static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW
+    static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() noexcept
     { return BaseClass::isFetchAndAddNative(); }
-    static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW
+    static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() noexcept
     { return BaseClass::isFetchAndAddWaitFree(); }
     template <typename T> static Q_ALWAYS_INLINE
-    bool ref(T &_q_value) Q_DECL_NOTHROW
+    bool ref(T &_q_value) noexcept
     {
         return BaseClass::fetchAndAddRelaxed(_q_value, 1) != T(-1);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    bool deref(T &_q_value) Q_DECL_NOTHROW
+    bool deref(T &_q_value) noexcept
     {
          return BaseClass::fetchAndAddRelaxed(_q_value, -1) != 1;
     }
@@ -130,16 +142,16 @@ template <typename BaseClass> struct QGenericAtomicOps
 #if 0
     // These functions have no default implementation
     // Archictectures must implement them
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW;
-    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW;
+    static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept;
+    static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept;
     template <typename T, typename X> static inline
-    bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue) Q_DECL_NOTHROW;
+    bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue) noexcept;
     template <typename T, typename X> static inline
-    bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue, X *currentValue) Q_DECL_NOTHROW;
+    bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept;
 #endif
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue) Q_DECL_NOTHROW
+    bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue) noexcept
     {
         bool tmp = BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue);
         BaseClass::acquireMemoryFence(_q_value);
@@ -147,21 +159,21 @@ template <typename BaseClass> struct QGenericAtomicOps
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    bool testAndSetRelease(T &_q_value, X expectedValue, X newValue) Q_DECL_NOTHROW
+    bool testAndSetRelease(T &_q_value, X expectedValue, X newValue) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue);
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue) Q_DECL_NOTHROW
+    bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
         return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue);
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue, X *currentValue) Q_DECL_NOTHROW
+    bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept
     {
         bool tmp = BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue);
         BaseClass::acquireMemoryFence(_q_value);
@@ -169,35 +181,35 @@ template <typename BaseClass> struct QGenericAtomicOps
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    bool testAndSetRelease(T &_q_value, X expectedValue, X newValue, X *currentValue) Q_DECL_NOTHROW
+    bool testAndSetRelease(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue);
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue, X *currentValue) Q_DECL_NOTHROW
+    bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
         return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue);
     }
 
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return false; }
-    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return false; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return false; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return false; }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    T fetchAndStoreRelaxed(T &_q_value, X newValue) Q_DECL_NOTHROW
+    T fetchAndStoreRelaxed(T &_q_value, X newValue) noexcept
     {
         // implement fetchAndStore on top of testAndSet
         Q_FOREVER {
-            T tmp = load(_q_value);
+            T tmp = loadRelaxed(_q_value);
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, newValue))
                 return tmp;
         }
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    T fetchAndStoreAcquire(T &_q_value, X newValue) Q_DECL_NOTHROW
+    T fetchAndStoreAcquire(T &_q_value, X newValue) noexcept
     {
         T tmp = BaseClass::fetchAndStoreRelaxed(_q_value, newValue);
         BaseClass::acquireMemoryFence(_q_value);
@@ -205,34 +217,34 @@ template <typename BaseClass> struct QGenericAtomicOps
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    T fetchAndStoreRelease(T &_q_value, X newValue) Q_DECL_NOTHROW
+    T fetchAndStoreRelease(T &_q_value, X newValue) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         return BaseClass::fetchAndStoreRelaxed(_q_value, newValue);
     }
 
     template <typename T, typename X> static Q_ALWAYS_INLINE
-    T fetchAndStoreOrdered(T &_q_value, X newValue) Q_DECL_NOTHROW
+    T fetchAndStoreOrdered(T &_q_value, X newValue) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
         return BaseClass::fetchAndStoreRelaxed(_q_value, newValue);
     }
 
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return false; }
-    static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return false; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return false; }
+    static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return false; }
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         // implement fetchAndAdd on top of testAndSet
         Q_FOREVER {
-            T tmp = BaseClass::load(_q_value);
+            T tmp = BaseClass::loadRelaxed(_q_value);
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp + valueToAdd)))
                 return tmp;
         }
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndAddAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         T tmp = BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd);
         BaseClass::acquireMemoryFence(_q_value);
@@ -240,14 +252,14 @@ template <typename BaseClass> struct QGenericAtomicOps
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndAddRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         return BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndAddOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW
+    T fetchAndAddOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
         return BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd);
@@ -256,7 +268,7 @@ template <typename BaseClass> struct QGenericAtomicOps
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_MSVC(4146)   // unary minus operator applied to unsigned type, result still unsigned
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndSubRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) Q_DECL_NOTHROW
+    T fetchAndSubRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept
     {
         // implement fetchAndSub on top of fetchAndAdd
         return fetchAndAddRelaxed(_q_value, -operand);
@@ -264,7 +276,7 @@ QT_WARNING_DISABLE_MSVC(4146)   // unary minus operator applied to unsigned type
 QT_WARNING_POP
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndSubAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) Q_DECL_NOTHROW
+    T fetchAndSubAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept
     {
         T tmp = BaseClass::fetchAndSubRelaxed(_q_value, operand);
         BaseClass::acquireMemoryFence(_q_value);
@@ -272,24 +284,24 @@ QT_WARNING_POP
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndSubRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) Q_DECL_NOTHROW
+    T fetchAndSubRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         return BaseClass::fetchAndSubRelaxed(_q_value, operand);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndSubOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) Q_DECL_NOTHROW
+    T fetchAndSubOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
         return BaseClass::fetchAndSubRelaxed(_q_value, operand);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndAndRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndAndRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         // implement fetchAndAnd on top of testAndSet
-        T tmp = BaseClass::load(_q_value);
+        T tmp = BaseClass::loadRelaxed(_q_value);
         Q_FOREVER {
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp & operand), &tmp))
                 return tmp;
@@ -297,7 +309,7 @@ QT_WARNING_POP
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndAndAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndAndAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         T tmp = BaseClass::fetchAndAndRelaxed(_q_value, operand);
         BaseClass::acquireMemoryFence(_q_value);
@@ -305,24 +317,24 @@ QT_WARNING_POP
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndAndRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndAndRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         return BaseClass::fetchAndAndRelaxed(_q_value, operand);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndAndOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndAndOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
         return BaseClass::fetchAndAndRelaxed(_q_value, operand);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndOrRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndOrRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         // implement fetchAndOr on top of testAndSet
-        T tmp = BaseClass::load(_q_value);
+        T tmp = BaseClass::loadRelaxed(_q_value);
         Q_FOREVER {
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp | operand), &tmp))
                 return tmp;
@@ -330,7 +342,7 @@ QT_WARNING_POP
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndOrAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndOrAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         T tmp = BaseClass::fetchAndOrRelaxed(_q_value, operand);
         BaseClass::acquireMemoryFence(_q_value);
@@ -338,24 +350,24 @@ QT_WARNING_POP
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndOrRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndOrRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         return BaseClass::fetchAndOrRelaxed(_q_value, operand);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndOrOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndOrOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
         return BaseClass::fetchAndOrRelaxed(_q_value, operand);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndXorRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndXorRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         // implement fetchAndXor on top of testAndSet
-        T tmp = BaseClass::load(_q_value);
+        T tmp = BaseClass::loadRelaxed(_q_value);
         Q_FOREVER {
             if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp ^ operand), &tmp))
                 return tmp;
@@ -363,7 +375,7 @@ QT_WARNING_POP
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndXorAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndXorAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         T tmp = BaseClass::fetchAndXorRelaxed(_q_value, operand);
         BaseClass::acquireMemoryFence(_q_value);
@@ -371,14 +383,14 @@ QT_WARNING_POP
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndXorRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndXorRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         BaseClass::releaseMemoryFence(_q_value);
         return BaseClass::fetchAndXorRelaxed(_q_value, operand);
     }
 
     template <typename T> static Q_ALWAYS_INLINE
-    T fetchAndXorOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW
+    T fetchAndXorOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept
     {
         BaseClass::orderedMemoryFence(_q_value);
         return BaseClass::fetchAndXorRelaxed(_q_value, operand);
diff --git a/src/corelib/thread/qlocking_p.h b/src/corelib/thread/qlocking_p.h
new file mode 100644
index 0000000000..9a796cf7f7
--- /dev/null
+++ b/src/corelib/thread/qlocking_p.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QLOCKING_P_H
+#define QLOCKING_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of qmutex.cpp, qmutex_unix.cpp, and qmutex_win.cpp.  This header
+// file may change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qmutex.h>
+
+#include <mutex>
+
+QT_BEGIN_NAMESPACE
+
+//
+// This API is bridging the time until we can depend on C++17:
+//
+// - qt_scoped_lock returns a lock that cannot be unlocked again before the end of the scope
+// - qt_unique_lock returns a lock that can be unlock()ed and moved around
+// - for compat with QMutexLocker, qt_unique_lock supports passing by pointer.
+//   Do NOT use this overload lightly; it's only for cases such as where a Q_GLOBAL_STATIC
+//   may have already been deleted. In particular, do NOT port from
+//       QMutexLocker locker(&mutex);
+//   to
+//       auto locker = qt_unique_lock(&mutex);
+//   as this will not port automatically to std::unique_lock come C++17!
+//
+// The intent, come C++17, is to replace
+//     qt_scoped_lock(mutex);
+//     qt_unique_lock(mutex); // except qt_unique_lock(&mutex)
+// with
+//     std::scoped_lock(mutex);
+//     std::unique_lock(mutex);
+// resp. (C++17 meaning CTAD, guaranteed copy elision + scoped_lock available on all platforms),
+// so please use these functions only in ways which don't break this mechanical search & replace.
+//
+
+namespace {
+
+template <typename Mutex, typename Lock =
+#if defined(__cpp_guaranteed_copy_elision) && __cpp_guaranteed_copy_elision >= 201606L
+# if defined(__cpp_lib_scoped_lock) && __cpp_lib_scoped_lock >= 201703L
+          std::scoped_lock
+# else
+          std::lock_guard
+# endif
+#else
+          std::unique_lock
+#endif
+          <typename std::decay<Mutex>::type>
+>
+Lock qt_scoped_lock(Mutex &mutex)
+{
+    return Lock(mutex);
+}
+
+template <typename Mutex, typename Lock = std::unique_lock<typename std::decay<Mutex>::type>>
+Lock qt_unique_lock(Mutex &mutex)
+{
+    return Lock(mutex);
+}
+
+template <typename Mutex, typename Lock = std::unique_lock<typename std::decay<Mutex>::type>>
+Lock qt_unique_lock(Mutex *mutex)
+{
+    return mutex ? Lock(*mutex) : Lock() ;
+}
+
+} // unnamed namespace
+
+QT_END_NAMESPACE
+
+#endif // QLOCKING_P_H
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp
index 3881ac017e..9e52f286ee 100644
--- a/src/corelib/thread/qmutex.cpp
+++ b/src/corelib/thread/qmutex.cpp
@@ -82,7 +82,7 @@ public:
     QMutex mutex;
 
     bool lock(int timeout) QT_MUTEX_LOCK_NOEXCEPT;
-    void unlock() Q_DECL_NOTHROW;
+    void unlock() noexcept;
 };
 
 /*
@@ -147,7 +147,7 @@ public:
     It is constructed and destroyed with almost no overhead,
     which means it is fine to have many mutexes as part of other classes.
 
-    \sa QMutexLocker, QReadWriteLock, QSemaphore, QWaitCondition
+    \sa QRecursiveMutex, QMutexLocker, QReadWriteLock, QSemaphore, QWaitCondition
 */
 
 /*!
@@ -156,12 +156,19 @@ public:
     \value Recursive  In this mode, a thread can lock the same mutex
                       multiple times and the mutex won't be unlocked
                       until a corresponding number of unlock() calls
-                      have been made.
+                      have been made. You should use QRecursiveMutex
+                      for this use-case.
 
     \value NonRecursive  In this mode, a thread may only lock a mutex
                          once.
 
-    \sa QMutex()
+    \sa QMutex(), QRecursiveMutex
+*/
+
+/*!
+    \fn QMutex::QMutex()
+
+    Constructs a new mutex. The mutex is created in an unlocked state.
 */
 
 /*!
@@ -179,7 +186,7 @@ public:
 */
 QMutex::QMutex(RecursionMode mode)
 {
-    d_ptr.store(mode == Recursive ? new QRecursiveMutexPrivate : 0);
+    d_ptr.storeRelaxed(mode == Recursive ? new QRecursiveMutexPrivate : 0);
 }
 
 /*!
@@ -189,12 +196,12 @@ QMutex::QMutex(RecursionMode mode)
 */
 QMutex::~QMutex()
 {
-    QMutexData *d = d_ptr.load();
+    QMutexData *d = d_ptr.loadRelaxed();
     if (isRecursive()) {
         delete static_cast<QRecursiveMutexPrivate *>(d);
     } else if (d) {
 #ifndef QT_LINUX_FUTEX
-        if (d != dummyLocked() && static_cast<QMutexPrivate *>(d)->possiblyUnlocked.load()
+        if (d != dummyLocked() && static_cast<QMutexPrivate *>(d)->possiblyUnlocked.loadRelaxed()
             && tryLock()) {
             unlock();
             return;
@@ -205,13 +212,15 @@ QMutex::~QMutex()
 }
 
 /*! \fn void QMutex::lock()
+    \fn QRecursiveMutex::lock()
+
     Locks the mutex. If another thread has locked the mutex then this
     call will block until that thread has unlocked it.
 
     Calling this function multiple times on the same mutex from the
     same thread is allowed if this mutex is a
-    \l{QMutex::Recursive}{recursive mutex}. If this mutex is a
-    \l{QMutex::NonRecursive}{non-recursive mutex}, this function will
+    \l{QRecursiveMutex}{recursive mutex}. If this mutex is a
+    \l{QMutex}{non-recursive mutex}, this function will
     \e dead-lock when the mutex is locked recursively.
 
     \sa unlock()
@@ -228,6 +237,7 @@ void QMutex::lock() QT_MUTEX_LOCK_NOEXCEPT
 }
 
 /*! \fn bool QMutex::tryLock(int timeout)
+    \fn bool QRecursiveMutex::tryLock(int timeout)
 
     Attempts to lock the mutex. This function returns \c true if the lock
     was obtained; otherwise it returns \c false. If another thread has
@@ -243,8 +253,8 @@ void QMutex::lock() QT_MUTEX_LOCK_NOEXCEPT
 
     Calling this function multiple times on the same mutex from the
     same thread is allowed if this mutex is a
-    \l{QMutex::Recursive}{recursive mutex}. If this mutex is a
-    \l{QMutex::NonRecursive}{non-recursive mutex}, this function will
+    \l{QRecursiveMutex}{recursive mutex}. If this mutex is a
+    \l{QMutex}{non-recursive mutex}, this function will
     \e always return false when attempting to lock the mutex
     recursively.
 
@@ -262,6 +272,7 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
 }
 
 /*! \fn bool QMutex::try_lock()
+    \fn bool QRecursiveMutex::try_lock()
     \since 5.8
 
     Attempts to lock the mutex. This function returns \c true if the lock
@@ -275,6 +286,7 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
 */
 
 /*! \fn template <class Rep, class Period> bool QMutex::try_lock_for(std::chrono::duration<Rep, Period> duration)
+    \fn template <class Rep, class Period> bool QRecursiveMutex::try_lock_for(std::chrono::duration<Rep, Period> duration)
     \since 5.8
 
     Attempts to lock the mutex. This function returns \c true if the lock
@@ -290,8 +302,8 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
 
     Calling this function multiple times on the same mutex from the
     same thread is allowed if this mutex is a
-    \l{QMutex::Recursive}{recursive mutex}. If this mutex is a
-    \l{QMutex::NonRecursive}{non-recursive mutex}, this function will
+    \l{QRecursiveMutex}{recursive mutex}. If this mutex is a
+    \l{QMutex}{non-recursive mutex}, this function will
     \e always return false when attempting to lock the mutex
     recursively.
 
@@ -299,6 +311,7 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
 */
 
 /*! \fn template<class Clock, class Duration> bool QMutex::try_lock_until(std::chrono::time_point<Clock, Duration> timePoint)
+    \fn template<class Clock, class Duration> bool QRecursiveMutex::try_lock_until(std::chrono::time_point<Clock, Duration> timePoint)
     \since 5.8
 
     Attempts to lock the mutex. This function returns \c true if the lock
@@ -314,8 +327,8 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
 
     Calling this function multiple times on the same mutex from the
     same thread is allowed if this mutex is a
-    \l{QMutex::Recursive}{recursive mutex}. If this mutex is a
-    \l{QMutex::NonRecursive}{non-recursive mutex}, this function will
+    \l{QRecursiveMutex}{recursive mutex}. If this mutex is a
+    \l{QMutex}{non-recursive mutex}, this function will
     \e always return false when attempting to lock the mutex
     recursively.
 
@@ -323,13 +336,15 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
 */
 
 /*! \fn void QMutex::unlock()
+    \fn void QRecursiveMutex::unlock()
+
     Unlocks the mutex. Attempting to unlock a mutex in a different
     thread to the one that locked it results in an error. Unlocking a
     mutex that is not locked results in undefined behavior.
 
     \sa lock()
 */
-void QMutex::unlock() Q_DECL_NOTHROW
+void QMutex::unlock() noexcept
 {
     QMutexData *current;
     if (fastTryUnlock(current))
@@ -348,7 +363,7 @@ void QMutex::unlock() Q_DECL_NOTHROW
     Returns \c true if the mutex is recursive.
 */
 
-bool QBasicMutex::isRecursive() Q_DECL_NOTHROW
+bool QBasicMutex::isRecursive() noexcept
 {
     return QT_PREPEND_NAMESPACE(isRecursive)(d_ptr.loadAcquire());
 }
@@ -358,12 +373,64 @@ bool QBasicMutex::isRecursive() Q_DECL_NOTHROW
 
     Returns \c true if the mutex is recursive.
 */
-bool QBasicMutex::isRecursive() const Q_DECL_NOTHROW
+bool QBasicMutex::isRecursive() const noexcept
 {
     return QT_PREPEND_NAMESPACE(isRecursive)(d_ptr.loadAcquire());
 }
 
 /*!
+    \class QRecursiveMutex
+    \inmodule QtCore
+    \since 5.14
+    \brief The QRecursiveMutex class provides access serialization between threads.
+
+    \threadsafe
+
+    \ingroup thread
+
+    The QRecursiveMutex class is a mutex, like QMutex, with which it is
+    API-compatible. It differs from QMutex by accepting lock() calls from
+    the same thread any number of times. QMutex would deadlock in this situation.
+
+    QRecursiveMutex is much more expensive to construct and operate on, so
+    use a plain QMutex whenever you can. Sometimes, one public function,
+    however, calls another public function, and they both need to lock the
+    same mutex. In this case, you have two options:
+
+    \list
+    \li Factor the code that needs mutex protection into private functions,
+    which assume that the mutex is held when they are called, and lock a
+    plain QMutex in the public functions before you call the private
+    implementation ones.
+    \li Or use a recursive mutex, so it doesn't matter that the first public
+    function has already locked the mutex when the second one wishes to do so.
+    \endlist
+
+    \sa QMutex, QMutexLocker, QReadWriteLock, QSemaphore, QWaitCondition
+*/
+
+/*!
+    Constructs a new recursive mutex. The mutex is created in an unlocked state.
+
+    \sa lock(), unlock()
+*/
+QRecursiveMutex::QRecursiveMutex()
+    : QMutex()
+{
+    d_ptr.storeRelaxed(new QRecursiveMutexPrivate);
+}
+
+/*!
+    Destroys the mutex.
+
+    \warning Destroying a locked mutex may result in undefined behavior.
+*/
+QRecursiveMutex::~QRecursiveMutex()
+{
+    delete static_cast<QRecursiveMutexPrivate*>(d_ptr.fetchAndStoreAcquire(nullptr));
+}
+
+/*!
     \class QMutexLocker
     \inmodule QtCore
     \brief The QMutexLocker class is a convenience class that simplifies
@@ -427,6 +494,17 @@ bool QBasicMutex::isRecursive() const Q_DECL_NOTHROW
 */
 
 /*!
+    \fn QMutexLocker::QMutexLocker(QRecursiveMutex *mutex)
+    \since 5.14
+
+    Constructs a QMutexLocker and locks \a mutex. The mutex will be
+    unlocked (unlock() called) when the QMutexLocker is destroyed.
+    If \a mutex is \nullptr, QMutexLocker does nothing.
+
+    \sa QMutex::lock()
+*/
+
+/*!
     \fn QMutexLocker::~QMutexLocker()
 
     Destroys the QMutexLocker and unlocks the mutex that was locked
@@ -517,7 +595,7 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT
         }
 
         QMutexPrivate *d = static_cast<QMutexPrivate *>(copy);
-        if (timeout == 0 && !d->possiblyUnlocked.load())
+        if (timeout == 0 && !d->possiblyUnlocked.loadRelaxed())
             return false;
 
         // At this point we have a pointer to a QMutexPrivate. But the other thread
@@ -541,7 +619,7 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT
         // is set to the BigNumber magic value set in unlockInternal()
         int old_waiters;
         do {
-            old_waiters = d->waiters.load();
+            old_waiters = d->waiters.loadRelaxed();
             if (old_waiters == -QMutexPrivate::BigNumber) {
                 // we are unlocking, and the thread that unlocks is about to change d to 0
                 // we try to acquire the mutex by changing to dummyLocked()
@@ -550,7 +628,7 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT
                     d->deref();
                     return true;
                 } else {
-                    Q_ASSERT(d != d_ptr.load()); //else testAndSetAcquire should have succeeded
+                    Q_ASSERT(d != d_ptr.loadRelaxed()); //else testAndSetAcquire should have succeeded
                     // Mutex is likely to bo 0, we should continue the outer-loop,
                     //  set old_waiters to the magic value of BigNumber
                     old_waiters = QMutexPrivate::BigNumber;
@@ -563,7 +641,7 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT
             // The mutex was unlocked before we incremented waiters.
             if (old_waiters != QMutexPrivate::BigNumber) {
                 //we did not break the previous loop
-                Q_ASSERT(d->waiters.load() >= 1);
+                Q_ASSERT(d->waiters.loadRelaxed() >= 1);
                 d->waiters.deref();
             }
             d->deref();
@@ -572,11 +650,11 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT
 
         if (d->wait(timeout)) {
             // reset the possiblyUnlocked flag if needed (and deref its corresponding reference)
-            if (d->possiblyUnlocked.load() && d->possiblyUnlocked.testAndSetRelaxed(true, false))
+            if (d->possiblyUnlocked.loadRelaxed() && d->possiblyUnlocked.testAndSetRelaxed(true, false))
                 d->deref();
             d->derefWaiters(1);
             //we got the lock. (do not deref)
-            Q_ASSERT(d == d_ptr.load());
+            Q_ASSERT(d == d_ptr.loadRelaxed());
             return true;
         } else {
             Q_ASSERT(timeout >= 0);
@@ -593,14 +671,14 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT
             return false;
         }
     }
-    Q_ASSERT(d_ptr.load() != 0);
+    Q_ASSERT(d_ptr.loadRelaxed() != 0);
     return true;
 }
 
 /*!
     \internal
 */
-void QBasicMutex::unlockInternal() Q_DECL_NOTHROW
+void QBasicMutex::unlockInternal() noexcept
 {
     QMutexData *copy = d_ptr.loadAcquire();
     Q_ASSERT(copy); //we must be locked
@@ -618,7 +696,7 @@ void QBasicMutex::unlockInternal() Q_DECL_NOTHROW
         //there is no one waiting on this mutex anymore, set the mutex as unlocked (d = 0)
         if (d_ptr.testAndSetRelease(d, 0)) {
             // reset the possiblyUnlocked flag if needed (and deref its corresponding reference)
-            if (d->possiblyUnlocked.load() && d->possiblyUnlocked.testAndSetRelaxed(true, false))
+            if (d->possiblyUnlocked.loadRelaxed() && d->possiblyUnlocked.testAndSetRelaxed(true, false))
                 d->deref();
         }
         d->derefWaiters(0);
@@ -657,30 +735,30 @@ QMutexPrivate *QMutexPrivate::allocate()
     int i = freelist()->next();
     QMutexPrivate *d = &(*freelist())[i];
     d->id = i;
-    Q_ASSERT(d->refCount.load() == 0);
+    Q_ASSERT(d->refCount.loadRelaxed() == 0);
     Q_ASSERT(!d->recursive);
-    Q_ASSERT(!d->possiblyUnlocked.load());
-    Q_ASSERT(d->waiters.load() == 0);
-    d->refCount.store(1);
+    Q_ASSERT(!d->possiblyUnlocked.loadRelaxed());
+    Q_ASSERT(d->waiters.loadRelaxed() == 0);
+    d->refCount.storeRelaxed(1);
     return d;
 }
 
 void QMutexPrivate::release()
 {
     Q_ASSERT(!recursive);
-    Q_ASSERT(refCount.load() == 0);
-    Q_ASSERT(!possiblyUnlocked.load());
-    Q_ASSERT(waiters.load() == 0);
+    Q_ASSERT(refCount.loadRelaxed() == 0);
+    Q_ASSERT(!possiblyUnlocked.loadRelaxed());
+    Q_ASSERT(waiters.loadRelaxed() == 0);
     freelist()->release(id);
 }
 
 // atomically subtract "value" to the waiters, and remove the QMutexPrivate::BigNumber flag
-void QMutexPrivate::derefWaiters(int value) Q_DECL_NOTHROW
+void QMutexPrivate::derefWaiters(int value) noexcept
 {
     int old_waiters;
     int new_waiters;
     do {
-        old_waiters = waiters.load();
+        old_waiters = waiters.loadRelaxed();
         new_waiters = old_waiters;
         if (new_waiters < 0) {
             new_waiters += QMutexPrivate::BigNumber;
@@ -696,7 +774,7 @@ void QMutexPrivate::derefWaiters(int value) Q_DECL_NOTHROW
 inline bool QRecursiveMutexPrivate::lock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
 {
     Qt::HANDLE self = QThread::currentThreadId();
-    if (owner.load() == self) {
+    if (owner.loadRelaxed() == self) {
         ++count;
         Q_ASSERT_X(count != 0, "QMutex::lock", "Overflow in recursion counter");
         return true;
@@ -709,19 +787,19 @@ inline bool QRecursiveMutexPrivate::lock(int timeout) QT_MUTEX_LOCK_NOEXCEPT
     }
 
     if (success)
-        owner.store(self);
+        owner.storeRelaxed(self);
     return success;
 }
 
 /*!
    \internal
  */
-inline void QRecursiveMutexPrivate::unlock() Q_DECL_NOTHROW
+inline void QRecursiveMutexPrivate::unlock() noexcept
 {
     if (count > 0) {
         count--;
     } else {
-        owner.store(0);
+        owner.storeRelaxed(0);
         mutex.QBasicMutex::unlock();
     }
 }
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h
index 837355a602..c693ff65d8 100644
--- a/src/corelib/thread/qmutex.h
+++ b/src/corelib/thread/qmutex.h
@@ -57,11 +57,13 @@ QT_BEGIN_NAMESPACE
 #if QT_CONFIG(thread) || defined(Q_CLANG_QDOC)
 
 #ifdef Q_OS_LINUX
-# define QT_MUTEX_LOCK_NOEXCEPT Q_DECL_NOTHROW
+# define QT_MUTEX_LOCK_NOEXCEPT noexcept
 #else
 # define QT_MUTEX_LOCK_NOEXCEPT
 #endif
 
+class QMutex;
+class QRecursiveMutex;
 class QMutexData;
 
 class Q_CORE_EXPORT QBasicMutex
@@ -80,39 +82,39 @@ public:
     }
 
     // BasicLockable concept
-    inline void unlock() Q_DECL_NOTHROW {
-        Q_ASSERT(d_ptr.load()); //mutex must be locked
+    inline void unlock() noexcept {
+        Q_ASSERT(d_ptr.loadRelaxed()); //mutex must be locked
         if (!fastTryUnlock())
             unlockInternal();
     }
 
-    bool tryLock() Q_DECL_NOTHROW {
+    bool tryLock() noexcept {
         return fastTryLock();
     }
 
     // Lockable concept
-    bool try_lock() Q_DECL_NOTHROW { return tryLock(); }
+    bool try_lock() noexcept { return tryLock(); }
 
-    bool isRecursive() Q_DECL_NOTHROW; //### Qt6: remove me
-    bool isRecursive() const Q_DECL_NOTHROW;
+    bool isRecursive() noexcept; //### Qt6: remove me
+    bool isRecursive() const noexcept;
 
 private:
-    inline bool fastTryLock() Q_DECL_NOTHROW {
+    inline bool fastTryLock() noexcept {
         return d_ptr.testAndSetAcquire(nullptr, dummyLocked());
     }
-    inline bool fastTryUnlock() Q_DECL_NOTHROW {
+    inline bool fastTryUnlock() noexcept {
         return d_ptr.testAndSetRelease(dummyLocked(), nullptr);
     }
-    inline bool fastTryLock(QMutexData *&current) Q_DECL_NOTHROW {
+    inline bool fastTryLock(QMutexData *&current) noexcept {
         return d_ptr.testAndSetAcquire(nullptr, dummyLocked(), current);
     }
-    inline bool fastTryUnlock(QMutexData *&current) Q_DECL_NOTHROW {
+    inline bool fastTryUnlock(QMutexData *&current) noexcept {
         return d_ptr.testAndSetRelease(dummyLocked(), nullptr, current);
     }
 
     void lockInternal() QT_MUTEX_LOCK_NOEXCEPT;
     bool lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT;
-    void unlockInternal() Q_DECL_NOTHROW;
+    void unlockInternal() noexcept;
 
     QBasicAtomicPointer<QMutexData> d_ptr;
     static inline QMutexData *dummyLocked() {
@@ -120,21 +122,27 @@ private:
     }
 
     friend class QMutex;
+    friend class QRecursiveMutex;
     friend class QMutexData;
 };
 
 class Q_CORE_EXPORT QMutex : public QBasicMutex
 {
 public:
+#if defined(Q_COMPILER_CONSTEXPR)
+    constexpr QMutex() = default;
+#else
+    QMutex() { d_ptr.storeRelaxed(nullptr); }
+#endif
     enum RecursionMode { NonRecursive, Recursive };
-    explicit QMutex(RecursionMode mode = NonRecursive);
+    explicit QMutex(RecursionMode mode);
     ~QMutex();
 
     // BasicLockable concept
     void lock() QT_MUTEX_LOCK_NOEXCEPT;
     bool tryLock(int timeout = 0) QT_MUTEX_LOCK_NOEXCEPT;
     // BasicLockable concept
-    void unlock() Q_DECL_NOTHROW;
+    void unlock() noexcept;
 
     // Lockable concept
     bool try_lock() QT_MUTEX_LOCK_NOEXCEPT { return tryLock(); }
@@ -158,12 +166,13 @@ public:
     }
 #endif
 
-    bool isRecursive() const Q_DECL_NOTHROW
+    bool isRecursive() const noexcept
     { return QBasicMutex::isRecursive(); }
 
 private:
     Q_DISABLE_COPY(QMutex)
     friend class QMutexLocker;
+    friend class QRecursiveMutex;
     friend class ::tst_QMutex;
 
 #if QT_HAS_INCLUDE(<chrono>)
@@ -192,6 +201,24 @@ private:
 #endif
 };
 
+class QRecursiveMutex : private QMutex
+{
+    // ### Qt 6: make it independent of QMutex
+    friend class QMutexLocker;
+public:
+    Q_CORE_EXPORT QRecursiveMutex();
+    Q_CORE_EXPORT ~QRecursiveMutex();
+
+    using QMutex::lock;
+    using QMutex::tryLock;
+    using QMutex::unlock;
+    using QMutex::try_lock;
+#if QT_HAS_INCLUDE(<chrono>)
+    using QMutex::try_lock_for;
+    using QMutex::try_lock_until;
+#endif
+};
+
 class Q_CORE_EXPORT QMutexLocker
 {
 public:
@@ -207,12 +234,15 @@ public:
             val |= 1;
         }
     }
+    explicit QMutexLocker(QRecursiveMutex *m) QT_MUTEX_LOCK_NOEXCEPT
+        : QMutexLocker{static_cast<QBasicMutex*>(m)} {}
 #else
     QMutexLocker(QMutex *) { }
+    QMutexLocker(QRecursiveMutex *) {}
 #endif
     inline ~QMutexLocker() { unlock(); }
 
-    inline void unlock() Q_DECL_NOTHROW
+    inline void unlock() noexcept
     {
         if ((val & quintptr(1u)) == quintptr(1u)) {
             val &= ~quintptr(1u);
@@ -257,24 +287,24 @@ class Q_CORE_EXPORT QMutex
 public:
     enum RecursionMode { NonRecursive, Recursive };
 
-    inline Q_DECL_CONSTEXPR explicit QMutex(RecursionMode = NonRecursive) Q_DECL_NOTHROW { }
+    inline Q_DECL_CONSTEXPR explicit QMutex(RecursionMode = NonRecursive) noexcept { }
 
-    inline void lock() Q_DECL_NOTHROW {}
-    inline bool tryLock(int timeout = 0) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; }
-    inline bool try_lock() Q_DECL_NOTHROW { return true; }
-    inline void unlock() Q_DECL_NOTHROW {}
-    inline bool isRecursive() const Q_DECL_NOTHROW { return true; }
+    inline void lock() noexcept {}
+    inline bool tryLock(int timeout = 0) noexcept { Q_UNUSED(timeout); return true; }
+    inline bool try_lock() noexcept { return true; }
+    inline void unlock() noexcept {}
+    inline bool isRecursive() const noexcept { return true; }
 
 #if QT_HAS_INCLUDE(<chrono>)
     template <class Rep, class Period>
-    inline bool try_lock_for(std::chrono::duration<Rep, Period> duration) Q_DECL_NOTHROW
+    inline bool try_lock_for(std::chrono::duration<Rep, Period> duration) noexcept
     {
         Q_UNUSED(duration);
         return true;
     }
 
     template<class Clock, class Duration>
-    inline bool try_lock_until(std::chrono::time_point<Clock, Duration> timePoint) Q_DECL_NOTHROW
+    inline bool try_lock_until(std::chrono::time_point<Clock, Duration> timePoint) noexcept
     {
         Q_UNUSED(timePoint);
         return true;
@@ -285,15 +315,17 @@ private:
     Q_DISABLE_COPY(QMutex)
 };
 
+class QRecursiveMutex : public QMutex {};
+
 class Q_CORE_EXPORT QMutexLocker
 {
 public:
-    inline explicit QMutexLocker(QMutex *) Q_DECL_NOTHROW {}
-    inline ~QMutexLocker() Q_DECL_NOTHROW {}
+    inline explicit QMutexLocker(QMutex *) noexcept {}
+    inline ~QMutexLocker() noexcept {}
 
-    inline void unlock() Q_DECL_NOTHROW {}
-    void relock() Q_DECL_NOTHROW {}
-    inline QMutex *mutex() const Q_DECL_NOTHROW { return nullptr; }
+    inline void unlock() noexcept {}
+    void relock() noexcept {}
+    inline QMutex *mutex() const noexcept { return nullptr; }
 
 private:
     Q_DISABLE_COPY(QMutexLocker)
diff --git a/src/corelib/thread/qmutex_linux.cpp b/src/corelib/thread/qmutex_linux.cpp
index 507e72cb76..3270875471 100644
--- a/src/corelib/thread/qmutex_linux.cpp
+++ b/src/corelib/thread/qmutex_linux.cpp
@@ -106,7 +106,7 @@ static inline QMutexData *dummyFutexValue()
 }
 
 template <bool IsTimed> static inline
-bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -1, QElapsedTimer *elapsedTimer = 0) Q_DECL_NOTHROW
+bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -1, QElapsedTimer *elapsedTimer = 0) noexcept
 {
     if (!IsTimed)
         timeout = -1;
@@ -149,17 +149,17 @@ bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -
         }
     }
 
-    Q_ASSERT(d_ptr.load());
+    Q_ASSERT(d_ptr.loadRelaxed());
     return true;
 }
 
-void QBasicMutex::lockInternal() Q_DECL_NOTHROW
+void QBasicMutex::lockInternal() noexcept
 {
     Q_ASSERT(!isRecursive());
     lockInternal_helper<false>(d_ptr);
 }
 
-bool QBasicMutex::lockInternal(int timeout) Q_DECL_NOTHROW
+bool QBasicMutex::lockInternal(int timeout) noexcept
 {
     Q_ASSERT(!isRecursive());
     QElapsedTimer elapsedTimer;
@@ -167,9 +167,9 @@ bool QBasicMutex::lockInternal(int timeout) Q_DECL_NOTHROW
     return lockInternal_helper<true>(d_ptr, timeout, &elapsedTimer);
 }
 
-void QBasicMutex::unlockInternal() Q_DECL_NOTHROW
+void QBasicMutex::unlockInternal() noexcept
 {
-    QMutexData *d = d_ptr.load();
+    QMutexData *d = d_ptr.loadRelaxed();
     Q_ASSERT(d); //we must be locked
     Q_ASSERT(d != dummyLocked()); // testAndSetRelease(dummyLocked(), 0) failed
     Q_UNUSED(d);
diff --git a/src/corelib/thread/qmutex_mac.cpp b/src/corelib/thread/qmutex_mac.cpp
index 9a8d9bc750..923f89f697 100644
--- a/src/corelib/thread/qmutex_mac.cpp
+++ b/src/corelib/thread/qmutex_mac.cpp
@@ -79,7 +79,7 @@ bool QMutexPrivate::wait(int timeout)
     return (r == KERN_SUCCESS);
 }
 
-void QMutexPrivate::wakeUp() Q_DECL_NOTHROW
+void QMutexPrivate::wakeUp() noexcept
 {
     semaphore_signal(mach_semaphore);
 }
diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h
index ec9bfc1152..048d8707c4 100644
--- a/src/corelib/thread/qmutex_p.h
+++ b/src/corelib/thread/qmutex_p.h
@@ -92,28 +92,28 @@ public:
     QMutexPrivate();
 
     bool wait(int timeout = -1);
-    void wakeUp() Q_DECL_NOTHROW;
+    void wakeUp() noexcept;
 
     // Control the lifetime of the privates
     QAtomicInt refCount;
     int id;
 
     bool ref() {
-        Q_ASSERT(refCount.load() >= 0);
+        Q_ASSERT(refCount.loadRelaxed() >= 0);
         int c;
         do {
-            c = refCount.load();
+            c = refCount.loadRelaxed();
             if (c == 0)
                 return false;
         } while (!refCount.testAndSetRelaxed(c, c + 1));
-        Q_ASSERT(refCount.load() >= 0);
+        Q_ASSERT(refCount.loadRelaxed() >= 0);
         return true;
     }
     void deref() {
-        Q_ASSERT(refCount.load() >= 0);
+        Q_ASSERT(refCount.loadRelaxed() >= 0);
         if (!refCount.deref())
             release();
-        Q_ASSERT(refCount.load() >= 0);
+        Q_ASSERT(refCount.loadRelaxed() >= 0);
     }
     void release();
     static QMutexPrivate *allocate();
@@ -125,7 +125,7 @@ public:
                                     when the mutex is unlocked.
                                   */
     enum { BigNumber = 0x100000 }; //Must be bigger than the possible number of waiters (number of threads)
-    void derefWaiters(int value) Q_DECL_NOTHROW;
+    void derefWaiters(int value) noexcept;
 
     //platform specific stuff
 #if defined(Q_OS_MAC)
diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp
index 3ee24a292c..df2f606a23 100644
--- a/src/corelib/thread/qmutex_unix.cpp
+++ b/src/corelib/thread/qmutex_unix.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 static void report_error(int code, const char *where, const char *what)
 {
     if (code != 0)
-        qWarning("%s: %s failure: %s", where, what, qPrintable(qt_error_string(code)));
+        qErrnoWarning(code, "%s: %s failure", where, what);
 }
 
 #ifdef QT_UNIX_SEMAPHORE
@@ -99,7 +99,7 @@ bool QMutexPrivate::wait(int timeout)
     return true;
 }
 
-void QMutexPrivate::wakeUp() Q_DECL_NOTHROW
+void QMutexPrivate::wakeUp() noexcept
 {
     report_error(sem_post(&semaphore), "QMutex::unlock", "sem_post");
 }
@@ -146,7 +146,7 @@ bool QMutexPrivate::wait(int timeout)
     return ret;
 }
 
-void QMutexPrivate::wakeUp() Q_DECL_NOTHROW
+void QMutexPrivate::wakeUp() noexcept
 {
     report_error(pthread_mutex_lock(&mutex), "QMutex::unlock", "mutex lock");
     wakeup = true;
diff --git a/src/corelib/thread/qmutex_win.cpp b/src/corelib/thread/qmutex_win.cpp
index 3c314a4c0c..e221bc89cb 100644
--- a/src/corelib/thread/qmutex_win.cpp
+++ b/src/corelib/thread/qmutex_win.cpp
@@ -64,7 +64,7 @@ bool QMutexPrivate::wait(int timeout)
     return (WaitForSingleObjectEx(event, timeout < 0 ? INFINITE : timeout, FALSE) == WAIT_OBJECT_0);
 }
 
-void QMutexPrivate::wakeUp() Q_DECL_NOTHROW
+void QMutexPrivate::wakeUp() noexcept
 { SetEvent(event); }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp
deleted file mode 100644
index bb063b8ab6..0000000000
--- a/src/corelib/thread/qmutexpool.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qatomic.h"
-#include "qmutexpool_p.h"
-
-QT_BEGIN_NAMESPACE
-
-Q_GLOBAL_STATIC_WITH_ARGS(QMutexPool, globalMutexPool, (QMutex::Recursive))
-
-/*!
-    \class QMutexPool
-    \inmodule QtCore
-    \brief The QMutexPool class provides a pool of QMutex objects.
-
-    \internal
-
-    \ingroup thread
-
-    QMutexPool is a convenience class that provides access to a fixed
-    number of QMutex objects.
-
-    Typical use of a QMutexPool is in situations where it is not
-    possible or feasible to use one QMutex for every protected object.
-    The mutex pool will return a mutex based on the address of the
-    object that needs protection.
-
-    For example, consider this simple class:
-
-    \snippet code/src_corelib_thread_qmutexpool.cpp 0
-
-    Adding a QMutex member to the Number class does not make sense,
-    because it is so small. However, in order to ensure that access to
-    each Number is protected, you need to use a mutex. In this case, a
-    QMutexPool would be ideal.
-
-    Code to calculate the square of a number would then look something
-    like this:
-
-    \snippet code/src_corelib_thread_qmutexpool.cpp 1
-
-    This function will safely calculate the square of a number, since
-    it uses a mutex from a QMutexPool. The mutex is locked and
-    unlocked automatically by the QMutexLocker class. See the
-    QMutexLocker documentation for more details.
-*/
-
-/*!
-    Constructs  a QMutexPool, reserving space for \a size QMutexes. All
-    mutexes in the pool are created with \a recursionMode. By default,
-    all mutexes are non-recursive.
-
-    The QMutexes are created when needed, and deleted when the
-    QMutexPool is destructed.
-*/
-QMutexPool::QMutexPool(QMutex::RecursionMode recursionMode, int size)
-    : mutexes(size), recursionMode(recursionMode)
-{
-    for (int index = 0; index < mutexes.count(); ++index) {
-        mutexes[index].store(0);
-    }
-}
-
-/*!
-    Destructs a QMutexPool. All QMutexes that were created by the pool
-    are deleted.
-*/
-QMutexPool::~QMutexPool()
-{
-    for (int index = 0; index < mutexes.count(); ++index)
-        delete mutexes[index].loadAcquire();
-}
-
-/*!
-    Returns the global QMutexPool instance.
-*/
-QMutexPool *QMutexPool::instance()
-{
-    return globalMutexPool();
-}
-
-/*!
-    \fn QMutexPool::get(const void *address)
-    Returns a QMutex from the pool. QMutexPool uses the value \a address
-    to determine which mutex is returned from the pool.
-*/
-
-/*!
-    \internal
-  create the mutex for the given index
- */
-QMutex *QMutexPool::createMutex(int index)
-{
-    // mutex not created, create one
-    QMutex *newMutex = new QMutex(recursionMode);
-    if (!mutexes[index].testAndSetRelease(nullptr, newMutex)) {
-        delete newMutex;
-        return mutexes[index].loadAcquire();
-    } else {
-        return newMutex;
-    }
-}
-
-/*!
-    Returns a QMutex from the global mutex pool.
-*/
-QMutex *QMutexPool::globalInstanceGet(const void *address)
-{
-    QMutexPool * const globalInstance = globalMutexPool();
-    if (globalInstance == 0)
-        return 0;
-    return globalInstance->get(address);
-}
-
-QT_END_NAMESPACE
diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h
index ded102d32d..570c526225 100644
--- a/src/corelib/thread/qorderedmutexlocker_p.h
+++ b/src/corelib/thread/qorderedmutexlocker_p.h
@@ -58,6 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#if QT_CONFIG(thread)
+
 /*
   Locks 2 mutexes in a defined order, avoiding a recursive lock if
   we're trying to lock the same mutex twice.
@@ -65,9 +67,9 @@ QT_BEGIN_NAMESPACE
 class QOrderedMutexLocker
 {
 public:
-    QOrderedMutexLocker(QMutex *m1, QMutex *m2)
-        : mtx1((m1 == m2) ? m1 : (std::less<QMutex *>()(m1, m2) ? m1 : m2)),
-          mtx2((m1 == m2) ?  0 : (std::less<QMutex *>()(m1, m2) ? m2 : m1)),
+    QOrderedMutexLocker(QBasicMutex *m1, QBasicMutex *m2)
+        : mtx1((m1 == m2) ? m1 : (std::less<QBasicMutex *>()(m1, m2) ? m1 : m2)),
+          mtx2((m1 == m2) ?  0 : (std::less<QBasicMutex *>()(m1, m2) ? m2 : m1)),
           locked(false)
     {
         relock();
@@ -95,12 +97,12 @@ public:
         }
     }
 
-    static bool relock(QMutex *mtx1, QMutex *mtx2)
+    static bool relock(QBasicMutex *mtx1, QBasicMutex *mtx2)
     {
         // mtx1 is already locked, mtx2 not... do we need to unlock and relock?
         if (mtx1 == mtx2)
             return false;
-        if (std::less<QMutex *>()(mtx1, mtx2)) {
+        if (std::less<QBasicMutex *>()(mtx1, mtx2)) {
             mtx2->lock();
             return true;
         }
@@ -113,10 +115,58 @@ public:
     }
 
 private:
-    QMutex *mtx1, *mtx2;
+    QBasicMutex *mtx1, *mtx2;
     bool locked;
 };
 
+class QBasicMutexLocker
+{
+public:
+    inline explicit QBasicMutexLocker(QBasicMutex *m) QT_MUTEX_LOCK_NOEXCEPT
+        : m(m), isLocked(true)
+    {
+        m->lock();
+    }
+    inline ~QBasicMutexLocker() { if (isLocked) unlock(); }
+
+    inline void unlock() noexcept
+    {
+        isLocked = false;
+        m->unlock();
+    }
+
+    inline void relock() QT_MUTEX_LOCK_NOEXCEPT
+    {
+        isLocked = true;
+        m->lock();
+    }
+
+private:
+    Q_DISABLE_COPY(QBasicMutexLocker)
+
+    QBasicMutex *m;
+    bool isLocked;
+};
+
+#else
+
+class QOrderedMutexLocker
+{
+public:
+    QOrderedMutexLocker(QBasicMutex *, QBasicMutex *) {}
+    ~QOrderedMutexLocker() {}
+
+    void relock() {}
+    void unlock() {}
+
+    static bool relock(QBasicMutex *, QBasicMutex *) { return false; }
+};
+
+using QBasicMutexLocker = QMutexLocker;
+
+#endif
+
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index d7cf7a7284..14654986a0 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -48,6 +48,7 @@
 #include "qreadwritelock_p.h"
 #include "qelapsedtimer.h"
 #include "private/qfreelist_p.h"
+#include "private/qlocking_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -143,7 +144,7 @@ inline bool isUncontendedLocked(const QReadWriteLockPrivate *d)
 QReadWriteLock::QReadWriteLock(RecursionMode recursionMode)
     : d_ptr(recursionMode == Recursive ? new QReadWriteLockPrivate(true) : nullptr)
 {
-    Q_ASSERT_X(!(quintptr(d_ptr.load()) & StateMask), "QReadWriteLock::QReadWriteLock", "bad d_ptr alignment");
+    Q_ASSERT_X(!(quintptr(d_ptr.loadRelaxed()) & StateMask), "QReadWriteLock::QReadWriteLock", "bad d_ptr alignment");
 }
 
 /*!
@@ -154,7 +155,7 @@ QReadWriteLock::QReadWriteLock(RecursionMode recursionMode)
 */
 QReadWriteLock::~QReadWriteLock()
 {
-    auto d = d_ptr.load();
+    auto d = d_ptr.loadRelaxed();
     if (isUncontendedLocked(d)) {
         qWarning("QReadWriteLock: destroying locked QReadWriteLock");
         return;
@@ -262,8 +263,8 @@ bool QReadWriteLock::tryLockForRead(int timeout)
         if (d->recursive)
             return d->recursiveLockForRead(timeout);
 
-        QMutexLocker lock(&d->mutex);
-        if (d != d_ptr.load()) {
+        auto lock = qt_unique_lock(d->mutex);
+        if (d != d_ptr.loadRelaxed()) {
             // d_ptr has changed: this QReadWriteLock was unlocked before we had
             // time to lock d->mutex.
             // We are holding a lock to a mutex within a QReadWriteLockPrivate
@@ -369,8 +370,8 @@ bool QReadWriteLock::tryLockForWrite(int timeout)
         if (d->recursive)
             return d->recursiveLockForWrite(timeout);
 
-        QMutexLocker lock(&d->mutex);
-        if (d != d_ptr.load()) {
+        auto lock = qt_unique_lock(d->mutex);
+        if (d != d_ptr.loadRelaxed()) {
             // The mutex was unlocked before we had time to lock the mutex.
             // We are holding to a mutex within a QReadWriteLockPrivate that is already released
             // (or even is already re-used) but that's ok because the QFreeList never frees them.
@@ -418,7 +419,7 @@ void QReadWriteLock::unlock()
             return;
         }
 
-        QMutexLocker locker(&d->mutex);
+        const auto lock = qt_scoped_lock(d->mutex);
         if (d->writerCount) {
             Q_ASSERT(d->writerCount == 1);
             Q_ASSERT(d->readerCount == 0);
@@ -433,7 +434,7 @@ void QReadWriteLock::unlock()
         if (d->waitingReaders || d->waitingWriters) {
             d->unlock();
         } else {
-            Q_ASSERT(d_ptr.load() == d); // should not change when we still hold the mutex
+            Q_ASSERT(d_ptr.loadRelaxed() == d); // should not change when we still hold the mutex
             d_ptr.storeRelease(nullptr);
             d->release();
         }
@@ -444,7 +445,7 @@ void QReadWriteLock::unlock()
 /*! \internal  Helper for QWaitCondition::wait */
 QReadWriteLock::StateForWaitCondition QReadWriteLock::stateForWaitCondition() const
 {
-    QReadWriteLockPrivate *d = d_ptr.load();
+    QReadWriteLockPrivate *d = d_ptr.loadRelaxed();
     switch (quintptr(d) & StateMask) {
     case StateLockedForRead: return LockedForRead;
     case StateLockedForWrite: return LockedForWrite;
@@ -536,7 +537,7 @@ void QReadWriteLockPrivate::unlock()
 bool QReadWriteLockPrivate::recursiveLockForRead(int timeout)
 {
     Q_ASSERT(recursive);
-    QMutexLocker lock(&mutex);
+    auto lock = qt_unique_lock(mutex);
 
     Qt::HANDLE self = QThread::currentThreadId();
 
@@ -556,7 +557,7 @@ bool QReadWriteLockPrivate::recursiveLockForRead(int timeout)
 bool QReadWriteLockPrivate::recursiveLockForWrite(int timeout)
 {
     Q_ASSERT(recursive);
-    QMutexLocker lock(&mutex);
+    auto lock = qt_unique_lock(mutex);
 
     Qt::HANDLE self = QThread::currentThreadId();
     if (currentWriter == self) {
@@ -574,7 +575,7 @@ bool QReadWriteLockPrivate::recursiveLockForWrite(int timeout)
 void QReadWriteLockPrivate::recursiveUnlock()
 {
     Q_ASSERT(recursive);
-    QMutexLocker lock(&mutex);
+    auto lock = qt_unique_lock(mutex);
 
     Qt::HANDLE self = QThread::currentThreadId();
     if (self == currentWriter) {
diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h
index 65fa76fd6d..3c1ed91b94 100644
--- a/src/corelib/thread/qreadwritelock.h
+++ b/src/corelib/thread/qreadwritelock.h
@@ -180,18 +180,18 @@ class Q_CORE_EXPORT QReadWriteLock
 {
 public:
     enum RecursionMode { NonRecursive, Recursive };
-    inline explicit QReadWriteLock(RecursionMode = NonRecursive) Q_DECL_NOTHROW { }
+    inline explicit QReadWriteLock(RecursionMode = NonRecursive) noexcept { }
     inline ~QReadWriteLock() { }
 
-    static inline void lockForRead() Q_DECL_NOTHROW { }
-    static inline bool tryLockForRead() Q_DECL_NOTHROW { return true; }
-    static inline bool tryLockForRead(int timeout) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; }
+    void lockForRead() noexcept { }
+    bool tryLockForRead() noexcept { return true; }
+    bool tryLockForRead(int timeout) noexcept { Q_UNUSED(timeout); return true; }
 
-    static inline void lockForWrite() Q_DECL_NOTHROW { }
-    static inline bool tryLockForWrite() Q_DECL_NOTHROW { return true; }
-    static inline bool tryLockForWrite(int timeout) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; }
+    void lockForWrite() noexcept { }
+    bool tryLockForWrite() noexcept { return true; }
+    bool tryLockForWrite(int timeout) noexcept { Q_UNUSED(timeout); return true; }
 
-    static inline void unlock() Q_DECL_NOTHROW { }
+    void unlock() noexcept { }
 
 private:
     Q_DISABLE_COPY(QReadWriteLock)
@@ -200,12 +200,12 @@ private:
 class Q_CORE_EXPORT QReadLocker
 {
 public:
-    inline QReadLocker(QReadWriteLock *) Q_DECL_NOTHROW { }
-    inline ~QReadLocker() Q_DECL_NOTHROW { }
+    inline explicit QReadLocker(QReadWriteLock *) noexcept { }
+    inline ~QReadLocker() noexcept { }
 
-    static inline void unlock() Q_DECL_NOTHROW { }
-    static inline void relock() Q_DECL_NOTHROW { }
-    static inline QReadWriteLock *readWriteLock() Q_DECL_NOTHROW { return nullptr; }
+    void unlock() noexcept { }
+    void relock() noexcept { }
+    QReadWriteLock *readWriteLock() noexcept { return nullptr; }
 
 private:
     Q_DISABLE_COPY(QReadLocker)
@@ -214,12 +214,12 @@ private:
 class Q_CORE_EXPORT QWriteLocker
 {
 public:
-    inline explicit QWriteLocker(QReadWriteLock *) Q_DECL_NOTHROW { }
-    inline ~QWriteLocker() Q_DECL_NOTHROW { }
+    inline explicit QWriteLocker(QReadWriteLock *) noexcept { }
+    inline ~QWriteLocker() noexcept { }
 
-    static inline void unlock() Q_DECL_NOTHROW { }
-    static inline void relock() Q_DECL_NOTHROW { }
-    static inline QReadWriteLock *readWriteLock() Q_DECL_NOTHROW { return nullptr; }
+    void unlock() noexcept { }
+    void relock() noexcept { }
+    QReadWriteLock *readWriteLock() noexcept { return nullptr; }
 
 private:
     Q_DISABLE_COPY(QWriteLocker)
diff --git a/src/corelib/thread/qreadwritelock_p.h b/src/corelib/thread/qreadwritelock_p.h
index 31da2401c0..a4d002b7f2 100644
--- a/src/corelib/thread/qreadwritelock_p.h
+++ b/src/corelib/thread/qreadwritelock_p.h
@@ -63,17 +63,16 @@ QT_BEGIN_NAMESPACE
 class QReadWriteLockPrivate
 {
 public:
-    QReadWriteLockPrivate(bool isRecursive = false)
-        : readerCount(0), writerCount(0), waitingReaders(0), waitingWriters(0),
-        recursive(isRecursive), id(0), currentWriter(nullptr) {}
+    explicit QReadWriteLockPrivate(bool isRecursive = false)
+        : recursive(isRecursive) {}
 
     QMutex mutex;
     QWaitCondition writerCond;
     QWaitCondition readerCond;
-    int readerCount;
-    int writerCount;
-    int waitingReaders;
-    int waitingWriters;
+    int readerCount = 0;
+    int writerCount = 0;
+    int waitingReaders = 0;
+    int waitingWriters = 0;
     const bool recursive;
 
     //Called with the mutex locked
@@ -82,19 +81,18 @@ public:
     void unlock();
 
     //memory management
-    int id;
+    int id = 0;
     void release();
     static QReadWriteLockPrivate *allocate();
 
     // Recusive mutex handling
-    Qt::HANDLE currentWriter;
+    Qt::HANDLE currentWriter = {};
     QHash<Qt::HANDLE, int> currentReaders;
 
     // called with the mutex unlocked
     bool recursiveLockForWrite(int timeout);
     bool recursiveLockForRead(int timeout);
     void recursiveUnlock();
-
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h
index 1f29e8d187..7a65089396 100644
--- a/src/corelib/thread/qresultstore.h
+++ b/src/corelib/thread/qresultstore.h
@@ -142,7 +142,7 @@ public:
     template <typename T>
     int addResult(int index, const T *result)
     {
-        if (result == 0)
+        if (result == nullptr)
             return addResult(index, static_cast<void *>(nullptr));
         else
             return addResult(index, static_cast<void *>(new T(*result)));
@@ -158,7 +158,7 @@ public:
     int addResults(int index, const QVector<T> *results, int totalCount)
     {
         if (m_filterMode == true && results->count() != totalCount && 0 == results->count())
-            return addResults(index, 0, 0, totalCount);
+            return addResults(index, nullptr, 0, totalCount);
         else
             return addResults(index, new QVector<T>(*results), results->count(), totalCount);
     }
diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
index 2e0b6f2bc0..d4fb756b94 100644
--- a/src/corelib/thread/qsemaphore.cpp
+++ b/src/corelib/thread/qsemaphore.cpp
@@ -264,7 +264,7 @@ template <bool IsTimed> bool futexSemaphoreTryAcquire(QBasicAtomicInteger<quintp
 
     if (futexHasWaiterCount) {
         // decrement the number of threads waiting
-        Q_ASSERT(futexHigh32(&u)->load() & 0x7fffffffU);
+        Q_ASSERT(futexHigh32(&u)->loadRelaxed() & 0x7fffffffU);
         u.fetchAndSubRelaxed(oneWaiter);
     }
     return false;
@@ -293,7 +293,7 @@ QSemaphore::QSemaphore(int n)
         quintptr nn = unsigned(n);
         if (futexHasWaiterCount)
             nn |= quint64(nn) << 32;    // token count replicated in high word
-        u.store(nn);
+        u.storeRelaxed(nn);
     } else {
         d = new QSemaphorePrivate(n);
     }
@@ -425,7 +425,7 @@ void QSemaphore::release(int n)
 int QSemaphore::available() const
 {
     if (futexAvailable())
-        return futexAvailCounter(u.load());
+        return futexAvailCounter(u.loadRelaxed());
 
     QMutexLocker locker(&d->mutex);
     return d->avail;
diff --git a/src/corelib/thread/qsemaphore.h b/src/corelib/thread/qsemaphore.h
index b830ff1bfd..58c12997ad 100644
--- a/src/corelib/thread/qsemaphore.h
+++ b/src/corelib/thread/qsemaphore.h
@@ -75,14 +75,14 @@ class QSemaphoreReleaser
 {
 public:
     QSemaphoreReleaser() = default;
-    explicit QSemaphoreReleaser(QSemaphore &sem, int n = 1) Q_DECL_NOTHROW
+    explicit QSemaphoreReleaser(QSemaphore &sem, int n = 1) noexcept
         : m_sem(&sem), m_n(n) {}
-    explicit QSemaphoreReleaser(QSemaphore *sem, int n = 1) Q_DECL_NOTHROW
+    explicit QSemaphoreReleaser(QSemaphore *sem, int n = 1) noexcept
         : m_sem(sem), m_n(n) {}
-    QSemaphoreReleaser(QSemaphoreReleaser &&other) Q_DECL_NOTHROW
+    QSemaphoreReleaser(QSemaphoreReleaser &&other) noexcept
         : m_sem(other.m_sem), m_n(other.m_n)
     { other.m_sem = nullptr; }
-    QSemaphoreReleaser &operator=(QSemaphoreReleaser &&other) Q_DECL_NOTHROW
+    QSemaphoreReleaser &operator=(QSemaphoreReleaser &&other) noexcept
     { QSemaphoreReleaser moved(std::move(other)); swap(moved); return *this; }
 
     ~QSemaphoreReleaser()
@@ -91,16 +91,16 @@ public:
             m_sem->release(m_n);
     }
 
-    void swap(QSemaphoreReleaser &other) Q_DECL_NOTHROW
+    void swap(QSemaphoreReleaser &other) noexcept
     {
         qSwap(m_sem, other.m_sem);
         qSwap(m_n, other.m_n);
     }
 
-    QSemaphore *semaphore() const Q_DECL_NOTHROW
+    QSemaphore *semaphore() const noexcept
     { return m_sem; }
 
-    QSemaphore *cancel() Q_DECL_NOTHROW
+    QSemaphore *cancel() noexcept
     {
         QSemaphore *old = m_sem;
         m_sem = nullptr;
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 9f60de1f87..9fd1dd059d 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -65,7 +65,7 @@ QThreadData::QThreadData(int initialRefCount)
 
 QThreadData::~QThreadData()
 {
-    Q_ASSERT(_ref.load() == 0);
+    Q_ASSERT(_ref.loadRelaxed() == 0);
 
     // In the odd case that Qt is running on a secondary thread, the main
     // thread instance will have been dereffed asunder because of the deref in
@@ -73,8 +73,8 @@ QThreadData::~QThreadData()
     // crashing during QCoreApplicationData's global static cleanup we need to
     // safeguard the main thread here.. This fix is a bit crude, but it solves
     // the problem...
-    if (this->thread == QCoreApplicationPrivate::theMainThread) {
-       QCoreApplicationPrivate::theMainThread = 0;
+    if (this->thread.loadAcquire() == QCoreApplicationPrivate::theMainThread.loadAcquire()) {
+       QCoreApplicationPrivate::theMainThread.storeRelease(nullptr);
        QThreadData::clearCurrentThreadData();
     }
 
@@ -85,8 +85,8 @@ QThreadData::~QThreadData()
     // because this destructor is still running (the _ref sub-object has not
     // been destroyed) and there's no reentrancy. The refcount will become
     // negative, but that's acceptable.
-    QThread *t = thread;
-    thread = 0;
+    QThread *t = thread.loadAcquire();
+    thread.storeRelease(nullptr);
     delete t;
 
     for (int i = 0; i < postEventList.size(); ++i) {
@@ -105,7 +105,7 @@ void QThreadData::ref()
 {
 #if QT_CONFIG(thread)
     (void) _ref.ref();
-    Q_ASSERT(_ref.load() != 0);
+    Q_ASSERT(_ref.loadRelaxed() != 0);
 #endif
 }
 
@@ -171,6 +171,11 @@ QThreadPrivate::QThreadPrivate(QThreadData *d)
 // to 128K.
 #ifdef Q_OS_INTEGRITY
     stackSize = 128 * 1024;
+#elif defined(Q_OS_RTEMS)
+    static bool envStackSizeOk = false;
+    static const int envStackSize = qEnvironmentVariableIntValue("QT_DEFAULT_THREAD_STACK_SIZE", &envStackSizeOk);
+    if (envStackSizeOk)
+        stackSize = envStackSize;
 #endif
 
 #if defined (Q_OS_WIN)
@@ -393,7 +398,7 @@ QThread *QThread::currentThread()
 {
     QThreadData *data = QThreadData::current();
     Q_ASSERT(data != 0);
-    return data->thread;
+    return data->thread.loadAcquire();
 }
 
 /*!
@@ -839,17 +844,17 @@ bool QThread::event(QEvent* event)
     return QObject::event(event);
 }
 
-Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW
+Qt::HANDLE QThread::currentThreadId() noexcept
 {
     return Qt::HANDLE(currentThread());
 }
 
 QThread *QThread::currentThread()
 {
-    return QThreadData::current()->thread;
+    return QThreadData::current()->thread.loadAcquire();
 }
 
-int QThread::idealThreadCount() Q_DECL_NOTHROW
+int QThread::idealThreadCount() noexcept
 {
     return 1;
 }
@@ -878,11 +883,11 @@ QThreadData *QThreadData::current(bool createIfNecessary)
     if (!data && createIfNecessary) {
         data = new QThreadData;
         data->thread = new QAdoptedThread(data);
-        data->threadId.store(Qt::HANDLE(data->thread));
+        data->threadId.storeRelaxed(Qt::HANDLE(data->thread.loadAcquire()));
         data->deref();
         data->isAdopted = true;
-        if (!QCoreApplicationPrivate::theMainThread)
-            QCoreApplicationPrivate::theMainThread = data->thread.load();
+        if (!QCoreApplicationPrivate::theMainThread.loadAcquire())
+            QCoreApplicationPrivate::theMainThread.storeRelease(data->thread.loadRelaxed());
     }
     return data;
 }
@@ -925,7 +930,7 @@ QThreadPrivate::~QThreadPrivate()
 QAbstractEventDispatcher *QThread::eventDispatcher() const
 {
     Q_D(const QThread);
-    return d->data->eventDispatcher.load();
+    return d->data->eventDispatcher.loadRelaxed();
 }
 
 /*!
@@ -980,7 +985,7 @@ bool QThread::event(QEvent *event)
 
 void QThread::requestInterruption()
 {
-    if (this == QCoreApplicationPrivate::theMainThread) {
+    if (this == QCoreApplicationPrivate::theMainThread.loadAcquire()) {
         qWarning("QThread::requestInterruption has no effect on the main thread");
         return;
     }
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index b6c5bf47d0..c7a6dc8f1a 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -70,9 +70,9 @@ class Q_CORE_EXPORT QThread : public QObject
 {
     Q_OBJECT
 public:
-    static Qt::HANDLE currentThreadId() Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION;
+    static Qt::HANDLE currentThreadId() noexcept Q_DECL_PURE_FUNCTION;
     static QThread *currentThread();
-    static int idealThreadCount() Q_DECL_NOTHROW;
+    static int idealThreadCount() noexcept;
     static void yieldCurrentThread();
 
     explicit QThread(QObject *parent = nullptr);
@@ -209,7 +209,6 @@ struct Callable
     {
     }
 
-#if defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS)
     // Apply the same semantics of a lambda closure type w.r.t. the special
     // member functions, if possible: delete the copy assignment operator,
     // bring back all the others as per the RO5 (cf. §8.1.5.1/11 [expr.prim.lambda.closure])
@@ -218,7 +217,6 @@ struct Callable
     Callable(Callable &&) = default;
     Callable &operator=(const Callable &) = delete;
     Callable &operator=(Callable &&) = default;
-#endif
 
     void operator()()
     {
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index 57e6c995c5..b2d1628e6e 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -89,7 +89,7 @@ public:
     QEvent *event;
     int priority;
     inline QPostEvent()
-        : receiver(0), event(0), priority(0)
+        : receiver(nullptr), event(nullptr), priority(0)
     { }
     inline QPostEvent(QObject *r, QEvent *e, int p)
         : receiver(r), event(e), priority(p)
@@ -148,7 +148,7 @@ private:
 class Q_CORE_EXPORT QDaemonThread : public QThread
 {
 public:
-    QDaemonThread(QObject *parent = 0);
+    QDaemonThread(QObject *parent = nullptr);
     ~QDaemonThread();
 };
 
@@ -157,7 +157,7 @@ class QThreadPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QThread)
 
 public:
-    QThreadPrivate(QThreadData *d = 0);
+    QThreadPrivate(QThreadData *d = nullptr);
     ~QThreadPrivate();
 
     void setPriority(QThread::Priority prio);
@@ -187,8 +187,8 @@ public:
 #endif // Q_OS_UNIX
 
 #ifdef Q_OS_WIN
-    static unsigned int __stdcall start(void *) Q_DECL_NOEXCEPT;
-    static void finish(void *, bool lockAnyway=true) Q_DECL_NOEXCEPT;
+    static unsigned int __stdcall start(void *) noexcept;
+    static void finish(void *, bool lockAnyway=true) noexcept;
 
     Qt::HANDLE handle;
     unsigned int id;
@@ -251,17 +251,17 @@ public:
 #endif
     static void clearCurrentThreadData();
     static QThreadData *get2(QThread *thread)
-    { Q_ASSERT_X(thread != 0, "QThread", "internal error"); return thread->d_func()->data; }
+    { Q_ASSERT_X(thread != nullptr, "QThread", "internal error"); return thread->d_func()->data; }
 
 
     void ref();
     void deref();
     inline bool hasEventDispatcher() const
-    { return eventDispatcher.load() != nullptr; }
+    { return eventDispatcher.loadRelaxed() != nullptr; }
     QAbstractEventDispatcher *createEventDispatcher();
     QAbstractEventDispatcher *ensureEventDispatcher()
     {
-        QAbstractEventDispatcher *ed = eventDispatcher.load();
+        QAbstractEventDispatcher *ed = eventDispatcher.loadRelaxed();
         if (Q_LIKELY(ed))
             return ed;
         return createEventDispatcher();
@@ -284,7 +284,7 @@ public:
 
     public:
         FlaggedDebugSignatures() : idx(0)
-        { std::fill_n(locations, Count, static_cast<char*>(0)); }
+        { std::fill_n(locations, Count, static_cast<char*>(nullptr)); }
 
         void store(const char* method)
         { locations[idx++ % Count] = method; }
@@ -331,7 +331,7 @@ class QAdoptedThread : public QThread
     Q_DECLARE_PRIVATE(QThread)
 
 public:
-    QAdoptedThread(QThreadData *data = 0);
+    QAdoptedThread(QThreadData *data = nullptr);
     ~QAdoptedThread();
     void init();
 
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 710528ea41..cb3c0d6bb1 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -108,17 +108,8 @@ Q_STATIC_ASSERT(sizeof(pthread_t) <= sizeof(Qt::HANDLE));
 
 enum { ThreadPriorityResetFlag = 0x80000000 };
 
-#if defined(Q_OS_LINUX) && defined(__GLIBC__) && (defined(Q_CC_GNU) || defined(Q_CC_INTEL)) && !defined(QT_LINUXBASE)
-/* LSB doesn't have __thread, https://lsbbugs.linuxfoundation.org/show_bug.cgi?id=993 */
-#define HAVE_TLS
-#endif
-#if defined(Q_CC_XLC) || defined (Q_CC_SUN)
-#define HAVE_TLS
-#endif
 
-#ifdef HAVE_TLS
-static __thread QThreadData *currentThreadData = 0;
-#endif
+static thread_local QThreadData *currentThreadData = 0;
 
 static pthread_once_t current_thread_data_once = PTHREAD_ONCE_INIT;
 static pthread_key_t current_thread_data_key;
@@ -138,7 +129,7 @@ static void destroy_current_thread_data(void *p)
     pthread_setspecific(current_thread_data_key, p);
     QThreadData *data = static_cast<QThreadData *>(p);
     if (data->isAdopted) {
-        QThread *thread = data->thread;
+        QThread *thread = data->thread.loadAcquire();
         Q_ASSERT(thread);
         QThreadPrivate *thread_p = static_cast<QThreadPrivate *>(QObjectPrivate::get(thread));
         Q_ASSERT(!thread_p->finished);
@@ -179,28 +170,19 @@ Q_DESTRUCTOR_FUNCTION(destroy_current_thread_data_key)
 // Utility functions for getting, setting and clearing thread specific data.
 static QThreadData *get_thread_data()
 {
-#ifdef HAVE_TLS
     return currentThreadData;
-#else
-    pthread_once(&current_thread_data_once, create_current_thread_data_key);
-    return reinterpret_cast<QThreadData *>(pthread_getspecific(current_thread_data_key));
-#endif
 }
 
 static void set_thread_data(QThreadData *data)
 {
-#ifdef HAVE_TLS
     currentThreadData = data;
-#endif
     pthread_once(&current_thread_data_once, create_current_thread_data_key);
     pthread_setspecific(current_thread_data_key, data);
 }
 
 static void clear_thread_data()
 {
-#ifdef HAVE_TLS
     currentThreadData = 0;
-#endif
     pthread_setspecific(current_thread_data_key, 0);
 }
 
@@ -249,9 +231,9 @@ QThreadData *QThreadData::current(bool createIfNecessary)
         }
         data->deref();
         data->isAdopted = true;
-        data->threadId.store(to_HANDLE(pthread_self()));
-        if (!QCoreApplicationPrivate::theMainThread)
-            QCoreApplicationPrivate::theMainThread = data->thread.load();
+        data->threadId.storeRelaxed(to_HANDLE(pthread_self()));
+        if (!QCoreApplicationPrivate::theMainThread.loadAcquire())
+            QCoreApplicationPrivate::theMainThread.storeRelease(data->thread.loadRelaxed());
     }
     return data;
 }
@@ -282,7 +264,7 @@ QAbstractEventDispatcher *QThreadPrivate::createEventDispatcher(QThreadData *dat
     else
         return new QEventDispatcherUNIX;
 #elif !defined(QT_NO_GLIB)
-    const bool isQtMainThread = data->thread == QCoreApplicationPrivate::mainThread();
+    const bool isQtMainThread = data->thread.loadAcquire() == QCoreApplicationPrivate::mainThread();
     if (qEnvironmentVariableIsEmpty("QT_NO_GLIB")
         && (isQtMainThread || qEnvironmentVariableIsEmpty("QT_NO_THREADED_GLIB"))
         && QEventDispatcherGlib::versionSupported())
@@ -331,7 +313,7 @@ void *QThreadPrivate::start(void *arg)
                 thr->d_func()->setPriority(QThread::Priority(thr->d_func()->priority & ~ThreadPriorityResetFlag));
             }
 
-            data->threadId.store(to_HANDLE(pthread_self()));
+            data->threadId.storeRelaxed(to_HANDLE(pthread_self()));
             set_thread_data(data);
 
             data->ref();
@@ -401,7 +383,7 @@ void QThreadPrivate::finish(void *arg)
         QThreadStorageData::finish((void **)data);
         locker.relock();
 
-        QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher.load();
+        QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher.loadRelaxed();
         if (eventDispatcher) {
             d->data->eventDispatcher = 0;
             locker.unlock();
@@ -439,7 +421,7 @@ void QThreadPrivate::finish(void *arg)
  ** QThread
  *************************************************************************/
 
-Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW
+Qt::HANDLE QThread::currentThreadId() noexcept
 {
     // requires a C cast here otherwise we run into trouble on AIX
     return to_HANDLE(pthread_self());
@@ -454,7 +436,7 @@ Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW
 int QThreadPrivate::idealThreadCount = 1;
 #endif
 
-int QThread::idealThreadCount() Q_DECL_NOTHROW
+int QThread::idealThreadCount() noexcept
 {
     int cores = 1;
 
@@ -714,8 +696,7 @@ void QThread::start(Priority priority)
 #endif // _POSIX_THREAD_ATTR_STACKSIZE
 
         if (code) {
-            qWarning("QThread::start: Thread stack size error: %s",
-                     qPrintable(qt_error_string(code)));
+            qErrnoWarning(code, "QThread::start: Thread stack size error");
 
             // we failed to set the stacksize, and as the documentation states,
             // the thread will fail to run...
@@ -741,16 +722,16 @@ void QThread::start(Priority priority)
 #endif
         code = pthread_create(&threadId, &attr, QThreadPrivate::start, this);
     }
-    d->data->threadId.store(to_HANDLE(threadId));
+    d->data->threadId.storeRelaxed(to_HANDLE(threadId));
 
     pthread_attr_destroy(&attr);
 
     if (code) {
-        qWarning("QThread::start: Thread creation error: %s", qPrintable(qt_error_string(code)));
+        qErrnoWarning(code, "QThread::start: Thread creation error");
 
         d->running = false;
         d->finished = false;
-        d->data->threadId.store(nullptr);
+        d->data->threadId.storeRelaxed(nullptr);
     }
 }
 
@@ -760,13 +741,12 @@ void QThread::terminate()
     Q_D(QThread);
     QMutexLocker locker(&d->mutex);
 
-    if (!d->data->threadId.load())
+    if (!d->data->threadId.loadRelaxed())
         return;
 
-    int code = pthread_cancel(from_HANDLE<pthread_t>(d->data->threadId.load()));
+    int code = pthread_cancel(from_HANDLE<pthread_t>(d->data->threadId.loadRelaxed()));
     if (code) {
-        qWarning("QThread::start: Thread termination error: %s",
-                 qPrintable(qt_error_string((code))));
+        qErrnoWarning(code, "QThread::start: Thread termination error");
     }
 #endif
 }
@@ -776,7 +756,7 @@ bool QThread::wait(unsigned long time)
     Q_D(QThread);
     QMutexLocker locker(&d->mutex);
 
-    if (from_HANDLE<pthread_t>(d->data->threadId.load()) == pthread_self()) {
+    if (from_HANDLE<pthread_t>(d->data->threadId.loadRelaxed()) == pthread_self()) {
         qWarning("QThread::wait: Thread tried to wait on itself");
         return false;
     }
@@ -818,7 +798,7 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority)
     int sched_policy;
     sched_param param;
 
-    if (pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.load()), &sched_policy, &param) != 0) {
+    if (pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.loadRelaxed()), &sched_policy, &param) != 0) {
         // failed to get the scheduling policy, don't bother setting
         // the priority
         qWarning("QThread::setPriority: Cannot get scheduler parameters");
@@ -834,15 +814,15 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority)
     }
 
     param.sched_priority = prio;
-    int status = pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.load()), sched_policy, &param);
+    int status = pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.loadRelaxed()), sched_policy, &param);
 
 # ifdef SCHED_IDLE
     // were we trying to set to idle priority and failed?
     if (status == -1 && sched_policy == SCHED_IDLE && errno == EINVAL) {
         // reset to lowest priority possible
-        pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.load()), &sched_policy, &param);
+        pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.loadRelaxed()), &sched_policy, &param);
         param.sched_priority = sched_get_priority_min(sched_policy);
-        pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.load()), sched_policy, &param);
+        pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.loadRelaxed()), sched_policy, &param);
     }
 # else
     Q_UNUSED(status);
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 5c7642c26e..a72df2fc40 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -140,11 +140,11 @@ QThreadData *QThreadData::current(bool createIfNecessary)
         }
         threadData->deref();
         threadData->isAdopted = true;
-        threadData->threadId.store(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())));
+        threadData->threadId.storeRelaxed(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())));
 
 #ifndef Q_OS_WINRT
         if (!QCoreApplicationPrivate::theMainThread) {
-            QCoreApplicationPrivate::theMainThread = threadData->thread.load();
+            QCoreApplicationPrivate::theMainThread = threadData->thread.loadRelaxed();
         } else {
 #else
         // for winrt the main thread is set explicitly in QCoreApplication's constructor as the
@@ -186,9 +186,9 @@ void QThreadData::setMainThread()
         }
         threadData->deref();
         threadData->isAdopted = true;
-        threadData->threadId.store(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())));
+        threadData->threadId.storeRelaxed(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())));
     }
-    QCoreApplicationPrivate::theMainThread = threadData->thread.load();
+    QCoreApplicationPrivate::theMainThread = threadData->thread.loadRelaxed();
 }
 #endif
 
@@ -374,14 +374,14 @@ QAbstractEventDispatcher *QThreadPrivate::createEventDispatcher(QThreadData *dat
 
 #if QT_CONFIG(thread)
 
-unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(void *arg) Q_DECL_NOEXCEPT
+unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(void *arg) noexcept
 {
     QThread *thr = reinterpret_cast<QThread *>(arg);
     QThreadData *data = QThreadData::get2(thr);
 
     qt_create_tls();
     TlsSetValue(qt_current_thread_data_tls_index, data);
-    data->threadId.store(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())));
+    data->threadId.storeRelaxed(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())));
 
     QThread::setTerminationEnabled(false);
 
@@ -408,7 +408,7 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi
     return 0;
 }
 
-void QThreadPrivate::finish(void *arg, bool lockAnyway) Q_DECL_NOEXCEPT
+void QThreadPrivate::finish(void *arg, bool lockAnyway) noexcept
 {
     QThread *thr = reinterpret_cast<QThread *>(arg);
     QThreadPrivate *d = thr->d_func();
@@ -423,7 +423,7 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway) Q_DECL_NOEXCEPT
     QThreadStorageData::finish(tls_data);
     locker.relock();
 
-    QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher.load();
+    QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher.loadRelaxed();
     if (eventDispatcher) {
         d->data->eventDispatcher = 0;
         locker.unlock();
@@ -449,12 +449,12 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway) Q_DECL_NOEXCEPT
  ** QThread
  *************************************************************************/
 
-Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW
+Qt::HANDLE QThread::currentThreadId() noexcept
 {
     return reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()));
 }
 
-int QThread::idealThreadCount() Q_DECL_NOTHROW
+int QThread::idealThreadCount() noexcept
 {
     SYSTEM_INFO sysinfo;
 #ifndef Q_OS_WINRT
diff --git a/src/corelib/thread/qthreadpool_p.h b/src/corelib/thread/qthreadpool_p.h
index 952e02ef20..01852d8366 100644
--- a/src/corelib/thread/qthreadpool_p.h
+++ b/src/corelib/thread/qthreadpool_p.h
@@ -162,7 +162,7 @@ public:
     void tryToStartMoreThreads();
     bool tooManyThreadsActive() const;
 
-    void startThread(QRunnable *runnable = 0);
+    void startThread(QRunnable *runnable = nullptr);
     void reset();
     bool waitForDone(int msecs);
     bool waitForDone(const QDeadlineTimer &timer);
diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp
index 8b82118a5c..fdc484d2d2 100644
--- a/src/corelib/thread/qthreadstorage.cpp
+++ b/src/corelib/thread/qthreadstorage.cpp
@@ -126,7 +126,7 @@ void **QThreadStorageData::get() const
     DEBUG_MSG("QThreadStorageData: Returning storage %d, data %p, for thread %p",
           id,
           *v,
-          data->thread.load());
+          data->thread.loadRelaxed());
 
     return *v ? v : 0;
 }
@@ -148,7 +148,7 @@ void **QThreadStorageData::set(void *p)
         DEBUG_MSG("QThreadStorageData: Deleting previous storage %d, data %p, for thread %p",
                 id,
                 value,
-                data->thread.load());
+                data->thread.loadRelaxed());
 
         QMutexLocker locker(&destructorsMutex);
         DestructorMap *destr = destructors();
@@ -164,7 +164,7 @@ void **QThreadStorageData::set(void *p)
 
     // store new data
     value = p;
-    DEBUG_MSG("QThreadStorageData: Set storage %d for thread %p to %p", id, data->thread.load(), p);
+    DEBUG_MSG("QThreadStorageData: Set storage %d for thread %p to %p", id, data->thread.loadRelaxed(), p);
     return &value;
 }
 
diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h
index 55fc482da3..9eb8672e92 100644
--- a/src/corelib/thread/qthreadstorage.h
+++ b/src/corelib/thread/qthreadstorage.h
@@ -69,7 +69,7 @@ inline
 T *&qThreadStorage_localData(QThreadStorageData &d, T **)
 {
     void **v = d.get();
-    if (!v) v = d.set(0);
+    if (!v) v = d.set(nullptr);
     return *(reinterpret_cast<T**>(v));
 }
 
@@ -139,7 +139,7 @@ public:
     inline ~QThreadStorage() { }
 
     inline bool hasLocalData() const
-    { return d.get() != 0; }
+    { return d.get() != nullptr; }
 
     inline T& localData()
     { return qThreadStorage_localData(d, reinterpret_cast<T*>(0)); }
diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp
index 0ba90763cf..dd7475cec5 100644
--- a/src/corelib/thread/qwaitcondition_unix.cpp
+++ b/src/corelib/thread/qwaitcondition_unix.cpp
@@ -72,7 +72,7 @@ __attribute__((weakref("__pthread_cond_timedwait_relative")));
 static void report_error(int code, const char *where, const char *what)
 {
     if (code != 0)
-        qWarning("%s: %s failure: %s", where, what, qPrintable(qt_error_string(code)));
+        qErrnoWarning(code, "%s: %s failure", where, what);
 }
 
 void qt_initialize_pthread_cond(pthread_cond_t *cond, const char *where)
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
index 22f0de0523..9fc9af0e65 100644
--- a/src/corelib/thread/thread.pri
+++ b/src/corelib/thread/thread.pri
@@ -28,7 +28,7 @@ qtConfig(thread) {
         thread/qbasicatomic.h \
         thread/qfutex_p.h \
         thread/qgenericatomic.h \
-        thread/qmutexpool_p.h \
+        thread/qlocking_p.h \
         thread/qmutex_p.h \
         thread/qorderedmutexlocker_p.h \
         thread/qreadwritelock_p.h \
@@ -40,7 +40,6 @@ qtConfig(thread) {
     SOURCES += \
        thread/qatomic.cpp \
        thread/qmutex.cpp \
-       thread/qmutexpool.cpp \
        thread/qreadwritelock.cpp \
        thread/qsemaphore.cpp \
        thread/qthreadpool.cpp \
diff --git a/src/corelib/time/qcalendar.cpp b/src/corelib/time/qcalendar.cpp
new file mode 100644
index 0000000000..d308aeba2b
--- /dev/null
+++ b/src/corelib/time/qcalendar.cpp
@@ -0,0 +1,1109 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "qcalendar.h"
+#include "qcalendarbackend_p.h"
+#include "qgregoriancalendar_p.h"
+#ifndef QT_BOOTSTRAPPED
+#include "qjuliancalendar_p.h"
+#include "qmilankoviccalendar_p.h"
+#endif
+#if QT_CONFIG(jalalicalendar)
+#include "qjalalicalendar_p.h"
+#endif
+#if QT_CONFIG(islamiccivilcalendar)
+#include "qislamiccivilcalendar_p.h"
+#endif
+
+#include "qdatetime.h"
+#include "qcalendarmath_p.h"
+#include <qhash.h>
+#include <qdebug.h>
+
+#include <unordered_map>
+
+QT_BEGIN_NAMESPACE
+
+namespace {
+
+struct CalendarName : public QString
+{
+    CalendarName(const QString &name) : QString(name) {}
+};
+
+inline bool operator==(const CalendarName &u, const CalendarName &v)
+{
+    return u.compare(v, Qt::CaseInsensitive) == 0;
+}
+
+inline uint qHash(const CalendarName &key, uint seed = 0) noexcept
+{
+    return qHash(key.toLower(), seed);
+}
+
+struct Registry {
+    std::vector<QCalendarBackend *> byId;
+    QHash<CalendarName, QCalendarBackend *> byName;
+    QCalendarBackend *gregorianCalendar = nullptr;
+    bool populated = false;
+
+    Registry()
+    {
+        byId.resize(int(QCalendar::System::Last) + 1);
+    }
+
+    ~Registry()
+    {
+        qDeleteAll(byId);
+    }
+
+    bool registerName(QCalendarBackend *calendar, const QString &name)
+    {
+        if (byName.find(name) != byName.end()) {
+            qWarning() << "Calendar name" << name
+                       << "is already taken, new calendar will not be registered.";
+            return false;
+        }
+        byName.insert(name, calendar);
+        return true;
+    }
+    void addCalendar(QCalendarBackend *calendar, const QString &name, QCalendar::System id)
+    {
+        if (!registerName(calendar, name))
+            return;
+        Q_ASSERT(byId.size() >= size_t(id));
+        if (id == QCalendar::System::User) {
+            byId.push_back(calendar);
+        } else {
+            Q_ASSERT(byId.at(size_t(id)) == nullptr);
+            byId[size_t(id)] = calendar;
+        }
+        if (id == QCalendar::System::Gregorian) {
+            Q_ASSERT(!gregorianCalendar);
+            gregorianCalendar = calendar;
+        }
+    }
+    /*
+        \internal
+        Ensures each enum-available calendar has been instantiated.
+
+        This arranges for each to register itself by name; it only does anything on
+        its first call, which ensures that name-based lookups can always find all
+        the calendars available via the enum.
+    */
+    void populate()
+    {
+        if (populated)
+            return;
+
+        for (int i = 0; i <= int(QCalendar::System::Last); ++i)
+            (void)QCalendar(QCalendar::System(i));
+    }
+};
+
+}
+
+Q_GLOBAL_STATIC(Registry, calendarRegistry);
+
+
+/*!
+    \since 5.14
+
+    \class QCalendarBackend
+    \inmodule QtCore
+    \internal
+    \reentrant
+    \brief The QCalendarBackend class provides basic calendaring functions.
+
+    QCalendarBackend provides the base class on which all calendar types are
+    implemented. On construction, the backend is registered with its primary
+    name.
+
+    A backend may also be registered with aliases, where the calendar is known
+    by several names. Registering with the name used by CLDR (the Unicode
+    consortium's Common Locale Data Repository) is recommended, particularly
+    when interacting with third-party software. Once a backend is registered for
+    a name, QCalendar can be constructed using that name to select the backend.
+
+    Each calendar backend must inherit from QCalendarBackend and implement its
+    pure virtual methods. It may also override some other virtual methods, as
+    needed.
+
+    Most backends are pure code, with no data elements. Such backends should
+    normally be implemented as singletons. For a backend to be added to the
+    QCalendar::System enum, it should be such a singleton, with a case in
+    QCalendar::fromEnum()'s switch statement to instantiate it.
+
+    Non-singleton calendar backends should ensure that each instance is created
+    with a distinct primary name. Later instances attempting to register with a
+    name already in use shall fail to register and be unavailable to QCalendar,
+    hence unusable.
+
+    \sa registerAlias(), QDate, QDateTime, QDateEdit, QDateTimeEdit, QCalendarWidget
+*/
+
+/*!
+    Constructs the calendar and registers it under \a name using \a id.
+*/
+QCalendarBackend::QCalendarBackend(const QString &name, QCalendar::System id)
+{
+    calendarRegistry->addCalendar(this, name, id);
+}
+
+/*!
+    Destroys the calendar.
+
+    Never call this from user code. Each calendar backend, once instantiated,
+    shall exist for the lifetime of the program. Its destruction is taken care
+    of by destruction of the registry of calendar backends and their names.
+*/
+QCalendarBackend::~QCalendarBackend()
+{
+}
+
+/*!
+    The calendar system of this calendar.
+
+    Each calendar backend constructible from the QCalendar::System enum should
+    return the member of that enum that produces it. Other calendars should
+    return User.
+
+    \sa QCalendarBackend::fromEnum()
+*/
+QCalendar::System QCalendarBackend::calendarSystem() const
+{
+    return QCalendar::System::User;
+}
+
+/*!
+    The primary name of this calendar.
+ */
+QString QCalendar::name() const
+{
+    return d ? d->name() : QString();
+}
+
+// date queries
+/*!
+   \fn int QCalendarBackend::daysInMonth(int month, int year) const
+
+   Returns number of days in the month number \a month, in year \a year.
+
+   An implementation should return 0 if the given year had no such month. If
+   year is QCalendar::Unspecified, return the usual number of days for the
+   month, in those years that include it.
+
+   Calendars with intercallary days may represent these as extra days of the
+   preceding month, or as short months separate from the usual ones. In the
+   former case, daysInMonth(month, year) should be the number of ordinary days
+   in the month, although \c{isDateValid(year, month, day)} might return \c true
+   for some larger values of \c day.
+
+   \sa daysInYear(), monthsInYear(), minimumDaysInMonth(), maximumDaysInMonth()
+*/
+
+// properties of the calendar
+
+/*!
+    \fn bool QCalendarBackend::isLeapYear(int year) const
+
+    Returns \c true if the specified \a year is a leap year for this calendar.
+
+    \sa daysInYear(), isDateValid()
+*/
+
+/*!
+    \fn bool QCalendarBackend::isLunar() const
+
+    Returns \c true if this calendar is a lunar calendar. Otherwise returns \c
+    false.
+
+    A lunar calendar is a calendar based upon the monthly cycles of the Moon's
+    phases (synodic months). This contrasts with solar calendars, whose annual
+    cycles are based only upon the solar year.
+
+    \sa isLuniSolar(), isSolar(), isProleptic()
+*/
+
+/*!
+    \fn bool QCalendarBackend::isLuniSolar() const
+
+    Returns \c true if this calendar is a lunisolar calendar. Otherwise returns
+    \c false.
+
+    A lunisolar calendar is a calendar whose date indicates both the moon phase
+    and the time of the solar year.
+
+    \sa isLunar(), isSolar(), isProleptic()
+*/
+
+/*!
+    \fn bool QCalendarBackend::isSolar() const
+
+    Returns \c true if this calendar is a solar calendar. Otherwise returns
+    \c false.
+
+    A solar calendar is a calendar whose dates indicate the season or almost
+    equivalently the apparent position of the sun relative to the fixed stars.
+    The Gregorian calendar, widely accepted as standard in the world,
+    is an example of solar calendar.
+
+    \sa isLuniSolar(), isLunar(), isProleptic()
+*/
+
+/*!
+    Returns the total number of days in the year number \a year.
+    Returns zero if there is no such year in this calendar.
+
+    This base implementation returns 366 for leap years and 365 for ordinary
+    years.
+
+    \sa monthsInYear(), daysInMonth(), isLeapYear()
+*/
+int QCalendarBackend::daysInYear(int year) const
+{
+    return monthsInYear(year) ? isLeapYear(year) ? 366 : 365 : 0;
+}
+
+/*!
+    Returns the total number of months in the year number \a year.
+    Returns zero if there is no such year in this calendar.
+
+    This base implementation returns 12 for any valid year.
+
+    \sa daysInYear(), maximumMonthsInYear(), isDateValid()
+*/
+int QCalendarBackend::monthsInYear(int year) const
+{
+    return year > 0 || (year < 0 ? isProleptic() : hasYearZero()) ? 12 : 0;
+}
+
+/*!
+    Returns \c true if the date specified by \a year, \a month, and \a day is
+    valid for this calendar; otherwise returns \c false. For example,
+    the date 2018-04-19 is valid for the Gregorian calendar, but 2018-16-19 and
+    2018-04-38 are invalid.
+
+    Calendars with intercallary days may represent these as extra days of the
+    preceding month or as short months separate from the usual ones. In the
+    former case, a \a day value greater than \c{daysInMonth(\a{month},
+    \a{year})} may be valid.
+
+    \sa daysInMonth(), monthsInYear()
+*/
+bool QCalendarBackend::isDateValid(int year, int month, int day) const
+{
+    return day > 0 && day <= daysInMonth(month, year);
+}
+
+/*!
+    Returns \c true if this calendar is a proleptic calendar. Otherwise returns
+    \c false.
+
+    A proleptic calendar results from allowing negative year numbers to indicate
+    years before the nominal start of the calendar system.
+
+    \sa isLuniSolar(), isSolar(), isLunar(), hasYearZero()
+*/
+
+bool QCalendarBackend::isProleptic() const
+{
+    return true;
+}
+
+/*!
+    Returns \c true if year number \c 0 is considered a valid year in this
+    calendar. Otherwise returns \c false.
+
+    \sa isDateValid(), isProleptic()
+*/
+
+bool QCalendarBackend::hasYearZero() const
+{
+    return false;
+}
+
+/*!
+    Returns the maximum number of days in a month for any year.
+
+    This base implementation returns 31, as this is a common case.
+
+    For calendars with intercallary days, although daysInMonth() doesn't include
+    the intercallary days in its count for an individual month,
+    maximumDaysInMonth() should include intercallary days, so that it is the
+    maximum value of \c day for which \c{isDateValid(year, month, day)} can be
+    true.
+
+    \sa maximumMonthsInYear(), daysInMonth()
+*/
+int QCalendarBackend::maximumDaysInMonth() const
+{
+    return 31;
+}
+
+/*!
+    Returns the minimum number of days in any valid month of any valid year.
+
+    This base implementation returns 29, as this is a common case.
+
+    \sa maximumMonthsInYear(), daysInMonth()
+*/
+int QCalendarBackend::minimumDaysInMonth() const
+{
+    return 29;
+}
+
+/*!
+    Returns the maximum number of months possible in any year.
+
+    This base implementation returns 12, as this is a common case.
+
+    \sa maximumDaysInMonth(), monthsInYear()
+*/
+int QCalendarBackend::maximumMonthsInYear() const
+{
+    return 12;
+}
+
+// Julian day number calculations
+
+/*!
+    \fn bool QCalendarBackend::dateToJulianDay(int year, int month, int day, qint64 *jd) const
+
+    Computes the Julian day number corresponding to the specified \a year, \a
+    month, and \a day. Returns true and sets \a jd if there is such a date in
+    this calendar; otherwise, returns false.
+
+    \sa QCalendar::partsFromDate(), julianDayToDate()
+*/
+
+/*!
+    \fn QCalendar::YearMonthDay QCalendarBackend::julianDayToDate(qint64 jd) const
+
+    Computes the year, month, and day in this calendar for the given Julian day
+    number \a jd. If the given day falls outside this calendar's scope
+    (e.g. before the start-date of a non-proleptic calendar), the returned
+    structure's isValid() is false; otherwise, its year, month, and day fields
+    provide this calendar's description of the date.
+
+    \sa QCalendar::dateFromParts(), dateToJulianDay()
+*/
+
+/*!
+   Returns the day of the week for the given Julian Day Number \a jd.
+
+   This is 1 for Monday through 7 for Sunday.
+
+   Calendars with intercallary days may return larger values for these
+   intercallary days. They should avoid using 0 for any special purpose (it is
+   already used in QDate::dayOfWeek() to mean an invalid date). The calendar
+   should treat the numbers used as an \c enum, whose values need not be
+   contiguous, nor need they follow closely from the 1 through 7 of the usual
+   returns. It suffices that weekDayName() can recognize each such number as
+   identifying a distinct name, that it returns to identify the particular
+   intercallary day.
+
+   This base implementation uses the day-numbering that various calendars have
+   borrowed off the Hebrew calendar.
+
+   \sa weekDayName(), standaloneWeekDayName(), QDate::dayOfWeek()
+ */
+int QCalendarBackend::dayOfWeek(qint64 jd) const
+{
+    return QRoundingDown::qMod(jd, 7) + 1;
+}
+
+// Month and week-day name look-ups (implemented in qlocale.cpp):
+/*!
+    \fn QString QCalendarBackend::monthName(const QLocale &locale, int month, int year,
+                                            QLocale::FormatType format) const
+
+    Returns the name of the specified \a month in the given \a year for the
+    chosen \a locale, using the given \a format to determine how complete the
+    name is.
+
+    If \a year is Unspecified, return the name for the month that usually has
+    this number within a typical year. Calendars with a leap month that isn't
+    always the last may need to take account of the year to map the month number
+    to the particular year's month with that number.
+
+    \note Backends for which CLDR provides data can configure the default
+    implementation of the two month name look-up methods by arranging for
+    localeMonthIndexData() and localeMonthData() to provide access to the CLDR
+    data (see cldr2qlocalexml.py, qlocalexml2cpp.py and existing backends).
+    Conversely, backends that override both month name look-up methods need not
+    return anything meaningful from localeMonthIndexData() or localeMonthData().
+
+    \sa standaloneMonthName(), QLocale::monthName()
+*/
+
+/*!
+    \fn QString QCalendarBackend::standaloneMonthName(const QLocale &locale, int month, int year
+                                                      QLocale::FormatType format) const
+
+    Returns the standalone name of the specified \a month in the chosen \a
+    locale, using the specified \a format to determine how complete the name is.
+
+    If \a year is Unspecified, return the standalone name for the month that
+    usually has this number within a typical year. Calendars with a leap month
+    that isn't always the last may need to take account of the year to map the
+    month number to the particular year's month with that number.
+
+    \sa monthName(), QLocale::standaloneMonthName()
+*/
+
+/*!
+    \fn QString QCalendarBackend::weekDayName(const QLocale &locale, int day,
+                                              QLocale::FormatType format) const
+
+    Returns the name of the specified \a day of the week in the chosen \a
+    locale, using the specified \a format to determine how complete the name is.
+
+    The base implementation handles \a day values from 1 to 7 using the day
+    names CLDR provides, which are suitable for calendards that use the same
+    (Hebrew-derived) week as the Gregorian calendar.
+
+    Calendars whose dayOfWeek() returns a value outside the range from 1 to 7
+    need to reimplement this method to handle such extra week-day values. They
+    can assume that \a day is a value returned by the same calendar's
+    dayOfWeek().
+
+    \sa dayOfWeek(), standaloneWeekDayName(), QLocale::dayName()
+*/
+
+/*!
+    \fn QString QCalendarBackend::standaloneWeekDayName(const QLocale &locale, int day,
+                                                        QLocale::FormatType format) const
+
+    Returns the standalone name of the specified \a day of the week in the
+    chosen \a locale, using the specified \a format to determine how complete
+    the name is.
+
+    The base implementation handles \a day values from 1 to 7 using the
+    standalone day names CLDR provides, which are suitable for calendards that
+    use the same (Hebrew-derived) week as the Gregorian calendar.
+
+    Calendars whose dayOfWeek() returns a value outside the range from 1 to 7
+    need to reimplement this method to handle such extra week-day values. They
+    can assume that \a day is a value returned by the same calendar's
+    dayOfWeek().
+
+    \sa dayOfWeek(), weekDayName(), QLocale::standaloneDayName()
+*/
+
+/*!
+    \fn QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &datetime,
+                                                   const QDate &dateOnly, const QTime &timeOnly,
+                                                   const QLocale &locale) const
+
+    Returns a string representing a given date, time or date-time.
+
+    If \a datetime is specified and valid, it is used and both date and time
+    format tokens are converted to appropriate representations of the parts of
+    the datetime. Otherwise, if \a dateOnly is valid, only date format tokens
+    are converted; else, if \a timeOnly is valid, only time format tokens are
+    converted. If none are valid, an empty string is returned.
+
+    The specified \a locale influences how some format tokens are converted; for
+    example, when substituting day and month names and their short-forms. For
+    the supported formatting tokens, see QDate::toString() and
+    QTime::toString(). As described above, the provided date, time and date-time
+    determine which of these tokens are recognized: where these appear in \a
+    format they are replaced by data. Any text in \a format not recognized as a
+    format token is copied verbatim into the result string.
+
+    \sa QDate::toString(), QTime::toString(), QDateTime::toString()
+*/
+// End of methods implemented in qlocale.cpp
+
+/*!
+    Returns a list of names of the available calendar systems. Any
+    QCalendarBackend sub-class must be registered before being exposed to Date
+    and Time APIs.
+
+    \sa registerAlias(), fromName()
+*/
+QStringList QCalendarBackend::availableCalendars()
+{
+    if (calendarRegistry.isDestroyed())
+        return {};
+    calendarRegistry->populate();
+    return QStringList(calendarRegistry->byName.keyBegin(), calendarRegistry->byName.keyEnd());
+}
+
+/*!
+    Registers an alias for this calendar backend. Once a backend is registered,
+    its name will be included in the list of available calendars and the
+    calendar can be instantiated by name.
+
+    Returns \c false if the given \a name is already in use, otherwise it
+    registers this calendar backend and returns \c true.
+
+    \sa availableCalendars(), fromName()
+*/
+bool QCalendarBackend::registerAlias(const QString &name)
+{
+    if (calendarRegistry.isDestroyed())
+        return false;
+    return calendarRegistry->registerName(this, name);
+}
+
+/*!
+    Returns a pointer to a named calendar backend.
+
+    If the given \a name is present in availableCalendars(), the backend
+    matching it is returned; otherwise, \c nullptr is returned. Matching of
+    names ignores case. Note that this won't provoke construction of a calendar
+    backend, it will only return ones that have been instantiated (and not yet
+    destroyed) by some other means. However, calendars available via the
+    QCalendar::System enum are always registered when this is called.
+
+    \sa availableCalendars(), registerAlias(), fromEnum()
+*/
+const QCalendarBackend *QCalendarBackend::fromName(QStringView name)
+{
+    if (calendarRegistry.isDestroyed())
+        return nullptr;
+    calendarRegistry->populate();
+    auto it = calendarRegistry->byName.find(name.toString());
+    return it == calendarRegistry->byName.end() ? nullptr : *it;
+}
+
+/*!
+    \overload
+ */
+const QCalendarBackend *QCalendarBackend::fromName(QLatin1String name)
+{
+    if (calendarRegistry.isDestroyed())
+        return nullptr;
+    calendarRegistry->populate();
+    auto it = calendarRegistry->byName.find(QString(name));
+    return it == calendarRegistry->byName.end() ? nullptr : *it;
+}
+
+/*!
+    Returns a pointer to a calendar backend, specified by enum.
+
+    This will instantiate the indicated calendar (which will enable fromName()
+    to return it subsequently), but only for the Qt-supported calendars for
+    which (where relevant) the appropriate feature has been enabled.
+*/
+const QCalendarBackend *QCalendarBackend::fromEnum(QCalendar::System system)
+{
+    if (calendarRegistry.isDestroyed() || system == QCalendar::System::User)
+        return nullptr;
+    Q_ASSERT(calendarRegistry->byId.size() >= size_t(system));
+    if (auto *c = calendarRegistry->byId.at(size_t(system)))
+        return c;
+    switch (system) {
+    case QCalendar::System::Gregorian:
+        return new QGregorianCalendar;
+#ifndef QT_BOOTSTRAPPED
+    case QCalendar::System::Julian:
+        return new QJulianCalendar;
+    case QCalendar::System::Milankovic:
+        return new QMilankovicCalendar;
+#endif
+#if QT_CONFIG(jalalicalendar)
+    case QCalendar::System::Jalali:
+        return new QJalaliCalendar;
+#endif
+#if QT_CONFIG(islamiccivilcalendar)
+    case QCalendar::System::IslamicCivil:
+        return new QIslamicCivilCalendar;
+#else // When highest-numbered system isn't enabled, ensure we have a case for Last:
+    case QCalendar::System::Last:
+#endif
+    case QCalendar::System::User:
+        Q_UNREACHABLE();
+    }
+    return nullptr;
+}
+
+/*!
+    \since 5.14
+
+    \class QCalendar
+    \inmodule QtCore
+    \reentrant
+    \brief The QCalendar class describes calendar systems.
+
+    A QCalendar object maps a year, month, and day-number to a specific day
+    (ultimately identified by its Julian day number), using the rules of a
+    particular system.
+
+    The default QCalendar() is a proleptic Gregorian calendar, which has no year
+    zero. Other calendars may be supported by enabling suitable features or
+    loading plugins. Calendars supported as features can be constructed by
+    passing the QCalendar::System enumeration to the constructor. All supported
+    calendars may be constructed by name, once they have been constructed. (Thus
+    plugins instantiate their calendar backend to register it.) Built-in
+    backends, accessible via QCalendar::System, are also always available by
+    name.
+
+    A QCalendar value is immutable.
+
+    \sa QDate, QDateTime
+*/
+
+/*!
+    \enum QCalendar::System
+
+    This enumerated type is used to specify a choice of calendar system.
+
+    \value Gregorian The default calendar, used internationally.
+    \value Julian An ancient Roman calendar with too few leap years.
+    \value Milankovic A revised Julian calendar used by some Orthodox churches.
+    \value Jalali The Solar Hijri calendar (also called Persian).
+    \value IslamicCivil The (tabular) Islamic Civil calendar.
+    \omitvalue Last
+    \omitvalue User
+
+    \sa QCalendar
+*/
+
+/*!
+    \fn QCalendar::QCalendar()
+    \fn QCalendar::QCalendar(QCalendar::System system)
+    \fn QCalendar::QCalendar(QLatin1String name)
+    \fn QCalendar::QCalendar(QStringView name)
+
+    Constructs a calendar object.
+
+    The choice of calendar to use may be indicated as \a system, using the
+    enumeration QCalendar::System, or by \a name, using a string (either Unicode
+    or Latin 1). Construction by name may depend on an instance of the given
+    calendar being constructed by other means first. With no argument, the
+    default constructor returns the Gregorian calendar.
+
+    \sa QCalendar, System, isValid()
+*/
+
+QCalendar::QCalendar()
+    : d(nullptr)
+{
+    if (calendarRegistry.isDestroyed())
+        return;
+    d = calendarRegistry->gregorianCalendar;
+    if (!d)
+        d = new QGregorianCalendar;
+}
+
+QCalendar::QCalendar(QCalendar::System system)
+    : d(QCalendarBackend::fromEnum(system)) {}
+
+QCalendar::QCalendar(QLatin1String name)
+    : d(QCalendarBackend::fromName(name)) {}
+
+QCalendar::QCalendar(QStringView name)
+    : d(QCalendarBackend::fromName(name)) {}
+
+/*
+    \fn bool QCalendar::isValid() const
+
+    Returns true if this is a valid calendar object.
+
+    Constructing a calendar with an unrecognised calendar name may result in an
+    invalid object. Use this method to check after creating a calendar by name.
+*/
+
+// Date queries:
+
+/*!
+    Returns the number of days in the given \a month of the given \a year.
+
+    Months are numbered consecutively, starting with 1 for the first month of
+    each year. If \a year is \c Unspecified (its default, if not passed), the
+    month's length in a normal year is returned.
+
+    \sa maximumDaysInMonth(), minimumDaysInMonth()
+*/
+int QCalendar::daysInMonth(int month, int year) const
+{
+    return d ? d->daysInMonth(month, year) : 0;
+}
+
+/*!
+    Returns the number of days in the given \a year.
+*/
+int QCalendar::daysInYear(int year) const
+{
+    return d ? d->daysInYear(year) : 0;
+}
+
+/*!
+    Returns the number of months in the given \a year.
+*/
+int QCalendar::monthsInYear(int year) const
+{
+    return d ? d->monthsInYear(year) : 0;
+}
+
+/*!
+    Returns \c true precisely if the given \a year, \a month, and \a day specify
+    a valid date in this calendar.
+
+    Usually this means 1 <= month <= monthsInYear(year) and 1 <= day <=
+    daysInMonth(month, year). However, calendars with intercallary days or
+    months may complicate that.
+*/
+bool QCalendar::isDateValid(int year, int month, int day) const
+{
+    return d && d->isDateValid(year, month, day);
+}
+
+// properties of the calendar
+
+/*!
+    Returns \c true if this calendar object is the Gregorian calendar object
+    used as default calendar by other Qt APIs, e.g. in QDate.
+*/
+bool QCalendar::isGregorian() const
+{
+    Q_ASSERT(!calendarRegistry.isDestroyed());
+    return d == calendarRegistry->gregorianCalendar;
+}
+
+/*!
+    Returns \c true if the given \a year is a leap year.
+
+    Since the year is not a whole number of days long, some years are longer
+    than others. The difference may be a whole month or just a single day; the
+    details vary between calendars.
+
+    \sa isDateValid()
+*/
+bool QCalendar::isLeapYear(int year) const
+{
+    return d && d->isLeapYear(year);
+}
+
+/*!
+    Returns \c true if this calendar is a lunar calendar.
+
+    A lunar calendar is one based primarily on the phases of the moon.
+*/
+bool QCalendar::isLunar() const
+{
+    return d && d->isLunar();
+}
+
+/*!
+    Returns \c true if this calendar is luni-solar.
+
+    A luni-solar calendar expresses the phases of the moon but adapts itself to
+    also keep track of the Sun's varying position in the sky, relative to the
+    fixed stars.
+*/
+bool QCalendar::isLuniSolar() const
+{
+    return d && d->isLuniSolar();
+}
+
+/*!
+    Returns \c true if this calendar is solar.
+
+    A solar calendar is based primarily on the Sun's varying position in the
+    sky, relative to the fixed stars.
+*/
+bool QCalendar::isSolar() const
+{
+    return d && d->isSolar();
+}
+
+/*!
+    Returns \c true if this calendar is proleptic.
+
+    A proleptic calendar is able to describe years arbitrarily long before its
+    first. These are represented by negative year numbers and possibly by a year
+    zero.
+
+    \sa hasYearZero()
+*/
+bool QCalendar::isProleptic() const
+{
+    return d && d->isProleptic();
+}
+
+/*!
+    Returns \c true if this calendar has a year zero.
+
+    A calendar may represent years from its first year onwards but provide no
+    way to describe years before its first; such a calendar has no year zero and
+    is not proleptic.
+
+    A calendar which represents years before its first may number these years
+    simply by following the usual integer counting, so that the year before the
+    first is year zero, with negative-numbered years preceding this; such a
+    calendar is proleptic and has a year zero. A calendar might also have a year
+    zero (for example, the year of some great event, with subsequent years being
+    the first year after that event, the second year after, and so on) without
+    describing years before its year zero. Such a calendar would have a year
+    zero without being proleptic.
+
+    Some calendars, however, represent years before their first by an alternate
+    numbering; for example, the proleptic Gregorian calendar's first year is 1
+    CE and the year before it is 1 BCE, preceded by 2 BCE and so on. In this
+    case, we use negative year numbers for this alternate numbering, with year
+    -1 as the year before year 1, year -2 as the year before year -1 and so
+    on. Such a calendar is proleptic but has no year zero.
+
+    \sa isProleptic()
+*/
+bool QCalendar::hasYearZero() const
+{
+    return d && d->hasYearZero();
+}
+
+/*!
+    Returns the number of days in the longest month in the calendar, in any year.
+
+    \sa daysInMonth(), minimumDaysInMonth()
+*/
+int QCalendar::maximumDaysInMonth() const
+{
+    return d ? d->maximumDaysInMonth() : 0;
+}
+
+/*!
+    Returns the number of days in the shortest month in the calendar, in any year.
+
+    \sa daysInMonth(), maximumDaysInMonth()
+*/
+int QCalendar::minimumDaysInMonth() const
+{
+    return d ? d->minimumDaysInMonth() : 0;
+}
+
+/*!
+    Returns the largest number of months that any year may contain.
+
+    \sa monthName(), standaloneMonthName(), monthsInYear()
+*/
+int QCalendar::maximumMonthsInYear() const
+{
+    return d ? d->maximumMonthsInYear() : 0;
+}
+
+// Julian Day conversions:
+
+/*!
+    \fn QDate QCalendar::dateFromParts(int year, int month, int day) const
+    \fn QDate QCalendar::dateFromParts(const QCalendar::YearMonthDay &parts) const
+
+    Converts a year, month, and day to a QDate.
+
+    The \a year, \a month, and \a day may be passed as separate numbers or
+    packaged together as the members of \a parts. Returns a QDate with the given
+    year, month, and day of the month in this calendar, if there is one.
+    Otherwise, including the case where any of the values is
+    QCalendar::Unspecified, returns a QDate whose isNull() is true.
+
+    \sa isDateValid(), partsFromDate()
+*/
+QDate QCalendar::dateFromParts(int year, int month, int day) const
+{
+    qint64 jd;
+    return d && d->dateToJulianDay(year, month, day, &jd)
+        ? QDate::fromJulianDay(jd) : QDate();
+}
+
+QDate QCalendar::dateFromParts(const QCalendar::YearMonthDay &parts) const
+{
+    return parts.isValid() ? dateFromParts(parts.year, parts.month, parts.day) : QDate();
+}
+
+/*!
+    Converts a QDate to a year, month, and day of the month.
+
+    The returned structure's isValid() shall be false if the calendar is unable
+    to represent the given \a date. Otherwise its year, month, and day
+    members record the so-named parts of its representation.
+
+    \sa dateFromParts(), isProleptic(), hasYearZero()
+*/
+QCalendar::YearMonthDay QCalendar::partsFromDate(QDate date) const
+{
+    return d ? d->julianDayToDate(date.toJulianDay()) : YearMonthDay();
+}
+
+/*!
+    Returns the day of the week number for the given \a date.
+
+    Returns zero if the calendar is unable to represent the indicated date.
+    Returns 1 for Monday through 7 for Sunday. Calendars with intercallary days
+    may use other numbers to represent these.
+
+    \sa partsFromDate(), Qt::DayOfWeek
+*/
+int QCalendar::dayOfWeek(QDate date) const
+{
+    return d ? d->dayOfWeek(date.toJulianDay()) : 0;
+}
+
+// Locale data access
+
+/*!
+    Returns a suitably localised name for a month.
+
+    The month is indicated by a number, with \a month = 1 meaning the first
+    month of the year and subsequent months numbered accordingly. Returns an
+    empty string if the \a month number is unrecognized.
+
+    The \a year may be Unspecified, in which case the mapping from numbers to
+    names for a typical year's months should be used. Some calendars have leap
+    months that aren't always at the end of the year; their mapping of month
+    numbers to names may then depend on the placement of a leap month. Thus the
+    year should normally be specified, if known.
+
+    The name is returned in the form that would normally be used in a full date,
+    in the specified \a locale; the \a format determines how fully it shall be
+    expressed (i.e. to what extent it is abbreviated).
+
+    \sa standaloneMonthName(), maximumMonthsInYear(), dateTimeToString()
+*/
+QString QCalendar::monthName(const QLocale &locale, int month, int year,
+                             QLocale::FormatType format) const
+{
+    const int maxMonth = year == Unspecified ? maximumMonthsInYear() : monthsInYear(year);
+    if (!d || month < 1 || month > maxMonth)
+        return QString();
+
+    return d->monthName(locale, month, year, format);
+}
+
+/*!
+    Returns a suitably localised standalone name for a month.
+
+    The month is indicated by a number, with \a month = 1 meaning the first
+    month of the year and subsequent months numbered accordingly. Returns an
+    empty string if the \a month number is unrecognized.
+
+    The \a year may be Unspecified, in which case the mapping from numbers to
+    names for a typical year's months should be used. Some calendars have leap
+    months that aren't always at the end of the year; their mapping of month
+    numbers to names may then depend on the placement of a leap month. Thus the
+    year should normally be specified, if known.
+
+    The name is returned in the form that would be used in isolation in the
+    specified \a locale; the \a format determines how fully it shall be
+    expressed (i.e. to what extent it is abbreviated).
+
+    \sa monthName(), maximumMonthsInYear(), dateTimeToString()
+*/
+QString QCalendar::standaloneMonthName(const QLocale &locale, int month, int year,
+                                       QLocale::FormatType format) const
+{
+    const int maxMonth = year == Unspecified ? maximumMonthsInYear() : monthsInYear(year);
+    if (!d || month < 1 || month > maxMonth)
+        return QString();
+
+    return d->standaloneMonthName(locale, month, year, format);
+}
+
+/*!
+    Returns a suitably localised name for a day of the week.
+
+    The days of the week are numbered from 1 for Monday through 7 for
+    Sunday. Some calendars may support higher numbers for other days
+    (e.g. intercallary days, that are not part of any week). Returns an empty
+    string if the \a day number is unrecognized.
+
+    The name is returned in the form that would normally be used in a full date,
+    in the specified \a locale; the \a format determines how fully it shall be
+    expressed (i.e. to what extent it is abbreviated).
+
+    \sa standaloneWeekDayName(), dayOfWeek()
+*/
+QString QCalendar::weekDayName(const QLocale &locale, int day,
+                               QLocale::FormatType format) const
+{
+    return d ? d->weekDayName(locale, day, format) : QString();
+}
+
+/*!
+    Returns a suitably localised standalone name for a day of the week.
+
+    The days of the week are numbered from 1 for Monday through 7 for
+    Sunday. Some calendars may support higher numbers for other days
+    (e.g. intercallary days, that are not part of any week). Returns an empty
+    string if the \a day number is unrecognized.
+
+    The name is returned in the form that would be used in isolation (for
+    example as a column heading in a calendar's tabular display of a month with
+    successive weeks as rows) in the specified \a locale; the \a format
+    determines how fully it shall be expressed (i.e. to what extent it is
+    abbreviated).
+
+    \sa weekDayName(), dayOfWeek()
+*/
+QString QCalendar::standaloneWeekDayName(const QLocale &locale, int day,
+                                         QLocale::FormatType format) const
+{
+    return d ? d->standaloneWeekDayName(locale, day, format) : QString();
+}
+
+/*!
+    Returns a string representing a given date, time or date-time.
+
+    If \a datetime is valid, it is represented and format specifiers for both
+    date and time fields are recognized; otherwise, if \a dateOnly is valid, it
+    is represented and only format specifiers for date fields are recognized;
+    finally, if \a timeOnly is valid, it is represented and only format
+    specifiers for time fields are recognized. If none of these is valid, an
+    empty string is returned.
+
+    See QDate::toString and QTime::toString() for the supported field
+    specifiers.  Characters in \a format that are recognized as field specifiers
+    are replaced by text representing appropriate data from the date and/or time
+    being represented. The texts to represent them may depend on the \a locale
+    specified. Other charagers in \a format are copied verbatim into the
+    returned string.
+
+    \sa monthName(), weekDayName(), QDate::toString(), QTime::toString()
+*/
+QString QCalendar::dateTimeToString(QStringView format, const QDateTime &datetime,
+                                    const QDate &dateOnly, const QTime &timeOnly,
+                                    const QLocale &locale) const
+{
+    return d ? d->dateTimeToString(format, datetime, dateOnly, timeOnly, locale) : QString();
+}
+
+/*!
+    Returns a list of names of the available calendar systems.
+
+    These may be supplied by plugins or other code linked into an application,
+    in addition to the ones provided by Qt, some of which are controlled by
+    features.
+*/
+QStringList QCalendar::availableCalendars()
+{
+    return QCalendarBackend::availableCalendars();
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/time/qcalendar.h b/src/corelib/time/qcalendar.h
new file mode 100644
index 0000000000..42c8e150c5
--- /dev/null
+++ b/src/corelib/time/qcalendar.h
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCALENDAR_H
+#define QCALENDAR_H
+
+#include <limits>
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qlocale.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringview.h>
+
+/* Suggested enum names for other calendars known to CLDR (v33.1)
+
+   Not yet implemented - see QCalendar::System - contributions welcome:
+
+   * Buddhist -- Thai Buddhist, to be specific
+   * Chinese
+   * Coptic
+   * Dangi -- Korean
+   * Ethiopic (Amete Mihret - epoch approx. 8 C.E.)
+   * EthiopicAmeteAlem (Amete Alem - epoch approx. 5493 B.C.E; data from
+     type="ethiopic-amete-alem", an alias for type="ethioaa")
+   * Hebrew
+   * Indian -- National
+   * Islamic -- Based on astronomical observations, not predictions, so hard to
+     implement. CLDR's data for type="islamic" apply, unless overridden, to the
+     other Islamic calendar variants, i.e. IslamicCivil, above, and the three
+     following. See QHijriCalendar, a common base to provide that data.
+   * IslamicTabular -- tabular, astronomical epoch (same as IslamicCivil, except
+     for epoch), CLDR type="islamic-tbla"
+   * Saudi -- Saudi Arabia, sighting; CLDR type="islamic-rgsa"
+   * UmmAlQura -- Umm al-Qura, Saudi Arabia, calculated; CLDR type="islamic-umalqura"
+   * Iso8601 -- as Gregorian, but treating ISO 8601 weeks as "months"
+   * Japanese -- Imperial calendar
+   * Minguo -- Republic of China, Taiwan; CLDR type="roc"
+
+   See:
+   http://www.unicode.org/repos/cldr/tags/latest/common/bcp47/calendar.xml
+
+   These can potentially be supported, as features, using CLDR's data; any
+   others shall need hand-crafted localization data; it would probably be best
+   to do that by contributing data for them to CLDR.
+*/
+
+QT_BEGIN_NAMESPACE
+
+class QCalendarBackend;
+class QDate;
+
+class Q_CORE_EXPORT QCalendar
+{
+    Q_GADGET
+public:
+    // (Extra parentheses to suppress bogus reading of min() as a macro.)
+    enum : int { Unspecified = (std::numeric_limits<int>::min)() };
+    struct YearMonthDay
+    {
+        YearMonthDay() = default;
+        YearMonthDay(int y, int m = 1, int d = 1) : year(y), month(m), day(d) {}
+
+        bool isValid() const
+        { return month != Unspecified && day != Unspecified; }
+        // (The first year supported by QDate has year == Unspecified.)
+
+        int year = Unspecified;
+        int month = Unspecified;
+        int day = Unspecified;
+    };
+    // Feature (\w+)calendar uses CLDR type="\1" data, except as noted in type="..." comments below
+    enum class System
+    {
+        Gregorian, // CLDR: type = "gregory", alias = "gregorian"
+#ifndef QT_BOOTSTRAPPED
+        Julian = 8,
+        Milankovic = 9,
+#endif // These are Roman-based, so share Gregorian's CLDR data
+
+        // Feature-controlled calendars:
+#if QT_CONFIG(jalalicalendar) // type="persian"
+        Jalali = 10,
+#endif
+#if QT_CONFIG(islamiccivilcalendar) // type="islamic-civil", uses data from type="islamic"
+        IslamicCivil = 11,
+        // tabular, civil epoch
+        // 30 year cycle, leap on 2, 5, 7, 10, 13, 16, 18, 21, 24, 26 and 29
+        // (Other variants: 2, 5, 8, (10|11), 13, 16, 19, 21, 24, 27 and 29.)
+#endif
+
+        Last = 11, // Highest number of any above
+        User = -1
+    };
+    // New entries must be added to the \enum doc in qcalendar.cpp and
+    // handled in QCalendarBackend::fromEnum()
+    Q_ENUM(System)
+
+    explicit QCalendar(); // Gregorian, optimised
+    explicit QCalendar(System system);
+    explicit QCalendar(QLatin1String name);
+    explicit QCalendar(QStringView name);
+
+    // QCalendar is a trivially copyable value type.
+    bool isValid() const { return d != nullptr; }
+
+    // Date queries:
+    int daysInMonth(int month, int year = Unspecified) const;
+    int daysInYear(int year) const;
+    int monthsInYear(int year) const;
+    bool isDateValid(int year, int month, int day) const;
+
+    // Leap years:
+    bool isLeapYear(int year) const;
+
+    // Properties of the calendar:
+    bool isGregorian() const;
+    bool isLunar() const;
+    bool isLuniSolar() const;
+    bool isSolar() const;
+    bool isProleptic() const;
+    bool hasYearZero() const;
+    int maximumDaysInMonth() const;
+    int minimumDaysInMonth() const;
+    int maximumMonthsInYear() const;
+    QString name() const;
+
+    // QDate conversions:
+    QDate dateFromParts(int year, int month, int day) const;
+    QDate dateFromParts(const YearMonthDay &parts) const;
+    YearMonthDay partsFromDate(QDate date) const;
+    int dayOfWeek(QDate date) const;
+
+    // Month and week-day names (as in QLocale):
+    QString monthName(const QLocale &locale, int month, int year = Unspecified,
+                      QLocale::FormatType format=QLocale::LongFormat) const;
+    QString standaloneMonthName(const QLocale &locale, int month, int year = Unspecified,
+                                QLocale::FormatType format = QLocale::LongFormat) const;
+    QString weekDayName(const QLocale &locale, int day,
+                        QLocale::FormatType format = QLocale::LongFormat) const;
+    QString standaloneWeekDayName(const QLocale &locale, int day,
+                                  QLocale::FormatType format=QLocale::LongFormat) const;
+
+    // Formatting of date-times:
+    QString dateTimeToString(QStringView format, const QDateTime &datetime,
+                             const QDate &dateOnly, const QTime &timeOnly,
+                             const QLocale &locale) const;
+
+    // What's available ?
+    static QStringList availableCalendars();
+private:
+    // Always supplied by QCalendarBackend and expected to be a singleton
+    const QCalendarBackend *d;
+};
+
+QT_END_NAMESPACE
+
+#endif // QCALENDAR_H
diff --git a/src/corelib/time/qcalendarbackend_p.h b/src/corelib/time/qcalendarbackend_p.h
new file mode 100644
index 0000000000..21506e9e2c
--- /dev/null
+++ b/src/corelib/time/qcalendarbackend_p.h
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCALENDAR_BACKEND_P_H
+#define QCALENDAR_BACKEND_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of calendar implementations.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qobjectdefs.h>
+#include <QtCore/qcalendar.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qmap.h>
+
+QT_BEGIN_NAMESPACE
+
+// Locale-related parts, mostly handled in ../text/qlocale.cpp
+struct QLocaleDataEntry {
+    quint16 index, size;
+};
+
+struct QCalendarLocale {
+    quint16 m_language_id, m_script_id, m_country_id;
+    // Month name indexes:
+    QLocaleDataEntry m_standalone_short;
+    QLocaleDataEntry m_standalone_long;
+    QLocaleDataEntry m_standalone_narrow;
+    QLocaleDataEntry m_short;
+    QLocaleDataEntry m_long;
+    QLocaleDataEntry m_narrow;
+};
+
+// Partial implementation, of methods with common forms, in qcalendar.cpp
+class Q_CORE_EXPORT QCalendarBackend
+{
+    friend class QCalendar;
+public:
+    virtual ~QCalendarBackend();
+    virtual QString name() const = 0;
+    virtual QCalendar::System calendarSystem() const;
+    // Date queries:
+    virtual int daysInMonth(int month, int year = QCalendar::Unspecified) const = 0;
+    virtual int daysInYear(int year) const;
+    virtual int monthsInYear(int year) const;
+    virtual bool isDateValid(int year, int month, int day) const;
+    // Properties of the calendar:
+    virtual bool isLeapYear(int year) const = 0;
+    virtual bool isLunar() const = 0;
+    virtual bool isLuniSolar() const = 0;
+    virtual bool isSolar() const = 0;
+    virtual bool isProleptic() const;
+    virtual bool hasYearZero() const;
+    virtual int maximumDaysInMonth() const;
+    virtual int minimumDaysInMonth() const;
+    virtual int maximumMonthsInYear() const;
+    // Julian Day conversions:
+    virtual bool dateToJulianDay(int year, int month, int day, qint64 *jd) const = 0;
+    virtual QCalendar::YearMonthDay julianDayToDate(qint64 jd) const = 0;
+    // Day of week and week numbering:
+    virtual int dayOfWeek(qint64 jd) const;
+
+    // Names of months and week-days (implemented in qlocale.cpp):
+    virtual QString monthName(const QLocale &locale, int month, int year,
+                              QLocale::FormatType format) const;
+    virtual QString standaloneMonthName(const QLocale &locale, int month, int year,
+                                        QLocale::FormatType format) const;
+    virtual QString weekDayName(const QLocale &locale, int day,
+                                QLocale::FormatType format) const;
+    virtual QString standaloneWeekDayName(const QLocale &locale, int day,
+                                          QLocale::FormatType format) const;
+
+    // Formatting of date-times (implemented in qlocale.cpp):
+    virtual QString dateTimeToString(QStringView format, const QDateTime &datetime,
+                                     const QDate &dateOnly, const QTime &timeOnly,
+                                     const QLocale &locale) const;
+
+    // Calendar enumeration by name:
+    static QStringList availableCalendars();
+
+protected:
+    QCalendarBackend(const QString &name, QCalendar::System id = QCalendar::System::User);
+
+    // Locale support:
+    virtual const QCalendarLocale *localeMonthIndexData() const = 0;
+    virtual const ushort *localeMonthData() const = 0;
+
+    bool registerAlias(const QString &name);
+
+private:
+    // QCalendar's access to its registry:
+    static const QCalendarBackend *fromName(QStringView name);
+    static const QCalendarBackend *fromName(QLatin1String name);
+    // QCalendar's access to singletons:
+    static const QCalendarBackend *fromEnum(QCalendar::System system);
+};
+
+QT_END_NAMESPACE
+
+#endif // QCALENDAR_BACKEND_P_H
diff --git a/src/corelib/time/qcalendarmath_p.h b/src/corelib/time/qcalendarmath_p.h
new file mode 100644
index 0000000000..61c2c5d2b5
--- /dev/null
+++ b/src/corelib/time/qcalendarmath_p.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCALENDARMATH_P_H
+#define QCALENDARMATH_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of q*calendar.cpp.  This header file may change from version to version
+// without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qglobal_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace QRoundingDown {
+/*
+  Division, rounding down (rather than towards zero).
+
+  From C++11 onwards, integer division is defined to round towards zero, so we
+  can rely on that when implementing this. This is only used with denominator b
+  > 0, so we only have to treat negative numerator, a, specially.
+*/
+
+template<typename Int> constexpr Int qDiv(Int a, unsigned b)
+{ return (a - (a < 0 ? int(b - 1) : 0)) / int(b); }
+
+template<typename Int> constexpr Int qMod(Int a, unsigned b)
+{ return a - qDiv(a, b) * b; }
+
+} // QRoundingDown
+
+QT_END_NAMESPACE
+
+#endif // QCALENDARMATH_P_H
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
index aa1ffff400..95a7255a04 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/time/qdatetime.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -73,6 +73,9 @@
 #include <private/qcore_mac_p.h>
 #endif
 
+#include "qcalendar.h"
+#include "qgregoriancalendar_p.h"
+
 QT_BEGIN_NAMESPACE
 
 /*****************************************************************************
@@ -94,90 +97,35 @@ enum {
   QDate static helper functions
  *****************************************************************************/
 
-static inline QDate fixedDate(int y, int m, int d)
-{
-    QDate result(y, m, 1);
-    result.setDate(y, m, qMin(d, result.daysInMonth()));
-    return result;
-}
-
-/*
-  Division, rounding down (rather than towards zero).
-
-  From C++11 onwards, integer division is defined to round towards zero, so we
-  can rely on that when implementing this.  This is only used with denominator b
-  > 0, so we only have to treat negative numerator, a, specially.
- */
-static inline qint64 floordiv(qint64 a, int b)
-{
-    return (a - (a < 0 ? b - 1 : 0)) / b;
-}
-
-static inline int floordiv(int a, int b)
-{
-    return (a - (a < 0 ? b - 1 : 0)) / b;
-}
-
-static inline qint64 julianDayFromDate(int year, int month, int day)
+static inline QDate fixedDate(QCalendar::YearMonthDay &&parts, QCalendar cal)
 {
-    // Adjust for no year 0
-    if (year < 0)
-        ++year;
+    if ((parts.year < 0 && !cal.isProleptic()) || (parts.year == 0 && !cal.hasYearZero()))
+        return QDate();
 
-/*
- * Math from The Calendar FAQ at http://www.tondering.dk/claus/cal/julperiod.php
- * This formula is correct for all julian days, when using mathematical integer
- * division (round to negative infinity), not c++11 integer division (round to zero)
- */
-    int    a = floordiv(14 - month, 12);
-    qint64 y = (qint64)year + 4800 - a;
-    int    m = month + 12 * a - 3;
-    return day + floordiv(153 * m + 2, 5) + 365 * y + floordiv(y, 4) - floordiv(y, 100) + floordiv(y, 400) - 32045;
+    parts.day = qMin(parts.day, cal.daysInMonth(parts.month, parts.year));
+    return cal.dateFromParts(parts);
 }
 
-struct ParsedDate
-{
-    int year, month, day;
-};
-
-// prevent this function from being inlined into all 10 users
-Q_NEVER_INLINE
-static ParsedDate getDateFromJulianDay(qint64 julianDay)
+static inline QDate fixedDate(QCalendar::YearMonthDay &&parts)
 {
-/*
- * Math from The Calendar FAQ at http://www.tondering.dk/claus/cal/julperiod.php
- * This formula is correct for all julian days, when using mathematical integer
- * division (round to negative infinity), not c++11 integer division (round to zero)
- */
-    qint64 a = julianDay + 32044;
-    qint64 b = floordiv(4 * a + 3, 146097);
-    int    c = a - floordiv(146097 * b, 4);
-
-    int    d = floordiv(4 * c + 3, 1461);
-    int    e = c - floordiv(1461 * d, 4);
-    int    m = floordiv(5 * e + 2, 153);
-
-    int    day = e - floordiv(153 * m + 2, 5) + 1;
-    int    month = m + 3 - 12 * floordiv(m, 10);
-    int    year = 100 * b + d - 4800 + floordiv(m, 10);
-
-    // Adjust for no year 0
-    if (year <= 0)
-        --year ;
-
-    return { year, month, day };
+    if (parts.year) {
+        parts.day = qMin(parts.day, QGregorianCalendar::monthLength(parts.month, parts.year));
+        qint64 jd;
+        if (QGregorianCalendar::julianFromParts(parts.year, parts.month, parts.day, &jd))
+            return QDate::fromJulianDay(jd);
+    }
+    return QDate();
 }
 
 /*****************************************************************************
   Date/Time formatting helper functions
  *****************************************************************************/
 
-static const char monthDays[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-
 #if QT_CONFIG(textdate)
 static const char qt_shortMonthNames[][4] = {
     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
 
 static int qt_monthNumberFromShortName(QStringRef shortName)
 {
@@ -190,7 +138,7 @@ static int qt_monthNumberFromShortName(QStringRef shortName)
 static int qt_monthNumberFromShortName(const QString &shortName)
 { return qt_monthNumberFromShortName(QStringRef(&shortName)); }
 
-static int fromShortMonthName(const QStringRef &monthName)
+static int fromShortMonthName(const QStringRef &monthName, int year)
 {
     // Assume that English monthnames are the default
     int month = qt_monthNumberFromShortName(monthName);
@@ -198,7 +146,7 @@ static int fromShortMonthName(const QStringRef &monthName)
         return month;
     // If English names can't be found, search the localized ones
     for (int i = 1; i <= 12; ++i) {
-        if (monthName == QLocale::system().monthName(i, QLocale::ShortFormat))
+        if (monthName == QCalendar().monthName(QLocale::system(), i, year, QLocale::ShortFormat))
             return i;
     }
     return -1;
@@ -259,7 +207,7 @@ static QString toOffsetString(Qt::DateFormat format, int offset)
 
 #if QT_CONFIG(datestring)
 // Parse offset in [+-]HH[[:]mm] format
-static int fromOffsetString(const QStringRef &offsetString, bool *valid) Q_DECL_NOTHROW
+static int fromOffsetString(const QStringRef &offsetString, bool *valid) noexcept
 {
     *valid = false;
 
@@ -344,7 +292,7 @@ static int fromOffsetString(const QStringRef &offsetString, bool *valid) Q_DECL_
     The year(), month(), and day() functions provide access to the year, month,
     and day numbers. Also, dayOfWeek() and dayOfYear() functions are
     provided. The same information is provided in textual format by
-    toString(). The day and month numbers can be mapped to names using QLocal.
+    toString(). The day and month numbers can be mapped to names using QLocale.
 
     QDate provides a full set of operators to compare two QDate
     objects where smaller means earlier, and larger means later.
@@ -380,7 +328,7 @@ static int fromOffsetString(const QStringRef &offsetString, bool *valid) Q_DECL_
     for technical reasons limited to between -784350574879 and 784354017364,
     which means from before 2 billion BCE to after 2 billion CE.
 
-    \sa QTime, QDateTime, QDateEdit, QDateTimeEdit, QCalendarWidget
+    \sa QTime, QDateTime, QCalendar, QDateTime::YearRange, QDateEdit, QDateTimeEdit, QCalendarWidget
 */
 
 /*!
@@ -394,19 +342,24 @@ static int fromOffsetString(const QStringRef &offsetString, bool *valid) Q_DECL_
 /*!
     Constructs a date with year \a y, month \a m and day \a d.
 
-    If the specified date is invalid, the date is not set and
-    isValid() returns \c false.
+    The date is understood in terms of the Gregorian calendar. If the specified
+    date is invalid, the date is not set and isValid() returns \c false.
 
     \warning Years 1 to 99 are interpreted as is. Year 0 is invalid.
 
-    \sa isValid()
+    \sa isValid(), QCalendar::dateFromParts()
 */
 
 QDate::QDate(int y, int m, int d)
 {
-    setDate(y, m, d);
+    if (!QGregorianCalendar::julianFromParts(y, m, d, &jd))
+        jd = nullJd();
 }
 
+QDate::QDate(int y, int m, int d, QCalendar cal)
+{
+    *this = cal.dateFromParts(y, m, d);
+}
 
 /*!
     \fn bool QDate::isNull() const
@@ -419,36 +372,66 @@ QDate::QDate(int y, int m, int d)
     \sa isValid()
 */
 
-
 /*!
     \fn bool QDate::isValid() const
 
     Returns \c true if this date is valid; otherwise returns \c false.
 
-    \sa isNull()
+    \sa isNull(), QCalendar::isDateValid()
 */
 
-
 /*!
-    Returns the year of this date. Negative numbers indicate years
-    before 1 CE, such that year -44 is 44 BCE.
+    Returns the year of this date.
 
-    Returns 0 if the date is invalid.
+    Uses \a cal as calendar, if supplied, else the Gregorian calendar.
+
+    Returns 0 if the date is invalid. For some calendars, dates before their
+    first year may all be invalid.
 
-    \sa month(), day()
+    If using a calendar which has a year 0, check using isValid() if the return
+    is 0. Such calendars use negative year numbers in the obvious way, with
+    year 1 preceded by year 0, in turn preceded by year -1 and so on.
+
+    Some calendars, despite having no year 0, have a conventional numbering of
+    the years before their first year, counting backwards from 1. For example,
+    in the proleptic Gregorian calendar, successive years before 1 CE (the first
+    year) are identified as 1 BCE, 2 BCE, 3 BCE and so on. For such calendars,
+    negative year numbers are used to indicate these years before year 1, with
+    -1 indicating the year before 1.
+
+    \sa month(), day(), QCalendar::hasYearZero(), QCalendar::isProleptic()
 */
 
-int QDate::year() const
+int QDate::year(QCalendar cal) const
 {
-    if (isNull())
-        return 0;
+    if (isValid()) {
+        const auto parts = cal.partsFromDate(*this);
+        if (parts.isValid())
+            return parts.year;
+    }
+    return 0;
+}
+
+/*!
+  \overload
+ */
 
-    return getDateFromJulianDay(jd).year;
+int QDate::year() const
+{
+    if (isValid()) {
+        const auto parts = QGregorianCalendar::partsFromJulian(jd);
+        if (parts.isValid())
+            return parts.year;
+    }
+    return 0;
 }
 
 /*!
-    Returns the number corresponding to the month of this date, using
-    the following convention:
+    Returns the month-number for the date.
+
+    Numbers the months of the year starting with 1 for the first. Uses \a cal
+    as calendar if supplied, else the Gregorian calendar, for which the month
+    numbering is as follows:
 
     \list
     \li 1 = "January"
@@ -465,118 +448,201 @@ int QDate::year() const
     \li 12 = "December"
     \endlist
 
-    Returns 0 if the date is invalid.
+    Returns 0 if the date is invalid. Note that some calendars may have more
+    than 12 months in some years.
 
     \sa year(), day()
 */
 
-int QDate::month() const
+int QDate::month(QCalendar cal) const
 {
-    if (isNull())
-        return 0;
+    if (isValid()) {
+        const auto parts = cal.partsFromDate(*this);
+        if (parts.isValid())
+            return parts.month;
+    }
+    return 0;
+}
 
-    return getDateFromJulianDay(jd).month;
+/*!
+  \overload
+ */
+
+int QDate::month() const
+{
+    if (isValid()) {
+        const auto parts = QGregorianCalendar::partsFromJulian(jd);
+        if (parts.isValid())
+            return parts.month;
+    }
+    return 0;
 }
 
 /*!
-    Returns the day of the month (1 to 31) of this date.
+    Returns the day of the month for this date.
 
-    Returns 0 if the date is invalid.
+    Uses \a cal as calendar if supplied, else the Gregorian calendar (for which
+    the return ranges from 1 to 31). Returns 0 if the date is invalid.
 
     \sa year(), month(), dayOfWeek()
 */
 
-int QDate::day() const
+int QDate::day(QCalendar cal) const
 {
-    if (isNull())
-        return 0;
+    if (isValid()) {
+        const auto parts = cal.partsFromDate(*this);
+        if (parts.isValid())
+            return parts.day;
+    }
+    return 0;
+}
 
-    return getDateFromJulianDay(jd).day;
+/*!
+  \overload
+ */
+
+int QDate::day() const
+{
+    if (isValid()) {
+        const auto parts = QGregorianCalendar::partsFromJulian(jd);
+        if (parts.isValid())
+            return parts.day;
+    }
+    return 0;
 }
 
 /*!
     Returns the weekday (1 = Monday to 7 = Sunday) for this date.
 
-    Returns 0 if the date is invalid.
+    Uses \a cal as calendar if supplied, else the Gregorian calendar. Returns 0
+    if the date is invalid. Some calendars may give special meaning
+    (e.g. intercallary days) to values greater than 7.
 
     \sa day(), dayOfYear(), Qt::DayOfWeek
 */
 
-int QDate::dayOfWeek() const
+int QDate::dayOfWeek(QCalendar cal) const
 {
     if (isNull())
         return 0;
 
-    if (jd >= 0)
-        return (jd % 7) + 1;
-    else
-        return ((jd + 1) % 7) + 7;
+    return cal.dayOfWeek(*this);
 }
 
 /*!
-    Returns the day of the year (1 to 365 or 366 on leap years) for
-    this date.
+  \overload
+ */
 
-    Returns 0 if the date is invalid.
+int QDate::dayOfWeek() const
+{
+    return isValid() ? QGregorianCalendar::weekDayOfJulian(jd) : 0;
+}
+
+/*!
+    Returns the day of the year (1 for the first day) for this date.
+
+    Uses \a cal as calendar if supplied, else the Gregorian calendar.
+    Returns 0 if either the date or the first day of its year is invalid.
 
     \sa day(), dayOfWeek()
 */
 
-int QDate::dayOfYear() const
+int QDate::dayOfYear(QCalendar cal) const
 {
-    if (isNull())
-        return 0;
+    if (isValid()) {
+        QDate firstDay = cal.dateFromParts(year(cal), 1, 1);
+        if (firstDay.isValid())
+            return firstDay.daysTo(*this) + 1;
+    }
+    return 0;
+}
+
+/*!
+  \overload
+ */
 
-    return jd - julianDayFromDate(year(), 1, 1) + 1;
+int QDate::dayOfYear() const
+{
+    if (isValid()) {
+        qint64 first;
+        if (QGregorianCalendar::julianFromParts(year(), 1, 1, &first))
+            return jd - first + 1;
+    }
+    return 0;
 }
 
 /*!
-    Returns the number of days in the month (28 to 31) for this date.
+    Returns the number of days in the month for this date.
 
-    Returns 0 if the date is invalid.
+    Uses \a cal as calendar if supplied, else the Gregorian calendar (for which
+    the result ranges from 28 to 31). Returns 0 if the date is invalid.
 
     \sa day(), daysInYear()
 */
 
-int QDate::daysInMonth() const
+int QDate::daysInMonth(QCalendar cal) const
 {
-    if (isNull())
-        return 0;
+    if (isValid()) {
+        const auto parts = cal.partsFromDate(*this);
+        if (parts.isValid())
+            return cal.daysInMonth(parts.month, parts.year);
+    }
+    return 0;
+}
 
-    const ParsedDate pd = getDateFromJulianDay(jd);
-    if (pd.month == 2 && isLeapYear(pd.year))
-        return 29;
-    else
-        return monthDays[pd.month];
+/*!
+  \overload
+ */
+
+int QDate::daysInMonth() const
+{
+    if (isValid()) {
+        const auto parts = QGregorianCalendar::partsFromJulian(jd);
+        if (parts.isValid())
+            return QGregorianCalendar::monthLength(parts.month, parts.year);
+    }
+    return 0;
 }
 
 /*!
-    Returns the number of days in the year (365 or 366) for this date.
+    Returns the number of days in the year for this date.
 
-    Returns 0 if the date is invalid.
+    Uses \a cal as calendar if supplied, else the Gregorian calendar (for which
+    the result is 365 or 366). Returns 0 if the date is invalid.
 
     \sa day(), daysInMonth()
 */
 
-int QDate::daysInYear() const
+int QDate::daysInYear(QCalendar cal) const
 {
     if (isNull())
         return 0;
 
-    return isLeapYear(getDateFromJulianDay(jd).year) ? 366 : 365;
+    return cal.daysInYear(year(cal));
 }
 
 /*!
-    Returns the week number (1 to 53), and stores the year in
-    *\a{yearNumber} unless \a yearNumber is null (the default).
+  \overload
+ */
 
-    Returns 0 if the date is invalid.
+int QDate::daysInYear() const
+{
+    return isValid() ? QGregorianCalendar::leapTest(year()) ? 366 : 365 : 0;
+}
+
+/*!
+    Returns the ISO 8601 week number (1 to 53).
+
+    Returns 0 if the date is invalid. Otherwise, returns the week number for the
+    date. If \a yearNumber is not \nullptr (its default), stores the year as
+    *\a{yearNumber}.
 
-    In accordance with ISO 8601, weeks start on Monday and the first
-    Thursday of a year is always in week 1 of that year. Most years
-    have 52 weeks, but some have 53.
+    In accordance with ISO 8601, each week falls in the year to which most of
+    its days belong, in the Gregorian calendar. As ISO 8601's week starts on
+    Monday, this is the year in which the week's Thursday falls. Most years have
+    52 weeks, but some have 53.
 
-    *\a{yearNumber} is not always the same as year(). For example, 1
+    \note *\a{yearNumber} is not always the same as year(). For example, 1
     January 2000 has week number 52 in the year 1999, and 31 December
     2002 has week number 1 in the year 2003.
 
@@ -588,33 +654,282 @@ int QDate::weekNumber(int *yearNumber) const
     if (!isValid())
         return 0;
 
-    int year = QDate::year();
-    int yday = dayOfYear();
-    int wday = dayOfWeek();
-
-    int week = (yday - wday + 10) / 7;
-
-    if (week == 0) {
-        // last week of previous year
-        --year;
-        week = (yday + 365 + (QDate::isLeapYear(year) ? 1 : 0) - wday + 10) / 7;
-        Q_ASSERT(week == 52 || week == 53);
-    } else if (week == 53) {
-        // maybe first week of next year
-        int w = (yday - 365 - (QDate::isLeapYear(year) ? 1 : 0) - wday + 10) / 7;
-        if (w > 0) {
-            ++year;
-            week = w;
-        }
-        Q_ASSERT(week == 53 || week == 1);
-    }
+    // This could be replaced by use of QIso8601Calendar, once we implement it.
+    // The Thursday of the same week determines our answer:
+    QDate thursday(addDays(4 - dayOfWeek()));
+    int year = thursday.year();
+    // Week n's Thurs's DOY has 1 <= DOY - 7*(n-1) < 8, so 0 <= DOY + 6 - 7*n < 7:
+    int week = (thursday.dayOfYear() + 6) / 7;
 
-    if (yearNumber != 0)
+    if (yearNumber)
         *yearNumber = year;
     return week;
 }
 
+static bool inDateTimeRange(qint64 jd, bool start)
+{
+    using Bounds = std::numeric_limits<qint64>;
+    if (jd < Bounds::min() + JULIAN_DAY_FOR_EPOCH)
+        return false;
+    jd -= JULIAN_DAY_FOR_EPOCH;
+    const qint64 maxDay = Bounds::max() / MSECS_PER_DAY;
+    const qint64 minDay = Bounds::min() / MSECS_PER_DAY - 1;
+    // (Divisions rounded towards zero, as MSECS_PER_DAY has factors other than two.)
+    // Range includes start of last day and end of first:
+    if (start)
+        return jd > minDay && jd <= maxDay;
+    return jd >= minDay && jd < maxDay;
+}
+
+static QDateTime toEarliest(const QDate &day, const QDateTime &form)
+{
+    const Qt::TimeSpec spec = form.timeSpec();
+    const int offset = (spec == Qt::OffsetFromUTC) ? form.offsetFromUtc() : 0;
+#if QT_CONFIG(timezone)
+    QTimeZone zone;
+    if (spec == Qt::TimeZone)
+        zone = form.timeZone();
+#endif
+    auto moment = [=](QTime time) {
+        switch (spec) {
+        case Qt::OffsetFromUTC: return QDateTime(day, time, spec, offset);
+#if QT_CONFIG(timezone)
+        case Qt::TimeZone: return QDateTime(day, time, zone);
+#endif
+        default: return QDateTime(day, time, spec);
+        }
+    };
+    // Longest routine time-zone transition is 2 hours:
+    QDateTime when = moment(QTime(2, 0));
+    if (!when.isValid()) {
+        // Noon should be safe ...
+        when = moment(QTime(12, 0));
+        if (!when.isValid()) {
+            // ... unless it's a 24-hour jump (moving the date-line)
+            when = moment(QTime(23, 59, 59, 999));
+            if (!when.isValid())
+                return QDateTime();
+        }
+    }
+    int high = when.time().msecsSinceStartOfDay() / 60000;
+    int low = 0;
+    // Binary chop to the right minute
+    while (high > low + 1) {
+        int mid = (high + low) / 2;
+        QDateTime probe = moment(QTime(mid / 60, mid % 60));
+        if (probe.isValid() && probe.date() == day) {
+            high = mid;
+            when = probe;
+        } else {
+            low = mid;
+        }
+    }
+    return when;
+}
+
+/*!
+    \since 5.14
+    \fn QDateTime QDate::startOfDay(Qt::TimeSpec spec, int offsetSeconds) const
+    \fn QDateTime QDate::startOfDay(const QTimeZone &zone) const
+
+    Returns the start-moment of the day.  Usually, this shall be midnight at the
+    start of the day: however, if a time-zone transition causes the given date
+    to skip over that midnight (e.g. a DST spring-forward skipping from the end
+    of the previous day to 01:00 of the new day), the actual earliest time in
+    the day is returned.  This can only arise when the start-moment is specified
+    in terms of a time-zone (by passing its QTimeZone as \a zone) or in terms of
+    local time (by passing Qt::LocalTime as \a spec; this is its default).
+
+    The \a offsetSeconds is ignored unless \a spec is Qt::OffsetFromUTC, when it
+    gives the implied zone's offset from UTC.  As UTC and such zones have no
+    transitions, the start of the day is QTime(0, 0) in these cases.
+
+    In the rare case of a date that was entirely skipped (this happens when a
+    zone east of the international date-line switches to being west of it), the
+    return shall be invalid.  Passing Qt::TimeZone as \a spec (instead of
+    passing a QTimeZone) or passing an invalid time-zone as \a zone will also
+    produce an invalid result, as shall dates that start outside the range
+    representable by QDateTime.
+
+    \sa endOfDay()
+*/
+QDateTime QDate::startOfDay(Qt::TimeSpec spec, int offsetSeconds) const
+{
+    if (!inDateTimeRange(jd, true))
+        return QDateTime();
+
+    switch (spec) {
+    case Qt::TimeZone: // should pass a QTimeZone instead of Qt::TimeZone
+        qWarning() << "Called QDate::startOfDay(Qt::TimeZone) on" << *this;
+        return QDateTime();
+    case Qt::OffsetFromUTC:
+    case Qt::UTC:
+        return QDateTime(*this, QTime(0, 0), spec, offsetSeconds);
+
+    case Qt::LocalTime:
+        if (offsetSeconds)
+            qWarning("Ignoring offset (%d seconds) passed with Qt::LocalTime", offsetSeconds);
+        break;
+    }
+    QDateTime when(*this, QTime(0, 0), spec);
+    if (!when.isValid())
+        when = toEarliest(*this, when);
+
+    return when.isValid() ? when : QDateTime();
+}
+
+#if QT_CONFIG(timezone)
+/*!
+  \overload
+  \since 5.14
+*/
+QDateTime QDate::startOfDay(const QTimeZone &zone) const
+{
+    if (!inDateTimeRange(jd, true) || !zone.isValid())
+        return QDateTime();
+
+    QDateTime when(*this, QTime(0, 0), zone);
+    if (when.isValid())
+        return when;
+
+    // The start of the day must have fallen in a spring-forward's gap; find the spring-forward:
+    if (zone.hasTransitions()) {
+        QTimeZone::OffsetData tran = zone.previousTransition(QDateTime(*this, QTime(23, 59, 59, 999), zone));
+        const QDateTime &at = tran.atUtc.toTimeZone(zone);
+        if (at.isValid() && at.date() == *this)
+            return at;
+    }
+
+    when = toEarliest(*this, when);
+    return when.isValid() ? when : QDateTime();
+}
+#endif // timezone
+
+static QDateTime toLatest(const QDate &day, const QDateTime &form)
+{
+    const Qt::TimeSpec spec = form.timeSpec();
+    const int offset = (spec == Qt::OffsetFromUTC) ? form.offsetFromUtc() : 0;
+#if QT_CONFIG(timezone)
+    QTimeZone zone;
+    if (spec == Qt::TimeZone)
+        zone = form.timeZone();
+#endif
+    auto moment = [=](QTime time) {
+        switch (spec) {
+        case Qt::OffsetFromUTC: return QDateTime(day, time, spec, offset);
+#if QT_CONFIG(timezone)
+        case Qt::TimeZone: return QDateTime(day, time, zone);
+#endif
+        default: return QDateTime(day, time, spec);
+        }
+    };
+    // Longest routine time-zone transition is 2 hours:
+    QDateTime when = moment(QTime(21, 59, 59, 999));
+    if (!when.isValid()) {
+        // Noon should be safe ...
+        when = moment(QTime(12, 0));
+        if (!when.isValid()) {
+            // ... unless it's a 24-hour jump (moving the date-line)
+            when = moment(QTime(0, 0));
+            if (!when.isValid())
+                return QDateTime();
+        }
+    }
+    int high = 24 * 60;
+    int low = when.time().msecsSinceStartOfDay() / 60000;
+    // Binary chop to the right minute
+    while (high > low + 1) {
+        int mid = (high + low) / 2;
+        QDateTime probe = moment(QTime(mid / 60, mid % 60, 59, 999));
+        if (probe.isValid() && probe.date() == day) {
+            low = mid;
+            when = probe;
+        } else {
+            high = mid;
+        }
+    }
+    return when;
+}
+
+/*!
+    \since 5.14
+    \fn QDateTime QDate::endOfDay(Qt::TimeSpec spec, int offsetSeconds) const
+    \fn QDateTime QDate::endOfDay(const QTimeZone &zone) const
+
+    Returns the end-moment of the day.  Usually, this is one millisecond before
+    the midnight at the end of the day: however, if a time-zone transition
+    causes the given date to skip over that midnight (e.g. a DST spring-forward
+    skipping from just before 23:00 to the start of the next day), the actual
+    latest time in the day is returned.  This can only arise when the
+    start-moment is specified in terms of a time-zone (by passing its QTimeZone
+    as \a zone) or in terms of local time (by passing Qt::LocalTime as \a spec;
+    this is its default).
+
+    The \a offsetSeconds is ignored unless \a spec is Qt::OffsetFromUTC, when it
+    gives the implied zone's offset from UTC.  As UTC and such zones have no
+    transitions, the end of the day is QTime(23, 59, 59, 999) in these cases.
+
+    In the rare case of a date that was entirely skipped (this happens when a
+    zone east of the international date-line switches to being west of it), the
+    return shall be invalid.  Passing Qt::TimeZone as \a spec (instead of
+    passing a QTimeZone) will also produce an invalid result, as shall dates
+    that end outside the range representable by QDateTime.
+
+    \sa startOfDay()
+*/
+QDateTime QDate::endOfDay(Qt::TimeSpec spec, int offsetSeconds) const
+{
+    if (!inDateTimeRange(jd, false))
+        return QDateTime();
+
+    switch (spec) {
+    case Qt::TimeZone: // should pass a QTimeZone instead of Qt::TimeZone
+        qWarning() << "Called QDate::endOfDay(Qt::TimeZone) on" << *this;
+        return QDateTime();
+    case Qt::UTC:
+    case Qt::OffsetFromUTC:
+        return QDateTime(*this, QTime(23, 59, 59, 999), spec, offsetSeconds);
+
+    case Qt::LocalTime:
+        if (offsetSeconds)
+            qWarning("Ignoring offset (%d seconds) passed with Qt::LocalTime", offsetSeconds);
+        break;
+    }
+    QDateTime when(*this, QTime(23, 59, 59, 999), spec);
+    if (!when.isValid())
+        when = toLatest(*this, when);
+    return when.isValid() ? when : QDateTime();
+}
+
+#if QT_CONFIG(timezone)
+/*!
+  \overload
+  \since 5.14
+*/
+QDateTime QDate::endOfDay(const QTimeZone &zone) const
+{
+    if (!inDateTimeRange(jd, false) || !zone.isValid())
+        return QDateTime();
+
+    QDateTime when(*this, QTime(23, 59, 59, 999), zone);
+    if (when.isValid())
+        return when;
+
+    // The end of the day must have fallen in a spring-forward's gap; find the spring-forward:
+    if (zone.hasTransitions()) {
+        QTimeZone::OffsetData tran = zone.nextTransition(QDateTime(*this, QTime(0, 0), zone));
+        const QDateTime &at = tran.atUtc.toTimeZone(zone);
+        if (at.isValid() && at.date() == *this)
+            return at;
+    }
+
+    when = toLatest(*this, when);
+    return when.isValid() ? when : QDateTime();
+}
+#endif // timezone
+
 #if QT_DEPRECATED_SINCE(5, 11) && QT_CONFIG(textdate)
+
 /*!
     \since 4.5
     \deprecated
@@ -651,9 +966,11 @@ QString QDate::shortMonthName(int month, QDate::MonthNameType type)
 {
     switch (type) {
     case QDate::DateFormat:
-        return QLocale::system().monthName(month, QLocale::ShortFormat);
+        return QCalendar().monthName(QLocale::system(), month,
+                                     QCalendar::Unspecified, QLocale::ShortFormat);
     case QDate::StandaloneFormat:
-        return QLocale::system().standaloneMonthName(month, QLocale::ShortFormat);
+        return QCalendar().standaloneMonthName(QLocale::system(), month,
+                                               QCalendar::Unspecified, QLocale::ShortFormat);
     }
     return QString();
 }
@@ -694,9 +1011,11 @@ QString QDate::longMonthName(int month, MonthNameType type)
 {
     switch (type) {
     case QDate::DateFormat:
-        return QLocale::system().monthName(month, QLocale::LongFormat);
+        return QCalendar().monthName(QLocale::system(), month,
+                                     QCalendar::Unspecified, QLocale::LongFormat);
     case QDate::StandaloneFormat:
-        return QLocale::system().standaloneMonthName(month, QLocale::LongFormat);
+        return QCalendar().standaloneMonthName(QLocale::system(), month,
+                                               QCalendar::Unspecified, QLocale::LongFormat);
     }
     return QString();
 }
@@ -781,24 +1100,32 @@ QString QDate::longDayName(int weekday, MonthNameType type)
 #if QT_CONFIG(datestring)
 
 #if QT_CONFIG(textdate)
+static QString toStringTextDate(QDate date, QCalendar cal)
+{
+    if (date.isValid()) {
+        const auto parts = cal.partsFromDate(date);
+        if (parts.isValid()) {
+            const QLatin1Char sp(' ');
+            return QLocale::system().dayName(cal.dayOfWeek(date), QLocale::ShortFormat) + sp
+                + cal.monthName(QLocale::system(), parts.month, parts.year, QLocale::ShortFormat)
+                + sp + QString::number(parts.day) + sp + QString::number(parts.year);
+        }
+    }
+    return QString();
+}
+
 static QString toStringTextDate(QDate date)
 {
-    const ParsedDate pd = getDateFromJulianDay(date.toJulianDay());
-    static const QLatin1Char sp(' ');
-    return QLocale::system().dayName(date.dayOfWeek(), QLocale::ShortFormat) + sp
-         + QLocale::system().monthName(pd.month, QLocale::ShortFormat) + sp
-         + QString::number(pd.day) + sp
-         + QString::number(pd.year);
+    return toStringTextDate(date, QCalendar());
 }
 #endif // textdate
 
-static QString toStringIsoDate(qint64 jd)
+static QString toStringIsoDate(const QDate &date)
 {
-    const ParsedDate pd = getDateFromJulianDay(jd);
-    if (pd.year >= 0 && pd.year <= 9999)
-        return QString::asprintf("%04d-%02d-%02d", pd.year, pd.month, pd.day);
-    else
-        return QString();
+    const auto parts = QCalendar().partsFromDate(date);
+    if (parts.isValid() && parts.year >= 0 && parts.year <= 9999)
+        return QString::asprintf("%04d-%02d-%02d", parts.year, parts.month, parts.day);
+    return QString();
 }
 
 /*!
@@ -863,7 +1190,7 @@ QString QDate::toString(Qt::DateFormat format) const
     case Qt::DefaultLocaleLongDate:
         return QLocale().toString(*this, QLocale::LongFormat);
     case Qt::RFC2822Date:
-        return QLocale::c().toString(*this, QStringViewLiteral("dd MMM yyyy"));
+        return QLocale::c().toString(*this, u"dd MMM yyyy");
     default:
 #if QT_CONFIG(textdate)
     case Qt::TextDate:
@@ -871,7 +1198,7 @@ QString QDate::toString(Qt::DateFormat format) const
 #endif
     case Qt::ISODate:
     case Qt::ISODateWithMs:
-        return toStringIsoDate(jd);
+        return toStringIsoDate(*this);
     }
 }
 
@@ -945,6 +1272,47 @@ QString QDate::toString(const QString &format) const
 }
 #endif
 
+QString QDate::toString(Qt::DateFormat format, QCalendar cal) const
+{
+    if (!isValid())
+        return QString();
+
+    switch (format) {
+    case Qt::SystemLocaleDate:
+    case Qt::SystemLocaleShortDate:
+        return QLocale::system().toString(*this, QLocale::ShortFormat, cal);
+    case Qt::SystemLocaleLongDate:
+        return QLocale::system().toString(*this, QLocale::LongFormat, cal);
+    case Qt::LocaleDate:
+    case Qt::DefaultLocaleShortDate:
+        return QLocale().toString(*this, QLocale::ShortFormat, cal);
+    case Qt::DefaultLocaleLongDate:
+        return QLocale().toString(*this, QLocale::LongFormat, cal);
+    case Qt::RFC2822Date:
+        return QLocale::c().toString(*this, QStringView(u"dd MMM yyyy"), cal);
+    default:
+#ifndef QT_NO_TEXTDATE
+    case Qt::TextDate:
+        return toStringTextDate(*this, cal);
+#endif
+    case Qt::ISODate:
+    case Qt::ISODateWithMs:
+        return toStringIsoDate(*this);
+    }
+}
+
+QString QDate::toString(QStringView format, QCalendar cal) const
+{
+    return QLocale::system().toString(*this, format, cal); // QLocale::c() ### Qt6
+}
+
+#if QT_STRINGVIEW_LEVEL < 2
+QString QDate::toString(const QString &format, QCalendar cal) const
+{
+    return toString(qToStringViewIgnoringNull(format), cal);
+}
+#endif
+
 #endif // datestring
 
 /*!
@@ -964,21 +1332,36 @@ QString QDate::toString(const QString &format) const
 /*!
     \since 4.2
 
-    Sets the date's \a year, \a month, and \a day. Returns \c true if
-    the date is valid; otherwise returns \c false.
-
-    If the specified date is invalid, the QDate object is set to be
-    invalid.
+    Sets this to represent the date, in the Gregorian calendar, with the given
+    \a year, \a month and \a day numbers. Returns true if the resulting date is
+    valid, otherwise it sets this to represent an invalid date and returns
+    false.
 
-    \sa isValid()
+    \sa isValid(), QCalendar::dateFromParts()
 */
 bool QDate::setDate(int year, int month, int day)
 {
-    if (isValid(year, month, day))
-        jd = julianDayFromDate(year, month, day);
-    else
-        jd = nullJd();
+    if (QGregorianCalendar::julianFromParts(year, month, day, &jd))
+        return true;
+
+    jd = nullJd();
+    return false;
+}
+
+/*!
+    \since 5.14
+
+    Sets this to represent the date, in the given calendar \a cal, with the
+    given \a year, \a month and \a day numbers. Returns true if the resulting
+    date is valid, otherwise it sets this to represent an invalid date and
+    returns false.
+
+    \sa isValid(), QCalendar::dateFromParts()
+*/
 
+bool QDate::setDate(int year, int month, int day, QCalendar cal)
+{
+    *this = QDate(year, month, day, cal);
     return isValid();
 }
 
@@ -992,20 +1375,21 @@ bool QDate::setDate(int year, int month, int day)
 
     \note In Qt versions prior to 5.7, this function is marked as non-\c{const}.
 
-    \sa year(), month(), day(), isValid()
+    \sa year(), month(), day(), isValid(), QCalendar::partsFromDate()
 */
 void QDate::getDate(int *year, int *month, int *day) const
 {
-    ParsedDate pd = { 0, 0, 0 };
+    QCalendar::YearMonthDay parts; // invalid by default
     if (isValid())
-        pd = getDateFromJulianDay(jd);
+        parts = QGregorianCalendar::partsFromJulian(jd);
 
+    const bool ok = parts.isValid();
     if (year)
-        *year = pd.year;
+        *year = ok ? parts.year : 0;
     if (month)
-        *month = pd.month;
+        *month = ok ? parts.month : 0;
     if (day)
-        *day = pd.day;
+        *day = ok ? parts.day : 0;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -1043,96 +1427,129 @@ QDate QDate::addDays(qint64 ndays) const
     Returns a QDate object containing a date \a nmonths later than the
     date of this object (or earlier if \a nmonths is negative).
 
-    \note If the ending day/month combination does not exist in the
-    resulting month/year, this function will return a date that is the
-    latest valid date.
+    Uses \a cal as calendar, if supplied, else the Gregorian calendar.
+
+    \note If the ending day/month combination does not exist in the resulting
+    month/year, this function will return a date that is the latest valid date
+    in the selected month.
 
     \sa addDays(), addYears()
 */
 
-QDate QDate::addMonths(int nmonths) const
+QDate QDate::addMonths(int nmonths, QCalendar cal) const
 {
     if (!isValid())
         return QDate();
-    if (!nmonths)
+
+    if (nmonths == 0)
         return *this;
 
-    int old_y, y, m, d;
-    {
-        const ParsedDate pd = getDateFromJulianDay(jd);
-        y = pd.year;
-        m = pd.month;
-        d = pd.day;
+    auto parts = cal.partsFromDate(*this);
+
+    if (!parts.isValid())
+        return QDate();
+    Q_ASSERT(parts.year || cal.hasYearZero());
+
+    parts.month += nmonths;
+    while (parts.month <= 0) {
+        if (--parts.year || cal.hasYearZero())
+            parts.month += cal.monthsInYear(parts.year);
     }
-    old_y = y;
-
-    bool increasing = nmonths > 0;
-
-    while (nmonths != 0) {
-        if (nmonths < 0 && nmonths + 12 <= 0) {
-            y--;
-            nmonths+=12;
-        } else if (nmonths < 0) {
-            m+= nmonths;
-            nmonths = 0;
-            if (m <= 0) {
-                --y;
-                m += 12;
-            }
-        } else if (nmonths - 12 >= 0) {
-            y++;
-            nmonths -= 12;
-        } else if (m == 12) {
-            y++;
-            m = 0;
-        } else {
-            m += nmonths;
-            nmonths = 0;
-            if (m > 12) {
-                ++y;
-                m -= 12;
-            }
-        }
+    int count = cal.monthsInYear(parts.year);
+    while (parts.month > count) {
+        parts.month -= count;
+        count = (++parts.year || cal.hasYearZero()) ? cal.monthsInYear(parts.year) : 0;
     }
 
-    // was there a sign change?
-    if ((old_y > 0 && y <= 0) ||
-        (old_y < 0 && y >= 0))
-        // yes, adjust the date by +1 or -1 years
-        y += increasing ? +1 : -1;
+    return fixedDate(std::move(parts), cal);
+}
 
-    return fixedDate(y, m, d);
+/*!
+  \overload
+*/
+
+QDate QDate::addMonths(int nmonths) const
+{
+    if (isNull())
+        return QDate();
+
+    if (nmonths == 0)
+        return *this;
+
+    auto parts = QGregorianCalendar::partsFromJulian(jd);
+
+    if (!parts.isValid())
+        return QDate();
+    Q_ASSERT(parts.year);
+
+    parts.month += nmonths;
+    while (parts.month <= 0) {
+        if (--parts.year) // skip over year 0
+            parts.month += 12;
+    }
+    while (parts.month > 12) {
+        parts.month -= 12;
+        if (!++parts.year) // skip over year 0
+            ++parts.year;
+    }
+
+    return fixedDate(std::move(parts));
 }
 
 /*!
     Returns a QDate object containing a date \a nyears later than the
     date of this object (or earlier if \a nyears is negative).
 
-    \note If the ending day/month combination does not exist in the
-    resulting year (i.e., if the date was Feb 29 and the final year is
-    not a leap year), this function will return a date that is the
-    latest valid date (that is, Feb 28).
+    Uses \a cal as calendar, if supplied, else the Gregorian calendar.
+
+    \note If the ending day/month combination does not exist in the resulting
+    year (e.g., for the Gregorian calendar, if the date was Feb 29 and the final
+    year is not a leap year), this function will return a date that is the
+    latest valid date in the given month (in the example, Feb 28).
 
     \sa addDays(), addMonths()
 */
 
-QDate QDate::addYears(int nyears) const
+QDate QDate::addYears(int nyears, QCalendar cal) const
 {
     if (!isValid())
         return QDate();
 
-    ParsedDate pd = getDateFromJulianDay(jd);
+    auto parts = cal.partsFromDate(*this);
+    if (!parts.isValid())
+        return QDate();
 
-    int old_y = pd.year;
-    pd.year += nyears;
+    int old_y = parts.year;
+    parts.year += nyears;
 
-    // was there a sign change?
-    if ((old_y > 0 && pd.year <= 0) ||
-        (old_y < 0 && pd.year >= 0))
-        // yes, adjust the date by +1 or -1 years
-        pd.year += nyears > 0 ? +1 : -1;
+    // If we just crossed (or hit) a missing year zero, adjust year by +/- 1:
+    if (!cal.hasYearZero() && ((old_y > 0) != (parts.year > 0) || !parts.year))
+        parts.year += nyears > 0 ? +1 : -1;
 
-    return fixedDate(pd.year, pd.month, pd.day);
+    return fixedDate(std::move(parts), cal);
+}
+
+/*!
+    \overload
+*/
+
+QDate QDate::addYears(int nyears) const
+{
+    if (isNull())
+        return QDate();
+
+    auto parts = QGregorianCalendar::partsFromJulian(jd);
+    if (!parts.isValid())
+        return QDate();
+
+    int old_y = parts.year;
+    parts.year += nyears;
+
+    // If we just crossed (or hit) a missing year zero, adjust year by +/- 1:
+    if ((old_y > 0) != (parts.year > 0) || !parts.year)
+        parts.year += nyears > 0 ? +1 : -1;
+
+    return fixedDate(std::move(parts));
 }
 
 /*!
@@ -1209,8 +1626,6 @@ qint64 QDate::daysTo(const QDate &d) const
 
 #if QT_CONFIG(datestring)
 /*!
-    \fn QDate QDate::fromString(const QString &string, Qt::DateFormat format)
-
     Returns the QDate represented by the \a string, using the
     \a format given, or an invalid date if the string cannot be
     parsed.
@@ -1221,7 +1636,8 @@ qint64 QDate::daysTo(const QDate &d) const
 
     \sa toString(), QLocale::toDate()
 */
-QDate QDate::fromString(const QString& string, Qt::DateFormat format)
+
+QDate QDate::fromString(const QString &string, Qt::DateFormat format)
 {
     if (string.isEmpty())
         return QDate();
@@ -1247,19 +1663,17 @@ QDate QDate::fromString(const QString& string, Qt::DateFormat format)
         if (parts.count() != 4)
             return QDate();
 
-        QStringRef monthName = parts.at(1);
-        const int month = fromShortMonthName(monthName);
-        if (month == -1) {
-            // Month name matches neither English nor other localised name.
-            return QDate();
-        }
-
         bool ok = false;
         int year = parts.at(3).toInt(&ok);
-        if (!ok)
+        int day = ok ? parts.at(2).toInt(&ok) : 0;
+        if (!ok || !day)
+            return QDate();
+
+        const int month = fromShortMonthName(parts.at(1), year);
+        if (month == -1) // Month name matches no English or localised name.
             return QDate();
 
-        return QDate(year, month, parts.at(2).toInt());
+        return QDate(year, month, day);
         }
 #endif // textdate
     case Qt::ISODate: {
@@ -1278,11 +1692,13 @@ QDate QDate::fromString(const QString& string, Qt::DateFormat format)
 }
 
 /*!
-    \fn QDate QDate::fromString(const QString &string, const QString &format)
-
     Returns the QDate represented by the \a string, using the \a
     format given, or an invalid date if the string cannot be parsed.
 
+    Uses \a cal as calendar if supplied, else the Gregorian calendar. Ranges of
+    values in the format descriptions below are for the latter; they may be
+    different for other calendars.
+
     These expressions may be used for the format:
 
     \table
@@ -1342,58 +1758,61 @@ QDate QDate::fromString(const QString& string, Qt::DateFormat format)
         QLocale::toDate()
 */
 
-QDate QDate::fromString(const QString &string, const QString &format)
+QDate QDate::fromString(const QString &string, const QString &format, QCalendar cal)
 {
     QDate date;
 #if QT_CONFIG(datetimeparser)
-    QDateTimeParser dt(QVariant::Date, QDateTimeParser::FromString);
+    QDateTimeParser dt(QVariant::Date, QDateTimeParser::FromString, cal);
     // dt.setDefaultLocale(QLocale::c()); ### Qt 6
     if (dt.parseFormat(format))
         dt.fromString(string, &date, 0);
 #else
     Q_UNUSED(string);
     Q_UNUSED(format);
+    Q_UNUSED(cal);
 #endif
     return date;
 }
+
+/*!
+  \overload
+*/
+
+QDate QDate::fromString(const QString &string, const QString &format)
+{
+    return fromString(string, format, QCalendar());
+}
 #endif // datestring
 
 /*!
     \overload
 
-    Returns \c true if the specified date (\a year, \a month, and \a
-    day) is valid; otherwise returns \c false.
+    Returns \c true if the specified date (\a year, \a month, and \a day) is
+    valid in the Gregorian calendar; otherwise returns \c false.
 
     Example:
     \snippet code/src_corelib_tools_qdatetime.cpp 4
 
-    \sa isNull(), setDate()
+    \sa isNull(), setDate(), QCalendar::isDateValid()
 */
 
 bool QDate::isValid(int year, int month, int day)
 {
-    // there is no year 0 in the Gregorian calendar
-    if (year == 0)
-        return false;
-
-    return (day > 0 && month > 0 && month <= 12) &&
-           (day <= monthDays[month] || (day == 29 && month == 2 && isLeapYear(year)));
+    return QGregorianCalendar::validParts(year, month, day);
 }
 
 /*!
     \fn bool QDate::isLeapYear(int year)
 
-    Returns \c true if the specified \a year is a leap year; otherwise
-    returns \c false.
+    Returns \c true if the specified \a year is a leap year in the Gregorian
+    calendar; otherwise returns \c false.
+
+    \sa QCalendar::isLeapYear()
 */
 
 bool QDate::isLeapYear(int y)
 {
-    // No year 0 in Gregorian calendar, so -1, -5, -9 etc are leap years
-    if ( y < 1)
-        ++y;
-
-    return (y % 4 == 0 && y % 100 != 0) || y % 400 == 0;
+    return QGregorianCalendar::leapTest(y);
 }
 
 /*! \fn static QDate QDate::fromJulianDay(qint64 jd)
@@ -1422,12 +1841,10 @@ bool QDate::isLeapYear(int y)
     \brief The QTime class provides clock time functions.
 
 
-    A QTime object contains a clock time, which it can express as the
-    numbers of hours, minutes, seconds, and milliseconds since
-    midnight. It can read the current time from the system clock and
-    measure a span of elapsed time. It provides functions for
-    comparing times and for manipulating a time by adding a number of
-    milliseconds.
+    A QTime object contains a clock time, which it can express as the numbers of
+    hours, minutes, seconds, and milliseconds since midnight. It provides
+    functions for comparing times and for manipulating a time by adding a number
+    of milliseconds.
 
     QTime uses the 24-hour clock format; it has no concept of AM/PM.
     Unlike QDateTime, QTime knows nothing about time zones or
@@ -1452,18 +1869,15 @@ bool QDate::isLeapYear(int y)
     objects; an earlier time is considered smaller than a later one;
     if A.msecsTo(B) is positive, then A < B.
 
-    QTime can be used to measure a span of elapsed time using the
-    start(), restart(), and elapsed() functions.
-
     \sa QDate, QDateTime
 */
 
 /*!
     \fn QTime::QTime()
 
-    Constructs a null time object. A null time can be a QTime(0, 0, 0, 0)
-    (i.e., midnight) object, except that isNull() returns \c true and isValid()
-    returns \c false.
+    Constructs a null time object. For a null time, isNull() returns \c true and
+    isValid() returns \c false. If you need a zero time, use QTime(0, 0).  For
+    the start of a day, see QDate::startOfDay().
 
     \sa isNull(), isValid()
 */
@@ -1977,8 +2391,6 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format,
 }
 
 /*!
-    \fn QTime QTime::fromString(const QString &string, Qt::DateFormat format)
-
     Returns the time represented in the \a string as a QTime using the
     \a format given, or an invalid time if this is not possible.
 
@@ -1990,7 +2402,7 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format,
 
     \sa toString(), QLocale::toTime()
 */
-QTime QTime::fromString(const QString& string, Qt::DateFormat format)
+QTime QTime::fromString(const QString &string, Qt::DateFormat format)
 {
     if (string.isEmpty())
         return QTime();
@@ -2012,13 +2424,11 @@ QTime QTime::fromString(const QString& string, Qt::DateFormat format)
     case Qt::ISODateWithMs:
     case Qt::TextDate:
     default:
-        return fromIsoTimeString(QStringRef(&string), format, 0);
+        return fromIsoTimeString(QStringRef(&string), format, nullptr);
     }
 }
 
 /*!
-    \fn QTime QTime::fromString(const QString &string, const QString &format)
-
     Returns the QTime represented by the \a string, using the \a
     format given, or an invalid time if the string cannot be parsed.
 
@@ -2075,7 +2485,7 @@ QTime QTime::fromString(const QString &string, const QString &format)
 {
     QTime time;
 #if QT_CONFIG(datetimeparser)
-    QDateTimeParser dt(QVariant::Time, QDateTimeParser::FromString);
+    QDateTimeParser dt(QVariant::Time, QDateTimeParser::FromString, QCalendar());
     // dt.setDefaultLocale(QLocale::c()); ### Qt 6
     if (dt.parseFormat(format))
         dt.fromString(string, 0, &time);
@@ -2108,7 +2518,7 @@ bool QTime::isValid(int h, int m, int s, int ms)
     return (uint)h < 24 && (uint)m < 60 && (uint)s < 60 && (uint)ms < 1000;
 }
 
-
+#if QT_DEPRECATED_SINCE(5, 14) // ### Qt 6: remove
 /*!
     Sets this time to the current time. This is practical for timing:
 
@@ -2177,6 +2587,7 @@ int QTime::elapsed() const
         n += 86400 * 1000;
     return n;
 }
+#endif // Use QElapsedTimer instead !
 
 /*****************************************************************************
   QDateTime static helper functions
@@ -2212,7 +2623,7 @@ static int qt_timezone()
         // - It also takes DST into account, so we need to adjust it to always
         //   get the Standard Time offset.
         return -t.tm_gmtoff + (t.tm_isdst ? (long)SECS_PER_HOUR : 0L);
-#elif defined(Q_OS_INTEGRITY)
+#elif defined(Q_OS_INTEGRITY) || defined(Q_OS_RTEMS)
         return 0;
 #else
         return timezone;
@@ -2260,7 +2671,7 @@ int QDateTimeParser::startsWithLocalTimeZone(const QStringRef name)
 // then null date/time will be returned, you should adjust the date first if
 // you need a guaranteed result.
 static qint64 qt_mktime(QDate *date, QTime *time, QDateTimePrivate::DaylightStatus *daylightStatus,
-                        QString *abbreviation, bool *ok = 0)
+                        QString *abbreviation, bool *ok = nullptr)
 {
     const qint64 msec = time->msec();
     int yy, mm, dd;
@@ -2349,7 +2760,7 @@ static bool qt_localtime(qint64 msecsSinceEpoch, QDate *localDate, QTime *localT
 #if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // Use the reentrant version of localtime() where available
     // as is thread-safe and doesn't use a shared static data area
-    tm *res = 0;
+    tm *res = nullptr;
     res = localtime_r(&secsSinceEpoch, &local);
     if (res)
         valid = true;
@@ -2359,7 +2770,7 @@ static bool qt_localtime(qint64 msecsSinceEpoch, QDate *localDate, QTime *localT
 #else
     // Returns shared static data which may be overwritten at any time
     // So copy the result asap
-    tm *res = 0;
+    tm *res = nullptr;
     res = localtime(&secsSinceEpoch);
     if (res) {
         local = *res;
@@ -2393,8 +2804,8 @@ static void msecsToTime(qint64 msecs, QDate *date, QTime *time)
     qint64 jd = JULIAN_DAY_FOR_EPOCH;
     qint64 ds = 0;
 
-    if (qAbs(msecs) >= MSECS_PER_DAY) {
-        jd += (msecs / MSECS_PER_DAY);
+    if (msecs >= MSECS_PER_DAY || msecs <= -MSECS_PER_DAY) {
+        jd += msecs / MSECS_PER_DAY;
         msecs %= MSECS_PER_DAY;
     }
 
@@ -2422,7 +2833,7 @@ static qint64 timeToMSecs(const QDate &date, const QTime &time)
 
 // Convert an MSecs Since Epoch into Local Time
 static bool epochMSecsToLocalTime(qint64 msecs, QDate *localDate, QTime *localTime,
-                                  QDateTimePrivate::DaylightStatus *daylightStatus = 0)
+                                  QDateTimePrivate::DaylightStatus *daylightStatus = nullptr)
 {
     if (msecs < 0) {
         // Docs state any LocalTime before 1970-01-01 will *not* have any Daylight Time applied
@@ -2462,8 +2873,8 @@ static bool epochMSecsToLocalTime(qint64 msecs, QDate *localDate, QTime *localTi
 // values from mktime for the adjusted local date and time.
 static qint64 localMSecsToEpochMSecs(qint64 localMsecs,
                                      QDateTimePrivate::DaylightStatus *daylightStatus,
-                                     QDate *localDate = 0, QTime *localTime = 0,
-                                     QString *abbreviation = 0)
+                                     QDate *localDate = nullptr, QTime *localTime = nullptr,
+                                     QString *abbreviation = nullptr)
 {
     QDate dt;
     QTime tm;
@@ -2766,7 +3177,7 @@ static void setDateTime(QDateTimeData &d, const QDate &date, const QTime &time)
     if (!useTime.isValid() && date.isValid())
         useTime = QTime::fromMSecsSinceStartOfDay(0);
 
-    QDateTimePrivate::StatusFlags newStatus = 0;
+    QDateTimePrivate::StatusFlags newStatus = { };
 
     // Set date value and status
     qint64 days = 0;
@@ -2844,7 +3255,7 @@ inline QDateTime::Data::Data(Qt::TimeSpec spec)
         // the structure is too small, we need to detach
         d = new QDateTimePrivate;
         d->ref.ref();
-        d->m_status = mergeSpec(0, spec);
+        d->m_status = mergeSpec(nullptr, spec);
     }
 }
 
@@ -2929,13 +3340,13 @@ inline void QDateTime::Data::detach()
         x->m_status = QDateTimePrivate::StatusFlag(data.status & ~QDateTimePrivate::ShortData);
         x->m_msecs = data.msecs;
     } else {
-        if (d->ref.load() == 1)
+        if (d->ref.loadRelaxed() == 1)
             return;
 
         x = new QDateTimePrivate(*d);
     }
 
-    x->ref.store(1);
+    x->ref.storeRelaxed(1);
     if (!wasShort && !d->ref.deref())
         delete d;
     d = x;
@@ -2951,7 +3362,7 @@ inline QDateTimePrivate *QDateTime::Data::operator->()
 {
     // should we attempt to detach here?
     Q_ASSERT(!isShort());
-    Q_ASSERT(d->ref.load() == 1);
+    Q_ASSERT(d->ref.loadRelaxed() == 1);
     return d;
 }
 
@@ -3021,15 +3432,15 @@ inline qint64 QDateTimePrivate::zoneMSecsToEpochMSecs(qint64 zoneMSecs, const QT
     datetime by adding a number of seconds, days, months, or years.
 
     QDateTime can describe datetimes with respect to \l{Qt::LocalTime}{local
-    time}, to \l{Qt::UTC}{UTC}, to a specified \l{Qt::OffsetFromUTC}{offset
-    from UTC} or to a specified \l{Qt::TimeZone}{time zone}, in conjunction
-    with the QTimeZone class. For example, a time zone of "Europe/Berlin" will
-    apply the daylight-saving rules as used in Germany since 1970. In contrast,
-    an offset from UTC of +3600 seconds is one hour ahead of UTC (usually
-    written in ISO standard notation as "UTC+01:00"), with no daylight-saving
-    offset or changes. When using either local time or a specified time zone,
-    time-zone transitions such as the starts and ends of daylight-saving time
-    (DST) are taken into account. The choice of system used to represent a
+    time}, to \l{Qt::UTC}{UTC}, to a specified \l{Qt::OffsetFromUTC}{offset from
+    UTC} or to a specified \l{Qt::TimeZone}{time zone}, in conjunction with the
+    QTimeZone class. For example, a time zone of "Europe/Berlin" will apply the
+    daylight-saving rules as used in Germany since 1970. In contrast, an offset
+    from UTC of +3600 seconds is one hour ahead of UTC (usually written in ISO
+    standard notation as "UTC+01:00"), with no daylight-saving offset or
+    changes. When using either local time or a specified time zone, time-zone
+    transitions such as the starts and ends of daylight-saving time (DST; but
+    see below) are taken into account. The choice of system used to represent a
     datetime is described as its "timespec".
 
     A QDateTime object is typically created either by giving a date and time
@@ -3117,11 +3528,13 @@ inline qint64 QDateTimePrivate::zoneMSecsToEpochMSecs(qint64 zoneMSecs, const QT
 
     The range of valid dates taking DST into account is 1970-01-01 to the
     present, and rules are in place for handling DST correctly until 2037-12-31,
-    but these could change. For dates falling outside that range, QDateTime
-    makes a \e{best guess} using the rules for year 1970 or 2037, but we can't
-    guarantee accuracy. This means QDateTime doesn't take into account changes
-    in a time zone before 1970, even if the system's time zone database provides
-    that information.
+    but these could change. For dates after 2037, QDateTime makes a \e{best
+    guess} using the rules for year 2037, but we can't guarantee accuracy;
+    indeed, for \e{any} future date, the time-zone may change its rules before
+    that date comes around. For dates before 1970, QDateTime doesn't take DST
+    changes into account, even if the system's time zone database provides that
+    information, although it does take into account changes to the time-zone's
+    standard offset, where this information is available.
 
     \section2 Offsets From UTC
 
@@ -3135,12 +3548,32 @@ inline qint64 QDateTimePrivate::zoneMSecsToEpochMSecs(qint64 zoneMSecs, const QT
 */
 
 /*!
+    \since 5.14
+    \enum QDateTime::YearRange
+
+    This enumerated type describes the range of years (in the Gregorian
+    calendar) representable by QDateTime:
+
+    \value First The later parts of this year are representable
+    \value Last The earlier parts of this year are representable
+
+    All dates strictly between these two years are also representable.
+    Note, however, that the Gregorian Calendar has no year zero.
+
+    \note QDate can describe dates in a wider range of years.  For most
+    purposes, this makes little difference, as the range of years that QDateTime
+    can support reaches 292 million years either side of 1970.
+
+    \sa isValid(), QDate
+*/
+
+/*!
     Constructs a null datetime (i.e. null date and null time). A null
     datetime is invalid, since the date is invalid.
 
     \sa isValid()
 */
-QDateTime::QDateTime() Q_DECL_NOEXCEPT_EXPR(Data::CanBeSmall)
+QDateTime::QDateTime() noexcept(Data::CanBeSmall)
 {
 }
 
@@ -3151,7 +3584,7 @@ QDateTime::QDateTime() Q_DECL_NOEXCEPT_EXPR(Data::CanBeSmall)
 */
 
 QDateTime::QDateTime(const QDate &date)
-    : d(QDateTimePrivate::create(date, QTime(0, 0, 0), Qt::LocalTime, 0))
+    : d(QDateTimePrivate::create(date, QTime(0, 0), Qt::LocalTime, 0))
 {
 }
 
@@ -3219,7 +3652,7 @@ QDateTime::QDateTime(const QDate &date, const QTime &time, const QTimeZone &time
 /*!
     Constructs a copy of the \a other datetime.
 */
-QDateTime::QDateTime(const QDateTime &other) Q_DECL_NOTHROW
+QDateTime::QDateTime(const QDateTime &other) noexcept
     : d(other.d)
 {
 }
@@ -3229,7 +3662,7 @@ QDateTime::QDateTime(const QDateTime &other) Q_DECL_NOTHROW
     Moves the content of the temporary \a other datetime to this object and
     leaves \a other in an unspecified (but proper) state.
 */
-QDateTime::QDateTime(QDateTime &&other) Q_DECL_NOTHROW
+QDateTime::QDateTime(QDateTime &&other) noexcept
     : d(std::move(other.d))
 {
 }
@@ -3246,7 +3679,7 @@ QDateTime::~QDateTime()
     copy.
 */
 
-QDateTime &QDateTime::operator=(const QDateTime &other) Q_DECL_NOTHROW
+QDateTime &QDateTime::operator=(const QDateTime &other) noexcept
 {
     d = other.d;
     return *this;
@@ -3282,7 +3715,7 @@ bool QDateTime::isNull() const
     hour, i.e. if the transition is at 2am and the clock goes forward to 3am
     then the time from 02:00:00 to 02:59:59.999 is considered to be invalid.
 
-    \sa QDate::isValid(), QTime::isValid()
+    \sa QDateTime::YearRange, QDate::isValid(), QTime::isValid()
 */
 
 bool QDateTime::isValid() const
@@ -3303,7 +3736,7 @@ QDate QDateTime::date() const
     if (!status.testFlag(QDateTimePrivate::ValidDate))
         return QDate();
     QDate dt;
-    msecsToTime(getMSecs(d), &dt, 0);
+    msecsToTime(getMSecs(d), &dt, nullptr);
     return dt;
 }
 
@@ -3319,7 +3752,7 @@ QTime QDateTime::time() const
     if (!status.testFlag(QDateTimePrivate::ValidTime))
         return QTime();
     QTime tm;
-    msecsToTime(getMSecs(d), 0, &tm);
+    msecsToTime(getMSecs(d), nullptr, &tm);
     return tm;
 }
 
@@ -3367,17 +3800,22 @@ QTimeZone QDateTime::timeZone() const
 /*!
     \since 5.2
 
-    Returns the current Offset From UTC in seconds.
-
-    If the timeSpec() is Qt::OffsetFromUTC this will be the value originally set.
+    Returns this date-time's Offset From UTC in seconds.
 
-    If the timeSpec() is Qt::TimeZone this will be the offset effective in the
-    Time Zone including any Daylight-Saving Offset.
-
-    If the timeSpec() is Qt::LocalTime this will be the difference between the
-    Local Time and UTC including any Daylight-Saving Offset.
+    The result depends on timeSpec():
+    \list
+    \li \c Qt::UTC The offset is 0.
+    \li \c Qt::OffsetFromUTC The offset is the value originally set.
+    \li \c Qt::LocalTime The local time's offset from UTC is returned.
+    \li \c Qt::TimeZone The offset used by the time-zone is returned.
+    \endlist
 
-    If the timeSpec() is Qt::UTC this will be 0.
+    For the last two, the offset at this date and time will be returned, taking
+    account of Daylight-Saving Offset unless the date precedes the start of
+    1970. The offset is the difference between the local time or time in the
+    given time-zone and UTC time; it is positive in time-zones ahead of UTC
+    (East of The Prime Meridian), negative for those behind UTC (West of The
+    Prime Meridian).
 
     \sa setOffsetFromUtc()
 */
@@ -3423,6 +3861,9 @@ int QDateTime::offsetFromUtc() const
 
 QString QDateTime::timeZoneAbbreviation() const
 {
+    if (!isValid())
+        return QString();
+
     switch (getSpec(d)) {
     case Qt::UTC:
         return QLatin1String("UTC");
@@ -3437,7 +3878,7 @@ QString QDateTime::timeZoneAbbreviation() const
     case Qt::LocalTime:  {
         QString abbrev;
         auto status = extractDaylightStatus(getStatus(d));
-        localMSecsToEpochMSecs(getMSecs(d), &status, 0, 0, &abbrev);
+        localMSecsToEpochMSecs(getMSecs(d), &status, nullptr, nullptr, &abbrev);
         return abbrev;
         }
     }
@@ -3457,6 +3898,9 @@ QString QDateTime::timeZoneAbbreviation() const
 
 bool QDateTime::isDaylightTime() const
 {
+    if (!isValid())
+        return false;
+
     switch (getSpec(d)) {
     case Qt::UTC:
     case Qt::OffsetFromUTC:
@@ -3853,7 +4297,7 @@ QString QDateTime::toString(Qt::DateFormat format) const
     case Qt::DefaultLocaleLongDate:
         return QLocale().toString(*this, QLocale::LongFormat);
     case Qt::RFC2822Date: {
-        buf = QLocale::c().toString(*this, QStringViewLiteral("dd MMM yyyy hh:mm:ss "));
+        buf = QLocale::c().toString(*this, u"dd MMM yyyy hh:mm:ss ");
         buf += toOffsetString(Qt::TextDate, offsetFromUtc());
         return buf;
     }
@@ -4323,17 +4767,24 @@ QDateTime QDateTime::toTimeZone(const QTimeZone &timeZone) const
     Returns \c true if this datetime is equal to the \a other datetime;
     otherwise returns \c false.
 
+    Since 5.14, all invalid datetimes are equal to one another and differ from
+    all other datetimes.
+
     \sa operator!=()
 */
 
 bool QDateTime::operator==(const QDateTime &other) const
 {
-    if (getSpec(d) == Qt::LocalTime
-        && getStatus(d) == getStatus(other.d)) {
+    if (!isValid())
+        return !other.isValid();
+    if (!other.isValid())
+        return false;
+
+    if (getSpec(d) == Qt::LocalTime && getStatus(d) == getStatus(other.d))
         return getMSecs(d) == getMSecs(other.d);
-    }
+
     // Convert to UTC and compare
-    return (toMSecsSinceEpoch() == other.toMSecsSinceEpoch());
+    return toMSecsSinceEpoch() == other.toMSecsSinceEpoch();
 }
 
 /*!
@@ -4342,8 +4793,9 @@ bool QDateTime::operator==(const QDateTime &other) const
     Returns \c true if this datetime is different from the \a other
     datetime; otherwise returns \c false.
 
-    Two datetimes are different if either the date, the time, or the
-    time zone components are different.
+    Two datetimes are different if either the date, the time, or the time zone
+    components are different. Since 5.14, any invalid datetime is less than all
+    valid datetimes.
 
     \sa operator==()
 */
@@ -4355,12 +4807,16 @@ bool QDateTime::operator==(const QDateTime &other) const
 
 bool QDateTime::operator<(const QDateTime &other) const
 {
-    if (getSpec(d) == Qt::LocalTime
-        && getStatus(d) == getStatus(other.d)) {
+    if (!isValid())
+        return other.isValid();
+    if (!other.isValid())
+        return false;
+
+    if (getSpec(d) == Qt::LocalTime && getStatus(d) == getStatus(other.d))
         return getMSecs(d) < getMSecs(other.d);
-    }
+
     // Convert to UTC and compare
-    return (toMSecsSinceEpoch() < other.toMSecsSinceEpoch());
+    return toMSecsSinceEpoch() < other.toMSecsSinceEpoch();
 }
 
 /*!
@@ -4430,12 +4886,10 @@ static inline uint msecsFromDecomposed(int hour, int minute, int sec, int msec =
 
 QDate QDate::currentDate()
 {
-    QDate d;
     SYSTEMTIME st;
     memset(&st, 0, sizeof(SYSTEMTIME));
     GetLocalTime(&st);
-    d.jd = julianDayFromDate(st.wYear, st.wMonth, st.wDay);
-    return d;
+    return QDate(st.wYear, st.wMonth, st.wDay);
 }
 
 QTime QTime::currentTime()
@@ -4450,48 +4904,46 @@ QTime QTime::currentTime()
 
 QDateTime QDateTime::currentDateTime()
 {
-    QDate d;
     QTime t;
     SYSTEMTIME st;
     memset(&st, 0, sizeof(SYSTEMTIME));
     GetLocalTime(&st);
-    d.jd = julianDayFromDate(st.wYear, st.wMonth, st.wDay);
+    QDate d(st.wYear, st.wMonth, st.wDay);
     t.mds = msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
     return QDateTime(d, t);
 }
 
 QDateTime QDateTime::currentDateTimeUtc()
 {
-    QDate d;
     QTime t;
     SYSTEMTIME st;
     memset(&st, 0, sizeof(SYSTEMTIME));
     GetSystemTime(&st);
-    d.jd = julianDayFromDate(st.wYear, st.wMonth, st.wDay);
+    QDate d(st.wYear, st.wMonth, st.wDay);
     t.mds = msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
     return QDateTime(d, t, Qt::UTC);
 }
 
-qint64 QDateTime::currentMSecsSinceEpoch() Q_DECL_NOTHROW
+qint64 QDateTime::currentMSecsSinceEpoch() noexcept
 {
     SYSTEMTIME st;
     memset(&st, 0, sizeof(SYSTEMTIME));
     GetSystemTime(&st);
+    const qint64 daysAfterEpoch = QDate(1970, 1, 1).daysTo(QDate(st.wYear, st.wMonth, st.wDay));
 
     return msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds) +
-            qint64(julianDayFromDate(st.wYear, st.wMonth, st.wDay)
-                   - julianDayFromDate(1970, 1, 1)) * Q_INT64_C(86400000);
+           daysAfterEpoch * Q_INT64_C(86400000);
 }
 
-qint64 QDateTime::currentSecsSinceEpoch() Q_DECL_NOTHROW
+qint64 QDateTime::currentSecsSinceEpoch() noexcept
 {
     SYSTEMTIME st;
     memset(&st, 0, sizeof(SYSTEMTIME));
     GetSystemTime(&st);
+    const qint64 daysAfterEpoch = QDate(1970, 1, 1).daysTo(QDate(st.wYear, st.wMonth, st.wDay));
 
     return st.wHour * SECS_PER_HOUR + st.wMinute * SECS_PER_MIN + st.wSecond +
-            qint64(julianDayFromDate(st.wYear, st.wMonth, st.wDay)
-                   - julianDayFromDate(1970, 1, 1)) * Q_INT64_C(86400);
+           daysAfterEpoch * Q_INT64_C(86400);
 }
 
 #elif defined(Q_OS_UNIX)
@@ -4515,19 +4967,19 @@ QDateTime QDateTime::currentDateTimeUtc()
     return fromMSecsSinceEpoch(currentMSecsSinceEpoch(), Qt::UTC);
 }
 
-qint64 QDateTime::currentMSecsSinceEpoch() Q_DECL_NOTHROW
+qint64 QDateTime::currentMSecsSinceEpoch() noexcept
 {
     // posix compliant system
     // we have milliseconds
     struct timeval tv;
-    gettimeofday(&tv, 0);
+    gettimeofday(&tv, nullptr);
     return qint64(tv.tv_sec) * Q_INT64_C(1000) + tv.tv_usec / 1000;
 }
 
-qint64 QDateTime::currentSecsSinceEpoch() Q_DECL_NOTHROW
+qint64 QDateTime::currentSecsSinceEpoch() noexcept
 {
     struct timeval tv;
-    gettimeofday(&tv, 0);
+    gettimeofday(&tv, nullptr);
     return qint64(tv.tv_sec);
 }
 #else
@@ -4741,8 +5193,6 @@ int QDateTime::utcOffset() const
 #if QT_CONFIG(datestring)
 
 /*!
-    \fn QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
-
     Returns the QDateTime represented by the \a string, using the
     \a format given, or an invalid datetime if this is not possible.
 
@@ -4752,7 +5202,7 @@ int QDateTime::utcOffset() const
 
     \sa toString(), QLocale::toDateTime()
 */
-QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
+QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
 {
     if (string.isEmpty())
         return QDateTime();
@@ -4851,48 +5301,45 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
             return QDateTime();
 
         // Accept "Sun Dec 1 13:02:00 1974" and "Sun 1. Dec 13:02:00 1974"
+
+        // Year and time can be in either order.
+        // Guess which by looking for ':' in the time
+        int yearPart = 3;
+        int timePart = 3;
+        if (parts.at(3).contains(QLatin1Char(':')))
+            yearPart = 4;
+        else if (parts.at(4).contains(QLatin1Char(':')))
+            timePart = 4;
+        else
+            return QDateTime();
+
         int month = 0;
         int day = 0;
         bool ok = false;
 
-        // First try month then day
-        month = fromShortMonthName(parts.at(1));
+        int year = parts.at(yearPart).toInt(&ok);
+        if (!ok || year == 0)
+            return QDateTime();
+
+        // Next try month then day
+        month = fromShortMonthName(parts.at(1), year);
         if (month)
-            day = parts.at(2).toInt();
+            day = parts.at(2).toInt(&ok);
 
-        // If failed try day then month
-        if (!month || !day) {
-            month = fromShortMonthName(parts.at(2));
+        // If failed, try day then month
+        if (!ok || !month || !day) {
+            month = fromShortMonthName(parts.at(2), year);
             if (month) {
                 QStringRef dayStr = parts.at(1);
                 if (dayStr.endsWith(QLatin1Char('.'))) {
                     dayStr = dayStr.left(dayStr.size() - 1);
-                    day = dayStr.toInt();
+                    day = dayStr.toInt(&ok);
                 }
             }
         }
 
         // If both failed, give up
-        if (!month || !day)
-            return QDateTime();
-
-        // Year can be before or after time, "Sun Dec 1 1974 13:02:00" or "Sun Dec 1 13:02:00 1974"
-        // Guess which by looking for ':' in the time
-        int year = 0;
-        int yearPart = 0;
-        int timePart = 0;
-        if (parts.at(3).contains(QLatin1Char(':'))) {
-            yearPart = 4;
-            timePart = 3;
-        } else if (parts.at(4).contains(QLatin1Char(':'))) {
-            yearPart = 3;
-            timePart = 4;
-        } else {
-            return QDateTime();
-        }
-
-        year = parts.at(yearPart).toInt(&ok);
-        if (!ok)
+        if (!ok || !month || !day)
             return QDateTime();
 
         QDate date(year, month, day);
@@ -4959,11 +5406,13 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
 }
 
 /*!
-    \fn QDateTime QDateTime::fromString(const QString &string, const QString &format)
-
     Returns the QDateTime represented by the \a string, using the \a
     format given, or an invalid datetime if the string cannot be parsed.
 
+    Uses the calendar \a cal if supplied, else Gregorian. The illustrative
+    values and ranges below are given for the latter; other calendars may have
+    different ranges or values.
+
     These expressions may be used for the date part of the format string:
 
     \table
@@ -5066,23 +5515,33 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
     QLocale::toDateTime()
 */
 
-QDateTime QDateTime::fromString(const QString &string, const QString &format)
+QDateTime QDateTime::fromString(const QString &string, const QString &format, QCalendar cal)
 {
 #if QT_CONFIG(datetimeparser)
     QTime time;
     QDate date;
 
-    QDateTimeParser dt(QVariant::DateTime, QDateTimeParser::FromString);
+    QDateTimeParser dt(QVariant::DateTime, QDateTimeParser::FromString, cal);
     // dt.setDefaultLocale(QLocale::c()); ### Qt 6
     if (dt.parseFormat(format) && dt.fromString(string, &date, &time))
         return QDateTime(date, time);
 #else
     Q_UNUSED(string);
     Q_UNUSED(format);
+    Q_UNUSED(cal);
 #endif
     return QDateTime();
 }
 
+/*
+  \overload
+*/
+
+QDateTime QDateTime::fromString(const QString &string, const QString &format)
+{
+    return fromString(string, format, QCalendar());
+}
+
 #endif // datestring
 /*!
     \fn QDateTime QDateTime::toLocalTime() const
@@ -5360,7 +5819,7 @@ QDebug operator<<(QDebug dbg, const QTime &time)
     QDebugStateSaver saver(dbg);
     dbg.nospace() << "QTime(";
     if (time.isValid())
-        dbg.nospace() << time.toString(QStringViewLiteral("HH:mm:ss.zzz"));
+        dbg.nospace() << time.toString(u"HH:mm:ss.zzz");
     else
         dbg.nospace() << "Invalid";
     dbg.nospace() << ')';
@@ -5373,7 +5832,7 @@ QDebug operator<<(QDebug dbg, const QDateTime &date)
     dbg.nospace() << "QDateTime(";
     if (date.isValid()) {
         const Qt::TimeSpec ts = date.timeSpec();
-        dbg.noquote() << date.toString(QStringViewLiteral("yyyy-MM-dd HH:mm:ss.zzz t"))
+        dbg.noquote() << date.toString(u"yyyy-MM-dd HH:mm:ss.zzz t")
                       << ' ' << ts;
         switch (ts) {
         case Qt::UTC:
@@ -5408,7 +5867,7 @@ uint qHash(const QDateTime &key, uint seed)
     // QDate/QTime/spec/offset because QDateTime::operator== converts both arguments
     // to the same timezone. If we don't, qHash would return different hashes for
     // two QDateTimes that are equivalent once converted to the same timezone.
-    return qHash(key.toMSecsSinceEpoch(), seed);
+    return key.isValid() ? qHash(key.toMSecsSinceEpoch(), seed) : seed;
 }
 
 /*! \fn uint qHash(const QDate &key, uint seed = 0)
@@ -5417,7 +5876,7 @@ uint qHash(const QDateTime &key, uint seed)
 
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 */
-uint qHash(const QDate &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QDate &key, uint seed) noexcept
 {
     return qHash(key.toJulianDay(), seed);
 }
@@ -5428,7 +5887,7 @@ uint qHash(const QDate &key, uint seed) Q_DECL_NOTHROW
 
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 */
-uint qHash(const QTime &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QTime &key, uint seed) noexcept
 {
     return qHash(key.msecsSinceStartOfDay(), seed);
 }
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/time/qdatetime.h
index 8b2a60acaa..3eae8ebf64 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/time/qdatetime.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -54,9 +54,11 @@ Q_FORWARD_DECLARE_OBJC_CLASS(NSDate);
 
 QT_BEGIN_NAMESPACE
 
+class QCalendar;
 class QTimeZone;
+class QDateTime;
 
-class Q_CORE_EXPORT QDate
+class Q_CORE_EXPORT QDate // ### Qt 6: change to be used by value, not const &
 {
 public:
     enum MonthNameType { // ### Qt 6: remove, along with methods using it
@@ -68,6 +70,7 @@ private:
 public:
     Q_DECL_CONSTEXPR QDate() : jd(nullJd()) {}
     QDate(int y, int m, int d);
+    QDate(int y, int m, int d, QCalendar cal);
 
     Q_DECL_CONSTEXPR bool isNull() const { return !isValid(); }
     Q_DECL_CONSTEXPR bool isValid() const { return jd >= minJd() && jd <= maxJd(); }
@@ -81,6 +84,21 @@ public:
     int daysInYear() const;
     int weekNumber(int *yearNum = nullptr) const;
 
+    int year(QCalendar cal) const;
+    int month(QCalendar cal) const;
+    int day(QCalendar cal) const;
+    int dayOfWeek(QCalendar cal) const;
+    int dayOfYear(QCalendar cal) const;
+    int daysInMonth(QCalendar cal) const;
+    int daysInYear(QCalendar cal) const;
+
+    QDateTime startOfDay(Qt::TimeSpec spec = Qt::LocalTime, int offsetSeconds = 0) const;
+    QDateTime endOfDay(Qt::TimeSpec spec = Qt::LocalTime, int offsetSeconds = 0) const;
+#if QT_CONFIG(timezone)
+    QDateTime startOfDay(const QTimeZone &zone) const;
+    QDateTime endOfDay(const QTimeZone &zone) const;
+#endif
+
 #if QT_DEPRECATED_SINCE(5, 10) && QT_CONFIG(textdate)
     QT_DEPRECATED_X("Use QLocale::monthName or QLocale::standaloneMonthName")
         static QString shortMonthName(int month, MonthNameType type = DateFormat);
@@ -95,15 +113,20 @@ public:
     QString toString(Qt::DateFormat f = Qt::TextDate) const;
 #if QT_STRINGVIEW_LEVEL < 2
     QString toString(const QString &format) const;
+    QString toString(const QString &format, QCalendar cal) const;
 #endif
+
     QString toString(QStringView format) const;
+    QString toString(Qt::DateFormat f, QCalendar cal) const;
+    QString toString(QStringView format, QCalendar cal) const;
 #endif
 #if QT_DEPRECATED_SINCE(5,0)
-QT_DEPRECATED inline bool setYMD(int y, int m, int d)
-{ if (uint(y) <= 99) y += 1900; return setDate(y, m, d); }
+    QT_DEPRECATED_X("Use setDate() instead") inline bool setYMD(int y, int m, int d)
+    { if (uint(y) <= 99) y += 1900; return setDate(y, m, d); }
 #endif
 
     bool setDate(int year, int month, int day);
+    bool setDate(int year, int month, int day, QCalendar cal);
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     void getDate(int *year, int *month, int *day); // ### Qt 6: remove
@@ -113,7 +136,9 @@ QT_DEPRECATED inline bool setYMD(int y, int m, int d)
     Q_REQUIRED_RESULT QDate addDays(qint64 days) const;
     Q_REQUIRED_RESULT QDate addMonths(int months) const;
     Q_REQUIRED_RESULT QDate addYears(int years) const;
-    qint64 daysTo(const QDate &) const;
+    Q_REQUIRED_RESULT QDate addMonths(int months, QCalendar cal) const;
+    Q_REQUIRED_RESULT QDate addYears(int years, QCalendar cal) const;
+    qint64 daysTo(const QDate &) const; // ### Qt 6: QDate
 
     Q_DECL_CONSTEXPR bool operator==(const QDate &other) const { return jd == other.jd; }
     Q_DECL_CONSTEXPR bool operator!=(const QDate &other) const { return jd != other.jd; }
@@ -126,6 +151,7 @@ QT_DEPRECATED inline bool setYMD(int y, int m, int d)
 #if QT_CONFIG(datestring)
     static QDate fromString(const QString &s, Qt::DateFormat f = Qt::TextDate);
     static QDate fromString(const QString &s, const QString &format);
+    static QDate fromString(const QString &s, const QString &format, QCalendar cal);
 #endif
     static bool isValid(int y, int m, int d);
     static bool isLeapYear(int year);
@@ -151,7 +177,7 @@ private:
 };
 Q_DECLARE_TYPEINFO(QDate, Q_MOVABLE_TYPE);
 
-class Q_CORE_EXPORT QTime
+class Q_CORE_EXPORT QTime // ### Qt 6: change to be used by value, not const &
 {
     explicit Q_DECL_CONSTEXPR QTime(int ms) : mds(ms)
     {}
@@ -177,9 +203,9 @@ public:
     bool setHMS(int h, int m, int s, int ms = 0);
 
     Q_REQUIRED_RESULT QTime addSecs(int secs) const;
-    int secsTo(const QTime &) const;
+    int secsTo(const QTime &) const; // ### Qt 6: plain QTime
     Q_REQUIRED_RESULT QTime addMSecs(int ms) const;
-    int msecsTo(const QTime &) const;
+    int msecsTo(const QTime &) const; // ### Qt 6: plain QTime
 
     Q_DECL_CONSTEXPR bool operator==(const QTime &other) const { return mds == other.mds; }
     Q_DECL_CONSTEXPR bool operator!=(const QTime &other) const { return mds != other.mds; }
@@ -198,9 +224,11 @@ public:
 #endif
     static bool isValid(int h, int m, int s, int ms = 0);
 
-    void start();
-    int restart();
-    int elapsed() const;
+#if QT_DEPRECATED_SINCE(5, 14) // ### Qt 6: remove
+    QT_DEPRECATED_X("Use QElapsedTimer instead") void start();
+    QT_DEPRECATED_X("Use QElapsedTimer instead") int restart();
+    QT_DEPRECATED_X("Use QElapsedTimer instead") int elapsed() const;
+#endif
 private:
     enum TimeFlag { NullTime = -1 };
     Q_DECL_CONSTEXPR inline int ds() const { return mds == -1 ? 0 : mds; }
@@ -208,7 +236,7 @@ private:
 
     friend class QDateTime;
     friend class QDateTimePrivate;
-#ifndef QT_NO_DATASTREAM
+#ifndef QT_NO_DATASTREAM // ### Qt 6: plain QTime
     friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QTime &);
     friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QTime &);
 #endif
@@ -258,24 +286,22 @@ class Q_CORE_EXPORT QDateTime
     };
 
 public:
-    QDateTime() Q_DECL_NOEXCEPT_EXPR(Data::CanBeSmall);
-    explicit QDateTime(const QDate &);
+    QDateTime() noexcept(Data::CanBeSmall);
+    explicit QDateTime(const QDate &); // ### Qt 6: plain QDate, QTime
     QDateTime(const QDate &, const QTime &, Qt::TimeSpec spec = Qt::LocalTime);
     // ### Qt 6: Merge with above with default offsetSeconds = 0
     QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec, int offsetSeconds);
 #if QT_CONFIG(timezone)
     QDateTime(const QDate &date, const QTime &time, const QTimeZone &timeZone);
 #endif // timezone
-    QDateTime(const QDateTime &other) Q_DECL_NOTHROW;
-    QDateTime(QDateTime &&other) Q_DECL_NOTHROW;
+    QDateTime(const QDateTime &other) noexcept;
+    QDateTime(QDateTime &&other) noexcept;
     ~QDateTime();
 
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDateTime &operator=(QDateTime &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
-    QDateTime &operator=(const QDateTime &other) Q_DECL_NOTHROW;
+    QDateTime &operator=(QDateTime &&other) noexcept { swap(other); return *this; }
+    QDateTime &operator=(const QDateTime &other) noexcept;
 
-    void swap(QDateTime &other) Q_DECL_NOTHROW { qSwap(d.d, other.d.d); }
+    void swap(QDateTime &other) noexcept { qSwap(d.d, other.d.d); }
 
     bool isNull() const;
     bool isValid() const;
@@ -293,7 +319,7 @@ public:
     qint64 toMSecsSinceEpoch() const;
     qint64 toSecsSinceEpoch() const;
 
-    void setDate(const QDate &date);
+    void setDate(const QDate &date); // ### Qt 6: plain QDate
     void setTime(const QTime &time);
     void setTimeSpec(Qt::TimeSpec spec);
     void setOffsetFromUtc(int offsetSeconds);
@@ -336,8 +362,8 @@ public:
     inline bool operator>=(const QDateTime &other) const { return !(*this < other); }
 
 #if QT_DEPRECATED_SINCE(5, 2) // ### Qt 6: remove
-    QT_DEPRECATED void setUtcOffset(int seconds);
-    QT_DEPRECATED int utcOffset() const;
+    QT_DEPRECATED_X("Use setOffsetFromUtc() instead") void setUtcOffset(int seconds);
+    QT_DEPRECATED_X("Use offsetFromUtc() instead") int utcOffset() const;
 #endif // QT_DEPRECATED_SINCE
 
     static QDateTime currentDateTime();
@@ -345,6 +371,7 @@ public:
 #if QT_CONFIG(datestring)
     static QDateTime fromString(const QString &s, Qt::DateFormat f = Qt::TextDate);
     static QDateTime fromString(const QString &s, const QString &format);
+    static QDateTime fromString(const QString &s, const QString &format, QCalendar cal);
 #endif
 
 #if QT_DEPRECATED_SINCE(5, 8)
@@ -366,8 +393,8 @@ public:
     static QDateTime fromSecsSinceEpoch(qint64 secs, const QTimeZone &timeZone);
 #endif
 
-    static qint64 currentMSecsSinceEpoch() Q_DECL_NOTHROW;
-    static qint64 currentSecsSinceEpoch() Q_DECL_NOTHROW;
+    static qint64 currentMSecsSinceEpoch() noexcept;
+    static qint64 currentSecsSinceEpoch() noexcept;
 
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
     static QDateTime fromCFDate(CFDateRef date);
@@ -376,6 +403,10 @@ public:
     NSDate *toNSDate() const Q_DECL_NS_RETURNS_AUTORELEASED;
 #endif
 
+    // (1<<63) ms is 292277024.6 (average Gregorian) years, counted from the start of 1970, so
+    // Last is floor(1970 + 292277024.6); no year 0, so First is floor(1970 - 1 - 292277024.6)
+    enum class YearRange : qint32 { First = -292275056,  Last = +292278994 };
+
 private:
     friend class QDateTimePrivate;
 
@@ -410,8 +441,8 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QDateTime &);
 // QDateTime is not noexcept for now -- to be revised once
 // timezone and calendaring support is added
 Q_CORE_EXPORT uint qHash(const QDateTime &key, uint seed = 0);
-Q_CORE_EXPORT uint qHash(const QDate &key, uint seed = 0) Q_DECL_NOTHROW;
-Q_CORE_EXPORT uint qHash(const QTime &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT uint qHash(const QDate &key, uint seed = 0) noexcept;
+Q_CORE_EXPORT uint qHash(const QTime &key, uint seed = 0) noexcept;
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/time/qdatetime_p.h
index b3d00745d0..f4f00a8b9b 100644
--- a/src/corelib/tools/qdatetime_p.h
+++ b/src/corelib/time/qdatetime_p.h
@@ -56,7 +56,7 @@
 #include "qplatformdefs.h"
 #include "QtCore/qatomic.h"
 #include "QtCore/qdatetime.h"
-#include "QtCore/qpair.h"
+#include "QtCore/qshareddata.h"
 
 #if QT_CONFIG(timezone)
 #include "qtimezone.h"
@@ -64,7 +64,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDateTimePrivate
+class QDateTimePrivate : public QSharedData
 {
 public:
     // forward the declarations from QDateTime (this makes them public)
@@ -110,13 +110,6 @@ public:
         DaylightMask        = SetToStandardTime | SetToDaylightTime
     };
 
-    QDateTimePrivate() : m_msecs(0),
-                         m_status(StatusFlag(Qt::LocalTime << TimeSpecShift)),
-                         m_offsetFromUtc(0),
-                         ref(0)
-    {
-    }
-
     static QDateTime::Data create(const QDate &toDate, const QTime &toTime, Qt::TimeSpec toSpec,
                                   int offsetSeconds);
 
@@ -124,10 +117,9 @@ public:
     static QDateTime::Data create(const QDate &toDate, const QTime &toTime, const QTimeZone & timeZone);
 #endif // timezone
 
-    qint64 m_msecs;
-    StatusFlags m_status;
-    int m_offsetFromUtc;
-    mutable QAtomicInt ref;
+    StatusFlags m_status = StatusFlag(Qt::LocalTime << TimeSpecShift);
+    qint64 m_msecs = 0;
+    int m_offsetFromUtc = 0;
 #if QT_CONFIG(timezone)
     QTimeZone m_timeZone;
 #endif // timezone
@@ -135,15 +127,11 @@ public:
 #if QT_CONFIG(timezone)
     static qint64 zoneMSecsToEpochMSecs(qint64 msecs, const QTimeZone &zone,
                                         DaylightStatus hint = UnknownDaylightTime,
-                                        QDate *localDate = 0, QTime *localTime = 0);
+                                        QDate *localDate = nullptr, QTime *localTime = nullptr);
 
     // Inlined for its one caller in qdatetime.cpp
     inline void setUtcOffsetByTZ(qint64 atMSecsSinceEpoch);
 #endif // timezone
-
-    // ### Qt 5.14: expose publicly in QDateTime
-    // The first and last years of which QDateTime can represent some part:
-    enum class YearRange : qint32 { First = -292275056,  Last = +292278994 };
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp
index adc5451dec..2c566e3584 100644
--- a/src/corelib/tools/qdatetimeparser.cpp
+++ b/src/corelib/time/qdatetimeparser.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -47,7 +47,6 @@
 #if QT_CONFIG(timezone)
 #include "qtimezone.h"
 #endif
-#include "qregexp.h"
 #include "qdebug.h"
 
 //#define QDATETIMEPARSER_DEBUG
@@ -61,6 +60,9 @@
 
 QT_BEGIN_NAMESPACE
 
+template <typename T>
+using ShortVector = QVarLengthArray<T, 13>; // enough for month (incl. leap) and day-of-week names
+
 QDateTimeParser::~QDateTimeParser()
 {
 }
@@ -78,8 +80,8 @@ int QDateTimeParser::getDigit(const QDateTime &t, int index) const
 {
     if (index < 0 || index >= sectionNodes.size()) {
 #if QT_CONFIG(datestring)
-        qWarning("QDateTimeParser::getDigit() Internal error (%s %d)",
-                 qPrintable(t.toString()), index);
+        qWarning("QDateTimeParser::getDigit() Internal error (%ls %d)",
+                 qUtf16Printable(t.toString()), index);
 #else
         qWarning("QDateTimeParser::getDigit() Internal error (%d)", index);
 #endif
@@ -93,19 +95,19 @@ int QDateTimeParser::getDigit(const QDateTime &t, int index) const
     case SecondSection: return t.time().second();
     case MSecSection: return t.time().msec();
     case YearSection2Digits:
-    case YearSection: return t.date().year();
-    case MonthSection: return t.date().month();
-    case DaySection: return t.date().day();
+    case YearSection: return t.date().year(calendar);
+    case MonthSection: return t.date().month(calendar);
+    case DaySection: return t.date().day(calendar);
     case DayOfWeekSectionShort:
-    case DayOfWeekSectionLong: return t.date().day();
+    case DayOfWeekSectionLong: return t.date().day(calendar);
     case AmPmSection: return t.time().hour() > 11 ? 1 : 0;
 
     default: break;
     }
 
 #if QT_CONFIG(datestring)
-    qWarning("QDateTimeParser::getDigit() Internal error 2 (%s %d)",
-             qPrintable(t.toString()), index);
+    qWarning("QDateTimeParser::getDigit() Internal error 2 (%ls %d)",
+             qUtf16Printable(t.toString()), index);
 #else
     qWarning("QDateTimeParser::getDigit() Internal error 2 (%d)", index);
 #endif
@@ -128,8 +130,8 @@ bool QDateTimeParser::setDigit(QDateTime &v, int index, int newVal) const
 {
     if (index < 0 || index >= sectionNodes.size()) {
 #if QT_CONFIG(datestring)
-        qWarning("QDateTimeParser::setDigit() Internal error (%s %d %d)",
-                 qPrintable(v.toString()), index, newVal);
+        qWarning("QDateTimeParser::setDigit() Internal error (%ls %d %d)",
+                 qUtf16Printable(v.toString()), index, newVal);
 #else
         qWarning("QDateTimeParser::setDigit() Internal error (%d %d)", index, newVal);
 #endif
@@ -139,9 +141,9 @@ bool QDateTimeParser::setDigit(QDateTime &v, int index, int newVal) const
 
     const QDate date = v.date();
     const QTime time = v.time();
-    int year = date.year();
-    int month = date.month();
-    int day = date.day();
+    int year = date.year(calendar);
+    int month = date.month(calendar);
+    int day = date.day(calendar);
     int hour = time.hour();
     int minute = time.minute();
     int second = time.second();
@@ -177,21 +179,21 @@ bool QDateTimeParser::setDigit(QDateTime &v, int index, int newVal) const
         break;
     case AmPmSection: hour = (newVal == 0 ? hour % 12 : (hour % 12) + 12); break;
     default:
-        qWarning("QDateTimeParser::setDigit() Internal error (%s)",
-                 qPrintable(node.name()));
+        qWarning("QDateTimeParser::setDigit() Internal error (%ls)",
+                 qUtf16Printable(node.name()));
         break;
     }
 
     if (!(node.type & DaySectionMask)) {
         if (day < cachedDay)
             day = cachedDay;
-        const int max = QDate(year, month, 1).daysInMonth();
+        const int max = calendar.daysInMonth(month, year);
         if (day > max) {
             day = max;
         }
     }
 
-    const QDate newDate(year, month, day);
+    const QDate newDate(year, month, day, calendar);
     const QTime newTime(hour, minute, second, msec);
     if (!newDate.isValid() || !newTime.isValid())
         return false;
@@ -221,26 +223,28 @@ int QDateTimeParser::absoluteMax(int s, const QDateTime &cur) const
     case TimeZoneSection: return QTimeZone::MaxUtcOffsetSecs;
 #endif
     case Hour24Section:
-    case Hour12Section: return 23; // this is special-cased in
-                                   // parseSection. We want it to be
-                                   // 23 for the stepBy case.
+    case Hour12Section:
+        // This is special-cased in parseSection.
+        // We want it to be 23 for the stepBy case.
+        return 23;
     case MinuteSection:
     case SecondSection: return 59;
     case MSecSection: return 999;
     case YearSection2Digits:
-    case YearSection: return 9999; // sectionMaxSize will prevent
-                                   // people from typing in a larger
-                                   // number in count == 2 sections.
-                                   // stepBy() will work on real years anyway
-    case MonthSection: return 12;
+    case YearSection:
+        // sectionMaxSize will prevent people from typing in a larger number in
+        // count == 2 sections; stepBy() will work on real years anyway.
+        return 9999;
+    case MonthSection: return calendar.maximumMonthsInYear();
     case DaySection:
     case DayOfWeekSectionShort:
-    case DayOfWeekSectionLong: return cur.isValid() ? cur.date().daysInMonth() : 31;
+    case DayOfWeekSectionLong:
+        return cur.isValid() ? cur.date().daysInMonth(calendar) : calendar.maximumDaysInMonth();
     case AmPmSection: return 1;
     default: break;
     }
-    qWarning("QDateTimeParser::absoluteMax() Internal error (%s)",
-             qPrintable(sn.name()));
+    qWarning("QDateTimeParser::absoluteMax() Internal error (%ls)",
+             qUtf16Printable(sn.name()));
     return -1;
 }
 
@@ -271,8 +275,8 @@ int QDateTimeParser::absoluteMin(int s) const
     case AmPmSection: return 0;
     default: break;
     }
-    qWarning("QDateTimeParser::absoluteMin() Internal error (%s, %0x)",
-             qPrintable(sn.name()), sn.type);
+    qWarning("QDateTimeParser::absoluteMin() Internal error (%ls, %0x)",
+             qUtf16Printable(sn.name()), sn.type);
     return -1;
 }
 
@@ -327,7 +331,7 @@ int QDateTimeParser::sectionPos(const SectionNode &sn) const
     default: break;
     }
     if (sn.pos == -1) {
-        qWarning("QDateTimeParser::sectionPos Internal error (%s)", qPrintable(sn.name()));
+        qWarning("QDateTimeParser::sectionPos Internal error (%ls)", qUtf16Printable(sn.name()));
         return -1;
     }
     return sn.pos;
@@ -613,7 +617,7 @@ int QDateTimeParser::sectionSize(int sectionIndex) const
 int QDateTimeParser::sectionMaxSize(Section s, int count) const
 {
 #if QT_CONFIG(textdate)
-    int mcount = 12;
+    int mcount = calendar.maximumMonthsInYear();
 #endif
 
     switch (s) {
@@ -655,7 +659,7 @@ int QDateTimeParser::sectionMaxSize(Section s, int count) const
             const QLocale::FormatType format = count == 4 ? QLocale::LongFormat : QLocale::ShortFormat;
             for (int i=1; i<=mcount; ++i) {
                 const QString str = (s == MonthSection
-                                     ? l.monthName(i, format)
+                                     ? calendar.monthName(l, i, QCalendar::Unspecified, format)
                                      : l.dayName(i, format));
                 ret = qMax(str.size(), ret);
             }
@@ -734,8 +738,8 @@ QDateTimeParser::parseSection(const QDateTime &currentValue, int sectionIndex,
     ParsedSection result; // initially Invalid
     const SectionNode &sn = sectionNode(sectionIndex);
     if (sn.type & Internal) {
-        qWarning("QDateTimeParser::parseSection Internal error (%s %d)",
-                 qPrintable(sn.name()), sectionIndex);
+        qWarning("QDateTimeParser::parseSection Internal error (%ls %d)",
+                 qUtf16Printable(sn.name()), sectionIndex);
         return result;
     }
 
@@ -788,9 +792,9 @@ QDateTimeParser::parseSection(const QDateTime &currentValue, int sectionIndex,
             int num = 0, used = 0;
             if (sn.type == MonthSection) {
                 const QDate minDate = getMinimum().date();
-                const int min = (currentValue.date().year() == minDate.year())
-                    ? minDate.month() : 1;
-                num = findMonth(sectiontext.toLower(), min, sectionIndex, &sectiontext, &used);
+                const int year = currentValue.date().year(calendar);
+                const int min = (year == minDate.year(calendar)) ? minDate.month(calendar) : 1;
+                num = findMonth(sectiontext.toLower(), min, sectionIndex, year, &sectiontext, &used);
             } else {
                 num = findDay(sectiontext.toLower(), 1, sectionIndex, &sectiontext, &used);
             }
@@ -885,8 +889,8 @@ QDateTimeParser::parseSection(const QDateTime &currentValue, int sectionIndex,
         }
         break; }
     default:
-        qWarning("QDateTimeParser::parseSection Internal error (%s %d)",
-                 qPrintable(sn.name()), sectionIndex);
+        qWarning("QDateTimeParser::parseSection Internal error (%ls %d)",
+                 qUtf16Printable(sn.name()), sectionIndex);
         return result;
     }
     Q_ASSERT(result.state != Invalid || result.value == -1);
@@ -897,16 +901,36 @@ QDateTimeParser::parseSection(const QDateTime &currentValue, int sectionIndex,
 /*!
   \internal
 
+  Returns a day-number, in the same month as \a rough and as close to \a rough's
+  day number as is valid, that \a calendar puts on the day of the week indicated
+  by \a weekDay.
+*/
+
+static int weekDayWithinMonth(const QCalendar &calendar, const QDate &rough, int weekDay)
+{
+    // TODO: can we adapt this to cope gracefully with intercallary days (day of
+    // week > 7) without making it slower for more widely-used calendars ?
+    int day = rough.day(calendar) + weekDay - calendar.dayOfWeek(rough);
+    if (day <= 0)
+        return day + 7;
+    if (day > rough.daysInMonth(calendar))
+        return day - 7;
+    return day;
+}
+
+/*!
+  \internal
+
   Returns a date consistent with the given data on parts specified by known,
   while staying as close to the given data as it can.  Returns an invalid date
   when on valid date is consistent with the data.
 */
 
-static QDate actualDate(QDateTimeParser::Sections known, int year, int year2digits,
-                        int month, int day, int dayofweek)
+static QDate actualDate(QDateTimeParser::Sections known, const QCalendar &calendar,
+                        int year, int year2digits, int month, int day, int dayofweek)
 {
-    QDate actual(year, month, day);
-    if (actual.isValid() && year % 100 == year2digits && actual.dayOfWeek() == dayofweek)
+    QDate actual(year, month, day, calendar);
+    if (actual.isValid() && year % 100 == year2digits && calendar.dayOfWeek(actual) == dayofweek)
         return actual; // The obvious candidate is fine :-)
 
     if (dayofweek < 1 || dayofweek > 7) // Invalid: ignore
@@ -932,18 +956,18 @@ static QDate actualDate(QDateTimeParser::Sections known, int year, int year2digi
         known &= ~QDateTimeParser::MonthSection;
     }
 
-    QDate first(year, month, 1);
+    QDate first(year, month, 1, calendar);
     int last = known & QDateTimeParser::YearSection && known & QDateTimeParser::MonthSection
-        ? first.daysInMonth() : 0;
+        ? first.daysInMonth(calendar) : 0;
     // If we also know day-of-week, tweak last to the last in the month that matches it:
     if (last && known & QDateTimeParser::DayOfWeekSectionMask) {
-        int diff = (dayofweek - first.dayOfWeek() - last) % 7;
+        int diff = (dayofweek - calendar.dayOfWeek(first) - last) % 7;
         Q_ASSERT(diff <= 0); // C++11 specifies (-ve) % (+ve) to be <= 0.
         last += diff;
     }
     if (day < 1) {
         if (known & QDateTimeParser::DayOfWeekSectionMask && last) {
-            day = 1 + dayofweek - first.dayOfWeek();
+            day = 1 + dayofweek - calendar.dayOfWeek(first);
             if (day < 1)
                 day += 7;
         } else {
@@ -957,12 +981,12 @@ static QDate actualDate(QDateTimeParser::Sections known, int year, int year2digi
         day = last;
     }
 
-    actual = QDate(year, month, day);
+    actual = QDate(year, month, day, calendar);
     if (!actual.isValid() // We can't do better than we have, in this case
         || (known & QDateTimeParser::DaySection
             && known & QDateTimeParser::MonthSection
             && known & QDateTimeParser::YearSection) // ditto
-        || actual.dayOfWeek() == dayofweek // Good enough, use it.
+        || calendar.dayOfWeek(actual) == dayofweek // Good enough, use it.
         || (known & QDateTimeParser::DayOfWeekSectionMask) == 0) { // No contradiction, use it.
         return actual;
     }
@@ -977,12 +1001,8 @@ static QDate actualDate(QDateTimeParser::Sections known, int year, int year2digi
 
     if ((known & QDateTimeParser::DaySection) == 0) {
         // Relatively easy to fix.
-        day += dayofweek - actual.dayOfWeek();
-        if (day < 1)
-            day += 7;
-        else if (day > actual.daysInMonth())
-            day -= 7;
-        actual = QDate(year, month, day);
+        day = weekDayWithinMonth(calendar, actual, dayofweek);
+        actual = QDate(year, month, day, calendar);
         return actual;
     }
 
@@ -994,18 +1014,18 @@ static QDate actualDate(QDateTimeParser::Sections known, int year, int year2digi
         */
         for (int m = 1; m < 12; m++) {
             if (m < month) {
-                actual = QDate(year, month - m, day);
-                if (actual.dayOfWeek() == dayofweek)
+                actual = QDate(year, month - m, day, calendar);
+                if (calendar.dayOfWeek(actual) == dayofweek)
                     return actual;
             }
             if (m + month <= 12) {
-                actual = QDate(year, month + m, day);
-                if (actual.dayOfWeek() == dayofweek)
+                actual = QDate(year, month + m, day, calendar);
+                if (calendar.dayOfWeek(actual) == dayofweek)
                     return actual;
             }
         }
         // Should only get here in corner cases; e.g. day == 31
-        actual = QDate(year, month, day); // Restore from trial values.
+        actual = QDate(year, month, day, calendar); // Restore from trial values.
     }
 
     if ((known & QDateTimeParser::YearSection) == 0) {
@@ -1018,24 +1038,24 @@ static QDate actualDate(QDateTimeParser::Sections known, int year, int year2digi
               is '97, it makes sense to consider 1997.  If either adjacent
               century does work, the other won't.
             */
-            actual = QDate(year + 100, month, day);
-            if (actual.dayOfWeek() == dayofweek)
+            actual = QDate(year + 100, month, day, calendar);
+            if (calendar.dayOfWeek(actual) == dayofweek)
                 return actual;
-            actual = QDate(year - 100, month, day);
-            if (actual.dayOfWeek() == dayofweek)
+            actual = QDate(year - 100, month, day, calendar);
+            if (calendar.dayOfWeek(actual) == dayofweek)
                 return actual;
         } else {
             // Offset by 7 is usually enough, but rare cases may need more:
             for (int y = 1; y < 12; y++) {
-                actual = QDate(year - y, month, day);
-                if (actual.dayOfWeek() == dayofweek)
+                actual = QDate(year - y, month, day, calendar);
+                if (calendar.dayOfWeek(actual) == dayofweek)
                     return actual;
-                actual = QDate(year + y, month, day);
-                if (actual.dayOfWeek() == dayofweek)
+                actual = QDate(year + y, month, day, calendar);
+                if (calendar.dayOfWeek(actual) == dayofweek)
                     return actual;
             }
         }
-        actual = QDate(year, month, day); // Restore from trial values.
+        actual = QDate(year, month, day, calendar); // Restore from trial values.
     }
 
     return actual; // It'll just have to do :-(
@@ -1098,7 +1118,7 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
     int minute = defaultTime.minute();
     int second = defaultTime.second();
     int msec = defaultTime.msec();
-    int dayofweek = defaultDate.dayOfWeek();
+    int dayofweek = calendar.dayOfWeek(defaultDate);
     Qt::TimeSpec tspec = defaultValue.timeSpec();
     int zoneOffset = 0; // In seconds; local - UTC
 #if QT_CONFIG(timezone)
@@ -1139,7 +1159,8 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
         ParsedSection sect;
 
         {
-            const QDate date = actualDate(isSet, year, year2digits, month, day, dayofweek);
+            const QDate date = actualDate(isSet, calendar, year, year2digits,
+                                          month, day, dayofweek);
             const QTime time = actualTime(isSet, hour, hour12, ampm, minute, second, msec);
             sect = parseSection(
 #if QT_CONFIG(timezone)
@@ -1200,8 +1221,8 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
         case DaySection: current = &day; sect.value = qMax<int>(1, sect.value); break;
         case AmPmSection: current = &ampm; break;
         default:
-            qWarning("QDateTimeParser::parse Internal error (%s)",
-                     qPrintable(sn.name()));
+            qWarning("QDateTimeParser::parse Internal error (%ls)",
+                     qUtf16Printable(sn.name()));
             break;
         }
 
@@ -1249,22 +1270,17 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
             }
         }
 
-        const QDate date(year, month, day);
-        const int diff = dayofweek - date.dayOfWeek();
-        if (diff != 0 && state == Acceptable && isSet & DayOfWeekSectionMask) {
+        const QDate date(year, month, day, calendar);
+        if (dayofweek != calendar.dayOfWeek(date)
+                && state == Acceptable && isSet & DayOfWeekSectionMask) {
             if (isSet & DaySection)
                 conflicts = true;
             const SectionNode &sn = sectionNode(currentSectionIndex);
             if (sn.type & DayOfWeekSectionMask || currentSectionIndex == -1) {
                 // dayofweek should be preferred
-                day += diff;
-                if (day <= 0) {
-                    day += 7;
-                } else if (day > date.daysInMonth()) {
-                    day -= 7;
-                }
+                day = weekDayWithinMonth(calendar, date, dayofweek);
                 QDTPDEBUG << year << month << day << dayofweek
-                          << diff << QDate(year, month, day).dayOfWeek();
+                          << calendar.dayOfWeek(QDate(year, month, day, calendar));
             }
         }
 
@@ -1276,20 +1292,18 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
             needfixday = true;
         }
 
-        if (!QDate::isValid(year, month, day)) {
-            if (day < 32) {
+        if (!calendar.isDateValid(year, month, day)) {
+            if (day <= calendar.maximumDaysInMonth())
                 cachedDay = day;
-            }
-            if (day > 28 && QDate::isValid(year, month, 1)) {
+            if (day > calendar.minimumDaysInMonth() && calendar.isDateValid(year, month, 1))
                 needfixday = true;
-            }
         }
         if (needfixday) {
             if (context == FromString) {
                 return StateNode();
             }
             if (state == Acceptable && fixday) {
-                day = qMin<int>(day, QDate(year, month, 1).daysInMonth());
+                day = qMin<int>(day, calendar.daysInMonth(month, year));
 
                 const QLocale loc = locale();
                 for (int i=0; i<sectionNodesCount; ++i) {
@@ -1297,7 +1311,7 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
                     if (sn.type & DaySection) {
                         input->replace(sectionPos(sn), sectionSize(i), loc.toString(day));
                     } else if (sn.type & DayOfWeekSectionMask) {
-                        const int dayOfWeek = QDate(year, month, day).dayOfWeek();
+                        const int dayOfWeek = calendar.dayOfWeek(QDate(year, month, day, calendar));
                         const QLocale::FormatType dayFormat =
                             (sn.type == DayOfWeekSectionShort
                              ? QLocale::ShortFormat : QLocale::LongFormat);
@@ -1334,13 +1348,12 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
                 conflicts = true;
             }
         }
-
     }
 
     QDTPDEBUG << year << month << day << hour << minute << second << msec;
     Q_ASSERT(state != Invalid);
 
-    const QDate date(year, month, day);
+    const QDate date(year, month, day, calendar);
     const QTime time(hour, minute, second, msec);
     const QDateTime when =
 #if QT_CONFIG(timezone)
@@ -1391,8 +1404,8 @@ QDateTimeParser::parse(QString input, int position, const QDateTime &defaultValu
         if (context != FromString && scan.value < minimum) {
             const QLatin1Char space(' ');
             if (scan.value >= minimum)
-                qWarning("QDateTimeParser::parse Internal error 3 (%s %s)",
-                         qPrintable(scan.value.toString()), qPrintable(minimum.toString()));
+                qWarning("QDateTimeParser::parse Internal error 3 (%ls %ls)",
+                         qUtf16Printable(scan.value.toString()), qUtf16Printable(minimum.toString()));
 
             bool done = false;
             scan.state = Invalid;
@@ -1428,10 +1441,11 @@ QDateTimeParser::parse(QString input, int position, const QDateTime &defaultValu
                         Q_FALLTHROUGH();
                     case MonthSection:
                         if (sn.count >= 3) {
-                            const int finalMonth = scan.value.date().month();
+                            const QDate when = scan.value.date();
+                            const int finalMonth = when.month(calendar);
                             int tmp = finalMonth;
                             // I know the first possible month makes the date too early
-                            while ((tmp = findMonth(t, tmp + 1, i)) != -1) {
+                            while ((tmp = findMonth(t, tmp + 1, i, when.year(calendar))) != -1) {
                                 const QDateTime copy(scan.value.addMonths(tmp - finalMonth));
                                 if (copy >= minimum && copy <= maximum)
                                     break; // break out of while
@@ -1474,8 +1488,8 @@ QDateTimeParser::parse(QString input, int position, const QDateTime &defaultValu
 
                         const int min = getDigit(minimum, i);
                         if (min == -1) {
-                            qWarning("QDateTimeParser::parse Internal error 4 (%s)",
-                                     qPrintable(sn.name()));
+                            qWarning("QDateTimeParser::parse Internal error 4 (%ls)",
+                                     qUtf16Printable(sn.name()));
                             scan.state = Invalid;
                             done = true;
                             break;
@@ -1529,7 +1543,7 @@ QDateTimeParser::parse(QString input, int position, const QDateTime &defaultValu
   length of overlap in *used (if \a used is non-NULL) and the first entry that
   overlapped this much in *usedText (if \a usedText is non-NULL).
  */
-static int findTextEntry(const QString &text, const QVector<QString> &entries, QString *usedText, int *used)
+static int findTextEntry(const QString &text, const ShortVector<QString> &entries, QString *usedText, int *used)
 {
     if (text.isEmpty())
         return -1;
@@ -1567,7 +1581,7 @@ static int findTextEntry(const QString &text, const QVector<QString> &entries, Q
 */
 
 int QDateTimeParser::findMonth(const QString &str1, int startMonth, int sectionIndex,
-                               QString *usedMonth, int *used) const
+                               int year, QString *usedMonth, int *used) const
 {
     const SectionNode &sn = sectionNode(sectionIndex);
     if (sn.type != MonthSection) {
@@ -1577,10 +1591,10 @@ int QDateTimeParser::findMonth(const QString &str1, int startMonth, int sectionI
 
     QLocale::FormatType type = sn.count == 3 ? QLocale::ShortFormat : QLocale::LongFormat;
     QLocale l = locale();
-    QVector<QString> monthNames;
+    ShortVector<QString> monthNames;
     monthNames.reserve(13 - startMonth);
     for (int month = startMonth; month <= 12; ++month)
-        monthNames.append(l.monthName(month, type));
+        monthNames.append(calendar.monthName(l, month, year, type));
 
     const int index = findTextEntry(str1, monthNames, usedMonth, used);
     return index < 0 ? index : index + startMonth;
@@ -1596,7 +1610,7 @@ int QDateTimeParser::findDay(const QString &str1, int startDay, int sectionIndex
 
     QLocale::FormatType type = sn.count == 4 ? QLocale::LongFormat : QLocale::ShortFormat;
     QLocale l = locale();
-    QVector<QString> daysOfWeek;
+    ShortVector<QString> daysOfWeek;
     daysOfWeek.reserve(8 - startDay);
     for (int day = startDay; day <= 7; ++day)
         daysOfWeek.append(l.dayName(day, type));
@@ -1776,8 +1790,8 @@ int QDateTimeParser::SectionNode::maxChange() const
     case YearSection: return 9999 * 365;
     case YearSection2Digits: return 100 * 365;
     default:
-        qWarning("QDateTimeParser::maxChange() Internal error (%s)",
-                 qPrintable(name()));
+        qWarning("QDateTimeParser::maxChange() Internal error (%ls)",
+                 qUtf16Printable(name()));
     }
 
     return -1;
@@ -1825,8 +1839,8 @@ QDateTimeParser::FieldInfo QDateTimeParser::fieldInfo(int index) const
     case TimeZoneSection:
         break;
     default:
-        qWarning("QDateTimeParser::fieldInfo Internal error 2 (%d %s %d)",
-                 index, qPrintable(sn.name()), sn.count);
+        qWarning("QDateTimeParser::fieldInfo Internal error 2 (%d %ls %d)",
+                 index, qUtf16Printable(sn.name()), sn.count);
         break;
     }
     return ret;
@@ -1849,8 +1863,8 @@ QString QDateTimeParser::SectionNode::format() const
     case YearSection2Digits:
     case YearSection: fillChar = QLatin1Char('y'); break;
     default:
-        qWarning("QDateTimeParser::sectionFormat Internal error (%s)",
-                 qPrintable(name(type)));
+        qWarning("QDateTimeParser::sectionFormat Internal error (%ls)",
+                 qUtf16Printable(name(type)));
         return QString();
     }
     if (fillChar.isNull()) {
@@ -1878,7 +1892,7 @@ bool QDateTimeParser::potentialValue(const QStringRef &str, int min, int max, in
     int val = (int)locale().toUInt(str);
     const SectionNode &sn = sectionNode(index);
     if (sn.type == YearSection2Digits) {
-        const int year = currentValue.date().year();
+        const int year = currentValue.date().year(calendar);
         val += year - (year % 100);
     }
     if (val >= min && val <= max && str.size() == size) {
@@ -1986,7 +2000,7 @@ QString QDateTimeParser::stateName(State s) const
 #if QT_CONFIG(datestring)
 bool QDateTimeParser::fromString(const QString &t, QDate *date, QTime *time) const
 {
-    QDateTime val(QDate(1900, 1, 1), QDATETIMEEDIT_TIME_MIN);
+    QDateTime val(QDate(1900, 1, 1).startOfDay());
     const StateNode tmp = parse(t, -1, val, false);
     if (tmp.state != Acceptable || tmp.conflicts) {
         return false;
@@ -2014,20 +2028,20 @@ QDateTime QDateTimeParser::getMinimum() const
 {
     // Cache the most common case
     if (spec == Qt::LocalTime) {
-        static const QDateTime localTimeMin(QDATETIMEEDIT_DATE_MIN, QDATETIMEEDIT_TIME_MIN, Qt::LocalTime);
+        static const QDateTime localTimeMin(QDATETIMEEDIT_DATE_MIN.startOfDay(Qt::LocalTime));
         return localTimeMin;
     }
-    return QDateTime(QDATETIMEEDIT_DATE_MIN, QDATETIMEEDIT_TIME_MIN, spec);
+    return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec));
 }
 
 QDateTime QDateTimeParser::getMaximum() const
 {
     // Cache the most common case
     if (spec == Qt::LocalTime) {
-        static const QDateTime localTimeMax(QDATETIMEEDIT_DATE_MAX, QDATETIMEEDIT_TIME_MAX, Qt::LocalTime);
+        static const QDateTime localTimeMax(QDATETIMEEDIT_DATE_MAX.endOfDay(Qt::LocalTime));
         return localTimeMax;
     }
-    return QDateTime(QDATETIMEEDIT_DATE_MAX, QDATETIMEEDIT_TIME_MAX, spec);
+    return QDateTime(QDATETIMEEDIT_DATE_MAX.endOfDay(spec));
 }
 
 QString QDateTimeParser::getAmPmText(AmPm ap, Case cs) const
@@ -2048,4 +2062,13 @@ bool operator==(const QDateTimeParser::SectionNode &s1, const QDateTimeParser::S
     return (s1.type == s2.type) && (s1.pos == s2.pos) && (s1.count == s2.count);
 }
 
+/*!
+  Sets \a cal as the calendar to use. The default is Gregorian.
+*/
+
+void QDateTimeParser::setCalendar(const QCalendar &cal)
+{
+    calendar = cal;
+}
+
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qdatetimeparser_p.h b/src/corelib/time/qdatetimeparser_p.h
index f7e6e351fe..e9f1455380 100644
--- a/src/corelib/tools/qdatetimeparser_p.h
+++ b/src/corelib/time/qdatetimeparser_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -57,6 +57,7 @@
 #include "QtCore/qdatetime.h"
 #include "QtCore/qstringlist.h"
 #include "QtCore/qlocale.h"
+#include "QtCore/qcalendar.h"
 #ifndef QT_BOOTSTRAPPED
 # include "QtCore/qvariant.h"
 #endif
@@ -65,14 +66,11 @@
 
 QT_REQUIRE_CONFIG(datetimeparser);
 
-#define QDATETIMEEDIT_TIME_MIN QTime(0, 0, 0, 0)
-#define QDATETIMEEDIT_TIME_MAX QTime(23, 59, 59, 999)
+#define QDATETIMEEDIT_TIME_MIN QTime(0, 0) // Prefer QDate::startOfDay()
+#define QDATETIMEEDIT_TIME_MAX QTime(23, 59, 59, 999) // Prefer QDate::endOfDay()
 #define QDATETIMEEDIT_DATE_MIN QDate(100, 1, 1)
 #define QDATETIMEEDIT_COMPAT_DATE_MIN QDate(1752, 9, 14)
 #define QDATETIMEEDIT_DATE_MAX QDate(9999, 12, 31)
-#define QDATETIMEEDIT_DATETIME_MIN QDateTime(QDATETIMEEDIT_DATE_MIN, QDATETIMEEDIT_TIME_MIN)
-#define QDATETIMEEDIT_COMPAT_DATETIME_MIN QDateTime(QDATETIMEEDIT_COMPAT_DATE_MIN, QDATETIMEEDIT_TIME_MIN)
-#define QDATETIMEEDIT_DATETIME_MAX QDateTime(QDATETIMEEDIT_DATE_MAX, QDATETIMEEDIT_TIME_MAX)
 #define QDATETIMEEDIT_DATE_INITIAL QDate(2000, 1, 1)
 
 QT_BEGIN_NAMESPACE
@@ -85,9 +83,9 @@ public:
         FromString,
         DateTimeEdit
     };
-    QDateTimeParser(QVariant::Type t, Context ctx)
-        : currentSectionIndex(-1), display(0), cachedDay(-1), parserType(t),
-        fixday(false), spec(Qt::LocalTime), context(ctx)
+    QDateTimeParser(QVariant::Type t, Context ctx, const QCalendar &cal = QCalendar())
+        : currentSectionIndex(-1), display(nullptr), cachedDay(-1), parserType(t),
+        fixday(false), spec(Qt::LocalTime), context(ctx), calendar(cal)
     {
         defaultLocale = QLocale::system();
         first.type = FirstSection;
@@ -198,6 +196,7 @@ public:
 
     void setDefaultLocale(const QLocale &loc) { defaultLocale = loc; }
     virtual QString displayText() const { return text; }
+    void setCalendar(const QCalendar &calendar);
 
 private:
     int sectionMaxSize(Section s, int count) const;
@@ -218,9 +217,9 @@ private:
     ParsedSection parseSection(const QDateTime &currentValue, int sectionIndex,
                                int offset, QString *text) const;
     int findMonth(const QString &str1, int monthstart, int sectionIndex,
-                  QString *monthName = 0, int *used = 0) const;
+                  int year, QString *monthName = nullptr, int *used = nullptr) const;
     int findDay(const QString &str1, int intDaystart, int sectionIndex,
-                QString *dayName = 0, int *used = 0) const;
+                QString *dayName = nullptr, int *used = nullptr) const;
     ParsedSection findTimeZone(QStringRef str, const QDateTime &when,
                                int maxVal, int minVal) const;
 #if QT_CONFIG(timezone)
@@ -236,7 +235,7 @@ private:
         PossiblePM = 3,
         PossibleBoth = 4
     };
-    AmPmFinder findAmPm(QString &str, int index, int *used = 0) const;
+    AmPmFinder findAmPm(QString &str, int index, int *used = nullptr) const;
 #endif // datestring
 
     bool potentialValue(const QStringRef &str, int min, int max, int index,
@@ -300,6 +299,7 @@ protected: // for the benefit of QDateTimeEditPrivate
     bool fixday;
     Qt::TimeSpec spec; // spec if used by QDateTimeEdit
     Context context;
+    QCalendar calendar;
 };
 Q_DECLARE_TYPEINFO(QDateTimeParser::SectionNode, Q_PRIMITIVE_TYPE);
 
diff --git a/src/corelib/time/qgregoriancalendar.cpp b/src/corelib/time/qgregoriancalendar.cpp
new file mode 100644
index 0000000000..633b1ea94e
--- /dev/null
+++ b/src/corelib/time/qgregoriancalendar.cpp
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qgregoriancalendar_p.h"
+#include "qcalendarmath_p.h"
+#include <QtCore/qdatetime.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QRoundingDown;
+
+/*!
+    \since 5.14
+
+    \class QGregorianCalendar
+    \inmodule QtCore
+    \brief The QGregorianCalendar class implements the Gregorian calendar.
+
+    \section1 The Gregorian Calendar
+
+    The Gregorian calendar is a refinement of the earlier Julian calendar,
+    itself a late form of the Roman calendar. It is widely used.
+
+    \sa QRomanCalendar, QJulianCalendar, QCalendar
+*/
+
+QGregorianCalendar::QGregorianCalendar()
+    : QRomanCalendar(QStringLiteral("Gregorian"), QCalendar::System::Gregorian)
+{
+    registerAlias(QStringLiteral("gregory"));
+}
+
+QString QGregorianCalendar::name() const
+{
+    return QStringLiteral("Gregorian");
+}
+
+QCalendar::System QGregorianCalendar::calendarSystem() const
+{
+    return QCalendar::System::Gregorian;
+}
+
+bool QGregorianCalendar::isLeapYear(int year) const
+{
+    return leapTest(year);
+}
+
+bool QGregorianCalendar::leapTest(int year)
+{
+    if (year == QCalendar::Unspecified)
+        return false;
+
+    // No year 0 in Gregorian calendar, so -1, -5, -9 etc are leap years
+    if (year < 1)
+        ++year;
+
+    return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0);
+}
+
+// Duplicating code from QRomanCalendar, but inlining isLeapYear() as leapTest():
+int QGregorianCalendar::monthLength(int month, int year)
+{
+    if (month < 1 || month > 12)
+        return 0;
+
+    if (month == 2)
+        return leapTest(year) ? 29 : 28;
+
+    return 30 | ((month & 1) ^ (month >> 3));
+}
+
+bool QGregorianCalendar::validParts(int year, int month, int day)
+{
+    return year && 0 < day && day <= monthLength(month, year);
+}
+
+int QGregorianCalendar::weekDayOfJulian(qint64 jd)
+{
+    return qMod(jd, 7) + 1;
+}
+
+bool QGregorianCalendar::dateToJulianDay(int year, int month, int day, qint64 *jd) const
+{
+    return julianFromParts(year, month, day, jd);
+}
+
+bool QGregorianCalendar::julianFromParts(int year, int month, int day, qint64 *jd)
+{
+    Q_ASSERT(jd);
+    if (!validParts(year, month, day))
+        return false;
+
+    if (year < 0)
+        ++year;
+
+    /*
+     * Math from The Calendar FAQ at http://www.tondering.dk/claus/cal/julperiod.php
+     * This formula is correct for all julian days, when using mathematical integer
+     * division (round to negative infinity), not c++11 integer division (round to zero)
+     */
+    int    a = month < 3 ? 1 : 0;
+    qint64 y = qint64(year) + 4800 - a;
+    int    m = month + 12 * a - 3;
+    *jd = day + qDiv(153 * m + 2, 5) - 32045
+        + 365 * y + qDiv(y, 4) - qDiv(y, 100) + qDiv(y, 400);
+    return true;
+}
+
+QCalendar::YearMonthDay QGregorianCalendar::julianDayToDate(qint64 jd) const
+{
+    return partsFromJulian(jd);
+}
+
+QCalendar::YearMonthDay QGregorianCalendar::partsFromJulian(qint64 jd)
+{
+    /*
+     * Math from The Calendar FAQ at http://www.tondering.dk/claus/cal/julperiod.php
+     * This formula is correct for all julian days, when using mathematical integer
+     * division (round to negative infinity), not c++11 integer division (round to zero)
+     */
+    qint64 a = jd + 32044;
+    qint64 b = qDiv(4 * a + 3, 146097);
+    int    c = a - qDiv(146097 * b, 4);
+
+    int    d = qDiv(4 * c + 3, 1461);
+    int    e = c - qDiv(1461 * d, 4);
+    int    m = qDiv(5 * e + 2, 153);
+
+    int y = 100 * b + d - 4800 + qDiv(m, 10);
+
+    // Adjust for no year 0
+    int year = y > 0 ? y : y - 1;
+    int month = m + 3 - 12 * qDiv(m, 10);
+    int day = e - qDiv(153 * m + 2, 5) + 1;
+
+    return QCalendar::YearMonthDay(year, month, day);
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/time/qgregoriancalendar_p.h b/src/corelib/time/qgregoriancalendar_p.h
new file mode 100644
index 0000000000..191f9c127b
--- /dev/null
+++ b/src/corelib/time/qgregoriancalendar_p.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGREGORIAN_CALENDAR_P_H
+#define QGREGORIAN_CALENDAR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of calendar implementations.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qromancalendar_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class Q_CORE_EXPORT QGregorianCalendar : public QRomanCalendar
+{
+    // TODO: provide static methods, called by the overrides, that can be called
+    // directly by QDate to optimize various parts.
+public:
+    QGregorianCalendar();
+    // CAlendar properties:
+    QString name() const override;
+    QCalendar::System calendarSystem() const override;
+    // Date queries:
+    bool isLeapYear(int year) const override;
+    // Julian Day conversions:
+    bool dateToJulianDay(int year, int month, int day, qint64 *jd) const override;
+    QCalendar::YearMonthDay julianDayToDate(qint64 jd) const override;
+
+    // Names of months (implemented in qlocale.cpp):
+    QString monthName(const QLocale &locale, int month, int year,
+                      QLocale::FormatType format) const override;
+    QString standaloneMonthName(const QLocale &locale, int month, int year,
+                                QLocale::FormatType format) const override;
+
+    // Static optimized versions for the benefit of QDate:
+    static int weekDayOfJulian(qint64 jd);
+    static bool leapTest(int year);
+    static int monthLength(int month, int year);
+    static bool validParts(int year, int month, int day);
+    static QCalendar::YearMonthDay partsFromJulian(qint64 jd);
+    static bool julianFromParts(int year, int month, int day, qint64 *jd);
+};
+
+QT_END_NAMESPACE
+
+#endif // QGREGORIAN_CALENDAR_P_H
diff --git a/src/corelib/time/qhijricalendar.cpp b/src/corelib/time/qhijricalendar.cpp
new file mode 100644
index 0000000000..b5d89fbc5c
--- /dev/null
+++ b/src/corelib/time/qhijricalendar.cpp
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qglobal.h"
+#include "qhijricalendar_p.h"
+#include "qhijricalendar_data_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \since 5.14
+    \internal
+
+    \class QHijriCalendar
+    \inmodule QtCore
+    \brief The QHijriCalendar class supports Islamic (Hijri) calendar implementations.
+
+    \section1 Islamic Calendar System
+
+    The Islamic, Muslim, or Hijri calendar is a lunar calendar consisting of 12
+    months in a year of 354 or 355 days. It is used (often alongside the
+    Gregorian calendar) to date events in many Muslim countries. It is also used
+    by Muslims to determine the proper days of Islamic holidays and rituals,
+    such as the annual period of fasting and the proper time for the pilgrimage
+    to Mecca.
+
+    Source: \l {https://en.wikipedia.org/wiki/Islamic_calendar}{Wikipedia page
+    on Hijri Calendar}
+
+    \section1 Support for variants
+
+    This base class provides the common details shared by all variants on the
+    Islamic calendar. Each year comprises 12 months of 29 or 30 days each; most
+    years have as many of 29 as of 30, but leap years extend one 29-day month to
+    30 days. In tabular versions of the calendar (where mathematical rules are
+    used to determine the details), odd-numbered months have 30 days, as does
+    the last (twelfth) month of a leap year; all other months have 29
+    days. Other versions are based on actual astronomical observations of the
+    moon's phase at sunset, which vary from place to place.
+
+    \sa QIslamicCivilCalendar, QCalendar
+*/
+
+bool QHijriCalendar::isLunar() const
+{
+    return true;
+}
+
+bool QHijriCalendar::isLuniSolar() const
+{
+    return false;
+}
+
+bool QHijriCalendar::isSolar() const
+{
+    return false;
+}
+
+int QHijriCalendar::daysInMonth(int month, int year) const
+{
+    if (year == 0 || month < 1 || month > 12)
+        return 0;
+
+    if (month == 12 && isLeapYear(year))
+        return 30;
+
+    return month % 2 == 0 ? 29 : 30;
+}
+
+int QHijriCalendar::maximumDaysInMonth() const
+{
+    return 30;
+}
+
+int QHijriCalendar::daysInYear(int year) const
+{
+    return monthsInYear(year) ? isLeapYear(year) ? 355 : 354 : 0;
+}
+
+const QCalendarLocale *QHijriCalendar::localeMonthIndexData() const
+{
+    return locale_data;
+}
+
+const ushort *QHijriCalendar::localeMonthData() const
+{
+    return months_data;
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/time/qhijricalendar_data_p.h b/src/corelib/time/qhijricalendar_data_p.h
new file mode 100644
index 0000000000..3900e1a477
--- /dev/null
+++ b/src/corelib/time/qhijricalendar_data_p.h
@@ -0,0 +1,1146 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QHIJRI_CALENDAR_DATA_P_H
+#define QHIJRI_CALENDAR_DATA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
+// file may change from version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qglobal_p.h>
+#include <QtCore/private/qcalendarbackend_p.h>
+
+QT_BEGIN_NAMESPACE
+
+// GENERATED PART STARTS HERE
+
+/*
+    This part of the file was generated on 2019-05-27 from the
+    Common Locale Data Repository v35.1
+
+    http://www.unicode.org/cldr/
+
+    Do not edit this section: instead regenerate it using
+    cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or
+    edited) CLDR data; see qtbase/util/locale_database/.
+*/
+
+static const QCalendarLocale locale_data[] = {
+   //  lang   script terr   sShort  sLong   sNarrow short   long    narrow
+      {     1,     0,     0,{ 0,87 },{ 87,107 },{ 194,29 },{ 0,87 },{ 87,107 },{ 194,29 }}, // C/AnyScript/AnyCountry
+       {     3,     7,    69,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Oromo/Latin/Ethiopia
+       {     3,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Oromo/Latin/Kenya
+       {     4,     7,    69,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Afar/Latin/Ethiopia
+       {     5,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Afrikaans/Latin/South Africa
+       {     5,     7,   148,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Afrikaans/Latin/Namibia
+       {     6,     7,     2,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Albanian/Latin/Albania
+       {     6,     7,   127,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Albanian/Latin/Macedonia
+       {     6,     7,   257,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Albanian/Latin/Kosovo
+       {     7,    14,    69,{ 223,79 },{ 329,75 },{ 302,27 },{ 223,79 },{ 329,75 },{ 302,27 }}, // Amharic/Ethiopic/Ethiopia
+       {     8,     1,    64,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Egypt
+       {     8,     1,     3,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Algeria
+       {     8,     1,    17,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Bahrain
+       {     8,     1,    42,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Chad
+       {     8,     1,    48,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Comoros
+       {     8,     1,    59,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Djibouti
+       {     8,     1,    67,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Eritrea
+       {     8,     1,   103,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Iraq
+       {     8,     1,   105,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Israel
+       {     8,     1,   109,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Jordan
+       {     8,     1,   115,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Kuwait
+       {     8,     1,   119,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Lebanon
+       {     8,     1,   122,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Libya
+       {     8,     1,   136,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Mauritania
+       {     8,     1,   145,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Morocco
+       {     8,     1,   162,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Oman
+       {     8,     1,   165,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Palestinian Territories
+       {     8,     1,   175,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Qatar
+       {     8,     1,   186,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Saudi Arabia
+       {     8,     1,   194,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Somalia
+       {     8,     1,   201,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Sudan
+       {     8,     1,   207,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Syria
+       {     8,     1,   216,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Tunisia
+       {     8,     1,   223,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/United Arab Emirates
+       {     8,     1,   236,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Western Sahara
+       {     8,     1,   237,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/Yemen
+       {     8,     1,   254,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/South Sudan
+       {     8,     1,   260,{ 404,97 },{ 404,97 },{ 501,27 },{ 404,97 },{ 404,97 },{ 501,27 }}, // Arabic/Arabic/World
+       {     9,    10,    11,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Armenian/Armenian/Armenia
+       {    10,    11,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Assamese/Bengali/India
+       {    12,     7,    15,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Azerbaijani/Latin/Azerbaijan
+       {    12,     1,   102,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Azerbaijani/Arabic/Iran
+       {    12,     2,    15,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Azerbaijani/Cyrillic/Azerbaijan
+       {    13,     2,   178,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Bashkir/Cyrillic/Russia
+       {    14,     7,   197,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Basque/Latin/Spain
+       {    15,    11,    18,{ 528,105 },{ 528,105 },{ 633,27 },{ 528,105 },{ 528,105 },{ 633,27 }}, // Bengali/Bengali/Bangladesh
+       {    15,    11,   100,{ 528,105 },{ 528,105 },{ 633,27 },{ 528,105 },{ 528,105 },{ 633,27 }}, // Bengali/Bengali/India
+       {    16,    31,    25,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Dzongkha/Tibetan/Bhutan
+       {    19,     7,    74,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Breton/Latin/France
+       {    20,     2,    33,{ 223,79 },{ 660,97 },{ 302,27 },{ 223,79 },{ 660,97 },{ 302,27 }}, // Bulgarian/Cyrillic/Bulgaria
+       {    21,    25,   147,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Burmese/Myanmar/Myanmar
+       {    22,     2,    20,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Belarusian/Cyrillic/Belarus
+       {    23,    20,    36,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Khmer/Khmer/Cambodia
+       {    24,     7,   197,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Catalan/Latin/Spain
+       {    24,     7,     5,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Catalan/Latin/Andorra
+       {    24,     7,    74,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Catalan/Latin/France
+       {    24,     7,   106,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Catalan/Latin/Italy
+       {    25,     5,    44,{ 757,39 },{ 796,38 },{ 302,27 },{ 757,39 },{ 796,38 },{ 302,27 }}, // Chinese/Simplified Han/China
+       {    25,     5,    97,{ 757,39 },{ 796,38 },{ 302,27 },{ 757,39 },{ 796,38 },{ 302,27 }}, // Chinese/Simplified Han/Hong Kong
+       {    25,     5,   126,{ 757,39 },{ 796,38 },{ 302,27 },{ 757,39 },{ 796,38 },{ 302,27 }}, // Chinese/Simplified Han/Macau
+       {    25,     5,   190,{ 757,39 },{ 796,38 },{ 302,27 },{ 757,39 },{ 796,38 },{ 302,27 }}, // Chinese/Simplified Han/Singapore
+       {    25,     6,    97,{ 834,72 },{ 834,72 },{ 302,27 },{ 834,72 },{ 834,72 },{ 302,27 }}, // Chinese/Traditional Han/Hong Kong
+       {    25,     6,   126,{ 834,72 },{ 834,72 },{ 302,27 },{ 834,72 },{ 834,72 },{ 302,27 }}, // Chinese/Traditional Han/Macau
+       {    25,     6,   208,{ 834,72 },{ 834,72 },{ 302,27 },{ 834,72 },{ 834,72 },{ 302,27 }}, // Chinese/Traditional Han/Taiwan
+       {    26,     7,    74,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Corsican/Latin/France
+       {    27,     7,    54,{ 223,79 },{ 87,107 },{ 906,39 },{ 223,79 },{ 87,107 },{ 906,39 }}, // Croatian/Latin/Croatia
+       {    27,     7,    27,{ 223,79 },{ 87,107 },{ 906,39 },{ 223,79 },{ 87,107 },{ 906,39 }}, // Croatian/Latin/Bosnia And Herzegowina
+       {    28,     7,    57,{ 945,77 },{ 1022,130 },{ 302,27 },{ 945,77 },{ 1022,130 },{ 302,27 }}, // Czech/Latin/Czech Republic
+       {    29,     7,    58,{ 223,79 },{ 1152,107 },{ 302,27 },{ 223,79 },{ 1152,107 },{ 302,27 }}, // Danish/Latin/Denmark
+       {    29,     7,    86,{ 223,79 },{ 1152,107 },{ 302,27 },{ 223,79 },{ 1152,107 },{ 302,27 }}, // Danish/Latin/Greenland
+       {    30,     7,   151,{ 1259,84 },{ 1343,135 },{ 302,27 },{ 1259,84 },{ 1343,135 },{ 302,27 }}, // Dutch/Latin/Netherlands
+       {    30,     7,    12,{ 1259,84 },{ 1343,135 },{ 302,27 },{ 1259,84 },{ 1343,135 },{ 302,27 }}, // Dutch/Latin/Aruba
+       {    30,     7,    21,{ 1259,84 },{ 1343,135 },{ 302,27 },{ 1259,84 },{ 1343,135 },{ 302,27 }}, // Dutch/Latin/Belgium
+       {    30,     7,   152,{ 1259,84 },{ 1343,135 },{ 302,27 },{ 1259,84 },{ 1343,135 },{ 302,27 }}, // Dutch/Latin/Cura Sao
+       {    30,     7,   202,{ 1259,84 },{ 1343,135 },{ 302,27 },{ 1259,84 },{ 1343,135 },{ 302,27 }}, // Dutch/Latin/Suriname
+       {    30,     7,   255,{ 1259,84 },{ 1343,135 },{ 302,27 },{ 1259,84 },{ 1343,135 },{ 302,27 }}, // Dutch/Latin/Bonaire
+       {    30,     7,   256,{ 1259,84 },{ 1343,135 },{ 302,27 },{ 1259,84 },{ 1343,135 },{ 302,27 }}, // Dutch/Latin/Sint Maarten
+       {    31,     7,   225,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/United States
+       {    31,     3,   225,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Deseret/United States
+       {    31,     7,     4,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/American Samoa
+       {    31,     7,     7,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Anguilla
+       {    31,     7,     9,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Antigua And Barbuda
+       {    31,     7,    13,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Australia
+       {    31,     7,    14,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Austria
+       {    31,     7,    16,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Bahamas
+       {    31,     7,    19,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Barbados
+       {    31,     7,    21,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Belgium
+       {    31,     7,    22,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Belize
+       {    31,     7,    24,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Bermuda
+       {    31,     7,    28,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Botswana
+       {    31,     7,    31,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/British Indian Ocean Territory
+       {    31,     7,    35,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Burundi
+       {    31,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Cameroon
+       {    31,     7,    38,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Canada
+       {    31,     7,    40,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Cayman Islands
+       {    31,     7,    45,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Christmas Island
+       {    31,     7,    46,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Cocos Islands
+       {    31,     7,    51,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Cook Islands
+       {    31,     7,    56,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Cyprus
+       {    31,     7,    58,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Denmark
+       {    31,     7,    60,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Dominica
+       {    31,     7,    67,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Eritrea
+       {    31,     7,    70,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Falkland Islands
+       {    31,     7,    72,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Fiji
+       {    31,     7,    73,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Finland
+       {    31,     7,    75,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Guernsey
+       {    31,     7,    80,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Gambia
+       {    31,     7,    82,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Germany
+       {    31,     7,    83,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Ghana
+       {    31,     7,    84,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Gibraltar
+       {    31,     7,    87,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Grenada
+       {    31,     7,    89,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Guam
+       {    31,     7,    93,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Guyana
+       {    31,     7,    97,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Hong Kong
+       {    31,     7,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/India
+       {    31,     7,   104,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Ireland
+       {    31,     7,   105,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Israel
+       {    31,     7,   107,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Jamaica
+       {    31,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Kenya
+       {    31,     7,   112,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Kiribati
+       {    31,     7,   120,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Lesotho
+       {    31,     7,   121,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Liberia
+       {    31,     7,   126,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Macau
+       {    31,     7,   128,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Madagascar
+       {    31,     7,   129,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Malawi
+       {    31,     7,   130,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Malaysia
+       {    31,     7,   133,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Malta
+       {    31,     7,   134,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Marshall Islands
+       {    31,     7,   137,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Mauritius
+       {    31,     7,   140,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Micronesia
+       {    31,     7,   144,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Montserrat
+       {    31,     7,   148,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Namibia
+       {    31,     7,   149,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Nauru
+       {    31,     7,   151,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Netherlands
+       {    31,     7,   154,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/New Zealand
+       {    31,     7,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Nigeria
+       {    31,     7,   158,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Niue
+       {    31,     7,   159,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Norfolk Island
+       {    31,     7,   160,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Northern Mariana Islands
+       {    31,     7,   163,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Pakistan
+       {    31,     7,   164,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Palau
+       {    31,     7,   167,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Papua New Guinea
+       {    31,     7,   170,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Philippines
+       {    31,     7,   171,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Pitcairn
+       {    31,     7,   174,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Puerto Rico
+       {    31,     7,   179,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Rwanda
+       {    31,     7,   180,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Saint Kitts And Nevis
+       {    31,     7,   181,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Saint Lucia
+       {    31,     7,   182,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Saint Vincent And The Grenadines
+       {    31,     7,   183,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Samoa
+       {    31,     7,   188,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Seychelles
+       {    31,     7,   189,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Sierra Leone
+       {    31,     7,   190,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Singapore
+       {    31,     7,   192,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Slovenia
+       {    31,     7,   193,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Solomon Islands
+       {    31,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/South Africa
+       {    31,     7,   199,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Saint Helena
+       {    31,     7,   201,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Sudan
+       {    31,     7,   204,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Swaziland
+       {    31,     7,   205,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Sweden
+       {    31,     7,   206,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Switzerland
+       {    31,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Tanzania
+       {    31,     7,   213,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Tokelau
+       {    31,     7,   214,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Tonga
+       {    31,     7,   215,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Trinidad And Tobago
+       {    31,     7,   219,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Turks And Caicos Islands
+       {    31,     7,   220,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Tuvalu
+       {    31,     7,   221,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Uganda
+       {    31,     7,   223,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/United Arab Emirates
+       {    31,     7,   224,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/United Kingdom
+       {    31,     7,   226,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/United States Minor Outlying Islands
+       {    31,     7,   229,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Vanuatu
+       {    31,     7,   233,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/British Virgin Islands
+       {    31,     7,   234,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/United States Virgin Islands
+       {    31,     7,   239,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Zambia
+       {    31,     7,   240,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Zimbabwe
+       {    31,     7,   249,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Diego Garcia
+       {    31,     7,   251,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Isle Of Man
+       {    31,     7,   252,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Jersey
+       {    31,     7,   254,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/South Sudan
+       {    31,     7,   256,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Sint Maarten
+       {    31,     7,   260,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/World
+       {    31,     7,   261,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // English/Latin/Europe
+       {    32,     7,   260,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Esperanto/Latin/World
+       {    33,     7,    68,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Estonian/Latin/Estonia
+       {    34,     7,    71,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Faroese/Latin/Faroe Islands
+       {    34,     7,    58,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Faroese/Latin/Denmark
+       {    36,     7,    73,{ 223,79 },{ 1478,130 },{ 302,27 },{ 223,79 },{ 1478,130 },{ 302,27 }}, // Finnish/Latin/Finland
+       {    37,     7,    74,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/France
+       {    37,     7,     3,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Algeria
+       {    37,     7,    21,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Belgium
+       {    37,     7,    23,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Benin
+       {    37,     7,    34,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Burkina Faso
+       {    37,     7,    35,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Burundi
+       {    37,     7,    37,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Cameroon
+       {    37,     7,    38,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Canada
+       {    37,     7,    41,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Central African Republic
+       {    37,     7,    42,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Chad
+       {    37,     7,    48,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Comoros
+       {    37,     7,    49,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Congo Kinshasa
+       {    37,     7,    50,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Congo Brazzaville
+       {    37,     7,    53,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Ivory Coast
+       {    37,     7,    59,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Djibouti
+       {    37,     7,    66,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Equatorial Guinea
+       {    37,     7,    76,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/French Guiana
+       {    37,     7,    77,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/French Polynesia
+       {    37,     7,    79,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Gabon
+       {    37,     7,    88,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Guadeloupe
+       {    37,     7,    91,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Guinea
+       {    37,     7,    94,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Haiti
+       {    37,     7,   125,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Luxembourg
+       {    37,     7,   128,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Madagascar
+       {    37,     7,   132,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Mali
+       {    37,     7,   135,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Martinique
+       {    37,     7,   136,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Mauritania
+       {    37,     7,   137,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Mauritius
+       {    37,     7,   138,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Mayotte
+       {    37,     7,   142,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Monaco
+       {    37,     7,   145,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Morocco
+       {    37,     7,   153,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/New Caledonia
+       {    37,     7,   156,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Niger
+       {    37,     7,   176,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Reunion
+       {    37,     7,   179,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Rwanda
+       {    37,     7,   187,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Senegal
+       {    37,     7,   188,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Seychelles
+       {    37,     7,   200,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Saint Pierre And Miquelon
+       {    37,     7,   206,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Switzerland
+       {    37,     7,   207,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Syria
+       {    37,     7,   212,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Togo
+       {    37,     7,   216,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Tunisia
+       {    37,     7,   229,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Vanuatu
+       {    37,     7,   235,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Wallis And Futuna Islands
+       {    37,     7,   244,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Saint Barthelemy
+       {    37,     7,   245,{ 1608,91 },{ 1699,140 },{ 302,27 },{ 1839,91 },{ 1699,140 },{ 302,27 }}, // French/Latin/Saint Martin
+       {    38,     7,   151,{ 1259,84 },{ 1343,135 },{ 302,27 },{ 1259,84 },{ 1343,135 },{ 302,27 }}, // Western Frisian/Latin/Netherlands
+       {    39,     7,   224,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Gaelic/Latin/United Kingdom
+       {    40,     7,   197,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Galician/Latin/Spain
+       {    41,    15,    81,{ 1930,74 },{ 2004,125 },{ 302,27 },{ 1930,74 },{ 2004,125 },{ 302,27 }}, // Georgian/Georgian/Georgia
+       {    42,     7,    82,{ 223,79 },{ 2129,117 },{ 302,27 },{ 223,79 },{ 2129,117 },{ 302,27 }}, // German/Latin/Germany
+       {    42,     7,    14,{ 223,79 },{ 2129,117 },{ 302,27 },{ 223,79 },{ 2129,117 },{ 302,27 }}, // German/Latin/Austria
+       {    42,     7,    21,{ 223,79 },{ 2129,117 },{ 302,27 },{ 223,79 },{ 2129,117 },{ 302,27 }}, // German/Latin/Belgium
+       {    42,     7,   106,{ 223,79 },{ 2129,117 },{ 302,27 },{ 223,79 },{ 2129,117 },{ 302,27 }}, // German/Latin/Italy
+       {    42,     7,   123,{ 223,79 },{ 2129,117 },{ 302,27 },{ 223,79 },{ 2129,117 },{ 302,27 }}, // German/Latin/Liechtenstein
+       {    42,     7,   125,{ 223,79 },{ 2129,117 },{ 302,27 },{ 223,79 },{ 2129,117 },{ 302,27 }}, // German/Latin/Luxembourg
+       {    42,     7,   206,{ 223,79 },{ 2129,117 },{ 302,27 },{ 223,79 },{ 2129,117 },{ 302,27 }}, // German/Latin/Switzerland
+       {    43,    16,    85,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Greek/Greek/Greece
+       {    43,    16,    56,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Greek/Greek/Cyprus
+       {    44,     7,    86,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Greenlandic/Latin/Greenland
+       {    45,     7,   168,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Guarani/Latin/Paraguay
+       {    46,    17,   100,{ 2246,75 },{ 2321,99 },{ 302,27 },{ 2246,75 },{ 2321,99 },{ 302,27 }}, // Gujarati/Gujarati/India
+       {    47,     7,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Hausa/Latin/Nigeria
+       {    47,     1,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Hausa/Arabic/Nigeria
+       {    47,     7,    83,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Hausa/Latin/Ghana
+       {    47,     7,   156,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Hausa/Latin/Niger
+       {    48,    18,   105,{ 2420,96 },{ 2516,117 },{ 302,27 },{ 2420,96 },{ 2633,117 },{ 302,27 }}, // Hebrew/Hebrew/Israel
+       {    49,    13,   100,{ 223,79 },{ 2750,109 },{ 302,27 },{ 223,79 },{ 2750,109 },{ 302,27 }}, // Hindi/Devanagari/India
+       {    50,     7,    98,{ 2859,77 },{ 2936,100 },{ 302,27 },{ 2859,77 },{ 3036,128 },{ 302,27 }}, // Hungarian/Latin/Hungary
+       {    51,     7,    99,{ 3164,79 },{ 1152,107 },{ 302,27 },{ 3164,79 },{ 1152,107 },{ 302,27 }}, // Icelandic/Latin/Iceland
+       {    52,     7,   101,{ 3243,79 },{ 3322,107 },{ 302,27 },{ 3243,79 },{ 3322,107 },{ 302,27 }}, // Indonesian/Latin/Indonesia
+       {    53,     7,   260,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Interlingua/Latin/World
+       {    55,    44,    38,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Inuktitut/Canadian Aboriginal/Canada
+       {    55,     7,    38,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Inuktitut/Latin/Canada
+       {    57,     7,   104,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Irish/Latin/Ireland
+       {    58,     7,   106,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Italian/Latin/Italy
+       {    58,     7,   184,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Italian/Latin/San Marino
+       {    58,     7,   206,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Italian/Latin/Switzerland
+       {    58,     7,   230,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Italian/Latin/Vatican City State
+       {    59,    19,   108,{ 3429,98 },{ 3429,98 },{ 302,27 },{ 3429,98 },{ 3429,98 },{ 302,27 }}, // Japanese/Japanese/Japan
+       {    60,     7,   101,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Javanese/Latin/Indonesia
+       {    61,    21,   100,{ 3527,80 },{ 3607,101 },{ 302,27 },{ 3527,80 },{ 3607,101 },{ 302,27 }}, // Kannada/Kannada/India
+       {    62,     1,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kashmiri/Arabic/India
+       {    63,     2,   110,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kazakh/Cyrillic/Kazakhstan
+       {    64,     7,   179,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kinyarwanda/Latin/Rwanda
+       {    65,     2,   116,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kirghiz/Cyrillic/Kyrgyzstan
+       {    66,    22,   114,{ 223,79 },{ 3708,70 },{ 302,27 },{ 223,79 },{ 3708,70 },{ 302,27 }}, // Korean/Korean/South Korea
+       {    66,    22,   113,{ 223,79 },{ 3708,70 },{ 302,27 },{ 223,79 },{ 3708,70 },{ 302,27 }}, // Korean/Korean/North Korea
+       {    67,     7,   217,{ 223,79 },{ 3778,110 },{ 302,27 },{ 223,79 },{ 3778,110 },{ 302,27 }}, // Kurdish/Latin/Turkey
+       {    68,     7,    35,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Rundi/Latin/Burundi
+       {    69,    23,   117,{ 3888,76 },{ 3964,96 },{ 302,27 },{ 4060,78 },{ 3964,96 },{ 302,27 }}, // Lao/Lao/Laos
+       {    71,     7,   118,{ 223,79 },{ 4138,109 },{ 302,27 },{ 223,79 },{ 4138,109 },{ 302,27 }}, // Latvian/Latin/Latvia
+       {    72,     7,    49,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lingala/Latin/Congo Kinshasa
+       {    72,     7,     6,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lingala/Latin/Angola
+       {    72,     7,    41,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lingala/Latin/Central African Republic
+       {    72,     7,    50,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lingala/Latin/Congo Brazzaville
+       {    73,     7,   124,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lithuanian/Latin/Lithuania
+       {    74,     2,   127,{ 4247,72 },{ 4319,90 },{ 302,27 },{ 4247,72 },{ 4319,90 },{ 302,27 }}, // Macedonian/Cyrillic/Macedonia
+       {    75,     7,   128,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Malagasy/Latin/Madagascar
+       {    76,     7,   130,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Malay/Latin/Malaysia
+       {    76,     1,   130,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Malay/Arabic/Malaysia
+       {    76,     7,    32,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Malay/Latin/Brunei
+       {    76,     7,   190,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Malay/Latin/Singapore
+       {    77,    24,   100,{ 4409,98 },{ 4507,103 },{ 4610,27 },{ 4409,98 },{ 4637,103 },{ 4610,27 }}, // Malayalam/Malayalam/India
+       {    78,     7,   133,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Maltese/Latin/Malta
+       {    79,     7,   154,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Maori/Latin/New Zealand
+       {    80,    13,   100,{ 4740,79 },{ 4819,88 },{ 4907,27 },{ 4740,79 },{ 4819,88 },{ 4907,27 }}, // Marathi/Devanagari/India
+       {    82,     2,   143,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Mongolian/Cyrillic/Mongolia
+       {    82,     8,    44,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Mongolian/Mongolian/China
+       {    84,    13,   150,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Nepali/Devanagari/Nepal
+       {    84,    13,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Nepali/Devanagari/India
+       {    85,     7,   161,{ 4934,79 },{ 5013,107 },{ 302,27 },{ 5120,79 },{ 5013,107 },{ 302,27 }}, // Norwegian Bokmal/Latin/Norway
+       {    85,     7,   203,{ 4934,79 },{ 5013,107 },{ 302,27 },{ 5120,79 },{ 5013,107 },{ 302,27 }}, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
+       {    86,     7,    74,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Occitan/Latin/France
+       {    87,    26,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Oriya/Oriya/India
+       {    88,     1,     1,{ 5199,78 },{ 5277,82 },{ 302,27 },{ 5199,78 },{ 5277,82 },{ 302,27 }}, // Pashto/Arabic/Afghanistan
+       {    88,     1,   163,{ 5199,78 },{ 5359,82 },{ 302,27 },{ 5199,78 },{ 5359,82 },{ 302,27 }}, // Pashto/Arabic/Pakistan
+       {    89,     1,   102,{ 5441,91 },{ 5532,91 },{ 302,27 },{ 5623,93 },{ 5623,93 },{ 302,27 }}, // Persian/Arabic/Iran
+       {    89,     1,     1,{ 5441,91 },{ 5532,91 },{ 302,27 },{ 5623,93 },{ 5623,93 },{ 302,27 }}, // Persian/Arabic/Afghanistan
+       {    90,     7,   172,{ 5716,78 },{ 5794,108 },{ 302,27 },{ 5716,78 },{ 5794,108 },{ 302,27 }}, // Polish/Latin/Poland
+       {    91,     7,    30,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Brazil
+       {    91,     7,     6,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Angola
+       {    91,     7,    39,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Cape Verde
+       {    91,     7,    62,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/East Timor
+       {    91,     7,    66,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Equatorial Guinea
+       {    91,     7,    92,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Guinea Bissau
+       {    91,     7,   125,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Luxembourg
+       {    91,     7,   126,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Macau
+       {    91,     7,   146,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Mozambique
+       {    91,     7,   173,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Portugal
+       {    91,     7,   185,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Sao Tome And Principe
+       {    91,     7,   206,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Portuguese/Latin/Switzerland
+       {    92,     4,   100,{ 5902,78 },{ 5980,93 },{ 302,27 },{ 5902,78 },{ 6073,95 },{ 302,27 }}, // Punjabi/Gurmukhi/India
+       {    92,     1,   163,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Punjabi/Arabic/Pakistan
+       {    93,     7,   169,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Quechua/Latin/Peru
+       {    93,     7,    26,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Quechua/Latin/Bolivia
+       {    93,     7,    63,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Quechua/Latin/Ecuador
+       {    94,     7,   206,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Romansh/Latin/Switzerland
+       {    95,     7,   177,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Romanian/Latin/Romania
+       {    95,     7,   141,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Romanian/Latin/Moldova
+       {    96,     2,   178,{ 6168,80 },{ 6248,132 },{ 302,27 },{ 6168,80 },{ 6248,132 },{ 302,27 }}, // Russian/Cyrillic/Russia
+       {    96,     2,    20,{ 6168,80 },{ 6248,132 },{ 302,27 },{ 6168,80 },{ 6248,132 },{ 302,27 }}, // Russian/Cyrillic/Belarus
+       {    96,     2,   110,{ 6168,80 },{ 6248,132 },{ 302,27 },{ 6168,80 },{ 6248,132 },{ 302,27 }}, // Russian/Cyrillic/Kazakhstan
+       {    96,     2,   116,{ 6168,80 },{ 6248,132 },{ 302,27 },{ 6168,80 },{ 6248,132 },{ 302,27 }}, // Russian/Cyrillic/Kyrgyzstan
+       {    96,     2,   141,{ 6168,80 },{ 6248,132 },{ 302,27 },{ 6168,80 },{ 6248,132 },{ 302,27 }}, // Russian/Cyrillic/Moldova
+       {    96,     2,   222,{ 6168,80 },{ 6248,132 },{ 302,27 },{ 6168,80 },{ 6248,132 },{ 302,27 }}, // Russian/Cyrillic/Ukraine
+       {    98,     7,    41,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sango/Latin/Central African Republic
+       {    99,    13,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sanskrit/Devanagari/India
+       {   100,     2,   243,{ 6380,70 },{ 6450,91 },{ 302,27 },{ 6380,70 },{ 6541,98 },{ 302,27 }}, // Serbian/Cyrillic/Serbia
+       {   100,     7,    27,{ 6639,73 },{ 6712,95 },{ 302,27 },{ 6639,73 },{ 6807,98 },{ 302,27 }}, // Serbian/Latin/Bosnia And Herzegowina
+       {   100,     7,   242,{ 6639,73 },{ 6712,95 },{ 302,27 },{ 6639,73 },{ 6807,98 },{ 302,27 }}, // Serbian/Latin/Montenegro
+       {   100,     7,   243,{ 6639,73 },{ 6712,95 },{ 302,27 },{ 6639,73 },{ 6807,98 },{ 302,27 }}, // Serbian/Latin/Serbia
+       {   100,     2,    27,{ 6380,70 },{ 6450,91 },{ 302,27 },{ 6380,70 },{ 6541,98 },{ 302,27 }}, // Serbian/Cyrillic/Bosnia And Herzegowina
+       {   100,     2,   242,{ 6380,70 },{ 6450,91 },{ 302,27 },{ 6380,70 },{ 6541,98 },{ 302,27 }}, // Serbian/Cyrillic/Montenegro
+       {   100,     2,   257,{ 6380,70 },{ 6450,91 },{ 302,27 },{ 6380,70 },{ 6541,98 },{ 302,27 }}, // Serbian/Cyrillic/Kosovo
+       {   100,     7,   257,{ 6639,73 },{ 6712,95 },{ 302,27 },{ 6639,73 },{ 6807,98 },{ 302,27 }}, // Serbian/Latin/Kosovo
+       {   101,     2,    81,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Ossetic/Cyrillic/Georgia
+       {   101,     2,   178,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Ossetic/Cyrillic/Russia
+       {   102,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Southern Sotho/Latin/South Africa
+       {   103,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tswana/Latin/South Africa
+       {   104,     7,   240,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Shona/Latin/Zimbabwe
+       {   105,     1,   163,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sindhi/Arabic/Pakistan
+       {   106,    32,   198,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sinhala/Sinhala/Sri Lanka
+       {   107,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Swati/Latin/South Africa
+       {   108,     7,   191,{ 6905,79 },{ 6984,136 },{ 302,27 },{ 6905,79 },{ 6984,136 },{ 302,27 }}, // Slovak/Latin/Slovakia
+       {   109,     7,   192,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Slovenian/Latin/Slovenia
+       {   110,     7,   194,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Somali/Latin/Somalia
+       {   110,     7,    59,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Somali/Latin/Djibouti
+       {   110,     7,    69,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Somali/Latin/Ethiopia
+       {   110,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Somali/Latin/Kenya
+       {   111,     7,   197,{ 5120,79 },{ 7120,107 },{ 302,27 },{ 5120,79 },{ 7120,107 },{ 302,27 }}, // Spanish/Latin/Spain
+       {   111,     7,    10,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Argentina
+       {   111,     7,    22,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Belize
+       {   111,     7,    26,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Bolivia
+       {   111,     7,    30,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Brazil
+       {   111,     7,    43,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Chile
+       {   111,     7,    47,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Colombia
+       {   111,     7,    52,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Costa Rica
+       {   111,     7,    55,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Cuba
+       {   111,     7,    61,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Dominican Republic
+       {   111,     7,    63,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Ecuador
+       {   111,     7,    65,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/El Salvador
+       {   111,     7,    66,{ 5120,79 },{ 7120,107 },{ 302,27 },{ 5120,79 },{ 7120,107 },{ 302,27 }}, // Spanish/Latin/Equatorial Guinea
+       {   111,     7,    90,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Guatemala
+       {   111,     7,    96,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Honduras
+       {   111,     7,   139,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Mexico
+       {   111,     7,   155,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Nicaragua
+       {   111,     7,   166,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Panama
+       {   111,     7,   168,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Paraguay
+       {   111,     7,   169,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Peru
+       {   111,     7,   170,{ 5120,79 },{ 7120,107 },{ 302,27 },{ 5120,79 },{ 7120,107 },{ 302,27 }}, // Spanish/Latin/Philippines
+       {   111,     7,   174,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Puerto Rico
+       {   111,     7,   225,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/United States
+       {   111,     7,   227,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Uruguay
+       {   111,     7,   231,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Venezuela
+       {   111,     7,   238,{ 5120,79 },{ 7120,107 },{ 302,27 },{ 5120,79 },{ 7120,107 },{ 302,27 }}, // Spanish/Latin/Canary Islands
+       {   111,     7,   246,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Spanish/Latin/Latin America
+       {   111,     7,   250,{ 5120,79 },{ 7120,107 },{ 302,27 },{ 5120,79 },{ 7120,107 },{ 302,27 }}, // Spanish/Latin/Ceuta And Melilla
+       {   113,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Swahili/Latin/Tanzania
+       {   113,     7,    49,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Swahili/Latin/Congo Kinshasa
+       {   113,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Swahili/Latin/Kenya
+       {   113,     7,   221,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Swahili/Latin/Uganda
+       {   114,     7,   205,{ 223,79 },{ 7227,128 },{ 302,27 },{ 223,79 },{ 7355,128 },{ 302,27 }}, // Swedish/Latin/Sweden
+       {   114,     7,    73,{ 223,79 },{ 7227,128 },{ 302,27 },{ 223,79 },{ 7355,128 },{ 302,27 }}, // Swedish/Latin/Finland
+       {   114,     7,   248,{ 223,79 },{ 7227,128 },{ 302,27 },{ 223,79 },{ 7355,128 },{ 302,27 }}, // Swedish/Latin/Aland Islands
+       {   115,     7,   106,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sardinian/Latin/Italy
+       {   116,     2,   209,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tajik/Cyrillic/Tajikistan
+       {   117,    27,   100,{ 7483,73 },{ 7556,92 },{ 302,27 },{ 7483,73 },{ 7556,92 },{ 302,27 }}, // Tamil/Tamil/India
+       {   117,    27,   130,{ 7483,73 },{ 7556,92 },{ 302,27 },{ 7483,73 },{ 7556,92 },{ 302,27 }}, // Tamil/Tamil/Malaysia
+       {   117,    27,   190,{ 7483,73 },{ 7556,92 },{ 302,27 },{ 7483,73 },{ 7556,92 },{ 302,27 }}, // Tamil/Tamil/Singapore
+       {   117,    27,   198,{ 7483,73 },{ 7556,92 },{ 302,27 },{ 7483,73 },{ 7556,92 },{ 302,27 }}, // Tamil/Tamil/Sri Lanka
+       {   118,     2,   178,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tatar/Cyrillic/Russia
+       {   119,    28,   100,{ 7648,75 },{ 7723,96 },{ 302,27 },{ 7648,75 },{ 87,107 },{ 302,27 }}, // Telugu/Telugu/India
+       {   120,    30,   211,{ 7819,90 },{ 7909,103 },{ 302,27 },{ 7819,90 },{ 7909,103 },{ 302,27 }}, // Thai/Thai/Thailand
+       {   121,    31,    44,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tibetan/Tibetan/China
+       {   121,    31,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tibetan/Tibetan/India
+       {   122,    14,    69,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tigrinya/Ethiopic/Ethiopia
+       {   122,    14,    67,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tigrinya/Ethiopic/Eritrea
+       {   123,     7,   214,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tongan/Latin/Tonga
+       {   124,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tsonga/Latin/South Africa
+       {   125,     7,   217,{ 8012,84 },{ 8096,111 },{ 302,27 },{ 8012,84 },{ 8096,111 },{ 302,27 }}, // Turkish/Latin/Turkey
+       {   125,     7,    56,{ 8012,84 },{ 8096,111 },{ 302,27 },{ 8012,84 },{ 8096,111 },{ 302,27 }}, // Turkish/Latin/Cyprus
+       {   126,     7,   218,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Turkmen/Latin/Turkmenistan
+       {   128,     1,    44,{ 8207,119 },{ 8207,119 },{ 302,27 },{ 8207,119 },{ 8207,119 },{ 302,27 }}, // Uighur/Arabic/China
+       {   129,     2,   222,{ 8326,72 },{ 8398,104 },{ 302,27 },{ 8502,82 },{ 8398,104 },{ 302,27 }}, // Ukrainian/Cyrillic/Ukraine
+       {   130,     1,   163,{ 8584,99 },{ 8683,97 },{ 302,27 },{ 8584,99 },{ 8683,97 },{ 302,27 }}, // Urdu/Arabic/Pakistan
+       {   130,     1,   100,{ 8584,99 },{ 8683,97 },{ 302,27 },{ 8584,99 },{ 8683,97 },{ 302,27 }}, // Urdu/Arabic/India
+       {   131,     7,   228,{ 223,79 },{ 8780,123 },{ 302,27 },{ 223,79 },{ 8780,123 },{ 302,27 }}, // Uzbek/Latin/Uzbekistan
+       {   131,     1,     1,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Uzbek/Arabic/Afghanistan
+       {   131,     2,   228,{ 223,79 },{ 8903,115 },{ 302,27 },{ 223,79 },{ 8903,115 },{ 302,27 }}, // Uzbek/Cyrillic/Uzbekistan
+       {   132,     7,   232,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Vietnamese/Latin/Vietnam
+       {   133,     7,   260,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Volapuk/Latin/World
+       {   134,     7,   224,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Welsh/Latin/United Kingdom
+       {   135,     7,   187,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Wolof/Latin/Senegal
+       {   136,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Xhosa/Latin/South Africa
+       {   137,    18,   260,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Yiddish/Hebrew/World
+       {   138,     7,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Yoruba/Latin/Nigeria
+       {   138,     7,    23,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Yoruba/Latin/Benin
+       {   140,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Zulu/Latin/South Africa
+       {   141,     7,   161,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Norwegian Nynorsk/Latin/Norway
+       {   142,     7,    27,{ 9018,75 },{ 9093,99 },{ 302,27 },{ 9018,75 },{ 9093,99 },{ 302,27 }}, // Bosnian/Latin/Bosnia And Herzegowina
+       {   142,     2,    27,{ 6380,70 },{ 6450,91 },{ 302,27 },{ 6380,70 },{ 6541,98 },{ 302,27 }}, // Bosnian/Cyrillic/Bosnia And Herzegowina
+       {   143,    29,   131,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Divehi/Thaana/Maldives
+       {   144,     7,   251,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Manx/Latin/Isle Of Man
+       {   145,     7,   224,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Cornish/Latin/United Kingdom
+       {   146,     7,    83,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Akan/Latin/Ghana
+       {   147,    13,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Konkani/Devanagari/India
+       {   148,     7,    83,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Ga/Latin/Ghana
+       {   149,     7,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Igbo/Latin/Nigeria
+       {   150,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kamba/Latin/Kenya
+       {   151,    33,   103,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Syriac/Syriac/Iraq
+       {   152,    14,    67,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Blin/Ethiopic/Eritrea
+       {   153,    14,    69,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Geez/Ethiopic/Ethiopia
+       {   155,     7,    69,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sidamo/Latin/Ethiopia
+       {   156,     7,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Atsam/Latin/Nigeria
+       {   157,    14,    67,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tigre/Ethiopic/Eritrea
+       {   158,     7,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Jju/Latin/Nigeria
+       {   159,     7,   106,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Friulian/Latin/Italy
+       {   160,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Venda/Latin/South Africa
+       {   161,     7,    83,{ 9192,48 },{ 9240,87 },{ 302,27 },{ 9192,48 },{ 9240,87 },{ 302,27 }}, // Ewe/Latin/Ghana
+       {   161,     7,   212,{ 9192,48 },{ 9240,87 },{ 302,27 },{ 9192,48 },{ 9240,87 },{ 302,27 }}, // Ewe/Latin/Togo
+       {   162,    14,    69,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Walamo/Ethiopic/Ethiopia
+       {   163,     7,   225,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Hawaiian/Latin/United States
+       {   164,     7,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tyap/Latin/Nigeria
+       {   165,     7,   129,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Nyanja/Latin/Malawi
+       {   166,     7,   170,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Filipino/Latin/Philippines
+       {   167,     7,   206,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Swiss German/Latin/Switzerland
+       {   167,     7,    74,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Swiss German/Latin/France
+       {   167,     7,   123,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Swiss German/Latin/Liechtenstein
+       {   168,    34,    44,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sichuan Yi/Yi/China
+       {   169,     7,   121,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kpelle/Latin/Liberia
+       {   170,     7,    82,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Low German/Latin/Germany
+       {   170,     7,   151,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Low German/Latin/Netherlands
+       {   171,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // South Ndebele/Latin/South Africa
+       {   172,     7,   195,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Northern Sotho/Latin/South Africa
+       {   173,     7,   161,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Northern Sami/Latin/Norway
+       {   173,     7,    73,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Northern Sami/Latin/Finland
+       {   173,     7,   205,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Northern Sami/Latin/Sweden
+       {   174,     7,   208,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Taroko/Latin/Taiwan
+       {   175,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Gusii/Latin/Kenya
+       {   176,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Taita/Latin/Kenya
+       {   177,     7,   187,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Senegal
+       {   177,     7,    34,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Burkina Faso
+       {   177,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Cameroon
+       {   177,     7,    80,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Gambia
+       {   177,     7,    83,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Ghana
+       {   177,     7,    91,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Guinea
+       {   177,     7,    92,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Guinea Bissau
+       {   177,     7,   121,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Liberia
+       {   177,     7,   136,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Mauritania
+       {   177,     7,   156,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Niger
+       {   177,     7,   157,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Nigeria
+       {   177,     7,   189,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Latin/Sierra Leone
+       {   177,   134,    91,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Fulah/Adlam/Guinea
+       {   178,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kikuyu/Latin/Kenya
+       {   179,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Samburu/Latin/Kenya
+       {   180,     7,   146,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sena/Latin/Mozambique
+       {   181,     7,   240,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // North Ndebele/Latin/Zimbabwe
+       {   182,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Rombo/Latin/Tanzania
+       {   183,     9,   145,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tachelhit/Tifinagh/Morocco
+       {   183,     7,   145,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tachelhit/Latin/Morocco
+       {   184,     7,     3,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kabyle/Latin/Algeria
+       {   185,     7,   221,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Nyankole/Latin/Uganda
+       {   186,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Bena/Latin/Tanzania
+       {   187,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Vunjo/Latin/Tanzania
+       {   188,     7,   132,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Bambara/Latin/Mali
+       {   188,    75,   132,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Bambara/Nko/Mali
+       {   189,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Embu/Latin/Kenya
+       {   190,    12,   225,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Cherokee/Cherokee/United States
+       {   191,     7,   137,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Morisyen/Latin/Mauritius
+       {   192,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Makonde/Latin/Tanzania
+       {   193,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Langi/Latin/Tanzania
+       {   194,     7,   221,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Ganda/Latin/Uganda
+       {   195,     7,   239,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Bemba/Latin/Zambia
+       {   196,     7,    39,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kabuverdianu/Latin/Cape Verde
+       {   197,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Meru/Latin/Kenya
+       {   198,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kalenjin/Latin/Kenya
+       {   199,     7,   148,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Nama/Latin/Namibia
+       {   200,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Machame/Latin/Tanzania
+       {   201,     7,    82,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Colognian/Latin/Germany
+       {   202,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Masai/Latin/Kenya
+       {   202,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Masai/Latin/Tanzania
+       {   203,     7,   221,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Soga/Latin/Uganda
+       {   204,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Luyia/Latin/Kenya
+       {   205,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Asu/Latin/Tanzania
+       {   206,     7,   221,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Teso/Latin/Uganda
+       {   206,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Teso/Latin/Kenya
+       {   207,     7,    67,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Saho/Latin/Eritrea
+       {   208,     7,   132,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Koyra Chiini/Latin/Mali
+       {   209,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Rwa/Latin/Tanzania
+       {   210,     7,   111,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Luo/Latin/Kenya
+       {   211,     7,   221,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Chiga/Latin/Uganda
+       {   212,     7,   145,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Central Morocco Tamazight/Latin/Morocco
+       {   213,     7,   132,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Koyraboro Senni/Latin/Mali
+       {   214,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Shambala/Latin/Tanzania
+       {   215,    13,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Bodo/Devanagari/India
+       {   218,     2,   178,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Chechen/Cyrillic/Russia
+       {   219,     2,   178,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Church/Cyrillic/Russia
+       {   220,     2,   178,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Chuvash/Cyrillic/Russia
+       {   230,     7,    49,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Luba Katanga/Latin/Congo Kinshasa
+       {   231,     7,   125,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Luxembourgish/Latin/Luxembourg
+       {   236,     7,    21,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Walloon/Latin/Belgium
+       {   237,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Aghem/Latin/Cameroon
+       {   238,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Basaa/Latin/Cameroon
+       {   239,     7,   156,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Zarma/Latin/Niger
+       {   240,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Duala/Latin/Cameroon
+       {   241,     7,   187,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Jola Fonyi/Latin/Senegal
+       {   242,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Ewondo/Latin/Cameroon
+       {   243,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Bafia/Latin/Cameroon
+       {   244,     7,   146,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Makhuwa Meetto/Latin/Mozambique
+       {   245,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Mundang/Latin/Cameroon
+       {   246,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kwasio/Latin/Cameroon
+       {   247,     7,   254,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Nuer/Latin/South Sudan
+       {   248,     2,   178,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sakha/Cyrillic/Russia
+       {   249,     7,   210,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sangu/Latin/Tanzania
+       {   251,     7,   156,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tasawaq/Latin/Niger
+       {   252,    35,   121,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Vai/Vai/Liberia
+       {   252,     7,   121,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Vai/Latin/Liberia
+       {   253,     7,   206,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Walser/Latin/Switzerland
+       {   254,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Yangben/Latin/Cameroon
+       {   256,     7,   197,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 9327,143 },{ 302,27 }}, // Asturian/Latin/Spain
+       {   257,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Ngomba/Latin/Cameroon
+       {   258,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kako/Latin/Cameroon
+       {   259,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Meta/Latin/Cameroon
+       {   260,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Ngiemboon/Latin/Cameroon
+       {   290,    11,   100,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Manipuri/Bengali/India
+       {   309,   100,   232,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Tai Dam/Tai Viet/Vietnam
+       {   312,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Akoose/Latin/Cameroon
+       {   313,     7,   225,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lakota/Latin/United States
+       {   314,     9,   145,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Standard Moroccan Tamazight/Tifinagh/Morocco
+       {   315,     7,    43,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Mapuche/Latin/Chile
+       {   316,     1,   103,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Central Kurdish/Arabic/Iraq
+       {   316,     1,   102,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Central Kurdish/Arabic/Iran
+       {   317,     7,    82,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lower Sorbian/Latin/Germany
+       {   318,     7,    82,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Upper Sorbian/Latin/Germany
+       {   319,     7,    37,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kenyang/Latin/Cameroon
+       {   320,     7,    38,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Mohawk/Latin/Canada
+       {   321,    75,    91,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Nko/Nko/Guinea
+       {   322,     7,   260,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Prussian/Latin/World
+       {   323,     7,    90,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Kiche/Latin/Guatemala
+       {   324,     7,   205,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Southern Sami/Latin/Sweden
+       {   325,     7,   205,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lule Sami/Latin/Sweden
+       {   326,     7,    73,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Inari Sami/Latin/Finland
+       {   327,     7,    73,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Skolt Sami/Latin/Finland
+       {   328,     7,    13,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Warlpiri/Latin/Australia
+       {   346,     1,   102,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Mazanderani/Arabic/Iran
+       {   349,     1,   102,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Northern Luri/Arabic/Iran
+       {   349,     1,   103,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Northern Luri/Arabic/Iraq
+       {   357,     6,    97,{ 834,72 },{ 834,72 },{ 302,27 },{ 834,72 },{ 834,72 },{ 302,27 }}, // Cantonese/Traditional Han/Hong Kong
+       {   357,     5,    44,{ 9470,72 },{ 9470,72 },{ 302,27 },{ 9470,72 },{ 9470,72 },{ 302,27 }}, // Cantonese/Simplified Han/China
+       {   360,     7,   260,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Ido/Latin/World
+       {   361,     7,   260,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Lojban/Latin/World
+       {   362,     7,   106,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Sicilian/Latin/Italy
+       {   363,     1,   102,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Southern Kurdish/Arabic/Iran
+       {   364,     1,   163,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Western Balochi/Arabic/Pakistan
+       {   365,     7,   170,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Cebuano/Latin/Philippines
+       {   366,     2,   178,{ 223,79 },{ 87,107 },{ 302,27 },{ 223,79 },{ 87,107 },{ 302,27 }}, // Erzya/Cyrillic/Russia
+       {     0,     0,     0,{  0,0},{  0,0},{  0,0},{  0,0},{  0,0},{  0,0}}, // trailing zeros
+};
+
+static const ushort months_data[] = {
+0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62,
+0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b,
+0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x2e,
+0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d,
+0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61,
+0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x4a,
+0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61,
+0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b,
+0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61, 0x68,
+0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b,
+0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32,
+0x3b, 0x31, 0x33, 0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b,
+0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20,
+0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x68,
+0x61, 0x77, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48,
+0x2e, 0x3b, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b,
+0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x1219, 0x1200, 0x1228, 0x121d, 0x3b, 0x1233, 0x1348, 0x122d, 0x3b, 0x1228, 0x1262,
+0x12d1, 0x120d, 0x20, 0x12a0, 0x12c8, 0x120d, 0x3b, 0x1228, 0x1262, 0x12d1, 0x120d, 0x20, 0x12a0, 0x12ba, 0x122d, 0x3b, 0x1300, 0x121b, 0x12f0, 0x120d,
+0x20, 0x12a0, 0x12c8, 0x120d, 0x3b, 0x1300, 0x121b, 0x12f0, 0x120d, 0x20, 0x12a0, 0x12ba, 0x122d, 0x3b, 0x1228, 0x1300, 0x1265, 0x3b, 0x123b, 0x12a5,
+0x1263, 0x1295, 0x3b, 0x1228, 0x1218, 0x12f3, 0x1295, 0x3b, 0x1238, 0x12cb, 0x120d, 0x3b, 0x12d9, 0x120d, 0x1242, 0x12f3, 0x1205, 0x3b, 0x12d9, 0x120d,
+0x1202, 0x1303, 0x1205, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x627, 0x644,
+0x623, 0x648, 0x644, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x627, 0x644, 0x622, 0x62e, 0x631, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x649,
+0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x649, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x649, 0x20, 0x627, 0x644, 0x622, 0x62e, 0x631, 0x629,
+0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627,
+0x644, 0x3b, 0x630, 0x648, 0x20, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x629, 0x3b, 0x630, 0x648, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x629,
+0x3b, 0x661, 0x3b, 0x662, 0x3b, 0x663, 0x3b, 0x664, 0x3b, 0x665, 0x3b, 0x666, 0x3b, 0x667, 0x3b, 0x668, 0x3b, 0x669, 0x3b, 0x661,
+0x660, 0x3b, 0x661, 0x661, 0x3b, 0x661, 0x662, 0x3b, 0x9ae, 0x9b9, 0x9b0, 0x9b0, 0x9ae, 0x3b, 0x9b8, 0x9ab, 0x9b0, 0x3b, 0x9b0, 0x9ac,
+0x9bf, 0x989, 0x9b2, 0x20, 0x986, 0x989, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x989, 0x9b8, 0x20, 0x9b8, 0x9be, 0x9a8,
+0x9bf, 0x3b, 0x99c, 0x9ae, 0x9be, 0x9a6, 0x9bf, 0x989, 0x9b2, 0x20, 0x986, 0x989, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x99c, 0x9ae, 0x9be,
+0x9a6, 0x9bf, 0x989, 0x9b8, 0x20, 0x9b8, 0x9be, 0x9a8, 0x9bf, 0x3b, 0x9b0, 0x99c, 0x9ac, 0x3b, 0x9b6, 0x9be, 0x2018, 0x9ac, 0x9be, 0x9a8,
+0x3b, 0x9b0, 0x9ae, 0x99c, 0x9be, 0x9a8, 0x3b, 0x9b6, 0x9be, 0x993, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x99c, 0x9cd, 0x9ac, 0x9bf, 0x9b2,
+0x995, 0x9a6, 0x3b, 0x99c, 0x9cd, 0x9ac, 0x9bf, 0x9b2, 0x9b9, 0x99c, 0x9cd, 0x99c, 0x3b, 0x9e7, 0x3b, 0x9e8, 0x3b, 0x9e9, 0x3b, 0x9ea,
+0x3b, 0x9eb, 0x3b, 0x9ec, 0x3b, 0x9ed, 0x3b, 0x9ee, 0x3b, 0x9ef, 0x3b, 0x9e7, 0x9e6, 0x3b, 0x9e7, 0x9e7, 0x3b, 0x9e7, 0x9e8, 0x3b,
+0x43c, 0x443, 0x445, 0x430, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x440, 0x430, 0x431, 0x438, 0x2d, 0x31,
+0x3b, 0x440, 0x430, 0x431, 0x438, 0x2d, 0x32, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x2d, 0x31, 0x3b, 0x434, 0x436,
+0x443, 0x43c, 0x430, 0x434, 0x430, 0x2d, 0x32, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x431, 0x430, 0x43d,
+0x3b, 0x440, 0x430, 0x43c, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x430, 0x43b, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d,
+0x41a, 0x430, 0x430, 0x434, 0x430, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x445, 0x438, 0x434, 0x436, 0x430, 0x3b, 0x31, 0x6708, 0x3b,
+0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708,
+0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31, 0x32, 0x6708, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c,
+0x6708, 0x3b, 0x4e09, 0x6708, 0x3b, 0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b,
+0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708, 0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708, 0x3b, 0x7a46, 0x54c8, 0x862d, 0x59c6, 0x6708, 0x3b,
+0x8272, 0x6cd5, 0x723e, 0x6708, 0x3b, 0x8cf4, 0x6bd4, 0x6708, 0x20, 0x49, 0x3b, 0x8cf4, 0x6bd4, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x4e3b, 0x99ac,
+0x9054, 0x6708, 0x20, 0x49, 0x3b, 0x4e3b, 0x99ac, 0x9054, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x8cf4, 0x54f2, 0x535c, 0x6708, 0x3b, 0x820d, 0x723e,
+0x90a6, 0x6708, 0x3b, 0x8cf4, 0x8cb7, 0x4e39, 0x6708, 0x3b, 0x9583, 0x74e6, 0x9b6f, 0x6708, 0x3b, 0x90fd, 0x723e, 0x5580, 0x723e, 0x5fb7, 0x6708, 0x3b,
+0x90fd, 0x723e, 0x9ed1, 0x54f2, 0x6708, 0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e,
+0x3b, 0x36, 0x2e, 0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e,
+0x3b, 0x31, 0x32, 0x2e, 0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x65, 0x62, 0x2e, 0x20,
+0x49, 0x3b, 0x72, 0x65, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x64, 0x17e,
+0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x65, 0x64, 0x2e, 0x3b, 0x161, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e,
+0x3b, 0x161, 0x61, 0x77, 0x2e, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x68,
+0x2e, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x65, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x65, 0x62,
+0xed, 0x2019, 0x75, 0x20, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x72, 0x65, 0x62, 0xed, 0x2019, 0x75, 0x20, 0x73,
+0x2d, 0x73, 0xe1, 0x6e, 0xed, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x61, 0x6c, 0x2d, 0xfa, 0x6c, 0xe1,
+0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x61, 0x6c, 0x2d, 0xe1, 0x63, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x72,
+0x65, 0x64, 0x17e, 0x65, 0x62, 0x3b, 0x161, 0x61, 0x2019, 0x62, 0xe1, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e,
+0x3b, 0x161, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x7a,
+0xfa, 0x20, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17e, 0x64, 0x17e, 0x61, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d,
+0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb,
+0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20,
+0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d,
+0x61, 0x64, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51,
+0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x4d,
+0x6f, 0x65, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62,
+0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x2e, 0x20, 0x49,
+0x49, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x6a, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x6a, 0x61,
+0x77, 0x2e, 0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x6b, 0x2e, 0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20,
+0x68, 0x2e, 0x3b, 0x4d, 0x6f, 0x65, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52,
+0x61, 0x62, 0x69, 0x2bb, 0x61, 0x20, 0x61, 0x6c, 0x20, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x61,
+0x20, 0x61, 0x6c, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x61, 0x64, 0x2bb, 0x61, 0x6c, 0x20,
+0x61, 0x77, 0x61, 0x6c, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x61, 0x64, 0x2bb, 0x61, 0x6c, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x69,
+0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x6a, 0x61, 0x2bb, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61,
+0x64, 0x61, 0x6e, 0x3b, 0x53, 0x6a, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x6b, 0x61,
+0x2bb, 0x61, 0x62, 0x61, 0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x68, 0x69, 0x7a, 0x6a, 0x61, 0x3b, 0x6d, 0x75,
+0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61,
+0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x6b, 0x68,
+0x69, 0x72, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x75, 0x6c, 0x61, 0x3b, 0x64, 0x17e, 0x75,
+0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x72, 0x61, 0x64, 0x17e, 0x61, 0x62,
+0x3b, 0x161, 0x61, 0x2019, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x161, 0x61, 0x77, 0x77,
+0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x71, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c,
+0x2d, 0x68, 0x69, 0x64, 0x64, 0x17e, 0x61, 0x3b, 0x6d, 0x6f, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72,
+0x61, 0x62, 0x2e, 0x20, 0x61, 0x77, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x74, 0x68, 0x2e, 0x3b, 0x6a, 0x6f, 0x75,
+0x6d, 0x2e, 0x20, 0x6f, 0x75, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x74, 0x68, 0x2e, 0x3b, 0x72, 0x61, 0x6a,
+0x2e, 0x3b, 0x63, 0x68, 0x61, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x63, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64,
+0x68, 0x6f, 0x75, 0x2e, 0x20, 0x71, 0x69, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e, 0x20, 0x68, 0x69, 0x2e, 0x3b, 0x6d,
+0x6f, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x61,
+0x20, 0x61, 0x6c, 0x20, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x61, 0x20, 0x61, 0x74, 0x68, 0x2d, 0x74,
+0x68, 0x61, 0x6e, 0x69, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x20, 0x6f, 0x75, 0x6c, 0x61,
+0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x74, 0x68, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x61, 0x3b,
+0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x63, 0x68, 0x61, 0x61, 0x62, 0x61, 0x6e, 0x65, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64,
+0x61, 0x6e, 0x3b, 0x63, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x20, 0x61, 0x6c, 0x20, 0x71,
+0x69, 0x60, 0x64, 0x61, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x3b, 0x6d,
+0x6f, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x61, 0x77, 0x2e, 0x3b, 0x72,
+0x61, 0x62, 0x2e, 0x20, 0x74, 0x68, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x6f, 0x75, 0x6c, 0x2e, 0x3b, 0x6a,
+0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x74, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x63, 0x68, 0x61, 0x61, 0x2e,
+0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x63, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e, 0x20, 0x71, 0x2e,
+0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e, 0x20, 0x68, 0x2e, 0x3b, 0x10db, 0x10e3, 0x10f0, 0x2e, 0x3b, 0x10e1, 0x10d0, 0x10e4, 0x2e, 0x3b,
+0x10e0, 0x10d0, 0x10d1, 0x2e, 0x20, 0x49, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x2e, 0x20,
+0x49, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x10e0, 0x10d0, 0x10ef, 0x2e, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x2e, 0x3b,
+0x10e0, 0x10d0, 0x10db, 0x2e, 0x3b, 0x10e8, 0x10d0, 0x10d5, 0x2e, 0x3b, 0x10d6, 0x10e3, 0x10da, 0x2d, 0x10d9, 0x2e, 0x3b, 0x10d6, 0x10e3, 0x10da,
+0x2d, 0x10f0, 0x2e, 0x3b, 0x10db, 0x10e3, 0x10f0, 0x10d0, 0x10e0, 0x10d0, 0x10db, 0x10d8, 0x3b, 0x10e1, 0x10d0, 0x10e4, 0x10d0, 0x10e0, 0x10d8, 0x3b,
+0x10e0, 0x10d0, 0x10d1, 0x10d8, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x10d8, 0x20, 0x10e3,
+0x10da, 0x2d, 0x10d0, 0x10ee, 0x10d8, 0x10e0, 0x10d8, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x10d0, 0x10d3, 0x10d0, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10d5,
+0x10d0, 0x10da, 0x10d8, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x10d0, 0x10d3, 0x10d0, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10ee, 0x10d8, 0x10e0, 0x10d8, 0x3b,
+0x10e0, 0x10d0, 0x10ef, 0x10d0, 0x10d1, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10db, 0x10d0, 0x10d3, 0x10d0,
+0x10dc, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10d6, 0x10e3, 0x10da, 0x2d, 0x10d9, 0x10d0, 0x10d0, 0x10d3, 0x10d0, 0x3b,
+0x10d6, 0x10e3, 0x10da, 0x2d, 0x10f0, 0x10d8, 0x10ef, 0x10d0, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61,
+0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49,
+0x3b, 0x44, 0x73, 0x63, 0x68, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x63, 0x68, 0x75, 0x6d, 0x61,
+0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x64, 0x73, 0x63, 0x68, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x2bb, 0x62,
+0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x44,
+0x68, 0x75, 0x20, 0x6c, 0x2d, 0x71, 0x61, 0x2bf, 0x64, 0x61, 0x3b, 0x44, 0x68, 0x75, 0x20, 0x6c, 0x2d, 0x48, 0x69, 0x64,
+0x64, 0x73, 0x63, 0x68, 0x61, 0x3b, 0xaae, 0xac1, 0xab9, 0x2e, 0x3b, 0xab8, 0xaab, 0x2e, 0x3b, 0xab0, 0xaac, 0x2e, 0x49, 0x3b,
+0xab0, 0xaac, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0x2e, 0x20, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0x2e, 0x20, 0x49,
+0x49, 0x3b, 0xab0, 0xabe, 0xa9c, 0x2e, 0x3b, 0xab6, 0xabe, 0x2e, 0x3b, 0xab0, 0xabe, 0xaae, 0x2e, 0x3b, 0xab6, 0xabe, 0xab5, 0x2e,
+0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xa95, 0xacd, 0xaaf, 0xac1, 0x2e, 0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xa8f, 0xa9a, 0x2e,
+0x3b, 0xaae, 0xac1, 0xab9, 0xab0, 0xacd, 0xab0, 0xaae, 0x3b, 0xab8, 0xaab, 0xab0, 0x3b, 0xab0, 0xabe, 0xaac, 0xac0, 0x2bb, 0x20, 0x49,
+0x3b, 0xab0, 0xabe, 0xaac, 0xac0, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0xabe, 0xaa6, 0xabe, 0x20, 0x49, 0x3b, 0xa9c,
+0xac1, 0xaae, 0xabe, 0xaa6, 0xabe, 0x20, 0x49, 0x49, 0x3b, 0xab0, 0xa9c, 0xaac, 0x3b, 0xab6, 0xabe, 0x2bb, 0xaac, 0xabe, 0xaa8, 0x3b,
+0xab0, 0xaae, 0xaa6, 0xabe, 0xaa8, 0x3b, 0xab6, 0xabe, 0xab5, 0xacd, 0xab5, 0xab2, 0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xa95, 0xacd,
+0xab5, 0xac0, 0x2bb, 0xaa1, 0xabe, 0xab9, 0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xab9, 0xabf, 0xa9c, 0xacd, 0xa9c, 0xabe, 0xab9, 0x3b,
+0x5de, 0x5d5, 0x5d7, 0x5e8, 0x5dd, 0x3b, 0x5e6, 0x5e4, 0x5e8, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5f3, 0x3b, 0x5e8, 0x5d1,
+0x5d9, 0x5e2, 0x20, 0x5d1, 0x5f3, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5f3, 0x3b, 0x5d2, 0x5f3, 0x5d5,
+0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d1, 0x5f3, 0x3b, 0x5e8, 0x5d2, 0x5f3, 0x5d1, 0x3b, 0x5e9, 0x5e2, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5e8,
+0x5de, 0x5d3, 0x5d0, 0x5df, 0x3b, 0x5e9, 0x5d5, 0x5d5, 0x5d0, 0x5dc, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5e7, 0x5e2,
+0x5d3, 0x5d4, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x3b, 0x5de, 0x5d5, 0x5d7, 0x5e8,
+0x5dd, 0x3b, 0x5e6, 0x5e4, 0x5e8, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d0, 0x5d5, 0x5d5, 0x5dc, 0x3b, 0x5e8,
+0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5be, 0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20,
+0x5d0, 0x5dc, 0x5be, 0x5d0, 0x5d5, 0x5dc, 0x5d0, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5be, 0x5ea, 0x5f3,
+0x5d0, 0x5e0, 0x5d9, 0x5d4, 0x3b, 0x5e8, 0x5d2, 0x5f3, 0x5d1, 0x3b, 0x5e9, 0x5e2, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5e8, 0x5de, 0x5d3, 0x5d0,
+0x5df, 0x3b, 0x5e9, 0x5d5, 0x5d5, 0x5d0, 0x5dc, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5e7, 0x5e2, 0x5d3, 0x5d4, 0x3b,
+0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x3b, 0x5de, 0x5d5, 0x5d7, 0x5e8, 0x5dd, 0x3b, 0x5e6,
+0x5e4, 0x5e8, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5dc, 0x2d, 0x5d0, 0x5d5, 0x5d5, 0x5dc, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2,
+0x20, 0x5d0, 0x2d, 0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5dc, 0x2d,
+0x5d0, 0x5d5, 0x5dc, 0x5d0, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x2d, 0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9,
+0x5d4, 0x3b, 0x5e8, 0x5d2, 0x5f3, 0x5d1, 0x3b, 0x5e9, 0x5e2, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5e8, 0x5de, 0x5d3, 0x5d0, 0x5df, 0x3b, 0x5e9,
+0x5d5, 0x5d5, 0x5d0, 0x5dc, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5e7, 0x5e2, 0x5d3, 0x5d4, 0x3b, 0x5d3, 0x5f3, 0x5d5,
+0x20, 0x5d0, 0x5dc, 0x5be, 0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x3b, 0x92e, 0x941, 0x939, 0x930, 0x94d, 0x930, 0x92e, 0x3b, 0x938, 0x92b,
+0x930, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x92a, 0x94d, 0x930, 0x925, 0x92e, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x926, 0x94d,
+0x935, 0x93f, 0x924, 0x940, 0x92f, 0x3b, 0x91c, 0x941, 0x92e, 0x94d, 0x921, 0x93e, 0x20, 0x92a, 0x94d, 0x930, 0x925, 0x92e, 0x3b, 0x91c,
+0x941, 0x92e, 0x94d, 0x921, 0x93e, 0x20, 0x926, 0x94d, 0x935, 0x93f, 0x924, 0x940, 0x92f, 0x3b, 0x930, 0x91c, 0x92c, 0x3b, 0x936, 0x93e,
+0x935, 0x928, 0x3b, 0x930, 0x92e, 0x91c, 0x93e, 0x928, 0x3b, 0x936, 0x935, 0x94d, 0x935, 0x94d, 0x932, 0x3b, 0x91c, 0x93f, 0x932, 0x2d,
+0x915, 0x94d, 0x926, 0x93e, 0x939, 0x3b, 0x91c, 0x93f, 0x932, 0x94d, 0x2d, 0x939, 0x93f, 0x91c, 0x94d, 0x91c, 0x93e, 0x939, 0x3b, 0x4d,
+0x6f, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0xe9, 0x62, 0x2e, 0x20, 0x31, 0x3b, 0x52, 0xe9, 0x62, 0x2e,
+0x20, 0x32, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b,
+0x52, 0x65, 0x64, 0x2e, 0x3b, 0x53, 0x61, 0x62, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x65, 0x76, 0x2e, 0x3b,
+0x44, 0x73, 0xfc, 0x6c, 0x20, 0x6b, 0x2e, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x2e, 0x3b, 0x4d, 0x6f, 0x68, 0x61,
+0x72, 0x72, 0x65, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20, 0x49, 0x3b, 0x52, 0xe9,
+0x62, 0x69, 0x20, 0x49, 0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0xe1, 0x64, 0x69, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d,
+0xe1, 0x64, 0x69, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x65, 0x64, 0x73, 0x65, 0x62, 0x3b, 0x53, 0x61, 0x62, 0xe1, 0x6e, 0x3b,
+0x52, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x53, 0x65, 0x76, 0x76, 0xe1, 0x6c, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20,
+0x6b, 0x61, 0x64, 0x65, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x65, 0x64, 0x73, 0x65, 0x3b, 0x4d, 0x6f, 0x68, 0x61,
+0x72, 0x72, 0x65, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20, 0x65, 0x6c, 0x20, 0x61,
+0x76, 0x76, 0x65, 0x6c, 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20, 0x65, 0x6c, 0x20, 0x61, 0x63, 0x63, 0x68, 0x65, 0x72, 0x3b,
+0x44, 0x73, 0x65, 0x6d, 0xe1, 0x64, 0x69, 0x20, 0x65, 0x6c, 0x20, 0x61, 0x76, 0x76, 0x65, 0x6c, 0x3b, 0x44, 0x73, 0x65,
+0x6d, 0xe1, 0x64, 0x69, 0x20, 0x65, 0x6c, 0x20, 0x61, 0x63, 0x63, 0x68, 0x65, 0x72, 0x3b, 0x52, 0x65, 0x64, 0x73, 0x65,
+0x62, 0x3b, 0x53, 0x61, 0x62, 0xe1, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x53, 0x65, 0x76, 0x76,
+0xe1, 0x6c, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x65,
+0x64, 0x73, 0x65, 0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49,
+0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e,
+0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x73,
+0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d,
+0x48, 0x2e, 0x3b, 0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b,
+0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20,
+0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x79,
+0x61, 0x77, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48,
+0x2e, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62,
+0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61,
+0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53,
+0x79, 0x61, 0x2019, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x68, 0x61, 0x6e, 0x3b, 0x53, 0x79, 0x61, 0x77,
+0x61, 0x6c, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x44, 0x68, 0x75, 0x2bb,
+0x6c, 0x2d, 0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x30e0, 0x30cf, 0x30c3, 0x30e9, 0x30e0, 0x3b, 0x30b5, 0x30d5, 0x30a2, 0x30eb, 0x3b,
+0x30e9, 0x30d3, 0x30fc, 0x30fb, 0x30a6, 0x30eb, 0x30fb, 0x30a2, 0x30a6, 0x30ef, 0x30eb, 0x3b, 0x30e9, 0x30d3, 0x30fc, 0x30fb, 0x30a6, 0x30c3, 0x30fb, 0x30b5,
+0x30fc, 0x30cb, 0x30fc, 0x3b, 0x30b8, 0x30e5, 0x30de, 0x30fc, 0x30c0, 0x30eb, 0x30fb, 0x30a2, 0x30a6, 0x30ef, 0x30eb, 0x3b, 0x30b8, 0x30e5, 0x30de, 0x30fc,
+0x30c0, 0x30c3, 0x30b5, 0x30fc, 0x30cb, 0x30fc, 0x3b, 0x30e9, 0x30b8, 0x30e3, 0x30d6, 0x3b, 0x30b7, 0x30e3, 0x30a2, 0x30d0, 0x30fc, 0x30f3, 0x3b, 0x30e9,
+0x30de, 0x30c0, 0x30fc, 0x30f3, 0x3b, 0x30b7, 0x30e3, 0x30a6, 0x30ef, 0x30fc, 0x30eb, 0x3b, 0x30ba, 0x30eb, 0x30fb, 0x30ab, 0x30a4, 0x30c0, 0x3b, 0x30ba,
+0x30eb, 0x30fb, 0x30d2, 0x30c3, 0x30b8, 0x30e3, 0x3b, 0xcae, 0xcc1, 0xcb9, 0xccd, 0x2e, 0x3b, 0xcb8, 0xcab, 0xcbe, 0x2e, 0x3b, 0xcb0, 0xcac,
+0xcbf, 0x2018, 0x20, 0x49, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49, 0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xccd, 0x2e, 0x20, 0x49,
+0x3b, 0xc9c, 0xcc1, 0xcae, 0xccd, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xcb0, 0xc9c, 0xccd, 0x2e, 0x3b, 0xcb6, 0x2e, 0x3b, 0xcb0, 0xcae,
+0xccd, 0x2e, 0x3b, 0xcb6, 0xcb5, 0xccd, 0x2e, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd, 0x2d, 0xc95, 0xcbf, 0x2e, 0x3b, 0xca7, 0xcc1,
+0x2018, 0xcb2, 0xccd, 0x2d, 0xcb9, 0x2e, 0x3b, 0xcae, 0xcc1, 0xcb9, 0xcb0, 0xcae, 0xccd, 0x3b, 0xcb8, 0xcab, 0xcbe, 0xcb0, 0xccd, 0x3b,
+0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49, 0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xcbe, 0xca6,
+0xcbe, 0x20, 0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xcbe, 0xca6, 0xcbe, 0x20, 0x49, 0x49, 0x3b, 0xcb0, 0xc9c, 0xcac, 0xccd, 0x3b, 0xcb6,
+0x2019, 0xcac, 0xcbe, 0xca8, 0xccd, 0x3b, 0xcb0, 0xcae, 0xca6, 0xcbe, 0xca8, 0xccd, 0x3b, 0xcb6, 0xcb5, 0xccd, 0xcb5, 0xcbe, 0xcb2, 0xccd,
+0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd, 0x2d, 0xc95, 0xcbf, 0x2018, 0xca1, 0xcbe, 0xcb9, 0xccd, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd,
+0x2d, 0xcb9, 0xcbf, 0xc9c, 0xcbe, 0xcb9, 0xccd, 0x3b, 0xbb34, 0xd558, 0xb78c, 0x3b, 0xc0ac, 0xd30c, 0xb974, 0x3b, 0xb77c, 0xbe44, 0x20, 0xc54c,
+0x20, 0xc544, 0xc648, 0x3b, 0xb77c, 0xbe44, 0x20, 0xc54c, 0x20, 0xc384, 0xb2c8, 0x3b, 0xc8fc, 0xb9c8, 0xb2e4, 0x20, 0xc54c, 0x20, 0xc544, 0xc648,
+0x3b, 0xc8fc, 0xb9c8, 0xb2e4, 0x20, 0xc54c, 0x20, 0xc384, 0xb2c8, 0x3b, 0xb77c, 0xc7a1, 0x3b, 0xc250, 0xc544, 0xbc18, 0x3b, 0xb77c, 0xb9c8, 0xb2e8,
+0x3b, 0xc250, 0xc648, 0x3b, 0xb4c0, 0x20, 0xc54c, 0x20, 0xae4c, 0xb2e4, 0x3b, 0xb4c0, 0x20, 0xc54c, 0x20, 0xd788, 0xc790, 0x3b, 0x6d, 0x75,
+0x1e96, 0x65, 0x72, 0x65, 0x6d, 0x3b, 0x73, 0x65, 0x66, 0x65, 0x72, 0x3b, 0x72, 0x65, 0x62, 0xee, 0x2bf, 0x75, 0x6c, 0x65,
+0x77, 0x65, 0x6c, 0x3b, 0x72, 0x65, 0x62, 0xee, 0x2bf, 0x75, 0x6c, 0x61, 0x78, 0x65, 0x72, 0x3b, 0x63, 0x65, 0x6d, 0x61,
+0x7a, 0xee, 0x79, 0x65, 0x6c, 0x65, 0x77, 0x65, 0x6c, 0x3b, 0x63, 0x65, 0x6d, 0x61, 0x7a, 0xee, 0x79, 0x65, 0x6c, 0x61,
+0x78, 0x65, 0x72, 0x3b, 0x72, 0x65, 0x63, 0x65, 0x62, 0x3b, 0x15f, 0x65, 0x2bf, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x65, 0x6d,
+0x65, 0x7a, 0x61, 0x6e, 0x3b, 0x15f, 0x65, 0x77, 0x61, 0x6c, 0x3b, 0x7a, 0xee, 0x6c, 0x71, 0x65, 0x2bf, 0x64, 0x65, 0x3b,
+0x7a, 0xee, 0x6c, 0x1e96, 0x65, 0x63, 0x65, 0x3b, 0xea1, 0xeb8, 0xeae, 0xeb1, 0xe94, 0x3b, 0xec0, 0xe84, 0xeb2, 0xeb0, 0x3b, 0xeae,
+0xead, 0xe81, 0xe9a, 0xeb5, 0x20, 0x31, 0x3b, 0xeae, 0xead, 0xe81, 0xe9a, 0xeb5, 0x20, 0x32, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20,
+0x31, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x32, 0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0, 0x3b, 0xe8a, 0xeb2, 0x3b, 0xec0, 0xeae, 0xeb2,
+0xeb0, 0xea1, 0xeb0, 0x3b, 0xec0, 0xe8a, 0xebb, 0xeb2, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xe81, 0xeb4, 0xead, 0xeb8, 0x3b, 0xe8a, 0xeb8, 0xea5,
+0xeab, 0xeb4, 0xe88, 0x3b, 0xea1, 0xeb8, 0xea3, 0xeb0, 0xeae, 0xead, 0xea1, 0x3b, 0xe8a, 0xeb2, 0xe9f, 0xeb2, 0xea3, 0x3b, 0xeae, 0xead,
+0xe94, 0xe9a, 0xeb5, 0x20, 0x31, 0x3b, 0xeae, 0xead, 0xe94, 0xe9a, 0xeb5, 0x20, 0x32, 0x3b, 0xe88, 0xeb8, 0xea1, 0xeb2, 0xe94, 0xeb2,
+0x20, 0x31, 0x3b, 0xe88, 0xeb8, 0xea1, 0xeb2, 0xe94, 0xeb2, 0x20, 0x32, 0x3b, 0xeae, 0xeb2, 0xe88, 0xeb1, 0xe9a, 0x3b, 0xe8a, 0xeb0,
+0xe9a, 0xeb2, 0xe99, 0x3b, 0xeae, 0xeb2, 0xea1, 0xeb2, 0xe94, 0xead, 0xe99, 0x3b, 0xec0, 0xe8a, 0xebb, 0xeb2, 0xea7, 0xeb1, 0xe94, 0x3b,
+0xe94, 0xeb8, 0xead, 0xeb1, 0xe94, 0xe81, 0xeb4, 0xe94, 0xeb0, 0x3b, 0xe94, 0xeb8, 0xead, 0xeb1, 0xe94, 0xe81, 0xeb4, 0xe88, 0xeb0, 0x3b,
+0xea1, 0xeb8, 0xeae, 0xeb1, 0xe94, 0x3b, 0xec0, 0xe84, 0xeb2, 0xeb0, 0x3b, 0xeae, 0xead, 0xe94, 0xe9a, 0xeb5, 0x20, 0x31, 0x3b, 0xeae,
+0xead, 0xe81, 0xe9a, 0xeb5, 0x20, 0x32, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x31, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x32,
+0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0, 0x3b, 0xe8a, 0xeb0, 0xead, 0xecc, 0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0, 0xea1, 0xeb0, 0x3b, 0xec0, 0xe8a,
+0xebb, 0xeb2, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xe81, 0xeb4, 0xead, 0xeb8, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xeab, 0xeb4, 0xe88, 0x3b, 0x6d, 0x75,
+0x68, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x73, 0x3b, 0x31, 0x2e, 0x20, 0x72, 0x61, 0x62,
+0x12b, 0x3b, 0x32, 0x2e, 0x20, 0x72, 0x61, 0x62, 0x12b, 0x3b, 0x31, 0x2e, 0x20, 0x64, 0x17e, 0x75, 0x6d, 0x101, 0x64, 0x101,
+0x3b, 0x32, 0x2e, 0x20, 0x64, 0x17e, 0x75, 0x6d, 0x101, 0x64, 0x101, 0x3b, 0x72, 0x61, 0x64, 0x17e, 0x61, 0x62, 0x73, 0x3b,
+0x161, 0x61, 0x62, 0x61, 0x6e, 0x73, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x101, 0x6e, 0x73, 0x3b, 0x161, 0x61, 0x75, 0x76,
+0x61, 0x6c, 0x73, 0x3b, 0x64, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x6b, 0x69, 0x64, 0x101, 0x3b, 0x64, 0x75, 0x20, 0x61, 0x6c,
+0x2d, 0x68, 0x69, 0x64, 0x17e, 0x101, 0x3b, 0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441, 0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430, 0x431,
+0x2e, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x45f, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x45f,
+0x443, 0x43c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x45f, 0x2e, 0x3b, 0x448, 0x430, 0x431, 0x2e, 0x3b, 0x440, 0x430, 0x43c,
+0x2e, 0x3b, 0x448, 0x430, 0x432, 0x2e, 0x3b, 0x434, 0x443, 0x43b, 0x43a, 0x2e, 0x3b, 0x434, 0x443, 0x43b, 0x445, 0x2e, 0x3b, 0x43c,
+0x443, 0x445, 0x430, 0x440, 0x435, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x440, 0x430, 0x431, 0x438, 0x20, 0x49, 0x3b,
+0x440, 0x430, 0x431, 0x438, 0x20, 0x49, 0x49, 0x3b, 0x45f, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x3b, 0x45f, 0x443, 0x43c,
+0x430, 0x434, 0x430, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x45f, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440,
+0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x448, 0x430, 0x432, 0x430, 0x43b, 0x3b, 0x434, 0x443, 0x43b, 0x43a, 0x438, 0x434, 0x430,
+0x3b, 0x434, 0x443, 0x43b, 0x445, 0x438, 0x45f, 0x430, 0x3b, 0xd2e, 0xd41, 0xd39, 0x2e, 0x3b, 0xd38, 0xd2b, 0x2e, 0x3b, 0xd31, 0xd2c,
+0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0x2e, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16,
+0xd3f, 0x2e, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0x2e, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26,
+0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0x2e, 0x3b, 0xd31, 0xd1c, 0x2e, 0x3b, 0xd36, 0xd39, 0xd2c, 0xd3e, 0x2e, 0x3b, 0xd31, 0xd2e,
+0xd26, 0xd3e, 0x2e, 0x3b, 0xd36, 0xd35, 0xd4d, 0xd35, 0xd3e, 0x2e, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd16, 0xd39, 0x2e, 0x3b, 0xd26,
+0xd41, 0xd7d, 0x20, 0xd39, 0xd3f, 0x2e, 0x3b, 0xd2e, 0xd41, 0xd39, 0xd31, 0xd02, 0x3b, 0xd38, 0xd2b, 0xd7c, 0x3b, 0xd31, 0xd2c, 0xd40,
+0xd39, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f,
+0xd7c, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41,
+0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd31, 0xd1c, 0xd2c, 0xd4d, 0x3b, 0xd36, 0xd39, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd31, 0xd2e,
+0xd26, 0xd3e, 0xd7b, 0x3b, 0xd36, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd7d, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd16, 0xd39, 0xd26, 0xd4d, 0x3b,
+0xd26, 0xd41, 0xd7d, 0x20, 0xd39, 0xd3f, 0xd1c, 0xd4d, 0xd1c, 0x3b, 0xd2e, 0xd41, 0x3b, 0xd38, 0x3b, 0xd31, 0x3b, 0xd31, 0x3b, 0xd1c,
+0x3b, 0xd1c, 0x3b, 0xd31, 0x3b, 0xd36, 0x3b, 0xd31, 0x3b, 0xd36, 0x3b, 0xd26, 0xd41, 0x3b, 0xd26, 0xd41, 0x3b, 0xd2e, 0xd41, 0xd39,
+0xd31, 0xd02, 0x3b, 0xd38, 0xd2b, 0xd7c, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b,
+0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd05,
+0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd31, 0xd1c, 0xd2c,
+0xd4d, 0x3b, 0xd36, 0xd39, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd31, 0xd2e, 0xd33, 0xd3e, 0xd7b, 0x3b, 0xd36, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd7d,
+0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd16, 0xd39, 0xd26, 0xd4d, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd39, 0xd3f, 0xd1c, 0xd4d, 0xd1c, 0x3b,
+0x92e, 0x94b, 0x939, 0x2e, 0x3b, 0x938, 0x92b, 0x2e, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x49, 0x3b, 0x930, 0x93e, 0x92c, 0x940,
+0x20, 0x49, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x2e, 0x20, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x2e, 0x20, 0x49, 0x49,
+0x3b, 0x930, 0x91d, 0x93e, 0x2e, 0x3b, 0x936, 0x93e, 0x92c, 0x93e, 0x2e, 0x3b, 0x930, 0x92e, 0x2e, 0x3b, 0x936, 0x935, 0x94d, 0x935,
+0x93e, 0x2e, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x915, 0x940, 0x2e, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x939, 0x93f, 0x2e, 0x3b, 0x92e,
+0x94b, 0x939, 0x930, 0x92e, 0x3b, 0x938, 0x92b, 0x930, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x49, 0x3b, 0x930, 0x93e, 0x92c, 0x940,
+0x20, 0x49, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x926, 0x93e, 0x20, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x926, 0x93e, 0x20,
+0x49, 0x49, 0x3b, 0x930, 0x91d, 0x93e, 0x92c, 0x3b, 0x936, 0x93e, 0x92c, 0x93e, 0x928, 0x3b, 0x930, 0x92e, 0x91c, 0x93e, 0x928, 0x3b,
+0x936, 0x935, 0x94d, 0x935, 0x93e, 0x932, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x915, 0x940, 0x926, 0x93e, 0x939, 0x3b, 0x927, 0x941, 0x932,
+0x2d, 0x939, 0x93f, 0x91c, 0x93e, 0x939, 0x3b, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b, 0x96d,
+0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967, 0x3b, 0x967, 0x968, 0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73,
+0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x6a,
+0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x73,
+0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c,
+0x2d, 0x71, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x2e, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61,
+0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x69,
+0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61,
+0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61,
+0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d,
+0x71, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b,
+0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62,
+0x2e, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b,
+0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x2e,
+0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x71, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x645,
+0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x647, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49,
+0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x627, 0x62c,
+0x627, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b,
+0x62f, 0x627, 0x644, 0x642, 0x627, 0x639, 0x62f, 0x647, 0x3b, 0x62d, 0x644, 0x627, 0x644, 0x20, 0x62d, 0x62c, 0x3b, 0x645, 0x62d, 0x631,
+0x645, 0x3b, 0x62f, 0x20, 0x635, 0x641, 0x631, 0x6d0, 0x20, 0x62f, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639,
+0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631,
+0x627, 0x62c, 0x627, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627,
+0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642, 0x627, 0x639, 0x62f, 0x647, 0x3b, 0x62d, 0x644, 0x627, 0x644, 0x20, 0x62d, 0x62c, 0x3b, 0x645,
+0x62d, 0x631, 0x645, 0x3b, 0x62f, 0x20, 0x635, 0x641, 0x631, 0x6d2, 0x20, 0x62f, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628,
+0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x648, 0x645, 0x627, 0x20, 0x49, 0x49,
+0x3b, 0x631, 0x627, 0x62c, 0x627, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634,
+0x648, 0x627, 0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642, 0x627, 0x639, 0x62f, 0x647, 0x3b, 0x62d, 0x644, 0x627, 0x644, 0x20, 0x62d, 0x62c,
+0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x627, 0x648, 0x644,
+0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x200c, 0x627,
+0x644, 0x627, 0x648, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x200c, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x631, 0x62c,
+0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630,
+0x6cc, 0x642, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x6cc, 0x62d, 0x62c, 0x647, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631,
+0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644, 0x62b,
+0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f,
+0x6cc, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631,
+0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x6cc, 0x642, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x6cc, 0x62d,
+0x62c, 0x647, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x627,
+0x648, 0x644, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc,
+0x200c, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x200c, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b,
+0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644,
+0x3b, 0x630, 0x6cc, 0x642, 0x639, 0x62f, 0x647, 0x654, 0x3b, 0x630, 0x6cc, 0x62d, 0x62c, 0x647, 0x654, 0x3b, 0x4d, 0x75, 0x68, 0x2e,
+0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49,
+0x3b, 0x44, 0x17c, 0x75, 0x2e, 0x20, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x2e, 0x3b,
+0x53, 0x7a, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x7a, 0x61, 0x77, 0x2e, 0x3b, 0x5a, 0x75, 0x20, 0x61,
+0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72,
+0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62,
+0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x6d,
+0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x64, 0x17c, 0x61, 0x62, 0x3b, 0x53, 0x7a, 0x61, 0x62, 0x61, 0x6e,
+0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x7a, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x5a, 0x75, 0x20,
+0x61, 0x6c, 0x2d, 0x6b, 0x61, 0x64, 0x61, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17c, 0x64, 0x17c,
+0x61, 0x3b, 0xa2e, 0xa41, 0xa39, 0xa71, 0x2e, 0x3b, 0xa38, 0xa2b, 0x2e, 0x3b, 0xa30, 0xa2c, 0x2e, 0x20, 0x49, 0x3b, 0xa30, 0xa2c,
+0x2e, 0x20, 0x49, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0x2e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0x2e, 0x20, 0x49, 0x49, 0x3b,
+0xa30, 0xa3e, 0xa1c, 0x2e, 0x3b, 0xa38, 0xa3c, 0xa3e, 0x2e, 0x3b, 0xa30, 0xa3e, 0xa2e, 0x2e, 0x3b, 0xa38, 0xa3c, 0xa05, 0x2e, 0x3b,
+0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0x2e, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa39, 0xa3f, 0x2e, 0x3b,
+0xa2e, 0xa41, 0xa39, 0xa71, 0xa30, 0xa2e, 0x3b, 0xa38, 0xa2b, 0xa30, 0x3b, 0xa30, 0xa2c, 0xa40, 0x2bb, 0x20, 0x49, 0x3b, 0xa30, 0xa2c,
+0xa40, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26,
+0xa3e, 0x20, 0x49, 0x49, 0x3b, 0xa30, 0xa1c, 0xa2c, 0x3b, 0xa38, 0xa3c, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa30, 0xa2e, 0xa1c, 0xa3c, 0xa3e,
+0xa28, 0x3b, 0xa38, 0xa3c, 0xa35, 0xa3e, 0xa32, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0xa26, 0xa3e, 0xa39, 0x3b,
+0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa39, 0xa3f, 0xa1c, 0xa4d, 0xa39, 0xa3e, 0x3b, 0xa2e, 0xa41, 0xa39, 0xa71, 0xa30, 0xa2e, 0x3b,
+0xa38, 0xa2b, 0xa30, 0x3b, 0xa30, 0xa2c, 0xa40, 0x20, 0x2bb, 0x20, 0x49, 0x3b, 0xa30, 0xa2c, 0xa40, 0x20, 0x2bb, 0x20, 0x49, 0x49,
+0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x49, 0x3b,
+0xa30, 0xa1c, 0xa2c, 0x3b, 0xa38, 0xa3c, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa30, 0xa2e, 0xa1c, 0xa3c, 0xa3e, 0xa28, 0x3b, 0xa38, 0xa3c, 0xa35,
+0xa3e, 0xa32, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0xa26, 0xa3e, 0xa39, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32,
+0x2d, 0xa39, 0xa3f, 0xa1c, 0xa4d, 0xa39, 0xa3e, 0x3b, 0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441, 0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430,
+0x431, 0x2e, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49,
+0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x2e, 0x3b, 0x448, 0x430, 0x430, 0x431,
+0x2e, 0x3b, 0x440, 0x430, 0x43c, 0x2e, 0x3b, 0x448, 0x430, 0x432, 0x2e, 0x3b, 0x437, 0x443, 0x43b, 0x44c, 0x2d, 0x43a, 0x2e, 0x3b,
+0x437, 0x443, 0x43b, 0x44c, 0x2d, 0x445, 0x2e, 0x3b, 0x43c, 0x443, 0x445, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444,
+0x430, 0x440, 0x3b, 0x440, 0x430, 0x431, 0x438, 0x2d, 0x443, 0x43b, 0x44c, 0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x440,
+0x430, 0x431, 0x438, 0x2d, 0x443, 0x43b, 0x44c, 0x2d, 0x430, 0x445, 0x438, 0x440, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x2d,
+0x443, 0x43b, 0x44c, 0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x2d, 0x443, 0x43b,
+0x44c, 0x2d, 0x430, 0x445, 0x438, 0x440, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x430, 0x43d,
+0x3b, 0x440, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x448, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x437, 0x443, 0x43b,
+0x44c, 0x2d, 0x43a, 0x430, 0x430, 0x434, 0x430, 0x3b, 0x437, 0x443, 0x43b, 0x44c, 0x2d, 0x445, 0x438, 0x434, 0x436, 0x436, 0x430, 0x3b,
+0x41c, 0x443, 0x445, 0x2e, 0x3b, 0x421, 0x430, 0x444, 0x2e, 0x3b, 0x420, 0x435, 0x431, 0x2e, 0x20, 0x31, 0x3b, 0x420, 0x435, 0x431,
+0x2e, 0x20, 0x32, 0x3b, 0x40f, 0x443, 0x43c, 0x2e, 0x20, 0x31, 0x3b, 0x40f, 0x443, 0x43c, 0x2e, 0x20, 0x32, 0x3b, 0x420, 0x435,
+0x45f, 0x2e, 0x3b, 0x428, 0x430, 0x2e, 0x3b, 0x420, 0x430, 0x43c, 0x2e, 0x3b, 0x428, 0x435, 0x2e, 0x3b, 0x417, 0x443, 0x43b, 0x2d,
+0x43a, 0x2e, 0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x445, 0x2e, 0x3b, 0x41c, 0x443, 0x445, 0x430, 0x440, 0x435, 0x43c, 0x3b, 0x421, 0x430,
+0x444, 0x435, 0x440, 0x3b, 0x420, 0x435, 0x431, 0x438, 0x20, 0x31, 0x3b, 0x420, 0x435, 0x431, 0x438, 0x20, 0x32, 0x3b, 0x40f, 0x443,
+0x43c, 0x430, 0x434, 0x435, 0x20, 0x31, 0x3b, 0x40f, 0x443, 0x43c, 0x430, 0x434, 0x435, 0x20, 0x32, 0x3b, 0x420, 0x435, 0x45f, 0x435,
+0x431, 0x3b, 0x428, 0x430, 0x2bb, 0x431, 0x430, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x428, 0x435, 0x432,
+0x430, 0x43b, 0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x43a, 0x430, 0x434, 0x435, 0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x445, 0x438, 0x45f, 0x435,
+0x3b, 0x41c, 0x443, 0x440, 0x430, 0x445, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x2bb,
+0x20, 0x49, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x408, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49,
+0x3b, 0x408, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x49, 0x3b, 0x420, 0x430, 0x452, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x2bb,
+0x431, 0x430, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x430, 0x43b, 0x3b, 0x414, 0x443,
+0x2bb, 0x43b, 0x2d, 0x41a, 0x438, 0x2bb, 0x434, 0x430, 0x3b, 0x414, 0x443, 0x2bb, 0x43b, 0x2d, 0x445, 0x438, 0x452, 0x430, 0x3b, 0x4d,
+0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x65, 0x62, 0x2e, 0x20, 0x31, 0x3b, 0x52, 0x65, 0x62, 0x2e,
+0x20, 0x32, 0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x31, 0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x32, 0x3b, 0x52,
+0x65, 0x64, 0x17e, 0x2e, 0x3b, 0x160, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x160, 0x65, 0x2e, 0x3b, 0x5a, 0x75,
+0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x65, 0x6d, 0x3b,
+0x53, 0x61, 0x66, 0x65, 0x72, 0x3b, 0x52, 0x65, 0x62, 0x69, 0x20, 0x31, 0x3b, 0x52, 0x65, 0x62, 0x69, 0x20, 0x32, 0x3b,
+0x44, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x31, 0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x32, 0x3b,
+0x52, 0x65, 0x64, 0x17e, 0x65, 0x62, 0x3b, 0x160, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x61,
+0x6e, 0x3b, 0x160, 0x65, 0x76, 0x61, 0x6c, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x5a, 0x75, 0x6c,
+0x2d, 0x68, 0x69, 0x64, 0x17e, 0x65, 0x3b, 0x4d, 0x75, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72,
+0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75,
+0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x111,
+0x61, 0x62, 0x3b, 0x160, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x160, 0x61,
+0x76, 0x61, 0x6c, 0x3b, 0x44, 0x75, 0x2bb, 0x6c, 0x2d, 0x4b, 0x69, 0x2bb, 0x64, 0x61, 0x3b, 0x44, 0x75, 0x2bb, 0x6c, 0x2d,
+0x68, 0x69, 0x111, 0x61, 0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20,
+0x49, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x64, 0x17e,
+0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x64, 0x2e, 0x3b, 0x161, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e,
+0x3b, 0x161, 0x61, 0x75, 0x2e, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c,
+0x2d, 0x68, 0x2e, 0x3b, 0x61, 0x6c, 0x2d, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61,
+0x72, 0x3b, 0x72, 0x61, 0x62, 0xed, 0xb4, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62,
+0xed, 0xb4, 0x61, 0x74, 0x68, 0x2d, 0x74, 0x68, 0xe1, 0x6e, 0xed, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20,
+0x6c, 0x2d, 0xfa, 0x6c, 0xe1, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x6c, 0x2d, 0xe1, 0x63, 0x68, 0x69,
+0x72, 0x61, 0x3b, 0x72, 0x61, 0x64, 0x17e, 0x61, 0x62, 0x3b, 0x161, 0x61, 0xb4, 0x20, 0x62, 0xe1, 0x6e, 0x3b, 0x72, 0x61,
+0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x161, 0x61, 0x75, 0x76, 0xe1, 0x6c, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x6b,
+0x61, 0xb4, 0x20, 0x64, 0x61, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17e, 0x64, 0x17e, 0x61, 0x3b,
+0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb,
+0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49,
+0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61,
+0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c,
+0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x71, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d,
+0x68, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61,
+0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62,
+0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c,
+0x2d, 0x75, 0x6c, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x61,
+0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x2019, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64,
+0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x67, 0x61, 0x2019,
+0x64, 0x61, 0x3b, 0x44, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72,
+0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61,
+0x77, 0x77, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b,
+0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x75, 0x6c, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d,
+0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2019, 0x62,
+0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64,
+0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x67, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x68, 0x69, 0x6a,
+0x6a, 0x61, 0x3b, 0xbae, 0xbc1, 0xbb9, 0x2e, 0x3b, 0xb9a, 0xb83, 0xbaa, 0x2e, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x31, 0x3b, 0xbb0,
+0xbaa, 0xbbf, 0x20, 0x32, 0x3b, 0xb9c, 0xbc1, 0xbae, 0x2e, 0x20, 0x31, 0x3b, 0xb9c, 0xbc1, 0xbae, 0x2e, 0x20, 0x32, 0x3b, 0xbb0,
+0xb9c, 0x2e, 0x3b, 0xbb7, 0xb83, 0x2e, 0x3b, 0xbb0, 0xbae, 0x2e, 0x3b, 0xbb7, 0xbb5, 0xbcd, 0x2e, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd,
+0x20, 0xb95, 0xb83, 0x2e, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd, 0x20, 0xbb9, 0xbbf, 0xb9c, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbc1, 0xbb9, 0xbb0,
+0xbcd, 0xbb0, 0xbae, 0xbcd, 0x3b, 0xb9a, 0xb83, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x31, 0x3b, 0xbb0, 0xbaa, 0xbbf,
+0x20, 0x32, 0x3b, 0xb9c, 0xbc1, 0xbae, 0xba4, 0xbbe, 0x20, 0x31, 0x3b, 0xb9c, 0xbc1, 0xbae, 0xba4, 0xbbe, 0x20, 0x32, 0x3b, 0xbb0,
+0xb9c, 0xbaa, 0xbcd, 0x3b, 0xbb7, 0xb83, 0xbaa, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xbb0, 0xbae, 0xbb2, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xbb7, 0xbb5,
+0xbcd, 0xbb5, 0xbbe, 0xbb2, 0xbcd, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd, 0x20, 0xb95, 0xb83, 0xba4, 0xbbe, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd,
+0x20, 0xbb9, 0xbbf, 0xb9c, 0xbcd, 0xb9c, 0xbbe, 0x3b, 0xc2e, 0xc41, 0xc39, 0x2e, 0x3b, 0xc38, 0xc2b, 0x2e, 0x3b, 0xc30, 0x2e, 0x20,
+0x49, 0x3b, 0xc30, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xc1c, 0xc41, 0xc2e, 0x2e, 0x20, 0x49, 0x3b, 0xc1c, 0xc41, 0xc2e, 0x2e, 0x20,
+0x49, 0x49, 0x3b, 0xc30, 0xc1c, 0x2e, 0x3b, 0xc37, 0xc2c, 0xc3e, 0x2e, 0x3b, 0xc30, 0xc02, 0xc1c, 0xc3e, 0x2e, 0x3b, 0xc37, 0xc35,
+0xc4d, 0xc35, 0xc3e, 0x2e, 0x3b, 0xc27, 0xc41, 0xc32, 0xc4d, 0x2d, 0xc15, 0xc3f, 0x2e, 0x3b, 0xc27, 0xc41, 0xc32, 0xc4d, 0x2d, 0xc39,
+0xc3f, 0x2e, 0x3b, 0xc2e, 0xc41, 0xc39, 0xc30, 0xc4d, 0xc30, 0xc02, 0x3b, 0xc38, 0xc2b, 0xc30, 0xc4d, 0x3b, 0xc30, 0xc2c, 0xc40, 0x20,
+0x49, 0x3b, 0xc30, 0xc2c, 0xc40, 0x20, 0x49, 0x49, 0x3b, 0xc1c, 0xc41, 0xc2e, 0xc26, 0xc3e, 0x20, 0x49, 0x3b, 0xc1c, 0xc41, 0xc2e,
+0xc26, 0xc3e, 0x20, 0x49, 0x49, 0x3b, 0xc30, 0xc1c, 0xc2c, 0xc4d, 0x3b, 0xc37, 0xc2c, 0xc3e, 0xc28, 0xc4d, 0x3b, 0xc30, 0xc02, 0xc1c,
+0xc3e, 0xc28, 0xc4d, 0x3b, 0xc37, 0xc35, 0xc4d, 0xc35, 0xc3e, 0xc32, 0xc4d, 0x3b, 0xc27, 0xc41, 0xc32, 0xc4d, 0x2d, 0xc15, 0xc3f, 0x20,
+0xc26, 0xc3e, 0xc39, 0xc4d, 0x3b, 0xc27, 0xc41, 0xc32, 0xc4d, 0x2d, 0xc39, 0xc3f, 0xc1c, 0xc4d, 0xc1c, 0xc3e, 0xc39, 0xc4d, 0x3b, 0xe21,
+0xe38, 0xe2e, 0xe31, 0xe23, 0x2e, 0x3b, 0xe40, 0xe28, 0xe32, 0xe30, 0x2e, 0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x3b, 0xe23,
+0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32,
+0xe14, 0xe32, 0x20, 0x49, 0x49, 0x3b, 0xe40, 0xe23, 0xe32, 0xe30, 0x2e, 0x3b, 0xe0a, 0xe30, 0xe2d, 0xe4c, 0x2e, 0x3b, 0xe40, 0xe23,
+0xe32, 0xe30, 0xe21, 0xe30, 0x2e, 0x3b, 0xe40, 0xe0a, 0xe32, 0xe27, 0x2e, 0x3b, 0xe0b, 0xe38, 0xe25, 0xe01, 0xe34, 0xe2d, 0xe3a, 0x2e,
+0x3b, 0xe0b, 0xe38, 0xe25, 0xe2b, 0xe34, 0xe08, 0x2e, 0x3b, 0xe21, 0xe38, 0xe2e, 0xe30, 0xe23, 0xe4c, 0xe23, 0xe2d, 0xe21, 0x3b, 0xe0b,
+0xe2d, 0xe1f, 0xe32, 0xe23, 0xe4c, 0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x49,
+0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20, 0x49, 0x49, 0x3b,
+0xe23, 0xe2d, 0xe08, 0xe31, 0xe1a, 0x3b, 0xe0a, 0xe30, 0xe2d, 0xe30, 0xe1a, 0xe32, 0xe19, 0x3b, 0xe23, 0xe2d, 0xe21, 0xe30, 0xe14, 0xe2d,
+0xe19, 0x3b, 0xe40, 0xe0a, 0xe32, 0xe27, 0xe31, 0xe25, 0x3b, 0xe0b, 0xe38, 0xe25, 0xe01, 0xe34, 0xe2d, 0xe3a, 0xe14, 0xe30, 0xe2e, 0xe3a,
+0x3b, 0xe0b, 0xe38, 0xe25, 0xe2b, 0xe34, 0xe08, 0xe0d, 0xe30, 0xe2e, 0xe3a, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x2e, 0x3b, 0x53,
+0x61, 0x66, 0x65, 0x72, 0x3b, 0x52, 0x2e, 0x65, 0x76, 0x76, 0x65, 0x6c, 0x3b, 0x52, 0x2e, 0x61, 0x68, 0x69, 0x72, 0x3b,
+0x43, 0x2e, 0x65, 0x76, 0x76, 0x65, 0x6c, 0x3b, 0x43, 0x2e, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x52, 0x65, 0x63, 0x65, 0x70,
+0x3b, 0x15e, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x15e, 0x65, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x5a,
+0x69, 0x6c, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x5a, 0x69, 0x6c, 0x68, 0x69, 0x63, 0x63, 0x65, 0x3b, 0x4d, 0x75, 0x68, 0x61,
+0x72, 0x72, 0x65, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x65, 0x72, 0x3b, 0x52, 0x65, 0x62, 0x69, 0xfc, 0x6c, 0x65, 0x76, 0x76,
+0x65, 0x6c, 0x3b, 0x52, 0x65, 0x62, 0x69, 0xfc, 0x6c, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x43, 0x65, 0x6d, 0x61, 0x7a, 0x69,
+0x79, 0x65, 0x6c, 0x65, 0x76, 0x76, 0x65, 0x6c, 0x3b, 0x43, 0x65, 0x6d, 0x61, 0x7a, 0x69, 0x79, 0x65, 0x6c, 0x61, 0x68,
+0x69, 0x72, 0x3b, 0x52, 0x65, 0x63, 0x65, 0x70, 0x3b, 0x15e, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a,
+0x61, 0x6e, 0x3b, 0x15e, 0x65, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x5a, 0x69, 0x6c, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x5a, 0x69,
+0x6c, 0x68, 0x69, 0x63, 0x63, 0x65, 0x3b, 0x645, 0x6c7, 0x6be, 0x6d5, 0x631, 0x631, 0x6d5, 0x645, 0x3b, 0x633, 0x6d5, 0x67e, 0x6d5,
+0x631, 0x3b, 0x631, 0x6d5, 0x628, 0x649, 0x626, 0x6c7, 0x644, 0x626, 0x6d5, 0x6cb, 0x6cb, 0x6d5, 0x644, 0x3b, 0x631, 0x6d5, 0x628, 0x649,
+0x626, 0x6c7, 0x644, 0x626, 0x627, 0x62e, 0x649, 0x631, 0x3b, 0x62c, 0x6d5, 0x645, 0x627, 0x62f, 0x649, 0x64a, 0x6d5, 0x644, 0x626, 0x6d5,
+0x6cb, 0x6cb, 0x6d5, 0x644, 0x3b, 0x62c, 0x6d5, 0x645, 0x627, 0x62f, 0x649, 0x64a, 0x6d5, 0x644, 0x626, 0x627, 0x62e, 0x649, 0x631, 0x3b,
+0x631, 0x6d5, 0x62c, 0x6d5, 0x628, 0x3b, 0x634, 0x6d5, 0x626, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x627, 0x645, 0x649, 0x632, 0x627, 0x646,
+0x3b, 0x634, 0x6d5, 0x6cb, 0x6cb, 0x627, 0x644, 0x3b, 0x632, 0x6c7, 0x644, 0x642, 0x6d5, 0x626, 0x62f, 0x6d5, 0x3b, 0x632, 0x6c7, 0x644,
+0x6be, 0x6d5, 0x62c, 0x62c, 0x6d5, 0x3b, 0x43c, 0x443, 0x445, 0x3b, 0x441, 0x430, 0x444, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49,
+0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x20, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c,
+0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x3b, 0x440, 0x430, 0x43c, 0x3b, 0x434, 0x430,
+0x432, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x43a, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x445, 0x3b, 0x43c, 0x443,
+0x445, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x3b,
+0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x3b, 0x434, 0x436,
+0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x430, 0x431,
+0x430, 0x43d, 0x3b, 0x440, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x434, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x437, 0x443,
+0x2d, 0x43b, 0x44c, 0x2d, 0x43a, 0x430, 0x430, 0x434, 0x430, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x445, 0x456, 0x434, 0x436,
+0x430, 0x3b, 0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441, 0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x3b, 0x440,
+0x430, 0x431, 0x456, 0x20, 0x49, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e,
+0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x2e, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x2e, 0x3b, 0x440, 0x430, 0x43c, 0x2e,
+0x3b, 0x434, 0x430, 0x432, 0x2e, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x43a, 0x2e, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c,
+0x2d, 0x445, 0x2e, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644,
+0x627, 0x648, 0x651, 0x644, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644, 0x62b, 0x651, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645,
+0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x627, 0x648, 0x651, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x62b,
+0x651, 0x627, 0x646, 0x6cc, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646,
+0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x6c3, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x62d,
+0x62c, 0x6c3, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x20, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644,
+0x627, 0x648, 0x644, 0x3b, 0x631, 0x20, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627,
+0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646,
+0x6cc, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648,
+0x627, 0x644, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x6c3, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x62d, 0x62c, 0x6c3, 0x3b,
+0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x6f, 0x62, 0x69, 0x2bc,
+0x20, 0x75, 0x6c, 0x2d, 0x61, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x52, 0x6f, 0x62, 0x69, 0x2bc, 0x20, 0x75, 0x6c, 0x2d, 0x6f,
+0x78, 0x69, 0x72, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x20, 0x75, 0x6c, 0x2d, 0x61, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x4a,
+0x75, 0x6d, 0x61, 0x64, 0x20, 0x75, 0x6c, 0x2d, 0x6f, 0x78, 0x69, 0x72, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53,
+0x68, 0x61, 0x2bc, 0x62, 0x6f, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x6f, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x76, 0x76,
+0x6f, 0x6c, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x71, 0x61, 0x2bc, 0x64, 0x61, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x69, 0x6a,
+0x6a, 0x61, 0x3b, 0x41c, 0x443, 0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430,
+0x431, 0x438, 0x443, 0x43b, 0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x43e, 0x445,
+0x438, 0x440, 0x3b, 0x416, 0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x416, 0x443, 0x43c, 0x43e,
+0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x445, 0x440, 0x43e, 0x3b, 0x420, 0x430, 0x436, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x44a, 0x431,
+0x43e, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x437, 0x43e, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x43e, 0x43b, 0x3b, 0x417, 0x438,
+0x43b, 0x2d, 0x49b, 0x430, 0x44a, 0x434, 0x430, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x4b3, 0x438, 0x436, 0x436, 0x430, 0x3b, 0x6d, 0x75,
+0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x69, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20,
+0x69, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x69, 0x69, 0x3b,
+0x72, 0x65, 0x64, 0x17e, 0x2e, 0x3b, 0x161, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x161, 0x65, 0x2e, 0x3b, 0x7a,
+0x75, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x65, 0x6d,
+0x3b, 0x73, 0x61, 0x66, 0x65, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x69, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb,
+0x20, 0x69, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64,
+0x65, 0x20, 0x69, 0x69, 0x3b, 0x72, 0x65, 0x64, 0x17e, 0x65, 0x62, 0x3b, 0x161, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72,
+0x61, 0x6d, 0x61, 0x7a, 0x61, 0x6e, 0x3b, 0x161, 0x65, 0x76, 0x61, 0x6c, 0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x6b, 0x61, 0x64,
+0x65, 0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17e, 0x65, 0x3b, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b,
+0x74, 0x65, 0x64, 0x3b, 0x61, 0x66, 0x254, 0x3b, 0x64, 0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b,
+0x64, 0x65, 0x61, 0x3b, 0x61, 0x6e, 0x79, 0x3b, 0x6b, 0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x3b,
+0x64, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b,
+0x61, 0x66, 0x254, 0x66, 0x69, 0x1ebd, 0x3b, 0x64, 0x61, 0x6d, 0x25b, 0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73, 0x69, 0x61,
+0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e, 0x79, 0x254,
+0x6e, 0x79, 0x254, 0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b, 0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65,
+0x3b, 0x64, 0x7a, 0x6f, 0x6d, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x64,
+0x65, 0x20, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x64,
+0x65, 0x20, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61,
+0x20, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x52,
+0x61, 0x6a, 0x61, 0x62, 0x3b, 0x64, 0x65, 0x20, 0x53, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x64, 0x65, 0x20, 0x52,
+0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x64, 0x65, 0x20, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x65,
+0x20, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x65, 0x20, 0x44, 0x68, 0x75,
+0x2bb, 0x6c, 0x2d, 0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x7a46, 0x54c8, 0x5170, 0x59c6, 0x6708, 0x3b, 0x8272, 0x6cd5, 0x5c14, 0x6708,
+0x3b, 0x8d56, 0x6bd4, 0x6708, 0x20, 0x49, 0x3b, 0x8d56, 0x6bd4, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x4e3b, 0x9a6c, 0x8fbe, 0x6708, 0x20, 0x49,
+0x3b, 0x4e3b, 0x9a6c, 0x8fbe, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x8d56, 0x54f2, 0x535c, 0x6708, 0x3b, 0x820d, 0x5c14, 0x90a6, 0x6708, 0x3b, 0x8d56,
+0x4e70, 0x4e39, 0x6708, 0x3b, 0x95ea, 0x74e6, 0x9c81, 0x6708, 0x3b, 0x90fd, 0x5c14, 0x5580, 0x5c14, 0x5fb7, 0x6708, 0x3b, 0x90fd, 0x5c14, 0x9ed1, 0x54f2,
+0x6708, 0x3b
+};
+// GENERATED PART ENDS HERE
+
+QT_END_NAMESPACE
+
+#endif // QHIJRI_CALENDAR_DATA_P_H
diff --git a/src/corelib/time/qhijricalendar_p.h b/src/corelib/time/qhijricalendar_p.h
new file mode 100644
index 0000000000..60820488b4
--- /dev/null
+++ b/src/corelib/time/qhijricalendar_p.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QHIJRI_CALENDAR_P_H
+#define QHIJRI_CALENDAR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of calendar implementations.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qglobal_p.h>
+#include "qcalendarbackend_p.h"
+
+QT_REQUIRE_CONFIG(hijricalendar);
+
+QT_BEGIN_NAMESPACE
+
+// Base for sharing with other variants on the Islamic calendar, as needed:
+class Q_CORE_EXPORT QHijriCalendar : public QCalendarBackend
+{
+public:
+    int daysInMonth(int month, int year = QCalendar::Unspecified) const override;
+    int maximumDaysInMonth() const override;
+    int daysInYear(int year) const override;
+
+    bool isLunar() const override;
+    bool isLuniSolar() const override;
+    bool isSolar() const override;
+
+protected:
+    const QCalendarLocale *localeMonthIndexData() const override;
+    const ushort *localeMonthData() const override;
+    // (The INTEGRITY compiler got upset at: using QCalendarBackend:QCalendarBackend;)
+    QHijriCalendar(const QString &name, QCalendar::System id = QCalendar::System::User)
+        : QCalendarBackend(name, id) {}
+};
+
+QT_END_NAMESPACE
+
+#endif // QHIJRI_CALENDAR_P_H
diff --git a/src/corelib/time/qislamiccivilcalendar.cpp b/src/corelib/time/qislamiccivilcalendar.cpp
new file mode 100644
index 0000000000..a6a2afd207
--- /dev/null
+++ b/src/corelib/time/qislamiccivilcalendar.cpp
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qglobal.h"
+#include "qislamiccivilcalendar_p.h"
+#include "qcalendarmath_p.h"
+#include <QtCore/qmath.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QRoundingDown;
+
+/*!
+    \since 5.14
+    \internal
+
+    \class QIslamicCivilCalendar
+    \inmodule QtCore
+    \brief Implements a commonly-used computed version of the Islamic calendar.
+
+    \section1 Civil Islamic Calendar
+
+    QIslamicCivilCalendar implements a tabular version of the Hijri calendar
+    which is known as the Islamic Civil Calendar. It has the same numbering of
+    years and months, but the months are determined by arithmetical rules rather
+    than by observation or astronomical calculations.
+
+    \section2 Calendar Organization
+
+    The civil calendar follows the usual tabular scheme of odd-numbered months
+    and the last month of each leap year being 30 days long, the rest being 29
+    days long. Its determination of leap years follows a 30-year cycle, in each
+    of which the years 2, 5, 7, 10, 13, 16, 18, 21, 24, 26 and 29 are leap
+    years.
+
+    \sa QHijriCalendar, QCalendar
+*/
+
+QIslamicCivilCalendar::QIslamicCivilCalendar()
+    : QHijriCalendar(QStringLiteral("Islamic Civil"), QCalendar::System::IslamicCivil)
+{
+    registerAlias(QStringLiteral("islamic-civil")); // CLDR name
+    registerAlias(QStringLiteral("islamicc")); // old CLDR name, still (2018) used by Mozilla
+    // Until we have a oncrete implementation that knows all the needed ephemerides:
+    registerAlias(QStringLiteral("Islamic"));
+}
+
+QString QIslamicCivilCalendar::name() const
+{
+    return QStringLiteral("Islamic Civil");
+}
+
+QCalendar::System QIslamicCivilCalendar::calendarSystem() const
+{
+    return QCalendar::System::IslamicCivil;
+}
+
+bool QIslamicCivilCalendar::isLeapYear(int year) const
+{
+    if (year == QCalendar::Unspecified)
+        return false;
+    if (year < 0)
+        ++year;
+    return qMod(year * 11 + 14, 30) < 11;
+}
+
+bool QIslamicCivilCalendar::dateToJulianDay(int year, int month, int day, qint64 *jd) const
+{
+    Q_ASSERT(jd);
+    if (!isDateValid(year, month, day))
+        return false;
+    if (year <= 0)
+        ++year;
+    *jd = qDiv(10631 * year - 10617, 30)
+            + qDiv(325 * month - 320, 11)
+            + day + 1948439;
+    return true;
+}
+
+QCalendar::YearMonthDay QIslamicCivilCalendar::julianDayToDate(qint64 jd) const
+{
+    const qint64 epoch = 1948440;
+    const int32_t k2 = 30 * (jd - epoch) + 15;
+    const int32_t k1 = 11 * qDiv(qMod(k2, 10631), 30) + 5;
+    int y = qDiv(k2, 10631) + 1;
+    const int month = qDiv(k1, 325) + 1;
+    const int day = qDiv(qMod(k1, 325), 11) + 1;
+    return QCalendar::YearMonthDay(y > 0 ? y : y - 1, month, day);
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/time/qislamiccivilcalendar_p.h b/src/corelib/time/qislamiccivilcalendar_p.h
new file mode 100644
index 0000000000..01d0525f62
--- /dev/null
+++ b/src/corelib/time/qislamiccivilcalendar_p.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QISLAMIC_CIVIL_CALENDAR_P_H
+#define QISLAMIC_CIVIL_CALENDAR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of calendar implementations.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qhijricalendar_p.h"
+
+QT_REQUIRE_CONFIG(islamiccivilcalendar);
+
+QT_BEGIN_NAMESPACE
+
+class Q_CORE_EXPORT QIslamicCivilCalendar : public QHijriCalendar
+{
+public:
+    QIslamicCivilCalendar();
+    // Calendar properties:
+    QString name() const override;
+    QCalendar::System calendarSystem() const override;
+    // Date queries:
+    bool isLeapYear(int year) const override;
+    // Julian Day conversions:
+    bool dateToJulianDay(int year, int month, int day, qint64 *jd) const override;
+    QCalendar::YearMonthDay julianDayToDate(qint64 jd) const override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QISLAMIC_CIVIL_CALENDAR_P_H
diff --git a/src/corelib/time/qjalalicalendar.cpp b/src/corelib/time/qjalalicalendar.cpp
new file mode 100644
index 0000000000..be9246d7db
--- /dev/null
+++ b/src/corelib/time/qjalalicalendar.cpp
@@ -0,0 +1,212 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qglobal.h"
+#include "qjalalicalendar_p.h"
+#include "qjalalicalendar_data_p.h"
+#include "qcalendarmath_p.h"
+#include <QtCore/qmath.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QRoundingDown;
+
+// Constants
+
+static const qint64 cycleDays = 1029983;
+static const int cycleYears = 2820;
+static const double yearLength = 365.24219858156028368; // 365 + leapRatio;
+static const qint64 jalaliEpoch = 2121446; // 475/01/01 AP, start of 2820 cycle
+
+// Calendar implementation
+
+static inline int cycle(qint64 jdn)
+{
+    return qDiv(jdn - jalaliEpoch, cycleDays);
+}
+
+qint64 cycleStart(int cycleNo)
+{
+    return jalaliEpoch + cycleNo * cycleDays;
+}
+
+qint64 firstDayOfYear(int year, int cycleNo)
+{
+    qint64 firstDOYinEra = static_cast<qint64>(qFloor(year * yearLength));
+    return jalaliEpoch + cycleNo * cycleDays + firstDOYinEra;
+}
+
+/*!
+    \since 5.14
+
+    \class QJalaliCalendar
+    \inmodule QtCore
+    \brief The QJalaliCalendar class provides Jalali (Hijri Shamsi) calendar
+    system implementation.
+
+    \section1 Solar Hijri Calendar System
+
+    The Solar Hijri calendar, also called the Solar Hejri calendar, Shamsi
+    Hijri calendar or Jalali calendar, is the official calendar of Iran and
+    Afghanistan. It begins on the vernal equinox (Nowruz) as determined by
+    astronomical calculation for the Iran Standard Time meridian
+    (52.5°E or GMT+3.5h). This determination of starting moment is more accurate
+    than the Gregorian calendar for predicting the date of the vernal equinox,
+    because it uses astronomical observations rather than mathematical rules.
+
+    \section2 Calendar Organization
+
+    Each of the twelve months corresponds with a zodiac sign. The first six
+    months have 31 days, the next five have 30 days, and the last month has 29
+    days in usual years but 30 days in leap years. The New Year's Day always
+    falls on the March equinox.
+
+    \section2 Leap Year Rules
+
+    The Solar Hijri calendar produces a five-year leap year interval after about
+    every seven four-year leap year intervals. It usually follows a 33-year
+    cycle with occasional interruptions by single 29-year or 37-year subcycles.
+    The reason for this behavior is that it tracks the observed vernal equinox.
+    By contrast, some less accurate predictive algorithms are in use based
+    on confusion between the average tropical year (365.2422 days, approximated
+    with near 128-year cycles or 2820-year great cycles) and the mean interval
+    between spring equinoxes (365.2424 days, approximated with a near 33-year
+    cycle).
+
+    Source: \l {https://en.wikipedia.org/wiki/Solar_Hijri_calendar}{Wikipedia
+    page on Solar Hijri Calendar}
+ */
+
+QJalaliCalendar::QJalaliCalendar()
+    : QCalendarBackend(QStringLiteral("Jalali"), QCalendar::System::Jalali)
+{
+    registerAlias(QStringLiteral("Persian"));
+}
+
+QString QJalaliCalendar::name() const
+{
+    return QStringLiteral("Jalali");
+}
+
+QCalendar::System QJalaliCalendar::calendarSystem() const
+{
+    return QCalendar::System::Jalali;
+}
+
+bool QJalaliCalendar::isLeapYear(int year) const
+{
+    if (year == QCalendar::Unspecified)
+        return false;
+    if (year < 0)
+        year++;
+    return qMod((year + 2346) * 683, 2820) < 683;
+}
+
+bool QJalaliCalendar::isLunar() const
+{
+    return false;
+}
+
+bool QJalaliCalendar::isLuniSolar() const
+{
+    return false;
+}
+
+bool QJalaliCalendar::isSolar() const
+{
+    return true;
+}
+
+bool QJalaliCalendar::dateToJulianDay(int year, int month, int day, qint64 *jd) const
+{
+    Q_ASSERT(jd);
+    if (!isDateValid(year, month, day))
+        return false;
+
+    const int y = year - (year < 0 ? 474 : 475);
+    const int c = qDiv(y, cycleYears);
+    const int yearInCycle = y - c * cycleYears;
+    int dayInYear = day;
+    for (int i = 1; i < month; ++i)
+        dayInYear += daysInMonth(i, year);
+    *jd = firstDayOfYear(yearInCycle, c) + dayInYear - 1;
+    return true;
+}
+
+QCalendar::YearMonthDay QJalaliCalendar::julianDayToDate(qint64 jd) const
+{
+    const int c = cycle(jd);
+    int yearInCycle = qFloor((jd - cycleStart(c)) / yearLength);
+    int year = yearInCycle + 475 + c * cycleYears;
+    int day = jd - firstDayOfYear(yearInCycle, c) + 1;
+    if (day > daysInYear(year <= 0 ? year - 1 : year)) {
+        year++;
+        day = 1;
+    }
+    if (year <= 0)
+        year--;
+    int month;
+    for (month = 1; month < 12; ++month) {
+        const int last = daysInMonth(month, year);
+        if (day <= last)
+            break;
+        day -= last;
+    }
+    return QCalendar::YearMonthDay(year, month, day);
+}
+
+int QJalaliCalendar::daysInMonth(int month, int year) const
+{
+    if (year && month > 0 && month <= 12)
+        return month < 7 ? 31 : month < 12 || isLeapYear(year) ? 30 : 29;
+
+    return 0;
+}
+
+const QCalendarLocale *QJalaliCalendar::localeMonthIndexData() const
+{
+    return locale_data;
+}
+
+const ushort *QJalaliCalendar::localeMonthData() const
+{
+    return months_data;
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/time/qjalalicalendar_data_p.h b/src/corelib/time/qjalalicalendar_data_p.h
new file mode 100644
index 0000000000..865e3ff98d
--- /dev/null
+++ b/src/corelib/time/qjalalicalendar_data_p.h
@@ -0,0 +1,893 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPERSIANCALENDAR_DATA_P_H
+#define QPERSIANCALENDAR_DATA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
+// file may change from version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qglobal_p.h>
+#include <QtCore/private/qcalendarbackend_p.h>
+
+QT_BEGIN_NAMESPACE
+
+// GENERATED PART STARTS HERE
+
+/*
+    This part of the file was generated on 2019-05-27 from the
+    Common Locale Data Repository v35.1
+
+    http://www.unicode.org/cldr/
+
+    Do not edit this section: instead regenerate it using
+    cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or
+    edited) CLDR data; see qtbase/util/locale_database/.
+*/
+
+static const QCalendarLocale locale_data[] = {
+   //  lang   script terr   sShort  sLong   sNarrow short   long    narrow
+      {     1,     0,     0,{ 0,48 },{ 48,84 },{ 132,24 },{ 0,48 },{ 48,84 },{ 156,29 }}, // C/AnyScript/AnyCountry
+       {     3,     7,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Oromo/Latin/Ethiopia
+       {     3,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Oromo/Latin/Kenya
+       {     4,     7,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Afar/Latin/Ethiopia
+       {     5,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Afrikaans/Latin/South Africa
+       {     5,     7,   148,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Afrikaans/Latin/Namibia
+       {     6,     7,     2,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Albanian/Latin/Albania
+       {     6,     7,   127,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Albanian/Latin/Macedonia
+       {     6,     7,   257,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Albanian/Latin/Kosovo
+       {     7,    14,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Amharic/Ethiopic/Ethiopia
+       {     8,     1,    64,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Egypt
+       {     8,     1,     3,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Algeria
+       {     8,     1,    17,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Bahrain
+       {     8,     1,    42,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Chad
+       {     8,     1,    48,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Comoros
+       {     8,     1,    59,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Djibouti
+       {     8,     1,    67,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Eritrea
+       {     8,     1,   103,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Iraq
+       {     8,     1,   105,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Israel
+       {     8,     1,   109,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Jordan
+       {     8,     1,   115,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Kuwait
+       {     8,     1,   119,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Lebanon
+       {     8,     1,   122,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Libya
+       {     8,     1,   136,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Mauritania
+       {     8,     1,   145,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Morocco
+       {     8,     1,   162,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Oman
+       {     8,     1,   165,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Palestinian Territories
+       {     8,     1,   175,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Qatar
+       {     8,     1,   186,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Saudi Arabia
+       {     8,     1,   194,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Somalia
+       {     8,     1,   201,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Sudan
+       {     8,     1,   207,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Syria
+       {     8,     1,   216,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Tunisia
+       {     8,     1,   223,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/United Arab Emirates
+       {     8,     1,   236,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Western Sahara
+       {     8,     1,   237,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Yemen
+       {     8,     1,   254,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/South Sudan
+       {     8,     1,   260,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/World
+       {     9,    10,    11,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Armenian/Armenian/Armenia
+       {    10,    11,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Assamese/Bengali/India
+       {    12,     7,    15,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Azerbaijani/Latin/Azerbaijan
+       {    12,     1,   102,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Azerbaijani/Arabic/Iran
+       {    12,     2,    15,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Azerbaijani/Cyrillic/Azerbaijan
+       {    13,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bashkir/Cyrillic/Russia
+       {    14,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Basque/Latin/Spain
+       {    15,    11,    18,{ 280,88 },{ 368,89 },{ 457,27 },{ 280,88 },{ 368,89 },{ 457,27 }}, // Bengali/Bengali/Bangladesh
+       {    15,    11,   100,{ 280,88 },{ 368,89 },{ 457,27 },{ 280,88 },{ 368,89 },{ 457,27 }}, // Bengali/Bengali/India
+       {    16,    31,    25,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dzongkha/Tibetan/Bhutan
+       {    19,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Breton/Latin/France
+       {    20,     2,    33,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bulgarian/Cyrillic/Bulgaria
+       {    21,    25,   147,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Burmese/Myanmar/Myanmar
+       {    22,     2,    20,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Belarusian/Cyrillic/Belarus
+       {    23,    20,    36,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Khmer/Khmer/Cambodia
+       {    24,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Catalan/Latin/Spain
+       {    24,     7,     5,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Catalan/Latin/Andorra
+       {    24,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Catalan/Latin/France
+       {    24,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Catalan/Latin/Italy
+       {    25,     5,    44,{ 484,39 },{ 523,38 },{ 185,27 },{ 484,39 },{ 523,38 },{ 185,27 }}, // Chinese/Simplified Han/China
+       {    25,     5,    97,{ 484,39 },{ 523,38 },{ 185,27 },{ 484,39 },{ 523,38 },{ 185,27 }}, // Chinese/Simplified Han/Hong Kong
+       {    25,     5,   126,{ 484,39 },{ 523,38 },{ 185,27 },{ 484,39 },{ 523,38 },{ 185,27 }}, // Chinese/Simplified Han/Macau
+       {    25,     5,   190,{ 484,39 },{ 523,38 },{ 185,27 },{ 484,39 },{ 523,38 },{ 185,27 }}, // Chinese/Simplified Han/Singapore
+       {    25,     6,    97,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Chinese/Traditional Han/Hong Kong
+       {    25,     6,   126,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Chinese/Traditional Han/Macau
+       {    25,     6,   208,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Chinese/Traditional Han/Taiwan
+       {    26,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Corsican/Latin/France
+       {    27,     7,    54,{ 48,84 },{ 48,84 },{ 561,39 },{ 48,84 },{ 48,84 },{ 561,39 }}, // Croatian/Latin/Croatia
+       {    27,     7,    27,{ 48,84 },{ 48,84 },{ 561,39 },{ 48,84 },{ 48,84 },{ 561,39 }}, // Croatian/Latin/Bosnia And Herzegowina
+       {    28,     7,    57,{ 600,82 },{ 600,82 },{ 185,27 },{ 600,82 },{ 600,82 },{ 185,27 }}, // Czech/Latin/Czech Republic
+       {    29,     7,    58,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Danish/Latin/Denmark
+       {    29,     7,    86,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Danish/Latin/Greenland
+       {    30,     7,   151,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Netherlands
+       {    30,     7,    12,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Aruba
+       {    30,     7,    21,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Belgium
+       {    30,     7,   152,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Cura Sao
+       {    30,     7,   202,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Suriname
+       {    30,     7,   255,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Bonaire
+       {    30,     7,   256,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Sint Maarten
+       {    31,     7,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United States
+       {    31,     3,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Deseret/United States
+       {    31,     7,     4,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/American Samoa
+       {    31,     7,     7,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Anguilla
+       {    31,     7,     9,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Antigua And Barbuda
+       {    31,     7,    13,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Australia
+       {    31,     7,    14,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Austria
+       {    31,     7,    16,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Bahamas
+       {    31,     7,    19,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Barbados
+       {    31,     7,    21,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Belgium
+       {    31,     7,    22,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Belize
+       {    31,     7,    24,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Bermuda
+       {    31,     7,    28,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Botswana
+       {    31,     7,    31,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/British Indian Ocean Territory
+       {    31,     7,    35,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Burundi
+       {    31,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cameroon
+       {    31,     7,    38,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Canada
+       {    31,     7,    40,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cayman Islands
+       {    31,     7,    45,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Christmas Island
+       {    31,     7,    46,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cocos Islands
+       {    31,     7,    51,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cook Islands
+       {    31,     7,    56,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cyprus
+       {    31,     7,    58,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Denmark
+       {    31,     7,    60,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Dominica
+       {    31,     7,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Eritrea
+       {    31,     7,    70,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Falkland Islands
+       {    31,     7,    72,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Fiji
+       {    31,     7,    73,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Finland
+       {    31,     7,    75,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Guernsey
+       {    31,     7,    80,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Gambia
+       {    31,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Germany
+       {    31,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Ghana
+       {    31,     7,    84,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Gibraltar
+       {    31,     7,    87,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Grenada
+       {    31,     7,    89,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Guam
+       {    31,     7,    93,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Guyana
+       {    31,     7,    97,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Hong Kong
+       {    31,     7,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/India
+       {    31,     7,   104,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Ireland
+       {    31,     7,   105,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Israel
+       {    31,     7,   107,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Jamaica
+       {    31,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Kenya
+       {    31,     7,   112,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Kiribati
+       {    31,     7,   120,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Lesotho
+       {    31,     7,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Liberia
+       {    31,     7,   126,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Macau
+       {    31,     7,   128,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Madagascar
+       {    31,     7,   129,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Malawi
+       {    31,     7,   130,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Malaysia
+       {    31,     7,   133,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Malta
+       {    31,     7,   134,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Marshall Islands
+       {    31,     7,   137,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Mauritius
+       {    31,     7,   140,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Micronesia
+       {    31,     7,   144,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Montserrat
+       {    31,     7,   148,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Namibia
+       {    31,     7,   149,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Nauru
+       {    31,     7,   151,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Netherlands
+       {    31,     7,   154,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/New Zealand
+       {    31,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Nigeria
+       {    31,     7,   158,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Niue
+       {    31,     7,   159,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Norfolk Island
+       {    31,     7,   160,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Northern Mariana Islands
+       {    31,     7,   163,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Pakistan
+       {    31,     7,   164,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Palau
+       {    31,     7,   167,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Papua New Guinea
+       {    31,     7,   170,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Philippines
+       {    31,     7,   171,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Pitcairn
+       {    31,     7,   174,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Puerto Rico
+       {    31,     7,   179,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Rwanda
+       {    31,     7,   180,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Saint Kitts And Nevis
+       {    31,     7,   181,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Saint Lucia
+       {    31,     7,   182,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Saint Vincent And The Grenadines
+       {    31,     7,   183,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Samoa
+       {    31,     7,   188,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Seychelles
+       {    31,     7,   189,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Sierra Leone
+       {    31,     7,   190,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Singapore
+       {    31,     7,   192,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Slovenia
+       {    31,     7,   193,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Solomon Islands
+       {    31,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/South Africa
+       {    31,     7,   199,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Saint Helena
+       {    31,     7,   201,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Sudan
+       {    31,     7,   204,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Swaziland
+       {    31,     7,   205,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Sweden
+       {    31,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Switzerland
+       {    31,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Tanzania
+       {    31,     7,   213,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Tokelau
+       {    31,     7,   214,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Tonga
+       {    31,     7,   215,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Trinidad And Tobago
+       {    31,     7,   219,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Turks And Caicos Islands
+       {    31,     7,   220,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Tuvalu
+       {    31,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Uganda
+       {    31,     7,   223,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United Arab Emirates
+       {    31,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United Kingdom
+       {    31,     7,   226,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United States Minor Outlying Islands
+       {    31,     7,   229,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Vanuatu
+       {    31,     7,   233,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/British Virgin Islands
+       {    31,     7,   234,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United States Virgin Islands
+       {    31,     7,   239,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Zambia
+       {    31,     7,   240,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Zimbabwe
+       {    31,     7,   249,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Diego Garcia
+       {    31,     7,   251,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Isle Of Man
+       {    31,     7,   252,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Jersey
+       {    31,     7,   254,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/South Sudan
+       {    31,     7,   256,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Sint Maarten
+       {    31,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/World
+       {    31,     7,   261,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Europe
+       {    32,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Esperanto/Latin/World
+       {    33,     7,    68,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Estonian/Latin/Estonia
+       {    34,     7,    71,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Faroese/Latin/Faroe Islands
+       {    34,     7,    58,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Faroese/Latin/Denmark
+       {    36,     7,    73,{ 766,82 },{ 848,118 },{ 185,27 },{ 966,142 },{ 966,142 },{ 185,27 }}, // Finnish/Latin/Finland
+       {    37,     7,    74,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/France
+       {    37,     7,     3,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Algeria
+       {    37,     7,    21,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Belgium
+       {    37,     7,    23,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Benin
+       {    37,     7,    34,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Burkina Faso
+       {    37,     7,    35,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Burundi
+       {    37,     7,    37,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Cameroon
+       {    37,     7,    38,{ 1248,58 },{ 1306,82 },{ 185,27 },{ 1248,58 },{ 1306,82 },{ 185,27 }}, // French/Latin/Canada
+       {    37,     7,    41,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Central African Republic
+       {    37,     7,    42,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Chad
+       {    37,     7,    48,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Comoros
+       {    37,     7,    49,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Congo Kinshasa
+       {    37,     7,    50,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Congo Brazzaville
+       {    37,     7,    53,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Ivory Coast
+       {    37,     7,    59,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Djibouti
+       {    37,     7,    66,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Equatorial Guinea
+       {    37,     7,    76,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/French Guiana
+       {    37,     7,    77,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/French Polynesia
+       {    37,     7,    79,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Gabon
+       {    37,     7,    88,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Guadeloupe
+       {    37,     7,    91,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Guinea
+       {    37,     7,    94,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Haiti
+       {    37,     7,   125,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Luxembourg
+       {    37,     7,   128,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Madagascar
+       {    37,     7,   132,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Mali
+       {    37,     7,   135,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Martinique
+       {    37,     7,   136,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Mauritania
+       {    37,     7,   137,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Mauritius
+       {    37,     7,   138,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Mayotte
+       {    37,     7,   142,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Monaco
+       {    37,     7,   145,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Morocco
+       {    37,     7,   153,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/New Caledonia
+       {    37,     7,   156,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Niger
+       {    37,     7,   176,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Reunion
+       {    37,     7,   179,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Rwanda
+       {    37,     7,   187,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Senegal
+       {    37,     7,   188,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Seychelles
+       {    37,     7,   200,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Saint Pierre And Miquelon
+       {    37,     7,   206,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Switzerland
+       {    37,     7,   207,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Syria
+       {    37,     7,   212,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Togo
+       {    37,     7,   216,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Tunisia
+       {    37,     7,   229,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Vanuatu
+       {    37,     7,   235,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Wallis And Futuna Islands
+       {    37,     7,   244,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Saint Barthelemy
+       {    37,     7,   245,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Saint Martin
+       {    38,     7,   151,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Western Frisian/Latin/Netherlands
+       {    39,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Gaelic/Latin/United Kingdom
+       {    40,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Galician/Latin/Spain
+       {    41,    15,    81,{ 1388,92 },{ 1388,92 },{ 185,27 },{ 1388,92 },{ 1388,92 },{ 185,27 }}, // Georgian/Georgian/Georgia
+       {    42,     7,    82,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Germany
+       {    42,     7,    14,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Austria
+       {    42,     7,    21,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Belgium
+       {    42,     7,   106,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Italy
+       {    42,     7,   123,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Liechtenstein
+       {    42,     7,   125,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Luxembourg
+       {    42,     7,   206,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Switzerland
+       {    43,    16,    85,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Greek/Greek/Greece
+       {    43,    16,    56,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Greek/Greek/Cyprus
+       {    44,     7,    86,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Greenlandic/Latin/Greenland
+       {    45,     7,   168,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Guarani/Latin/Paraguay
+       {    46,    17,   100,{ 1567,86 },{ 1567,86 },{ 185,27 },{ 1567,86 },{ 1567,86 },{ 185,27 }}, // Gujarati/Gujarati/India
+       {    47,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hausa/Latin/Nigeria
+       {    47,     1,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hausa/Arabic/Nigeria
+       {    47,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hausa/Latin/Ghana
+       {    47,     7,   156,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hausa/Latin/Niger
+       {    48,    18,   105,{ 1653,69 },{ 1653,69 },{ 185,27 },{ 1653,69 },{ 1653,69 },{ 185,27 }}, // Hebrew/Hebrew/Israel
+       {    49,    13,   100,{ 1722,82 },{ 1722,82 },{ 185,27 },{ 1722,82 },{ 1722,82 },{ 185,27 }}, // Hindi/Devanagari/India
+       {    50,     7,    98,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Hungarian/Latin/Hungary
+       {    51,     7,    99,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Icelandic/Latin/Iceland
+       {    52,     7,   101,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Indonesian/Latin/Indonesia
+       {    53,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Interlingua/Latin/World
+       {    55,    44,    38,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Inuktitut/Canadian Aboriginal/Canada
+       {    55,     7,    38,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Inuktitut/Latin/Canada
+       {    57,     7,   104,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Irish/Latin/Ireland
+       {    58,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Italian/Latin/Italy
+       {    58,     7,   184,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Italian/Latin/San Marino
+       {    58,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Italian/Latin/Switzerland
+       {    58,     7,   230,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Italian/Latin/Vatican City State
+       {    59,    19,   108,{ 1804,78 },{ 1804,78 },{ 185,27 },{ 1804,78 },{ 1804,78 },{ 185,27 }}, // Japanese/Japanese/Japan
+       {    60,     7,   101,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Javanese/Latin/Indonesia
+       {    61,    21,   100,{ 1882,93 },{ 1882,93 },{ 185,27 },{ 1882,93 },{ 1882,93 },{ 185,27 }}, // Kannada/Kannada/India
+       {    62,     1,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kashmiri/Arabic/India
+       {    63,     2,   110,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kazakh/Cyrillic/Kazakhstan
+       {    64,     7,   179,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kinyarwanda/Latin/Rwanda
+       {    65,     2,   116,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kirghiz/Cyrillic/Kyrgyzstan
+       {    66,    22,   114,{ 1975,55 },{ 1975,55 },{ 185,27 },{ 1975,55 },{ 1975,55 },{ 185,27 }}, // Korean/Korean/South Korea
+       {    66,    22,   113,{ 1975,55 },{ 1975,55 },{ 185,27 },{ 1975,55 },{ 1975,55 },{ 185,27 }}, // Korean/Korean/North Korea
+       {    67,     7,   217,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kurdish/Latin/Turkey
+       {    68,     7,    35,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Rundi/Latin/Burundi
+       {    69,    23,   117,{ 2030,80 },{ 2110,81 },{ 185,27 },{ 2191,80 },{ 2110,81 },{ 185,27 }}, // Lao/Lao/Laos
+       {    71,     7,   118,{ 2271,93 },{ 2271,93 },{ 185,27 },{ 2271,93 },{ 2271,93 },{ 185,27 }}, // Latvian/Latin/Latvia
+       {    72,     7,    49,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lingala/Latin/Congo Kinshasa
+       {    72,     7,     6,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lingala/Latin/Angola
+       {    72,     7,    41,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lingala/Latin/Central African Republic
+       {    72,     7,    50,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lingala/Latin/Congo Brazzaville
+       {    73,     7,   124,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lithuanian/Latin/Lithuania
+       {    74,     2,   127,{ 2364,80 },{ 2364,80 },{ 185,27 },{ 2364,80 },{ 2364,80 },{ 185,27 }}, // Macedonian/Cyrillic/Macedonia
+       {    75,     7,   128,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malagasy/Latin/Madagascar
+       {    76,     7,   130,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malay/Latin/Malaysia
+       {    76,     1,   130,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malay/Arabic/Malaysia
+       {    76,     7,    32,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malay/Latin/Brunei
+       {    76,     7,   190,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malay/Latin/Singapore
+       {    77,    24,   100,{ 2444,92 },{ 2444,92 },{ 2536,40 },{ 2444,92 },{ 2444,92 },{ 2536,40 }}, // Malayalam/Malayalam/India
+       {    78,     7,   133,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Maltese/Latin/Malta
+       {    79,     7,   154,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Maori/Latin/New Zealand
+       {    80,    13,   100,{ 2576,81 },{ 2576,81 },{ 2657,27 },{ 2576,81 },{ 2576,81 },{ 2657,27 }}, // Marathi/Devanagari/India
+       {    82,     2,   143,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mongolian/Cyrillic/Mongolia
+       {    82,     8,    44,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mongolian/Mongolian/China
+       {    84,    13,   150,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nepali/Devanagari/Nepal
+       {    84,    13,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nepali/Devanagari/India
+       {    85,     7,   161,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Norwegian Bokmal/Latin/Norway
+       {    85,     7,   203,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
+       {    86,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Occitan/Latin/France
+       {    87,    26,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Oriya/Oriya/India
+       {    88,     1,     1,{ 2684,63 },{ 2684,63 },{ 185,27 },{ 2684,63 },{ 2684,63 },{ 185,27 }}, // Pashto/Arabic/Afghanistan
+       {    88,     1,   163,{ 2684,63 },{ 2684,63 },{ 185,27 },{ 2684,63 },{ 2684,63 },{ 185,27 }}, // Pashto/Arabic/Pakistan
+       {    89,     1,   102,{ 2747,67 },{ 2747,67 },{ 2814,24 },{ 2747,67 },{ 2747,67 },{ 2814,24 }}, // Persian/Arabic/Iran
+       {    89,     1,     1,{ 2747,67 },{ 2747,67 },{ 2838,24 },{ 2747,67 },{ 2862,57 },{ 2814,24 }}, // Persian/Arabic/Afghanistan
+       {    90,     7,   172,{ 2919,84 },{ 2919,84 },{ 185,27 },{ 2919,84 },{ 2919,84 },{ 185,27 }}, // Polish/Latin/Poland
+       {    91,     7,    30,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Brazil
+       {    91,     7,     6,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Angola
+       {    91,     7,    39,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Cape Verde
+       {    91,     7,    62,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/East Timor
+       {    91,     7,    66,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Equatorial Guinea
+       {    91,     7,    92,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Guinea Bissau
+       {    91,     7,   125,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Luxembourg
+       {    91,     7,   126,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Macau
+       {    91,     7,   146,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Mozambique
+       {    91,     7,   173,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Portugal
+       {    91,     7,   185,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Sao Tome And Principe
+       {    91,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Switzerland
+       {    92,     4,   100,{ 3003,78 },{ 3003,78 },{ 185,27 },{ 3003,78 },{ 3003,78 },{ 185,27 }}, // Punjabi/Gurmukhi/India
+       {    92,     1,   163,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Punjabi/Arabic/Pakistan
+       {    93,     7,   169,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Quechua/Latin/Peru
+       {    93,     7,    26,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Quechua/Latin/Bolivia
+       {    93,     7,    63,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Quechua/Latin/Ecuador
+       {    94,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Romansh/Latin/Switzerland
+       {    95,     7,   177,{ 3081,86 },{ 3081,86 },{ 185,27 },{ 3081,86 },{ 3081,86 },{ 185,27 }}, // Romanian/Latin/Romania
+       {    95,     7,   141,{ 3081,86 },{ 3081,86 },{ 185,27 },{ 3081,86 },{ 3081,86 },{ 185,27 }}, // Romanian/Latin/Moldova
+       {    96,     2,   178,{ 3167,81 },{ 3167,81 },{ 185,27 },{ 3167,81 },{ 3167,81 },{ 185,27 }}, // Russian/Cyrillic/Russia
+       {    96,     2,    20,{ 3167,81 },{ 3167,81 },{ 185,27 },{ 3167,81 },{ 3167,81 },{ 185,27 }}, // Russian/Cyrillic/Belarus
+       {    96,     2,   110,{ 3167,81 },{ 3167,81 },{ 185,27 },{ 3167,81 },{ 3167,81 },{ 185,27 }}, // Russian/Cyrillic/Kazakhstan
+       {    96,     2,   116,{ 3167,81 },{ 3167,81 },{ 185,27 },{ 3167,81 },{ 3167,81 },{ 185,27 }}, // Russian/Cyrillic/Kyrgyzstan
+       {    96,     2,   141,{ 3167,81 },{ 3167,81 },{ 185,27 },{ 3167,81 },{ 3167,81 },{ 185,27 }}, // Russian/Cyrillic/Moldova
+       {    96,     2,   222,{ 3167,81 },{ 3167,81 },{ 185,27 },{ 3167,81 },{ 3167,81 },{ 185,27 }}, // Russian/Cyrillic/Ukraine
+       {    98,     7,    41,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sango/Latin/Central African Republic
+       {    99,    13,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sanskrit/Devanagari/India
+       {   100,     2,   243,{ 3248,81 },{ 3248,81 },{ 185,27 },{ 3248,81 },{ 3248,81 },{ 185,27 }}, // Serbian/Cyrillic/Serbia
+       {   100,     7,    27,{ 3329,81 },{ 3329,81 },{ 185,27 },{ 3329,81 },{ 3329,81 },{ 185,27 }}, // Serbian/Latin/Bosnia And Herzegowina
+       {   100,     7,   242,{ 3329,81 },{ 3329,81 },{ 185,27 },{ 3329,81 },{ 3329,81 },{ 185,27 }}, // Serbian/Latin/Montenegro
+       {   100,     7,   243,{ 3329,81 },{ 3329,81 },{ 185,27 },{ 3329,81 },{ 3329,81 },{ 185,27 }}, // Serbian/Latin/Serbia
+       {   100,     2,    27,{ 3248,81 },{ 3248,81 },{ 185,27 },{ 3248,81 },{ 3248,81 },{ 185,27 }}, // Serbian/Cyrillic/Bosnia And Herzegowina
+       {   100,     2,   242,{ 3248,81 },{ 3248,81 },{ 185,27 },{ 3248,81 },{ 3248,81 },{ 185,27 }}, // Serbian/Cyrillic/Montenegro
+       {   100,     2,   257,{ 3248,81 },{ 3248,81 },{ 185,27 },{ 3248,81 },{ 3248,81 },{ 185,27 }}, // Serbian/Cyrillic/Kosovo
+       {   100,     7,   257,{ 3329,81 },{ 3329,81 },{ 185,27 },{ 3329,81 },{ 3329,81 },{ 185,27 }}, // Serbian/Latin/Kosovo
+       {   101,     2,    81,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ossetic/Cyrillic/Georgia
+       {   101,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ossetic/Cyrillic/Russia
+       {   102,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Southern Sotho/Latin/South Africa
+       {   103,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tswana/Latin/South Africa
+       {   104,     7,   240,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Shona/Latin/Zimbabwe
+       {   105,     1,   163,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sindhi/Arabic/Pakistan
+       {   106,    32,   198,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sinhala/Sinhala/Sri Lanka
+       {   107,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swati/Latin/South Africa
+       {   108,     7,   191,{ 600,82 },{ 600,82 },{ 185,27 },{ 600,82 },{ 600,82 },{ 185,27 }}, // Slovak/Latin/Slovakia
+       {   109,     7,   192,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Slovenian/Latin/Slovenia
+       {   110,     7,   194,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Somali/Latin/Somalia
+       {   110,     7,    59,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Somali/Latin/Djibouti
+       {   110,     7,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Somali/Latin/Ethiopia
+       {   110,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Somali/Latin/Kenya
+       {   111,     7,   197,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Spain
+       {   111,     7,    10,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Argentina
+       {   111,     7,    22,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Belize
+       {   111,     7,    26,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Bolivia
+       {   111,     7,    30,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Brazil
+       {   111,     7,    43,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Chile
+       {   111,     7,    47,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Colombia
+       {   111,     7,    52,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Costa Rica
+       {   111,     7,    55,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Cuba
+       {   111,     7,    61,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Dominican Republic
+       {   111,     7,    63,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Ecuador
+       {   111,     7,    65,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/El Salvador
+       {   111,     7,    66,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Equatorial Guinea
+       {   111,     7,    90,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Guatemala
+       {   111,     7,    96,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Honduras
+       {   111,     7,   139,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Mexico
+       {   111,     7,   155,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Nicaragua
+       {   111,     7,   166,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Panama
+       {   111,     7,   168,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Paraguay
+       {   111,     7,   169,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Peru
+       {   111,     7,   170,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Philippines
+       {   111,     7,   174,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Puerto Rico
+       {   111,     7,   225,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/United States
+       {   111,     7,   227,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Uruguay
+       {   111,     7,   231,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Venezuela
+       {   111,     7,   238,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Canary Islands
+       {   111,     7,   246,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Latin America
+       {   111,     7,   250,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Ceuta And Melilla
+       {   113,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swahili/Latin/Tanzania
+       {   113,     7,    49,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swahili/Latin/Congo Kinshasa
+       {   113,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swahili/Latin/Kenya
+       {   113,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swahili/Latin/Uganda
+       {   114,     7,   205,{ 3410,84 },{ 3410,84 },{ 185,27 },{ 3494,84 },{ 3494,84 },{ 185,27 }}, // Swedish/Latin/Sweden
+       {   114,     7,    73,{ 3410,84 },{ 3410,84 },{ 185,27 },{ 3494,84 },{ 3494,84 },{ 185,27 }}, // Swedish/Latin/Finland
+       {   114,     7,   248,{ 3410,84 },{ 3410,84 },{ 185,27 },{ 3494,84 },{ 3494,84 },{ 185,27 }}, // Swedish/Latin/Aland Islands
+       {   115,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sardinian/Latin/Italy
+       {   116,     2,   209,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tajik/Cyrillic/Tajikistan
+       {   117,    27,   100,{ 3578,64 },{ 3642,94 },{ 185,27 },{ 3578,64 },{ 3642,94 },{ 185,27 }}, // Tamil/Tamil/India
+       {   117,    27,   130,{ 3578,64 },{ 3642,94 },{ 185,27 },{ 3578,64 },{ 3642,94 },{ 185,27 }}, // Tamil/Tamil/Malaysia
+       {   117,    27,   190,{ 3578,64 },{ 3642,94 },{ 185,27 },{ 3578,64 },{ 3642,94 },{ 185,27 }}, // Tamil/Tamil/Singapore
+       {   117,    27,   198,{ 3578,64 },{ 3642,94 },{ 185,27 },{ 3578,64 },{ 3642,94 },{ 185,27 }}, // Tamil/Tamil/Sri Lanka
+       {   118,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tatar/Cyrillic/Russia
+       {   119,    28,   100,{ 3736,89 },{ 3736,89 },{ 185,27 },{ 3736,89 },{ 3736,89 },{ 185,27 }}, // Telugu/Telugu/India
+       {   120,    30,   211,{ 3825,99 },{ 3825,99 },{ 185,27 },{ 3825,99 },{ 3825,99 },{ 185,27 }}, // Thai/Thai/Thailand
+       {   121,    31,    44,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tibetan/Tibetan/China
+       {   121,    31,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tibetan/Tibetan/India
+       {   122,    14,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tigrinya/Ethiopic/Ethiopia
+       {   122,    14,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tigrinya/Ethiopic/Eritrea
+       {   123,     7,   214,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tongan/Latin/Tonga
+       {   124,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tsonga/Latin/South Africa
+       {   125,     7,   217,{ 3924,81 },{ 3924,81 },{ 185,27 },{ 3924,81 },{ 3924,81 },{ 185,27 }}, // Turkish/Latin/Turkey
+       {   125,     7,    56,{ 3924,81 },{ 3924,81 },{ 185,27 },{ 3924,81 },{ 3924,81 },{ 185,27 }}, // Turkish/Latin/Cyprus
+       {   126,     7,   218,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Turkmen/Latin/Turkmenistan
+       {   128,     1,    44,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Uighur/Arabic/China
+       {   129,     2,   222,{ 4005,50 },{ 4055,81 },{ 185,27 },{ 4136,58 },{ 4055,81 },{ 185,27 }}, // Ukrainian/Cyrillic/Ukraine
+       {   130,     1,   163,{ 4194,67 },{ 4194,67 },{ 185,27 },{ 4194,67 },{ 4194,67 },{ 185,27 }}, // Urdu/Arabic/Pakistan
+       {   130,     1,   100,{ 4194,67 },{ 4194,67 },{ 185,27 },{ 4194,67 },{ 4194,67 },{ 185,27 }}, // Urdu/Arabic/India
+       {   131,     7,   228,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Uzbek/Latin/Uzbekistan
+       {   131,     1,     1,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Uzbek/Arabic/Afghanistan
+       {   131,     2,   228,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Uzbek/Cyrillic/Uzbekistan
+       {   132,     7,   232,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Vietnamese/Latin/Vietnam
+       {   133,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Volapuk/Latin/World
+       {   134,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Welsh/Latin/United Kingdom
+       {   135,     7,   187,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Wolof/Latin/Senegal
+       {   136,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Xhosa/Latin/South Africa
+       {   137,    18,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Yiddish/Hebrew/World
+       {   138,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Yoruba/Latin/Nigeria
+       {   138,     7,    23,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Yoruba/Latin/Benin
+       {   140,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Zulu/Latin/South Africa
+       {   141,     7,   161,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Norwegian Nynorsk/Latin/Norway
+       {   142,     7,    27,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bosnian/Latin/Bosnia And Herzegowina
+       {   142,     2,    27,{ 3248,81 },{ 3248,81 },{ 185,27 },{ 3248,81 },{ 3248,81 },{ 185,27 }}, // Bosnian/Cyrillic/Bosnia And Herzegowina
+       {   143,    29,   131,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Divehi/Thaana/Maldives
+       {   144,     7,   251,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Manx/Latin/Isle Of Man
+       {   145,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Cornish/Latin/United Kingdom
+       {   146,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Akan/Latin/Ghana
+       {   147,    13,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Konkani/Devanagari/India
+       {   148,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ga/Latin/Ghana
+       {   149,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Igbo/Latin/Nigeria
+       {   150,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kamba/Latin/Kenya
+       {   151,    33,   103,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Syriac/Syriac/Iraq
+       {   152,    14,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Blin/Ethiopic/Eritrea
+       {   153,    14,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Geez/Ethiopic/Ethiopia
+       {   155,     7,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sidamo/Latin/Ethiopia
+       {   156,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Atsam/Latin/Nigeria
+       {   157,    14,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tigre/Ethiopic/Eritrea
+       {   158,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Jju/Latin/Nigeria
+       {   159,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Friulian/Latin/Italy
+       {   160,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Venda/Latin/South Africa
+       {   161,     7,    83,{ 4261,48 },{ 4309,87 },{ 185,27 },{ 4261,48 },{ 4309,87 },{ 185,27 }}, // Ewe/Latin/Ghana
+       {   161,     7,   212,{ 4261,48 },{ 4309,87 },{ 185,27 },{ 4261,48 },{ 4309,87 },{ 185,27 }}, // Ewe/Latin/Togo
+       {   162,    14,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Walamo/Ethiopic/Ethiopia
+       {   163,     7,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hawaiian/Latin/United States
+       {   164,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tyap/Latin/Nigeria
+       {   165,     7,   129,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nyanja/Latin/Malawi
+       {   166,     7,   170,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Filipino/Latin/Philippines
+       {   167,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swiss German/Latin/Switzerland
+       {   167,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swiss German/Latin/France
+       {   167,     7,   123,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swiss German/Latin/Liechtenstein
+       {   168,    34,    44,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sichuan Yi/Yi/China
+       {   169,     7,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kpelle/Latin/Liberia
+       {   170,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Low German/Latin/Germany
+       {   170,     7,   151,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Low German/Latin/Netherlands
+       {   171,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // South Ndebele/Latin/South Africa
+       {   172,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Sotho/Latin/South Africa
+       {   173,     7,   161,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Sami/Latin/Norway
+       {   173,     7,    73,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Sami/Latin/Finland
+       {   173,     7,   205,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Sami/Latin/Sweden
+       {   174,     7,   208,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Taroko/Latin/Taiwan
+       {   175,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Gusii/Latin/Kenya
+       {   176,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Taita/Latin/Kenya
+       {   177,     7,   187,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Senegal
+       {   177,     7,    34,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Burkina Faso
+       {   177,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Cameroon
+       {   177,     7,    80,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Gambia
+       {   177,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Ghana
+       {   177,     7,    91,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Guinea
+       {   177,     7,    92,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Guinea Bissau
+       {   177,     7,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Liberia
+       {   177,     7,   136,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Mauritania
+       {   177,     7,   156,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Niger
+       {   177,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Nigeria
+       {   177,     7,   189,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Sierra Leone
+       {   177,   134,    91,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Adlam/Guinea
+       {   178,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kikuyu/Latin/Kenya
+       {   179,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Samburu/Latin/Kenya
+       {   180,     7,   146,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sena/Latin/Mozambique
+       {   181,     7,   240,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // North Ndebele/Latin/Zimbabwe
+       {   182,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Rombo/Latin/Tanzania
+       {   183,     9,   145,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tachelhit/Tifinagh/Morocco
+       {   183,     7,   145,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tachelhit/Latin/Morocco
+       {   184,     7,     3,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kabyle/Latin/Algeria
+       {   185,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nyankole/Latin/Uganda
+       {   186,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bena/Latin/Tanzania
+       {   187,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Vunjo/Latin/Tanzania
+       {   188,     7,   132,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bambara/Latin/Mali
+       {   188,    75,   132,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bambara/Nko/Mali
+       {   189,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Embu/Latin/Kenya
+       {   190,    12,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Cherokee/Cherokee/United States
+       {   191,     7,   137,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Morisyen/Latin/Mauritius
+       {   192,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Makonde/Latin/Tanzania
+       {   193,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Langi/Latin/Tanzania
+       {   194,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ganda/Latin/Uganda
+       {   195,     7,   239,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bemba/Latin/Zambia
+       {   196,     7,    39,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kabuverdianu/Latin/Cape Verde
+       {   197,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Meru/Latin/Kenya
+       {   198,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kalenjin/Latin/Kenya
+       {   199,     7,   148,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nama/Latin/Namibia
+       {   200,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Machame/Latin/Tanzania
+       {   201,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Colognian/Latin/Germany
+       {   202,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Masai/Latin/Kenya
+       {   202,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Masai/Latin/Tanzania
+       {   203,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Soga/Latin/Uganda
+       {   204,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Luyia/Latin/Kenya
+       {   205,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Asu/Latin/Tanzania
+       {   206,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Teso/Latin/Uganda
+       {   206,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Teso/Latin/Kenya
+       {   207,     7,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Saho/Latin/Eritrea
+       {   208,     7,   132,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Koyra Chiini/Latin/Mali
+       {   209,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Rwa/Latin/Tanzania
+       {   210,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Luo/Latin/Kenya
+       {   211,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Chiga/Latin/Uganda
+       {   212,     7,   145,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Central Morocco Tamazight/Latin/Morocco
+       {   213,     7,   132,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Koyraboro Senni/Latin/Mali
+       {   214,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Shambala/Latin/Tanzania
+       {   215,    13,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bodo/Devanagari/India
+       {   218,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Chechen/Cyrillic/Russia
+       {   219,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Church/Cyrillic/Russia
+       {   220,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Chuvash/Cyrillic/Russia
+       {   230,     7,    49,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Luba Katanga/Latin/Congo Kinshasa
+       {   231,     7,   125,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Luxembourgish/Latin/Luxembourg
+       {   236,     7,    21,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Walloon/Latin/Belgium
+       {   237,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Aghem/Latin/Cameroon
+       {   238,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Basaa/Latin/Cameroon
+       {   239,     7,   156,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Zarma/Latin/Niger
+       {   240,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Duala/Latin/Cameroon
+       {   241,     7,   187,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Jola Fonyi/Latin/Senegal
+       {   242,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ewondo/Latin/Cameroon
+       {   243,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bafia/Latin/Cameroon
+       {   244,     7,   146,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Makhuwa Meetto/Latin/Mozambique
+       {   245,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mundang/Latin/Cameroon
+       {   246,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kwasio/Latin/Cameroon
+       {   247,     7,   254,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nuer/Latin/South Sudan
+       {   248,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sakha/Cyrillic/Russia
+       {   249,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sangu/Latin/Tanzania
+       {   251,     7,   156,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tasawaq/Latin/Niger
+       {   252,    35,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Vai/Vai/Liberia
+       {   252,     7,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Vai/Latin/Liberia
+       {   253,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Walser/Latin/Switzerland
+       {   254,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Yangben/Latin/Cameroon
+       {   256,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Asturian/Latin/Spain
+       {   257,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ngomba/Latin/Cameroon
+       {   258,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kako/Latin/Cameroon
+       {   259,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Meta/Latin/Cameroon
+       {   260,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ngiemboon/Latin/Cameroon
+       {   290,    11,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Manipuri/Bengali/India
+       {   309,   100,   232,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tai Dam/Tai Viet/Vietnam
+       {   312,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Akoose/Latin/Cameroon
+       {   313,     7,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lakota/Latin/United States
+       {   314,     9,   145,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Standard Moroccan Tamazight/Tifinagh/Morocco
+       {   315,     7,    43,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mapuche/Latin/Chile
+       {   316,     1,   103,{ 4396,102 },{ 4396,102 },{ 185,27 },{ 4396,102 },{ 4396,102 },{ 185,27 }}, // Central Kurdish/Arabic/Iraq
+       {   316,     1,   102,{ 4396,102 },{ 4396,102 },{ 185,27 },{ 4396,102 },{ 4396,102 },{ 185,27 }}, // Central Kurdish/Arabic/Iran
+       {   317,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lower Sorbian/Latin/Germany
+       {   318,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Upper Sorbian/Latin/Germany
+       {   319,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kenyang/Latin/Cameroon
+       {   320,     7,    38,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mohawk/Latin/Canada
+       {   321,    75,    91,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nko/Nko/Guinea
+       {   322,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Prussian/Latin/World
+       {   323,     7,    90,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kiche/Latin/Guatemala
+       {   324,     7,   205,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Southern Sami/Latin/Sweden
+       {   325,     7,   205,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lule Sami/Latin/Sweden
+       {   326,     7,    73,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Inari Sami/Latin/Finland
+       {   327,     7,    73,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Skolt Sami/Latin/Finland
+       {   328,     7,    13,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Warlpiri/Latin/Australia
+       {   346,     1,   102,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mazanderani/Arabic/Iran
+       {   349,     1,   102,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Luri/Arabic/Iran
+       {   349,     1,   103,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Luri/Arabic/Iraq
+       {   357,     6,    97,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Cantonese/Traditional Han/Hong Kong
+       {   357,     5,    44,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Cantonese/Simplified Han/China
+       {   360,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ido/Latin/World
+       {   361,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lojban/Latin/World
+       {   362,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sicilian/Latin/Italy
+       {   363,     1,   102,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Southern Kurdish/Arabic/Iran
+       {   364,     1,   163,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Western Balochi/Arabic/Pakistan
+       {   365,     7,   170,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Cebuano/Latin/Philippines
+       {   366,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Erzya/Cyrillic/Russia
+       {     0,     0,     0,{  0,0},{  0,0},{  0,0},{  0,0},{  0,0},{  0,0}}, // trailing zeros
+};
+
+static const ushort months_data[] = {
+0x46, 0x61, 0x72, 0x3b, 0x4f, 0x72, 0x64, 0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x3b,
+0x53, 0x68, 0x61, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x41, 0x62, 0x61, 0x3b, 0x41, 0x7a, 0x61, 0x3b, 0x44, 0x65, 0x79, 0x3b,
+0x42, 0x61, 0x68, 0x3b, 0x45, 0x73, 0x66, 0x3b, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72,
+0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69,
+0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d,
+0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61,
+0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x46, 0x3b, 0x4f, 0x3b, 0x4b, 0x3b, 0x54, 0x3b,
+0x4d, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x31, 0x3b, 0x32, 0x3b,
+0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b,
+0x31, 0x32, 0x3b, 0x31, 0x33, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38,
+0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x641, 0x631, 0x641, 0x631, 0x62f, 0x646, 0x3b, 0x623,
+0x630, 0x631, 0x628, 0x64a, 0x647, 0x634, 0x62a, 0x3b, 0x62e, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x62a, 0x627, 0x631, 0x3b, 0x645, 0x631,
+0x62f, 0x627, 0x62f, 0x3b, 0x634, 0x647, 0x631, 0x641, 0x627, 0x631, 0x3b, 0x645, 0x647, 0x631, 0x3b, 0x622, 0x64a, 0x627, 0x646, 0x3b,
+0x622, 0x630, 0x631, 0x3b, 0x62f, 0x64a, 0x3b, 0x628, 0x647, 0x645, 0x646, 0x3b, 0x627, 0x633, 0x641, 0x646, 0x62f, 0x627, 0x631, 0x3b,
+0x9ab, 0x9cd, 0x9af, 0x9be, 0x9ad, 0x9be, 0x9b0, 0x9cd, 0x9a1, 0x9bf, 0x9a8, 0x3b, 0x985, 0x9b0, 0x9a1, 0x9bf, 0x9ac, 0x9c7, 0x9b9, 0x9c7,
+0x9b6, 0x9cd, 0x9a4, 0x3b, 0x996, 0x9cb, 0x9b0, 0x9cd, 0x9a6, 0x9cd, 0x9a6, 0x3b, 0x9a4, 0x9c0, 0x9b0, 0x3b, 0x9ae, 0x9b0, 0x9cd, 0x9af,
+0x9be, 0x9a6, 0x3b, 0x9b6, 0x9be, 0x9b9, 0x9b0, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ae, 0x9c7, 0x9b9, 0x9c7, 0x9b0, 0x3b, 0x986, 0x9ac,
+0x9be, 0x9a8, 0x3b, 0x986, 0x99c, 0x9be, 0x9b0, 0x3b, 0x9a6, 0x9c7, 0x3b, 0x9ac, 0x9be, 0x9b9, 0x9ae, 0x9be, 0x9a8, 0x3b, 0x98f, 0x9b8,
+0x9ab, 0x9cd, 0x9af, 0x9be, 0x9a8, 0x9cd, 0x9a1, 0x3b, 0x9ab, 0x9cd, 0x9af, 0x9be, 0x9ad, 0x9be, 0x9b0, 0x9cd, 0x9a1, 0x9bf, 0x9a8, 0x3b,
+0x985, 0x9b0, 0x9a1, 0x9bf, 0x9ac, 0x9c7, 0x9b9, 0x9c7, 0x9b6, 0x9cd, 0x9a4, 0x3b, 0x996, 0x9cb, 0x9b0, 0x9cd, 0x9a6, 0x9cd, 0x9a6, 0x3b,
+0x9a4, 0x9c0, 0x9b0, 0x3b, 0x9ae, 0x9b0, 0x9cd, 0x9af, 0x9be, 0x9a6, 0x3b, 0x9b6, 0x9be, 0x9b9, 0x9b0, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b,
+0x9ae, 0x9c7, 0x9b9, 0x9c7, 0x9b0, 0x3b, 0x986, 0x9ac, 0x9be, 0x9a8, 0x3b, 0x9ac, 0x9be, 0x99c, 0x9be, 0x9b0, 0x3b, 0x9a6, 0x9c7, 0x3b,
+0x9ac, 0x9be, 0x9b9, 0x9ae, 0x9be, 0x9a8, 0x3b, 0x98f, 0x9b8, 0x9ab, 0x9cd, 0x9af, 0x9be, 0x9a8, 0x9cd, 0x9a1, 0x3b, 0x9e7, 0x3b, 0x9e8,
+0x3b, 0x9e9, 0x3b, 0x9ea, 0x3b, 0x9eb, 0x3b, 0x9ec, 0x3b, 0x9ed, 0x3b, 0x9ee, 0x3b, 0x9ef, 0x3b, 0x9e7, 0x9e6, 0x3b, 0x9e7, 0x9e7,
+0x3b, 0x9e7, 0x9e8, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36,
+0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31,
+0x32, 0x6708, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b, 0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708,
+0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708, 0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708,
+0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b, 0x37,
+0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e, 0x3b,
+0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74,
+0x3b, 0x63, 0x68, 0x6f, 0x72, 0x64, 0xe1, 0x64, 0x3b, 0x74, 0xed, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0xe1, 0x64, 0x3b,
+0x161, 0x61, 0x68, 0x72, 0xed, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0xe1, 0x62, 0xe1, 0x6e, 0x3b, 0xe1,
+0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x69, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e,
+0x64, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65,
+0x73, 0x68, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64,
+0x61, 0x64, 0x3b, 0x73, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0x61, 0x62,
+0x61, 0x6e, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65,
+0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69,
+0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d,
+0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b,
+0x61, 0x62, 0x61, 0x6e, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e,
+0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x6b, 0x75, 0x75,
+0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x6b, 0x75, 0x75, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64,
+0x61, 0x64, 0x6b, 0x75, 0x75, 0x3b, 0x74, 0x69, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x6b,
+0x75, 0x75, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x6b,
+0x75, 0x75, 0x3b, 0x61, 0x62, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x64,
+0x65, 0x79, 0x6b, 0x75, 0x75, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x73, 0x66, 0x61,
+0x6e, 0x64, 0x6b, 0x75, 0x75, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x6b, 0x75, 0x75, 0x74, 0x61,
+0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6b, 0x68, 0x6f,
+0x72, 0x64, 0x61, 0x64, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x74, 0x69, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d,
+0x6f, 0x72, 0x64, 0x61, 0x64, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x6b,
+0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x61, 0x62, 0x61, 0x6e, 0x6b,
+0x75, 0x75, 0x74, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x64, 0x65, 0x79, 0x6b, 0x75,
+0x75, 0x74, 0x61, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x65, 0x73, 0x66, 0x61,
+0x6e, 0x64, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x66, 0x61, 0x72, 0x2e, 0x3b, 0x6f, 0x72, 0x64, 0x2e, 0x3b, 0x6b, 0x68,
+0x6f, 0x2e, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x2e, 0x3b, 0x161, 0x61, 0x68, 0x2e, 0x3b, 0x6d, 0x65, 0x68,
+0x72, 0x3b, 0xe2, 0x62, 0xe2, 0x6e, 0x3b, 0xe2, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x2e,
+0x3b, 0x65, 0x73, 0x66, 0x2e, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69,
+0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d,
+0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b,
+0xe2, 0x62, 0xe2, 0x6e, 0x3b, 0xe2, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e,
+0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x46, 0x61, 0x72, 0x2e, 0x3b, 0x4f, 0x72, 0x64, 0x2e, 0x3b, 0x4b, 0x68,
+0x6f, 0x2e, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x2e, 0x3b, 0x160, 0x61, 0x68, 0x2e, 0x3b, 0x4d, 0x65, 0x68,
+0x72, 0x3b, 0xc2, 0x62, 0xe2, 0x2e, 0x3b, 0xc2, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x2e,
+0x3b, 0x45, 0x73, 0x66, 0x2e, 0x3b, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69,
+0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d,
+0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x160, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b,
+0xc2, 0x62, 0xe2, 0x6e, 0x3b, 0xc2, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e,
+0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x10e4, 0x10d0, 0x10e0, 0x10d5, 0x10d0, 0x10e0, 0x10d3, 0x10d8, 0x10dc, 0x10d8, 0x3b, 0x10dd,
+0x10e0, 0x10d3, 0x10d8, 0x10d1, 0x10d4, 0x10f0, 0x10d4, 0x10e8, 0x10d7, 0x10d8, 0x3b, 0x10ee, 0x10dd, 0x10e0, 0x10d3, 0x10d0, 0x10d3, 0x10d8, 0x3b, 0x10d7,
+0x10d8, 0x10e0, 0x10d8, 0x3b, 0x10db, 0x10dd, 0x10e0, 0x10d3, 0x10d0, 0x10d3, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10f0, 0x10e0, 0x10d8, 0x10d5, 0x10d0, 0x10e0,
+0x10d8, 0x3b, 0x10db, 0x10d4, 0x10f0, 0x10e0, 0x10d8, 0x3b, 0x10d0, 0x10d1, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10d0, 0x10d6, 0x10d0, 0x10e0, 0x10d8, 0x3b,
+0x10d3, 0x10d4, 0x10d8, 0x3b, 0x10d1, 0x10d0, 0x10f0, 0x10db, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10d4, 0x10e1, 0x10e4, 0x10d0, 0x10dc, 0x10d3, 0x10d8, 0x3b,
+0x46, 0x61, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x63,
+0x68, 0x74, 0x3b, 0x43, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x101,
+0x64, 0x3b, 0x53, 0x63, 0x68, 0x61, 0x68, 0x72, 0x69, 0x77, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x100, 0x62,
+0x101, 0x6e, 0x3b, 0x100, 0x73, 0x61, 0x72, 0x3b, 0x44, 0xe9, 0x69, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45,
+0x73, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0xaab, 0xabe, 0xab0, 0xacd, 0xab5, 0xabe, 0xab0, 0xacd, 0xaa6, 0xabf, 0xaa8, 0x3b, 0xa93,
+0xab0, 0xaa1, 0xac0, 0xaac, 0xac7, 0xab9, 0xac7, 0xab6, 0xacd, 0xa9f, 0x3b, 0xa96, 0xacb, 0xab0, 0xaa6, 0xabe, 0xaa6, 0x3b, 0xaa4, 0xabf,
+0xab0, 0x3b, 0xaae, 0xacb, 0xab0, 0xacd, 0xaa6, 0xabe, 0xaa6, 0x3b, 0xab6, 0xabe, 0xab9, 0xab0, 0xabf, 0xab5, 0xab0, 0x3b, 0xaae, 0xac7,
+0xab9, 0xab0, 0x3b, 0xa85, 0xaac, 0xabe, 0xaa8, 0x3b, 0xa85, 0xa9d, 0xabe, 0xab0, 0x3b, 0xaa1, 0xac7, 0xaaf, 0x3b, 0xaac, 0xabe, 0xab9,
+0xaae, 0xac7, 0xaa8, 0x3b, 0xa8f, 0xab8, 0xacd, 0xaab, 0xabe, 0xaa8, 0xacd, 0xaa1, 0x3b, 0x5e4, 0x5e8, 0x5d5, 0x5e8, 0x5d3, 0x5d9, 0x5df,
+0x3b, 0x5d0, 0x5e8, 0x5d3, 0x5d9, 0x5d1, 0x5d4, 0x5e9, 0x5ea, 0x3b, 0x5d7, 0x5f3, 0x5e8, 0x5d3, 0x5d0, 0x5d3, 0x3b, 0x5ea, 0x5d9, 0x5e8,
+0x3b, 0x5de, 0x5e8, 0x5d3, 0x5d0, 0x5d3, 0x3b, 0x5e9, 0x5d4, 0x5e8, 0x5d9, 0x5d5, 0x5e8, 0x3b, 0x5de, 0x5d4, 0x5e8, 0x3b, 0x5d0, 0x5d1,
+0x5d0, 0x5df, 0x3b, 0x5d0, 0x5d3, 0x5f3, 0x5e8, 0x3b, 0x5d3, 0x5d9, 0x3b, 0x5d1, 0x5d4, 0x5de, 0x5df, 0x3b, 0x5d0, 0x5e1, 0x5e4, 0x5e0,
+0x5d3, 0x3b, 0x92b, 0x930, 0x94d, 0x935, 0x93e, 0x926, 0x93f, 0x928, 0x3b, 0x913, 0x930, 0x94d, 0x926, 0x93f, 0x935, 0x947, 0x939, 0x947,
+0x938, 0x94d, 0x91f, 0x3b, 0x916, 0x94b, 0x930, 0x930, 0x94d, 0x926, 0x93e, 0x926, 0x3b, 0x91f, 0x93f, 0x930, 0x3b, 0x92e, 0x94b, 0x930,
+0x926, 0x93e, 0x926, 0x3b, 0x936, 0x93e, 0x939, 0x930, 0x940, 0x935, 0x930, 0x94d, 0x3b, 0x92e, 0x947, 0x939, 0x930, 0x3b, 0x905, 0x935,
+0x928, 0x3b, 0x905, 0x91c, 0x93c, 0x930, 0x3b, 0x921, 0x947, 0x3b, 0x92c, 0x939, 0x92e, 0x928, 0x3b, 0x908, 0x938, 0x94d, 0x92b, 0x928,
+0x94d, 0x926, 0x94d, 0x3b, 0x30d5, 0x30a1, 0x30eb, 0x30f4, 0x30a1, 0x30eb, 0x30c7, 0x30a3, 0x30fc, 0x30f3, 0x3b, 0x30aa, 0x30eb, 0x30c7, 0x30a3, 0x30fc,
+0x30d9, 0x30d8, 0x30b7, 0x30e5, 0x30c8, 0x3b, 0x30db, 0x30eb, 0x30c0, 0x30fc, 0x30c9, 0x3b, 0x30c6, 0x30a3, 0x30fc, 0x30eb, 0x3b, 0x30e2, 0x30eb, 0x30c0,
+0x30fc, 0x30c9, 0x3b, 0x30b7, 0x30e3, 0x30cf, 0x30ea, 0x30fc, 0x30f4, 0x30a1, 0x30eb, 0x3b, 0x30e1, 0x30d5, 0x30eb, 0x3b, 0x30a2, 0x30fc, 0x30d0, 0x30fc,
+0x30f3, 0x3b, 0x30a2, 0x30fc, 0x30b6, 0x30eb, 0x3b, 0x30c7, 0x30a4, 0x3b, 0x30d0, 0x30d5, 0x30de, 0x30f3, 0x3b, 0x30a8, 0x30b9, 0x30d5, 0x30a1, 0x30f3,
+0x30c9, 0x3b, 0xcab, 0xcb0, 0xccd, 0xcb5, 0xcb0, 0xccd, 0xca6, 0xcbf, 0xca8, 0xccd, 0x3b, 0xc93, 0xcb0, 0xccd, 0xca6, 0xcbf, 0xcac, 0xcc6,
+0xcb9, 0xcc6, 0xcb6, 0xccd, 0xc9f, 0xccd, 0x3b, 0xc96, 0xccb, 0xcb0, 0xccd, 0xca1, 0xcbe, 0xca6, 0xccd, 0x3b, 0xc9f, 0xcbf, 0xcb0, 0xccd,
+0x3b, 0xcae, 0xcca, 0xcb0, 0xccd, 0xca6, 0xcbe, 0xca6, 0xccd, 0x3b, 0xcb6, 0xcb9, 0xcb0, 0xcbf, 0xcb5, 0xcbe, 0xcb0, 0xccd, 0x3b, 0xcae,
+0xcc6, 0xcb9, 0xccd, 0xcb0, 0xccd, 0x3b, 0xc85, 0xcac, 0xca8, 0xccd, 0x3b, 0xc85, 0xc9d, 0xcb0, 0xccd, 0x3b, 0xca1, 0xcc7, 0x3b, 0xcac,
+0xcb9, 0xccd, 0xcae, 0xca8, 0xccd, 0x3b, 0xc8e, 0xcb8, 0xccd, 0xcab, 0xcbe, 0xc82, 0xca1, 0xccd, 0x3b, 0xd654, 0xb974, 0xbc14, 0xb518, 0x3b,
+0xc624, 0xb974, 0xb514, 0xbca0, 0xd5e4, 0xc26c, 0xd2b8, 0x3b, 0xd638, 0xb974, 0xb2e4, 0xb4dc, 0x3b, 0xd2f0, 0xb974, 0x3b, 0xbaa8, 0xb974, 0xb2e4, 0xb4dc,
+0x3b, 0xc0e4, 0xd750, 0xb9ac, 0xbc14, 0xb974, 0x3b, 0xba54, 0xd750, 0xb974, 0x3b, 0xc544, 0xbc18, 0x3b, 0xc544, 0xc790, 0xb974, 0x3b, 0xb2e4, 0xc774,
+0x3b, 0xbc14, 0xd750, 0xb9cc, 0x3b, 0xc5d0, 0xc2a4, 0xd310, 0xb4dc, 0x3b, 0xe9f, 0xea3, 0xeb2, 0xea7, 0xeb2, 0xe94, 0xeb4, 0xe99, 0x3b, 0xead,
+0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xeae, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xec1, 0xe95,
+0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xea5, 0xeb4, 0xea7, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeb5,
+0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b, 0xe9a, 0xea3, 0xeb2, 0xea1,
+0xeb2, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0x3b, 0xe9f, 0xea3, 0xeb2, 0xea7, 0xeb2, 0xe94, 0xeb4, 0xe99, 0x3b, 0xead,
+0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xea3, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xec1, 0xe95,
+0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xeab, 0xeb4, 0xea7, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeb5,
+0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0xea3, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b, 0xe9a, 0xea3, 0xeb2,
+0xec1, 0xea1, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0x3b, 0xe9f, 0xeb2, 0xea3, 0xea7, 0xeb2, 0xe94, 0xeb4, 0xe99, 0x3b,
+0xead, 0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xea3, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xec1,
+0xe95, 0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xeab, 0xeb4, 0xea7, 0xeb2, 0x3b, 0xec0, 0xea1,
+0xeb5, 0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b, 0xe9a, 0xea3, 0xeb2,
+0xea1, 0xeb2, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x12b, 0x6e,
+0x73, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x73, 0x3b, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64,
+0x73, 0x3b, 0x74, 0x12b, 0x72, 0x73, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x73, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69,
+0x76, 0x113, 0x72, 0x73, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x73, 0x3b, 0x61, 0x62, 0x61, 0x6e, 0x73, 0x3b, 0x61, 0x7a, 0x65,
+0x72, 0x73, 0x3b, 0x64, 0x65, 0x6a, 0x73, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x73, 0x3b, 0x65, 0x73, 0x66, 0x61,
+0x6e, 0x64, 0x73, 0x3b, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x438, 0x43d, 0x3b, 0x43e, 0x440, 0x434, 0x438, 0x431, 0x435,
+0x445, 0x435, 0x448, 0x442, 0x3b, 0x43a, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x442, 0x438, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x434,
+0x430, 0x434, 0x3b, 0x448, 0x430, 0x445, 0x440, 0x438, 0x432, 0x430, 0x440, 0x3b, 0x43c, 0x435, 0x440, 0x3b, 0x430, 0x431, 0x430, 0x43d,
+0x3b, 0x430, 0x437, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x458, 0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x435, 0x441, 0x444,
+0x430, 0x43d, 0x434, 0x3b, 0xd2b, 0xd7c, 0xd35, 0xd3e, 0xd7c, 0xd26, 0xd3f, 0xd7b, 0x3b, 0xd13, 0xd7c, 0xd21, 0xd3f, 0xd2c, 0xd46, 0xd39,
+0xd46, 0xd37, 0xd4d, 0x200c, 0xd31, 0xd4d, 0xd31, 0xd4d, 0x3b, 0xd16, 0xd4b, 0xd7c, 0xd26, 0xd3e, 0xd26, 0xd4d, 0x3b, 0xd1f, 0xd3f, 0xd7c,
+0x3b, 0xd2e, 0xd4b, 0xd7c, 0xd26, 0xd3e, 0xd26, 0xd4d, 0x3b, 0xd37, 0xd39, 0xd4d, 0x200c, 0xd30, 0xd3f, 0xd35, 0xd3e, 0xd7c, 0x3b, 0xd2e,
+0xd46, 0xd39, 0xd7c, 0x3b, 0xd05, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd05, 0xd38, 0xd7c, 0x3b, 0xd21, 0xd46, 0xd2f, 0xd4d, 0x3b, 0xd2c, 0xd39,
+0xd4d, 0x200c, 0xd2e, 0xd3e, 0xd7b, 0x3b, 0xd0e, 0xd38, 0xd4d, 0x200c, 0xd2b, 0xd3e, 0xd7b, 0xd21, 0xd4d, 0x3b, 0xd2b, 0x2e, 0x3b, 0xd13,
+0x2e, 0x3b, 0xd16, 0xd4b, 0x3b, 0xd1f, 0xd3f, 0x2e, 0x3b, 0xd2e, 0xd4b, 0x2e, 0x3b, 0xd37, 0x2e, 0x3b, 0xd2e, 0xd46, 0x2e, 0x3b,
+0xd05, 0x2e, 0x3b, 0xd05, 0x2e, 0x3b, 0xd21, 0xd46, 0x2e, 0x3b, 0xd2c, 0x2e, 0x3b, 0xd0e, 0x2e, 0x3b, 0x92b, 0x930, 0x935, 0x930,
+0x926, 0x93f, 0x928, 0x3b, 0x913, 0x930, 0x94d, 0x926, 0x93f, 0x92c, 0x947, 0x939, 0x947, 0x936, 0x94d, 0x924, 0x3b, 0x916, 0x94b, 0x930,
+0x926, 0x93e, 0x926, 0x3b, 0x924, 0x93f, 0x930, 0x3b, 0x92e, 0x94b, 0x930, 0x926, 0x93e, 0x926, 0x3b, 0x936, 0x93e, 0x939, 0x930, 0x940,
+0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x947, 0x939, 0x947, 0x930, 0x3b, 0x905, 0x92c, 0x93e, 0x928, 0x3b, 0x905, 0x91d, 0x93e, 0x930, 0x3b,
+0x926, 0x947, 0x3b, 0x92c, 0x93e, 0x939, 0x92e, 0x93e, 0x928, 0x3b, 0x90f, 0x938, 0x92b, 0x93e, 0x902, 0x926, 0x3b, 0x967, 0x3b, 0x968,
+0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b, 0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967,
+0x3b, 0x967, 0x968, 0x3b, 0x648, 0x631, 0x6cc, 0x3b, 0x63a, 0x648, 0x6cc, 0x6cc, 0x3b, 0x63a, 0x628, 0x631, 0x6af, 0x648, 0x644, 0x6cc,
+0x3b, 0x686, 0x646, 0x6af, 0x627, 0x69a, 0x3b, 0x632, 0x645, 0x631, 0x6cc, 0x3b, 0x648, 0x696, 0x6cc, 0x3b, 0x62a, 0x644, 0x647, 0x3b,
+0x644, 0x693, 0x645, 0x3b, 0x644, 0x6cc, 0x646, 0x62f, 0x6cd, 0x3b, 0x645, 0x631, 0x63a, 0x648, 0x645, 0x6cc, 0x3b, 0x633, 0x644, 0x648,
+0x627, 0x63a, 0x647, 0x3b, 0x6a9, 0x628, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x62f, 0x6cc, 0x646, 0x3b, 0x627, 0x631, 0x62f, 0x6cc, 0x628,
+0x647, 0x634, 0x62a, 0x3b, 0x62e, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x62a, 0x6cc, 0x631, 0x3b, 0x645, 0x631, 0x62f, 0x627, 0x62f, 0x3b,
+0x634, 0x647, 0x631, 0x6cc, 0x648, 0x631, 0x3b, 0x645, 0x647, 0x631, 0x3b, 0x622, 0x628, 0x627, 0x646, 0x3b, 0x622, 0x630, 0x631, 0x3b,
+0x62f, 0x6cc, 0x3b, 0x628, 0x647, 0x645, 0x646, 0x3b, 0x627, 0x633, 0x641, 0x646, 0x62f, 0x3b, 0x641, 0x3b, 0x627, 0x3b, 0x62e, 0x3b,
+0x62a, 0x3b, 0x645, 0x3b, 0x634, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x622, 0x3b, 0x62f, 0x3b, 0x628, 0x3b, 0x627, 0x3b, 0x62d, 0x3b,
+0x62b, 0x3b, 0x62c, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x645, 0x3b, 0x639, 0x3b, 0x642, 0x3b, 0x62c, 0x3b, 0x62f, 0x3b,
+0x62d, 0x3b, 0x62d, 0x645, 0x644, 0x3b, 0x62b, 0x648, 0x631, 0x3b, 0x62c, 0x648, 0x632, 0x627, 0x3b, 0x633, 0x631, 0x637, 0x627, 0x646,
+0x3b, 0x627, 0x633, 0x62f, 0x3b, 0x633, 0x646, 0x628, 0x644, 0x647, 0x654, 0x3b, 0x645, 0x6cc, 0x632, 0x627, 0x646, 0x3b, 0x639, 0x642,
+0x631, 0x628, 0x3b, 0x642, 0x648, 0x633, 0x3b, 0x62c, 0x62f, 0x6cc, 0x3b, 0x62f, 0x644, 0x648, 0x3b, 0x62d, 0x648, 0x62a, 0x3b, 0x46,
+0x61, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x7a, 0x74,
+0x3b, 0x43, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b,
+0x53, 0x7a, 0x61, 0x68, 0x72, 0x69, 0x77, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x100, 0x62, 0x101, 0x6e, 0x3b,
+0x100, 0x73, 0x61, 0x72, 0x3b, 0x44, 0xe9, 0x69, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61,
+0x6e, 0x64, 0x3b, 0xa2b, 0xa3e, 0xa30, 0xa35, 0xa30, 0xa21, 0xa40, 0xa28, 0x3b, 0xa14, 0xa30, 0xa21, 0xa3e, 0xa08, 0xa2c, 0xa39, 0xa48,
+0xa38, 0xa3c, 0xa1f, 0x3b, 0xa16, 0xa4b, 0xa21, 0xa30, 0xa21, 0x3b, 0xa1f, 0xa3f, 0xa30, 0x3b, 0xa2e, 0xa4b, 0xa30, 0xa21, 0xa3e, 0xa26,
+0x3b, 0xa38, 0xa3c, 0xa30, 0xa3e, 0xa07, 0xa35, 0xa30, 0x3b, 0xa2e, 0xa47, 0xa39, 0xa30, 0x3b, 0xa05, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa05,
+0xa1c, 0xa3c, 0xa3e, 0xa30, 0x3b, 0xa21, 0xa47, 0xa05, 0x3b, 0xa2c, 0xa3e, 0xa39, 0xa2e, 0xa28, 0x3b, 0xa10, 0xa38, 0xa2b, 0xa70, 0xa21,
+0x3b, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73,
+0x68, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x41, 0x2d, 0x4d, 0x6f, 0x72,
+0x64, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41,
+0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b,
+0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x438, 0x43d, 0x3b, 0x43e, 0x440, 0x434,
+0x438, 0x431, 0x435, 0x445, 0x435, 0x448, 0x442, 0x3b, 0x445, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x442, 0x438, 0x440, 0x3b, 0x43c,
+0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x448, 0x430, 0x445, 0x440, 0x438, 0x432, 0x435, 0x440, 0x3b, 0x43c, 0x435, 0x445, 0x440, 0x3b,
+0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d,
+0x3b, 0x44d, 0x441, 0x444, 0x430, 0x43d, 0x434, 0x3b, 0x424, 0x430, 0x440, 0x430, 0x432, 0x430, 0x434, 0x438, 0x43d, 0x3b, 0x41e, 0x440,
+0x434, 0x438, 0x431, 0x435, 0x445, 0x435, 0x448, 0x442, 0x3b, 0x41a, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x422, 0x438, 0x440, 0x3b,
+0x41c, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x428, 0x430, 0x445, 0x440, 0x438, 0x432, 0x430, 0x440, 0x3b, 0x41c, 0x435, 0x445, 0x440,
+0x3b, 0x410, 0x431, 0x430, 0x43d, 0x3b, 0x410, 0x437, 0x430, 0x440, 0x3b, 0x414, 0x435, 0x458, 0x3b, 0x411, 0x430, 0x445, 0x43c, 0x430,
+0x43d, 0x3b, 0x415, 0x441, 0x444, 0x430, 0x43d, 0x434, 0x3b, 0x46, 0x61, 0x72, 0x61, 0x76, 0x61, 0x64, 0x69, 0x6e, 0x3b, 0x4f,
+0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b, 0x4b, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72,
+0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x160, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68,
+0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x6a, 0x3b, 0x42, 0x61, 0x68, 0x6d,
+0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b,
+0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b,
+0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x53, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72,
+0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x100, 0x62, 0x101, 0x6e, 0x3b, 0x100, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b,
+0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72,
+0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72,
+0x64, 0x101, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x73, 0x68, 0x61, 0x68, 0x72,
+0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0x101, 0x62, 0x101, 0x6e, 0x3b, 0x101, 0x7a, 0x61, 0x72, 0x3b,
+0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0xb83, 0xbaa,
+0xbb0, 0xbcd, 0x2e, 0x3b, 0xb86, 0xbb0, 0xbcd, 0xb9f, 0xbbf, 0x2e, 0x3b, 0xb95, 0xbca, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xba4, 0xbbf, 0xbb0,
+0xbcd, 0x3b, 0xbae, 0xbca, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xbb7, 0xbbe, 0xbb0, 0xbbf, 0x2e, 0x3b, 0xbae, 0xbc6, 0xbb9, 0xbcd, 0x2e, 0x3b,
+0xb85, 0xbaa, 0xbbe, 0x2e, 0x3b, 0xb85, 0xb9a, 0xbbe, 0x2e, 0x3b, 0xba4, 0xbc7, 0x3b, 0xbaa, 0xbb9, 0xbcd, 0x2e, 0x3b, 0xb8e, 0xb83,
+0x2e, 0x3b, 0xb83, 0xbaa, 0xbb0, 0xbcd, 0xbb5, 0xbbe, 0xba4, 0xbbf, 0xba9, 0xbcd, 0x3b, 0xb86, 0xbb0, 0xbcd, 0xb9f, 0xbbf, 0xbaa, 0xbc6,
+0xbb9, 0xbc6, 0xbb7, 0xbcd, 0xba4, 0xbcd, 0x3b, 0xb95, 0xbca, 0xbb0, 0xbcd, 0xba4, 0xbbe, 0xba4, 0xbcd, 0x3b, 0xba4, 0xbbf, 0xbb0, 0xbcd,
+0x3b, 0xbae, 0xbca, 0xbb0, 0xbcd, 0xba4, 0xbbe, 0xba4, 0xbcd, 0x3b, 0xbb7, 0xbbe, 0xbb0, 0xbbf, 0xbb5, 0xbbe, 0xbb0, 0xbcd, 0x3b, 0xbae,
+0xbc6, 0xbb9, 0xbcd, 0xbb0, 0xbcd, 0x3b, 0xb85, 0xbaa, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xb85, 0xb9a, 0xbbe, 0xbb0, 0xbcd, 0x3b, 0xba4, 0xbc7,
+0x3b, 0xbaa, 0xbb9, 0xbcd, 0xbae, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xb8e, 0xb83, 0xbaa, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xc2b, 0xc3e, 0xc35, 0xc30,
+0xc4d, 0xc21, 0xc3f, 0xc28, 0xc4d, 0x3b, 0xc0a, 0xc21, 0xc3e, 0xc2c, 0xc39, 0xc37, 0xc4d, 0xc1f, 0xc4d, 0x3b, 0xc16, 0xc4b, 0xc30, 0xc4d,
+0xc21, 0xc3e, 0xc21, 0xc4d, 0x3b, 0xc1f, 0xc3f, 0xc30, 0xc4d, 0x3b, 0xc2e, 0xc46, 0xc30, 0xc4d, 0xc21, 0xc3e, 0xc21, 0xc4d, 0x3b, 0xc36,
+0xc36, 0xc3f, 0xc35, 0xc30, 0xc4d, 0x3b, 0xc2e, 0xc46, 0xc39, 0xc30, 0xc4d, 0x3b, 0xc05, 0xc2c, 0xc28, 0xc4d, 0x3b, 0xc05, 0xc1c, 0xc30,
+0xc4d, 0x3b, 0xc21, 0xc47, 0x3b, 0xc2c, 0xc3e, 0xc39, 0xc4d, 0x200c, 0xc2e, 0xc3e, 0xc28, 0xc4d, 0x3b, 0xc0e, 0xc38, 0xc4d, 0x200c, 0xc2b,
+0xc3e, 0xc02, 0xc21, 0xc4d, 0x3b, 0xe1f, 0xe32, 0xe23, 0xe4c, 0xe27, 0xe32, 0xe23, 0xe4c, 0xe14, 0xe34, 0xe19, 0x3b, 0xe2d, 0xe2d, 0xe23,
+0xe4c, 0xe14, 0xe34, 0xe40, 0xe1a, 0xe40, 0xe2e, 0xe0a, 0xe15, 0xe4c, 0x3b, 0xe04, 0xe2d, 0xe23, 0xe4c, 0xe41, 0xe14, 0xe14, 0x3b, 0xe40,
+0xe15, 0xe2d, 0xe23, 0xe4c, 0x3b, 0xe21, 0xe2d, 0xe23, 0xe4c, 0xe41, 0xe14, 0xe14, 0x3b, 0xe0a, 0xe32, 0xe2b, 0xe23, 0xe34, 0xe27, 0xe32,
+0xe23, 0xe4c, 0x3b, 0xe40, 0xe21, 0xe2e, 0xe23, 0xe4c, 0x3b, 0xe2d, 0xe30, 0xe1a, 0xe32, 0xe19, 0x3b, 0xe2d, 0xe30, 0xe0b, 0xe32, 0xe23,
+0xe4c, 0x3b, 0xe40, 0xe14, 0xe22, 0xe4c, 0x3b, 0xe1a, 0xe32, 0xe2e, 0xe4c, 0xe21, 0xe32, 0xe19, 0x3b, 0xe40, 0xe2d, 0xe2a, 0xe1f, 0xe32,
+0xe19, 0xe14, 0xe4c, 0x3b, 0x46, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65,
+0x68, 0x65, 0x15f, 0x74, 0x3b, 0x48, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64,
+0x61, 0x64, 0x3b, 0x15e, 0x65, 0x68, 0x72, 0x69, 0x76, 0x65, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61,
+0x6e, 0x3b, 0x41, 0x7a, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x65, 0x68, 0x6d, 0x65, 0x6e, 0x3b, 0x45, 0x73,
+0x66, 0x65, 0x6e, 0x64, 0x3b, 0x444, 0x430, 0x440, 0x3b, 0x43e, 0x440, 0x434, 0x3b, 0x445, 0x43e, 0x440, 0x3b, 0x442, 0x456, 0x440,
+0x3b, 0x43c, 0x43e, 0x440, 0x3b, 0x448, 0x430, 0x445, 0x3b, 0x43c, 0x435, 0x445, 0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437,
+0x435, 0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x3b, 0x435, 0x441, 0x444, 0x3b, 0x444, 0x430, 0x440, 0x432, 0x430,
+0x440, 0x434, 0x456, 0x43d, 0x3b, 0x43e, 0x440, 0x434, 0x456, 0x431, 0x435, 0x445, 0x435, 0x448, 0x442, 0x3b, 0x445, 0x43e, 0x440, 0x434,
+0x430, 0x434, 0x3b, 0x442, 0x456, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x448, 0x430, 0x445, 0x440, 0x456, 0x432,
+0x435, 0x440, 0x3b, 0x43c, 0x435, 0x445, 0x440, 0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b, 0x434, 0x435,
+0x439, 0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x435, 0x441, 0x444, 0x430, 0x43d, 0x434, 0x3b, 0x444, 0x430, 0x440, 0x2e,
+0x3b, 0x43e, 0x440, 0x434, 0x2e, 0x3b, 0x445, 0x43e, 0x440, 0x2e, 0x3b, 0x442, 0x456, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x2e, 0x3b,
+0x448, 0x430, 0x445, 0x2e, 0x3b, 0x43c, 0x435, 0x445, 0x2e, 0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b,
+0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x2e, 0x3b, 0x435, 0x441, 0x444, 0x2e, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x62f, 0x646,
+0x3b, 0x622, 0x631, 0x688, 0x628, 0x627, 0x626, 0x634, 0x3b, 0x62e, 0x62f, 0x627, 0x62f, 0x627, 0x62f, 0x3b, 0x62a, 0x6cc, 0x631, 0x3b,
+0x645, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x634, 0x6c1, 0x631, 0x6cc, 0x648, 0x627, 0x631, 0x3b, 0x645, 0x6c1, 0x631, 0x3b, 0x627, 0x628,
+0x627, 0x646, 0x3b, 0x622, 0x632, 0x631, 0x3b, 0x688, 0x6d2, 0x3b, 0x628, 0x6c1, 0x645, 0x646, 0x3b, 0x627, 0x633, 0x641, 0x646, 0x62f,
+0x3b, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b, 0x74, 0x65, 0x64, 0x3b, 0x61, 0x66, 0x254, 0x3b, 0x64, 0x61, 0x6d,
+0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x6e, 0x79, 0x3b, 0x6b, 0x65, 0x6c,
+0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x3b, 0x64, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x64, 0x7a,
+0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x61, 0x66, 0x254, 0x66, 0x69, 0x1ebd, 0x3b, 0x64, 0x61, 0x6d, 0x25b,
+0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73, 0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73, 0x69, 0x61,
+0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b, 0x61, 0x64,
+0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x6d, 0x65, 0x3b, 0x62e, 0x627, 0x6a9, 0x6d5,
+0x644, 0x6ce, 0x648, 0x6d5, 0x3b, 0x628, 0x627, 0x646, 0x6d5, 0x645, 0x6d5, 0x695, 0x3b, 0x62c, 0x6c6, 0x632, 0x6d5, 0x631, 0x62f, 0x627,
+0x646, 0x3b, 0x67e, 0x648, 0x648, 0x634, 0x67e, 0x6d5, 0x695, 0x3b, 0x6af, 0x6d5, 0x644, 0x627, 0x648, 0x6ce, 0x698, 0x3b, 0x62e, 0x6d5,
+0x631, 0x645, 0x627, 0x646, 0x627, 0x646, 0x3b, 0x695, 0x6d5, 0x632, 0x628, 0x6d5, 0x631, 0x3b, 0x62e, 0x6d5, 0x632, 0x6d5, 0x6b5, 0x648,
+0x6d5, 0x631, 0x3b, 0x633, 0x6d5, 0x631, 0x645, 0x627, 0x648, 0x6d5, 0x632, 0x3b, 0x628, 0x6d5, 0x641, 0x631, 0x627, 0x646, 0x628, 0x627,
+0x631, 0x3b, 0x695, 0x6ce, 0x628, 0x6d5, 0x646, 0x62f, 0x627, 0x646, 0x3b, 0x631, 0x6d5, 0x634, 0x6d5, 0x645, 0x6ce, 0x3b
+};
+// GENERATED PART ENDS HERE
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/corelib/time/qjalalicalendar_p.h b/src/corelib/time/qjalalicalendar_p.h
new file mode 100644
index 0000000000..5b94dada9f
--- /dev/null
+++ b/src/corelib/time/qjalalicalendar_p.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QJALALI_CALENDAR_P_H
+#define QJALALI_CALENDAR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of calendar implementations.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qcalendarbackend_p.h"
+
+QT_REQUIRE_CONFIG(jalalicalendar);
+
+QT_BEGIN_NAMESPACE
+
+class Q_CORE_EXPORT QJalaliCalendar : public QCalendarBackend
+{
+public:
+    QJalaliCalendar();
+    // Calendar properties:
+    QString name() const override;
+    QCalendar::System calendarSystem() const override;
+    // Date queries:
+    int daysInMonth(int month, int year = QCalendar::Unspecified) const override;
+    bool isLeapYear(int year) const override;
+    // Properties of the calendar
+    bool isLunar() const override;
+    bool isLuniSolar() const override;
+    bool isSolar() const override;
+    // Julian Day conversions:
+    bool dateToJulianDay(int year, int month, int day, qint64 *jd) const override;
+    QCalendar::YearMonthDay julianDayToDate(qint64 jd) const override;
+
+protected:
+    // locale support:
+    const QCalendarLocale *localeMonthIndexData() const override;
+    const ushort *localeMonthData() const override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QJALALI_CALENDAR_P_H
diff --git a/src/corelib/time/qjuliancalendar.cpp b/src/corelib/time/qjuliancalendar.cpp
new file mode 100644
index 0000000000..8c6818eb31
--- /dev/null
+++ b/src/corelib/time/qjuliancalendar.cpp
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qglobal.h"
+#include "qjuliancalendar_p.h"
+#include "qromancalendar_data_p.h"
+#include "qcalendarmath_p.h"
+#include <QtCore/qmath.h>
+#include <QtCore/qlocale.h>
+#include <QtCore/qdatetime.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QRoundingDown;
+
+/*!
+    \since 5.14
+
+    \class QJulianCalendar
+    \inmodule QtCore
+    \brief The QJulianCalendar class provides Julian calendar system
+    implementation.
+
+    \section1 Julian Calendar
+
+    The Julian calendar, proposed by Julius Caesar in 46 BC (708 AUC), was a
+    reform of the Roman calendar. It took effect on 1 January 45 BC (AUC 709),
+    by edict. It was the predominant calendar in the Roman world, most of
+    Europe, and in European settlements in the Americas and elsewhere, until it
+    was refined and gradually replaced by the Gregorian calendar,
+    promulgated in 1582 by Pope Gregory XIII.
+
+    The Julian calendar gains against the mean tropical year at the rate of one
+    day in 128 years. For the Gregorian calendar, the figure is one day in
+    3030 years. The difference in the average length of the year
+    between Julian (365.25 days) and Gregorian (365.2425 days) is 0.002%.
+
+    Source: \l {https://en.wikipedia.org/wiki/Julian_calendar}{Wikipedia page on
+    Julian Calendar}
+ */
+
+QJulianCalendar::QJulianCalendar()
+    : QRomanCalendar(QStringLiteral("Julian"), QCalendar::System::Julian) {}
+
+QString QJulianCalendar::name() const
+{
+    return QStringLiteral("Julian");
+}
+
+QCalendar::System QJulianCalendar::calendarSystem() const
+{
+    return QCalendar::System::Julian;
+}
+
+bool QJulianCalendar::isLeapYear(int year) const
+{
+    if (year == QCalendar::Unspecified || !year)
+        return false;
+
+    return qMod(year < 0 ? year + 1 : year, 4) == 0;
+}
+
+// Julian Day 0 was January the first in the proleptic Julian calendar's 4713 BC
+
+bool QJulianCalendar::dateToJulianDay(int year, int month, int day, qint64 *jd) const
+{
+    Q_ASSERT(jd);
+    if (!isDateValid(year, month, day))
+        return false;
+    if (year < 0)
+        ++year;
+    const qint64 c0 = month < 3 ? -1 : 0;
+    const qint64 j1 = qDiv(1461 * (year + c0), 4);
+    const qint64 j2 = qDiv(153 * month - 1836 * c0 - 457, 5);
+    *jd = j1 + j2 + day + 1721117;
+    return true;
+}
+
+QCalendar::YearMonthDay QJulianCalendar::julianDayToDate(qint64 jd) const
+{
+    const qint64 y2 = jd - 1721118;
+    const qint64 k2 = 4 * y2 + 3;
+    const qint64 k1 = 5 * qDiv(qMod(k2, 1461), 4) + 2;
+    const qint64 x1 = qDiv(k1, 153);
+    const qint64 c0 = qDiv(x1 + 2, 12);
+    const int y = qint16(qDiv(k2, 1461) + c0);
+    const int month = quint8(x1 - 12 * c0 + 3);
+    const int day = qDiv(qMod(k1, 153), 5) + 1;
+    return QCalendar::YearMonthDay(y > 0 ? y : y - 1, month, day);
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/mirclient/qmirclientcursor.h b/src/corelib/time/qjuliancalendar_p.h
index c5de23b272..104cf6aa30 100644
--- a/src/plugins/platforms/mirclient/qmirclientcursor.h
+++ b/src/corelib/time/qjuliancalendar_p.h
@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2015-2016 Canonical, Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,28 +37,38 @@
 **
 ****************************************************************************/
 
+#ifndef QJULIAN_CALENDAR_P_H
+#define QJULIAN_CALENDAR_P_H
 
-#ifndef QMIRCLIENTCURSOR_H
-#define QMIRCLIENTCURSOR_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of calendar implementations.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
-#include <qpa/qplatformcursor.h>
+#include "qromancalendar_p.h"
 
-#include <QMap>
-#include <QByteArray>
+QT_BEGIN_NAMESPACE
 
-struct MirConnection;
-struct MirSurface;
-
-class QMirClientCursor : public QPlatformCursor
+class Q_CORE_EXPORT QJulianCalendar : public QRomanCalendar
 {
 public:
-    QMirClientCursor(MirConnection *connection);
-    void changeCursor(QCursor *windowCursor, QWindow *window) override;
-private:
-    void configureMirCursorWithPixmapQCursor(MirSurface *surface, QCursor &cursor);
-    void applyDefaultCursorConfiguration(MirSurface *surface);
-    QMap<int, QByteArray> mShapeToCursorName;
-    MirConnection *mConnection;
+    QJulianCalendar();
+    // Calendar properties:
+    QString name() const override;
+    QCalendar::System calendarSystem() const override;
+    // Date queries:
+    bool isLeapYear(int year) const override;
+    // Julian Day conversions:
+    bool dateToJulianDay(int year, int month, int day, qint64 *jd) const override;
+    QCalendar::YearMonthDay julianDayToDate(qint64 jd) const override;
 };
 
-#endif // QMIRCLIENTCURSOR_H
+QT_END_NAMESPACE
+
+#endif // QJULIAN_CALENDAR_P_H
diff --git a/src/corelib/time/qmilankoviccalendar.cpp b/src/corelib/time/qmilankoviccalendar.cpp
new file mode 100644
index 0000000000..68d74947b9
--- /dev/null
+++ b/src/corelib/time/qmilankoviccalendar.cpp
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qglobal.h"
+#include "qmilankoviccalendar_p.h"
+#include "qcalendarmath_p.h"
+#include <QtCore/qmath.h>
+#include <QtCore/qlocale.h>
+#include <QtCore/qdatetime.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QRoundingDown;
+
+/*!
+    \since 5.14
+
+    \class QMilankovicCalendar
+    \inmodule QtCore
+    \brief The QMilankovicCalendar class provides Milanković calendar system
+    implementation.
+
+    \section1
+
+    The Revised Julian calendar, also known as the Milanković calendar, or,
+    less formally, new calendar, is a calendar, developed and proposed by the
+    Serbian scientist Milutin Milanković in 1923, which effectively discontinued
+    the 340 years of divergence between the naming of dates sanctioned by those
+    Eastern Orthodox churches adopting it and the Gregorian calendar that has
+    come to predominate worldwide. This calendar was intended to replace the
+    ecclesiastical calendar based on the Julian calendar hitherto in use by all
+    of the Eastern Orthodox Church. The Revised Julian calendar temporarily
+    aligned its dates with the Gregorian calendar proclaimed in 1582 by Pope
+    Gregory XIII for adoption by the Christian world. The calendar has been
+    adopted by the Orthodox churches of Constantinople, Albania, Alexandria,
+    Antioch, Bulgaria, Cyprus, Greece, Poland, and Romania.
+
+    Source: \l {https://en.wikipedia.org/wiki/Revised_Julian_calendar}{Wikipedia
+    page on Milanković Calendar}
+ */
+
+QMilankovicCalendar::QMilankovicCalendar()
+    : QRomanCalendar(QStringLiteral("Milankovic"), QCalendar::System::Milankovic) {}
+
+QString QMilankovicCalendar::name() const
+{
+    return QStringLiteral("Milankovic");
+}
+
+QCalendar::System QMilankovicCalendar::calendarSystem() const
+{
+    return QCalendar::System::Milankovic;
+}
+
+bool QMilankovicCalendar::isLeapYear(int year) const
+{
+    if (year == QCalendar::Unspecified)
+        return false;
+    if (year <= 0)
+        ++year;
+    if (qMod(year, 4))
+        return false;
+    if (qMod(year, 100) == 0) {
+        const qint16 century = qMod(qDiv(year, 100), 9);
+        if (century != 2 && century != 6)
+            return false;
+    }
+    return true;
+}
+
+bool QMilankovicCalendar::dateToJulianDay(int year, int month, int day, qint64 *jd) const
+{
+    Q_ASSERT(jd);
+    if (!isDateValid(year, month, day))
+        return false;
+    if (year <= 0)
+        ++year;
+    const qint16 c0 = month < 3 ? -1 : 0;
+    const qint16 x1 = month - 12 * c0 - 3;
+    const qint16 x4 = year + c0;
+    const qint16 x3 = qDiv(x4, 100);
+    const qint16 x2 = qMod(x4, 100);
+    *jd = qDiv(328718 * x3 + 6, 9)
+        + qDiv(36525 * x2 , 100)
+        + qDiv(153 * x1 + 2 , 5)
+        + day + 1721119;
+    return true;
+}
+
+QCalendar::YearMonthDay  QMilankovicCalendar::julianDayToDate(qint64 jd) const
+{
+    const qint64 k3 = 9 * (jd - 1721120) + 2;
+    const qint64 x3 = qDiv(k3, 328718);
+    const qint64 k2 = 100 * qDiv(qMod(k3, 328718), 9) + 99;
+    const qint64 k1 = qDiv(qMod(k2, 36525), 100) * 5 + 2;
+    const qint64 x2 = qDiv(k2, 36525);
+    const qint64 x1 = qDiv(5 * qDiv(qMod(k2, 36525), 100) + 2, 153);
+    const qint64 c0 = qDiv(x1 + 2, 12);
+    const int y = 100 * x3 + x2 + c0;
+    const int month = x1 - 12 * c0 + 3;
+    const int day = qDiv(qMod(k1, 153), 5) + 1;
+    return QCalendar::YearMonthDay(y > 0 ? y : y - 1, month, day);
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/mirclient/qmirclientbackingstore.h b/src/corelib/time/qmilankoviccalendar_p.h
index 7644c77df2..ebff7e7f39 100644
--- a/src/plugins/platforms/mirclient/qmirclientbackingstore.h
+++ b/src/corelib/time/qmilankoviccalendar_p.h
@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Canonical, Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,38 +37,38 @@
 **
 ****************************************************************************/
 
+#ifndef QMILANKOVICCALENDAR_CALENDAR_P_H
+#define QMILANKOVICCALENDAR_CALENDAR_P_H
 
-#ifndef QMIRCLIENTBACKINGSTORE_H
-#define QMIRCLIENTBACKINGSTORE_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of calendar implementations.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
-#include <qpa/qplatformbackingstore.h>
+#include "qromancalendar_p.h"
 
-class QOpenGLContext;
-class QOpenGLTexture;
-class QOpenGLTextureBlitter;
+QT_BEGIN_NAMESPACE
 
-class QMirClientBackingStore : public QPlatformBackingStore
+class Q_CORE_EXPORT QMilankovicCalendar : public QRomanCalendar
 {
 public:
-    QMirClientBackingStore(QWindow* window);
-    virtual ~QMirClientBackingStore();
-
-    // QPlatformBackingStore methods.
-    void beginPaint(const QRegion&) override;
-    void flush(QWindow* window, const QRegion& region, const QPoint& offset) override;
-    void resize(const QSize& size, const QRegion& staticContents) override;
-    QPaintDevice* paintDevice() override;
-    QImage toImage() const override;
-
-protected:
-    void updateTexture();
-
-private:
-    QScopedPointer<QOpenGLContext> mContext;
-    QScopedPointer<QOpenGLTexture> mTexture;
-    QScopedPointer<QOpenGLTextureBlitter> mBlitter;
-    QImage mImage;
-    QRegion mDirty;
+    QMilankovicCalendar();
+    // Calendar properties:
+    QString name() const override;
+    QCalendar::System calendarSystem() const override;
+    // Date queries:
+    bool isLeapYear(int year) const override;
+    // Julian Day conversions:
+    bool dateToJulianDay(int year, int month, int day, qint64 *jd) const override;
+    QCalendar::YearMonthDay julianDayToDate(qint64 jd) const override;
 };
 
-#endif // QMIRCLIENTBACKINGSTORE_H
+QT_END_NAMESPACE
+
+#endif // QMILANKOVICCALENDAR_CALENDAR_P_H
diff --git a/src/corelib/time/qromancalendar.cpp b/src/corelib/time/qromancalendar.cpp
new file mode 100644
index 0000000000..c3cd134490
--- /dev/null
+++ b/src/corelib/time/qromancalendar.cpp
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qglobal.h"
+#include "qromancalendar_p.h"
+#include "qromancalendar_data_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \since 5.14
+
+    \class QRomanCalendar
+    \inmodule QtCore
+    \brief The QRomanCalendar class is a shared base for calendars based on the
+    ancient Roman calendar.
+
+    \section1
+
+    Calendars based on the ancient Roman calendar share the names of months,
+    whose lengths depend in a common way on whether the year is a leap
+    year. They differ in how they determine which years are leap years.
+
+    \sa QGregorianCalendar, QJulianCalendar, QMilankovicCalendar
+*/
+
+int QRomanCalendar::daysInMonth(int month, int year) const
+{
+    if (!year || month < 1 || month > 12)
+        return 0;
+
+    if (month == 2)
+        return isLeapYear(year) ? 29 : 28;
+
+    // Long if odd up to July = 7, or if even from 8 = August onwards:
+    return 30 | ((month & 1) ^ (month >> 3));
+}
+
+int QRomanCalendar::minimumDaysInMonth() const
+{
+    return 28;
+}
+
+bool QRomanCalendar::isLunar() const
+{
+    return false;
+}
+
+bool QRomanCalendar::isLuniSolar() const
+{
+    return false;
+}
+
+bool QRomanCalendar::isSolar() const
+{
+    return true;
+}
+
+const QCalendarLocale *QRomanCalendar::localeMonthIndexData() const
+{
+    return locale_data;
+}
+
+const ushort *QRomanCalendar::localeMonthData() const
+{
+    return months_data;
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/time/qromancalendar_data_p.h b/src/corelib/time/qromancalendar_data_p.h
new file mode 100644
index 0000000000..b3a2a24a44
--- /dev/null
+++ b/src/corelib/time/qromancalendar_data_p.h
@@ -0,0 +1,2646 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QROMANCALENDAR_DATA_P_H
+#define QROMANCALENDAR_DATA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
+// file may change from version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qglobal_p.h>
+#include <QtCore/private/qcalendarbackend_p.h>
+
+QT_BEGIN_NAMESPACE
+
+// GENERATED PART STARTS HERE
+
+/*
+    This part of the file was generated on 2019-05-27 from the
+    Common Locale Data Repository v35.1
+
+    http://www.unicode.org/cldr/
+
+    Do not edit this section: instead regenerate it using
+    cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or
+    edited) CLDR data; see qtbase/util/locale_database/.
+*/
+
+static const QCalendarLocale locale_data[] = {
+   //  lang   script terr   sShort  sLong   sNarrow short   long    narrow
+      {     1,     0,     0,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 158,29 }}, // C/AnyScript/AnyCountry
+       {     3,     7,    69,{ 187,48 },{ 235,111 },{ 134,24 },{ 187,48 },{ 235,111 },{ 134,24 }}, // Oromo/Latin/Ethiopia
+       {     3,     7,   111,{ 187,48 },{ 235,111 },{ 346,24 },{ 187,48 },{ 235,111 },{ 134,24 }}, // Oromo/Latin/Kenya
+       {     4,     7,    69,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Afar/Latin/Ethiopia
+       {     5,     7,   195,{ 445,59 },{ 504,92 },{ 134,24 },{ 445,59 },{ 504,92 },{ 134,24 }}, // Afrikaans/Latin/South Africa
+       {     5,     7,   148,{ 445,59 },{ 504,92 },{ 134,24 },{ 445,59 },{ 504,92 },{ 134,24 }}, // Afrikaans/Latin/Namibia
+       {     6,     7,     2,{ 596,50 },{ 646,78 },{ 724,27 },{ 596,50 },{ 646,78 },{ 724,27 }}, // Albanian/Latin/Albania
+       {     6,     7,   127,{ 596,50 },{ 646,78 },{ 724,27 },{ 596,50 },{ 646,78 },{ 724,27 }}, // Albanian/Latin/Macedonia
+       {     6,     7,   257,{ 596,50 },{ 646,78 },{ 724,27 },{ 596,50 },{ 646,78 },{ 724,27 }}, // Albanian/Latin/Kosovo
+       {     7,    14,    69,{ 751,46 },{ 797,61 },{ 858,24 },{ 751,46 },{ 797,61 },{ 858,24 }}, // Amharic/Ethiopic/Ethiopia
+       {     8,     1,    64,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Egypt
+       {     8,     1,     3,{ 981,71 },{ 981,71 },{ 1052,24 },{ 981,71 },{ 981,71 },{ 1052,24 }}, // Arabic/Arabic/Algeria
+       {     8,     1,    17,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Bahrain
+       {     8,     1,    42,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Chad
+       {     8,     1,    48,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Comoros
+       {     8,     1,    59,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Djibouti
+       {     8,     1,    67,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Eritrea
+       {     8,     1,   103,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1192,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Iraq
+       {     8,     1,   105,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Israel
+       {     8,     1,   109,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1076,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Jordan
+       {     8,     1,   115,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Kuwait
+       {     8,     1,   119,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1076,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Lebanon
+       {     8,     1,   122,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Libya
+       {     8,     1,   136,{ 1284,72 },{ 1284,72 },{ 1356,24 },{ 1284,72 },{ 1284,72 },{ 1356,24 }}, // Arabic/Arabic/Mauritania
+       {     8,     1,   145,{ 1380,70 },{ 1380,70 },{ 1450,24 },{ 1380,70 },{ 1380,70 },{ 1450,24 }}, // Arabic/Arabic/Morocco
+       {     8,     1,   162,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Oman
+       {     8,     1,   165,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1076,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Palestinian Territories
+       {     8,     1,   175,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Qatar
+       {     8,     1,   186,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Saudi Arabia
+       {     8,     1,   194,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Somalia
+       {     8,     1,   201,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Sudan
+       {     8,     1,   207,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1076,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Syria
+       {     8,     1,   216,{ 981,71 },{ 981,71 },{ 1052,24 },{ 981,71 },{ 981,71 },{ 1052,24 }}, // Arabic/Arabic/Tunisia
+       {     8,     1,   223,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/United Arab Emirates
+       {     8,     1,   236,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Western Sahara
+       {     8,     1,   237,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Yemen
+       {     8,     1,   254,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/South Sudan
+       {     8,     1,   260,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/World
+       {     9,    10,    11,{ 1474,48 },{ 1522,94 },{ 1616,24 },{ 1474,48 },{ 1640,106 },{ 1616,24 }}, // Armenian/Armenian/Armenia
+       {    10,    11,   100,{ 1746,64 },{ 1810,89 },{ 1899,24 },{ 1746,64 },{ 1810,89 },{ 1899,24 }}, // Assamese/Bengali/India
+       {    12,     7,    15,{ 1923,48 },{ 1971,77 },{ 418,27 },{ 1923,48 },{ 2048,77 },{ 418,27 }}, // Azerbaijani/Latin/Azerbaijan
+       {    12,     1,   102,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Azerbaijani/Arabic/Iran
+       {    12,     2,    15,{ 2125,48 },{ 2173,77 },{ 418,27 },{ 2125,48 },{ 2250,77 },{ 418,27 }}, // Azerbaijani/Cyrillic/Azerbaijan
+       {    13,     2,   178,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Bashkir/Cyrillic/Russia
+       {    14,     7,   197,{ 2327,60 },{ 2387,93 },{ 2480,24 },{ 2327,60 },{ 2387,93 },{ 2480,24 }}, // Basque/Latin/Spain
+       {    15,    11,    18,{ 2504,90 },{ 2504,90 },{ 2594,33 },{ 2627,77 },{ 2504,90 },{ 2594,33 }}, // Bengali/Bengali/Bangladesh
+       {    15,    11,   100,{ 2504,90 },{ 2504,90 },{ 2594,33 },{ 2627,77 },{ 2504,90 },{ 2594,33 }}, // Bengali/Bengali/India
+       {    16,    31,    25,{ 2704,63 },{ 2767,191 },{ 2958,27 },{ 2985,27 },{ 3012,132 },{ 3144,27 }}, // Dzongkha/Tibetan/Bhutan
+       {    19,     7,    74,{ 3171,63 },{ 3234,78 },{ 3312,36 },{ 3171,63 },{ 3234,78 },{ 3312,36 }}, // Breton/Latin/France
+       {    20,     2,    33,{ 3348,49 },{ 3397,82 },{ 3479,24 },{ 3348,49 },{ 3397,82 },{ 3479,24 }}, // Bulgarian/Cyrillic/Bulgaria
+       {    21,    25,   147,{ 3503,43 },{ 3546,88 },{ 3634,24 },{ 3503,43 },{ 3546,88 },{ 3634,24 }}, // Burmese/Myanmar/Myanmar
+       {    22,     2,    20,{ 3658,48 },{ 3706,95 },{ 3801,24 },{ 3825,48 },{ 3873,98 },{ 3801,24 }}, // Belarusian/Cyrillic/Belarus
+       {    23,    20,    36,{ 3971,71 },{ 3971,71 },{ 4042,24 },{ 3971,71 },{ 3971,71 },{ 4042,24 }}, // Khmer/Khmer/Cambodia
+       {    24,     7,   197,{ 4066,60 },{ 4126,82 },{ 4208,36 },{ 4244,93 },{ 4337,115 },{ 4208,36 }}, // Catalan/Latin/Spain
+       {    24,     7,     5,{ 4066,60 },{ 4126,82 },{ 4208,36 },{ 4244,93 },{ 4337,115 },{ 4208,36 }}, // Catalan/Latin/Andorra
+       {    24,     7,    74,{ 4066,60 },{ 4126,82 },{ 4208,36 },{ 4244,93 },{ 4337,115 },{ 4208,36 }}, // Catalan/Latin/France
+       {    24,     7,   106,{ 4066,60 },{ 4126,82 },{ 4208,36 },{ 4244,93 },{ 4337,115 },{ 4208,36 }}, // Catalan/Latin/Italy
+       {    25,     5,    44,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Chinese/Simplified Han/China
+       {    25,     5,    97,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Chinese/Simplified Han/Hong Kong
+       {    25,     5,   126,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Chinese/Simplified Han/Macau
+       {    25,     5,   190,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Chinese/Simplified Han/Singapore
+       {    25,     6,    97,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Chinese/Traditional Han/Hong Kong
+       {    25,     6,   126,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Chinese/Traditional Han/Macau
+       {    25,     6,   208,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Chinese/Traditional Han/Taiwan
+       {    26,     7,    74,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Corsican/Latin/France
+       {    27,     7,    54,{ 4529,49 },{ 4578,94 },{ 4672,39 },{ 4529,49 },{ 4711,98 },{ 4672,39 }}, // Croatian/Latin/Croatia
+       {    27,     7,    27,{ 4529,49 },{ 4578,94 },{ 4672,39 },{ 4529,49 },{ 4711,98 },{ 4672,39 }}, // Croatian/Latin/Bosnia And Herzegowina
+       {    28,     7,    57,{ 4809,48 },{ 4857,82 },{ 418,27 },{ 4809,48 },{ 4939,84 },{ 418,27 }}, // Czech/Latin/Czech Republic
+       {    29,     7,    58,{ 5023,59 },{ 5082,84 },{ 134,24 },{ 5023,59 },{ 5082,84 },{ 134,24 }}, // Danish/Latin/Denmark
+       {    29,     7,    86,{ 5023,59 },{ 5082,84 },{ 134,24 },{ 5023,59 },{ 5082,84 },{ 134,24 }}, // Danish/Latin/Greenland
+       {    30,     7,   151,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Netherlands
+       {    30,     7,    12,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Aruba
+       {    30,     7,    21,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Belgium
+       {    30,     7,   152,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Cura Sao
+       {    30,     7,   202,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Suriname
+       {    30,     7,   255,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Bonaire
+       {    30,     7,   256,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Sint Maarten
+       {    31,     7,   225,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United States
+       {    31,     3,   225,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // English/Deseret/United States
+       {    31,     7,     4,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/American Samoa
+       {    31,     7,     7,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Anguilla
+       {    31,     7,     9,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Antigua And Barbuda
+       {    31,     7,    13,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Australia
+       {    31,     7,    14,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Austria
+       {    31,     7,    16,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Bahamas
+       {    31,     7,    19,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Barbados
+       {    31,     7,    21,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Belgium
+       {    31,     7,    22,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Belize
+       {    31,     7,    24,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Bermuda
+       {    31,     7,    28,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Botswana
+       {    31,     7,    31,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/British Indian Ocean Territory
+       {    31,     7,    35,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Burundi
+       {    31,     7,    37,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cameroon
+       {    31,     7,    38,{ 5313,59 },{ 48,86 },{ 134,24 },{ 5313,59 },{ 48,86 },{ 134,24 }}, // English/Latin/Canada
+       {    31,     7,    40,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cayman Islands
+       {    31,     7,    45,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Christmas Island
+       {    31,     7,    46,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cocos Islands
+       {    31,     7,    51,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cook Islands
+       {    31,     7,    56,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cyprus
+       {    31,     7,    58,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Denmark
+       {    31,     7,    60,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Dominica
+       {    31,     7,    67,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Eritrea
+       {    31,     7,    70,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Falkland Islands
+       {    31,     7,    72,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Fiji
+       {    31,     7,    73,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Finland
+       {    31,     7,    75,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Guernsey
+       {    31,     7,    80,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Gambia
+       {    31,     7,    82,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Germany
+       {    31,     7,    83,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Ghana
+       {    31,     7,    84,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Gibraltar
+       {    31,     7,    87,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Grenada
+       {    31,     7,    89,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Guam
+       {    31,     7,    93,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Guyana
+       {    31,     7,    97,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Hong Kong
+       {    31,     7,   100,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/India
+       {    31,     7,   104,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Ireland
+       {    31,     7,   105,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Israel
+       {    31,     7,   107,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Jamaica
+       {    31,     7,   111,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Kenya
+       {    31,     7,   112,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Kiribati
+       {    31,     7,   120,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Lesotho
+       {    31,     7,   121,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Liberia
+       {    31,     7,   126,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Macau
+       {    31,     7,   128,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Madagascar
+       {    31,     7,   129,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Malawi
+       {    31,     7,   130,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Malaysia
+       {    31,     7,   133,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Malta
+       {    31,     7,   134,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Marshall Islands
+       {    31,     7,   137,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Mauritius
+       {    31,     7,   140,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Micronesia
+       {    31,     7,   144,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Montserrat
+       {    31,     7,   148,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Namibia
+       {    31,     7,   149,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Nauru
+       {    31,     7,   151,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Netherlands
+       {    31,     7,   154,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/New Zealand
+       {    31,     7,   157,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Nigeria
+       {    31,     7,   158,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Niue
+       {    31,     7,   159,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Norfolk Island
+       {    31,     7,   160,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Northern Mariana Islands
+       {    31,     7,   163,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Pakistan
+       {    31,     7,   164,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Palau
+       {    31,     7,   167,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Papua New Guinea
+       {    31,     7,   170,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Philippines
+       {    31,     7,   171,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Pitcairn
+       {    31,     7,   174,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Puerto Rico
+       {    31,     7,   179,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Rwanda
+       {    31,     7,   180,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Saint Kitts And Nevis
+       {    31,     7,   181,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Saint Lucia
+       {    31,     7,   182,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Saint Vincent And The Grenadines
+       {    31,     7,   183,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Samoa
+       {    31,     7,   188,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Seychelles
+       {    31,     7,   189,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Sierra Leone
+       {    31,     7,   190,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Singapore
+       {    31,     7,   192,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Slovenia
+       {    31,     7,   193,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Solomon Islands
+       {    31,     7,   195,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/South Africa
+       {    31,     7,   199,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Saint Helena
+       {    31,     7,   201,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Sudan
+       {    31,     7,   204,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Swaziland
+       {    31,     7,   205,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Sweden
+       {    31,     7,   206,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Switzerland
+       {    31,     7,   210,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Tanzania
+       {    31,     7,   213,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Tokelau
+       {    31,     7,   214,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Tonga
+       {    31,     7,   215,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Trinidad And Tobago
+       {    31,     7,   219,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Turks And Caicos Islands
+       {    31,     7,   220,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Tuvalu
+       {    31,     7,   221,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Uganda
+       {    31,     7,   223,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United Arab Emirates
+       {    31,     7,   224,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United Kingdom
+       {    31,     7,   226,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United States Minor Outlying Islands
+       {    31,     7,   229,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Vanuatu
+       {    31,     7,   233,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/British Virgin Islands
+       {    31,     7,   234,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United States Virgin Islands
+       {    31,     7,   239,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Zambia
+       {    31,     7,   240,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Zimbabwe
+       {    31,     7,   249,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Diego Garcia
+       {    31,     7,   251,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Isle Of Man
+       {    31,     7,   252,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Jersey
+       {    31,     7,   254,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/South Sudan
+       {    31,     7,   256,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Sint Maarten
+       {    31,     7,   260,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/World
+       {    31,     7,   261,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Europe
+       {    32,     7,   260,{ 5372,48 },{ 5420,91 },{ 134,24 },{ 5372,48 },{ 5420,91 },{ 134,24 }}, // Esperanto/Latin/World
+       {    33,     7,    68,{ 5511,59 },{ 5570,91 },{ 5661,24 },{ 5511,59 },{ 5570,91 },{ 5661,24 }}, // Estonian/Latin/Estonia
+       {    34,     7,    71,{ 5685,48 },{ 5733,83 },{ 134,24 },{ 5816,59 },{ 5733,83 },{ 134,24 }}, // Faroese/Latin/Faroe Islands
+       {    34,     7,    58,{ 5685,48 },{ 5733,83 },{ 134,24 },{ 5816,59 },{ 5733,83 },{ 134,24 }}, // Faroese/Latin/Denmark
+       {    36,     7,    73,{ 5875,69 },{ 5944,105 },{ 6049,24 },{ 6073,93 },{ 6166,129 },{ 6049,24 }}, // Finnish/Latin/Finland
+       {    37,     7,    74,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/France
+       {    37,     7,     3,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Algeria
+       {    37,     7,    21,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Belgium
+       {    37,     7,    23,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Benin
+       {    37,     7,    34,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Burkina Faso
+       {    37,     7,    35,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Burundi
+       {    37,     7,    37,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Cameroon
+       {    37,     7,    38,{ 6443,64 },{ 6358,85 },{ 134,24 },{ 6443,64 },{ 6358,85 },{ 134,24 }}, // French/Latin/Canada
+       {    37,     7,    41,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Central African Republic
+       {    37,     7,    42,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Chad
+       {    37,     7,    48,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Comoros
+       {    37,     7,    49,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Congo Kinshasa
+       {    37,     7,    50,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Congo Brazzaville
+       {    37,     7,    53,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Ivory Coast
+       {    37,     7,    59,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Djibouti
+       {    37,     7,    66,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Equatorial Guinea
+       {    37,     7,    76,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/French Guiana
+       {    37,     7,    77,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/French Polynesia
+       {    37,     7,    79,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Gabon
+       {    37,     7,    88,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Guadeloupe
+       {    37,     7,    91,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Guinea
+       {    37,     7,    94,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Haiti
+       {    37,     7,   125,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Luxembourg
+       {    37,     7,   128,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Madagascar
+       {    37,     7,   132,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Mali
+       {    37,     7,   135,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Martinique
+       {    37,     7,   136,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Mauritania
+       {    37,     7,   137,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Mauritius
+       {    37,     7,   138,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Mayotte
+       {    37,     7,   142,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Monaco
+       {    37,     7,   145,{ 6507,61 },{ 6358,85 },{ 134,24 },{ 6507,61 },{ 6358,85 },{ 134,24 }}, // French/Latin/Morocco
+       {    37,     7,   153,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/New Caledonia
+       {    37,     7,   156,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Niger
+       {    37,     7,   176,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Reunion
+       {    37,     7,   179,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Rwanda
+       {    37,     7,   187,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Senegal
+       {    37,     7,   188,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Seychelles
+       {    37,     7,   200,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Saint Pierre And Miquelon
+       {    37,     7,   206,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Switzerland
+       {    37,     7,   207,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Syria
+       {    37,     7,   212,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Togo
+       {    37,     7,   216,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Tunisia
+       {    37,     7,   229,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Vanuatu
+       {    37,     7,   235,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Wallis And Futuna Islands
+       {    37,     7,   244,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Saint Barthelemy
+       {    37,     7,   245,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Saint Martin
+       {    38,     7,   151,{ 6568,48 },{ 6616,95 },{ 134,24 },{ 6568,48 },{ 6616,95 },{ 134,24 }}, // Western Frisian/Latin/Netherlands
+       {    39,     7,   224,{ 6711,61 },{ 6772,142 },{ 6914,24 },{ 6711,61 },{ 6938,167 },{ 6914,24 }}, // Gaelic/Latin/United Kingdom
+       {    40,     7,   197,{ 7105,60 },{ 7165,87 },{ 7252,24 },{ 7276,60 },{ 7336,87 },{ 7423,36 }}, // Galician/Latin/Spain
+       {    41,    15,    81,{ 7459,48 },{ 7507,99 },{ 7606,24 },{ 7459,48 },{ 7507,99 },{ 7606,24 }}, // Georgian/Georgian/Georgia
+       {    42,     7,    82,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Germany
+       {    42,     7,    14,{ 7821,48 },{ 7869,83 },{ 134,24 },{ 7952,59 },{ 7869,83 },{ 134,24 }}, // German/Latin/Austria
+       {    42,     7,    21,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Belgium
+       {    42,     7,   106,{ 7821,48 },{ 7869,83 },{ 134,24 },{ 7952,59 },{ 7869,83 },{ 134,24 }}, // German/Latin/Italy
+       {    42,     7,   123,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Liechtenstein
+       {    42,     7,   125,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Luxembourg
+       {    42,     7,   206,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Switzerland
+       {    43,    16,    85,{ 8011,50 },{ 8061,115 },{ 8176,24 },{ 8200,50 },{ 8250,115 },{ 8176,24 }}, // Greek/Greek/Greece
+       {    43,    16,    56,{ 8011,50 },{ 8061,115 },{ 8176,24 },{ 8200,50 },{ 8250,115 },{ 8176,24 }}, // Greek/Greek/Cyprus
+       {    44,     7,    86,{ 8365,48 },{ 8413,96 },{ 134,24 },{ 8365,48 },{ 8413,96 },{ 134,24 }}, // Greenlandic/Latin/Greenland
+       {    45,     7,   168,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Guarani/Latin/Paraguay
+       {    46,    17,   100,{ 8509,67 },{ 8576,87 },{ 8663,31 },{ 8509,67 },{ 8576,87 },{ 8663,31 }}, // Gujarati/Gujarati/India
+       {    47,     7,   157,{ 8694,48 },{ 8742,85 },{ 8827,24 },{ 8694,48 },{ 8742,85 },{ 8827,24 }}, // Hausa/Latin/Nigeria
+       {    47,     1,   157,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Hausa/Arabic/Nigeria
+       {    47,     7,    83,{ 8694,48 },{ 8742,85 },{ 8827,24 },{ 8694,48 },{ 8742,85 },{ 8827,24 }}, // Hausa/Latin/Ghana
+       {    47,     7,   156,{ 8694,48 },{ 8742,85 },{ 8827,24 },{ 8694,48 },{ 8742,85 },{ 8827,24 }}, // Hausa/Latin/Niger
+       {    48,    18,   105,{ 8851,58 },{ 8909,72 },{ 418,27 },{ 8851,58 },{ 8909,72 },{ 418,27 }}, // Hebrew/Hebrew/Israel
+       {    49,    13,   100,{ 8981,59 },{ 9040,73 },{ 9113,30 },{ 8981,59 },{ 9040,73 },{ 9113,30 }}, // Hindi/Devanagari/India
+       {    50,     7,    98,{ 9143,64 },{ 9207,98 },{ 9305,25 },{ 9143,64 },{ 9207,98 },{ 9305,25 }}, // Hungarian/Latin/Hungary
+       {    51,     7,    99,{ 9330,59 },{ 9389,82 },{ 9471,24 },{ 9330,59 },{ 9389,82 },{ 9471,24 }}, // Icelandic/Latin/Iceland
+       {    52,     7,   101,{ 9495,48 },{ 9543,87 },{ 134,24 },{ 9495,48 },{ 9543,87 },{ 134,24 }}, // Indonesian/Latin/Indonesia
+       {    53,     7,   260,{ 9630,48 },{ 9678,93 },{ 418,27 },{ 9630,48 },{ 9678,93 },{ 9771,24 }}, // Interlingua/Latin/World
+       {    55,    44,    38,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Inuktitut/Canadian Aboriginal/Canada
+       {    55,     7,    38,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Inuktitut/Latin/Canada
+       {    57,     7,   104,{ 9795,62 },{ 9857,107 },{ 9964,24 },{ 9795,62 },{ 9857,107 },{ 9964,24 }}, // Irish/Latin/Ireland
+       {    58,     7,   106,{ 9988,48 },{ 10036,94 },{ 10130,24 },{ 9988,48 },{ 10036,94 },{ 10130,24 }}, // Italian/Latin/Italy
+       {    58,     7,   184,{ 9988,48 },{ 10036,94 },{ 10130,24 },{ 9988,48 },{ 10036,94 },{ 10130,24 }}, // Italian/Latin/San Marino
+       {    58,     7,   206,{ 9988,48 },{ 10036,94 },{ 10130,24 },{ 9988,48 },{ 10036,94 },{ 10130,24 }}, // Italian/Latin/Switzerland
+       {    58,     7,   230,{ 9988,48 },{ 10036,94 },{ 10130,24 },{ 9988,48 },{ 10036,94 },{ 10130,24 }}, // Italian/Latin/Vatican City State
+       {    59,    19,   108,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Japanese/Japanese/Japan
+       {    60,     7,   101,{ 10154,48 },{ 9543,87 },{ 134,24 },{ 10154,48 },{ 9543,87 },{ 134,24 }}, // Javanese/Latin/Indonesia
+       {    61,    21,   100,{ 10202,63 },{ 10265,87 },{ 10352,31 },{ 10383,69 },{ 10265,87 },{ 10352,31 }}, // Kannada/Kannada/India
+       {    62,     1,   100,{ 10452,72 },{ 10452,72 },{ 10524,24 },{ 10452,72 },{ 10452,72 },{ 10524,24 }}, // Kashmiri/Arabic/India
+       {    63,     2,   110,{ 10548,60 },{ 10608,83 },{ 10691,24 },{ 10548,60 },{ 10715,83 },{ 10691,24 }}, // Kazakh/Cyrillic/Kazakhstan
+       {    64,     7,   179,{ 10798,60 },{ 10858,101 },{ 418,27 },{ 10798,60 },{ 10858,101 },{ 418,27 }}, // Kinyarwanda/Latin/Rwanda
+       {    65,     2,   116,{ 10959,48 },{ 11007,80 },{ 11087,24 },{ 11111,59 },{ 11170,80 },{ 11087,24 }}, // Kirghiz/Cyrillic/Kyrgyzstan
+       {    66,    22,   114,{ 11250,39 },{ 11250,39 },{ 11250,39 },{ 11250,39 },{ 11250,39 },{ 11250,39 }}, // Korean/Korean/South Korea
+       {    66,    22,   113,{ 11250,39 },{ 11250,39 },{ 11250,39 },{ 11250,39 },{ 11250,39 },{ 11250,39 }}, // Korean/Korean/North Korea
+       {    67,     7,   217,{ 11289,48 },{ 11337,88 },{ 11425,24 },{ 11289,48 },{ 11449,101 },{ 11425,24 }}, // Kurdish/Latin/Turkey
+       {    68,     7,    35,{ 11550,60 },{ 11610,106 },{ 418,27 },{ 11550,60 },{ 11610,106 },{ 418,27 }}, // Rundi/Latin/Burundi
+       {    69,    23,   117,{ 11716,61 },{ 11777,75 },{ 418,27 },{ 11716,61 },{ 11777,75 },{ 418,27 }}, // Lao/Lao/Laos
+       {    71,     7,   118,{ 11852,65 },{ 11917,101 },{ 134,24 },{ 11852,65 },{ 11917,101 },{ 134,24 }}, // Latvian/Latin/Latvia
+       {    72,     7,    49,{ 12018,48 },{ 12066,203 },{ 12269,24 },{ 12018,48 },{ 12066,203 },{ 12269,24 }}, // Lingala/Latin/Congo Kinshasa
+       {    72,     7,     6,{ 12018,48 },{ 12066,203 },{ 12269,24 },{ 12018,48 },{ 12066,203 },{ 12269,24 }}, // Lingala/Latin/Angola
+       {    72,     7,    41,{ 12018,48 },{ 12066,203 },{ 12269,24 },{ 12018,48 },{ 12066,203 },{ 12269,24 }}, // Lingala/Latin/Central African Republic
+       {    72,     7,    50,{ 12018,48 },{ 12066,203 },{ 12269,24 },{ 12018,48 },{ 12066,203 },{ 12269,24 }}, // Lingala/Latin/Congo Brazzaville
+       {    73,     7,   124,{ 12293,70 },{ 12363,96 },{ 12459,24 },{ 12293,70 },{ 12483,98 },{ 12459,24 }}, // Lithuanian/Latin/Lithuania
+       {    74,     2,   127,{ 12581,61 },{ 12642,85 },{ 12727,24 },{ 12581,61 },{ 12642,85 },{ 12727,24 }}, // Macedonian/Cyrillic/Macedonia
+       {    75,     7,   128,{ 12751,48 },{ 12799,92 },{ 134,24 },{ 12751,48 },{ 12799,92 },{ 134,24 }}, // Malagasy/Latin/Madagascar
+       {    76,     7,   130,{ 12891,48 },{ 12939,82 },{ 13021,24 },{ 12891,48 },{ 12939,82 },{ 13021,24 }}, // Malay/Latin/Malaysia
+       {    76,     1,   130,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Malay/Arabic/Malaysia
+       {    76,     7,    32,{ 12891,48 },{ 12939,82 },{ 13021,24 },{ 12891,48 },{ 12939,82 },{ 13021,24 }}, // Malay/Latin/Brunei
+       {    76,     7,   190,{ 12891,48 },{ 12939,82 },{ 13021,24 },{ 12891,48 },{ 12939,82 },{ 13021,24 }}, // Malay/Latin/Singapore
+       {    77,    24,   100,{ 13045,62 },{ 13107,88 },{ 13195,32 },{ 13045,62 },{ 13107,88 },{ 13195,32 }}, // Malayalam/Malayalam/India
+       {    78,     7,   133,{ 13227,48 },{ 13275,86 },{ 13361,36 },{ 13227,48 },{ 13275,86 },{ 13397,24 }}, // Maltese/Latin/Malta
+       {    79,     7,   154,{ 13421,59 },{ 13480,133 },{ 13613,24 },{ 13421,59 },{ 13480,133 },{ 13613,24 }}, // Maori/Latin/New Zealand
+       {    80,    13,   100,{ 13637,66 },{ 13703,86 },{ 13789,32 },{ 13637,66 },{ 13703,86 },{ 13789,32 }}, // Marathi/Devanagari/India
+       {    82,     2,   143,{ 13821,99 },{ 13920,192 },{ 14112,38 },{ 13821,99 },{ 14150,192 },{ 14112,38 }}, // Mongolian/Cyrillic/Mongolia
+       {    82,     8,    44,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Mongolian/Mongolian/China
+       {    84,    13,   150,{ 14342,85 },{ 14342,85 },{ 14427,53 },{ 14342,85 },{ 14342,85 },{ 14480,52 }}, // Nepali/Devanagari/Nepal
+       {    84,    13,   100,{ 14342,85 },{ 14342,85 },{ 14427,53 },{ 14342,85 },{ 14342,85 },{ 14480,52 }}, // Nepali/Devanagari/India
+       {    85,     7,   161,{ 5685,48 },{ 14532,83 },{ 134,24 },{ 5816,59 },{ 14532,83 },{ 134,24 }}, // Norwegian Bokmal/Latin/Norway
+       {    85,     7,   203,{ 5685,48 },{ 14532,83 },{ 134,24 },{ 5816,59 },{ 14532,83 },{ 134,24 }}, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
+       {    86,     7,    74,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Occitan/Latin/France
+       {    87,    26,   100,{ 14615,86 },{ 14615,86 },{ 14701,32 },{ 14615,86 },{ 14615,86 },{ 14701,32 }}, // Oriya/Oriya/India
+       {    88,     1,     1,{ 14733,68 },{ 14801,69 },{ 418,27 },{ 14870,69 },{ 14870,69 },{ 14939,24 }}, // Pashto/Arabic/Afghanistan
+       {    88,     1,   163,{ 14733,68 },{ 14801,69 },{ 418,27 },{ 14870,69 },{ 14870,69 },{ 14939,24 }}, // Pashto/Arabic/Pakistan
+       {    89,     1,   102,{ 14963,70 },{ 14963,70 },{ 15033,24 },{ 15057,74 },{ 15057,74 },{ 15033,24 }}, // Persian/Arabic/Iran
+       {    89,     1,     1,{ 15131,68 },{ 15131,68 },{ 14939,24 },{ 15199,62 },{ 15131,68 },{ 14939,24 }}, // Persian/Arabic/Afghanistan
+       {    90,     7,   172,{ 15261,48 },{ 15309,97 },{ 15406,24 },{ 15261,48 },{ 15430,99 },{ 15529,24 }}, // Polish/Latin/Poland
+       {    91,     7,    30,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Brazil
+       {    91,     7,     6,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Angola
+       {    91,     7,    39,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Cape Verde
+       {    91,     7,    62,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/East Timor
+       {    91,     7,    66,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Equatorial Guinea
+       {    91,     7,    92,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Guinea Bissau
+       {    91,     7,   125,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Luxembourg
+       {    91,     7,   126,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Macau
+       {    91,     7,   146,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Mozambique
+       {    91,     7,   173,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Portugal
+       {    91,     7,   185,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Sao Tome And Principe
+       {    91,     7,   206,{ 15553,48 },{ 15601,89 },{ 134,24 },{ 15553,48 },{ 15601,89 },{ 134,24 }}, // Portuguese/Latin/Switzerland
+       {    92,     4,   100,{ 15690,50 },{ 15740,68 },{ 15808,28 },{ 15690,50 },{ 15740,68 },{ 15808,28 }}, // Punjabi/Gurmukhi/India
+       {    92,     1,   163,{ 15836,67 },{ 15836,67 },{ 418,27 },{ 15836,67 },{ 15836,67 },{ 418,27 }}, // Punjabi/Arabic/Pakistan
+       {    93,     7,   169,{ 15903,48 },{ 15951,88 },{ 418,27 },{ 15903,48 },{ 15951,88 },{ 418,27 }}, // Quechua/Latin/Peru
+       {    93,     7,    26,{ 15903,48 },{ 15951,88 },{ 418,27 },{ 15903,48 },{ 15951,88 },{ 418,27 }}, // Quechua/Latin/Bolivia
+       {    93,     7,    63,{ 15903,48 },{ 15951,88 },{ 418,27 },{ 15903,48 },{ 15951,88 },{ 418,27 }}, // Quechua/Latin/Ecuador
+       {    94,     7,   206,{ 16039,67 },{ 16106,92 },{ 16198,24 },{ 16039,67 },{ 16106,92 },{ 16198,24 }}, // Romansh/Latin/Switzerland
+       {    95,     7,   177,{ 16222,60 },{ 16282,98 },{ 16380,24 },{ 16222,60 },{ 16282,98 },{ 16380,24 }}, // Romanian/Latin/Romania
+       {    95,     7,   141,{ 16222,60 },{ 16282,98 },{ 16380,24 },{ 16222,60 },{ 16282,98 },{ 16380,24 }}, // Romanian/Latin/Moldova
+       {    96,     2,   178,{ 16404,62 },{ 11170,80 },{ 11087,24 },{ 16466,62 },{ 16528,82 },{ 11087,24 }}, // Russian/Cyrillic/Russia
+       {    96,     2,    20,{ 16404,62 },{ 11170,80 },{ 11087,24 },{ 16466,62 },{ 16528,82 },{ 11087,24 }}, // Russian/Cyrillic/Belarus
+       {    96,     2,   110,{ 16404,62 },{ 11170,80 },{ 11087,24 },{ 16466,62 },{ 16528,82 },{ 11087,24 }}, // Russian/Cyrillic/Kazakhstan
+       {    96,     2,   116,{ 16404,62 },{ 11170,80 },{ 11087,24 },{ 16466,62 },{ 16528,82 },{ 11087,24 }}, // Russian/Cyrillic/Kyrgyzstan
+       {    96,     2,   141,{ 16404,62 },{ 11170,80 },{ 11087,24 },{ 16466,62 },{ 16528,82 },{ 11087,24 }}, // Russian/Cyrillic/Moldova
+       {    96,     2,   222,{ 16404,62 },{ 11170,80 },{ 11087,24 },{ 16466,62 },{ 16528,82 },{ 11087,24 }}, // Russian/Cyrillic/Ukraine
+       {    98,     7,    41,{ 16610,48 },{ 16658,91 },{ 16749,24 },{ 16610,48 },{ 16658,91 },{ 16749,24 }}, // Sango/Latin/Central African Republic
+       {    99,    13,   100,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sanskrit/Devanagari/India
+       {   100,     2,   243,{ 16773,48 },{ 16821,81 },{ 12727,24 },{ 16773,48 },{ 16821,81 },{ 12727,24 }}, // Serbian/Cyrillic/Serbia
+       {   100,     7,    27,{ 16902,50 },{ 16952,81 },{ 9771,24 },{ 17033,48 },{ 16952,81 },{ 9771,24 }}, // Serbian/Latin/Bosnia And Herzegowina
+       {   100,     7,   242,{ 17081,58 },{ 16952,81 },{ 9771,24 },{ 17081,58 },{ 16952,81 },{ 9771,24 }}, // Serbian/Latin/Montenegro
+       {   100,     7,   243,{ 17033,48 },{ 16952,81 },{ 9771,24 },{ 17033,48 },{ 16952,81 },{ 9771,24 }}, // Serbian/Latin/Serbia
+       {   100,     2,    27,{ 17139,50 },{ 16821,81 },{ 12727,24 },{ 16773,48 },{ 16821,81 },{ 12727,24 }}, // Serbian/Cyrillic/Bosnia And Herzegowina
+       {   100,     2,   242,{ 17139,50 },{ 16821,81 },{ 12727,24 },{ 17139,50 },{ 16821,81 },{ 12727,24 }}, // Serbian/Cyrillic/Montenegro
+       {   100,     2,   257,{ 17139,50 },{ 16821,81 },{ 12727,24 },{ 17139,50 },{ 16821,81 },{ 12727,24 }}, // Serbian/Cyrillic/Kosovo
+       {   100,     7,   257,{ 17081,58 },{ 16952,81 },{ 9771,24 },{ 17081,58 },{ 16952,81 },{ 9771,24 }}, // Serbian/Latin/Kosovo
+       {   101,     2,    81,{ 17189,63 },{ 17252,82 },{ 11087,24 },{ 17334,60 },{ 17394,86 },{ 11087,24 }}, // Ossetic/Cyrillic/Georgia
+       {   101,     2,   178,{ 17189,63 },{ 17252,82 },{ 11087,24 },{ 17334,60 },{ 17394,86 },{ 11087,24 }}, // Ossetic/Cyrillic/Russia
+       {   102,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Southern Sotho/Latin/South Africa
+       {   103,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tswana/Latin/South Africa
+       {   104,     7,   240,{ 17480,48 },{ 17528,100 },{ 17628,24 },{ 17480,48 },{ 17528,100 },{ 17628,24 }}, // Shona/Latin/Zimbabwe
+       {   105,     1,   163,{ 17652,72 },{ 17652,72 },{ 134,24 },{ 17652,72 },{ 17652,72 },{ 134,24 }}, // Sindhi/Arabic/Pakistan
+       {   106,    32,   198,{ 17724,59 },{ 17783,96 },{ 17879,32 },{ 17911,61 },{ 17783,96 },{ 17879,32 }}, // Sinhala/Sinhala/Sri Lanka
+       {   107,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Swati/Latin/South Africa
+       {   108,     7,   191,{ 17972,48 },{ 18020,82 },{ 9771,24 },{ 17972,48 },{ 18102,89 },{ 9771,24 }}, // Slovak/Latin/Slovakia
+       {   109,     7,   192,{ 18191,59 },{ 18250,86 },{ 9771,24 },{ 18191,59 },{ 18250,86 },{ 9771,24 }}, // Slovenian/Latin/Slovenia
+       {   110,     7,   194,{ 18336,48 },{ 18384,92 },{ 18476,24 },{ 18336,48 },{ 18500,189 },{ 18476,24 }}, // Somali/Latin/Somalia
+       {   110,     7,    59,{ 18336,48 },{ 18384,92 },{ 18476,24 },{ 18336,48 },{ 18500,189 },{ 18476,24 }}, // Somali/Latin/Djibouti
+       {   110,     7,    69,{ 18336,48 },{ 18384,92 },{ 18476,24 },{ 18336,48 },{ 18500,189 },{ 18476,24 }}, // Somali/Latin/Ethiopia
+       {   110,     7,   111,{ 18336,48 },{ 18384,92 },{ 18476,24 },{ 18336,48 },{ 18500,189 },{ 18476,24 }}, // Somali/Latin/Kenya
+       {   111,     7,   197,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18689,61 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Spain
+       {   111,     7,    10,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Argentina
+       {   111,     7,    22,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Belize
+       {   111,     7,    26,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Bolivia
+       {   111,     7,    30,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Brazil
+       {   111,     7,    43,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Chile
+       {   111,     7,    47,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Colombia
+       {   111,     7,    52,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Costa Rica
+       {   111,     7,    55,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Cuba
+       {   111,     7,    61,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Dominican Republic
+       {   111,     7,    63,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Ecuador
+       {   111,     7,    65,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/El Salvador
+       {   111,     7,    66,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18689,61 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Equatorial Guinea
+       {   111,     7,    90,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Guatemala
+       {   111,     7,    96,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Honduras
+       {   111,     7,   139,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Mexico
+       {   111,     7,   155,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Nicaragua
+       {   111,     7,   166,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Panama
+       {   111,     7,   168,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18689,61 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Paraguay
+       {   111,     7,   169,{ 18923,60 },{ 15951,88 },{ 18839,24 },{ 18983,60 },{ 19043,88 },{ 18839,24 }}, // Spanish/Latin/Peru
+       {   111,     7,   170,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18689,61 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Philippines
+       {   111,     7,   174,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Puerto Rico
+       {   111,     7,   225,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/United States
+       {   111,     7,   227,{ 18923,60 },{ 15951,88 },{ 18839,24 },{ 18983,60 },{ 19043,88 },{ 18839,24 }}, // Spanish/Latin/Uruguay
+       {   111,     7,   231,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18689,61 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Venezuela
+       {   111,     7,   238,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18689,61 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Canary Islands
+       {   111,     7,   246,{ 18863,60 },{ 18750,89 },{ 18839,24 },{ 18863,60 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Latin America
+       {   111,     7,   250,{ 18689,61 },{ 18750,89 },{ 18839,24 },{ 18689,61 },{ 18750,89 },{ 18839,24 }}, // Spanish/Latin/Ceuta And Melilla
+       {   113,     7,   210,{ 19131,48 },{ 19179,84 },{ 134,24 },{ 19131,48 },{ 19179,84 },{ 134,24 }}, // Swahili/Latin/Tanzania
+       {   113,     7,    49,{ 19131,48 },{ 19179,84 },{ 134,24 },{ 19131,48 },{ 19179,84 },{ 134,24 }}, // Swahili/Latin/Congo Kinshasa
+       {   113,     7,   111,{ 19131,48 },{ 19179,84 },{ 134,24 },{ 19131,48 },{ 19179,84 },{ 134,24 }}, // Swahili/Latin/Kenya
+       {   113,     7,   221,{ 19131,48 },{ 19179,84 },{ 134,24 },{ 19131,48 },{ 19179,84 },{ 134,24 }}, // Swahili/Latin/Uganda
+       {   114,     7,   205,{ 19263,59 },{ 19322,86 },{ 134,24 },{ 19263,59 },{ 19322,86 },{ 134,24 }}, // Swedish/Latin/Sweden
+       {   114,     7,    73,{ 19263,59 },{ 19322,86 },{ 134,24 },{ 19263,59 },{ 19322,86 },{ 134,24 }}, // Swedish/Latin/Finland
+       {   114,     7,   248,{ 19263,59 },{ 19322,86 },{ 134,24 },{ 19263,59 },{ 19322,86 },{ 134,24 }}, // Swedish/Latin/Aland Islands
+       {   115,     7,   106,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sardinian/Latin/Italy
+       {   116,     2,   209,{ 10959,48 },{ 19408,71 },{ 11087,24 },{ 10959,48 },{ 19408,71 },{ 11087,24 }}, // Tajik/Cyrillic/Tajikistan
+       {   117,    27,   100,{ 19479,58 },{ 19537,86 },{ 19623,31 },{ 19479,58 },{ 19537,86 },{ 19623,31 }}, // Tamil/Tamil/India
+       {   117,    27,   130,{ 19479,58 },{ 19537,86 },{ 19623,31 },{ 19479,58 },{ 19537,86 },{ 19623,31 }}, // Tamil/Tamil/Malaysia
+       {   117,    27,   190,{ 19479,58 },{ 19537,86 },{ 19623,31 },{ 19479,58 },{ 19537,86 },{ 19623,31 }}, // Tamil/Tamil/Singapore
+       {   117,    27,   198,{ 19479,58 },{ 19537,86 },{ 19623,31 },{ 19479,58 },{ 19537,86 },{ 19623,31 }}, // Tamil/Tamil/Sri Lanka
+       {   118,     2,   178,{ 19654,62 },{ 19716,81 },{ 418,27 },{ 19654,62 },{ 19716,81 },{ 418,27 }}, // Tatar/Cyrillic/Russia
+       {   119,    28,   100,{ 19797,62 },{ 19859,86 },{ 19945,31 },{ 19797,62 },{ 19859,86 },{ 19945,31 }}, // Telugu/Telugu/India
+       {   120,    30,   211,{ 19976,63 },{ 20039,98 },{ 19976,63 },{ 19976,63 },{ 20039,98 },{ 19976,63 }}, // Thai/Thai/Thailand
+       {   121,    31,    44,{ 2704,63 },{ 20137,159 },{ 418,27 },{ 2704,63 },{ 20296,147 },{ 418,27 }}, // Tibetan/Tibetan/China
+       {   121,    31,   100,{ 2704,63 },{ 20137,159 },{ 418,27 },{ 2704,63 },{ 20296,147 },{ 418,27 }}, // Tibetan/Tibetan/India
+       {   122,    14,    69,{ 20443,36 },{ 20479,54 },{ 20533,24 },{ 20443,36 },{ 20479,54 },{ 20533,24 }}, // Tigrinya/Ethiopic/Ethiopia
+       {   122,    14,    67,{ 20443,36 },{ 20479,54 },{ 20533,24 },{ 20443,36 },{ 20479,54 },{ 20533,24 }}, // Tigrinya/Ethiopic/Eritrea
+       {   123,     7,   214,{ 20557,51 },{ 20608,87 },{ 20695,24 },{ 20557,51 },{ 20608,87 },{ 20695,24 }}, // Tongan/Latin/Tonga
+       {   124,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tsonga/Latin/South Africa
+       {   125,     7,   217,{ 20719,48 },{ 20767,75 },{ 20842,24 },{ 20719,48 },{ 20767,75 },{ 20842,24 }}, // Turkish/Latin/Turkey
+       {   125,     7,    56,{ 20719,48 },{ 20767,75 },{ 20842,24 },{ 20719,48 },{ 20767,75 },{ 20842,24 }}, // Turkish/Latin/Cyprus
+       {   126,     7,   218,{ 20866,50 },{ 20916,77 },{ 20993,24 },{ 21017,51 },{ 21068,77 },{ 20993,24 }}, // Turkmen/Latin/Turkmenistan
+       {   128,     1,    44,{ 21145,84 },{ 21145,84 },{ 418,27 },{ 21145,84 },{ 21145,84 },{ 418,27 }}, // Uighur/Arabic/China
+       {   129,     2,   222,{ 21229,48 },{ 21277,95 },{ 21372,24 },{ 21396,67 },{ 21463,87 },{ 21550,24 }}, // Ukrainian/Cyrillic/Ukraine
+       {   130,     1,   163,{ 21574,68 },{ 21574,68 },{ 134,24 },{ 21574,68 },{ 21574,68 },{ 134,24 }}, // Urdu/Arabic/Pakistan
+       {   130,     1,   100,{ 21574,68 },{ 21574,68 },{ 134,24 },{ 21574,68 },{ 21574,68 },{ 134,24 }}, // Urdu/Arabic/India
+       {   131,     7,   228,{ 21642,48 },{ 21690,75 },{ 21765,24 },{ 21789,48 },{ 21837,75 },{ 21765,24 }}, // Uzbek/Latin/Uzbekistan
+       {   131,     1,     1,{ 21912,47 },{ 15131,68 },{ 418,27 },{ 21912,47 },{ 15131,68 },{ 418,27 }}, // Uzbek/Arabic/Afghanistan
+       {   131,     2,   228,{ 21959,48 },{ 22007,71 },{ 11087,24 },{ 21959,48 },{ 22007,71 },{ 11087,24 }}, // Uzbek/Cyrillic/Uzbekistan
+       {   132,     7,   232,{ 22078,75 },{ 22153,99 },{ 418,27 },{ 22252,75 },{ 22327,99 },{ 418,27 }}, // Vietnamese/Latin/Vietnam
+       {   133,     7,   260,{ 22426,48 },{ 22474,74 },{ 22548,24 },{ 22572,48 },{ 22474,74 },{ 22548,24 }}, // Volapuk/Latin/World
+       {   134,     7,   224,{ 22620,52 },{ 22672,87 },{ 22759,26 },{ 22785,59 },{ 22672,87 },{ 22759,26 }}, // Welsh/Latin/United Kingdom
+       {   135,     7,   187,{ 22844,47 },{ 22891,84 },{ 418,27 },{ 22844,47 },{ 22891,84 },{ 418,27 }}, // Wolof/Latin/Senegal
+       {   136,     7,   195,{ 22975,48 },{ 23023,91 },{ 418,27 },{ 22975,48 },{ 23023,91 },{ 418,27 }}, // Xhosa/Latin/South Africa
+       {   137,    18,   260,{ 23114,58 },{ 23172,92 },{ 418,27 },{ 23172,92 },{ 23172,92 },{ 418,27 }}, // Yiddish/Hebrew/World
+       {   138,     7,   157,{ 23264,40 },{ 23304,73 },{ 23377,27 },{ 23404,55 },{ 23459,121 },{ 23377,27 }}, // Yoruba/Latin/Nigeria
+       {   138,     7,    23,{ 23580,41 },{ 23621,74 },{ 23695,27 },{ 23722,56 },{ 23778,134 },{ 23695,27 }}, // Yoruba/Latin/Benin
+       {   140,     7,   195,{ 23912,48 },{ 23960,91 },{ 134,24 },{ 23912,48 },{ 23960,91 },{ 24051,24 }}, // Zulu/Latin/South Africa
+       {   141,     7,   161,{ 5685,48 },{ 14532,83 },{ 134,24 },{ 24075,59 },{ 14532,83 },{ 134,24 }}, // Norwegian Nynorsk/Latin/Norway
+       {   142,     7,    27,{ 8365,48 },{ 24134,83 },{ 9771,24 },{ 8365,48 },{ 24134,83 },{ 9771,24 }}, // Bosnian/Latin/Bosnia And Herzegowina
+       {   142,     2,    27,{ 24217,48 },{ 24265,83 },{ 12727,24 },{ 24217,48 },{ 24265,83 },{ 12727,24 }}, // Bosnian/Cyrillic/Bosnia And Herzegowina
+       {   143,    29,   131,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Divehi/Thaana/Maldives
+       {   144,     7,   251,{ 24348,102 },{ 24450,140 },{ 418,27 },{ 24348,102 },{ 24450,140 },{ 418,27 }}, // Manx/Latin/Isle Of Man
+       {   145,     7,   224,{ 24590,46 },{ 24636,130 },{ 418,27 },{ 24590,46 },{ 24636,130 },{ 418,27 }}, // Cornish/Latin/United Kingdom
+       {   146,     7,    83,{ 24766,48 },{ 24814,192 },{ 418,27 },{ 24766,48 },{ 24814,192 },{ 418,27 }}, // Akan/Latin/Ghana
+       {   147,    13,   100,{ 25006,88 },{ 25006,88 },{ 418,27 },{ 25006,88 },{ 25006,88 },{ 418,27 }}, // Konkani/Devanagari/India
+       {   148,     7,    83,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Ga/Latin/Ghana
+       {   149,     7,   157,{ 25094,48 },{ 25142,87 },{ 25229,24 },{ 25094,48 },{ 25142,87 },{ 25229,24 }}, // Igbo/Latin/Nigeria
+       {   150,     7,   111,{ 25253,48 },{ 25301,189 },{ 25490,24 },{ 25253,48 },{ 25301,189 },{ 25490,24 }}, // Kamba/Latin/Kenya
+       {   151,    33,   103,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Syriac/Syriac/Iraq
+       {   152,    14,    67,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Blin/Ethiopic/Eritrea
+       {   153,    14,    69,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Geez/Ethiopic/Ethiopia
+       {   155,     7,    69,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sidamo/Latin/Ethiopia
+       {   156,     7,   157,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Atsam/Latin/Nigeria
+       {   157,    14,    67,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tigre/Ethiopic/Eritrea
+       {   158,     7,   157,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Jju/Latin/Nigeria
+       {   159,     7,   106,{ 25514,48 },{ 25562,77 },{ 25639,24 },{ 25514,48 },{ 25562,77 },{ 25639,24 }}, // Friulian/Latin/Italy
+       {   160,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Venda/Latin/South Africa
+       {   161,     7,    83,{ 25663,48 },{ 25711,87 },{ 25798,24 },{ 25663,48 },{ 25711,87 },{ 25798,24 }}, // Ewe/Latin/Ghana
+       {   161,     7,   212,{ 25663,48 },{ 25711,87 },{ 25798,24 },{ 25663,48 },{ 25711,87 },{ 25798,24 }}, // Ewe/Latin/Togo
+       {   162,    14,    69,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Walamo/Ethiopic/Ethiopia
+       {   163,     7,   225,{ 25822,59 },{ 25881,95 },{ 418,27 },{ 25822,59 },{ 25881,95 },{ 418,27 }}, // Hawaiian/Latin/United States
+       {   164,     7,   157,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tyap/Latin/Nigeria
+       {   165,     7,   129,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Nyanja/Latin/Malawi
+       {   166,     7,   170,{ 25976,48 },{ 26024,88 },{ 26112,38 },{ 25976,48 },{ 26024,88 },{ 25976,48 }}, // Filipino/Latin/Philippines
+       {   167,     7,   206,{ 7630,48 },{ 26150,86 },{ 134,24 },{ 7630,48 },{ 26150,86 },{ 134,24 }}, // Swiss German/Latin/Switzerland
+       {   167,     7,    74,{ 7630,48 },{ 26150,86 },{ 134,24 },{ 7630,48 },{ 26150,86 },{ 134,24 }}, // Swiss German/Latin/France
+       {   167,     7,   123,{ 7630,48 },{ 26150,86 },{ 134,24 },{ 7630,48 },{ 26150,86 },{ 134,24 }}, // Swiss German/Latin/Liechtenstein
+       {   168,    34,    44,{ 26236,38 },{ 26236,38 },{ 418,27 },{ 26236,38 },{ 26236,38 },{ 418,27 }}, // Sichuan Yi/Yi/China
+       {   169,     7,   121,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Kpelle/Latin/Liberia
+       {   170,     7,    82,{ 26274,59 },{ 26333,85 },{ 134,24 },{ 26274,59 },{ 26333,85 },{ 134,24 }}, // Low German/Latin/Germany
+       {   170,     7,   151,{ 26274,59 },{ 26333,85 },{ 134,24 },{ 26274,59 },{ 26333,85 },{ 134,24 }}, // Low German/Latin/Netherlands
+       {   171,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // South Ndebele/Latin/South Africa
+       {   172,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Northern Sotho/Latin/South Africa
+       {   173,     7,   161,{ 26418,59 },{ 26477,145 },{ 26622,24 },{ 26418,59 },{ 26477,145 },{ 26622,24 }}, // Northern Sami/Latin/Norway
+       {   173,     7,    73,{ 26646,60 },{ 26477,145 },{ 26622,24 },{ 26646,60 },{ 26477,145 },{ 26622,24 }}, // Northern Sami/Latin/Finland
+       {   173,     7,   205,{ 26418,59 },{ 26477,145 },{ 26622,24 },{ 26418,59 },{ 26477,145 },{ 26622,24 }}, // Northern Sami/Latin/Sweden
+       {   174,     7,   208,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Taroko/Latin/Taiwan
+       {   175,     7,   111,{ 26706,48 },{ 26754,88 },{ 26842,24 },{ 26706,48 },{ 26754,88 },{ 26842,24 }}, // Gusii/Latin/Kenya
+       {   176,     7,   111,{ 26866,48 },{ 26914,221 },{ 27135,24 },{ 26866,48 },{ 26914,221 },{ 27135,24 }}, // Taita/Latin/Kenya
+       {   177,     7,   187,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Senegal
+       {   177,     7,    34,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Burkina Faso
+       {   177,     7,    37,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Cameroon
+       {   177,     7,    80,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Gambia
+       {   177,     7,    83,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Ghana
+       {   177,     7,    91,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Guinea
+       {   177,     7,    92,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Guinea Bissau
+       {   177,     7,   121,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Liberia
+       {   177,     7,   136,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Mauritania
+       {   177,     7,   156,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Niger
+       {   177,     7,   157,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Nigeria
+       {   177,     7,   189,{ 27159,48 },{ 27207,77 },{ 27284,24 },{ 27159,48 },{ 27207,77 },{ 27284,24 }}, // Fulah/Latin/Sierra Leone
+       {   177,   134,    91,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Fulah/Adlam/Guinea
+       {   178,     7,   111,{ 27308,48 },{ 27356,185 },{ 27541,24 },{ 27308,48 },{ 27356,185 },{ 27541,24 }}, // Kikuyu/Latin/Kenya
+       {   179,     7,   111,{ 27565,48 },{ 27613,173 },{ 27786,24 },{ 27565,48 },{ 27613,173 },{ 27786,24 }}, // Samburu/Latin/Kenya
+       {   180,     7,   146,{ 27810,48 },{ 27858,88 },{ 134,24 },{ 27810,48 },{ 27858,88 },{ 134,24 }}, // Sena/Latin/Mozambique
+       {   181,     7,   240,{ 27946,52 },{ 27998,112 },{ 28110,24 },{ 27946,52 },{ 27998,112 },{ 28110,24 }}, // North Ndebele/Latin/Zimbabwe
+       {   182,     7,   210,{ 28134,39 },{ 28173,194 },{ 28367,24 },{ 28134,39 },{ 28173,194 },{ 28367,24 }}, // Rombo/Latin/Tanzania
+       {   183,     9,   145,{ 28391,48 },{ 28439,81 },{ 28520,24 },{ 28391,48 },{ 28439,81 },{ 28520,24 }}, // Tachelhit/Tifinagh/Morocco
+       {   183,     7,   145,{ 28544,48 },{ 28592,81 },{ 28673,24 },{ 28544,48 },{ 28592,81 },{ 28673,24 }}, // Tachelhit/Latin/Morocco
+       {   184,     7,     3,{ 28697,48 },{ 28745,82 },{ 28827,24 },{ 28851,48 },{ 28899,84 },{ 28983,24 }}, // Kabyle/Latin/Algeria
+       {   185,     7,   221,{ 29007,48 },{ 29055,152 },{ 134,24 },{ 29007,48 },{ 29055,152 },{ 134,24 }}, // Nyankole/Latin/Uganda
+       {   186,     7,   210,{ 29207,48 },{ 29255,254 },{ 29509,24 },{ 29207,48 },{ 29255,254 },{ 29509,24 }}, // Bena/Latin/Tanzania
+       {   187,     7,   210,{ 19131,48 },{ 29533,87 },{ 134,24 },{ 19131,48 },{ 29533,87 },{ 134,24 }}, // Vunjo/Latin/Tanzania
+       {   188,     7,   132,{ 29620,47 },{ 29667,92 },{ 29759,24 },{ 29620,47 },{ 29667,92 },{ 29759,24 }}, // Bambara/Latin/Mali
+       {   188,    75,   132,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Bambara/Nko/Mali
+       {   189,     7,   111,{ 29783,48 },{ 29831,207 },{ 30038,24 },{ 29783,48 },{ 29831,207 },{ 30038,24 }}, // Embu/Latin/Kenya
+       {   190,    12,   225,{ 30062,36 },{ 30098,58 },{ 30156,24 },{ 30062,36 },{ 30098,58 },{ 30156,24 }}, // Cherokee/Cherokee/United States
+       {   191,     7,   137,{ 30180,47 },{ 30227,68 },{ 30295,24 },{ 30180,47 },{ 30227,68 },{ 30295,24 }}, // Morisyen/Latin/Mauritius
+       {   192,     7,   210,{ 19131,48 },{ 30319,264 },{ 134,24 },{ 19131,48 },{ 30319,264 },{ 134,24 }}, // Makonde/Latin/Tanzania
+       {   193,     7,   210,{ 30583,83 },{ 30666,111 },{ 30777,24 },{ 30583,83 },{ 30666,111 },{ 30777,24 }}, // Langi/Latin/Tanzania
+       {   194,     7,   221,{ 30801,48 },{ 30849,97 },{ 134,24 },{ 30801,48 },{ 30849,97 },{ 134,24 }}, // Ganda/Latin/Uganda
+       {   195,     7,   239,{ 30946,48 },{ 30994,83 },{ 31077,24 },{ 30946,48 },{ 30994,83 },{ 31077,24 }}, // Bemba/Latin/Zambia
+       {   196,     7,    39,{ 31101,48 },{ 31149,85 },{ 134,24 },{ 31101,48 },{ 31149,85 },{ 134,24 }}, // Kabuverdianu/Latin/Cape Verde
+       {   197,     7,   111,{ 31234,48 },{ 31282,86 },{ 31368,24 },{ 31234,48 },{ 31282,86 },{ 31368,24 }}, // Meru/Latin/Kenya
+       {   198,     7,   111,{ 31392,49 },{ 31441,121 },{ 31562,24 },{ 31392,49 },{ 31441,121 },{ 31562,24 }}, // Kalenjin/Latin/Kenya
+       {   199,     7,   148,{ 0,48 },{ 31586,136 },{ 134,24 },{ 0,48 },{ 31586,136 },{ 134,24 }}, // Nama/Latin/Namibia
+       {   200,     7,   210,{ 19131,48 },{ 29533,87 },{ 134,24 },{ 19131,48 },{ 29533,87 },{ 134,24 }}, // Machame/Latin/Tanzania
+       {   201,     7,    82,{ 31722,59 },{ 31781,87 },{ 13021,24 },{ 31868,48 },{ 31781,87 },{ 13021,24 }}, // Colognian/Latin/Germany
+       {   202,     7,   111,{ 31916,51 },{ 31967,132 },{ 418,27 },{ 31916,51 },{ 31967,132 },{ 418,27 }}, // Masai/Latin/Kenya
+       {   202,     7,   210,{ 31916,51 },{ 31967,132 },{ 418,27 },{ 31916,51 },{ 31967,132 },{ 418,27 }}, // Masai/Latin/Tanzania
+       {   203,     7,   221,{ 30801,48 },{ 30849,97 },{ 134,24 },{ 30801,48 },{ 30849,97 },{ 134,24 }}, // Soga/Latin/Uganda
+       {   204,     7,   111,{ 32099,48 },{ 19179,84 },{ 134,24 },{ 32099,48 },{ 19179,84 },{ 134,24 }}, // Luyia/Latin/Kenya
+       {   205,     7,   210,{ 32147,48 },{ 19179,84 },{ 134,24 },{ 32147,48 },{ 19179,84 },{ 134,24 }}, // Asu/Latin/Tanzania
+       {   206,     7,   221,{ 32195,48 },{ 32243,94 },{ 32337,24 },{ 32195,48 },{ 32243,94 },{ 32337,24 }}, // Teso/Latin/Uganda
+       {   206,     7,   111,{ 32195,48 },{ 32243,94 },{ 32337,24 },{ 32195,48 },{ 32243,94 },{ 32337,24 }}, // Teso/Latin/Kenya
+       {   207,     7,    67,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Saho/Latin/Eritrea
+       {   208,     7,   132,{ 32361,46 },{ 32407,88 },{ 32495,24 },{ 32361,46 },{ 32407,88 },{ 32495,24 }}, // Koyra Chiini/Latin/Mali
+       {   209,     7,   210,{ 19131,48 },{ 29533,87 },{ 134,24 },{ 19131,48 },{ 29533,87 },{ 134,24 }}, // Rwa/Latin/Tanzania
+       {   210,     7,   111,{ 32519,48 },{ 32567,186 },{ 32753,24 },{ 32519,48 },{ 32567,186 },{ 32753,24 }}, // Luo/Latin/Kenya
+       {   211,     7,   221,{ 29007,48 },{ 29055,152 },{ 134,24 },{ 29007,48 },{ 29055,152 },{ 134,24 }}, // Chiga/Latin/Uganda
+       {   212,     7,   145,{ 32777,48 },{ 32825,86 },{ 32911,24 },{ 32777,48 },{ 32825,86 },{ 32911,24 }}, // Central Morocco Tamazight/Latin/Morocco
+       {   213,     7,   132,{ 32361,46 },{ 32407,88 },{ 32495,24 },{ 32361,46 },{ 32407,88 },{ 32495,24 }}, // Koyraboro Senni/Latin/Mali
+       {   214,     7,   210,{ 19131,48 },{ 32935,84 },{ 134,24 },{ 19131,48 },{ 32935,84 },{ 134,24 }}, // Shambala/Latin/Tanzania
+       {   215,    13,   100,{ 33019,88 },{ 33019,88 },{ 33107,31 },{ 33019,88 },{ 33019,88 },{ 33107,31 }}, // Bodo/Devanagari/India
+       {   218,     2,   178,{ 21959,48 },{ 11170,80 },{ 11087,24 },{ 21959,48 },{ 11170,80 },{ 11087,24 }}, // Chechen/Cyrillic/Russia
+       {   219,     2,   178,{ 33138,65 },{ 33203,117 },{ 33320,30 },{ 33138,65 },{ 33350,117 },{ 33320,30 }}, // Church/Cyrillic/Russia
+       {   220,     2,   178,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Chuvash/Cyrillic/Russia
+       {   230,     7,    49,{ 33467,49 },{ 33516,99 },{ 33615,24 },{ 33467,49 },{ 33516,99 },{ 33615,24 }}, // Luba Katanga/Latin/Congo Kinshasa
+       {   231,     7,   125,{ 33639,48 },{ 33687,85 },{ 134,24 },{ 33772,59 },{ 33687,85 },{ 134,24 }}, // Luxembourgish/Latin/Luxembourg
+       {   236,     7,    21,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Walloon/Latin/Belgium
+       {   237,     7,    37,{ 33831,48 },{ 33879,195 },{ 34074,24 },{ 33831,48 },{ 33879,195 },{ 34074,24 }}, // Aghem/Latin/Cameroon
+       {   238,     7,    37,{ 34098,48 },{ 34146,90 },{ 34236,24 },{ 34098,48 },{ 34146,90 },{ 34236,24 }}, // Basaa/Latin/Cameroon
+       {   239,     7,   156,{ 32361,46 },{ 32407,88 },{ 32495,24 },{ 32361,46 },{ 32407,88 },{ 32495,24 }}, // Zarma/Latin/Niger
+       {   240,     7,    37,{ 34260,49 },{ 34309,99 },{ 34408,24 },{ 34260,49 },{ 34309,99 },{ 34408,24 }}, // Duala/Latin/Cameroon
+       {   241,     7,   187,{ 34432,36 },{ 34468,82 },{ 34550,24 },{ 34432,36 },{ 34468,82 },{ 34550,24 }}, // Jola Fonyi/Latin/Senegal
+       {   242,     7,    37,{ 34574,50 },{ 34624,141 },{ 34765,24 },{ 34574,50 },{ 34624,141 },{ 34765,24 }}, // Ewondo/Latin/Cameroon
+       {   243,     7,    37,{ 34789,39 },{ 34828,191 },{ 418,27 },{ 34789,39 },{ 34828,191 },{ 418,27 }}, // Bafia/Latin/Cameroon
+       {   244,     7,   146,{ 35019,48 },{ 35067,213 },{ 35280,24 },{ 35019,48 },{ 35067,213 },{ 35280,24 }}, // Makhuwa Meetto/Latin/Mozambique
+       {   245,     7,    37,{ 35304,48 },{ 35352,139 },{ 35491,24 },{ 35304,48 },{ 35352,139 },{ 35491,24 }}, // Mundang/Latin/Cameroon
+       {   246,     7,    37,{ 35515,51 },{ 35566,143 },{ 418,27 },{ 35515,51 },{ 35566,143 },{ 418,27 }}, // Kwasio/Latin/Cameroon
+       {   247,     7,   254,{ 35709,54 },{ 35763,96 },{ 35859,24 },{ 35709,54 },{ 35763,96 },{ 35859,24 }}, // Nuer/Latin/South Sudan
+       {   248,     2,   178,{ 35883,50 },{ 35933,116 },{ 36049,24 },{ 35883,50 },{ 36073,121 },{ 36049,24 }}, // Sakha/Cyrillic/Russia
+       {   249,     7,   210,{ 36194,48 },{ 36242,117 },{ 418,27 },{ 36194,48 },{ 36242,117 },{ 418,27 }}, // Sangu/Latin/Tanzania
+       {   251,     7,   156,{ 32361,46 },{ 32407,88 },{ 32495,24 },{ 32361,46 },{ 32407,88 },{ 32495,24 }}, // Tasawaq/Latin/Niger
+       {   252,    35,   121,{ 36359,38 },{ 36397,61 },{ 418,27 },{ 36359,38 },{ 36397,61 },{ 418,27 }}, // Vai/Vai/Liberia
+       {   252,     7,   121,{ 36458,81 },{ 36458,81 },{ 418,27 },{ 36458,81 },{ 36458,81 },{ 418,27 }}, // Vai/Latin/Liberia
+       {   253,     7,   206,{ 36539,48 },{ 36587,99 },{ 36686,24 },{ 36539,48 },{ 36587,99 },{ 36686,24 }}, // Walser/Latin/Switzerland
+       {   254,     7,    37,{ 36710,51 },{ 36761,191 },{ 418,27 },{ 36710,51 },{ 36761,191 },{ 418,27 }}, // Yangben/Latin/Cameroon
+       {   256,     7,   197,{ 36952,48 },{ 37000,85 },{ 37085,24 },{ 37109,48 },{ 37157,117 },{ 37085,24 }}, // Asturian/Latin/Spain
+       {   257,     7,    37,{ 37274,174 },{ 37274,174 },{ 418,27 },{ 37274,174 },{ 37274,174 },{ 418,27 }}, // Ngomba/Latin/Cameroon
+       {   258,     7,    37,{ 37448,102 },{ 37448,102 },{ 418,27 },{ 37448,102 },{ 37448,102 },{ 418,27 }}, // Kako/Latin/Cameroon
+       {   259,     7,    37,{ 37550,137 },{ 37687,142 },{ 37829,36 },{ 37550,137 },{ 37687,142 },{ 37829,36 }}, // Meta/Latin/Cameroon
+       {   260,     7,    37,{ 37865,165 },{ 37865,165 },{ 418,27 },{ 37865,165 },{ 37865,165 },{ 418,27 }}, // Ngiemboon/Latin/Cameroon
+       {   290,    11,   100,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Manipuri/Bengali/India
+       {   309,   100,   232,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tai Dam/Tai Viet/Vietnam
+       {   312,     7,    37,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Akoose/Latin/Cameroon
+       {   313,     7,   225,{ 38030,180 },{ 38030,180 },{ 418,27 },{ 38030,180 },{ 38030,180 },{ 418,27 }}, // Lakota/Latin/United States
+       {   314,     9,   145,{ 28391,48 },{ 28439,81 },{ 28520,24 },{ 28391,48 },{ 28439,81 },{ 28520,24 }}, // Standard Moroccan Tamazight/Tifinagh/Morocco
+       {   315,     7,    43,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Mapuche/Latin/Chile
+       {   316,     1,   103,{ 38210,105 },{ 38210,105 },{ 38315,24 },{ 38210,105 },{ 38210,105 },{ 38315,24 }}, // Central Kurdish/Arabic/Iraq
+       {   316,     1,   102,{ 38210,105 },{ 38210,105 },{ 38315,24 },{ 38210,105 },{ 38210,105 },{ 38315,24 }}, // Central Kurdish/Arabic/Iran
+       {   317,     7,    82,{ 38339,48 },{ 38387,85 },{ 9771,24 },{ 38472,60 },{ 38532,93 },{ 9771,24 }}, // Lower Sorbian/Latin/Germany
+       {   318,     7,    82,{ 38625,48 },{ 38673,86 },{ 9771,24 },{ 38759,60 },{ 38819,93 },{ 9771,24 }}, // Upper Sorbian/Latin/Germany
+       {   319,     7,    37,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Kenyang/Latin/Cameroon
+       {   320,     7,    38,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Mohawk/Latin/Canada
+       {   321,    75,    91,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Nko/Nko/Guinea
+       {   322,     7,   260,{ 38912,48 },{ 38960,91 },{ 39051,24 },{ 38912,48 },{ 38960,91 },{ 39051,24 }}, // Prussian/Latin/World
+       {   323,     7,    90,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Kiche/Latin/Guatemala
+       {   324,     7,   205,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Southern Sami/Latin/Sweden
+       {   325,     7,   205,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Lule Sami/Latin/Sweden
+       {   326,     7,    73,{ 39075,77 },{ 39152,140 },{ 39292,25 },{ 39075,77 },{ 39152,140 },{ 39292,25 }}, // Inari Sami/Latin/Finland
+       {   327,     7,    73,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Skolt Sami/Latin/Finland
+       {   328,     7,    13,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Warlpiri/Latin/Australia
+       {   346,     1,   102,{ 14963,70 },{ 14963,70 },{ 418,27 },{ 14963,70 },{ 14963,70 },{ 418,27 }}, // Mazanderani/Arabic/Iran
+       {   349,     1,   102,{ 39317,77 },{ 39317,77 },{ 418,27 },{ 39317,77 },{ 39317,77 },{ 418,27 }}, // Northern Luri/Arabic/Iran
+       {   349,     1,   103,{ 39317,77 },{ 39317,77 },{ 418,27 },{ 39317,77 },{ 39317,77 },{ 418,27 }}, // Northern Luri/Arabic/Iraq
+       {   357,     6,    97,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Cantonese/Traditional Han/Hong Kong
+       {   357,     5,    44,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Cantonese/Simplified Han/China
+       {   360,     7,   260,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Ido/Latin/World
+       {   361,     7,   260,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Lojban/Latin/World
+       {   362,     7,   106,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sicilian/Latin/Italy
+       {   363,     1,   102,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Southern Kurdish/Arabic/Iran
+       {   364,     1,   163,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Western Balochi/Arabic/Pakistan
+       {   365,     7,   170,{ 39394,46 },{ 39440,88 },{ 39528,24 },{ 39394,46 },{ 39440,88 },{ 39528,24 }}, // Cebuano/Latin/Philippines
+       {   366,     2,   178,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Erzya/Cyrillic/Russia
+       {     0,     0,     0,{  0,0},{  0,0},{  0,0},{  0,0},{  0,0},{  0,0}}, // trailing zeros
+};
+
+static const ushort months_data[] = {
+0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,
+0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x63, 0x74, 0x3b,
+0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72,
+0x75, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x68, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79,
+0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65,
+0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65,
+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,
+0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x31, 0x3b,
+0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31,
+0x31, 0x3b, 0x31, 0x32, 0x3b, 0x31, 0x33, 0x41, 0x6d, 0x61, 0x3b, 0x47, 0x75, 0x72, 0x3b, 0x42, 0x69, 0x74, 0x3b, 0x45,
+0x6c, 0x62, 0x3b, 0x43, 0x61, 0x6d, 0x3b, 0x57, 0x61, 0x78, 0x3b, 0x41, 0x64, 0x6f, 0x3b, 0x48, 0x61, 0x67, 0x3b, 0x46,
+0x75, 0x6c, 0x3b, 0x4f, 0x6e, 0x6b, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x4d, 0x75, 0x64, 0x3b, 0x41, 0x6d, 0x61, 0x6a, 0x6a,
+0x69, 0x69, 0x3b, 0x47, 0x75, 0x72, 0x61, 0x61, 0x6e, 0x64, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x42, 0x69, 0x74, 0x6f, 0x6f,
+0x74, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x45, 0x6c, 0x62, 0x61, 0x3b, 0x43, 0x61, 0x61, 0x6d, 0x73, 0x61, 0x3b, 0x57,
+0x61, 0x78, 0x61, 0x62, 0x61, 0x6a, 0x6a, 0x69, 0x69, 0x3b, 0x41, 0x64, 0x6f, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61,
+0x3b, 0x48, 0x61, 0x67, 0x61, 0x79, 0x79, 0x61, 0x3b, 0x46, 0x75, 0x75, 0x6c, 0x62, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6e,
+0x6b, 0x6f, 0x6c, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x53, 0x61, 0x64, 0x61, 0x61, 0x73, 0x61, 0x3b, 0x4d,
+0x75, 0x64, 0x64, 0x65, 0x65, 0x3b, 0x41, 0x3b, 0x47, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x43, 0x3b, 0x57, 0x3b, 0x41, 0x3b,
+0x48, 0x3b, 0x46, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x4d, 0x30, 0x31, 0x3b, 0x4d, 0x30, 0x32, 0x3b, 0x4d, 0x30,
+0x33, 0x3b, 0x4d, 0x30, 0x34, 0x3b, 0x4d, 0x30, 0x35, 0x3b, 0x4d, 0x30, 0x36, 0x3b, 0x4d, 0x30, 0x37, 0x3b, 0x4d, 0x30,
+0x38, 0x3b, 0x4d, 0x30, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32, 0x3b, 0x31, 0x3b,
+0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31,
+0x31, 0x3b, 0x31, 0x32, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x72, 0x74, 0x2e, 0x3b,
+0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41,
+0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44,
+0x65, 0x73, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,
+0x69, 0x65, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,
+0x75, 0x6e, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x65, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b,
+0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f,
+0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b,
+0x73, 0x68, 0x6b, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x70, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x3b,
+0x6b, 0x6f, 0x72, 0x72, 0x3b, 0x67, 0x75, 0x73, 0x68, 0x3b, 0x73, 0x68, 0x74, 0x3b, 0x74, 0x65, 0x74, 0x3b, 0x6e, 0xeb,
+0x6e, 0x3b, 0x64, 0x68, 0x6a, 0x3b, 0x6a, 0x61, 0x6e, 0x61, 0x72, 0x3b, 0x73, 0x68, 0x6b, 0x75, 0x72, 0x74, 0x3b, 0x6d,
+0x61, 0x72, 0x73, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x73, 0x68, 0x6f,
+0x72, 0x3b, 0x6b, 0x6f, 0x72, 0x72, 0x69, 0x6b, 0x3b, 0x67, 0x75, 0x73, 0x68, 0x74, 0x3b, 0x73, 0x68, 0x74, 0x61, 0x74,
+0x6f, 0x72, 0x3b, 0x74, 0x65, 0x74, 0x6f, 0x72, 0x3b, 0x6e, 0xeb, 0x6e, 0x74, 0x6f, 0x72, 0x3b, 0x64, 0x68, 0x6a, 0x65,
+0x74, 0x6f, 0x72, 0x3b, 0x6a, 0x3b, 0x73, 0x68, 0x3b, 0x6d, 0x3b, 0x70, 0x3b, 0x6d, 0x3b, 0x71, 0x3b, 0x6b, 0x3b, 0x67,
+0x3b, 0x73, 0x68, 0x3b, 0x74, 0x3b, 0x6e, 0x3b, 0x64, 0x68, 0x3b, 0x1303, 0x1295, 0x12e9, 0x3b, 0x134c, 0x1265, 0x1229, 0x3b, 0x121b,
+0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x122a, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235,
+0x3b, 0x1234, 0x1355, 0x1274, 0x3b, 0x12a6, 0x12ad, 0x1276, 0x3b, 0x1296, 0x126c, 0x121d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x3b, 0x1303, 0x1295, 0x12e9,
+0x12c8, 0x122a, 0x3b, 0x134c, 0x1265, 0x1229, 0x12c8, 0x122a, 0x3b, 0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x122a, 0x120d, 0x3b, 0x121c, 0x12ed,
+0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235, 0x1275, 0x3b, 0x1234, 0x1355, 0x1274, 0x121d, 0x1260, 0x122d, 0x3b,
+0x12a6, 0x12ad, 0x1276, 0x1260, 0x122d, 0x3b, 0x1296, 0x126c, 0x121d, 0x1260, 0x122d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x1260, 0x122d, 0x3b, 0x1303, 0x3b,
+0x134c, 0x3b, 0x121b, 0x3b, 0x12a4, 0x3b, 0x121c, 0x3b, 0x1301, 0x3b, 0x1301, 0x3b, 0x12a6, 0x3b, 0x1234, 0x3b, 0x12a6, 0x3b, 0x1296, 0x3b,
+0x12f2, 0x3b, 0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b,
+0x623, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644,
+0x64a, 0x648, 0x3b, 0x623, 0x63a, 0x633, 0x637, 0x633, 0x3b, 0x633, 0x628, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648,
+0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641,
+0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x648, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x633, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f,
+0x3b, 0x62c, 0x627, 0x646, 0x641, 0x64a, 0x3b, 0x641, 0x64a, 0x641, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x641,
+0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x62c, 0x648, 0x627, 0x646, 0x3b, 0x62c, 0x648, 0x64a, 0x644, 0x64a, 0x629, 0x3b,
+0x623, 0x648, 0x62a, 0x3b, 0x633, 0x628, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,
+0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b,
+0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x623, 0x3b, 0x633, 0x3b, 0x623, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x643, 0x627, 0x646, 0x648,
+0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646,
+0x64a, 0x633, 0x627, 0x646, 0x3b, 0x623, 0x64a, 0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648,
+0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a, 0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x623,
+0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648,
+0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x643, 0x3b, 0x634, 0x3b, 0x622, 0x3b, 0x646, 0x3b, 0x623, 0x3b, 0x62d, 0x3b,
+0x62a, 0x3b, 0x622, 0x3b, 0x623, 0x3b, 0x62a, 0x3b, 0x62a, 0x3b, 0x643, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644,
+0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646, 0x64a, 0x633, 0x627, 0x646,
+0x3b, 0x623, 0x64a, 0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648, 0x632, 0x3b, 0x622, 0x628,
+0x3b, 0x623, 0x64a, 0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0xa0, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x62a,
+0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644,
+0x623, 0x648, 0x644, 0x3b, 0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631,
+0x633, 0x3b, 0x625, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a,
+0x648, 0x644, 0x64a, 0x648, 0x3b, 0x623, 0x63a, 0x634, 0x62a, 0x3b, 0x634, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648,
+0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x62c, 0x645, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641, 0x3b,
+0x645, 0x3b, 0x625, 0x3b, 0x648, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x634, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x3b,
+0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x628,
+0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x632,
+0x3b, 0x63a, 0x634, 0x62a, 0x3b, 0x634, 0x62a, 0x646, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,
+0x646, 0x628, 0x631, 0x3b, 0x62f, 0x62c, 0x646, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x645, 0x3b,
+0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x634, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x3b, 0x570, 0x576, 0x57e, 0x3b, 0x583, 0x57f,
+0x57e, 0x3b, 0x574, 0x580, 0x57f, 0x3b, 0x561, 0x57a, 0x580, 0x3b, 0x574, 0x575, 0x57d, 0x3b, 0x570, 0x576, 0x57d, 0x3b, 0x570, 0x56c,
+0x57d, 0x3b, 0x585, 0x563, 0x57d, 0x3b, 0x57d, 0x565, 0x57a, 0x3b, 0x570, 0x578, 0x56f, 0x3b, 0x576, 0x578, 0x575, 0x3b, 0x564, 0x565,
+0x56f, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580, 0x3b, 0x583, 0x565, 0x57f, 0x580, 0x57e, 0x561, 0x580, 0x3b, 0x574, 0x561,
+0x580, 0x57f, 0x3b, 0x561, 0x57a, 0x580, 0x56b, 0x56c, 0x3b, 0x574, 0x561, 0x575, 0x56b, 0x57d, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x56b,
+0x57d, 0x3b, 0x570, 0x578, 0x582, 0x56c, 0x56b, 0x57d, 0x3b, 0x585, 0x563, 0x578, 0x57d, 0x57f, 0x578, 0x57d, 0x3b, 0x57d, 0x565, 0x57a,
+0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x570, 0x578, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x576, 0x578, 0x575,
+0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x564, 0x565, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x540, 0x3b, 0x553, 0x3b,
+0x544, 0x3b, 0x531, 0x3b, 0x544, 0x3b, 0x540, 0x3b, 0x540, 0x3b, 0x555, 0x3b, 0x54d, 0x3b, 0x540, 0x3b, 0x546, 0x3b, 0x534, 0x3b,
+0x570, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580, 0x56b, 0x3b, 0x583, 0x565, 0x57f, 0x580, 0x57e, 0x561, 0x580, 0x56b, 0x3b, 0x574, 0x561,
+0x580, 0x57f, 0x56b, 0x3b, 0x561, 0x57a, 0x580, 0x56b, 0x56c, 0x56b, 0x3b, 0x574, 0x561, 0x575, 0x56b, 0x57d, 0x56b, 0x3b, 0x570, 0x578,
+0x582, 0x576, 0x56b, 0x57d, 0x56b, 0x3b, 0x570, 0x578, 0x582, 0x56c, 0x56b, 0x57d, 0x56b, 0x3b, 0x585, 0x563, 0x578, 0x57d, 0x57f, 0x578,
+0x57d, 0x56b, 0x3b, 0x57d, 0x565, 0x57a, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x570, 0x578, 0x56f, 0x57f, 0x565, 0x574,
+0x562, 0x565, 0x580, 0x56b, 0x3b, 0x576, 0x578, 0x575, 0x565, 0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x564, 0x565, 0x56f, 0x57f, 0x565,
+0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x3b, 0x9ae, 0x9be,
+0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x2019, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c,
+0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x3b, 0x99b, 0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb,
+0x3b, 0x9a8, 0x9f1, 0x9c7, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ab,
+0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0,
+0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x2019, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b7,
+0x9cd, 0x99f, 0x3b, 0x99b, 0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac,
+0x9f0, 0x3b, 0x9a8, 0x9f1, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x99c,
+0x3b, 0x9ab, 0x3b, 0x9ae, 0x3b, 0x98f, 0x3b, 0x9ae, 0x3b, 0x99c, 0x3b, 0x99c, 0x3b, 0x986, 0x3b, 0x99b, 0x3b, 0x985, 0x3b, 0x9a8,
+0x3b, 0x9a1, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d,
+0x61, 0x79, 0x3b, 0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b, 0x61, 0x76, 0x71, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f,
+0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x59, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65,
+0x76, 0x72, 0x61, 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b,
+0x130, 0x79, 0x75, 0x6e, 0x3b, 0x130, 0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e,
+0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72,
+0x3b, 0x44, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0x79, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x61,
+0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x75,
+0x6e, 0x3b, 0x69, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0x79, 0x61,
+0x62, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65,
+0x6b, 0x61, 0x62, 0x72, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440,
+0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x458, 0x43d, 0x3b, 0x438, 0x458, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43d,
+0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x458, 0x3b, 0x434, 0x435, 0x43a, 0x3b, 0x408, 0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b,
+0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430,
+0x439, 0x3b, 0x418, 0x458, 0x443, 0x43d, 0x3b, 0x418, 0x458, 0x443, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421,
+0x435, 0x43d, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x458, 0x430,
+0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0x458, 0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432,
+0x440, 0x430, 0x43b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438,
+0x458, 0x443, 0x43d, 0x3b, 0x438, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442,
+0x458, 0x430, 0x431, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x43d, 0x43e, 0x458, 0x430, 0x431, 0x440, 0x3b,
+0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0x75, 0x72, 0x74, 0x2e, 0x3b, 0x6f, 0x74, 0x73, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
+0x2e, 0x3b, 0x61, 0x70, 0x69, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x2e, 0x3b, 0x65, 0x6b, 0x61, 0x2e, 0x3b, 0x75, 0x7a, 0x74,
+0x2e, 0x3b, 0x61, 0x62, 0x75, 0x2e, 0x3b, 0x69, 0x72, 0x61, 0x2e, 0x3b, 0x75, 0x72, 0x72, 0x2e, 0x3b, 0x61, 0x7a, 0x61,
+0x2e, 0x3b, 0x61, 0x62, 0x65, 0x2e, 0x3b, 0x75, 0x72, 0x74, 0x61, 0x72, 0x72, 0x69, 0x6c, 0x61, 0x3b, 0x6f, 0x74, 0x73,
+0x61, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x78, 0x6f, 0x61, 0x3b, 0x61, 0x70, 0x69, 0x72, 0x69, 0x6c, 0x61,
+0x3b, 0x6d, 0x61, 0x69, 0x61, 0x74, 0x7a, 0x61, 0x3b, 0x65, 0x6b, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x75, 0x7a, 0x74, 0x61,
+0x69, 0x6c, 0x61, 0x3b, 0x61, 0x62, 0x75, 0x7a, 0x74, 0x75, 0x61, 0x3b, 0x69, 0x72, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x75,
+0x72, 0x72, 0x69, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6f, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x6e, 0x64, 0x75, 0x61, 0x3b,
+0x55, 0x3b, 0x4f, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x55, 0x3b,
+0x41, 0x3b, 0x41, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9b0, 0x9c1,
+0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b, 0x9ae,
+0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8, 0x9c7,
+0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad, 0x9c7,
+0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x99c, 0x9be, 0x3b, 0x9ab, 0x9c7, 0x3b,
+0x9ae, 0x9be, 0x3b, 0x98f, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x3b, 0x986, 0x3b, 0x9b8, 0x9c7, 0x3b,
+0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x9bf, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd,
+0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be,
+0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985,
+0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae,
+0x9cd, 0x9ac, 0x9b0, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf23, 0x3b, 0xf5f,
+0xfb3, 0xf0b, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf27, 0x3b, 0xf5f,
+0xfb3, 0xf0b, 0xf28, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf21,
+0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf22, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b,
+0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72,
+0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b,
+0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b,
+0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b,
+0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56,
+0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b,
+0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4,
+0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4,
+0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf21, 0x3b,
+0xf22, 0x3b, 0xf23, 0x3b, 0xf24, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28, 0x3b, 0xf29, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21,
+0xf21, 0x3b, 0xf21, 0xf22, 0x3b, 0xf21, 0x3b, 0xf22, 0x3b, 0xf23, 0x3b, 0xf24, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28,
+0x3b, 0xf29, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b, 0x31, 0x32, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b,
+0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54,
+0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b,
+0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54,
+0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf42, 0xf74,
+0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74,
+0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66,
+0xf0b, 0xf54, 0xf0b, 0x3b, 0xf21, 0x3b, 0xf22, 0x3b, 0xf23, 0x3b, 0x34, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28, 0x3b,
+0x39, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b, 0xf21, 0xf22, 0x3b, 0x47, 0x65, 0x6e, 0x2e, 0x3b, 0x43, 0x2bc, 0x68, 0x77,
+0x65, 0x2e, 0x3b, 0x4d, 0x65, 0x75, 0x72, 0x2e, 0x3b, 0x45, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x65, 0x3b, 0x4d, 0x65,
+0x7a, 0x68, 0x2e, 0x3b, 0x47, 0x6f, 0x75, 0x65, 0x2e, 0x3b, 0x45, 0x6f, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x2e,
+0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x7a, 0x75, 0x2e, 0x3b, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72,
+0x3b, 0x43, 0x2bc, 0x68, 0x77, 0x65, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x4d, 0x65, 0x75, 0x72, 0x7a, 0x68, 0x3b, 0x45, 0x62,
+0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x65, 0x3b, 0x4d, 0x65, 0x7a, 0x68, 0x65, 0x76, 0x65, 0x6e, 0x3b, 0x47, 0x6f, 0x75,
+0x65, 0x72, 0x65, 0x3b, 0x45, 0x6f, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x67, 0x6f, 0x6c, 0x6f, 0x3b, 0x48, 0x65,
+0x72, 0x65, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x72, 0x7a, 0x75, 0x3b, 0x30, 0x31, 0x3b, 0x30, 0x32, 0x3b, 0x30, 0x33,
+0x3b, 0x30, 0x34, 0x3b, 0x30, 0x35, 0x3b, 0x30, 0x36, 0x3b, 0x30, 0x37, 0x3b, 0x30, 0x38, 0x3b, 0x30, 0x39, 0x3b, 0x31,
+0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x44f, 0x43d, 0x443, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430, 0x440, 0x442,
+0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433,
+0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x435, 0x3b, 0x434, 0x435, 0x43a, 0x3b, 0x44f, 0x43d, 0x443,
+0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f,
+0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443,
+0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440,
+0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x44f,
+0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x44e, 0x3b, 0x44e, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d,
+0x3b, 0x434, 0x3b, 0x1007, 0x1014, 0x103a, 0x3b, 0x1016, 0x1031, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007,
+0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x3b, 0x1029, 0x3b, 0x1005, 0x1000, 0x103a, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x3b, 0x1014,
+0x102d, 0x102f, 0x3b, 0x1012, 0x102e, 0x3b, 0x1007, 0x1014, 0x103a, 0x1014, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1016, 0x1031, 0x1016, 0x1031, 0x102c,
+0x103a, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x1015, 0x103c, 0x102e, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d,
+0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x101c, 0x102d, 0x102f, 0x1004, 0x103a, 0x3b, 0x1029, 0x1002, 0x102f, 0x1010, 0x103a, 0x3b, 0x1005, 0x1000, 0x103a,
+0x1010, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x1010, 0x102d, 0x102f, 0x1018, 0x102c, 0x3b, 0x1014, 0x102d, 0x102f,
+0x101d, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1012, 0x102e, 0x1007, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1007, 0x3b, 0x1016, 0x3b, 0x1019, 0x3b,
+0x1027, 0x3b, 0x1019, 0x3b, 0x1007, 0x3b, 0x1007, 0x3b, 0x1029, 0x3b, 0x1005, 0x3b, 0x1021, 0x3b, 0x1014, 0x3b, 0x1012, 0x3b, 0x441, 0x442,
+0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447, 0x44d,
+0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456,
+0x441, 0x3b, 0x441, 0x43d, 0x435, 0x3b, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x44b, 0x3b,
+0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43c, 0x430, 0x439,
+0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43d, 0x456, 0x432,
+0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447,
+0x43d, 0x456, 0x43a, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f, 0x430, 0x434, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x430, 0x43d, 0x44c,
+0x3b, 0x441, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x43a, 0x3b, 0x43c, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x436, 0x3b, 0x432, 0x3b, 0x43a,
+0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x441, 0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440, 0x430,
+0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x447, 0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435, 0x440,
+0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435, 0x3b, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d,
+0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x430, 0x433, 0x430, 0x3b, 0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x430, 0x3b, 0x43a, 0x440,
+0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x430, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44f, 0x3b,
+0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44f, 0x3b, 0x436, 0x43d, 0x456, 0x45e, 0x43d, 0x44f, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441, 0x43d,
+0x44f, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447, 0x43d, 0x456, 0x43a, 0x430, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f,
+0x430, 0x434, 0x430, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x43d, 0x44f, 0x3b, 0x1798, 0x1780, 0x179a, 0x17b6, 0x3b, 0x1780, 0x17bb, 0x1798, 0x17d2,
+0x1797, 0x17c8, 0x3b, 0x1798, 0x17b8, 0x1793, 0x17b6, 0x3b, 0x1798, 0x17c1, 0x179f, 0x17b6, 0x3b, 0x17a7, 0x179f, 0x1797, 0x17b6, 0x3b, 0x1798, 0x17b7,
+0x1790, 0x17bb, 0x1793, 0x17b6, 0x3b, 0x1780, 0x1780, 0x17d2, 0x1780, 0x178a, 0x17b6, 0x3b, 0x179f, 0x17b8, 0x17a0, 0x17b6, 0x3b, 0x1780, 0x1789, 0x17d2,
+0x1789, 0x17b6, 0x3b, 0x178f, 0x17bb, 0x179b, 0x17b6, 0x3b, 0x179c, 0x17b7, 0x1785, 0x17d2, 0x1786, 0x17b7, 0x1780, 0x17b6, 0x3b, 0x1792, 0x17d2, 0x1793,
+0x17bc, 0x3b, 0x1798, 0x3b, 0x1780, 0x3b, 0x1798, 0x3b, 0x1798, 0x3b, 0x17a7, 0x3b, 0x1798, 0x3b, 0x1780, 0x3b, 0x179f, 0x3b, 0x1780, 0x3b,
+0x178f, 0x3b, 0x179c, 0x3b, 0x1792, 0x3b, 0x67, 0x65, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
+0xe7, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c,
+0x2e, 0x3b, 0x61, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e,
+0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x6d,
+0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b,
+0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72,
+0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64,
+0x65, 0x73, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47, 0x4e, 0x3b, 0x46, 0x42, 0x3b, 0x4d, 0xc7, 0x3b, 0x41, 0x42, 0x3b,
+0x4d, 0x47, 0x3b, 0x4a, 0x4e, 0x3b, 0x4a, 0x4c, 0x3b, 0x41, 0x47, 0x3b, 0x53, 0x54, 0x3b, 0x4f, 0x43, 0x3b, 0x4e, 0x56,
+0x3b, 0x44, 0x53, 0x3b, 0x64, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x2e,
+0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d,
+0x61, 0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x2e, 0x3b,
+0x64, 0x2019, 0x61, 0x67, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x2e,
+0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x64, 0x65, 0x20,
+0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x6d,
+0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b,
+0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x64, 0x2019,
+0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x2019,
+0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,
+0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708,
+0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31,
+0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31, 0x32, 0x6708, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b,
+0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708,
+0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708, 0x3b, 0x73, 0x69, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x3b, 0x6f, 0x17e,
+0x75, 0x3b, 0x74, 0x72, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x6b, 0x6f,
+0x6c, 0x3b, 0x72, 0x75, 0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x73, 0x74, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x73, 0x69,
+0x6a, 0x65, 0x10d, 0x61, 0x6e, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x61, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x61,
+0x6b, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x61, 0x6e, 0x6a, 0x3b, 0x6c, 0x69,
+0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x72, 0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x3b,
+0x72, 0x75, 0x6a, 0x61, 0x6e, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65,
+0x6e, 0x69, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x61, 0x63, 0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e,
+0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31,
+0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e, 0x3b, 0x73, 0x69, 0x6a, 0x65, 0x10d, 0x6e, 0x6a, 0x61, 0x3b,
+0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x65, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x6b, 0x61, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x6e,
+0x6a, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x6e, 0x6a, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x72,
+0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x61, 0x3b, 0x72, 0x75, 0x6a, 0x6e, 0x61, 0x3b,
+0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x6f, 0x67, 0x61, 0x3b,
+0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x61, 0x3b, 0x6c, 0x65, 0x64, 0x3b, 0xfa, 0x6e, 0x6f, 0x3b, 0x62, 0x159, 0x65,
+0x3b, 0x64, 0x75, 0x62, 0x3b, 0x6b, 0x76, 0x11b, 0x3b, 0x10d, 0x76, 0x6e, 0x3b, 0x10d, 0x76, 0x63, 0x3b, 0x73, 0x72, 0x70,
+0x3b, 0x7a, 0xe1, 0x159, 0x3b, 0x159, 0xed, 0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x6c, 0x65, 0x64,
+0x65, 0x6e, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x65, 0x6e, 0x3b, 0x64, 0x75, 0x62, 0x65, 0x6e,
+0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x65, 0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65,
+0x6e, 0x65, 0x63, 0x3b, 0x73, 0x72, 0x70, 0x65, 0x6e, 0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed, 0x6a, 0x65, 0x6e,
+0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x65, 0x63, 0x3b, 0x6c,
+0x65, 0x64, 0x6e, 0x61, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x61, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x6e, 0x61, 0x3b, 0x64, 0x75,
+0x62, 0x6e, 0x61, 0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x6e, 0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x6e, 0x61, 0x3b, 0x10d, 0x65,
+0x72, 0x76, 0x65, 0x6e, 0x63, 0x65, 0x3b, 0x73, 0x72, 0x70, 0x6e, 0x61, 0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed,
+0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e,
+0x63, 0x65, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70,
+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67,
+0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63,
+0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72,
+0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75,
+0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
+0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63,
+0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x72, 0x74, 0x2e,
+0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b,
+0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b,
+0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,
+0x69, 0x3b, 0x6d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75,
+0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x65, 0x70,
+0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d,
+0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65,
+0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e,
+0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x63, 0x74,
+0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b,
+0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b,
+0x61, 0x16d, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b,
+0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72,
+0x74, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6f, 0x3b, 0x6d, 0x61, 0x6a, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f,
+0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x16d, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,
+0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72,
+0x6f, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x3b, 0x76, 0x65, 0x65, 0x62,
+0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e,
+0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74,
+0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x76, 0x65,
+0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b,
+0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75,
+0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65,
+0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72,
+0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,
+0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72,
+0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70,
+0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,
+0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d,
+0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b,
+0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f,
+0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e,
+0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b,
+0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b,
+0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69,
+0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x3b,
+0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x3b, 0x65, 0x6c, 0x6f,
+0x3b, 0x73, 0x79, 0x79, 0x73, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x3b, 0x6a, 0x6f,
+0x75, 0x6c, 0x75, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75,
+0x75, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75,
+0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65,
+0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75,
+0x75, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x3b,
+0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x4b,
+0x3b, 0x48, 0x3b, 0x45, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x2e,
+0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x2e, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x2e, 0x3b, 0x68, 0x75,
+0x68, 0x74, 0x69, 0x6b, 0x2e, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x2e, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x2e,
+0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x2e, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x2e, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b,
+0x2e, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x2e, 0x3b, 0x6a, 0x6f,
+0x75, 0x6c, 0x75, 0x6b, 0x2e, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x6c,
+0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b,
+0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x74,
+0x61, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75,
+0x74, 0x61, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x74,
+0x61, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75,
+0x75, 0x74, 0x61, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e,
+0x3b, 0x66, 0xe9, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69,
+0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70,
+0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61,
+0x6e, 0x76, 0x69, 0x65, 0x72, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x69, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61,
+0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x65,
+0x74, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74,
+0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0xe9, 0x63, 0x65, 0x6d, 0x62,
+0x72, 0x65, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b,
+0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x2e,
+0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,
+0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
+0x2e, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x2e, 0x3b, 0x6a, 0x75, 0x69, 0x6c,
+0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f,
+0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x72, 0x74, 0x3b,
+0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b,
+0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6e,
+0x65, 0x77, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x77, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x4d, 0x61,
+0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x61, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x79,
+0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x69,
+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x69, 0x6d, 0x62, 0x65,
+0x72, 0x3b, 0x44, 0x65, 0x73, 0x69, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x46, 0x61, 0x6f, 0x69, 0x3b, 0x47, 0x65, 0x61, 0x72,
+0x72, 0x3b, 0x4d, 0xe0, 0x72, 0x74, 0x3b, 0x47, 0x69, 0x62, 0x6c, 0x3b, 0x43, 0xe8, 0x69, 0x74, 0x3b, 0xd2, 0x67, 0x6d,
+0x68, 0x3b, 0x49, 0x75, 0x63, 0x68, 0x3b, 0x4c, 0xf9, 0x6e, 0x61, 0x3b, 0x53, 0x75, 0x6c, 0x74, 0x3b, 0x44, 0xe0, 0x6d,
+0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x44, 0xf9, 0x62, 0x68, 0x3b, 0x41, 0x6d, 0x20, 0x46, 0x61, 0x6f, 0x69, 0x6c,
+0x6c, 0x65, 0x61, 0x63, 0x68, 0x3b, 0x41, 0x6e, 0x20, 0x47, 0x65, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x3b, 0x41, 0x6d, 0x20,
+0x4d, 0xe0, 0x72, 0x74, 0x3b, 0x41, 0x6e, 0x20, 0x47, 0x69, 0x62, 0x6c, 0x65, 0x61, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x43,
+0xe8, 0x69, 0x74, 0x65, 0x61, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0xd2, 0x67, 0x6d, 0x68, 0x69, 0x6f, 0x73, 0x3b,
+0x41, 0x6e, 0x20, 0x74, 0x2d, 0x49, 0x75, 0x63, 0x68, 0x61, 0x72, 0x3b, 0x41, 0x6e, 0x20, 0x4c, 0xf9, 0x6e, 0x61, 0x73,
+0x74, 0x61, 0x6c, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x75, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x3b, 0x41, 0x6e, 0x20,
+0x44, 0xe0, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e,
+0x3b, 0x41, 0x6e, 0x20, 0x44, 0xf9, 0x62, 0x68, 0x6c, 0x61, 0x63, 0x68, 0x64, 0x3b, 0x46, 0x3b, 0x47, 0x3b, 0x4d, 0x3b,
+0x47, 0x3b, 0x43, 0x3b, 0xd2, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x64, 0x68,
+0x65, 0x6e, 0x20, 0x46, 0x68, 0x61, 0x6f, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x63, 0x68, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20,
+0x47, 0x68, 0x65, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x4d, 0x68, 0xe0, 0x72, 0x74, 0x3b,
+0x64, 0x68, 0x65, 0x6e, 0x20, 0x47, 0x68, 0x69, 0x62, 0x6c, 0x65, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x43,
+0x68, 0xe8, 0x69, 0x74, 0x65, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0xd2, 0x67, 0x6d, 0x68, 0x69, 0x6f, 0x73,
+0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x49, 0x75, 0x63, 0x68, 0x61, 0x72, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x4c, 0xf9,
+0x6e, 0x61, 0x73, 0x74, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x75, 0x6c, 0x74, 0x61, 0x69,
+0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x44, 0xe0, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20,
+0x74, 0x2d, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x44, 0xf9, 0x62, 0x68, 0x6c,
+0x61, 0x63, 0x68, 0x64, 0x3b, 0x58, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b,
+0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x2e, 0x3b,
+0x41, 0x67, 0x6f, 0x2e, 0x3b, 0x53, 0x65, 0x74, 0x2e, 0x3b, 0x4f, 0x75, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b,
+0x44, 0x65, 0x63, 0x2e, 0x3b, 0x58, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x69, 0x72,
+0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x58,
+0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74,
+0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
+0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,
+0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x78, 0x61, 0x6e, 0x2e,
+0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6f,
+0x3b, 0x78, 0x75, 0xf1, 0x6f, 0x3b, 0x78, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e,
+0x3b, 0x6f, 0x75, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x78, 0x61, 0x6e, 0x65,
+0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61,
+0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x78, 0x75, 0xf1, 0x6f, 0x3b, 0x78, 0x75, 0x6c, 0x6c, 0x6f,
+0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74,
+0x75, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,
+0x72, 0x6f, 0x3b, 0x78, 0x2e, 0x3b, 0x66, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x61, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x78, 0x2e,
+0x3b, 0x78, 0x2e, 0x3b, 0x61, 0x2e, 0x3b, 0x73, 0x2e, 0x3b, 0x6f, 0x2e, 0x3b, 0x6e, 0x2e, 0x3b, 0x64, 0x2e, 0x3b, 0x10d8,
+0x10d0, 0x10dc, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x3b, 0x10d8,
+0x10d5, 0x10dc, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x3b, 0x10dc,
+0x10dd, 0x10d4, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x3b, 0x10d8, 0x10d0, 0x10dc, 0x10d5, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x10d4, 0x10e0,
+0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x10e2, 0x10d8, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x10d8, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0,
+0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d0, 0x10d2,
+0x10d5, 0x10d8, 0x10e1, 0x10e2, 0x10dd, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x10e2, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dd, 0x10e5, 0x10e2,
+0x10dd, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d4,
+0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d7, 0x3b, 0x10db, 0x3b, 0x10d0, 0x3b, 0x10db, 0x3b, 0x10d8, 0x3b, 0x10d8, 0x3b,
+0x10d0, 0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10dc, 0x3b, 0x10d3, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4,
+0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75,
+0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61,
+0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70,
+0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75,
+0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,
+0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72,
+0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e,
+0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b,
+0x53, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e,
+0x3b, 0x4a, 0xe4, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69,
+0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74,
+0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0xe4, 0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72,
+0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a,
+0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74,
+0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
+0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0xe4, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62,
+0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69,
+0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e,
+0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c,
+0x3ac, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3ac, 0x3b9, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb,
+0x3b, 0x391, 0x3cd, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3b, 0x394, 0x3b5, 0x3ba,
+0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3ac, 0x3c1,
+0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39c, 0x3ac, 0x3c1, 0x3c4, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3af, 0x3bb, 0x3b9, 0x3bf, 0x3c2,
+0x3b, 0x39c, 0x3ac, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb, 0x3b9,
+0x3bf, 0x3c2, 0x3b, 0x391, 0x3cd, 0x3b3, 0x3bf, 0x3c5, 0x3c3, 0x3c4, 0x3bf, 0x3c2, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3ad, 0x3bc, 0x3b2,
+0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3ce, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3bc, 0x3b2,
+0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3b, 0x3a6, 0x3b,
+0x39c, 0x3b, 0x391, 0x3b, 0x39c, 0x3b, 0x399, 0x3b, 0x399, 0x3b, 0x391, 0x3b, 0x3a3, 0x3b, 0x39f, 0x3b, 0x39d, 0x3b, 0x394, 0x3b,
+0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3b1, 0x390, 0x3b,
+0x399, 0x3bf, 0x3c5, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba,
+0x3c4, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5,
+0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3c4, 0x3af, 0x3bf, 0x3c5,
+0x3b, 0x391, 0x3c0, 0x3c1, 0x3b9, 0x3bb, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x390, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd,
+0x3af, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3bf, 0x3cd, 0x3c3, 0x3c4, 0x3bf,
+0x3c5, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3c9, 0x3b2, 0x3c1,
+0x3af, 0x3bf, 0x3c5, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b5, 0x3bc, 0x3b2,
+0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72,
+0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70,
+0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69,
+0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x69, 0x3b, 0x61, 0x70, 0x72,
+0x69, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61,
+0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b,
+0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x64,
+0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd,
+0xab0, 0xac1, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c,
+0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7,
+0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacb, 0x3b, 0xaa8, 0xab5, 0xac7, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd,
+0xaaf, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd,
+0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe,
+0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa91, 0xa95,
+0xacd, 0xa9f, 0xacb, 0xaac, 0xab0, 0x3b, 0xaa8, 0xab5, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0xaae, 0xacd,
+0xaac, 0xab0, 0x3b, 0xa9c, 0xabe, 0x3b, 0xaab, 0xac7, 0x3b, 0xaae, 0xabe, 0x3b, 0xa8f, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0x3b,
+0xa9c, 0xac1, 0x3b, 0xa91, 0x3b, 0xab8, 0x3b, 0xa91, 0x3b, 0xaa8, 0x3b, 0xaa1, 0xabf, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x61,
+0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x66, 0x69, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75,
+0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x75, 0x77, 0x3b, 0x44, 0x69,
+0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x46, 0x61, 0x62, 0x75, 0x72, 0x61, 0x69, 0x72, 0x75, 0x3b,
+0x4d, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x41, 0x66, 0x69, 0x72, 0x69, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x79, 0x75, 0x3b, 0x59,
+0x75, 0x6e, 0x69, 0x3b, 0x59, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x74, 0x75,
+0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x75, 0x77, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x44,
+0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59,
+0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5f3, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5f3,
+0x3b, 0x5de, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5f3, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9,
+0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5f3, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5f3, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5f3, 0x3b, 0x5e0,
+0x5d5, 0x5d1, 0x5f3, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5f3, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5d5, 0x5d0,
+0x5e8, 0x3b, 0x5de, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9,
+0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5de, 0x5d1, 0x5e8, 0x3b,
+0x5d0, 0x5d5, 0x5e7, 0x5d8, 0x5d5, 0x5d1, 0x5e8, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5d1, 0x5e8,
+0x3b, 0x91c, 0x928, 0x970, 0x3b, 0x92b, 0x93c, 0x930, 0x970, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930,
+0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x970, 0x3b, 0x905, 0x917, 0x970, 0x3b, 0x938,
+0x93f, 0x924, 0x970, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942, 0x970, 0x3b, 0x928, 0x935, 0x970, 0x3b, 0x926, 0x93f, 0x938, 0x970, 0x3b,
+0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x93c, 0x930, 0x935, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905,
+0x92a, 0x94d, 0x930, 0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905,
+0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x93f, 0x924, 0x902, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942, 0x92c, 0x930, 0x3b,
+0x928, 0x935, 0x902, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x902, 0x92c, 0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x93c, 0x3b, 0x92e, 0x93e,
+0x3b, 0x905, 0x3b, 0x92e, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x905, 0x3b, 0x938, 0x93f, 0x3b, 0x905, 0x3b, 0x928, 0x3b,
+0x926, 0x93f, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x2e, 0x3b,
+0xe1, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x6a, 0x2e, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b,
+0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,
+0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1,
+0x72, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x69, 0x75, 0x73, 0x3b, 0xe1, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0xe1,
+0x6a, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6e, 0x69, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6c, 0x69, 0x75, 0x73, 0x3b, 0x61, 0x75,
+0x67, 0x75, 0x73, 0x7a, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f,
+0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65,
+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0xc1, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41,
+0x3b, 0x53, 0x7a, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b,
+0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a,
+0xfa, 0x6c, 0x2e, 0x3b, 0xe1, 0x67, 0xfa, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e,
+0xf3, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0xfa, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72,
+0xfa, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a,
+0xfa, 0x6e, 0xed, 0x3b, 0x6a, 0xfa, 0x6c, 0xed, 0x3b, 0xe1, 0x67, 0xfa, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,
+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0xf3, 0x76, 0x65, 0x6d, 0x62, 0x65,
+0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d,
+0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0xc1, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46,
+0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a,
+0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44,
+0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b,
+0x4d, 0x61, 0x72, 0x65, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69,
+0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d,
+0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72,
+0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61,
+0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75,
+0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x63, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61,
+0x6e, 0x75, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72,
+0x74, 0x69, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f,
+0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,
+0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72,
+0x65, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d,
+0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x61, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x45, 0x61, 0x6e, 0x3b, 0x46,
+0x65, 0x61, 0x62, 0x68, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x3b,
+0x4d, 0x65, 0x69, 0x74, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x3b, 0x4d, 0x46, 0xf3, 0x6d, 0x68,
+0x3b, 0x44, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x3b, 0x45, 0x61, 0x6e,
+0xe1, 0x69, 0x72, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x72, 0x61, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69,
+0x62, 0x72, 0x65, 0xe1, 0x6e, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x74,
+0x68, 0x65, 0x61, 0x6d, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x65,
+0xe1, 0x6e, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x44, 0x65, 0x69, 0x72, 0x65, 0x61, 0x64, 0x68, 0x20,
+0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c,
+0x61, 0x69, 0x67, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4c, 0x3b,
+0x4d, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x67, 0x65, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b,
+0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x67, 0x3b, 0x67, 0x69, 0x75, 0x3b, 0x6c, 0x75, 0x67, 0x3b, 0x61, 0x67, 0x6f, 0x3b,
+0x73, 0x65, 0x74, 0x3b, 0x6f, 0x74, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b, 0x67, 0x65, 0x6e, 0x6e,
+0x61, 0x69, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x62, 0x72, 0x61, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61,
+0x70, 0x72, 0x69, 0x6c, 0x65, 0x3b, 0x6d, 0x61, 0x67, 0x67, 0x69, 0x6f, 0x3b, 0x67, 0x69, 0x75, 0x67, 0x6e, 0x6f, 0x3b,
+0x6c, 0x75, 0x67, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d,
+0x62, 0x72, 0x65, 0x3b, 0x6f, 0x74, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65,
+0x3b, 0x64, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,
+0x47, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65,
+0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75,
+0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65,
+0x73, 0x3b, 0xc9c, 0xca8, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa,
+0xccd, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0x3b,
+0xcb8, 0xcc6, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0x3b, 0xca1,
+0xcbf, 0xcb8, 0xcc6, 0xc82, 0x3b, 0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcbf, 0x3b,
+0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0xcb2, 0xccd, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2,
+0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0xcb8, 0xccd, 0xc9f, 0xccd, 0x3b, 0xcb8, 0xcc6, 0xcaa, 0xccd, 0xc9f,
+0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0xcac,
+0xcb0, 0xccd, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc9c, 0x3b, 0xcab, 0xcc6, 0x3b, 0xcae, 0xcbe, 0x3b,
+0xc8f, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0x3b, 0xc9c, 0xcc1, 0x3b, 0xc86, 0x3b, 0xcb8, 0xcc6, 0x3b, 0xc85, 0x3b, 0xca8, 0x3b,
+0xca1, 0xcbf, 0x3b, 0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcbe,
+0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c,
+0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0x3b, 0xcb8, 0xcc6, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb,
+0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0x3b, 0x62c, 0x646, 0x624, 0x631, 0x6cc, 0x3b, 0x641, 0x631,
+0x624, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x655, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x654, 0x3b,
+0x62c, 0x648, 0x657, 0x646, 0x3b, 0x62c, 0x648, 0x657, 0x644, 0x627, 0x6cc, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a,
+0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x657, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633,
+0x645, 0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b,
+0x633, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x49b, 0x430, 0x4a3, 0x2e, 0x3b, 0x430, 0x49b, 0x43f, 0x2e, 0x3b, 0x43d, 0x430,
+0x443, 0x2e, 0x3b, 0x441, 0x4d9, 0x443, 0x2e, 0x3b, 0x43c, 0x430, 0x43c, 0x2e, 0x3b, 0x43c, 0x430, 0x443, 0x2e, 0x3b, 0x448, 0x456,
+0x43b, 0x2e, 0x3b, 0x442, 0x430, 0x43c, 0x2e, 0x3b, 0x49b, 0x44b, 0x440, 0x2e, 0x3b, 0x49b, 0x430, 0x437, 0x2e, 0x3b, 0x49b, 0x430,
+0x440, 0x2e, 0x3b, 0x436, 0x435, 0x43b, 0x2e, 0x3b, 0x49a, 0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x410, 0x49b, 0x43f, 0x430, 0x43d,
+0x3b, 0x41d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x421, 0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x41c, 0x430, 0x43c, 0x44b, 0x440, 0x3b,
+0x41c, 0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x428, 0x456, 0x43b, 0x434, 0x435, 0x3b, 0x422, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49a,
+0x44b, 0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49a, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49a, 0x430, 0x440, 0x430, 0x448, 0x430,
+0x3b, 0x416, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x3b, 0x49a, 0x3b, 0x410, 0x3b, 0x41d, 0x3b, 0x421, 0x3b, 0x41c,
+0x3b, 0x41c, 0x3b, 0x428, 0x3b, 0x422, 0x3b, 0x49a, 0x3b, 0x49a, 0x3b, 0x49a, 0x3b, 0x416, 0x3b, 0x49b, 0x430, 0x4a3, 0x442, 0x430,
+0x440, 0x3b, 0x430, 0x49b, 0x43f, 0x430, 0x43d, 0x3b, 0x43d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x441, 0x4d9, 0x443, 0x456, 0x440,
+0x3b, 0x43c, 0x430, 0x43c, 0x44b, 0x440, 0x3b, 0x43c, 0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x448, 0x456, 0x43b, 0x434, 0x435, 0x3b,
+0x442, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49b, 0x44b, 0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49b, 0x430, 0x437, 0x430, 0x43d,
+0x3b, 0x49b, 0x430, 0x440, 0x430, 0x448, 0x430, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x3b, 0x6d, 0x75,
+0x74, 0x2e, 0x3b, 0x67, 0x61, 0x73, 0x2e, 0x3b, 0x77, 0x65, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x2e, 0x3b, 0x67, 0x69,
+0x63, 0x2e, 0x3b, 0x6b, 0x61, 0x6d, 0x2e, 0x3b, 0x6e, 0x79, 0x61, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x6e, 0x7a,
+0x65, 0x2e, 0x3b, 0x75, 0x6b, 0x77, 0x2e, 0x3b, 0x75, 0x67, 0x75, 0x2e, 0x3b, 0x75, 0x6b, 0x75, 0x2e, 0x3b, 0x4d, 0x75,
+0x74, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x3b, 0x47, 0x61, 0x73, 0x68, 0x79, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x3b, 0x57,
+0x65, 0x72, 0x75, 0x72, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x74, 0x61, 0x3b, 0x47, 0x69, 0x63, 0x75, 0x72, 0x61, 0x6e, 0x73,
+0x69, 0x3b, 0x4b, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x61,
+0x6e, 0x61, 0x6d, 0x61, 0x3b, 0x4e, 0x7a, 0x65, 0x6c, 0x69, 0x3b, 0x55, 0x6b, 0x77, 0x61, 0x6b, 0x69, 0x72, 0x61, 0x3b,
+0x55, 0x67, 0x75, 0x73, 0x68, 0x79, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x55, 0x6b, 0x75, 0x62, 0x6f, 0x7a, 0x61, 0x3b, 0x42f,
+0x43d, 0x432, 0x3b, 0x424, 0x435, 0x432, 0x3b, 0x41c, 0x430, 0x440, 0x3b, 0x410, 0x43f, 0x440, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418,
+0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x3b, 0x421, 0x435, 0x43d, 0x3b, 0x41e, 0x43a, 0x442, 0x3b, 0x41d,
+0x43e, 0x44f, 0x3b, 0x414, 0x435, 0x43a, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b,
+0x44c, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e,
+0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f,
+0x431, 0x440, 0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x414,
+0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0x42f, 0x3b, 0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x3b, 0x41c, 0x3b, 0x418, 0x3b, 0x418,
+0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x41e, 0x3b, 0x41d, 0x3b, 0x414, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e,
+0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x2e, 0x3b,
+0x438, 0x44e, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b,
+0x43d, 0x43e, 0x44f, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x444, 0x435, 0x432,
+0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x439,
+0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435,
+0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440,
+0x44c, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0x31, 0xc6d4, 0x3b, 0x32, 0xc6d4, 0x3b, 0x33, 0xc6d4, 0x3b, 0x34,
+0xc6d4, 0x3b, 0x35, 0xc6d4, 0x3b, 0x36, 0xc6d4, 0x3b, 0x37, 0xc6d4, 0x3b, 0x38, 0xc6d4, 0x3b, 0x39, 0xc6d4, 0x3b, 0x31, 0x30, 0xc6d4,
+0x3b, 0x31, 0x31, 0xc6d4, 0x3b, 0x31, 0x32, 0xc6d4, 0x3b, 0x72, 0xea, 0x62, 0x3b, 0x72, 0x65, 0x15f, 0x3b, 0x61, 0x64, 0x61,
+0x3b, 0x61, 0x76, 0x72, 0x3b, 0x67, 0x75, 0x6c, 0x3b, 0x70, 0xfb, 0x15f, 0x3b, 0x74, 0xee, 0x72, 0x3b, 0x67, 0x65, 0x6c,
+0x3b, 0x72, 0x65, 0x7a, 0x3b, 0x6b, 0x65, 0x77, 0x3b, 0x73, 0x65, 0x72, 0x3b, 0x62, 0x65, 0x72, 0x3b, 0x72, 0xea, 0x62,
+0x65, 0x6e, 0x64, 0x61, 0x6e, 0x3b, 0x72, 0x65, 0x15f, 0x65, 0x6d, 0xee, 0x3b, 0x61, 0x64, 0x61, 0x72, 0x3b, 0x61, 0x76,
+0x72, 0xea, 0x6c, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e, 0x3b, 0x70, 0xfb, 0x15f, 0x70, 0x65, 0x72, 0x3b, 0x74, 0xee, 0x72,
+0x6d, 0x65, 0x68, 0x3b, 0x67, 0x65, 0x6c, 0x61, 0x77, 0xea, 0x6a, 0x3b, 0x72, 0x65, 0x7a, 0x62, 0x65, 0x72, 0x3b, 0x6b,
+0x65, 0x77, 0xe7, 0xea, 0x72, 0x3b, 0x73, 0x65, 0x72, 0x6d, 0x61, 0x77, 0x65, 0x7a, 0x3b, 0x62, 0x65, 0x72, 0x66, 0x61,
+0x6e, 0x62, 0x61, 0x72, 0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x47, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x47,
+0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x72, 0xea, 0x62, 0x65, 0x6e, 0x64, 0x61, 0x6e, 0xea, 0x3b, 0x72,
+0x65, 0x15f, 0x65, 0x6d, 0x69, 0x79, 0xea, 0x3b, 0x61, 0x64, 0x61, 0x72, 0xea, 0x3b, 0x61, 0x76, 0x72, 0xea, 0x6c, 0xea,
+0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e, 0xea, 0x3b, 0x70, 0xfb, 0x15f, 0x70, 0x65, 0x72, 0xea, 0x3b, 0x74, 0xee, 0x72, 0x6d,
+0x65, 0x68, 0xea, 0x3b, 0x67, 0x65, 0x6c, 0x61, 0x77, 0xea, 0x6a, 0xea, 0x3b, 0x72, 0x65, 0x7a, 0x62, 0x65, 0x72, 0xea,
+0x3b, 0x6b, 0x65, 0x77, 0xe7, 0xea, 0x72, 0xea, 0x3b, 0x73, 0x65, 0x72, 0x6d, 0x61, 0x77, 0x65, 0x7a, 0xea, 0x3b, 0x62,
+0x65, 0x72, 0x66, 0x61, 0x6e, 0x62, 0x61, 0x72, 0xea, 0x3b, 0x4d, 0x75, 0x74, 0x2e, 0x3b, 0x47, 0x61, 0x73, 0x2e, 0x3b,
+0x57, 0x65, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x74, 0x2e, 0x3b, 0x47, 0x69, 0x63, 0x2e, 0x3b, 0x4b, 0x61, 0x6d, 0x2e, 0x3b,
+0x4e, 0x79, 0x61, 0x2e, 0x3b, 0x4b, 0x61, 0x6e, 0x2e, 0x3b, 0x4e, 0x7a, 0x65, 0x2e, 0x3b, 0x55, 0x6b, 0x77, 0x2e, 0x3b,
+0x55, 0x67, 0x75, 0x2e, 0x3b, 0x55, 0x6b, 0x75, 0x2e, 0x3b, 0x4e, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x52, 0x75, 0x68, 0x75,
+0x68, 0x75, 0x6d, 0x61, 0x3b, 0x4e, 0x74, 0x77, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x3b, 0x4e, 0x64, 0x61, 0x6d, 0x75,
+0x6b, 0x69, 0x7a, 0x61, 0x3b, 0x52, 0x75, 0x73, 0x61, 0x6d, 0x61, 0x3b, 0x52, 0x75, 0x68, 0x65, 0x73, 0x68, 0x69, 0x3b,
+0x4d, 0x75, 0x6b, 0x61, 0x6b, 0x61, 0x72, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x61, 0x72, 0x6f, 0x3b,
+0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x47, 0x69, 0x74, 0x75, 0x67, 0x75, 0x74, 0x75, 0x3b, 0x4d, 0x75,
+0x6e, 0x79, 0x6f, 0x6e, 0x79, 0x6f, 0x3b, 0x4b, 0x69, 0x67, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x3b, 0xea1, 0x2e, 0xe81, 0x2e,
+0x3b, 0xe81, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0x2e, 0xe99, 0x2e, 0x3b, 0xea1, 0x2e, 0xeaa, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe9e, 0x2e,
+0x3b, 0xea1, 0xeb4, 0x2e, 0xe96, 0x2e, 0x3b, 0xe81, 0x2e, 0xea5, 0x2e, 0x3b, 0xeaa, 0x2e, 0xeab, 0x2e, 0x3b, 0xe81, 0x2e, 0xe8d,
+0x2e, 0x3b, 0xe95, 0x2e, 0xea5, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe88, 0x2e, 0x3b, 0xe97, 0x2e, 0xea7, 0x2e, 0x3b, 0xea1, 0xeb1, 0xe87,
+0xe81, 0xead, 0xe99, 0x3b, 0xe81, 0xeb8, 0xea1, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb5, 0xe99, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeaa, 0xeb2, 0x3b,
+0xe9e, 0xeb6, 0xe94, 0xeaa, 0xeb0, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb4, 0xe96, 0xeb8, 0xe99, 0xeb2, 0x3b, 0xe81, 0xecd, 0xea5, 0xeb0, 0xe81,
+0xebb, 0xe94, 0x3b, 0xeaa, 0xeb4, 0xe87, 0xeab, 0xeb2, 0x3b, 0xe81, 0xeb1, 0xe99, 0xe8d, 0xeb2, 0x3b, 0xe95, 0xeb8, 0xea5, 0xeb2, 0x3b,
+0xe9e, 0xeb0, 0xe88, 0xeb4, 0xe81, 0x3b, 0xe97, 0xeb1, 0xe99, 0xea7, 0xeb2, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0x65,
+0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73,
+0x3b, 0x6a, 0x16b, 0x6e, 0x2e, 0x3b, 0x6a, 0x16b, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74,
+0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e,
+0x76, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74,
+0x73, 0x3b, 0x61, 0x70, 0x72, 0x12b, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x69,
+0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6c, 0x69, 0x6a, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x73, 0x3b, 0x73, 0x65,
+0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x6f,
+0x76, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x79, 0x61,
+0x6e, 0x3b, 0x66, 0x62, 0x6c, 0x3b, 0x6d, 0x73, 0x69, 0x3b, 0x61, 0x70, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x79, 0x75,
+0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x74, 0x3b, 0x73, 0x74, 0x62, 0x3b, 0x254, 0x74, 0x62, 0x3b, 0x6e, 0x76,
+0x62, 0x3b, 0x64, 0x73, 0x62, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x79, 0x61, 0x6d, 0x62, 0x6f,
+0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x73, 0xe1, 0x6e,
+0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79,
+0x61, 0x20, 0x6d, 0xed, 0x6e, 0x65, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74,
+0xe1, 0x6e, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x6f, 0x74, 0xf3, 0x62, 0xe1, 0x3b,
+0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6e, 0x73, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a,
+0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x77, 0x61, 0x6d, 0x62, 0x65, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61,
+0x20, 0x6c, 0x69, 0x62, 0x77, 0x61, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69,
+0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x254,
+0x30c, 0x6b, 0x254, 0x301, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e,
+0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x79, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x79,
+0x3b, 0x79, 0x3b, 0x61, 0x3b, 0x73, 0x3b, 0x254, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x73, 0x61, 0x75, 0x73, 0x2e, 0x3b, 0x76,
+0x61, 0x73, 0x2e, 0x3b, 0x6b, 0x6f, 0x76, 0x2e, 0x3b, 0x62, 0x61, 0x6c, 0x2e, 0x3b, 0x67, 0x65, 0x67, 0x2e, 0x3b, 0x62,
+0x69, 0x72, 0x17e, 0x2e, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x2e, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x2e, 0x3b, 0x72, 0x75, 0x67,
+0x73, 0x2e, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x2e, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x2e, 0x3b, 0x67, 0x72, 0x75, 0x6f,
+0x64, 0x2e, 0x3b, 0x73, 0x61, 0x75, 0x73, 0x69, 0x73, 0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x6b, 0x6f,
+0x76, 0x61, 0x73, 0x3b, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x73, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x3b,
+0x62, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x73, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x61, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x6a,
+0x16b, 0x74, 0x69, 0x73, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x117, 0x6a, 0x69, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69, 0x73,
+0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x74, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x69, 0x73, 0x3b, 0x53,
+0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x42, 0x3b, 0x47, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4c,
+0x3b, 0x47, 0x3b, 0x73, 0x61, 0x75, 0x73, 0x69, 0x6f, 0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x6b, 0x6f,
+0x76, 0x6f, 0x3b, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x17e, 0x69, 0x6f, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x73,
+0x3b, 0x62, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x6f, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x6f, 0x73, 0x3b, 0x72, 0x75, 0x67,
+0x70, 0x6a, 0x16b, 0x10d, 0x69, 0x6f, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x117, 0x6a, 0x6f, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69,
+0x6f, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x10d, 0x69, 0x6f, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x17e, 0x69, 0x6f,
+0x3b, 0x458, 0x430, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e,
+0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x2e, 0x3b, 0x458, 0x443, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b,
+0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a,
+0x2e, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c,
+0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458,
+0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438,
+0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435,
+0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x458, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x458, 0x3b, 0x458,
+0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,
+0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x41,
+0x6f, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a,
+0x61, 0x6e, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x74,
+0x73, 0x61, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x79, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x61, 0x3b, 0x4a,
+0x6f, 0x6c, 0x61, 0x79, 0x3b, 0x41, 0x6f, 0x67, 0x6f, 0x73, 0x69, 0x74, 0x72, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x61,
+0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x61, 0x6d, 0x62, 0x72,
+0x61, 0x3b, 0x44, 0x65, 0x73, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,
+0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f,
+0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a,
+0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x3b,
+0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b,
+0x4f, 0x67, 0x6f, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,
+0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72,
+0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f,
+0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0xd1c, 0xd28, 0xd41, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0x3b, 0xd2e, 0xd3e, 0xd7c, 0x3b,
+0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b,
+0xd13, 0xd17, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0x3b, 0xd28, 0xd35,
+0xd02, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0x3b, 0xd1c, 0xd28, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41,
+0xd35, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd3e, 0xd7c, 0xd1a, 0xd4d, 0xd1a, 0xd4d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0xd7d, 0x3b, 0xd2e,
+0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0xd38, 0xd4d, 0xd31, 0xd4d, 0xd31,
+0xd4d, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd12, 0xd15, 0xd4d, 0x200c, 0xd1f, 0xd4b, 0xd2c,
+0xd7c, 0x3b, 0xd28, 0xd35, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd1c, 0x3b, 0xd2b, 0xd46, 0x3b,
+0xd2e, 0xd3e, 0x3b, 0xd0f, 0x3b, 0xd2e, 0xd46, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd13, 0x3b, 0xd38, 0xd46, 0x3b,
+0xd12, 0x3b, 0xd28, 0x3b, 0xd21, 0xd3f, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x72, 0x61, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41,
+0x70, 0x72, 0x3b, 0x4d, 0x65, 0x6a, 0x3b, 0x120, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x77, 0x3b, 0x53,
+0x65, 0x74, 0x3b, 0x4f, 0x74, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x10b, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61,
+0x72, 0x3b, 0x46, 0x72, 0x61, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d,
+0x65, 0x6a, 0x6a, 0x75, 0x3b, 0x120, 0x75, 0x6e, 0x6a, 0x75, 0x3b, 0x4c, 0x75, 0x6c, 0x6a, 0x75, 0x3b, 0x41, 0x77, 0x77,
+0x69, 0x73, 0x73, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x74, 0x75, 0x62,
+0x72, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x10b, 0x65, 0x6d, 0x62, 0x72, 0x75,
+0x3b, 0x4a, 0x6e, 0x3b, 0x46, 0x72, 0x3b, 0x4d, 0x7a, 0x3b, 0x41, 0x70, 0x3b, 0x4d, 0x6a, 0x3b, 0x120, 0x6e, 0x3b, 0x4c,
+0x6a, 0x3b, 0x41, 0x77, 0x3b, 0x53, 0x74, 0x3b, 0x4f, 0x62, 0x3b, 0x4e, 0x76, 0x3b, 0x44, 0x10b, 0x3b, 0x4a, 0x3b, 0x46,
+0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x120, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44,
+0x3b, 0x4b, 0x6f, 0x68, 0x69, 0x3b, 0x48, 0x75, 0x69, 0x3b, 0x50, 0x6f, 0x75, 0x3b, 0x50, 0x61, 0x65, 0x3b, 0x48, 0x61,
+0x72, 0x61, 0x3b, 0x50, 0x69, 0x70, 0x69, 0x3b, 0x48, 0x14d, 0x6e, 0x67, 0x6f, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x4d,
+0x61, 0x68, 0x75, 0x3b, 0x4e, 0x75, 0x6b, 0x75, 0x3b, 0x52, 0x61, 0x6e, 0x67, 0x69, 0x3b, 0x48, 0x61, 0x6b, 0x69, 0x3b,
+0x4b, 0x6f, 0x68, 0x69, 0x74, 0x101, 0x74, 0x65, 0x61, 0x3b, 0x48, 0x75, 0x69, 0x74, 0x61, 0x6e, 0x67, 0x75, 0x72, 0x75,
+0x3b, 0x50, 0x6f, 0x75, 0x74, 0x16b, 0x74, 0x65, 0x72, 0x61, 0x6e, 0x67, 0x69, 0x3b, 0x50, 0x61, 0x65, 0x6e, 0x67, 0x61,
+0x77, 0x68, 0x101, 0x77, 0x68, 0x101, 0x3b, 0x48, 0x61, 0x72, 0x61, 0x74, 0x75, 0x61, 0x3b, 0x50, 0x69, 0x70, 0x69, 0x72,
+0x69, 0x3b, 0x48, 0x14d, 0x6e, 0x67, 0x6f, 0x6e, 0x67, 0x6f, 0x69, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x74, 0x75, 0x72, 0x69,
+0x6b, 0x14d, 0x6b, 0x101, 0x3b, 0x4d, 0x61, 0x68, 0x75, 0x72, 0x75, 0x3b, 0x57, 0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x61,
+0x2d, 0x101, 0x2d, 0x6e, 0x75, 0x6b, 0x75, 0x3b, 0x57, 0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x61, 0x2d, 0x101, 0x2d, 0x72,
+0x61, 0x6e, 0x67, 0x69, 0x3b, 0x48, 0x61, 0x6b, 0x69, 0x68, 0x65, 0x61, 0x3b, 0x4b, 0x3b, 0x48, 0x3b, 0x50, 0x3b, 0x50,
+0x3b, 0x48, 0x3b, 0x50, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x48, 0x3b, 0x91c, 0x93e, 0x928,
+0x947, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f,
+0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x3b, 0x938, 0x92a, 0x94d, 0x91f,
+0x947, 0x902, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x3b, 0x921, 0x93f, 0x938,
+0x947, 0x902, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e,
+0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c,
+0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902,
+0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930,
+0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x91c, 0x93e, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b,
+0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x911, 0x3b, 0x938, 0x3b, 0x911, 0x3b, 0x928, 0x94b, 0x3b, 0x921, 0x93f,
+0x3b, 0x31, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x32, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x33, 0x2d, 0x440,
+0x20, 0x441, 0x430, 0x440, 0x3b, 0x34, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x35, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440,
+0x3b, 0x36, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x37, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x38, 0x2d, 0x440,
+0x20, 0x441, 0x430, 0x440, 0x3b, 0x39, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x31, 0x30, 0x2d, 0x440, 0x20, 0x441, 0x430,
+0x440, 0x3b, 0x31, 0x31, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x31, 0x32, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b,
+0x41d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x425, 0x43e, 0x451, 0x440, 0x434, 0x443,
+0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x413, 0x443, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440,
+0x20, 0x441, 0x430, 0x440, 0x3b, 0x414, 0x4e9, 0x440, 0x4e9, 0x432, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440,
+0x3b, 0x422, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x417, 0x443, 0x440, 0x433, 0x430,
+0x430, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x414, 0x43e, 0x43b, 0x43e, 0x43e, 0x434, 0x443, 0x433,
+0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x41d, 0x430, 0x439, 0x43c, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441,
+0x430, 0x440, 0x3b, 0x415, 0x441, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x410, 0x440, 0x430, 0x432,
+0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x410, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x43d, 0x44d, 0x433,
+0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x410, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x445, 0x43e, 0x451,
+0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x49, 0x3b, 0x49, 0x49, 0x3b, 0x49, 0x49, 0x49,
+0x3b, 0x49, 0x56, 0x3b, 0x56, 0x3b, 0x56, 0x49, 0x3b, 0x56, 0x49, 0x49, 0x3b, 0x56, 0x49, 0x49, 0x49, 0x3b, 0x49, 0x58,
+0x3b, 0x58, 0x3b, 0x58, 0x49, 0x3b, 0x58, 0x49, 0x49, 0x3b, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20,
+0x441, 0x430, 0x440, 0x3b, 0x445, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x433,
+0x443, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x434, 0x4e9, 0x440, 0x4e9, 0x432,
+0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x442, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440,
+0x20, 0x441, 0x430, 0x440, 0x3b, 0x437, 0x443, 0x440, 0x433, 0x430, 0x430, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430,
+0x440, 0x3b, 0x434, 0x43e, 0x43b, 0x43e, 0x43e, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x43d, 0x430,
+0x439, 0x43c, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x435, 0x441, 0x434, 0x4af, 0x433, 0x44d, 0x44d,
+0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440,
+0x3b, 0x430, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440,
+0x3b, 0x430, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x445, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430,
+0x440, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x905, 0x930, 0x940, 0x3b, 0x92e, 0x93e,
+0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941,
+0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c, 0x930,
+0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x921, 0x93f,
+0x938, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a,
+0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x3b, 0x905, 0x917, 0x3b,
+0x938, 0x947, 0x92a, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x3b,
+0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x3b, 0x92e, 0x947,
+0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x3b, 0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x3b, 0x905, 0x915, 0x94d, 0x91f,
+0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66,
+0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61,
+0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73,
+0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76,
+0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xb1c, 0xb3e, 0xb28, 0xb41, 0xb06,
+0xb30, 0xb40, 0x3b, 0xb2b, 0xb47, 0xb2c, 0xb43, 0xb06, 0xb30, 0xb40, 0x3b, 0xb2e, 0xb3e, 0xb30, 0xb4d, 0xb1a, 0xb4d, 0xb1a, 0x3b, 0xb05,
+0xb2a, 0xb4d, 0xb30, 0xb47, 0xb32, 0x3b, 0xb2e, 0xb07, 0x3b, 0xb1c, 0xb41, 0xb28, 0x3b, 0xb1c, 0xb41, 0xb32, 0xb3e, 0xb07, 0x3b, 0xb05,
+0xb17, 0xb37, 0xb4d, 0xb1f, 0x3b, 0xb38, 0xb47, 0xb2a, 0xb4d, 0xb1f, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb05, 0xb15, 0xb4d, 0xb1f,
+0xb4b, 0xb2c, 0xb30, 0x3b, 0xb28, 0xb2d, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb21, 0xb3f, 0xb38, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30,
+0x3b, 0xb1c, 0xb3e, 0x3b, 0xb2b, 0xb47, 0x3b, 0xb2e, 0xb3e, 0x3b, 0xb05, 0x3b, 0xb2e, 0xb07, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb1c, 0xb41,
+0x3b, 0xb05, 0x3b, 0xb38, 0xb47, 0x3b, 0xb05, 0x3b, 0xb28, 0x3b, 0xb21, 0xb3f, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641,
+0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b,
+0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628,
+0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631,
+0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x6d0, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b,
+0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627,
+0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,
+0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648,
+0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646,
+0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x6d0, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b,
+0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c,
+0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646,
+0x3b, 0x62f, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x3b, 0x645, 0x627, 0x631, 0x633,
+0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x647, 0x3b, 0x698, 0x648, 0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647,
+0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646,
+0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x622,
+0x3b, 0x645, 0x3b, 0x698, 0x3b, 0x698, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x698, 0x627, 0x646,
+0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631,
+0x6cc, 0x644, 0x3b, 0x645, 0x647, 0x654, 0x3b, 0x698, 0x648, 0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x654, 0x3b, 0x627,
+0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627,
+0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x628, 0x631,
+0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648,
+0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b,
+0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c,
+0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644,
+0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a,
+0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645,
+0x3b, 0x73, 0x74, 0x79, 0x3b, 0x6c, 0x75, 0x74, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6b, 0x77, 0x69, 0x3b, 0x6d, 0x61, 0x6a,
+0x3b, 0x63, 0x7a, 0x65, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x69, 0x65, 0x3b, 0x77, 0x72, 0x7a, 0x3b, 0x70, 0x61, 0x17a,
+0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x65, 0x144, 0x3b, 0x6c, 0x75, 0x74,
+0x79, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x65, 0x63, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x63, 0x69, 0x65, 0x144, 0x3b, 0x6d, 0x61,
+0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x72, 0x77, 0x69, 0x65, 0x63, 0x3b, 0x6c, 0x69, 0x70, 0x69, 0x65, 0x63, 0x3b, 0x73, 0x69,
+0x65, 0x72, 0x70, 0x69, 0x65, 0x144, 0x3b, 0x77, 0x72, 0x7a, 0x65, 0x73, 0x69, 0x65, 0x144, 0x3b, 0x70, 0x61, 0x17a, 0x64,
+0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69, 0x6b, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x67, 0x72, 0x75,
+0x64, 0x7a, 0x69, 0x65, 0x144, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x43, 0x3b, 0x4c, 0x3b,
+0x53, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x4c, 0x3b, 0x47, 0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x6e, 0x69, 0x61, 0x3b, 0x6c,
+0x75, 0x74, 0x65, 0x67, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x74, 0x6e, 0x69, 0x61,
+0x3b, 0x6d, 0x61, 0x6a, 0x61, 0x3b, 0x63, 0x7a, 0x65, 0x72, 0x77, 0x63, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x63, 0x61, 0x3b,
+0x73, 0x69, 0x65, 0x72, 0x70, 0x6e, 0x69, 0x61, 0x3b, 0x77, 0x72, 0x7a, 0x65, 0x15b, 0x6e, 0x69, 0x61, 0x3b, 0x70, 0x61,
+0x17a, 0x64, 0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69, 0x6b, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61,
+0x3b, 0x67, 0x72, 0x75, 0x64, 0x6e, 0x69, 0x61, 0x3b, 0x73, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x63,
+0x3b, 0x6c, 0x3b, 0x73, 0x3b, 0x77, 0x3b, 0x70, 0x3b, 0x6c, 0x3b, 0x67, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76,
+0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c,
+0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x7a,
+0x3b, 0x6a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d,
+0x61, 0x72, 0xe7, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x68,
+0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d,
+0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f,
+0x3b, 0x64, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0xa1c, 0xa28, 0x3b, 0xa2b, 0xa3c, 0xa30, 0x3b, 0xa2e, 0xa3e, 0xa30,
+0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32, 0xa3e, 0x3b,
+0xa05, 0xa17, 0x3b, 0xa38, 0xa24, 0xa70, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0x3b, 0xa28, 0xa35, 0xa70, 0x3b, 0xa26, 0xa38, 0xa70, 0x3b,
+0xa1c, 0xa28, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2b, 0xa3c, 0xa30, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2e, 0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a,
+0xa4d, 0xa30, 0xa48, 0xa32, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32, 0xa3e, 0xa08, 0x3b, 0xa05, 0xa17,
+0xa38, 0xa24, 0x3b, 0xa38, 0xa24, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0xa2c, 0xa30, 0x3b, 0xa28, 0xa35, 0xa70, 0xa2c,
+0xa30, 0x3b, 0xa26, 0xa38, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa1c, 0x3b, 0xa2b, 0xa3c, 0x3b, 0xa2e, 0xa3e, 0x3b, 0xa05, 0x3b, 0xa2e, 0x3b,
+0xa1c, 0xa42, 0x3b, 0xa1c, 0xa41, 0x3b, 0xa05, 0x3b, 0xa38, 0x3b, 0xa05, 0x3b, 0xa28, 0x3b, 0xa26, 0x3b, 0x62c, 0x646, 0x648, 0x631,
+0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645,
+0x626, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a,
+0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645,
+0x628, 0x631, 0x3b, 0x45, 0x6e, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d,
+0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f,
+0x63, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x63, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62,
+0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79,
+0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f,
+0x3b, 0x53, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e,
+0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x73,
+0x63, 0x68, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72,
+0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x2e, 0x3b, 0x66, 0x61, 0x6e, 0x2e, 0x3b, 0x61,
+0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e,
+0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x65, 0x72,
+0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x67, 0x6c, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65,
+0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x66, 0x61, 0x6e, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x61, 0x76, 0x75, 0x73,
+0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b,
+0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x53, 0x3b,
+0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b,
+0x44, 0x3b, 0x69, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72,
+0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x2e, 0x3b, 0x69, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e,
+0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63,
+0x2e, 0x3b, 0x69, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x65,
+0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x65, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x69, 0x3b,
+0x69, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x69, 0x75, 0x6c, 0x69, 0x65, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73,
+0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b,
+0x6e, 0x6f, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b,
+0x49, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b,
+0x4e, 0x3b, 0x44, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b,
+0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430,
+0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e,
+0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440,
+0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x438, 0x44e, 0x43d, 0x2e, 0x3b, 0x438, 0x44e, 0x43b, 0x2e,
+0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f,
+0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44f, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430,
+0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x430, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x44f, 0x3b,
+0x438, 0x44e, 0x43d, 0x44f, 0x3b, 0x438, 0x44e, 0x43b, 0x44f, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x430, 0x3b, 0x441, 0x435,
+0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440,
+0x44f, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44f, 0x3b, 0x4e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4d, 0x62,
+0xe4, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x42, 0xea, 0x6c, 0x3b, 0x46, 0xf6, 0x6e, 0x3b, 0x4c, 0x65, 0x6e, 0x3b, 0x4b, 0xfc,
+0x6b, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x4e, 0x67, 0x62, 0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6b, 0x3b, 0x4e, 0x79,
+0x65, 0x6e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x75, 0x6e, 0x64, 0xef, 0x67, 0x69, 0x3b, 0x4d, 0x62, 0xe4, 0x6e, 0x67,
+0xfc, 0x3b, 0x4e, 0x67, 0x75, 0x62, 0xf9, 0x65, 0x3b, 0x42, 0xea, 0x6c, 0xe4, 0x77, 0xfc, 0x3b, 0x46, 0xf6, 0x6e, 0x64,
+0x6f, 0x3b, 0x4c, 0x65, 0x6e, 0x67, 0x75, 0x61, 0x3b, 0x4b, 0xfc, 0x6b, 0xfc, 0x72, 0xfc, 0x3b, 0x4d, 0x76, 0x75, 0x6b,
+0x61, 0x3b, 0x4e, 0x67, 0x62, 0x65, 0x72, 0x65, 0x72, 0x65, 0x3b, 0x4e, 0x61, 0x62, 0xe4, 0x6e, 0x64, 0xfc, 0x72, 0x75,
+0x3b, 0x4b, 0x61, 0x6b, 0x61, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x46,
+0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431,
+0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b,
+0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446,
+0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442,
+0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430,
+0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e,
+0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430,
+0x440, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d,
+0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b,
+0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66,
+0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61,
+0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70,
+0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d,
+0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62,
+0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c,
+0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63,
+0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x2e,
+0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x2e, 0x3b, 0x73, 0x65,
+0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x458,
+0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b,
+0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x3b, 0x43e, 0x43a, 0x442,
+0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b, 0x42f, 0x43d, 0x432, 0x2e, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x2e, 0x3b,
+0x41c, 0x430, 0x440, 0x442, 0x2e, 0x3b, 0x410, 0x43f, 0x440, 0x2e, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b,
+0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x2e, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x41e, 0x43a, 0x442, 0x2e,
+0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x414, 0x435, 0x43a, 0x2e, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424,
+0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x44a, 0x438, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c,
+0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441,
+0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d,
+0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444,
+0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x44b, 0x3b, 0x438,
+0x44e, 0x43d, 0x44b, 0x3b, 0x438, 0x44e, 0x43b, 0x44b, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x2e, 0x3b, 0x43e,
+0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44b,
+0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x44a, 0x438, 0x439, 0x44b, 0x3b, 0x430, 0x43f,
+0x440, 0x435, 0x43b, 0x44b, 0x3b, 0x43c, 0x430, 0x439, 0x44b, 0x3b, 0x438, 0x44e, 0x43d, 0x44b, 0x3b, 0x438, 0x44e, 0x43b, 0x44b, 0x3b,
+0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x44b, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x43e, 0x43a, 0x442,
+0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44b, 0x3b,
+0x4e, 0x64, 0x69, 0x3b, 0x4b, 0x75, 0x6b, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x4b, 0x75, 0x62, 0x3b, 0x43, 0x68, 0x76, 0x3b,
+0x43, 0x68, 0x6b, 0x3b, 0x43, 0x68, 0x67, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x47, 0x75, 0x6e, 0x3b, 0x47, 0x75, 0x6d, 0x3b,
+0x4d, 0x62, 0x75, 0x3b, 0x5a, 0x76, 0x69, 0x3b, 0x4e, 0x64, 0x69, 0x72, 0x61, 0x3b, 0x4b, 0x75, 0x6b, 0x61, 0x64, 0x7a,
+0x69, 0x3b, 0x4b, 0x75, 0x72, 0x75, 0x6d, 0x65, 0x3b, 0x4b, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x62, 0x69, 0x3b, 0x43, 0x68,
+0x69, 0x76, 0x61, 0x62, 0x76, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75,
+0x6e, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4e, 0x79, 0x61, 0x6d, 0x61, 0x76, 0x68, 0x75, 0x76, 0x68, 0x75, 0x3b, 0x47, 0x75,
+0x6e, 0x79, 0x61, 0x6e, 0x61, 0x3b, 0x47, 0x75, 0x6d, 0x69, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4d, 0x62, 0x75, 0x64, 0x7a,
+0x69, 0x3b, 0x5a, 0x76, 0x69, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x43, 0x3b,
+0x43, 0x3b, 0x4e, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x64a,
+0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x626, 0x64a,
+0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x621, 0x650, 0x3b, 0x622, 0x6af, 0x633, 0x67d, 0x3b, 0x633, 0x64a, 0x67e,
+0x67d, 0x645, 0x628, 0x631, 0x3b, 0x622, 0x6aa, 0x67d, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x68a, 0x633,
+0x645, 0x628, 0x631, 0x3b, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d,
+0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b,
+0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0x3b, 0xdaf, 0xdd9,
+0xdc3, 0xdd0, 0x3b, 0xda2, 0xdb1, 0xdc0, 0xdcf, 0xdbb, 0xdd2, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0xdbb, 0xdc0, 0xdcf, 0xdbb, 0xdd2, 0x3b, 0xdb8,
+0xdcf, 0xdbb, 0xdca, 0xdad, 0xdd4, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b,
+0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0xdc3, 0xdca, 0xdad, 0xdd4, 0x3b, 0xdc3, 0xdd0,
+0xdb4, 0xdca, 0xdad, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0xdad, 0xddd, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdb1,
+0xddc, 0xdc0, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xda2,
+0x3b, 0xdb4, 0xdd9, 0x3b, 0xdb8, 0xdcf, 0x3b, 0xd85, 0x3b, 0xdb8, 0xdd0, 0x3b, 0xda2, 0xdd6, 0x3b, 0xda2, 0xdd6, 0x3b, 0xd85, 0x3b,
+0xdc3, 0xdd0, 0x3b, 0xd94, 0x3b, 0xdb1, 0xdd9, 0x3b, 0xdaf, 0xdd9, 0x3b, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf,
+0xdbb, 0xdca, 0xdad, 0xdd4, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2,
+0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0x3b, 0xd94, 0xd9a,
+0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b,
+0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b,
+0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b,
+0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63,
+0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61,
+0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3,
+0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65,
+0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x6d,
+0x61, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x61, 0x3b, 0x6d, 0xe1, 0x6a, 0x61, 0x3b, 0x6a, 0xfa, 0x6e,
+0x61, 0x3b, 0x6a, 0xfa, 0x6c, 0x61, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,
+0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72,
+0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e,
+0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b,
+0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x76, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b,
+0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62,
+0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a,
+0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b,
+0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f,
+0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b,
+0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b,
+0x4c, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x73, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x66, 0x3b,
+0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61, 0x61, 0x79, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x61, 0x61, 0x79,
+0x6f, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b,
+0x4a, 0x75, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x75, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x53,
+0x65, 0x62, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f,
+0x66, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b,
+0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b,
+0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20,
+0x4c, 0x61, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x64, 0x64, 0x65, 0x78, 0x61,
+0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x41, 0x66, 0x72, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68,
+0x61, 0x20, 0x53, 0x68, 0x61, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x69, 0x78, 0x61,
+0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x64, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69,
+0x73, 0x68, 0x61, 0x20, 0x53, 0x69, 0x64, 0x65, 0x65, 0x64, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20,
+0x53, 0x61, 0x67, 0x61, 0x61, 0x6c, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x62, 0x6e,
+0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x77, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f,
+0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x20, 0x69, 0x79, 0x6f,
+0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d,
+0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a,
+0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b,
+0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e, 0x3b, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72,
+0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x6f,
+0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b,
+0x73, 0x65, 0x70, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e,
+0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45,
+0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e,
+0x3b, 0x44, 0x3b, 0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62,
+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67,
+0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69,
+0x63, 0x2e, 0x3b, 0x45, 0x6e, 0x65, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x62,
+0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x79, 0x2e, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x67,
+0x6f, 0x2e, 0x3b, 0x53, 0x65, 0x74, 0x2e, 0x3b, 0x4f, 0x63, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x69,
+0x63, 0x2e, 0x3b, 0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62,
+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67,
+0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69,
+0x63, 0x2e, 0x3b, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72,
+0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b,
+0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62,
+0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65,
+0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,
+0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41,
+0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a,
+0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68,
+0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75,
+0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b,
+0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d,
+0x62, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70,
+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67,
+0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63,
+0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d,
+0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a,
+0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65,
+0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64,
+0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b,
+0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b,
+0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41e,
+0x43a, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0xb9c,
+0xba9, 0x2e, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0x2e, 0x3b,
+0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0x2e, 0x3b, 0xb9a, 0xbc6, 0xbaa,
+0xbcd, 0x2e, 0x3b, 0xb85, 0xb95, 0xbcd, 0x2e, 0x3b, 0xba8, 0xbb5, 0x2e, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0x2e, 0x3b, 0xb9c, 0xba9, 0xbb5,
+0xbb0, 0xbbf, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0xbb0, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0xb9a, 0xbcd, 0x3b, 0xb8f,
+0xbaa, 0xbcd, 0xbb0, 0xbb2, 0xbcd, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86,
+0xb95, 0xbb8, 0xbcd, 0xb9f, 0xbcd, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0xb9f, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb85, 0xb95, 0xbcd,
+0xb9f, 0xbcb, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xba8, 0xbb5, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0xbae, 0xbcd, 0xbaa,
+0xbb0, 0xbcd, 0x3b, 0xb9c, 0x3b, 0xbaa, 0xbbf, 0x3b, 0xbae, 0xbbe, 0x3b, 0xb8f, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb9c,
+0xbc2, 0x3b, 0xb86, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xb85, 0x3b, 0xba8, 0x3b, 0xb9f, 0xbbf, 0x3b, 0x433, 0x44b, 0x439, 0x43d, 0x2e, 0x3b,
+0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438,
+0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b,
+0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x433, 0x44b, 0x439, 0x43d,
+0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440,
+0x435, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432,
+0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440,
+0x44c, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0xc1c, 0xc28, 0x3b,
+0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0x3b, 0xc2e,
+0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc41, 0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f,
+0xc46, 0xc02, 0x3b, 0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b, 0x3b, 0xc28, 0xc35, 0xc02, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02, 0x3b, 0xc1c,
+0xc28, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f,
+0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0xc32, 0xc4d, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc41, 0xc32,
+0xc48, 0x3b, 0xc06, 0xc17, 0xc38, 0xc4d, 0xc1f, 0xc41, 0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b,
+0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc28, 0xc35, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46,
+0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc1c, 0x3b, 0xc2b, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0x3b, 0xc0f, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42,
+0x3b, 0xc1c, 0xc41, 0x3b, 0xc06, 0x3b, 0xc38, 0xc46, 0x3b, 0xc05, 0x3b, 0xc28, 0x3b, 0xc21, 0xc3f, 0x3b, 0xe21, 0x2e, 0xe04, 0x2e,
+0x3b, 0xe01, 0x2e, 0xe1e, 0x2e, 0x3b, 0xe21, 0xe35, 0x2e, 0xe04, 0x2e, 0x3b, 0xe40, 0xe21, 0x2e, 0xe22, 0x2e, 0x3b, 0xe1e, 0x2e,
+0xe04, 0x2e, 0x3b, 0xe21, 0xe34, 0x2e, 0xe22, 0x2e, 0x3b, 0xe01, 0x2e, 0xe04, 0x2e, 0x3b, 0xe2a, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01,
+0x2e, 0xe22, 0x2e, 0x3b, 0xe15, 0x2e, 0xe04, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe22, 0x2e, 0x3b, 0xe18, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21,
+0xe01, 0xe23, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe38, 0xe21, 0xe20, 0xe32, 0xe1e, 0xe31, 0xe19, 0xe18, 0xe4c, 0x3b, 0xe21, 0xe35, 0xe19,
+0xe32, 0xe04, 0xe21, 0x3b, 0xe40, 0xe21, 0xe29, 0xe32, 0xe22, 0xe19, 0x3b, 0xe1e, 0xe24, 0xe29, 0xe20, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21,
+0xe34, 0xe16, 0xe38, 0xe19, 0xe32, 0xe22, 0xe19, 0x3b, 0xe01, 0xe23, 0xe01, 0xe0e, 0xe32, 0xe04, 0xe21, 0x3b, 0xe2a, 0xe34, 0xe07, 0xe2b,
+0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe31, 0xe19, 0xe22, 0xe32, 0xe22, 0xe19, 0x3b, 0xe15, 0xe38, 0xe25, 0xe32, 0xe04, 0xe21, 0x3b, 0xe1e,
+0xe24, 0xe28, 0xe08, 0xe34, 0xe01, 0xe32, 0xe22, 0xe19, 0x3b, 0xe18, 0xe31, 0xe19, 0xe27, 0xe32, 0xe04, 0xe21, 0x3b, 0xf5f, 0xfb3, 0xf0b,
+0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54,
+0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,
+0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3,
+0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53,
+0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3,
+0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54,
+0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f,
+0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56,
+0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0x3b, 0xf5f,
+0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b,
+0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74,
+0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56,
+0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0x3b,
+0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b,
+0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66,
+0xf0b, 0xf54, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x3b, 0x1218, 0x130b, 0x3b, 0x121a, 0x12eb, 0x3b, 0x130d, 0x1295, 0x3b, 0x1230, 0x1290,
+0x3b, 0x1213, 0x121d, 0x3b, 0x1290, 0x1213, 0x3b, 0x1218, 0x1235, 0x3b, 0x1325, 0x1245, 0x3b, 0x1215, 0x12f3, 0x3b, 0x1273, 0x1215, 0x3b, 0x1325,
+0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x1275, 0x3b, 0x1218, 0x130b, 0x1262, 0x1275, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x12eb, 0x3b, 0x130d, 0x1295, 0x1266,
+0x1275, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x1228, 0x121d, 0x3b, 0x1325,
+0x1245, 0x121d, 0x1272, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x1235, 0x3b, 0x1325, 0x3b, 0x1208, 0x3b, 0x1218, 0x3b, 0x121a,
+0x3b, 0x130d, 0x3b, 0x1230, 0x3b, 0x1213, 0x3b, 0x1290, 0x3b, 0x1218, 0x3b, 0x1325, 0x3b, 0x1215, 0x3b, 0x1273, 0x3b, 0x53, 0x101, 0x6e,
+0x3b, 0x46, 0x113, 0x70, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75,
+0x6e, 0x3b, 0x53, 0x69, 0x75, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x3b,
+0x4e, 0x14d, 0x76, 0x3b, 0x54, 0x12b, 0x73, 0x3b, 0x53, 0x101, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x113, 0x70, 0x75,
+0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x73, 0x69, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x6c, 0x65, 0x6c, 0x69, 0x3b,
+0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x6f,
+0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x74, 0x6f, 0x70, 0x61,
+0x3b, 0x4e, 0x14d, 0x76, 0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x73, 0x65, 0x6d, 0x61, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d,
+0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4f,
+0x63, 0x61, 0x3b, 0x15e, 0x75, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4e, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48,
+0x61, 0x7a, 0x3b, 0x54, 0x65, 0x6d, 0x3b, 0x41, 0x11f, 0x75, 0x3b, 0x45, 0x79, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x3b, 0x4b,
+0x61, 0x73, 0x3b, 0x41, 0x72, 0x61, 0x3b, 0x4f, 0x63, 0x61, 0x6b, 0x3b, 0x15e, 0x75, 0x62, 0x61, 0x74, 0x3b, 0x4d, 0x61,
+0x72, 0x74, 0x3b, 0x4e, 0x69, 0x73, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x79, 0x131, 0x73, 0x3b, 0x48, 0x61, 0x7a, 0x69, 0x72,
+0x61, 0x6e, 0x3b, 0x54, 0x65, 0x6d, 0x6d, 0x75, 0x7a, 0x3b, 0x41, 0x11f, 0x75, 0x73, 0x74, 0x6f, 0x73, 0x3b, 0x45, 0x79,
+0x6c, 0xfc, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x73, 0x131, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6c, 0x131,
+0x6b, 0x3b, 0x4f, 0x3b, 0x15e, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x45, 0x3b,
+0x45, 0x3b, 0x4b, 0x3b, 0x41, 0x3b, 0xdd, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x77, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70,
+0x72, 0x3b, 0x4d, 0x61, 0xfd, 0x3b, 0x49, 0xfd, 0x75, 0x6e, 0x3b, 0x49, 0xfd, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x67, 0x3b,
+0x53, 0x65, 0x6e, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0xfd, 0x3b, 0x44, 0x65, 0x6b, 0x3b, 0xdd, 0x61, 0x6e, 0x77,
+0x61, 0x72, 0x3b, 0x46, 0x65, 0x77, 0x72, 0x61, 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c,
+0x3b, 0x4d, 0x61, 0xfd, 0x3b, 0x49, 0xfd, 0x75, 0x6e, 0x3b, 0x49, 0xfd, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x67, 0x75, 0x73,
+0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x4e,
+0x6f, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0xdd, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41,
+0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0xfd, 0x61, 0x6e,
+0x3b, 0x66, 0x65, 0x77, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0xfd, 0x3b, 0x69, 0xfd,
+0x75, 0x6e, 0x3b, 0x69, 0xfd, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b,
+0x6e, 0x6f, 0xfd, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0xfd, 0x61, 0x6e, 0x77, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x77, 0x72, 0x61,
+0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0xfd, 0x3b, 0x69, 0xfd, 0x75,
+0x6e, 0x3b, 0x69, 0xfd, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0xfd, 0x61,
+0x62, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65,
+0x6b, 0x61, 0x62, 0x72, 0x3b, 0x64a, 0x627, 0x646, 0x6cb, 0x627, 0x631, 0x3b, 0x641, 0x6d0, 0x6cb, 0x631, 0x627, 0x644, 0x3b, 0x645,
+0x627, 0x631, 0x62a, 0x3b, 0x626, 0x627, 0x67e, 0x631, 0x6d0, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x626, 0x649, 0x64a, 0x6c7, 0x646,
+0x3b, 0x626, 0x649, 0x64a, 0x6c7, 0x644, 0x3b, 0x626, 0x627, 0x6cb, 0x63a, 0x6c7, 0x633, 0x62a, 0x3b, 0x633, 0x6d0, 0x646, 0x62a, 0x6d5,
+0x628, 0x649, 0x631, 0x3b, 0x626, 0x6c6, 0x643, 0x62a, 0x6d5, 0x628, 0x649, 0x631, 0x3b, 0x646, 0x648, 0x64a, 0x627, 0x628, 0x649, 0x631,
+0x3b, 0x62f, 0x6d0, 0x643, 0x627, 0x628, 0x649, 0x631, 0x3b, 0x441, 0x456, 0x447, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x431, 0x435, 0x440,
+0x3b, 0x43a, 0x432, 0x456, 0x3b, 0x442, 0x440, 0x430, 0x3b, 0x447, 0x435, 0x440, 0x3b, 0x43b, 0x438, 0x43f, 0x3b, 0x441, 0x435, 0x440,
+0x3b, 0x432, 0x435, 0x440, 0x3b, 0x436, 0x43e, 0x432, 0x3b, 0x43b, 0x438, 0x441, 0x3b, 0x433, 0x440, 0x443, 0x3b, 0x441, 0x456, 0x447,
+0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x438, 0x439, 0x3b, 0x431, 0x435, 0x440, 0x435, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43a,
+0x432, 0x456, 0x442, 0x435, 0x43d, 0x44c, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x435,
+0x43d, 0x44c, 0x3b, 0x43b, 0x438, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435,
+0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e,
+0x43f, 0x430, 0x434, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x435, 0x43d, 0x44c, 0x3b, 0x421, 0x3b, 0x41b, 0x3b, 0x411, 0x3b, 0x41a, 0x3b,
+0x422, 0x3b, 0x427, 0x3b, 0x41b, 0x3b, 0x421, 0x3b, 0x412, 0x3b, 0x416, 0x3b, 0x41b, 0x3b, 0x413, 0x3b, 0x441, 0x456, 0x447, 0x2e,
+0x3b, 0x43b, 0x44e, 0x442, 0x2e, 0x3b, 0x431, 0x435, 0x440, 0x2e, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x2e, 0x3b, 0x442, 0x440, 0x430,
+0x432, 0x2e, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x2e, 0x3b, 0x43b, 0x438, 0x43f, 0x2e, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x2e, 0x3b,
+0x432, 0x435, 0x440, 0x2e, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x2e, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x2e, 0x3b, 0x433, 0x440, 0x443,
+0x434, 0x2e, 0x3b, 0x441, 0x456, 0x447, 0x43d, 0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x43e, 0x433, 0x43e, 0x3b, 0x431, 0x435, 0x440, 0x435,
+0x437, 0x43d, 0x44f, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x43d, 0x44f, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x43d, 0x44f, 0x3b, 0x447, 0x435,
+0x440, 0x432, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x43f, 0x43d, 0x44f, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x43d, 0x44f, 0x3b, 0x432, 0x435,
+0x440, 0x435, 0x441, 0x43d, 0x44f, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430,
+0x434, 0x430, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x43d, 0x44f, 0x3b, 0x441, 0x3b, 0x43b, 0x3b, 0x431, 0x3b, 0x43a, 0x3b, 0x442, 0x3b,
+0x447, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x432, 0x3b, 0x436, 0x3b, 0x43b, 0x3b, 0x433, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b,
+0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x6cc,
+0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645,
+0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628,
+0x631, 0x3b, 0x59, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61,
+0x79, 0x3b, 0x49, 0x79, 0x6e, 0x3b, 0x49, 0x79, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x4f, 0x6b,
+0x74, 0x3b, 0x4e, 0x6f, 0x79, 0x3b, 0x44, 0x65, 0x6b, 0x3b, 0x59, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x76,
+0x72, 0x61, 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x49,
+0x79, 0x75, 0x6e, 0x3b, 0x49, 0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74,
+0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65,
+0x6b, 0x61, 0x62, 0x72, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41,
+0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72,
+0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b, 0x61, 0x76, 0x67,
+0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x79, 0x61, 0x6e,
+0x76, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65,
+0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x75, 0x6e, 0x3b, 0x69, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75,
+0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f,
+0x79, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x3b,
+0x645, 0x627, 0x631, 0x3b, 0x627, 0x67e, 0x631, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627,
+0x6af, 0x633, 0x3b, 0x633, 0x67e, 0x62a, 0x3b, 0x627, 0x6a9, 0x62a, 0x3b, 0x646, 0x648, 0x645, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x44f,
+0x43d, 0x432, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438,
+0x44e, 0x43d, 0x3b, 0x438, 0x44e, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43d, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d,
+0x43e, 0x44f, 0x3b, 0x434, 0x435, 0x43a, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b,
+0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x3b, 0x438,
+0x44e, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x43e, 0x43a,
+0x442, 0x44f, 0x431, 0x440, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0x54, 0x68,
+0x67, 0x20, 0x31, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x32, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x33, 0x3b, 0x54, 0x68, 0x67, 0x20,
+0x34, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x37, 0x3b,
+0x54, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x54,
+0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31,
+0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x32, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x33, 0x3b, 0x54, 0x68, 0xe1,
+0x6e, 0x67, 0x20, 0x34, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x35, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x36,
+0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x37, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x38, 0x3b, 0x54, 0x68, 0xe1,
+0x6e, 0x67, 0x20, 0x39, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20,
+0x31, 0x31, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68,
+0x67, 0x20, 0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x33, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0x67, 0x20,
+0x35, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x38, 0x3b,
+0x74, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b,
+0x74, 0x68, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,
+0x20, 0x32, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x33, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x34, 0x3b, 0x74,
+0x68, 0xe1, 0x6e, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x36, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,
+0x20, 0x37, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x39, 0x3b, 0x74,
+0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0xe1,
+0x6e, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0xe4, 0x7a, 0x3b, 0x70, 0x72,
+0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x67, 0x73, 0x74, 0x3b, 0x73, 0x65,
+0x74, 0x3b, 0x74, 0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x79, 0x61, 0x6e, 0x75, 0x6c, 0x3b,
+0x66, 0x65, 0x62, 0x75, 0x6c, 0x3b, 0x6d, 0xe4, 0x7a, 0x75, 0x6c, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x75, 0x6c, 0x3b, 0x6d,
+0x61, 0x79, 0x75, 0x6c, 0x3b, 0x79, 0x75, 0x6e, 0x75, 0x6c, 0x3b, 0x79, 0x75, 0x6c, 0x75, 0x6c, 0x3b, 0x67, 0x75, 0x73,
+0x74, 0x75, 0x6c, 0x3b, 0x73, 0x65, 0x74, 0x75, 0x6c, 0x3b, 0x74, 0x6f, 0x62, 0x75, 0x6c, 0x3b, 0x6e, 0x6f, 0x76, 0x75,
+0x6c, 0x3b, 0x64, 0x65, 0x6b, 0x75, 0x6c, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x59, 0x3b,
+0x59, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b,
+0x6d, 0xe4, 0x7a, 0x3b, 0x70, 0x72, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b,
+0x67, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x74, 0x6f, 0x6e, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x6b, 0x3b,
+0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b,
+0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79,
+0x64, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x3b, 0x49, 0x6f, 0x6e, 0x61, 0x77, 0x72, 0x3b, 0x43,
+0x68, 0x77, 0x65, 0x66, 0x72, 0x6f, 0x72, 0x3b, 0x4d, 0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c,
+0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x65, 0x66, 0x69, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x65,
+0x6e, 0x6e, 0x61, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x72, 0x65,
+0x66, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x77, 0x65, 0x64, 0x64, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x66, 0x79, 0x72, 0x3b, 0x49,
+0x3b, 0x43, 0x68, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b,
+0x54, 0x3b, 0x52, 0x68, 0x3b, 0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x45,
+0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x3b,
+0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x3b, 0x52,
+0x68, 0x61, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x3b, 0x46, 0x65, 0x77, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x72, 0x3b,
+0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x77, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0xe0, 0x74, 0x3b, 0x4f,
+0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x77, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x53, 0x61, 0x6d, 0x77, 0x69, 0x79, 0x65, 0x65, 0x3b,
+0x46, 0x65, 0x77, 0x72, 0x69, 0x79, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x41, 0x77, 0x72, 0x69, 0x6c, 0x3b,
+0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x77, 0x65, 0x3b, 0x53, 0x75, 0x6c, 0x65, 0x74, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0xe0,
+0x74, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x77,
+0xe0, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x73, 0xe0, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46,
+0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a,
+0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44,
+0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x79, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61,
+0x72, 0x69, 0x3b, 0x4d, 0x61, 0x74, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79,
+0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69,
+0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f,
+0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x5d9, 0x5d0, 0x5b7, 0x5e0, 0x3b, 0x5e4,
+0x5bf, 0x5e2, 0x5d1, 0x3b, 0x5de, 0x5e2, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5b7, 0x5e4, 0x5bc, 0x5e8, 0x3b, 0x5de, 0x5d9, 0x5d9, 0x3b, 0x5d9,
+0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d9, 0x5d2, 0x3b, 0x5e1, 0x5e2, 0x5e4, 0x5bc, 0x3b, 0x5d0,
+0x5e7, 0x5d8, 0x3b, 0x5e0, 0x5d0, 0x5d5, 0x5d5, 0x3b, 0x5d3, 0x5e2, 0x5e6, 0x3b, 0x5d9, 0x5d0, 0x5b7, 0x5e0, 0x5d5, 0x5d0, 0x5b7, 0x5e8,
+0x3b, 0x5e4, 0x5bf, 0x5e2, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5b7, 0x5e8, 0x3b, 0x5de, 0x5e2, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5b7, 0x5e4, 0x5bc,
+0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5,
+0x5d9, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e2, 0x5e4, 0x5bc, 0x5d8, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5d0, 0x5e7, 0x5d8,
+0x5d0, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5e0, 0x5d0, 0x5d5, 0x5d5, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5d3, 0x5e2, 0x5e6, 0x5e2, 0x5de,
+0x5d1, 0x5e2, 0x5e8, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x3b, 0xc8, 0x72, 0x3b, 0x1eb8, 0x72, 0x3b, 0xcc, 0x67, 0x3b, 0x1eb8, 0x300, 0x62,
+0x3b, 0xd2, 0x6b, 0x3b, 0x41, 0x67, 0x3b, 0xd2, 0x67, 0x3b, 0x4f, 0x77, 0x3b, 0x1ecc, 0x300, 0x77, 0x3b, 0x42, 0xe9, 0x3b,
+0x1ecc, 0x300, 0x70, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9, 0x301, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x1eb8, 0x72, 0x1eb9,
+0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64,
+0x75, 0x3b, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x1ecc,
+0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x53, 0x3b, 0xc8,
+0x3b, 0x1eb8, 0x3b, 0xcc, 0x3b, 0x1eb8, 0x300, 0x3b, 0xd2, 0x3b, 0x41, 0x3b, 0xd2, 0x3b, 0x4f, 0x3b, 0x1ecc, 0x300, 0x3b, 0x42,
+0x3b, 0x1ecc, 0x300, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0x3b,
+0xcc, 0x67, 0x62, 0x3b, 0x1eb8, 0x300, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x3b, 0x41, 0x67, 0x1eb9, 0x3b, 0xd2, 0x67, 0xfa,
+0x3b, 0x4f, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x3b, 0x4f,
+0x1e63, 0xf9, 0x20, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9, 0x301, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b,
+0x4f, 0x1e63, 0xf9, 0x20, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b,
+0x4f, 0x1e63, 0xf9, 0x20, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75,
+0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b,
+0x4f, 0x1e63, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0,
+0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b,
+0x53, 0x68, 0x25b, 0x301, 0x3b, 0xc8, 0x72, 0x3b, 0x190, 0x72, 0x3b, 0xcc, 0x67, 0x3b, 0x190, 0x300, 0x62, 0x3b, 0xd2, 0x6b,
+0x3b, 0x41, 0x67, 0x3b, 0xd2, 0x67, 0x3b, 0x4f, 0x77, 0x3b, 0x186, 0x300, 0x77, 0x3b, 0x42, 0xe9, 0x3b, 0x186, 0x300, 0x70,
+0x3b, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x25b, 0x301, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x190, 0x72, 0x25b, 0x300, 0x6e,
+0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x190, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b,
+0x41, 0x67, 0x25b, 0x6d, 0x254, 0x3b, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x186, 0x300, 0x77,
+0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x186, 0x300, 0x70, 0x25b, 0x300, 0x3b, 0x53, 0x3b, 0xc8, 0x3b, 0x190,
+0x3b, 0xcc, 0x3b, 0x190, 0x300, 0x3b, 0xd2, 0x3b, 0x41, 0x3b, 0xd2, 0x3b, 0x4f, 0x3b, 0x186, 0x300, 0x3b, 0x42, 0x3b, 0x186,
+0x300, 0x3b, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0x3b, 0x190, 0x72, 0x25b, 0x300, 0x6e, 0x3b, 0xcc,
+0x67, 0x62, 0x3b, 0x190, 0x300, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x3b, 0x41, 0x67, 0x25b, 0x3b, 0xd2, 0x67, 0xfa, 0x3b,
+0x4f, 0x77, 0x65, 0x3b, 0x186, 0x300, 0x77, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0x3b, 0x186, 0x300, 0x70, 0x25b, 0x3b, 0x4f, 0x73,
+0x68, 0xf9, 0x20, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x25b, 0x301, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c,
+0xe8, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x190, 0x72, 0x25b, 0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xcc,
+0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x190, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0x4f, 0x73, 0x68, 0xf9,
+0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x41, 0x67, 0x25b, 0x6d, 0x254, 0x3b, 0x4f, 0x73,
+0x68, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x4f,
+0x73, 0x68, 0xf9, 0x20, 0x186, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa,
+0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x186, 0x300, 0x70, 0x25b, 0x300, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,
+0x4d, 0x61, 0x73, 0x3b, 0x45, 0x70, 0x68, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b,
+0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b,
+0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d,
+0x61, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x68, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75,
+0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70,
+0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d,
+0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d,
+0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b,
+0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a,
+0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f,
+0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72,
+0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b,
+0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,
+0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e,
+0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x458, 0x430, 0x43d,
+0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d,
+0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x443, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432,
+0x3b, 0x434, 0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b,
+0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b,
+0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x443, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430,
+0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434,
+0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x4a, 0x2d, 0x67, 0x75, 0x65, 0x72, 0x3b, 0x54, 0x2d, 0x61, 0x72, 0x72,
+0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x72, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61,
+0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x2d, 0x73, 0x6f, 0x75, 0x72,
+0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69,
+0x72, 0x3b, 0x4a, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x2d, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b,
+0x4d, 0x2d, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x67, 0x65, 0x75,
+0x72, 0x65, 0x65, 0x3b, 0x54, 0x6f, 0x73, 0x68, 0x69, 0x61, 0x67, 0x68, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b,
+0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x65, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79,
+0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79,
+0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x65,
+0x61, 0x6e, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x66, 0x6f, 0x75,
+0x79, 0x69, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x6e,
+0x79, 0x20, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x3b, 0x47, 0x65, 0x6e, 0x3b, 0x48, 0x77, 0x65, 0x3b, 0x4d, 0x65,
+0x75, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x3b, 0x4d, 0x65, 0x74, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x45, 0x73, 0x74,
+0x3b, 0x47, 0x77, 0x6e, 0x3b, 0x48, 0x65, 0x64, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x76, 0x3b, 0x6d, 0x69, 0x73, 0x20,
+0x47, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x48, 0x77, 0x65, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x6d,
+0x69, 0x73, 0x20, 0x4d, 0x65, 0x75, 0x72, 0x74, 0x68, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x45, 0x62, 0x72, 0x65, 0x6c, 0x3b,
+0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x74, 0x68, 0x65, 0x76, 0x65, 0x6e, 0x3b,
+0x6d, 0x69, 0x73, 0x20, 0x47, 0x6f, 0x72, 0x74, 0x68, 0x65, 0x72, 0x65, 0x6e, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x45, 0x73,
+0x74, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x47, 0x77, 0x79, 0x6e, 0x6e, 0x67, 0x61, 0x6c, 0x61, 0x3b, 0x6d, 0x69, 0x73, 0x20,
+0x48, 0x65, 0x64, 0x72, 0x61, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x44, 0x75, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4b, 0x65, 0x76,
+0x61, 0x72, 0x64, 0x68, 0x75, 0x3b, 0x53, 0x2d, 0x186, 0x3b, 0x4b, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x186, 0x3b, 0x45, 0x2d,
+0x4f, 0x3b, 0x45, 0x2d, 0x4b, 0x3b, 0x4f, 0x2d, 0x41, 0x3b, 0x41, 0x2d, 0x4b, 0x3b, 0x44, 0x2d, 0x186, 0x3b, 0x46, 0x2d,
+0x190, 0x3b, 0x186, 0x2d, 0x41, 0x3b, 0x186, 0x2d, 0x4f, 0x3b, 0x4d, 0x2d, 0x186, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x61, 0x2d,
+0x186, 0x70, 0x25b, 0x70, 0x254, 0x6e, 0x3b, 0x4b, 0x77, 0x61, 0x6b, 0x77, 0x61, 0x72, 0x2d, 0x186, 0x67, 0x79, 0x65, 0x66,
+0x75, 0x6f, 0x3b, 0x45, 0x62, 0x254, 0x77, 0x2d, 0x186, 0x62, 0x65, 0x6e, 0x65, 0x6d, 0x3b, 0x45, 0x62, 0x254, 0x62, 0x69,
+0x72, 0x61, 0x2d, 0x4f, 0x66, 0x6f, 0x72, 0x69, 0x73, 0x75, 0x6f, 0x3b, 0x45, 0x73, 0x75, 0x73, 0x6f, 0x77, 0x20, 0x41,
+0x6b, 0x65, 0x74, 0x73, 0x65, 0x61, 0x62, 0x61, 0x2d, 0x4b, 0x254, 0x74, 0x254, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x4f,
+0x62, 0x69, 0x72, 0x61, 0x64, 0x65, 0x2d, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x6d, 0x75, 0x6d, 0x75, 0x3b, 0x41,
+0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x2d, 0x4b, 0x69, 0x74, 0x61, 0x77, 0x6f, 0x6e, 0x73, 0x61, 0x3b, 0x44, 0x69, 0x66,
+0x75, 0x75, 0x2d, 0x186, 0x73, 0x61, 0x6e, 0x64, 0x61, 0x61, 0x3b, 0x46, 0x61, 0x6e, 0x6b, 0x77, 0x61, 0x2d, 0x190, 0x62,
+0x254, 0x3b, 0x186, 0x62, 0x25b, 0x73, 0x25b, 0x2d, 0x41, 0x68, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x3b, 0x186, 0x62, 0x65, 0x72,
+0x25b, 0x66, 0x25b, 0x77, 0x2d, 0x4f, 0x62, 0x75, 0x62, 0x75, 0x6f, 0x3b, 0x4d, 0x75, 0x6d, 0x75, 0x2d, 0x186, 0x70, 0x25b,
+0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930,
+0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e,
+0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x92f, 0x3b, 0x906, 0x917, 0x94b, 0x938, 0x94d, 0x924, 0x3b, 0x938,
+0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d,
+0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x4a, 0x65, 0x6e, 0x3b, 0x46, 0x65,
+0x62, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75,
+0x6c, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x1ecc, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69,
+0x73, 0x3b, 0x4a, 0x65, 0x6e, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb,
+0x3b, 0x4d, 0x61, 0x61, 0x63, 0x68, 0x1ecb, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x65, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a,
+0x75, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x1ecb, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x1ecd, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70,
+0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1ecc, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61,
+0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a,
+0x3b, 0x4a, 0x3b, 0x1ecc, 0x3b, 0x53, 0x3b, 0x1ecc, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x65, 0x6c,
+0x3b, 0x4b, 0x74, 0x169, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x74, 0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f, 0x6f,
+0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x4b, 0x6e, 0x64, 0x3b, 0x128, 0x6b, 0x75, 0x3b, 0x128, 0x6b, 0x6d, 0x3b, 0x128, 0x6b, 0x6c,
+0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77,
+0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74,
+0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20,
+0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x68,
+0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x75, 0x6f, 0x6e,
+0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x79, 0x61, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d,
+0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61,
+0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69,
+0x20, 0x6e, 0x61, 0x20, 0x129, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75,
+0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6c, 0x129, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b,
+0x54, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x5a, 0x65, 0x6e, 0x3b, 0x46, 0x65,
+0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x76, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x3b, 0x4c, 0x75,
+0x69, 0x3b, 0x41, 0x76, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69,
+0x63, 0x3b, 0x5a, 0x65, 0x6e, 0xe2, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0xe2, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0xe7, 0x3b,
+0x41, 0x76, 0x72, 0xee, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x6e, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41,
+0x76, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x61, 0x72,
+0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x5a,
+0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e,
+0x3b, 0x44, 0x3b, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b, 0x74, 0x65, 0x64, 0x3b, 0x61, 0x66, 0x254, 0x3b, 0x64,
+0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x6e, 0x79, 0x3b, 0x6b,
+0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x3b, 0x64, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f,
+0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x61, 0x66, 0x254, 0x66, 0x129, 0x65, 0x3b, 0x64, 0x61,
+0x6d, 0x61, 0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73, 0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73,
+0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b,
+0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x6d, 0x65, 0x3b, 0x64, 0x3b,
+0x64, 0x3b, 0x74, 0x3b, 0x61, 0x3b, 0x64, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x61, 0x3b, 0x6b, 0x3b, 0x61, 0x3b,
+0x64, 0x3b, 0x49, 0x61, 0x6e, 0x2e, 0x3b, 0x50, 0x65, 0x70, 0x2e, 0x3b, 0x4d, 0x61, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x70,
+0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x2e, 0x3b, 0x49, 0x75, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x75, 0x2e,
+0x3b, 0x4b, 0x65, 0x70, 0x2e, 0x3b, 0x2bb, 0x4f, 0x6b, 0x2e, 0x3b, 0x4e, 0x6f, 0x77, 0x2e, 0x3b, 0x4b, 0x65, 0x6b, 0x2e,
+0x3b, 0x49, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x50, 0x65, 0x70, 0x65, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d,
+0x61, 0x6c, 0x61, 0x6b, 0x69, 0x3b, 0x2bb, 0x41, 0x70, 0x65, 0x6c, 0x69, 0x6c, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49,
+0x75, 0x6e, 0x65, 0x3b, 0x49, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x75, 0x6b, 0x61, 0x6b, 0x65, 0x3b, 0x4b, 0x65,
+0x70, 0x61, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x6b, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x6f,
+0x77, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4b, 0x65, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x45, 0x6e, 0x65, 0x3b,
+0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b,
+0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b,
+0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61,
+0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79, 0x6f,
+0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x79, 0x65, 0x6d,
+0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62, 0x72,
+0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,
+0x4d, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b,
+0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62,
+0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b,
+0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x63, 0x68, 0x74, 0x3b, 0x53,
+0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f,
+0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xa2cd, 0xa1aa, 0x3b, 0xa44d,
+0xa1aa, 0x3b, 0xa315, 0xa1aa, 0x3b, 0xa1d6, 0xa1aa, 0x3b, 0xa26c, 0xa1aa, 0x3b, 0xa0d8, 0xa1aa, 0x3b, 0xa3c3, 0xa1aa, 0x3b, 0xa246, 0xa1aa, 0x3b,
+0xa22c, 0xa1aa, 0x3b, 0xa2b0, 0xa1aa, 0x3b, 0xa2b0, 0xa2aa, 0xa1aa, 0x3b, 0xa2b0, 0xa44b, 0xa1aa, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46,
+0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75,
+0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b,
+0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x61, 0x72,
+0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,
+0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73,
+0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x76, 0x65, 0x72, 0x3b,
+0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x111,
+0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x3b, 0x63, 0x75, 0x6f, 0x3b, 0x6d, 0x69, 0x65,
+0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b,
+0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x3b, 0x6f, 0x111, 0x111,
+0x61, 0x6a, 0x61, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x6d, 0xe1, 0x6e,
+0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f,
+0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x65,
+0x61, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65, 0x6d, 0xe1, 0x6e,
+0x6e, 0x75, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x6d,
+0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x6b,
+0xe1, 0x62, 0x6d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x6d, 0xe1, 0x6e, 0x6e,
+0x75, 0x3b, 0x4f, 0x3b, 0x47, 0x3b, 0x4e, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x10c, 0x3b,
+0x47, 0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b,
+0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69,
+0x3b, 0x62, 0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62,
+0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x3b, 0x43, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70,
+0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x43, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65,
+0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x43, 0x68, 0x61, 0x6e, 0x75, 0x61,
+0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70,
+0x69, 0x72, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6c, 0x61,
+0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b,
+0x69, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x62, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62,
+0x61, 0x3b, 0x43, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x53, 0x3b,
+0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x49, 0x6d, 0x62, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61,
+0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4b, 0x61, 0x72, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x57, 0x75, 0x6e, 0x3b, 0x49, 0x6b,
+0x65, 0x3b, 0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,
+0x68, 0x77, 0x61, 0x20, 0x69, 0x6d, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61,
+0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61,
+0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x6f,
+0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20,
+0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x72, 0x61, 0x6e, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20,
+0x67, 0x68, 0x77, 0x61, 0x20, 0x6d, 0x66, 0x75, 0x6e, 0x67, 0x61, 0x64, 0x65, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,
+0x68, 0x77, 0x61, 0x20, 0x77, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68,
+0x77, 0x61, 0x20, 0x69, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20,
+0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d,
+0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6d, 0x77, 0x65, 0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77,
+0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x77, 0x69, 0x3b, 0x49, 0x3b, 0x4b, 0x3b, 0x4b,
+0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x57, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x73,
+0x69, 0x69, 0x3b, 0x63, 0x6f, 0x6c, 0x3b, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0x65, 0x65, 0x3b, 0x64, 0x75, 0x75, 0x3b, 0x6b,
+0x6f, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x3b, 0x6a, 0x75, 0x6b, 0x3b, 0x73, 0x6c, 0x74, 0x3b, 0x79, 0x61, 0x72, 0x3b, 0x6a,
+0x6f, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x6f, 0x3b, 0x63, 0x6f, 0x6c, 0x74, 0x65, 0x3b, 0x6d,
+0x62, 0x6f, 0x6f, 0x79, 0x3b, 0x73, 0x65, 0x65, 0x257, 0x74, 0x6f, 0x3b, 0x64, 0x75, 0x75, 0x6a, 0x61, 0x6c, 0x3b, 0x6b,
+0x6f, 0x72, 0x73, 0x65, 0x3b, 0x6d, 0x6f, 0x72, 0x73, 0x6f, 0x3b, 0x6a, 0x75, 0x6b, 0x6f, 0x3b, 0x73, 0x69, 0x69, 0x6c,
+0x74, 0x6f, 0x3b, 0x79, 0x61, 0x72, 0x6b, 0x6f, 0x6d, 0x61, 0x61, 0x3b, 0x6a, 0x6f, 0x6c, 0x61, 0x6c, 0x3b, 0x62, 0x6f,
+0x77, 0x74, 0x65, 0x3b, 0x73, 0x3b, 0x63, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b,
+0x73, 0x3b, 0x79, 0x3b, 0x6a, 0x3b, 0x62, 0x3b, 0x4a, 0x45, 0x4e, 0x3b, 0x57, 0x4b, 0x52, 0x3b, 0x57, 0x47, 0x54, 0x3b,
+0x57, 0x4b, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b, 0x57, 0x54, 0x44, 0x3b, 0x57, 0x4d, 0x4a, 0x3b, 0x57, 0x4e, 0x4e, 0x3b,
+0x57, 0x4b, 0x44, 0x3b, 0x57, 0x49, 0x4b, 0x3b, 0x57, 0x4d, 0x57, 0x3b, 0x44, 0x49, 0x54, 0x3b, 0x4e, 0x6a, 0x65, 0x6e,
+0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x72, 0x129, 0x3b, 0x4d,
+0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65,
+0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61,
+0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64,
+0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a,
+0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77,
+0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77,
+0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169,
+0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4e, 0x64, 0x69, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61,
+0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49,
+0x3b, 0x49, 0x3b, 0x44, 0x3b, 0x4f, 0x62, 0x6f, 0x3b, 0x57, 0x61, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4f, 0x6e, 0x67,
+0x3b, 0x49, 0x6d, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b, 0x53, 0x61, 0x70, 0x3b, 0x49, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x61,
+0x3b, 0x54, 0x6f, 0x6d, 0x3b, 0x54, 0x6f, 0x62, 0x3b, 0x54, 0x6f, 0x77, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,
+0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4c,
+0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6b, 0x75, 0x6e, 0x69, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,
+0x20, 0x6f, 0x6e, 0x67, 0x2019, 0x77, 0x61, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6d, 0x65,
+0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c,
+0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x73, 0x69, 0x65, 0x74,
+0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c,
+0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f,
+0x6e, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20,
+0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4f, 0x3b, 0x57, 0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b,
+0x49, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61,
+0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75,
+0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61,
+0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x6f,
+0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75,
+0x6c, 0x68, 0x6f, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f,
+0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63,
+0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x5a, 0x69, 0x62, 0x3b, 0x4e, 0x68, 0x6c, 0x6f, 0x3b, 0x4d, 0x62, 0x69, 0x3b, 0x4d,
+0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x77, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x3b, 0x4e, 0x63, 0x77, 0x3b,
+0x4d, 0x70, 0x61, 0x6e, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x3b, 0x5a, 0x69,
+0x62, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x6c, 0x61, 0x3b, 0x4e, 0x68, 0x6c, 0x6f, 0x6c, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d,
+0x62, 0x69, 0x6d, 0x62, 0x69, 0x74, 0x68, 0x6f, 0x3b, 0x4d, 0x61, 0x62, 0x61, 0x73, 0x61, 0x3b, 0x4e, 0x6b, 0x77, 0x65,
+0x6e, 0x6b, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75,
+0x6c, 0x69, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4e, 0x63, 0x77, 0x61, 0x62, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4d, 0x70,
+0x61, 0x6e, 0x64, 0x75, 0x6c, 0x61, 0x3b, 0x4d, 0x66, 0x75, 0x6d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x7a, 0x69, 0x3b,
+0x4d, 0x70, 0x61, 0x6c, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x5a, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b,
+0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x31, 0x3b, 0x4d, 0x32, 0x3b,
+0x4d, 0x33, 0x3b, 0x4d, 0x34, 0x3b, 0x4d, 0x35, 0x3b, 0x4d, 0x36, 0x3b, 0x4d, 0x37, 0x3b, 0x4d, 0x38, 0x3b, 0x4d, 0x39,
+0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77,
+0x61, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61,
+0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b,
+0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69,
+0x20, 0x77, 0x61, 0x20, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x73, 0x69,
+0x74, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65,
+0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,
+0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b,
+0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f,
+0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61,
+0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53,
+0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x2d49, 0x2d4f, 0x2d4f, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x3b, 0x2d4e,
+0x2d30, 0x2d55, 0x3b, 0x2d49, 0x2d31, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x3b, 0x2d56,
+0x2d53, 0x2d5b, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x3b, 0x2d49,
+0x2d4f, 0x2d4f, 0x2d30, 0x2d62, 0x2d54, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x2d62, 0x2d55, 0x3b, 0x2d4e, 0x2d30, 0x2d55, 0x2d5a, 0x3b, 0x2d49, 0x2d31, 0x2d54,
+0x2d49, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x2d62, 0x2d53,
+0x2d63, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x2d5c, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x2d31,
+0x2d54, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b,
+0x2d49, 0x3b, 0x2d31, 0x3b, 0x2d4e, 0x3b, 0x2d49, 0x3b, 0x2d4e, 0x3b, 0x2d62, 0x3b, 0x2d62, 0x3b, 0x2d56, 0x3b, 0x2d5b, 0x3b, 0x2d3d, 0x3b,
+0x2d4f, 0x3b, 0x2d37, 0x3b, 0x69, 0x6e, 0x6e, 0x3b, 0x62, 0x1e5b, 0x61, 0x3b, 0x6d, 0x61, 0x1e5b, 0x3b, 0x69, 0x62, 0x72, 0x3b,
+0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x263, 0x75, 0x63, 0x3b, 0x63, 0x75, 0x74, 0x3b,
+0x6b, 0x74, 0x75, 0x3b, 0x6e, 0x75, 0x77, 0x3b, 0x64, 0x75, 0x6a, 0x3b, 0x69, 0x6e, 0x6e, 0x61, 0x79, 0x72, 0x3b, 0x62,
+0x1e5b, 0x61, 0x79, 0x1e5b, 0x3b, 0x6d, 0x61, 0x1e5b, 0x1e63, 0x3b, 0x69, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x79,
+0x75, 0x3b, 0x79, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x263, 0x75, 0x63, 0x74, 0x3b,
+0x63, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x3b, 0x6e, 0x75, 0x77, 0x61, 0x6e,
+0x62, 0x69, 0x72, 0x3b, 0x64, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x69, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x69,
+0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x263, 0x3b, 0x63, 0x3b, 0x6b, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x59, 0x65, 0x6e,
+0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e,
+0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x57, 0x61, 0x6d,
+0x3b, 0x44, 0x75, 0x6a, 0x3b, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b, 0x61, 0x72, 0x3b,
+0x4d, 0x65, 0x263, 0x72, 0x65, 0x73, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b,
+0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x74, 0x65,
+0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54, 0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x57, 0x61, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x44, 0x75,
+0x1e7, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59,
+0x3b, 0x194, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d,
+0x65, 0x263, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194,
+0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x4e, 0x75, 0x6e, 0x3b, 0x44, 0x75, 0x1e7, 0x3b, 0x59,
+0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65, 0x73,
+0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b,
+0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54,
+0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x4e, 0x75, 0x6e, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x44, 0x75, 0x1e7, 0x65, 0x6d, 0x62,
+0x65, 0x1e5b, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x194, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4c, 0x3b, 0x43, 0x3b, 0x54,
+0x3b, 0x52, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x4b, 0x42, 0x5a, 0x3b, 0x4b, 0x42, 0x52, 0x3b, 0x4b, 0x53, 0x54, 0x3b, 0x4b,
+0x4b, 0x4e, 0x3b, 0x4b, 0x54, 0x4e, 0x3b, 0x4b, 0x4d, 0x4b, 0x3b, 0x4b, 0x4d, 0x53, 0x3b, 0x4b, 0x4d, 0x4e, 0x3b, 0x4b,
+0x4d, 0x57, 0x3b, 0x4b, 0x4b, 0x4d, 0x3b, 0x4b, 0x4e, 0x4b, 0x3b, 0x4b, 0x4e, 0x42, 0x3b, 0x4f, 0x6b, 0x77, 0x6f, 0x6b,
+0x75, 0x62, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4f, 0x6b,
+0x77, 0x61, 0x6b, 0x61, 0x73, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4f,
+0x6b, 0x77, 0x61, 0x6b, 0x61, 0x74, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61,
+0x67, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x6a, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61,
+0x6d, 0x75, 0x6e, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x77, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4f,
+0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e,
+0x61, 0x20, 0x6b, 0x75, 0x6d, 0x77, 0x65, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61,
+0x20, 0x69, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x48, 0x75, 0x74, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x44, 0x61, 0x74, 0x3b, 0x54,
+0x61, 0x69, 0x3b, 0x48, 0x61, 0x6e, 0x3b, 0x53, 0x69, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54,
+0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b, 0x4b, 0x6d, 0x6a, 0x3b, 0x4b, 0x6d, 0x62, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77,
+0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x68, 0x75, 0x74, 0x61, 0x6c, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d,
+0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61, 0x20,
+0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61,
+0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x74, 0x61, 0x69, 0x3b, 0x70, 0x61,
+0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70,
+0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x70, 0x61,
+0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x70, 0x61, 0x20,
+0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x70, 0x61, 0x20, 0x6d,
+0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77,
+0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65,
+0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61,
+0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20,
+0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x48, 0x3b, 0x56, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x53,
+0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69,
+0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69,
+0x6c, 0x79, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x61, 0x69,
+0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74,
+0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b,
+0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x77, 0x69, 0x3b, 0x6d, 0x25b, 0x3b, 0x7a,
+0x75, 0x77, 0x3b, 0x7a, 0x75, 0x6c, 0x3b, 0x75, 0x74, 0x69, 0x3b, 0x73, 0x25b, 0x74, 0x3b, 0x254, 0x6b, 0x75, 0x3b, 0x6e,
+0x6f, 0x77, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x7a, 0x61, 0x6e, 0x77, 0x75, 0x79, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x75, 0x72,
+0x75, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x61, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d,
+0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x25b, 0x6e, 0x3b, 0x7a, 0x75, 0x6c, 0x75, 0x79, 0x65, 0x3b, 0x75, 0x74, 0x69, 0x3b, 0x73,
+0x25b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x254, 0x6b, 0x75, 0x74, 0x254, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x6e,
+0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x5a,
+0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x5a, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x186, 0x3b, 0x4e,
+0x3b, 0x44, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x61, 0x69, 0x3b, 0x4b, 0x61, 0x74, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x47,
+0x61, 0x74, 0x3b, 0x47, 0x61, 0x6e, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x4b, 0x6e, 0x6e, 0x3b, 0x4b, 0x65, 0x6e, 0x3b, 0x49,
+0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x67, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,
+0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x129, 0x72, 0x69,
+0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77,
+0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,
+0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74,
+0x61, 0x6e, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77,
+0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61,
+0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72,
+0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,
+0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
+0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x4b, 0x61, 0x129, 0x72, 0x129, 0x3b, 0x4d, 0x3b,
+0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b,
+0x49, 0x3b, 0x13a4, 0x13c3, 0x3b, 0x13a7, 0x13a6, 0x3b, 0x13a0, 0x13c5, 0x3b, 0x13a7, 0x13ec, 0x3b, 0x13a0, 0x13c2, 0x3b, 0x13d5, 0x13ad, 0x3b,
+0x13ab, 0x13f0, 0x3b, 0x13a6, 0x13b6, 0x3b, 0x13da, 0x13b5, 0x3b, 0x13da, 0x13c2, 0x3b, 0x13c5, 0x13d3, 0x3b, 0x13a5, 0x13cd, 0x3b, 0x13a4, 0x13c3,
+0x13b8, 0x13d4, 0x13c5, 0x3b, 0x13a7, 0x13a6, 0x13b5, 0x3b, 0x13a0, 0x13c5, 0x13f1, 0x3b, 0x13a7, 0x13ec, 0x13c2, 0x3b, 0x13a0, 0x13c2, 0x13cd, 0x13ac,
+0x13d8, 0x3b, 0x13d5, 0x13ad, 0x13b7, 0x13f1, 0x3b, 0x13ab, 0x13f0, 0x13c9, 0x13c2, 0x3b, 0x13a6, 0x13b6, 0x13c2, 0x3b, 0x13da, 0x13b5, 0x13cd, 0x13d7,
+0x3b, 0x13da, 0x13c2, 0x13c5, 0x13d7, 0x3b, 0x13c5, 0x13d3, 0x13d5, 0x13c6, 0x3b, 0x13a5, 0x13cd, 0x13a9, 0x13f1, 0x3b, 0x13a4, 0x3b, 0x13a7, 0x3b,
+0x13a0, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13d5, 0x3b, 0x13ab, 0x3b, 0x13a6, 0x3b, 0x13da, 0x3b, 0x13da, 0x3b, 0x13c5, 0x3b, 0x13a5, 0x3b,
+0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x76, 0x72, 0x3b, 0x6d, 0x65, 0x3b, 0x7a,
+0x69, 0x6e, 0x3b, 0x7a, 0x69, 0x6c, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e,
+0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x7a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x69, 0x79,
+0x65, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69, 0x6e, 0x3b,
+0x7a, 0x69, 0x6c, 0x79, 0x65, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x3b, 0x6f, 0x6b, 0x74,
+0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76, 0x61, 0x6d, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6d, 0x3b, 0x7a, 0x3b, 0x66, 0x3b, 0x6d,
+0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b, 0x7a, 0x3b, 0x6f, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x4d,
+0x77, 0x65, 0x64, 0x69, 0x20, 0x4e, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61,
+0x20, 0x50, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x54, 0x61, 0x74, 0x75, 0x3b,
+0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65,
+0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77,
+0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x6d, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64,
+0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x69, 0x76, 0x69, 0x6c,
+0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61,
+0x20, 0x4d, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79,
+0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69,
+0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f,
+0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20,
+0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61,
+0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61,
+0x20, 0x4d, 0x3b, 0x46, 0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x65, 0x65,
+0x6e, 0x64, 0x61, 0x3b, 0x49, 0x6b, 0xfa, 0x6d, 0x69, 0x3b, 0x49, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0x61, 0x6c, 0x61, 0x3b,
+0x49, 0x64, 0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x56, 0x268, 0x268, 0x72,
+0x268, 0x3b, 0x53, 0x61, 0x61, 0x74, 0x289, 0x3b, 0x49, 0x6e, 0x79, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x53,
+0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x289, 0x66, 0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4b, 0x289, 0x6e, 0x61,
+0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x289, 0x6b, 0x65, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6b, 0x75, 0x6d,
+0x69, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x64,
+0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4b, 0x289, 0x6d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x4b, 0x289, 0x76, 0x268,
+0x268, 0x72, 0x268, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x69, 0x3b,
+0x4b, 0x289, 0x73, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x46, 0x3b, 0x4e,
+0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x53,
+0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x75, 0x3b, 0x4d, 0x61, 0x61,
+0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x69,
+0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x46,
+0x65, 0x62, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x41, 0x70, 0x75, 0x6c,
+0x69, 0x3b, 0x4d, 0x61, 0x61, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x61, 0x79,
+0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x69, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x62, 0x75, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x61,
+0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65,
+0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x45, 0x70,
+0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b, 0x53, 0x65,
+0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,
+0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72,
+0x65, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67,
+0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61,
+0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46,
+0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44,
+0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69,
+0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75,
+0x3b, 0x4e, 0x75, 0x76, 0x3b, 0x44, 0x69, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x46, 0x65, 0x62, 0x72,
+0x65, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x75, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x75,
+0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x75, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b,
+0x53, 0x65, 0x74, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x75, 0x76, 0x65,
+0x6e, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x7a, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x41, 0x4e, 0x3b, 0x46, 0x45,
+0x42, 0x3b, 0x4d, 0x41, 0x43, 0x3b, 0x128, 0x50, 0x55, 0x3b, 0x4d, 0x128, 0x128, 0x3b, 0x4e, 0x4a, 0x55, 0x3b, 0x4e, 0x4a,
+0x52, 0x3b, 0x41, 0x47, 0x41, 0x3b, 0x53, 0x50, 0x54, 0x3b, 0x4f, 0x4b, 0x54, 0x3b, 0x4e, 0x4f, 0x56, 0x3b, 0x44, 0x45,
+0x43, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x75, 0x61, 0x72, 0x129, 0x3b,
+0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x128, 0x70, 0x75, 0x72, 0x169, 0x3b, 0x4d, 0x129, 0x129, 0x3b, 0x4e, 0x6a, 0x75, 0x6e,
+0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x72, 0x61, 0x129, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74,
+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x169, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b,
+0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x128, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b,
+0x4e, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x61, 0x74,
+0x3b, 0x54, 0x61, 0x61, 0x3b, 0x49, 0x77, 0x6f, 0x3b, 0x4d, 0x61, 0x6d, 0x3b, 0x50, 0x61, 0x61, 0x3b, 0x4e, 0x67, 0x65,
+0x3b, 0x52, 0x6f, 0x6f, 0x3b, 0x42, 0x75, 0x72, 0x3b, 0x45, 0x70, 0x65, 0x3b, 0x4b, 0x70, 0x74, 0x3b, 0x4b, 0x70, 0x61,
+0x3b, 0x4d, 0x75, 0x6c, 0x67, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x2019, 0x61, 0x74, 0x79, 0x61, 0x61, 0x74, 0x6f, 0x3b, 0x4b,
+0x69, 0x70, 0x74, 0x61, 0x61, 0x6d, 0x6f, 0x3b, 0x49, 0x77, 0x6f, 0x6f, 0x74, 0x6b, 0x75, 0x75, 0x74, 0x3b, 0x4d, 0x61,
+0x6d, 0x75, 0x75, 0x74, 0x3b, 0x50, 0x61, 0x61, 0x67, 0x69, 0x3b, 0x4e, 0x67, 0x2019, 0x65, 0x69, 0x79, 0x65, 0x65, 0x74,
+0x3b, 0x52, 0x6f, 0x6f, 0x70, 0x74, 0x75, 0x69, 0x3b, 0x42, 0x75, 0x72, 0x65, 0x65, 0x74, 0x3b, 0x45, 0x70, 0x65, 0x65,
+0x73, 0x6f, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x75, 0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x20, 0x74, 0x61, 0x61, 0x69,
+0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x75, 0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x62, 0x6f, 0x20, 0x61, 0x65, 0x6e, 0x67,
+0x2019, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x42, 0x3b,
+0x45, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e, 0x6e, 0x69, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e, 0x1c0,
+0x67, 0xf4, 0x61, 0x62, 0x3b, 0x1c0, 0x4b, 0x68, 0x75, 0x75, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c3, 0x48, 0xf4, 0x61,
+0x1c2, 0x6b, 0x68, 0x61, 0x69, 0x62, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x69, 0x74, 0x73, 0xe2, 0x62, 0x3b, 0x47, 0x61, 0x6d,
+0x61, 0x1c0, 0x61, 0x65, 0x62, 0x3b, 0x1c2, 0x4b, 0x68, 0x6f, 0x65, 0x73, 0x61, 0x6f, 0x62, 0x3b, 0x41, 0x6f, 0x1c1, 0x6b,
+0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x54, 0x61, 0x72, 0x61, 0x1c0, 0x6b, 0x68, 0x75, 0x75,
+0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c2, 0x4e, 0xfb, 0x1c1, 0x6e, 0xe2, 0x69, 0x73, 0x65, 0x62, 0x3b, 0x1c0,
+0x48, 0x6f, 0x6f, 0x1c2, 0x67, 0x61, 0x65, 0x62, 0x3b, 0x48, 0xf4, 0x61, 0x73, 0x6f, 0x72, 0x65, 0x1c1, 0x6b, 0x68, 0xe2,
+0x62, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0xe4, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x7a, 0x2e, 0x3b, 0x41, 0x70, 0x72,
+0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x4f, 0x75, 0x6a, 0x2e,
+0x3b, 0x53, 0xe4, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e,
+0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x65, 0x77, 0x61, 0x3b, 0x46, 0xe4, 0x62, 0x72, 0x6f, 0x77, 0x61, 0x3b, 0x4d, 0xe4, 0xe4,
+0x7a, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a,
+0x75, 0x75, 0x6c, 0x69, 0x3b, 0x4f, 0x75, 0x6a, 0x6f, 0xdf, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72,
+0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x68, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44,
+0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0xe4, 0x62, 0x3b, 0x4d, 0xe4, 0x7a, 0x3b,
+0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x75, 0x6a, 0x3b,
+0x53, 0xe4, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x44, 0x61, 0x6c, 0x3b,
+0x41, 0x72, 0xe1, 0x3b, 0x186, 0x25b, 0x6e, 0x3b, 0x44, 0x6f, 0x79, 0x3b, 0x4c, 0xe9, 0x70, 0x3b, 0x52, 0x6f, 0x6b, 0x3b,
+0x53, 0xe1, 0x73, 0x3b, 0x42, 0x254, 0x301, 0x72, 0x3b, 0x4b, 0xfa, 0x73, 0x3b, 0x47, 0xed, 0x73, 0x3b, 0x53, 0x68, 0x289,
+0x301, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x3b, 0x4f, 0x6c, 0x61, 0x64, 0x61, 0x6c, 0x289, 0x301, 0x3b, 0x41, 0x72, 0xe1, 0x74,
+0x3b, 0x186, 0x25b, 0x6e, 0x268, 0x301, 0x254, 0x268, 0x14b, 0x254, 0x6b, 0x3b, 0x4f, 0x6c, 0x6f, 0x64, 0x6f, 0x79, 0xed, 0xf3,
+0x72, 0xed, 0xea, 0x20, 0x69, 0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4f, 0x6c, 0x6f, 0x69, 0x6c, 0xe9, 0x70, 0x16b,
+0x6e, 0x79, 0x12b, 0x113, 0x20, 0x69, 0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4b, 0xfa, 0x6a, 0xfa, 0x254, 0x72, 0x254,
+0x6b, 0x3b, 0x4d, 0xf3, 0x72, 0x75, 0x73, 0xe1, 0x73, 0x69, 0x6e, 0x3b, 0x186, 0x6c, 0x254, 0x301, 0x268, 0x301, 0x62, 0x254,
+0x301, 0x72, 0xe1, 0x72, 0x25b, 0x3b, 0x4b, 0xfa, 0x73, 0x68, 0xee, 0x6e, 0x3b, 0x4f, 0x6c, 0x67, 0xed, 0x73, 0x61, 0x6e,
+0x3b, 0x50, 0x289, 0x73, 0x68, 0x289, 0x301, 0x6b, 0x61, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x14b, 0x289, 0x301, 0x73, 0x3b, 0x4a,
+0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,
+0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
+0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41,
+0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53,
+0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4d,
+0x75, 0x6b, 0x3b, 0x4b, 0x77, 0x61, 0x3b, 0x44, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x6f, 0x64, 0x3b, 0x4a,
+0x6f, 0x6c, 0x3b, 0x50, 0x65, 0x64, 0x3b, 0x53, 0x6f, 0x6b, 0x3b, 0x54, 0x69, 0x62, 0x3b, 0x4c, 0x61, 0x62, 0x3b, 0x50,
+0x6f, 0x6f, 0x3b, 0x4f, 0x72, 0x61, 0x72, 0x61, 0x3b, 0x4f, 0x6d, 0x75, 0x6b, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x67,
+0x2019, 0x3b, 0x4f, 0x64, 0x75, 0x6e, 0x67, 0x2019, 0x65, 0x6c, 0x3b, 0x4f, 0x6d, 0x61, 0x72, 0x75, 0x6b, 0x3b, 0x4f, 0x6d,
+0x6f, 0x64, 0x6f, 0x6b, 0x2019, 0x6b, 0x69, 0x6e, 0x67, 0x2019, 0x6f, 0x6c, 0x3b, 0x4f, 0x6a, 0x6f, 0x6c, 0x61, 0x3b, 0x4f,
+0x70, 0x65, 0x64, 0x65, 0x6c, 0x3b, 0x4f, 0x73, 0x6f, 0x6b, 0x6f, 0x73, 0x6f, 0x6b, 0x6f, 0x6d, 0x61, 0x3b, 0x4f, 0x74,
+0x69, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6c, 0x61, 0x62, 0x6f, 0x72, 0x3b, 0x4f, 0x70, 0x6f, 0x6f, 0x3b, 0x52, 0x3b, 0x4d,
+0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x50,
+0x3b, 0x17d, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x69, 0x3b, 0x4d, 0x65, 0x3b,
+0x17d, 0x75, 0x77, 0x3b, 0x17d, 0x75, 0x79, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
+0x6f, 0x6f, 0x3b, 0x44, 0x65, 0x65, 0x3b, 0x17d, 0x61, 0x6e, 0x77, 0x69, 0x79, 0x65, 0x3b, 0x46, 0x65, 0x65, 0x77, 0x69,
+0x72, 0x69, 0x79, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x69, 0x3b, 0x41, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65,
+0x3b, 0x17d, 0x75, 0x77, 0x65, 0x14b, 0x3b, 0x17d, 0x75, 0x79, 0x79, 0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x74,
+0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x75, 0x72, 0x3b, 0x4e, 0x6f, 0x6f, 0x77, 0x61,
+0x6e, 0x62, 0x75, 0x72, 0x3b, 0x44, 0x65, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x17d, 0x3b, 0x46, 0x3b, 0x4d,
+0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x17d, 0x3b, 0x17d, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44,
+0x41, 0x43, 0x3b, 0x44, 0x41, 0x52, 0x3b, 0x44, 0x41, 0x44, 0x3b, 0x44, 0x41, 0x4e, 0x3b, 0x44, 0x41, 0x48, 0x3b, 0x44,
+0x41, 0x55, 0x3b, 0x44, 0x41, 0x4f, 0x3b, 0x44, 0x41, 0x42, 0x3b, 0x44, 0x4f, 0x43, 0x3b, 0x44, 0x41, 0x50, 0x3b, 0x44,
+0x47, 0x49, 0x3b, 0x44, 0x41, 0x47, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x63, 0x68, 0x69, 0x65,
+0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20,
+0x6d, 0x61, 0x72, 0x20, 0x41, 0x64, 0x65, 0x6b, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x6e, 0x67,
+0x2019, 0x77, 0x65, 0x6e, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x63, 0x68, 0x3b, 0x44,
+0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x75, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d,
+0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41,
+0x62, 0x6f, 0x72, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x4f, 0x63, 0x68, 0x69, 0x6b, 0x6f, 0x3b,
+0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72,
+0x20, 0x67, 0x69, 0x20, 0x61, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41,
+0x70, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x43, 0x3b, 0x52, 0x3b, 0x44, 0x3b, 0x4e,
+0x3b, 0x42, 0x3b, 0x55, 0x3b, 0x42, 0x3b, 0x42, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x59, 0x65, 0x6e,
+0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x49, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e,
+0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x75, 0x74, 0x3b, 0x4b, 0x1e6d, 0x75, 0x3b, 0x4e, 0x77, 0x61,
+0x3b, 0x44, 0x75, 0x6a, 0x3b, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x61, 0x79,
+0x65, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x49, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b,
+0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x75,
+0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x4b, 0x1e6d, 0x75, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x77, 0x61, 0x6e, 0x62, 0x69,
+0x72, 0x3b, 0x44, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4d,
+0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194, 0x3b, 0x43, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61,
+0x6c, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70,
+0x6c, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b,
+0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f,
+0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x91c,
+0x93e, 0x928, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e,
+0x93e, 0x930, 0x94d, 0x938, 0x3b, 0x90f, 0x92b, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c,
+0x941, 0x932, 0x93e, 0x907, 0x3b, 0x906, 0x917, 0x938, 0x94d, 0x925, 0x3b, 0x938, 0x947, 0x92c, 0x925, 0x947, 0x91c, 0x94d, 0x92c, 0x93c,
+0x930, 0x3b, 0x905, 0x916, 0x925, 0x92c, 0x930, 0x3b, 0x928, 0x92c, 0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x926, 0x93f, 0x938,
+0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b,
+0x91c, 0x941, 0x3b, 0x91c, 0x941, 0x3b, 0x906, 0x3b, 0x938, 0x947, 0x3b, 0x905, 0x3b, 0x928, 0x3b, 0x926, 0x93f, 0x3b, 0x456, 0x486,
+0x430, 0x2de9, 0x487, 0x3b, 0x444, 0x435, 0x2de1, 0x487, 0x3b, 0x43c, 0x430, 0x2dec, 0x487, 0x3b, 0x430, 0x486, 0x43f, 0x2dec, 0x487, 0x3b,
+0x43c, 0x430, 0xa675, 0x3b, 0x456, 0x486, 0xa64b, 0x2de9, 0x487, 0x3b, 0x456, 0x486, 0xa64b, 0x2de7, 0x487, 0x3b, 0x430, 0x486, 0x301, 0x475,
+0x2de2, 0x487, 0x3b, 0x441, 0x435, 0x2deb, 0x487, 0x3b, 0x47b, 0x486, 0x43a, 0x2dee, 0x3b, 0x43d, 0x43e, 0x435, 0x2de8, 0x3b, 0x434, 0x435,
+0x2de6, 0x487, 0x3b, 0x456, 0x486, 0x430, 0x43d, 0x43d, 0xa64b, 0x430, 0x301, 0x440, 0x457, 0x439, 0x3b, 0x444, 0x435, 0x432, 0x440, 0xa64b,
+0x430, 0x301, 0x440, 0x457, 0x439, 0x3b, 0x43c, 0x430, 0x301, 0x440, 0x442, 0x44a, 0x3b, 0x430, 0x486, 0x43f, 0x440, 0x456, 0x301, 0x43b,
+0x43b, 0x457, 0x439, 0x3b, 0x43c, 0x430, 0x301, 0x457, 0x439, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43d, 0x457, 0x439, 0x3b, 0x456, 0x486,
+0xa64b, 0x301, 0x43b, 0x457, 0x439, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x433, 0xa64b, 0x441, 0x442, 0x44a, 0x3b, 0x441, 0x435, 0x43f, 0x442,
+0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x47b, 0x486, 0x43a, 0x442, 0x461, 0x301, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x43d,
+0x43e, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b,
+0x406, 0x486, 0x3b, 0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x486, 0x3b, 0x41c, 0x3b, 0x406, 0x486, 0x3b, 0x406, 0x486, 0x3b, 0x410, 0x486,
+0x3b, 0x421, 0x3b, 0x47a, 0x486, 0x3b, 0x41d, 0x3b, 0x414, 0x3b, 0x456, 0x486, 0x430, 0x43d, 0x43d, 0xa64b, 0x430, 0x301, 0x440, 0x457,
+0x430, 0x3b, 0x444, 0x435, 0x432, 0x440, 0xa64b, 0x430, 0x301, 0x440, 0x457, 0x430, 0x3b, 0x43c, 0x430, 0x301, 0x440, 0x442, 0x430, 0x3b,
+0x430, 0x486, 0x43f, 0x440, 0x456, 0x301, 0x43b, 0x43b, 0x457, 0x430, 0x3b, 0x43c, 0x430, 0x301, 0x457, 0x430, 0x3b, 0x456, 0x486, 0xa64b,
+0x301, 0x43d, 0x457, 0x430, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43b, 0x457, 0x430, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x433, 0xa64b, 0x441,
+0x442, 0x430, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x47b, 0x486, 0x43a, 0x442, 0x461,
+0x301, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x43d, 0x43e, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x434, 0x435, 0x43a, 0x435,
+0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x43, 0x69, 0x6f, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x4c, 0x75, 0x73, 0x3b, 0x4d,
+0x75, 0x75, 0x3b, 0x4c, 0x75, 0x6d, 0x3b, 0x4c, 0x75, 0x66, 0x3b, 0x4b, 0x61, 0x62, 0x3b, 0x4c, 0x75, 0x73, 0x68, 0x3b,
+0x4c, 0x75, 0x74, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x43, 0x69, 0x73, 0x3b, 0x43, 0x69, 0x6f, 0x6e,
+0x67, 0x6f, 0x3b, 0x4c, 0xf9, 0x69, 0x73, 0x68, 0x69, 0x3b, 0x4c, 0x75, 0x73, 0xf2, 0x6c, 0x6f, 0x3b, 0x4d, 0xf9, 0x75,
+0x79, 0xe0, 0x3b, 0x4c, 0x75, 0x6d, 0xf9, 0x6e, 0x67, 0xf9, 0x6c, 0xf9, 0x3b, 0x4c, 0x75, 0x66, 0x75, 0x69, 0x6d, 0x69,
+0x3b, 0x4b, 0x61, 0x62, 0xe0, 0x6c, 0xe0, 0x73, 0x68, 0xec, 0x70, 0xf9, 0x3b, 0x4c, 0xf9, 0x73, 0x68, 0xec, 0x6b, 0xe0,
+0x3b, 0x4c, 0x75, 0x74, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x67, 0xf9, 0x64, 0x69, 0x3b, 0x4b,
+0x61, 0x73, 0x77, 0xe8, 0x6b, 0xe8, 0x73, 0xe8, 0x3b, 0x43, 0x69, 0x73, 0x77, 0xe0, 0x3b, 0x43, 0x3b, 0x4c, 0x3b, 0x4c,
+0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x4a,
+0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x65, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a,
+0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
+0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61,
+0x72, 0x3b, 0x4d, 0xe4, 0x65, 0x72, 0x7a, 0x3b, 0x41, 0x62, 0x72, 0xeb, 0x6c, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a,
+0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74,
+0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
+0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62,
+0x2e, 0x3b, 0x4d, 0xe4, 0x65, 0x2e, 0x3b, 0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x69,
+0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e,
+0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x6e, 0xf9, 0x6d, 0x3b, 0x6b, 0x268, 0x7a, 0x3b, 0x74,
+0x268, 0x64, 0x3b, 0x74, 0x61, 0x61, 0x3b, 0x73, 0x65, 0x65, 0x3b, 0x6e, 0x7a, 0x75, 0x3b, 0x64, 0x75, 0x6d, 0x3b, 0x66,
+0x254, 0x65, 0x3b, 0x64, 0x7a, 0x75, 0x3b, 0x6c, 0x254, 0x6d, 0x3b, 0x6b, 0x61, 0x61, 0x3b, 0x66, 0x77, 0x6f, 0x3b, 0x6e,
+0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6e, 0xf9, 0x6d, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6b,
+0x197, 0x300, 0x7a, 0xf9, 0x294, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x197, 0x300, 0x64, 0x289, 0x300,
+0x67, 0x68, 0xe0, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x1ce, 0x61, 0x66, 0x289, 0x304, 0x67, 0x68,
+0x101, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0xe8, 0x73, 0xe8, 0x65, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254,
+0x300, 0x6e, 0x7a, 0xf9, 0x67, 0x68, 0xf2, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x64, 0xf9, 0x6d, 0x6c,
+0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6b, 0x77, 0xee, 0x66, 0x254, 0x300, 0x65, 0x3b, 0x6e, 0x64,
+0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x197, 0x300, 0x66, 0x289, 0x300, 0x67, 0x68, 0xe0, 0x64, 0x7a, 0x75, 0x67, 0x68,
+0xf9, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x67, 0x68, 0x1d4, 0x75, 0x77, 0x65, 0x6c, 0x254, 0x300, 0x6d,
+0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x63, 0x68, 0x77, 0x61, 0x294, 0xe0, 0x6b, 0x61, 0x61, 0x20, 0x77,
+0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0xe8, 0x66, 0x77, 0xf2, 0x6f, 0x3b, 0x6e, 0x3b, 0x6b, 0x3b, 0x74, 0x3b,
+0x74, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x6b, 0x3b, 0x66, 0x3b, 0x64, 0x3b, 0x6c, 0x3b, 0x63, 0x3b, 0x66, 0x3b, 0x6b, 0x254,
+0x6e, 0x3b, 0x6d, 0x61, 0x63, 0x3b, 0x6d, 0x61, 0x74, 0x3b, 0x6d, 0x74, 0x6f, 0x3b, 0x6d, 0x70, 0x75, 0x3b, 0x68, 0x69,
+0x6c, 0x3b, 0x6e, 0x6a, 0x65, 0x3b, 0x68, 0x69, 0x6b, 0x3b, 0x64, 0x69, 0x70, 0x3b, 0x62, 0x69, 0x6f, 0x3b, 0x6d, 0x61,
+0x79, 0x3b, 0x6c, 0x69, 0x253, 0x3b, 0x4b, 0x254, 0x6e, 0x64, 0x254, 0x14b, 0x3b, 0x4d, 0xe0, 0x63, 0x25b, 0x302, 0x6c, 0x3b,
+0x4d, 0xe0, 0x74, 0xf9, 0x6d, 0x62, 0x3b, 0x4d, 0xe0, 0x74, 0x6f, 0x70, 0x3b, 0x4d, 0x300, 0x70, 0x75, 0x79, 0x25b, 0x3b,
+0x48, 0xec, 0x6c, 0xf2, 0x6e, 0x64, 0x25b, 0x300, 0x3b, 0x4e, 0x6a, 0xe8, 0x62, 0xe0, 0x3b, 0x48, 0xec, 0x6b, 0x61, 0x14b,
+0x3b, 0x44, 0xec, 0x70, 0x254, 0x300, 0x73, 0x3b, 0x42, 0xec, 0xf2, 0xf4, 0x6d, 0x3b, 0x4d, 0xe0, 0x79, 0x25b, 0x73, 0xe8,
+0x70, 0x3b, 0x4c, 0xec, 0x62, 0x75, 0x79, 0x20, 0x6c, 0x69, 0x20, 0x144, 0x79, 0xe8, 0x65, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b,
+0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x68, 0x3b, 0x6e, 0x3b, 0x68, 0x3b, 0x64, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x6c, 0x3b,
+0x64, 0x69, 0x3b, 0x14b, 0x67, 0x254, 0x6e, 0x3b, 0x73, 0x254, 0x14b, 0x3b, 0x64, 0x69, 0x253, 0x3b, 0x65, 0x6d, 0x69, 0x3b,
+0x65, 0x73, 0x254, 0x3b, 0x6d, 0x61, 0x64, 0x3b, 0x64, 0x69, 0x14b, 0x3b, 0x6e, 0x79, 0x25b, 0x74, 0x3b, 0x6d, 0x61, 0x79,
+0x3b, 0x74, 0x69, 0x6e, 0x3b, 0x65, 0x6c, 0xe1, 0x3b, 0x64, 0x69, 0x6d, 0x254, 0x301, 0x64, 0x69, 0x3b, 0x14b, 0x67, 0x254,
+0x6e, 0x64, 0x25b, 0x3b, 0x73, 0x254, 0x14b, 0x25b, 0x3b, 0x64, 0x69, 0x253, 0xe1, 0x253, 0xe1, 0x3b, 0x65, 0x6d, 0x69, 0x61,
+0x73, 0x65, 0x6c, 0x65, 0x3b, 0x65, 0x73, 0x254, 0x70, 0x25b, 0x73, 0x254, 0x70, 0x25b, 0x3b, 0x6d, 0x61, 0x64, 0x69, 0x253,
+0x25b, 0x301, 0x64, 0xed, 0x253, 0x25b, 0x301, 0x3b, 0x64, 0x69, 0x14b, 0x67, 0x69, 0x6e, 0x64, 0x69, 0x3b, 0x6e, 0x79, 0x25b,
+0x74, 0x25b, 0x6b, 0x69, 0x3b, 0x6d, 0x61, 0x79, 0xe9, 0x73, 0x25b, 0x301, 0x3b, 0x74, 0x69, 0x6e, 0xed, 0x6e, 0xed, 0x3b,
+0x65, 0x6c, 0xe1, 0x14b, 0x67, 0x25b, 0x301, 0x3b, 0x64, 0x3b, 0x14b, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x65, 0x3b, 0x65, 0x3b,
+0x6d, 0x3b, 0x64, 0x3b, 0x6e, 0x3b, 0x6d, 0x3b, 0x74, 0x3b, 0x65, 0x3b, 0x53, 0x61, 0x3b, 0x46, 0x65, 0x3b, 0x4d, 0x61,
+0x3b, 0x41, 0x62, 0x3b, 0x4d, 0x65, 0x3b, 0x53, 0x75, 0x3b, 0x53, 0xfa, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x3b, 0x4f,
+0x6b, 0x3b, 0x4e, 0x6f, 0x3b, 0x44, 0x65, 0x3b, 0x53, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x46, 0xe9, 0x62, 0x69, 0x72,
+0x69, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x41, 0x62, 0x75, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53,
+0x75, 0x65, 0x14b, 0x3b, 0x53, 0xfa, 0x75, 0x79, 0x65, 0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d,
+0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72,
+0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,
+0x53, 0x3b, 0x53, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6e, 0x67, 0x6f, 0x3b, 0x6e, 0x67,
+0x62, 0x3b, 0x6e, 0x67, 0x6c, 0x3b, 0x6e, 0x67, 0x6e, 0x3b, 0x6e, 0x67, 0x74, 0x3b, 0x6e, 0x67, 0x73, 0x3b, 0x6e, 0x67,
+0x7a, 0x3b, 0x6e, 0x67, 0x6d, 0x3b, 0x6e, 0x67, 0x65, 0x3b, 0x6e, 0x67, 0x61, 0x3b, 0x6e, 0x67, 0x61, 0x64, 0x3b, 0x6e,
+0x67, 0x61, 0x62, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6f, 0x73, 0xfa, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x62, 0x25b,
+0x30c, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6c, 0xe1, 0x6c, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6e, 0x79, 0x69,
+0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x74, 0xe1, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x73, 0x61,
+0x6d, 0x259, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x7a, 0x61, 0x6d, 0x67, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x6e,
+0x67, 0x254, 0x6e, 0x20, 0x6d, 0x77, 0x6f, 0x6d, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x65, 0x62, 0x75, 0x6c, 0xfa, 0x3b,
+0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x20,
+0x61, 0x69, 0x20, 0x64, 0x7a, 0x69, 0xe1, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x20, 0x61, 0x69,
+0x20, 0x62, 0x25b, 0x30c, 0x3b, 0x6f, 0x3b, 0x62, 0x3b, 0x6c, 0x3b, 0x6e, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x6d,
+0x3b, 0x65, 0x3b, 0x61, 0x3b, 0x64, 0x3b, 0x62, 0x3b, 0x14b, 0x31, 0x3b, 0x14b, 0x32, 0x3b, 0x14b, 0x33, 0x3b, 0x14b, 0x34,
+0x3b, 0x14b, 0x35, 0x3b, 0x14b, 0x36, 0x3b, 0x14b, 0x37, 0x3b, 0x14b, 0x38, 0x3b, 0x14b, 0x39, 0x3b, 0x14b, 0x31, 0x30, 0x3b,
+0x14b, 0x31, 0x31, 0x3b, 0x14b, 0x31, 0x32, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x20, 0x6e, 0x74, 0x254, 0x301, 0x6e,
+0x74, 0x254, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x62, 0x25b, 0x301, 0x25b, 0x3b, 0x14b, 0x77, 0xed,
+0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x72, 0xe1, 0xe1, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e,
+0x69, 0x6e, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x6e, 0x3b, 0x14b, 0x77, 0xed,
+0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x66, 0x254, 0x6b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b,
+0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x62, 0x25b, 0x25b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1,
+0x61, 0x72, 0x61, 0x61, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x6e, 0x69, 0x6e,
+0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20,
+0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x20, 0x64, 0x69, 0x20, 0x62, 0x254, 0x301, 0x6b, 0x3b, 0x14b, 0x77, 0xed,
+0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x20, 0x64, 0x69, 0x20, 0x62, 0x25b, 0x301, 0x25b, 0x3b, 0x4b,
+0x77, 0x61, 0x3b, 0x55, 0x6e, 0x61, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x43, 0x68, 0x65, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d,
+0x6f, 0x63, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b, 0x4d,
+0x6f, 0x6a, 0x3b, 0x59, 0x65, 0x6c, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x77, 0x61, 0x6e,
+0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x61, 0x79, 0x65, 0x6c, 0x69, 0x3b,
+0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65, 0x72, 0x61, 0x72, 0x75, 0x3b, 0x4d, 0x77, 0x65,
+0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65, 0x63, 0x68, 0x65, 0x73, 0x68, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72,
+0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65, 0x74, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
+0x77, 0x6f, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x75, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x63, 0x68, 0x61, 0x3b, 0x4d, 0x77,
+0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f,
+0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b,
+0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
+0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72,
+0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x79, 0x65, 0x6c, 0x2019, 0x6c, 0x69, 0x3b,
+0x4b, 0x3b, 0x55, 0x3b, 0x52, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b,
+0x4d, 0x3b, 0x59, 0x3b, 0x46, 0x4c, 0x4f, 0x3b, 0x43, 0x4c, 0x41, 0x3b, 0x43, 0x4b, 0x49, 0x3b, 0x46, 0x4d, 0x46, 0x3b,
+0x4d, 0x41, 0x44, 0x3b, 0x4d, 0x42, 0x49, 0x3b, 0x4d, 0x4c, 0x49, 0x3b, 0x4d, 0x41, 0x4d, 0x3b, 0x46, 0x44, 0x45, 0x3b,
+0x46, 0x4d, 0x55, 0x3b, 0x46, 0x47, 0x57, 0x3b, 0x46, 0x59, 0x55, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4c, 0x6f, 0x6f, 0x3b,
+0x43, 0x6f, 0x6b, 0x63, 0x77, 0x61, 0x6b, 0x6c, 0x61, 0x14b, 0x6e, 0x65, 0x3b, 0x43, 0x6f, 0x6b, 0x63, 0x77, 0x61, 0x6b,
+0x6c, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4d, 0x61, 0x72, 0x66, 0x6f, 0x6f, 0x3b, 0x4d, 0x61, 0x64, 0x1dd, 0x1dd,
+0x75, 0x75, 0x74, 0x1dd, 0x62, 0x69, 0x6a, 0x61, 0x14b, 0x3b, 0x4d, 0x61, 0x6d, 0x1dd, 0x14b, 0x67, 0x77, 0xe3, 0x61, 0x66,
+0x61, 0x68, 0x62, 0x69, 0x69, 0x3b, 0x4d, 0x61, 0x6d, 0x1dd, 0x14b, 0x67, 0x77, 0xe3, 0x61, 0x6c, 0x69, 0x69, 0x3b, 0x4d,
+0x61, 0x64, 0x1dd, 0x6d, 0x62, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x44, 0x1dd, 0x253, 0x6c, 0x69, 0x69, 0x3b, 0x46,
+0x129, 0x69, 0x20, 0x4d, 0x75, 0x6e, 0x64, 0x61, 0x14b, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x47, 0x77, 0x61, 0x68, 0x6c, 0x6c,
+0x65, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x59, 0x75, 0x72, 0x75, 0x3b, 0x4f, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x44,
+0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x55, 0x3b, 0x57, 0x3b, 0x59, 0x3b, 0x6e, 0x67, 0x31, 0x3b, 0x6e,
+0x67, 0x32, 0x3b, 0x6e, 0x67, 0x33, 0x3b, 0x6e, 0x67, 0x34, 0x3b, 0x6e, 0x67, 0x35, 0x3b, 0x6e, 0x67, 0x36, 0x3b, 0x6e,
+0x67, 0x37, 0x3b, 0x6e, 0x67, 0x38, 0x3b, 0x6e, 0x67, 0x39, 0x3b, 0x6e, 0x67, 0x31, 0x30, 0x3b, 0x6e, 0x67, 0x31, 0x31,
+0x3b, 0x6b, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x6d, 0x61, 0x74, 0xe1, 0x68, 0x72, 0x61, 0x3b,
+0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6d, 0x62, 0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6c, 0x61,
+0x6c, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x74,
+0x61, 0x6e, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x74, 0x75, 0xf3, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20,
+0x68, 0x25b, 0x6d, 0x62, 0x75, 0x25b, 0x72, 0xed, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x6c, 0x254, 0x6d, 0x62, 0x69,
+0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x72, 0x25b, 0x62, 0x76, 0x75, 0xe2, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20,
+0x77, 0x75, 0x6d, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x77, 0x75, 0x6d, 0x20, 0x6e, 0x61, 0x76, 0x1d4, 0x72, 0x3b,
+0x6b, 0x72, 0xed, 0x73, 0x69, 0x6d, 0x69, 0x6e, 0x3b, 0x54, 0x69, 0x6f, 0x70, 0x3b, 0x50, 0x25b, 0x74, 0x3b, 0x44, 0x75,
+0x254, 0x331, 0x254, 0x331, 0x3b, 0x47, 0x75, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0xe4, 0x3b, 0x4b, 0x6f, 0x72, 0x3b, 0x50, 0x61,
+0x79, 0x3b, 0x54, 0x68, 0x6f, 0x6f, 0x3b, 0x54, 0x25b, 0x25b, 0x3b, 0x4c, 0x61, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x54,
+0x69, 0x64, 0x3b, 0x54, 0x69, 0x6f, 0x70, 0x20, 0x74, 0x68, 0x61, 0x72, 0x20, 0x70, 0x25b, 0x74, 0x3b, 0x50, 0x25b, 0x74,
+0x3b, 0x44, 0x75, 0x254, 0x331, 0x254, 0x331, 0x14b, 0x3b, 0x47, 0x75, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0xe4, 0x74, 0x3b, 0x4b,
+0x6f, 0x72, 0x6e, 0x79, 0x6f, 0x6f, 0x74, 0x3b, 0x50, 0x61, 0x79, 0x20, 0x79, 0x69, 0x65, 0x331, 0x74, 0x6e, 0x69, 0x3b,
+0x54, 0x68, 0x6f, 0x331, 0x6f, 0x331, 0x72, 0x3b, 0x54, 0x25b, 0x25b, 0x72, 0x3b, 0x4c, 0x61, 0x61, 0x74, 0x68, 0x3b, 0x4b,
+0x75, 0x72, 0x3b, 0x54, 0x69, 0x6f, 0x331, 0x70, 0x20, 0x69, 0x6e, 0x20, 0x64, 0x69, 0x331, 0x69, 0x331, 0x74, 0x3b, 0x54,
+0x3b, 0x50, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x4b,
+0x3b, 0x54, 0x3b, 0x422, 0x43e, 0x445, 0x441, 0x3b, 0x41e, 0x43b, 0x443, 0x43d, 0x3b, 0x41a, 0x43b, 0x43d, 0x3b, 0x41c, 0x441, 0x443,
+0x3b, 0x42b, 0x430, 0x43c, 0x3b, 0x411, 0x44d, 0x441, 0x3b, 0x41e, 0x442, 0x439, 0x3b, 0x410, 0x442, 0x440, 0x3b, 0x411, 0x43b, 0x495,
+0x3b, 0x410, 0x43b, 0x442, 0x3b, 0x421, 0x44d, 0x442, 0x3b, 0x410, 0x445, 0x441, 0x3b, 0x442, 0x43e, 0x445, 0x441, 0x443, 0x43d, 0x43d,
+0x44c, 0x443, 0x3b, 0x43e, 0x43b, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x3b, 0x43a, 0x443, 0x43b, 0x443, 0x43d, 0x20, 0x442, 0x443, 0x442,
+0x430, 0x440, 0x3b, 0x43c, 0x443, 0x443, 0x441, 0x20, 0x443, 0x441, 0x442, 0x430, 0x440, 0x3b, 0x44b, 0x430, 0x43c, 0x20, 0x44b, 0x439,
+0x430, 0x3b, 0x431, 0x44d, 0x441, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x43e, 0x442, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x430, 0x442, 0x44b,
+0x440, 0x434, 0x44c, 0x44b, 0x445, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x431, 0x430, 0x43b, 0x430, 0x495, 0x430, 0x43d, 0x20, 0x44b, 0x439,
+0x430, 0x3b, 0x430, 0x43b, 0x442, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x441, 0x44d, 0x442, 0x438, 0x43d, 0x43d, 0x44c, 0x438, 0x3b,
+0x430, 0x445, 0x441, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x422, 0x3b, 0x41e, 0x3b, 0x41a, 0x3b, 0x41c, 0x3b, 0x42b, 0x3b, 0x411,
+0x3b, 0x41e, 0x3b, 0x410, 0x3b, 0x411, 0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x410, 0x3b, 0x422, 0x43e, 0x445, 0x441, 0x443, 0x43d, 0x43d,
+0x44c, 0x443, 0x3b, 0x41e, 0x43b, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x3b, 0x41a, 0x443, 0x43b, 0x443, 0x43d, 0x20, 0x442, 0x443, 0x442,
+0x430, 0x440, 0x3b, 0x41c, 0x443, 0x443, 0x441, 0x20, 0x443, 0x441, 0x442, 0x430, 0x440, 0x3b, 0x42b, 0x430, 0x43c, 0x20, 0x44b, 0x439,
+0x44b, 0x43d, 0x3b, 0x411, 0x44d, 0x441, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x41e, 0x442, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b,
+0x410, 0x442, 0x44b, 0x440, 0x434, 0x44c, 0x44b, 0x445, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x411, 0x430, 0x43b, 0x430, 0x495, 0x430,
+0x43d, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x410, 0x43b, 0x442, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x421, 0x44d, 0x442, 0x438,
+0x43d, 0x43d, 0x44c, 0x438, 0x3b, 0x430, 0x445, 0x441, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x4d, 0x75, 0x70, 0x3b, 0x4d, 0x77,
+0x69, 0x3b, 0x4d, 0x73, 0x68, 0x3b, 0x4d, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x67, 0x3b, 0x4d, 0x75, 0x6a, 0x3b, 0x4d, 0x73,
+0x70, 0x3b, 0x4d, 0x70, 0x67, 0x3b, 0x4d, 0x79, 0x65, 0x3b, 0x4d, 0x6f, 0x6b, 0x3b, 0x4d, 0x75, 0x73, 0x3b, 0x4d, 0x75,
+0x68, 0x3b, 0x4d, 0x75, 0x70, 0x61, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x77, 0x61, 0x3b, 0x4d, 0x77, 0x69, 0x74, 0x6f,
+0x70, 0x65, 0x3b, 0x4d, 0x75, 0x73, 0x68, 0x65, 0x6e, 0x64, 0x65, 0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4d, 0x75,
+0x73, 0x68, 0x65, 0x6e, 0x64, 0x65, 0x20, 0x4d, 0x61, 0x67, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x75, 0x6a, 0x69, 0x6d, 0x62,
+0x69, 0x3b, 0x4d, 0x75, 0x73, 0x68, 0x69, 0x70, 0x65, 0x70, 0x6f, 0x3b, 0x4d, 0x75, 0x70, 0x75, 0x67, 0x75, 0x74, 0x6f,
+0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x4d, 0x6f, 0x6b, 0x68, 0x75, 0x3b, 0x4d, 0x75, 0x73, 0x6f,
+0x6e, 0x67, 0x61, 0x6e, 0x64, 0x65, 0x6d, 0x62, 0x77, 0x65, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0xa5a8,
+0xa595, 0xa51e, 0x3b, 0xa552, 0xa561, 0x3b, 0xa57e, 0xa5ba, 0x3b, 0xa5a2, 0xa595, 0x3b, 0xa591, 0xa571, 0x3b, 0xa5b1, 0xa60b, 0x3b, 0xa5b1, 0xa55e,
+0x3b, 0xa5db, 0xa515, 0x3b, 0xa562, 0xa54c, 0x3b, 0xa56d, 0xa583, 0x3b, 0xa51e, 0xa60b, 0x3b, 0xa5a8, 0xa595, 0xa5cf, 0x3b, 0xa5a8, 0xa595, 0x20,
+0xa56a, 0xa574, 0x20, 0xa51e, 0xa500, 0xa56e, 0xa54a, 0x3b, 0xa552, 0xa561, 0xa59d, 0xa595, 0x3b, 0xa57e, 0xa5ba, 0x3b, 0xa5a2, 0xa595, 0x3b, 0xa591,
+0xa571, 0x3b, 0xa5b1, 0xa60b, 0x3b, 0xa5b1, 0xa55e, 0xa524, 0x3b, 0xa5db, 0xa515, 0x3b, 0xa562, 0xa54c, 0x3b, 0xa56d, 0xa583, 0x3b, 0xa51e, 0xa60b,
+0xa554, 0xa57f, 0x20, 0xa578, 0xa583, 0xa5cf, 0x3b, 0xa5a8, 0xa595, 0x20, 0xa56a, 0xa574, 0x20, 0xa5cf, 0xa5ba, 0xa56e, 0xa54a, 0x3b, 0x6c, 0x75,
+0x75, 0x6b, 0x61, 0x6f, 0x20, 0x6b, 0x65, 0x6d, 0xe3, 0x3b, 0x253, 0x61, 0x6e, 0x64, 0x61, 0x253, 0x75, 0x3b, 0x76, 0x254,
+0x254, 0x3b, 0x66, 0x75, 0x6c, 0x75, 0x3b, 0x67, 0x6f, 0x6f, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x6b, 0x254, 0x6e, 0x64, 0x65,
+0x3b, 0x73, 0x61, 0x61, 0x68, 0x3b, 0x67, 0x61, 0x6c, 0x6f, 0x3b, 0x6b, 0x65, 0x6e, 0x70, 0x6b, 0x61, 0x74, 0x6f, 0x20,
+0x253, 0x6f, 0x6c, 0x6f, 0x6c, 0x254, 0x3b, 0x6c, 0x75, 0x75, 0x6b, 0x61, 0x6f, 0x20, 0x6c, 0x254, 0x6d, 0x61, 0x3b, 0x4a,
+0x65, 0x6e, 0x3b, 0x48, 0x6f, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x42,
+0x72, 0xe1, 0x3b, 0x48, 0x65, 0x69, 0x3b, 0xd6, 0x69, 0x67, 0x3b, 0x48, 0x65, 0x72, 0x3b, 0x57, 0xed, 0x6d, 0x3b, 0x57,
+0x69, 0x6e, 0x3b, 0x43, 0x68, 0x72, 0x3b, 0x4a, 0x65, 0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x48, 0x6f, 0x72, 0x6e, 0x69, 0x67,
+0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x65, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x6a, 0x65,
+0x3b, 0x42, 0x72, 0xe1, 0x10d, 0x65, 0x74, 0x3b, 0x48, 0x65, 0x69, 0x77, 0x65, 0x74, 0x3b, 0xd6, 0x69, 0x67, 0x161, 0x74,
+0x65, 0x3b, 0x48, 0x65, 0x72, 0x62, 0x161, 0x74, 0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x57, 0xed, 0x6d, 0xe1, 0x6e, 0x65,
+0x74, 0x3b, 0x57, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x43, 0x68, 0x72, 0x69, 0x161, 0x74,
+0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x4a, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x42, 0x3b, 0x48, 0x3b,
+0xd6, 0x3b, 0x48, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x43, 0x3b, 0x6f, 0x2e, 0x31, 0x3b, 0x6f, 0x2e, 0x32, 0x3b, 0x6f, 0x2e,
+0x33, 0x3b, 0x6f, 0x2e, 0x34, 0x3b, 0x6f, 0x2e, 0x35, 0x3b, 0x6f, 0x2e, 0x36, 0x3b, 0x6f, 0x2e, 0x37, 0x3b, 0x6f, 0x2e,
+0x38, 0x3b, 0x6f, 0x2e, 0x39, 0x3b, 0x6f, 0x2e, 0x31, 0x30, 0x3b, 0x6f, 0x2e, 0x31, 0x31, 0x3b, 0x6f, 0x2e, 0x31, 0x32,
+0x3b, 0x70, 0x69, 0x6b, 0xed, 0x74, 0xed, 0x6b, 0xed, 0x74, 0x69, 0x65, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0xed, 0x20, 0xfa,
+0x20, 0x6b, 0x75, 0x74, 0xfa, 0x61, 0x6e, 0x3b, 0x73, 0x69, 0x25b, 0x79, 0x25b, 0x301, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69,
+0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x6e, 0x64, 0xed, 0x25b, 0x3b, 0x254, 0x6e, 0x73, 0xfa, 0x6d, 0x62, 0x254, 0x6c, 0x2c, 0x20,
+0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xe1, 0x74, 0xfa, 0x25b, 0x3b, 0x6d, 0x65, 0x73, 0x69, 0x14b,
+0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe9, 0x6e, 0x69, 0x65, 0x3b, 0x65, 0x6e, 0x73, 0x69, 0x6c,
+0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xe1, 0x6e, 0x75, 0x25b, 0x3b, 0x254, 0x73, 0x254,
+0x6e, 0x3b, 0x65, 0x66, 0x75, 0x74, 0x65, 0x3b, 0x70, 0x69, 0x73, 0x75, 0x79, 0xfa, 0x3b, 0x69, 0x6d, 0x25b, 0x14b, 0x20,
+0x69, 0x20, 0x70, 0x75, 0x254, 0x73, 0x3b, 0x69, 0x6d, 0x25b, 0x14b, 0x20, 0x69, 0x20, 0x70, 0x75, 0x74, 0xfa, 0x6b, 0x2c,
+0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xed, 0x25b, 0x3b, 0x6d, 0x61, 0x6b, 0x61, 0x6e, 0x64, 0x69,
+0x6b, 0x25b, 0x3b, 0x70, 0x69, 0x6c, 0x254, 0x6e, 0x64, 0x254, 0x301, 0x3b, 0x58, 0x69, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,
+0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x58, 0x75, 0x6e, 0x3b, 0x58, 0x6e, 0x74, 0x3b,
+0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x63, 0x68, 0x3b, 0x50, 0x61, 0x79, 0x3b, 0x41, 0x76, 0x69, 0x3b,
+0x78, 0x69, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x75,
+0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x75, 0x3b, 0x78, 0x75, 0x6e, 0x75, 0x3b, 0x78, 0x75, 0x6e,
+0x65, 0x74, 0x75, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65,
+0x3b, 0x6f, 0x63, 0x68, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x70, 0x61, 0x79, 0x61, 0x72, 0x65, 0x73, 0x3b, 0x61, 0x76, 0x69,
+0x65, 0x6e, 0x74, 0x75, 0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41,
+0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x78, 0x69, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72,
+0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x78, 0x75, 0x6e, 0x3b, 0x78, 0x6e, 0x74, 0x3b, 0x61, 0x67, 0x6f,
+0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x63, 0x68, 0x3b, 0x70, 0x61, 0x79, 0x3b, 0x61, 0x76, 0x69, 0x3b, 0x64, 0x65, 0x20,
+0x78, 0x69, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x64, 0x65,
+0x20, 0x6d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61,
+0x79, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x78, 0x75, 0x6e, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x78, 0x75, 0x6e, 0x65, 0x74, 0x75,
+0x3b, 0x64, 0x2019, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62,
+0x72, 0x65, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x68, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x70, 0x61, 0x79, 0x61,
+0x72, 0x65, 0x73, 0x3b, 0x64, 0x2019, 0x61, 0x76, 0x69, 0x65, 0x6e, 0x74, 0x75, 0x3b, 0x4e, 0x64, 0x75, 0x14b, 0x6d, 0x62,
+0x69, 0x20, 0x53, 0x61, 0x14b, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x70, 0xe1, 0x3b, 0x50, 0x25b,
+0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x74, 0xe1, 0x74, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301,
+0x6e, 0x25b, 0x301, 0x6b, 0x77, 0x61, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x61, 0x74, 0x61, 0x61, 0x3b, 0x50,
+0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x6e, 0x74, 0xfa, 0x6b, 0xfa, 0x3b, 0x50, 0x25b, 0x73,
+0x61, 0x14b, 0x20, 0x53, 0x61, 0x61, 0x6d, 0x62, 0xe1, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e,
+0x25b, 0x301, 0x66, 0x254, 0x6d, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x70, 0x66,
+0xfa, 0xa78b, 0xfa, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e, 0x25b, 0x67, 0x25b, 0x301, 0x6d, 0x3b, 0x50, 0x25b, 0x73,
+0x61, 0x14b, 0x20, 0x4e, 0x74, 0x73, 0x254, 0x30c, 0x70, 0x6d, 0x254, 0x301, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e,
+0x74, 0x73, 0x254, 0x30c, 0x70, 0x70, 0xe1, 0x3b, 0x70, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b,
+0x6d, 0x62, 0x69, 0x79, 0x254, 0x20, 0x6d, 0x25b, 0x6e, 0x64, 0x6f, 0x14b, 0x67, 0x254, 0x3b, 0x4e, 0x79, 0x254, 0x6c, 0x254,
+0x6d, 0x62, 0x254, 0x14b, 0x67, 0x254, 0x3b, 0x4d, 0x254, 0x6e, 0x254, 0x20, 0x14b, 0x67, 0x62, 0x61, 0x6e, 0x6a, 0x61, 0x3b,
+0x4e, 0x79, 0x61, 0x14b, 0x67, 0x77, 0x25b, 0x20, 0x14b, 0x67, 0x62, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x75, 0x14b, 0x67,
+0x77, 0x25b, 0x3b, 0x66, 0x25b, 0x3b, 0x6e, 0x6a, 0x61, 0x70, 0x69, 0x3b, 0x6e, 0x79, 0x75, 0x6b, 0x75, 0x6c, 0x3b, 0x31,
+0x31, 0x3b, 0x253, 0x75, 0x6c, 0x253, 0x75, 0x73, 0x25b, 0x3b, 0x6d, 0x62, 0x65, 0x67, 0x74, 0x75, 0x67, 0x3b, 0x69, 0x6d,
+0x65, 0x67, 0x20, 0xe0, 0x62, 0xf9, 0x62, 0xec, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0x6d, 0x62, 0x259, 0x14b, 0x63, 0x68,
+0x75, 0x62, 0x69, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6e, 0x67, 0x77, 0x259, 0x300, 0x74, 0x3b, 0x69, 0x6d, 0x259, 0x67,
+0x20, 0x66, 0x6f, 0x67, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x69, 0x62, 0x254, 0x64, 0x3b, 0x69,
+0x6d, 0x259, 0x67, 0x20, 0xe0, 0x64, 0xf9, 0x6d, 0x62, 0x259, 0x300, 0x14b, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63,
+0x68, 0x69, 0x6b, 0x61, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x75, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x74,
+0xe8, 0x73, 0x69, 0x2bc, 0x65, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x7a, 0xf2, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b,
+0x72, 0x69, 0x7a, 0x6d, 0x65, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6d, 0x62, 0x65, 0x67, 0x74, 0x75, 0x67, 0x3b,
+0x69, 0x6d, 0x65, 0x67, 0x20, 0xe0, 0x62, 0xf9, 0x62, 0xec, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0x6d, 0x62, 0x259, 0x14b,
+0x63, 0x68, 0x75, 0x62, 0x69, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6e, 0x67, 0x77, 0x259, 0x300, 0x74, 0x3b, 0x69, 0x6d,
+0x259, 0x67, 0x20, 0x66, 0x6f, 0x67, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x69, 0x62, 0x254, 0x64,
+0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0xe0, 0x64, 0xf9, 0x6d, 0x62, 0x259, 0x300, 0x14b, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20,
+0x69, 0x63, 0x68, 0x69, 0x6b, 0x61, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x75, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67,
+0x20, 0x74, 0xe8, 0x73, 0x69, 0x2bc, 0x65, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x7a, 0xf2, 0x3b, 0x69, 0x6d, 0x259, 0x67,
+0x20, 0x6b, 0x72, 0x69, 0x7a, 0x6d, 0x65, 0x64, 0x3b, 0x4d, 0x31, 0x3b, 0x41, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4e, 0x34,
+0x3b, 0x46, 0x35, 0x3b, 0x49, 0x36, 0x3b, 0x41, 0x37, 0x3b, 0x49, 0x38, 0x3b, 0x4b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31,
+0x31, 0x3b, 0x31, 0x32, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x6c, 0xf9,
+0x6d, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6b, 0xe0, 0x67, 0x20, 0x6e, 0x67, 0x77, 0xf3, 0x14b, 0x3b, 0x73, 0x61, 0x14b, 0x20,
+0x6c, 0x65, 0x70, 0x79, 0xe8, 0x20, 0x73, 0x68, 0xfa, 0x6d, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x63, 0xff, 0xf3, 0x3b, 0x73,
+0x61, 0x14b, 0x20, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x63, 0xff, 0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6e, 0x6a, 0xff,
+0x6f, 0x6c, 0xe1, 0x2bc, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0x79, 0x25b, 0x300, 0x62, 0x20, 0x74, 0x79, 0x25b, 0x300, 0x62,
+0x20, 0x6d, 0x62, 0x289, 0x300, 0x14b, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6d, 0x62, 0x289, 0x300, 0x14b, 0x3b, 0x73, 0x61, 0x14b,
+0x20, 0x6e, 0x67, 0x77, 0x254, 0x300, 0x2bc, 0x20, 0x6d, 0x62, 0xff, 0x25b, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0xe0, 0x14b,
+0x61, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0xe1, 0x2bc, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6d, 0x65, 0x6a, 0x77, 0x6f, 0x14b,
+0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6c, 0xf9, 0x6d, 0x3b, 0x57, 0x69, 0xf3, 0x74, 0x68, 0x65, 0x21f, 0x69, 0x6b, 0x61,
+0x20, 0x57, 0xed, 0x3b, 0x54, 0x68, 0x69, 0x79, 0xf3, 0x21f, 0x65, 0x79, 0x75, 0x14b, 0x6b, 0x61, 0x20, 0x57, 0xed, 0x3b,
+0x49, 0x161, 0x74, 0xe1, 0x77, 0x69, 0x10d, 0x68, 0x61, 0x79, 0x61, 0x7a, 0x61, 0x14b, 0x20, 0x57, 0xed, 0x3b, 0x50, 0x21f,
+0x65, 0x17e, 0xed, 0x74, 0x21f, 0x6f, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x74, 0x21f,
+0x6f, 0x20, 0x57, 0xed, 0x3b, 0x57, 0xed, 0x70, 0x61, 0x7a, 0x75, 0x6b, 0x21f, 0x61, 0x2d, 0x77, 0x61, 0x161, 0x74, 0xe9,
+0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x70, 0x21f, 0xe1, 0x73, 0x61, 0x70, 0x61, 0x20, 0x57, 0xed, 0x3b, 0x57,
+0x61, 0x73, 0xfa, 0x74, 0x21f, 0x75, 0x14b, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x1e7,
+0x69, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x2d, 0x6b, 0x61, 0x73, 0x6e, 0xe1, 0x20,
+0x57, 0xed, 0x3b, 0x57, 0x61, 0x6e, 0xed, 0x79, 0x65, 0x74, 0x75, 0x20, 0x57, 0xed, 0x3b, 0x54, 0x21f, 0x61, 0x68, 0xe9,
+0x6b, 0x61, 0x70, 0x161, 0x75, 0x14b, 0x20, 0x57, 0xed, 0x3b, 0x6a9, 0x627, 0x646, 0x648, 0x648, 0x646, 0x6cc, 0x20, 0x62f, 0x648,
+0x648, 0x6d5, 0x645, 0x3b, 0x634, 0x648, 0x628, 0x627, 0x62a, 0x3b, 0x626, 0x627, 0x632, 0x627, 0x631, 0x3b, 0x646, 0x6cc, 0x633, 0x627,
+0x646, 0x3b, 0x626, 0x627, 0x6cc, 0x627, 0x631, 0x3b, 0x62d, 0x648, 0x632, 0x6d5, 0x6cc, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x6d5, 0x645,
+0x648, 0x648, 0x632, 0x3b, 0x626, 0x627, 0x628, 0x3b, 0x626, 0x6d5, 0x6cc, 0x644, 0x648, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x6cc,
+0x646, 0x6cc, 0x20, 0x6cc, 0x6d5, 0x6a9, 0x6d5, 0x645, 0x3b, 0x62a, 0x634, 0x631, 0x6cc, 0x646, 0x6cc, 0x20, 0x62f, 0x648, 0x648, 0x6d5,
+0x645, 0x3b, 0x6a9, 0x627, 0x646, 0x648, 0x646, 0x6cc, 0x20, 0x6cc, 0x6d5, 0x6a9, 0x6d5, 0x645, 0x3b, 0x6a9, 0x3b, 0x634, 0x3b, 0x626,
+0x3b, 0x646, 0x3b, 0x626, 0x3b, 0x62d, 0x3b, 0x62a, 0x3b, 0x626, 0x3b, 0x626, 0x3b, 0x62a, 0x3b, 0x62a, 0x3b, 0x6a9, 0x3b, 0x6a,
+0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x11b, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a,
+0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e,
+0x6f, 0x77, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61,
+0x72, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e,
+0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74,
+0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62,
+0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62,
+0x2e, 0x3b, 0x6d, 0x11b, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x2e, 0x3b, 0x6a, 0x75, 0x6e,
+0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x77, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74,
+0x2e, 0x3b, 0x6e, 0x6f, 0x77, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x61, 0x3b,
+0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c,
+0x61, 0x3b, 0x6d, 0x61, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x61,
+0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f,
+0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65,
+0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x11b, 0x72, 0x3b, 0x61, 0x70, 0x72,
+0x3b, 0x6d, 0x65, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x70,
+0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x77, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,
+0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x3b, 0x6d,
+0x65, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x77, 0x67, 0x75,
+0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72,
+0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a,
+0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x11b, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d,
+0x65, 0x6a, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x77, 0x67, 0x2e, 0x3b, 0x73,
+0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x77, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a,
+0x61, 0x6e, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x6d, 0x11b, 0x72, 0x63,
+0x61, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x61, 0x3b, 0x6d, 0x65, 0x6a, 0x65, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x61,
+0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x61, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74,
+0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62,
+0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x72, 0x61, 0x67, 0x3b, 0x77, 0x61, 0x73, 0x3b,
+0x70, 0x16b, 0x6c, 0x3b, 0x73, 0x61, 0x6b, 0x3b, 0x7a, 0x61, 0x6c, 0x3b, 0x73, 0x12b, 0x6d, 0x3b, 0x6c, 0x12b, 0x70, 0x3b,
+0x64, 0x61, 0x67, 0x3b, 0x73, 0x69, 0x6c, 0x3b, 0x73, 0x70, 0x61, 0x3b, 0x6c, 0x61, 0x70, 0x3b, 0x73, 0x61, 0x6c, 0x3b,
+0x72, 0x61, 0x67, 0x73, 0x3b, 0x77, 0x61, 0x73, 0x73, 0x61, 0x72, 0x69, 0x6e, 0x73, 0x3b, 0x70, 0x16b, 0x6c, 0x69, 0x73,
+0x3b, 0x73, 0x61, 0x6b, 0x6b, 0x69, 0x73, 0x3b, 0x7a, 0x61, 0x6c, 0x6c, 0x61, 0x77, 0x73, 0x3b, 0x73, 0x12b, 0x6d, 0x65,
+0x6e, 0x69, 0x73, 0x3b, 0x6c, 0x12b, 0x70, 0x61, 0x3b, 0x64, 0x61, 0x67, 0x67, 0x69, 0x73, 0x3b, 0x73, 0x69, 0x6c, 0x6c,
+0x69, 0x6e, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x73, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x16b, 0x74,
+0x69, 0x73, 0x3b, 0x73, 0x61, 0x6c, 0x6c, 0x61, 0x77, 0x73, 0x3b, 0x52, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x5a,
+0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x75, 0x111, 0x69, 0x76, 0x3b,
+0x6b, 0x75, 0x6f, 0x76, 0xe2, 0x3b, 0x6e, 0x6a, 0x75, 0x68, 0x10d, 0xe2, 0x3b, 0x63, 0x75, 0xe1, 0x14b, 0x75, 0x69, 0x3b,
+0x76, 0x79, 0x65, 0x73, 0x69, 0x3b, 0x6b, 0x65, 0x73, 0x69, 0x3b, 0x73, 0x79, 0x65, 0x69, 0x6e, 0x69, 0x3b, 0x70, 0x6f,
+0x72, 0x67, 0x65, 0x3b, 0x10d, 0x6f, 0x68, 0x10d, 0xe2, 0x3b, 0x72, 0x6f, 0x6f, 0x76, 0x76, 0xe2, 0x64, 0x3b, 0x73, 0x6b,
+0x61, 0x6d, 0x6d, 0xe2, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0xe2, 0x3b, 0x75, 0x111, 0x111, 0xe2, 0x69, 0x76, 0x65, 0x6d,
+0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6b, 0x75, 0x6f, 0x76, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x68,
+0x10d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0xe1, 0x14b, 0x75, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b,
+0x76, 0x79, 0x65, 0x73, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6b, 0x65, 0x73, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75,
+0x3b, 0x73, 0x79, 0x65, 0x69, 0x6e, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x70, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1,
+0xe1, 0x6e, 0x75, 0x3b, 0x10d, 0x6f, 0x68, 0x10d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x72, 0x6f, 0x6f, 0x76, 0x76,
+0xe2, 0x64, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x73, 0x6b, 0x61, 0x6d, 0x6d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b,
+0x6a, 0x75, 0x6f, 0x76, 0x6c, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x55, 0x3b, 0x4b, 0x3b, 0x4e, 0x4a, 0x3b, 0x43,
+0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x50, 0x3b, 0x10c, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x62c, 0x627, 0x646,
+0x6a4, 0x6cc, 0x6d5, 0x3b, 0x641, 0x626, 0x6a4, 0x631, 0x6cc, 0x6d5, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x6a4, 0x631, 0x6cc,
+0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x659, 0x623, 0x646, 0x3b, 0x62c, 0x648, 0x659, 0x644, 0x627, 0x3b, 0x622, 0x6af,
+0x648, 0x633, 0x62a, 0x3b, 0x633, 0x626, 0x67e, 0x62a, 0x627, 0x645, 0x631, 0x3b, 0x626, 0x648, 0x6a9, 0x62a, 0x648, 0x6a4, 0x631, 0x3b,
+0x646, 0x648, 0x6a4, 0x627, 0x645, 0x631, 0x3b, 0x62f, 0x626, 0x633, 0x627, 0x645, 0x631, 0x3b, 0x45, 0x6e, 0x3b, 0x50, 0x65, 0x62,
+0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c,
+0x3b, 0x41, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b,
+0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x6f, 0x3b,
+0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6c,
+0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,
+0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69,
+0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b,
+0x48, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b
+};
+// GENERATED PART ENDS HERE
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/corelib/time/qromancalendar_p.h b/src/corelib/time/qromancalendar_p.h
new file mode 100644
index 0000000000..49efb3df89
--- /dev/null
+++ b/src/corelib/time/qromancalendar_p.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QROMAN_CALENDAR_P_H
+#define QROMAN_CALENDAR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of calendar implementations.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qcalendarbackend_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class Q_CORE_EXPORT QRomanCalendar : public QCalendarBackend
+{
+public:
+    // date queries:
+    int daysInMonth(int month, int year = QCalendar::Unspecified) const override;
+    int minimumDaysInMonth() const override;
+    // properties of the calendar
+    bool isLunar() const override;
+    bool isLuniSolar() const override;
+    bool isSolar() const override;
+protected:
+    // locale support:
+    const QCalendarLocale *localeMonthIndexData() const override;
+    const ushort *localeMonthData() const override;
+    // (The INTEGRITY compiler got upset at: using QCalendarBackend:QCalendarBackend;)
+    QRomanCalendar(const QString &name, QCalendar::System id = QCalendar::System::User)
+        : QCalendarBackend(name, id) {}
+};
+
+QT_END_NAMESPACE
+
+#endif // QROMAN_CALENDAR_P_H
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/time/qtimezone.cpp
index cbc6b50c98..ef323de14a 100644
--- a/src/corelib/tools/qtimezone.cpp
+++ b/src/corelib/time/qtimezone.cpp
@@ -317,7 +317,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz);
     Create a null/invalid time zone instance.
 */
 
-QTimeZone::QTimeZone() Q_DECL_NOTHROW
+QTimeZone::QTimeZone() noexcept
     : d(0)
 {
 }
diff --git a/src/corelib/tools/qtimezone.h b/src/corelib/time/qtimezone.h
index 29d8a4dbe5..62ecee49bb 100644
--- a/src/corelib/tools/qtimezone.h
+++ b/src/corelib/time/qtimezone.h
@@ -89,7 +89,7 @@ public:
     };
     typedef QVector<OffsetData> OffsetDataList;
 
-    QTimeZone() Q_DECL_NOTHROW;
+    QTimeZone() noexcept;
     explicit QTimeZone(const QByteArray &ianaId);
     explicit QTimeZone(int offsetSeconds);
     /*implicit*/ QTimeZone(const QByteArray &zoneId, int offsetSeconds, const QString &name,
@@ -99,11 +99,9 @@ public:
     ~QTimeZone();
 
     QTimeZone &operator=(const QTimeZone &other);
- #ifdef Q_COMPILER_RVALUE_REFS
-    QTimeZone &operator=(QTimeZone &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QTimeZone &operator=(QTimeZone &&other) noexcept { swap(other); return *this; }
 
-    void swap(QTimeZone &other) Q_DECL_NOTHROW
+    void swap(QTimeZone &other) noexcept
     { d.swap(other.d); }
 
     bool operator==(const QTimeZone &other) const;
diff --git a/src/corelib/tools/qtimezoneprivate.cpp b/src/corelib/time/qtimezoneprivate.cpp
index 569b343187..569b343187 100644
--- a/src/corelib/tools/qtimezoneprivate.cpp
+++ b/src/corelib/time/qtimezoneprivate.cpp
diff --git a/src/corelib/tools/qtimezoneprivate_android.cpp b/src/corelib/time/qtimezoneprivate_android.cpp
index be4f374fdd..be4f374fdd 100644
--- a/src/corelib/tools/qtimezoneprivate_android.cpp
+++ b/src/corelib/time/qtimezoneprivate_android.cpp
diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h
new file mode 100644
index 0000000000..40d6c972c2
--- /dev/null
+++ b/src/corelib/time/qtimezoneprivate_data_p.h
@@ -0,0 +1,1257 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 John Layt <jlayt@kde.org>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef QTIMEZONEPRIVATE_DATA_P_H
+#define QTIMEZONEPRIVATE_DATA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of internal files.  This header file may change from version to version
+// without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qglobal_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*
+    Windows Zone ID support, included in default base class build so can be used on all platforms,
+    e.g. an app running on Linux may need to communicate with a Windows Outlook server.  These
+    tables can also be used to look-up Region Codes and UTC Offsets on platforms that don't directly
+    support them., e.g. Mac does not support availableTimeZones() filtering by region or offset.
+
+    Another data table is provided for generic UTC+00:00 format time zones to be used as a
+    fall-back if no system time zones are available (QT_NO_SYSTEMLOCALE is set) or for QDateTimes
+    with a QT:Spec of OffsetFromUTC
+
+    These tables are automatically adapted from the CLDR supplemental/windowsZones.xml data file
+    using a script in qtbase/util/locale_database.  Please do not edit this data directly.  In the
+    future if ICU is made a hard dependency then the ICU resource can be used directly and this
+    table removed
+*/
+
+struct QZoneData {
+    quint16 windowsIdKey;      // Windows ID Key
+    quint16 country;           // Country of IANA ID's, AnyCountry means No Country
+    quint16 ianaIdIndex;      // All IANA ID's for the Windows ID and Country, space separated
+};
+
+struct QWindowsData {
+    quint16 windowsIdKey;      // Windows ID Key
+    quint16 windowsIdIndex;    // Windows ID Literal
+    quint16 ianaIdIndex;      // Default IANA ID for the Windows ID
+    qint32 offsetFromUtc;      // Standard Time Offset from UTC, used for quick look-ups
+};
+
+struct QUtcData {
+    quint16 ianaIdIndex;      // IANA ID's
+    qint32 offsetFromUtc;      // Offset form UTC is seconds
+};
+
+/*
+    COPYRIGHT AND PERMISSION NOTICE
+
+    Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+    the Terms of Use in http://www.unicode.org/copyright.html.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of the Unicode data files and any associated documentation (the "Data
+    Files") or Unicode software and any associated documentation (the "Software")
+    to deal in the Data Files or Software without restriction, including without
+    limitation the rights to use, copy, modify, merge, publish, distribute, and/or
+    sell copies of the Data Files or Software, and to permit persons to whom the
+    Data Files or Software are furnished to do so, provided that (a) the above
+    copyright notice(s) and this permission notice appear with all copies of the
+    Data Files or Software, (b) both the above copyright notice(s) and this
+    permission notice appear in associated documentation, and (c) there is clear
+    notice in each modified Data File or in the Software as well as in the
+    documentation associated with the Data File(s) or Software that the data or
+    software has been modified.
+*/
+
+// GENERATED PART STARTS HERE
+
+/*
+    This part of the file was generated on 2019-05-28 from the
+    Common Locale Data Repository v35.1 supplemental/windowsZones.xml file $Revision: 14742 $
+
+    http://www.unicode.org/cldr/
+
+    Do not edit this code: run cldr2qtimezone.py on updated (or
+    edited) CLDR data; see qtbase/util/locale_database/.
+*/
+
+// Windows ID Key, Country Enum, IANA ID Index
+static const QZoneData zoneDataTable[] = {
+    {    131,   143,     0 }, // W. Mongolia Standard Time / Mongolia
+    {    124,   112,    10 }, // UTC+12 / Kiribati
+    {     52,    94,    25 }, // Haiti Standard Time / Haiti
+    {     32,    44,    48 }, // China Standard Time / China
+    {     95,   244,    62 }, // SA Western Standard Time / Saint Barthelemy
+    {     25,   116,    84 }, // Central Asia Standard Time / Kyrgyzstan
+    {     36,     8,    97 }, // E. Africa Standard Time / Antarctica
+    {     33,   154,   114 }, // Chatham Islands Standard Time / New Zealand
+    {     95,   144,   130 }, // SA Western Standard Time / Montserrat
+    {     37,    13,   149 }, // E. Australia Standard Time / Australia
+    {     61,     0,   187 }, // Line Islands Standard Time / AnyCountry
+    {    132,   218,   198 }, // West Asia Standard Time / Turkmenistan
+    {    122,    30,   212 }, // UTC-02 / Brazil
+    {     24,    52,   228 }, // Central America Standard Time / Costa Rica
+    {     36,    67,   247 }, // E. Africa Standard Time / Eritrea
+    {    128,     8,   261 }, // W. Australia Standard Time / Antarctica
+    {    101,   101,   278 }, // SE Asia Standard Time / Indonesia
+    {     93,     8,   306 }, // SA Eastern Standard Time / Antarctica
+    {      4,   178,   325 }, // Altai Standard Time / Russia
+    {     95,   256,   338 }, // SA Western Standard Time / Sint Maarten
+    {     95,    60,   360 }, // SA Western Standard Time / Dominica
+    {    134,   167,   377 }, // West Pacific Standard Time / Papua New Guinea
+    {     13,    13,   398 }, // AUS Eastern Standard Time / Australia
+    {     69,   236,   435 }, // Morocco Standard Time / Western Sahara
+    {     39,    30,   451 }, // E. South America Standard Time / Brazil
+    {    124,   134,   469 }, // UTC+12 / Marshall Islands
+    {    125,   112,   502 }, // UTC+13 / Kiribati
+    {    103,   146,   520 }, // South Africa Standard Time / Mozambique
+    {     94,    30,   534 }, // SA Pacific Standard Time / Brazil
+    {     88,    74,   570 }, // Romance Standard Time / France
+    {     71,    38,   583 }, // Mountain Standard Time / Canada
+    {     72,   147,   657 }, // Myanmar Standard Time / Myanmar
+    {     26,    30,   670 }, // Central Brazilian Standard Time / Brazil
+    {    130,   123,   706 }, // W. Europe Standard Time / Liechtenstein
+    {     46,    73,   719 }, // FLE Standard Time / Finland
+    {     93,    70,   735 }, // SA Eastern Standard Time / Falkland Islands
+    {     78,   159,   752 }, // Norfolk Standard Time / Norfolk Island
+    {     53,     0,   768 }, // Hawaiian Standard Time / AnyCountry
+    {     28,    54,   779 }, // Central European Standard Time / Croatia
+    {     75,   150,   793 }, // Nepal Standard Time / Nepal
+    {     46,    33,   807 }, // FLE Standard Time / Bulgaria
+    {      6,   162,   820 }, // Arabian Standard Time / Oman
+    {    132,   131,   832 }, // West Asia Standard Time / Maldives
+    {     88,   197,   848 }, // Romance Standard Time / Spain
+    {     50,    91,   875 }, // Greenwich Standard Time / Guinea
+    {      5,   237,   890 }, // Arab Standard Time / Yemen
+    {     92,   222,   900 }, // Russian Standard Time / Ukraine
+    {    103,   204,   918 }, // South Africa Standard Time / Swaziland
+    {    130,   203,   933 }, // W. Europe Standard Time / Svalbard And Jan Mayen Islands
+    {      7,   103,   953 }, // Arabic Standard Time / Iraq
+    {    119,   226,   966 }, // UTC-11 / United States Minor Outlying Islands
+    {      5,   115,   981 }, // Arab Standard Time / Kuwait
+    {     50,   189,   993 }, // Greenwich Standard Time / Sierra Leone
+    {     31,     0,  1009 }, // Central Standard Time / AnyCountry
+    {     53,    51,  1017 }, // Hawaiian Standard Time / Cook Islands
+    {    129,    50,  1035 }, // W. Central Africa Standard Time / Congo Brazzaville
+    {     64,    43,  1054 }, // Magallanes Standard Time / Chile
+    {    119,     0,  1075 }, // UTC-11 / AnyCountry
+    {     84,    38,  1086 }, // Pacific Standard Time / Canada
+    {     22,    11,  1138 }, // Caucasus Standard Time / Armenia
+    {    130,   142,  1151 }, // W. Europe Standard Time / Monaco
+    {    103,   239,  1165 }, // South Africa Standard Time / Zambia
+    {     46,   222,  1179 }, // FLE Standard Time / Ukraine
+    {     87,   168,  1225 }, // Paraguay Standard Time / Paraguay
+    {     57,   109,  1242 }, // Jordan Standard Time / Jordan
+    {    109,    30,  1253 }, // Tocantins Standard Time / Brazil
+    {     55,   102,  1271 }, // Iran Standard Time / Iran
+    {    101,     8,  1283 }, // SE Asia Standard Time / Antarctica
+    {     27,    57,  1300 }, // Central Europe Standard Time / Czech Republic
+    {     95,   215,  1314 }, // SA Western Standard Time / Trinidad And Tobago
+    {    103,    28,  1336 }, // South Africa Standard Time / Botswana
+    {    132,     0,  1352 }, // West Asia Standard Time / AnyCountry
+    {     94,    63,  1362 }, // SA Pacific Standard Time / Ecuador
+    {     51,    85,  1380 }, // GTB Standard Time / Greece
+    {     36,   128,  1394 }, // E. Africa Standard Time / Madagascar
+    {     53,   226,  1414 }, // Hawaiian Standard Time / United States Minor Outlying Islands
+    {     94,   107,  1431 }, // SA Pacific Standard Time / Jamaica
+    {    104,   198,  1447 }, // Sri Lanka Standard Time / Sri Lanka
+    {     27,   243,  1460 }, // Central Europe Standard Time / Serbia
+    {     25,   110,  1476 }, // Central Asia Standard Time / Kazakhstan
+    {    125,     0,  1502 }, // UTC+13 / AnyCountry
+    {     94,    38,  1513 }, // SA Pacific Standard Time / Canada
+    {     25,    31,  1535 }, // Central Asia Standard Time / British Indian Ocean Territory
+    {    108,    13,  1549 }, // Tasmania Standard Time / Australia
+    {     95,   174,  1583 }, // SA Western Standard Time / Puerto Rico
+    {     95,   180,  1603 }, // SA Western Standard Time / Saint Kitts And Nevis
+    {    130,   206,  1620 }, // W. Europe Standard Time / Switzerland
+    {    117,   225,  1634 }, // US Eastern Standard Time / United States
+    {     29,   140,  1701 }, // Central Pacific Standard Time / Micronesia
+    {    120,    77,  1731 }, // UTC-09 / French Polynesia
+    {    129,   156,  1747 }, // W. Central Africa Standard Time / Niger
+    {    118,   139,  1761 }, // US Mountain Standard Time / Mexico
+    {     36,   194,  1780 }, // E. Africa Standard Time / Somalia
+    {    118,     0,  1797 }, // US Mountain Standard Time / AnyCountry
+    {     10,    24,  1807 }, // Atlantic Standard Time / Bermuda
+    {    103,   240,  1824 }, // South Africa Standard Time / Zimbabwe
+    {     32,   126,  1838 }, // China Standard Time / Macau
+    {    129,    66,  1849 }, // W. Central Africa Standard Time / Equatorial Guinea
+    {     66,   137,  1863 }, // Mauritius Standard Time / Mauritius
+    {     46,    68,  1880 }, // FLE Standard Time / Estonia
+    {     50,   187,  1895 }, // Greenwich Standard Time / Senegal
+    {    132,   110,  1908 }, // West Asia Standard Time / Kazakhstan
+    {     25,    44,  1968 }, // Central Asia Standard Time / China
+    {    130,   106,  1980 }, // W. Europe Standard Time / Italy
+    {     48,   251,  1992 }, // GMT Standard Time / Isle Of Man
+    {     36,   210,  2011 }, // E. Africa Standard Time / Tanzania
+    {     10,    86,  2032 }, // Atlantic Standard Time / Greenland
+    {    123,    86,  2046 }, // UTC / Greenland
+    {     20,    38,  2067 }, // Canada Central Standard Time / Canada
+    {     15,    86,  2104 }, // Azores Standard Time / Greenland
+    {     69,   145,  2125 }, // Morocco Standard Time / Morocco
+    {    115,   219,  2143 }, // Turks And Caicos Standard Time / Turks And Caicos Islands
+    {     50,    80,  2162 }, // Greenwich Standard Time / Gambia
+    {    129,    42,  2176 }, // W. Central Africa Standard Time / Chad
+    {     56,   105,  2192 }, // Israel Standard Time / Israel
+    {     64,     8,  2207 }, // Magallanes Standard Time / Antarctica
+    {     12,    13,  2225 }, // Aus Central W. Standard Time / Australia
+    {     24,   155,  2241 }, // Central America Standard Time / Nicaragua
+    {    102,   170,  2257 }, // Singapore Standard Time / Philippines
+    {    134,   160,  2269 }, // West Pacific Standard Time / Northern Mariana Islands
+    {     43,    64,  2284 }, // Egypt Standard Time / Egypt
+    {     88,    21,  2297 }, // Romance Standard Time / Belgium
+    {     76,     8,  2313 }, // New Zealand Standard Time / Antarctica
+    {     51,   177,  2332 }, // GTB Standard Time / Romania
+    {    103,     0,  2349 }, // South Africa Standard Time / AnyCountry
+    {     41,   225,  2359 }, // Eastern Standard Time / United States
+    {    129,    23,  2516 }, // W. Central Africa Standard Time / Benin
+    {     79,   178,  2534 }, // North Asia East Standard Time / Russia
+    {    116,   143,  2547 }, // Ulaanbaatar Standard Time / Mongolia
+    {    130,    14,  2580 }, // W. Europe Standard Time / Austria
+    {     41,    38,  2594 }, // Eastern Standard Time / Canada
+    {     95,   255,  2699 }, // SA Western Standard Time / Bonaire
+    {    124,   149,  2718 }, // UTC+12 / Nauru
+    {    134,     8,  2732 }, // West Pacific Standard Time / Antarctica
+    {     63,   178,  2758 }, // Magadan Standard Time / Russia
+    {    130,   161,  2771 }, // W. Europe Standard Time / Norway
+    {    110,     0,  2783 }, // Tokyo Standard Time / AnyCountry
+    {     24,    63,  2793 }, // Central America Standard Time / Ecuador
+    {    103,    35,  2811 }, // South Africa Standard Time / Burundi
+    {     10,    38,  2828 }, // Atlantic Standard Time / Canada
+    {     29,     0,  2896 }, // Central Pacific Standard Time / AnyCountry
+    {     95,    87,  2907 }, // SA Western Standard Time / Grenada
+    {     29,   153,  2923 }, // Central Pacific Standard Time / New Caledonia
+    {     42,   139,  2938 }, // Eastern Standard Time (Mexico) / Mexico
+    {      2,   225,  2953 }, // Alaskan Standard Time / United States
+    {     49,    86,  3029 }, // Greenland Standard Time / Greenland
+    {     50,    92,  3045 }, // Greenwich Standard Time / Guinea Bissau
+    {    130,   184,  3059 }, // W. Europe Standard Time / San Marino
+    {     27,    98,  3077 }, // Central Europe Standard Time / Hungary
+    {     24,    96,  3093 }, // Central America Standard Time / Honduras
+    {     62,    13,  3113 }, // Lord Howe Standard Time / Australia
+    {     36,     0,  3133 }, // E. Africa Standard Time / AnyCountry
+    {    129,    79,  3143 }, // W. Central Africa Standard Time / Gabon
+    {     95,   182,  3161 }, // SA Western Standard Time / Saint Vincent And The Grenadines
+    {     48,   224,  3180 }, // GMT Standard Time / United Kingdom
+    {     68,   227,  3194 }, // Montevideo Standard Time / Uruguay
+    {    124,     0,  3213 }, // UTC+12 / AnyCountry
+    {    130,   230,  3224 }, // W. Europe Standard Time / Vatican City State
+    {     50,    99,  3239 }, // Greenwich Standard Time / Iceland
+    {     34,    55,  3258 }, // Cuba Standard Time / Cuba
+    {     41,    16,  3273 }, // Eastern Standard Time / Bahamas
+    {    122,   196,  3288 }, // UTC-02 / South Georgia And The South Sandwich Islands
+    {     24,    65,  3311 }, // Central America Standard Time / El Salvador
+    {     31,   225,  3331 }, // Central Standard Time / United States
+    {     95,     0,  3499 }, // SA Western Standard Time / AnyCountry
+    {     94,   166,  3509 }, // SA Pacific Standard Time / Panama
+    {     94,    47,  3524 }, // SA Pacific Standard Time / Colombia
+    {     70,   139,  3539 }, // Mountain Standard Time (Mexico) / Mexico
+    {    124,   220,  3574 }, // UTC+12 / Tuvalu
+    {    130,    84,  3591 }, // W. Europe Standard Time / Gibraltar
+    {     82,   178,  3608 }, // Omsk Standard Time / Russia
+    {     60,   122,  3618 }, // Libya Standard Time / Libya
+    {     25,     8,  3633 }, // Central Asia Standard Time / Antarctica
+    {     95,    12,  3651 }, // SA Western Standard Time / Aruba
+    {     67,   119,  3665 }, // Middle East Standard Time / Lebanon
+    {    102,     0,  3677 }, // Singapore Standard Time / AnyCountry
+    {     74,   148,  3687 }, // Namibia Standard Time / Namibia
+    {    126,   231,  3703 }, // Venezuela Standard Time / Venezuela
+    {     95,   234,  3719 }, // SA Western Standard Time / United States Virgin Islands
+    {     21,     0,  3737 }, // Cape Verde Standard Time / AnyCountry
+    {     95,     9,  3747 }, // SA Western Standard Time / Antigua And Barbuda
+    {     94,   169,  3763 }, // SA Pacific Standard Time / Peru
+    {     46,   248,  3776 }, // FLE Standard Time / Aland Islands
+    {     50,   199,  3793 }, // Greenwich Standard Time / Saint Helena
+    {    134,   140,  3812 }, // West Pacific Standard Time / Micronesia
+    {    102,   190,  3825 }, // Singapore Standard Time / Singapore
+    {     95,    61,  3840 }, // SA Western Standard Time / Dominican Republic
+    {    103,   129,  3862 }, // South Africa Standard Time / Malawi
+    {     30,   139,  3878 }, // Central Standard Time (Mexico) / Mexico
+    {    102,   130,  3954 }, // Singapore Standard Time / Malaysia
+    {     45,    72,  3985 }, // Fiji Standard Time / Fiji
+    {    118,   225,  3998 }, // US Mountain Standard Time / United States
+    {     17,    25,  4014 }, // Bangladesh Standard Time / Bhutan
+    {    130,   133,  4027 }, // W. Europe Standard Time / Malta
+    {     92,   178,  4040 }, // Russian Standard Time / Russia
+    {     95,   135,  4084 }, // SA Western Standard Time / Martinique
+    {     35,     0,  4103 }, // Dateline Standard Time / AnyCountry
+    {    135,   178,  4114 }, // Yakutsk Standard Time / Russia
+    {      1,     1,  4141 }, // Afghanistan Standard Time / Afghanistan
+    {    123,     0,  4152 }, // UTC / AnyCountry
+    {     31,   139,  4168 }, // Central Standard Time / Mexico
+    {      6,     0,  4186 }, // Arabian Standard Time / AnyCountry
+    {    101,    45,  4196 }, // SE Asia Standard Time / Christmas Island
+    {     15,   173,  4213 }, // Azores Standard Time / Portugal
+    {    129,     0,  4229 }, // W. Central Africa Standard Time / AnyCountry
+    {     17,    18,  4239 }, // Bangladesh Standard Time / Bangladesh
+    {     31,    38,  4250 }, // Central Standard Time / Canada
+    {     94,     0,  4325 }, // SA Pacific Standard Time / AnyCountry
+    {    125,   213,  4335 }, // UTC+13 / Tokelau
+    {     73,   178,  4351 }, // N. Central Asia Standard Time / Russia
+    {    133,   165,  4368 }, // West Bank Standard Time / Palestinian Territories
+    {    114,   217,  4390 }, // Turkey Standard Time / Turkey
+    {      3,   225,  4406 }, // Aleutian Standard Time / United States
+    {    101,     0,  4419 }, // SE Asia Standard Time / AnyCountry
+    {     71,   225,  4429 }, // Mountain Standard Time / United States
+    {     36,    69,  4458 }, // E. Africa Standard Time / Ethiopia
+    {    130,   151,  4477 }, // W. Europe Standard Time / Netherlands
+    {     95,   245,  4494 }, // SA Western Standard Time / Saint Martin
+    {     48,   173,  4510 }, // GMT Standard Time / Portugal
+    {     46,   124,  4541 }, // FLE Standard Time / Lithuania
+    {    130,    82,  4556 }, // W. Europe Standard Time / Germany
+    {     65,    77,  4586 }, // Marquesas Standard Time / French Polynesia
+    {     80,   178,  4604 }, // North Asia Standard Time / Russia
+    {     61,   112,  4639 }, // Line Islands Standard Time / Kiribati
+    {     96,   200,  4658 }, // Saint Pierre Standard Time / Saint Pierre And Miquelon
+    {     48,   104,  4675 }, // GMT Standard Time / Ireland
+    {      5,   186,  4689 }, // Arab Standard Time / Saudi Arabia
+    {     83,    43,  4701 }, // Pacific SA Standard Time / Chile
+    {     91,   178,  4718 }, // Russia Time Zone 11 / Russia
+    {     36,    48,  4745 }, // E. Africa Standard Time / Comoros
+    {     95,   152,  4759 }, // SA Western Standard Time / Cura Sao
+    {     38,   141,  4775 }, // E. Europe Standard Time / Moldova
+    {     24,    22,  4791 }, // Central America Standard Time / Belize
+    {    103,   195,  4806 }, // South Africa Standard Time / South Africa
+    {    127,   178,  4826 }, // Vladivostok Standard Time / Russia
+    {    122,     0,  4857 }, // UTC-02 / AnyCountry
+    {    106,   207,  4867 }, // Syria Standard Time / Syria
+    {     93,    76,  4881 }, // SA Eastern Standard Time / French Guiana
+    {     50,   136,  4897 }, // Greenwich Standard Time / Mauritania
+    {     41,     0,  4915 }, // Eastern Standard Time / AnyCountry
+    {     16,    30,  4923 }, // Bahia Standard Time / Brazil
+    {     40,    43,  4937 }, // Easter Island Standard Time / Chile
+    {     93,     0,  4952 }, // SA Eastern Standard Time / AnyCountry
+    {      9,   178,  4962 }, // Astrakhan Standard Time / Russia
+    {     95,    30,  4996 }, // SA Western Standard Time / Brazil
+    {     18,    20,  5049 }, // Belarus Standard Time / Belarus
+    {     95,   181,  5062 }, // SA Western Standard Time / Saint Lucia
+    {    129,     6,  5079 }, // W. Central Africa Standard Time / Angola
+    {    129,   157,  5093 }, // W. Central Africa Standard Time / Nigeria
+    {    130,     5,  5106 }, // W. Europe Standard Time / Andorra
+    {     58,   178,  5121 }, // Kaliningrad Standard Time / Russia
+    {     71,     0,  5140 }, // Mountain Standard Time / AnyCountry
+    {     95,     7,  5148 }, // SA Western Standard Time / Anguilla
+    {    124,   235,  5165 }, // UTC+12 / Wallis And Futuna Islands
+    {      6,   223,  5180 }, // Arabian Standard Time / United Arab Emirates
+    {     94,    40,  5191 }, // SA Pacific Standard Time / Cayman Islands
+    {    101,   211,  5206 }, // SE Asia Standard Time / Thailand
+    {     29,   193,  5219 }, // Central Pacific Standard Time / Solomon Islands
+    {     47,    81,  5239 }, // Georgian Standard Time / Georgia
+    {    101,    36,  5252 }, // SE Asia Standard Time / Cambodia
+    {    132,   228,  5268 }, // West Asia Standard Time / Uzbekistan
+    {     51,    56,  5297 }, // GTB Standard Time / Cyprus
+    {     95,    88,  5325 }, // SA Western Standard Time / Guadeloupe
+    {    101,   232,  5344 }, // SE Asia Standard Time / Vietnam
+    {    113,   178,  5356 }, // Transbaikal Standard Time / Russia
+    {     50,   121,  5367 }, // Greenwich Standard Time / Liberia
+    {     95,   233,  5383 }, // SA Western Standard Time / British Virgin Islands
+    {    129,    49,  5399 }, // W. Central Africa Standard Time / Congo Kinshasa
+    {     97,   178,  5415 }, // Sakhalin Standard Time / Russia
+    {    124,   226,  5429 }, // UTC+12 / United States Minor Outlying Islands
+    {     50,    83,  5442 }, // Greenwich Standard Time / Ghana
+    {     76,   154,  5455 }, // New Zealand Standard Time / New Zealand
+    {     23,    13,  5472 }, // Cen. Australia Standard Time / Australia
+    {     53,    77,  5513 }, // Hawaiian Standard Time / French Polynesia
+    {     50,    34,  5528 }, // Greenwich Standard Time / Burkina Faso
+    {    132,    78,  5547 }, // West Asia Standard Time / French Southern Territories
+    {    121,     0,  5564 }, // UTC-08 / AnyCountry
+    {     27,     2,  5574 }, // Central Europe Standard Time / Albania
+    {    107,   208,  5588 }, // Taipei Standard Time / Taiwan
+    {     88,    58,  5600 }, // Romance Standard Time / Denmark
+    {     36,   221,  5618 }, // E. Africa Standard Time / Uganda
+    {     95,    19,  5633 }, // SA Western Standard Time / Barbados
+    {     14,    15,  5650 }, // Azerbaijan Standard Time / Azerbaijan
+    {     32,    97,  5660 }, // China Standard Time / Hong Kong
+    {    110,   101,  5675 }, // Tokyo Standard Time / Indonesia
+    {     53,   225,  5689 }, // Hawaiian Standard Time / United States
+    {     36,   111,  5706 }, // E. Africa Standard Time / Kenya
+    {    134,    89,  5721 }, // West Pacific Standard Time / Guam
+    {     36,   254,  5734 }, // E. Africa Standard Time / South Sudan
+    {     48,    71,  5746 }, // GMT Standard Time / Faroe Islands
+    {     90,   178,  5762 }, // Russia Time Zone 10 / Russia
+    {    119,   158,  5781 }, // UTC-11 / Niue
+    {    129,     3,  5794 }, // W. Central Africa Standard Time / Algeria
+    {    110,    62,  5809 }, // Tokyo Standard Time / East Timor
+    {     93,    30,  5819 }, // SA Eastern Standard Time / Brazil
+    {     27,   242,  5898 }, // Central Europe Standard Time / Montenegro
+    {    129,    37,  5915 }, // W. Central Africa Standard Time / Cameroon
+    {    101,   117,  5929 }, // SE Asia Standard Time / Laos
+    {     85,   139,  5944 }, // Pacific Standard Time (Mexico) / Mexico
+    {     50,   212,  5981 }, // Greenwich Standard Time / Togo
+    {     46,   118,  5993 }, // FLE Standard Time / Latvia
+    {     95,    38,  6005 }, // SA Western Standard Time / Canada
+    {    132,   209,  6026 }, // West Asia Standard Time / Tajikistan
+    {     77,    38,  6040 }, // Newfoundland Standard Time / Canada
+    {    110,   108,  6057 }, // Tokyo Standard Time / Japan
+    {     25,     0,  6068 }, // Central Asia Standard Time / AnyCountry
+    {     28,    27,  6078 }, // Central European Standard Time / Bosnia And Herzegowina
+    {     27,   191,  6094 }, // Central Europe Standard Time / Slovakia
+    {     95,    93,  6112 }, // SA Western Standard Time / Guyana
+    {     48,   197,  6127 }, // GMT Standard Time / Spain
+    {     19,   167,  6143 }, // Bougainville Standard Time / Papua New Guinea
+    {      5,    17,  6164 }, // Arab Standard Time / Bahrain
+    {     24,    90,  6177 }, // Central America Standard Time / Guatemala
+    {     95,    26,  6195 }, // SA Western Standard Time / Bolivia
+    {     81,   113,  6210 }, // North Korea Standard Time / North Korea
+    {    119,     4,  6225 }, // UTC-11 / American Samoa
+    {     66,   176,  6243 }, // Mauritius Standard Time / Reunion
+    {    103,   120,  6258 }, // South Africa Standard Time / Lesotho
+    {     84,     0,  6272 }, // Pacific Standard Time / AnyCountry
+    {    120,     0,  6280 }, // UTC-09 / AnyCountry
+    {    129,   216,  6290 }, // W. Central Africa Standard Time / Tunisia
+    {     99,   185,  6303 }, // Sao Tome Standard Time / Sao Tome And Principe
+    {    100,   178,  6319 }, // Saratov Standard Time / Russia
+    {    105,   201,  6334 }, // Sudan Standard Time / Sudan
+    {     48,   252,  6350 }, // GMT Standard Time / Jersey
+    {     29,    13,  6364 }, // Central Pacific Standard Time / Australia
+    {     71,   139,  6385 }, // Mountain Standard Time / Mexico
+    {     21,    39,  6401 }, // Cape Verde Standard Time / Cape Verde
+    {    102,   101,  6421 }, // Singapore Standard Time / Indonesia
+    {     27,   192,  6435 }, // Central Europe Standard Time / Slovenia
+    {     48,    75,  6452 }, // GMT Standard Time / Guernsey
+    {    132,     8,  6468 }, // West Asia Standard Time / Antarctica
+    {      8,    10,  6486 }, // Argentina Standard Time / Argentina
+    {     98,   183,  6759 }, // Samoa Standard Time / Samoa
+    {    129,    41,  6772 }, // W. Central Africa Standard Time / Central African Republic
+    {    111,   178,  6786 }, // Tomsk Standard Time / Russia
+    {    110,   164,  6797 }, // Tokyo Standard Time / Palau
+    {     11,    13,  6811 }, // AUS Central Standard Time / Australia
+    {    121,   171,  6828 }, // UTC-08 / Pitcairn
+    {    102,    32,  6845 }, // Singapore Standard Time / Brunei
+    {    112,   214,  6857 }, // Tonga Standard Time / Tonga
+    {     89,   178,  6875 }, // Russia Time Zone 3 / Russia
+    {    128,    13,  6889 }, // W. Australia Standard Time / Australia
+    {     28,   172,  6905 }, // Central European Standard Time / Poland
+    {     72,    46,  6919 }, // Myanmar Standard Time / Cocos Islands
+    {     66,   188,  6932 }, // Mauritius Standard Time / Seychelles
+    {     84,   225,  6944 }, // Pacific Standard Time / United States
+    {     54,   100,  6983 }, // India Standard Time / India
+    {     50,    53,  6997 }, // Greenwich Standard Time / Ivory Coast
+    {     24,     0,  7012 }, // Central America Standard Time / AnyCountry
+    {     29,   229,  7022 }, // Central Pacific Standard Time / Vanuatu
+    {    130,   125,  7036 }, // W. Europe Standard Time / Luxembourg
+    {     50,   132,  7054 }, // Greenwich Standard Time / Mali
+    {    103,   179,  7068 }, // South Africa Standard Time / Rwanda
+    {      5,   175,  7082 }, // Arab Standard Time / Qatar
+    {     86,   163,  7093 }, // Pakistan Standard Time / Pakistan
+    {    134,     0,  7106 }, // West Pacific Standard Time / AnyCountry
+    {     36,    59,  7117 }, // E. Africa Standard Time / Djibouti
+    {     44,   178,  7133 }, // Ekaterinburg Standard Time / Russia
+    {    118,    38,  7152 }, // US Mountain Standard Time / Canada
+    {     36,   138,  7209 }, // E. Africa Standard Time / Mayotte
+    {     28,   127,  7224 }, // Central European Standard Time / Macedonia
+    {     59,   114,  7238 }, // Korea Standard Time / South Korea
+    {     93,   202,  7249 }, // SA Eastern Standard Time / Suriname
+    {    130,   205,  7268 }, // W. Europe Standard Time / Sweden
+    {    103,    49,  7285 }, // South Africa Standard Time / Congo Kinshasa
+    {      0,     0,     0 } // Trailing zeroes
+};
+
+// Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset
+static const QWindowsData windowsDataTable[] = {
+    {      1,     0,  4141, 16200 }, // Afghanistan Standard Time
+    {      2,    26,  7303,-32400 }, // Alaskan Standard Time
+    {      3,    48,  4406,-36000 }, // Aleutian Standard Time
+    {      4,    71,   325, 25200 }, // Altai Standard Time
+    {      5,    91,  4689, 10800 }, // Arab Standard Time
+    {      6,   110,  5180, 14400 }, // Arabian Standard Time
+    {      7,   132,   953, 10800 }, // Arabic Standard Time
+    {      8,   153,  7321,-10800 }, // Argentina Standard Time
+    {      9,   177,  7342, 14400 }, // Astrakhan Standard Time
+    {     10,   201,  7359,-14400 }, // Atlantic Standard Time
+    {     11,   224,  6811, 34200 }, // AUS Central Standard Time
+    {     12,   250,  2225, 31500 }, // Aus Central W. Standard Time
+    {     13,   279,  7375, 36000 }, // AUS Eastern Standard Time
+    {     14,   305,  5650, 14400 }, // Azerbaijan Standard Time
+    {     15,   330,  4213, -3600 }, // Azores Standard Time
+    {     16,   351,  4923,-10800 }, // Bahia Standard Time
+    {     17,   371,  4239, 21600 }, // Bangladesh Standard Time
+    {     18,   396,  5049, 10800 }, // Belarus Standard Time
+    {     19,   418,  6143, 39600 }, // Bougainville Standard Time
+    {     20,   445,  7392,-21600 }, // Canada Central Standard Time
+    {     21,   474,  6401, -3600 }, // Cape Verde Standard Time
+    {     22,   499,  1138, 14400 }, // Caucasus Standard Time
+    {     23,   522,  7407, 34200 }, // Cen. Australia Standard Time
+    {     24,   551,  6177,-21600 }, // Central America Standard Time
+    {     25,   581,  7426, 21600 }, // Central Asia Standard Time
+    {     26,   608,  7438,-14400 }, // Central Brazilian Standard Time
+    {     27,   640,  3077,  3600 }, // Central Europe Standard Time
+    {     28,   669,  6905,  3600 }, // Central European Standard Time
+    {     29,   700,  5219, 39600 }, // Central Pacific Standard Time
+    {     30,   730,  7453,-21600 }, // Central Standard Time (Mexico)
+    {     31,   761,  7473,-21600 }, // Central Standard Time
+    {     32,   783,    48, 28800 }, // China Standard Time
+    {     33,   803,   114, 45900 }, // Chatham Islands Standard Time
+    {     34,   833,  3258,-18000 }, // Cuba Standard Time
+    {     35,   852,  4103,-43200 }, // Dateline Standard Time
+    {     36,   875,  5706, 10800 }, // E. Africa Standard Time
+    {     37,   899,  7489, 36000 }, // E. Australia Standard Time
+    {     38,   926,  4775,  7200 }, // E. Europe Standard Time
+    {     39,   950,   451,-10800 }, // E. South America Standard Time
+    {     40,   981,  4937,-21600 }, // Easter Island Standard Time
+    {     41,  1009,  7508,-18000 }, // Eastern Standard Time
+    {     42,  1031,  2938,-18000 }, // Eastern Standard Time (Mexico)
+    {     43,  1062,  2284,  7200 }, // Egypt Standard Time
+    {     44,  1082,  7133, 18000 }, // Ekaterinburg Standard Time
+    {     45,  1109,  3985, 43200 }, // Fiji Standard Time
+    {     46,  1128,  7525,  7200 }, // FLE Standard Time
+    {     47,  1146,  5239, 14400 }, // Georgian Standard Time
+    {     48,  1169,  3180,     0 }, // GMT Standard Time
+    {     49,  1187,  3029,-10800 }, // Greenland Standard Time
+    {     50,  1211,  3239,     0 }, // Greenwich Standard Time
+    {     51,  1235,  2332,  7200 }, // GTB Standard Time
+    {     52,  1253,    25,-18000 }, // Haiti Standard Time
+    {     53,  1273,  5689,-36000 }, // Hawaiian Standard Time
+    {     54,  1296,  6983, 19800 }, // India Standard Time
+    {     55,  1316,  1271, 12600 }, // Iran Standard Time
+    {     56,  1335,  2192,  7200 }, // Israel Standard Time
+    {     57,  1356,  1242,  7200 }, // Jordan Standard Time
+    {     58,  1377,  5121,  7200 }, // Kaliningrad Standard Time
+    {     59,  1403,  7238, 32400 }, // Korea Standard Time
+    {     60,  1423,  3618,  7200 }, // Libya Standard Time
+    {     61,  1443,  4639, 50400 }, // Line Islands Standard Time
+    {     62,  1470,  3113, 37800 }, // Lord Howe Standard Time
+    {     63,  1494,  2758, 36000 }, // Magadan Standard Time
+    {     64,  1516,  1054,-10800 }, // Magallanes Standard Time
+    {     65,  1541,  4586,-34200 }, // Marquesas Standard Time
+    {     66,  1565,  1863, 14400 }, // Mauritius Standard Time
+    {     67,  1589,  3665,  7200 }, // Middle East Standard Time
+    {     68,  1615,  3194,-10800 }, // Montevideo Standard Time
+    {     69,  1640,  2125,     0 }, // Morocco Standard Time
+    {     70,  1662,  7537,-25200 }, // Mountain Standard Time (Mexico)
+    {     71,  1694,  7555,-25200 }, // Mountain Standard Time
+    {     72,  1717,   657, 23400 }, // Myanmar Standard Time
+    {     73,  1739,  4351, 21600 }, // N. Central Asia Standard Time
+    {     74,  1769,  3687,  3600 }, // Namibia Standard Time
+    {     75,  1791,   793, 20700 }, // Nepal Standard Time
+    {     76,  1811,  5455, 43200 }, // New Zealand Standard Time
+    {     77,  1837,  6040,-12600 }, // Newfoundland Standard Time
+    {     78,  1864,   752, 39600 }, // Norfolk Standard Time
+    {     79,  1886,  2534, 28800 }, // North Asia East Standard Time
+    {     80,  1916,  7570, 25200 }, // North Asia Standard Time
+    {     81,  1941,  6210, 30600 }, // North Korea Standard Time
+    {     82,  1967,  3608, 21600 }, // Omsk Standard Time
+    {     83,  1986,  4701,-10800 }, // Pacific SA Standard Time
+    {     84,  2011,  7587,-28800 }, // Pacific Standard Time
+    {     85,  2033,  7607,-28800 }, // Pacific Standard Time (Mexico)
+    {     86,  2064,  7093, 18000 }, // Pakistan Standard Time
+    {     87,  2087,  1225,-14400 }, // Paraguay Standard Time
+    {     88,  2110,   570,  3600 }, // Romance Standard Time
+    {     89,  2132,  6875, 14400 }, // Russia Time Zone 3
+    {     90,  2151,  5762, 39600 }, // Russia Time Zone 10
+    {     91,  2171,  7623, 43200 }, // Russia Time Zone 11
+    {     92,  2191,  7638, 10800 }, // Russian Standard Time
+    {     93,  2213,  4881,-10800 }, // SA Eastern Standard Time
+    {     94,  2238,  3524,-18000 }, // SA Pacific Standard Time
+    {     95,  2263,  6195,-14400 }, // SA Western Standard Time
+    {     96,  2288,  4658,-10800 }, // Saint Pierre Standard Time
+    {     97,  2315,  5415, 39600 }, // Sakhalin Standard Time
+    {     98,  2338,  6759, 46800 }, // Samoa Standard Time
+    {     99,  2358,  6303,     0 }, // Sao Tome Standard Time
+    {    100,  2381,  6319, 14400 }, // Saratov Standard Time
+    {    101,  2403,  5206, 25200 }, // SE Asia Standard Time
+    {    102,  2425,  3825, 28800 }, // Singapore Standard Time
+    {    103,  2449,  4806,  7200 }, // South Africa Standard Time
+    {    104,  2476,  1447, 19800 }, // Sri Lanka Standard Time
+    {    105,  2500,  6334,  7200 }, // Sudan Standard Time
+    {    106,  2520,  4867,  7200 }, // Syria Standard Time
+    {    107,  2540,  5588, 28800 }, // Taipei Standard Time
+    {    108,  2561,  7652, 36000 }, // Tasmania Standard Time
+    {    109,  2584,  1253,-10800 }, // Tocantins Standard Time
+    {    110,  2608,  6057, 32400 }, // Tokyo Standard Time
+    {    111,  2628,  6786, 25200 }, // Tomsk Standard Time
+    {    112,  2648,  6857, 46800 }, // Tonga Standard Time
+    {    113,  2668,  5356, 32400 }, // Transbaikal Standard Time
+    {    114,  2694,  4390,  7200 }, // Turkey Standard Time
+    {    115,  2715,  2143,-14400 }, // Turks And Caicos Standard Time
+    {    116,  2746,  7669, 28800 }, // Ulaanbaatar Standard Time
+    {    117,  2772,  7686,-18000 }, // US Eastern Standard Time
+    {    118,  2797,  3998,-25200 }, // US Mountain Standard Time
+    {    119,  2823,  1075,-39600 }, // UTC-11
+    {    120,  2830,  6280,-32400 }, // UTC-09
+    {    121,  2837,  5564,-28800 }, // UTC-08
+    {    122,  2844,  4857, -7200 }, // UTC-02
+    {    123,  2851,  7707,     0 }, // UTC
+    {    124,  2855,  3213, 43200 }, // UTC+12
+    {    125,  2862,  1502, 46800 }, // UTC+13
+    {    126,  2869,  3703,-16200 }, // Venezuela Standard Time
+    {    127,  2893,  7715, 36000 }, // Vladivostok Standard Time
+    {    128,  2919,  6889, 28800 }, // W. Australia Standard Time
+    {    129,  2946,  5093,  3600 }, // W. Central Africa Standard Time
+    {    130,  2978,  7732,  3600 }, // W. Europe Standard Time
+    {    131,  3002,     0, 25200 }, // W. Mongolia Standard Time
+    {    132,  3028,  7746, 18000 }, // West Asia Standard Time
+    {    133,  3052,  7760,  7200 }, // West Bank Standard Time
+    {    134,  3076,   377, 36000 }, // West Pacific Standard Time
+    {    135,  3103,  7772, 32400 }, // Yakutsk Standard Time
+    {      0,     0,     0,     0 } // Trailing zeroes
+};
+
+// IANA ID Index, UTC Offset
+static const QUtcData utcDataTable[] = {
+    {   7785,     0 }, // UTC
+    {   7789,-50400 }, // UTC-14:00
+    {   7799,-46800 }, // UTC-13:00
+    {   7809,-43200 }, // UTC-12:00
+    {   7819,-39600 }, // UTC-11:00
+    {   7829,-36000 }, // UTC-10:00
+    {   7839,-32400 }, // UTC-09:00
+    {   7849,-28800 }, // UTC-08:00
+    {   7859,-25200 }, // UTC-07:00
+    {   7869,-21600 }, // UTC-06:00
+    {   7879,-18000 }, // UTC-05:00
+    {   7889,-16200 }, // UTC-04:30
+    {   7899,-14400 }, // UTC-04:00
+    {   7909,-12600 }, // UTC-03:30
+    {   7919,-10800 }, // UTC-03:00
+    {   7929, -7200 }, // UTC-02:00
+    {   7939, -3600 }, // UTC-01:00
+    {   7949,     0 }, // UTC-00:00
+    {   7959,     0 }, // UTC+00:00
+    {   7969,  3600 }, // UTC+01:00
+    {   7979,  7200 }, // UTC+02:00
+    {   7989, 10800 }, // UTC+03:00
+    {   7999, 12600 }, // UTC+03:30
+    {   8009, 14400 }, // UTC+04:00
+    {   8019, 16200 }, // UTC+04:30
+    {   8029, 18000 }, // UTC+05:00
+    {   8039, 19800 }, // UTC+05:30
+    {   8049, 20700 }, // UTC+05:45
+    {   8059, 21600 }, // UTC+06:00
+    {   8069, 23400 }, // UTC+06:30
+    {   8079, 25200 }, // UTC+07:00
+    {   8089, 28800 }, // UTC+08:00
+    {   8099, 30600 }, // UTC+08:30
+    {   8109, 32400 }, // UTC+09:00
+    {   8119, 34200 }, // UTC+09:30
+    {   8129, 36000 }, // UTC+10:00
+    {   8139, 39600 }, // UTC+11:00
+    {   8149, 43200 }, // UTC+12:00
+    {   8159, 46800 }, // UTC+13:00
+    {   8169, 50400 }, // UTC+14:00
+    {     0,      0 } // Trailing zeroes
+};
+
+static const char windowsIdData[] = {
+0x41, 0x66, 0x67, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
+0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x61, 0x73, 0x6b, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x74, 0x61, 0x69, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x20, 0x53, 0x74, 0x61, 0x6e,
+0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74,
+0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x69, 0x63, 0x20, 0x53,
+0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69,
+0x6e, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x73, 0x74,
+0x72, 0x61, 0x6b, 0x68, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65,
+0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54,
+0x69, 0x6d, 0x65, 0x0, 0x41, 0x55, 0x53, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e,
+0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x75, 0x73, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61,
+0x6c, 0x20, 0x57, 0x2e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41,
+0x55, 0x53, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
+0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x7a, 0x65, 0x72, 0x62, 0x61, 0x69, 0x6a, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e,
+0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x7a, 0x6f, 0x72, 0x65, 0x73, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x61, 0x6e, 0x67, 0x6c, 0x61, 0x64, 0x65, 0x73,
+0x68, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x65, 0x6c, 0x61,
+0x72, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x6f,
+0x75, 0x67, 0x61, 0x69, 0x6e, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
+0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x61, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20,
+0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x61, 0x70, 0x65, 0x20, 0x56,
+0x65, 0x72, 0x64, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43,
+0x61, 0x75, 0x63, 0x61, 0x73, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
+0x65, 0x0, 0x43, 0x65, 0x6e, 0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65,
+0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x42, 0x72, 0x61, 0x7a,
+0x69, 0x6c, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
+0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
+0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x45, 0x75, 0x72,
+0x6f, 0x70, 0x65, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
+0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e,
+0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74,
+0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29,
+0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6d, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x53,
+0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x75, 0x62, 0x61, 0x20, 0x53, 0x74,
+0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x44, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6e, 0x65,
+0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x41, 0x66,
+0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45,
+0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
+0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e,
+0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65,
+0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
+0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53,
+0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f,
+0x29, 0x0, 0x45, 0x67, 0x79, 0x70, 0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
+0x65, 0x0, 0x45, 0x6b, 0x61, 0x74, 0x65, 0x72, 0x69, 0x6e, 0x62, 0x75, 0x72, 0x67, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
+0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x46, 0x69, 0x6a, 0x69, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x46, 0x4c, 0x45, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
+0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x65, 0x6f, 0x72, 0x67, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
+0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x4d, 0x54, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
+0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x77, 0x69, 0x63, 0x68,
+0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x54, 0x42, 0x20, 0x53,
+0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x48, 0x61, 0x69, 0x74, 0x69, 0x20, 0x53,
+0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x48, 0x61, 0x77, 0x61, 0x69, 0x69, 0x61,
+0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x6e, 0x64, 0x69,
+0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x72, 0x61, 0x6e,
+0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x73, 0x72, 0x61, 0x65,
+0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4a, 0x6f, 0x72, 0x64,
+0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4b, 0x61, 0x6c,
+0x69, 0x6e, 0x69, 0x6e, 0x67, 0x72, 0x61, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x4b, 0x6f, 0x72, 0x65, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x4c, 0x69, 0x62, 0x79, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x4c, 0x69, 0x6e, 0x65, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e,
+0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4c, 0x6f, 0x72, 0x64, 0x20, 0x48, 0x6f, 0x77, 0x65, 0x20,
+0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x67, 0x61, 0x64, 0x61,
+0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x67, 0x61,
+0x6c, 0x6c, 0x61, 0x6e, 0x65, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65,
+0x0, 0x4d, 0x61, 0x72, 0x71, 0x75, 0x65, 0x73, 0x61, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
+0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
+0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x45, 0x61, 0x73, 0x74,
+0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x6f, 0x6e, 0x74, 0x65,
+0x76, 0x69, 0x64, 0x65, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
+0x4d, 0x6f, 0x72, 0x6f, 0x63, 0x63, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
+0x65, 0x0, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
+0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, 0x0, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61,
+0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x79, 0x61,
+0x6e, 0x6d, 0x61, 0x72, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e,
+0x2e, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
+0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x70, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61,
+0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x77,
+0x66, 0x6f, 0x75, 0x6e, 0x64, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54,
+0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x66, 0x6f, 0x6c, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
+0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x45, 0x61, 0x73,
+0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x74,
+0x68, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65,
+0x0, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x4b, 0x6f, 0x72, 0x65, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
+0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4f, 0x6d, 0x73, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
+0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x41, 0x20, 0x53, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53,
+0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
+0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69,
+0x63, 0x6f, 0x29, 0x0, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
+0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x20, 0x53, 0x74, 0x61, 0x6e,
+0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x52, 0x6f, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x20, 0x53, 0x74,
+0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54,
+0x69, 0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x33, 0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x31, 0x30, 0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x31, 0x31, 0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x53,
+0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x41, 0x20, 0x45, 0x61, 0x73, 0x74,
+0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x41,
+0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x53, 0x41, 0x20, 0x57, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x20, 0x50, 0x69, 0x65, 0x72, 0x72, 0x65,
+0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61, 0x6b, 0x68, 0x61,
+0x6c, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61,
+0x6d, 0x6f, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61,
+0x6f, 0x20, 0x54, 0x6f, 0x6d, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65,
+0x0, 0x53, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x76, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x53, 0x45, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
+0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
+0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63,
+0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x72, 0x69, 0x20,
+0x4c, 0x61, 0x6e, 0x6b, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
+0x53, 0x75, 0x64, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
+0x53, 0x79, 0x72, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
+0x54, 0x61, 0x69, 0x70, 0x65, 0x69, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65,
+0x0, 0x54, 0x61, 0x73, 0x6d, 0x61, 0x6e, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54,
+0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, 0x63, 0x61, 0x6e, 0x74, 0x69, 0x6e, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, 0x6b, 0x79, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, 0x6d, 0x73, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x62, 0x61, 0x69, 0x6b, 0x61, 0x6c, 0x20,
+0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x75, 0x72, 0x6b, 0x65, 0x79,
+0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x75, 0x72, 0x6b, 0x73,
+0x20, 0x41, 0x6e, 0x64, 0x20, 0x43, 0x61, 0x69, 0x63, 0x6f, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
+0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x6c, 0x61, 0x61, 0x6e, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x20, 0x53, 0x74,
+0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x53, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65,
+0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x53, 0x20,
+0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x31, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x39, 0x0, 0x55, 0x54, 0x43,
+0x2d, 0x30, 0x38, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x32, 0x0, 0x55, 0x54, 0x43, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31,
+0x32, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x33, 0x0, 0x56, 0x65, 0x6e, 0x65, 0x7a, 0x75, 0x65, 0x6c, 0x61, 0x20, 0x53,
+0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f,
+0x73, 0x74, 0x6f, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57,
+0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
+0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72,
+0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e,
+0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
+0x65, 0x0, 0x57, 0x2e, 0x20, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
+0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, 0x73, 0x74, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74,
+0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, 0x73, 0x74, 0x20, 0x42, 0x61, 0x6e,
+0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, 0x73, 0x74,
+0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
+0x6d, 0x65, 0x0, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
+0x54, 0x69, 0x6d, 0x65, 0x0
+};
+
+static const char ianaIdData[] = {
+0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x76, 0x64, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x61,
+0x72, 0x61, 0x77, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x2d, 0x61, 0x75,
+0x2d, 0x50, 0x72, 0x69, 0x6e, 0x63, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x68, 0x61, 0x6e, 0x67, 0x68, 0x61,
+0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x42, 0x61, 0x72, 0x74, 0x68, 0x65, 0x6c,
+0x65, 0x6d, 0x79, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x69, 0x73, 0x68, 0x6b, 0x65, 0x6b, 0x0, 0x41, 0x6e, 0x74,
+0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x79, 0x6f, 0x77, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69,
+0x63, 0x2f, 0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f,
+0x6e, 0x74, 0x73, 0x65, 0x72, 0x72, 0x61, 0x74, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42,
+0x72, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x65, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4c, 0x69,
+0x6e, 0x64, 0x65, 0x6d, 0x61, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x34, 0x0, 0x41, 0x73,
+0x69, 0x61, 0x2f, 0x41, 0x73, 0x68, 0x67, 0x61, 0x62, 0x61, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x4e, 0x6f, 0x72, 0x6f, 0x6e, 0x68, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x6f, 0x73, 0x74,
+0x61, 0x5f, 0x52, 0x69, 0x63, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x73, 0x6d, 0x65, 0x72, 0x61,
+0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x73, 0x65, 0x79, 0x0, 0x41, 0x73,
+0x69, 0x61, 0x2f, 0x4a, 0x61, 0x6b, 0x61, 0x72, 0x74, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x6f, 0x6e, 0x74,
+0x69, 0x61, 0x6e, 0x61, 0x6b, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x6f, 0x74,
+0x68, 0x65, 0x72, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x72, 0x6e, 0x61, 0x75, 0x6c, 0x0, 0x41, 0x6d,
+0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x5f, 0x50, 0x72, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x0,
+0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x0, 0x50, 0x61, 0x63,
+0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x5f, 0x4d, 0x6f, 0x72, 0x65, 0x73, 0x62, 0x79, 0x0, 0x41, 0x75,
+0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x53, 0x79, 0x64, 0x6e, 0x65, 0x79, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72,
+0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4d, 0x65, 0x6c, 0x62, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x45, 0x6c, 0x5f, 0x41, 0x61, 0x69, 0x75, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53,
+0x61, 0x6f, 0x5f, 0x50, 0x61, 0x75, 0x6c, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4d, 0x61, 0x6a,
+0x75, 0x72, 0x6f, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x77, 0x61, 0x6a, 0x61, 0x6c, 0x65, 0x69,
+0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x75, 0x72, 0x79, 0x0,
+0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x70, 0x75, 0x74, 0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x52, 0x69, 0x6f, 0x5f, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x45, 0x69, 0x72, 0x75, 0x6e, 0x65, 0x70, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x61, 0x72,
+0x69, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, 0x64, 0x6d, 0x6f, 0x6e, 0x74, 0x6f, 0x6e, 0x20,
+0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6d, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x5f, 0x42, 0x61,
+0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x75, 0x76, 0x69, 0x6b, 0x20, 0x41, 0x6d, 0x65,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x59, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6b, 0x6e, 0x69, 0x66, 0x65, 0x0, 0x41, 0x73, 0x69,
+0x61, 0x2f, 0x52, 0x61, 0x6e, 0x67, 0x6f, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75,
+0x69, 0x61, 0x62, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6d, 0x70, 0x6f, 0x5f, 0x47,
+0x72, 0x61, 0x6e, 0x64, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x61, 0x64, 0x75, 0x7a, 0x0, 0x45,
+0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x48, 0x65, 0x6c, 0x73, 0x69, 0x6e, 0x6b, 0x69, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e,
+0x74, 0x69, 0x63, 0x2f, 0x53, 0x74, 0x61, 0x6e, 0x6c, 0x65, 0x79, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f,
+0x4e, 0x6f, 0x72, 0x66, 0x6f, 0x6c, 0x6b, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x30, 0x0, 0x45,
+0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x61, 0x67, 0x72, 0x65, 0x62, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61,
+0x74, 0x6d, 0x61, 0x6e, 0x64, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x6f, 0x66, 0x69, 0x61, 0x0,
+0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x75, 0x73, 0x63, 0x61, 0x74, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d,
+0x61, 0x6c, 0x64, 0x69, 0x76, 0x65, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x61, 0x64, 0x72, 0x69,
+0x64, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x65, 0x75, 0x74, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x43, 0x6f, 0x6e, 0x61, 0x6b, 0x72, 0x79, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x64, 0x65, 0x6e, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x69, 0x6d, 0x66, 0x65, 0x72, 0x6f, 0x70, 0x6f, 0x6c, 0x0, 0x41, 0x66,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x62, 0x61, 0x62, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x72, 0x63, 0x74, 0x69, 0x63, 0x2f,
+0x4c, 0x6f, 0x6e, 0x67, 0x79, 0x65, 0x61, 0x72, 0x62, 0x79, 0x65, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61,
+0x67, 0x68, 0x64, 0x61, 0x64, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4d, 0x69, 0x64, 0x77, 0x61, 0x79,
+0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x77, 0x61, 0x69, 0x74, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x46, 0x72, 0x65, 0x65, 0x74, 0x6f, 0x77, 0x6e, 0x0, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x0, 0x50, 0x61, 0x63,
+0x69, 0x66, 0x69, 0x63, 0x2f, 0x52, 0x61, 0x72, 0x6f, 0x74, 0x6f, 0x6e, 0x67, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x42, 0x72, 0x61, 0x7a, 0x7a, 0x61, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x50, 0x75, 0x6e, 0x74, 0x61, 0x5f, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x73, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47,
+0x4d, 0x54, 0x2b, 0x31, 0x31, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x56, 0x61, 0x6e, 0x63, 0x6f, 0x75,
+0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x68, 0x69, 0x74, 0x65, 0x68, 0x6f, 0x72, 0x73, 0x65, 0x0, 0x41, 0x73,
+0x69, 0x61, 0x2f, 0x59, 0x65, 0x72, 0x65, 0x76, 0x61, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f,
+0x6e, 0x61, 0x63, 0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x73, 0x61, 0x6b, 0x61, 0x0, 0x45,
+0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x69, 0x65, 0x76, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x55, 0x7a,
+0x68, 0x67, 0x6f, 0x72, 0x6f, 0x64, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x61, 0x70, 0x6f, 0x72, 0x6f,
+0x7a, 0x68, 0x79, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x73, 0x75, 0x6e, 0x63, 0x69, 0x6f,
+0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6d, 0x6d, 0x61, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x41, 0x72, 0x61, 0x67, 0x75, 0x61, 0x69, 0x6e, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x65, 0x68, 0x72,
+0x61, 0x6e, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x76, 0x69, 0x73, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x72, 0x61, 0x67, 0x75, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x5f, 0x6f, 0x66, 0x5f, 0x53, 0x70, 0x61, 0x69, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69,
+0x63, 0x61, 0x2f, 0x47, 0x61, 0x62, 0x6f, 0x72, 0x6f, 0x6e, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d,
+0x35, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x79, 0x61, 0x71, 0x75, 0x69, 0x6c, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x74, 0x68, 0x65, 0x6e, 0x73, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e,
+0x2f, 0x41, 0x6e, 0x74, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x72, 0x69, 0x76, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69,
+0x63, 0x2f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x74, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a,
+0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x6f, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x65, 0x6c, 0x67, 0x72, 0x61, 0x64, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61,
+0x2f, 0x41, 0x6c, 0x6d, 0x61, 0x74, 0x79, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, 0x6f, 0x73, 0x74, 0x61, 0x6e, 0x61,
+0x79, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x33, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x43, 0x6f, 0x72, 0x61, 0x6c, 0x5f, 0x48, 0x61, 0x72, 0x62, 0x6f, 0x75, 0x72, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61,
+0x6e, 0x2f, 0x43, 0x68, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x48,
+0x6f, 0x62, 0x61, 0x72, 0x74, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x43, 0x75, 0x72, 0x72,
+0x69, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x75, 0x65, 0x72, 0x74, 0x6f, 0x5f, 0x52, 0x69,
+0x63, 0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4b, 0x69, 0x74, 0x74, 0x73, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x75, 0x72, 0x69, 0x63, 0x68, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69,
+0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x65, 0x6e, 0x67, 0x6f, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x56, 0x65, 0x76, 0x61, 0x79,
+0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x6e, 0x61, 0x70, 0x65, 0x20, 0x50, 0x61, 0x63, 0x69,
+0x66, 0x69, 0x63, 0x2f, 0x4b, 0x6f, 0x73, 0x72, 0x61, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47,
+0x61, 0x6d, 0x62, 0x69, 0x65, 0x72, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x69, 0x61, 0x6d, 0x65, 0x79,
+0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x69, 0x6c, 0x6c, 0x6f, 0x0,
+0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x67, 0x61, 0x64, 0x69, 0x73, 0x68, 0x75, 0x0, 0x45, 0x74, 0x63,
+0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x37, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x42, 0x65, 0x72, 0x6d,
+0x75, 0x64, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x72, 0x61, 0x72, 0x65, 0x0, 0x41, 0x73,
+0x69, 0x61, 0x2f, 0x4d, 0x61, 0x63, 0x61, 0x75, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6c, 0x61,
+0x62, 0x6f, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x54, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x44, 0x61, 0x6b, 0x61, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4f, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73,
+0x69, 0x61, 0x2f, 0x41, 0x71, 0x74, 0x61, 0x75, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x71, 0x74, 0x6f, 0x62, 0x65,
+0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x74, 0x79, 0x72, 0x61, 0x75, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, 0x79,
+0x7a, 0x79, 0x6c, 0x6f, 0x72, 0x64, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x72, 0x75, 0x6d, 0x71, 0x69, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x52, 0x6f, 0x6d, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x49,
+0x73, 0x6c, 0x65, 0x5f, 0x6f, 0x66, 0x5f, 0x4d, 0x61, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61,
+0x72, 0x5f, 0x65, 0x73, 0x5f, 0x53, 0x61, 0x6c, 0x61, 0x61, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x54, 0x68, 0x75, 0x6c, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x6e, 0x6d, 0x61, 0x72,
+0x6b, 0x73, 0x68, 0x61, 0x76, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x65, 0x67, 0x69, 0x6e,
+0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x77, 0x69, 0x66, 0x74, 0x5f, 0x43, 0x75, 0x72, 0x72,
+0x65, 0x6e, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x62, 0x79,
+0x73, 0x75, 0x6e, 0x64, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x73, 0x61, 0x62, 0x6c, 0x61, 0x6e,
+0x63, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x72, 0x61, 0x6e, 0x64, 0x5f, 0x54, 0x75, 0x72,
+0x6b, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x6e, 0x6a, 0x75, 0x6c, 0x0, 0x41, 0x66, 0x72, 0x69,
+0x63, 0x61, 0x2f, 0x4e, 0x64, 0x6a, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4a, 0x65, 0x72,
+0x75, 0x73, 0x61, 0x6c, 0x65, 0x6d, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61,
+0x6c, 0x6d, 0x65, 0x72, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x45, 0x75, 0x63, 0x6c, 0x61,
+0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x75, 0x61, 0x0, 0x41, 0x73, 0x69,
+0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x69, 0x6c, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x53, 0x61, 0x69,
+0x70, 0x61, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x69, 0x72, 0x6f, 0x0, 0x45, 0x75, 0x72,
+0x6f, 0x70, 0x65, 0x2f, 0x42, 0x72, 0x75, 0x73, 0x73, 0x65, 0x6c, 0x73, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74,
+0x69, 0x63, 0x61, 0x2f, 0x4d, 0x63, 0x4d, 0x75, 0x72, 0x64, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42,
+0x75, 0x63, 0x68, 0x61, 0x72, 0x65, 0x73, 0x74, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x32, 0x0, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f, 0x59, 0x6f, 0x72, 0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72,
+0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x74, 0x72, 0x6f, 0x69, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x50, 0x65, 0x74, 0x65, 0x72, 0x73, 0x62, 0x75, 0x72, 0x67, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x56, 0x69, 0x6e, 0x63, 0x65,
+0x6e, 0x6e, 0x65, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61,
+0x2f, 0x57, 0x69, 0x6e, 0x61, 0x6d, 0x61, 0x63, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x65, 0x6e,
+0x74, 0x75, 0x63, 0x6b, 0x79, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x69, 0x63, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x41, 0x6d, 0x65,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x75, 0x69, 0x73, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69,
+0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x6f, 0x2d, 0x4e, 0x6f, 0x76, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x49,
+0x72, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x6c, 0x61, 0x61, 0x6e, 0x62, 0x61, 0x61,
+0x74, 0x61, 0x72, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x68, 0x6f, 0x69, 0x62, 0x61, 0x6c, 0x73, 0x61, 0x6e, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x69, 0x65, 0x6e, 0x6e, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x54, 0x6f, 0x72, 0x6f, 0x6e, 0x74, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x71,
+0x61, 0x6c, 0x75, 0x69, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x72, 0x65,
+0x61, 0x6c, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x69, 0x70, 0x69, 0x67, 0x6f, 0x6e, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, 0x6e, 0x67, 0x6e, 0x69, 0x72, 0x74, 0x75, 0x6e, 0x67, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x68, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x5f, 0x42, 0x61, 0x79, 0x0, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x69, 0x6a, 0x6b, 0x0, 0x50, 0x61,
+0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, 0x61, 0x75, 0x72, 0x75, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69,
+0x63, 0x61, 0x2f, 0x44, 0x75, 0x6d, 0x6f, 0x6e, 0x74, 0x44, 0x55, 0x72, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x73,
+0x69, 0x61, 0x2f, 0x4d, 0x61, 0x67, 0x61, 0x64, 0x61, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4f, 0x73,
+0x6c, 0x6f, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x39, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
+0x2f, 0x47, 0x61, 0x6c, 0x61, 0x70, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75,
+0x6a, 0x75, 0x6d, 0x62, 0x75, 0x72, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x6c, 0x69,
+0x66, 0x61, 0x78, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6c, 0x61, 0x63, 0x65, 0x5f, 0x42, 0x61,
+0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6f, 0x6f, 0x73, 0x65, 0x5f, 0x42, 0x61, 0x79, 0x20,
+0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x63, 0x74, 0x6f, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f,
+0x47, 0x4d, 0x54, 0x2d, 0x31, 0x31, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x72, 0x65, 0x6e, 0x61,
+0x64, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, 0x6f, 0x75, 0x6d, 0x65, 0x61, 0x0, 0x41, 0x6d,
+0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6e, 0x63, 0x75, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a,
+0x75, 0x6e, 0x65, 0x61, 0x75, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x6d, 0x65, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x69, 0x74, 0x6b, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x61, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6f, 0x64,
+0x74, 0x68, 0x61, 0x62, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x69, 0x73, 0x73, 0x61, 0x75, 0x0, 0x45,
+0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x6e, 0x5f, 0x4d, 0x61, 0x72, 0x69, 0x6e, 0x6f, 0x0, 0x45, 0x75, 0x72,
+0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x64, 0x61, 0x70, 0x65, 0x73, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x54, 0x65, 0x67, 0x75, 0x63, 0x69, 0x67, 0x61, 0x6c, 0x70, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c,
+0x69, 0x61, 0x2f, 0x4c, 0x6f, 0x72, 0x64, 0x5f, 0x48, 0x6f, 0x77, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54,
+0x2d, 0x33, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x69, 0x62, 0x72, 0x65, 0x76, 0x69, 0x6c, 0x6c, 0x65,
+0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x56, 0x69, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x6f, 0x6e, 0x64, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54,
+0x2d, 0x31, 0x32, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6e, 0x0, 0x41,
+0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x52, 0x65, 0x79, 0x6b, 0x6a, 0x61, 0x76, 0x69, 0x6b, 0x0, 0x41, 0x6d,
+0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x76, 0x61, 0x6e, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x4e, 0x61, 0x73, 0x73, 0x61, 0x75, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x53, 0x6f, 0x75,
+0x74, 0x68, 0x5f, 0x47, 0x65, 0x6f, 0x72, 0x67, 0x69, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45,
+0x6c, 0x5f, 0x53, 0x61, 0x6c, 0x76, 0x61, 0x64, 0x6f, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43,
+0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61,
+0x6e, 0x61, 0x2f, 0x4b, 0x6e, 0x6f, 0x78, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69,
+0x61, 0x6e, 0x61, 0x2f, 0x54, 0x65, 0x6c, 0x6c, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x4d, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x65, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x4e, 0x6f, 0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, 0x2f, 0x42, 0x65, 0x75, 0x6c, 0x61, 0x68, 0x20,
+0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61,
+0x2f, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74,
+0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f, 0x53, 0x61, 0x6c, 0x65, 0x6d, 0x0, 0x45,
+0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x34, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, 0x6e,
+0x61, 0x6d, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6f, 0x67, 0x6f, 0x74, 0x61, 0x0, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x41, 0x6d, 0x65,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x7a, 0x61, 0x74, 0x6c, 0x61, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69,
+0x63, 0x2f, 0x46, 0x75, 0x6e, 0x61, 0x66, 0x75, 0x74, 0x69, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x47, 0x69,
+0x62, 0x72, 0x61, 0x6c, 0x74, 0x61, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4f, 0x6d, 0x73, 0x6b, 0x0, 0x41, 0x66,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x72, 0x69, 0x70, 0x6f, 0x6c, 0x69, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74,
+0x69, 0x63, 0x61, 0x2f, 0x56, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41,
+0x72, 0x75, 0x62, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x65, 0x69, 0x72, 0x75, 0x74, 0x0, 0x45, 0x74, 0x63,
+0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x38, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x69, 0x6e, 0x64, 0x68, 0x6f,
+0x65, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x72, 0x61, 0x63, 0x61, 0x73, 0x0, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x54, 0x68, 0x6f, 0x6d, 0x61, 0x73, 0x0, 0x45, 0x74, 0x63,
+0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x74, 0x69, 0x67,
+0x75, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x69, 0x6d, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f,
+0x70, 0x65, 0x2f, 0x4d, 0x61, 0x72, 0x69, 0x65, 0x68, 0x61, 0x6d, 0x6e, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69,
+0x63, 0x2f, 0x53, 0x74, 0x5f, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f,
+0x54, 0x72, 0x75, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x0,
+0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x6f, 0x5f, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67,
+0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6c, 0x61, 0x6e, 0x74, 0x79, 0x72, 0x65, 0x0, 0x41, 0x6d,
+0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x20, 0x41, 0x6d,
+0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x69, 0x61, 0x5f, 0x42, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x61, 0x73,
+0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x72, 0x69, 0x64, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72,
+0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x65, 0x72, 0x72, 0x65, 0x79, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b,
+0x75, 0x61, 0x6c, 0x61, 0x5f, 0x4c, 0x75, 0x6d, 0x70, 0x75, 0x72, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x63,
+0x68, 0x69, 0x6e, 0x67, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x46, 0x69, 0x6a, 0x69, 0x0, 0x41, 0x6d,
+0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x68, 0x6f, 0x65, 0x6e, 0x69, 0x78, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54,
+0x68, 0x69, 0x6d, 0x70, 0x68, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x61, 0x6c, 0x74, 0x61, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65,
+0x2f, 0x4b, 0x69, 0x72, 0x6f, 0x76, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x6f, 0x6c, 0x67, 0x6f, 0x67,
+0x72, 0x61, 0x64, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x69, 0x71,
+0x75, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x32, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59,
+0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x68, 0x61, 0x6e, 0x64, 0x79, 0x67, 0x61,
+0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x62, 0x75, 0x6c, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x20,
+0x45, 0x74, 0x63, 0x2f, 0x55, 0x54, 0x43, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x74, 0x61,
+0x6d, 0x6f, 0x72, 0x6f, 0x73, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x34, 0x0, 0x49, 0x6e, 0x64, 0x69,
+0x61, 0x6e, 0x2f, 0x43, 0x68, 0x72, 0x69, 0x73, 0x74, 0x6d, 0x61, 0x73, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69,
+0x63, 0x2f, 0x41, 0x7a, 0x6f, 0x72, 0x65, 0x73, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x0, 0x41,
+0x73, 0x69, 0x61, 0x2f, 0x44, 0x68, 0x61, 0x6b, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x69,
+0x6e, 0x6e, 0x69, 0x70, 0x65, 0x67, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x61, 0x69, 0x6e, 0x79,
+0x5f, 0x52, 0x69, 0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x61, 0x6e, 0x6b, 0x69,
+0x6e, 0x5f, 0x49, 0x6e, 0x6c, 0x65, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x65, 0x73, 0x6f,
+0x6c, 0x75, 0x74, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x35, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66,
+0x69, 0x63, 0x2f, 0x46, 0x61, 0x6b, 0x61, 0x6f, 0x66, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x76, 0x6f,
+0x73, 0x69, 0x62, 0x69, 0x72, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x65, 0x62, 0x72, 0x6f, 0x6e, 0x20,
+0x41, 0x73, 0x69, 0x61, 0x2f, 0x47, 0x61, 0x7a, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x49, 0x73, 0x74,
+0x61, 0x6e, 0x62, 0x75, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x64, 0x61, 0x6b, 0x0, 0x45,
+0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x37, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x6e,
+0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6f, 0x69, 0x73, 0x65, 0x0, 0x41, 0x66,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x64, 0x64, 0x69, 0x73, 0x5f, 0x41, 0x62, 0x61, 0x62, 0x61, 0x0, 0x45, 0x75, 0x72,
+0x6f, 0x70, 0x65, 0x2f, 0x41, 0x6d, 0x73, 0x74, 0x65, 0x72, 0x64, 0x61, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x4d, 0x61, 0x72, 0x69, 0x67, 0x6f, 0x74, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x69, 0x73,
+0x62, 0x6f, 0x6e, 0x20, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x4d, 0x61, 0x64, 0x65, 0x69, 0x72, 0x61,
+0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x69, 0x6c, 0x6e, 0x69, 0x75, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f,
+0x70, 0x65, 0x2f, 0x42, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x73,
+0x69, 0x6e, 0x67, 0x65, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4d, 0x61, 0x72, 0x71, 0x75, 0x65,
+0x73, 0x61, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x73, 0x6e, 0x6f, 0x79, 0x61, 0x72, 0x73, 0x6b,
+0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x76, 0x6f, 0x6b, 0x75, 0x7a, 0x6e, 0x65, 0x74, 0x73, 0x6b, 0x0, 0x50,
+0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x69, 0x72, 0x69, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x0, 0x41, 0x6d,
+0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x69, 0x71, 0x75, 0x65, 0x6c, 0x6f, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70,
+0x65, 0x2f, 0x44, 0x75, 0x62, 0x6c, 0x69, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x52, 0x69, 0x79, 0x61, 0x64, 0x68,
+0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x69, 0x61, 0x67, 0x6f, 0x0, 0x41, 0x73,
+0x69, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x63, 0x68, 0x61, 0x74, 0x6b, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6e,
+0x61, 0x64, 0x79, 0x72, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x6f, 0x6d, 0x6f, 0x72, 0x6f, 0x0, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, 0x72, 0x61, 0x63, 0x61, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70,
+0x65, 0x2f, 0x43, 0x68, 0x69, 0x73, 0x69, 0x6e, 0x61, 0x75, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42,
+0x65, 0x6c, 0x69, 0x7a, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x6f, 0x68, 0x61, 0x6e, 0x6e, 0x65,
+0x73, 0x62, 0x75, 0x72, 0x67, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, 0x73, 0x74,
+0x6f, 0x6b, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x73, 0x74, 0x2d, 0x4e, 0x65, 0x72, 0x61, 0x0, 0x45, 0x74, 0x63,
+0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x32, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x61, 0x6d, 0x61, 0x73, 0x63, 0x75, 0x73,
+0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x79, 0x65, 0x6e, 0x6e, 0x65, 0x0, 0x41, 0x66, 0x72,
+0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x75, 0x61, 0x6b, 0x63, 0x68, 0x6f, 0x74, 0x74, 0x0, 0x45, 0x53, 0x54, 0x35, 0x45,
+0x44, 0x54, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x69, 0x61, 0x0, 0x50, 0x61, 0x63,
+0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b,
+0x33, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x73, 0x74, 0x72, 0x61, 0x6b, 0x68, 0x61, 0x6e, 0x20, 0x45,
+0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x55, 0x6c, 0x79, 0x61, 0x6e, 0x6f, 0x76, 0x73, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72,
+0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x61, 0x75, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42,
+0x6f, 0x61, 0x5f, 0x56, 0x69, 0x73, 0x74, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72,
+0x74, 0x6f, 0x5f, 0x56, 0x65, 0x6c, 0x68, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x69, 0x6e, 0x73,
+0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4c, 0x75, 0x63, 0x69, 0x61, 0x0, 0x41,
+0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x61, 0x6e, 0x64, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x4c, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x6e, 0x64, 0x6f, 0x72, 0x72, 0x61,
+0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x61, 0x6c, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x72, 0x61, 0x64, 0x0,
+0x4d, 0x53, 0x54, 0x37, 0x4d, 0x44, 0x54, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x67, 0x75,
+0x69, 0x6c, 0x6c, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x57, 0x61, 0x6c, 0x6c, 0x69, 0x73, 0x0,
+0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x75, 0x62, 0x61, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43,
+0x61, 0x79, 0x6d, 0x61, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x6e, 0x67, 0x6b, 0x6f, 0x6b, 0x0, 0x50,
+0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, 0x75, 0x61, 0x64, 0x61, 0x6c, 0x63, 0x61, 0x6e, 0x61, 0x6c, 0x0, 0x41,
+0x73, 0x69, 0x61, 0x2f, 0x54, 0x62, 0x69, 0x6c, 0x69, 0x73, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x68, 0x6e,
+0x6f, 0x6d, 0x5f, 0x50, 0x65, 0x6e, 0x68, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x73, 0x68, 0x6b, 0x65, 0x6e,
+0x74, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x6e, 0x64, 0x0, 0x41, 0x73, 0x69,
+0x61, 0x2f, 0x46, 0x61, 0x6d, 0x61, 0x67, 0x75, 0x73, 0x74, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x69, 0x63,
+0x6f, 0x73, 0x69, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x64, 0x65, 0x6c, 0x6f,
+0x75, 0x70, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x69, 0x67, 0x6f, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61,
+0x2f, 0x43, 0x68, 0x69, 0x74, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x72, 0x6f, 0x76,
+0x69, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x6f, 0x72, 0x74, 0x6f, 0x6c, 0x61, 0x0, 0x41,
+0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x69, 0x6e, 0x73, 0x68, 0x61, 0x73, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f,
+0x53, 0x61, 0x6b, 0x68, 0x61, 0x6c, 0x69, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x57, 0x61, 0x6b,
+0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x63, 0x63, 0x72, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66,
+0x69, 0x63, 0x2f, 0x41, 0x75, 0x63, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69,
+0x61, 0x2f, 0x41, 0x64, 0x65, 0x6c, 0x61, 0x69, 0x64, 0x65, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61,
+0x2f, 0x42, 0x72, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x48, 0x69, 0x6c, 0x6c, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
+0x2f, 0x54, 0x61, 0x68, 0x69, 0x74, 0x69, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4f, 0x75, 0x61, 0x67, 0x61,
+0x64, 0x6f, 0x75, 0x67, 0x6f, 0x75, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4b, 0x65, 0x72, 0x67, 0x75, 0x65,
+0x6c, 0x65, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x38, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65,
+0x2f, 0x54, 0x69, 0x72, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x69, 0x70, 0x65, 0x69, 0x0,
+0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x43, 0x6f, 0x70, 0x65, 0x6e, 0x68, 0x61, 0x67, 0x65, 0x6e, 0x0, 0x41, 0x66,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x70, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x6f, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x6b, 0x75, 0x0,
+0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x6e, 0x67, 0x5f, 0x4b, 0x6f, 0x6e, 0x67, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f,
+0x4a, 0x61, 0x79, 0x61, 0x70, 0x75, 0x72, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x48, 0x6f, 0x6e,
+0x6f, 0x6c, 0x75, 0x6c, 0x75, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x61, 0x69, 0x72, 0x6f, 0x62, 0x69,
+0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, 0x75, 0x61, 0x6d, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x4a, 0x75, 0x62, 0x61, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x46, 0x61, 0x65, 0x72, 0x6f,
+0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x72, 0x65, 0x64, 0x6e, 0x65, 0x6b, 0x6f, 0x6c, 0x79, 0x6d, 0x73, 0x6b,
+0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, 0x69, 0x75, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x41, 0x6c, 0x67, 0x69, 0x65, 0x72, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x69, 0x6c, 0x69, 0x0, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x46, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x65, 0x7a, 0x61, 0x20, 0x41, 0x6d, 0x65,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x65, 0x6c, 0x65, 0x6d, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d,
+0x61, 0x63, 0x65, 0x69, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x65, 0x63, 0x69, 0x66, 0x65,
+0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x6d, 0x0, 0x45, 0x75,
+0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x6f, 0x64, 0x67, 0x6f, 0x72, 0x69, 0x63, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x44, 0x6f, 0x75, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x56, 0x69, 0x65, 0x6e, 0x74, 0x69,
+0x61, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x69, 0x6a, 0x75, 0x61, 0x6e, 0x61, 0x20,
+0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x61, 0x5f, 0x49, 0x73, 0x61, 0x62, 0x65, 0x6c,
+0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x6d, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f,
+0x52, 0x69, 0x67, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6c, 0x61, 0x6e, 0x63, 0x2d, 0x53,
+0x61, 0x62, 0x6c, 0x6f, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x65, 0x0,
+0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x0, 0x41, 0x73, 0x69,
+0x61, 0x2f, 0x54, 0x6f, 0x6b, 0x79, 0x6f, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x36, 0x0, 0x45, 0x75,
+0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x72, 0x61, 0x6a, 0x65, 0x76, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65,
+0x2f, 0x42, 0x72, 0x61, 0x74, 0x69, 0x73, 0x6c, 0x61, 0x76, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x43, 0x61, 0x6e, 0x61,
+0x72, 0x79, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x42, 0x6f, 0x75, 0x67, 0x61, 0x69, 0x6e, 0x76, 0x69,
+0x6c, 0x6c, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x72, 0x61, 0x69, 0x6e, 0x0, 0x41, 0x6d, 0x65,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x74, 0x65, 0x6d, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69,
+0x63, 0x61, 0x2f, 0x4c, 0x61, 0x5f, 0x50, 0x61, 0x7a, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x79, 0x6f, 0x6e, 0x67,
+0x79, 0x61, 0x6e, 0x67, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x61, 0x67, 0x6f, 0x5f, 0x50, 0x61,
+0x67, 0x6f, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x52, 0x65, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x0, 0x41, 0x66,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x73, 0x65, 0x72, 0x75, 0x0, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x0,
+0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x39, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x75, 0x6e,
+0x69, 0x73, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6f, 0x5f, 0x54, 0x6f, 0x6d, 0x65, 0x0, 0x45,
+0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x76, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x4b, 0x68, 0x61, 0x72, 0x74, 0x6f, 0x75, 0x6d, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4a, 0x65, 0x72,
+0x73, 0x65, 0x79, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x63, 0x71, 0x75,
+0x61, 0x72, 0x69, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4f, 0x6a, 0x69, 0x6e, 0x61, 0x67, 0x61,
+0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x43, 0x61, 0x70, 0x65, 0x5f, 0x56, 0x65, 0x72, 0x64, 0x65,
+0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x61, 0x6b, 0x61, 0x73, 0x73, 0x61, 0x72, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70,
+0x65, 0x2f, 0x4c, 0x6a, 0x75, 0x62, 0x6c, 0x6a, 0x61, 0x6e, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x47,
+0x75, 0x65, 0x72, 0x6e, 0x73, 0x65, 0x79, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x4d,
+0x61, 0x77, 0x73, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x65, 0x6e, 0x6f, 0x73,
+0x5f, 0x41, 0x69, 0x72, 0x65, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e,
+0x74, 0x69, 0x6e, 0x61, 0x2f, 0x4c, 0x61, 0x5f, 0x52, 0x69, 0x6f, 0x6a, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
+0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x52, 0x69, 0x6f, 0x5f, 0x47, 0x61, 0x6c, 0x6c,
+0x65, 0x67, 0x6f, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69,
+0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6c, 0x74, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67,
+0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x5f, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72,
+0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x5f, 0x4c, 0x75,
+0x69, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61,
+0x2f, 0x54, 0x75, 0x63, 0x75, 0x6d, 0x61, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67,
+0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x55, 0x73, 0x68, 0x75, 0x61, 0x69, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69,
+0x63, 0x61, 0x2f, 0x43, 0x61, 0x74, 0x61, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x43, 0x6f, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x75, 0x6a,
+0x75, 0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x6e, 0x64, 0x6f, 0x7a, 0x61, 0x0, 0x50,
+0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x41, 0x70, 0x69, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42,
+0x61, 0x6e, 0x67, 0x75, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x6f, 0x6d, 0x73, 0x6b, 0x0, 0x50, 0x61, 0x63,
+0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x61, 0x6c, 0x61, 0x75, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61,
+0x2f, 0x44, 0x61, 0x72, 0x77, 0x69, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x69, 0x74, 0x63,
+0x61, 0x69, 0x72, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x0, 0x50, 0x61, 0x63,
+0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x74, 0x61, 0x70, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70,
+0x65, 0x2f, 0x53, 0x61, 0x6d, 0x61, 0x72, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x50,
+0x65, 0x72, 0x74, 0x68, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x57, 0x61, 0x72, 0x73, 0x61, 0x77, 0x0, 0x49,
+0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x6f, 0x63, 0x6f, 0x73, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d,
+0x61, 0x68, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x73, 0x5f, 0x41, 0x6e, 0x67, 0x65,
+0x6c, 0x65, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x74, 0x6c, 0x61, 0x6b, 0x61, 0x74,
+0x6c, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x74, 0x74, 0x61, 0x0, 0x41, 0x66, 0x72,
+0x69, 0x63, 0x61, 0x2f, 0x41, 0x62, 0x69, 0x64, 0x6a, 0x61, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b,
+0x36, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x66, 0x61, 0x74, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f,
+0x70, 0x65, 0x2f, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x6f, 0x75, 0x72, 0x67, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x42, 0x61, 0x6d, 0x61, 0x6b, 0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x69, 0x67, 0x61, 0x6c,
+0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, 0x61, 0x74, 0x61, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61,
+0x72, 0x61, 0x63, 0x68, 0x69, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x30, 0x0, 0x41, 0x66, 0x72,
+0x69, 0x63, 0x61, 0x2f, 0x44, 0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x65,
+0x6b, 0x61, 0x74, 0x65, 0x72, 0x69, 0x6e, 0x62, 0x75, 0x72, 0x67, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x44, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x5f, 0x43, 0x72, 0x65, 0x65, 0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x43, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x46, 0x6f, 0x72,
+0x74, 0x5f, 0x4e, 0x65, 0x6c, 0x73, 0x6f, 0x6e, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, 0x79, 0x6f,
+0x74, 0x74, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x6b, 0x6f, 0x70, 0x6a, 0x65, 0x0, 0x41, 0x73,
+0x69, 0x61, 0x2f, 0x53, 0x65, 0x6f, 0x75, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, 0x72,
+0x61, 0x6d, 0x61, 0x72, 0x69, 0x62, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x74, 0x6f, 0x63, 0x6b,
+0x68, 0x6f, 0x6c, 0x6d, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x62, 0x75, 0x6d, 0x62, 0x61, 0x73,
+0x68, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65,
+0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x65, 0x6e, 0x6f, 0x73, 0x5f, 0x41, 0x69, 0x72, 0x65,
+0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x73, 0x74, 0x72, 0x61, 0x6b, 0x68, 0x61, 0x6e, 0x0, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x6c, 0x69, 0x66, 0x61, 0x78, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72,
+0x61, 0x6c, 0x69, 0x61, 0x2f, 0x53, 0x79, 0x64, 0x6e, 0x65, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
+0x52, 0x65, 0x67, 0x69, 0x6e, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x41, 0x64, 0x65,
+0x6c, 0x61, 0x69, 0x64, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6c, 0x6d, 0x61, 0x74, 0x79, 0x0, 0x41, 0x6d,
+0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, 0x69, 0x61, 0x62, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x2f, 0x43, 0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42,
+0x72, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f,
+0x59, 0x6f, 0x72, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x69, 0x65, 0x76, 0x0, 0x41, 0x6d, 0x65,
+0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69,
+0x63, 0x61, 0x2f, 0x44, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x73, 0x6e,
+0x6f, 0x79, 0x61, 0x72, 0x73, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x73, 0x5f, 0x41,
+0x6e, 0x67, 0x65, 0x6c, 0x65, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x69, 0x6a, 0x75, 0x61,
+0x6e, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x63, 0x68, 0x61, 0x74, 0x6b, 0x61, 0x0, 0x45, 0x75,
+0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69,
+0x61, 0x2f, 0x48, 0x6f, 0x62, 0x61, 0x72, 0x74, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x6c, 0x61, 0x61, 0x6e, 0x62,
+0x61, 0x61, 0x74, 0x61, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e,
+0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f,
+0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42,
+0x65, 0x72, 0x6c, 0x69, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x73, 0x68, 0x6b, 0x65, 0x6e, 0x74, 0x0,
+0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x65, 0x62, 0x72, 0x6f, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x61, 0x6b,
+0x75, 0x74, 0x73, 0x6b, 0x0, 0x55, 0x54, 0x43, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2d, 0x31, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2d, 0x31, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2d, 0x30, 0x39, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x38, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2d, 0x30, 0x37, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x36, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2d, 0x30, 0x35, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x34, 0x3a, 0x33, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2d, 0x30, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x33, 0x3a, 0x33, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2d, 0x30, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2d, 0x30, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x33, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x34, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x34, 0x35, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x36, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x36, 0x3a, 0x33, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x37, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x38, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x38, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x39, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x30, 0x39, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x31, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55,
+0x54, 0x43, 0x2b, 0x31, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x34, 0x3a, 0x30, 0x30, 0x0
+};
+// GENERATED PART ENDS HERE
+
+QT_END_NAMESPACE
+
+#endif // QTIMEZONEPRIVATE_DATA_P_H
diff --git a/src/corelib/tools/qtimezoneprivate_icu.cpp b/src/corelib/time/qtimezoneprivate_icu.cpp
index 5570ce7571..5570ce7571 100644
--- a/src/corelib/tools/qtimezoneprivate_icu.cpp
+++ b/src/corelib/time/qtimezoneprivate_icu.cpp
diff --git a/src/corelib/tools/qtimezoneprivate_mac.mm b/src/corelib/time/qtimezoneprivate_mac.mm
index d3c4fbe5da..d3c4fbe5da 100644
--- a/src/corelib/tools/qtimezoneprivate_mac.mm
+++ b/src/corelib/time/qtimezoneprivate_mac.mm
diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h
index 24a9a00f11..5f6491ef81 100644
--- a/src/corelib/tools/qtimezoneprivate_p.h
+++ b/src/corelib/time/qtimezoneprivate_p.h
@@ -53,7 +53,7 @@
 //
 
 #include "qtimezone.h"
-#include "qlocale_p.h"
+#include "private/qlocale_p.h"
 #include "qvector.h"
 
 #if QT_CONFIG(icu)
@@ -282,9 +282,9 @@ struct QTzTransitionRule
     quint8 abbreviationIndex;
 };
 Q_DECLARE_TYPEINFO(QTzTransitionRule, Q_PRIMITIVE_TYPE);
-Q_DECL_CONSTEXPR inline bool operator==(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator==(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) noexcept
 { return lhs.stdOffset == rhs.stdOffset && lhs.dstOffset == rhs.dstOffset && lhs.abbreviationIndex == rhs.abbreviationIndex; }
-Q_DECL_CONSTEXPR inline bool operator!=(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator!=(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) noexcept
 { return !operator==(lhs, rhs); }
 
 class Q_AUTOTEST_EXPORT QTzTimeZonePrivate final : public QTimeZonePrivate
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
index 57bc000af5..3c2695a789 100644
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
@@ -39,7 +39,7 @@
 
 #include "qtimezone.h"
 #include "qtimezoneprivate_p.h"
-#include "qdatetime_p.h" // ### Qt 5.14: remove once YearRange is on QDateTime
+#include "private/qlocale_tools_p.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QHash>
@@ -48,8 +48,6 @@
 
 #include <qdebug.h>
 
-#include "qlocale_tools_p.h"
-
 #include <algorithm>
 #include <errno.h>
 #include <limits.h>
@@ -474,7 +472,7 @@ struct PosixZone
     static PosixZone invalid() { return {QString(), InvalidOffset}; }
     static PosixZone parse(const char *&pos, const char *end);
 
-    bool hasValidOffset() const Q_DECL_NOTHROW { return offset != InvalidOffset; }
+    bool hasValidOffset() const noexcept { return offset != InvalidOffset; }
 };
 
 } // unnamed namespace
@@ -522,6 +520,10 @@ PosixZone PosixZone::parse(const char *&pos, const char *end)
     QString name = QString::fromUtf8(nameBegin, nameEnd - nameBegin);
     const int offset = zoneEnd > zoneBegin ? parsePosixOffset(zoneBegin, zoneEnd) : InvalidOffset;
     pos = zoneEnd;
+    // UTC+hh:mm:ss or GMT+hh:mm:ss should be read as offsets from UTC, not as a
+    // POSIX rule naming a zone as UTC or GMT and specifying a non-zero offset.
+    if (offset != 0 && (name == QLatin1String("UTC") || name == QLatin1String("GMT")))
+        return invalid();
     return {std::move(name), offset};
 }
 
@@ -586,8 +588,8 @@ static QVector<QTimeZonePrivate::Data> calculatePosixTransitions(const QByteArra
         stdTime = QTime(2, 0, 0);
 
     // Limit year to the range QDateTime can represent:
-    const int minYear = int(QDateTimePrivate::YearRange::First);
-    const int maxYear = int(QDateTimePrivate::YearRange::Last);
+    const int minYear = int(QDateTime::YearRange::First);
+    const int maxYear = int(QDateTime::YearRange::Last);
     startYear = qBound(minYear, startYear, maxYear);
     endYear = qBound(minYear, endYear, maxYear);
     Q_ASSERT(startYear <= endYear);
@@ -660,8 +662,17 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
         tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
         if (!tzif.open(QIODevice::ReadOnly)) {
             tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-            if (!tzif.open(QIODevice::ReadOnly))
+            if (!tzif.open(QIODevice::ReadOnly)) {
+                // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
+                const QByteArray zoneInfo = ianaId.split(',').at(0);
+                const char *begin = zoneInfo.constBegin();
+                if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset()
+                    && (begin == zoneInfo.constEnd()
+                        || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) {
+                    m_id = m_posixRule = ianaId;
+                }
                 return;
+            }
         }
     }
 
@@ -1100,7 +1111,7 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
             path = QFile::symLinkTarget(path);
         if (index >= 0) {
             // /etc/localtime is a symlink to the current TZ file, so extract from path
-            ianaId = path.mid(index + zoneinfo.size()).toUtf8();
+            ianaId = path.midRef(index + zoneinfo.size()).toUtf8();
         }
     }
 
@@ -1126,14 +1137,21 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
             while (ianaId.isEmpty() && !ts.atEnd() && ts.status() == QTextStream::Ok) {
                 line = ts.readLine();
                 if (line.startsWith(QLatin1String("ZONE="))) {
-                    ianaId = line.mid(6, line.size() - 7).toUtf8();
+                    ianaId = line.midRef(6, line.size() - 7).toUtf8();
                 } else if (line.startsWith(QLatin1String("TIMEZONE="))) {
-                    ianaId = line.mid(10, line.size() - 11).toUtf8();
+                    ianaId = line.midRef(10, line.size() - 11).toUtf8();
                 }
             }
         }
     }
 
+    // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
+    if (ianaId.isEmpty()) {
+        QFile zone(QStringLiteral("/etc/TZ"));
+        if (zone.open(QIODevice::ReadOnly))
+            ianaId = zone.readAll().trimmed();
+    }
+
     // Give up for now and return UTC
     if (ianaId.isEmpty())
         ianaId = utcQByteArray();
diff --git a/src/corelib/tools/qtimezoneprivate_win.cpp b/src/corelib/time/qtimezoneprivate_win.cpp
index 1bf2366748..0fec5355b2 100644
--- a/src/corelib/tools/qtimezoneprivate_win.cpp
+++ b/src/corelib/time/qtimezoneprivate_win.cpp
@@ -46,13 +46,14 @@
 
 #include <algorithm>
 
-QT_BEGIN_NAMESPACE
-
 #ifndef Q_OS_WINRT
+#include <private/qwinregistry_p.h>
 // The registry-based timezone backend is not available on WinRT, which falls back to equivalent APIs.
 #define QT_USE_REGISTRY_TIMEZONE 1
 #endif
 
+QT_BEGIN_NAMESPACE
+
 /*
     Private
 
@@ -71,8 +72,8 @@ QT_BEGIN_NAMESPACE
 // Vista introduced support for historic data, see MSDN docs on DYNAMIC_TIME_ZONE_INFORMATION
 // http://msdn.microsoft.com/en-gb/library/windows/desktop/ms724253%28v=vs.85%29.aspx
 #ifdef QT_USE_REGISTRY_TIMEZONE
-static const char tzRegPath[] = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones";
-static const char currTzRegPath[] = "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation";
+static const wchar_t tzRegPath[] = LR"(SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones)";
+static const wchar_t currTzRegPath[] = LR"(SYSTEM\CurrentControlSet\Control\TimeZoneInformation)";
 #endif
 
 enum {
@@ -138,27 +139,6 @@ bool equalTzi(const TIME_ZONE_INFORMATION &tzi1, const TIME_ZONE_INFORMATION &tz
 }
 
 #ifdef QT_USE_REGISTRY_TIMEZONE
-bool openRegistryKey(const QString &keyPath, HKEY *key)
-{
-    return RegOpenKeyEx(HKEY_LOCAL_MACHINE, reinterpret_cast<const wchar_t*>(keyPath.utf16()),
-                        0, KEY_READ, key) == ERROR_SUCCESS;
-}
-
-QString readRegistryString(const HKEY &key, const wchar_t *value)
-{
-    wchar_t buffer[MAX_PATH] = {0};
-    DWORD size = sizeof(wchar_t) * MAX_PATH;
-    RegQueryValueEx(key, value, nullptr, nullptr, reinterpret_cast<LPBYTE>(buffer), &size);
-    return QString::fromWCharArray(buffer);
-}
-
-int readRegistryValue(const HKEY &key, const wchar_t *value)
-{
-    DWORD buffer;
-    DWORD size = sizeof(buffer);
-    RegQueryValueEx(key, value, nullptr, nullptr, reinterpret_cast<LPBYTE>(&buffer), &size);
-    return buffer;
-}
 
 QWinTimeZonePrivate::QWinTransitionRule readRegistryRule(const HKEY &key,
                                                          const wchar_t *value, bool *ok)
@@ -185,12 +165,11 @@ TIME_ZONE_INFORMATION getRegistryTzi(const QByteArray &windowsId, bool *ok)
     TIME_ZONE_INFORMATION tzi;
     REG_TZI_FORMAT regTzi;
     DWORD regTziSize = sizeof(regTzi);
-    HKEY key = NULL;
-    const QString tziKeyPath = QString::fromUtf8(tzRegPath) + QLatin1Char('\\')
+    const QString tziKeyPath = QString::fromWCharArray(tzRegPath) + QLatin1Char('\\')
                                + QString::fromUtf8(windowsId);
 
-    if (openRegistryKey(tziKeyPath, &key)) {
-
+    QWinRegistryKey key(HKEY_LOCAL_MACHINE, tziKeyPath);
+    if (key.isValid()) {
         DWORD size = sizeof(tzi.DaylightName);
         RegQueryValueEx(key, L"Dlt", nullptr, nullptr, reinterpret_cast<LPBYTE>(tzi.DaylightName), &size);
 
@@ -206,8 +185,6 @@ TIME_ZONE_INFORMATION getRegistryTzi(const QByteArray &windowsId, bool *ok)
             tzi.DaylightDate = regTzi.DaylightDate;
             *ok = true;
         }
-
-        RegCloseKey(key);
     }
 
     return tzi;
@@ -299,8 +276,8 @@ QList<QByteArray> availableWindowsIds()
 #ifdef QT_USE_REGISTRY_TIMEZONE
     // TODO Consider caching results in a global static, very unlikely to change.
     QList<QByteArray> list;
-    HKEY key = NULL;
-    if (openRegistryKey(QString::fromUtf8(tzRegPath), &key)) {
+    QWinRegistryKey key(HKEY_LOCAL_MACHINE, tzRegPath);
+    if (key.isValid()) {
         DWORD idCount = 0;
         if (RegQueryInfoKey(key, 0, 0, 0, &idCount, 0, 0, 0, 0, 0, 0, 0) == ERROR_SUCCESS
             && idCount > 0) {
@@ -311,7 +288,6 @@ QList<QByteArray> availableWindowsIds()
                     list.append(QString::fromWCharArray(buffer).toUtf8());
             }
         }
-        RegCloseKey(key);
     }
     return list;
 #else // QT_USE_REGISTRY_TIMEZONE
@@ -325,15 +301,10 @@ QByteArray windowsSystemZoneId()
 {
 #ifdef QT_USE_REGISTRY_TIMEZONE
     // On Vista and later is held in the value TimeZoneKeyName in key currTzRegPath
-    QString id;
-    HKEY key = NULL;
-    QString tziKeyPath = QString::fromUtf8(currTzRegPath);
-    if (openRegistryKey(tziKeyPath, &key)) {
-        id = readRegistryString(key, L"TimeZoneKeyName");
-        RegCloseKey(key);
-        if (!id.isEmpty())
-            return std::move(id).toUtf8();
-    }
+    const QString id = QWinRegistryKey(HKEY_LOCAL_MACHINE, currTzRegPath)
+                       .stringValue(L"TimeZoneKeyName");
+    if (!id.isEmpty())
+        return id.toUtf8();
 
     // On XP we have to iterate over the zones until we find a match on
     // names/offsets with the current data
@@ -371,6 +342,7 @@ QDate calculateTransitionLocalDate(const SYSTEMTIME &rule, int year)
     // Otherwise, the rule date is annual and relative:
     const int dayOfWeek = rule.wDayOfWeek == 0 ? 7 : rule.wDayOfWeek;
     QDate date(year, rule.wMonth, 1);
+    Q_ASSERT(date.isValid());
     // How many days before was last dayOfWeek before target month ?
     int adjust = dayOfWeek - date.dayOfWeek(); // -6 <= adjust < 7
     if (adjust >= 0) // Ensure -7 <= adjust < 0:
@@ -401,6 +373,7 @@ qint64 calculateTransitionForYear(const SYSTEMTIME &rule, int year, int bias)
 {
     // TODO Consider caching the calculated values - i.e. replace SYSTEMTIME in
     // WinTransitionRule; do this in init() once and store the results.
+    Q_ASSERT(year);
     const QDate date = calculateTransitionLocalDate(rule, year);
     const QTime time = QTime(rule.wHour, rule.wMinute, rule.wSecond);
     if (date.isValid() && time.isValid())
@@ -479,6 +452,7 @@ struct TransitionTimePair
 
 int yearEndOffset(const QWinTimeZonePrivate::QWinTransitionRule &rule, int year)
 {
+    Q_ASSERT(year);
     int offset = rule.standardTimeBias;
     // Only needed to help another TransitionTimePair work out year + 1's start
     // offset; and the oldYearOffset we use only affects an alleged transition
@@ -572,22 +546,22 @@ void QWinTimeZonePrivate::init(const QByteArray &ianaId)
     if (!m_windowsId.isEmpty()) {
 #ifdef QT_USE_REGISTRY_TIMEZONE
         // Open the base TZI for the time zone
-        HKEY baseKey = NULL;
-        const QString baseKeyPath = QString::fromUtf8(tzRegPath) + QLatin1Char('\\')
+        const QString baseKeyPath = QString::fromWCharArray(tzRegPath) + QLatin1Char('\\')
                                    + QString::fromUtf8(m_windowsId);
-        if (openRegistryKey(baseKeyPath, &baseKey)) {
+        QWinRegistryKey baseKey(HKEY_LOCAL_MACHINE, baseKeyPath);
+        if (baseKey.isValid()) {
             //  Load the localized names
-            m_displayName = readRegistryString(baseKey, L"Display");
-            m_standardName = readRegistryString(baseKey, L"Std");
-            m_daylightName = readRegistryString(baseKey, L"Dlt");
+            m_displayName = baseKey.stringValue(L"Display");
+            m_standardName = baseKey.stringValue(L"Std");
+            m_daylightName = baseKey.stringValue(L"Dlt");
             // On Vista and later the optional dynamic key holds historic data
             const QString dynamicKeyPath = baseKeyPath + QLatin1String("\\Dynamic DST");
-            HKEY dynamicKey = NULL;
-            if (openRegistryKey(dynamicKeyPath, &dynamicKey)) {
+            QWinRegistryKey dynamicKey(HKEY_LOCAL_MACHINE, dynamicKeyPath);
+            if (dynamicKey.isValid()) {
                 // Find out the start and end years stored, then iterate over them
-                int startYear = readRegistryValue(dynamicKey, L"FirstEntry");
-                int endYear = readRegistryValue(dynamicKey, L"LastEntry");
-                for (int year = startYear; year <= endYear; ++year) {
+                const auto startYear = dynamicKey.dwordValue(L"FirstEntry");
+                const auto endYear = dynamicKey.dwordValue(L"LastEntry");
+                for (int year = int(startYear.first); year <= int(endYear.first); ++year) {
                     bool ruleOk;
                     QWinTransitionRule rule = readRegistryRule(dynamicKey,
                                                                reinterpret_cast<LPCWSTR>(QString::number(year).utf16()),
@@ -608,7 +582,6 @@ void QWinTimeZonePrivate::init(const QByteArray &ianaId)
                         m_tranRules.append(rule);
                     }
                 }
-                RegCloseKey(dynamicKey);
             } else {
                 // No dynamic data so use the base data
                 bool ruleOk;
@@ -617,7 +590,6 @@ void QWinTimeZonePrivate::init(const QByteArray &ianaId)
                 if (ruleOk)
                     m_tranRules.append(rule);
             }
-            RegCloseKey(baseKey);
         }
 #else // QT_USE_REGISTRY_TIMEZONE
         if (gTimeZones->isEmpty())
@@ -743,11 +715,12 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::data(qint64 forMSecsSinceEpoch) cons
         const QWinTransitionRule &rule = m_tranRules.at(ruleIndex);
         // Does this rule's period include any transition at all ?
         if (rule.standardTimeRule.wMonth > 0 || rule.daylightTimeRule.wMonth > 0) {
-            const int endYear = qMax(rule.startYear, year - 1);
+            int prior = year == 1 ? -1 : year - 1; // No year 0.
+            const int endYear = qMax(rule.startYear, prior);
             while (year >= endYear) {
                 const int newYearOffset = (year <= rule.startYear && ruleIndex > 0)
-                    ? yearEndOffset(m_tranRules.at(ruleIndex - 1), year - 1)
-                    : yearEndOffset(rule, year - 1);
+                    ? yearEndOffset(m_tranRules.at(ruleIndex - 1), prior)
+                    : yearEndOffset(rule, prior);
                 const TransitionTimePair pair(rule, year, newYearOffset);
                 bool isDst = false;
                 if (pair.std != invalidMSecs() && pair.std <= forMSecsSinceEpoch) {
@@ -755,7 +728,8 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::data(qint64 forMSecsSinceEpoch) cons
                 } else if (pair.dst != invalidMSecs() && pair.dst <= forMSecsSinceEpoch) {
                     isDst = true;
                 } else {
-                    --year; // Try an earlier year for this rule (once).
+                    year = prior; // Try an earlier year for this rule (once).
+                    prior = year == 1 ? -1 : year - 1; // No year 0.
                     continue;
                 }
                 return ruleToData(rule, forMSecsSinceEpoch,
@@ -767,8 +741,11 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::data(qint64 forMSecsSinceEpoch) cons
             // No transition, no DST, use the year's standard time.
             return ruleToData(rule, forMSecsSinceEpoch, QTimeZone::StandardTime);
         }
-        if (year >= rule.startYear)
+        if (year >= rule.startYear) {
             year = rule.startYear - 1; // Seek last transition in new rule.
+            if (!year)
+                --year;
+        }
     }
     // We don't have relevant data :-(
     return invalidData();
@@ -795,9 +772,10 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::nextTransition(qint64 afterMSecsSinc
                 year = rule.startYear; // Seek first transition in this rule.
             const int endYear = ruleIndex + 1 < m_tranRules.count()
                 ? qMin(m_tranRules.at(ruleIndex + 1).startYear, year + 2) : (year + 2);
+            int prior = year == 1 ? -1 : year - 1; // No year 0.
             int newYearOffset = (year <= rule.startYear && ruleIndex > 0)
-                ? yearEndOffset(m_tranRules.at(ruleIndex - 1), year - 1)
-                : yearEndOffset(rule, year - 1);
+                ? yearEndOffset(m_tranRules.at(ruleIndex - 1), prior)
+                : yearEndOffset(rule, prior);
             while (year < endYear) {
                 const TransitionTimePair pair(rule, year, newYearOffset);
                 bool isDst = false;
@@ -810,7 +788,9 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::nextTransition(qint64 afterMSecsSinc
                     newYearOffset = rule.standardTimeBias;
                     if (pair.dst > pair.std)
                         newYearOffset += rule.daylightTimeBias;
-                    ++year; // Try a later year for this rule (once).
+                    // Try a later year for this rule (once).
+                    prior = year;
+                    year = year == -1 ? 1 : year + 1; // No year 0
                     continue;
                 }
 
@@ -837,11 +817,12 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::previousTransition(qint64 beforeMSec
         const QWinTransitionRule &rule = m_tranRules.at(ruleIndex);
         // Does this rule's period include any transition at all ?
         if (rule.standardTimeRule.wMonth > 0 || rule.daylightTimeRule.wMonth > 0) {
-            const int endYear = qMax(rule.startYear, year - 1);
+            int prior = year == 1 ? -1 : year - 1; // No year 0.
+            const int endYear = qMax(rule.startYear, prior);
             while (year >= endYear) {
                 const int newYearOffset = (year <= rule.startYear && ruleIndex > 0)
-                    ? yearEndOffset(m_tranRules.at(ruleIndex - 1), year - 1)
-                    : yearEndOffset(rule, year - 1);
+                    ? yearEndOffset(m_tranRules.at(ruleIndex - 1), prior)
+                    : yearEndOffset(rule, prior);
                 const TransitionTimePair pair(rule, year, newYearOffset);
                 bool isDst = false;
                 if (pair.std != invalidMSecs() && pair.std < beforeMSecsSinceEpoch) {
@@ -849,7 +830,8 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::previousTransition(qint64 beforeMSec
                 } else if (pair.dst != invalidMSecs() && pair.dst < beforeMSecsSinceEpoch) {
                     isDst = true;
                 } else {
-                    --year; // Try an earlier year for this rule (once).
+                    year = prior; // Try an earlier year for this rule (once).
+                    prior = year == 1 ? -1 : year - 1; // No year 0.
                     continue;
                 }
                 if (isDst)
@@ -863,8 +845,11 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::previousTransition(qint64 beforeMSec
             // rule:
             return ruleToData(rule, startOfTime, QTimeZone::StandardTime, false);
         } // else: no transition during rule's period
-        if (year >= rule.startYear)
+        if (year >= rule.startYear) {
             year = rule.startYear - 1; // Seek last transition in new rule
+            if (!year)
+                --year;
+        }
     }
     // Apparently no transition before the given time:
     return invalidData();
diff --git a/src/corelib/time/time.pri b/src/corelib/time/time.pri
new file mode 100644
index 0000000000..84efbfbfd2
--- /dev/null
+++ b/src/corelib/time/time.pri
@@ -0,0 +1,71 @@
+# Qt time / date / zone / calendar module
+
+HEADERS += \
+        time/qcalendar.h \
+        time/qcalendarbackend_p.h \
+        time/qcalendarmath_p.h \
+        time/qdatetime.h \
+        time/qdatetime_p.h \
+        time/qgregoriancalendar_p.h \
+        time/qjuliancalendar_p.h \
+        time/qmilankoviccalendar_p.h \
+        time/qromancalendar_p.h \
+        time/qromancalendar_data_p.h
+
+SOURCES += \
+        time/qdatetime.cpp \
+        time/qcalendar.cpp \
+        time/qgregoriancalendar.cpp \
+        time/qjuliancalendar.cpp \
+        time/qmilankoviccalendar.cpp \
+        time/qromancalendar.cpp
+
+qtConfig(hijricalendar) {
+    SOURCES += \
+        time/qhijricalendar.cpp
+    HEADERS += \
+        time/qhijricalendar_p.h \
+        time/qhijricalendar_data_p.h
+}
+
+qtConfig(islamiccivilcalendar) {
+    SOURCES += \
+        time/qislamiccivilcalendar.cpp
+    HEADERS += \
+        time/qislamiccivilcalendar_p.h
+}
+
+qtConfig(jalalicalendar) {
+    SOURCES += \
+        time/qjalalicalendar.cpp
+    HEADERS += \
+        time/qjalalicalendar_p.h \
+        time/qjalalicalendar_data_p.h
+}
+
+qtConfig(timezone) {
+    HEADERS += \
+        time/qtimezone.h \
+        time/qtimezoneprivate_p.h \
+        time/qtimezoneprivate_data_p.h
+    SOURCES += \
+        time/qtimezone.cpp \
+        time/qtimezoneprivate.cpp
+    !nacl:darwin: {
+        SOURCES += time/qtimezoneprivate_mac.mm
+    } else: android:!android-embedded: {
+        SOURCES += time/qtimezoneprivate_android.cpp
+    } else: unix: {
+        SOURCES += time/qtimezoneprivate_tz.cpp
+        qtConfig(icu): SOURCES += time/qtimezoneprivate_icu.cpp
+    } else: qtConfig(icu): {
+        SOURCES += time/qtimezoneprivate_icu.cpp
+    } else: win32: {
+        SOURCES += time/qtimezoneprivate_win.cpp
+    }
+}
+
+qtConfig(datetimeparser) {
+    HEADERS += time/qdatetimeparser_p.h
+    SOURCES += time/qdatetimeparser.cpp
+}
diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h
index 0146e22fa3..b01ce0db58 100644
--- a/src/corelib/tools/qalgorithms.h
+++ b/src/corelib/tools/qalgorithms.h
@@ -524,7 +524,7 @@ QT_DEPRECATED_X("Use std::binary_search") Q_OUTOFLINE_TEMPLATE RandomAccessItera
 #  if (defined __apple_build_version__ &&  __clang_major__ >= 7) || (Q_CC_CLANG >= 307)
 #    define QT_HAS_CONSTEXPR_BUILTINS
 #  endif
-#elif defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) && !defined(Q_OS_WINCE) && !defined(Q_PROCESSOR_ARM)
+#elif defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) && !defined(Q_PROCESSOR_ARM)
 #  define QT_HAS_CONSTEXPR_BUILTINS
 #elif defined(Q_CC_GNU)
 #  define QT_HAS_CONSTEXPR_BUILTINS
@@ -533,7 +533,7 @@ QT_DEPRECATED_X("Use std::binary_search") Q_OUTOFLINE_TEMPLATE RandomAccessItera
 #if defined QT_HAS_CONSTEXPR_BUILTINS
 #if defined(Q_CC_GNU) || defined(Q_CC_CLANG)
 #  define QT_HAS_BUILTIN_CTZS
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) noexcept
 {
 #  if QT_HAS_BUILTIN(__builtin_ctzs)
     return __builtin_ctzs(v);
@@ -542,7 +542,7 @@ Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) Q_DECL_NOTHROW
 #  endif
 }
 #define QT_HAS_BUILTIN_CLZS
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) noexcept
 {
 #  if QT_HAS_BUILTIN(__builtin_clzs)
     return __builtin_clzs(v);
@@ -551,44 +551,44 @@ Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) Q_DECL_NOTHROW
 #  endif
 }
 #define QT_HAS_BUILTIN_CTZ
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctz(quint32 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctz(quint32 v) noexcept
 {
     return __builtin_ctz(v);
 }
 #define QT_HAS_BUILTIN_CLZ
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clz(quint32 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clz(quint32 v) noexcept
 {
     return __builtin_clz(v);
 }
 #define QT_HAS_BUILTIN_CTZLL
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzll(quint64 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzll(quint64 v) noexcept
 {
     return __builtin_ctzll(v);
 }
 #define QT_HAS_BUILTIN_CLZLL
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzll(quint64 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzll(quint64 v) noexcept
 {
     return __builtin_clzll(v);
 }
 #define QALGORITHMS_USE_BUILTIN_POPCOUNT
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint32 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint32 v) noexcept
 {
     return __builtin_popcount(v);
 }
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint8 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint8 v) noexcept
 {
     return __builtin_popcount(v);
 }
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint16 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint16 v) noexcept
 {
     return __builtin_popcount(v);
 }
 #define QALGORITHMS_USE_BUILTIN_POPCOUNTLL
-Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) noexcept
 {
     return __builtin_popcountll(v);
 }
-#elif defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) && !defined(Q_PROCESSOR_ARM)
+#elif defined(Q_CC_MSVC) && !defined(Q_PROCESSOR_ARM)
 #define QT_POPCOUNT_CONSTEXPR
 #define QT_POPCOUNT_RELAXED_CONSTEXPR
 #define QT_HAS_BUILTIN_CTZ
@@ -630,12 +630,12 @@ Q_ALWAYS_INLINE unsigned long qt_builtin_clzll(quint64 val)
 }
 #endif // MSVC 64bit
 #  define QT_HAS_BUILTIN_CTZS
-Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) Q_DECL_NOTHROW
+Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) noexcept
 {
     return qt_builtin_ctz(v);
 }
 #define QT_HAS_BUILTIN_CLZS
-Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) Q_DECL_NOTHROW
+Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) noexcept
 {
     return qt_builtin_clz(v) - 16U;
 }
@@ -652,19 +652,19 @@ Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) Q_DECL_NOTHROW
 #if defined(__AVX__) || defined(__SSE4_2__) || defined(__POPCNT__)
 #define QALGORITHMS_USE_BUILTIN_POPCOUNT
 #define QALGORITHMS_USE_BUILTIN_POPCOUNTLL
-Q_ALWAYS_INLINE uint qt_builtin_popcount(quint32 v) Q_DECL_NOTHROW
+Q_ALWAYS_INLINE uint qt_builtin_popcount(quint32 v) noexcept
 {
     return __popcnt(v);
 }
-Q_ALWAYS_INLINE uint qt_builtin_popcount(quint8 v) Q_DECL_NOTHROW
+Q_ALWAYS_INLINE uint qt_builtin_popcount(quint8 v) noexcept
 {
     return __popcnt16(v);
 }
-Q_ALWAYS_INLINE uint qt_builtin_popcount(quint16 v) Q_DECL_NOTHROW
+Q_ALWAYS_INLINE uint qt_builtin_popcount(quint16 v) noexcept
 {
     return __popcnt16(v);
 }
-Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NOTHROW
+Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) noexcept
 {
 #if Q_PROCESSOR_WORDSIZE == 8
     return __popcnt64(v);
@@ -685,7 +685,7 @@ Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NOTHROW
 
 } //namespace QAlgorithmsPrivate
 
-Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint32 v) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint32 v) noexcept
 {
 #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT
     return QAlgorithmsPrivate::qt_builtin_popcount(v);
@@ -698,7 +698,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint32
 #endif
 }
 
-Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint8 v) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint8 v) noexcept
 {
 #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT
     return QAlgorithmsPrivate::qt_builtin_popcount(v);
@@ -708,7 +708,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint8
 #endif
 }
 
-Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint16 v) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint16 v) noexcept
 {
 #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT
     return QAlgorithmsPrivate::qt_builtin_popcount(v);
@@ -719,7 +719,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint16
 #endif
 }
 
-Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint64 v) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint64 v) noexcept
 {
 #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNTLL
     return QAlgorithmsPrivate::qt_builtin_popcountll(v);
@@ -734,7 +734,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint64
 #endif
 }
 
-Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(long unsigned int v) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(long unsigned int v) noexcept
 {
     return qPopulationCount(static_cast<quint64>(v));
 }
@@ -744,7 +744,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(long un
 #endif
 #undef QT_POPCOUNT_CONSTEXPR
 
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint32 v) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint32 v) noexcept
 {
 #if defined(QT_HAS_BUILTIN_CTZ)
     return v ? QAlgorithmsPrivate::qt_builtin_ctz(v) : 32U;
@@ -762,7 +762,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint32 v) Q_DECL_NO
 #endif
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint8 v) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint8 v) noexcept
 {
 #if defined(QT_HAS_BUILTIN_CTZ)
     return v ? QAlgorithmsPrivate::qt_builtin_ctz(v) : 8U;
@@ -777,7 +777,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint8 v) Q_DECL_NOT
 #endif
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint16 v) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint16 v) noexcept
 {
 #if defined(QT_HAS_BUILTIN_CTZS)
     return v ? QAlgorithmsPrivate::qt_builtin_ctzs(v) : 16U;
@@ -793,7 +793,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint16 v) Q_DECL_NO
 #endif
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint64 v) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint64 v) noexcept
 {
 #if defined(QT_HAS_BUILTIN_CTZLL)
     return v ? QAlgorithmsPrivate::qt_builtin_ctzll(v) : 64;
@@ -804,12 +804,12 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint64 v) Q_DECL_NO
 #endif
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(unsigned long v) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(unsigned long v) noexcept
 {
     return qCountTrailingZeroBits(QIntegerForSizeof<long>::Unsigned(v));
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint32 v) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint32 v) noexcept
 {
 #if defined(QT_HAS_BUILTIN_CLZ)
     return v ? QAlgorithmsPrivate::qt_builtin_clz(v) : 32U;
@@ -824,7 +824,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint32 v) Q_DECL_NOT
 #endif
 }
 
-QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) Q_DECL_NOTHROW
+QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) noexcept
 {
 #if defined(QT_HAS_BUILTIN_CLZ)
     return v ? QAlgorithmsPrivate::qt_builtin_clz(v)-24U : 8U;
@@ -836,7 +836,7 @@ QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) Q_DECL
 #endif
 }
 
-QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DECL_NOTHROW
+QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) noexcept
 {
 #if defined(QT_HAS_BUILTIN_CLZS)
     return v ? QAlgorithmsPrivate::qt_builtin_clzs(v) : 16U;
@@ -849,7 +849,7 @@ QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DEC
 #endif
 }
 
-QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) Q_DECL_NOTHROW
+QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) noexcept
 {
 #if defined(QT_HAS_BUILTIN_CLZLL)
     return v ? QAlgorithmsPrivate::qt_builtin_clzll(v) : 64U;
@@ -864,7 +864,7 @@ QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) Q_DEC
 #endif
 }
 
-QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(unsigned long v) Q_DECL_NOTHROW
+QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(unsigned long v) noexcept
 {
     return qCountLeadingZeroBits(QIntegerForSizeof<long>::Unsigned(v));
 }
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
index a91d833e3b..234a44f6b6 100644
--- a/src/corelib/tools/qarraydata.cpp
+++ b/src/corelib/tools/qarraydata.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -41,11 +41,114 @@
 #include <QtCore/qarraydata.h>
 #include <QtCore/private/qnumeric_p.h>
 #include <QtCore/private/qtools_p.h>
+#include <QtCore/qmath.h>
 
 #include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
 
+/*
+ * This pair of functions is declared in qtools_p.h and is used by the Qt
+ * containers to allocate memory and grow the memory block during append
+ * operations.
+ *
+ * They take size_t parameters and return size_t so they will change sizes
+ * according to the pointer width. However, knowing Qt containers store the
+ * container size and element indexes in ints, these functions never return a
+ * size larger than INT_MAX. This is done by casting the element count and
+ * memory block size to int in several comparisons: the check for negative is
+ * very fast on most platforms as the code only needs to check the sign bit.
+ *
+ * These functions return SIZE_MAX on overflow, which can be passed to malloc()
+ * and will surely cause a NULL return (there's no way you can allocate a
+ * memory block the size of your entire VM space).
+ */
+
+/*!
+    \internal
+    \since 5.7
+
+    Returns the memory block size for a container containing \a elementCount
+    elements, each of \a elementSize bytes, plus a header of \a headerSize
+    bytes. That is, this function returns \c
+      {elementCount * elementSize + headerSize}
+
+    but unlike the simple calculation, it checks for overflows during the
+    multiplication and the addition.
+
+    Both \a elementCount and \a headerSize can be zero, but \a elementSize
+    cannot.
+
+    This function returns SIZE_MAX (~0) on overflow or if the memory block size
+    would not fit an int.
+*/
+size_t qCalculateBlockSize(size_t elementCount, size_t elementSize, size_t headerSize) noexcept
+{
+    unsigned count = unsigned(elementCount);
+    unsigned size = unsigned(elementSize);
+    unsigned header = unsigned(headerSize);
+    Q_ASSERT(elementSize);
+    Q_ASSERT(size == elementSize);
+    Q_ASSERT(header == headerSize);
+
+    if (Q_UNLIKELY(count != elementCount))
+        return std::numeric_limits<size_t>::max();
+
+    unsigned bytes;
+    if (Q_UNLIKELY(mul_overflow(size, count, &bytes)) ||
+            Q_UNLIKELY(add_overflow(bytes, header, &bytes)))
+        return std::numeric_limits<size_t>::max();
+    if (Q_UNLIKELY(int(bytes) < 0))     // catches bytes >= 2GB
+        return std::numeric_limits<size_t>::max();
+
+    return bytes;
+}
+
+/*!
+    \internal
+    \since 5.7
+
+    Returns the memory block size and the number of elements that will fit in
+    that block for a container containing \a elementCount elements, each of \a
+    elementSize bytes, plus a header of \a headerSize bytes. This function
+    assumes the container will grow and pre-allocates a growth factor.
+
+    Both \a elementCount and \a headerSize can be zero, but \a elementSize
+    cannot.
+
+    This function returns SIZE_MAX (~0) on overflow or if the memory block size
+    would not fit an int.
+
+    \note The memory block may contain up to \a elementSize - 1 bytes more than
+    needed.
+*/
+CalculateGrowingBlockSizeResult
+qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t headerSize) noexcept
+{
+    CalculateGrowingBlockSizeResult result = {
+        std::numeric_limits<size_t>::max(),std::numeric_limits<size_t>::max()
+    };
+
+    unsigned bytes = unsigned(qCalculateBlockSize(elementCount, elementSize, headerSize));
+    if (int(bytes) < 0)     // catches std::numeric_limits<size_t>::max()
+        return result;
+
+    unsigned morebytes = qNextPowerOfTwo(bytes);
+    if (Q_UNLIKELY(int(morebytes) < 0)) {
+        // catches morebytes == 2GB
+        // grow by half the difference between bytes and morebytes
+        bytes += (morebytes - bytes) / 2;
+    } else {
+        bytes = morebytes;
+    }
+
+    result.elementCount = (bytes - unsigned(headerSize)) / unsigned(elementSize);
+    result.size = bytes;
+    return result;
+}
+
+// End of qtools_p.h implementation
+
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
 
@@ -87,7 +190,7 @@ static QArrayData *reallocateData(QArrayData *header, size_t allocSize, uint opt
 }
 
 QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
-        size_t capacity, AllocationOptions options) Q_DECL_NOTHROW
+        size_t capacity, AllocationOptions options) noexcept
 {
     // Alignment is a power of two
     Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData)
@@ -112,7 +215,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
         headerSize += (alignment - Q_ALIGNOF(QArrayData));
 
     if (headerSize > size_t(MaxAllocSize))
-        return 0;
+        return nullptr;
 
     size_t allocSize = calculateBlockSize(capacity, objectSize, headerSize, options);
     QArrayData *header = static_cast<QArrayData *>(::malloc(allocSize));
@@ -121,9 +224,9 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
                 & ~(alignment - 1);
 
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        header->ref.atomic.store(bool(!(options & Unsharable)));
+        header->ref.atomic.storeRelaxed(bool(!(options & Unsharable)));
 #else
-        header->ref.atomic.store(1);
+        header->ref.atomic.storeRelaxed(1);
 #endif
         header->size = 0;
         header->alloc = capacity;
@@ -135,7 +238,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
 }
 
 QArrayData *QArrayData::reallocateUnaligned(QArrayData *data, size_t objectSize, size_t capacity,
-                                            AllocationOptions options) Q_DECL_NOTHROW
+                                            AllocationOptions options) noexcept
 {
     Q_ASSERT(data);
     Q_ASSERT(data->isMutable());
@@ -150,7 +253,7 @@ QArrayData *QArrayData::reallocateUnaligned(QArrayData *data, size_t objectSize,
 }
 
 void QArrayData::deallocate(QArrayData *data, size_t objectSize,
-        size_t alignment) Q_DECL_NOTHROW
+        size_t alignment) noexcept
 {
     // Alignment is a power of two
     Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData)
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h
index a642fb9b39..dcd95924c1 100644
--- a/src/corelib/tools/qarraydata.h
+++ b/src/corelib/tools/qarraydata.h
@@ -113,14 +113,14 @@ struct Q_CORE_EXPORT QArrayData
     }
 
     Q_REQUIRED_RESULT static QArrayData *allocate(size_t objectSize, size_t alignment,
-            size_t capacity, AllocationOptions options = Default) Q_DECL_NOTHROW;
+            size_t capacity, AllocationOptions options = Default) noexcept;
     Q_REQUIRED_RESULT static QArrayData *reallocateUnaligned(QArrayData *data, size_t objectSize,
-            size_t newCapacity, AllocationOptions newOptions = Default) Q_DECL_NOTHROW;
+            size_t newCapacity, AllocationOptions newOptions = Default) noexcept;
     static void deallocate(QArrayData *data, size_t objectSize,
-            size_t alignment) Q_DECL_NOTHROW;
+            size_t alignment) noexcept;
 
     static const QArrayData shared_null[2];
-    static QArrayData *sharedNull() Q_DECL_NOTHROW { return const_cast<QArrayData*>(shared_null); }
+    static QArrayData *sharedNull() noexcept { return const_cast<QArrayData*>(shared_null); }
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QArrayData::AllocationOptions)
@@ -254,7 +254,7 @@ struct QTypedArrayData
         return result;
     }
 
-    static QTypedArrayData *sharedNull() Q_DECL_NOTHROW
+    static QTypedArrayData *sharedNull() noexcept
     {
         Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
         return static_cast<QTypedArrayData *>(QArrayData::sharedNull());
@@ -306,8 +306,6 @@ struct QArrayDataPointerRef
 // accomplished by hiding a static const instance of QStaticArrayData, which is
 // POD.
 
-#if defined(Q_COMPILER_VARIADIC_MACROS)
-#if defined(Q_COMPILER_LAMBDA)
 // Hide array inside a lambda
 #define Q_ARRAY_LITERAL(Type, ...)                                              \
     ([]() -> QArrayDataPointerRef<Type> {                                       \
@@ -324,15 +322,18 @@ struct QArrayDataPointerRef
             return StaticWrapper::get();                                        \
         }())                                                                    \
     /**/
+
+#ifdef Q_COMPILER_CONSTEXPR
+#define Q_ARRAY_LITERAL_CHECK_LITERAL_TYPE(Type) Q_STATIC_ASSERT(std::is_literal_type<Type>::value)
+#else
+#define Q_ARRAY_LITERAL_CHECK_LITERAL_TYPE(Type) do {} while (0)
 #endif
-#endif // defined(Q_COMPILER_VARIADIC_MACROS)
 
-#if defined(Q_ARRAY_LITERAL)
 #define Q_ARRAY_LITERAL_IMPL(Type, ...)                                         \
-    union { Type type_must_be_POD; } dummy; Q_UNUSED(dummy)                     \
+    Q_ARRAY_LITERAL_CHECK_LITERAL_TYPE(Type);                                   \
                                                                                 \
     /* Portable compile-time array size computation */                          \
-    Type data[] = { __VA_ARGS__ }; Q_UNUSED(data)                               \
+    Q_CONSTEXPR Type data[] = { __VA_ARGS__ }; Q_UNUSED(data);                  \
     enum { Size = sizeof(data) / sizeof(data[0]) };                             \
                                                                                 \
     static const QStaticArrayData<Type, Size> literal = {                       \
@@ -342,31 +343,6 @@ struct QArrayDataPointerRef
         { static_cast<QTypedArrayData<Type> *>(                                 \
             const_cast<QArrayData *>(&literal.header)) };                       \
     /**/
-#else
-// As a fallback, memory is allocated and data copied to the heap.
-
-// The fallback macro does NOT use variadic macros and does NOT support
-// variable number of arguments. It is suitable for char arrays.
-
-namespace QtPrivate {
-    template <class T, size_t N>
-    inline QArrayDataPointerRef<T> qMakeArrayLiteral(const T (&array)[N])
-    {
-        union { T type_must_be_POD; } dummy; Q_UNUSED(dummy)
-
-        QArrayDataPointerRef<T> result = { QTypedArrayData<T>::allocate(N) };
-        Q_CHECK_PTR(result.ptr);
-
-        ::memcpy(result.ptr->data(), array, N * sizeof(T));
-        result.ptr->size = N;
-
-        return result;
-    }
-}
-
-#define Q_ARRAY_LITERAL(Type, Array) \
-    QT_PREPEND_NAMESPACE(QtPrivate::qMakeArrayLiteral)<Type>( Array )
-#endif // !defined(Q_ARRAY_LITERAL)
 
 namespace QtPrivate {
 struct Q_CORE_EXPORT QContainerImplHelper
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h
index 7e1b43f9b1..8e19525f07 100644
--- a/src/corelib/tools/qarraydataops.h
+++ b/src/corelib/tools/qarraydataops.h
@@ -106,7 +106,7 @@ struct QPodArrayOps
     void destroyAll() // Call from destructors, ONLY!
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(this->ref.atomic.load() == 0);
+        Q_ASSERT(this->ref.atomic.loadRelaxed() == 0);
 
         // As this is to be called only from destructor, it doesn't need to be
         // exception safe; size not updated.
@@ -204,7 +204,7 @@ struct QGenericArrayOps
         // As this is to be called only from destructor, it doesn't need to be
         // exception safe; size not updated.
 
-        Q_ASSERT(this->ref.atomic.load() == 0);
+        Q_ASSERT(this->ref.atomic.loadRelaxed() == 0);
 
         const T *const b = this->begin();
         const T *i = this->end();
diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h
index 51cfa6e849..af5173c9ad 100644
--- a/src/corelib/tools/qarraydatapointer.h
+++ b/src/corelib/tools/qarraydatapointer.h
@@ -52,7 +52,7 @@ private:
     typedef QArrayDataOps<T> DataOps;
 
 public:
-    QArrayDataPointer() Q_DECL_NOTHROW
+    QArrayDataPointer() noexcept
         : d(Data::sharedNull())
     {
     }
@@ -82,20 +82,18 @@ public:
         return *this;
     }
 
-#ifdef Q_COMPILER_RVALUE_REFS
-    QArrayDataPointer(QArrayDataPointer &&other) Q_DECL_NOTHROW
+    QArrayDataPointer(QArrayDataPointer &&other) noexcept
         : d(other.d)
     {
         other.d = Data::sharedNull();
     }
 
-    QArrayDataPointer &operator=(QArrayDataPointer &&other) Q_DECL_NOTHROW
+    QArrayDataPointer &operator=(QArrayDataPointer &&other) noexcept
     {
         QArrayDataPointer moved(std::move(other));
         this->swap(moved);
         return *this;
     }
-#endif
 
     DataOps &operator*() const
     {
@@ -150,7 +148,7 @@ public:
     bool isSharable() const { return d->isSharable(); }
 #endif
 
-    void swap(QArrayDataPointer &other) Q_DECL_NOTHROW
+    void swap(QArrayDataPointer &other) noexcept
     {
         qSwap(d, other.d);
     }
@@ -204,22 +202,11 @@ inline bool operator!=(const QArrayDataPointer<T> &lhs, const QArrayDataPointer<
 }
 
 template <class T>
-inline void qSwap(QArrayDataPointer<T> &p1, QArrayDataPointer<T> &p2)
+inline void swap(QArrayDataPointer<T> &p1, QArrayDataPointer<T> &p2)
 {
     p1.swap(p2);
 }
 
 QT_END_NAMESPACE
 
-namespace std
-{
-    template <class T>
-    inline void swap(
-            QT_PREPEND_NAMESPACE(QArrayDataPointer)<T> &p1,
-            QT_PREPEND_NAMESPACE(QArrayDataPointer)<T> &p2)
-    {
-        p1.swap(p2);
-    }
-}
-
 #endif // include guard
diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h
index ff40bf5654..9b0e931aca 100644
--- a/src/corelib/tools/qbitarray.h
+++ b/src/corelib/tools/qbitarray.h
@@ -50,21 +50,19 @@ class Q_CORE_EXPORT QBitArray
 {
     friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QBitArray &);
     friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QBitArray &);
-    friend Q_CORE_EXPORT uint qHash(const QBitArray &key, uint seed) Q_DECL_NOTHROW;
+    friend Q_CORE_EXPORT uint qHash(const QBitArray &key, uint seed) noexcept;
     QByteArray d;
 
 public:
-    inline QBitArray() Q_DECL_NOTHROW {}
+    inline QBitArray() noexcept {}
     explicit QBitArray(int size, bool val = false);
     QBitArray(const QBitArray &other) : d(other.d) {}
     inline QBitArray &operator=(const QBitArray &other) { d = other.d; return *this; }
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QBitArray(QBitArray &&other) Q_DECL_NOTHROW : d(std::move(other.d)) {}
-    inline QBitArray &operator=(QBitArray &&other) Q_DECL_NOTHROW
+    inline QBitArray(QBitArray &&other) noexcept : d(std::move(other.d)) {}
+    inline QBitArray &operator=(QBitArray &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
 
-    inline void swap(QBitArray &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    inline void swap(QBitArray &other) noexcept { qSwap(d, other.d); }
 
     inline int size() const { return (d.size() << 3) - *d.constData(); }
     inline int count() const { return (d.size() << 3) - *d.constData(); }
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
index 8c0e7860f7..4fcde46fbc 100644
--- a/src/corelib/tools/qcache.h
+++ b/src/corelib/tools/qcache.h
@@ -51,7 +51,7 @@ class QCache
     struct Node {
         inline Node() : keyPtr(0) {}
         inline Node(T *data, int cost)
-            : keyPtr(0), t(data), c(cost), p(0), n(0) {}
+            : keyPtr(nullptr), t(data), c(cost), p(nullptr), n(nullptr) {}
         const Key *keyPtr; T *t; int c; Node *p,*n;
     };
     Node *f, *l;
@@ -71,14 +71,14 @@ class QCache
     inline T *relink(const Key &key) {
         typename QHash<Key, Node>::iterator i = hash.find(key);
         if (typename QHash<Key, Node>::const_iterator(i) == hash.constEnd())
-            return 0;
+            return nullptr;
 
         Node &n = *i;
         if (f != &n) {
             if (n.p) n.p->n = n.n;
             if (n.n) n.n->p = n.p;
             if (l == &n) l = n.p;
-            n.p = 0;
+            n.p = nullptr;
             n.n = f;
             f->p = &n;
             f = &n;
@@ -89,7 +89,7 @@ class QCache
     Q_DISABLE_COPY(QCache)
 
 public:
-    inline explicit QCache(int maxCost = 100) Q_DECL_NOTHROW;
+    inline explicit QCache(int maxCost = 100) noexcept;
     inline ~QCache() { clear(); }
 
     inline int maxCost() const { return mx; }
@@ -116,13 +116,13 @@ private:
 };
 
 template <class Key, class T>
-inline QCache<Key, T>::QCache(int amaxCost) Q_DECL_NOTHROW
-    : f(0), l(0), mx(amaxCost), total(0) {}
+inline QCache<Key, T>::QCache(int amaxCost) noexcept
+    : f(nullptr), l(nullptr), mx(amaxCost), total(0) {}
 
 template <class Key, class T>
 inline void QCache<Key,T>::clear()
 { while (f) { delete f->t; f = f->n; }
- hash.clear(); l = 0; total = 0; }
+ hash.clear(); l = nullptr; total = 0; }
 
 template <class Key, class T>
 inline void QCache<Key,T>::setMaxCost(int m)
@@ -153,11 +153,11 @@ inline T *QCache<Key,T>::take(const Key &key)
 {
     typename QHash<Key, Node>::iterator i = hash.find(key);
     if (i == hash.end())
-        return 0;
+        return nullptr;
 
     Node &n = *i;
     T *t = n.t;
-    n.t = 0;
+    n.t = nullptr;
     unlink(n);
     return t;
 }
diff --git a/src/corelib/tools/qcommandlineoption.cpp b/src/corelib/tools/qcommandlineoption.cpp
index c2b86014ba..aff684fad2 100644
--- a/src/corelib/tools/qcommandlineoption.cpp
+++ b/src/corelib/tools/qcommandlineoption.cpp
@@ -254,7 +254,7 @@ namespace {
         typedef QString argument_type;
 
         Q_NEVER_INLINE
-        result_type operator()(const QString &name) const Q_DECL_NOEXCEPT
+        result_type operator()(const QString &name) const noexcept
         {
             if (Q_UNLIKELY(name.isEmpty()))
                 return warn("be empty");
@@ -271,7 +271,7 @@ namespace {
         }
 
         Q_NEVER_INLINE
-        static bool warn(const char *what) Q_DECL_NOEXCEPT
+        static bool warn(const char *what) noexcept
         {
             qWarning("QCommandLineOption: Option names cannot %s", what);
             return true;
diff --git a/src/corelib/tools/qcommandlineoption.h b/src/corelib/tools/qcommandlineoption.h
index 276be042de..e2ca64acef 100644
--- a/src/corelib/tools/qcommandlineoption.h
+++ b/src/corelib/tools/qcommandlineoption.h
@@ -71,11 +71,9 @@ public:
     ~QCommandLineOption();
 
     QCommandLineOption &operator=(const QCommandLineOption &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QCommandLineOption &operator=(QCommandLineOption &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QCommandLineOption &operator=(QCommandLineOption &&other) noexcept { swap(other); return *this; }
 
-    void swap(QCommandLineOption &other) Q_DECL_NOTHROW
+    void swap(QCommandLineOption &other) noexcept
     { qSwap(d, other.d); }
 
     QStringList names() const;
diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp
index 6817d73143..48501f5271 100644
--- a/src/corelib/tools/qcommandlineparser.cpp
+++ b/src/corelib/tools/qcommandlineparser.cpp
@@ -41,6 +41,7 @@
 #include "qcommandlineparser.h"
 
 #include <qcoreapplication.h>
+#include <private/qcoreapplication_p.h>
 #include <qhash.h>
 #include <qvector.h>
 #include <qdebug.h>
@@ -70,11 +71,12 @@ public:
     bool parse(const QStringList &args);
     void checkParsed(const char *method);
     QStringList aliases(const QString &name) const;
-    QString helpText() const;
+    QString helpText(bool includeQtOptions) const;
     bool registerFoundOption(const QString &optionName);
     bool parseOptionValue(const QString &optionName, const QString &argument,
                           QStringList::const_iterator *argumentIterator,
                           QStringList::const_iterator argsEnd);
+    Q_NORETURN void showHelp(int exitCode, bool includeQtOptions);
 
     //! Error text set when parse() returns false
     QString errorText;
@@ -130,7 +132,7 @@ QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const
 {
     const NameHash_t::const_iterator it = nameHash.constFind(optionName);
     if (it == nameHash.cend()) {
-        qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName));
+        qWarning("QCommandLineParser: option not defined: \"%ls\"", qUtf16Printable(optionName));
         return QStringList();
     }
     return commandLineOptionList.at(*it).names();
@@ -362,8 +364,10 @@ bool QCommandLineParser::addOption(const QCommandLineOption &option)
 
     if (!optionNames.isEmpty()) {
         for (const QString &name : optionNames) {
-            if (d->nameHash.contains(name))
+            if (d->nameHash.contains(name)) {
+                qWarning() << "QCommandLineParser: already having an option named" << name;
                 return false;
+            }
         }
 
         d->commandLineOptionList.append(option);
@@ -417,7 +421,9 @@ QCommandLineOption QCommandLineParser::addVersionOption()
 
 /*!
     Adds the help option (\c{-h}, \c{--help} and \c{-?} on Windows)
-    This option is handled automatically by QCommandLineParser.
+    as well as an option \c{--help-all} to include Qt-specific options in the output.
+
+    These options are handled automatically by QCommandLineParser.
 
     Remember to use setApplicationDescription to set the application description,
     which will be displayed when this option is used.
@@ -434,8 +440,10 @@ QCommandLineOption QCommandLineParser::addHelpOption()
                 << QStringLiteral("?")
 #endif
                 << QStringLiteral("h")
-                << QStringLiteral("help"), tr("Displays this help."));
+                << QStringLiteral("help"), tr("Displays help on commandline options."));
     addOption(opt);
+    QCommandLineOption optHelpAll(QStringLiteral("help-all"), tr("Displays help including Qt specific options."));
+    addOption(optHelpAll);
     d->builtinHelpOption = true;
     return opt;
 }
@@ -552,9 +560,9 @@ static void showParserMessage(const QString &message, MessageType type)
 {
 #if defined(Q_OS_WINRT)
     if (type == UsageMessage)
-        qInfo(qPrintable(message));
+        qInfo("%ls", qUtf16Printable(message));
     else
-        qCritical(qPrintable(message));
+        qCritical("%ls", qUtf16Printable(message));
     return;
 #elif defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED)
     if (displayMessageBox()) {
@@ -579,7 +587,8 @@ static void showParserMessage(const QString &message, MessageType type)
     In addition to parsing the options (like parse()), this function also handles the builtin
     options and handles errors.
 
-    The builtin options are \c{--version} if addVersionOption was called and \c{--help} if addHelpOption was called.
+    The builtin options are \c{--version} if addVersionOption was called and
+    \c{--help} / \c{--help-all} if addHelpOption was called.
 
     When invoking one of these options, or when an error happens (for instance an unknown option was
     passed), the current process will then stop, using the exit() function.
@@ -598,7 +607,10 @@ void QCommandLineParser::process(const QStringList &arguments)
         showVersion();
 
     if (d->builtinHelpOption && isSet(QStringLiteral("help")))
-        showHelp(EXIT_SUCCESS);
+        d->showHelp(EXIT_SUCCESS, false);
+
+    if (d->builtinHelpOption && isSet(QStringLiteral("help-all")))
+        d->showHelp(EXIT_SUCCESS, true);
 }
 
 /*!
@@ -886,7 +898,7 @@ QStringList QCommandLineParser::values(const QString &optionName) const
         return values;
     }
 
-    qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName));
+    qWarning("QCommandLineParser: option not defined: \"%ls\"", qUtf16Printable(optionName));
     return QStringList();
 }
 
@@ -1031,7 +1043,12 @@ Q_NORETURN void QCommandLineParser::showVersion()
 */
 Q_NORETURN void QCommandLineParser::showHelp(int exitCode)
 {
-    showParserMessage(d->helpText(), UsageMessage);
+    d->showHelp(exitCode, false);
+}
+
+Q_NORETURN void QCommandLineParserPrivate::showHelp(int exitCode, bool includeQtOptions)
+{
+    showParserMessage(helpText(includeQtOptions), UsageMessage);
     qt_call_post_routines();
     ::exit(exitCode);
 }
@@ -1043,7 +1060,7 @@ Q_NORETURN void QCommandLineParser::showHelp(int exitCode)
 */
 QString QCommandLineParser::helpText() const
 {
-    return d->helpText();
+    return d->helpText(false);
 }
 
 static QString wrapText(const QString &names, int longestOptionNameString, const QString &description)
@@ -1101,13 +1118,16 @@ static QString wrapText(const QString &names, int longestOptionNameString, const
     return text;
 }
 
-QString QCommandLineParserPrivate::helpText() const
+QString QCommandLineParserPrivate::helpText(bool includeQtOptions) const
 {
     const QLatin1Char nl('\n');
     QString text;
     QString usage;
     usage += QCoreApplication::instance()->arguments().constFirst(); // executable name
-    if (!commandLineOptionList.isEmpty())
+    QList<QCommandLineOption> options = commandLineOptionList;
+    if (includeQtOptions)
+        QCoreApplication::instance()->d_func()->addQtOptions(&options);
+    if (!options.isEmpty())
         usage += QLatin1Char(' ') + QCommandLineParser::tr("[options]");
     for (const PositionalArgumentDefinition &arg : positionalArgumentDefinitions)
         usage += QLatin1Char(' ') + arg.syntax;
@@ -1115,12 +1135,12 @@ QString QCommandLineParserPrivate::helpText() const
     if (!description.isEmpty())
        text += description + nl;
     text += nl;
-    if (!commandLineOptionList.isEmpty())
+    if (!options.isEmpty())
         text += QCommandLineParser::tr("Options:") + nl;
     QStringList optionNameList;
-    optionNameList.reserve(commandLineOptionList.size());
+    optionNameList.reserve(options.size());
     int longestOptionNameString = 0;
-    for (const QCommandLineOption &option : commandLineOptionList) {
+    for (const QCommandLineOption &option : qAsConst(options)) {
         if (option.flags() & QCommandLineOption::HiddenFromHelp)
             continue;
         const QStringList optionNames = option.names();
@@ -1139,14 +1159,14 @@ QString QCommandLineParserPrivate::helpText() const
     }
     ++longestOptionNameString;
     auto optionNameIterator = optionNameList.cbegin();
-    for (const QCommandLineOption &option : commandLineOptionList) {
+    for (const QCommandLineOption &option : qAsConst(options)) {
         if (option.flags() & QCommandLineOption::HiddenFromHelp)
             continue;
         text += wrapText(*optionNameIterator, longestOptionNameString, option.description());
         ++optionNameIterator;
     }
     if (!positionalArgumentDefinitions.isEmpty()) {
-        if (!commandLineOptionList.isEmpty())
+        if (!options.isEmpty())
             text += nl;
         text += QCommandLineParser::tr("Arguments:") + nl;
         for (const PositionalArgumentDefinition &arg : positionalArgumentDefinitions)
diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h
index 646d8908c3..532b4c95ce 100644
--- a/src/corelib/tools/qcontainerfwd.h
+++ b/src/corelib/tools/qcontainerfwd.h
@@ -47,7 +47,9 @@ QT_BEGIN_NAMESPACE
 
 template <class Key, class T> class QCache;
 template <class Key, class T> class QHash;
+#ifndef QT_NO_LINKED_LIST
 template <class T> class QLinkedList;
+#endif
 template <class T> class QList;
 template <class Key, class T> class QMap;
 template <class Key, class T> class QMultiHash;
diff --git a/src/corelib/tools/qcontainertools_impl.h b/src/corelib/tools/qcontainertools_impl.h
new file mode 100644
index 0000000000..3a0c4381f1
--- /dev/null
+++ b/src/corelib/tools/qcontainertools_impl.h
@@ -0,0 +1,132 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com>
+** Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#if 0
+#pragma qt_sync_skip_header_check
+#pragma qt_sync_stop_processing
+#endif
+
+#ifndef QCONTAINERTOOLS_IMPL_H
+#define QCONTAINERTOOLS_IMPL_H
+
+#include <QtCore/qglobal.h>
+#include <iterator>
+
+QT_BEGIN_NAMESPACE
+
+namespace QtPrivate
+{
+template <typename Iterator>
+using IfIsInputIterator = typename std::enable_if<
+    std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::input_iterator_tag>::value,
+    bool>::type;
+
+template <typename Iterator>
+using IfIsForwardIterator = typename std::enable_if<
+    std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::forward_iterator_tag>::value,
+    bool>::type;
+
+template <typename Iterator>
+using IfIsNotForwardIterator = typename std::enable_if<
+    !std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::forward_iterator_tag>::value,
+    bool>::type;
+
+template <typename Container,
+          typename InputIterator,
+          IfIsNotForwardIterator<InputIterator> = true>
+void reserveIfForwardIterator(Container *, InputIterator, InputIterator)
+{
+}
+
+template <typename Container,
+          typename ForwardIterator,
+          IfIsForwardIterator<ForwardIterator> = true>
+void reserveIfForwardIterator(Container *c, ForwardIterator f, ForwardIterator l)
+{
+    c->reserve(static_cast<typename Container::size_type>(std::distance(f, l)));
+}
+
+// for detecting expression validity
+template <typename ... T>
+using void_t = void;
+
+template <typename Iterator, typename = void_t<>>
+struct AssociativeIteratorHasKeyAndValue : std::false_type
+{
+};
+
+template <typename Iterator>
+struct AssociativeIteratorHasKeyAndValue<
+        Iterator,
+        void_t<decltype(std::declval<Iterator &>().key()),
+               decltype(std::declval<Iterator &>().value())>
+    >
+    : std::true_type
+{
+};
+
+template <typename Iterator, typename = void_t<>, typename = void_t<>>
+struct AssociativeIteratorHasFirstAndSecond : std::false_type
+{
+};
+
+template <typename Iterator>
+struct AssociativeIteratorHasFirstAndSecond<
+        Iterator,
+        void_t<decltype(std::declval<Iterator &>()->first),
+               decltype(std::declval<Iterator &>()->second)>
+    >
+    : std::true_type
+{
+};
+
+template <typename Iterator>
+using IfAssociativeIteratorHasKeyAndValue =
+    typename std::enable_if<AssociativeIteratorHasKeyAndValue<Iterator>::value, bool>::type;
+
+template <typename Iterator>
+using IfAssociativeIteratorHasFirstAndSecond =
+    typename std::enable_if<AssociativeIteratorHasFirstAndSecond<Iterator>::value, bool>::type;
+
+} // namespace QtPrivate
+
+QT_END_NAMESPACE
+
+#endif // QCONTAINERTOOLS_IMPL_H
diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h
index fdb9c6d19a..7b74b4f526 100644
--- a/src/corelib/tools/qcontiguouscache.h
+++ b/src/corelib/tools/qcontiguouscache.h
@@ -100,18 +100,16 @@ public:
 
     inline ~QContiguousCache() { if (!d) return; if (!d->ref.deref()) freeData(p); }
 
-    inline void detach() { if (d->ref.load() != 1) detach_helper(); }
-    inline bool isDetached() const { return d->ref.load() == 1; }
+    inline void detach() { if (d->ref.loadRelaxed() != 1) detach_helper(); }
+    inline bool isDetached() const { return d->ref.loadRelaxed() == 1; }
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
     inline void setSharable(bool sharable) { if (!sharable) detach(); d->sharable = sharable; }
 #endif
 
     QContiguousCache<T> &operator=(const QContiguousCache<T> &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QContiguousCache<T> &operator=(QContiguousCache<T> &&other)
+    inline QContiguousCache<T> &operator=(QContiguousCache<T> &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
-    inline void swap(QContiguousCache<T> &other) { qSwap(d, other.d); }
+    inline void swap(QContiguousCache<T> &other) noexcept { qSwap(d, other.d); }
     bool operator==(const QContiguousCache<T> &other) const;
     inline bool operator!=(const QContiguousCache<T> &other) const { return !(*this == other); }
 
@@ -178,7 +176,7 @@ void QContiguousCache<T>::detach_helper()
     union { QContiguousCacheData *d; QContiguousCacheTypedData<T> *p; } x;
 
     x.d = allocateData(d->alloc);
-    x.d->ref.store(1);
+    x.d->ref.storeRelaxed(1);
     x.d->count = d->count;
     x.d->start = d->start;
     x.d->offset = d->offset;
@@ -217,7 +215,7 @@ void QContiguousCache<T>::setCapacity(int asize)
     detach();
     union { QContiguousCacheData *d; QContiguousCacheTypedData<T> *p; } x;
     x.d = allocateData(asize);
-    x.d->ref.store(1);
+    x.d->ref.storeRelaxed(1);
     x.d->alloc = asize;
     x.d->count = qMin(d->count, asize);
     x.d->offset = d->offset + d->count - x.d->count;
@@ -253,7 +251,7 @@ void QContiguousCache<T>::setCapacity(int asize)
 template <typename T>
 void QContiguousCache<T>::clear()
 {
-    if (d->ref.load() == 1) {
+    if (d->ref.loadRelaxed() == 1) {
         if (QTypeInfo<T>::isComplex) {
             int oldcount = d->count;
             T * i = p->array + d->start;
@@ -269,7 +267,7 @@ void QContiguousCache<T>::clear()
     } else {
         union { QContiguousCacheData *d; QContiguousCacheTypedData<T> *p; } x;
         x.d = allocateData(d->alloc);
-        x.d->ref.store(1);
+        x.d->ref.storeRelaxed(1);
         x.d->alloc = d->alloc;
         x.d->count = x.d->start = x.d->offset = 0;
         x.d->sharable = true;
@@ -289,7 +287,7 @@ QContiguousCache<T>::QContiguousCache(int cap)
 {
     Q_ASSERT(cap >= 0);
     d = allocateData(cap);
-    d->ref.store(1);
+    d->ref.storeRelaxed(1);
     d->alloc = cap;
     d->count = d->start = d->offset = 0;
     d->sharable = true;
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index 51f48503fb..fa8d21e07a 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -58,6 +58,10 @@ typedef unsigned char BitSequence;
 typedef unsigned long long DataLength;
 typedef enum { SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2 } HashReturn;
 
+#ifdef Q_OS_RTEMS
+#  undef ALIGN
+#endif
+
 #include "../../3rdparty/sha3/KeccakSponge.c"
 typedef spongeState hashState;
 
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index f82048db0f..52c8d13fe3 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -339,6 +339,23 @@ struct TCBPoint {
 };
 Q_DECLARE_TYPEINFO(TCBPoint, Q_PRIMITIVE_TYPE);
 
+QDataStream &operator<<(QDataStream &stream, const TCBPoint &point)
+{
+    stream << point._point
+           << point._t
+           << point._c
+           << point._b;
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, TCBPoint &point)
+{
+    stream >> point._point
+           >> point._t
+           >> point._c
+           >> point._b;
+    return stream;
+}
 
 typedef QVector<TCBPoint> TCBPoints;
 
@@ -363,6 +380,34 @@ public:
 
 };
 
+QDataStream &operator<<(QDataStream &stream, QEasingCurveFunction *func)
+{
+    if (func) {
+        stream << func->_p;
+        stream << func->_a;
+        stream << func->_o;
+        if (stream.version() > QDataStream::Qt_5_12) {
+            stream << func->_bezierCurves;
+            stream << func->_tcbPoints;
+        }
+    }
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, QEasingCurveFunction *func)
+{
+    if (func) {
+        stream >> func->_p;
+        stream >> func->_a;
+        stream >> func->_o;
+        if (stream.version() > QDataStream::Qt_5_12) {
+            stream >> func->_bezierCurves;
+            stream >> func->_tcbPoints;
+        }
+    }
+    return stream;
+}
+
 static QEasingCurve::EasingFunction curveToFunc(QEasingCurve::Type curve);
 
 qreal QEasingCurveFunction::value(qreal t)
@@ -538,6 +583,13 @@ struct BezierEase : public QEasingCurveFunction
             qWarning("QEasingCurve: Invalid bezier curve");
             return x;
         }
+
+        // The bezier computation is not always precise on the endpoints, so handle explicitly
+        if (!(x > 0))
+            return 0;
+        if (!(x < 1))
+            return 1;
+
         SingleCubicBezier *singleCubicBezier = 0;
         getBezierSegment(singleCubicBezier, x);
 
@@ -862,6 +914,10 @@ struct TCBEase : public BezierEase
         return BezierEase::value(x);
     }
 
+    QEasingCurveFunction *copy() const override
+    {
+        return new TCBEase{*this};
+    }
 };
 
 struct ElasticEase : public QEasingCurveFunction
@@ -949,6 +1005,11 @@ struct BackEase : public QEasingCurveFunction
 
     qreal value(qreal t) override
     {
+        // The *Back() functions are not always precise on the endpoints, so handle explicitly
+        if (!(t > 0))
+            return 0;
+        if (!(t < 1))
+            return 1;
         qreal o = (_o < 0) ? qreal(1.70158) : _o;
         switch(_t) {
         case QEasingCurve::InBack:
@@ -1480,9 +1541,7 @@ QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
     bool hasConfig = easing.d_ptr->config;
     stream << hasConfig;
     if (hasConfig) {
-        stream << easing.d_ptr->config->_p;
-        stream << easing.d_ptr->config->_a;
-        stream << easing.d_ptr->config->_o;
+        stream << easing.d_ptr->config;
     }
     return stream;
 }
@@ -1515,9 +1574,7 @@ QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
     easing.d_ptr->config = nullptr;
     if (hasConfig) {
         QEasingCurveFunction *config = curveToFunctionObject(type);
-        stream >> config->_p;
-        stream >> config->_a;
-        stream >> config->_o;
+        stream >> config;
         easing.d_ptr->config = config;
     }
     return stream;
diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h
index 74bde5825a..d3a468bb22 100644
--- a/src/corelib/tools/qeasingcurve.h
+++ b/src/corelib/tools/qeasingcurve.h
@@ -41,6 +41,9 @@
 #define QEASINGCURVE_H
 
 #include <QtCore/qglobal.h>
+
+QT_REQUIRE_CONFIG(easingcurve);
+
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qvector.h>
 #if QT_DEPRECATED_SINCE(5, 0)
@@ -80,13 +83,11 @@ public:
 
     QEasingCurve &operator=(const QEasingCurve &other)
     { if ( this != &other ) { QEasingCurve copy(other); swap(copy); } return *this; }
-#ifdef Q_COMPILER_RVALUE_REFS
-    QEasingCurve(QEasingCurve &&other) Q_DECL_NOTHROW : d_ptr(other.d_ptr) { other.d_ptr = nullptr; }
-    QEasingCurve &operator=(QEasingCurve &&other) Q_DECL_NOTHROW
+    QEasingCurve(QEasingCurve &&other) noexcept : d_ptr(other.d_ptr) { other.d_ptr = nullptr; }
+    QEasingCurve &operator=(QEasingCurve &&other) noexcept
     { qSwap(d_ptr, other.d_ptr); return *this; }
-#endif
 
-    void swap(QEasingCurve &other) Q_DECL_NOTHROW { qSwap(d_ptr, other.d_ptr); }
+    void swap(QEasingCurve &other) noexcept { qSwap(d_ptr, other.d_ptr); }
 
     bool operator==(const QEasingCurve &other) const;
     inline bool operator!=(const QEasingCurve &other) const
diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h
index 7776dd8c4e..5ba23b344b 100644
--- a/src/corelib/tools/qfreelist_p.h
+++ b/src/corelib/tools/qfreelist_p.h
@@ -171,7 +171,7 @@ class QFreeList
         // qDebug("QFreeList: allocating %d elements (%ld bytes) with offset %d", size, size * sizeof(ElementType), offset);
         ElementType *v = new ElementType[size];
         for (int i = 0; i < size; ++i)
-            v[i].next.store(offset + i + 1);
+            v[i].next.storeRelaxed(offset + i + 1);
         return v;
     }
 
@@ -225,14 +225,14 @@ template <typename T, typename ConstantsType>
 inline typename QFreeList<T, ConstantsType>::ConstReferenceType QFreeList<T, ConstantsType>::at(int x) const
 {
     const int block = blockfor(x);
-    return (_v[block].load())[x].t();
+    return (_v[block].loadRelaxed())[x].t();
 }
 
 template <typename T, typename ConstantsType>
 inline typename QFreeList<T, ConstantsType>::ReferenceType QFreeList<T, ConstantsType>::operator[](int x)
 {
     const int block = blockfor(x);
-    return (_v[block].load())[x].t();
+    return (_v[block].loadRelaxed())[x].t();
 }
 
 template <typename T, typename ConstantsType>
@@ -249,15 +249,15 @@ inline int QFreeList<T, ConstantsType>::next()
 
         if (!v) {
             v = allocate((id & ConstantsType::IndexMask) - at, ConstantsType::Sizes[block]);
-            if (!_v[block].testAndSetRelease(0, v)) {
+            if (!_v[block].testAndSetRelease(nullptr, v)) {
                 // race with another thread lost
                 delete [] v;
                 v = _v[block].loadAcquire();
-                Q_ASSERT(v != 0);
+                Q_ASSERT(v != nullptr);
             }
         }
 
-        newid = v[at].next.load() | (id & ~ConstantsType::IndexMask);
+        newid = v[at].next.loadRelaxed() | (id & ~ConstantsType::IndexMask);
     } while (!_next.testAndSetRelease(id, newid));
     // qDebug("QFreeList::next(): returning %d (_next now %d, serial %d)",
     //        id & ConstantsType::IndexMask,
@@ -271,12 +271,12 @@ inline void QFreeList<T, ConstantsType>::release(int id)
 {
     int at = id & ConstantsType::IndexMask;
     const int block = blockfor(at);
-    ElementType *v = _v[block].load();
+    ElementType *v = _v[block].loadRelaxed();
 
     int x, newid;
     do {
         x = _next.loadAcquire();
-        v[at].next.store(x & ConstantsType::IndexMask);
+        v[at].next.storeRelaxed(x & ConstantsType::IndexMask);
 
         newid = incrementserial(x, id);
     } while (!_next.testAndSetRelease(x, newid));
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 32e9a4269c..a53d6db997 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -197,7 +197,7 @@ static uint crc32(...)
 }
 #endif
 
-static inline uint hash(const uchar *p, size_t len, uint seed) Q_DECL_NOTHROW
+static inline uint hash(const uchar *p, size_t len, uint seed) noexcept
 {
     uint h = seed;
 
@@ -210,12 +210,12 @@ static inline uint hash(const uchar *p, size_t len, uint seed) Q_DECL_NOTHROW
     return h;
 }
 
-uint qHashBits(const void *p, size_t len, uint seed) Q_DECL_NOTHROW
+uint qHashBits(const void *p, size_t len, uint seed) noexcept
 {
     return hash(static_cast<const uchar*>(p), int(len), seed);
 }
 
-static inline uint hash(const QChar *p, size_t len, uint seed) Q_DECL_NOTHROW
+static inline uint hash(const QChar *p, size_t len, uint seed) noexcept
 {
     uint h = seed;
 
@@ -228,29 +228,29 @@ static inline uint hash(const QChar *p, size_t len, uint seed) Q_DECL_NOTHROW
     return h;
 }
 
-uint qHash(const QByteArray &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QByteArray &key, uint seed) noexcept
 {
     return hash(reinterpret_cast<const uchar *>(key.constData()), size_t(key.size()), seed);
 }
 
 #if QT_STRINGVIEW_LEVEL < 2
-uint qHash(const QString &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QString &key, uint seed) noexcept
 {
     return hash(key.unicode(), size_t(key.size()), seed);
 }
 
-uint qHash(const QStringRef &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QStringRef &key, uint seed) noexcept
 {
     return hash(key.unicode(), size_t(key.size()), seed);
 }
 #endif
 
-uint qHash(QStringView key, uint seed) Q_DECL_NOTHROW
+uint qHash(QStringView key, uint seed) noexcept
 {
     return hash(key.data(), key.size(), seed);
 }
 
-uint qHash(const QBitArray &bitArray, uint seed) Q_DECL_NOTHROW
+uint qHash(const QBitArray &bitArray, uint seed) noexcept
 {
     int m = bitArray.d.size() - 1;
     uint result = hash(reinterpret_cast<const uchar *>(bitArray.d.constData()),
@@ -264,7 +264,7 @@ uint qHash(const QBitArray &bitArray, uint seed) Q_DECL_NOTHROW
     return result;
 }
 
-uint qHash(QLatin1String key, uint seed) Q_DECL_NOTHROW
+uint qHash(QLatin1String key, uint seed) noexcept
 {
     return hash(reinterpret_cast<const uchar *>(key.data()), size_t(key.size()), seed);
 }
@@ -321,7 +321,7 @@ static QBasicAtomicInt qt_qhash_seed = Q_BASIC_ATOMIC_INITIALIZER(-1);
 */
 static void qt_initialize_qhash_seed()
 {
-    if (qt_qhash_seed.load() == -1) {
+    if (qt_qhash_seed.loadRelaxed() == -1) {
         int x(qt_create_qhash_seed() & INT_MAX);
         qt_qhash_seed.testAndSetRelaxed(-1, x);
     }
@@ -340,7 +340,7 @@ static void qt_initialize_qhash_seed()
 int qGlobalQHashSeed()
 {
     qt_initialize_qhash_seed();
-    return qt_qhash_seed.load();
+    return qt_qhash_seed.loadRelaxed();
 }
 
 /*! \relates QHash
@@ -372,14 +372,14 @@ void qSetGlobalQHashSeed(int newSeed)
         return;
     if (newSeed == -1) {
         int x(qt_create_qhash_seed() & INT_MAX);
-        qt_qhash_seed.store(x);
+        qt_qhash_seed.storeRelaxed(x);
     } else {
         if (newSeed) {
             // can't use qWarning here (reentrancy)
             fprintf(stderr, "qSetGlobalQHashSeed: forced seed value is not 0, cannot guarantee that the "
                             "hashing functions will produce a stable value.");
         }
-        qt_qhash_seed.store(newSeed & INT_MAX);
+        qt_qhash_seed.storeRelaxed(newSeed & INT_MAX);
     }
 }
 
@@ -398,7 +398,7 @@ void qSetGlobalQHashSeed(int newSeed)
     This function can hash discontiguous memory by invoking it on each chunk,
     passing the previous's result in the next call's \a chained argument.
 */
-uint qt_hash(QStringView key, uint chained) Q_DECL_NOTHROW
+uint qt_hash(QStringView key, uint chained) noexcept
 {
     auto n = key.size();
     auto p = key.utf16();
@@ -471,7 +471,7 @@ static int countBits(int hint)
 const int MinNumBits = 4;
 
 const QHashData QHashData::shared_null = {
-    0, 0, Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, MinNumBits, 0, 0, 0, true, false, 0
+    nullptr, nullptr, Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, MinNumBits, 0, 0, 0, true, false, 0
 };
 
 void *QHashData::allocateNode(int nodeAlign)
@@ -501,15 +501,15 @@ QHashData *QHashData::detach_helper(void (*node_duplicate)(Node *, void *),
     if (this == &shared_null)
         qt_initialize_qhash_seed(); // may throw
     d = new QHashData;
-    d->fakeNext = 0;
-    d->buckets = 0;
+    d->fakeNext = nullptr;
+    d->buckets = nullptr;
     d->ref.initializeOwned();
     d->size = size;
     d->nodeSize = nodeSize;
     d->userNumBits = userNumBits;
     d->numBits = numBits;
     d->numBuckets = numBuckets;
-    d->seed = (this == &shared_null) ? uint(qt_qhash_seed.load()) : seed;
+    d->seed = (this == &shared_null) ? uint(qt_qhash_seed.loadRelaxed()) : seed;
     d->sharable = true;
     d->strictAlignment = nodeAlign > 8;
     d->reserved = 0;
@@ -709,7 +709,7 @@ void QHashData::dump()
                 }
                 n = n->next;
             }
-            qDebug("%s", qPrintable(line));
+            qDebug("%ls", qUtf16Printable(line));
         }
     }
 }
@@ -938,7 +938,7 @@ void QHashData::checkSanity()
 
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 */
-uint qHash(float key, uint seed) Q_DECL_NOTHROW
+uint qHash(float key, uint seed) noexcept
 {
     return key != 0.0f ? hash(reinterpret_cast<const uchar *>(&key), sizeof(key), seed) : seed ;
 }
@@ -948,7 +948,7 @@ uint qHash(float key, uint seed) Q_DECL_NOTHROW
 
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 */
-uint qHash(double key, uint seed) Q_DECL_NOTHROW
+uint qHash(double key, uint seed) noexcept
 {
     return key != 0.0  ? hash(reinterpret_cast<const uchar *>(&key), sizeof(key), seed) : seed ;
 }
@@ -959,7 +959,7 @@ uint qHash(double key, uint seed) Q_DECL_NOTHROW
 
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 */
-uint qHash(long double key, uint seed) Q_DECL_NOTHROW
+uint qHash(long double key, uint seed) noexcept
 {
     return key != 0.0L ? hash(reinterpret_cast<const uchar *>(&key), sizeof(key), seed) : seed ;
 }
@@ -1251,6 +1251,17 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW
     compiled in C++11 mode.
 */
 
+/*! \fn template <class Key, class T> template <class InputIterator> QHash<Key, T>::QHash(InputIterator begin, InputIterator end)
+    \since 5.14
+
+    Constructs a hash with a copy of each of the elements in the iterator range
+    [\a begin, \a end). Either the elements iterated by the range must be
+    objects with \c{first} and \c{second} data members (like \c{QPair},
+    \c{std::pair}, etc.) convertible to \c Key and to \c T respectively; or the
+    iterators must have \c{key()} and \c{value()} member functions, returning a
+    key convertible to \c Key and a value convertible to \c T respectively.
+*/
+
 /*! \fn template <class Key, class T> QHash<Key, T>::QHash(const QHash &other)
 
     Constructs a copy of \a other.
@@ -2586,6 +2597,17 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW
     \sa operator=()
 */
 
+/*! \fn template <class Key, class T> template <class InputIterator> QMultiHash::QMultiHash(InputIterator begin, InputIterator end)
+    \since 5.14
+
+    Constructs a multi-hash with a copy of each of the elements in the iterator range
+    [\a begin, \a end). Either the elements iterated by the range must be
+    objects with \c{first} and \c{second} data members (like \c{QPair},
+    \c{std::pair}, etc.) convertible to \c Key and to \c T respectively; or the
+    iterators must have \c{key()} and \c{value()} member functions, returning a
+    key convertible to \c Key and a value convertible to \c T respectively.
+*/
+
 /*! \fn template <class Key, class T> QMultiHash<Key, T>::iterator QMultiHash<Key, T>::replace(const Key &key, const T &value)
 
     Inserts a new item with the \a key and a value of \a value.
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index a586ca5671..236e433101 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -46,12 +46,10 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qrefcount.h>
 #include <QtCore/qhashfunctions.h>
-
-#ifdef Q_COMPILER_INITIALIZER_LISTS
-#include <initializer_list>
-#endif
+#include <QtCore/qcontainertools_impl.h>
 
 #include <algorithm>
+#include <initializer_list>
 
 #if defined(Q_CC_MSVC)
 #pragma warning( push )
@@ -138,7 +136,7 @@ struct QHashDummyValue
 {
 };
 
-inline bool operator==(const QHashDummyValue & /* v1 */, const QHashDummyValue & /* v2 */)
+constexpr bool operator==(const QHashDummyValue &, const QHashDummyValue &) noexcept
 {
     return true;
 }
@@ -240,8 +238,7 @@ class QHash
     static inline int alignOfNode() { return qMax<int>(sizeof(void*), Q_ALIGNOF(Node)); }
 
 public:
-    inline QHash() Q_DECL_NOTHROW : d(const_cast<QHashData *>(&QHashData::shared_null)) { }
-#ifdef Q_COMPILER_INITIALIZER_LISTS
+    inline QHash() noexcept : d(const_cast<QHashData *>(&QHashData::shared_null)) { }
     inline QHash(std::initializer_list<std::pair<Key,T> > list)
         : d(const_cast<QHashData *>(&QHashData::shared_null))
     {
@@ -249,17 +246,36 @@ public:
         for (typename std::initializer_list<std::pair<Key,T> >::const_iterator it = list.begin(); it != list.end(); ++it)
             insert(it->first, it->second);
     }
-#endif
     QHash(const QHash &other) : d(other.d) { d->ref.ref(); if (!d->sharable) detach(); }
     ~QHash() { if (!d->ref.deref()) freeData(d); }
 
     QHash &operator=(const QHash &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QHash(QHash &&other) Q_DECL_NOTHROW : d(other.d) { other.d = const_cast<QHashData *>(&QHashData::shared_null); }
-    QHash &operator=(QHash &&other) Q_DECL_NOTHROW
+    QHash(QHash &&other) noexcept : d(other.d) { other.d = const_cast<QHashData *>(&QHashData::shared_null); }
+    QHash &operator=(QHash &&other) noexcept
     { QHash moved(std::move(other)); swap(moved); return *this; }
+#ifdef Q_QDOC
+    template <typename InputIterator>
+    QHash(InputIterator f, InputIterator l);
+#else
+    template <typename InputIterator, QtPrivate::IfAssociativeIteratorHasKeyAndValue<InputIterator> = true>
+    QHash(InputIterator f, InputIterator l)
+        : QHash()
+    {
+        QtPrivate::reserveIfForwardIterator(this, f, l);
+        for (; f != l; ++f)
+            insert(f.key(), f.value());
+    }
+
+    template <typename InputIterator, QtPrivate::IfAssociativeIteratorHasFirstAndSecond<InputIterator> = true>
+    QHash(InputIterator f, InputIterator l)
+        : QHash()
+    {
+        QtPrivate::reserveIfForwardIterator(this, f, l);
+        for (; f != l; ++f)
+            insert(f->first, f->second);
+    }
 #endif
-    void swap(QHash &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QHash &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QHash &other) const;
     bool operator!=(const QHash &other) const { return !(*this == other); }
@@ -473,7 +489,7 @@ public:
     inline const_key_value_iterator constKeyValueEnd() const { return const_key_value_iterator(end()); }
 
     QPair<iterator, iterator> equal_range(const Key &key);
-    QPair<const_iterator, const_iterator> equal_range(const Key &key) const Q_DECL_NOTHROW;
+    QPair<const_iterator, const_iterator> equal_range(const Key &key) const noexcept;
     iterator erase(iterator it) { return erase(const_iterator(it.i)); }
     iterator erase(const_iterator it);
 
@@ -512,11 +528,11 @@ private:
 
     static void duplicateNode(QHashData::Node *originalNode, void *newNode);
 
-    bool isValidIterator(const iterator &it) const Q_DECL_NOTHROW
+    bool isValidIterator(const iterator &it) const noexcept
     { return isValidNode(it.i); }
-    bool isValidIterator(const const_iterator &it) const Q_DECL_NOTHROW
+    bool isValidIterator(const const_iterator &it) const noexcept
     { return isValidNode(it.i); }
-    bool isValidNode(QHashData::Node *node) const Q_DECL_NOTHROW
+    bool isValidNode(QHashData::Node *node) const noexcept
     {
 #if defined(QT_DEBUG) && !defined(Q_HASH_NO_ITERATOR_DEBUG)
         while (node->next)
@@ -941,44 +957,32 @@ Q_OUTOFLINE_TEMPLATE typename QHash<Key, T>::Node **QHash<Key, T>::findNode(cons
 template <class Key, class T>
 Q_OUTOFLINE_TEMPLATE bool QHash<Key, T>::operator==(const QHash &other) const
 {
-    if (size() != other.size())
-        return false;
     if (d == other.d)
         return true;
+    if (size() != other.size())
+        return false;
 
     const_iterator it = begin();
 
     while (it != end()) {
         // Build two equal ranges for i.key(); one for *this and one for other.
         // For *this we can avoid a lookup via equal_range, as we know the beginning of the range.
-        auto thisEqualRangeEnd = it;
-        while (thisEqualRangeEnd != end() && it.key() == thisEqualRangeEnd.key())
-            ++thisEqualRangeEnd;
+        auto thisEqualRangeStart = it;
+        const Key &thisEqualRangeKey = it.key();
+        size_type n = 0;
+        do {
+            ++it;
+            ++n;
+        } while (it != end() && it.key() == thisEqualRangeKey);
 
-        const auto otherEqualRange = other.equal_range(it.key());
+        const auto otherEqualRange = other.equal_range(thisEqualRangeKey);
 
-        if (std::distance(it, thisEqualRangeEnd) != std::distance(otherEqualRange.first, otherEqualRange.second))
+        if (n != std::distance(otherEqualRange.first, otherEqualRange.second))
             return false;
 
         // Keys in the ranges are equal by construction; this checks only the values.
-        //
-        // When using the 3-arg std::is_permutation, MSVC will emit warning C4996,
-        // passing an unchecked iterator to a Standard Library algorithm. We don't
-        // want to suppress the warning, and we can't use stdext::make_checked_array_iterator
-        // because QHash::(const_)iterator does not work with size_t and thus will
-        // emit more warnings. Use the 4-arg std::is_permutation instead (which
-        // is supported since MSVC 2015).
-        //
-        // ### Qt 6: if C++14 library support is a mandated minimum, remove the ifdef for MSVC.
-        if (!std::is_permutation(it, thisEqualRangeEnd, otherEqualRange.first
-#ifdef Q_CC_MSVC
-                                 , otherEqualRange.second
-#endif
-                                 )) {
+        if (!qt_is_permutation(thisEqualRangeStart, it, otherEqualRange.first, otherEqualRange.second))
             return false;
-        }
-
-        it = thisEqualRangeEnd;
     }
 
     return true;
@@ -993,7 +997,7 @@ QPair<typename QHash<Key, T>::iterator, typename QHash<Key, T>::iterator> QHash<
 }
 
 template <class Key, class T>
-QPair<typename QHash<Key, T>::const_iterator, typename QHash<Key, T>::const_iterator> QHash<Key, T>::equal_range(const Key &akey) const Q_DECL_NOTHROW
+QPair<typename QHash<Key, T>::const_iterator, typename QHash<Key, T>::const_iterator> QHash<Key, T>::equal_range(const Key &akey) const noexcept
 {
     Node *node = *findNode(akey);
     const_iterator firstIt = const_iterator(node);
@@ -1020,23 +1024,39 @@ template <class Key, class T>
 class QMultiHash : public QHash<Key, T>
 {
 public:
-    QMultiHash() Q_DECL_NOTHROW {}
-#ifdef Q_COMPILER_INITIALIZER_LISTS
+    QMultiHash() noexcept {}
     inline QMultiHash(std::initializer_list<std::pair<Key,T> > list)
     {
         this->reserve(int(list.size()));
         for (typename std::initializer_list<std::pair<Key,T> >::const_iterator it = list.begin(); it != list.end(); ++it)
             insert(it->first, it->second);
     }
+#ifdef Q_QDOC
+    template <typename InputIterator>
+    QMultiHash(InputIterator f, InputIterator l);
+#else
+    template <typename InputIterator, QtPrivate::IfAssociativeIteratorHasKeyAndValue<InputIterator> = true>
+    QMultiHash(InputIterator f, InputIterator l)
+    {
+        QtPrivate::reserveIfForwardIterator(this, f, l);
+        for (; f != l; ++f)
+            insert(f.key(), f.value());
+    }
+
+    template <typename InputIterator, QtPrivate::IfAssociativeIteratorHasFirstAndSecond<InputIterator> = true>
+    QMultiHash(InputIterator f, InputIterator l)
+    {
+        QtPrivate::reserveIfForwardIterator(this, f, l);
+        for (; f != l; ++f)
+            insert(f->first, f->second);
+    }
 #endif
     // compiler-generated copy/move ctors/assignment operators are fine!
     // compiler-generated destructor is fine!
 
     QMultiHash(const QHash<Key, T> &other) : QHash<Key, T>(other) {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    QMultiHash(QHash<Key, T> &&other) Q_DECL_NOTHROW : QHash<Key, T>(std::move(other)) {}
-#endif
-    void swap(QMultiHash &other) Q_DECL_NOTHROW { QHash<Key, T>::swap(other); } // prevent QMultiHash<->QHash swaps
+    QMultiHash(QHash<Key, T> &&other) noexcept : QHash<Key, T>(std::move(other)) {}
+    void swap(QMultiHash &other) noexcept { QHash<Key, T>::swap(other); } // prevent QMultiHash<->QHash swaps
 
     inline typename QHash<Key, T>::iterator replace(const Key &key, const T &value)
     { return QHash<Key, T>::insert(key, value); }
@@ -1130,7 +1150,7 @@ Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR(Hash)
 
 template <class Key, class T>
 uint qHash(const QHash<Key, T> &key, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(std::declval<Key&>())) && noexcept(qHash(std::declval<T&>())))
+    noexcept(noexcept(qHash(std::declval<Key&>())) && noexcept(qHash(std::declval<T&>())))
 {
     QtPrivate::QHashCombineCommutative hash;
     for (auto it = key.begin(), end = key.end(); it != end; ++it) {
@@ -1143,7 +1163,7 @@ uint qHash(const QHash<Key, T> &key, uint seed = 0)
 
 template <class Key, class T>
 inline uint qHash(const QMultiHash<Key, T> &key, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(std::declval<Key&>())) && noexcept(qHash(std::declval<T&>())))
+    noexcept(noexcept(qHash(std::declval<Key&>())) && noexcept(qHash(std::declval<T&>())))
 {
     const QHash<Key, T> &key2 = key;
     return qHash(key2, seed);
diff --git a/src/corelib/tools/qhashfunctions.h b/src/corelib/tools/qhashfunctions.h
index d013c26d66..2ff3464912 100644
--- a/src/corelib/tools/qhashfunctions.h
+++ b/src/corelib/tools/qhashfunctions.h
@@ -45,6 +45,7 @@
 #include <QtCore/qpair.h>
 
 #include <numeric> // for std::accumulate
+#include <functional> // for std::hash
 
 #if 0
 #pragma qt_class(QHashFunctions)
@@ -67,54 +68,54 @@ class QLatin1String;
 Q_CORE_EXPORT int qGlobalQHashSeed();
 Q_CORE_EXPORT void qSetGlobalQHashSeed(int newSeed);
 
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHashBits(const void *p, size_t size, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHashBits(const void *p, size_t size, uint seed = 0) noexcept;
 
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(char key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uchar key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(signed char key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ushort key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(short key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uint key, uint seed = 0) Q_DECL_NOTHROW { return key ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(int key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ulong key, uint seed = 0) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(char key, uint seed = 0) noexcept { return uint(key) ^ seed; }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uchar key, uint seed = 0) noexcept { return uint(key) ^ seed; }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(signed char key, uint seed = 0) noexcept { return uint(key) ^ seed; }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ushort key, uint seed = 0) noexcept { return uint(key) ^ seed; }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(short key, uint seed = 0) noexcept { return uint(key) ^ seed; }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uint key, uint seed = 0) noexcept { return key ^ seed; }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(int key, uint seed = 0) noexcept { return uint(key) ^ seed; }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ulong key, uint seed = 0) noexcept
 {
     return (sizeof(ulong) > sizeof(uint))
         ? (uint(((key >> (8 * sizeof(uint) - 1)) ^ key) & (~0U)) ^ seed)
         : (uint(key & (~0U)) ^ seed);
 }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(long key, uint seed = 0) Q_DECL_NOTHROW { return qHash(ulong(key), seed); }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(quint64 key, uint seed = 0) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(long key, uint seed = 0) noexcept { return qHash(ulong(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(quint64 key, uint seed = 0) noexcept
 {
     return uint(((key >> (8 * sizeof(uint) - 1)) ^ key) & (~0U)) ^ seed;
 }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(qint64 key, uint seed = 0) Q_DECL_NOTHROW { return qHash(quint64(key), seed); }
-Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(float key, uint seed = 0) Q_DECL_NOTHROW;
-Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(double key, uint seed = 0) Q_DECL_NOTHROW;
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(qint64 key, uint seed = 0) noexcept { return qHash(quint64(key), seed); }
+Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(float key, uint seed = 0) noexcept;
+Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(double key, uint seed = 0) noexcept;
 #if !defined(Q_OS_DARWIN) || defined(Q_CLANG_QDOC)
-Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(long double key, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(long double key, uint seed = 0) noexcept;
 #endif
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(const QChar key, uint seed = 0) Q_DECL_NOTHROW { return qHash(key.unicode(), seed); }
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QByteArray &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(const QChar key, uint seed = 0) noexcept { return qHash(key.unicode(), seed); }
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QByteArray &key, uint seed = 0) noexcept;
 #if QT_STRINGVIEW_LEVEL < 2
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QString &key, uint seed = 0) Q_DECL_NOTHROW;
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QStringRef &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QString &key, uint seed = 0) noexcept;
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QStringRef &key, uint seed = 0) noexcept;
 #endif
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(QStringView key, uint seed = 0) Q_DECL_NOTHROW;
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QBitArray &key, uint seed = 0) Q_DECL_NOTHROW;
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(QLatin1String key, uint seed = 0) Q_DECL_NOTHROW;
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qt_hash(QStringView key, uint chained = 0) Q_DECL_NOTHROW;
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(QStringView key, uint seed = 0) noexcept;
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QBitArray &key, uint seed = 0) noexcept;
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(QLatin1String key, uint seed = 0) noexcept;
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qt_hash(QStringView key, uint chained = 0) noexcept;
 
-Q_DECL_CONST_FUNCTION inline uint qHash(std::nullptr_t, uint seed = 0) Q_DECL_NOTHROW
+Q_DECL_CONST_FUNCTION inline uint qHash(std::nullptr_t, uint seed = 0) noexcept
 {
     return qHash(reinterpret_cast<quintptr>(nullptr), seed);
 }
 
-template <class T> inline uint qHash(const T *key, uint seed = 0) Q_DECL_NOTHROW
+template <class T> inline uint qHash(const T *key, uint seed = 0) noexcept
 {
     return qHash(reinterpret_cast<quintptr>(key), seed);
 }
 template<typename T> inline uint qHash(const T &t, uint seed)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t)))
+    noexcept(noexcept(qHash(t)))
 { return qHash(t) ^ seed; }
 
 namespace QtPrivate {
@@ -122,7 +123,7 @@ namespace QtPrivate {
 struct QHashCombine {
     typedef uint result_type;
     template <typename T>
-    Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t)))
+    Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const noexcept(noexcept(qHash(t)))
     // combiner taken from N3876 / boost::hash_combine
     { return seed ^ (qHash(t) + 0x9e3779b9 + (seed << 6) + (seed >> 2)) ; }
 };
@@ -135,7 +136,7 @@ struct QHashCombineCommutative {
     // QHash). Therefore, provide a commutative combiner, too.
     typedef uint result_type;
     template <typename T>
-    Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t)))
+    Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const noexcept(noexcept(qHash(t)))
     { return seed + qHash(t); } // don't use xor!
 };
 
@@ -143,20 +144,20 @@ struct QHashCombineCommutative {
 
 template <typename InputIterator>
 inline uint qHashRange(InputIterator first, InputIterator last, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(*first))) // assume iterator operations don't throw
+    noexcept(noexcept(qHash(*first))) // assume iterator operations don't throw
 {
     return std::accumulate(first, last, seed, QtPrivate::QHashCombine());
 }
 
 template <typename InputIterator>
 inline uint qHashRangeCommutative(InputIterator first, InputIterator last, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(*first))) // assume iterator operations don't throw
+    noexcept(noexcept(qHash(*first))) // assume iterator operations don't throw
 {
     return std::accumulate(first, last, seed, QtPrivate::QHashCombineCommutative());
 }
 
 template <typename T1, typename T2> inline uint qHash(const QPair<T1, T2> &key, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(key.first, seed)) && noexcept(qHash(key.second, seed)))
+    noexcept(noexcept(qHash(key.first, seed)) && noexcept(qHash(key.second, seed)))
 {
     uint h1 = qHash(key.first, seed);
     uint h2 = qHash(key.second, seed);
@@ -164,7 +165,7 @@ template <typename T1, typename T2> inline uint qHash(const QPair<T1, T2> &key,
 }
 
 template <typename T1, typename T2> inline uint qHash(const std::pair<T1, T2> &key, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(key.first, seed)) && noexcept(qHash(key.second, seed)))
+    noexcept(noexcept(qHash(key.first, seed)) && noexcept(qHash(key.second, seed)))
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.first);
@@ -172,6 +173,41 @@ template <typename T1, typename T2> inline uint qHash(const std::pair<T1, T2> &k
     return seed;
 }
 
+#define QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH(Class, Arguments)      \
+    QT_BEGIN_INCLUDE_NAMESPACE                                      \
+    namespace std {                                                 \
+        template <>                                                 \
+        struct hash< QT_PREPEND_NAMESPACE(Class) > {                \
+            using argument_type = QT_PREPEND_NAMESPACE(Class);      \
+            using result_type = size_t;                             \
+            size_t operator()(Arguments s) const                    \
+                noexcept(noexcept(QT_PREPEND_NAMESPACE(qHash)(s)))  \
+            {                                                       \
+                /* this seeds qHash with the result of */           \
+                /* std::hash applied to an int, to reap */          \
+                /* any protection against predictable hash */       \
+                /* values the std implementation may provide */     \
+                return QT_PREPEND_NAMESPACE(qHash)(s,               \
+                           QT_PREPEND_NAMESPACE(qHash)(             \
+                                      std::hash<int>{}(0)));        \
+            }                                                       \
+        };                                                          \
+    }                                                               \
+    QT_END_INCLUDE_NAMESPACE                                        \
+    /*end*/
+
+#define QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(Class) \
+    QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH(Class, const argument_type &)
+#define QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(Class) \
+    QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH(Class, argument_type)
+
+QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QString)
+QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QStringRef)
+QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QStringView)
+QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QLatin1String)
+QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QByteArray)
+QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray)
+
 QT_END_NAMESPACE
 
 #if defined(Q_CC_MSVC)
diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h
index 177a4f1a4c..84a0e116ca 100644
--- a/src/corelib/tools/qiterator.h
+++ b/src/corelib/tools/qiterator.h
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#if !defined(QT_NO_JAVA_STYLE_ITERATORS)
+
 #define Q_DECLARE_SEQUENTIAL_ITERATOR(C) \
 \
 template <class T> \
@@ -179,6 +181,13 @@ public: \
       n = c->end(); return false; } \
 };
 
+#else // QT_NO_JAVA_STYLE_ITERATORS
+#define Q_DECLARE_SEQUENTIAL_ITERATOR(C)
+#define Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(C)
+#define Q_DECLARE_ASSOCIATIVE_ITERATOR(C)
+#define Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR(C)
+#endif // QT_NO_JAVA_STYLE_ITERATORS
+
 template<typename Key, typename T, class Iterator>
 class QKeyValueIterator
 {
@@ -190,15 +199,15 @@ public:
     typedef const value_type &reference;
 
     QKeyValueIterator() = default;
-    Q_DECL_CONSTEXPR explicit QKeyValueIterator(Iterator o) Q_DECL_NOEXCEPT_EXPR(std::is_nothrow_move_constructible<Iterator>::value)
+    Q_DECL_CONSTEXPR explicit QKeyValueIterator(Iterator o) noexcept(std::is_nothrow_move_constructible<Iterator>::value)
         : i(std::move(o)) {}
 
     std::pair<Key, T> operator*() const {
         return std::pair<Key, T>(i.key(), i.value());
     }
 
-    friend bool operator==(QKeyValueIterator lhs, QKeyValueIterator rhs) Q_DECL_NOEXCEPT { return lhs.i == rhs.i; }
-    friend bool operator!=(QKeyValueIterator lhs, QKeyValueIterator rhs) Q_DECL_NOEXCEPT { return lhs.i != rhs.i; }
+    friend bool operator==(QKeyValueIterator lhs, QKeyValueIterator rhs) noexcept { return lhs.i == rhs.i; }
+    friend bool operator!=(QKeyValueIterator lhs, QKeyValueIterator rhs) noexcept { return lhs.i != rhs.i; }
 
     inline QKeyValueIterator &operator++() { ++i; return *this; }
     inline QKeyValueIterator operator++(int) { return QKeyValueIterator(i++);}
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index 949f63ea15..3afd23d76b 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -347,7 +347,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
     function to determine whether the QLineF represents a valid line
     or a null line.
 
-    The intersect() function determines the IntersectType for this
+    The intersects() function determines the IntersectionType for this
     line and a given line, while the angleTo() function returns the
     angle between the lines. In addition, the unitVector() function
     returns a line that has the same starting point as this line, but
@@ -370,6 +370,11 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
 
 /*!
     \enum QLineF::IntersectType
+    \obsolete Use QLineF::IntersectionType instead
+*/
+
+/*!
+    \enum QLineF::IntersectionType
 
     Describes the intersection between two lines.
 
@@ -657,8 +662,10 @@ QLineF QLineF::unitVector() const
     return f;
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
     \fn QLineF::IntersectType QLineF::intersect(const QLineF &line, QPointF *intersectionPoint) const
+    \obsolete Use intersects() instead
 
     Returns a value indicating whether or not \e this line intersects
     with the given \a line.
@@ -670,6 +677,23 @@ QLineF QLineF::unitVector() const
 
 QLineF::IntersectType QLineF::intersect(const QLineF &l, QPointF *intersectionPoint) const
 {
+    return intersects(l, intersectionPoint);
+}
+#endif
+
+/*!
+    \fn QLineF::IntersectionType QLineF::intersects(const QLineF &line, QPointF *intersectionPoint) const
+    \since 5.14
+
+    Returns a value indicating whether or not \e this line intersects
+    with the given \a line.
+
+    The actual intersection point is extracted to \a intersectionPoint
+    (if the pointer is valid). If the lines are parallel, the
+    intersection point is undefined.
+*/
+QLineF::IntersectionType QLineF::intersects(const QLineF &l, QPointF *intersectionPoint) const
+{
     // ipmlementation is based on Graphics Gems III's "Faster Line Segment Intersection"
     const QPointF a = pt2 - pt1;
     const QPointF b = l.pt1 - l.pt2;
@@ -805,6 +829,7 @@ qreal QLineF::angleTo(const QLineF &l) const
         return delta_normalized;
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
   \fn qreal QLineF::angle(const QLineF &line) const
 
@@ -837,6 +862,7 @@ qreal QLineF::angle(const QLineF &l) const
     if (cos_line >= -1.0 && cos_line <= 1.0) rad = qAcos( cos_line );
     return rad * 360 / M_2PI;
 }
+#endif
 
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h
index 6361c1af9f..c96d624afd 100644
--- a/src/corelib/tools/qline.h
+++ b/src/corelib/tools/qline.h
@@ -215,6 +215,7 @@ class Q_CORE_EXPORT QLineF {
 public:
 
     enum IntersectType { NoIntersection, BoundedIntersection, UnboundedIntersection };
+    using IntersectionType = IntersectType;
 
     Q_DECL_CONSTEXPR inline QLineF();
     Q_DECL_CONSTEXPR inline QLineF(const QPointF &pt1, const QPointF &pt2);
@@ -248,10 +249,14 @@ public:
     Q_REQUIRED_RESULT QLineF unitVector() const;
     Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QLineF normalVector() const;
 
-    // ### Qt 6: rename intersects() or intersection() and rename IntersectType IntersectionType
-    IntersectType intersect(const QLineF &l, QPointF *intersectionPoint) const;
+    IntersectionType intersects(const QLineF &l, QPointF *intersectionPoint) const;
 
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_VERSION_X(5, 14, "Use intersects() instead")
+    IntersectType intersect(const QLineF &l, QPointF *intersectionPoint) const;
+    QT_DEPRECATED_X("Use angleTo() instead, take care that the return value is between 0 and 360 degree.")
     qreal angle(const QLineF &l) const;
+#endif
 
     Q_DECL_CONSTEXPR inline QPointF pointAt(qreal t) const;
     inline void translate(const QPointF &p);
diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
index d9d93862e5..3b1bc8aab1 100644
--- a/src/corelib/tools/qlinkedlist.cpp
+++ b/src/corelib/tools/qlinkedlist.cpp
@@ -37,6 +37,10 @@
 **
 ****************************************************************************/
 
+#ifdef QT_NO_LINKED_LIST
+# undef QT_NO_LINKED_LIST
+#endif
+
 #include "qlinkedlist.h"
 
 QT_BEGIN_NAMESPACE
@@ -153,6 +157,14 @@ const QLinkedListData QLinkedListData::shared_null = {
     initializer lists.
 */
 
+/*! \fn template <class T> template<typename InputIterator> QLinkedList<T>::QLinkedList(InputIterator first, InputIterator last)
+    \since 5.14
+
+    Constructs a list with the contents in the iterator range [\a first, \a last).
+
+    The value type of \c InputIterator must be convertible to \c T.
+*/
+
 /*! \fn template <class T> QLinkedList<T>::~QLinkedList()
 
     Destroys the list. References to the values in the list, and all
@@ -734,8 +746,7 @@ const QLinkedListData QLinkedListData::shared_null = {
     \snippet code/src_corelib_tools_qlinkedlist.cpp 7
 
     STL-style iterators can be used as arguments to \l{generic
-    algorithms}. For example, here's how to find an item in the list
-    using the qFind() algorithm:
+    algorithms}. For example, here's how to find an item in the list:
 
     \snippet code/src_corelib_tools_qlinkedlist.cpp 8
 
@@ -979,8 +990,7 @@ const QLinkedListData QLinkedListData::shared_null = {
     \snippet code/src_corelib_tools_qlinkedlist.cpp 14
 
     STL-style iterators can be used as arguments to \l{generic
-    algorithms}. For example, here's how to find an item in the list
-    using the qFind() algorithm:
+    algorithms}. For example, here's how to find an item in the list:
 
     \snippet code/src_corelib_tools_qlinkedlist.cpp 15
 
diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h
index 1e6d4df474..8970d39be0 100644
--- a/src/corelib/tools/qlinkedlist.h
+++ b/src/corelib/tools/qlinkedlist.h
@@ -40,18 +40,21 @@
 #ifndef QLINKEDLIST_H
 #define QLINKEDLIST_H
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_LINKED_LIST
+
 #include <QtCore/qiterator.h>
 #include <QtCore/qrefcount.h>
+#include <QtCore/qcontainertools_impl.h>
+#include <QtCore/qdatastream.h>
+#include <QtCore/qtypeinfo.h>
 
+#include <algorithm>
+#include <initializer_list>
 #include <iterator>
 #include <list>
 
-#include <algorithm>
-
-#if defined(Q_COMPILER_INITIALIZER_LISTS)
-# include <initializer_list>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 
@@ -80,24 +83,23 @@ class QLinkedList
     union { QLinkedListData *d; QLinkedListNode<T> *e; };
 
 public:
-    inline QLinkedList() Q_DECL_NOTHROW : d(const_cast<QLinkedListData *>(&QLinkedListData::shared_null)) { }
+    inline QLinkedList() noexcept : d(const_cast<QLinkedListData *>(&QLinkedListData::shared_null)) { }
     inline QLinkedList(const QLinkedList<T> &l) : d(l.d) { d->ref.ref(); if (!d->sharable) detach(); }
-#if defined(Q_COMPILER_INITIALIZER_LISTS)
     inline QLinkedList(std::initializer_list<T> list)
-        : d(const_cast<QLinkedListData *>(&QLinkedListData::shared_null))
+        : QLinkedList(list.begin(), list.end()) {}
+    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
+    inline QLinkedList(InputIterator first, InputIterator last)
+        : QLinkedList()
     {
-        std::copy(list.begin(), list.end(), std::back_inserter(*this));
+        std::copy(first, last, std::back_inserter(*this));
     }
-#endif
     ~QLinkedList();
     QLinkedList<T> &operator=(const QLinkedList<T> &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QLinkedList(QLinkedList<T> &&other) Q_DECL_NOTHROW
+    QLinkedList(QLinkedList<T> &&other) noexcept
         : d(other.d) { other.d = const_cast<QLinkedListData *>(&QLinkedListData::shared_null); }
-    QLinkedList<T> &operator=(QLinkedList<T> &&other) Q_DECL_NOTHROW
+    QLinkedList<T> &operator=(QLinkedList<T> &&other) noexcept
     { QLinkedList moved(std::move(other)); swap(moved); return *this; }
-#endif
-    inline void swap(QLinkedList<T> &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    inline void swap(QLinkedList<T> &other) noexcept { qSwap(d, other.d); }
     bool operator==(const QLinkedList<T> &l) const;
     inline bool operator!=(const QLinkedList<T> &l) const { return !(*this == l); }
 
@@ -137,10 +139,10 @@ public:
         inline iterator() : i(nullptr) {}
         inline iterator(Node *n) : i(n) {}
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-        iterator(const iterator &other) Q_DECL_NOTHROW : i(other.i) {}
-        iterator &operator=(const iterator &other) Q_DECL_NOTHROW { i = other.i; return *this; }
-        iterator(iterator &&other) Q_DECL_NOTHROW : i(other.i) {}
-        iterator &operator=(iterator &&other) Q_DECL_NOTHROW { return *this = other; }
+        iterator(const iterator &other) noexcept : i(other.i) {}
+        iterator &operator=(const iterator &other) noexcept { i = other.i; return *this; }
+        iterator(iterator &&other) noexcept : i(other.i) {}
+        iterator &operator=(iterator &&other) noexcept { return *this = other; }
 #endif
         inline T &operator*() const { return i->t; }
         inline T *operator->() const { return &i->t; }
@@ -176,10 +178,10 @@ public:
         inline const_iterator(Node *n) : i(n) {}
         inline const_iterator(iterator ci) : i(ci.i){}
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-        const_iterator(const const_iterator &other) Q_DECL_NOTHROW : i(other.i) {}
-        const_iterator &operator=(const const_iterator &other) Q_DECL_NOTHROW { i = other.i; return *this; }
-        const_iterator(const_iterator &&other) Q_DECL_NOTHROW : i(other.i) {}
-        const_iterator &operator=(const_iterator &&other) Q_DECL_NOTHROW { return *this = other; }
+        const_iterator(const const_iterator &other) noexcept : i(other.i) {}
+        const_iterator &operator=(const const_iterator &other) noexcept { i = other.i; return *this; }
+        const_iterator(const_iterator &&other) noexcept : i(other.i) {}
+        const_iterator &operator=(const_iterator &&other) noexcept { return *this = other; }
 #endif
         inline const T &operator*() const { return i->t; }
         inline const T *operator->() const { return &i->t; }
@@ -203,20 +205,20 @@ public:
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
     inline iterator begin() { detach(); return e->n; }
-    inline const_iterator begin() const Q_DECL_NOTHROW { return e->n; }
-    inline const_iterator cbegin() const Q_DECL_NOTHROW { return e->n; }
-    inline const_iterator constBegin() const Q_DECL_NOTHROW { return e->n; }
+    inline const_iterator begin() const noexcept { return e->n; }
+    inline const_iterator cbegin() const noexcept { return e->n; }
+    inline const_iterator constBegin() const noexcept { return e->n; }
     inline iterator end() { detach(); return e; }
-    inline const_iterator end() const Q_DECL_NOTHROW { return e; }
-    inline const_iterator cend() const Q_DECL_NOTHROW { return e; }
-    inline const_iterator constEnd() const Q_DECL_NOTHROW { return e; }
+    inline const_iterator end() const noexcept { return e; }
+    inline const_iterator cend() const noexcept { return e; }
+    inline const_iterator constEnd() const noexcept { return e; }
 
     reverse_iterator rbegin() { return reverse_iterator(end()); }
     reverse_iterator rend() { return reverse_iterator(begin()); }
-    const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
+    const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); }
 
     iterator insert(iterator before, const T &t);
     iterator erase(iterator pos);
@@ -270,6 +272,15 @@ private:
     iterator detach_helper2(iterator);
     void freeData(QLinkedListData*);
 };
+template <typename T>
+Q_DECLARE_TYPEINFO_BODY(QLinkedList<T>, Q_MOVABLE_TYPE|Q_RELOCATABLE_TYPE);
+
+#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
+template <typename InputIterator,
+          typename ValueType = typename std::iterator_traits<InputIterator>::value_type,
+          QtPrivate::IfIsInputIterator<InputIterator> = true>
+QLinkedList(InputIterator, InputIterator) -> QLinkedList<ValueType>;
+#endif
 
 template <typename T>
 inline QLinkedList<T>::~QLinkedList()
@@ -340,7 +351,7 @@ void QLinkedList<T>::freeData(QLinkedListData *x)
 {
     Node *y = reinterpret_cast<Node*>(x);
     Node *i = y->n;
-    Q_ASSERT(x->ref.atomic.load() == 0);
+    Q_ASSERT(x->ref.atomic.loadRelaxed() == 0);
     while (i != y) {
         Node *n = i;
         i = i->n;
@@ -565,6 +576,24 @@ QLinkedList<T> QLinkedList<T>::operator+(const QLinkedList<T> &l) const
 Q_DECLARE_SEQUENTIAL_ITERATOR(LinkedList)
 Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(LinkedList)
 
+#ifndef QT_NO_DATASTREAM
+template <typename T>
+inline QDataStream &operator>>(QDataStream &s, QLinkedList<T> &l)
+{
+    return QtPrivate::readListBasedContainer(s, l);
+}
+
+template <typename T>
+inline QDataStream &operator<<(QDataStream &s, const QLinkedList<T> &l)
+{
+    return QtPrivate::writeSequentialContainer(s, l);
+}
+#endif
+
 QT_END_NAMESPACE
 
+Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(QLinkedList)
+
+#endif // QT_NO_LINKED_LIST
+
 #endif // QLINKEDLIST_H
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index 6f8084c676..dfebd57e34 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -75,7 +75,7 @@ template class Q_CORE_EXPORT QVector<QPoint>;
     the number of elements in the list.
 */
 
-const QListData::Data QListData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, { 0 } };
+const QListData::Data QListData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, { nullptr } };
 
 /*!
  *  Detaches the QListData by allocating new memory for a list which will be bigger
@@ -545,6 +545,14 @@ void **QListData::erase(void **xi)
     \since 5.2
 */
 
+/*! \fn template <class T> template<typename InputIterator> QList<T>::QList(InputIterator first, InputIterator last)
+    \since 5.14
+
+    Constructs a QList with the contents in the iterator range [\a first, \a last).
+
+    The value type of \c InputIterator must be convertible to \c T.
+*/
+
 /*!
     \fn template <class T> QList<T> QList<T>::mid(int pos, int length) const
 
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index a98a9147d6..425ffa42a5 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -46,12 +46,13 @@
 #include <QtCore/qarraydata.h>
 #include <QtCore/qhashfunctions.h>
 #include <QtCore/qvector.h>
+#include <QtCore/qcontainertools_impl.h>
 
-#include <iterator>
-#include <list>
 #include <algorithm>
-#ifdef Q_COMPILER_INITIALIZER_LISTS
 #include <initializer_list>
+#include <iterator>
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+#include <list>
 #endif
 
 #include <stdlib.h>
@@ -111,11 +112,11 @@ struct Q_CORE_EXPORT QListData {
     void remove(int i);
     void remove(int i, int n);
     void move(int from, int to);
-    inline int size() const Q_DECL_NOTHROW { return int(d->end - d->begin); }   // q6sizetype
-    inline bool isEmpty() const Q_DECL_NOTHROW { return d->end  == d->begin; }
-    inline void **at(int i) const Q_DECL_NOTHROW { return d->array + d->begin + i; }
-    inline void **begin() const Q_DECL_NOTHROW { return d->array + d->begin; }
-    inline void **end() const Q_DECL_NOTHROW { return d->array + d->end; }
+    inline int size() const noexcept { return int(d->end - d->begin); }   // q6sizetype
+    inline bool isEmpty() const noexcept { return d->end  == d->begin; }
+    inline void **at(int i) const noexcept { return d->array + d->begin + i; }
+    inline void **begin() const noexcept { return d->array + d->begin; }
+    inline void **end() const noexcept { return d->array + d->end; }
 };
 
 namespace QtPrivate {
@@ -156,26 +157,23 @@ private:
     union { QListData p; QListData::Data *d; };
 
 public:
-    inline QList() Q_DECL_NOTHROW : d(const_cast<QListData::Data *>(&QListData::shared_null)) { }
+    inline QList() noexcept : d(const_cast<QListData::Data *>(&QListData::shared_null)) { }
     QList(const QList<T> &l);
     ~QList();
     QList<T> &operator=(const QList<T> &l);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QList(QList<T> &&other) Q_DECL_NOTHROW
+    inline QList(QList<T> &&other) noexcept
         : d(other.d) { other.d = const_cast<QListData::Data *>(&QListData::shared_null); }
-    inline QList &operator=(QList<T> &&other) Q_DECL_NOTHROW
+    inline QList &operator=(QList<T> &&other) noexcept
     { QList moved(std::move(other)); swap(moved); return *this; }
-#endif
-    inline void swap(QList<T> &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
-#ifdef Q_COMPILER_INITIALIZER_LISTS
+    inline void swap(QList<T> &other) noexcept { qSwap(d, other.d); }
     inline QList(std::initializer_list<T> args)
-        : d(const_cast<QListData::Data *>(&QListData::shared_null))
-    { reserve(int(args.size())); std::copy(args.begin(), args.end(), std::back_inserter(*this)); }
-#endif
+        : QList(args.begin(), args.end()) {}
+    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
+    QList(InputIterator first, InputIterator last);
     bool operator==(const QList<T> &l) const;
     inline bool operator!=(const QList<T> &l) const { return !(*this == l); }
 
-    inline int size() const Q_DECL_NOTHROW { return p.size(); }
+    inline int size() const noexcept { return p.size(); }
 
     inline void detach() { if (d->ref.isShared()) detach_helper(); }
 
@@ -198,9 +196,9 @@ public:
             d->ref.setSharable(sharable);
     }
 #endif
-    inline bool isSharedWith(const QList<T> &other) const Q_DECL_NOTHROW { return d == other.d; }
+    inline bool isSharedWith(const QList<T> &other) const noexcept { return d == other.d; }
 
-    inline bool isEmpty() const Q_DECL_NOTHROW { return p.isEmpty(); }
+    inline bool isEmpty() const noexcept { return p.isEmpty(); }
 
     void clear();
 
@@ -243,36 +241,36 @@ public:
         typedef T *pointer;
         typedef T &reference;
 
-        inline iterator() Q_DECL_NOTHROW : i(nullptr) {}
-        inline iterator(Node *n) Q_DECL_NOTHROW : i(n) {}
+        inline iterator() noexcept : i(nullptr) {}
+        inline iterator(Node *n) noexcept : i(n) {}
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
         // can't remove it in Qt 5, since doing so would make the type trivial,
         // which changes the way it's passed to functions by value.
-        inline iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i){}
-        inline iterator &operator=(const iterator &o) Q_DECL_NOTHROW
+        inline iterator(const iterator &o) noexcept : i(o.i){}
+        inline iterator &operator=(const iterator &o) noexcept
         { i = o.i; return *this; }
 #endif
         inline T &operator*() const { return i->t(); }
         inline T *operator->() const { return &i->t(); }
         inline T &operator[](difference_type j) const { return i[j].t(); }
-        inline bool operator==(const iterator &o) const Q_DECL_NOTHROW { return i == o.i; }
-        inline bool operator!=(const iterator &o) const Q_DECL_NOTHROW { return i != o.i; }
-        inline bool operator<(const iterator& other) const Q_DECL_NOTHROW { return i < other.i; }
-        inline bool operator<=(const iterator& other) const Q_DECL_NOTHROW { return i <= other.i; }
-        inline bool operator>(const iterator& other) const Q_DECL_NOTHROW { return i > other.i; }
-        inline bool operator>=(const iterator& other) const Q_DECL_NOTHROW { return i >= other.i; }
+        inline bool operator==(const iterator &o) const noexcept { return i == o.i; }
+        inline bool operator!=(const iterator &o) const noexcept { return i != o.i; }
+        inline bool operator<(const iterator& other) const noexcept { return i < other.i; }
+        inline bool operator<=(const iterator& other) const noexcept { return i <= other.i; }
+        inline bool operator>(const iterator& other) const noexcept { return i > other.i; }
+        inline bool operator>=(const iterator& other) const noexcept { return i >= other.i; }
 #ifndef QT_STRICT_ITERATORS
-        inline bool operator==(const const_iterator &o) const Q_DECL_NOTHROW
+        inline bool operator==(const const_iterator &o) const noexcept
             { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const Q_DECL_NOTHROW
+        inline bool operator!=(const const_iterator &o) const noexcept
             { return i != o.i; }
-        inline bool operator<(const const_iterator& other) const Q_DECL_NOTHROW
+        inline bool operator<(const const_iterator& other) const noexcept
             { return i < other.i; }
-        inline bool operator<=(const const_iterator& other) const Q_DECL_NOTHROW
+        inline bool operator<=(const const_iterator& other) const noexcept
             { return i <= other.i; }
-        inline bool operator>(const const_iterator& other) const Q_DECL_NOTHROW
+        inline bool operator>(const const_iterator& other) const noexcept
             { return i > other.i; }
-        inline bool operator>=(const const_iterator& other) const Q_DECL_NOTHROW
+        inline bool operator>=(const const_iterator& other) const noexcept
             { return i >= other.i; }
 #endif
         inline iterator &operator++() { ++i; return *this; }
@@ -298,29 +296,29 @@ public:
         typedef const T *pointer;
         typedef const T &reference;
 
-        inline const_iterator() Q_DECL_NOTHROW : i(nullptr) {}
-        inline const_iterator(Node *n) Q_DECL_NOTHROW : i(n) {}
+        inline const_iterator() noexcept : i(nullptr) {}
+        inline const_iterator(Node *n) noexcept : i(n) {}
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
         // can't remove it in Qt 5, since doing so would make the type trivial,
         // which changes the way it's passed to functions by value.
-        inline const_iterator(const const_iterator &o) Q_DECL_NOTHROW : i(o.i) {}
-        inline const_iterator &operator=(const const_iterator &o) Q_DECL_NOTHROW
+        inline const_iterator(const const_iterator &o) noexcept : i(o.i) {}
+        inline const_iterator &operator=(const const_iterator &o) noexcept
         { i = o.i; return *this; }
 #endif
 #ifdef QT_STRICT_ITERATORS
-        inline explicit const_iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i) {}
+        inline explicit const_iterator(const iterator &o) noexcept : i(o.i) {}
 #else
-        inline const_iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i) {}
+        inline const_iterator(const iterator &o) noexcept : i(o.i) {}
 #endif
         inline const T &operator*() const { return i->t(); }
         inline const T *operator->() const { return &i->t(); }
         inline const T &operator[](difference_type j) const { return i[j].t(); }
-        inline bool operator==(const const_iterator &o) const Q_DECL_NOTHROW { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const Q_DECL_NOTHROW { return i != o.i; }
-        inline bool operator<(const const_iterator& other) const Q_DECL_NOTHROW { return i < other.i; }
-        inline bool operator<=(const const_iterator& other) const Q_DECL_NOTHROW { return i <= other.i; }
-        inline bool operator>(const const_iterator& other) const Q_DECL_NOTHROW { return i > other.i; }
-        inline bool operator>=(const const_iterator& other) const Q_DECL_NOTHROW { return i >= other.i; }
+        inline bool operator==(const const_iterator &o) const noexcept { return i == o.i; }
+        inline bool operator!=(const const_iterator &o) const noexcept { return i != o.i; }
+        inline bool operator<(const const_iterator& other) const noexcept { return i < other.i; }
+        inline bool operator<=(const const_iterator& other) const noexcept { return i <= other.i; }
+        inline bool operator>(const const_iterator& other) const noexcept { return i > other.i; }
+        inline bool operator>=(const const_iterator& other) const noexcept { return i >= other.i; }
         inline const_iterator &operator++() { ++i; return *this; }
         inline const_iterator operator++(int) { Node *n = i; ++i; return n; }
         inline const_iterator &operator--() { i--; return *this; }
@@ -338,19 +336,19 @@ public:
     typedef std::reverse_iterator<iterator> reverse_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
     inline iterator begin() { detach(); return reinterpret_cast<Node *>(p.begin()); }
-    inline const_iterator begin() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.begin()); }
-    inline const_iterator cbegin() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.begin()); }
-    inline const_iterator constBegin() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.begin()); }
+    inline const_iterator begin() const noexcept { return reinterpret_cast<Node *>(p.begin()); }
+    inline const_iterator cbegin() const noexcept { return reinterpret_cast<Node *>(p.begin()); }
+    inline const_iterator constBegin() const noexcept { return reinterpret_cast<Node *>(p.begin()); }
     inline iterator end() { detach(); return reinterpret_cast<Node *>(p.end()); }
-    inline const_iterator end() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.end()); }
-    inline const_iterator cend() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.end()); }
-    inline const_iterator constEnd() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.end()); }
+    inline const_iterator end() const noexcept { return reinterpret_cast<Node *>(p.end()); }
+    inline const_iterator cend() const noexcept { return reinterpret_cast<Node *>(p.end()); }
+    inline const_iterator constEnd() const noexcept { return reinterpret_cast<Node *>(p.end()); }
     reverse_iterator rbegin() { return reverse_iterator(end()); }
     reverse_iterator rend() { return reverse_iterator(begin()); }
-    const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
+    const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); }
     iterator insert(iterator before, const T &t);
     iterator erase(iterator pos);
     iterator erase(iterator first, iterator last);
@@ -405,16 +403,22 @@ public:
     inline QList<T> &operator<<(const QList<T> &l)
     { *this += l; return *this; }
 
+    static QList<T> fromVector(const QVector<T> &vector);
     QVector<T> toVector() const;
-    QSet<T> toSet() const;
 
-    static QList<T> fromVector(const QVector<T> &vector);
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+    Q_DECL_DEPRECATED_X("Use QList<T>(set.begin(), set.end()) instead.")
     static QList<T> fromSet(const QSet<T> &set);
+    Q_DECL_DEPRECATED_X("Use QSet<T>(list.begin(), list.end()) instead.")
+    QSet<T> toSet() const;
 
+    Q_DECL_DEPRECATED_X("Use QList<T>(list.begin(), list.end()) instead.")
     static inline QList<T> fromStdList(const std::list<T> &list)
-    { QList<T> tmp; std::copy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; }
+    { return QList<T>(list.begin(), list.end()); }
+    Q_DECL_DEPRECATED_X("Use std::list<T>(list.begin(), list.end()) instead.")
     inline std::list<T> toStdList() const
-    { std::list<T> tmp; std::copy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; }
+    { return std::list<T>(begin(), end()); }
+#endif
 
 private:
     Node *detach_helper_grow(int i, int n);
@@ -427,7 +431,7 @@ private:
     void node_copy(Node *from, Node *to, Node *src);
     void node_destruct(Node *from, Node *to);
 
-    bool isValidIterator(const iterator &i) const Q_DECL_NOTHROW
+    bool isValidIterator(const iterator &i) const noexcept
     {
         const std::less<const Node *> less = {};
         return !less(i.i, cbegin().i) && !less(cend().i, i.i);
@@ -442,6 +446,13 @@ private:
     inline int count_impl(const T &, QListData::ArrayCompatibleLayout) const;
 };
 
+#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
+template <typename InputIterator,
+          typename ValueType = typename std::iterator_traits<InputIterator>::value_type,
+          QtPrivate::IfIsInputIterator<InputIterator> = true>
+QList(InputIterator, InputIterator) -> QList<ValueType>;
+#endif
+
 #if defined(Q_CC_BOR)
 template <typename T>
 Q_INLINE_TEMPLATE T &QList<T>::Node::t()
@@ -530,7 +541,7 @@ inline typename QList<T>::iterator QList<T>::insert(iterator before, const T &t)
     Q_ASSERT_X(isValidIterator(before), "QList::insert", "The specified iterator argument 'before' is invalid");
 
     int iBefore = int(before.i - reinterpret_cast<Node *>(p.begin()));
-    Node *n = 0;
+    Node *n = nullptr;
     if (d->ref.isShared())
         n = detach_helper_grow(iBefore, 1);
     else
@@ -710,7 +721,7 @@ inline void QList<T>::swapItemsAt(int i, int j)
     Q_ASSERT_X(i >= 0 && i < p.size() && j >= 0 && j < p.size(),
                 "QList<T>::swap", "index out of range");
     detach();
-    std::swap(d->array[d->begin + i], d->array[d->begin + j]);
+    qSwap(d->array[d->begin + i], d->array[d->begin + j]);
 }
 
 template <typename T>
@@ -847,6 +858,15 @@ Q_OUTOFLINE_TEMPLATE QList<T>::~QList()
 }
 
 template <typename T>
+template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator>>
+QList<T>::QList(InputIterator first, InputIterator last)
+    : QList()
+{
+    QtPrivate::reserveIfForwardIterator(this, first, last);
+    std::copy(first, last, std::back_inserter(*this));
+}
+
+template <typename T>
 Q_OUTOFLINE_TEMPLATE bool QList<T>::operator==(const QList<T> &l) const
 {
     if (d == l.d)
@@ -1092,10 +1112,7 @@ inline int QList<T>::count_impl(const T &t, QListData::ArrayCompatibleLayout) co
 template <typename T>
 Q_OUTOFLINE_TEMPLATE QVector<T> QList<T>::toVector() const
 {
-    QVector<T> result(size());
-    for (int i = 0; i < size(); ++i)
-        result[i] = at(i);
-    return result;
+    return QVector<T>(begin(), end());
 }
 
 template <typename T>
@@ -1107,11 +1124,7 @@ QList<T> QList<T>::fromVector(const QVector<T> &vector)
 template <typename T>
 Q_OUTOFLINE_TEMPLATE QList<T> QVector<T>::toList() const
 {
-    QList<T> result;
-    result.reserve(size());
-    for (int i = 0; i < size(); ++i)
-        result.append(at(i));
-    return result;
+    return QList<T>(begin(), end());
 }
 
 template <typename T>
@@ -1125,14 +1138,14 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(List)
 
 template <typename T>
 uint qHash(const QList<T> &key, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHashRange(key.cbegin(), key.cend(), seed)))
+    noexcept(noexcept(qHashRange(key.cbegin(), key.cend(), seed)))
 {
     return qHashRange(key.cbegin(), key.cend(), seed);
 }
 
 template <typename T>
 bool operator<(const QList<T> &lhs, const QList<T> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(),
+    noexcept(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(),
                                                                rhs.begin(), rhs.end())))
 {
     return std::lexicographical_compare(lhs.begin(), lhs.end(),
@@ -1141,21 +1154,21 @@ bool operator<(const QList<T> &lhs, const QList<T> &rhs)
 
 template <typename T>
 inline bool operator>(const QList<T> &lhs, const QList<T> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return rhs < lhs;
 }
 
 template <typename T>
 inline bool operator<=(const QList<T> &lhs, const QList<T> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return !(lhs > rhs);
 }
 
 template <typename T>
 inline bool operator>=(const QList<T> &lhs, const QList<T> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return !(lhs < rhs);
 }
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 5f7275c5f8..a0ec372f9a 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-const QMapDataBase QMapDataBase::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, { 0, 0, 0 }, 0 };
+const QMapDataBase QMapDataBase::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, { 0, nullptr, nullptr }, nullptr };
 
 const QMapNodeBase *QMapNodeBase::nextNode() const
 {
@@ -92,7 +92,7 @@ void QMapDataBase::rotateLeft(QMapNodeBase *x)
     QMapNodeBase *&root = header.left;
     QMapNodeBase *y = x->right;
     x->right = y->left;
-    if (y->left != 0)
+    if (y->left != nullptr)
         y->left->setParent(x);
     y->setParent(x->parent());
     if (x == root)
@@ -111,7 +111,7 @@ void QMapDataBase::rotateRight(QMapNodeBase *x)
     QMapNodeBase *&root = header.left;
     QMapNodeBase *y = x->left;
     x->left = y->right;
-    if (y->right != 0)
+    if (y->right != nullptr)
         y->right->setParent(x);
     y->setParent(x->parent());
     if (x == root)
@@ -173,7 +173,7 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
     QMapNodeBase *y = z;
     QMapNodeBase *x;
     QMapNodeBase *x_parent;
-    if (y->left == 0) {
+    if (y->left == nullptr) {
         x = y->right;
         if (y == mostLeftNode) {
             if (x)
@@ -182,11 +182,11 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
                 mostLeftNode = y->parent();
         }
     } else {
-        if (y->right == 0) {
+        if (y->right == nullptr) {
             x = y->left;
         } else {
             y = y->right;
-            while (y->left != 0)
+            while (y->left != nullptr)
                 y = y->left;
             x = y->right;
         }
@@ -228,7 +228,7 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
             z->parent()->right = x;
     }
     if (y->color() != QMapNodeBase::Red) {
-        while (x != root && (x == 0 || x->color() == QMapNodeBase::Black)) {
+        while (x != root && (x == nullptr || x->color() == QMapNodeBase::Black)) {
             if (x == x_parent->left) {
                 QMapNodeBase *w = x_parent->right;
                 if (w->color() == QMapNodeBase::Red) {
@@ -237,13 +237,13 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
                     rotateLeft(x_parent);
                     w = x_parent->right;
                 }
-                if ((w->left == 0 || w->left->color() == QMapNodeBase::Black) &&
-                    (w->right == 0 || w->right->color() == QMapNodeBase::Black)) {
+                if ((w->left == nullptr || w->left->color() == QMapNodeBase::Black) &&
+                    (w->right == nullptr || w->right->color() == QMapNodeBase::Black)) {
                     w->setColor(QMapNodeBase::Red);
                     x = x_parent;
                     x_parent = x_parent->parent();
                 } else {
-                    if (w->right == 0 || w->right->color() == QMapNodeBase::Black) {
+                    if (w->right == nullptr || w->right->color() == QMapNodeBase::Black) {
                         if (w->left)
                             w->left->setColor(QMapNodeBase::Black);
                         w->setColor(QMapNodeBase::Red);
@@ -265,13 +265,13 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
                 rotateRight(x_parent);
                 w = x_parent->left;
             }
-            if ((w->right == 0 || w->right->color() == QMapNodeBase::Black) &&
-                (w->left == 0 || w->left->color() == QMapNodeBase::Black)) {
+            if ((w->right == nullptr || w->right->color() == QMapNodeBase::Black) &&
+                (w->left == nullptr|| w->left->color() == QMapNodeBase::Black)) {
                 w->setColor(QMapNodeBase::Red);
                 x = x_parent;
                 x_parent = x_parent->parent();
             } else {
-                if (w->left == 0 || w->left->color() == QMapNodeBase::Black) {
+                if (w->left == nullptr || w->left->color() == QMapNodeBase::Black) {
                     if (w->right)
                         w->right->setColor(QMapNodeBase::Black);
                     w->setColor(QMapNodeBase::Red);
@@ -363,8 +363,8 @@ QMapDataBase *QMapDataBase::createData()
     d->size = 0;
 
     d->header.p = 0;
-    d->header.left = 0;
-    d->header.right = 0;
+    d->header.left = nullptr;
+    d->header.right = nullptr;
     d->mostLeftNode = &(d->header);
 
     return d;
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index 1cf9299e26..18c681581f 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -49,13 +49,10 @@
 #include <QtCore/qdebug.h>
 #endif
 
-#include <map>
-#include <new>
 #include <functional>
-
-#ifdef Q_COMPILER_INITIALIZER_LISTS
 #include <initializer_list>
-#endif
+#include <map>
+#include <new>
 
 QT_BEGIN_NAMESPACE
 
@@ -100,10 +97,10 @@ struct Q_CORE_EXPORT QMapNodeBase
 
     template <typename T>
     static typename std::enable_if<QTypeInfo<T>::isComplex>::type
-    callDestructorIfNecessary(T &t) Q_DECL_NOTHROW { Q_UNUSED(t); t.~T(); } // Q_UNUSED: silence MSVC unused 't' warning
+    callDestructorIfNecessary(T &t) noexcept { Q_UNUSED(t); t.~T(); } // Q_UNUSED: silence MSVC unused 't' warning
     template <typename T>
     static typename std::enable_if<!QTypeInfo<T>::isComplex>::type
-    callDestructorIfNecessary(T &) Q_DECL_NOTHROW {}
+    callDestructorIfNecessary(T &) noexcept {}
 };
 
 template <class Key, class T>
@@ -142,7 +139,7 @@ private:
             rightNode()->destroySubTree();
     }
 
-    QMapNode() Q_DECL_EQ_DELETE;
+    QMapNode() = delete;
     Q_DISABLE_COPY(QMapNode)
 };
 
@@ -325,32 +322,28 @@ class QMap
     QMapData<Key, T> *d;
 
 public:
-    inline QMap() Q_DECL_NOTHROW : d(static_cast<QMapData<Key, T> *>(const_cast<QMapDataBase *>(&QMapDataBase::shared_null))) { }
-#ifdef Q_COMPILER_INITIALIZER_LISTS
+    inline QMap() noexcept : d(static_cast<QMapData<Key, T> *>(const_cast<QMapDataBase *>(&QMapDataBase::shared_null))) { }
     inline QMap(std::initializer_list<std::pair<Key,T> > list)
         : d(static_cast<QMapData<Key, T> *>(const_cast<QMapDataBase *>(&QMapDataBase::shared_null)))
     {
         for (typename std::initializer_list<std::pair<Key,T> >::const_iterator it = list.begin(); it != list.end(); ++it)
             insert(it->first, it->second);
     }
-#endif
     QMap(const QMap<Key, T> &other);
 
     inline ~QMap() { if (!d->ref.deref()) d->destroy(); }
 
     QMap<Key, T> &operator=(const QMap<Key, T> &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QMap(QMap<Key, T> &&other) Q_DECL_NOTHROW
+    inline QMap(QMap<Key, T> &&other) noexcept
         : d(other.d)
     {
         other.d = static_cast<QMapData<Key, T> *>(
                 const_cast<QMapDataBase *>(&QMapDataBase::shared_null));
     }
 
-    inline QMap<Key, T> &operator=(QMap<Key, T> &&other) Q_DECL_NOTHROW
+    inline QMap<Key, T> &operator=(QMap<Key, T> &&other) noexcept
     { QMap moved(std::move(other)); swap(moved); return *this; }
-#endif
-    inline void swap(QMap<Key, T> &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    inline void swap(QMap<Key, T> &other) noexcept { qSwap(d, other.d); }
     explicit QMap(const typename std::map<Key, T> &other);
     std::map<Key, T> toStdMap() const;
 
@@ -1187,19 +1180,15 @@ template <class Key, class T>
 class QMultiMap : public QMap<Key, T>
 {
 public:
-    QMultiMap() Q_DECL_NOTHROW {}
-#ifdef Q_COMPILER_INITIALIZER_LISTS
+    QMultiMap() noexcept {}
     inline QMultiMap(std::initializer_list<std::pair<Key,T> > list)
     {
         for (typename std::initializer_list<std::pair<Key,T> >::const_iterator it = list.begin(); it != list.end(); ++it)
             insert(it->first, it->second);
     }
-#endif
     QMultiMap(const QMap<Key, T> &other) : QMap<Key, T>(other) {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    QMultiMap(QMap<Key, T> &&other) Q_DECL_NOTHROW : QMap<Key, T>(std::move(other)) {}
-#endif
-    void swap(QMultiMap<Key, T> &other) Q_DECL_NOTHROW { QMap<Key, T>::swap(other); }
+    QMultiMap(QMap<Key, T> &&other) noexcept : QMap<Key, T>(std::move(other)) {}
+    void swap(QMultiMap<Key, T> &other) noexcept { QMap<Key, T>::swap(other); }
 
     inline typename QMap<Key, T>::iterator replace(const Key &key, const T &value)
     { return QMap<Key, T>::insert(key, value); }
diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h
index 0c73235d26..447037daaa 100644
--- a/src/corelib/tools/qmargins.h
+++ b/src/corelib/tools/qmargins.h
@@ -51,28 +51,28 @@ QT_BEGIN_NAMESPACE
 class QMargins
 {
 public:
-    Q_DECL_CONSTEXPR QMargins() Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QMargins(int left, int top, int right, int bottom) Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR int left() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR int top() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR int right() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR int bottom() const Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR void setLeft(int left) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR void setTop(int top) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR void setRight(int right) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR void setBottom(int bottom) Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR QMargins &operator+=(const QMargins &margins) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR QMargins &operator-=(const QMargins &margins) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR QMargins &operator+=(int) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR QMargins &operator-=(int) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR QMargins &operator*=(int) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QMargins() noexcept;
+    Q_DECL_CONSTEXPR QMargins(int left, int top, int right, int bottom) noexcept;
+
+    Q_DECL_CONSTEXPR bool isNull() const noexcept;
+
+    Q_DECL_CONSTEXPR int left() const noexcept;
+    Q_DECL_CONSTEXPR int top() const noexcept;
+    Q_DECL_CONSTEXPR int right() const noexcept;
+    Q_DECL_CONSTEXPR int bottom() const noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR void setLeft(int left) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR void setTop(int top) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR void setRight(int right) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR void setBottom(int bottom) noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR QMargins &operator+=(const QMargins &margins) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR QMargins &operator-=(const QMargins &margins) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR QMargins &operator+=(int) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR QMargins &operator-=(int) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR QMargins &operator*=(int) noexcept;
     Q_DECL_RELAXED_CONSTEXPR QMargins &operator/=(int);
-    Q_DECL_RELAXED_CONSTEXPR QMargins &operator*=(qreal) Q_DECL_NOTHROW;
+    Q_DECL_RELAXED_CONSTEXPR QMargins &operator*=(qreal) noexcept;
     Q_DECL_RELAXED_CONSTEXPR QMargins &operator/=(qreal);
 
 private:
@@ -81,8 +81,8 @@ private:
     int m_right;
     int m_bottom;
 
-    friend Q_DECL_CONSTEXPR inline bool operator==(const QMargins &, const QMargins &) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &, const QMargins &) Q_DECL_NOTHROW;
+    friend Q_DECL_CONSTEXPR inline bool operator==(const QMargins &, const QMargins &) noexcept;
+    friend Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &, const QMargins &) noexcept;
 };
 
 Q_DECLARE_TYPEINFO(QMargins, Q_MOVABLE_TYPE);
@@ -99,40 +99,40 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QMargins &);
   QMargins inline functions
  *****************************************************************************/
 
-Q_DECL_CONSTEXPR inline QMargins::QMargins() Q_DECL_NOTHROW : m_left(0), m_top(0), m_right(0), m_bottom(0) {}
+Q_DECL_CONSTEXPR inline QMargins::QMargins() noexcept : m_left(0), m_top(0), m_right(0), m_bottom(0) {}
 
-Q_DECL_CONSTEXPR inline QMargins::QMargins(int aleft, int atop, int aright, int abottom) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins::QMargins(int aleft, int atop, int aright, int abottom) noexcept
     : m_left(aleft), m_top(atop), m_right(aright), m_bottom(abottom) {}
 
-Q_DECL_CONSTEXPR inline bool QMargins::isNull() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QMargins::isNull() const noexcept
 { return m_left==0 && m_top==0 && m_right==0 && m_bottom==0; }
 
-Q_DECL_CONSTEXPR inline int QMargins::left() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QMargins::left() const noexcept
 { return m_left; }
 
-Q_DECL_CONSTEXPR inline int QMargins::top() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QMargins::top() const noexcept
 { return m_top; }
 
-Q_DECL_CONSTEXPR inline int QMargins::right() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QMargins::right() const noexcept
 { return m_right; }
 
-Q_DECL_CONSTEXPR inline int QMargins::bottom() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QMargins::bottom() const noexcept
 { return m_bottom; }
 
 
-Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setLeft(int aleft) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setLeft(int aleft) noexcept
 { m_left = aleft; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setTop(int atop) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setTop(int atop) noexcept
 { m_top = atop; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setRight(int aright) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setRight(int aright) noexcept
 { m_right = aright; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setBottom(int abottom) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setBottom(int abottom) noexcept
 { m_bottom = abottom; }
 
-Q_DECL_CONSTEXPR inline bool operator==(const QMargins &m1, const QMargins &m2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator==(const QMargins &m1, const QMargins &m2) noexcept
 {
     return
             m1.m_left == m2.m_left &&
@@ -141,7 +141,7 @@ Q_DECL_CONSTEXPR inline bool operator==(const QMargins &m1, const QMargins &m2)
             m1.m_bottom == m2.m_bottom;
 }
 
-Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &m1, const QMargins &m2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &m1, const QMargins &m2) noexcept
 {
     return
             m1.m_left != m2.m_left ||
@@ -150,55 +150,55 @@ Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &m1, const QMargins &m2)
             m1.m_bottom != m2.m_bottom;
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &m1, const QMargins &m2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &m1, const QMargins &m2) noexcept
 {
     return QMargins(m1.left() + m2.left(), m1.top() + m2.top(),
                     m1.right() + m2.right(), m1.bottom() + m2.bottom());
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &m1, const QMargins &m2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &m1, const QMargins &m2) noexcept
 {
     return QMargins(m1.left() - m2.left(), m1.top() - m2.top(),
                     m1.right() - m2.right(), m1.bottom() - m2.bottom());
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &lhs, int rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &lhs, int rhs) noexcept
 {
     return QMargins(lhs.left() + rhs, lhs.top() + rhs,
                     lhs.right() + rhs, lhs.bottom() + rhs);
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator+(int lhs, const QMargins &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator+(int lhs, const QMargins &rhs) noexcept
 {
     return QMargins(rhs.left() + lhs, rhs.top() + lhs,
                     rhs.right() + lhs, rhs.bottom() + lhs);
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &lhs, int rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &lhs, int rhs) noexcept
 {
     return QMargins(lhs.left() - rhs, lhs.top() - rhs,
                     lhs.right() - rhs, lhs.bottom() - rhs);
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, int factor) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, int factor) noexcept
 {
     return QMargins(margins.left() * factor, margins.top() * factor,
                     margins.right() * factor, margins.bottom() * factor);
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator*(int factor, const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator*(int factor, const QMargins &margins) noexcept
 {
     return QMargins(margins.left() * factor, margins.top() * factor,
                     margins.right() * factor, margins.bottom() * factor);
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, qreal factor) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, qreal factor) noexcept
 {
     return QMargins(qRound(margins.left() * factor), qRound(margins.top() * factor),
                     qRound(margins.right() * factor), qRound(margins.bottom() * factor));
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator*(qreal factor, const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator*(qreal factor, const QMargins &margins) noexcept
 {
     return QMargins(qRound(margins.left() * factor), qRound(margins.top() * factor),
                     qRound(margins.right() * factor), qRound(margins.bottom() * factor));
@@ -216,17 +216,17 @@ Q_DECL_CONSTEXPR inline QMargins operator/(const QMargins &margins, qreal diviso
                     qRound(margins.right() / divisor), qRound(margins.bottom() / divisor));
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(const QMargins &margins) noexcept
 {
     return *this = *this + margins;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(const QMargins &margins) noexcept
 {
     return *this = *this - margins;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(int margin) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(int margin) noexcept
 {
     m_left += margin;
     m_top += margin;
@@ -235,7 +235,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(int margin) Q_DEC
     return *this;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(int margin) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(int margin) noexcept
 {
     m_left -= margin;
     m_top -= margin;
@@ -244,7 +244,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(int margin) Q_DEC
     return *this;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator*=(int factor) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator*=(int factor) noexcept
 {
     return *this = *this * factor;
 }
@@ -254,7 +254,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator/=(int divisor)
     return *this = *this / divisor;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator*=(qreal factor) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator*=(qreal factor) noexcept
 {
     return *this = *this * factor;
 }
@@ -264,12 +264,12 @@ Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator/=(qreal divisor)
     return *this = *this / divisor;
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &margins) noexcept
 {
     return margins;
 }
 
-Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &margins) noexcept
 {
     return QMargins(-margins.left(), -margins.top(), -margins.right(), -margins.bottom());
 }
@@ -285,30 +285,30 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QMargins &);
 class QMarginsF
 {
 public:
-    Q_DECL_CONSTEXPR QMarginsF() Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QMarginsF(qreal left, qreal top, qreal right, qreal bottom) Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QMarginsF(const QMargins &margins) Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR qreal left() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR qreal top() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR qreal right() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR qreal bottom() const Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR void setLeft(qreal left) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR void setTop(qreal top) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR void setRight(qreal right) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR void setBottom(qreal bottom) Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator+=(const QMarginsF &margins) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator-=(const QMarginsF &margins) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator+=(qreal addend) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator-=(qreal subtrahend) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator*=(qreal factor) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QMarginsF() noexcept;
+    Q_DECL_CONSTEXPR QMarginsF(qreal left, qreal top, qreal right, qreal bottom) noexcept;
+    Q_DECL_CONSTEXPR QMarginsF(const QMargins &margins) noexcept;
+
+    Q_DECL_CONSTEXPR bool isNull() const noexcept;
+
+    Q_DECL_CONSTEXPR qreal left() const noexcept;
+    Q_DECL_CONSTEXPR qreal top() const noexcept;
+    Q_DECL_CONSTEXPR qreal right() const noexcept;
+    Q_DECL_CONSTEXPR qreal bottom() const noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR void setLeft(qreal left) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR void setTop(qreal top) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR void setRight(qreal right) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR void setBottom(qreal bottom) noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator+=(const QMarginsF &margins) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator-=(const QMarginsF &margins) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator+=(qreal addend) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator-=(qreal subtrahend) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator*=(qreal factor) noexcept;
     Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator/=(qreal divisor);
 
-    Q_DECL_CONSTEXPR inline QMargins toMargins() const Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR inline QMargins toMargins() const noexcept;
 
 private:
     qreal m_left;
@@ -332,44 +332,44 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QMarginsF &);
   QMarginsF inline functions
  *****************************************************************************/
 
-Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF() Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF() noexcept
     : m_left(0), m_top(0), m_right(0), m_bottom(0) {}
 
-Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF(qreal aleft, qreal atop, qreal aright, qreal abottom) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF(qreal aleft, qreal atop, qreal aright, qreal abottom) noexcept
     : m_left(aleft), m_top(atop), m_right(aright), m_bottom(abottom) {}
 
-Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF(const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF(const QMargins &margins) noexcept
     : m_left(margins.left()), m_top(margins.top()), m_right(margins.right()), m_bottom(margins.bottom()) {}
 
-Q_DECL_CONSTEXPR inline bool QMarginsF::isNull() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QMarginsF::isNull() const noexcept
 { return qFuzzyIsNull(m_left) && qFuzzyIsNull(m_top) && qFuzzyIsNull(m_right) && qFuzzyIsNull(m_bottom); }
 
-Q_DECL_CONSTEXPR inline qreal QMarginsF::left() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QMarginsF::left() const noexcept
 { return m_left; }
 
-Q_DECL_CONSTEXPR inline qreal QMarginsF::top() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QMarginsF::top() const noexcept
 { return m_top; }
 
-Q_DECL_CONSTEXPR inline qreal QMarginsF::right() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QMarginsF::right() const noexcept
 { return m_right; }
 
-Q_DECL_CONSTEXPR inline qreal QMarginsF::bottom() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QMarginsF::bottom() const noexcept
 { return m_bottom; }
 
 
-Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setLeft(qreal aleft) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setLeft(qreal aleft) noexcept
 { m_left = aleft; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setTop(qreal atop) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setTop(qreal atop) noexcept
 { m_top = atop; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setRight(qreal aright) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setRight(qreal aright) noexcept
 { m_right = aright; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setBottom(qreal abottom) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setBottom(qreal abottom) noexcept
 { m_bottom = abottom; }
 
-Q_DECL_CONSTEXPR inline bool operator==(const QMarginsF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator==(const QMarginsF &lhs, const QMarginsF &rhs) noexcept
 {
     return qFuzzyCompare(lhs.left(), rhs.left())
            && qFuzzyCompare(lhs.top(), rhs.top())
@@ -377,48 +377,48 @@ Q_DECL_CONSTEXPR inline bool operator==(const QMarginsF &lhs, const QMarginsF &r
            && qFuzzyCompare(lhs.bottom(), rhs.bottom());
 }
 
-Q_DECL_CONSTEXPR inline bool operator!=(const QMarginsF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator!=(const QMarginsF &lhs, const QMarginsF &rhs) noexcept
 {
     return !operator==(lhs, rhs);
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &lhs, const QMarginsF &rhs) noexcept
 {
     return QMarginsF(lhs.left() + rhs.left(), lhs.top() + rhs.top(),
                      lhs.right() + rhs.right(), lhs.bottom() + rhs.bottom());
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &lhs, const QMarginsF &rhs) noexcept
 {
     return QMarginsF(lhs.left() - rhs.left(), lhs.top() - rhs.top(),
                      lhs.right() - rhs.right(), lhs.bottom() - rhs.bottom());
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &lhs, qreal rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &lhs, qreal rhs) noexcept
 {
     return QMarginsF(lhs.left() + rhs, lhs.top() + rhs,
                      lhs.right() + rhs, lhs.bottom() + rhs);
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator+(qreal lhs, const QMarginsF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator+(qreal lhs, const QMarginsF &rhs) noexcept
 {
     return QMarginsF(rhs.left() + lhs, rhs.top() + lhs,
                      rhs.right() + lhs, rhs.bottom() + lhs);
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &lhs, qreal rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &lhs, qreal rhs) noexcept
 {
     return QMarginsF(lhs.left() - rhs, lhs.top() - rhs,
                      lhs.right() - rhs, lhs.bottom() - rhs);
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator*(const QMarginsF &lhs, qreal rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator*(const QMarginsF &lhs, qreal rhs) noexcept
 {
     return QMarginsF(lhs.left() * rhs, lhs.top() * rhs,
                      lhs.right() * rhs, lhs.bottom() * rhs);
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator*(qreal lhs, const QMarginsF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator*(qreal lhs, const QMarginsF &rhs) noexcept
 {
     return QMarginsF(rhs.left() * lhs, rhs.top() * lhs,
                      rhs.right() * lhs, rhs.bottom() * lhs);
@@ -430,17 +430,17 @@ Q_DECL_CONSTEXPR inline QMarginsF operator/(const QMarginsF &lhs, qreal divisor)
                      lhs.right() / divisor, lhs.bottom() / divisor);
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(const QMarginsF &margins) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(const QMarginsF &margins) noexcept
 {
     return *this = *this + margins;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(const QMarginsF &margins) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(const QMarginsF &margins) noexcept
 {
     return *this = *this - margins;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(qreal addend) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(qreal addend) noexcept
 {
     m_left += addend;
     m_top += addend;
@@ -449,7 +449,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(qreal addend) Q
     return *this;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(qreal subtrahend) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(qreal subtrahend) noexcept
 {
     m_left -= subtrahend;
     m_top -= subtrahend;
@@ -458,7 +458,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(qreal subtrahen
     return *this;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator*=(qreal factor) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator*=(qreal factor) noexcept
 {
     return *this = *this * factor;
 }
@@ -468,17 +468,17 @@ Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator/=(qreal divisor)
     return *this = *this / divisor;
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &margins) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &margins) noexcept
 {
     return margins;
 }
 
-Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &margins) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &margins) noexcept
 {
     return QMarginsF(-margins.left(), -margins.top(), -margins.right(), -margins.bottom());
 }
 
-Q_DECL_CONSTEXPR inline QMargins QMarginsF::toMargins() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QMargins QMarginsF::toMargins() const noexcept
 {
     return QMargins(qRound(m_left), qRound(m_top), qRound(m_right), qRound(m_bottom));
 }
diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h
index 94977fc826..9ebf88bc8f 100644
--- a/src/corelib/tools/qpair.h
+++ b/src/corelib/tools/qpair.h
@@ -52,41 +52,39 @@ struct QPair
     typedef T2 second_type;
 
     Q_DECL_CONSTEXPR QPair()
-        Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_default_constructible<T1>::value &&
+        noexcept((std::is_nothrow_default_constructible<T1>::value &&
                               std::is_nothrow_default_constructible<T2>::value))
         : first(), second() {}
     Q_DECL_CONSTEXPR QPair(const T1 &t1, const T2 &t2)
-        Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_copy_constructible<T1>::value &&
+        noexcept((std::is_nothrow_copy_constructible<T1>::value &&
                               std::is_nothrow_copy_constructible<T2>::value))
         : first(t1), second(t2) {}
     // compiler-generated copy/move ctor/assignment operators are fine!
 
     template <typename TT1, typename TT2>
     Q_DECL_CONSTEXPR QPair(const QPair<TT1, TT2> &p)
-        Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_constructible<T1, TT1&>::value &&
+        noexcept((std::is_nothrow_constructible<T1, TT1&>::value &&
                               std::is_nothrow_constructible<T2, TT2&>::value))
         : first(p.first), second(p.second) {}
     template <typename TT1, typename TT2>
     Q_DECL_RELAXED_CONSTEXPR QPair &operator=(const QPair<TT1, TT2> &p)
-        Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_assignable<T1, TT1&>::value &&
+        noexcept((std::is_nothrow_assignable<T1, TT1&>::value &&
                               std::is_nothrow_assignable<T2, TT2&>::value))
     { first = p.first; second = p.second; return *this; }
-#ifdef Q_COMPILER_RVALUE_REFS
     template <typename TT1, typename TT2>
     Q_DECL_CONSTEXPR QPair(QPair<TT1, TT2> &&p)
-        Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_constructible<T1, TT1>::value &&
+        noexcept((std::is_nothrow_constructible<T1, TT1>::value &&
                               std::is_nothrow_constructible<T2, TT2>::value))
         // can't use std::move here as it's not constexpr in C++11:
         : first(static_cast<TT1 &&>(p.first)), second(static_cast<TT2 &&>(p.second)) {}
     template <typename TT1, typename TT2>
     Q_DECL_RELAXED_CONSTEXPR QPair &operator=(QPair<TT1, TT2> &&p)
-        Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_assignable<T1, TT1>::value &&
+        noexcept((std::is_nothrow_assignable<T1, TT1>::value &&
                               std::is_nothrow_assignable<T2, TT2>::value))
     { first = std::move(p.first); second = std::move(p.second); return *this; }
-#endif
 
     Q_DECL_RELAXED_CONSTEXPR void swap(QPair &other)
-        Q_DECL_NOEXCEPT_EXPR(noexcept(qSwap(other.first, other.first)) && noexcept(qSwap(other.second, other.second)))
+        noexcept(noexcept(qSwap(other.first, other.first)) && noexcept(qSwap(other.second, other.second)))
     {
         // use qSwap() to pick up ADL swaps automatically:
         qSwap(first, other.first);
@@ -97,8 +95,13 @@ struct QPair
     T2 second;
 };
 
+#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
+template<class T1, class T2>
+QPair(T1, T2) -> QPair<T1, T2>;
+#endif
+
 template <typename T1, typename T2>
-void swap(QPair<T1, T2> &lhs, QPair<T1, T2> &rhs) Q_DECL_NOEXCEPT_EXPR(noexcept(lhs.swap(rhs)))
+void swap(QPair<T1, T2> &lhs, QPair<T1, T2> &rhs) noexcept(noexcept(lhs.swap(rhs)))
 { lhs.swap(rhs); }
 
 // mark QPair<T1,T2> as complex/movable/primitive depending on the
@@ -108,45 +111,45 @@ class QTypeInfo<QPair<T1, T2> > : public QTypeInfoMerger<QPair<T1, T2>, T1, T2>
 
 template <class T1, class T2>
 Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator==(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(p1.first == p2.first && p1.second == p2.second))
+    noexcept(noexcept(p1.first == p2.first && p1.second == p2.second))
 { return p1.first == p2.first && p1.second == p2.second; }
 
 template <class T1, class T2>
 Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator!=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(!(p1 == p2)))
+    noexcept(noexcept(!(p1 == p2)))
 { return !(p1 == p2); }
 
 template <class T1, class T2>
 Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator<(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(p1.first < p2.first || (!(p2.first < p1.first) && p1.second < p2.second)))
+    noexcept(noexcept(p1.first < p2.first || (!(p2.first < p1.first) && p1.second < p2.second)))
 {
     return p1.first < p2.first || (!(p2.first < p1.first) && p1.second < p2.second);
 }
 
 template <class T1, class T2>
 Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator>(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(p2 < p1))
+    noexcept(noexcept(p2 < p1))
 {
     return p2 < p1;
 }
 
 template <class T1, class T2>
 Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator<=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(!(p2 < p1)))
+    noexcept(noexcept(!(p2 < p1)))
 {
     return !(p2 < p1);
 }
 
 template <class T1, class T2>
 Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator>=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(!(p1 < p2)))
+    noexcept(noexcept(!(p1 < p2)))
 {
     return !(p1 < p2);
 }
 
 template <class T1, class T2>
 Q_DECL_CONSTEXPR Q_OUTOFLINE_TEMPLATE QPair<T1, T2> qMakePair(const T1 &x, const T2 &y)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(QPair<T1, T2>(x, y)))
+    noexcept(noexcept(QPair<T1, T2>(x, y)))
 {
     return QPair<T1, T2>(x, y);
 }
diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc
index 59e6931995..65576ef2e6 100644
--- a/src/corelib/tools/qpair.qdoc
+++ b/src/corelib/tools/qpair.qdoc
@@ -28,6 +28,7 @@
 /*!
     \class QPair
     \inmodule QtCore
+    \reentrant
     \brief The QPair class is a template class that stores a pair of items.
 
     \ingroup tools
diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp
index e98eaac4fc..432fb33297 100644
--- a/src/corelib/tools/qpoint.cpp
+++ b/src/corelib/tools/qpoint.cpp
@@ -138,6 +138,17 @@ QT_BEGIN_NAMESPACE
     \sa y(), setX()
 */
 
+/*!
+    \fn QPoint::transposed() const
+    \since 5.14
+
+    Returns a point with x and y coordinates exchanged:
+    \code
+    QPoint{1, 2}.transposed() // {2, 1}
+    \endcode
+
+    \sa x(), y(), setX(), setY()
+*/
 
 /*!
     \fn int &QPoint::rx()
@@ -583,6 +594,18 @@ QDebug operator<<(QDebug dbg, const QPointF &p)
 */
 
 /*!
+    \fn QPointF::transposed() const
+    \since 5.14
+
+    Returns a point with x and y coordinates exchanged:
+    \code
+    QPointF{1.0, 2.0}.transposed() // {2.0, 1.0}
+    \endcode
+
+    \sa x(), y(), setX(), setY()
+*/
+
+/*!
     \fn qreal& QPointF::rx()
 
     Returns a reference to the x coordinate of this point.
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h
index d7323f7707..fe952f95da 100644
--- a/src/corelib/tools/qpoint.h
+++ b/src/corelib/tools/qpoint.h
@@ -64,6 +64,8 @@ public:
 
     Q_DECL_CONSTEXPR inline int manhattanLength() const;
 
+    Q_DECL_CONSTEXPR QPoint transposed() const noexcept { return {yp, xp}; }
+
     Q_DECL_RELAXED_CONSTEXPR inline int &rx();
     Q_DECL_RELAXED_CONSTEXPR inline int &ry();
 
@@ -94,7 +96,7 @@ public:
     friend Q_DECL_CONSTEXPR inline const QPoint operator/(const QPoint &, qreal);
 
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
-    Q_REQUIRED_RESULT CGPoint toCGPoint() const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT CGPoint toCGPoint() const noexcept;
 #endif
 
 private:
@@ -232,6 +234,8 @@ public:
     Q_DECL_RELAXED_CONSTEXPR inline void setX(qreal x);
     Q_DECL_RELAXED_CONSTEXPR inline void setY(qreal y);
 
+    Q_DECL_CONSTEXPR QPointF transposed() const noexcept { return {yp, xp}; }
+
     Q_DECL_RELAXED_CONSTEXPR inline qreal &rx();
     Q_DECL_RELAXED_CONSTEXPR inline qreal &ry();
 
@@ -256,8 +260,8 @@ public:
     Q_DECL_CONSTEXPR QPoint toPoint() const;
 
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
-    Q_REQUIRED_RESULT static QPointF fromCGPoint(CGPoint point) Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT CGPoint toCGPoint() const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT static QPointF fromCGPoint(CGPoint point) noexcept;
+    Q_REQUIRED_RESULT CGPoint toCGPoint() const noexcept;
 #endif
 
 private:
diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h
index b55f210577..d5a60ada56 100644
--- a/src/corelib/tools/qqueue.h
+++ b/src/corelib/tools/qqueue.h
@@ -50,11 +50,11 @@ class QQueue : public QList<T>
 {
 public:
     // compiler-generated special member functions are fine!
-    inline void swap(QQueue<T> &other) Q_DECL_NOTHROW { QList<T>::swap(other); } // prevent QList<->QQueue swaps
+    inline void swap(QQueue<T> &other) noexcept { QList<T>::swap(other); } // prevent QList<->QQueue swaps
 #ifndef Q_QDOC
     // bring in QList::swap(int, int). We cannot say using QList<T>::swap,
     // because we don't want to make swap(QList&) available.
-    inline void swap(int i, int j) { QList<T>::swap(i, j); }
+    Q_DECL_DEPRECATED inline void swap(int i, int j) { QList<T>::swapItemsAt(i, j); }
 #endif
     inline void enqueue(const T &t) { QList<T>::append(t); }
     inline T dequeue() { return QList<T>::takeFirst(); }
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp
index c8301e2590..cd20102a2b 100644
--- a/src/corelib/tools/qrect.cpp
+++ b/src/corelib/tools/qrect.cpp
@@ -300,7 +300,7 @@ QT_BEGIN_NAMESPACE
     \sa isValid(), isEmpty()
 */
 
-QRect QRect::normalized() const Q_DECL_NOTHROW
+QRect QRect::normalized() const noexcept
 {
     QRect r;
     if (x2 < x1 - 1) {                                // swap bad x values
@@ -820,7 +820,7 @@ QRect QRect::normalized() const Q_DECL_NOTHROW
     \sa intersects()
 */
 
-bool QRect::contains(const QPoint &p, bool proper) const Q_DECL_NOTHROW
+bool QRect::contains(const QPoint &p, bool proper) const noexcept
 {
     int l, r;
     if (x2 < x1 - 1) {
@@ -884,7 +884,7 @@ bool QRect::contains(const QPoint &p, bool proper) const Q_DECL_NOTHROW
     rectangle (not on the edge).
 */
 
-bool QRect::contains(const QRect &r, bool proper) const Q_DECL_NOTHROW
+bool QRect::contains(const QRect &r, bool proper) const noexcept
 {
     if (isNull() || r.isNull())
         return false;
@@ -962,7 +962,7 @@ bool QRect::contains(const QRect &r, bool proper) const Q_DECL_NOTHROW
     \sa operator|=(), united()
 */
 
-QRect QRect::operator|(const QRect &r) const Q_DECL_NOTHROW
+QRect QRect::operator|(const QRect &r) const noexcept
 {
     if (isNull())
         return r;
@@ -1033,7 +1033,7 @@ QRect QRect::operator|(const QRect &r) const Q_DECL_NOTHROW
     \sa operator&=(), intersected()
 */
 
-QRect QRect::operator&(const QRect &r) const Q_DECL_NOTHROW
+QRect QRect::operator&(const QRect &r) const noexcept
 {
     if (isNull() || r.isNull())
         return QRect();
@@ -1112,7 +1112,7 @@ QRect QRect::operator&(const QRect &r) const Q_DECL_NOTHROW
     \sa contains()
 */
 
-bool QRect::intersects(const QRect &r) const Q_DECL_NOTHROW
+bool QRect::intersects(const QRect &r) const noexcept
 {
     if (isNull() || r.isNull())
         return false;
@@ -1540,7 +1540,7 @@ QDebug operator<<(QDebug dbg, const QRect &r)
     \sa isValid(), isEmpty()
 */
 
-QRectF QRectF::normalized() const Q_DECL_NOTHROW
+QRectF QRectF::normalized() const noexcept
 {
     QRectF r = *this;
     if (r.w < 0) {
@@ -1964,7 +1964,7 @@ QRectF QRectF::normalized() const Q_DECL_NOTHROW
     \sa intersects()
 */
 
-bool QRectF::contains(const QPointF &p) const Q_DECL_NOTHROW
+bool QRectF::contains(const QPointF &p) const noexcept
 {
     qreal l = xp;
     qreal r = xp;
@@ -2010,7 +2010,7 @@ bool QRectF::contains(const QPointF &p) const Q_DECL_NOTHROW
     otherwise returns \c false.
 */
 
-bool QRectF::contains(const QRectF &r) const Q_DECL_NOTHROW
+bool QRectF::contains(const QRectF &r) const noexcept
 {
     qreal l1 = xp;
     qreal r1 = xp;
@@ -2148,7 +2148,7 @@ bool QRectF::contains(const QRectF &r) const Q_DECL_NOTHROW
     \sa united(), operator|=()
 */
 
-QRectF QRectF::operator|(const QRectF &r) const Q_DECL_NOTHROW
+QRectF QRectF::operator|(const QRectF &r) const noexcept
 {
     if (isNull())
         return r;
@@ -2217,7 +2217,7 @@ QRectF QRectF::operator|(const QRectF &r) const Q_DECL_NOTHROW
     \sa operator&=(), intersected()
 */
 
-QRectF QRectF::operator&(const QRectF &r) const Q_DECL_NOTHROW
+QRectF QRectF::operator&(const QRectF &r) const noexcept
 {
     qreal l1 = xp;
     qreal r1 = xp;
@@ -2302,7 +2302,7 @@ QRectF QRectF::operator&(const QRectF &r) const Q_DECL_NOTHROW
     \sa contains()
 */
 
-bool QRectF::intersects(const QRectF &r) const Q_DECL_NOTHROW
+bool QRectF::intersects(const QRectF &r) const noexcept
 {
     qreal l1 = xp;
     qreal r1 = xp;
@@ -2369,7 +2369,7 @@ bool QRectF::intersects(const QRectF &r) const Q_DECL_NOTHROW
     \sa toRect()
 */
 
-QRect QRectF::toAlignedRect() const Q_DECL_NOTHROW
+QRect QRectF::toAlignedRect() const noexcept
 {
     int xmin = int(qFloor(xp));
     int xmax = int(qCeil(xp + w));
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h
index 3b40055b5a..7aa2312f38 100644
--- a/src/corelib/tools/qrect.h
+++ b/src/corelib/tools/qrect.h
@@ -57,104 +57,104 @@ QT_BEGIN_NAMESPACE
 class Q_CORE_EXPORT QRect
 {
 public:
-    Q_DECL_CONSTEXPR QRect() Q_DECL_NOTHROW : x1(0), y1(0), x2(-1), y2(-1) {}
-    Q_DECL_CONSTEXPR QRect(const QPoint &topleft, const QPoint &bottomright) Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QRect(const QPoint &topleft, const QSize &size) Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QRect(int left, int top, int width, int height) Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline bool isNull() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline bool isEmpty() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline int left() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline int top() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline int right() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline int bottom() const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT QRect normalized() const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline int x() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline int y() const Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setLeft(int pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setTop(int pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setRight(int pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setBottom(int pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setX(int x) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setY(int y) Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void setTopLeft(const QPoint &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setBottomRight(const QPoint &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setTopRight(const QPoint &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setBottomLeft(const QPoint &p) Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline QPoint topLeft() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline QPoint bottomRight() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline QPoint topRight() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline QPoint bottomLeft() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline QPoint center() const Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void moveLeft(int pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTop(int pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveRight(int pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveBottom(int pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTopLeft(const QPoint &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveBottomRight(const QPoint &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTopRight(const QPoint &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveBottomLeft(const QPoint &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveCenter(const QPoint &p) Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void translate(int dx, int dy) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void translate(const QPoint &p) Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect translated(int dx, int dy) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect translated(const QPoint &p) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect transposed() const Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTo(int x, int t) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTo(const QPoint &p) Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void setRect(int x, int y, int w, int h) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QRect() noexcept : x1(0), y1(0), x2(-1), y2(-1) {}
+    Q_DECL_CONSTEXPR QRect(const QPoint &topleft, const QPoint &bottomright) noexcept;
+    Q_DECL_CONSTEXPR QRect(const QPoint &topleft, const QSize &size) noexcept;
+    Q_DECL_CONSTEXPR QRect(int left, int top, int width, int height) noexcept;
+
+    Q_DECL_CONSTEXPR inline bool isNull() const noexcept;
+    Q_DECL_CONSTEXPR inline bool isEmpty() const noexcept;
+    Q_DECL_CONSTEXPR inline bool isValid() const noexcept;
+
+    Q_DECL_CONSTEXPR inline int left() const noexcept;
+    Q_DECL_CONSTEXPR inline int top() const noexcept;
+    Q_DECL_CONSTEXPR inline int right() const noexcept;
+    Q_DECL_CONSTEXPR inline int bottom() const noexcept;
+    Q_REQUIRED_RESULT QRect normalized() const noexcept;
+
+    Q_DECL_CONSTEXPR inline int x() const noexcept;
+    Q_DECL_CONSTEXPR inline int y() const noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setLeft(int pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setTop(int pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setRight(int pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setBottom(int pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setX(int x) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setY(int y) noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void setTopLeft(const QPoint &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setBottomRight(const QPoint &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setTopRight(const QPoint &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setBottomLeft(const QPoint &p) noexcept;
+
+    Q_DECL_CONSTEXPR inline QPoint topLeft() const noexcept;
+    Q_DECL_CONSTEXPR inline QPoint bottomRight() const noexcept;
+    Q_DECL_CONSTEXPR inline QPoint topRight() const noexcept;
+    Q_DECL_CONSTEXPR inline QPoint bottomLeft() const noexcept;
+    Q_DECL_CONSTEXPR inline QPoint center() const noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void moveLeft(int pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTop(int pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveRight(int pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveBottom(int pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTopLeft(const QPoint &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveBottomRight(const QPoint &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTopRight(const QPoint &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveBottomLeft(const QPoint &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveCenter(const QPoint &p) noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void translate(int dx, int dy) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void translate(const QPoint &p) noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect translated(int dx, int dy) const noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect translated(const QPoint &p) const noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect transposed() const noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTo(int x, int t) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTo(const QPoint &p) noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void setRect(int x, int y, int w, int h) noexcept;
     Q_DECL_RELAXED_CONSTEXPR inline void getRect(int *x, int *y, int *w, int *h) const;
 
-    Q_DECL_RELAXED_CONSTEXPR inline void setCoords(int x1, int y1, int x2, int y2) Q_DECL_NOTHROW;
+    Q_DECL_RELAXED_CONSTEXPR inline void setCoords(int x1, int y1, int x2, int y2) noexcept;
     Q_DECL_RELAXED_CONSTEXPR inline void getCoords(int *x1, int *y1, int *x2, int *y2) const;
 
-    Q_DECL_RELAXED_CONSTEXPR inline void adjust(int x1, int y1, int x2, int y2) Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect adjusted(int x1, int y1, int x2, int y2) const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline QSize size() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline int width() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline int height() const Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setWidth(int w) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setHeight(int h) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setSize(const QSize &s) Q_DECL_NOTHROW;
-
-    QRect operator|(const QRect &r) const Q_DECL_NOTHROW;
-    QRect operator&(const QRect &r) const Q_DECL_NOTHROW;
-    inline QRect& operator|=(const QRect &r) Q_DECL_NOTHROW;
-    inline QRect& operator&=(const QRect &r) Q_DECL_NOTHROW;
-
-    bool contains(const QRect &r, bool proper = false) const Q_DECL_NOTHROW;
-    bool contains(const QPoint &p, bool proper=false) const Q_DECL_NOTHROW;
-    inline bool contains(int x, int y) const Q_DECL_NOTHROW;
-    inline bool contains(int x, int y, bool proper) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT inline QRect united(const QRect &other) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT inline QRect intersected(const QRect &other) const Q_DECL_NOTHROW;
-    bool intersects(const QRect &r) const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline QRect marginsAdded(const QMargins &margins) const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline QRect marginsRemoved(const QMargins &margins) const Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline QRect &operator+=(const QMargins &margins) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline QRect &operator-=(const QMargins &margins) Q_DECL_NOTHROW;
+    Q_DECL_RELAXED_CONSTEXPR inline void adjust(int x1, int y1, int x2, int y2) noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect adjusted(int x1, int y1, int x2, int y2) const noexcept;
+
+    Q_DECL_CONSTEXPR inline QSize size() const noexcept;
+    Q_DECL_CONSTEXPR inline int width() const noexcept;
+    Q_DECL_CONSTEXPR inline int height() const noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setWidth(int w) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setHeight(int h) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setSize(const QSize &s) noexcept;
+
+    QRect operator|(const QRect &r) const noexcept;
+    QRect operator&(const QRect &r) const noexcept;
+    inline QRect& operator|=(const QRect &r) noexcept;
+    inline QRect& operator&=(const QRect &r) noexcept;
+
+    bool contains(const QRect &r, bool proper = false) const noexcept;
+    bool contains(const QPoint &p, bool proper=false) const noexcept;
+    inline bool contains(int x, int y) const noexcept;
+    inline bool contains(int x, int y, bool proper) const noexcept;
+    Q_REQUIRED_RESULT inline QRect united(const QRect &other) const noexcept;
+    Q_REQUIRED_RESULT inline QRect intersected(const QRect &other) const noexcept;
+    bool intersects(const QRect &r) const noexcept;
+
+    Q_DECL_CONSTEXPR inline QRect marginsAdded(const QMargins &margins) const noexcept;
+    Q_DECL_CONSTEXPR inline QRect marginsRemoved(const QMargins &margins) const noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline QRect &operator+=(const QMargins &margins) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline QRect &operator-=(const QMargins &margins) noexcept;
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    Q_REQUIRED_RESULT QT_DEPRECATED QRect unite(const QRect &r) const Q_DECL_NOTHROW { return united(r); }
-    Q_REQUIRED_RESULT QT_DEPRECATED QRect intersect(const QRect &r) const Q_DECL_NOTHROW { return intersected(r); }
+    Q_REQUIRED_RESULT QT_DEPRECATED QRect unite(const QRect &r) const noexcept { return united(r); }
+    Q_REQUIRED_RESULT QT_DEPRECATED QRect intersect(const QRect &r) const noexcept { return intersected(r); }
 #endif
 
-    friend Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) Q_DECL_NOTHROW;
+    friend Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) noexcept;
+    friend Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) noexcept;
 
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
-    Q_REQUIRED_RESULT CGRect toCGRect() const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT CGRect toCGRect() const noexcept;
 #endif
 
 private:
@@ -165,8 +165,8 @@ private:
 };
 Q_DECLARE_TYPEINFO(QRect, Q_MOVABLE_TYPE);
 
-Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) Q_DECL_NOTHROW;
-Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) Q_DECL_NOTHROW;
+Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) noexcept;
+Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) noexcept;
 
 
 /*****************************************************************************
@@ -181,97 +181,97 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QRect &);
   QRect inline member functions
  *****************************************************************************/
 
-Q_DECL_CONSTEXPR inline QRect::QRect(int aleft, int atop, int awidth, int aheight) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect::QRect(int aleft, int atop, int awidth, int aheight) noexcept
     : x1(aleft), y1(atop), x2(aleft + awidth - 1), y2(atop + aheight - 1) {}
 
-Q_DECL_CONSTEXPR inline QRect::QRect(const QPoint &atopLeft, const QPoint &abottomRight) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect::QRect(const QPoint &atopLeft, const QPoint &abottomRight) noexcept
     : x1(atopLeft.x()), y1(atopLeft.y()), x2(abottomRight.x()), y2(abottomRight.y()) {}
 
-Q_DECL_CONSTEXPR inline QRect::QRect(const QPoint &atopLeft, const QSize &asize) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect::QRect(const QPoint &atopLeft, const QSize &asize) noexcept
     : x1(atopLeft.x()), y1(atopLeft.y()), x2(atopLeft.x()+asize.width() - 1), y2(atopLeft.y()+asize.height() - 1) {}
 
-Q_DECL_CONSTEXPR inline bool QRect::isNull() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QRect::isNull() const noexcept
 { return x2 == x1 - 1 && y2 == y1 - 1; }
 
-Q_DECL_CONSTEXPR inline bool QRect::isEmpty() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QRect::isEmpty() const noexcept
 { return x1 > x2 || y1 > y2; }
 
-Q_DECL_CONSTEXPR inline bool QRect::isValid() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QRect::isValid() const noexcept
 { return x1 <= x2 && y1 <= y2; }
 
-Q_DECL_CONSTEXPR inline int QRect::left() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QRect::left() const noexcept
 { return x1; }
 
-Q_DECL_CONSTEXPR inline int QRect::top() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QRect::top() const noexcept
 { return y1; }
 
-Q_DECL_CONSTEXPR inline int QRect::right() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QRect::right() const noexcept
 { return x2; }
 
-Q_DECL_CONSTEXPR inline int QRect::bottom() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QRect::bottom() const noexcept
 { return y2; }
 
-Q_DECL_CONSTEXPR inline int QRect::x() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QRect::x() const noexcept
 { return x1; }
 
-Q_DECL_CONSTEXPR inline int QRect::y() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QRect::y() const noexcept
 { return y1; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setLeft(int pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setLeft(int pos) noexcept
 { x1 = pos; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTop(int pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTop(int pos) noexcept
 { y1 = pos; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setRight(int pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setRight(int pos) noexcept
 { x2 = pos; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottom(int pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottom(int pos) noexcept
 { y2 = pos; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTopLeft(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTopLeft(const QPoint &p) noexcept
 { x1 = p.x(); y1 = p.y(); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottomRight(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottomRight(const QPoint &p) noexcept
 { x2 = p.x(); y2 = p.y(); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTopRight(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTopRight(const QPoint &p) noexcept
 { x2 = p.x(); y1 = p.y(); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottomLeft(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottomLeft(const QPoint &p) noexcept
 { x1 = p.x(); y2 = p.y(); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setX(int ax) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setX(int ax) noexcept
 { x1 = ax; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setY(int ay) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setY(int ay) noexcept
 { y1 = ay; }
 
-Q_DECL_CONSTEXPR inline QPoint QRect::topLeft() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QPoint QRect::topLeft() const noexcept
 { return QPoint(x1, y1); }
 
-Q_DECL_CONSTEXPR inline QPoint QRect::bottomRight() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QPoint QRect::bottomRight() const noexcept
 { return QPoint(x2, y2); }
 
-Q_DECL_CONSTEXPR inline QPoint QRect::topRight() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QPoint QRect::topRight() const noexcept
 { return QPoint(x2, y1); }
 
-Q_DECL_CONSTEXPR inline QPoint QRect::bottomLeft() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QPoint QRect::bottomLeft() const noexcept
 { return QPoint(x1, y2); }
 
-Q_DECL_CONSTEXPR inline QPoint QRect::center() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QPoint QRect::center() const noexcept
 { return QPoint(int((qint64(x1)+x2)/2), int((qint64(y1)+y2)/2)); } // cast avoids overflow on addition
 
-Q_DECL_CONSTEXPR inline int QRect::width() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QRect::width() const noexcept
 { return  x2 - x1 + 1; }
 
-Q_DECL_CONSTEXPR inline int QRect::height() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QRect::height() const noexcept
 { return  y2 - y1 + 1; }
 
-Q_DECL_CONSTEXPR inline QSize QRect::size() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSize QRect::size() const noexcept
 { return QSize(width(), height()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(int dx, int dy) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(int dx, int dy) noexcept
 {
     x1 += dx;
     y1 += dy;
@@ -279,7 +279,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(int dx, int dy) Q_DECL_NOT
     y2 += dy;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(const QPoint &p) noexcept
 {
     x1 += p.x();
     y1 += p.y();
@@ -287,16 +287,16 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(const QPoint &p) Q_DECL_NO
     y2 += p.y();
 }
 
-Q_DECL_CONSTEXPR inline QRect QRect::translated(int dx, int dy) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect QRect::translated(int dx, int dy) const noexcept
 { return QRect(QPoint(x1 + dx, y1 + dy), QPoint(x2 + dx, y2 + dy)); }
 
-Q_DECL_CONSTEXPR inline QRect QRect::translated(const QPoint &p) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect QRect::translated(const QPoint &p) const noexcept
 { return QRect(QPoint(x1 + p.x(), y1 + p.y()), QPoint(x2 + p.x(), y2 + p.y())); }
 
-Q_DECL_CONSTEXPR inline QRect QRect::transposed() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect QRect::transposed() const noexcept
 { return QRect(topLeft(), size().transposed()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(int ax, int ay) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(int ax, int ay) noexcept
 {
     x2 += ax - x1;
     y2 += ay - y1;
@@ -304,7 +304,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(int ax, int ay) Q_DECL_NOTHRO
     y1 = ay;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(const QPoint &p) noexcept
 {
     x2 += p.x() - x1;
     y2 += p.y() - y1;
@@ -312,49 +312,49 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(const QPoint &p) Q_DECL_NOTHR
     y1 = p.y();
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveLeft(int pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveLeft(int pos) noexcept
 { x2 += (pos - x1); x1 = pos; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTop(int pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTop(int pos) noexcept
 { y2 += (pos - y1); y1 = pos; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveRight(int pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveRight(int pos) noexcept
 {
     x1 += (pos - x2);
     x2 = pos;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottom(int pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottom(int pos) noexcept
 {
     y1 += (pos - y2);
     y2 = pos;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTopLeft(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTopLeft(const QPoint &p) noexcept
 {
     moveLeft(p.x());
     moveTop(p.y());
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottomRight(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottomRight(const QPoint &p) noexcept
 {
     moveRight(p.x());
     moveBottom(p.y());
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTopRight(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTopRight(const QPoint &p) noexcept
 {
     moveRight(p.x());
     moveTop(p.y());
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottomLeft(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottomLeft(const QPoint &p) noexcept
 {
     moveLeft(p.x());
     moveBottom(p.y());
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveCenter(const QPoint &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveCenter(const QPoint &p) noexcept
 {
     int w = x2 - x1;
     int h = y2 - y1;
@@ -372,7 +372,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::getRect(int *ax, int *ay, int *aw, i
     *ah = y2 - y1 + 1;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setRect(int ax, int ay, int aw, int ah) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setRect(int ax, int ay, int aw, int ah) noexcept
 {
     x1 = ax;
     y1 = ay;
@@ -388,7 +388,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::getCoords(int *xp1, int *yp1, int *x
     *yp2 = y2;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setCoords(int xp1, int yp1, int xp2, int yp2) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setCoords(int xp1, int yp1, int xp2, int yp2) noexcept
 {
     x1 = xp1;
     y1 = yp1;
@@ -396,10 +396,10 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::setCoords(int xp1, int yp1, int xp2,
     y2 = yp2;
 }
 
-Q_DECL_CONSTEXPR inline QRect QRect::adjusted(int xp1, int yp1, int xp2, int yp2) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect QRect::adjusted(int xp1, int yp1, int xp2, int yp2) const noexcept
 { return QRect(QPoint(x1 + xp1, y1 + yp1), QPoint(x2 + xp2, y2 + yp2)); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::adjust(int dx1, int dy1, int dx2, int dy2) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::adjust(int dx1, int dy1, int dx2, int dy2) noexcept
 {
     x1 += dx1;
     y1 += dy1;
@@ -407,97 +407,97 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::adjust(int dx1, int dy1, int dx2, in
     y2 += dy2;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setWidth(int w) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setWidth(int w) noexcept
 { x2 = (x1 + w - 1); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setHeight(int h) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setHeight(int h) noexcept
 { y2 = (y1 + h - 1); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRect::setSize(const QSize &s) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRect::setSize(const QSize &s) noexcept
 {
     x2 = (s.width()  + x1 - 1);
     y2 = (s.height() + y1 - 1);
 }
 
-inline bool QRect::contains(int ax, int ay, bool aproper) const Q_DECL_NOTHROW
+inline bool QRect::contains(int ax, int ay, bool aproper) const noexcept
 {
     return contains(QPoint(ax, ay), aproper);
 }
 
-inline bool QRect::contains(int ax, int ay) const Q_DECL_NOTHROW
+inline bool QRect::contains(int ax, int ay) const noexcept
 {
     return contains(QPoint(ax, ay), false);
 }
 
-inline QRect& QRect::operator|=(const QRect &r) Q_DECL_NOTHROW
+inline QRect& QRect::operator|=(const QRect &r) noexcept
 {
     *this = *this | r;
     return *this;
 }
 
-inline QRect& QRect::operator&=(const QRect &r) Q_DECL_NOTHROW
+inline QRect& QRect::operator&=(const QRect &r) noexcept
 {
     *this = *this & r;
     return *this;
 }
 
-inline QRect QRect::intersected(const QRect &other) const Q_DECL_NOTHROW
+inline QRect QRect::intersected(const QRect &other) const noexcept
 {
     return *this & other;
 }
 
-inline QRect QRect::united(const QRect &r) const Q_DECL_NOTHROW
+inline QRect QRect::united(const QRect &r) const noexcept
 {
     return *this | r;
 }
 
-Q_DECL_CONSTEXPR inline bool operator==(const QRect &r1, const QRect &r2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator==(const QRect &r1, const QRect &r2) noexcept
 {
     return r1.x1==r2.x1 && r1.x2==r2.x2 && r1.y1==r2.y1 && r1.y2==r2.y2;
 }
 
-Q_DECL_CONSTEXPR inline bool operator!=(const QRect &r1, const QRect &r2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator!=(const QRect &r1, const QRect &r2) noexcept
 {
     return r1.x1!=r2.x1 || r1.x2!=r2.x2 || r1.y1!=r2.y1 || r1.y2!=r2.y2;
 }
 
-Q_DECL_CONSTEXPR inline QRect operator+(const QRect &rectangle, const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect operator+(const QRect &rectangle, const QMargins &margins) noexcept
 {
     return QRect(QPoint(rectangle.left() - margins.left(), rectangle.top() - margins.top()),
                  QPoint(rectangle.right() + margins.right(), rectangle.bottom() + margins.bottom()));
 }
 
-Q_DECL_CONSTEXPR inline QRect operator+(const QMargins &margins, const QRect &rectangle) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect operator+(const QMargins &margins, const QRect &rectangle) noexcept
 {
     return QRect(QPoint(rectangle.left() - margins.left(), rectangle.top() - margins.top()),
                  QPoint(rectangle.right() + margins.right(), rectangle.bottom() + margins.bottom()));
 }
 
-Q_DECL_CONSTEXPR inline QRect operator-(const QRect &lhs, const QMargins &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect operator-(const QRect &lhs, const QMargins &rhs) noexcept
 {
     return QRect(QPoint(lhs.left() + rhs.left(), lhs.top() + rhs.top()),
                  QPoint(lhs.right() - rhs.right(), lhs.bottom() - rhs.bottom()));
 }
 
-Q_DECL_CONSTEXPR inline QRect QRect::marginsAdded(const QMargins &margins) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect QRect::marginsAdded(const QMargins &margins) const noexcept
 {
     return QRect(QPoint(x1 - margins.left(), y1 - margins.top()),
                  QPoint(x2 + margins.right(), y2 + margins.bottom()));
 }
 
-Q_DECL_CONSTEXPR inline QRect QRect::marginsRemoved(const QMargins &margins) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect QRect::marginsRemoved(const QMargins &margins) const noexcept
 {
     return QRect(QPoint(x1 + margins.left(), y1 + margins.top()),
                  QPoint(x2 - margins.right(), y2 - margins.bottom()));
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QRect &QRect::operator+=(const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QRect &QRect::operator+=(const QMargins &margins) noexcept
 {
     *this = marginsAdded(margins);
     return *this;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QRect &QRect::operator-=(const QMargins &margins) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QRect &QRect::operator-=(const QMargins &margins) noexcept
 {
     *this = marginsRemoved(margins);
     return *this;
@@ -511,110 +511,110 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QRect &);
 class Q_CORE_EXPORT QRectF
 {
 public:
-    Q_DECL_CONSTEXPR QRectF() Q_DECL_NOTHROW : xp(0.), yp(0.), w(0.), h(0.) {}
-    Q_DECL_CONSTEXPR QRectF(const QPointF &topleft, const QSizeF &size) Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QRectF(const QPointF &topleft, const QPointF &bottomRight) Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QRectF(qreal left, qreal top, qreal width, qreal height) Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QRectF(const QRect &rect) Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline bool isNull() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline bool isEmpty() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT QRectF normalized() const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline qreal left() const Q_DECL_NOTHROW { return xp; }
-    Q_DECL_CONSTEXPR inline qreal top() const Q_DECL_NOTHROW { return yp; }
-    Q_DECL_CONSTEXPR inline qreal right() const Q_DECL_NOTHROW { return xp + w; }
-    Q_DECL_CONSTEXPR inline qreal bottom() const Q_DECL_NOTHROW { return yp + h; }
-
-    Q_DECL_CONSTEXPR inline qreal x() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline qreal y() const Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setLeft(qreal pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setTop(qreal pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setRight(qreal pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setBottom(qreal pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setX(qreal pos) Q_DECL_NOTHROW { setLeft(pos); }
-    Q_DECL_RELAXED_CONSTEXPR inline void setY(qreal pos) Q_DECL_NOTHROW { setTop(pos); }
-
-    Q_DECL_CONSTEXPR inline QPointF topLeft() const Q_DECL_NOTHROW { return QPointF(xp, yp); }
-    Q_DECL_CONSTEXPR inline QPointF bottomRight() const Q_DECL_NOTHROW { return QPointF(xp+w, yp+h); }
-    Q_DECL_CONSTEXPR inline QPointF topRight() const Q_DECL_NOTHROW { return QPointF(xp+w, yp); }
-    Q_DECL_CONSTEXPR inline QPointF bottomLeft() const Q_DECL_NOTHROW { return QPointF(xp, yp+h); }
-    Q_DECL_CONSTEXPR inline QPointF center() const Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void setTopLeft(const QPointF &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setBottomRight(const QPointF &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setTopRight(const QPointF &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setBottomLeft(const QPointF &p) Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void moveLeft(qreal pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTop(qreal pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveRight(qreal pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveBottom(qreal pos) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTopLeft(const QPointF &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveBottomRight(const QPointF &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTopRight(const QPointF &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveBottomLeft(const QPointF &p) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveCenter(const QPointF &p) Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void translate(qreal dx, qreal dy) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void translate(const QPointF &p) Q_DECL_NOTHROW;
-
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF translated(qreal dx, qreal dy) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF translated(const QPointF &p) const Q_DECL_NOTHROW;
-
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF transposed() const Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTo(qreal x, qreal y) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void moveTo(const QPointF &p) Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline void setRect(qreal x, qreal y, qreal w, qreal h) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QRectF() noexcept : xp(0.), yp(0.), w(0.), h(0.) {}
+    Q_DECL_CONSTEXPR QRectF(const QPointF &topleft, const QSizeF &size) noexcept;
+    Q_DECL_CONSTEXPR QRectF(const QPointF &topleft, const QPointF &bottomRight) noexcept;
+    Q_DECL_CONSTEXPR QRectF(qreal left, qreal top, qreal width, qreal height) noexcept;
+    Q_DECL_CONSTEXPR QRectF(const QRect &rect) noexcept;
+
+    Q_DECL_CONSTEXPR inline bool isNull() const noexcept;
+    Q_DECL_CONSTEXPR inline bool isEmpty() const noexcept;
+    Q_DECL_CONSTEXPR inline bool isValid() const noexcept;
+    Q_REQUIRED_RESULT QRectF normalized() const noexcept;
+
+    Q_DECL_CONSTEXPR inline qreal left() const noexcept { return xp; }
+    Q_DECL_CONSTEXPR inline qreal top() const noexcept { return yp; }
+    Q_DECL_CONSTEXPR inline qreal right() const noexcept { return xp + w; }
+    Q_DECL_CONSTEXPR inline qreal bottom() const noexcept { return yp + h; }
+
+    Q_DECL_CONSTEXPR inline qreal x() const noexcept;
+    Q_DECL_CONSTEXPR inline qreal y() const noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setLeft(qreal pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setTop(qreal pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setRight(qreal pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setBottom(qreal pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setX(qreal pos) noexcept { setLeft(pos); }
+    Q_DECL_RELAXED_CONSTEXPR inline void setY(qreal pos) noexcept { setTop(pos); }
+
+    Q_DECL_CONSTEXPR inline QPointF topLeft() const noexcept { return QPointF(xp, yp); }
+    Q_DECL_CONSTEXPR inline QPointF bottomRight() const noexcept { return QPointF(xp+w, yp+h); }
+    Q_DECL_CONSTEXPR inline QPointF topRight() const noexcept { return QPointF(xp+w, yp); }
+    Q_DECL_CONSTEXPR inline QPointF bottomLeft() const noexcept { return QPointF(xp, yp+h); }
+    Q_DECL_CONSTEXPR inline QPointF center() const noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void setTopLeft(const QPointF &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setBottomRight(const QPointF &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setTopRight(const QPointF &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setBottomLeft(const QPointF &p) noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void moveLeft(qreal pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTop(qreal pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveRight(qreal pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveBottom(qreal pos) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTopLeft(const QPointF &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveBottomRight(const QPointF &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTopRight(const QPointF &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveBottomLeft(const QPointF &p) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveCenter(const QPointF &p) noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void translate(qreal dx, qreal dy) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void translate(const QPointF &p) noexcept;
+
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF translated(qreal dx, qreal dy) const noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF translated(const QPointF &p) const noexcept;
+
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF transposed() const noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTo(qreal x, qreal y) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void moveTo(const QPointF &p) noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline void setRect(qreal x, qreal y, qreal w, qreal h) noexcept;
     Q_DECL_RELAXED_CONSTEXPR inline void getRect(qreal *x, qreal *y, qreal *w, qreal *h) const;
 
-    Q_DECL_RELAXED_CONSTEXPR inline void setCoords(qreal x1, qreal y1, qreal x2, qreal y2) Q_DECL_NOTHROW;
+    Q_DECL_RELAXED_CONSTEXPR inline void setCoords(qreal x1, qreal y1, qreal x2, qreal y2) noexcept;
     Q_DECL_RELAXED_CONSTEXPR inline void getCoords(qreal *x1, qreal *y1, qreal *x2, qreal *y2) const;
 
-    Q_DECL_RELAXED_CONSTEXPR inline void adjust(qreal x1, qreal y1, qreal x2, qreal y2) Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF adjusted(qreal x1, qreal y1, qreal x2, qreal y2) const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline QSizeF size() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline qreal width() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline qreal height() const Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setWidth(qreal w) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setHeight(qreal h) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setSize(const QSizeF &s) Q_DECL_NOTHROW;
-
-    QRectF operator|(const QRectF &r) const Q_DECL_NOTHROW;
-    QRectF operator&(const QRectF &r) const Q_DECL_NOTHROW;
-    inline QRectF& operator|=(const QRectF &r) Q_DECL_NOTHROW;
-    inline QRectF& operator&=(const QRectF &r) Q_DECL_NOTHROW;
-
-    bool contains(const QRectF &r) const Q_DECL_NOTHROW;
-    bool contains(const QPointF &p) const Q_DECL_NOTHROW;
-    inline bool contains(qreal x, qreal y) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT inline QRectF united(const QRectF &other) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT inline QRectF intersected(const QRectF &other) const Q_DECL_NOTHROW;
-    bool intersects(const QRectF &r) const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline QRectF marginsAdded(const QMarginsF &margins) const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline QRectF marginsRemoved(const QMarginsF &margins) const Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator+=(const QMarginsF &margins) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator-=(const QMarginsF &margins) Q_DECL_NOTHROW;
+    Q_DECL_RELAXED_CONSTEXPR inline void adjust(qreal x1, qreal y1, qreal x2, qreal y2) noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF adjusted(qreal x1, qreal y1, qreal x2, qreal y2) const noexcept;
+
+    Q_DECL_CONSTEXPR inline QSizeF size() const noexcept;
+    Q_DECL_CONSTEXPR inline qreal width() const noexcept;
+    Q_DECL_CONSTEXPR inline qreal height() const noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setWidth(qreal w) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setHeight(qreal h) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setSize(const QSizeF &s) noexcept;
+
+    QRectF operator|(const QRectF &r) const noexcept;
+    QRectF operator&(const QRectF &r) const noexcept;
+    inline QRectF& operator|=(const QRectF &r) noexcept;
+    inline QRectF& operator&=(const QRectF &r) noexcept;
+
+    bool contains(const QRectF &r) const noexcept;
+    bool contains(const QPointF &p) const noexcept;
+    inline bool contains(qreal x, qreal y) const noexcept;
+    Q_REQUIRED_RESULT inline QRectF united(const QRectF &other) const noexcept;
+    Q_REQUIRED_RESULT inline QRectF intersected(const QRectF &other) const noexcept;
+    bool intersects(const QRectF &r) const noexcept;
+
+    Q_DECL_CONSTEXPR inline QRectF marginsAdded(const QMarginsF &margins) const noexcept;
+    Q_DECL_CONSTEXPR inline QRectF marginsRemoved(const QMarginsF &margins) const noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator+=(const QMarginsF &margins) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator-=(const QMarginsF &margins) noexcept;
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    Q_REQUIRED_RESULT QT_DEPRECATED QRectF unite(const QRectF &r) const Q_DECL_NOTHROW { return united(r); }
-    Q_REQUIRED_RESULT QT_DEPRECATED QRectF intersect(const QRectF &r) const Q_DECL_NOTHROW { return intersected(r); }
+    Q_REQUIRED_RESULT QT_DEPRECATED QRectF unite(const QRectF &r) const noexcept { return united(r); }
+    Q_REQUIRED_RESULT QT_DEPRECATED QRectF intersect(const QRectF &r) const noexcept { return intersected(r); }
 #endif
 
-    friend Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) Q_DECL_NOTHROW;
+    friend Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) noexcept;
+    friend Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) noexcept;
 
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect toRect() const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT QRect toAlignedRect() const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect toRect() const noexcept;
+    Q_REQUIRED_RESULT QRect toAlignedRect() const noexcept;
 
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
-    Q_REQUIRED_RESULT static QRectF fromCGRect(CGRect rect) Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT CGRect toCGRect() const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT static QRectF fromCGRect(CGRect rect) noexcept;
+    Q_REQUIRED_RESULT CGRect toCGRect() const noexcept;
 #endif
 
 private:
@@ -625,8 +625,8 @@ private:
 };
 Q_DECLARE_TYPEINFO(QRectF, Q_MOVABLE_TYPE);
 
-Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) Q_DECL_NOTHROW;
-Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) Q_DECL_NOTHROW;
+Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) noexcept;
+Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) noexcept;
 
 
 /*****************************************************************************
@@ -641,23 +641,23 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QRectF &);
   QRectF inline member functions
  *****************************************************************************/
 
-Q_DECL_CONSTEXPR inline QRectF::QRectF(qreal aleft, qreal atop, qreal awidth, qreal aheight) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF::QRectF(qreal aleft, qreal atop, qreal awidth, qreal aheight) noexcept
     : xp(aleft), yp(atop), w(awidth), h(aheight)
 {
 }
 
-Q_DECL_CONSTEXPR inline QRectF::QRectF(const QPointF &atopLeft, const QSizeF &asize) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF::QRectF(const QPointF &atopLeft, const QSizeF &asize) noexcept
     : xp(atopLeft.x()), yp(atopLeft.y()), w(asize.width()), h(asize.height())
 {
 }
 
 
-Q_DECL_CONSTEXPR inline QRectF::QRectF(const QPointF &atopLeft, const QPointF &abottomRight) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF::QRectF(const QPointF &atopLeft, const QPointF &abottomRight) noexcept
     : xp(atopLeft.x()), yp(atopLeft.y()), w(abottomRight.x() - atopLeft.x()), h(abottomRight.y() - atopLeft.y())
 {
 }
 
-Q_DECL_CONSTEXPR inline QRectF::QRectF(const QRect &r) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF::QRectF(const QRect &r) noexcept
     : xp(r.x()), yp(r.y()), w(r.width()), h(r.height())
 {
 }
@@ -666,117 +666,117 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
 QT_WARNING_DISABLE_GCC("-Wfloat-equal")
 
-Q_DECL_CONSTEXPR inline bool QRectF::isNull() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QRectF::isNull() const noexcept
 { return w == 0. && h == 0.; }
 
-Q_DECL_CONSTEXPR inline bool QRectF::isEmpty() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QRectF::isEmpty() const noexcept
 { return w <= 0. || h <= 0.; }
 
 QT_WARNING_POP
 
-Q_DECL_CONSTEXPR inline bool QRectF::isValid() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QRectF::isValid() const noexcept
 { return w > 0. && h > 0.; }
 
-Q_DECL_CONSTEXPR inline qreal QRectF::x() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QRectF::x() const noexcept
 { return xp; }
 
-Q_DECL_CONSTEXPR inline qreal QRectF::y() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QRectF::y() const noexcept
 { return yp; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setLeft(qreal pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setLeft(qreal pos) noexcept
 { qreal diff = pos - xp; xp += diff; w -= diff; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setRight(qreal pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setRight(qreal pos) noexcept
 { w = pos - xp; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTop(qreal pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTop(qreal pos) noexcept
 { qreal diff = pos - yp; yp += diff; h -= diff; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottom(qreal pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottom(qreal pos) noexcept
 { h = pos - yp; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTopLeft(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTopLeft(const QPointF &p) noexcept
 { setLeft(p.x()); setTop(p.y()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTopRight(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTopRight(const QPointF &p) noexcept
 { setRight(p.x()); setTop(p.y()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottomLeft(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottomLeft(const QPointF &p) noexcept
 { setLeft(p.x()); setBottom(p.y()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottomRight(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottomRight(const QPointF &p) noexcept
 { setRight(p.x()); setBottom(p.y()); }
 
-Q_DECL_CONSTEXPR inline QPointF QRectF::center() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QPointF QRectF::center() const noexcept
 { return QPointF(xp + w/2, yp + h/2); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveLeft(qreal pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveLeft(qreal pos) noexcept
 { xp = pos; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTop(qreal pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTop(qreal pos) noexcept
 { yp = pos; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveRight(qreal pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveRight(qreal pos) noexcept
 { xp = pos - w; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottom(qreal pos) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottom(qreal pos) noexcept
 { yp = pos - h; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTopLeft(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTopLeft(const QPointF &p) noexcept
 { moveLeft(p.x()); moveTop(p.y()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTopRight(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTopRight(const QPointF &p) noexcept
 { moveRight(p.x()); moveTop(p.y()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottomLeft(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottomLeft(const QPointF &p) noexcept
 { moveLeft(p.x()); moveBottom(p.y()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottomRight(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottomRight(const QPointF &p) noexcept
 { moveRight(p.x()); moveBottom(p.y()); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveCenter(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveCenter(const QPointF &p) noexcept
 { xp = p.x() - w/2; yp = p.y() - h/2; }
 
-Q_DECL_CONSTEXPR inline qreal QRectF::width() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QRectF::width() const noexcept
 { return w; }
 
-Q_DECL_CONSTEXPR inline qreal QRectF::height() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QRectF::height() const noexcept
 { return h; }
 
-Q_DECL_CONSTEXPR inline QSizeF QRectF::size() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSizeF QRectF::size() const noexcept
 { return QSizeF(w, h); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::translate(qreal dx, qreal dy) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::translate(qreal dx, qreal dy) noexcept
 {
     xp += dx;
     yp += dy;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::translate(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::translate(const QPointF &p) noexcept
 {
     xp += p.x();
     yp += p.y();
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTo(qreal ax, qreal ay) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTo(qreal ax, qreal ay) noexcept
 {
     xp = ax;
     yp = ay;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTo(const QPointF &p) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTo(const QPointF &p) noexcept
 {
     xp = p.x();
     yp = p.y();
 }
 
-Q_DECL_CONSTEXPR inline QRectF QRectF::translated(qreal dx, qreal dy) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF QRectF::translated(qreal dx, qreal dy) const noexcept
 { return QRectF(xp + dx, yp + dy, w, h); }
 
-Q_DECL_CONSTEXPR inline QRectF QRectF::translated(const QPointF &p) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF QRectF::translated(const QPointF &p) const noexcept
 { return QRectF(xp + p.x(), yp + p.y(), w, h); }
 
-Q_DECL_CONSTEXPR inline QRectF QRectF::transposed() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF QRectF::transposed() const noexcept
 { return QRectF(topLeft(), size().transposed()); }
 
 Q_DECL_RELAXED_CONSTEXPR inline void QRectF::getRect(qreal *ax, qreal *ay, qreal *aaw, qreal *aah) const
@@ -787,7 +787,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRectF::getRect(qreal *ax, qreal *ay, qreal
     *aah = this->h;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setRect(qreal ax, qreal ay, qreal aaw, qreal aah) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setRect(qreal ax, qreal ay, qreal aaw, qreal aah) noexcept
 {
     this->xp = ax;
     this->yp = ay;
@@ -803,7 +803,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRectF::getCoords(qreal *xp1, qreal *yp1, q
     *yp2 = yp + h;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setCoords(qreal xp1, qreal yp1, qreal xp2, qreal yp2) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setCoords(qreal xp1, qreal yp1, qreal xp2, qreal yp2) noexcept
 {
     xp = xp1;
     yp = yp1;
@@ -811,105 +811,105 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setCoords(qreal xp1, qreal yp1, qre
     h = yp2 - yp1;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::adjust(qreal xp1, qreal yp1, qreal xp2, qreal yp2) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::adjust(qreal xp1, qreal yp1, qreal xp2, qreal yp2) noexcept
 { xp += xp1; yp += yp1; w += xp2 - xp1; h += yp2 - yp1; }
 
-Q_DECL_CONSTEXPR inline QRectF QRectF::adjusted(qreal xp1, qreal yp1, qreal xp2, qreal yp2) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF QRectF::adjusted(qreal xp1, qreal yp1, qreal xp2, qreal yp2) const noexcept
 { return QRectF(xp + xp1, yp + yp1, w + xp2 - xp1, h + yp2 - yp1); }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setWidth(qreal aw) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setWidth(qreal aw) noexcept
 { this->w = aw; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setHeight(qreal ah) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setHeight(qreal ah) noexcept
 { this->h = ah; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setSize(const QSizeF &s) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setSize(const QSizeF &s) noexcept
 {
     w = s.width();
     h = s.height();
 }
 
-inline bool QRectF::contains(qreal ax, qreal ay) const Q_DECL_NOTHROW
+inline bool QRectF::contains(qreal ax, qreal ay) const noexcept
 {
     return contains(QPointF(ax, ay));
 }
 
-inline QRectF& QRectF::operator|=(const QRectF &r) Q_DECL_NOTHROW
+inline QRectF& QRectF::operator|=(const QRectF &r) noexcept
 {
     *this = *this | r;
     return *this;
 }
 
-inline QRectF& QRectF::operator&=(const QRectF &r) Q_DECL_NOTHROW
+inline QRectF& QRectF::operator&=(const QRectF &r) noexcept
 {
     *this = *this & r;
     return *this;
 }
 
-inline QRectF QRectF::intersected(const QRectF &r) const Q_DECL_NOTHROW
+inline QRectF QRectF::intersected(const QRectF &r) const noexcept
 {
     return *this & r;
 }
 
-inline QRectF QRectF::united(const QRectF &r) const Q_DECL_NOTHROW
+inline QRectF QRectF::united(const QRectF &r) const noexcept
 {
     return *this | r;
 }
 
-Q_DECL_CONSTEXPR inline bool operator==(const QRectF &r1, const QRectF &r2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator==(const QRectF &r1, const QRectF &r2) noexcept
 {
     return qFuzzyCompare(r1.xp, r2.xp) && qFuzzyCompare(r1.yp, r2.yp)
            && qFuzzyCompare(r1.w, r2.w) && qFuzzyCompare(r1.h, r2.h);
 }
 
-Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &r1, const QRectF &r2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &r1, const QRectF &r2) noexcept
 {
     return !qFuzzyCompare(r1.xp, r2.xp) || !qFuzzyCompare(r1.yp, r2.yp)
            || !qFuzzyCompare(r1.w, r2.w) || !qFuzzyCompare(r1.h, r2.h);
 }
 
-Q_DECL_CONSTEXPR inline QRect QRectF::toRect() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRect QRectF::toRect() const noexcept
 {
     return QRect(QPoint(qRound(xp), qRound(yp)), QPoint(qRound(xp + w) - 1, qRound(yp + h) - 1));
 }
 
-Q_DECL_CONSTEXPR inline QRectF operator+(const QRectF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF operator+(const QRectF &lhs, const QMarginsF &rhs) noexcept
 {
     return QRectF(QPointF(lhs.left() - rhs.left(), lhs.top() - rhs.top()),
                   QSizeF(lhs.width() + rhs.left() + rhs.right(), lhs.height() + rhs.top() + rhs.bottom()));
 }
 
-Q_DECL_CONSTEXPR inline QRectF operator+(const QMarginsF &lhs, const QRectF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF operator+(const QMarginsF &lhs, const QRectF &rhs) noexcept
 {
     return QRectF(QPointF(rhs.left() - lhs.left(), rhs.top() - lhs.top()),
                   QSizeF(rhs.width() + lhs.left() + lhs.right(), rhs.height() + lhs.top() + lhs.bottom()));
 }
 
-Q_DECL_CONSTEXPR inline QRectF operator-(const QRectF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF operator-(const QRectF &lhs, const QMarginsF &rhs) noexcept
 {
     return QRectF(QPointF(lhs.left() + rhs.left(), lhs.top() + rhs.top()),
                   QSizeF(lhs.width() - rhs.left() - rhs.right(), lhs.height() - rhs.top() - rhs.bottom()));
 }
 
-Q_DECL_CONSTEXPR inline QRectF QRectF::marginsAdded(const QMarginsF &margins) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF QRectF::marginsAdded(const QMarginsF &margins) const noexcept
 {
     return QRectF(QPointF(xp - margins.left(), yp - margins.top()),
                   QSizeF(w + margins.left() + margins.right(), h + margins.top() + margins.bottom()));
 }
 
-Q_DECL_CONSTEXPR inline QRectF QRectF::marginsRemoved(const QMarginsF &margins) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QRectF QRectF::marginsRemoved(const QMarginsF &margins) const noexcept
 {
     return QRectF(QPointF(xp + margins.left(), yp + margins.top()),
                   QSizeF(w - margins.left() - margins.right(), h - margins.top() - margins.bottom()));
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QRectF &QRectF::operator+=(const QMarginsF &margins) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QRectF &QRectF::operator+=(const QMarginsF &margins) noexcept
 {
     *this = marginsAdded(margins);
     return *this;
 }
 
-Q_DECL_RELAXED_CONSTEXPR inline QRectF &QRectF::operator-=(const QMarginsF &margins) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QRectF &QRectF::operator-=(const QMarginsF &margins) noexcept
 {
     *this = marginsRemoved(margins);
     return *this;
diff --git a/src/corelib/tools/qrefcount.h b/src/corelib/tools/qrefcount.h
index 9586c3a79a..2e5388ad9a 100644
--- a/src/corelib/tools/qrefcount.h
+++ b/src/corelib/tools/qrefcount.h
@@ -51,8 +51,8 @@ namespace QtPrivate
 class RefCount
 {
 public:
-    inline bool ref() Q_DECL_NOTHROW {
-        int count = atomic.load();
+    inline bool ref() noexcept {
+        int count = atomic.loadRelaxed();
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
         if (count == 0) // !isSharable
             return false;
@@ -62,8 +62,8 @@ public:
         return true;
     }
 
-    inline bool deref() Q_DECL_NOTHROW {
-        int count = atomic.load();
+    inline bool deref() noexcept {
+        int count = atomic.loadRelaxed();
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
         if (count == 0) // !isSharable
             return false;
@@ -74,7 +74,7 @@ public:
     }
 
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    bool setSharable(bool sharable) Q_DECL_NOTHROW
+    bool setSharable(bool sharable) noexcept
     {
         Q_ASSERT(!isShared());
         if (sharable)
@@ -83,27 +83,27 @@ public:
             return atomic.testAndSetRelaxed(1, 0);
     }
 
-    bool isSharable() const Q_DECL_NOTHROW
+    bool isSharable() const noexcept
     {
         // Sharable === Shared ownership.
-        return atomic.load() != 0;
+        return atomic.loadRelaxed() != 0;
     }
 #endif
 
-    bool isStatic() const Q_DECL_NOTHROW
+    bool isStatic() const noexcept
     {
         // Persistent object, never deleted
-        return atomic.load() == -1;
+        return atomic.loadRelaxed() == -1;
     }
 
-    bool isShared() const Q_DECL_NOTHROW
+    bool isShared() const noexcept
     {
-        int count = atomic.load();
+        int count = atomic.loadRelaxed();
         return (count != 1) && (count != 0);
     }
 
-    void initializeOwned() Q_DECL_NOTHROW { atomic.store(1); }
-    void initializeUnsharable() Q_DECL_NOTHROW { atomic.store(0); }
+    void initializeOwned() noexcept { atomic.storeRelaxed(1); }
+    void initializeUnsharable() noexcept { atomic.storeRelaxed(0); }
 
     QBasicAtomicInt atomic;
 };
diff --git a/src/corelib/tools/qringbuffer.cpp b/src/corelib/tools/qringbuffer.cpp
index 59650ed2f7..311058a776 100644
--- a/src/corelib/tools/qringbuffer.cpp
+++ b/src/corelib/tools/qringbuffer.cpp
@@ -59,7 +59,7 @@ void QRingChunk::detach()
     const int chunkSize = size();
     QByteArray x(chunkSize, Qt::Uninitialized);
     ::memcpy(x.data(), chunk.constData() + headOffset, chunkSize);
-    chunk = qMove(x);
+    chunk = std::move(x);
     headOffset = 0;
     tailOffset = chunkSize;
 }
@@ -105,7 +105,7 @@ const char *QRingBuffer::readPointerAtPosition(qint64 pos, qint64 &length) const
     }
 
     length = 0;
-    return 0;
+    return nullptr;
 }
 
 void QRingBuffer::free(qint64 bytes)
diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index 76ab4a5b62..838cb31697 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -65,11 +65,11 @@ class QRingChunk
 {
 public:
     // initialization and cleanup
-    inline QRingChunk() Q_DECL_NOTHROW :
+    inline QRingChunk() noexcept :
         headOffset(0), tailOffset(0)
     {
     }
-    inline QRingChunk(const QRingChunk &other) Q_DECL_NOTHROW :
+    inline QRingChunk(const QRingChunk &other) noexcept :
         chunk(other.chunk), headOffset(other.headOffset), tailOffset(other.tailOffset)
     {
     }
@@ -77,30 +77,30 @@ public:
         chunk(alloc, Qt::Uninitialized), headOffset(0), tailOffset(0)
     {
     }
-    explicit inline QRingChunk(const QByteArray &qba) Q_DECL_NOTHROW :
+    explicit inline QRingChunk(const QByteArray &qba) noexcept :
         chunk(qba), headOffset(0), tailOffset(qba.size())
     {
     }
 
-    inline QRingChunk &operator=(const QRingChunk &other) Q_DECL_NOTHROW
+    inline QRingChunk &operator=(const QRingChunk &other) noexcept
     {
         chunk = other.chunk;
         headOffset = other.headOffset;
         tailOffset = other.tailOffset;
         return *this;
     }
-    inline QRingChunk(QRingChunk &&other) Q_DECL_NOTHROW :
+    inline QRingChunk(QRingChunk &&other) noexcept :
         chunk(other.chunk), headOffset(other.headOffset), tailOffset(other.tailOffset)
     {
         other.headOffset = other.tailOffset = 0;
     }
-    inline QRingChunk &operator=(QRingChunk &&other) Q_DECL_NOTHROW
+    inline QRingChunk &operator=(QRingChunk &&other) noexcept
     {
         swap(other);
         return *this;
     }
 
-    inline void swap(QRingChunk &other) Q_DECL_NOTHROW
+    inline void swap(QRingChunk &other) noexcept
     {
         chunk.swap(other.chunk);
         qSwap(headOffset, other.headOffset);
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h
index 2a4083466b..af0c0ed336 100644
--- a/src/corelib/tools/qscopedpointer.h
+++ b/src/corelib/tools/qscopedpointer.h
@@ -97,7 +97,7 @@ class QScopedPointer
 {
     typedef T *QScopedPointer:: *RestrictedBool;
 public:
-    explicit QScopedPointer(T *p = nullptr) Q_DECL_NOTHROW : d(p)
+    explicit QScopedPointer(T *p = nullptr) noexcept : d(p)
     {
     }
 
@@ -113,12 +113,12 @@ public:
         return *d;
     }
 
-    T *operator->() const Q_DECL_NOTHROW
+    T *operator->() const noexcept
     {
         return d;
     }
 
-    bool operator!() const Q_DECL_NOTHROW
+    bool operator!() const noexcept
     {
         return !d;
     }
@@ -129,28 +129,28 @@ public:
         return isNull() ? nullptr : &QScopedPointer::d;
     }
 #else
-    operator RestrictedBool() const Q_DECL_NOTHROW
+    operator RestrictedBool() const noexcept
     {
         return isNull() ? nullptr : &QScopedPointer::d;
     }
 #endif
 
-    T *data() const Q_DECL_NOTHROW
+    T *data() const noexcept
     {
         return d;
     }
 
-    T *get() const Q_DECL_NOTHROW
+    T *get() const noexcept
     {
         return d;
     }
 
-    bool isNull() const Q_DECL_NOTHROW
+    bool isNull() const noexcept
     {
         return !d;
     }
 
-    void reset(T *other = nullptr) Q_DECL_NOEXCEPT_EXPR(noexcept(Cleanup::cleanup(std::declval<T *>())))
+    void reset(T *other = nullptr) noexcept(noexcept(Cleanup::cleanup(std::declval<T *>())))
     {
         if (d == other)
             return;
@@ -159,14 +159,14 @@ public:
         Cleanup::cleanup(oldD);
     }
 
-    T *take() Q_DECL_NOTHROW
+    T *take() noexcept
     {
         T *oldD = d;
         d = nullptr;
         return oldD;
     }
 
-    void swap(QScopedPointer<T, Cleanup> &other) Q_DECL_NOTHROW
+    void swap(QScopedPointer<T, Cleanup> &other) noexcept
     {
         qSwap(d, other.d);
     }
@@ -181,43 +181,43 @@ private:
 };
 
 template <class T, class Cleanup>
-inline bool operator==(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW
+inline bool operator==(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) noexcept
 {
     return lhs.data() == rhs.data();
 }
 
 template <class T, class Cleanup>
-inline bool operator!=(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) noexcept
 {
     return lhs.data() != rhs.data();
 }
 
 template <class T, class Cleanup>
-inline bool operator==(const QScopedPointer<T, Cleanup> &lhs, std::nullptr_t) Q_DECL_NOTHROW
+inline bool operator==(const QScopedPointer<T, Cleanup> &lhs, std::nullptr_t) noexcept
 {
     return lhs.isNull();
 }
 
 template <class T, class Cleanup>
-inline bool operator==(std::nullptr_t, const QScopedPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW
+inline bool operator==(std::nullptr_t, const QScopedPointer<T, Cleanup> &rhs) noexcept
 {
     return rhs.isNull();
 }
 
 template <class T, class Cleanup>
-inline bool operator!=(const QScopedPointer<T, Cleanup> &lhs, std::nullptr_t) Q_DECL_NOTHROW
+inline bool operator!=(const QScopedPointer<T, Cleanup> &lhs, std::nullptr_t) noexcept
 {
     return !lhs.isNull();
 }
 
 template <class T, class Cleanup>
-inline bool operator!=(std::nullptr_t, const QScopedPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW
+inline bool operator!=(std::nullptr_t, const QScopedPointer<T, Cleanup> &rhs) noexcept
 {
     return !rhs.isNull();
 }
 
 template <class T, class Cleanup>
-inline void swap(QScopedPointer<T, Cleanup> &p1, QScopedPointer<T, Cleanup> &p2) Q_DECL_NOTHROW
+inline void swap(QScopedPointer<T, Cleanup> &p1, QScopedPointer<T, Cleanup> &p2) noexcept
 { p1.swap(p2); }
 
 template <typename T, typename Cleanup = QScopedPointerArrayDeleter<T> >
@@ -244,7 +244,7 @@ public:
         return this->d[i];
     }
 
-    void swap(QScopedArrayPointer &other) Q_DECL_NOTHROW // prevent QScopedPointer <->QScopedArrayPointer swaps
+    void swap(QScopedArrayPointer &other) noexcept // prevent QScopedPointer <->QScopedArrayPointer swaps
     { QScopedPointer<T, Cleanup>::swap(other); }
 
 private:
@@ -263,7 +263,7 @@ private:
 };
 
 template <typename T, typename Cleanup>
-inline void swap(QScopedArrayPointer<T, Cleanup> &lhs, QScopedArrayPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW
+inline void swap(QScopedArrayPointer<T, Cleanup> &lhs, QScopedArrayPointer<T, Cleanup> &rhs) noexcept
 { lhs.swap(rhs); }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qscopedvaluerollback.h b/src/corelib/tools/qscopedvaluerollback.h
index 5f76269388..f904b8dfcb 100644
--- a/src/corelib/tools/qscopedvaluerollback.h
+++ b/src/corelib/tools/qscopedvaluerollback.h
@@ -48,20 +48,20 @@ template <typename T>
 class QScopedValueRollback
 {
 public:
-    explicit QScopedValueRollback(T &var) :
-        varRef(var), oldValue(var)
+    explicit QScopedValueRollback(T &var)
+        : varRef(var), oldValue(var)
     {
     }
 
-    explicit QScopedValueRollback(T &var, T value) :
-        varRef(var), oldValue(var)
+    explicit QScopedValueRollback(T &var, T value)
+        : varRef(var), oldValue(std::move(var))
     {
-        varRef = qMove(value);
+        varRef = std::move(value);
     }
 
     ~QScopedValueRollback()
     {
-        varRef = qMove(oldValue);
+        varRef = std::move(oldValue);
     }
 
     void commit()
@@ -70,7 +70,7 @@ public:
     }
 
 private:
-    T& varRef;
+    T &varRef;
     T oldValue;
 
     Q_DISABLE_COPY(QScopedValueRollback)
diff --git a/src/corelib/tools/qscopeguard.h b/src/corelib/tools/qscopeguard.h
index 31100fcabb..45c3f93da4 100644
--- a/src/corelib/tools/qscopeguard.h
+++ b/src/corelib/tools/qscopeguard.h
@@ -50,14 +50,19 @@ template <typename F> class QScopeGuard;
 template <typename F> QScopeGuard<F> qScopeGuard(F f);
 
 template <typename F>
-class QScopeGuard
+class
+#if QT_HAS_CPP_ATTRIBUTE(nodiscard)
+// Q_REQUIRED_RESULT can be defined as __warn_unused_result__ or as [[nodiscard]]
+// but the 1st one has some limitations for example can be placed only on functions.
+Q_REQUIRED_RESULT
+#endif
+QScopeGuard
 {
 public:
-    QScopeGuard(QScopeGuard &&other) Q_DECL_NOEXCEPT
+    QScopeGuard(QScopeGuard &&other) noexcept
         : m_func(std::move(other.m_func))
-        , m_invoke(other.m_invoke)
+        , m_invoke(qExchange(other.m_invoke, false))
     {
-        other.dismiss();
     }
 
     ~QScopeGuard()
@@ -66,13 +71,13 @@ public:
             m_func();
     }
 
-    void dismiss() Q_DECL_NOEXCEPT
+    void dismiss() noexcept
     {
         m_invoke = false;
     }
 
 private:
-    explicit QScopeGuard(F f) Q_DECL_NOEXCEPT
+    explicit QScopeGuard(F &&f) noexcept
         : m_func(std::move(f))
     {
     }
@@ -86,6 +91,9 @@ private:
 
 
 template <typename F>
+#if QT_HAS_CPP_ATTRIBUTE(nodiscard)
+Q_REQUIRED_RESULT
+#endif
 QScopeGuard<F> qScopeGuard(F f)
 {
     return QScopeGuard<F>(std::move(f));
diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h
index 6640c8486d..2e72832185 100644
--- a/src/corelib/tools/qset.h
+++ b/src/corelib/tools/qset.h
@@ -41,10 +41,9 @@
 #define QSET_H
 
 #include <QtCore/qhash.h>
-#ifdef Q_COMPILER_INITIALIZER_LISTS
-#include <initializer_list>
-#endif
+#include <QtCore/qcontainertools_impl.h>
 
+#include <initializer_list>
 #include <iterator>
 
 QT_BEGIN_NAMESPACE
@@ -56,19 +55,21 @@ class QSet
     typedef QHash<T, QHashDummyValue> Hash;
 
 public:
-    inline QSet() Q_DECL_NOTHROW {}
-#ifdef Q_COMPILER_INITIALIZER_LISTS
+    inline QSet() noexcept {}
     inline QSet(std::initializer_list<T> list)
+        : QSet(list.begin(), list.end()) {}
+    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
+    inline QSet(InputIterator first, InputIterator last)
     {
-        reserve(int(list.size()));
-        for (typename std::initializer_list<T>::const_iterator it = list.begin(); it != list.end(); ++it)
-            insert(*it);
+        QtPrivate::reserveIfForwardIterator(this, first, last);
+        for (; first != last; ++first)
+            insert(*first);
     }
-#endif
+
     // compiler-generated copy/move ctor/assignment operators are fine!
     // compiler-generated destructor is fine!
 
-    inline void swap(QSet<T> &other) Q_DECL_NOTHROW { q_hash.swap(other.q_hash); }
+    inline void swap(QSet<T> &other) noexcept { q_hash.swap(other.q_hash); }
 
     inline bool operator==(const QSet<T> &other) const
         { return q_hash == other.q_hash; }
@@ -176,20 +177,20 @@ public:
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
     inline iterator begin() { return q_hash.begin(); }
-    inline const_iterator begin() const Q_DECL_NOTHROW { return q_hash.begin(); }
-    inline const_iterator cbegin() const Q_DECL_NOTHROW { return q_hash.begin(); }
-    inline const_iterator constBegin() const Q_DECL_NOTHROW { return q_hash.constBegin(); }
+    inline const_iterator begin() const noexcept { return q_hash.begin(); }
+    inline const_iterator cbegin() const noexcept { return q_hash.begin(); }
+    inline const_iterator constBegin() const noexcept { return q_hash.constBegin(); }
     inline iterator end() { return q_hash.end(); }
-    inline const_iterator end() const Q_DECL_NOTHROW { return q_hash.end(); }
-    inline const_iterator cend() const Q_DECL_NOTHROW { return q_hash.end(); }
-    inline const_iterator constEnd() const Q_DECL_NOTHROW { return q_hash.constEnd(); }
+    inline const_iterator end() const noexcept { return q_hash.end(); }
+    inline const_iterator cend() const noexcept { return q_hash.end(); }
+    inline const_iterator constEnd() const noexcept { return q_hash.constEnd(); }
 
     reverse_iterator rbegin() { return reverse_iterator(end()); }
     reverse_iterator rend() { return reverse_iterator(begin()); }
-    const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
+    const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); }
 
     iterator erase(iterator i)
     { return erase(m2c(i)); }
@@ -244,30 +245,40 @@ public:
     inline QSet<T> operator-(const QSet<T> &other) const
         { QSet<T> result = *this; result -= other; return result; }
 
-    QList<T> toList() const;
-    inline QList<T> values() const { return toList(); }
-
+    QList<T> values() const;
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+    Q_DECL_DEPRECATED_X("Use values() instead.")
+    QList<T> toList() const { return values(); }
+    Q_DECL_DEPRECATED_X("Use QSet<T>(list.begin(), list.end()) instead.")
     static QSet<T> fromList(const QList<T> &list);
+#endif
 
 private:
     Hash q_hash;
 
-    static const_iterator m2c(iterator it) Q_DECL_NOTHROW
+    static const_iterator m2c(iterator it) noexcept
     { return const_iterator(typename Hash::const_iterator(it.i.i)); }
 
     bool isValidIterator(const iterator &i) const
     {
         return q_hash.isValidIterator(reinterpret_cast<const typename Hash::iterator&>(i));
     }
-    bool isValidIterator(const const_iterator &i) const Q_DECL_NOTHROW
+    bool isValidIterator(const const_iterator &i) const noexcept
     {
         return q_hash.isValidIterator(reinterpret_cast<const typename Hash::const_iterator&>(i));
     }
 };
 
+#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
+template <typename InputIterator,
+          typename ValueType = typename std::iterator_traits<InputIterator>::value_type,
+          QtPrivate::IfIsInputIterator<InputIterator> = true>
+QSet(InputIterator, InputIterator) -> QSet<ValueType>;
+#endif
+
 template <typename T>
 uint qHash(const QSet<T> &key, uint seed = 0)
-Q_DECL_NOEXCEPT_EXPR(noexcept(qHashRangeCommutative(key.begin(), key.end(), seed)))
+noexcept(noexcept(qHashRangeCommutative(key.begin(), key.end(), seed)))
 {
     return qHashRangeCommutative(key.begin(), key.end(), seed);
 }
@@ -280,11 +291,9 @@ Q_INLINE_TEMPLATE void QSet<T>::reserve(int asize) { q_hash.reserve(asize); }
 template <class T>
 Q_INLINE_TEMPLATE QSet<T> &QSet<T>::unite(const QSet<T> &other)
 {
-    QSet<T> copy(other);
-    typename QSet<T>::const_iterator i = copy.constEnd();
-    while (i != copy.constBegin()) {
-        --i;
-        insert(*i);
+    if (!q_hash.isSharedWith(other.q_hash)) {
+        for (const T &e : other)
+            insert(e);
     }
     return *this;
 }
@@ -302,11 +311,9 @@ Q_INLINE_TEMPLATE QSet<T> &QSet<T>::intersect(const QSet<T> &other)
         copy2 = *this;
         *this = copy1;
     }
-    typename QSet<T>::const_iterator i = copy1.constEnd();
-    while (i != copy1.constBegin()) {
-        --i;
-        if (!copy2.contains(*i))
-            remove(*i);
+    for (const auto &e : qAsConst(copy1)) {
+        if (!copy2.contains(e))
+            remove(e);
     }
     return *this;
 }
@@ -342,14 +349,11 @@ Q_INLINE_TEMPLATE bool QSet<T>::intersects(const QSet<T> &other) const
 template <class T>
 Q_INLINE_TEMPLATE QSet<T> &QSet<T>::subtract(const QSet<T> &other)
 {
-    if (&other == this) {
+    if (q_hash.isSharedWith(other.q_hash)) {
         clear();
     } else {
-        auto i = other.constEnd();
-        while (i != other.constBegin()) {
-            --i;
-            remove(*i);
-        }
+        for (const auto &e : other)
+            remove(e);
     }
     return *this;
 }
@@ -367,7 +371,7 @@ Q_INLINE_TEMPLATE bool QSet<T>::contains(const QSet<T> &other) const
 }
 
 template <typename T>
-Q_OUTOFLINE_TEMPLATE QList<T> QSet<T>::toList() const
+Q_OUTOFLINE_TEMPLATE QList<T> QSet<T>::values() const
 {
     QList<T> result;
     result.reserve(size());
@@ -379,6 +383,7 @@ Q_OUTOFLINE_TEMPLATE QList<T> QSet<T>::toList() const
     return result;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 template <typename T>
 Q_OUTOFLINE_TEMPLATE QSet<T> QList<T>::toSet() const
 {
@@ -400,9 +405,11 @@ QList<T> QList<T>::fromSet(const QSet<T> &set)
 {
     return set.toList();
 }
+#endif
 
 Q_DECLARE_SEQUENTIAL_ITERATOR(Set)
 
+#if !defined(QT_NO_JAVA_STYLE_ITERATORS)
 template <typename T>
 class QMutableSetIterator
 {
@@ -434,6 +441,7 @@ public:
     { while (c->constBegin() != i) if (*(n = --i) == t) return true;
       n = c->end(); return false;  }
 };
+#endif // QT_NO_JAVA_STYLE_ITERATORS
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc
index 48863f2399..084523ed4b 100644
--- a/src/corelib/tools/qset.qdoc
+++ b/src/corelib/tools/qset.qdoc
@@ -108,9 +108,17 @@
 
     Constructs a set with a copy of each of the elements in the
     initializer list \a list.
+*/
+
+/*! \fn template <class T> template<typename InputIterator> QSet<T>::QSet(InputIterator first, InputIterator last)
+    \since 5.14
+
+    Constructs a set with the contents in the iterator range [\a first, \a last).
+
+    The value type of \c InputIterator must be convertible to \c T.
 
-    This function is only available if the program is being
-    compiled in C++11 mode.
+    \note If the range [\a first, \a last) contains duplicate elements,
+    the first one is retained.
 */
 
 /*!
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h
index 6930cb96a5..f123f8e7b9 100644
--- a/src/corelib/tools/qshareddata.h
+++ b/src/corelib/tools/qshareddata.h
@@ -52,17 +52,21 @@ QT_BEGIN_NAMESPACE
 
 template <class T> class QSharedDataPointer;
 
-class Q_CORE_EXPORT QSharedData
+class
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+Q_CORE_EXPORT
+#endif
+QSharedData
 {
 public:
     mutable QAtomicInt ref;
 
-    inline QSharedData() : ref(0) { }
-    inline QSharedData(const QSharedData &) : ref(0) { }
+    inline QSharedData() noexcept : ref(0) { }
+    inline QSharedData(const QSharedData &) noexcept : ref(0) { }
 
-private:
     // using the assignment operator would lead to corruption in the ref-counting
-    QSharedData &operator=(const QSharedData &);
+    QSharedData &operator=(const QSharedData &) = delete;
+    ~QSharedData() = default;
 };
 
 template <class T> class QSharedDataPointer
@@ -71,7 +75,7 @@ public:
     typedef T Type;
     typedef T *pointer;
 
-    inline void detach() { if (d && d->ref.load() != 1) detach_helper(); }
+    inline void detach() { if (d && d->ref.loadRelaxed() != 1) detach_helper(); }
     inline T &operator*() { detach(); return *d; }
     inline const T &operator*() const { return *d; }
     inline T *operator->() { detach(); return d; }
@@ -88,7 +92,7 @@ public:
     inline QSharedDataPointer() { d = nullptr; }
     inline ~QSharedDataPointer() { if (d && !d->ref.deref()) delete d; }
 
-    explicit QSharedDataPointer(T *data) Q_DECL_NOTHROW;
+    explicit QSharedDataPointer(T *data) noexcept;
     inline QSharedDataPointer(const QSharedDataPointer<T> &o) : d(o.d) { if (d) d->ref.ref(); }
     inline QSharedDataPointer<T> & operator=(const QSharedDataPointer<T> &o) {
         if (o.d != d) {
@@ -112,19 +116,17 @@ public:
         }
         return *this;
     }
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSharedDataPointer(QSharedDataPointer &&o) Q_DECL_NOTHROW : d(o.d) { o.d = nullptr; }
-    inline QSharedDataPointer<T> &operator=(QSharedDataPointer<T> &&other) Q_DECL_NOTHROW
+    QSharedDataPointer(QSharedDataPointer &&o) noexcept : d(o.d) { o.d = nullptr; }
+    inline QSharedDataPointer<T> &operator=(QSharedDataPointer<T> &&other) noexcept
     {
         QSharedDataPointer moved(std::move(other));
         swap(moved);
         return *this;
     }
-#endif
 
     inline bool operator!() const { return !d; }
 
-    inline void swap(QSharedDataPointer &other) Q_DECL_NOTHROW
+    inline void swap(QSharedDataPointer &other) noexcept
     { qSwap(d, other.d); }
 
 protected:
@@ -161,7 +163,7 @@ public:
     inline const T *constData() const { return d; }
     inline T *take() { T *x = d; d = nullptr; return x; }
 
-    inline void detach() { if (d && d->ref.load() != 1) detach_helper(); }
+    inline void detach() { if (d && d->ref.loadRelaxed() != 1) detach_helper(); }
 
     inline void reset()
     {
@@ -181,7 +183,7 @@ public:
     inline QExplicitlySharedDataPointer() { d = nullptr; }
     inline ~QExplicitlySharedDataPointer() { if (d && !d->ref.deref()) delete d; }
 
-    explicit QExplicitlySharedDataPointer(T *data) Q_DECL_NOTHROW;
+    explicit QExplicitlySharedDataPointer(T *data) noexcept;
     inline QExplicitlySharedDataPointer(const QExplicitlySharedDataPointer<T> &o) : d(o.d) { if (d) d->ref.ref(); }
 
     template<class X>
@@ -218,19 +220,17 @@ public:
         }
         return *this;
     }
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QExplicitlySharedDataPointer(QExplicitlySharedDataPointer &&o) Q_DECL_NOTHROW : d(o.d) { o.d = nullptr; }
-    inline QExplicitlySharedDataPointer<T> &operator=(QExplicitlySharedDataPointer<T> &&other) Q_DECL_NOTHROW
+    inline QExplicitlySharedDataPointer(QExplicitlySharedDataPointer &&o) noexcept : d(o.d) { o.d = nullptr; }
+    inline QExplicitlySharedDataPointer<T> &operator=(QExplicitlySharedDataPointer<T> &&other) noexcept
     {
         QExplicitlySharedDataPointer moved(std::move(other));
         swap(moved);
         return *this;
     }
-#endif
 
     inline bool operator!() const { return !d; }
 
-    inline void swap(QExplicitlySharedDataPointer &other) Q_DECL_NOTHROW
+    inline void swap(QExplicitlySharedDataPointer &other) noexcept
     { qSwap(d, other.d); }
 
 protected:
@@ -243,7 +243,7 @@ private:
 };
 
 template <class T>
-Q_INLINE_TEMPLATE QSharedDataPointer<T>::QSharedDataPointer(T *adata) Q_DECL_NOTHROW
+Q_INLINE_TEMPLATE QSharedDataPointer<T>::QSharedDataPointer(T *adata) noexcept
     : d(adata)
 { if (d) d->ref.ref(); }
 
@@ -280,7 +280,7 @@ Q_OUTOFLINE_TEMPLATE void QExplicitlySharedDataPointer<T>::detach_helper()
 }
 
 template <class T>
-Q_INLINE_TEMPLATE QExplicitlySharedDataPointer<T>::QExplicitlySharedDataPointer(T *adata) Q_DECL_NOTHROW
+Q_INLINE_TEMPLATE QExplicitlySharedDataPointer<T>::QExplicitlySharedDataPointer(T *adata) noexcept
     : d(adata)
 { if (d) d->ref.ref(); }
 
@@ -297,32 +297,20 @@ template <class T> inline bool operator==(const QExplicitlySharedDataPointer<T>
 }
 
 template <class T>
-Q_INLINE_TEMPLATE void qSwap(QSharedDataPointer<T> &p1, QSharedDataPointer<T> &p2)
+Q_INLINE_TEMPLATE void swap(QSharedDataPointer<T> &p1, QSharedDataPointer<T> &p2)
 { p1.swap(p2); }
 
 template <class T>
-Q_INLINE_TEMPLATE void qSwap(QExplicitlySharedDataPointer<T> &p1, QExplicitlySharedDataPointer<T> &p2)
+Q_INLINE_TEMPLATE void swap(QExplicitlySharedDataPointer<T> &p1, QExplicitlySharedDataPointer<T> &p2)
 { p1.swap(p2); }
 
-QT_END_NAMESPACE
-namespace std {
-    template <class T>
-    Q_INLINE_TEMPLATE void swap(QT_PREPEND_NAMESPACE(QSharedDataPointer)<T> &p1, QT_PREPEND_NAMESPACE(QSharedDataPointer)<T> &p2)
-    { p1.swap(p2); }
-
-    template <class T>
-    Q_INLINE_TEMPLATE void swap(QT_PREPEND_NAMESPACE(QExplicitlySharedDataPointer)<T> &p1, QT_PREPEND_NAMESPACE(QExplicitlySharedDataPointer)<T> &p2)
-    { p1.swap(p2); }
-}
-QT_BEGIN_NAMESPACE
-
 template <class T>
-Q_INLINE_TEMPLATE uint qHash(const QSharedDataPointer<T> &ptr, uint seed = 0) Q_DECL_NOTHROW
+Q_INLINE_TEMPLATE uint qHash(const QSharedDataPointer<T> &ptr, uint seed = 0) noexcept
 {
     return qHash(ptr.data(), seed);
 }
 template <class T>
-Q_INLINE_TEMPLATE uint qHash(const QExplicitlySharedDataPointer<T> &ptr, uint seed = 0) Q_DECL_NOTHROW
+Q_INLINE_TEMPLATE uint qHash(const QExplicitlySharedDataPointer<T> &ptr, uint seed = 0) noexcept
 {
     return qHash(ptr.data(), seed);
 }
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index 39a71a4393..f185d2f23f 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -343,12 +343,6 @@
     if you obtain a non-null object, you may use the pointer. See
     QWeakPointer::toStrongRef() for an example.
 
-    QWeakPointer also provides the QWeakPointer::data() method that returns
-    the tracked pointer without ensuring that it remains valid. This function
-    is provided if you can guarantee by external means that the object will
-    not get deleted (or if you only need the pointer value) and the cost of
-    creating a QSharedPointer using toStrongRef() is too high.
-
     \omit
     \section1 QWeakPointer internals
 
@@ -853,6 +847,7 @@
 /*!
     \fn template <class T> T *QWeakPointer<T>::data() const
     \since 4.6
+    \obsolete Use toStrongRef() instead, and data() on the returned QSharedPointer.
 
     Returns the value of the pointer being tracked by this QWeakPointer,
     \b without ensuring that it cannot get deleted. To have that guarantee,
@@ -1271,6 +1266,57 @@
 */
 
 /*!
+    \fn template <class X, class T> std::shared_ptr<X> qSharedPointerObjectCast(const std::shared_ptr<T> &src)
+    \relates QSharedPointer
+    \since 5.14
+
+    Returns a shared pointer to the pointer held by \a src, using a
+    \l qobject_cast() to type \tt X to obtain an internal pointer of the
+    appropriate type. If the \tt qobject_cast fails, the object
+    returned will be null.
+
+    Note that \tt X must have the same cv-qualifiers (\tt const and
+    \tt volatile) that \tt T has, or the code will fail to
+    compile. Use const_pointer_cast to cast away the constness.
+*/
+
+/*!
+    \fn template <class X, class T> std::shared_ptr<X> qobject_pointer_cast(const std::shared_ptr<T> &src)
+    \relates QSharedPointer
+    \since 5.14
+
+    Same as qSharedPointerObjectCast(). This function is provided for STL
+    compatibility.
+*/
+
+/*!
+    \fn template <class X, class T> std::shared_ptr<X> qSharedPointerObjectCast(std::shared_ptr<T> &&src)
+    \relates QSharedPointer
+    \since 5.14
+
+    Returns a shared pointer to the pointer held by \a src, using a
+    \l qobject_cast() to type \tt X to obtain an internal pointer of the
+    appropriate type.
+
+    If the \tt qobject_cast succeeds, the function will return a valid shared
+    pointer, and \a src is reset to null. If the \tt qobject_cast fails, the
+    object returned will be null, and \a src will not be modified.
+
+    Note that \tt X must have the same cv-qualifiers (\tt const and
+    \tt volatile) that \tt T has, or the code will fail to
+    compile. Use const_pointer_cast to cast away the constness.
+*/
+
+/*!
+    \fn template <class X, class T> std::shared_ptr<X> qobject_pointer_cast(std::shared_ptr<T> &&src)
+    \relates QSharedPointer
+    \since 5.14
+
+    Same as qSharedPointerObjectCast(). This function is provided for STL
+    compatibility.
+*/
+
+/*!
     \fn template <class X> template <class T> QSharedPointer<X> qSharedPointerObjectCast(const QWeakPointer<T> &src)
     \relates QSharedPointer
     \relates QWeakPointer
@@ -1334,7 +1380,7 @@ void QtSharedPointer::ExternalRefCountData::setQObjectShared(const QObject *, bo
 */
 void QtSharedPointer::ExternalRefCountData::checkQObjectShared(const QObject *)
 {
-    if (strongref.load() < 0)
+    if (strongref.loadRelaxed() < 0)
         qWarning("QSharedPointer: cannot create a QSharedPointer from a QObject-tracking QWeakPointer");
 }
 
@@ -1344,7 +1390,7 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge
     QObjectPrivate *d = QObjectPrivate::get(const_cast<QObject *>(obj));
     Q_ASSERT_X(!d->wasDeleted, "QWeakPointer", "Detected QWeakPointer creation in a QObject being deleted");
 
-    ExternalRefCountData *that = d->sharedRefcount.load();
+    ExternalRefCountData *that = d->sharedRefcount.loadRelaxed();
     if (that) {
         that->weakref.ref();
         return that;
@@ -1352,8 +1398,8 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge
 
     // we can create the refcount data because it doesn't exist
     ExternalRefCountData *x = new ExternalRefCountData(Qt::Uninitialized);
-    x->strongref.store(-1);
-    x->weakref.store(2);  // the QWeakPointer that called us plus the QObject itself
+    x->strongref.storeRelaxed(-1);
+    x->weakref.storeRelaxed(2);  // the QWeakPointer that called us plus the QObject itself
 
     ExternalRefCountData *ret;
     if (d->sharedRefcount.testAndSetOrdered(nullptr, x, ret)) {     // ought to be release+acquire; this is acq_rel+acquire
@@ -1361,7 +1407,7 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge
     } else {
         // ~ExternalRefCountData has a Q_ASSERT, so we use this trick to
         // only execute this if Q_ASSERTs are enabled
-        Q_ASSERT((x->weakref.store(0), true));
+        Q_ASSERT((x->weakref.storeRelaxed(0), true));
         delete x;
         ret->weakref.ref();
     }
diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h
index a2c5f990fc..5d47369687 100644
--- a/src/corelib/tools/qsharedpointer.h
+++ b/src/corelib/tools/qsharedpointer.h
@@ -48,6 +48,8 @@
 # include <QtCore/qsharedpointer_impl.h>
 #else
 
+#include <memory> // for std::shared_ptr
+
 QT_BEGIN_NAMESPACE
 
 
@@ -167,6 +169,10 @@ template <class X, class T> QSharedPointer<X> qSharedPointerConstCast(const QSha
 template <class X, class T> QSharedPointer<X> qSharedPointerConstCast(const QWeakPointer<T> &src);
 template <class X, class T> QSharedPointer<X> qSharedPointerObjectCast(const QSharedPointer<T> &src);
 template <class X, class T> QSharedPointer<X> qSharedPointerObjectCast(const QWeakPointer<T> &src);
+template <typename X, class T> std::shared_ptr<X> qobject_pointer_cast(const std::shared_ptr<T> &src);
+template <typename X, class T> std::shared_ptr<X> qobject_pointer_cast(std::shared_ptr<T> &&src);
+template <typename X, class T> std::shared_ptr<X> qSharedPointerObjectCast(const std::shared_ptr<T> &src);
+template <typename X, class T> std::shared_ptr<X> qSharedPointerObjectCast(std::shared_ptr<T> &&src);
 
 template <class X, class T> QWeakPointer<X> qWeakPointerCast(const QWeakPointer<T> &src);
 
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index f2158436fd..362d57fb9a 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -67,6 +67,8 @@ QT_END_NAMESPACE
 #endif
 #include <QtCore/qhashfunctions.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 //
@@ -90,6 +92,10 @@ template <class X, class T>
 QSharedPointer<X> qSharedPointerObjectCast(const QSharedPointer<T> &ptr);
 #endif
 
+namespace QtPrivate {
+struct EnableInternalData;
+}
+
 namespace QtSharedPointer {
     template <class T> class ExternalRefCount;
 
@@ -133,11 +139,11 @@ namespace QtSharedPointer {
         inline ExternalRefCountData(DestroyerFn d)
             : destroyer(d)
         {
-            strongref.store(1);
-            weakref.store(1);
+            strongref.storeRelaxed(1);
+            weakref.storeRelaxed(1);
         }
         inline ExternalRefCountData(Qt::Initialization) { }
-        ~ExternalRefCountData() { Q_ASSERT(!weakref.load()); Q_ASSERT(strongref.load() <= 0); }
+        ~ExternalRefCountData() { Q_ASSERT(!weakref.loadRelaxed()); Q_ASSERT(strongref.loadRelaxed() <= 0); }
 
         void destroy() { destroyer(this); }
 
@@ -218,8 +224,8 @@ namespace QtSharedPointer {
         }
     private:
         // prevent construction
-        ExternalRefCountWithCustomDeleter() Q_DECL_EQ_DELETE;
-        ~ExternalRefCountWithCustomDeleter() Q_DECL_EQ_DELETE;
+        ExternalRefCountWithCustomDeleter() = delete;
+        ~ExternalRefCountWithCustomDeleter() = delete;
         Q_DISABLE_COPY(ExternalRefCountWithCustomDeleter)
     };
 
@@ -263,8 +269,8 @@ namespace QtSharedPointer {
 
     private:
         // prevent construction
-        ExternalRefCountWithContiguousData() Q_DECL_EQ_DELETE;
-        ~ExternalRefCountWithContiguousData() Q_DECL_EQ_DELETE;
+        ExternalRefCountWithContiguousData() = delete;
+        ~ExternalRefCountWithContiguousData() = delete;
         Q_DISABLE_COPY(ExternalRefCountWithContiguousData)
     };
 
@@ -291,18 +297,18 @@ public:
     typedef const value_type &const_reference;
     typedef qptrdiff difference_type;
 
-    T *data() const Q_DECL_NOTHROW { return value; }
-    T *get() const Q_DECL_NOTHROW { return value; }
-    bool isNull() const Q_DECL_NOTHROW { return !data(); }
-    operator RestrictedBool() const Q_DECL_NOTHROW { return isNull() ? nullptr : &QSharedPointer::value; }
-    bool operator !() const Q_DECL_NOTHROW { return isNull(); }
+    T *data() const noexcept { return value; }
+    T *get() const noexcept { return value; }
+    bool isNull() const noexcept { return !data(); }
+    operator RestrictedBool() const noexcept { return isNull() ? nullptr : &QSharedPointer::value; }
+    bool operator !() const noexcept { return isNull(); }
     T &operator*() const { return *data(); }
-    T *operator->() const Q_DECL_NOTHROW { return data(); }
+    T *operator->() const noexcept { return data(); }
 
-    Q_DECL_CONSTEXPR QSharedPointer() Q_DECL_NOTHROW : value(nullptr), d(nullptr) { }
+    Q_DECL_CONSTEXPR QSharedPointer() noexcept : value(nullptr), d(nullptr) { }
     ~QSharedPointer() { deref(); }
 
-    Q_DECL_CONSTEXPR QSharedPointer(std::nullptr_t) Q_DECL_NOTHROW : value(nullptr), d(nullptr) { }
+    Q_DECL_CONSTEXPR QSharedPointer(std::nullptr_t) noexcept : value(nullptr), d(nullptr) { }
 
     template <class X, IfCompatible<X> = true>
     inline explicit QSharedPointer(X *ptr) : value(ptr) // noexcept
@@ -315,22 +321,21 @@ public:
     template <typename Deleter>
     QSharedPointer(std::nullptr_t, Deleter) : value(nullptr), d(nullptr) { }
 
-    QSharedPointer(const QSharedPointer &other) Q_DECL_NOTHROW : value(other.value), d(other.d)
+    QSharedPointer(const QSharedPointer &other) noexcept : value(other.value), d(other.d)
     { if (d) ref(); }
-    QSharedPointer &operator=(const QSharedPointer &other) Q_DECL_NOTHROW
+    QSharedPointer &operator=(const QSharedPointer &other) noexcept
     {
         QSharedPointer copy(other);
         swap(copy);
         return *this;
     }
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSharedPointer(QSharedPointer &&other) Q_DECL_NOTHROW
+    QSharedPointer(QSharedPointer &&other) noexcept
         : value(other.value), d(other.d)
     {
         other.d = nullptr;
         other.value = nullptr;
     }
-    QSharedPointer &operator=(QSharedPointer &&other) Q_DECL_NOTHROW
+    QSharedPointer &operator=(QSharedPointer &&other) noexcept
     {
         QSharedPointer moved(std::move(other));
         swap(moved);
@@ -338,7 +343,7 @@ public:
     }
 
     template <class X, IfCompatible<X> = true>
-    QSharedPointer(QSharedPointer<X> &&other) Q_DECL_NOTHROW
+    QSharedPointer(QSharedPointer<X> &&other) noexcept
         : value(other.value), d(other.d)
     {
         other.d = nullptr;
@@ -346,17 +351,15 @@ public:
     }
 
     template <class X, IfCompatible<X> = true>
-    QSharedPointer &operator=(QSharedPointer<X> &&other) Q_DECL_NOTHROW
+    QSharedPointer &operator=(QSharedPointer<X> &&other) noexcept
     {
         QSharedPointer moved(std::move(other));
         swap(moved);
         return *this;
     }
 
-#endif
-
     template <class X, IfCompatible<X> = true>
-    QSharedPointer(const QSharedPointer<X> &other) Q_DECL_NOTHROW : value(other.value), d(other.d)
+    QSharedPointer(const QSharedPointer<X> &other) noexcept : value(other.value), d(other.d)
     { if (d) ref(); }
 
     template <class X, IfCompatible<X> = true>
@@ -375,7 +378,7 @@ public:
     inline QSharedPointer<T> &operator=(const QWeakPointer<X> &other)
     { internalSet(other.d, other.value); return *this; }
 
-    inline void swap(QSharedPointer &other)
+    inline void swap(QSharedPointer &other) noexcept
     { this->internalSwap(other); }
 
     inline void reset() { clear(); }
@@ -444,9 +447,9 @@ public:
 private:
     explicit QSharedPointer(Qt::Initialization) {}
 
-    void deref() Q_DECL_NOTHROW
+    void deref() noexcept
     { deref(d); }
-    static void deref(Data *dd) Q_DECL_NOTHROW
+    static void deref(Data *dd) noexcept
     {
         if (!dd) return;
         if (!dd->strongref.deref()) {
@@ -487,7 +490,7 @@ private:
         enableSharedFromThis(ptr);
     }
 
-    void internalSwap(QSharedPointer &other) Q_DECL_NOTHROW
+    void internalSwap(QSharedPointer &other) noexcept
     {
         qSwap(d, other.d);
         qSwap(this->value, other.value);
@@ -500,19 +503,19 @@ public:
     template <class X> friend class QWeakPointer;
     template <class X, class Y> friend QSharedPointer<X> QtSharedPointer::copyAndSetPointer(X * ptr, const QSharedPointer<Y> &src);
 #endif
-    void ref() const Q_DECL_NOTHROW { d->weakref.ref(); d->strongref.ref(); }
+    void ref() const noexcept { d->weakref.ref(); d->strongref.ref(); }
 
     inline void internalSet(Data *o, T *actual)
     {
         if (o) {
             // increase the strongref, but never up from zero
             // or less (-1 is used by QWeakPointer on untracked QObject)
-            int tmp = o->strongref.load();
+            int tmp = o->strongref.loadRelaxed();
             while (tmp > 0) {
                 // try to increment from "tmp" to "tmp + 1"
                 if (o->strongref.testAndSetRelaxed(tmp, tmp + 1))
                     break;   // succeeded
-                tmp = o->strongref.load();  // failed, try again
+                tmp = o->strongref.loadRelaxed();  // failed, try again
             }
 
             if (tmp > 0) {
@@ -525,7 +528,7 @@ public:
 
         qSwap(d, o);
         qSwap(this->value, actual);
-        if (!d || d->strongref.load() == 0)
+        if (!d || d->strongref.loadRelaxed() == 0)
             this->value = nullptr;
 
         // dereference saved data
@@ -553,12 +556,16 @@ public:
     typedef const value_type &const_reference;
     typedef qptrdiff difference_type;
 
-    bool isNull() const Q_DECL_NOTHROW { return d == nullptr || d->strongref.load() == 0 || value == nullptr; }
-    operator RestrictedBool() const Q_DECL_NOTHROW { return isNull() ? nullptr : &QWeakPointer::value; }
-    bool operator !() const Q_DECL_NOTHROW { return isNull(); }
-    T *data() const Q_DECL_NOTHROW { return d == nullptr || d->strongref.load() == 0 ? nullptr : value; }
+    bool isNull() const noexcept { return d == nullptr || d->strongref.loadRelaxed() == 0 || value == nullptr; }
+    operator RestrictedBool() const noexcept { return isNull() ? nullptr : &QWeakPointer::value; }
+    bool operator !() const noexcept { return isNull(); }
 
-    inline QWeakPointer() Q_DECL_NOTHROW : d(nullptr), value(nullptr) { }
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use toStrongRef() instead, and data() on the returned QSharedPointer")
+    T *data() const noexcept { return internalData(); }
+#endif
+
+    inline QWeakPointer() noexcept : d(nullptr), value(nullptr) { }
     inline ~QWeakPointer() { if (d && !d->weakref.deref()) delete d; }
 
 #ifndef QT_NO_QOBJECT
@@ -576,26 +583,24 @@ public:
     { return *this = QWeakPointer(ptr); }
 #endif
 
-    QWeakPointer(const QWeakPointer &other) Q_DECL_NOTHROW : d(other.d), value(other.value)
+    QWeakPointer(const QWeakPointer &other) noexcept : d(other.d), value(other.value)
     { if (d) d->weakref.ref(); }
-#ifdef Q_COMPILER_RVALUE_REFS
-    QWeakPointer(QWeakPointer &&other) Q_DECL_NOTHROW
+    QWeakPointer(QWeakPointer &&other) noexcept
         : d(other.d), value(other.value)
     {
         other.d = nullptr;
         other.value = nullptr;
     }
-    QWeakPointer &operator=(QWeakPointer &&other) Q_DECL_NOTHROW
+    QWeakPointer &operator=(QWeakPointer &&other) noexcept
     { QWeakPointer moved(std::move(other)); swap(moved); return *this; }
-#endif
-    QWeakPointer &operator=(const QWeakPointer &other) Q_DECL_NOTHROW
+    QWeakPointer &operator=(const QWeakPointer &other) noexcept
     {
         QWeakPointer copy(other);
         swap(copy);
         return *this;
     }
 
-    void swap(QWeakPointer &other) Q_DECL_NOTHROW
+    void swap(QWeakPointer &other) noexcept
     {
         qSwap(this->d, other.d);
         qSwap(this->value, other.value);
@@ -623,11 +628,11 @@ public:
     }
 
     template <class X>
-    bool operator==(const QWeakPointer<X> &o) const Q_DECL_NOTHROW
+    bool operator==(const QWeakPointer<X> &o) const noexcept
     { return d == o.d && value == static_cast<const T *>(o.value); }
 
     template <class X>
-    bool operator!=(const QWeakPointer<X> &o) const Q_DECL_NOTHROW
+    bool operator!=(const QWeakPointer<X> &o) const noexcept
     { return !(*this == o); }
 
     template <class X, IfCompatible<X> = true>
@@ -642,11 +647,11 @@ public:
     }
 
     template <class X>
-    bool operator==(const QSharedPointer<X> &o) const Q_DECL_NOTHROW
+    bool operator==(const QSharedPointer<X> &o) const noexcept
     { return d == o.d; }
 
     template <class X>
-    bool operator!=(const QSharedPointer<X> &o) const Q_DECL_NOTHROW
+    bool operator!=(const QSharedPointer<X> &o) const noexcept
     { return !(*this == o); }
 
     inline void clear() { *this = QWeakPointer(); }
@@ -660,7 +665,7 @@ public:
 #endif
 
 private:
-
+    friend struct QtPrivate::EnableInternalData;
 #if defined(Q_NO_TEMPLATE_FRIENDS)
 public:
 #else
@@ -689,19 +694,33 @@ public:
         value = actual;
     }
 
+    // ### Qt 6: remove users of this API; no one should ever access
+    // a weak pointer's data but the weak pointer itself
+    inline T *internalData() const noexcept
+    {
+        return d == nullptr || d->strongref.loadRelaxed() == 0 ? nullptr : value;
+    }
+
     Data *d;
     T *value;
 };
 
+namespace QtPrivate {
+struct EnableInternalData {
+    template <typename T>
+    static T *internalData(const QWeakPointer<T> &p) noexcept { return p.internalData(); }
+};
+// hack to delay name lookup to instantiation time by making
+// EnableInternalData a dependent name:
+template <typename T>
+struct EnableInternalDataWrap : EnableInternalData {};
+}
+
 template <class T>
 class QEnableSharedFromThis
 {
 protected:
-#ifdef Q_COMPILER_DEFAULT_MEMBERS
     QEnableSharedFromThis() = default;
-#else
-    Q_DECL_CONSTEXPR QEnableSharedFromThis() {}
-#endif
     QEnableSharedFromThis(const QEnableSharedFromThis &) {}
     QEnableSharedFromThis &operator=(const QEnableSharedFromThis &) { return *this; }
 
@@ -728,92 +747,92 @@ public:
 // operator== and operator!=
 //
 template <class T, class X>
-bool operator==(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) Q_DECL_NOTHROW
+bool operator==(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) noexcept
 {
     return ptr1.data() == ptr2.data();
 }
 template <class T, class X>
-bool operator!=(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) Q_DECL_NOTHROW
+bool operator!=(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) noexcept
 {
     return ptr1.data() != ptr2.data();
 }
 
 template <class T, class X>
-bool operator==(const QSharedPointer<T> &ptr1, const X *ptr2) Q_DECL_NOTHROW
+bool operator==(const QSharedPointer<T> &ptr1, const X *ptr2) noexcept
 {
     return ptr1.data() == ptr2;
 }
 template <class T, class X>
-bool operator==(const T *ptr1, const QSharedPointer<X> &ptr2) Q_DECL_NOTHROW
+bool operator==(const T *ptr1, const QSharedPointer<X> &ptr2) noexcept
 {
     return ptr1 == ptr2.data();
 }
 template <class T, class X>
-bool operator!=(const QSharedPointer<T> &ptr1, const X *ptr2) Q_DECL_NOTHROW
+bool operator!=(const QSharedPointer<T> &ptr1, const X *ptr2) noexcept
 {
     return !(ptr1 == ptr2);
 }
 template <class T, class X>
-bool operator!=(const T *ptr1, const QSharedPointer<X> &ptr2) Q_DECL_NOTHROW
+bool operator!=(const T *ptr1, const QSharedPointer<X> &ptr2) noexcept
 {
     return !(ptr2 == ptr1);
 }
 
 template <class T, class X>
-bool operator==(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) Q_DECL_NOTHROW
+bool operator==(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) noexcept
 {
     return ptr2 == ptr1;
 }
 template <class T, class X>
-bool operator!=(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) Q_DECL_NOTHROW
+bool operator!=(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) noexcept
 {
     return ptr2 != ptr1;
 }
 
 template<class T>
-inline bool operator==(const QSharedPointer<T> &lhs, std::nullptr_t) Q_DECL_NOTHROW
+inline bool operator==(const QSharedPointer<T> &lhs, std::nullptr_t) noexcept
 {
     return lhs.isNull();
 }
 
 template<class T>
-inline bool operator!=(const QSharedPointer<T> &lhs, std::nullptr_t) Q_DECL_NOTHROW
+inline bool operator!=(const QSharedPointer<T> &lhs, std::nullptr_t) noexcept
 {
     return !lhs.isNull();
 }
 
 template<class T>
-inline bool operator==(std::nullptr_t, const QSharedPointer<T> &rhs) Q_DECL_NOTHROW
+inline bool operator==(std::nullptr_t, const QSharedPointer<T> &rhs) noexcept
 {
     return rhs.isNull();
 }
 
 template<class T>
-inline bool operator!=(std::nullptr_t, const QSharedPointer<T> &rhs) Q_DECL_NOTHROW
+inline bool operator!=(std::nullptr_t, const QSharedPointer<T> &rhs) noexcept
 {
     return !rhs.isNull();
 }
 
 template<class T>
-inline bool operator==(const QWeakPointer<T> &lhs, std::nullptr_t) Q_DECL_NOTHROW
+inline bool operator==(const QWeakPointer<T> &lhs, std::nullptr_t) noexcept
 {
     return lhs.isNull();
 }
 
 template<class T>
-inline bool operator!=(const QWeakPointer<T> &lhs, std::nullptr_t) Q_DECL_NOTHROW
+inline bool operator!=(const QWeakPointer<T> &lhs, std::nullptr_t) noexcept
 {
     return !lhs.isNull();
 }
 
 template<class T>
-inline bool operator==(std::nullptr_t, const QWeakPointer<T> &rhs) Q_DECL_NOTHROW
+inline bool operator==(std::nullptr_t, const QWeakPointer<T> &rhs) noexcept
 {
     return rhs.isNull();
 }
 
 template<class T>
-inline bool operator!=(std::nullptr_t, const QWeakPointer<T> &rhs) Q_DECL_NOTHROW
+inline bool operator!=(std::nullptr_t, const QWeakPointer<T> &rhs) noexcept
 {
     return !rhs.isNull();
 }
@@ -876,18 +895,12 @@ Q_INLINE_TEMPLATE QWeakPointer<T> QSharedPointer<T>::toWeakRef() const
 }
 
 template <class T>
-inline void qSwap(QSharedPointer<T> &p1, QSharedPointer<T> &p2)
-{
-    p1.swap(p2);
-}
+inline void swap(QSharedPointer<T> &p1, QSharedPointer<T> &p2) noexcept
+{ p1.swap(p2); }
 
-QT_END_NAMESPACE
-namespace std {
-    template <class T>
-    inline void swap(QT_PREPEND_NAMESPACE(QSharedPointer)<T> &p1, QT_PREPEND_NAMESPACE(QSharedPointer)<T> &p2)
-    { p1.swap(p2); }
-}
-QT_BEGIN_NAMESPACE
+template <class T>
+inline void swap(QWeakPointer<T> &p1, QWeakPointer<T> &p2) noexcept
+{ p1.swap(p2); }
 
 namespace QtSharedPointer {
 // helper functions:
@@ -972,11 +985,13 @@ qobject_cast(const QWeakPointer<T> &src)
     return qSharedPointerObjectCast<typename QtSharedPointer::RemovePointer<X>::Type, T>(src);
 }
 
+/// ### Qt 6: make this use toStrongRef() (once support for storing
+/// non-managed QObjects in QWeakPointer is removed)
 template<typename T>
 QWeakPointer<typename std::enable_if<QtPrivate::IsPointerToTypeDerivedFromQObject<T*>::Value, T>::type>
 qWeakPointerFromVariant(const QVariant &variant)
 {
-    return QWeakPointer<T>(qobject_cast<T*>(QtSharedPointer::weakPointerFromVariant_internal(variant).data()));
+    return QWeakPointer<T>(qobject_cast<T*>(QtPrivate::EnableInternalData::internalData(QtSharedPointer::weakPointerFromVariant_internal(variant))));
 }
 template<typename T>
 QSharedPointer<typename std::enable_if<QtPrivate::IsPointerToTypeDerivedFromQObject<T*>::Value, T>::type>
@@ -985,6 +1000,46 @@ qSharedPointerFromVariant(const QVariant &variant)
     return qSharedPointerObjectCast<T>(QtSharedPointer::sharedPointerFromVariant_internal(variant));
 }
 
+// std::shared_ptr helpers
+
+template <typename X, class T>
+std::shared_ptr<X> qobject_pointer_cast(const std::shared_ptr<T> &src)
+{
+    using element_type = typename std::shared_ptr<X>::element_type;
+    return std::shared_ptr<X>(src, qobject_cast<element_type *>(src.get()));
+}
+
+template <typename X, class T>
+std::shared_ptr<X> qobject_pointer_cast(std::shared_ptr<T> &&src)
+{
+    using element_type = typename std::shared_ptr<X>::element_type;
+    auto castResult = qobject_cast<element_type *>(src.get());
+    if (castResult) {
+        auto result = std::shared_ptr<X>(std::move(src), castResult);
+#if __cplusplus <= 201703L
+        // C++2a's move aliasing constructor will leave src empty.
+        // Before C++2a we don't really know if the compiler has support for it.
+        // The move aliasing constructor is the resolution for LWG2996,
+        // which does not impose a feature-testing macro. So: clear src.
+        src.reset();
+#endif
+        return result;
+    }
+    return std::shared_ptr<X>();
+}
+
+template <typename X, class T>
+std::shared_ptr<X> qSharedPointerObjectCast(const std::shared_ptr<T> &src)
+{
+    return qobject_pointer_cast<X>(src);
+}
+
+template <typename X, class T>
+std::shared_ptr<X> qSharedPointerObjectCast(std::shared_ptr<T> &&src)
+{
+    return qobject_pointer_cast<X>(std::move(src));
+}
+
 #endif
 
 template<typename T> Q_DECLARE_TYPEINFO_BODY(QWeakPointer<T>, Q_MOVABLE_TYPE);
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index 09c276c4e0..fb9b5996f6 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -595,9 +595,9 @@ quint64 qDetectCpuFeatures()
                features_string + features_indices[qCountTrailingZeroBits(missing)]);
     }
 
-    qt_cpu_features[0].store(f | quint32(QSimdInitialized));
+    qt_cpu_features[0].storeRelaxed(f | quint32(QSimdInitialized));
 #ifndef Q_ATOMIC_INT64_IS_SUPPORTED
-    qt_cpu_features[1].store(f >> 32);
+    qt_cpu_features[1].storeRelaxed(f >> 32);
 #endif
     return f;
 }
@@ -630,7 +630,7 @@ void qDumpCPUFeatures()
 #    define _rdrandXX_step _rdrand32_step
 #  endif
 
-QT_FUNCTION_TARGET(RDRND) qsizetype qRandomCpu(void *buffer, qsizetype count) Q_DECL_NOTHROW
+QT_FUNCTION_TARGET(RDRND) qsizetype qRandomCpu(void *buffer, qsizetype count) noexcept
 {
     unsigned *ptr = reinterpret_cast<unsigned *>(buffer);
     unsigned *end = ptr + count;
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index d603631a24..c28624a25e 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -347,9 +347,9 @@ extern Q_CORE_EXPORT QBasicAtomicInteger<unsigned> qt_cpu_features[2];
 Q_CORE_EXPORT quint64 qDetectCpuFeatures();
 
 #if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
-Q_CORE_EXPORT qsizetype qRandomCpu(void *, qsizetype) Q_DECL_NOTHROW;
+Q_CORE_EXPORT qsizetype qRandomCpu(void *, qsizetype) noexcept;
 #else
-static inline qsizetype qRandomCpu(void *, qsizetype) Q_DECL_NOTHROW
+static inline qsizetype qRandomCpu(void *, qsizetype) noexcept
 {
     return 0;
 }
@@ -357,9 +357,9 @@ static inline qsizetype qRandomCpu(void *, qsizetype) Q_DECL_NOTHROW
 
 static inline quint64 qCpuFeatures()
 {
-    quint64 features = qt_cpu_features[0].load();
+    quint64 features = qt_cpu_features[0].loadRelaxed();
 #ifndef Q_ATOMIC_INT64_IS_SUPPORTED
-    features |= quint64(qt_cpu_features[1].load()) << 32;
+    features |= quint64(qt_cpu_features[1].loadRelaxed()) << 32;
 #endif
     if (Q_UNLIKELY(features == 0)) {
         features = qDetectCpuFeatures();
diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp
index 3e97947ad2..2cbaae117d 100644
--- a/src/corelib/tools/qsize.cpp
+++ b/src/corelib/tools/qsize.cpp
@@ -163,7 +163,7 @@ QT_BEGIN_NAMESPACE
     \sa setWidth(), setHeight(), transposed()
 */
 
-void QSize::transpose() Q_DECL_NOTHROW
+void QSize::transpose() noexcept
 {
     qSwap(wd, ht);
 }
@@ -222,7 +222,7 @@ void QSize::transpose() Q_DECL_NOTHROW
     Return a size scaled to a rectangle with the given size \a s,
     according to the specified \a mode.
 */
-QSize QSize::scaled(const QSize &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW
+QSize QSize::scaled(const QSize &s, Qt::AspectRatioMode mode) const noexcept
 {
     if (mode == Qt::IgnoreAspectRatio || wd == 0 || ht == 0) {
         return s;
@@ -390,7 +390,25 @@ QSize QSize::scaled(const QSize &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHR
     \sa expandedTo(), scale()
 */
 
+/*!
+    \fn QSize QSize::grownBy(QMargins margins) const
+    \fn QSizeF QSizeF::grownBy(QMarginsF margins) const
+    \since 5.14
+
+    Returns the size that results from growing this size by \a margins.
+
+    \sa shrunkBy()
+*/
 
+/*!
+    \fn QSize QSize::shrunkBy(QMargins margins) const
+    \fn QSizeF QSizeF::shrunkBy(QMarginsF margins) const
+    \since 5.14
+
+    Returns the size that results from shrinking this size by \a margins.
+
+    \sa grownBy()
+*/
 
 /*****************************************************************************
   QSize stream functions
@@ -594,7 +612,7 @@ QDebug operator<<(QDebug dbg, const QSize &s)
     \sa setWidth(), setHeight(), transposed()
 */
 
-void QSizeF::transpose() Q_DECL_NOTHROW
+void QSizeF::transpose() noexcept
 {
     qSwap(wd, ht);
 }
@@ -653,7 +671,7 @@ void QSizeF::transpose() Q_DECL_NOTHROW
     Returns a size scaled to a rectangle with the given size \a s,
     according to the specified \a mode.
 */
-QSizeF QSizeF::scaled(const QSizeF &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW
+QSizeF QSizeF::scaled(const QSizeF &s, Qt::AspectRatioMode mode) const noexcept
 {
     if (mode == Qt::IgnoreAspectRatio || qIsNull(wd) || qIsNull(ht)) {
         return s;
diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h
index bb29dca7c4..06de1cd63f 100644
--- a/src/corelib/tools/qsize.h
+++ b/src/corelib/tools/qsize.h
@@ -41,6 +41,7 @@
 #define QSIZE_H
 
 #include <QtCore/qnamespace.h>
+#include <QtCore/qmargins.h>
 
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
 struct CGSize;
@@ -52,46 +53,51 @@ QT_BEGIN_NAMESPACE
 class Q_CORE_EXPORT QSize
 {
 public:
-    Q_DECL_CONSTEXPR QSize() Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QSize(int w, int h) Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline bool isNull() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline bool isEmpty() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline int width() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline int height() const Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setWidth(int w) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setHeight(int h) Q_DECL_NOTHROW;
-    void transpose() Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize transposed() const Q_DECL_NOTHROW;
-
-    inline void scale(int w, int h, Qt::AspectRatioMode mode) Q_DECL_NOTHROW;
-    inline void scale(const QSize &s, Qt::AspectRatioMode mode) Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT QSize scaled(int w, int h, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT QSize scaled(const QSize &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW;
-
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize expandedTo(const QSize &) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize boundedTo(const QSize &) const Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline int &rwidth() Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline int &rheight() Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline QSize &operator+=(const QSize &) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline QSize &operator-=(const QSize &) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline QSize &operator*=(qreal c) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QSize() noexcept;
+    Q_DECL_CONSTEXPR QSize(int w, int h) noexcept;
+
+    Q_DECL_CONSTEXPR inline bool isNull() const noexcept;
+    Q_DECL_CONSTEXPR inline bool isEmpty() const noexcept;
+    Q_DECL_CONSTEXPR inline bool isValid() const noexcept;
+
+    Q_DECL_CONSTEXPR inline int width() const noexcept;
+    Q_DECL_CONSTEXPR inline int height() const noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setWidth(int w) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setHeight(int h) noexcept;
+    void transpose() noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize transposed() const noexcept;
+
+    inline void scale(int w, int h, Qt::AspectRatioMode mode) noexcept;
+    inline void scale(const QSize &s, Qt::AspectRatioMode mode) noexcept;
+    Q_REQUIRED_RESULT QSize scaled(int w, int h, Qt::AspectRatioMode mode) const noexcept;
+    Q_REQUIRED_RESULT QSize scaled(const QSize &s, Qt::AspectRatioMode mode) const noexcept;
+
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize expandedTo(const QSize &) const noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize boundedTo(const QSize &) const noexcept;
+
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QSize grownBy(QMargins m) const noexcept
+    { return {width() + m.left() + m.right(), height() + m.top() + m.bottom()}; }
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QSize shrunkBy(QMargins m) const noexcept
+    { return {width() - m.left() - m.right(), height() - m.top() - m.bottom()}; }
+
+    Q_DECL_RELAXED_CONSTEXPR inline int &rwidth() noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline int &rheight() noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline QSize &operator+=(const QSize &) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline QSize &operator-=(const QSize &) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline QSize &operator*=(qreal c) noexcept;
     inline QSize &operator/=(qreal c);
 
-    friend inline Q_DECL_CONSTEXPR bool operator==(const QSize &, const QSize &) Q_DECL_NOTHROW;
-    friend inline Q_DECL_CONSTEXPR bool operator!=(const QSize &, const QSize &) Q_DECL_NOTHROW;
-    friend inline Q_DECL_CONSTEXPR const QSize operator+(const QSize &, const QSize &) Q_DECL_NOTHROW;
-    friend inline Q_DECL_CONSTEXPR const QSize operator-(const QSize &, const QSize &) Q_DECL_NOTHROW;
-    friend inline Q_DECL_CONSTEXPR const QSize operator*(const QSize &, qreal) Q_DECL_NOTHROW;
-    friend inline Q_DECL_CONSTEXPR const QSize operator*(qreal, const QSize &) Q_DECL_NOTHROW;
+    friend inline Q_DECL_CONSTEXPR bool operator==(const QSize &, const QSize &) noexcept;
+    friend inline Q_DECL_CONSTEXPR bool operator!=(const QSize &, const QSize &) noexcept;
+    friend inline Q_DECL_CONSTEXPR const QSize operator+(const QSize &, const QSize &) noexcept;
+    friend inline Q_DECL_CONSTEXPR const QSize operator-(const QSize &, const QSize &) noexcept;
+    friend inline Q_DECL_CONSTEXPR const QSize operator*(const QSize &, qreal) noexcept;
+    friend inline Q_DECL_CONSTEXPR const QSize operator*(qreal, const QSize &) noexcept;
     friend inline const QSize operator/(const QSize &, qreal);
 
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
-    Q_REQUIRED_RESULT CGSize toCGSize() const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT CGSize toCGSize() const noexcept;
 #endif
 
 private:
@@ -114,74 +120,74 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QSize &);
   QSize inline functions
  *****************************************************************************/
 
-Q_DECL_CONSTEXPR inline QSize::QSize() Q_DECL_NOTHROW : wd(-1), ht(-1) {}
+Q_DECL_CONSTEXPR inline QSize::QSize() noexcept : wd(-1), ht(-1) {}
 
-Q_DECL_CONSTEXPR inline QSize::QSize(int w, int h) Q_DECL_NOTHROW : wd(w), ht(h) {}
+Q_DECL_CONSTEXPR inline QSize::QSize(int w, int h) noexcept : wd(w), ht(h) {}
 
-Q_DECL_CONSTEXPR inline bool QSize::isNull() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QSize::isNull() const noexcept
 { return wd==0 && ht==0; }
 
-Q_DECL_CONSTEXPR inline bool QSize::isEmpty() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QSize::isEmpty() const noexcept
 { return wd<1 || ht<1; }
 
-Q_DECL_CONSTEXPR inline bool QSize::isValid() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QSize::isValid() const noexcept
 { return wd>=0 && ht>=0; }
 
-Q_DECL_CONSTEXPR inline int QSize::width() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QSize::width() const noexcept
 { return wd; }
 
-Q_DECL_CONSTEXPR inline int QSize::height() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int QSize::height() const noexcept
 { return ht; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QSize::setWidth(int w) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QSize::setWidth(int w) noexcept
 { wd = w; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QSize::setHeight(int h) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QSize::setHeight(int h) noexcept
 { ht = h; }
 
-Q_DECL_CONSTEXPR inline QSize QSize::transposed() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSize QSize::transposed() const noexcept
 { return QSize(ht, wd); }
 
-inline void QSize::scale(int w, int h, Qt::AspectRatioMode mode) Q_DECL_NOTHROW
+inline void QSize::scale(int w, int h, Qt::AspectRatioMode mode) noexcept
 { scale(QSize(w, h), mode); }
 
-inline void QSize::scale(const QSize &s, Qt::AspectRatioMode mode) Q_DECL_NOTHROW
+inline void QSize::scale(const QSize &s, Qt::AspectRatioMode mode) noexcept
 { *this = scaled(s, mode); }
 
-inline QSize QSize::scaled(int w, int h, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW
+inline QSize QSize::scaled(int w, int h, Qt::AspectRatioMode mode) const noexcept
 { return scaled(QSize(w, h), mode); }
 
-Q_DECL_RELAXED_CONSTEXPR inline int &QSize::rwidth() Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline int &QSize::rwidth() noexcept
 { return wd; }
 
-Q_DECL_RELAXED_CONSTEXPR inline int &QSize::rheight() Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline int &QSize::rheight() noexcept
 { return ht; }
 
-Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator+=(const QSize &s) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator+=(const QSize &s) noexcept
 { wd+=s.wd; ht+=s.ht; return *this; }
 
-Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator-=(const QSize &s) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator-=(const QSize &s) noexcept
 { wd-=s.wd; ht-=s.ht; return *this; }
 
-Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator*=(qreal c) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator*=(qreal c) noexcept
 { wd = qRound(wd*c); ht = qRound(ht*c); return *this; }
 
-Q_DECL_CONSTEXPR inline bool operator==(const QSize &s1, const QSize &s2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator==(const QSize &s1, const QSize &s2) noexcept
 { return s1.wd == s2.wd && s1.ht == s2.ht; }
 
-Q_DECL_CONSTEXPR inline bool operator!=(const QSize &s1, const QSize &s2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator!=(const QSize &s1, const QSize &s2) noexcept
 { return s1.wd != s2.wd || s1.ht != s2.ht; }
 
-Q_DECL_CONSTEXPR inline const QSize operator+(const QSize & s1, const QSize & s2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline const QSize operator+(const QSize & s1, const QSize & s2) noexcept
 { return QSize(s1.wd+s2.wd, s1.ht+s2.ht); }
 
-Q_DECL_CONSTEXPR inline const QSize operator-(const QSize &s1, const QSize &s2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline const QSize operator-(const QSize &s1, const QSize &s2) noexcept
 { return QSize(s1.wd-s2.wd, s1.ht-s2.ht); }
 
-Q_DECL_CONSTEXPR inline const QSize operator*(const QSize &s, qreal c) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline const QSize operator*(const QSize &s, qreal c) noexcept
 { return QSize(qRound(s.wd*c), qRound(s.ht*c)); }
 
-Q_DECL_CONSTEXPR inline const QSize operator*(qreal c, const QSize &s) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline const QSize operator*(qreal c, const QSize &s) noexcept
 { return QSize(qRound(s.wd*c), qRound(s.ht*c)); }
 
 inline QSize &QSize::operator/=(qreal c)
@@ -197,12 +203,12 @@ inline const QSize operator/(const QSize &s, qreal c)
     return QSize(qRound(s.wd/c), qRound(s.ht/c));
 }
 
-Q_DECL_CONSTEXPR inline QSize QSize::expandedTo(const QSize & otherSize) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSize QSize::expandedTo(const QSize & otherSize) const noexcept
 {
     return QSize(qMax(wd,otherSize.wd), qMax(ht,otherSize.ht));
 }
 
-Q_DECL_CONSTEXPR inline QSize QSize::boundedTo(const QSize & otherSize) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSize QSize::boundedTo(const QSize & otherSize) const noexcept
 {
     return QSize(qMin(wd,otherSize.wd), qMin(ht,otherSize.ht));
 }
@@ -215,50 +221,55 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QSize &);
 class Q_CORE_EXPORT QSizeF
 {
 public:
-    Q_DECL_CONSTEXPR QSizeF() Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QSizeF(const QSize &sz) Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR QSizeF(qreal w, qreal h) Q_DECL_NOTHROW;
-
-    inline bool isNull() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline bool isEmpty() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW;
-
-    Q_DECL_CONSTEXPR inline qreal width() const Q_DECL_NOTHROW;
-    Q_DECL_CONSTEXPR inline qreal height() const Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setWidth(qreal w) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline void setHeight(qreal h) Q_DECL_NOTHROW;
-    void transpose() Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF transposed() const Q_DECL_NOTHROW;
-
-    inline void scale(qreal w, qreal h, Qt::AspectRatioMode mode) Q_DECL_NOTHROW;
-    inline void scale(const QSizeF &s, Qt::AspectRatioMode mode) Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT QSizeF scaled(qreal w, qreal h, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT QSizeF scaled(const QSizeF &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW;
-
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF expandedTo(const QSizeF &) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF boundedTo(const QSizeF &) const Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline qreal &rwidth() Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline qreal &rheight() Q_DECL_NOTHROW;
-
-    Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator+=(const QSizeF &) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator-=(const QSizeF &) Q_DECL_NOTHROW;
-    Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator*=(qreal c) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QSizeF() noexcept;
+    Q_DECL_CONSTEXPR QSizeF(const QSize &sz) noexcept;
+    Q_DECL_CONSTEXPR QSizeF(qreal w, qreal h) noexcept;
+
+    inline bool isNull() const noexcept;
+    Q_DECL_CONSTEXPR inline bool isEmpty() const noexcept;
+    Q_DECL_CONSTEXPR inline bool isValid() const noexcept;
+
+    Q_DECL_CONSTEXPR inline qreal width() const noexcept;
+    Q_DECL_CONSTEXPR inline qreal height() const noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setWidth(qreal w) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline void setHeight(qreal h) noexcept;
+    void transpose() noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF transposed() const noexcept;
+
+    inline void scale(qreal w, qreal h, Qt::AspectRatioMode mode) noexcept;
+    inline void scale(const QSizeF &s, Qt::AspectRatioMode mode) noexcept;
+    Q_REQUIRED_RESULT QSizeF scaled(qreal w, qreal h, Qt::AspectRatioMode mode) const noexcept;
+    Q_REQUIRED_RESULT QSizeF scaled(const QSizeF &s, Qt::AspectRatioMode mode) const noexcept;
+
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF expandedTo(const QSizeF &) const noexcept;
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF boundedTo(const QSizeF &) const noexcept;
+
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QSizeF grownBy(QMarginsF m) const noexcept
+    { return {width() + m.left() + m.right(), height() + m.top() + m.bottom()}; }
+    Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QSizeF shrunkBy(QMarginsF m) const noexcept
+    { return {width() - m.left() - m.right(), height() - m.top() - m.bottom()}; }
+
+    Q_DECL_RELAXED_CONSTEXPR inline qreal &rwidth() noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline qreal &rheight() noexcept;
+
+    Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator+=(const QSizeF &) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator-=(const QSizeF &) noexcept;
+    Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator*=(qreal c) noexcept;
     inline QSizeF &operator/=(qreal c);
 
-    friend Q_DECL_CONSTEXPR inline bool operator==(const QSizeF &, const QSizeF &) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR inline bool operator!=(const QSizeF &, const QSizeF &) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR inline const QSizeF operator+(const QSizeF &, const QSizeF &) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR inline const QSizeF operator-(const QSizeF &, const QSizeF &) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR inline const QSizeF operator*(const QSizeF &, qreal) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR inline const QSizeF operator*(qreal, const QSizeF &) Q_DECL_NOTHROW;
+    friend Q_DECL_CONSTEXPR inline bool operator==(const QSizeF &, const QSizeF &) noexcept;
+    friend Q_DECL_CONSTEXPR inline bool operator!=(const QSizeF &, const QSizeF &) noexcept;
+    friend Q_DECL_CONSTEXPR inline const QSizeF operator+(const QSizeF &, const QSizeF &) noexcept;
+    friend Q_DECL_CONSTEXPR inline const QSizeF operator-(const QSizeF &, const QSizeF &) noexcept;
+    friend Q_DECL_CONSTEXPR inline const QSizeF operator*(const QSizeF &, qreal) noexcept;
+    friend Q_DECL_CONSTEXPR inline const QSizeF operator*(qreal, const QSizeF &) noexcept;
     friend inline const QSizeF operator/(const QSizeF &, qreal);
 
-    Q_DECL_CONSTEXPR inline QSize toSize() const Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR inline QSize toSize() const noexcept;
 
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
-    Q_REQUIRED_RESULT static QSizeF fromCGSize(CGSize size) Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT CGSize toCGSize() const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT static QSizeF fromCGSize(CGSize size) noexcept;
+    Q_REQUIRED_RESULT CGSize toCGSize() const noexcept;
 #endif
 
 private:
@@ -282,76 +293,76 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QSizeF &);
   QSizeF inline functions
  *****************************************************************************/
 
-Q_DECL_CONSTEXPR inline QSizeF::QSizeF() Q_DECL_NOTHROW : wd(-1.), ht(-1.) {}
+Q_DECL_CONSTEXPR inline QSizeF::QSizeF() noexcept : wd(-1.), ht(-1.) {}
 
-Q_DECL_CONSTEXPR inline QSizeF::QSizeF(const QSize &sz) Q_DECL_NOTHROW : wd(sz.width()), ht(sz.height()) {}
+Q_DECL_CONSTEXPR inline QSizeF::QSizeF(const QSize &sz) noexcept : wd(sz.width()), ht(sz.height()) {}
 
-Q_DECL_CONSTEXPR inline QSizeF::QSizeF(qreal w, qreal h) Q_DECL_NOTHROW : wd(w), ht(h) {}
+Q_DECL_CONSTEXPR inline QSizeF::QSizeF(qreal w, qreal h) noexcept : wd(w), ht(h) {}
 
-inline bool QSizeF::isNull() const Q_DECL_NOTHROW
+inline bool QSizeF::isNull() const noexcept
 { return qIsNull(wd) && qIsNull(ht); }
 
-Q_DECL_CONSTEXPR inline bool QSizeF::isEmpty() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QSizeF::isEmpty() const noexcept
 { return wd <= 0. || ht <= 0.; }
 
-Q_DECL_CONSTEXPR inline bool QSizeF::isValid() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool QSizeF::isValid() const noexcept
 { return wd >= 0. && ht >= 0.; }
 
-Q_DECL_CONSTEXPR inline qreal QSizeF::width() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QSizeF::width() const noexcept
 { return wd; }
 
-Q_DECL_CONSTEXPR inline qreal QSizeF::height() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline qreal QSizeF::height() const noexcept
 { return ht; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QSizeF::setWidth(qreal w) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QSizeF::setWidth(qreal w) noexcept
 { wd = w; }
 
-Q_DECL_RELAXED_CONSTEXPR inline void QSizeF::setHeight(qreal h) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline void QSizeF::setHeight(qreal h) noexcept
 { ht = h; }
 
-Q_DECL_CONSTEXPR inline QSizeF QSizeF::transposed() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSizeF QSizeF::transposed() const noexcept
 { return QSizeF(ht, wd); }
 
-inline void QSizeF::scale(qreal w, qreal h, Qt::AspectRatioMode mode) Q_DECL_NOTHROW
+inline void QSizeF::scale(qreal w, qreal h, Qt::AspectRatioMode mode) noexcept
 { scale(QSizeF(w, h), mode); }
 
-inline void QSizeF::scale(const QSizeF &s, Qt::AspectRatioMode mode) Q_DECL_NOTHROW
+inline void QSizeF::scale(const QSizeF &s, Qt::AspectRatioMode mode) noexcept
 { *this = scaled(s, mode); }
 
-inline QSizeF QSizeF::scaled(qreal w, qreal h, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW
+inline QSizeF QSizeF::scaled(qreal w, qreal h, Qt::AspectRatioMode mode) const noexcept
 { return scaled(QSizeF(w, h), mode); }
 
-Q_DECL_RELAXED_CONSTEXPR inline qreal &QSizeF::rwidth() Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline qreal &QSizeF::rwidth() noexcept
 { return wd; }
 
-Q_DECL_RELAXED_CONSTEXPR inline qreal &QSizeF::rheight() Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline qreal &QSizeF::rheight() noexcept
 { return ht; }
 
-Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator+=(const QSizeF &s) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator+=(const QSizeF &s) noexcept
 { wd += s.wd; ht += s.ht; return *this; }
 
-Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator-=(const QSizeF &s) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator-=(const QSizeF &s) noexcept
 { wd -= s.wd; ht -= s.ht; return *this; }
 
-Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator*=(qreal c) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator*=(qreal c) noexcept
 { wd *= c; ht *= c; return *this; }
 
-Q_DECL_CONSTEXPR inline bool operator==(const QSizeF &s1, const QSizeF &s2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator==(const QSizeF &s1, const QSizeF &s2) noexcept
 { return qFuzzyCompare(s1.wd, s2.wd) && qFuzzyCompare(s1.ht, s2.ht); }
 
-Q_DECL_CONSTEXPR inline bool operator!=(const QSizeF &s1, const QSizeF &s2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator!=(const QSizeF &s1, const QSizeF &s2) noexcept
 { return !qFuzzyCompare(s1.wd, s2.wd) || !qFuzzyCompare(s1.ht, s2.ht); }
 
-Q_DECL_CONSTEXPR inline const QSizeF operator+(const QSizeF & s1, const QSizeF & s2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline const QSizeF operator+(const QSizeF & s1, const QSizeF & s2) noexcept
 { return QSizeF(s1.wd+s2.wd, s1.ht+s2.ht); }
 
-Q_DECL_CONSTEXPR inline const QSizeF operator-(const QSizeF &s1, const QSizeF &s2) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline const QSizeF operator-(const QSizeF &s1, const QSizeF &s2) noexcept
 { return QSizeF(s1.wd-s2.wd, s1.ht-s2.ht); }
 
-Q_DECL_CONSTEXPR inline const QSizeF operator*(const QSizeF &s, qreal c) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline const QSizeF operator*(const QSizeF &s, qreal c) noexcept
 { return QSizeF(s.wd*c, s.ht*c); }
 
-Q_DECL_CONSTEXPR inline const QSizeF operator*(qreal c, const QSizeF &s) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline const QSizeF operator*(qreal c, const QSizeF &s) noexcept
 { return QSizeF(s.wd*c, s.ht*c); }
 
 inline QSizeF &QSizeF::operator/=(qreal c)
@@ -367,17 +378,17 @@ inline const QSizeF operator/(const QSizeF &s, qreal c)
     return QSizeF(s.wd/c, s.ht/c);
 }
 
-Q_DECL_CONSTEXPR inline QSizeF QSizeF::expandedTo(const QSizeF & otherSize) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSizeF QSizeF::expandedTo(const QSizeF & otherSize) const noexcept
 {
     return QSizeF(qMax(wd,otherSize.wd), qMax(ht,otherSize.ht));
 }
 
-Q_DECL_CONSTEXPR inline QSizeF QSizeF::boundedTo(const QSizeF & otherSize) const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSizeF QSizeF::boundedTo(const QSizeF & otherSize) const noexcept
 {
     return QSizeF(qMin(wd,otherSize.wd), qMin(ht,otherSize.ht));
 }
 
-Q_DECL_CONSTEXPR inline QSize QSizeF::toSize() const Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline QSize QSizeF::toSize() const noexcept
 {
     return QSize(qRound(wd), qRound(ht));
 }
diff --git a/src/corelib/tools/qstack.h b/src/corelib/tools/qstack.h
index bf04935b50..e59212aa2a 100644
--- a/src/corelib/tools/qstack.h
+++ b/src/corelib/tools/qstack.h
@@ -50,7 +50,7 @@ class QStack : public QVector<T>
 {
 public:
     // compiler-generated special member functions are fine!
-    inline void swap(QStack<T> &other) Q_DECL_NOTHROW { QVector<T>::swap(other); } // prevent QVector<->QStack swaps
+    inline void swap(QStack<T> &other) noexcept { QVector<T>::swap(other); } // prevent QVector<->QStack swaps
     inline void push(const T &t) { QVector<T>::append(t); }
     T pop();
     T &top();
diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp
index fa6c45aa11..0b11e7c77b 100644
--- a/src/corelib/tools/qtimeline.cpp
+++ b/src/corelib/tools/qtimeline.cpp
@@ -526,29 +526,24 @@ QTimeLine::CurveShape QTimeLine::curveShape() const
     return EaseInOutCurve;
 }
 
-void QTimeLine::setCurveShape(CurveShape shape)
+static QEasingCurve::Type convert(QTimeLine::CurveShape shape)
 {
     switch (shape) {
-    default:
-    case EaseInOutCurve:
-        setEasingCurve(QEasingCurve(QEasingCurve::InOutSine));
-        break;
-    case EaseInCurve:
-        setEasingCurve(QEasingCurve(QEasingCurve::InCurve));
-        break;
-    case EaseOutCurve:
-        setEasingCurve(QEasingCurve(QEasingCurve::OutCurve));
-        break;
-    case LinearCurve:
-        setEasingCurve(QEasingCurve(QEasingCurve::Linear));
-        break;
-    case SineCurve:
-        setEasingCurve(QEasingCurve(QEasingCurve::SineCurve));
-        break;
-    case CosineCurve:
-        setEasingCurve(QEasingCurve(QEasingCurve::CosineCurve));
-        break;
+#define CASE(x, y) case QTimeLine::x: return QEasingCurve::y
+    CASE(EaseInOutCurve, InOutSine);
+    CASE(EaseInCurve,    InCurve);
+    CASE(EaseOutCurve,   OutCurve);
+    CASE(LinearCurve,    Linear);
+    CASE(SineCurve,      SineCurve);
+    CASE(CosineCurve,    CosineCurve);
+#undef CASE
     }
+    Q_UNREACHABLE();
+}
+
+void QTimeLine::setCurveShape(CurveShape shape)
+{
+    setEasingCurve(convert(shape));
 }
 
 /*!
diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h
index d9982bdb58..9a60cd679f 100644
--- a/src/corelib/tools/qtimeline.h
+++ b/src/corelib/tools/qtimeline.h
@@ -40,6 +40,10 @@
 #ifndef QTIMELINE_H
 #define QTIMELINE_H
 
+#include <QtCore/qglobal.h>
+
+QT_REQUIRE_CONFIG(easingcurve);
+
 #include <QtCore/qeasingcurve.h>
 #include <QtCore/qobject.h>
 
diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/tools/qtimezoneprivate_data_p.h
deleted file mode 100644
index 69b9417f19..0000000000
--- a/src/corelib/tools/qtimezoneprivate_data_p.h
+++ /dev/null
@@ -1,1154 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 John Layt <jlayt@kde.org>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QTIMEZONEPRIVATE_DATA_P_H
-#define QTIMEZONEPRIVATE_DATA_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of internal files.  This header file may change from version to version
-// without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/private/qglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*
-    Windows Zone ID support, included in default base class build so can be used on all platforms,
-    e.g. an app running on Linux may need to communicate with a Windows Outlook server.  These
-    tables can also be used to look-up Region Codes and UTC Offsets on platforms that don't directly
-    support them., e.g. Mac does not support availableTimeZones() filtering by region or offset.
-
-    Another data table is provided for generic UTC+00:00 format time zones to be used as a
-    fall-back if no system time zones are available (QT_NO_SYSTEMLOCALE is set) or for QDateTimes
-    with a QT:Spec of OffsetFromUTC
-
-    These tables are automatically adapted from the CLDR supplemental/windowsZones.xml data file
-    using a script in qtbase/util/local_database.  Please do not edit this data directly.  In the
-    future if ICU is made a hard dependency then the ICU resource can be used directly and this
-    table removed
-*/
-
-struct QZoneData {
-    quint16 windowsIdKey;      // Windows ID Key
-    quint16 country;           // Country of IANA ID's, AnyCountry means No Country
-    quint16 ianaIdIndex;      // All IANA ID's for the Windows ID and Country, space separated
-};
-
-struct QWindowsData {
-    quint16 windowsIdKey;      // Windows ID Key
-    quint16 windowsIdIndex;    // Windows ID Literal
-    quint16 ianaIdIndex;      // Default IANA ID for the Windows ID
-    qint32 offsetFromUtc;      // Standard Time Offset from UTC, used for quick look-ups
-};
-
-struct QUtcData {
-    quint16 ianaIdIndex;      // IANA ID's
-    qint32 offsetFromUtc;      // Offset form UTC is seconds
-};
-
-/*
-    COPYRIGHT AND PERMISSION NOTICE
-
-    Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under
-    the Terms of Use in http://www.unicode.org/copyright.html.
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of the Unicode data files and any associated documentation (the "Data
-    Files") or Unicode software and any associated documentation (the "Software")
-    to deal in the Data Files or Software without restriction, including without
-    limitation the rights to use, copy, modify, merge, publish, distribute, and/or
-    sell copies of the Data Files or Software, and to permit persons to whom the
-    Data Files or Software are furnished to do so, provided that (a) the above
-    copyright notice(s) and this permission notice appear with all copies of the
-    Data Files or Software, (b) both the above copyright notice(s) and this
-    permission notice appear in associated documentation, and (c) there is clear
-    notice in each modified Data File or in the Software as well as in the
-    documentation associated with the Data File(s) or Software that the data or
-    software has been modified.
-*/
-
-// GENERATED PART STARTS HERE
-
-/*
-    This part of the file was generated on 2017-05-23 from the
-    Common Locale Data Repository v29 supplemental/windowsZones.xml file $Revision: 12348 $
-
-    http://www.unicode.org/cldr/
-
-    Do not edit this code: run cldr2qtimezone.py on updated (or
-    edited) CLDR data; see qtbase/util/local_database/.
-*/
-
-// Windows ID Key, Country Enum, IANA ID Index
-static const QZoneData zoneDataTable[] = {
-    {     22,    57,     0 }, // Central Europe Standard Time / CzechRepublic
-    {     69,   139,    14 }, // Pacific Standard Time / Mexico
-    {     53,   188,    51 }, // Mauritius Standard Time / Seychelles
-    {     50,   122,    63 }, // Libya Standard Time / Libya
-    {     79,    38,    78 }, // SA Western Standard Time / Canada
-    {     83,    35,    99 }, // South Africa Standard Time / Burundi
-    {    102,   205,   116 }, // W. Europe Standard Time / Sweden
-    {     89,   213,   133 }, // Tonga Standard Time / Tokelau
-    {     77,    76,   149 }, // SA Eastern Standard Time / FrenchGuiana
-    {     79,   215,   165 }, // SA Western Standard Time / TrinidadAndTobago
-    {     69,    38,   187 }, // Pacific Standard Time / Canada
-    {     97,     0,   239 }, // UTC+12 / AnyCountry
-    {     19,    65,   250 }, // Central America Standard Time / ElSalvador
-    {     82,   101,   270 }, // Singapore Standard Time / Indonesia
-    {     37,   248,   284 }, // FLE Standard Time / AlandIslands
-    {     16,     0,   301 }, // Cape Verde Standard Time / AnyCountry
-    {     97,   220,   311 }, // UTC+12 / Tuvalu
-    {     79,   182,   328 }, // SA Western Standard Time / SaintVincentAndTheGrenadines
-    {     83,   179,   347 }, // South Africa Standard Time / Rwanda
-    {    102,   125,   361 }, // W. Europe Standard Time / Luxembourg
-    {     41,    34,   379 }, // Greenwich Standard Time / BurkinaFaso
-    {     20,   116,   398 }, // Central Asia Standard Time / Kyrgyzstan
-    {    101,   216,   411 }, // W. Central Africa Standard Time / Tunisia
-    {    101,    79,   424 }, // W. Central Africa Standard Time / Gabon
-    {     19,    96,   442 }, // Central America Standard Time / Honduras
-    {     81,    36,   462 }, // SE Asia Standard Time / Cambodia
-    {     82,   170,   478 }, // Singapore Standard Time / Philippines
-    {    101,    41,   490 }, // W. Central Africa Standard Time / CentralAfricanRepublic
-    {      5,   103,   504 }, // Arabic Standard Time / Iraq
-    {     72,    21,   517 }, // Romance Standard Time / Belgium
-    {     74,   178,   533 }, // Russia Time Zone 10 / Russia
-    {     20,    44,   552 }, // Central Asia Standard Time / China
-    {      3,    17,   564 }, // Arab Standard Time / Bahrain
-    {     88,    62,   577 }, // Tokyo Standard Time / EastTimor
-    {     37,    68,   587 }, // FLE Standard Time / Estonia
-    {     41,   136,   602 }, // Greenwich Standard Time / Mauritania
-    {     83,    49,   620 }, // South Africa Standard Time / CongoKinshasa
-    {     72,    74,   638 }, // Romance Standard Time / France
-    {     35,   178,   651 }, // Ekaterinburg Standard Time / Russia
-    {     32,    16,   670 }, // Eastern Standard Time / Bahamas
-    {     94,    30,   685 }, // UTC-02 / Brazil
-    {     12,    30,   701 }, // Bahia Standard Time / Brazil
-    {     82,     0,   715 }, // Singapore Standard Time / AnyCountry
-    {     29,   201,   725 }, // E. Africa Standard Time / Sudan
-    {     24,   229,   741 }, // Central Pacific Standard Time / Vanuatu
-    {     55,   227,   755 }, // Montevideo Standard Time / Uruguay
-    {     79,   233,   774 }, // SA Western Standard Time / BritishVirginIslands
-    {     29,   221,   790 }, // E. Africa Standard Time / Uganda
-    {    101,     6,   805 }, // W. Central Africa Standard Time / Angola
-    {     68,   141,   819 }, // E. Europe Standard Time / Moldova
-    {     51,   112,   835 }, // Line Islands Standard Time / Kiribati
-    {     89,     0,   854 }, // Tonga Standard Time / AnyCountry
-    {     79,    61,   865 }, // SA Western Standard Time / DominicanRepublic
-    {     39,    75,   887 }, // GMT Standard Time / Guernsey
-    {     37,   222,   903 }, // FLE Standard Time / Ukraine
-    {     83,    28,   949 }, // South Africa Standard Time / Botswana
-    {     82,   130,   965 }, // Singapore Standard Time / Malaysia
-    {     95,     4,   996 }, // UTC-11 / AmericanSamoa
-    {     41,   189,  1014 }, // Greenwich Standard Time / SierraLeone
-    {     29,   194,  1030 }, // E. Africa Standard Time / Somalia
-    {     94,   196,  1047 }, // UTC-02 / SouthGeorgiaAndTheSouthSandwichIslands
-    {     96,     0,  1070 }, // UTC / AnyCountry
-    {    101,    37,  1078 }, // W. Central Africa Standard Time / Cameroon
-    {     13,    25,  1092 }, // Bangladesh Standard Time / Bhutan
-    {    102,   151,  1105 }, // W. Europe Standard Time / Netherlands
-    {     37,   118,  1122 }, // FLE Standard Time / Latvia
-    {     29,    48,  1134 }, // E. Africa Standard Time / Comoros
-    {     60,   178,  1148 }, // N. Central Asia Standard Time / Russia
-    {     81,   117,  1175 }, // SE Asia Standard Time / Laos
-    {     22,   242,  1190 }, // Central Europe Standard Time / Montenegro
-    {     37,    33,  1207 }, // FLE Standard Time / Bulgaria
-    {     11,   173,  1220 }, // Azores Standard Time / Portugal
-    {     97,   149,  1236 }, // UTC+12 / Nauru
-    {     83,   146,  1250 }, // South Africa Standard Time / Mozambique
-    {    102,    82,  1264 }, // W. Europe Standard Time / Germany
-    {     79,   255,  1294 }, // SA Western Standard Time / Bonaire
-    {     24,   153,  1313 }, // Central Pacific Standard Time / NewCaledonia
-    {     45,   102,  1328 }, // Iran Standard Time / Iran
-    {     13,    18,  1340 }, // Bangladesh Standard Time / Bangladesh
-    {     69,   225,  1351 }, // Pacific Standard Time / UnitedStates
-    {    102,   142,  1371 }, // W. Europe Standard Time / Monaco
-    {     29,   128,  1385 }, // E. Africa Standard Time / Madagascar
-    {     65,   178,  1405 }, // North Asia East Standard Time / Russia
-    {     20,     8,  1418 }, // Central Asia Standard Time / Antarctica
-    {     22,     2,  1436 }, // Central Europe Standard Time / Albania
-    {     79,    87,  1450 }, // SA Western Standard Time / Grenada
-    {     81,     0,  1466 }, // SE Asia Standard Time / AnyCountry
-    {     39,   173,  1476 }, // GMT Standard Time / Portugal
-    {    103,   228,  1507 }, // West Asia Standard Time / Uzbekistan
-    {     58,   139,  1536 }, // Mountain Standard Time / Mexico
-    {     83,   129,  1552 }, // South Africa Standard Time / Malawi
-    {     78,   107,  1568 }, // SA Pacific Standard Time / Jamaica
-    {     41,    91,  1584 }, // Greenwich Standard Time / Guinea
-    {    101,    49,  1599 }, // W. Central Africa Standard Time / CongoKinshasa
-    {     43,   226,  1615 }, // Hawaiian Standard Time / UnitedStatesMinorOutlyingIslands
-    {     77,     8,  1632 }, // SA Eastern Standard Time / Antarctica
-    {     97,   235,  1651 }, // UTC+12 / WallisAndFutunaIslands
-    {     81,   232,  1666 }, // SE Asia Standard Time / Vietnam
-    {     34,    64,  1678 }, // Egypt Standard Time / Egypt
-    {    102,   106,  1691 }, // W. Europe Standard Time / Italy
-    {     79,   256,  1703 }, // SA Western Standard Time / SintMaarten
-    {     59,   147,  1725 }, // Myanmar Standard Time / Myanmar
-    {     78,   166,  1738 }, // SA Pacific Standard Time / Panama
-    {     56,   236,  1753 }, // Morocco Standard Time / WesternSahara
-    {     24,   193,  1769 }, // Central Pacific Standard Time / SolomonIslands
-    {     48,   178,  1789 }, // Kaliningrad Standard Time / Russia
-    {     47,   109,  1808 }, // Jordan Standard Time / Jordan
-    {     42,   177,  1819 }, // GTB Standard Time / Romania
-    {     41,    92,  1836 }, // Greenwich Standard Time / GuineaBissau
-    {    102,   184,  1850 }, // W. Europe Standard Time / SanMarino
-    {    103,   209,  1868 }, // West Asia Standard Time / Tajikistan
-    {     75,   178,  1882 }, // Russia Time Zone 11 / Russia
-    {    101,   157,  1909 }, // W. Central Africa Standard Time / Nigeria
-    {     79,   152,  1922 }, // SA Western Standard Time / CuraSao
-    {     57,   139,  1938 }, // Mountain Standard Time (Mexico) / Mexico
-    {      4,   162,  1973 }, // Arabian Standard Time / Oman
-    {     78,   169,  1985 }, // SA Pacific Standard Time / Peru
-    {    102,   206,  1998 }, // W. Europe Standard Time / Switzerland
-    {     41,    99,  2012 }, // Greenwich Standard Time / Iceland
-    {     33,   139,  2031 }, // Eastern Standard Time (Mexico) / Mexico
-    {     58,   225,  2046 }, // Mountain Standard Time / UnitedStates
-    {    100,     8,  2075 }, // W. Australia Standard Time / Antarctica
-    {     79,    30,  2092 }, // SA Western Standard Time / Brazil
-    {    101,    23,  2145 }, // W. Central Africa Standard Time / Benin
-    {     78,    43,  2163 }, // SA Pacific Standard Time / Chile
-    {    104,     0,  2178 }, // West Pacific Standard Time / AnyCountry
-    {     79,   181,  2189 }, // SA Western Standard Time / SaintLucia
-    {     27,   126,  2206 }, // China Standard Time / Macau
-    {    101,    66,  2217 }, // W. Central Africa Standard Time / EquatorialGuinea
-    {     43,    51,  2231 }, // Hawaiian Standard Time / CookIslands
-    {     41,    80,  2249 }, // Greenwich Standard Time / Gambia
-    {     51,     0,  2263 }, // Line Islands Standard Time / AnyCountry
-    {     52,   178,  2274 }, // Magadan Standard Time / Russia
-    {     22,   191,  2287 }, // Central Europe Standard Time / Slovakia
-    {    102,     5,  2305 }, // W. Europe Standard Time / Andorra
-    {     81,   211,  2320 }, // SE Asia Standard Time / Thailand
-    {    103,     0,  2333 }, // West Asia Standard Time / AnyCountry
-    {     24,   167,  2343 }, // Central Pacific Standard Time / PapuaNewGuinea
-    {    102,   230,  2364 }, // W. Europe Standard Time / VaticanCityState
-    {     58,    38,  2379 }, // Mountain Standard Time / Canada
-    {     77,   202,  2453 }, // SA Eastern Standard Time / Suriname
-    {      9,    13,  2472 }, // AUS Eastern Standard Time / Australia
-    {     29,   210,  2509 }, // E. Africa Standard Time / Tanzania
-    {     58,     0,  2530 }, // Mountain Standard Time / AnyCountry
-    {     83,   120,  2538 }, // South Africa Standard Time / Lesotho
-    {     97,   134,  2552 }, // UTC+12 / MarshallIslands
-    {     29,   111,  2585 }, // E. Africa Standard Time / Kenya
-    {    103,   218,  2600 }, // West Asia Standard Time / Turkmenistan
-    {     27,    97,  2614 }, // China Standard Time / HongKong
-    {     29,     0,  2629 }, // E. Africa Standard Time / AnyCountry
-    {     19,    22,  2639 }, // Central America Standard Time / Belize
-    {     31,    30,  2654 }, // E. South America Standard Time / Brazil
-    {     72,   197,  2672 }, // Romance Standard Time / Spain
-    {     81,   101,  2699 }, // SE Asia Standard Time / Indonesia
-    {     88,     0,  2727 }, // Tokyo Standard Time / AnyCountry
-    {      2,   225,  2737 }, // Alaskan Standard Time / UnitedStates
-    {     72,    58,  2832 }, // Romance Standard Time / Denmark
-    {     63,     8,  2850 }, // New Zealand Standard Time / Antarctica
-    {      3,   175,  2869 }, // Arab Standard Time / Qatar
-    {     79,   245,  2880 }, // SA Western Standard Time / Saint Martin
-    {     79,    19,  2896 }, // SA Western Standard Time / Barbados
-    {     97,   226,  2913 }, // UTC+12 / UnitedStatesMinorOutlyingIslands
-    {     37,    73,  2926 }, // FLE Standard Time / Finland
-    {     29,   138,  2942 }, // E. Africa Standard Time / Mayotte
-    {     39,    71,  2957 }, // GMT Standard Time / FaroeIslands
-    {     78,    38,  2973 }, // SA Pacific Standard Time / Canada
-    {     43,     0,  2995 }, // Hawaiian Standard Time / AnyCountry
-    {     23,    27,  3006 }, // Central European Standard Time / BosniaAndHerzegowina
-    {     38,    81,  3022 }, // Georgian Standard Time / Georgia
-    {     95,     0,  3035 }, // UTC-11 / AnyCountry
-    {     24,    13,  3046 }, // Central Pacific Standard Time / Australia
-    {    104,   167,  3067 }, // West Pacific Standard Time / PapuaNewGuinea
-    {     71,   168,  3088 }, // Paraguay Standard Time / Paraguay
-    {     43,    77,  3105 }, // Hawaiian Standard Time / FrenchPolynesia
-    {     41,   212,  3120 }, // Greenwich Standard Time / Togo
-    {     39,   197,  3132 }, // GMT Standard Time / Spain
-    {     83,   195,  3148 }, // South Africa Standard Time / SouthAfrica
-    {     18,    13,  3168 }, // Cen. Australia Standard Time / Australia
-    {    104,   160,  3209 }, // West Pacific Standard Time / NorthernMarianaIslands
-    {     77,    70,  3224 }, // SA Eastern Standard Time / FalklandIslands
-    {     42,    56,  3241 }, // GTB Standard Time / Cyprus
-    {      4,   223,  3254 }, // Arabian Standard Time / UnitedArabEmirates
-    {    103,    78,  3265 }, // West Asia Standard Time / FrenchSouthernTerritories
-    {    101,    42,  3282 }, // W. Central Africa Standard Time / Chad
-    {     23,   127,  3298 }, // Central European Standard Time / Macedonia
-    {      3,   237,  3312 }, // Arab Standard Time / Yemen
-    {     80,   183,  3322 }, // Samoa Standard Time / Samoa
-    {     43,   225,  3335 }, // Hawaiian Standard Time / UnitedStates
-    {     28,     0,  3352 }, // Dateline Standard Time / AnyCountry
-    {     93,   139,  3363 }, // US Mountain Standard Time / Mexico
-    {     64,    38,  3382 }, // Newfoundland Standard Time / Canada
-    {     63,   154,  3399 }, // New Zealand Standard Time / NewZealand
-    {     76,   178,  3416 }, // Russian Standard Time / Russia
-    {     82,   190,  3465 }, // Singapore Standard Time / Singapore
-    {      1,     1,  3480 }, // Afghanistan Standard Time / Afghanistan
-    {    102,   133,  3491 }, // W. Europe Standard Time / Malta
-    {     79,    12,  3504 }, // SA Western Standard Time / Aruba
-    {     25,   139,  3518 }, // Central Standard Time (Mexico) / Mexico
-    {     39,   251,  3594 }, // GMT Standard Time / IsleOfMan
-    {    102,   123,  3613 }, // W. Europe Standard Time / Liechtenstein
-    {     77,    30,  3626 }, // SA Eastern Standard Time / Brazil
-    {     49,   114,  3723 }, // Korea Standard Time / SouthKorea
-    {     79,    88,  3734 }, // SA Western Standard Time / Guadeloupe
-    {     94,     0,  3753 }, // UTC-02 / AnyCountry
-    {     59,    46,  3763 }, // Myanmar Standard Time / CocosIslands
-    {    102,   203,  3776 }, // W. Europe Standard Time / SvalbardAndJanMayenIslands
-    {     29,    69,  3796 }, // E. Africa Standard Time / Ethiopia
-    {     73,   178,  3815 }, // Russia Time Zone 3 / Russia
-    {     83,   240,  3829 }, // South Africa Standard Time / Zimbabwe
-    {    100,    13,  3843 }, // W. Australia Standard Time / Australia
-    {    101,     0,  3859 }, // W. Central Africa Standard Time / AnyCountry
-    {     32,    55,  3869 }, // Eastern Standard Time / Cuba
-    {     56,   145,  3884 }, // Morocco Standard Time / Morocco
-    {     17,    11,  3902 }, // Caucasus Standard Time / Armenia
-    {      7,    24,  3915 }, // Atlantic Standard Time / Bermuda
-    {     86,   208,  3932 }, // Taipei Standard Time / Taiwan
-    {     20,     0,  3944 }, // Central Asia Standard Time / AnyCountry
-    {     40,    86,  3954 }, // Greenland Standard Time / Greenland
-    {     23,   172,  3970 }, // Central European Standard Time / Poland
-    {     89,   214,  3984 }, // Tonga Standard Time / Tonga
-    {     20,   110,  4002 }, // Central Asia Standard Time / Kazakhstan
-    {     81,     8,  4029 }, // SE Asia Standard Time / Antarctica
-    {     54,   119,  4046 }, // Middle East Standard Time / Lebanon
-    {     19,    90,  4058 }, // Central America Standard Time / Guatemala
-    {     70,   163,  4076 }, // Pakistan Standard Time / Pakistan
-    {     41,    83,  4089 }, // Greenwich Standard Time / Ghana
-    {     79,   174,  4102 }, // SA Western Standard Time / PuertoRico
-    {     79,    26,  4122 }, // SA Western Standard Time / Bolivia
-    {     32,   225,  4137 }, // Eastern Standard Time / UnitedStates
-    {     85,   207,  4294 }, // Syria Standard Time / Syria
-    {     97,   112,  4308 }, // UTC+12 / Kiribati
-    {     79,     0,  4323 }, // SA Western Standard Time / AnyCountry
-    {     78,    47,  4333 }, // SA Pacific Standard Time / Colombia
-    {     16,    39,  4348 }, // Cape Verde Standard Time / CapeVerde
-    {      8,    13,  4368 }, // AUS Central Standard Time / Australia
-    {    106,   113,  4385 }, // North Korea Standard Time / NorthKorea
-    {     10,    15,  4400 }, // Azerbaijan Standard Time / Azerbaijan
-    {    102,    84,  4410 }, // W. Europe Standard Time / Gibraltar
-    {     46,   105,  4427 }, // Israel Standard Time / Israel
-    {     22,   192,  4442 }, // Central Europe Standard Time / Slovenia
-    {     24,   159,  4459 }, // Central Pacific Standard Time / NorfolkIsland
-    {     82,    32,  4475 }, // Singapore Standard Time / Brunei
-    {    101,    50,  4487 }, // W. Central Africa Standard Time / CongoBrazzaville
-    {     62,   150,  4506 }, // Nepal Standard Time / Nepal
-    {     44,   100,  4520 }, // India Standard Time / India
-    {     79,     9,  4534 }, // SA Western Standard Time / AntiguaAndBarbuda
-    {     39,   252,  4550 }, // GMT Standard Time / Jersey
-    {     79,   144,  4564 }, // SA Western Standard Time / Montserrat
-    {     93,     0,  4583 }, // US Mountain Standard Time / AnyCountry
-    {     79,    93,  4593 }, // SA Western Standard Time / Guyana
-    {     41,   187,  4608 }, // Greenwich Standard Time / Senegal
-    {    102,   161,  4621 }, // W. Europe Standard Time / Norway
-    {     42,    85,  4633 }, // GTB Standard Time / Greece
-    {      3,   115,  4647 }, // Arab Standard Time / Kuwait
-    {     24,   140,  4659 }, // Central Pacific Standard Time / Micronesia
-    {     19,    52,  4689 }, // Central America Standard Time / CostaRica
-    {     79,    60,  4708 }, // SA Western Standard Time / Dominica
-    {     83,   204,  4725 }, // South Africa Standard Time / Swaziland
-    {     79,   135,  4740 }, // SA Western Standard Time / Martinique
-    {     53,   176,  4759 }, // Mauritius Standard Time / Reunion
-    {     19,     0,  4774 }, // Central America Standard Time / AnyCountry
-    {     90,   217,  4784 }, // Turkey Standard Time / Turkey
-    {     66,   178,  4800 }, // North Asia Standard Time / Russia
-    {     41,    53,  4835 }, // Greenwich Standard Time / IvoryCoast
-    {     78,    30,  4850 }, // SA Pacific Standard Time / Brazil
-    {     26,     0,  4886 }, // Central Standard Time / AnyCountry
-    {     93,   225,  4894 }, // US Mountain Standard Time / UnitedStates
-    {     15,    38,  4910 }, // Canada Central Standard Time / Canada
-    {     78,     0,  4947 }, // SA Pacific Standard Time / AnyCountry
-    {    103,     8,  4957 }, // West Asia Standard Time / Antarctica
-    {    103,   131,  4975 }, // West Asia Standard Time / Maldives
-    {     22,   243,  4991 }, // Central Europe Standard Time / Serbia
-    {     29,    67,  5007 }, // E. Africa Standard Time / Eritrea
-    {     93,    38,  5021 }, // US Mountain Standard Time / Canada
-    {     22,    98,  5078 }, // Central Europe Standard Time / Hungary
-    {     61,   148,  5094 }, // Namibia Standard Time / Namibia
-    {     88,   101,  5110 }, // Tokyo Standard Time / Indonesia
-    {     30,    13,  5124 }, // E. Australia Standard Time / Australia
-    {      4,     0,  5162 }, // Arabian Standard Time / AnyCountry
-    {     98,   231,  5172 }, // Venezuela Standard Time / Venezuela
-    {     29,     8,  5188 }, // E. Africa Standard Time / Antarctica
-    {     23,    54,  5205 }, // Central European Standard Time / Croatia
-    {      6,    10,  5219 }, // Argentina Standard Time / Argentina
-    {     67,     8,  5492 }, // Pacific SA Standard Time / Antarctica
-    {     32,    38,  5510 }, // Eastern Standard Time / Canada
-    {     41,   132,  5615 }, // Greenwich Standard Time / Mali
-    {      3,   186,  5629 }, // Arab Standard Time / SaudiArabia
-    {    104,   140,  5641 }, // West Pacific Standard Time / Micronesia
-    {     88,   108,  5654 }, // Tokyo Standard Time / Japan
-    {     89,   112,  5665 }, // Tonga Standard Time / Kiribati
-    {     39,   224,  5683 }, // GMT Standard Time / UnitedKingdom
-    {     92,   225,  5697 }, // US Eastern Standard Time / UnitedStates
-    {     84,   198,  5764 }, // Sri Lanka Standard Time / SriLanka
-    {     26,    38,  5777 }, // Central Standard Time / Canada
-    {     29,    59,  5852 }, // E. Africa Standard Time / Djibouti
-    {      7,    38,  5868 }, // Atlantic Standard Time / Canada
-    {     41,   185,  5936 }, // Greenwich Standard Time / SaoTomeAndPrincipe
-    {     79,   234,  5952 }, // SA Western Standard Time / UnitedStatesVirginIslands
-    {     83,   239,  5970 }, // South Africa Standard Time / Zambia
-    {     32,    94,  5984 }, // Eastern Standard Time / Haiti
-    {    101,   156,  6007 }, // W. Central Africa Standard Time / Niger
-    {     77,     0,  6021 }, // SA Eastern Standard Time / AnyCountry
-    {    101,     3,  6031 }, // W. Central Africa Standard Time / Algeria
-    {     78,    63,  6046 }, // SA Pacific Standard Time / Ecuador
-    {     20,    31,  6064 }, // Central Asia Standard Time / BritishIndianOceanTerritory
-    {     27,    44,  6078 }, // China Standard Time / China
-    {     21,    30,  6092 }, // Central Brazilian Standard Time / Brazil
-    {     95,   226,  6128 }, // UTC-11 / UnitedStatesMinorOutlyingIslands
-    {     32,     0,  6143 }, // Eastern Standard Time / AnyCountry
-    {     81,    45,  6151 }, // SE Asia Standard Time / ChristmasIsland
-    {     19,    63,  6168 }, // Central America Standard Time / Ecuador
-    {     79,     7,  6186 }, // SA Western Standard Time / Anguilla
-    {     78,    40,  6203 }, // SA Pacific Standard Time / CaymanIslands
-    {     79,   180,  6218 }, // SA Western Standard Time / SaintKittsAndNevis
-    {     67,    43,  6235 }, // Pacific SA Standard Time / Chile
-    {     88,   164,  6252 }, // Tokyo Standard Time / Palau
-    {    105,   178,  6266 }, // Yakutsk Standard Time / Russia
-    {     37,   124,  6304 }, // FLE Standard Time / Lithuania
-    {     41,   121,  6319 }, // Greenwich Standard Time / Liberia
-    {    104,    89,  6335 }, // West Pacific Standard Time / Guam
-    {     96,    86,  6348 }, // UTC / Greenland
-    {     36,    72,  6369 }, // Fiji Standard Time / Fiji
-    {     19,   155,  6382 }, // Central America Standard Time / Nicaragua
-    {     11,    86,  6398 }, // Azores Standard Time / Greenland
-    {     79,   244,  6419 }, // SA Western Standard Time / Saint Barthelemy
-    {     69,     0,  6441 }, // Pacific Standard Time / AnyCountry
-    {     79,   219,  6449 }, // SA Western Standard Time / TurksAndCaicosIslands
-    {    103,   110,  6468 }, // West Asia Standard Time / Kazakhstan
-    {     26,   225,  6501 }, // Central Standard Time / UnitedStates
-    {     26,   139,  6669 }, // Central Standard Time / Mexico
-    {      7,    86,  6687 }, // Atlantic Standard Time / Greenland
-    {     24,     0,  6701 }, // Central Pacific Standard Time / AnyCountry
-    {     41,   199,  6712 }, // Greenwich Standard Time / SaintHelena
-    {     95,   158,  6731 }, // UTC-11 / Niue
-    {     53,   137,  6744 }, // Mauritius Standard Time / Mauritius
-    {     91,   143,  6761 }, // Ulaanbaatar Standard Time / Mongolia
-    {     83,     0,  6794 }, // South Africa Standard Time / AnyCountry
-    {     14,    20,  6804 }, // Belarus Standard Time / Belarus
-    {     29,   254,  6817 }, // E. Africa Standard Time / SouthSudan
-    {     87,    13,  6829 }, // Tasmania Standard Time / Australia
-    {     99,   178,  6863 }, // Vladivostok Standard Time / Russia
-    {    104,     8,  6908 }, // West Pacific Standard Time / Antarctica
-    {     39,   104,  6934 }, // GMT Standard Time / Ireland
-    {    102,    14,  6948 }, // W. Europe Standard Time / Austria
-    {      0,     0,     0 } // Trailing zeroes
-};
-
-// Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset
-static const QWindowsData windowsDataTable[] = {
-    {      1,     0,  3480, 16200 }, // Afghanistan Standard Time
-    {      2,    26,  6962,-32400 }, // Alaskan Standard Time
-    {      3,    48,  5629, 10800 }, // Arab Standard Time
-    {      4,    67,  3254, 14400 }, // Arabian Standard Time
-    {      5,    89,   504, 10800 }, // Arabic Standard Time
-    {      6,   110,  6980,-10800 }, // Argentina Standard Time
-    {      7,   134,  7001,-14400 }, // Atlantic Standard Time
-    {      8,   157,  4368, 34200 }, // AUS Central Standard Time
-    {      9,   183,  7017, 36000 }, // AUS Eastern Standard Time
-    {     10,   209,  4400, 14400 }, // Azerbaijan Standard Time
-    {     11,   234,  1220, -3600 }, // Azores Standard Time
-    {     12,   255,   701,-10800 }, // Bahia Standard Time
-    {     13,   275,  1340, 21600 }, // Bangladesh Standard Time
-    {     14,   300,  6804, 10800 }, // Belarus Standard Time
-    {     15,   322,  7034,-21600 }, // Canada Central Standard Time
-    {     16,   351,  4348, -3600 }, // Cape Verde Standard Time
-    {     17,   376,  3902, 14400 }, // Caucasus Standard Time
-    {     18,   399,  7049, 34200 }, // Cen. Australia Standard Time
-    {     19,   428,  4058,-21600 }, // Central America Standard Time
-    {     20,   458,  7068, 21600 }, // Central Asia Standard Time
-    {     21,   485,  7080,-14400 }, // Central Brazilian Standard Time
-    {     22,   517,  5078,  3600 }, // Central Europe Standard Time
-    {     23,   546,  3970,  3600 }, // Central European Standard Time
-    {     24,   577,  1769, 39600 }, // Central Pacific Standard Time
-    {     25,   607,  7095,-21600 }, // Central Standard Time (Mexico)
-    {     26,   638,  7115,-21600 }, // Central Standard Time
-    {     27,   660,  6078, 28800 }, // China Standard Time
-    {     28,   680,  3352,-43200 }, // Dateline Standard Time
-    {     29,   703,  2585, 10800 }, // E. Africa Standard Time
-    {     30,   727,  7131, 36000 }, // E. Australia Standard Time
-    {     31,   754,  2654,-10800 }, // E. South America Standard Time
-    {     32,   785,  7150,-18000 }, // Eastern Standard Time
-    {     33,   807,  2031,-18000 }, // Eastern Standard Time (Mexico)
-    {     34,   838,  1678,  7200 }, // Egypt Standard Time
-    {     35,   858,   651, 18000 }, // Ekaterinburg Standard Time
-    {     36,   885,  6369, 43200 }, // Fiji Standard Time
-    {     37,   904,  7167,  7200 }, // FLE Standard Time
-    {     38,   922,  3022, 14400 }, // Georgian Standard Time
-    {     39,   945,  5683,     0 }, // GMT Standard Time
-    {     40,   963,  3954,-10800 }, // Greenland Standard Time
-    {     41,   987,  2012,     0 }, // Greenwich Standard Time
-    {     42,  1011,  1819,  7200 }, // GTB Standard Time
-    {     43,  1029,  3335,-36000 }, // Hawaiian Standard Time
-    {     44,  1052,  4520, 19800 }, // India Standard Time
-    {     45,  1072,  1328, 12600 }, // Iran Standard Time
-    {     46,  1091,  4427,  7200 }, // Israel Standard Time
-    {     47,  1112,  1808,  7200 }, // Jordan Standard Time
-    {     48,  1133,  1789,  7200 }, // Kaliningrad Standard Time
-    {     49,  1159,  3723, 32400 }, // Korea Standard Time
-    {     50,  1179,    63,  7200 }, // Libya Standard Time
-    {     51,  1199,   835, 50400 }, // Line Islands Standard Time
-    {     52,  1226,  2274, 36000 }, // Magadan Standard Time
-    {     53,  1248,  6744, 14400 }, // Mauritius Standard Time
-    {     54,  1272,  4046,  7200 }, // Middle East Standard Time
-    {     55,  1298,   755,-10800 }, // Montevideo Standard Time
-    {     56,  1323,  3884,     0 }, // Morocco Standard Time
-    {     57,  1345,  7179,-25200 }, // Mountain Standard Time (Mexico)
-    {     58,  1377,  7197,-25200 }, // Mountain Standard Time
-    {     59,  1400,  1725, 23400 }, // Myanmar Standard Time
-    {     60,  1422,  7212, 21600 }, // N. Central Asia Standard Time
-    {     61,  1452,  5094,  3600 }, // Namibia Standard Time
-    {     62,  1474,  4506, 20700 }, // Nepal Standard Time
-    {     63,  1494,  3399, 43200 }, // New Zealand Standard Time
-    {     64,  1520,  3382,-12600 }, // Newfoundland Standard Time
-    {     65,  1547,  1405, 28800 }, // North Asia East Standard Time
-    {     66,  1577,  7229, 25200 }, // North Asia Standard Time
-    {     67,  1602,  6235,-10800 }, // Pacific SA Standard Time
-    {     68,  1627,   819,  7200 }, // E. Europe Standard Time
-    {     69,  1651,  1351,-28800 }, // Pacific Standard Time
-    {     70,  1673,  4076, 18000 }, // Pakistan Standard Time
-    {     71,  1696,  3088,-14400 }, // Paraguay Standard Time
-    {     72,  1719,   638,  3600 }, // Romance Standard Time
-    {     73,  1741,  3815, 14400 }, // Russia Time Zone 3
-    {     74,  1760,   533, 39600 }, // Russia Time Zone 10
-    {     75,  1780,  7246, 43200 }, // Russia Time Zone 11
-    {     76,  1800,  7261, 10800 }, // Russian Standard Time
-    {     77,  1822,   149,-10800 }, // SA Eastern Standard Time
-    {     78,  1847,  4333,-18000 }, // SA Pacific Standard Time
-    {     79,  1872,  4122,-14400 }, // SA Western Standard Time
-    {     80,  1897,  3322, 46800 }, // Samoa Standard Time
-    {     81,  1917,  2320, 25200 }, // SE Asia Standard Time
-    {     82,  1939,  3465, 28800 }, // Singapore Standard Time
-    {     83,  1963,  3148,  7200 }, // South Africa Standard Time
-    {     84,  1990,  5764, 19800 }, // Sri Lanka Standard Time
-    {     85,  2014,  4294,  7200 }, // Syria Standard Time
-    {     86,  2034,  3932, 28800 }, // Taipei Standard Time
-    {     87,  2055,  7275, 36000 }, // Tasmania Standard Time
-    {     88,  2078,  5654, 32400 }, // Tokyo Standard Time
-    {     89,  2098,  3984, 46800 }, // Tonga Standard Time
-    {     90,  2118,  4784,  7200 }, // Turkey Standard Time
-    {     91,  2139,  7292, 28800 }, // Ulaanbaatar Standard Time
-    {     92,  2165,  7309,-18000 }, // US Eastern Standard Time
-    {     93,  2190,  4894,-25200 }, // US Mountain Standard Time
-    {     94,  2216,  3753, -7200 }, // UTC-02
-    {     95,  2223,  3035,-39600 }, // UTC-11
-    {     96,  2230,  1070,     0 }, // UTC
-    {     97,  2234,   239, 43200 }, // UTC+12
-    {     98,  2241,  5172,-16200 }, // Venezuela Standard Time
-    {     99,  2265,  7330, 36000 }, // Vladivostok Standard Time
-    {    100,  2291,  3843, 28800 }, // W. Australia Standard Time
-    {    101,  2318,  1909,  3600 }, // W. Central Africa Standard Time
-    {    102,  2350,  7347,  3600 }, // W. Europe Standard Time
-    {    103,  2374,  7361, 18000 }, // West Asia Standard Time
-    {    104,  2398,  3067, 36000 }, // West Pacific Standard Time
-    {    105,  2425,  7375, 32400 }, // Yakutsk Standard Time
-    {    106,  2447,  4385, 30600 }, // North Korea Standard Time
-    {      0,     0,     0,     0 } // Trailing zeroes
-};
-
-// IANA ID Index, UTC Offset
-static const QUtcData utcDataTable[] = {
-    {   7388,     0 }, // UTC
-    {   7392,-50400 }, // UTC-14:00
-    {   7402,-46800 }, // UTC-13:00
-    {   7412,-43200 }, // UTC-12:00
-    {   7422,-39600 }, // UTC-11:00
-    {   7432,-36000 }, // UTC-10:00
-    {   7442,-32400 }, // UTC-09:00
-    {   7452,-28800 }, // UTC-08:00
-    {   7462,-25200 }, // UTC-07:00
-    {   7472,-21600 }, // UTC-06:00
-    {   7482,-18000 }, // UTC-05:00
-    {   7492,-16200 }, // UTC-04:30
-    {   7502,-14400 }, // UTC-04:00
-    {   7512,-12600 }, // UTC-03:30
-    {   7522,-10800 }, // UTC-03:00
-    {   7532, -7200 }, // UTC-02:00
-    {   7542, -3600 }, // UTC-01:00
-    {   7552,     0 }, // UTC-00:00
-    {   7562,     0 }, // UTC+00:00
-    {   7572,  3600 }, // UTC+01:00
-    {   7582,  7200 }, // UTC+02:00
-    {   7592, 10800 }, // UTC+03:00
-    {   7602, 12600 }, // UTC+03:30
-    {   7612, 14400 }, // UTC+04:00
-    {   7622, 16200 }, // UTC+04:30
-    {   7632, 18000 }, // UTC+05:00
-    {   7642, 19800 }, // UTC+05:30
-    {   7652, 20700 }, // UTC+05:45
-    {   7662, 21600 }, // UTC+06:00
-    {   7672, 23400 }, // UTC+06:30
-    {   7682, 25200 }, // UTC+07:00
-    {   7692, 28800 }, // UTC+08:00
-    {   7702, 32400 }, // UTC+09:00
-    {   7712, 34200 }, // UTC+09:30
-    {   7722, 36000 }, // UTC+10:00
-    {   7732, 39600 }, // UTC+11:00
-    {   7742, 43200 }, // UTC+12:00
-    {   7752, 46800 }, // UTC+13:00
-    {   7762, 50400 }, // UTC+14:00
-    {   7772, 30600 }, // UTC+08:30
-    {     0,      0 } // Trailing zeroes
-};
-
-static const char windowsIdData[] = {
-0x41, 0x66, 0x67, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
-0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x61, 0x73, 0x6b, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
-0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
-0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e,
-0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x20,
-0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74,
-0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x55, 0x53,
-0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
-0x6d, 0x65, 0x0, 0x41, 0x55, 0x53, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
-0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x7a, 0x65, 0x72, 0x62, 0x61, 0x69, 0x6a, 0x61, 0x6e, 0x20,
-0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x7a, 0x6f, 0x72, 0x65, 0x73,
-0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x61, 0x68, 0x69, 0x61,
-0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x61, 0x6e, 0x67, 0x6c,
-0x61, 0x64, 0x65, 0x73, 0x68, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
-0x42, 0x65, 0x6c, 0x61, 0x72, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
-0x65, 0x0, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x61, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61,
-0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x61, 0x70, 0x65, 0x20, 0x56, 0x65, 0x72, 0x64,
-0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x61, 0x75, 0x63,
-0x61, 0x73, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43,
-0x65, 0x6e, 0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
-0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65,
-0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
-0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x42, 0x72, 0x61, 0x7a, 0x69, 0x6c, 0x69,
-0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e,
-0x74, 0x72, 0x61, 0x6c, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
-0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65,
-0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e,
-0x74, 0x72, 0x61, 0x6c, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
-0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, 0x0, 0x43, 0x65,
-0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
-0x43, 0x68, 0x69, 0x6e, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
-0x44, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
-0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20,
-0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x53, 0x6f, 0x75,
-0x74, 0x68, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
-0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
-0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, 0x0, 0x45, 0x67,
-0x79, 0x70, 0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x6b,
-0x61, 0x74, 0x65, 0x72, 0x69, 0x6e, 0x62, 0x75, 0x72, 0x67, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
-0x54, 0x69, 0x6d, 0x65, 0x0, 0x46, 0x69, 0x6a, 0x69, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54,
-0x69, 0x6d, 0x65, 0x0, 0x46, 0x4c, 0x45, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
-0x65, 0x0, 0x47, 0x65, 0x6f, 0x72, 0x67, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
-0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x4d, 0x54, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
-0x6d, 0x65, 0x0, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x77, 0x69, 0x63, 0x68, 0x20, 0x53, 0x74, 0x61,
-0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x54, 0x42, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64,
-0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x48, 0x61, 0x77, 0x61, 0x69, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74,
-0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x20, 0x53, 0x74,
-0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x72, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61,
-0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c, 0x20, 0x53, 0x74,
-0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4a, 0x6f, 0x72, 0x64, 0x61, 0x6e, 0x20, 0x53,
-0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4b, 0x61, 0x6c, 0x69, 0x6e, 0x69, 0x6e,
-0x67, 0x72, 0x61, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4b,
-0x6f, 0x72, 0x65, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4c,
-0x69, 0x62, 0x79, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4c,
-0x69, 0x6e, 0x65, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64,
-0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x67, 0x61, 0x64, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
-0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x20, 0x53, 0x74,
-0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x45,
-0x61, 0x73, 0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x6f,
-0x6e, 0x74, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
-0x6d, 0x65, 0x0, 0x4d, 0x6f, 0x72, 0x6f, 0x63, 0x63, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
-0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61,
-0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, 0x0, 0x4d, 0x6f, 0x75,
-0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
-0x4d, 0x79, 0x61, 0x6e, 0x6d, 0x61, 0x72, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
-0x65, 0x0, 0x4e, 0x2e, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74,
-0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x20,
-0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x70, 0x61, 0x6c, 0x20,
-0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65,
-0x61, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0,
-0x4e, 0x65, 0x77, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x45, 0x61,
-0x73, 0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72,
-0x74, 0x68, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
-0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x41, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61,
-0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53,
-0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61,
-0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x72, 0x61,
-0x67, 0x75, 0x61, 0x79, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x52,
-0x6f, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65,
-0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x33, 0x0,
-0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x31, 0x30, 0x0,
-0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x31, 0x31, 0x0,
-0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d,
-0x65, 0x0, 0x53, 0x41, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x41, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74,
-0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x41, 0x20, 0x57, 0x65, 0x73, 0x74, 0x65,
-0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61, 0x6d,
-0x6f, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x45, 0x20,
-0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53,
-0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
-0x6d, 0x65, 0x0, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e,
-0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x72, 0x69, 0x20, 0x4c, 0x61, 0x6e, 0x6b, 0x61, 0x20,
-0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x79, 0x72, 0x69, 0x61, 0x20,
-0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x61, 0x69, 0x70, 0x65, 0x69,
-0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x61, 0x73, 0x6d, 0x61,
-0x6e, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f,
-0x6b, 0x79, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f,
-0x6e, 0x67, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x75,
-0x72, 0x6b, 0x65, 0x79, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55,
-0x6c, 0x61, 0x61, 0x6e, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
-0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x53, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e,
-0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x53, 0x20, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69,
-0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x54, 0x43, 0x2d,
-0x30, 0x32, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x31, 0x0, 0x55, 0x54, 0x43, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x32,
-0x0, 0x56, 0x65, 0x6e, 0x65, 0x7a, 0x75, 0x65, 0x6c, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
-0x54, 0x69, 0x6d, 0x65, 0x0, 0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x20, 0x53, 0x74, 0x61,
-0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61,
-0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e,
-0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e,
-0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20,
-0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, 0x73, 0x74, 0x20, 0x41,
-0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65,
-0x73, 0x74, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20,
-0x54, 0x69, 0x6d, 0x65, 0x0, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72,
-0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x4b, 0x6f, 0x72, 0x65, 0x61, 0x20, 0x53,
-0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0
-};
-
-static const char ianaIdData[] = {
-0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x72, 0x61, 0x67, 0x75, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x54, 0x69, 0x6a, 0x75, 0x61, 0x6e, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61,
-0x6e, 0x74, 0x61, 0x5f, 0x49, 0x73, 0x61, 0x62, 0x65, 0x6c, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61,
-0x68, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x72, 0x69, 0x70, 0x6f, 0x6c, 0x69, 0x0, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6c, 0x61, 0x6e, 0x63, 0x2d, 0x53, 0x61, 0x62, 0x6c, 0x6f, 0x6e, 0x0, 0x41,
-0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x6a, 0x75, 0x6d, 0x62, 0x75, 0x72, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f,
-0x70, 0x65, 0x2f, 0x53, 0x74, 0x6f, 0x63, 0x6b, 0x68, 0x6f, 0x6c, 0x6d, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
-0x2f, 0x46, 0x61, 0x6b, 0x61, 0x6f, 0x66, 0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x79,
-0x65, 0x6e, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x5f, 0x6f, 0x66,
-0x5f, 0x53, 0x70, 0x61, 0x69, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x56, 0x61, 0x6e, 0x63, 0x6f,
-0x75, 0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x20,
-0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x68, 0x69, 0x74, 0x65, 0x68, 0x6f, 0x72, 0x73, 0x65, 0x0, 0x45,
-0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x32, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, 0x6c,
-0x5f, 0x53, 0x61, 0x6c, 0x76, 0x61, 0x64, 0x6f, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x61, 0x6b, 0x61, 0x73,
-0x73, 0x61, 0x72, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x61, 0x72, 0x69, 0x65, 0x68, 0x61, 0x6d, 0x6e,
-0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x46,
-0x75, 0x6e, 0x61, 0x66, 0x75, 0x74, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x56,
-0x69, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x69, 0x67, 0x61, 0x6c, 0x69,
-0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x6f, 0x75, 0x72, 0x67, 0x0, 0x41,
-0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4f, 0x75, 0x61, 0x67, 0x61, 0x64, 0x6f, 0x75, 0x67, 0x6f, 0x75, 0x0, 0x41, 0x73,
-0x69, 0x61, 0x2f, 0x42, 0x69, 0x73, 0x68, 0x6b, 0x65, 0x6b, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x75,
-0x6e, 0x69, 0x73, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x69, 0x62, 0x72, 0x65, 0x76, 0x69, 0x6c, 0x6c,
-0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x65, 0x67, 0x75, 0x63, 0x69, 0x67, 0x61, 0x6c, 0x70,
-0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x68, 0x6e, 0x6f, 0x6d, 0x5f, 0x50, 0x65, 0x6e, 0x68, 0x0, 0x41, 0x73,
-0x69, 0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x69, 0x6c, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x6e,
-0x67, 0x75, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x67, 0x68, 0x64, 0x61, 0x64, 0x0, 0x45, 0x75, 0x72,
-0x6f, 0x70, 0x65, 0x2f, 0x42, 0x72, 0x75, 0x73, 0x73, 0x65, 0x6c, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x72,
-0x65, 0x64, 0x6e, 0x65, 0x6b, 0x6f, 0x6c, 0x79, 0x6d, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x72, 0x75,
-0x6d, 0x71, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x72, 0x61, 0x69, 0x6e, 0x0, 0x41, 0x73, 0x69,
-0x61, 0x2f, 0x44, 0x69, 0x6c, 0x69, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x54, 0x61, 0x6c, 0x6c, 0x69, 0x6e,
-0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x75, 0x61, 0x6b, 0x63, 0x68, 0x6f, 0x74, 0x74, 0x0,
-0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x62, 0x75, 0x6d, 0x62, 0x61, 0x73, 0x68, 0x69, 0x0, 0x45, 0x75,
-0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x61, 0x72, 0x69, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x65, 0x6b, 0x61,
-0x74, 0x65, 0x72, 0x69, 0x6e, 0x62, 0x75, 0x72, 0x67, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x61,
-0x73, 0x73, 0x61, 0x75, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x6f, 0x6e, 0x68, 0x61,
-0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x69, 0x61, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47,
-0x4d, 0x54, 0x2d, 0x38, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x68, 0x61, 0x72, 0x74, 0x6f, 0x75, 0x6d,
-0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x66, 0x61, 0x74, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x54, 0x6f, 0x72, 0x74, 0x6f, 0x6c, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x61, 0x6d,
-0x70, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x61, 0x6e, 0x64, 0x61, 0x0, 0x45,
-0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x43, 0x68, 0x69, 0x73, 0x69, 0x6e, 0x61, 0x75, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66,
-0x69, 0x63, 0x2f, 0x4b, 0x69, 0x72, 0x69, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d,
-0x54, 0x2d, 0x31, 0x33, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x6f, 0x5f, 0x44,
-0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x47, 0x75, 0x65, 0x72, 0x6e, 0x73,
-0x65, 0x79, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x69, 0x65, 0x76, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70,
-0x65, 0x2f, 0x55, 0x7a, 0x68, 0x67, 0x6f, 0x72, 0x6f, 0x64, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x61,
-0x70, 0x6f, 0x72, 0x6f, 0x7a, 0x68, 0x79, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x61, 0x62, 0x6f,
-0x72, 0x6f, 0x6e, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x61, 0x6c, 0x61, 0x5f, 0x4c, 0x75, 0x6d, 0x70,
-0x75, 0x72, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x0, 0x50, 0x61, 0x63, 0x69,
-0x66, 0x69, 0x63, 0x2f, 0x50, 0x61, 0x67, 0x6f, 0x5f, 0x50, 0x61, 0x67, 0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61,
-0x2f, 0x46, 0x72, 0x65, 0x65, 0x74, 0x6f, 0x77, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x67,
-0x61, 0x64, 0x69, 0x73, 0x68, 0x75, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x53, 0x6f, 0x75, 0x74,
-0x68, 0x5f, 0x47, 0x65, 0x6f, 0x72, 0x67, 0x69, 0x61, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x0, 0x41, 0x66,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x6f, 0x75, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x68, 0x69,
-0x6d, 0x70, 0x68, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x6d, 0x73, 0x74, 0x65, 0x72, 0x64, 0x61,
-0x6d, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x52, 0x69, 0x67, 0x61, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e,
-0x2f, 0x43, 0x6f, 0x6d, 0x6f, 0x72, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x76, 0x6f, 0x73, 0x69, 0x62,
-0x69, 0x72, 0x73, 0x6b, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4f, 0x6d, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f,
-0x56, 0x69, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6e, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x6f, 0x64,
-0x67, 0x6f, 0x72, 0x69, 0x63, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x6f, 0x66, 0x69, 0x61, 0x0,
-0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x41, 0x7a, 0x6f, 0x72, 0x65, 0x73, 0x0, 0x50, 0x61, 0x63, 0x69,
-0x66, 0x69, 0x63, 0x2f, 0x4e, 0x61, 0x75, 0x72, 0x75, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x70,
-0x75, 0x74, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x20, 0x45, 0x75,
-0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x65, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x4b, 0x72, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x69, 0x6a, 0x6b, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
-0x2f, 0x4e, 0x6f, 0x75, 0x6d, 0x65, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x65, 0x68, 0x72, 0x61, 0x6e, 0x0,
-0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x68, 0x61, 0x6b, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c,
-0x6f, 0x73, 0x5f, 0x41, 0x6e, 0x67, 0x65, 0x6c, 0x65, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f,
-0x6e, 0x61, 0x63, 0x6f, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x41, 0x6e, 0x74, 0x61, 0x6e, 0x61, 0x6e, 0x61,
-0x72, 0x69, 0x76, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x49, 0x72, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x0, 0x41, 0x6e,
-0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x56, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f,
-0x70, 0x65, 0x2f, 0x54, 0x69, 0x72, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x72,
-0x65, 0x6e, 0x61, 0x64, 0x61, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x37, 0x0, 0x45, 0x75, 0x72, 0x6f,
-0x70, 0x65, 0x2f, 0x4c, 0x69, 0x73, 0x62, 0x6f, 0x6e, 0x20, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x4d,
-0x61, 0x64, 0x65, 0x69, 0x72, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x73, 0x68, 0x6b, 0x65, 0x6e, 0x74,
-0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x6e, 0x64, 0x0, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x4f, 0x6a, 0x69, 0x6e, 0x61, 0x67, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42,
-0x6c, 0x61, 0x6e, 0x74, 0x79, 0x72, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x61, 0x6d, 0x61,
-0x69, 0x63, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x6f, 0x6e, 0x61, 0x6b, 0x72, 0x79, 0x0, 0x41,
-0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x69, 0x6e, 0x73, 0x68, 0x61, 0x73, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66,
-0x69, 0x63, 0x2f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x74, 0x6f, 0x6e, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69,
-0x63, 0x61, 0x2f, 0x52, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x57,
-0x61, 0x6c, 0x6c, 0x69, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x69, 0x67, 0x6f, 0x6e, 0x0, 0x41, 0x66,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x69, 0x72, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x52, 0x6f,
-0x6d, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x5f, 0x50, 0x72, 0x69,
-0x6e, 0x63, 0x65, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x52, 0x61, 0x6e, 0x67, 0x6f, 0x6f, 0x6e, 0x0, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, 0x6e, 0x61, 0x6d, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f,
-0x45, 0x6c, 0x5f, 0x41, 0x61, 0x69, 0x75, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, 0x75, 0x61,
-0x64, 0x61, 0x6c, 0x63, 0x61, 0x6e, 0x61, 0x6c, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x61, 0x6c, 0x69,
-0x6e, 0x69, 0x6e, 0x67, 0x72, 0x61, 0x64, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6d, 0x6d, 0x61, 0x6e, 0x0, 0x45,
-0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x63, 0x68, 0x61, 0x72, 0x65, 0x73, 0x74, 0x0, 0x41, 0x66, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x42, 0x69, 0x73, 0x73, 0x61, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x6e,
-0x5f, 0x4d, 0x61, 0x72, 0x69, 0x6e, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x62,
-0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x63, 0x68, 0x61, 0x74, 0x6b, 0x61, 0x20, 0x41, 0x73, 0x69,
-0x61, 0x2f, 0x41, 0x6e, 0x61, 0x64, 0x79, 0x72, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x61, 0x67, 0x6f,
-0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, 0x72, 0x61, 0x63, 0x61, 0x6f, 0x0, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x7a, 0x61, 0x74, 0x6c, 0x61, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x75,
-0x73, 0x63, 0x61, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x69, 0x6d, 0x61, 0x0, 0x45, 0x75,
-0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x75, 0x72, 0x69, 0x63, 0x68, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63,
-0x2f, 0x52, 0x65, 0x79, 0x6b, 0x6a, 0x61, 0x76, 0x69, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43,
-0x61, 0x6e, 0x63, 0x75, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x6e, 0x76, 0x65, 0x72,
-0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6f, 0x69, 0x73, 0x65, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72,
-0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x73, 0x65, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
-0x4d, 0x61, 0x6e, 0x61, 0x75, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6f, 0x61, 0x5f, 0x56,
-0x69, 0x73, 0x74, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x6f, 0x5f, 0x56,
-0x65, 0x6c, 0x68, 0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x6f, 0x2d, 0x4e, 0x6f,
-0x76, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x0, 0x45, 0x74,
-0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x30, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f,
-0x4c, 0x75, 0x63, 0x69, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x61, 0x63, 0x61, 0x75, 0x0, 0x41, 0x66, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6c, 0x61, 0x62, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x52,
-0x61, 0x72, 0x6f, 0x74, 0x6f, 0x6e, 0x67, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x6e, 0x6a,
-0x75, 0x6c, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x34, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d,
-0x61, 0x67, 0x61, 0x64, 0x61, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x72, 0x61, 0x74, 0x69, 0x73,
-0x6c, 0x61, 0x76, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x6e, 0x64, 0x6f, 0x72, 0x72, 0x61, 0x0,
-0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x6e, 0x67, 0x6b, 0x6f, 0x6b, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54,
-0x2d, 0x35, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x42, 0x6f, 0x75, 0x67, 0x61, 0x69, 0x6e, 0x76, 0x69,
-0x6c, 0x6c, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6e, 0x0, 0x41,
-0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, 0x64, 0x6d, 0x6f, 0x6e, 0x74, 0x6f, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6d, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x5f, 0x42, 0x61, 0x79, 0x20, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x75, 0x76, 0x69, 0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
-0x2f, 0x59, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6b, 0x6e, 0x69, 0x66, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
-0x2f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x72, 0x69, 0x62, 0x6f, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69,
-0x61, 0x2f, 0x53, 0x79, 0x64, 0x6e, 0x65, 0x79, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4d,
-0x65, 0x6c, 0x62, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x72, 0x5f,
-0x65, 0x73, 0x5f, 0x53, 0x61, 0x6c, 0x61, 0x61, 0x6d, 0x0, 0x4d, 0x53, 0x54, 0x37, 0x4d, 0x44, 0x54, 0x0, 0x41, 0x66,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x73, 0x65, 0x72, 0x75, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f,
-0x4d, 0x61, 0x6a, 0x75, 0x72, 0x6f, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x77, 0x61, 0x6a, 0x61,
-0x6c, 0x65, 0x69, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x61, 0x69, 0x72, 0x6f, 0x62, 0x69, 0x0,
-0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x73, 0x68, 0x67, 0x61, 0x62, 0x61, 0x74, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x48,
-0x6f, 0x6e, 0x67, 0x5f, 0x4b, 0x6f, 0x6e, 0x67, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x33, 0x0, 0x41,
-0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x53, 0x61, 0x6f, 0x5f, 0x50, 0x61, 0x75, 0x6c, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d,
-0x61, 0x64, 0x72, 0x69, 0x64, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x65, 0x75, 0x74, 0x61, 0x0, 0x41,
-0x73, 0x69, 0x61, 0x2f, 0x4a, 0x61, 0x6b, 0x61, 0x72, 0x74, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x6f, 0x6e,
-0x74, 0x69, 0x61, 0x6e, 0x61, 0x6b, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x39, 0x0, 0x41, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x4a, 0x75, 0x6e, 0x65, 0x61, 0x75, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65,
-0x74, 0x6c, 0x61, 0x6b, 0x61, 0x74, 0x6c, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x6d,
-0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x69, 0x74, 0x6b, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x61, 0x74, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x43,
-0x6f, 0x70, 0x65, 0x6e, 0x68, 0x61, 0x67, 0x65, 0x6e, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61,
-0x2f, 0x4d, 0x63, 0x4d, 0x75, 0x72, 0x64, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, 0x61, 0x74, 0x61, 0x72, 0x0,
-0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x69, 0x67, 0x6f, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x6f, 0x73, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
-0x2f, 0x57, 0x61, 0x6b, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x48, 0x65, 0x6c, 0x73, 0x69, 0x6e, 0x6b,
-0x69, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, 0x79, 0x6f, 0x74, 0x74, 0x65, 0x0, 0x41, 0x74, 0x6c,
-0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x46, 0x61, 0x65, 0x72, 0x6f, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
-0x2f, 0x43, 0x6f, 0x72, 0x61, 0x6c, 0x5f, 0x48, 0x61, 0x72, 0x62, 0x6f, 0x75, 0x72, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47,
-0x4d, 0x54, 0x2b, 0x31, 0x30, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x72, 0x61, 0x6a, 0x65, 0x76,
-0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x62, 0x69, 0x6c, 0x69, 0x73, 0x69, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47,
-0x4d, 0x54, 0x2b, 0x31, 0x31, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x63,
-0x71, 0x75, 0x61, 0x72, 0x69, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x5f,
-0x4d, 0x6f, 0x72, 0x65, 0x73, 0x62, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x73, 0x75, 0x6e,
-0x63, 0x69, 0x6f, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x61, 0x68, 0x69, 0x74, 0x69, 0x0,
-0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x6d, 0x65, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63,
-0x2f, 0x43, 0x61, 0x6e, 0x61, 0x72, 0x79, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x6f, 0x68, 0x61, 0x6e,
-0x6e, 0x65, 0x73, 0x62, 0x75, 0x72, 0x67, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x41, 0x64,
-0x65, 0x6c, 0x61, 0x69, 0x64, 0x65, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42, 0x72, 0x6f,
-0x6b, 0x65, 0x6e, 0x5f, 0x48, 0x69, 0x6c, 0x6c, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x53, 0x61, 0x69,
-0x70, 0x61, 0x6e, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x53, 0x74, 0x61, 0x6e, 0x6c, 0x65, 0x79,
-0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x69, 0x63, 0x6f, 0x73, 0x69, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44,
-0x75, 0x62, 0x61, 0x69, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4b, 0x65, 0x72, 0x67, 0x75, 0x65, 0x6c, 0x65,
-0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x64, 0x6a, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x0, 0x45, 0x75,
-0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x6b, 0x6f, 0x70, 0x6a, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x64, 0x65,
-0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x41, 0x70, 0x69, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66,
-0x69, 0x63, 0x2f, 0x48, 0x6f, 0x6e, 0x6f, 0x6c, 0x75, 0x6c, 0x75, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b,
-0x31, 0x32, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x69, 0x6c, 0x6c,
-0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x0, 0x50,
-0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x41, 0x75, 0x63, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x0, 0x45, 0x75, 0x72, 0x6f,
-0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x69, 0x6d,
-0x66, 0x65, 0x72, 0x6f, 0x70, 0x6f, 0x6c, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x6f, 0x6c, 0x67, 0x6f,
-0x67, 0x72, 0x61, 0x64, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x0,
-0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x62, 0x75, 0x6c, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x61,
-0x6c, 0x74, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x75, 0x62, 0x61, 0x0, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x20, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x69, 0x61, 0x5f, 0x42, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x61, 0x73,
-0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x72, 0x69, 0x64, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x65, 0x72, 0x72, 0x65, 0x79, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65,
-0x2f, 0x49, 0x73, 0x6c, 0x65, 0x5f, 0x6f, 0x66, 0x5f, 0x4d, 0x61, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f,
-0x56, 0x61, 0x64, 0x75, 0x7a, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x46, 0x6f, 0x72, 0x74, 0x61, 0x6c,
-0x65, 0x7a, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x61, 0x67, 0x75, 0x61, 0x69, 0x6e,
-0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x65, 0x6c, 0x65, 0x6d, 0x20, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x63, 0x65, 0x69, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52,
-0x65, 0x63, 0x69, 0x66, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x61, 0x72,
-0x65, 0x6d, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x65, 0x6f, 0x75, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x47, 0x75, 0x61, 0x64, 0x65, 0x6c, 0x6f, 0x75, 0x70, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54,
-0x2b, 0x32, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x6f, 0x63, 0x6f, 0x73, 0x0, 0x41, 0x72, 0x63, 0x74,
-0x69, 0x63, 0x2f, 0x4c, 0x6f, 0x6e, 0x67, 0x79, 0x65, 0x61, 0x72, 0x62, 0x79, 0x65, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x41, 0x64, 0x64, 0x69, 0x73, 0x5f, 0x41, 0x62, 0x61, 0x62, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70,
-0x65, 0x2f, 0x53, 0x61, 0x6d, 0x61, 0x72, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x72, 0x61,
-0x72, 0x65, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x50, 0x65, 0x72, 0x74, 0x68, 0x0, 0x45,
-0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x76,
-0x61, 0x6e, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x73, 0x61, 0x62, 0x6c, 0x61, 0x6e, 0x63,
-0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x65, 0x72, 0x65, 0x76, 0x61, 0x6e, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e,
-0x74, 0x69, 0x63, 0x2f, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x69,
-0x70, 0x65, 0x69, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x36, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x47, 0x6f, 0x64, 0x74, 0x68, 0x61, 0x62, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x57, 0x61, 0x72,
-0x73, 0x61, 0x77, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x74, 0x61, 0x70,
-0x75, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6c, 0x6d, 0x61, 0x74, 0x79, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51,
-0x79, 0x7a, 0x79, 0x6c, 0x6f, 0x72, 0x64, 0x61, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f,
-0x44, 0x61, 0x76, 0x69, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x65, 0x69, 0x72, 0x75, 0x74, 0x0, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x74, 0x65, 0x6d, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61,
-0x2f, 0x4b, 0x61, 0x72, 0x61, 0x63, 0x68, 0x69, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x63, 0x63, 0x72,
-0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x75, 0x65, 0x72, 0x74, 0x6f, 0x5f, 0x52, 0x69, 0x63,
-0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x61, 0x5f, 0x50, 0x61, 0x7a, 0x0, 0x41, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f, 0x59, 0x6f, 0x72, 0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x44, 0x65, 0x74, 0x72, 0x6f, 0x69, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e,
-0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x50, 0x65, 0x74, 0x65, 0x72, 0x73, 0x62, 0x75, 0x72, 0x67, 0x20, 0x41, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x56, 0x69, 0x6e, 0x63, 0x65, 0x6e, 0x6e,
-0x65, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x57,
-0x69, 0x6e, 0x61, 0x6d, 0x61, 0x63, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x65, 0x6e, 0x74, 0x75,
-0x63, 0x6b, 0x79, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x69, 0x63, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x75, 0x69, 0x73, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44,
-0x61, 0x6d, 0x61, 0x73, 0x63, 0x75, 0x73, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x61, 0x72, 0x61,
-0x77, 0x61, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x34, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
-0x2f, 0x42, 0x6f, 0x67, 0x6f, 0x74, 0x61, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x43, 0x61, 0x70,
-0x65, 0x5f, 0x56, 0x65, 0x72, 0x64, 0x65, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x44, 0x61,
-0x72, 0x77, 0x69, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x79, 0x6f, 0x6e, 0x67, 0x79, 0x61, 0x6e, 0x67, 0x0,
-0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x6b, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x47, 0x69, 0x62,
-0x72, 0x61, 0x6c, 0x74, 0x61, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4a, 0x65, 0x72, 0x75, 0x73, 0x61, 0x6c, 0x65,
-0x6d, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x6a, 0x75, 0x62, 0x6c, 0x6a, 0x61, 0x6e, 0x61, 0x0, 0x50,
-0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, 0x6f, 0x72, 0x66, 0x6f, 0x6c, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f,
-0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x72, 0x61, 0x7a, 0x7a, 0x61,
-0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x74, 0x6d, 0x61, 0x6e, 0x64, 0x75, 0x0,
-0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x74, 0x74, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x41, 0x6e, 0x74, 0x69, 0x67, 0x75, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4a, 0x65, 0x72,
-0x73, 0x65, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x73, 0x65, 0x72, 0x72,
-0x61, 0x74, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x37, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
-0x2f, 0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x6b, 0x61, 0x72,
-0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4f, 0x73, 0x6c, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f,
-0x41, 0x74, 0x68, 0x65, 0x6e, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x77, 0x61, 0x69, 0x74, 0x0, 0x50,
-0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x6e, 0x61, 0x70, 0x65, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69,
-0x63, 0x2f, 0x4b, 0x6f, 0x73, 0x72, 0x61, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x6f, 0x73,
-0x74, 0x61, 0x5f, 0x52, 0x69, 0x63, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x6f, 0x6d, 0x69,
-0x6e, 0x69, 0x63, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x62, 0x61, 0x62, 0x61, 0x6e, 0x65, 0x0,
-0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x0, 0x49,
-0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x52, 0x65, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d,
-0x54, 0x2b, 0x36, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x49, 0x73, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x6c, 0x0,
-0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x73, 0x6e, 0x6f, 0x79, 0x61, 0x72, 0x73, 0x6b, 0x20, 0x41, 0x73, 0x69,
-0x61, 0x2f, 0x4e, 0x6f, 0x76, 0x6f, 0x6b, 0x75, 0x7a, 0x6e, 0x65, 0x74, 0x73, 0x6b, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x41, 0x62, 0x69, 0x64, 0x6a, 0x61, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x69,
-0x6f, 0x5f, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, 0x69, 0x72,
-0x75, 0x6e, 0x65, 0x70, 0x65, 0x0, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x50, 0x68, 0x6f, 0x65, 0x6e, 0x69, 0x78, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x65,
-0x67, 0x69, 0x6e, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x77, 0x69, 0x66, 0x74, 0x5f, 0x43,
-0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x35, 0x0, 0x41, 0x6e, 0x74,
-0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61,
-0x6e, 0x2f, 0x4d, 0x61, 0x6c, 0x64, 0x69, 0x76, 0x65, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x65,
-0x6c, 0x67, 0x72, 0x61, 0x64, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x73, 0x6d, 0x65, 0x72, 0x61,
-0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x5f, 0x43, 0x72, 0x65, 0x65,
-0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x6e, 0x20, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x46, 0x6f, 0x72, 0x74, 0x5f, 0x4e, 0x65, 0x6c, 0x73, 0x6f, 0x6e, 0x0, 0x45, 0x75,
-0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x64, 0x61, 0x70, 0x65, 0x73, 0x74, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61,
-0x2f, 0x57, 0x69, 0x6e, 0x64, 0x68, 0x6f, 0x65, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4a, 0x61, 0x79, 0x61, 0x70,
-0x75, 0x72, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42, 0x72, 0x69, 0x73, 0x62, 0x61,
-0x6e, 0x65, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4c, 0x69, 0x6e, 0x64, 0x65, 0x6d, 0x61,
-0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x34, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
-0x43, 0x61, 0x72, 0x61, 0x63, 0x61, 0x73, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x53,
-0x79, 0x6f, 0x77, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x61, 0x67, 0x72, 0x65, 0x62, 0x0, 0x41,
-0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x65, 0x6e, 0x6f, 0x73, 0x5f, 0x41, 0x69, 0x72, 0x65, 0x73, 0x20,
-0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x4c, 0x61,
-0x5f, 0x52, 0x69, 0x6f, 0x6a, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e,
-0x74, 0x69, 0x6e, 0x61, 0x2f, 0x52, 0x69, 0x6f, 0x5f, 0x47, 0x61, 0x6c, 0x6c, 0x65, 0x67, 0x6f, 0x73, 0x20, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6c, 0x74,
-0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f,
-0x53, 0x61, 0x6e, 0x5f, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67,
-0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x5f, 0x4c, 0x75, 0x69, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x54, 0x75, 0x63, 0x75, 0x6d, 0x61,
-0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f,
-0x55, 0x73, 0x68, 0x75, 0x61, 0x69, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x74, 0x61,
-0x6d, 0x61, 0x72, 0x63, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x6f, 0x72, 0x64, 0x6f, 0x62,
-0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x75, 0x6a, 0x75, 0x79, 0x20, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x6e, 0x64, 0x6f, 0x7a, 0x61, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69,
-0x63, 0x61, 0x2f, 0x50, 0x61, 0x6c, 0x6d, 0x65, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x6f,
-0x72, 0x6f, 0x6e, 0x74, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x71, 0x61, 0x6c, 0x75, 0x69,
-0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x72, 0x65, 0x61, 0x6c, 0x20, 0x41,
-0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x69, 0x70, 0x69, 0x67, 0x6f, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x50, 0x61, 0x6e, 0x67, 0x6e, 0x69, 0x72, 0x74, 0x75, 0x6e, 0x67, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x54, 0x68, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x5f, 0x42, 0x61, 0x79, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x42, 0x61, 0x6d, 0x61, 0x6b, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x52, 0x69, 0x79, 0x61, 0x64, 0x68,
-0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x72, 0x75, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54,
-0x6f, 0x6b, 0x79, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x75,
-0x72, 0x79, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x6f, 0x6e, 0x64, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73, 0x20, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x65, 0x6e, 0x67,
-0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x56, 0x65,
-0x76, 0x61, 0x79, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x6f, 0x0, 0x41, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x69, 0x6e, 0x6e, 0x69, 0x70, 0x65, 0x67, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x52, 0x61, 0x69, 0x6e, 0x79, 0x5f, 0x52, 0x69, 0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x5f, 0x49, 0x6e, 0x6c, 0x65, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44,
-0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x6c, 0x69,
-0x66, 0x61, 0x78, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6c, 0x61, 0x63, 0x65, 0x5f, 0x42, 0x61,
-0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6f, 0x6f, 0x73, 0x65, 0x5f, 0x42, 0x61, 0x79, 0x20,
-0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x63, 0x74, 0x6f, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x53, 0x61, 0x6f, 0x5f, 0x54, 0x6f, 0x6d, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
-0x53, 0x74, 0x5f, 0x54, 0x68, 0x6f, 0x6d, 0x61, 0x73, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x73,
-0x61, 0x6b, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x2d, 0x61, 0x75, 0x2d,
-0x50, 0x72, 0x69, 0x6e, 0x63, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x69, 0x61, 0x6d, 0x65, 0x79,
-0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x33, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6c,
-0x67, 0x69, 0x65, 0x72, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x79, 0x61, 0x71,
-0x75, 0x69, 0x6c, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x68, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x41, 0x73,
-0x69, 0x61, 0x2f, 0x53, 0x68, 0x61, 0x6e, 0x67, 0x68, 0x61, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
-0x43, 0x75, 0x69, 0x61, 0x62, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6d, 0x70, 0x6f,
-0x5f, 0x47, 0x72, 0x61, 0x6e, 0x64, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4d, 0x69, 0x64, 0x77,
-0x61, 0x79, 0x0, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x68,
-0x72, 0x69, 0x73, 0x74, 0x6d, 0x61, 0x73, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, 0x61, 0x6c, 0x61,
-0x70, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x67, 0x75, 0x69, 0x6c,
-0x6c, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x79, 0x6d, 0x61, 0x6e, 0x0, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4b, 0x69, 0x74, 0x74, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x69, 0x61, 0x67, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f,
-0x50, 0x61, 0x6c, 0x61, 0x75, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x20, 0x41,
-0x73, 0x69, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x74, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x68, 0x61, 0x6e, 0x64,
-0x79, 0x67, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x69, 0x6c, 0x6e, 0x69, 0x75, 0x73, 0x0, 0x41,
-0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x72, 0x6f, 0x76, 0x69, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66,
-0x69, 0x63, 0x2f, 0x47, 0x75, 0x61, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x6e, 0x6d,
-0x61, 0x72, 0x6b, 0x73, 0x68, 0x61, 0x76, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x46, 0x69, 0x6a,
-0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x75, 0x61, 0x0, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x62, 0x79, 0x73, 0x75, 0x6e, 0x64, 0x0, 0x41,
-0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x42, 0x61, 0x72, 0x74, 0x68, 0x65, 0x6c, 0x65, 0x6d, 0x79,
-0x0, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x72, 0x61,
-0x6e, 0x64, 0x5f, 0x54, 0x75, 0x72, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4f, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73,
-0x69, 0x61, 0x2f, 0x41, 0x71, 0x74, 0x61, 0x75, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x71, 0x74, 0x6f, 0x62, 0x65,
-0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x20, 0x41, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x4b, 0x6e, 0x6f, 0x78, 0x20, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x54, 0x65, 0x6c, 0x6c, 0x5f, 0x43,
-0x69, 0x74, 0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x65,
-0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f,
-0x74, 0x61, 0x2f, 0x42, 0x65, 0x75, 0x6c, 0x61, 0x68, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f,
-0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, 0x2f, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x41, 0x6d,
-0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, 0x2f, 0x4e,
-0x65, 0x77, 0x5f, 0x53, 0x61, 0x6c, 0x65, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x74,
-0x61, 0x6d, 0x6f, 0x72, 0x6f, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x68, 0x75, 0x6c, 0x65,
-0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x31, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63,
-0x2f, 0x53, 0x74, 0x5f, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e,
-0x69, 0x75, 0x65, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73,
-0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x6c, 0x61, 0x61, 0x6e, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x20, 0x41, 0x73,
-0x69, 0x61, 0x2f, 0x43, 0x68, 0x6f, 0x69, 0x62, 0x61, 0x6c, 0x73, 0x61, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d,
-0x54, 0x2d, 0x32, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x69, 0x6e, 0x73, 0x6b, 0x0, 0x41, 0x66, 0x72,
-0x69, 0x63, 0x61, 0x2f, 0x4a, 0x75, 0x62, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x48,
-0x6f, 0x62, 0x61, 0x72, 0x74, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x43, 0x75, 0x72, 0x72,
-0x69, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x20,
-0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x6b, 0x68, 0x61, 0x6c, 0x69, 0x6e, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55,
-0x73, 0x74, 0x2d, 0x4e, 0x65, 0x72, 0x61, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x44,
-0x75, 0x6d, 0x6f, 0x6e, 0x74, 0x44, 0x55, 0x72, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65,
-0x2f, 0x44, 0x75, 0x62, 0x6c, 0x69, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x69, 0x65, 0x6e, 0x6e,
-0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x0,
-0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x65, 0x6e, 0x6f, 0x73, 0x5f, 0x41, 0x69, 0x72, 0x65, 0x73,
-0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x6c, 0x69, 0x66, 0x61, 0x78, 0x0, 0x41, 0x75, 0x73,
-0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x53, 0x79, 0x64, 0x6e, 0x65, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63,
-0x61, 0x2f, 0x52, 0x65, 0x67, 0x69, 0x6e, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x41,
-0x64, 0x65, 0x6c, 0x61, 0x69, 0x64, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6c, 0x6d, 0x61, 0x74, 0x79, 0x0,
-0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, 0x69, 0x61, 0x62, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69,
-0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61,
-0x2f, 0x42, 0x72, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65,
-0x77, 0x5f, 0x59, 0x6f, 0x72, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x69, 0x65, 0x76, 0x0, 0x41,
-0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x0, 0x41, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x76,
-0x6f, 0x73, 0x69, 0x62, 0x69, 0x72, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x73, 0x6e, 0x6f,
-0x79, 0x61, 0x72, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x63, 0x68, 0x61, 0x74, 0x6b, 0x61,
-0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72,
-0x61, 0x6c, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x62, 0x61, 0x72, 0x74, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x6c, 0x61,
-0x61, 0x6e, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64,
-0x69, 0x61, 0x6e, 0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x56, 0x6c, 0x61, 0x64, 0x69,
-0x76, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x65, 0x72, 0x6c, 0x69, 0x6e,
-0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x73, 0x68, 0x6b, 0x65, 0x6e, 0x74, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f,
-0x59, 0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x0, 0x55, 0x54, 0x43, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x34, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x32, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x30, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x39, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x38, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x37, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x36, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x35, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x34, 0x3a, 0x33,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x33, 0x3a, 0x33,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x32, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x30, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x31, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x33, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x33, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x34, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x34, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x34,
-0x35, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x36, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x36, 0x3a, 0x33,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x37, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x38, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x39, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x39, 0x3a, 0x33,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x31, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x33, 0x3a, 0x30,
-0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x38, 0x3a, 0x33,
-0x30, 0x0
-};
-// GENERATED PART ENDS HERE
-
-QT_END_NAMESPACE
-
-#endif // QTIMEZONEPRIVATE_DATA_P_H
diff --git a/src/corelib/tools/qtools_p.h b/src/corelib/tools/qtools_p.h
index 17d2ab852a..d48318b474 100644
--- a/src/corelib/tools/qtools_p.h
+++ b/src/corelib/tools/qtools_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -57,17 +57,17 @@
 QT_BEGIN_NAMESPACE
 
 namespace QtMiscUtils {
-Q_DECL_CONSTEXPR inline char toHexUpper(uint value) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline char toHexUpper(uint value) noexcept
 {
     return "0123456789ABCDEF"[value & 0xF];
 }
 
-Q_DECL_CONSTEXPR inline char toHexLower(uint value) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline char toHexLower(uint value) noexcept
 {
     return "0123456789abcdef"[value & 0xF];
 }
 
-Q_DECL_CONSTEXPR inline int fromHex(uint c) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int fromHex(uint c) noexcept
 {
     return ((c >= '0') && (c <= '9')) ? int(c - '0') :
            ((c >= 'A') && (c <= 'F')) ? int(c - 'A' + 10) :
@@ -75,12 +75,12 @@ Q_DECL_CONSTEXPR inline int fromHex(uint c) Q_DECL_NOTHROW
            /* otherwise */              -1;
 }
 
-Q_DECL_CONSTEXPR inline char toOct(uint value) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline char toOct(uint value) noexcept
 {
     return '0' + char(value & 0x7);
 }
 
-Q_DECL_CONSTEXPR inline int fromOct(uint c) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline int fromOct(uint c) noexcept
 {
     return ((c >= '0') && (c <= '7')) ? int(c - '0') : -1;
 }
@@ -96,11 +96,11 @@ struct CalculateGrowingBlockSizeResult {
     size_t elementCount;
 };
 
-// implemented in qbytearray.cpp
+// Implemented in qarraydata.cpp:
 size_t Q_CORE_EXPORT Q_DECL_CONST_FUNCTION
-qCalculateBlockSize(size_t elementCount, size_t elementSize, size_t headerSize = 0) Q_DECL_NOTHROW;
+qCalculateBlockSize(size_t elementCount, size_t elementSize, size_t headerSize = 0) noexcept;
 CalculateGrowingBlockSizeResult Q_CORE_EXPORT Q_DECL_CONST_FUNCTION
-qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t headerSize = 0) Q_DECL_NOTHROW ;
+qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t headerSize = 0) noexcept ;
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h
index ef3a9884bf..6be695e317 100644
--- a/src/corelib/tools/qvarlengtharray.h
+++ b/src/corelib/tools/qvarlengtharray.h
@@ -43,15 +43,15 @@
 #include <QtCore/qcontainerfwd.h>
 #include <QtCore/qglobal.h>
 #include <QtCore/qalgorithms.h>
+#include <QtCore/qcontainertools_impl.h>
+#include <QtCore/qhashfunctions.h>
 
-#include <new>
-#include <string.h>
-#include <stdlib.h>
 #include <algorithm>
-#ifdef Q_COMPILER_INITIALIZER_LISTS
 #include <initializer_list>
-#endif
 #include <iterator>
+#include <new>
+#include <string.h>
+#include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -61,7 +61,9 @@ template<class T, int Prealloc>
 class QVarLengthArray
 {
 public:
-    inline explicit QVarLengthArray(int size = 0);
+    QVarLengthArray() : QVarLengthArray(0) {}
+
+    inline explicit QVarLengthArray(int size);
 
     inline QVarLengthArray(const QVarLengthArray<T, Prealloc> &other)
         : a(Prealloc), s(0), ptr(reinterpret_cast<T *>(array))
@@ -69,14 +71,18 @@ public:
         append(other.constData(), other.size());
     }
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
     QVarLengthArray(std::initializer_list<T> args)
-        : a(Prealloc), s(0), ptr(reinterpret_cast<T *>(array))
+        : QVarLengthArray(args.begin(), args.end())
     {
-        if (args.size())
-            append(args.begin(), int(args.size()));
     }
-#endif
+
+    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
+    inline QVarLengthArray(InputIterator first, InputIterator last)
+        : QVarLengthArray()
+    {
+        QtPrivate::reserveIfForwardIterator(this, first, last);
+        std::copy(first, last, std::back_inserter(*this));
+    }
 
     inline ~QVarLengthArray() {
         if (QTypeInfo<T>::isComplex) {
@@ -96,7 +102,6 @@ public:
         return *this;
     }
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
     QVarLengthArray<T, Prealloc> &operator=(std::initializer_list<T> list)
     {
         resize(int(list.size())); // ### q6sizetype
@@ -104,11 +109,12 @@ public:
                   QT_MAKE_CHECKED_ARRAY_ITERATOR(this->begin(), this->size()));
         return *this;
     }
-#endif
 
     inline void removeLast() {
         Q_ASSERT(s > 0);
-        realloc(s - 1, a);
+        if (QTypeInfo<T>::isComplex)
+            ptr[s - 1].~T();
+        --s;
     }
     inline int size() const { return s; }
     inline int count() const { return s; }
@@ -259,6 +265,13 @@ private:
     }
 };
 
+#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
+template <typename InputIterator,
+          typename ValueType = typename std::iterator_traits<InputIterator>::value_type,
+          QtPrivate::IfIsInputIterator<InputIterator> = true>
+QVarLengthArray(InputIterator, InputIterator) -> QVarLengthArray<ValueType>;
+#endif
+
 template <class T, int Prealloc>
 Q_INLINE_TEMPLATE QVarLengthArray<T, Prealloc>::QVarLengthArray(int asize)
     : s(asize) {
@@ -570,7 +583,7 @@ bool operator!=(const QVarLengthArray<T, Prealloc1> &l, const QVarLengthArray<T,
 
 template <typename T, int Prealloc1, int Prealloc2>
 bool operator<(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T, Prealloc2> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(),
+    noexcept(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(),
                                                                rhs.begin(), rhs.end())))
 {
     return std::lexicographical_compare(lhs.begin(), lhs.end(),
@@ -579,25 +592,32 @@ bool operator<(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T
 
 template <typename T, int Prealloc1, int Prealloc2>
 inline bool operator>(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T, Prealloc2> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return rhs < lhs;
 }
 
 template <typename T, int Prealloc1, int Prealloc2>
 inline bool operator<=(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T, Prealloc2> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return !(lhs > rhs);
 }
 
 template <typename T, int Prealloc1, int Prealloc2>
 inline bool operator>=(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T, Prealloc2> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return !(lhs < rhs);
 }
 
+template <typename T, int Prealloc>
+uint qHash(const QVarLengthArray<T, Prealloc> &key, uint seed = 0)
+    noexcept(noexcept(qHashRange(key.cbegin(), key.cend(), seed)))
+{
+    return qHashRange(key.cbegin(), key.cend(), seed);
+}
+
 QT_END_NAMESPACE
 
 #endif // QVARLENGTHARRAY_H
diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc
index bc8df82517..e5ba47b8ef 100644
--- a/src/corelib/tools/qvarlengtharray.qdoc
+++ b/src/corelib/tools/qvarlengtharray.qdoc
@@ -110,6 +110,14 @@
     lists.
 */
 
+/*! \fn template<class T, int Prealloc> template<typename InputIterator> QVarLengthArray<T, Prealloc>::QVarLengthArray(InputIterator first, InputIterator last)
+    \since 5.14
+
+    Constructs an array with the contents in the iterator range [\a first, \a last).
+
+    The value type of \c InputIterator must be convertible to \c T.
+*/
+
 
 /*! \fn template<class T, int Prealloc> QVarLengthArray<T, Prealloc>::~QVarLengthArray()
 
@@ -895,3 +903,11 @@
     \sa indexOf(), lastIndexOf()
 */
 
+/*!
+    template <typename T, int Prealloc> uint qHash(const QVarLengthArray<T, Prealloc> &key, uint seed = 0)
+    \relates QVarLengthArray
+    \since 5.14
+
+    Returns the hash value for \a key, using \a seed to seed the
+    calculation.
+*/
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 57cf6e51ce..62fbdb4a2a 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -45,14 +45,15 @@
 #include <QtCore/qrefcount.h>
 #include <QtCore/qarraydata.h>
 #include <QtCore/qhashfunctions.h>
+#include <QtCore/qcontainertools_impl.h>
 
 #include <iterator>
+#include <initializer_list>
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 #include <vector>
+#endif
 #include <stdlib.h>
 #include <string.h>
-#ifdef Q_COMPILER_INITIALIZER_LISTS
-#include <initializer_list>
-#endif
 
 #include <algorithm>
 
@@ -65,21 +66,22 @@ class QVector
     Data *d;
 
 public:
-    inline QVector() Q_DECL_NOTHROW : d(Data::sharedNull()) { }
+    inline QVector() noexcept : d(Data::sharedNull()) { }
     explicit QVector(int size);
     QVector(int size, const T &t);
     inline QVector(const QVector<T> &v);
     inline ~QVector() { if (!d->ref.deref()) freeData(d); }
     QVector<T> &operator=(const QVector<T> &v);
-#if defined(Q_COMPILER_RVALUE_REFS) || defined(Q_CLANG_QDOC)
-    QVector(QVector<T> &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Data::sharedNull(); }
-    QVector<T> &operator=(QVector<T> &&other) Q_DECL_NOTHROW
+    QVector(QVector<T> &&other) noexcept : d(other.d) { other.d = Data::sharedNull(); }
+    QVector<T> &operator=(QVector<T> &&other) noexcept
     { QVector moved(std::move(other)); swap(moved); return *this; }
-#endif
-    void swap(QVector<T> &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
-#ifdef Q_COMPILER_INITIALIZER_LISTS
+    void swap(QVector<T> &other) noexcept { qSwap(d, other.d); }
     inline QVector(std::initializer_list<T> args);
-#endif
+    QVector<T> &operator=(std::initializer_list<T> args);
+    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
+    inline QVector(InputIterator first, InputIterator last);
+    explicit QVector(QArrayDataPointerRef<T> ref) noexcept : d(ref.ptr) {}
+
     bool operator==(const QVector<T> &v) const;
     inline bool operator!=(const QVector<T> &v) const { return !(*this == v); }
 
@@ -138,9 +140,7 @@ public:
     T &operator[](int i);
     const T &operator[](int i) const;
     void append(const T &t);
-#if defined(Q_COMPILER_RVALUE_REFS) || defined(Q_CLANG_QDOC)
     void append(T &&t);
-#endif
     inline void append(const QVector<T> &l) { *this += l; }
     void prepend(T &&t);
     void prepend(const T &t);
@@ -208,29 +208,29 @@ public:
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 #if !defined(QT_STRICT_ITERATORS) || defined(Q_CLANG_QDOC)
     inline iterator begin() { detach(); return d->begin(); }
-    inline const_iterator begin() const Q_DECL_NOTHROW { return d->constBegin(); }
-    inline const_iterator cbegin() const Q_DECL_NOTHROW { return d->constBegin(); }
-    inline const_iterator constBegin() const Q_DECL_NOTHROW { return d->constBegin(); }
+    inline const_iterator begin() const noexcept { return d->constBegin(); }
+    inline const_iterator cbegin() const noexcept { return d->constBegin(); }
+    inline const_iterator constBegin() const noexcept { return d->constBegin(); }
     inline iterator end() { detach(); return d->end(); }
-    inline const_iterator end() const Q_DECL_NOTHROW { return d->constEnd(); }
-    inline const_iterator cend() const Q_DECL_NOTHROW { return d->constEnd(); }
-    inline const_iterator constEnd() const Q_DECL_NOTHROW { return d->constEnd(); }
+    inline const_iterator end() const noexcept { return d->constEnd(); }
+    inline const_iterator cend() const noexcept { return d->constEnd(); }
+    inline const_iterator constEnd() const noexcept { return d->constEnd(); }
 #else
     inline iterator begin(iterator = iterator()) { detach(); return d->begin(); }
-    inline const_iterator begin(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constBegin(); }
-    inline const_iterator cbegin(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constBegin(); }
-    inline const_iterator constBegin(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constBegin(); }
+    inline const_iterator begin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); }
+    inline const_iterator cbegin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); }
+    inline const_iterator constBegin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); }
     inline iterator end(iterator = iterator()) { detach(); return d->end(); }
-    inline const_iterator end(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constEnd(); }
-    inline const_iterator cend(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constEnd(); }
-    inline const_iterator constEnd(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constEnd(); }
+    inline const_iterator end(const_iterator = const_iterator()) const noexcept { return d->constEnd(); }
+    inline const_iterator cend(const_iterator = const_iterator()) const noexcept { return d->constEnd(); }
+    inline const_iterator constEnd(const_iterator = const_iterator()) const noexcept { return d->constEnd(); }
 #endif
     reverse_iterator rbegin() { return reverse_iterator(end()); }
     reverse_iterator rend() { return reverse_iterator(begin()); }
-    const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
+    const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); }
     iterator insert(iterator before, int n, const T &x);
     inline iterator insert(iterator before, const T &x) { return insert(before, 1, x); }
     inline iterator insert(iterator before, T &&x);
@@ -252,6 +252,13 @@ public:
     T value(int i) const;
     T value(int i, const T &defaultValue) const;
 
+    void swapItemsAt(int i, int j) {
+        Q_ASSERT_X(i >= 0 && i < size() && j >= 0 && j < size(),
+                    "QVector<T>::swap", "index out of range");
+        detach();
+        qSwap(d->begin()[i], d->begin()[j]);
+    }
+
     // STL compatibility
     typedef T value_type;
     typedef value_type* pointer;
@@ -263,10 +270,8 @@ public:
     typedef const_iterator ConstIterator;
     typedef int size_type;
     inline void push_back(const T &t) { append(t); }
-#if defined(Q_COMPILER_RVALUE_REFS) || defined(Q_CLANG_QDOC)
     void push_back(T &&t) { append(std::move(t)); }
     void push_front(T &&t) { prepend(std::move(t)); }
-#endif
     inline void push_front(const T &t) { prepend(t); }
     void pop_back() { removeLast(); }
     void pop_front() { removeFirst(); }
@@ -293,14 +298,17 @@ public:
     inline QVector<T> &operator<<(T &&t)
     { append(std::move(t)); return *this; }
 
-    QList<T> toList() const;
-
     static QVector<T> fromList(const QList<T> &list);
+    QList<T> toList() const;
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+    Q_DECL_DEPRECATED_X("Use QVector<T>(vector.begin(), vector.end()) instead.")
     static inline QVector<T> fromStdVector(const std::vector<T> &vector)
-    { QVector<T> tmp; tmp.reserve(int(vector.size())); std::copy(vector.begin(), vector.end(), std::back_inserter(tmp)); return tmp; }
+    { return QVector<T>(vector.begin(), vector.end()); }
+    Q_DECL_DEPRECATED_X("Use std::vector<T>(vector.begin(), vector.end()) instead.")
     inline std::vector<T> toStdVector() const
     { return std::vector<T>(d->begin(), d->end()); }
+#endif
 private:
     // ### Qt6: remove methods, they are unused
     void reallocData(const int size, const int alloc, QArrayData::AllocationOptions options = QArrayData::Default);
@@ -318,6 +326,13 @@ private:
     class AlignmentDummy { Data header; T array[1]; };
 };
 
+#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
+template <typename InputIterator,
+          typename ValueType = typename std::iterator_traits<InputIterator>::value_type,
+          QtPrivate::IfIsInputIterator<InputIterator> = true>
+QVector(InputIterator, InputIterator) -> QVector<ValueType>;
+#endif
+
 #ifdef Q_CC_MSVC
 // behavior change: an object of POD type constructed with an initializer of the form ()
 // will be default-initialized
@@ -522,11 +537,10 @@ QVector<T>::QVector(int asize, const T &t)
     }
 }
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
-# if defined(Q_CC_MSVC)
+#if defined(Q_CC_MSVC)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_MSVC(4127) // conditional expression is constant
-# endif // Q_CC_MSVC
+#endif // Q_CC_MSVC
 
 template <typename T>
 QVector<T>::QVector(std::initializer_list<T> args)
@@ -542,10 +556,27 @@ QVector<T>::QVector(std::initializer_list<T> args)
         d = Data::sharedNull();
     }
 }
-# if defined(Q_CC_MSVC)
+
+template <typename T>
+QVector<T> &QVector<T>::operator=(std::initializer_list<T> args)
+{
+    QVector<T> tmp(args);
+    tmp.swap(*this);
+    return *this;
+}
+
+#if defined(Q_CC_MSVC)
 QT_WARNING_POP
-# endif // Q_CC_MSVC
-#endif // Q_COMPILER_INITALIZER_LISTS
+#endif // Q_CC_MSVC
+
+template <typename T>
+template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator>>
+QVector<T>::QVector(InputIterator first, InputIterator last)
+    : QVector()
+{
+    QtPrivate::reserveIfForwardIterator(this, first, last);
+    std::copy(first, last, std::back_inserter(*this));
+}
 
 template <typename T>
 void QVector<T>::freeData(Data *x)
@@ -763,9 +794,9 @@ void QVector<T>::append(const T &t)
         realloc(isTooSmall ? d->size + 1 : d->alloc, opt);
 
         if (QTypeInfo<T>::isComplex)
-            new (d->end()) T(qMove(copy));
+            new (d->end()) T(std::move(copy));
         else
-            *d->end() = qMove(copy);
+            *d->end() = std::move(copy);
 
     } else {
         if (QTypeInfo<T>::isComplex)
@@ -776,7 +807,6 @@ void QVector<T>::append(const T &t)
     ++d->size;
 }
 
-#ifdef Q_COMPILER_RVALUE_REFS
 template <typename T>
 void QVector<T>::append(T &&t)
 {
@@ -790,7 +820,6 @@ void QVector<T>::append(T &&t)
 
     ++d->size;
 }
-#endif
 
 template <typename T>
 void QVector<T>::removeLast()
@@ -1052,14 +1081,14 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(Vector)
 
 template <typename T>
 uint qHash(const QVector<T> &key, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHashRange(key.cbegin(), key.cend(), seed)))
+    noexcept(noexcept(qHashRange(key.cbegin(), key.cend(), seed)))
 {
     return qHashRange(key.cbegin(), key.cend(), seed);
 }
 
 template <typename T>
 bool operator<(const QVector<T> &lhs, const QVector<T> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(),
+    noexcept(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(),
                                                                rhs.begin(), rhs.end())))
 {
     return std::lexicographical_compare(lhs.begin(), lhs.end(),
@@ -1068,21 +1097,21 @@ bool operator<(const QVector<T> &lhs, const QVector<T> &rhs)
 
 template <typename T>
 inline bool operator>(const QVector<T> &lhs, const QVector<T> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return rhs < lhs;
 }
 
 template <typename T>
 inline bool operator<=(const QVector<T> &lhs, const QVector<T> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return !(lhs > rhs);
 }
 
 template <typename T>
 inline bool operator>=(const QVector<T> &lhs, const QVector<T> &rhs)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs))
+    noexcept(noexcept(lhs < rhs))
 {
     return !(lhs < rhs);
 }
@@ -1104,6 +1133,24 @@ extern template class Q_CORE_EXPORT QVector<QPoint>;
 
 QVector<uint> QStringView::toUcs4() const { return QtPrivate::convertToUcs4(*this); }
 
+QVector<QStringRef> QString::splitRef(const QString &sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const
+{ return splitRef(sep, _sb(behavior), cs); }
+QVector<QStringRef> QString::splitRef(QChar sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const
+{ return splitRef(sep, _sb(behavior), cs); }
+#ifndef QT_NO_REGEXP
+QVector<QStringRef> QString::splitRef(const QRegExp &sep, Qt::SplitBehavior behavior) const
+{ return splitRef(sep, _sb(behavior)); }
+#endif
+#if QT_CONFIG(regularexpression)
+QVector<QStringRef> QString::splitRef(const QRegularExpression &sep, Qt::SplitBehavior behavior) const
+{ return splitRef(sep, _sb(behavior)); }
+#endif
+QVector<QStringRef> QStringRef::split(const QString &sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const
+{ return split(sep, QString::_sb(behavior), cs); }
+QVector<QStringRef> QStringRef::split(QChar sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const
+{ return split(sep, QString::_sb(behavior), cs); }
+
+
 QT_END_NAMESPACE
 
 #endif // QVECTOR_H
diff --git a/src/corelib/tools/qvector.qdoc b/src/corelib/tools/qvector.qdoc
index ad5821e73b..8765b7fbd6 100644
--- a/src/corelib/tools/qvector.qdoc
+++ b/src/corelib/tools/qvector.qdoc
@@ -261,6 +261,18 @@
     lists.
 */
 
+/*! \fn template <typename T> template<typename InputIterator> QVector<T>::QVector(InputIterator first, InputIterator last)
+    \since 5.14
+
+    Constructs a vector with the contents in the iterator range [\a first, \a last).
+
+    The value type of \c InputIterator must be convertible to \c T.
+*/
+
+/*!
+    \fn template <typename T> QVector<T>::QVector(QArrayDataPointerRef<T> ref)
+    \internal
+*/
 
 /*! \fn template <typename T> QVector<T>::~QVector()
 
@@ -281,6 +293,17 @@
     \since 5.2
 */
 
+/*!
+    \fn template <typename T> QVector<T> &QVector<T>::operator=(std::initializer_list<T> args)
+
+    Assigns the collection of values in \a args to this QVector instance.
+
+    This operator is only enabled if the compiler supports C++11 initializer
+    lists.
+
+    \since 5.14
+*/
+
 /*! \fn template <typename T> void QVector<T>::swap(QVector<T> &other)
     \since 4.8
 
@@ -288,6 +311,16 @@
     never fails.
 */
 
+/*! \fn template <typename T> void QVector<T>::swapItemsAt(int i, int j)
+    \since 5.14
+
+    Exchange the item at index position \a i with the item at index
+    position \a j. This function assumes that both \a i and \a j are
+    at least 0 but less than size(). To avoid failure, test that both
+    \a i and \a j are at least 0 and less than size().
+*/
+
+
 /*! \fn template <typename T> bool QVector<T>::operator==(const QVector<T> &other) const
 
     Returns \c true if \a other is equal to this vector; otherwise
diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp
index b96e48252e..58e3c15560 100644
--- a/src/corelib/tools/qversionnumber.cpp
+++ b/src/corelib/tools/qversionnumber.cpp
@@ -235,7 +235,7 @@ QVersionNumber QVersionNumber::normalized() const
 
     \sa commonPrefix()
 */
-bool QVersionNumber::isPrefixOf(const QVersionNumber &other) const Q_DECL_NOTHROW
+bool QVersionNumber::isPrefixOf(const QVersionNumber &other) const noexcept
 {
     if (segmentCount() > other.segmentCount())
         return false;
@@ -259,7 +259,7 @@ bool QVersionNumber::isPrefixOf(const QVersionNumber &other) const Q_DECL_NOTHRO
 
     \snippet qversionnumber/main.cpp 1
 */
-int QVersionNumber::compare(const QVersionNumber &v1, const QVersionNumber &v2) Q_DECL_NOTHROW
+int QVersionNumber::compare(const QVersionNumber &v1, const QVersionNumber &v2) noexcept
 {
     int commonlen;
 
@@ -482,7 +482,7 @@ QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex
     if (suffixIndex)
         *suffixIndex = int(lastGoodEnd - string.begin());
 
-    return QVersionNumber(qMove(seg));
+    return QVersionNumber(std::move(seg));
 }
 
 void QVersionNumber::SegmentStorage::setVector(int len, int maj, int min, int mic)
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h
index 1bfb4aab39..d43b86ba51 100644
--- a/src/corelib/tools/qversionnumber.h
+++ b/src/corelib/tools/qversionnumber.h
@@ -87,7 +87,7 @@ class QVersionNumber
         };
 
         // set the InlineSegmentMarker and set length to zero
-        SegmentStorage() Q_DECL_NOTHROW : dummy(1) {}
+        SegmentStorage() noexcept : dummy(1) {}
 
         SegmentStorage(const QVector<int> &seg)
         {
@@ -119,14 +119,13 @@ class QVersionNumber
             return *this;
         }
 
-#ifdef Q_COMPILER_RVALUE_REFS
-        SegmentStorage(SegmentStorage &&other) Q_DECL_NOTHROW
+        SegmentStorage(SegmentStorage &&other) noexcept
             : dummy(other.dummy)
         {
             other.dummy = 1;
         }
 
-        SegmentStorage &operator=(SegmentStorage &&other) Q_DECL_NOTHROW
+        SegmentStorage &operator=(SegmentStorage &&other) noexcept
         {
             qSwap(dummy, other.dummy);
             return *this;
@@ -139,8 +138,6 @@ class QVersionNumber
             else
                 pointer_segments = new QVector<int>(std::move(seg));
         }
-#endif
-#ifdef Q_COMPILER_INITIALIZER_LISTS
         SegmentStorage(std::initializer_list<int> args)
         {
             if (dataFitsInline(args.begin(), int(args.size()))) {
@@ -149,14 +146,13 @@ class QVersionNumber
                 pointer_segments = new QVector<int>(args);
             }
         }
-#endif
 
         ~SegmentStorage() { if (isUsingPointer()) delete pointer_segments; }
 
-        bool isUsingPointer() const Q_DECL_NOTHROW
+        bool isUsingPointer() const noexcept
         { return (inline_segments[InlineSegmentMarker] & 1) == 0; }
 
-        int size() const Q_DECL_NOTHROW
+        int size() const noexcept
         { return isUsingPointer() ? pointer_segments->size() : (inline_segments[InlineSegmentMarker] >> 1); }
 
         void setInlineSize(int len)
@@ -218,7 +214,7 @@ class QVersionNumber
     } m_segments;
 
 public:
-    inline QVersionNumber() Q_DECL_NOTHROW
+    inline QVersionNumber() noexcept
         : m_segments()
     {}
     inline explicit QVersionNumber(const QVector<int> &seg)
@@ -227,17 +223,13 @@ public:
 
     // compiler-generated copy/move ctor/assignment operators and the destructor are ok
 
-#ifdef Q_COMPILER_RVALUE_REFS
     explicit QVersionNumber(QVector<int> &&seg)
         : m_segments(std::move(seg))
     {}
-#endif
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
     inline QVersionNumber(std::initializer_list<int> args)
         : m_segments(args)
     {}
-#endif
 
     inline explicit QVersionNumber(int maj)
     { m_segments.setSegments(1, maj); }
@@ -248,34 +240,34 @@ public:
     inline explicit QVersionNumber(int maj, int min, int mic)
     { m_segments.setSegments(3, maj, min, mic); }
 
-    Q_REQUIRED_RESULT inline bool isNull() const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline bool isNull() const noexcept
     { return segmentCount() == 0; }
 
-    Q_REQUIRED_RESULT inline bool isNormalized() const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline bool isNormalized() const noexcept
     { return isNull() || segmentAt(segmentCount() - 1) != 0; }
 
-    Q_REQUIRED_RESULT inline int majorVersion() const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline int majorVersion() const noexcept
     { return segmentAt(0); }
 
-    Q_REQUIRED_RESULT inline int minorVersion() const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline int minorVersion() const noexcept
     { return segmentAt(1); }
 
-    Q_REQUIRED_RESULT inline int microVersion() const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline int microVersion() const noexcept
     { return segmentAt(2); }
 
     Q_REQUIRED_RESULT Q_CORE_EXPORT QVersionNumber normalized() const;
 
     Q_REQUIRED_RESULT Q_CORE_EXPORT QVector<int> segments() const;
 
-    Q_REQUIRED_RESULT inline int segmentAt(int index) const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline int segmentAt(int index) const noexcept
     { return (m_segments.size() > index) ? m_segments.at(index) : 0; }
 
-    Q_REQUIRED_RESULT inline int segmentCount() const Q_DECL_NOTHROW
+    Q_REQUIRED_RESULT inline int segmentCount() const noexcept
     { return m_segments.size(); }
 
-    Q_REQUIRED_RESULT Q_CORE_EXPORT bool isPrefixOf(const QVersionNumber &other) const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT Q_CORE_EXPORT bool isPrefixOf(const QVersionNumber &other) const noexcept;
 
-    Q_REQUIRED_RESULT Q_CORE_EXPORT static int compare(const QVersionNumber &v1, const QVersionNumber &v2) Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT Q_CORE_EXPORT static int compare(const QVersionNumber &v1, const QVersionNumber &v2) noexcept;
 
     Q_REQUIRED_RESULT Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber commonPrefix(const QVersionNumber &v1, const QVersionNumber &v2);
 
@@ -299,22 +291,22 @@ Q_DECLARE_TYPEINFO(QVersionNumber, Q_MOVABLE_TYPE);
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QVersionNumber &version);
 #endif
 
-Q_REQUIRED_RESULT inline bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
 { return QVersionNumber::compare(lhs, rhs) > 0; }
 
-Q_REQUIRED_RESULT inline bool operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
 { return QVersionNumber::compare(lhs, rhs) >= 0; }
 
-Q_REQUIRED_RESULT inline bool operator< (const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool operator< (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
 { return QVersionNumber::compare(lhs, rhs) < 0; }
 
-Q_REQUIRED_RESULT inline bool operator<=(const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool operator<=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
 { return QVersionNumber::compare(lhs, rhs) <= 0; }
 
-Q_REQUIRED_RESULT inline bool operator==(const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool operator==(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
 { return QVersionNumber::compare(lhs, rhs) == 0; }
 
-Q_REQUIRED_RESULT inline bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW
+Q_REQUIRED_RESULT inline bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
 { return QVersionNumber::compare(lhs, rhs) != 0; }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 995bab694e..40c84157cd 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -8,21 +8,10 @@ HEADERS +=  \
         tools/qarraydataops.h \
         tools/qarraydatapointer.h \
         tools/qbitarray.h \
-        tools/qbytearray.h \
-        tools/qbytearray_p.h \
-        tools/qbytearraylist.h \
-        tools/qbytearraymatcher.h \
-        tools/qbytedata_p.h \
         tools/qcache.h \
-        tools/qchar.h \
-        tools/qcollator.h \
-        tools/qcollator_p.h \
         tools/qcontainerfwd.h \
+        tools/qcontainertools_impl.h \
         tools/qcryptographichash.h \
-        tools/qdatetime.h \
-        tools/qdatetime_p.h \
-        tools/qdoublescanprint_p.h \
-        tools/qeasingcurve.h \
         tools/qfreelist_p.h \
         tools/qhash.h \
         tools/qhashfunctions.h \
@@ -30,10 +19,6 @@ HEADERS +=  \
         tools/qline.h \
         tools/qlinkedlist.h \
         tools/qlist.h \
-        tools/qlocale.h \
-        tools/qlocale_p.h \
-        tools/qlocale_tools_p.h \
-        tools/qlocale_data_p.h \
         tools/qmakearray_p.h \
         tools/qmap.h \
         tools/qmargins.h \
@@ -44,7 +29,6 @@ HEADERS +=  \
         tools/qpoint.h \
         tools/qqueue.h \
         tools/qrect.h \
-        tools/qregexp.h \
         tools/qringbuffer_p.h \
         tools/qrefcount.h \
         tools/qscopeguard.h \
@@ -58,20 +42,7 @@ HEADERS +=  \
         tools/qsimd_p.h \
         tools/qsize.h \
         tools/qstack.h \
-        tools/qstring.h \
-        tools/qstringalgorithms.h \
-        tools/qstringalgorithms_p.h \
-        tools/qstringbuilder.h \
-        tools/qstringiterator_p.h \
-        tools/qstringlist.h \
-        tools/qstringliteral.h \
-        tools/qstringmatcher.h \
-        tools/qstringview.h \
-        tools/qtextboundaryfinder.h \
-        tools/qtimeline.h \
         tools/qtools_p.h \
-        tools/qunicodetables_p.h \
-        tools/qunicodetools_p.h \
         tools/qvarlengtharray.h \
         tools/qvector.h \
         tools/qversionnumber.h
@@ -80,59 +51,29 @@ HEADERS +=  \
 SOURCES += \
         tools/qarraydata.cpp \
         tools/qbitarray.cpp \
-        tools/qbytearray.cpp \
-        tools/qbytearraylist.cpp \
-        tools/qbytearraymatcher.cpp \
-        tools/qcollator.cpp \
         tools/qcryptographichash.cpp \
-        tools/qdatetime.cpp \
-        tools/qeasingcurve.cpp \
         tools/qfreelist.cpp \
         tools/qhash.cpp \
         tools/qline.cpp \
         tools/qlinkedlist.cpp \
         tools/qlist.cpp \
-        tools/qlocale.cpp \
-        tools/qlocale_tools.cpp \
         tools/qpoint.cpp \
         tools/qmap.cpp \
         tools/qmargins.cpp \
         tools/qmessageauthenticationcode.cpp \
         tools/qcontiguouscache.cpp \
         tools/qrect.cpp \
-        tools/qregexp.cpp \
         tools/qrefcount.cpp \
         tools/qringbuffer.cpp \
         tools/qshareddata.cpp \
         tools/qsharedpointer.cpp \
         tools/qsimd.cpp \
         tools/qsize.cpp \
-        tools/qstring.cpp \
-        tools/qstringbuilder.cpp \
-        tools/qstringlist.cpp \
-        tools/qstringview.cpp \
-        tools/qtextboundaryfinder.cpp \
-        tools/qtimeline.cpp \
-        tools/qunicodetools.cpp \
-        tools/qvsnprintf.cpp \
         tools/qversionnumber.cpp
 
-NO_PCH_SOURCES = tools/qstring_compat.cpp
 msvc: NO_PCH_SOURCES += tools/qvector_msvc.cpp
 false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator
 
-!nacl:mac: {
-    SOURCES += tools/qlocale_mac.mm
-}
-else:unix {
-    SOURCES += tools/qlocale_unix.cpp
-}
-else:win32 {
-    SOURCES += tools/qlocale_win.cpp
-} else:integrity {
-    SOURCES += tools/qlocale_unix.cpp
-}
-
 qtConfig(system-zlib) {
     include($$PWD/../../3rdparty/zlib_dependency.pri)
 } else {
@@ -140,54 +81,6 @@ qtConfig(system-zlib) {
     include($$PWD/../../3rdparty/zlib.pri)
 }
 
-qtConfig(icu) {
-    QMAKE_USE_PRIVATE += icu
-
-    SOURCES += tools/qlocale_icu.cpp \
-               tools/qcollator_icu.cpp
-} else: win32 {
-    SOURCES += tools/qcollator_win.cpp
-} else: macx {
-    SOURCES += tools/qcollator_macx.cpp
-} else {
-    SOURCES += tools/qcollator_posix.cpp
-}
-
-qtConfig(timezone) {
-    HEADERS += \
-        tools/qtimezone.h \
-        tools/qtimezoneprivate_p.h \
-        tools/qtimezoneprivate_data_p.h
-    SOURCES += \
-        tools/qtimezone.cpp \
-        tools/qtimezoneprivate.cpp
-    !nacl:darwin: {
-        SOURCES += tools/qtimezoneprivate_mac.mm
-    } else: android:!android-embedded: {
-        SOURCES += tools/qtimezoneprivate_android.cpp
-    } else: unix: {
-        SOURCES += tools/qtimezoneprivate_tz.cpp
-        qtConfig(icu): SOURCES += tools/qtimezoneprivate_icu.cpp
-    } else: qtConfig(icu): {
-        SOURCES += tools/qtimezoneprivate_icu.cpp
-    } else: win32: {
-        SOURCES += tools/qtimezoneprivate_win.cpp
-    }
-}
-
-qtConfig(datetimeparser) {
-    HEADERS += tools/qdatetimeparser_p.h
-    SOURCES += tools/qdatetimeparser.cpp
-}
-
-qtConfig(regularexpression) {
-    QMAKE_USE_PRIVATE += pcre2
-
-    HEADERS += \
-        tools/qregularexpression.h
-    SOURCES += tools/qregularexpression.cpp
-}
-
 qtConfig(commandlineparser) {
     HEADERS += \
         tools/qcommandlineoption.h \
@@ -197,19 +90,6 @@ qtConfig(commandlineparser) {
         tools/qcommandlineparser.cpp
 }
 
-INCLUDEPATH += ../3rdparty/harfbuzz/src
-HEADERS += ../3rdparty/harfbuzz/src/harfbuzz.h
-SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \
-           ../3rdparty/harfbuzz/src/harfbuzz-gdef.c \
-           ../3rdparty/harfbuzz/src/harfbuzz-gsub.c \
-           ../3rdparty/harfbuzz/src/harfbuzz-gpos.c \
-           ../3rdparty/harfbuzz/src/harfbuzz-impl.c \
-           ../3rdparty/harfbuzz/src/harfbuzz-open.c \
-           ../3rdparty/harfbuzz/src/harfbuzz-stream.c \
-           ../3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp \
-           tools/qharfbuzz.cpp
-HEADERS += tools/qharfbuzz_p.h
-
 INCLUDEPATH += ../3rdparty/md5 \
                ../3rdparty/md4 \
                ../3rdparty/sha3
@@ -220,11 +100,20 @@ qtConfig(system-doubleconversion) {
     include($$PWD/../../3rdparty/double-conversion/double-conversion.pri)
 }
 
+qtConfig(easingcurve) {
+    HEADERS += \
+        tools/qeasingcurve.h \
+        tools/qtimeline.h
+
+    SOURCES += \
+        tools/qeasingcurve.cpp \
+        tools/qtimeline.cpp
+}
+
 # Note: libm should be present by default becaue this is C++
 unix:!macx-icc:!vxworks:!haiku:!integrity:!wasm: LIBS_PRIVATE += -lm
 
 TR_EXCLUDE += ../3rdparty/*
 
 # MIPS DSP
-MIPS_DSP_ASM += tools/qstring_mips_dsp_asm.S
 MIPS_DSP_HEADERS += ../gui/painting/qt_mips_asm_dsp_p.h
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index 920a04315d..2cfd7e086c 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -9,11 +9,11 @@ qtConfig(dbus-linked) {
 }
 
 win32 { 
-    LIBS_PRIVATE += \
-        -lws2_32 \
-        -ladvapi32 \
-        -lnetapi32 \
-        -luser32
+    QMAKE_USE_PRIVATE += \
+        advapi32 \
+        netapi32 \
+        user32 \
+        ws2_32
 }
 
 DEFINES += QT_NO_FOREACH
diff --git a/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp
index be72220153..b64ea5cf21 100644
--- a/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp
@@ -186,7 +186,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, MyDictionary &myd
     argument.beginMap();
     mydict.clear();
 
-    while ( !argMap.atEnd() ) {
+    while ( !argument.atEnd() ) {
         int key;
         MyValue value;
         argument.beginMapEntry();
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp
index f22696639d..1e2cbf6da6 100644
--- a/src/dbus/qdbus_symbols.cpp
+++ b/src/dbus/qdbus_symbols.cpp
@@ -41,6 +41,7 @@
 #include <QtCore/qglobal.h>
 #if QT_CONFIG(library)
 #include <QtCore/qlibrary.h>
+#include <QtCore/private/qlocking_p.h>
 #endif
 #include <QtCore/qmutex.h>
 
@@ -80,7 +81,7 @@ bool qdbus_loadLibDBus()
 
     static bool triedToLoadLibrary = false;
     static QBasicMutex mutex;
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     QLibrary *&lib = qdbus_libdbus;
     if (triedToLoadLibrary)
@@ -99,15 +100,15 @@ bool qdbus_loadLibDBus()
     };
 
     lib->unload();
-    for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) {
-        for (uint j = 0; j < sizeof(baseNames) / sizeof(baseNames[0]); ++j) {
+    for (const int majorversion : majorversions) {
+        for (const QString &baseName : baseNames) {
 #ifdef Q_OS_WIN
             QString suffix;
-            if (majorversions[i] != -1)
-                suffix = QString::number(- majorversions[i]); // negative so it prepends the dash
-            lib->setFileName(baseNames[j] + suffix);
+            if (majorversion != -1)
+                suffix = QString::number(- majorversion); // negative so it prepends the dash
+            lib->setFileName(baseName + suffix);
 #else
-            lib->setFileNameAndVersion(baseNames[j], majorversions[i]);
+            lib->setFileNameAndVersion(baseName, majorversion);
 #endif
             if (lib->load() && lib->resolve("dbus_connection_open_private"))
                 return true;
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 148bd54147..87de784fc0 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -66,11 +66,11 @@ namespace {
 // of to QDBusAbstractInterface::customEvent.
 // See solution in Patch Set 1 of this change in the Qt Gerrit servers.
 // (https://codereview.qt-project.org/#/c/126384/1)
-class DisconnectRelayEvent : public QMetaCallEvent
+class DisconnectRelayEvent : public QAbstractMetaCallEvent
 {
 public:
     DisconnectRelayEvent(QObject *sender, const QMetaMethod &m)
-        : QMetaCallEvent(0, 0, nullptr, sender, m.methodIndex())
+        : QAbstractMetaCallEvent(sender, m.methodIndex())
     {}
 
     void placeMetaCall(QObject *object) override
@@ -164,7 +164,7 @@ bool QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, void *retu
                      "used to read property %s.%s",
                      mp.typeName(), qPrintable(interface), mp.name());
             lastError = QDBusError(QDBusError::Failed,
-                                   QString::fromLatin1("Unregistered type %1 cannot be handled")
+                                   QLatin1String("Unregistered type %1 cannot be handled")
                                    .arg(QLatin1String(mp.typeName())));
             return false;
         }
@@ -185,7 +185,7 @@ bool QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, void *retu
     if (reply.signature() != QLatin1String("v")) {
         QString errmsg = QLatin1String("Invalid signature `%1' in return from call to "
                                        DBUS_INTERFACE_PROPERTIES);
-        lastError = QDBusError(QDBusError::InvalidSignature, qMove(errmsg).arg(reply.signature()));
+        lastError = QDBusError(QDBusError::InvalidSignature, std::move(errmsg).arg(reply.signature()));
         return false;
     }
 
@@ -220,15 +220,15 @@ bool QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, void *retu
     }
 
     // there was an error...
-    QString errmsg = QLatin1String("Unexpected `%1' (%2) when retrieving property `%3.%4' "
-                                   "(expected type `%5' (%6))");
+    const auto errmsg = QLatin1String("Unexpected `%1' (%2) when retrieving property `%3.%4' "
+                                      "(expected type `%5' (%6))");
     lastError = QDBusError(QDBusError::InvalidSignature,
-                           errmsg.arg(QString::fromLatin1(foundType),
-                                      QString::fromLatin1(foundSignature),
+                           errmsg.arg(QLatin1String(foundType),
+                                      QLatin1String(foundSignature),
                                       interface,
-                                      QString::fromUtf8(mp.name()),
-                                      QString::fromLatin1(mp.typeName()),
-                                      QString::fromLatin1(expectedSignature)));
+                                      QLatin1String(mp.name()),
+                                      QLatin1String(mp.typeName()),
+                                      QLatin1String(expectedSignature)));
     return false;
 }
 
@@ -691,18 +691,20 @@ void QDBusAbstractInterface::internalPropSet(const char *propname, const QVarian
 }
 
 /*!
-    Calls the method \a method on this interface and passes the parameters to this function to the
-    method.
+    \fn QDBusAbstractInterface::call(const QString &message)
+    \internal
+*/
+
+/*!
+    \fn QDBusAbstractInterface::call(const QString &message, Args&&...args)
+
+    Calls the method \a method on this interface and passes \a args to the method.
+    All \a args must be convertible to QVariant.
 
     The parameters to \c call are passed on to the remote function via D-Bus as input
     arguments. Output arguments are returned in the QDBusMessage reply. If the reply is an error
     reply, lastError() will also be set to the contents of the error message.
 
-    This function can be used with up to 8 parameters, passed in arguments \a arg1, \a arg2,
-    \a arg3, \a arg4, \a arg5, \a arg6, \a arg7 and \a arg8. If you need more than 8
-    parameters or if you have a variable number of parameters to be passed, use
-    callWithArgumentList().
-
     It can be used the following way:
 
     \snippet code/src_qdbus_qdbusabstractinterface.cpp 0
@@ -710,6 +712,19 @@ void QDBusAbstractInterface::internalPropSet(const char *propname, const QVarian
     This example illustrates function calling with 0, 1 and 2 parameters and illustrates different
     parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one
     Unicode string, the second call to \c "ProcessWork" will contain one string and one byte array).
+
+    \note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments.
+
+    \sa callWithArgumentList()
+*/
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+/*!
+    \internal
+
+    This function exists for binary compatibility with Qt versions < 5.14.
+    Programs recompiled against Qt 5.14 will use the variadic template function
+    instead.
 */
 QDBusMessage QDBusAbstractInterface::call(const QString &method, const QVariant &arg1,
                                           const QVariant &arg2,
@@ -722,27 +737,44 @@ QDBusMessage QDBusAbstractInterface::call(const QString &method, const QVariant
 {
     return call(QDBus::AutoDetect, method, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
 }
+#endif
+
+/*!
+    \fn QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &message)
+    \internal
+*/
 
 /*!
+    \fn QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &message, Args&&...args)
+
     \overload
 
-    Calls the method \a method on this interface and passes the
-    parameters to this function to the method. If \a mode is \c
-    NoWaitForReply, then this function will return immediately after
+    Calls the method \a method on this interface and passes \a args to the method.
+    All \a args must be convertible to QVariant.
+
+    If \a mode is \c NoWaitForReply, then this function will return immediately after
     placing the call, without waiting for a reply from the remote
     method. Otherwise, \a mode indicates whether this function should
     activate the Qt Event Loop while waiting for the reply to arrive.
 
-    This function can be used with up to 8 parameters, passed in arguments \a arg1, \a arg2,
-    \a arg3, \a arg4, \a arg5, \a arg6, \a arg7 and \a arg8. If you need more than 8
-    parameters or if you have a variable number of parameters to be passed, use
-    callWithArgumentList().
-
     If this function reenters the Qt event loop in order to wait for the
     reply, it will exclude user input. During the wait, it may deliver
     signals and other method calls to your application. Therefore, it
     must be prepared to handle a reentrancy whenever a call is placed
     with call().
+
+    \note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments.
+
+    \sa callWithArgumentList()
+*/
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+/*!
+    \internal
+
+    This function exists for binary compatibility with Qt versions < 5.14.
+    Programs recompiled against Qt 5.14 will use the variadic template function
+    instead.
 */
 QDBusMessage QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &method,
                                           const QVariant &arg1,
@@ -787,22 +819,23 @@ QDBusMessage QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &m
 
     return callWithArgumentList(mode, method, argList);
 }
+#endif // Qt 5
 
+/*!
+    \fn QDBusAbstractInterface::asyncCall(const QString &message)
+    \internal
+*/
 
 /*!
-    \since 4.5
-    Calls the method \a method on this interface and passes the parameters to this function to the
-    method.
+    \fn QDBusAbstractInterface::asyncCall(const QString &message, Args&&...args)
+
+    Calls the method \a method on this interface and passes \a args to the method.
+    All \a args must be convertible to QVariant.
 
     The parameters to \c call are passed on to the remote function via D-Bus as input
     arguments. The returned QDBusPendingCall object can be used to find out information about
     the reply.
 
-    This function can be used with up to 8 parameters, passed in arguments \a arg1, \a arg2,
-    \a arg3, \a arg4, \a arg5, \a arg6, \a arg7 and \a arg8. If you need more than 8
-    parameters or if you have a variable number of parameters to be passed, use
-    asyncCallWithArgumentList().
-
     It can be used the following way:
 
     \snippet code/src_qdbus_qdbusabstractinterface.cpp 1
@@ -810,6 +843,19 @@ QDBusMessage QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &m
     This example illustrates function calling with 0, 1 and 2 parameters and illustrates different
     parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one
     Unicode string, the second call to \c "ProcessWork" will contain one string and one byte array).
+
+    \note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments.
+
+    \sa asyncCallWithArgumentList()
+*/
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+/*!
+    \internal
+
+    This function exists for binary compatibility with Qt versions < 5.14.
+    Programs recompiled against Qt 5.14 will use the variadic template function
+    instead.
 */
 QDBusPendingCall QDBusAbstractInterface::asyncCall(const QString &method, const QVariant &arg1,
                                                    const QVariant &arg2,
@@ -853,6 +899,7 @@ QDBusPendingCall QDBusAbstractInterface::asyncCall(const QString &method, const
 
     return asyncCallWithArgumentList(method, argList);
 }
+#endif // Qt 5
 
 /*!
     \internal
@@ -865,6 +912,24 @@ QDBusMessage QDBusAbstractInterface::internalConstCall(QDBus::CallMode mode,
     return const_cast<QDBusAbstractInterface*>(this)->callWithArgumentList(mode, method, args);
 }
 
+QDBusMessage QDBusAbstractInterface::doCall(QDBus::CallMode mode, const QString &method, const QVariant *args, size_t numArgs)
+{
+    QList<QVariant> list;
+    list.reserve(int(numArgs));
+    for (size_t i = 0; i < numArgs; ++i)
+        list.append(args[i]);
+    return callWithArgumentList(mode, method, list);
+}
+
+QDBusPendingCall QDBusAbstractInterface::doAsyncCall(const QString &method, const QVariant *args, size_t numArgs)
+{
+    QList<QVariant> list;
+    list.reserve(int(numArgs));
+    for (size_t i = 0; i < numArgs; ++i)
+        list.append(args[i]);
+    return asyncCallWithArgumentList(method, list);
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_DBUS
diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h
index d6b0870787..4f4c7430a5 100644
--- a/src/dbus/qdbusabstractinterface.h
+++ b/src/dbus/qdbusabstractinterface.h
@@ -49,6 +49,7 @@
 #include <QtDBus/qdbusmessage.h>
 #include <QtDBus/qdbusextratypes.h>
 #include <QtDBus/qdbusconnection.h>
+#include <QtDBus/qdbuspendingcall.h>
 
 #ifdef interface
 #undef interface
@@ -98,26 +99,52 @@ public:
     void setTimeout(int timeout);
     int timeout() const;
 
+    QDBusMessage call(const QString &method)
+    {
+        return doCall(QDBus::AutoDetect, method, nullptr, 0);
+    }
+
+    template <typename...Args>
+    QDBusMessage call(const QString &method, Args &&...args)
+    {
+        const QVariant variants[] = { QVariant(std::forward<Args>(args))... };
+        return doCall(QDBus::AutoDetect, method, variants, sizeof...(args));
+    }
+
+    QDBusMessage call(QDBus::CallMode mode, const QString &method)
+    {
+        return doCall(mode, method, nullptr, 0);
+    }
+
+    template <typename...Args>
+    QDBusMessage call(QDBus::CallMode mode, const QString &method, Args &&...args)
+    {
+        const QVariant variants[] = { QVariant(std::forward<Args>(args))... };
+        return doCall(mode, method, variants, sizeof...(args));
+    }
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QDBusMessage call(const QString &method,
-                      const QVariant &arg1 = QVariant(),
-                      const QVariant &arg2 = QVariant(),
-                      const QVariant &arg3 = QVariant(),
-                      const QVariant &arg4 = QVariant(),
-                      const QVariant &arg5 = QVariant(),
-                      const QVariant &arg6 = QVariant(),
-                      const QVariant &arg7 = QVariant(),
-                      const QVariant &arg8 = QVariant());
+                      const QVariant &arg1,
+                      const QVariant &arg2,
+                      const QVariant &arg3,
+                      const QVariant &arg4,
+                      const QVariant &arg5,
+                      const QVariant &arg6,
+                      const QVariant &arg7,
+                      const QVariant &arg8);
 
     QDBusMessage call(QDBus::CallMode mode,
                       const QString &method,
-                      const QVariant &arg1 = QVariant(),
-                      const QVariant &arg2 = QVariant(),
-                      const QVariant &arg3 = QVariant(),
-                      const QVariant &arg4 = QVariant(),
-                      const QVariant &arg5 = QVariant(),
-                      const QVariant &arg6 = QVariant(),
-                      const QVariant &arg7 = QVariant(),
-                      const QVariant &arg8 = QVariant());
+                      const QVariant &arg1,
+                      const QVariant &arg2,
+                      const QVariant &arg3,
+                      const QVariant &arg4,
+                      const QVariant &arg5,
+                      const QVariant &arg6,
+                      const QVariant &arg7,
+                      const QVariant &arg8);
+#endif // Qt 5
 
     QDBusMessage callWithArgumentList(QDBus::CallMode mode,
                                       const QString &method,
@@ -130,15 +157,30 @@ public:
                           const QList<QVariant> &args,
                           QObject *receiver, const char *member);
 
+    QDBusPendingCall asyncCall(const QString &method)
+    {
+        return doAsyncCall(method, nullptr, 0);
+    }
+
+    template <typename...Args>
+    QDBusPendingCall asyncCall(const QString &method, Args&&...args)
+    {
+        const QVariant variants[] = { QVariant(std::forward<Args>(args))... };
+        return doAsyncCall(method, variants, sizeof...(args));
+    }
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QDBusPendingCall asyncCall(const QString &method,
-                               const QVariant &arg1 = QVariant(),
-                               const QVariant &arg2 = QVariant(),
-                               const QVariant &arg3 = QVariant(),
-                               const QVariant &arg4 = QVariant(),
-                               const QVariant &arg5 = QVariant(),
-                               const QVariant &arg6 = QVariant(),
-                               const QVariant &arg7 = QVariant(),
-                               const QVariant &arg8 = QVariant());
+                               const QVariant &arg1,
+                               const QVariant &arg2,
+                               const QVariant &arg3,
+                               const QVariant &arg4,
+                               const QVariant &arg5,
+                               const QVariant &arg6,
+                               const QVariant &arg7,
+                               const QVariant &arg8);
+#endif // Qt 5
+
     QDBusPendingCall asyncCallWithArgumentList(const QString &method,
                                                const QList<QVariant> &args);
 
@@ -156,6 +198,10 @@ protected:
                                    const QList<QVariant> &args = QList<QVariant>()) const;
 
 private:
+    QDBusMessage doCall(QDBus::CallMode mode, const QString &method, const QVariant *args, size_t numArgs);
+    QDBusPendingCall doAsyncCall(const QString &method, const QVariant *args, size_t numArgs);
+
+private:
     Q_DECLARE_PRIVATE(QDBusAbstractInterface)
     Q_PRIVATE_SLOT(d_func(), void _q_serviceOwnerChanged(QString,QString,QString))
 };
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index 2d1373006d..764bc24165 100644
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -111,7 +111,7 @@ bool QDBusArgumentPrivate::checkWrite(QDBusArgumentPrivate *&d)
         if (!d->marshaller()->ok)
             return false;
 
-        if (d->message && d->ref.load() != 1) {
+        if (d->message && d->ref.loadRelaxed() != 1) {
             QDBusMarshaller *dd = new QDBusMarshaller(d->capabilities);
             dd->message = q_dbus_message_copy(d->message);
             q_dbus_message_iter_init_append(dd->message, &dd->iterator);
@@ -152,7 +152,7 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d)
     if (!checkRead(d))
         return false;           //  don't bother
 
-    if (d->ref.load() == 1)
+    if (d->ref.loadRelaxed() == 1)
         return true;            // no need to detach
 
     QDBusDemarshaller *dd = new QDBusDemarshaller(d->capabilities);
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h
index 94a89a4e08..b7cd4c8989 100644
--- a/src/dbus/qdbusargument.h
+++ b/src/dbus/qdbusargument.h
@@ -76,14 +76,12 @@ public:
 
     QDBusArgument();
     QDBusArgument(const QDBusArgument &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDBusArgument(QDBusArgument &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; }
-    QDBusArgument &operator=(QDBusArgument &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDBusArgument(QDBusArgument &&other) noexcept : d(other.d) { other.d = nullptr; }
+    QDBusArgument &operator=(QDBusArgument &&other) noexcept { swap(other); return *this; }
     QDBusArgument &operator=(const QDBusArgument &other);
     ~QDBusArgument();
 
-    void swap(QDBusArgument &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QDBusArgument &other) noexcept { qSwap(d, other.d); }
 
     // used for marshalling (Qt -> D-BUS)
     QDBusArgument &operator<<(uchar arg);
diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h
index b678b9606f..3553d3d151 100644
--- a/src/dbus/qdbusargument_p.h
+++ b/src/dbus/qdbusargument_p.h
@@ -71,7 +71,7 @@ class QDBusArgumentPrivate
 {
 public:
     inline QDBusArgumentPrivate(int flags = 0)
-        : message(0), ref(1), capabilities(flags)
+        : message(nullptr), ref(1), capabilities(flags)
     { }
     virtual ~QDBusArgumentPrivate();
 
@@ -104,7 +104,7 @@ public:
 class QDBusMarshaller: public QDBusArgumentPrivate
 {
 public:
-    QDBusMarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0), ba(0), closeCode(0), ok(true), skipSignature(false)
+    QDBusMarshaller(int flags) : QDBusArgumentPrivate(flags), parent(nullptr), ba(nullptr), closeCode(0), ok(true), skipSignature(false)
     { direction = Marshalling; }
     ~QDBusMarshaller();
 
@@ -161,7 +161,7 @@ private:
 class QDBusDemarshaller: public QDBusArgumentPrivate
 {
 public:
-    inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0)
+    inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(flags), parent(nullptr)
     { direction = Demarshalling; }
     ~QDBusDemarshaller();
 
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index 296d5b369f..d6f3230fd2 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -47,6 +47,7 @@
 #include <qvector.h>
 #include <qtimer.h>
 #include <qthread.h>
+#include <QtCore/private/qlocking_p.h>
 
 #include "qdbusconnectioninterface.h"
 #include "qdbuserror.h"
@@ -106,7 +107,7 @@ QDBusConnectionPrivate *QDBusConnectionManager::busConnection(QDBusConnection::B
     // (the event loop will resume delivery)
     bool suspendedDelivery = qApp && qApp->thread() == QThread::currentThread();
 
-    QMutexLocker lock(&defaultBusMutex);
+    const auto locker = qt_scoped_lock(defaultBusMutex);
     if (defaultBuses[type])
         return defaultBuses[type];
 
@@ -178,7 +179,7 @@ void QDBusConnectionManager::run()
     exec();
 
     // cleanup:
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     for (QHash<QString, QDBusConnectionPrivate *>::const_iterator it = connectionHash.constBegin();
          it != connectionHash.constEnd(); ++it) {
         QDBusConnectionPrivate *d = it.value();
@@ -240,7 +241,7 @@ QDBusConnectionPrivate *QDBusConnectionManager::connectToPeer(const QString &add
 
 void QDBusConnectionManager::executeConnectionRequest(QDBusConnectionManager::ConnectionRequestData *data)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     const QString &name = *data->name;
     QDBusConnectionPrivate *&d = data->result;
 
@@ -428,7 +429,7 @@ QDBusConnection::QDBusConnection(const QString &name)
     if (name.isEmpty() || _q_manager.isDestroyed()) {
         d = 0;
     } else {
-        QMutexLocker locker(&_q_manager()->mutex);
+        const auto locker = qt_scoped_lock(_q_manager()->mutex);
         d = _q_manager()->connection(name);
         if (d)
             d->ref.ref();
@@ -537,7 +538,7 @@ QDBusConnection QDBusConnection::connectToPeer(const QString &address,
 void QDBusConnection::disconnectFromBus(const QString &name)
 {
     if (_q_manager()) {
-        QMutexLocker locker(&_q_manager()->mutex);
+        const auto locker = qt_scoped_lock(_q_manager()->mutex);
         QDBusConnectionPrivate *d = _q_manager()->connection(name);
         if (d && d->mode != QDBusConnectionPrivate::ClientMode)
             return;
@@ -558,7 +559,7 @@ void QDBusConnection::disconnectFromBus(const QString &name)
 void QDBusConnection::disconnectFromPeer(const QString &name)
 {
     if (_q_manager()) {
-        QMutexLocker locker(&_q_manager()->mutex);
+        const auto locker = qt_scoped_lock(_q_manager()->mutex);
         QDBusConnectionPrivate *d = _q_manager()->connection(name);
         if (d && d->mode != QDBusConnectionPrivate::PeerMode)
             return;
diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h
index 3711981f78..368f811602 100644
--- a/src/dbus/qdbusconnection.h
+++ b/src/dbus/qdbusconnection.h
@@ -131,14 +131,12 @@ public:
 
     explicit QDBusConnection(const QString &name);
     QDBusConnection(const QDBusConnection &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDBusConnection(QDBusConnection &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; }
-    QDBusConnection &operator=(QDBusConnection &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDBusConnection(QDBusConnection &&other) noexcept : d(other.d) { other.d = nullptr; }
+    QDBusConnection &operator=(QDBusConnection &&other) noexcept { swap(other); return *this; }
     QDBusConnection &operator=(const QDBusConnection &other);
     ~QDBusConnection();
 
-    void swap(QDBusConnection &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QDBusConnection &other) noexcept { qSwap(d, other.d); }
 
     bool isConnected() const;
     QString baseService() const;
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 7769b9ea71..da67a6c5d4 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -115,7 +115,7 @@ public:
 
     struct Watcher
     {
-        Watcher(): watch(0), read(0), write(0) {}
+        Watcher(): watch(nullptr), read(nullptr), write(nullptr) {}
         DBusWatch *watch;
         QSocketNotifier *read;
         QSocketNotifier *write;
@@ -132,7 +132,7 @@ public:
 
     struct SignalHook
     {
-        inline SignalHook() : obj(0), midx(-1) { }
+        inline SignalHook() : obj(nullptr), midx(-1) { }
         QString service, path, signature;
         QObject* obj;
         int midx;
@@ -150,9 +150,9 @@ public:
     {
         typedef QVector<ObjectTreeNode> DataList;
 
-        inline ObjectTreeNode() : obj(0), flags(0) { }
+        inline ObjectTreeNode() : obj(nullptr), flags(0) { }
         inline ObjectTreeNode(const QString &n) // intentionally implicit
-            : name(n), obj(0), flags(0) { }
+            : name(n), obj(nullptr), flags(0) { }
         inline bool operator<(const QString &other) const
             { return name < other; }
         inline bool operator<(const QStringRef &other) const
@@ -194,7 +194,7 @@ public:
 
 public:
     // public methods are entry points from other objects
-    explicit QDBusConnectionPrivate(QObject *parent = 0);
+    explicit QDBusConnectionPrivate(QObject *parent = nullptr);
     ~QDBusConnectionPrivate();
 
     void createBusService();
diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp
index ebb3803489..a2335a1795 100644
--- a/src/dbus/qdbusconnectioninterface.cpp
+++ b/src/dbus/qdbusconnectioninterface.cpp
@@ -199,6 +199,18 @@ QDBusReply<QStringList> QDBusConnectionInterface::registeredServiceNames() const
 }
 
 /*!
+  \property QDBusConnectionInterface::activatableServiceNames
+  \brief holds the activatable service names
+  \since 5.14
+
+  Lists all names that can be activated on the bus.
+*/
+QDBusReply<QStringList> QDBusConnectionInterface::activatableServiceNames() const
+{
+    return internalConstCall(QDBus::AutoDetect, QLatin1String("ListActivatableNames"));
+}
+
+/*!
     Returns \c true if the service name \a serviceName has is currently
     registered.
 */
diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h
index c7b1573722..d19e116c53 100644
--- a/src/dbus/qdbusconnectioninterface.h
+++ b/src/dbus/qdbusconnectioninterface.h
@@ -68,6 +68,7 @@ class Q_DBUS_EXPORT QDBusConnectionInterface: public QDBusAbstractInterface
     ~QDBusConnectionInterface();
 
     Q_PROPERTY(QDBusReply<QStringList> registeredServiceNames READ registeredServiceNames)
+    Q_PROPERTY(QDBusReply<QStringList> activatableServiceNames READ activatableServiceNames)
 
 public:
     enum ServiceQueueOptions {
@@ -90,6 +91,7 @@ public:
 
 public Q_SLOTS:
     QDBusReply<QStringList> registeredServiceNames() const;
+    QDBusReply<QStringList> activatableServiceNames() const;
     QDBusReply<bool> isServiceRegistered(const QString &serviceName) const;
     QDBusReply<QString> serviceOwner(const QString &name) const;
     QDBusReply<bool> unregisterService(const QString &serviceName);
diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h
index c264f62b7d..312bac71de 100644
--- a/src/dbus/qdbuserror.h
+++ b/src/dbus/qdbuserror.h
@@ -41,6 +41,7 @@
 #define QDBUSERROR_H
 
 #include <QtDBus/qtdbusglobal.h>
+#include <QtCore/qobjectdefs.h>
 #include <QtCore/qstring.h>
 
 #ifndef QT_NO_DBUS
@@ -54,6 +55,7 @@ class QDBusMessage;
 
 class Q_DBUS_EXPORT QDBusError
 {
+    Q_GADGET
 public:
     enum ErrorType {
         NoError = 0,
@@ -90,6 +92,7 @@ public:
         LastErrorType = InvalidMember
 #endif
     };
+    Q_ENUM(ErrorType)
 
     QDBusError();
 #ifndef QT_BOOTSTRAPPED
@@ -98,18 +101,16 @@ public:
 #endif
     QDBusError(ErrorType error, const QString &message);
     QDBusError(const QDBusError &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDBusError(QDBusError &&other) Q_DECL_NOTHROW
+    QDBusError(QDBusError &&other) noexcept
         : code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm))
     {}
-    QDBusError &operator=(QDBusError &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDBusError &operator=(QDBusError &&other) noexcept { swap(other); return *this; }
     QDBusError &operator=(const QDBusError &other);
 #ifndef QT_BOOTSTRAPPED
     QDBusError &operator=(const QDBusMessage &msg);
 #endif
 
-    void swap(QDBusError &other) Q_DECL_NOTHROW
+    void swap(QDBusError &other) noexcept
     {
         qSwap(code,   other.code);
         qSwap(msg,    other.msg);
diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp
index a0b121a1a3..06fbd6062e 100644
--- a/src/dbus/qdbusextratypes.cpp
+++ b/src/dbus/qdbusextratypes.cpp
@@ -167,6 +167,14 @@ void QDBusSignature::doCheck()
 */
 
 /*!
+    \since 5.14
+
+    Implicit cast to QVariant. Equivalent to calling
+    QVariant::fromValue() with this object as argument.
+*/
+QDBusObjectPath::operator QVariant() const { return QVariant::fromValue(*this); }
+
+/*!
     \class QDBusSignature
     \inmodule QtDBus
     \since 4.2
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h
index 12961e2702..6bb12ffe49 100644
--- a/src/dbus/qdbusextratypes.h
+++ b/src/dbus/qdbusextratypes.h
@@ -54,29 +54,28 @@
 
 QT_BEGIN_NAMESPACE
 
-
 class Q_DBUS_EXPORT QDBusObjectPath
 {
     QString m_path;
 public:
-    QDBusObjectPath() Q_DECL_NOTHROW : m_path() {}
+    QDBusObjectPath() noexcept : m_path() {}
     // compiler-generated copy/move constructor/assignment operators are ok!
     // compiler-generated destructor is ok!
 
     inline explicit QDBusObjectPath(const char *path);
     inline explicit QDBusObjectPath(QLatin1String path);
     inline explicit QDBusObjectPath(const QString &path);
-#ifdef Q_COMPILER_RVALUE_REFS
     explicit QDBusObjectPath(QString &&p) : m_path(std::move(p)) { doCheck(); }
-#endif
 
-    void swap(QDBusObjectPath &other) Q_DECL_NOTHROW { qSwap(m_path, other.m_path); }
+    void swap(QDBusObjectPath &other) noexcept { qSwap(m_path, other.m_path); }
 
     inline void setPath(const QString &path);
 
     inline QString path() const
     { return m_path; }
 
+    operator QVariant() const;
+
 private:
     void doCheck();
 };
@@ -114,18 +113,16 @@ class Q_DBUS_EXPORT QDBusSignature
 {
     QString m_signature;
 public:
-    QDBusSignature() Q_DECL_NOTHROW : m_signature() {}
+    QDBusSignature() noexcept : m_signature() {}
     // compiler-generated copy/move constructor/assignment operators are ok!
     // compiler-generated destructor is ok!
 
     inline explicit QDBusSignature(const char *signature);
     inline explicit QDBusSignature(QLatin1String signature);
     inline explicit QDBusSignature(const QString &signature);
-#ifdef Q_COMPILER_RVALUE_REFS
     explicit QDBusSignature(QString &&sig) : m_signature(std::move(sig)) { doCheck(); }
-#endif
 
-    void swap(QDBusSignature &other) Q_DECL_NOTHROW { qSwap(m_signature, other.m_signature); }
+    void swap(QDBusSignature &other) noexcept { qSwap(m_signature, other.m_signature); }
 
     inline void setSignature(const QString &signature);
 
@@ -168,16 +165,14 @@ class QDBusVariant
 {
     QVariant m_variant;
 public:
-    QDBusVariant() Q_DECL_NOTHROW : m_variant() {}
+    QDBusVariant() noexcept : m_variant() {}
     // compiler-generated copy/move constructor/assignment operators are ok!
     // compiler-generated destructor is ok!
 
     inline explicit QDBusVariant(const QVariant &variant);
-#ifdef Q_COMPILER_RVALUE_REFS
-    explicit QDBusVariant(QVariant &&v) Q_DECL_NOTHROW : m_variant(std::move(v)) {}
-#endif
+    explicit QDBusVariant(QVariant &&v) noexcept : m_variant(std::move(v)) {}
 
-    void swap(QDBusVariant &other) Q_DECL_NOTHROW { qSwap(m_variant, other.m_variant); }
+    void swap(QDBusVariant &other) noexcept { qSwap(m_variant, other.m_variant); }
 
     inline void setVariant(const QVariant &variant);
 
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 1125480447..4c27a93382 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -49,6 +49,7 @@
 #include <qstringlist.h>
 #include <qtimer.h>
 #include <qthread.h>
+#include <private/qlocking_p.h>
 
 #include "qdbusargument.h"
 #include "qdbusconnection_p.h"
@@ -304,7 +305,7 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v
         q_dbus_connection_set_allow_anonymous(connection, true);
 
     QDBusConnectionPrivate *newConnection = new QDBusConnectionPrivate(serverConnection->parent());
-    QMutexLocker locker(&QDBusConnectionManager::instance()->mutex);
+    const auto locker = qt_scoped_lock(QDBusConnectionManager::instance()->mutex);
     QDBusConnectionManager::instance()->setConnection(QLatin1String("QDBusServer-") + QString::number(reinterpret_cast<qulonglong>(newConnection), 16), newConnection);
     serverConnection->serverConnectionNames << newConnection->name;
 
@@ -340,8 +341,9 @@ static QByteArray buildMatchRule(const QString &service,
                                  const QString &objectPath, const QString &interface,
                                  const QString &member, const QDBusConnectionPrivate::ArgMatchRules &argMatch, const QString & /*signature*/)
 {
-    QString result = QLatin1String("type='signal',");
-    QString keyValue = QLatin1String("%1='%2',");
+    QString result;
+    result += QLatin1String("type='signal',");
+    const auto keyValue = QLatin1String("%1='%2',");
 
     if (!service.isEmpty())
         result += keyValue.arg(QLatin1String("sender"), service);
@@ -354,13 +356,13 @@ static QByteArray buildMatchRule(const QString &service,
 
     // add the argument string-matching now
     if (!argMatch.args.isEmpty()) {
-        keyValue = QLatin1String("arg%1='%2',");
+        const QString keyValue = QLatin1String("arg%1='%2',");
         for (int i = 0; i < argMatch.args.count(); ++i)
             if (!argMatch.args.at(i).isNull())
                 result += keyValue.arg(i).arg(argMatch.args.at(i));
     }
     if (!argMatch.arg0namespace.isEmpty()) {
-        result += QStringLiteral("arg0namespace='%1',").arg(argMatch.arg0namespace);
+        result += QLatin1String("arg0namespace='%1',").arg(argMatch.arg0namespace);
     }
 
     result.chop(1);             // remove ending comma
@@ -534,7 +536,7 @@ qDBusSignalFilter(DBusConnection *connection, DBusMessage *message, void *data)
 
 bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
 {
-    if (!ref.load())
+    if (!ref.loadRelaxed())
         return false;
 
     // local message are always delivered, regardless of filtering
@@ -1077,7 +1079,7 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate()
     if (lastMode == ClientMode || lastMode == PeerMode) {
         // the bus service object holds a reference back to us;
         // we need to destroy it before we finish destroying ourselves
-        Q_ASSERT(ref.load() == 0);
+        Q_ASSERT(ref.loadRelaxed() == 0);
         QObject *obj = (QObject *)busService;
         if (obj) {
             disconnect(obj, nullptr, this, nullptr);
@@ -1196,7 +1198,7 @@ void QDBusConnectionPrivate::doDispatch()
             PendingMessageList::Iterator end = pendingMessages.end();
             for ( ; it != end; ++it) {
                 qDBusDebug() << this << "dequeueing message" << *it;
-                handleMessage(qMove(*it));
+                handleMessage(std::move(*it));
             }
             pendingMessages.clear();
         }
@@ -1330,8 +1332,6 @@ bool QDBusConnectionPrivate::prepareHook(QDBusConnectionPrivate::SignalHook &hoo
         hook.midx = findSlot(receiver, normalizedName, hook.params);
     }
     if (hook.midx < minMIdx) {
-        if (hook.midx == -1)
-        {}
         return false;
     }
 
@@ -1371,19 +1371,19 @@ void QDBusConnectionPrivate::sendError(const QDBusMessage &msg, QDBusError::Erro
         if (msg.interface().isEmpty())
             interfaceMsg = QLatin1String("any interface");
         else
-            interfaceMsg = QString::fromLatin1("interface '%1'").arg(msg.interface());
+            interfaceMsg = QLatin1String("interface '%1'").arg(msg.interface());
 
         send(msg.createErrorReply(code,
-                                  QString::fromLatin1("No such method '%1' in %2 at object path '%3' "
-                                                      "(signature '%4')")
+                                  QLatin1String("No such method '%1' in %2 at object path '%3' "
+                                                "(signature '%4')")
                                   .arg(msg.member(), interfaceMsg, msg.path(), msg.signature())));
     } else if (code == QDBusError::UnknownInterface) {
         send(msg.createErrorReply(QDBusError::UnknownInterface,
-                                  QString::fromLatin1("No such interface '%1' at object path '%2'")
+                                  QLatin1String("No such interface '%1' at object path '%2'")
                                   .arg(msg.interface(), msg.path())));
     } else if (code == QDBusError::UnknownObject) {
         send(msg.createErrorReply(QDBusError::UnknownObject,
-                                  QString::fromLatin1("No such object path '%1'").arg(msg.path())));
+                                  QLatin1String("No such object path '%1'").arg(msg.path())));
     }
 }
 
@@ -1553,8 +1553,8 @@ void QDBusConnectionPrivate::handleObjectCall(const QDBusMessage &msg)
         objThread = result.obj->thread();
         if (!objThread) {
             send(msg.createErrorReply(QDBusError::InternalError,
-                                      QString::fromLatin1("Object '%1' (at path '%2')"
-                                                          " has no thread. Cannot deliver message.")
+                                      QLatin1String("Object '%1' (at path '%2')"
+                                                    " has no thread. Cannot deliver message.")
                                       .arg(result.obj->objectName(), msg.path())));
             return;
         }
@@ -1863,7 +1863,7 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call)
 {
     QDBusConnectionPrivate *connection = const_cast<QDBusConnectionPrivate *>(call->connection);
 
-    QMutexLocker locker(&call->mutex);
+    auto locker = qt_unique_lock(call->mutex);
 
     connection->pendingCalls.removeOne(call);
 
@@ -1980,7 +1980,7 @@ public:
 #endif
         static bool initializedAmounts = false;
         static QBasicMutex initializeMutex;
-        QMutexLocker locker(&initializeMutex);
+        auto locker = qt_unique_lock(initializeMutex);
 
         if (!initializedAmounts) {
             int tmp = 0;
@@ -2084,7 +2084,7 @@ QDBusMessage QDBusConnectionPrivate::sendWithReplyLocal(const QDBusMessage &mess
         if (interface.isEmpty())
             interface = QLatin1String("<no-interface>");
         return QDBusMessage::createError(QDBusError::InternalError,
-                                         QString::fromLatin1("Internal error trying to call %1.%2 at %3 (signature '%4'")
+                                         QLatin1String("Internal error trying to call %1.%2 at %3 (signature '%4'")
                                          .arg(interface, message.member(),
                                               message.path(), message.signature()));
     }
@@ -2128,11 +2128,11 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM
 
     if ((receiver && returnMethod) || errorMethod) {
        // no one waiting, will delete pcall in processFinishedCall()
-       pcall->ref.store(1);
+       pcall->ref.storeRelaxed(1);
     } else {
        // set double ref to prevent race between processFinishedCall() and ref counting
        // by QDBusPendingCall::QExplicitlySharedDataPointer<QDBusPendingCallPrivate>
-       pcall->ref.store(2);
+       pcall->ref.storeRelaxed(2);
     }
 
     if (isLoopback) {
diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h
index 3cd029a933..87db910d25 100644
--- a/src/dbus/qdbusintegrator_p.h
+++ b/src/dbus/qdbusintegrator_p.h
@@ -86,7 +86,7 @@ struct QDBusSlotCache
         int slotIdx;
         QVector<int> metaTypes;
 
-        void swap(Data &other) Q_DECL_NOTHROW
+        void swap(Data &other) noexcept
         {
             qSwap(flags,     other.flags);
             qSwap(slotIdx,   other.slotIdx);
@@ -96,41 +96,42 @@ struct QDBusSlotCache
     typedef QMultiHash<QString, Data> Hash;
     Hash hash;
 
-    void swap(QDBusSlotCache &other) Q_DECL_NOTHROW { qSwap(hash, other.hash); }
+    void swap(QDBusSlotCache &other) noexcept { qSwap(hash, other.hash); }
 };
 Q_DECLARE_SHARED(QDBusSlotCache::Data)
 Q_DECLARE_SHARED(QDBusSlotCache)
 
-class QDBusCallDeliveryEvent: public QMetaCallEvent
+class QDBusCallDeliveryEvent: public QAbstractMetaCallEvent
 {
 public:
     QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender,
                            const QDBusMessage &msg, const QVector<int> &types, int f = 0)
-        : QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types), flags(f)
+        : QAbstractMetaCallEvent(sender, -1), connection(c), message(msg), metaTypes(types), id(id), flags(f)
         { }
 
     void placeMetaCall(QObject *object) override
     {
-        QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id());
+        QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id);
     }
 
 private:
     QDBusConnection connection; // just for refcounting
     QDBusMessage message;
     QVector<int> metaTypes;
+    int id;
     int flags;
 };
 
-class QDBusActivateObjectEvent: public QMetaCallEvent
+class QDBusActivateObjectEvent: public QAbstractMetaCallEvent
 {
 public:
     QDBusActivateObjectEvent(const QDBusConnection &c, QObject *sender,
                              const QDBusConnectionPrivate::ObjectTreeNode &n,
-                             int p, const QDBusMessage &m, QSemaphore *s = 0)
-        : QMetaCallEvent(0, ushort(-1), 0, sender, -1, 0, 0, 0, s), connection(c), node(n),
+                             int p, const QDBusMessage &m, QSemaphore *s = nullptr)
+        : QAbstractMetaCallEvent(sender, -1, s), connection(c), node(n),
           pathStartPos(p), message(m), handled(false)
         { }
-    ~QDBusActivateObjectEvent();
+    ~QDBusActivateObjectEvent() override;
 
     void placeMetaCall(QObject *) override;
 
@@ -142,15 +143,15 @@ private:
     bool handled;
 };
 
-class QDBusSpyCallEvent : public QMetaCallEvent
+class QDBusSpyCallEvent : public QAbstractMetaCallEvent
 {
 public:
     typedef void (*Hook)(const QDBusMessage&);
     QDBusSpyCallEvent(QDBusConnectionPrivate *cp, const QDBusConnection &c, const QDBusMessage &msg,
                       const Hook *hooks, int count)
-        : QMetaCallEvent(0, 0, nullptr, cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count)
+        : QAbstractMetaCallEvent(cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count)
     {}
-    ~QDBusSpyCallEvent();
+    ~QDBusSpyCallEvent() override;
     void placeMetaCall(QObject *) override;
     static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount);
 
diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index 0ef5061b5f..edee4fc1e5 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -203,7 +203,7 @@ QString qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode &node
 static inline QDBusMessage interfaceNotFoundError(const QDBusMessage &msg, const QString &interface_name)
 {
     return msg.createErrorReply(QDBusError::UnknownInterface,
-                                QString::fromLatin1("Interface %1 was not found in object %2")
+                                QLatin1String("Interface %1 was not found in object %2")
                                 .arg(interface_name, msg.path()));
 }
 
@@ -211,10 +211,10 @@ static inline QDBusMessage
 propertyNotFoundError(const QDBusMessage &msg, const QString &interface_name, const QByteArray &property_name)
 {
     return msg.createErrorReply(QDBusError::UnknownProperty,
-                                QString::fromLatin1("Property %1%2%3 was not found in object %4")
+                                QLatin1String("Property %1%2%3 was not found in object %4")
                                 .arg(interface_name,
-                                     QString::fromLatin1(interface_name.isEmpty() ? "" : "."),
-                                     QString::fromLatin1(property_name),
+                                     QLatin1String(interface_name.isEmpty() ? "" : "."),
+                                     QLatin1String(property_name),
                                      msg.path()));
 }
 
@@ -302,16 +302,16 @@ static QDBusMessage propertyWriteReply(const QDBusMessage &msg, const QString &i
         return propertyNotFoundError(msg, interface_name, property_name);
     case PropertyTypeMismatch:
         return msg.createErrorReply(QDBusError::InvalidArgs,
-                                    QString::fromLatin1("Invalid arguments for writing to property %1%2%3")
+                                    QLatin1String("Invalid arguments for writing to property %1%2%3")
                                     .arg(interface_name,
-                                         QString::fromLatin1(interface_name.isEmpty() ? "" : "."),
-                                         QString::fromLatin1(property_name)));
+                                         QLatin1String(interface_name.isEmpty() ? "" : "."),
+                                         QLatin1String(property_name)));
     case PropertyReadOnly:
         return msg.createErrorReply(QDBusError::PropertyReadOnly,
-                                    QString::fromLatin1("Property %1%2%3 is read-only")
+                                    QLatin1String("Property %1%2%3 is read-only")
                                     .arg(interface_name,
-                                         QString::fromLatin1(interface_name.isEmpty() ? "" : "."),
-                                         QString::fromLatin1(property_name)));
+                                         QLatin1String(interface_name.isEmpty() ? "" : "."),
+                                         QLatin1String(property_name)));
     case PropertyWriteFailed:
         return msg.createErrorReply(QDBusError::InternalError,
                                     QString::fromLatin1("Internal error"));
diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp
index 4ea6cefff6..8e0b3e4598 100644
--- a/src/dbus/qdbusmarshaller.cpp
+++ b/src/dbus/qdbusmarshaller.cpp
@@ -211,7 +211,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg)
         qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. "
                  "Use qDBusRegisterMetaType to register it",
                  QMetaType::typeName(id), id);
-        error(QString::fromLatin1("Unregistered type %1 passed in arguments")
+        error(QLatin1String("Unregistered type %1 passed in arguments")
               .arg(QLatin1String(QMetaType::typeName(id))));
         return false;
     }
@@ -253,7 +253,7 @@ inline QDBusMarshaller *QDBusMarshaller::beginArray(int id)
         qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. "
                  "Use qDBusRegisterMetaType to register it",
                  QMetaType::typeName(id), id);
-        error(QString::fromLatin1("Unregistered type %1 passed in arguments")
+        error(QLatin1String("Unregistered type %1 passed in arguments")
               .arg(QLatin1String(QMetaType::typeName(id))));
         return this;
     }
@@ -268,14 +268,14 @@ inline QDBusMarshaller *QDBusMarshaller::beginMap(int kid, int vid)
         qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. "
                  "Use qDBusRegisterMetaType to register it",
                  QMetaType::typeName(kid), kid);
-        error(QString::fromLatin1("Unregistered type %1 passed in arguments")
+        error(QLatin1String("Unregistered type %1 passed in arguments")
               .arg(QLatin1String(QMetaType::typeName(kid))));
         return this;
     }
     if (ksignature[1] != 0 || !QDBusUtil::isValidBasicType(*ksignature)) {
         qWarning("QDBusMarshaller: type '%s' (%d) cannot be used as the key type in a D-BUS map.",
                  QMetaType::typeName(kid), kid);
-        error(QString::fromLatin1("Type %1 passed in arguments cannot be used as a key in a map")
+        error(QLatin1String("Type %1 passed in arguments cannot be used as a key in a map")
               .arg(QLatin1String(QMetaType::typeName(kid))));
         return this;
     }
@@ -286,7 +286,7 @@ inline QDBusMarshaller *QDBusMarshaller::beginMap(int kid, int vid)
         qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. "
                  "Use qDBusRegisterMetaType to register it",
                  typeName, vid);
-        error(QString::fromLatin1("Unregistered type %1 passed in arguments")
+        error(QLatin1String("Unregistered type %1 passed in arguments")
               .arg(QLatin1String(typeName)));
         return this;
     }
@@ -417,7 +417,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
         qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. "
                  "Use qDBusRegisterMetaType to register it",
                  QMetaType::typeName(id), id);
-        error(QString::fromLatin1("Unregistered type %1 passed in arguments")
+        error(QLatin1String("Unregistered type %1 passed in arguments")
               .arg(QLatin1String(QMetaType::typeName(id))));
         return false;
     }
diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h
index 23e04045d8..41845317c4 100644
--- a/src/dbus/qdbusmessage.h
+++ b/src/dbus/qdbusmessage.h
@@ -68,13 +68,11 @@ public:
 
     QDBusMessage();
     QDBusMessage(const QDBusMessage &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDBusMessage &operator=(QDBusMessage &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDBusMessage &operator=(QDBusMessage &&other) noexcept { swap(other); return *this; }
     QDBusMessage &operator=(const QDBusMessage &other);
     ~QDBusMessage();
 
-    void swap(QDBusMessage &other) Q_DECL_NOTHROW { qSwap(d_ptr, other.d_ptr); }
+    void swap(QDBusMessage &other) noexcept { qSwap(d_ptr, other.d_ptr); }
 
     static QDBusMessage createSignal(const QString &path, const QString &interface,
                                      const QString &name);
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index c4296f5c55..806cf7b415 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -649,7 +649,7 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con
 
     // mark as an error
     error = QDBusError(QDBusError::UnknownInterface,
-        QString::fromLatin1("Interface '%1' was not found")
+        QLatin1String("Interface '%1' was not found")
                        .arg(interface));
     return 0;
 }
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index 0729a3cbbb..58ce4f8930 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -93,7 +93,7 @@ void QDBusMetaTypeId::init()
 
     // reentrancy is not a problem since everything else is locked on their own
     // set the guard variable at the end
-    if (!initialized.load()) {
+    if (!initialized.loadRelaxed()) {
         // register our types with Qt Core (calling qMetaTypeId<T>() does this implicitly)
         (void)message();
         (void)argument();
@@ -145,7 +145,7 @@ void QDBusMetaTypeId::init()
         qDBusRegisterMetaType<QVector<QDBusUnixFileDescriptor> >();
 #endif
 
-        initialized.store(true);
+        initialized.storeRelaxed(true);
     }
 }
 
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp
index 4d0131afff..8e604d5a77 100644
--- a/src/dbus/qdbuspendingcall.cpp
+++ b/src/dbus/qdbuspendingcall.cpp
@@ -47,6 +47,7 @@
 #include "qcoreapplication.h"
 #include "qcoreevent.h"
 #include <private/qobject_p.h>
+#include <private/qlocking_p.h>
 
 #ifndef QT_NO_DBUS
 
@@ -221,8 +222,8 @@ void QDBusPendingCallPrivate::checkReceivedSignature()
 
     // can't use startsWith here because a null string doesn't start or end with an empty string
     if (replyMessage.signature().indexOf(expectedReplySignature) != 0) {
-        QString errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", "
-                                         "expected \"%2\"");
+        const auto errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", "
+                                            "expected \"%2\"");
         replyMessage = QDBusMessage::createError(
             QDBusError::InvalidSignature,
             errorMsg.arg(replyMessage.signature(), expectedReplySignature));
@@ -232,7 +233,7 @@ void QDBusPendingCallPrivate::checkReceivedSignature()
 
 void QDBusPendingCallPrivate::waitForFinished()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     if (replyMessage.type() != QDBusMessage::InvalidMessage)
         return;                 // already finished
@@ -330,7 +331,7 @@ bool QDBusPendingCall::isFinished() const
     if (!d)
         return true; // considered finished
 
-    QMutexLocker locker(&d->mutex);
+    const auto locker = qt_scoped_lock(d->mutex);
     return d->replyMessage.type() != QDBusMessage::InvalidMessage;
 }
 
@@ -352,7 +353,7 @@ bool QDBusPendingCall::isValid() const
 {
     if (!d)
         return false;
-    QMutexLocker locker(&d->mutex);
+    const auto locker = qt_scoped_lock(d->mutex);
     return d->replyMessage.type() == QDBusMessage::ReplyMessage;
 }
 
@@ -369,7 +370,7 @@ bool QDBusPendingCall::isError() const
 {
     if (!d)
         return true; // considered finished and an error
-    QMutexLocker locker(&d->mutex);
+    const auto locker = qt_scoped_lock(d->mutex);
     return d->replyMessage.type() == QDBusMessage::ErrorMessage;
 }
 
@@ -384,7 +385,7 @@ bool QDBusPendingCall::isError() const
 QDBusError QDBusPendingCall::error() const
 {
     if (d) {
-        QMutexLocker locker(&d->mutex);
+        const auto locker = qt_scoped_lock(d->mutex);
         return QDBusError(d->replyMessage);
     }
 
@@ -409,7 +410,7 @@ QDBusMessage QDBusPendingCall::reply() const
 {
     if (!d)
         return QDBusMessage::createError(error());
-    QMutexLocker locker(&d->mutex);
+    const auto locker = qt_scoped_lock(d->mutex);
     return d->replyMessage;
 }
 
@@ -473,7 +474,7 @@ QDBusPendingCall QDBusPendingCall::fromCompletedCall(const QDBusMessage &msg)
         msg.type() == QDBusMessage::ReplyMessage) {
         d = new QDBusPendingCallPrivate(QDBusMessage(), 0);
         d->replyMessage = msg;
-        d->ref.store(1);
+        d->ref.storeRelaxed(1);
     }
 
     return QDBusPendingCall(d);
@@ -503,7 +504,7 @@ QDBusPendingCallWatcher::QDBusPendingCallWatcher(const QDBusPendingCall &call, Q
     : QObject(*new QDBusPendingCallWatcherPrivate, parent), QDBusPendingCall(call)
 {
     if (d) {                    // QDBusPendingCall::d
-        QMutexLocker locker(&d->mutex);
+        const auto locker = qt_scoped_lock(d->mutex);
         if (!d->watcherHelper) {
             d->watcherHelper = new QDBusPendingCallWatcherHelper;
             if (d->replyMessage.type() != QDBusMessage::InvalidMessage) {
diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h
index 24b1d6a7ca..dd99346301 100644
--- a/src/dbus/qdbuspendingcall.h
+++ b/src/dbus/qdbuspendingcall.h
@@ -60,12 +60,10 @@ class Q_DBUS_EXPORT QDBusPendingCall
 public:
     QDBusPendingCall(const QDBusPendingCall &other);
     ~QDBusPendingCall();
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDBusPendingCall &operator=(QDBusPendingCall &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDBusPendingCall &operator=(QDBusPendingCall &&other) noexcept { swap(other); return *this; }
     QDBusPendingCall &operator=(const QDBusPendingCall &other);
 
-    void swap(QDBusPendingCall &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QDBusPendingCall &other) noexcept { qSwap(d, other.d); }
 
 #ifndef Q_CLANG_QDOC
     // pretend that they aren't here
diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h
index 10f189ae43..e1f6240f3e 100644
--- a/src/dbus/qdbuspendingcall_p.h
+++ b/src/dbus/qdbuspendingcall_p.h
@@ -99,7 +99,7 @@ public:
     // }
 
     QDBusPendingCallPrivate(const QDBusMessage &sent, QDBusConnectionPrivate *connection)
-        : sentMessage(sent), connection(connection), watcherHelper(0), pending(0)
+        : sentMessage(sent), connection(connection), watcherHelper(nullptr), pending(nullptr)
     { }
     ~QDBusPendingCallPrivate();
     bool setReplyCallback(QObject *target, const char *member);
diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp
index 6aec571563..ec49bafb60 100644
--- a/src/dbus/qdbuspendingreply.cpp
+++ b/src/dbus/qdbuspendingreply.cpp
@@ -42,6 +42,8 @@
 #include "qdbuspendingcall_p.h"
 #include "qdbusmetatype.h"
 
+#include <QtCore/private/qlocking_p.h>
+
 #ifndef QT_NO_DBUS
 
 /*!
@@ -277,7 +279,7 @@ QVariant QDBusPendingReplyData::argumentAt(int index) const
 void QDBusPendingReplyData::setMetaTypes(int count, const int *types)
 {
     Q_ASSERT(d);
-    QMutexLocker locker(&d->mutex);
+    const auto locker = qt_scoped_lock(d->mutex);
     d->setMetaTypes(count, types);
     d->checkReceivedSignature();
 }
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
index bc5cd92c84..1d7e60ad7f 100644
--- a/src/dbus/qdbuspendingreply.h
+++ b/src/dbus/qdbuspendingreply.h
@@ -156,7 +156,7 @@ public:
     {
         Q_STATIC_ASSERT_X(Index >= 0 && Index < Count, "Index out of bounds");
         typedef typename Select<Index>::Type ResultType;
-        return qdbus_cast<ResultType>(argumentAt(Index), 0);
+        return qdbus_cast<ResultType>(argumentAt(Index), nullptr);
     }
 #endif
 
diff --git a/src/dbus/qdbusreply.cpp b/src/dbus/qdbusreply.cpp
index 6abfaf174c..cf1a70508c 100644
--- a/src/dbus/qdbusreply.cpp
+++ b/src/dbus/qdbusreply.cpp
@@ -228,14 +228,14 @@ void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data
         receivedSignature = "<empty signature>";
     QString errorMsg;
     if (receivedType) {
-        errorMsg = QString::fromLatin1("Unexpected reply signature: got \"%1\" (%4), "
+        errorMsg = QLatin1String("Unexpected reply signature: got \"%1\" (%4), "
                                          "expected \"%2\" (%3)")
                    .arg(QLatin1String(receivedSignature),
                         QLatin1String(expectedSignature),
                         QLatin1String(data.typeName()),
                         QLatin1String(receivedType));
     } else {
-        errorMsg = QString::fromLatin1("Unexpected reply signature: got \"%1\", "
+        errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", "
                                          "expected \"%2\" (%3)")
                    .arg(QLatin1String(receivedSignature),
                         QLatin1String(expectedSignature),
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index 3ac5c794e1..eccffc3d3e 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -43,6 +43,8 @@
 #include "qdbusconnectionmanager_p.h"
 #include "qdbusutil_p.h"
 
+#include <QtCore/private/qlocking_p.h>
+
 #ifndef QT_NO_DBUS
 
 QT_BEGIN_NAMESPACE
@@ -121,7 +123,7 @@ QDBusServer::~QDBusServer()
         locker.unlock();
     }
     d->serverObject = nullptr;
-    d->ref.store(0);
+    d->ref.storeRelaxed(0);
     d->deleteLater();
 }
 
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp
index 459cfc6c66..73d1db2680 100644
--- a/src/dbus/qdbusunixfiledescriptor.cpp
+++ b/src/dbus/qdbusunixfiledescriptor.cpp
@@ -208,7 +208,7 @@ QDBusUnixFileDescriptor::~QDBusUnixFileDescriptor()
 */
 bool QDBusUnixFileDescriptor::isValid() const
 {
-    return d ? d->fd.load() != -1 : false;
+    return d ? d->fd.loadRelaxed() != -1 : false;
 }
 
 /*!
@@ -226,7 +226,7 @@ bool QDBusUnixFileDescriptor::isValid() const
 */
 int QDBusUnixFileDescriptor::fileDescriptor() const
 {
-    return d ? d->fd.load() : -1;
+    return d ? d->fd.loadRelaxed() : -1;
 }
 
 // actual implementation
@@ -283,12 +283,12 @@ void QDBusUnixFileDescriptor::giveFileDescriptor(int fileDescriptor)
     else
         d = new QDBusUnixFileDescriptorPrivate;
 
-    const int fdl = d->fd.load();
+    const int fdl = d->fd.loadRelaxed();
     if (fdl != -1)
         qt_safe_close(fdl);
 
     if (fileDescriptor != -1)
-        d->fd.store(fileDescriptor);
+        d->fd.storeRelaxed(fileDescriptor);
 }
 
 /*!
@@ -309,7 +309,7 @@ int QDBusUnixFileDescriptor::takeFileDescriptor()
 
 QDBusUnixFileDescriptorPrivate::~QDBusUnixFileDescriptorPrivate()
 {
-    const int fdl = fd.load();
+    const int fdl = fd.loadRelaxed();
     if (fdl != -1)
         qt_safe_close(fdl);
 }
diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h
index ed3209ceda..fcd73b2ec5 100644
--- a/src/dbus/qdbusunixfiledescriptor.h
+++ b/src/dbus/qdbusunixfiledescriptor.h
@@ -46,9 +46,7 @@
 
 #ifndef QT_NO_DBUS
 
-#ifdef Q_COMPILER_RVALUE_REFS
-# include <utility>
-#endif
+#include <utility>
 
 QT_BEGIN_NAMESPACE
 
@@ -61,13 +59,11 @@ public:
     QDBusUnixFileDescriptor();
     explicit QDBusUnixFileDescriptor(int fileDescriptor);
     QDBusUnixFileDescriptor(const QDBusUnixFileDescriptor &other);
-#if defined(Q_COMPILER_RVALUE_REFS)
-    QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other) noexcept { swap(other); return *this; }
     QDBusUnixFileDescriptor &operator=(const QDBusUnixFileDescriptor &other);
     ~QDBusUnixFileDescriptor();
 
-    void swap(QDBusUnixFileDescriptor &other) Q_DECL_NOTHROW
+    void swap(QDBusUnixFileDescriptor &other) noexcept
     { qSwap(d, other.d); }
 
     bool isValid() const;
diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h
index 2f187687b8..0814cc8050 100644
--- a/src/dbus/qdbusutil_p.h
+++ b/src/dbus/qdbusutil_p.h
@@ -106,7 +106,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil
             return false;
         }
         if (isValidInterfaceName(name)) return true;
-        *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid interface class: %1").arg(name));
+        *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Invalid interface class: %1").arg(name));
         return false;
     }
 
@@ -118,7 +118,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil
             return false;
         }
         if (isValidBusName(name)) return true;
-        *error = QDBusError(QDBusError::InvalidService, QString::fromLatin1("Invalid service name: %1").arg(name));
+        *error = QDBusError(QDBusError::InvalidService, QLatin1String("Invalid service name: %1").arg(name));
         return false;
     }
 
@@ -130,11 +130,11 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil
             return false;
         }
         if (isValidObjectPath(path)) return true;
-        *error = QDBusError(QDBusError::InvalidObjectPath, QString::fromLatin1("Invalid object path: %1").arg(path));
+        *error = QDBusError(QDBusError::InvalidObjectPath, QLatin1String("Invalid object path: %1").arg(path));
         return false;
     }
 
-    inline bool checkMemberName(const QString &name, AllowEmptyFlag empty, QDBusError *error, const char *nameType = 0)
+    inline bool checkMemberName(const QString &name, AllowEmptyFlag empty, QDBusError *error, const char *nameType = nullptr)
     {
         if (!nameType) nameType = "member";
         if (name.isEmpty()) {
@@ -143,8 +143,8 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil
             return false;
         }
         if (isValidMemberName(name)) return true;
-        *error = QDBusError(QDBusError::InvalidMember, QString::fromLatin1("Invalid %1 name: %2")
-                            .arg(QString::fromLatin1(nameType), name));
+        *error = QDBusError(QDBusError::InvalidMember, QLatin1String("Invalid %1 name: %2")
+                            .arg(QLatin1String(nameType), name));
         return false;
     }
 
@@ -156,7 +156,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil
             return false;
         }
         if (isValidErrorName(name)) return true;
-        *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid error name: %1").arg(name));
+        *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Invalid error name: %1").arg(name));
         return false;
     }
 
diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp
index e3c503aa0f..c6b3b90508 100644
--- a/src/dbus/qdbusxmlgenerator.cpp
+++ b/src/dbus/qdbusxmlgenerator.cpp
@@ -108,14 +108,14 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method
             if (!signature)
                 continue;
 
-            retval += QString::fromLatin1("    <property name=\"%1\" type=\"%2\" access=\"%3\"")
+            retval += QLatin1String("    <property name=\"%1\" type=\"%2\" access=\"%3\"")
                       .arg(QLatin1String(mp.name()),
                            QLatin1String(signature),
                            accessAsString(mp.isReadable(), mp.isWritable()));
 
             if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) {
                 const char *typeName = QMetaType::typeName(typeId);
-                retval += QString::fromLatin1(">\n      <annotation name=\"org.qtproject.QtDBus.QtTypeName\" value=\"%3\"/>\n    </property>\n")
+                retval += QLatin1String(">\n      <annotation name=\"org.qtproject.QtDBus.QtTypeName\" value=\"%3\"/>\n    </property>\n")
                           .arg(typeNameToXml(typeName));
             } else {
                 retval += QLatin1String("/>\n");
@@ -157,12 +157,12 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method
         if (typeId != QMetaType::UnknownType && typeId != QMetaType::Void) {
             const char *typeName = QDBusMetaType::typeToSignature(typeId);
             if (typeName) {
-                xml += QString::fromLatin1("      <arg type=\"%1\" direction=\"out\"/>\n")
+                xml += QLatin1String("      <arg type=\"%1\" direction=\"out\"/>\n")
                        .arg(typeNameToXml(typeName));
 
                 // do we need to describe this argument?
                 if (QDBusMetaType::signatureToType(typeName) == QVariant::Invalid)
-                    xml += QString::fromLatin1("      <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n")
+                    xml += QLatin1String("      <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n")
                         .arg(typeNameToXml(QMetaType::typeName(typeId)));
             } else {
                 qWarning() << "Unsupported return type" << typeId << QMetaType::typeName(typeId) << "in method" << mm.name();
@@ -199,7 +199,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method
 
             QString name;
             if (!names.at(j - 1).isEmpty())
-                name = QString::fromLatin1("name=\"%1\" ").arg(QLatin1String(names.at(j - 1)));
+                name = QLatin1String("name=\"%1\" ").arg(QLatin1String(names.at(j - 1)));
 
             bool isOutput = isSignal || j > inputCount;
 
@@ -233,7 +233,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method
                                  " value=\"true\"/>\n");
 
         retval += xml;
-        retval += QString::fromLatin1("    </%1>\n")
+        retval += QLatin1String("    </%1>\n")
                   .arg(isSignal ? QLatin1String("signal") : QLatin1String("method"));
     }
 
@@ -256,7 +256,7 @@ QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo,
 
     if (xml.isEmpty())
         return QString();       // don't add an empty interface
-    return QString::fromLatin1("  <interface name=\"%1\">\n%2  </interface>\n")
+    return QLatin1String("  <interface name=\"%1\">\n%2  </interface>\n")
         .arg(interface, xml);
 }
 #if 0
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index bdec9e973a..db47a3abc1 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -1859,7 +1859,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug d, const QAccessibleInterface *iface)
         return d;
     }
     d.nospace();
-    d << "QAccessibleInterface(" << hex << (const void *) iface << dec;
+    d << "QAccessibleInterface(" << Qt::hex << (const void *) iface << Qt::dec;
     if (iface->isValid()) {
         d << " name=" << iface->text(QAccessible::Name) << ' ';
         d << "role=" << qAccessibleRoleString(iface->role()) << ' ';
@@ -1898,7 +1898,7 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
     QDebugStateSaver saver(d);
     d.nospace() << "QAccessibleEvent(";
     if (ev.object()) {
-        d.nospace() << "object=" << hex << ev.object() << dec;
+        d.nospace() << "object=" << Qt::hex << ev.object() << Qt::dec;
         d.nospace() << "child=" << ev.child();
     } else {
         d.nospace() << "no object, uniqueId=" << ev.uniqueId();
diff --git a/src/gui/accessible/qaccessiblecache_p.h b/src/gui/accessible/qaccessiblecache_p.h
index a976277c1d..cf1ed04f35 100644
--- a/src/gui/accessible/qaccessiblecache_p.h
+++ b/src/gui/accessible/qaccessiblecache_p.h
@@ -73,7 +73,7 @@ public:
     QAccessibleInterface *interfaceForId(QAccessible::Id id) const;
     QAccessible::Id idForInterface(QAccessibleInterface *iface) const;
     QAccessible::Id insert(QObject *object, QAccessibleInterface *iface) const;
-    void deleteInterface(QAccessible::Id id, QObject *obj = 0);
+    void deleteInterface(QAccessible::Id id, QObject *obj = nullptr);
 
 #ifdef Q_OS_MAC
     QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *elementForId(QAccessible::Id axid) const;
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 6280b4dfa2..c2793bf236 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -1,7 +1,7 @@
 {
     "module": "gui",
     "depends": [
-        "core",
+        "core-private",
         "network"
     ],
     "testDir": "../../config.tests",
@@ -28,9 +28,9 @@
             "lgmon": "boolean",
             "libinput": "boolean",
             "libjpeg": { "type": "enum", "values": [ "no", "qt", "system" ] },
+            "libmd4c": { "type": "enum", "values": [ "no", "qt", "system" ] },
             "libpng": { "type": "enum", "values": [ "no", "qt", "system" ] },
             "linuxfb": "boolean",
-            "mirclient": "boolean",
             "mtdev": "boolean",
             "opengl": { "type": "optionalString", "values": [ "no", "yes", "desktop", "es2", "dynamic" ] },
             "opengl-es-2": { "type": "void", "name": "opengl", "value": "es2" },
@@ -61,6 +61,7 @@
             "export": "",
             "headers": ["bcm_host.h"],
             "sources": [
+                { "type": "pkgConfig", "args": "bcm_host" },
                 { "type": "makeSpec", "spec": "BCM_HOST" }
             ]
         },
@@ -377,6 +378,17 @@
                 "-ljpeg"
             ]
         },
+        "libmd4c": {
+            "label": "libmd4c",
+            "test": {
+                "main": "md_parse(\"hello\", 5, nullptr, nullptr);"
+            },
+            "headers": "md4c.h",
+            "sources": [
+                { "type": "pkgConfig", "args": "md4c" },
+                { "libs": "-lmd4c" }
+            ]
+        },
         "libpng": {
             "label": "libpng",
             "test": {
@@ -395,20 +407,6 @@
                 { "lib": "zlib", "condition": "features.system-zlib" }
             ]
         },
-        "mirclient": {
-            "label": "Mir client libraries",
-            "test": {
-                "tail": "static void surfaceCreateCallback(MirSurface*, void*) {}",
-                "main": [
-                    "u_application_lifecycle_delegate_new();",
-                    "mir_surface_create(0, surfaceCreateCallback, 0);"
-                ]
-            },
-            "headers": [ "mir_toolkit/mir_client_library.h", "ubuntu/application/lifecycle_delegate.h", "EGL/egl.h" ],
-            "sources": [
-                { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api libcontent-hub >= 0.2.0" }
-            ]
-        },
         "mtdev": {
             "label": "mtdev",
             "test": {
@@ -491,7 +489,7 @@
         "tslib": {
             "label": "tslib",
             "test": {
-                "main": "ts_open(\"foo\", 0);"
+                "main": "ts_setup(nullptr, 0);"
             },
             "headers": "tslib.h",
             "sources": [
@@ -1297,13 +1295,6 @@
             ],
             "output": [ "privateFeature" ]
         },
-        "mirclient": {
-            "label": "Mir client",
-            "section": "Platform plugins",
-            "autoDetect": false,
-            "condition": "libs.mirclient && features.xkbcommon",
-            "output": [ "privateFeature" ]
-        },
         "mtdev": {
             "label": "mtdev",
             "condition": "libs.mtdev",
@@ -1367,9 +1358,14 @@
             "condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2",
             "output": [ "publicFeature", "feature" ]
         },
+        "vkgen": {
+            "label": "vkgen",
+            "condition": "features.xmlstreamreader",
+            "output": [ "privateFeature" ]
+        },
         "vulkan": {
             "label": "Vulkan",
-            "condition": "libs.vulkan",
+            "condition": "features.vkgen && libs.vulkan",
             "output": [ "publicFeature" ]
         },
         "openvg": {
@@ -1379,7 +1375,7 @@
         },
         "egl": {
             "label": "EGL",
-            "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl)",
+            "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix)",
             "output": [ "privateFeature", "feature" ]
         },
         "egl_x11": {
@@ -1555,6 +1551,7 @@
         },
         "xcb-native-painting": {
             "label": "Native painting (experimental)",
+            "autoDetect": false,
             "emitIf": "features.xcb",
             "condition": "features.xcb-xlib && features.fontconfig && libs.xrender",
             "output": [ "privateFeature" ]
@@ -1605,6 +1602,28 @@
             "section": "Kernel",
             "output": [ "publicFeature", "feature" ]
         },
+        "textmarkdownreader": {
+            "label": "MarkdownReader",
+            "disable": "input.libmd4c == 'no'",
+            "enable": "input.libmd4c == 'system' || input.libmd4c == 'qt' || input.libmd4c == 'yes'",
+            "purpose": "Provides a Markdown (CommonMark and GitHub) reader",
+            "section": "Kernel",
+            "output": [ "publicFeature" ]
+        },
+        "system-textmarkdownreader": {
+            "label": "  Using system libmd4c",
+            "disable": "input.libmd4c == 'qt'",
+            "enable": "input.libmd4c == 'system'",
+            "section": "Kernel",
+            "condition": "libs.libmd4c",
+            "output": [ "publicFeature" ]
+        },
+        "textmarkdownwriter": {
+            "label": "MarkdownWriter",
+            "purpose": "Provides a Markdown (CommonMark) writer",
+            "section": "Kernel",
+            "output": [ "publicFeature" ]
+        },
         "textodfwriter": {
             "label": "OdfWriter",
             "purpose": "Provides an ODF writer.",
@@ -1647,7 +1666,7 @@
             "label": "QClipboard",
             "purpose": "Provides cut and paste operations.",
             "section": "Kernel",
-            "condition": "!config.integrity && !config.qnx",
+            "condition": "!config.integrity && !config.qnx && !config.rtems",
             "output": [ "publicFeature", "feature" ]
         },
         "wheelevent": {
@@ -1791,7 +1810,7 @@
             "label": "Multi process",
             "purpose": "Provides support for detecting the desktop environment, launching external processes and opening URLs.",
             "section": "Utilities",
-            "condition": "!config.integrity",
+            "condition": "!config.integrity && !config.rtems",
             "output": [ "privateFeature" ]
         },
         "whatsthis": {
@@ -1799,6 +1818,12 @@
             "purpose": "Supports displaying \"What's this\" help.",
             "section": "Widget Support",
             "output": [ "publicFeature", "feature" ]
+        },
+        "raster-64bit": {
+            "label": "QPainter - 64 bit raster",
+            "purpose": "Internal painting support for 64 bit (16 bpc) rasterization.",
+            "section": "Painting",
+            "output": [ "privateFeature" ]
         }
     },
 
@@ -1830,7 +1855,7 @@ or may depend on your system and XQuartz setup."
         },
         {
             "type": "warning",
-            "condition": "features.gui && config.linux && !config.android && !features.xcb && !features.eglfs && !features.directfb && !features.linuxfb && !features.mirclient",
+            "condition": "features.gui && config.linux && !config.android && !features.xcb && !features.eglfs && !features.directfb && !features.linuxfb",
             "message": "No QPA platform plugin enabled! This will
 produce a Qt that cannot run GUI applications.
 See \"Platform backends\" in the output of --help."
@@ -1877,6 +1902,12 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
                         "gif", "ico", "jpeg", "system-jpeg", "png", "system-png"
                     ]
                 },
+                {
+                    "section": "Text formats",
+                    "entries": [
+                        "texthtmlparser", "cssparser", "textodfwriter", "textmarkdownreader", "system-textmarkdownreader", "textmarkdownwriter"
+                    ]
+                },
                 "egl",
                 "openvg",
                 {
@@ -1938,7 +1969,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
                         "eglfs_openwfd", "eglfs_viv", "eglfs_viv_wl", "eglfs_rcar", "eglfs_egldevice", "eglfs_gbm", "eglfs_vsp2", "eglfs_mali", "eglfs_brcm", "eglfs_x11"
                     ]
                 },
-                "linuxfb", "vnc", "mirclient",
+                "linuxfb", "vnc",
                 {
                     "type": "feature",
                     "condition": "config.integrity",
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index 049b9ef179..76dd6d7ea1 100644
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -67,3 +67,6 @@ navigation.cppclassespage = "Qt GUI C++ Classes"
 
 # Ignore warnings about undocumented enum values for the QGradient presets
 spurious += "Undocumented enum item '.*' in QGradient::Preset"
+
+# \svgcolor {#ffdead}
+macro.svgcolor.HTML = "<div style=\"padding:10px;color:#fff;background:\1;\"></div>"
diff --git a/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp b/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
index bf864ce48d..236d6952e6 100644
--- a/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
+++ b/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
@@ -114,7 +114,7 @@ void MainWindow::insertCalendar()
     int year = date.year(), month = date.month();
 
     for (int weekDay = 1; weekDay <= 7; ++weekDay) {
-        cursor.insertText(QString("%1 ").arg(QDate::shortDayName(weekDay), 3),
+        cursor.insertText(QString("%1 ").arg(QLocale::system().dayName(weekDay), 3),
             boldFormat);
     }
 
diff --git a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
index a5801da67e..849f0e957f 100644
--- a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
@@ -117,7 +117,7 @@ void MainWindow::insertCalendar()
     int year = date.year(), month = date.month();
 
     for (int weekDay = 1; weekDay <= 7; ++weekDay) {
-        cursor.insertText(QString("%1 ").arg(QDate::shortDayName(weekDay), 3),
+        cursor.insertText(QString("%1 ").arg(QLocale::system().dayName(weekDay), 3),
             boldFormat);
     }
 
diff --git a/src/gui/doc/snippets/textdocumentendsnippet.cpp b/src/gui/doc/snippets/textdocumentendsnippet.cpp
index c8de501838..cb7abd5ca7 100644
--- a/src/gui/doc/snippets/textdocumentendsnippet.cpp
+++ b/src/gui/doc/snippets/textdocumentendsnippet.cpp
@@ -59,7 +59,7 @@ int main(int argv, char **args)
 
 //! [0]
     for (QTextBlock it = doc->begin(); it != doc->end(); it = it.next())
-        cout << it.text().toStdString() << endl;
+        cout << it.text().toStdString() << Qt::endl;
 //! [0]
 
     return 0;
diff --git a/src/gui/doc/src/includes/qt-colors.qdocinc b/src/gui/doc/src/includes/qt-colors.qdocinc
new file mode 100644
index 0000000000..4c082323b6
--- /dev/null
+++ b/src/gui/doc/src/includes/qt-colors.qdocinc
@@ -0,0 +1,86 @@
+\table
+\header
+    \li Name
+    \li Hex
+    \li Color
+\row
+    \li Color0
+    \li #000000
+    \li \svgcolor {#000000}
+\row
+    \li Color1
+    \li #ffffff
+    \li \svgcolor {#ffffff}
+\row
+    \li Black
+    \li #000000
+    \li \svgcolor {#000000}
+\row
+    \li White
+    \li #ffffff
+    \li \svgcolor {#ffffff}
+\row
+    \li DarkGray
+    \li #808080
+    \li \svgcolor {#808080}
+\row
+    \li Gray
+    \li #a0a0a4
+    \li \svgcolor {#a0a0a4}
+\row
+    \li LightGray
+    \li #c0c0c0
+    \li \svgcolor {#c0c0c0}
+\row
+    \li Red
+    \li #ff0000
+    \li \svgcolor {#ff0000}
+\row
+    \li Green
+    \li #00ff00
+    \li \svgcolor {#00ff00}
+\row
+    \li Blue
+    \li #0000ff
+    \li \svgcolor {#0000ff}
+\row
+    \li Cyan
+    \li #00ffff
+    \li \svgcolor {#00ffff}
+\row
+    \li Magenta
+    \li #ff00ff
+    \li \svgcolor {#ff00ff}
+\row
+    \li Yellow
+    \li #ffff00
+    \li \svgcolor {#ffff00}
+\row
+    \li DarkRed
+    \li #800000
+    \li \svgcolor {#800000}
+\row
+    \li DarkGreen
+    \li #008000
+    \li \svgcolor {#008000}
+\row
+    \li DarkBlue
+    \li #000080
+    \li \svgcolor {#000080}
+\row
+    \li DarkCyan
+    \li #008080
+    \li \svgcolor {#008080}
+\row
+    \li DarkMagenta
+    \li #800080
+    \li \svgcolor {#800080}
+\row
+    \li DarkYellow
+    \li #808000
+    \li \svgcolor {#808000}
+\row
+    \li Transparent
+    \li #00000000
+    \li (transparent)
+\endtable
diff --git a/src/gui/doc/src/includes/svg-colors.qdocinc b/src/gui/doc/src/includes/svg-colors.qdocinc
new file mode 100644
index 0000000000..4e5fb56d5e
--- /dev/null
+++ b/src/gui/doc/src/includes/svg-colors.qdocinc
@@ -0,0 +1,594 @@
+\table
+\header
+    \li Name
+    \li Hex
+    \li Color
+\row
+    \li aliceblue
+    \li #f0f8ff
+    \li \svgcolor {#f0f8ff}
+\row
+    \li antiquewhite
+    \li #faebd7
+    \li \svgcolor {#faebd7}
+\row
+    \li aqua
+    \li #00ffff
+    \li \svgcolor {#00ffff}
+\row
+    \li aquamarine
+    \li #7fffd4
+    \li \svgcolor {#7fffd4}
+\row
+    \li azure
+    \li #f0ffff
+    \li \svgcolor {#f0ffff}
+\row
+    \li beige
+    \li #f5f5dc
+    \li \svgcolor {#f5f5dc}
+\row
+    \li bisque
+    \li #ffe4c4
+    \li \svgcolor {#ffe4c4}
+\row
+    \li black
+    \li #000000
+    \li \svgcolor {#000000}
+\row
+    \li blanchedalmond
+    \li #ffebcd
+    \li \svgcolor {#ffebcd}
+\row
+    \li blue
+    \li #0000ff
+    \li \svgcolor {#0000ff}
+\row
+    \li blueviolet
+    \li #8a2be2
+    \li \svgcolor {#8a2be2}
+\row
+    \li brown
+    \li #a52a2a
+    \li \svgcolor {#a52a2a}
+\row
+    \li burlywood
+    \li #deb887
+    \li \svgcolor {#deb887}
+\row
+    \li cadetblue
+    \li #5f9ea0
+    \li \svgcolor {#5f9ea0}
+\row
+    \li chartreuse
+    \li #7fff00
+    \li \svgcolor {#7fff00}
+\row
+    \li chocolate
+    \li #d2691e
+    \li \svgcolor {#d2691e}
+\row
+    \li coral
+    \li #ff7f50
+    \li \svgcolor {#ff7f50}
+\row
+    \li cornflowerblue
+    \li #6495ed
+    \li \svgcolor {#6495ed}
+\row
+    \li cornsilk
+    \li #fff8dc
+    \li \svgcolor {#fff8dc}
+\row
+    \li crimson
+    \li #dc143c
+    \li \svgcolor {#dc143c}
+\row
+    \li cyan
+    \li #00ffff
+    \li \svgcolor {#00ffff}
+\row
+    \li darkblue
+    \li #00008b
+    \li \svgcolor {#00008b}
+\row
+    \li darkcyan
+    \li #008b8b
+    \li \svgcolor {#008b8b}
+\row
+    \li darkgoldenrod
+    \li #b8860b
+    \li \svgcolor {#b8860b}
+\row
+    \li darkgray
+    \li #a9a9a9
+    \li \svgcolor {#a9a9a9}
+\row
+    \li darkgreen
+    \li #006400
+    \li \svgcolor {#006400}
+\row
+    \li darkgrey
+    \li #a9a9a9
+    \li \svgcolor {#a9a9a9}
+\row
+    \li darkkhaki
+    \li #bdb76b
+    \li \svgcolor {#bdb76b}
+\row
+    \li darkmagenta
+    \li #8b008b
+    \li \svgcolor {#8b008b}
+\row
+    \li darkolivegreen
+    \li #556b2f
+    \li \svgcolor {#556b2f}
+\row
+    \li darkorange
+    \li #ff8c00
+    \li \svgcolor {#ff8c00}
+\row
+    \li darkorchid
+    \li #9932cc
+    \li \svgcolor {#9932cc}
+\row
+    \li darkred
+    \li #8b0000
+    \li \svgcolor {#8b0000}
+\row
+    \li darksalmon
+    \li #e9967a
+    \li \svgcolor {#e9967a}
+\row
+    \li darkseagreen
+    \li #8fbc8f
+    \li \svgcolor {#8fbc8f}
+\row
+    \li darkslateblue
+    \li #483d8b
+    \li \svgcolor {#483d8b}
+\row
+    \li darkslategray
+    \li #2f4f4f
+    \li \svgcolor {#2f4f4f}
+\row
+    \li darkslategrey
+    \li #2f4f4f
+    \li \svgcolor {#2f4f4f}
+\row
+    \li darkturquoise
+    \li #00ced1
+    \li \svgcolor {#00ced1}
+\row
+    \li darkviolet
+    \li #9400d3
+    \li \svgcolor {#9400d3}
+\row
+    \li deeppink
+    \li #ff1493
+    \li \svgcolor {#ff1493}
+\row
+    \li deepskyblue
+    \li #00bfff
+    \li \svgcolor {#00bfff}
+\row
+    \li dimgray
+    \li #696969
+    \li \svgcolor {#696969}
+\row
+    \li dimgrey
+    \li #696969
+    \li \svgcolor {#696969}
+\row
+    \li dodgerblue
+    \li #1e90ff
+    \li \svgcolor {#1e90ff}
+\row
+    \li firebrick
+    \li #b22222
+    \li \svgcolor {#b22222}
+\row
+    \li floralwhite
+    \li #fffaf0
+    \li \svgcolor {#fffaf0}
+\row
+    \li forestgreen
+    \li #228b22
+    \li \svgcolor {#228b22}
+\row
+    \li fuchsia
+    \li #ff00ff
+    \li \svgcolor {#ff00ff}
+\row
+    \li gainsboro
+    \li #dcdcdc
+    \li \svgcolor {#dcdcdc}
+\row
+    \li ghostwhite
+    \li #f8f8ff
+    \li \svgcolor {#f8f8ff}
+\row
+    \li gold
+    \li #ffd700
+    \li \svgcolor {#ffd700}
+\row
+    \li goldenrod
+    \li #daa520
+    \li \svgcolor {#daa520}
+\row
+    \li gray
+    \li #808080
+    \li \svgcolor {#808080}
+\row
+    \li grey
+    \li #808080
+    \li \svgcolor {#808080}
+\row
+    \li green
+    \li #008000
+    \li \svgcolor {#008000}
+\row
+    \li greenyellow
+    \li #adff2f
+    \li \svgcolor {#adff2f}
+\row
+    \li honeydew
+    \li #f0fff0
+    \li \svgcolor {#f0fff0}
+\row
+    \li hotpink
+    \li #ff69b4
+    \li \svgcolor {#ff69b4}
+\row
+    \li indianred
+    \li #cd5c5c
+    \li \svgcolor {#cd5c5c}
+\row
+    \li indigo
+    \li #4b0082
+    \li \svgcolor {#4b0082}
+\row
+    \li ivory
+    \li #fffff0
+    \li \svgcolor {#fffff0}
+\row
+    \li khaki
+    \li #f0e68c
+    \li \svgcolor {#f0e68c}
+\row
+    \li lavender
+    \li #e6e6fa
+    \li \svgcolor {#e6e6fa}
+\row
+    \li lavenderblush
+    \li #fff0f5
+    \li \svgcolor {#fff0f5}
+\row
+    \li lawngreen
+    \li #7cfc00
+    \li \svgcolor {#7cfc00}
+\row
+    \li lemonchiffon
+    \li #fffacd
+    \li \svgcolor {#fffacd}
+\row
+    \li lightblue
+    \li #add8e6
+    \li \svgcolor {#add8e6}
+\row
+    \li lightcoral
+    \li #f08080
+    \li \svgcolor {#f08080}
+\row
+    \li lightcyan
+    \li #e0ffff
+    \li \svgcolor {#e0ffff}
+\row
+    \li lightgoldenrodyellow
+    \li #fafad2
+    \li \svgcolor {#fafad2}
+\row
+    \li lightgray
+    \li #d3d3d3
+    \li \svgcolor {#d3d3d3}
+\row
+    \li lightgreen
+    \li #90ee90
+    \li \svgcolor {#90ee90}
+\row
+    \li lightgrey
+    \li #d3d3d3
+    \li \svgcolor {#d3d3d3}
+\row
+    \li lightpink
+    \li #ffb6c1
+    \li \svgcolor {#ffb6c1}
+\row
+    \li lightsalmon
+    \li #ffa07a
+    \li \svgcolor {#ffa07a}
+\row
+    \li lightseagreen
+    \li #20b2aa
+    \li \svgcolor {#20b2aa}
+\row
+    \li lightskyblue
+    \li #87cefa
+    \li \svgcolor {#87cefa}
+\row
+    \li lightslategray
+    \li #778899
+    \li \svgcolor {#778899}
+\row
+    \li lightslategrey
+    \li #778899
+    \li \svgcolor {#778899}
+\row
+    \li lightsteelblue
+    \li #b0c4de
+    \li \svgcolor {#b0c4de}
+\row
+    \li lightyellow
+    \li #ffffe0
+    \li \svgcolor {#ffffe0}
+\row
+    \li lime
+    \li #00ff00
+    \li \svgcolor {#00ff00}
+\row
+    \li limegreen
+    \li #32cd32
+    \li \svgcolor {#32cd32}
+\row
+    \li linen
+    \li #faf0e6
+    \li \svgcolor {#faf0e6}
+\row
+    \li magenta
+    \li #ff00ff
+    \li \svgcolor {#ff00ff}
+\row
+    \li maroon
+    \li #800000
+    \li \svgcolor {#800000}
+\row
+    \li mediumaquamarine
+    \li #66cdaa
+    \li \svgcolor {#66cdaa}
+\row
+    \li mediumblue
+    \li #0000cd
+    \li \svgcolor {#0000cd}
+\row
+    \li mediumorchid
+    \li #ba55d3
+    \li \svgcolor {#ba55d3}
+\row
+    \li mediumpurple
+    \li #9370db
+    \li \svgcolor {#9370db}
+\row
+    \li mediumseagreen
+    \li #3cb371
+    \li \svgcolor {#3cb371}
+\row
+    \li mediumslateblue
+    \li #7b68ee
+    \li \svgcolor {#7b68ee}
+\row
+    \li mediumspringgreen
+    \li #00fa9a
+    \li \svgcolor {#00fa9a}
+\row
+    \li mediumturquoise
+    \li #48d1cc
+    \li \svgcolor {#48d1cc}
+\row
+    \li mediumvioletred
+    \li #c71585
+    \li \svgcolor {#c71585}
+\row
+    \li midnightblue
+    \li #191970
+    \li \svgcolor {#191970}
+\row
+    \li mintcream
+    \li #f5fffa
+    \li \svgcolor {#f5fffa}
+\row
+    \li mistyrose
+    \li #ffe4e1
+    \li \svgcolor {#ffe4e1}
+\row
+    \li moccasin
+    \li #ffe4b5
+    \li \svgcolor {#ffe4b5}
+\row
+    \li navajowhite
+    \li #ffdead
+    \li \svgcolor {#ffdead}
+\row
+    \li navy
+    \li #000080
+    \li \svgcolor {#000080}
+\row
+    \li oldlace
+    \li #fdf5e6
+    \li \svgcolor {#fdf5e6}
+\row
+    \li olive
+    \li #808000
+    \li \svgcolor {#808000}
+\row
+    \li olivedrab
+    \li #6b8e23
+    \li \svgcolor {#6b8e23}
+\row
+    \li orange
+    \li #ffa500
+    \li \svgcolor {#ffa500}
+\row
+    \li orangered
+    \li #ff4500
+    \li \svgcolor {#ff4500}
+\row
+    \li orchid
+    \li #da70d6
+    \li \svgcolor {#da70d6}
+\row
+    \li palegoldenrod
+    \li #eee8aa
+    \li \svgcolor {#eee8aa}
+\row
+    \li palegreen
+    \li #98fb98
+    \li \svgcolor {#98fb98}
+\row
+    \li paleturquoise
+    \li #afeeee
+    \li \svgcolor {#afeeee}
+\row
+    \li palevioletred
+    \li #db7093
+    \li \svgcolor {#db7093}
+\row
+    \li papayawhip
+    \li #ffefd5
+    \li \svgcolor {#ffefd5}
+\row
+    \li peachpuff
+    \li #ffdab9
+    \li \svgcolor {#ffdab9}
+\row
+    \li peru
+    \li #cd853f
+    \li \svgcolor {#cd853f}
+\row
+    \li pink
+    \li #ffc0cb
+    \li \svgcolor {#ffc0cb}
+\row
+    \li plum
+    \li #dda0dd
+    \li \svgcolor {#dda0dd}
+\row
+    \li powderblue
+    \li #b0e0e6
+    \li \svgcolor {#b0e0e6}
+\row
+    \li purple
+    \li #800080
+    \li \svgcolor {#800080}
+\row
+    \li red
+    \li #ff0000
+    \li \svgcolor {#ff0000}
+\row
+    \li rosybrown
+    \li #bc8f8f
+    \li \svgcolor {#bc8f8f}
+\row
+    \li royalblue
+    \li #4169e1
+    \li \svgcolor {#4169e1}
+\row
+    \li saddlebrown
+    \li #8b4513
+    \li \svgcolor {#8b4513}
+\row
+    \li salmon
+    \li #fa8072
+    \li \svgcolor {#fa8072}
+\row
+    \li sandybrown
+    \li #f4a460
+    \li \svgcolor {#f4a460}
+\row
+    \li seagreen
+    \li #2e8b57
+    \li \svgcolor {#2e8b57}
+\row
+    \li seashell
+    \li #fff5ee
+    \li \svgcolor {#fff5ee}
+\row
+    \li sienna
+    \li #a0522d
+    \li \svgcolor {#a0522d}
+\row
+    \li silver
+    \li #c0c0c0
+    \li \svgcolor {#c0c0c0}
+\row
+    \li skyblue
+    \li #87ceeb
+    \li \svgcolor {#87ceeb}
+\row
+    \li slateblue
+    \li #6a5acd
+    \li \svgcolor {#6a5acd}
+\row
+    \li slategray
+    \li #708090
+    \li \svgcolor {#708090}
+\row
+    \li slategrey
+    \li #708090
+    \li \svgcolor {#708090}
+\row
+    \li snow
+    \li #fffafa
+    \li \svgcolor {#fffafa}
+\row
+    \li springgreen
+    \li #00ff7f
+    \li \svgcolor {#00ff7f}
+\row
+    \li steelblue
+    \li #4682b4
+    \li \svgcolor {#4682b4}
+\row
+    \li tan
+    \li #d2b48c
+    \li \svgcolor {#d2b48c}
+\row
+    \li teal
+    \li #008080
+    \li \svgcolor {#008080}
+\row
+    \li thistle
+    \li #d8bfd8
+    \li \svgcolor {#d8bfd8}
+\row
+    \li tomato
+    \li #ff6347
+    \li \svgcolor {#ff6347}
+\row
+    \li turquoise
+    \li #40e0d0
+    \li \svgcolor {#40e0d0}
+\row
+    \li violet
+    \li #ee82ee
+    \li \svgcolor {#ee82ee}
+\row
+    \li wheat
+    \li #f5deb3
+    \li \svgcolor {#f5deb3}
+\row
+    \li white
+    \li #ffffff
+    \li \svgcolor {#ffffff}
+\row
+    \li whitesmoke
+    \li #f5f5f5
+    \li \svgcolor {#f5f5f5}
+\row
+    \li yellow
+    \li #ffff00
+    \li \svgcolor {#ffff00}
+\row
+    \li yellowgreen
+    \li #9acd32
+    \li \svgcolor {#9acd32}
+\endtable
diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc
index a8ba076e3d..24fd4240b3 100644
--- a/src/gui/doc/src/richtext.qdoc
+++ b/src/gui/doc/src/richtext.qdoc
@@ -1175,12 +1175,75 @@
     \row    \li \c vertical-align
             \li baseline | sub | super | middle | top | bottom
             \li Vertical text alignment. For vertical alignment in text table cells only middle, top, and bottom apply.
+    \row    \li \c border-collapse
+            \li collapse | separate
+            \li Border Collapse mode for text tables. If set to collapse, cell-spacing will not be applied.
     \row    \li \c border-color
             \li <color>
-            \li Border color for text tables.
+            \li Border color for text tables and table cells.
+    \row    \li \c border-top-color
+            \li <color>
+            \li Top border color for table cells.
+    \row    \li \c border-bottom-color
+            \li <color>
+            \li Bottom border color for table cells.
+    \row    \li \c border-left-color
+            \li <color>
+            \li Left border color for table cells.
+    \row    \li \c border-right-color
+            \li <color>
+            \li Right border color for table cells.
     \row    \li \c border-style
             \li none | dotted | dashed | dot-dash | dot-dot-dash | solid | double | groove | ridge | inset | outset
-            \li Border style for text tables.
+            \li Border style for text tables and table cells.
+    \row    \li \c border-top-style
+            \li <color>
+            \li Top border style for table cells.
+    \row    \li \c border-bottom-style
+            \li <color>
+            \li Bottom border style for table cells.
+    \row    \li \c border-left-style
+            \li <color>
+            \li Left border style for table cells.
+    \row    \li \c border-right-style
+            \li <color>
+            \li Right border style for table cells.
+    \row    \li \c border-width
+            \li <width>px
+            \li Width of table or cell border
+    \row    \li \c border-top-width
+            \li <length>px
+            \li Top border width for table cells.
+    \row    \li \c border-bottom-width
+            \li <length>px
+            \li Bottom border width for table cells.
+    \row    \li \c border-left-width
+            \li <length>px
+            \li Left border width for table cells.
+    \row    \li \c border-right-width
+            \li <length>px
+            \li Right border width for table cells.
+    \row    \li \c border-top
+            \li <width>px <border-style> <border-color>
+            \li Shorthand for setting top border width, style and color
+    \row    \li \c border-bottom
+            \li <width>px <border-style> <border-color>
+            \li Shorthand for setting bottom border width, style and color
+    \row    \li \c border-left
+            \li <width>px <border-style> <border-color>
+            \li Shorthand for setting left border width, style and color
+    \row    \li \c border-right
+            \li <width>px <border-style> <border-color>
+            \li Shorthand for setting right border width, style and color
+    \row    \li \c border-top
+            \li <width>px <border-style> <border-color>
+            \li Shorthand for setting top border width, style and color
+    \row    \li \c border-bottom
+            \li <width>px <border-style> <border-color>
+            \li Shorthand for setting bottom border width, style and color
+    \row    \li \c border
+            \li <width>px <border-style> <border-color>
+            \li Shorthand for setting all four border's width, style and color
     \row    \li \c background
             \li [ <'background-color'> || <'background-image'> ]
             \li Background shorthand property
@@ -1190,7 +1253,7 @@
     \row    \li \c page-break-after
             \li [ auto | always ]
             \li Make it possible to enforce a page break after the paragraph/table
-    \row    \li float
+    \row    \li \c float
             \li [ left | right | none ]
             \li Specifies where an image or a text will be placed in another element. Note that the \c float property is
                only supported for tables and images.
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index edf8124081..45c8c05162 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -49,6 +49,7 @@ qtConfig(animation): include(animation/animation.pri)
 include(itemmodels/itemmodels.pri)
 include(vulkan/vulkan.pri)
 include(platform/platform.pri)
+include(rhi/rhi.pri)
 
 QMAKE_LIBS += $$QMAKE_LIBS_GUI
 
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 70fccbc378..3b2ced3f58 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -82,7 +82,18 @@ qtConfig(png) {
 }
 
 # SIMD
-SSSE3_SOURCES += image/qimage_ssse3.cpp
-NEON_SOURCES += image/qimage_neon.cpp
-MIPS_DSPR2_SOURCES += image/qimage_mips_dspr2.cpp
-MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S
+!android {
+    SSSE3_SOURCES += image/qimage_ssse3.cpp
+    NEON_SOURCES += image/qimage_neon.cpp
+    MIPS_DSPR2_SOURCES += image/qimage_mips_dspr2.cpp
+    MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S
+} else {
+    # see https://developer.android.com/ndk/guides/abis
+    arm64-v8a {
+        SOURCES += image/qimage_neon.cpp
+    }
+    x86 | x86_64 {
+        DEFINES += QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSSE3
+        SOURCES += image/qimage_ssse3.cpp
+    }
+}
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h
index f7895bb1e0..3cc360f670 100644
--- a/src/gui/image/qbitmap.h
+++ b/src/gui/image/qbitmap.h
@@ -61,7 +61,7 @@ public:
     QBitmap(const QBitmap &other) : QPixmap(other) {}
     // QBitmap(QBitmap &&other) : QPixmap(std::move(other)) {} // QPixmap doesn't, yet, have a move ctor
     QBitmap &operator=(const QBitmap &other) { QPixmap::operator=(other); return *this; }
-    QBitmap &operator=(QBitmap &&other) Q_DECL_NOTHROW { QPixmap::operator=(std::move(other)); return *this; }
+    QBitmap &operator=(QBitmap &&other) noexcept { QPixmap::operator=(std::move(other)); return *this; }
     ~QBitmap();
 #endif
 
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 80fa65daac..df8220a0c6 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -663,7 +663,7 @@ QFactoryLoader *qt_iconEngineFactoryLoader()
 /*!
   Constructs a null icon.
 */
-QIcon::QIcon() Q_DECL_NOEXCEPT
+QIcon::QIcon() noexcept
     : d(0)
 {
 }
@@ -987,7 +987,7 @@ bool QIcon::isNull() const
  */
 bool QIcon::isDetached() const
 {
-    return !d || d->ref.load() == 1;
+    return !d || d->ref.loadRelaxed() == 1;
 }
 
 /*! \internal
@@ -1000,7 +1000,7 @@ void QIcon::detach()
                 delete d;
             d = 0;
             return;
-        } else if (d->ref.load() != 1) {
+        } else if (d->ref.loadRelaxed() != 1) {
             QIconPrivate *x = new QIconPrivate(d->engine->clone());
             if (!d->ref.deref())
                 delete d;
@@ -1496,7 +1496,7 @@ QDebug operator<<(QDebug dbg, const QIcon &i)
         if (!i.name().isEmpty())
             dbg << i.name() << ',';
         dbg << "availableSizes[normal,Off]=" << i.availableSizes()
-            << ",cacheKey=" << showbase << hex << i.cacheKey() << dec << noshowbase;
+            << ",cacheKey=" << Qt::showbase << Qt::hex << i.cacheKey() << Qt::dec << Qt::noshowbase;
     }
     dbg << ')';
     return dbg;
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index 8870950982..735a3e134d 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -58,23 +58,19 @@ public:
     enum Mode { Normal, Disabled, Active, Selected };
     enum State { On, Off };
 
-    QIcon() Q_DECL_NOEXCEPT;
+    QIcon() noexcept;
     QIcon(const QPixmap &pixmap);
     QIcon(const QIcon &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QIcon(QIcon &&other) Q_DECL_NOEXCEPT
+    QIcon(QIcon &&other) noexcept
         : d(other.d)
     { other.d = nullptr; }
-#endif
     explicit QIcon(const QString &fileName); // file or resource name
     explicit QIcon(QIconEngine *engine);
     ~QIcon();
     QIcon &operator=(const QIcon &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QIcon &operator=(QIcon &&other) Q_DECL_NOEXCEPT
+    inline QIcon &operator=(QIcon &&other) noexcept
     { swap(other); return *this; }
-#endif
-    inline void swap(QIcon &other) Q_DECL_NOEXCEPT
+    inline void swap(QIcon &other) noexcept
     { qSwap(d, other.d); }
 
     operator QVariant() const;
diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h
index 0c5b51dc71..89fed5ccda 100644
--- a/src/gui/image/qiconengine.h
+++ b/src/gui/image/qiconengine.h
@@ -94,7 +94,7 @@ public:
     virtual void virtual_hook(int id, void *data);
 
 private:
-    QIconEngine &operator=(const QIconEngine &other) Q_DECL_EQ_DELETE;
+    QIconEngine &operator=(const QIconEngine &other) = delete;
 };
 
 #if QT_DEPRECATED_SINCE(5, 0)
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index f23debd931..dda407181a 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -38,8 +38,10 @@
 ****************************************************************************/
 
 #include "qimage.h"
-#include "qdatastream.h"
+
 #include "qbuffer.h"
+#include "qdatastream.h"
+#include "qcolortransform.h"
 #include "qmap.h"
 #include "qmatrix.h"
 #include "qtransform.h"
@@ -54,6 +56,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <qpa/qplatformpixmap.h>
+#include <private/qcolortransform_p.h>
 #include <private/qdrawhelper_p.h>
 #include <private/qmemrotate_p.h>
 #include <private/qimagescale_p.h>
@@ -284,6 +287,7 @@ bool QImageData::checkForAlphaPixels() const
     case QImage::Format_RGB555:
     case QImage::Format_RGB666:
     case QImage::Format_RGB888:
+    case QImage::Format_BGR888:
     case QImage::Format_RGBX8888:
     case QImage::Format_BGR30:
     case QImage::Format_RGB30:
@@ -717,6 +721,7 @@ bool QImageData::checkForAlphaPixels() const
     \value Format_RGBA64     The image is stored using a 64-bit halfword-ordered RGBA format (16-16-16-16). (added in Qt 5.12)
     \value Format_RGBA64_Premultiplied    The image is stored using a premultiplied 64-bit halfword-ordered
                              RGBA format (16-16-16-16). (added in Qt 5.12)
+    \value Format_BGR888     The image is stored using a 24-bit BGR format. (added in Qt 5.14)
 
     \note Drawing into a QImage with QImage::Format_Indexed8 is not
     supported.
@@ -738,7 +743,7 @@ bool QImageData::checkForAlphaPixels() const
     \sa isNull()
 */
 
-QImage::QImage() Q_DECL_NOEXCEPT
+QImage::QImage() noexcept
     : QPaintDevice()
 {
     d = 0;
@@ -1079,10 +1084,10 @@ QImage::operator QVariant() const
 void QImage::detach()
 {
     if (d) {
-        if (d->is_cached && d->ref.load() == 1)
+        if (d->is_cached && d->ref.loadRelaxed() == 1)
             QImagePixmapCleanupHooks::executeImageHooks(cacheKey());
 
-        if (d->ref.load() != 1 || d->ro_data)
+        if (d->ref.loadRelaxed() != 1 || d->ro_data)
             *this = copy();
 
         if (d)
@@ -1103,6 +1108,7 @@ static void copyMetadata(QImageData *dst, const QImageData *src)
     // Doesn't copy colortable and alpha_clut, or offset.
     copyPhysicalMetadata(dst, src);
     dst->text = src->text;
+    dst->colorSpace = src->colorSpace;
 }
 
 static void copyMetadata(QImage *dst, const QImage &src)
@@ -1392,7 +1398,7 @@ void QImage::setColorTable(const QVector<QRgb> colors)
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     d->colortable = colors;
 #else
-    d->colortable = qMove(const_cast<QVector<QRgb>&>(colors));
+    d->colortable = std::move(const_cast<QVector<QRgb>&>(colors));
 #endif
     d->has_alpha_clut = false;
     for (int i = 0; i < d->colortable.size(); ++i) {
@@ -3364,7 +3370,7 @@ void QImage::mirrored_inplace(bool horizontal, bool vertical)
     \sa {QImage#Image Transformations}{Image Transformations}
 */
 
-inline void rgbSwapped_generic(int width, int height, const QImage *src, QImage *dst, const QPixelLayout* layout)
+static inline void rgbSwapped_generic(int width, int height, const QImage *src, QImage *dst, const QPixelLayout* layout)
 {
     const RbSwapFunc func = layout->rbSwap;
     if (!func) {
@@ -4418,7 +4424,7 @@ qint64 QImage::cacheKey() const
 
 bool QImage::isDetached() const
 {
-    return d && d->ref.load() == 1;
+    return d && d->ref.loadRelaxed() == 1;
 }
 
 
@@ -4686,12 +4692,14 @@ QImage QImage::smoothScaled(int w, int h) const {
     case QImage::Format_RGBX8888:
 #endif
     case QImage::Format_RGBA8888_Premultiplied:
+#if QT_CONFIG(raster_64bit)
     case QImage::Format_RGBX64:
     case QImage::Format_RGBA64_Premultiplied:
         break;
     case QImage::Format_RGBA64:
         src = src.convertToFormat(QImage::Format_RGBA64_Premultiplied);
         break;
+#endif
     default:
         if (src.hasAlphaChannel())
             src = src.convertToFormat(QImage::Format_ARGB32_Premultiplied);
@@ -4949,13 +4957,139 @@ QTransform QImage::trueMatrix(const QTransform &matrix, int w, int h)
     return matrix * QTransform().translate(-delta.x(), -delta.y());
 }
 
+/*!
+    \since 5.14
+
+    Sets the image color space to \a colorSpace without performing any conversions on image data.
+
+    \sa colorSpace()
+*/
+void QImage::setColorSpace(const QColorSpace &colorSpace)
+{
+    if (!d)
+        return;
+    if (d->colorSpace == colorSpace)
+        return;
+    if (!isDetached()) // Detach only if shared, not for read-only data.
+        detach();
+    d->colorSpace = colorSpace;
+}
+
+/*!
+    \since 5.14
+
+    Converts the image to \a colorSpace.
+
+    If the image has no valid color space, the method does nothing.
+
+    \sa convertedToColorSpace(), setColorSpace()
+*/
+void QImage::convertToColorSpace(const QColorSpace &colorSpace)
+{
+    if (!d)
+        return;
+    if (!d->colorSpace.isValid())
+        return;
+    if (!colorSpace.isValid()) {
+        qWarning() << "QImage::convertToColorSpace: Output colorspace is not valid";
+        return;
+    }
+    detach();
+    applyColorTransform(d->colorSpace.transformationToColorSpace(colorSpace));
+    d->colorSpace = colorSpace;
+}
+
+/*!
+    \since 5.14
+
+    Returns the image converted to \a colorSpace.
+
+    If the image has no valid color space, a null QImage is returned.
+
+    \sa convertToColorSpace()
+*/
+QImage QImage::convertedToColorSpace(const QColorSpace &colorSpace) const
+{
+    if (!d || !d->colorSpace.isValid() || !colorSpace.isValid())
+        return QImage();
+    QImage image = copy();
+    image.convertToColorSpace(colorSpace);
+    return image;
+}
+
+/*!
+    \since 5.14
+
+    Returns the color space of the image if a color space is defined.
+*/
+QColorSpace QImage::colorSpace() const
+{
+    if (!d)
+        return QColorSpace();
+    return d->colorSpace;
+}
+
+/*!
+    \since 5.14
+
+    Applies the color transformation \a transform to all pixels in the image.
+*/
+void QImage::applyColorTransform(const QColorTransform &transform)
+{
+    QImage::Format oldFormat = format();
+    if (depth() > 32) {
+        if (format() != QImage::Format_RGBX64 && format() != QImage::Format_RGBA64
+                && format() != QImage::Format_RGBA64_Premultiplied)
+            *this = std::move(*this).convertToFormat(QImage::Format_RGBA64);
+    } else if (format() != QImage::Format_ARGB32 && format() != QImage::Format_RGB32
+                && format() != QImage::Format_ARGB32_Premultiplied) {
+        if (hasAlphaChannel())
+            *this = std::move(*this).convertToFormat(QImage::Format_ARGB32);
+        else
+            *this = std::move(*this).convertToFormat(QImage::Format_RGB32);
+    }
+
+    QColorTransformPrivate::TransformFlags flags = QColorTransformPrivate::Unpremultiplied;
+    switch (format()) {
+    case Format_ARGB32_Premultiplied:
+    case Format_RGBA64_Premultiplied:
+        flags = QColorTransformPrivate::Premultiplied;
+        break;
+    case Format_RGB32:
+    case Format_RGBX64:
+        flags = QColorTransformPrivate::InputOpaque;
+        break;
+    case Format_ARGB32:
+    case Format_RGBA64:
+        break;
+    default:
+        Q_UNREACHABLE();
+    }
+
+    if (depth() > 32) {
+        for (int i = 0; i < height(); ++i) {
+            QRgba64 *scanline = reinterpret_cast<QRgba64 *>(scanLine(i));
+            transform.d->apply(scanline, scanline, width(), flags);
+        }
+    } else {
+        for (int i = 0; i < height(); ++i) {
+            QRgb *scanline = reinterpret_cast<QRgb *>(scanLine(i));
+            transform.d->apply(scanline, scanline, width(), flags);
+        }
+    }
+
+    if (oldFormat != format())
+        *this = std::move(*this).convertToFormat(oldFormat);
+}
+
+
 bool QImageData::convertInPlace(QImage::Format newFormat, Qt::ImageConversionFlags flags)
 {
     if (format == newFormat)
         return true;
 
     // No in-place conversion if we have to detach
-    if (ref.load() > 1 || !own_data)
+    if (ref.loadRelaxed() > 1 || !own_data)
         return false;
 
     InPlace_Image_Converter converter = qimage_inplace_converter_map[format][newFormat];
@@ -5418,13 +5552,26 @@ static Q_CONSTEXPR QPixelFormat pixelformats[] = {
                     /*PREMULTIPLIED*/     QPixelFormat::NotPremultiplied,
                     /*INTERPRETATION*/    QPixelFormat::UnsignedShort,
                     /*BYTE ORDER*/        QPixelFormat::CurrentSystemEndian),
+        //QImage::Format_BGR888:
+        QPixelFormat(QPixelFormat::BGR,
+                    /*RED*/                8,
+                    /*GREEN*/              8,
+                    /*BLUE*/               8,
+                    /*FOURTH*/             0,
+                    /*FIFTH*/              0,
+                    /*ALPHA*/              0,
+                    /*ALPHA USAGE*/       QPixelFormat::IgnoresAlpha,
+                    /*ALPHA POSITION*/    QPixelFormat::AtBeginning,
+                    /*PREMULTIPLIED*/     QPixelFormat::NotPremultiplied,
+                    /*INTERPRETATION*/    QPixelFormat::UnsignedByte,
+                    /*BYTE ORDER*/        QPixelFormat::CurrentSystemEndian),
 };
 Q_STATIC_ASSERT(sizeof(pixelformats) / sizeof(*pixelformats) == QImage::NImageFormats);
 
 /*!
     Returns the QImage::Format as a QPixelFormat
 */
-QPixelFormat QImage::pixelFormat() const Q_DECL_NOTHROW
+QPixelFormat QImage::pixelFormat() const noexcept
 {
     return toPixelFormat(format());
 }
@@ -5432,7 +5579,7 @@ QPixelFormat QImage::pixelFormat() const Q_DECL_NOTHROW
 /*!
     Converts \a format into a QPixelFormat
 */
-QPixelFormat QImage::toPixelFormat(QImage::Format format) Q_DECL_NOTHROW
+QPixelFormat QImage::toPixelFormat(QImage::Format format) noexcept
 {
     Q_ASSERT(static_cast<int>(format) < NImageFormats);
     return pixelformats[format];
@@ -5441,7 +5588,7 @@ QPixelFormat QImage::toPixelFormat(QImage::Format format) Q_DECL_NOTHROW
 /*!
     Converts \a format into a QImage::Format
 */
-QImage::Format QImage::toImageFormat(QPixelFormat format) Q_DECL_NOTHROW
+QImage::Format QImage::toImageFormat(QPixelFormat format) noexcept
 {
     for (int i = 0; i < NImageFormats; i++) {
         if (format == pixelformats[i])
@@ -5457,7 +5604,7 @@ Q_GUI_EXPORT void qt_imageTransform(QImage &src, QImageIOHandler::Transformation
     if (orient == QImageIOHandler::TransformationRotate270) {
         src = rotated270(src);
     } else {
-        src = qMove(src).mirrored(orient & QImageIOHandler::TransformationMirror,
+        src = std::move(src).mirrored(orient & QImageIOHandler::TransformationMirror,
                                   orient & QImageIOHandler::TransformationFlip);
         if (orient & QImageIOHandler::TransformationRotate90)
             src = rotated90(src);
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 8335e117f2..7544ccca05 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -61,9 +61,11 @@ Q_FORWARD_DECLARE_MUTABLE_CG_TYPE(CGImage);
 QT_BEGIN_NAMESPACE
 
 
+class QColorSpace;
+class QColorTransform;
 class QIODevice;
-class QStringList;
 class QMatrix;
+class QStringList;
 class QTransform;
 class QVariant;
 template <class T> class QList;
@@ -129,13 +131,14 @@ public:
         Format_RGBA64,
         Format_RGBA64_Premultiplied,
         Format_Grayscale16,
+        Format_BGR888,
 #ifndef Q_QDOC
         NImageFormats
 #endif
     };
     Q_ENUM(Format)
 
-    QImage() Q_DECL_NOEXCEPT;
+    QImage() noexcept;
     QImage(const QSize &size, Format format);
     QImage(int width, int height, Format format);
     QImage(uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
@@ -149,19 +152,15 @@ public:
     explicit QImage(const QString &fileName, const char *format = nullptr);
 
     QImage(const QImage &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QImage(QImage &&other) Q_DECL_NOEXCEPT
+    inline QImage(QImage &&other) noexcept
         : QPaintDevice(), d(nullptr)
     { qSwap(d, other.d); }
-#endif
     ~QImage();
 
     QImage &operator=(const QImage &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QImage &operator=(QImage &&other) Q_DECL_NOEXCEPT
+    inline QImage &operator=(QImage &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
-    inline void swap(QImage &other) Q_DECL_NOEXCEPT
+    inline void swap(QImage &other) noexcept
     { qSwap(d, other.d); }
 
     bool isNull() const;
@@ -289,17 +288,23 @@ public:
     QImage mirrored(bool horizontally = false, bool vertically = true) const &
         { return mirrored_helper(horizontally, vertically); }
     QImage &&mirrored(bool horizontally = false, bool vertically = true) &&
-        { mirrored_inplace(horizontally, vertically); return qMove(*this); }
+        { mirrored_inplace(horizontally, vertically); return std::move(*this); }
     QImage rgbSwapped() const &
         { return rgbSwapped_helper(); }
     QImage &&rgbSwapped() &&
-        { rgbSwapped_inplace(); return qMove(*this); }
+        { rgbSwapped_inplace(); return std::move(*this); }
 #else
     QImage mirrored(bool horizontally = false, bool vertically = true) const;
     QImage rgbSwapped() const;
 #endif
     void invertPixels(InvertMode = InvertRgb);
 
+    QColorSpace colorSpace() const;
+    QImage convertedToColorSpace(const QColorSpace &) const;
+    void convertToColorSpace(const QColorSpace &);
+    void setColorSpace(const QColorSpace &);
+
+    void applyColorTransform(const QColorTransform &transform);
 
     bool load(QIODevice *device, const char* format);
     bool load(const QString &fileName, const char *format = nullptr);
@@ -333,9 +338,9 @@ public:
     QString text(const QString &key = QString()) const;
     void setText(const QString &key, const QString &value);
 
-    QPixelFormat pixelFormat() const Q_DECL_NOTHROW;
-    static QPixelFormat toPixelFormat(QImage::Format format) Q_DECL_NOTHROW;
-    static QImage::Format toImageFormat(QPixelFormat format) Q_DECL_NOTHROW;
+    QPixelFormat pixelFormat() const noexcept;
+    static QPixelFormat toPixelFormat(QImage::Format format) noexcept;
+    static QImage::Format toImageFormat(QPixelFormat format) noexcept;
 
     // Platform specific conversion functions
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
index 82ffb8af8b..9e1df7058c 100644
--- a/src/gui/image/qimage_conversions.cpp
+++ b/src/gui/image/qimage_conversions.cpp
@@ -39,7 +39,7 @@
 
 #include <private/qdrawhelper_p.h>
 #include <private/qguiapplication_p.h>
-#include <private/qcolorprofile_p.h>
+#include <private/qcolortrclut_p.h>
 #include <private/qendian_p.h>
 #include <private/qsimd_p.h>
 #include <private/qimage_p.h>
@@ -100,7 +100,7 @@ const uchar *qt_get_bitflip_array()
 
 void qGamma_correct_back_to_linear_cs(QImage *image)
 {
-    const QColorProfile *cp = QGuiApplicationPrivate::instance()->colorProfileForA32Text();
+    const QColorTrcLut *cp = QGuiApplicationPrivate::instance()->colorProfileForA32Text();
     if (!cp)
         return;
     // gamma correct the pixels back to linear color space...
@@ -429,8 +429,8 @@ typedef void (QT_FASTCALL *Rgb888ToRgbConverter)(quint32 *dst, const uchar *src,
 template <bool rgbx>
 static void convert_RGB888_to_RGB(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
 {
-    Q_ASSERT(src->format == QImage::Format_RGB888);
-    if (rgbx)
+    Q_ASSERT(src->format == QImage::Format_RGB888 || src->format == QImage::Format_BGR888);
+    if (rgbx ^ (src->format == QImage::Format_BGR888))
         Q_ASSERT(dest->format == QImage::Format_RGBX8888 || dest->format == QImage::Format_RGBA8888 || dest->format == QImage::Format_RGBA8888_Premultiplied);
     else
         Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied);
@@ -564,6 +564,67 @@ static bool convert_RGBA_to_ARGB_inplace(QImageData *data, Qt::ImageConversionFl
     return true;
 }
 
+static void convert_rgbswap_generic(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
+{
+    Q_ASSERT(src->width == dest->width);
+    Q_ASSERT(src->height == dest->height);
+
+    const RbSwapFunc func = qPixelLayouts[src->format].rbSwap;
+    Q_ASSERT(func);
+
+    const qsizetype sbpl = src->bytes_per_line;
+    const qsizetype dbpl = dest->bytes_per_line;
+    const uchar *src_data = src->data;
+    uchar *dest_data = dest->data;
+
+    for (int i = 0; i < src->height; ++i) {
+        func(dest_data, src_data, src->width);
+
+        src_data += sbpl;
+        dest_data += dbpl;
+    }
+}
+
+static bool convert_rgbswap_generic_inplace(QImageData *data, Qt::ImageConversionFlags)
+{
+    const RbSwapFunc func = qPixelLayouts[data->format].rbSwap;
+    Q_ASSERT(func);
+
+    const qsizetype bpl = data->bytes_per_line;
+    uchar *line_data = data->data;
+
+    for (int i = 0; i < data->height; ++i) {
+        func(line_data, line_data, data->width);
+        line_data += bpl;
+    }
+
+    switch (data->format) {
+    case QImage::Format_RGB888:
+        data->format = QImage::Format_BGR888;
+        break;
+    case QImage::Format_BGR888:
+        data->format = QImage::Format_RGB888;
+        break;
+    case QImage::Format_BGR30:
+        data->format = QImage::Format_RGB30;
+        break;
+    case QImage::Format_A2BGR30_Premultiplied:
+        data->format = QImage::Format_A2RGB30_Premultiplied;
+        break;
+    case QImage::Format_RGB30:
+        data->format = QImage::Format_BGR30;
+        break;
+    case QImage::Format_A2RGB30_Premultiplied:
+        data->format = QImage::Format_A2BGR30_Premultiplied;
+        break;
+    default:
+        Q_UNREACHABLE();
+        data->format = QImage::Format_Invalid;
+        return false;
+    }
+    return true;
+}
+
 template<QtPixelOrder PixelOrder, bool RGBA>
 static void convert_RGB_to_RGB30(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
 {
@@ -693,74 +754,10 @@ static bool convert_A2RGB30_PM_to_RGB30_inplace(QImageData *data, Qt::ImageConve
     return true;
 }
 
-static void convert_BGR30_to_RGB30(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
-{
-    Q_ASSERT(src->format == QImage::Format_RGB30 || src->format == QImage::Format_BGR30 ||
-             src->format == QImage::Format_A2RGB30_Premultiplied || src->format == QImage::Format_A2BGR30_Premultiplied);
-    Q_ASSERT(dest->format == QImage::Format_RGB30 || dest->format == QImage::Format_BGR30 ||
-             dest->format == QImage::Format_A2RGB30_Premultiplied || dest->format == QImage::Format_A2BGR30_Premultiplied);
-    Q_ASSERT(src->width == dest->width);
-    Q_ASSERT(src->height == dest->height);
-
-    const int src_pad = (src->bytes_per_line >> 2) - src->width;
-    const int dest_pad = (dest->bytes_per_line >> 2) - dest->width;
-    const quint32 *src_data = (quint32 *) src->data;
-    quint32 *dest_data = (quint32 *) dest->data;
-
-    for (int i = 0; i < src->height; ++i) {
-        const quint32 *end = src_data + src->width;
-        while (src_data < end) {
-            *dest_data = qRgbSwapRgb30(*src_data);
-            ++src_data;
-            ++dest_data;
-        }
-        src_data += src_pad;
-        dest_data += dest_pad;
-    }
-}
-
-static bool convert_BGR30_to_RGB30_inplace(QImageData *data, Qt::ImageConversionFlags)
-{
-    Q_ASSERT(data->format == QImage::Format_RGB30 || data->format == QImage::Format_BGR30 ||
-             data->format == QImage::Format_A2RGB30_Premultiplied || data->format == QImage::Format_A2BGR30_Premultiplied);
-
-    const int pad = (data->bytes_per_line >> 2) - data->width;
-    uint *rgb_data = (uint *) data->data;
-
-    for (int i = 0; i < data->height; ++i) {
-        const uint *end = rgb_data + data->width;
-        while (rgb_data < end) {
-            *rgb_data = qRgbSwapRgb30(*rgb_data);
-            ++rgb_data;
-        }
-        rgb_data += pad;
-    }
-
-    switch (data->format) {
-    case QImage::Format_BGR30:
-        data->format = QImage::Format_RGB30;
-        break;
-    case QImage::Format_A2BGR30_Premultiplied:
-        data->format = QImage::Format_A2RGB30_Premultiplied;
-        break;
-    case QImage::Format_RGB30:
-        data->format = QImage::Format_BGR30;
-        break;
-    case QImage::Format_A2RGB30_Premultiplied:
-        data->format = QImage::Format_A2BGR30_Premultiplied;
-        break;
-    default:
-        Q_UNREACHABLE();
-        data->format = QImage::Format_Invalid;
-        return false;
-    }
-    return true;
-}
-
 static bool convert_BGR30_to_A2RGB30_inplace(QImageData *data, Qt::ImageConversionFlags flags)
 {
     Q_ASSERT(data->format == QImage::Format_RGB30 || data->format == QImage::Format_BGR30);
-    if (!convert_BGR30_to_RGB30_inplace(data, flags))
+    if (!convert_rgbswap_generic_inplace(data, flags))
         return false;
 
     if (data->format == QImage::Format_RGB30)
@@ -2265,7 +2262,7 @@ static bool convert_Grayscale8_to_Indexed8_inplace(QImageData *data, Qt::ImageCo
 Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormats] =
 {
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
         0,
@@ -2286,7 +2283,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Mono
 
     {
@@ -2308,7 +2305,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_MonoLSB
 
     {
@@ -2333,7 +2330,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0, 0, 0, 0, 0,
         convert_Indexed8_to_Alpha8,
         convert_Indexed8_to_Grayscale8,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_Indexed8
 
     {
@@ -2361,7 +2358,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_RGB_to_RGB30<PixelOrderRGB, false>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGB32
 
     {
@@ -2391,7 +2388,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0, 0,
         0,
         convert_ARGB32_to_RGBA64<false>,
-        0, 0
+        0, 0, 0
     }, // Format_ARGB32
 
     {
@@ -2416,7 +2413,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_ARGB_to_RGBA,
         0, 0, 0, 0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     },  // Format_ARGB32_Premultiplied
 
     {
@@ -2438,7 +2435,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB16
 
     {
@@ -2460,7 +2457,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB8565_Premultiplied
 
     {
@@ -2482,7 +2479,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB666
 
     {
@@ -2504,7 +2501,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB6666_Premultiplied
 
     {
@@ -2526,7 +2523,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB555
 
     {
@@ -2548,7 +2545,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB8555_Premultiplied
 
     {
@@ -2565,13 +2562,14 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0,
+        0, // self
         0,
         0,
         convert_RGB888_to_RGB<true>,
         convert_RGB888_to_RGB<true>,
         convert_RGB888_to_RGB<true>,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        convert_rgbswap_generic,
     }, // Format_RGB888
 
     {
@@ -2593,7 +2591,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB444
 
     {
@@ -2614,7 +2612,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB4444_Premultiplied
     {
         0,
@@ -2641,7 +2639,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_RGB_to_RGB30<PixelOrderRGB, true>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGBX8888
     {
         0,
@@ -2670,7 +2668,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0, 0,
         0,
         convert_ARGB32_to_RGBA64<true>,
-        0, 0
+        0, 0, 0
     }, // Format_RGBA8888
 
     {
@@ -2692,7 +2690,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGBA8888_Premultiplied
 
     {
@@ -2717,10 +2715,10 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         convert_passthrough,
-        convert_BGR30_to_RGB30,
-        convert_BGR30_to_RGB30,
+        convert_rgbswap_generic,
+        convert_rgbswap_generic,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_BGR30
     {
         0,
@@ -2745,9 +2743,9 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_A2RGB30_PM_to_RGB30<false>,
         0,
         convert_A2RGB30_PM_to_RGB30<true>,
-        convert_BGR30_to_RGB30,
+        convert_rgbswap_generic,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_A2BGR30_Premultiplied
     {
         0,
@@ -2769,11 +2767,11 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        convert_BGR30_to_RGB30,
-        convert_BGR30_to_RGB30,
+        convert_rgbswap_generic,
+        convert_rgbswap_generic,
         0,
         convert_passthrough,
-        0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB30
     {
         0,
@@ -2796,11 +2794,11 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_A2RGB30_PM_to_ARGB<PixelOrderRGB, true>,
         0,
         convert_A2RGB30_PM_to_RGB30<true>,
-        convert_BGR30_to_RGB30,
+        convert_rgbswap_generic,
         convert_A2RGB30_PM_to_RGB30<false>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_A2RGB30_Premultiplied
     {
         0,
@@ -2820,7 +2818,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Alpha8
     {
         0,
@@ -2840,14 +2838,15 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Grayscale8
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, // self
         convert_passthrough,
         convert_passthrough,
-        convert_RGBA64_to_gray16
+        convert_RGBA64_to_gray16,
+        0
     }, // Format_RGBX64
     {
         0,
@@ -2874,6 +2873,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_RGBA64_to_RGBx64,
         0, // self
         convert_RGBA64_to_RGBA64PM,
+        0,
         0
     }, // Format_RGBA64
     {
@@ -2901,7 +2901,8 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_RGBA64PM_to_RGBA64<true>,
         convert_RGBA64PM_to_RGBA64<false>,
         0, // self
-        convert_RGBA64_to_gray16
+        convert_RGBA64_to_gray16,
+        0
     }, // Format_RGBA64_Premultiplied
     {
         0,
@@ -2931,20 +2932,46 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_gray16_to_RGBA64,
         convert_gray16_to_RGBA64,
         convert_gray16_to_RGBA64,
-        0  // self
+        0,  // self
+        0
     }, // Format_Grayscale16
+    {
+        0,
+        0,
+        0,
+        0,
+        0, 0, 0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        convert_rgbswap_generic,
+        0,
+        0,
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+        convert_RGB888_to_RGB<false>,
+        convert_RGB888_to_RGB<false>,
+        convert_RGB888_to_RGB<false>,
+#else
+        0, 0, 0,
+#endif
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, // self
+    }, // Format_BGR888
 };
 
 InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QImage::NImageFormats] =
 {
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Mono
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_MonoLSB
     {
         0,
@@ -2968,7 +2995,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0, 0, 0, 0, 0,
         convert_Indexed8_to_Alpha8_inplace,
         convert_Indexed8_to_Grayscale8_inplace,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_Indexed8
     {
         0,
@@ -2995,7 +3022,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_RGB_to_RGB30_inplace<PixelOrderRGB, false>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGB32
     {
         0,
@@ -3022,7 +3049,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_RGB_to_RGB30_inplace<PixelOrderRGB, false>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_ARGB32
     {
         0,
@@ -3046,34 +3073,35 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_ARGB_to_RGBA_inplace<QImage::Format_RGBA8888_Premultiplied>,
         0, 0, 0, 0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     },  // Format_ARGB32_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB16
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB8565_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB666
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB6666_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB555
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB8555_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        convert_rgbswap_generic_inplace
     }, // Format_RGB888
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB444
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB4444_Premultiplied
     {
         0,
@@ -3100,7 +3128,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_RGB_to_RGB30_inplace<PixelOrderRGB, true>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGBX8888
     {
         0,
@@ -3127,7 +3155,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_RGB_to_RGB30_inplace<PixelOrderRGB, true>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGBA8888
     {
         0,
@@ -3149,7 +3177,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGBA8888_Premultiplied
     {
         0,
@@ -3173,10 +3201,10 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0,
         0, // self
         convert_passthrough_inplace<QImage::Format_A2BGR30_Premultiplied>,
-        convert_BGR30_to_RGB30_inplace,
+        convert_rgbswap_generic_inplace,
         convert_BGR30_to_A2RGB30_inplace,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_BGR30
     {
         0,
@@ -3201,8 +3229,8 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_A2RGB30_PM_to_RGB30_inplace<false>,
         0, // self
         convert_A2RGB30_PM_to_RGB30_inplace<true>,
-        convert_BGR30_to_RGB30_inplace,
-        0, 0, 0, 0, 0, 0
+        convert_rgbswap_generic_inplace,
+        0, 0, 0, 0, 0, 0, 0
     }, // Format_A2BGR30_Premultiplied
     {
         0,
@@ -3224,11 +3252,11 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0,
         0,
         0,
-        convert_BGR30_to_RGB30_inplace,
+        convert_rgbswap_generic_inplace,
         convert_BGR30_to_A2RGB30_inplace,
         0, // self
         convert_passthrough_inplace<QImage::Format_A2RGB30_Premultiplied>,
-        0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB30
     {
         0,
@@ -3251,11 +3279,11 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_A2RGB30_PM_to_ARGB_inplace<PixelOrderRGB, true>,
         0,
         convert_A2RGB30_PM_to_RGB30_inplace<true>,
-        convert_BGR30_to_RGB30_inplace,
+        convert_rgbswap_generic_inplace,
         convert_A2RGB30_PM_to_RGB30_inplace<false>,
         0, // self
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_A2RGB30_Premultiplied
     {
         0,
@@ -3280,7 +3308,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0, 0, 0, 0,
         0, // self
         0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_Alpha8
     {
         0,
@@ -3305,32 +3333,37 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0, 0, 0, 0,
         0,
         0, // self
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_Grayscale8
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, // self
         convert_passthrough_inplace<QImage::Format_RGBA64>,
         convert_passthrough_inplace<QImage::Format_RGBA64_Premultiplied>,
-        0
+        0, 0
     }, // Format_RGBX64
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         convert_RGBA64_to_RGBx64_inplace,
         0, // self
         convert_RGBA64_to_RGBA64PM_inplace,
-        0
+        0, 0
     }, // Format_RGBA64
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         convert_RGBA64PM_to_RGBA64_inplace<true>,
         convert_RGBA64PM_to_RGBA64_inplace<false>,
         0, // self
-        0
+        0, 0
     }, // Format_RGBA64_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Grayscale16
+    {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        convert_rgbswap_generic_inplace,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    }, // Format_BGR888
 };
 
 static void qInitImageConversions()
@@ -3341,6 +3374,9 @@ static void qInitImageConversions()
         qimage_converter_map[QImage::Format_RGB888][QImage::Format_RGB32] = convert_RGB888_to_RGB32_ssse3;
         qimage_converter_map[QImage::Format_RGB888][QImage::Format_ARGB32] = convert_RGB888_to_RGB32_ssse3;
         qimage_converter_map[QImage::Format_RGB888][QImage::Format_ARGB32_Premultiplied] = convert_RGB888_to_RGB32_ssse3;
+        qimage_converter_map[QImage::Format_BGR888][QImage::Format_RGBX8888] = convert_RGB888_to_RGB32_ssse3;
+        qimage_converter_map[QImage::Format_BGR888][QImage::Format_RGBA8888] = convert_RGB888_to_RGB32_ssse3;
+        qimage_converter_map[QImage::Format_BGR888][QImage::Format_RGBA8888_Premultiplied] = convert_RGB888_to_RGB32_ssse3;
     }
 #endif
 
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index d88ad2d1d2..9e2d9c86bb 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -51,7 +51,9 @@
 // We mean it.
 //
 
+#include <QtGui/qcolorspace.h>
 #include <QtGui/private/qtguiglobal_p.h>
+#include <QtGui/qimage.h>
 #include <QtCore/private/qnumeric_p.h>
 
 #include <QMap>
@@ -65,7 +67,7 @@ struct Q_GUI_EXPORT QImageData {        // internal image data
     QImageData();
     ~QImageData();
     static QImageData *create(const QSize &size, QImage::Format format);
-    static QImageData *create(uchar *data, int w, int h,  int bpl, QImage::Format format, bool readOnly, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0);
+    static QImageData *create(uchar *data, int w, int h,  int bpl, QImage::Format format, bool readOnly, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
 
     QAtomicInt ref;
 
@@ -106,6 +108,8 @@ struct Q_GUI_EXPORT QImageData {        // internal image data
 
     QPaintEngine *paintEngine;
 
+    QColorSpace colorSpace;
+
     struct ImageSizeParameters {
         qsizetype bytesPerLine;
         qsizetype totalSize;
@@ -203,6 +207,7 @@ inline int qt_depthForFormat(QImage::Format format)
     case QImage::Format_ARGB8565_Premultiplied:
     case QImage::Format_ARGB8555_Premultiplied:
     case QImage::Format_RGB888:
+    case QImage::Format_BGR888:
         depth = 24;
         break;
     case QImage::Format_RGBX64:
diff --git a/src/gui/image/qimage_ssse3.cpp b/src/gui/image/qimage_ssse3.cpp
index 9cdfba20e3..fb81a1a6c3 100644
--- a/src/gui/image/qimage_ssse3.cpp
+++ b/src/gui/image/qimage_ssse3.cpp
@@ -121,8 +121,11 @@ Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, con
 
 void convert_RGB888_to_RGB32_ssse3(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
 {
-    Q_ASSERT(src->format == QImage::Format_RGB888);
-    Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied);
+    Q_ASSERT(src->format == QImage::Format_RGB888 || src->format == QImage::Format_BGR888);
+    if (src->format == QImage::Format_BGR888)
+        Q_ASSERT(dest->format == QImage::Format_RGBX8888 || dest->format == QImage::Format_RGBA8888 || dest->format == QImage::Format_RGBA8888_Premultiplied);
+    else
+        Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied);
     Q_ASSERT(src->width == dest->width);
     Q_ASSERT(src->height == dest->height);
 
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 360cc16319..dff24b449a 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -150,7 +150,7 @@
 // factory loader
 #include <qcoreapplication.h>
 #include <private/qfactoryloader_p.h>
-#include <QMutexLocker>
+#include <QtCore/private/qlocking_p.h>
 
 // for qt_getImageText
 #include <private/qimage_p.h>
@@ -186,8 +186,8 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
     QByteArray suffix;
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
-    static QMutex mutex;
-    QMutexLocker locker(&mutex);
+    static QBasicMutex mutex;
+    const auto locker = qt_scoped_lock(mutex);
 
     typedef QMultiMap<int, QString> PluginKeyMap;
 
@@ -197,7 +197,7 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
 
 #ifdef QIMAGEREADER_DEBUG
     qDebug() << "QImageReader::createReadHandler( device =" << (void *)device << ", format =" << format << "),"
-             << keyMap.size() << "plugins available: " << keyMap.values();
+             << keyMap.uniqueKeys().size() << "plugins available: " << keyMap;
 #endif
 
     int suffixPluginIndex = -1;
@@ -325,6 +325,29 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
 #endif
     }
 
+    if (handler && device && !suffix.isEmpty()) {
+        Q_ASSERT(qobject_cast<QFile *>(device));
+        // We have a file claiming to be of a recognized format. Now confirm that
+        // the handler also recognizes the file contents.
+        const qint64 pos = device->pos();
+        handler->setDevice(device);
+        if (!form.isEmpty())
+            handler->setFormat(form);
+        bool canRead = handler->canRead();
+        device->seek(pos);
+        if (canRead) {
+            // ok, we're done.
+            return handler;
+        }
+#ifdef QIMAGEREADER_DEBUG
+        qDebug() << "QImageReader::createReadHandler: the" << suffix << "handler can not read this file";
+#endif
+        // File may still be valid, just with wrong suffix, so fall back to
+        // finding a handler based on contents, below.
+        delete handler;
+        handler = nullptr;
+    }
+
 #ifndef QT_NO_IMAGEFORMATPLUGIN
     if (!handler && (autoDetectImageFormat || ignoresFormatAndExtension)) {
         // check if any of our plugins recognize the file from its contents.
@@ -336,7 +359,7 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
                 if (plugin && plugin->capabilities(device, QByteArray()) & QImageIOPlugin::CanRead) {
                     handler = plugin->create(device, testFormat);
 #ifdef QIMAGEREADER_DEBUG
-                    qDebug() << "QImageReader::createReadHandler: the" << keyMap.keys().at(i) << "plugin can read this data";
+                    qDebug() << "QImageReader::createReadHandler: the" << keyMap.value(i) << "plugin can read this data";
 #endif
                     break;
                 }
@@ -1115,8 +1138,10 @@ bool QImageReader::autoTransform() const
     case QImageReaderPrivate::DoNotApplyTransform:
         return false;
     case QImageReaderPrivate::UsePluginDefault:
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         if (d->initHandler())
             return d->handler->supportsOption(QImageIOHandler::TransformedByDefault);
+#endif
         Q_FALLTHROUGH();
     default:
         break;
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index f03c8836df..25fce050a1 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -175,11 +175,12 @@
 #include "qmovie.h"
 
 #include "qglobal.h"
+#include "qelapsedtimer.h"
 #include "qimage.h"
 #include "qimagereader.h"
 #include "qpixmap.h"
 #include "qrect.h"
-#include "qdatetime.h"
+#include "qelapsedtimer.h"
 #include "qtimer.h"
 #include "qpair.h"
 #include "qmap.h"
@@ -206,8 +207,8 @@ public:
         : pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(false)
     { }
 
-    inline QFrameInfo(const QPixmap &pixmap, int delay)
-        : pixmap(pixmap), delay(delay), endMark(false)
+    inline QFrameInfo(QPixmap &&pixmap, int delay)
+        : pixmap(std::move(pixmap)), delay(delay), endMark(false)
     { }
 
     inline bool isValid()
@@ -221,6 +222,7 @@ public:
     static inline QFrameInfo endMarker()
     { return QFrameInfo(true); }
 };
+Q_DECLARE_TYPEINFO(QFrameInfo, Q_MOVABLE_TYPE);
 
 class QMoviePrivate : public QObjectPrivate
 {
@@ -379,9 +381,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
             }
             if (frameNumber > greatestFrameNumber)
                 greatestFrameNumber = frameNumber;
-            QPixmap aPixmap = QPixmap::fromImage(std::move(anImage));
-            int aDelay = reader->nextImageDelay();
-            return QFrameInfo(aPixmap, aDelay);
+            return QFrameInfo(QPixmap::fromImage(std::move(anImage)), reader->nextImageDelay());
         } else if (frameNumber != 0) {
             // We've read all frames now. Return an end marker
             haveReadAll = true;
@@ -405,9 +405,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
                     return QFrameInfo(); // Invalid
                 }
                 greatestFrameNumber = i;
-                QPixmap aPixmap = QPixmap::fromImage(std::move(anImage));
-                int aDelay = reader->nextImageDelay();
-                QFrameInfo info(aPixmap, aDelay);
+                QFrameInfo info(QPixmap::fromImage(std::move(anImage)), reader->nextImageDelay());
                 // Cache it!
                 frameMap.insert(i, info);
                 if (i == frameNumber) {
@@ -437,7 +435,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
 */
 bool QMoviePrivate::next()
 {
-    QTime time;
+    QElapsedTimer time;
     time.start();
     QFrameInfo info = infoForFrame(nextFrameNumber);
     if (!info.isValid())
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index bba36b09cd..978a07b9f9 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -54,8 +54,10 @@
 #include "qpainter.h"
 #include "qpainterpath.h"
 #include "qpixmap.h"
+#include "qregexp.h"
 #include "qregion.h"
 #include "qdebug.h"
+#include <QtCore/private/qlocking_p.h>
 
 #include <algorithm>
 
@@ -234,7 +236,7 @@ void QPicture::detach()
 
 bool QPicture::isDetached() const
 {
-    return d_func()->ref.load() == 1;
+    return d_func()->ref.loadRelaxed() == 1;
 }
 
 /*!
@@ -1426,7 +1428,7 @@ void qt_init_picture_plugins()
     typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
 
     static QBasicMutex mutex;
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     static QFactoryLoader loader(QPictureFormatInterface_iid,
                                  QStringLiteral("/pictureformats"));
 
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index ec7b4bd7e3..189e57b9a3 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -78,11 +78,9 @@ public:
     void setBoundingRect(const QRect &r);
 
     QPicture& operator=(const QPicture &p);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QPicture &operator=(QPicture &&other) Q_DECL_NOEXCEPT
+    inline QPicture &operator=(QPicture &&other) noexcept
     { qSwap(d_ptr, other.d_ptr); return *this; }
-#endif
-    inline void swap(QPicture &other) Q_DECL_NOEXCEPT
+    inline void swap(QPicture &other) noexcept
     { d_ptr.swap(other.d_ptr); }
     void detach();
     bool isDetached() const;
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 5b4d218603..b6e41f16a5 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -262,7 +262,7 @@ QPixmap::QPixmap(const char * const xpm[])
 
 QPixmap::~QPixmap()
 {
-    Q_ASSERT(!data || data->ref.load() >= 1); // Catch if ref-counting changes again
+    Q_ASSERT(!data || data->ref.loadRelaxed() >= 1); // Catch if ref-counting changes again
 }
 
 /*!
@@ -910,7 +910,7 @@ void QPixmap::fill(const QColor &color)
         return;
     }
 
-    if (data->ref.load() == 1) {
+    if (data->ref.loadRelaxed() == 1) {
         // detach() will also remove this pixmap from caches, so
         // it has to be called even when ref == 1.
         detach();
@@ -1053,7 +1053,7 @@ QDataStream &operator>>(QDataStream &stream, QPixmap &pixmap)
 
 bool QPixmap::isDetached() const
 {
-    return data && data->ref.load() == 1;
+    return data && data->ref.loadRelaxed() == 1;
 }
 
 /*!
@@ -1523,10 +1523,10 @@ void QPixmap::detach()
         rasterData->image.detach();
     }
 
-    if (data->is_cached && data->ref.load() == 1)
+    if (data->is_cached && data->ref.loadRelaxed() == 1)
         QImagePixmapCleanupHooks::executePlatformPixmapModificationHooks(data.data());
 
-    if (data->ref.load() != 1) {
+    if (data->ref.loadRelaxed() != 1) {
         *this = copy();
     }
     ++data->detach_no;
@@ -1689,7 +1689,7 @@ QDebug operator<<(QDebug dbg, const QPixmap &r)
     } else {
         dbg << r.size() << ",depth=" << r.depth()
             << ",devicePixelRatio=" << r.devicePixelRatio()
-            << ",cacheKey=" << showbase << hex << r.cacheKey() << dec << noshowbase;
+            << ",cacheKey=" << Qt::showbase << Qt::hex << r.cacheKey() << Qt::dec << Qt::noshowbase;
     }
     dbg << ')';
     return dbg;
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 13c81f18d0..8c1395857e 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -73,11 +73,9 @@ public:
     ~QPixmap();
 
     QPixmap &operator=(const QPixmap &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QPixmap &operator=(QPixmap &&other) Q_DECL_NOEXCEPT
+    inline QPixmap &operator=(QPixmap &&other) noexcept
     { qSwap(data, other.data); return *this; }
-#endif
-    inline void swap(QPixmap &other) Q_DECL_NOEXCEPT
+    inline void swap(QPixmap &other) noexcept
     { qSwap(data, other.data); }
 
     operator QVariant() const;
@@ -139,12 +137,10 @@ public:
     QImage toImage() const;
     static QPixmap fromImage(const QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor);
     static QPixmap fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags = Qt::AutoColor);
-#ifdef Q_COMPILER_RVALUE_REFS
     static QPixmap fromImage(QImage &&image, Qt::ImageConversionFlags flags = Qt::AutoColor)
     {
         return fromImageInPlace(image, flags);
     }
-#endif
 
     bool load(const QString& fileName, const char *format = nullptr, Qt::ImageConversionFlags flags = Qt::AutoColor);
     bool loadFromData(const uchar *buf, uint len, const char* format = nullptr, Qt::ImageConversionFlags flags = Qt::AutoColor);
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 3a2db74098..8aad77b991 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -281,6 +281,7 @@ Q_GUI_EXPORT HBITMAP qt_imageToWinHBITMAP(const QImage &imageIn, int hbitmapForm
     }
         break;
     case QImage::Format_RGB888:
+    case QImage::Format_BGR888:
         compression = BI_RGB;
         bitCount = 24u;
         break;
@@ -368,7 +369,7 @@ static QImage::Format imageFromWinHBITMAP_Format(const BITMAPINFOHEADER &header,
             ? QImage::Format_RGB32 : QImage::Format_ARGB32_Premultiplied;
         break;
     case 24:
-        result = QImage::Format_RGB888;
+        result = QImage::Format_BGR888;
         break;
     case 16:
         result = QImage::Format_RGB555;
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index f6684eac7d..483d6d79a2 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -189,7 +189,7 @@ bool QPixmapCache::Key::operator ==(const Key &key) const
     Otherwise, if pixmap was flushed, the key is no longer valid.
     \since 5.7
 */
-bool QPixmapCache::Key::isValid() const Q_DECL_NOTHROW
+bool QPixmapCache::Key::isValid() const noexcept
 {
     return d && d->isValid;
 }
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index 12d05b00f3..55af35a5d9 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -55,18 +55,16 @@ public:
     public:
         Key();
         Key(const Key &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-        Key(Key &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; }
-        Key &operator =(Key &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+        Key(Key &&other) noexcept : d(other.d) { other.d = nullptr; }
+        Key &operator =(Key &&other) noexcept { swap(other); return *this; }
         ~Key();
         bool operator ==(const Key &key) const;
         inline bool operator !=(const Key &key) const
         { return !operator==(key); }
         Key &operator =(const Key &other);
 
-        void swap(Key &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
-        bool isValid() const Q_DECL_NOTHROW;
+        void swap(Key &other) noexcept { qSwap(d, other.d); }
+        bool isValid() const noexcept;
 
     private:
         KeyData *d;
diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h
index 3c57367514..ab8e2b7558 100644
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@@ -87,7 +87,7 @@ public:
                 && !d->image.d->paintEngine->isActive())
             {
                 delete d->image.d->paintEngine;
-                d->image.d->paintEngine = 0;
+                d->image.d->paintEngine = nullptr;
             }
         }
     }
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index f1b25f07a7..4ab45337b0 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -42,6 +42,7 @@
 
 #ifndef QT_NO_IMAGEFORMAT_PNG
 #include <qcoreapplication.h>
+#include <qdebug.h>
 #include <qiodevice.h>
 #include <qimage.h>
 #include <qlist.h>
@@ -50,6 +51,9 @@
 
 #include <private/qimage_p.h> // for qt_getImageText
 
+#include <qcolorspace.h>
+#include <private/qcolorspace_p.h>
+
 #include <png.h>
 #include <pngconf.h>
 
@@ -96,9 +100,16 @@ public:
         ReadingEnd,
         Error
     };
+    // Defines the order of how the various ways of setting colorspace overrides eachother:
+    enum ColorSpaceState {
+        Undefined = 0,
+        GammaChrm = 1, // gAMA+cHRM chunks
+        Srgb = 2,      // sRGB chunk
+        Icc = 3        // iCCP chunk
+    };
 
     QPngHandlerPrivate(QPngHandler *qq)
-        : gamma(0.0), fileGamma(0.0), quality(50), compression(50), png_ptr(0), info_ptr(0), end_info(0), state(Ready), q(qq)
+        : gamma(0.0), fileGamma(0.0), quality(50), compression(50), colorSpaceState(Undefined), png_ptr(0), info_ptr(0), end_info(0), state(Ready), q(qq)
     { }
 
     float gamma;
@@ -108,6 +119,8 @@ public:
     QString description;
     QSize scaledSize;
     QStringList readTexts;
+    QColorSpace colorSpace;
+    ColorSpaceState colorSpaceState;
 
     png_struct *png_ptr;
     png_info *info_ptr;
@@ -226,11 +239,8 @@ void qpiw_flush_fn(png_structp /* png_ptr */)
 }
 
 static
-void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, QSize scaledSize, bool *doScaledRead, float screen_gamma=0.0, float file_gamma=0.0)
+void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, QSize scaledSize, bool *doScaledRead)
 {
-    if (screen_gamma != 0.0 && file_gamma != 0.0)
-        png_set_gamma(png_ptr, 1.0f / screen_gamma, file_gamma);
-
     png_uint_32 width = 0;
     png_uint_32 height = 0;
     int bit_depth = 0;
@@ -585,10 +595,63 @@ bool QPngHandlerPrivate::readPngHeader()
 
     readPngTexts(info_ptr);
 
+#ifdef PNG_iCCP_SUPPORTED
+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+        png_charp name = nullptr;
+        int compressionType = 0;
+#if (PNG_LIBPNG_VER < 10500)
+        png_charp profileData = nullptr;
+#else
+        png_bytep profileData = nullptr;
+#endif
+        png_uint_32 profLen;
+        png_get_iCCP(png_ptr, info_ptr, &name, &compressionType, &profileData, &profLen);
+        colorSpace = QColorSpace::fromIccProfile(QByteArray::fromRawData((const char *)profileData, profLen));
+        if (!colorSpace.isValid()) {
+            qWarning() << "QPngHandler: Failed to parse ICC profile";
+        } else {
+            QColorSpacePrivate *csD = QColorSpacePrivate::getWritable(colorSpace);
+            if (csD->description.isEmpty())
+                csD->description = QString::fromLatin1((const char *)name);
+            colorSpaceState = Icc;
+        }
+    }
+#endif
+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sRGB)) {
+        int rendering_intent = -1;
+        png_get_sRGB(png_ptr, info_ptr, &rendering_intent);
+        // We don't actually care about the rendering_intent, just that it is valid
+        if (rendering_intent >= 0 && rendering_intent <= 3 && colorSpaceState <= Srgb) {
+            colorSpace = QColorSpace::SRgb;
+            colorSpaceState = Srgb;
+        }
+    }
     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) {
         double file_gamma = 0.0;
         png_get_gAMA(png_ptr, info_ptr, &file_gamma);
         fileGamma = file_gamma;
+        if (fileGamma > 0.0f && colorSpaceState <= GammaChrm) {
+            QColorSpacePrimaries primaries;
+            if (png_get_valid(png_ptr, info_ptr, PNG_INFO_cHRM)) {
+                double white_x, white_y, red_x, red_y;
+                double green_x, green_y, blue_x, blue_y;
+                png_get_cHRM(png_ptr, info_ptr,
+                             &white_x, &white_y, &red_x, &red_y,
+                             &green_x, &green_y, &blue_x, &blue_y);
+                primaries.whitePoint = QPointF(white_x, white_y);
+                primaries.redPoint = QPointF(red_x, red_y);
+                primaries.greenPoint = QPointF(green_x, green_y);
+                primaries.bluePoint = QPointF(blue_x, blue_y);
+            }
+            if (primaries.areValid()) {
+                colorSpace = QColorSpace(primaries.whitePoint, primaries.redPoint, primaries.greenPoint, primaries.bluePoint,
+                                         QColorSpace::TransferFunction::Gamma, fileGamma);
+            } else {
+                colorSpace = QColorSpace(QColorSpace::Primaries::SRgb,
+                                         QColorSpace::TransferFunction::Gamma, fileGamma);
+            }
+            colorSpaceState = GammaChrm;
+        }
     }
 
     state = ReadHeader;
@@ -613,8 +676,16 @@ bool QPngHandlerPrivate::readPngImage(QImage *outImage)
         return false;
     }
 
+    if (gamma != 0.0 && fileGamma != 0.0) {
+        // This configuration forces gamma correction and
+        // thus changes the output colorspace
+        png_set_gamma(png_ptr, 1.0f / gamma, fileGamma);
+        colorSpace = colorSpace.withTransferFunction(QColorSpace::TransferFunction::Gamma, 1.0f / gamma);
+        colorSpaceState = GammaChrm;
+    }
+
     bool doScaledRead = false;
-    setup_qt(*outImage, png_ptr, info_ptr, scaledSize, &doScaledRead, gamma, fileGamma);
+    setup_qt(*outImage, png_ptr, info_ptr, scaledSize, &doScaledRead);
 
     if (outImage->isNull()) {
         png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
@@ -683,6 +754,9 @@ bool QPngHandlerPrivate::readPngImage(QImage *outImage)
     if (scaledSize.isValid() && outImage->size() != scaledSize)
         *outImage = outImage->scaled(scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 
+    if (colorSpaceState > Undefined && colorSpace.isValid())
+        outImage->setColorSpace(colorSpace);
+
     return true;
 }
 
@@ -902,6 +976,26 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i
                  bpc, // per channel
                  color_type, 0, 0, 0);       // sets #channels
 
+#ifdef PNG_iCCP_SUPPORTED
+    if (image.colorSpace().isValid()) {
+        QColorSpace cs = image.colorSpace();
+        // Support the old gamma making it override transferfunction.
+        if (gamma != 0.0 && !qFuzzyCompare(cs.gamma(), 1.0f / gamma))
+            cs = cs.withTransferFunction(QColorSpace::TransferFunction::Gamma, 1.0f / gamma);
+        QByteArray iccProfileName = QColorSpacePrivate::get(cs)->description.toLatin1();
+        if (iccProfileName.isEmpty())
+            iccProfileName = QByteArrayLiteral("Custom");
+        QByteArray iccProfile = cs.iccProfile();
+        png_set_iCCP(png_ptr, info_ptr,
+             #if PNG_LIBPNG_VER < 10500
+                     iccProfileName.data(), PNG_COMPRESSION_TYPE_BASE, iccProfile.data(),
+             #else
+                     iccProfileName.constData(), PNG_COMPRESSION_TYPE_BASE,
+                     (png_const_bytep)iccProfile.constData(),
+             #endif
+                     iccProfile.length());
+    } else
+#endif
     if (gamma != 0.0) {
         png_set_gAMA(png_ptr, info_ptr, 1.0/gamma);
     }
@@ -985,6 +1079,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i
     if (color_type == PNG_COLOR_TYPE_RGB) {
         switch (image.format()) {
         case QImage::Format_RGB888:
+        case QImage::Format_BGR888:
             break;
         case QImage::Format_RGBX8888:
         case QImage::Format_RGBX64:
@@ -1037,6 +1132,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i
     case QImage::Format_RGB32:
     case QImage::Format_ARGB32:
     case QImage::Format_RGB888:
+    case QImage::Format_BGR888:
     case QImage::Format_RGBX8888:
     case QImage::Format_RGBA8888:
     case QImage::Format_RGBX64:
diff --git a/src/gui/image/qppmhandler_p.h b/src/gui/image/qppmhandler_p.h
index f3c9d0f139..2f3811b759 100644
--- a/src/gui/image/qppmhandler_p.h
+++ b/src/gui/image/qppmhandler_p.h
@@ -71,7 +71,7 @@ public:
     QByteArray name() const override;
 #endif
 
-    static bool canRead(QIODevice *device, QByteArray *subType = 0);
+    static bool canRead(QIODevice *device, QByteArray *subType = nullptr);
 
     QVariant option(ImageOption option) const override;
     void setOption(ImageOption option, const QVariant &value) override;
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
index 65a5b63bc7..3cd15b3e4d 100644
--- a/src/gui/image/qxbmhandler.cpp
+++ b/src/gui/image/qxbmhandler.cpp
@@ -44,6 +44,7 @@
 
 #include <qimage.h>
 #include <qiodevice.h>
+#include <qregexp.h>
 #include <qvariant.h>
 
 #include <stdio.h>
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index a32dfda96d..cf105b250a 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -45,6 +45,7 @@
 #include <qbytearraymatcher.h>
 #include <qimage.h>
 #include <qmap.h>
+#include <qregexp.h>
 #include <qtextstream.h>
 #include <qvariant.h>
 
@@ -1124,53 +1125,45 @@ static bool write_xpm_image(const QImage &sourceImage, QIODevice *device, const
             break;
     }
 
-    QString line;
-
     // write header
     QTextStream s(device);
-    s << "/* XPM */" << endl
-      << "static char *" << fbname(fileName) << "[]={" << endl
+    s << "/* XPM */" << Qt::endl
+      << "static char *" << fbname(fileName) << "[]={" << Qt::endl
       << '\"' << w << ' ' << h << ' ' << ncolors << ' ' << cpp << '\"';
 
     // write palette
     QMap<QRgb, int>::Iterator c = colorMap.begin();
     while (c != colorMap.end()) {
         QRgb color = c.key();
-        if (image.format() != QImage::Format_RGB32 && !qAlpha(color))
-            line = QString::asprintf("\"%s c None\"",
-                                     xpm_color_name(cpp, *c));
-        else
-            line = QString::asprintf("\"%s c #%02x%02x%02x\"",
-                                     xpm_color_name(cpp, *c),
-                                     qRed(color),
-                                     qGreen(color),
-                                     qBlue(color));
+        const QString line = image.format() != QImage::Format_RGB32 && !qAlpha(color)
+            ? QString::asprintf("\"%s c None\"", xpm_color_name(cpp, *c))
+            : QString::asprintf("\"%s c #%02x%02x%02x\"", xpm_color_name(cpp, *c),
+                                qRed(color), qGreen(color), qBlue(color));
         ++c;
-        s << ',' << endl << line;
+        s << ',' << Qt::endl << line;
     }
 
     // write pixels, limit to 4 characters per pixel
-    line.truncate(cpp*w);
+    QByteArray line;
     for(y=0; y<h; y++) {
+        line.clear();
         const QRgb *yp = reinterpret_cast<const QRgb *>(image.constScanLine(y));
-        int cc = 0;
         for(x=0; x<w; x++) {
             int color = (int)(*(yp + x));
             const QByteArray chars(xpm_color_name(cpp, colorMap[color]));
-            line[cc++] = QLatin1Char(chars[0]);
+            line.append(chars[0]);
             if (cpp > 1) {
-                line[cc++] = QLatin1Char(chars[1]);
+                line.append(chars[1]);
                 if (cpp > 2) {
-                    line[cc++] = QLatin1Char(chars[2]);
-                    if (cpp > 3) {
-                        line[cc++] = QLatin1Char(chars[3]);
-                    }
+                    line.append(chars[2]);
+                    if (cpp > 3)
+                        line.append(chars[3]);
                 }
             }
         }
-        s << ',' << endl << '\"' << line << '\"';
+        s << ',' << Qt::endl << '\"' << line << '\"';
     }
-    s << "};" << endl;
+    s << "};" << Qt::endl;
     return (s.status() == QTextStream::Ok);
 }
 
diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h
index 23d2938bc4..97c2e6f01b 100644
--- a/src/gui/itemmodels/qstandarditemmodel_p.h
+++ b/src/gui/itemmodels/qstandarditemmodel_p.h
@@ -109,11 +109,11 @@ class QStandardItemPrivate
     Q_DECLARE_PUBLIC(QStandardItem)
 public:
     inline QStandardItemPrivate()
-        : model(0),
-          parent(0),
+        : model(nullptr),
+          parent(nullptr),
           rows(0),
           columns(0),
-          q_ptr(0),
+          q_ptr(nullptr),
           lastKnownIndex(-1)
         { }
 
@@ -220,10 +220,10 @@ public:
         if (!index.isValid())
             return root.data();
         if (index.model() != q)
-            return 0;
+            return nullptr;
         QStandardItem *parent = static_cast<QStandardItem*>(index.internalPointer());
-        if (parent == 0)
-            return 0;
+        if (parent == nullptr)
+            return nullptr;
         return parent->child(index.row(), index.column());
     }
 
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 1f137fc46f..9c80f1e2cc 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -21,7 +21,7 @@ HEADERS += \
         kernel/qplatforminputcontextplugin_p.h \
         kernel/qplatformintegrationfactory_p.h \
         kernel/qplatformintegrationplugin.h \
-        kernel/qplatformtheme.h\
+        kernel/qplatformtheme.h \
         kernel/qplatformtheme_p.h \
         kernel/qplatformthemefactory_p.h \
         kernel/qplatformthemeplugin.h \
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index 9e4787589f..1ba8760a9d 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -494,7 +494,7 @@ QCursor::QCursor(Qt::CursorShape shape)
 
     \sa operator!=(const QCursor &lhs, const QCursor &rhs)
 */
-bool operator==(const QCursor &lhs, const QCursor &rhs) Q_DECL_NOTHROW
+bool operator==(const QCursor &lhs, const QCursor &rhs) noexcept
 {
     if (lhs.d == rhs.d)
         return true; // Copy or same shape
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index d62ee7a053..7966e35840 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -86,13 +86,11 @@ public:
     QCursor(const QCursor &cursor);
     ~QCursor();
     QCursor &operator=(const QCursor &cursor);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QCursor(QCursor &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; }
-    inline QCursor &operator=(QCursor &&other) Q_DECL_NOTHROW
+    QCursor(QCursor &&other) noexcept : d(other.d) { other.d = nullptr; }
+    inline QCursor &operator=(QCursor &&other) noexcept
     { swap(other); return *this; }
-#endif
 
-    void swap(QCursor &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QCursor &other) noexcept { qSwap(d, other.d); }
 
     operator QVariant() const;
 
@@ -112,13 +110,13 @@ public:
     inline static void setPos(QScreen *screen, const QPoint &p) { setPos(screen, p.x(), p.y()); }
 
 private:
-    friend Q_GUI_EXPORT bool operator==(const QCursor &lhs, const QCursor &rhs) Q_DECL_NOTHROW;
+    friend Q_GUI_EXPORT bool operator==(const QCursor &lhs, const QCursor &rhs) noexcept;
     QCursorData *d;
 };
 Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QCursor)
 
-Q_GUI_EXPORT bool operator==(const QCursor &lhs, const QCursor &rhs) Q_DECL_NOTHROW;
-inline bool operator!=(const QCursor &lhs, const QCursor &rhs) Q_DECL_NOTHROW { return !(lhs == rhs); }
+Q_GUI_EXPORT bool operator==(const QCursor &lhs, const QCursor &rhs) noexcept;
+inline bool operator!=(const QCursor &lhs, const QCursor &rhs) noexcept { return !(lhs == rhs); }
 
 /*****************************************************************************
   QCursor stream functions
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h
index 8f8eb03f87..b1219c8658 100644
--- a/src/gui/kernel/qdnd_p.h
+++ b/src/gui/kernel/qdnd_p.h
@@ -73,9 +73,9 @@ class QDragPrivate : public QObjectPrivate
 {
 public:
     QDragPrivate()
-        : source(0)
-        , target(0)
-        , data(0)
+        : source(nullptr)
+        , target(nullptr)
+        , data(nullptr)
     { }
     QObject *source;
     QObject *target;
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index e7a320f3a4..2b28052dd5 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -535,13 +535,6 @@ Qt::MouseEventFlags QMouseEvent::flags() const
 */
 
 /*!
-    \fn QPointF QMouseEvent::posF() const
-    \obsolete
-
-    Use localPos() instead.
-*/
-
-/*!
     \class QHoverEvent
     \ingroup events
     \inmodule QtGui
@@ -750,35 +743,21 @@ QHoverEvent::~QHoverEvent()
     \l inverted always returns false.
 */
 
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
     \fn Qt::Orientation QWheelEvent::orientation() const
     \obsolete
 
-    Returns the wheel's orientation.
-
     Use angleDelta() instead.
 */
+#endif
 
+#if QT_CONFIG(wheelevent)
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
     \obsolete
-    Constructs a wheel event object.
-
-    Use the constructor taking \e angleDelta and \e pixelDelta QPoints instead.
-
-    The position, \a pos, is the location of the mouse cursor within
-    the widget. The globalPos() is initialized to QCursor::pos()
-    which is usually, but not always, correct.
-    Use the other constructor if you need to specify the global
-    position explicitly.
-
-    The \a buttons describe the state of the mouse buttons at the time
-    of the event, \a delta contains the rotation distance,
-    \a modifiers holds the keyboard modifier flags at the time of the
-    event, and \a orient holds the wheel's orientation.
-
-    \sa pos(), pixelDelta(), angleDelta()
+    This constructor has been deprecated.
 */
-#if QT_CONFIG(wheelevent)
 QWheelEvent::QWheelEvent(const QPointF &pos, int delta,
                          Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers,
                          Qt::Orientation orient)
@@ -793,26 +772,8 @@ QWheelEvent::QWheelEvent(const QPointF &pos, int delta,
 }
 
 /*!
-  \internal
-*/
-QWheelEvent::~QWheelEvent()
-{
-}
-
-/*!
     \obsolete
-    Constructs a wheel event object.
-
-    Use the constructor taking \e angleDelta and \e pixelDelta QPoints instead.
-
-    The \a pos provides the location of the mouse cursor
-    within the widget. The position in global coordinates is specified
-    by \a globalPos. \a delta contains the rotation distance, \a modifiers
-    holds the keyboard modifier flags at the time of the event, and
-    \a orient holds the wheel's orientation.
-
-
-    \sa pos(), pixelDelta(), angleDelta()
+    This constructor has been deprecated.
 */
 QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta,
                          Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers,
@@ -827,133 +788,51 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta
 }
 
 /*!
-    Constructs a wheel event object.
-
-    The \a pos provides the location of the mouse cursor
-    within the window. The position in global coordinates is specified
-    by \a globalPos.
-
-    \a pixelDelta contains the scrolling distance in pixels on screen, while
-    \a angleDelta contains the wheel rotation distance. \a pixelDelta is
-    optional and can be null.
-
-    The mouse and keyboard states at the time of the event are specified by
-    \a buttons and \a modifiers.
-
-    For backwards compatibility, the event can also hold monodirectional wheel
-    event data: \a qt4Delta specifies the rotation, and \a qt4Orientation the
-    direction.
-
-    The phase() is initialized to Qt::ScrollUpdate. Use the other constructor
-    to specify the phase explicitly.
-
-    \sa posF(), globalPosF(), angleDelta(), pixelDelta()
+    \obsolete
+    This constructor has been deprecated.
 */
-
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
             QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
             Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
     : QWheelEvent(pos, globalPos, pixelDelta, angleDelta, qt4Delta, qt4Orientation,
                   buttons, modifiers, Qt::NoScrollPhase)
 {}
+QT_WARNING_POP
 
 /*!
-    Constructs a wheel event object.
-
-    The \a pos provides the location of the mouse cursor
-    within the window. The position in global coordinates is specified
-    by \a globalPos.
-
-    \a pixelDelta contains the scrolling distance in pixels on screen, while
-    \a angleDelta contains the wheel rotation distance. \a pixelDelta is
-    optional and can be null.
-
-    The mouse and keyboard states at the time of the event are specified by
-    \a buttons and \a modifiers.
-
-    For backwards compatibility, the event can also hold monodirectional wheel
-    event data: \a qt4Delta specifies the rotation, and \a qt4Orientation the
-    direction.
-
-    The scrolling phase of the event is specified by \a phase.
-
-    \sa posF(), globalPosF(), angleDelta(), pixelDelta(), phase()
+    \obsolete
+    This constructor has been deprecated.
 */
-
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
             QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
             Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase)
     : QWheelEvent(pos, globalPos, pixelDelta, angleDelta, qt4Delta, qt4Orientation,
                   buttons, modifiers, phase, Qt::MouseEventNotSynthesized)
 {}
+QT_WARNING_POP
 
 /*!
-    Constructs a wheel event object.
-
-    The \a pos provides the location of the mouse cursor within the window. The
-    position in global coordinates is specified by \a globalPos.
-
-    \a pixelDelta contains the scrolling distance in pixels on screen, while
-    \a angleDelta contains the wheel rotation distance. \a pixelDelta is
-    optional and can be null.
-
-    The mouse and keyboard states at the time of the event are specified by
-    \a buttons and \a modifiers.
-
-    For backwards compatibility, the event can also hold monodirectional wheel
-    event data: \a qt4Delta specifies the rotation, and \a qt4Orientation the
-    direction.
-
-    The scrolling phase of the event is specified by \a phase.
-
-    If the wheel event comes from a physical mouse wheel, \a source is set to
-    Qt::MouseEventNotSynthesized. If it comes from a gesture detected by the
-    operating system, or from a non-mouse hardware device, such that \a pixelDelta is
-    directly related to finger movement, \a source is set to Qt::MouseEventSynthesizedBySystem.
-    If it comes from Qt, source would be set to Qt::MouseEventSynthesizedByQt.
-
-    \sa posF(), globalPosF(), angleDelta(), pixelDelta(), phase()
+    \obsolete
+    This constructor has been deprecated.
 */
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
             QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
             Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, Qt::MouseEventSource source)
     : QWheelEvent(pos, globalPos, pixelDelta, angleDelta, qt4Delta, qt4Orientation,
                   buttons, modifiers, phase, source, false)
 {}
+QT_WARNING_POP
 
 /*!
-    Constructs a wheel event object.
-
-    The \a pos provides the location of the mouse cursor
-    within the window. The position in global coordinates is specified
-    by \a globalPos.
-
-    \a pixelDelta contains the scrolling distance in pixels on screen, while
-    \a angleDelta contains the wheel rotation distance. \a pixelDelta is
-    optional and can be null.
-
-    The mouse and keyboard states at the time of the event are specified by
-    \a buttons and \a modifiers.
-
-    For backwards compatibility, the event can also hold monodirectional wheel
-    event data: \a qt4Delta specifies the rotation, and \a qt4Orientation the
-    direction.
-
-    The scrolling phase of the event is specified by \a phase.
-
-    If the wheel event comes from a physical mouse wheel, \a source is set to
-    Qt::MouseEventNotSynthesized. If it comes from a gesture detected by the
-    operating system, or from a non-mouse hardware device, such that \a
-    pixelDelta is directly related to finger movement, \a source is set to
-    Qt::MouseEventSynthesizedBySystem. If it comes from Qt, source would be set
-    to Qt::MouseEventSynthesizedByQt.
-
-    If the system is configured to invert the delta values delivered with the
-    event (such as natural scrolling of the touchpad on OS X), \a inverted
-    should be \c true. Otherwise, \a inverted is \c false
-
-    \sa posF(), globalPosF(), angleDelta(), pixelDelta(), phase()
+    \obsolete
+    This constructor has been deprecated.
 */
 QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
             QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
@@ -962,6 +841,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
       angleD(angleDelta), qt4D(qt4Delta), qt4O(qt4Orientation), mouseState(buttons), src(source),
       invertedScrolling(inverted), ph(phase)
 {}
+#endif // QT_DEPRECATED_SINCE(5, 15)
 
 /*!
     Constructs a wheel event object.
@@ -990,7 +870,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
     event (such as natural scrolling of the touchpad on macOS), \a inverted
     should be \c true. Otherwise, \a inverted is \c false
 
-    \sa posF(), globalPosF(), angleDelta(), pixelDelta(), phase()
+    \sa position(), globalPosition(), angleDelta(), pixelDelta(), phase(), inverted(), source()
 */
 QWheelEvent::QWheelEvent(QPointF pos, QPointF globalPos, QPoint pixelDelta, QPoint angleDelta,
             Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase,
@@ -1002,6 +882,12 @@ QWheelEvent::QWheelEvent(QPointF pos, QPointF globalPos, QPoint pixelDelta, QPoi
     qt4D = (qt4O == Qt::Horizontal ? angleDelta.x() : angleDelta.y());
 }
 
+/*!
+  \internal
+*/
+QWheelEvent::~QWheelEvent()
+{
+}
 #endif // QT_CONFIG(wheelevent)
 
 /*!
@@ -1053,6 +939,31 @@ QWheelEvent::QWheelEvent(QPointF pos, QPointF globalPos, QPoint pixelDelta, QPoi
 */
 
 /*!
+    \fn QPoint QWheelEvent::position() const
+
+    Returns the position of the mouse cursor relative to the widget
+    that received the event.
+
+    If you move your widgets around in response to mouse events,
+    use globalPosition() instead of this function.
+
+    \sa globalPosition()
+*/
+
+/*!
+    \fn QPoint QWheelEvent::globalPosition() const
+
+    Returns the global position of the mouse pointer \e{at the time
+    of the event}. This is important on asynchronous window systems
+    such as X11; whenever you move your widgets around in response to
+    mouse events, globalPosition() can differ a lot from the current
+    cursor position returned by QCursor::pos().
+
+    \sa position()
+*/
+
+#if QT_DEPRECATED_SINCE(5, 15)
+/*!
     \fn int QWheelEvent::delta() const
     \obsolete
 
@@ -1061,88 +972,61 @@ QWheelEvent::QWheelEvent(QPointF pos, QPointF globalPos, QPoint pixelDelta, QPoi
 
 /*!
     \fn QPoint QWheelEvent::pos() const
+    \obsolete
 
-    Returns the position of the mouse cursor relative to the widget
-    that received the event.
-
-    If you move your widgets around in response to mouse events,
-    use globalPos() instead of this function.
-
-    \sa x(), y(), globalPos()
+    This function has been deprecated, use position() instead.
 */
 
 /*!
     \fn int QWheelEvent::x() const
+    \obsolete
 
-    Returns the x position of the mouse cursor, relative to the
-    widget that received the event.
-
-    \sa y(), pos()
+    This function has been deprecated, use position() instead.
 */
 
 /*!
     \fn int QWheelEvent::y() const
+    \obsolete
 
-    Returns the y position of the mouse cursor, relative to the
-    widget that received the event.
-
-    \sa x(), pos()
+    This function has been deprecated, use position() instead.
 */
 
 
 /*!
     \fn QPoint QWheelEvent::globalPos() const
+    \obsolete
 
-    Returns the global position of the mouse pointer \e{at the time
-    of the event}. This is important on asynchronous window systems
-    such as X11; whenever you move your widgets around in response to
-    mouse events, globalPos() can differ a lot from the current
-    cursor position returned by QCursor::pos().
-
-    \sa globalX(), globalY()
+    This function has been deprecated, use globalPosition() instead.
 */
 
 /*!
     \fn int QWheelEvent::globalX() const
+    \obsolete
 
-    Returns the global x position of the mouse cursor at the time of
-    the event.
-
-    \sa globalY(), globalPos()
+    This function has been deprecated, use globalPosition() instead.
 */
 
 /*!
     \fn int QWheelEvent::globalY() const
+    \obsolete
 
-    Returns the global y position of the mouse cursor at the time of
-    the event.
-
-    \sa globalX(), globalPos()
+    This function has been deprecated, use globalPosition() instead.
 */
 
 /*!
     \fn const QPointF &QWheelEvent::posF() const
+    \obsolete
 
-    Returns the position of the mouse cursor relative to the widget
-    that received the event.
-
-    If you move your widgets around in response to mouse events,
-    use globalPosF() instead of this function.
-
-    \sa globalPosF()
+    This function has been deprecated, use position() instead.
 */
 
 /*!
     \fn const QPointF &QWheelEvent::globalPosF() const
+    \obsolete
 
-    Returns the global position of the mouse pointer \e{at the time
-    of the event}. This is important on asynchronous window systems
-    such as X11; whenever you move your widgets around in response to
-    mouse events, globalPosF() can differ a lot from the current
-    cursor position returned by QCursor::pos().
-
-    \sa posF()
+    This function has been deprecated, use globalPosition() instead.
 */
+#endif
 
 /*!
     \fn Qt::ScrollPhase QWheelEvent::phase() const
@@ -1246,16 +1130,6 @@ QKeyEvent::~QKeyEvent()
 }
 
 /*!
-    \fn QKeyEvent *QKeyEvent::createExtendedKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers, const QString& text, bool autorep, ushort count)
-    \internal
-*/
-
-/*!
-    \fn bool QKeyEvent::hasExtendedInfo() const
-    \internal
-*/
-
-/*!
   \fn quint32 QKeyEvent::nativeScanCode() const
   \since 4.2
 
@@ -2683,7 +2557,7 @@ Qt::MouseButtons QTabletEvent::buttons() const
     globalPos() can differ significantly from the current position
     QCursor::pos().
 
-    \sa globalX(), globalY(), hiResGlobalPos()
+    \sa globalX(), globalY()
 */
 
 /*!
@@ -2728,15 +2602,6 @@ Qt::MouseButtons QTabletEvent::buttons() const
 */
 
 /*!
-    \fn const QPointF &QTabletEvent::hiResGlobalPos() const
-
-    The high precision coordinates delivered from the tablet expressed.
-    Sub pixeling information is in the fractional part of the QPointF.
-
-    \sa globalPos(), hiResGlobalX(), hiResGlobalY()
-*/
-
-/*!
     \fn qreal &QTabletEvent::hiResGlobalX() const
 
     The high precision x position of the tablet device.
@@ -2818,10 +2683,10 @@ Qt::MouseButtons QTabletEvent::buttons() const
     \sa Qt::NativeGestureType, QGestureEvent
 */
 
+#if QT_DEPRECATED_SINCE(5, 10)
 /*!
     \deprecated The QTouchDevice parameter is now required
 */
-#if QT_DEPRECATED_SINCE(5, 10)
 QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QPointF &localPos, const QPointF &windowPos,
                                          const QPointF &screenPos, qreal realValue, ulong sequenceId, quint64 intValue)
     : QInputEvent(QEvent::NativeGesture), mGestureType(type),
@@ -3764,13 +3629,13 @@ static inline void formatTouchEvent(QDebug d, const QTouchEvent &t)
 
 static void formatUnicodeString(QDebug d, const QString &s)
 {
-    d << '"' << hex;
+    d << '"' << Qt::hex;
     for (int i = 0; i < s.size(); ++i) {
         if (i)
             d << ',';
         d << "U+" << s.at(i).unicode();
     }
-    d << dec << '"';
+    d << Qt::dec << '"';
 }
 
 static inline void formatInputMethodEvent(QDebug d, const QInputMethodEvent *e)
@@ -3807,8 +3672,8 @@ static inline void formatInputMethodQueryEvent(QDebug d, const QInputMethodQuery
     QDebugStateSaver saver(d);
     d.noquote();
     const Qt::InputMethodQueries queries = e->queries();
-    d << "QInputMethodQueryEvent(queries=" << showbase << hex << int(queries)
-      << noshowbase << dec << ", {";
+    d << "QInputMethodQueryEvent(queries=" << Qt::showbase << Qt::hex << int(queries)
+      << Qt::noshowbase << Qt::dec << ", {";
     for (unsigned mask = 1; mask <= Qt::ImInputItemClipRectangle; mask<<=1) {
         if (queries & mask) {
             const Qt::InputMethodQuery query = static_cast<Qt::InputMethodQuery>(mask);
@@ -4001,7 +3866,7 @@ QDebug operator<<(QDebug dbg, const QTouchEvent::TouchPoint &tp)
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace();
-    dbg << "TouchPoint(" << hex << tp.id() << dec << " (";
+    dbg << "TouchPoint(" << Qt::hex << tp.id() << Qt::dec << " (";
     QtDebugUtils::formatQPoint(dbg, tp.pos());
     dbg << ") ";
     QtDebugUtils::formatQEnum(dbg, tp.state());
@@ -4072,10 +3937,15 @@ QDebug operator<<(QDebug dbg, const QEvent *e)
     case QEvent::Wheel: {
         const QWheelEvent *we = static_cast<const QWheelEvent *>(e);
         dbg << "QWheelEvent(" << we->phase();
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED // delta() and orientation()
         if (!we->pixelDelta().isNull() || !we->angleDelta().isNull())
             dbg << ", pixelDelta=" << we->pixelDelta() << ", angleDelta=" << we->angleDelta();
+#if QT_DEPRECATED_SINCE(5, 14)
         else if (int qt4Delta = we->delta())
             dbg << ", delta=" << qt4Delta << ", orientation=" << we->orientation();
+#endif
+QT_WARNING_POP
         dbg << ')';
     }
         break;
@@ -4432,18 +4302,6 @@ QWindowStateChangeEvent::~QWindowStateChangeEvent()
     QGraphicsItem::acceptTouchEvents()
 */
 
-/*! \enum QTouchEvent::DeviceType
-    \obsolete
-
-    This enum represents the type of device that generated a QTouchEvent.
-
-    This enum has been deprecated. Use QTouchDevice::DeviceType instead.
-    \omitvalue TouchPad
-    \omitvalue TouchScreen
-
-    \sa QTouchDevice::DeviceType, QTouchDevice::type(), QTouchEvent::device()
-*/
-
 /*!
     Constructs a QTouchEvent with the given \a eventType, \a device, and
     \a touchPoints. The \a touchPointStates and \a modifiers
@@ -4483,16 +4341,6 @@ QTouchEvent::~QTouchEvent()
     This is typically a QWidget or a QQuickItem. May be 0 when no specific target is available.
 */
 
-/*! \fn QTouchEvent::DeviceType QTouchEvent::deviceType() const
-    \obsolete
-
-    Returns the touch device Type, which is of type \l {QTouchEvent::DeviceType} {DeviceType}.
-
-    This function has been deprecated. Use QTouchDevice::type() instead.
-
-    \sa QTouchDevice::type(), QTouchEvent::device()
-*/
-
 /*! \fn QTouchEvent::TouchPoint::TouchPoint(TouchPoint &&other)
 
     Move-constructs a TouchPoint instance, making it point to the same
@@ -4921,7 +4769,7 @@ QVector<QPointF> QTouchEvent::TouchPoint::rawScreenPositions() const
 /*! \internal */
 void QTouchEvent::TouchPoint::setId(int id)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->id = id;
 }
@@ -4929,7 +4777,7 @@ void QTouchEvent::TouchPoint::setId(int id)
 /*! \internal */
 void QTouchEvent::TouchPoint::setUniqueId(qint64 uid)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->uniqueId = QPointingDeviceUniqueId::fromNumericId(uid);
 }
@@ -4937,7 +4785,7 @@ void QTouchEvent::TouchPoint::setUniqueId(qint64 uid)
 /*! \internal */
 void QTouchEvent::TouchPoint::setState(Qt::TouchPointStates state)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->state = state;
 }
@@ -4945,7 +4793,7 @@ void QTouchEvent::TouchPoint::setState(Qt::TouchPointStates state)
 /*! \internal */
 void QTouchEvent::TouchPoint::setPos(const QPointF &pos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->pos = pos;
 }
@@ -4953,7 +4801,7 @@ void QTouchEvent::TouchPoint::setPos(const QPointF &pos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setScenePos(const QPointF &scenePos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->scenePos = scenePos;
 }
@@ -4961,7 +4809,7 @@ void QTouchEvent::TouchPoint::setScenePos(const QPointF &scenePos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setScreenPos(const QPointF &screenPos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->screenPos = screenPos;
 }
@@ -4969,7 +4817,7 @@ void QTouchEvent::TouchPoint::setScreenPos(const QPointF &screenPos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setNormalizedPos(const QPointF &normalizedPos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->normalizedPos = normalizedPos;
 }
@@ -4977,7 +4825,7 @@ void QTouchEvent::TouchPoint::setNormalizedPos(const QPointF &normalizedPos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setStartPos(const QPointF &startPos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->startPos = startPos;
 }
@@ -4985,7 +4833,7 @@ void QTouchEvent::TouchPoint::setStartPos(const QPointF &startPos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setStartScenePos(const QPointF &startScenePos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->startScenePos = startScenePos;
 }
@@ -4993,7 +4841,7 @@ void QTouchEvent::TouchPoint::setStartScenePos(const QPointF &startScenePos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setStartScreenPos(const QPointF &startScreenPos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->startScreenPos = startScreenPos;
 }
@@ -5001,7 +4849,7 @@ void QTouchEvent::TouchPoint::setStartScreenPos(const QPointF &startScreenPos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setStartNormalizedPos(const QPointF &startNormalizedPos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->startNormalizedPos = startNormalizedPos;
 }
@@ -5009,7 +4857,7 @@ void QTouchEvent::TouchPoint::setStartNormalizedPos(const QPointF &startNormaliz
 /*! \internal */
 void QTouchEvent::TouchPoint::setLastPos(const QPointF &lastPos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->lastPos = lastPos;
 }
@@ -5017,7 +4865,7 @@ void QTouchEvent::TouchPoint::setLastPos(const QPointF &lastPos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setLastScenePos(const QPointF &lastScenePos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->lastScenePos = lastScenePos;
 }
@@ -5025,7 +4873,7 @@ void QTouchEvent::TouchPoint::setLastScenePos(const QPointF &lastScenePos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setLastScreenPos(const QPointF &lastScreenPos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->lastScreenPos = lastScreenPos;
 }
@@ -5033,7 +4881,7 @@ void QTouchEvent::TouchPoint::setLastScreenPos(const QPointF &lastScreenPos)
 /*! \internal */
 void QTouchEvent::TouchPoint::setLastNormalizedPos(const QPointF &lastNormalizedPos)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->lastNormalizedPos = lastNormalizedPos;
 }
@@ -5044,7 +4892,7 @@ void QTouchEvent::TouchPoint::setLastNormalizedPos(const QPointF &lastNormalized
 */
 void QTouchEvent::TouchPoint::setRect(const QRectF &rect)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->pos = rect.center();
     d->ellipseDiameters = rect.size();
@@ -5055,7 +4903,7 @@ void QTouchEvent::TouchPoint::setRect(const QRectF &rect)
 */
 void QTouchEvent::TouchPoint::setSceneRect(const QRectF &sceneRect)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->scenePos = sceneRect.center();
     d->ellipseDiameters = sceneRect.size();
@@ -5066,7 +4914,7 @@ void QTouchEvent::TouchPoint::setSceneRect(const QRectF &sceneRect)
 */
 void QTouchEvent::TouchPoint::setScreenRect(const QRectF &screenRect)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->screenPos = screenRect.center();
     d->ellipseDiameters = screenRect.size();
@@ -5075,7 +4923,7 @@ void QTouchEvent::TouchPoint::setScreenRect(const QRectF &screenRect)
 /*! \internal */
 void QTouchEvent::TouchPoint::setPressure(qreal pressure)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->pressure = pressure;
 }
@@ -5083,7 +4931,7 @@ void QTouchEvent::TouchPoint::setPressure(qreal pressure)
 /*! \internal */
 void QTouchEvent::TouchPoint::setRotation(qreal angle)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->rotation = angle;
 }
@@ -5091,7 +4939,7 @@ void QTouchEvent::TouchPoint::setRotation(qreal angle)
 /*! \internal */
 void QTouchEvent::TouchPoint::setEllipseDiameters(const QSizeF &dia)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->ellipseDiameters = dia;
 }
@@ -5099,7 +4947,7 @@ void QTouchEvent::TouchPoint::setEllipseDiameters(const QSizeF &dia)
 /*! \internal */
 void QTouchEvent::TouchPoint::setVelocity(const QVector2D &v)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->velocity = v;
 }
@@ -5107,7 +4955,7 @@ void QTouchEvent::TouchPoint::setVelocity(const QVector2D &v)
 /*! \internal */
 void QTouchEvent::TouchPoint::setRawScreenPositions(const QVector<QPointF> &positions)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->rawScreenPositions = positions;
 }
@@ -5117,7 +4965,7 @@ void QTouchEvent::TouchPoint::setRawScreenPositions(const QVector<QPointF> &posi
 */
 void QTouchEvent::TouchPoint::setFlags(InfoFlags flags)
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d = d->detach();
     d->flags = flags;
 }
@@ -5320,7 +5168,7 @@ QScrollEvent::ScrollState QScrollEvent::scrollState() const
 
 /*!
     Creates a new QScreenOrientationChangeEvent
-    \a orientation is the new orientation of the screen.
+    \a screenOrientation is the new orientation of the \a screen.
 */
 QScreenOrientationChangeEvent::QScreenOrientationChangeEvent(QScreen *screen, Qt::ScreenOrientation screenOrientation)
     : QEvent(QEvent::OrientationChange), m_screen(screen), m_orientation(screenOrientation)
@@ -5426,7 +5274,7 @@ QPointingDeviceUniqueId QPointingDeviceUniqueId::fromNumericId(qint64 id)
 
     \sa isValid()
 */
-qint64 QPointingDeviceUniqueId::numericId() const Q_DECL_NOTHROW
+qint64 QPointingDeviceUniqueId::numericId() const noexcept
 {
     return m_numericId;
 }
@@ -5438,7 +5286,7 @@ qint64 QPointingDeviceUniqueId::numericId() const Q_DECL_NOTHROW
     Returns whether the two unique pointer IDs \a lhs and \a rhs identify the same pointer
     (\c true) or not (\c false).
 */
-bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) Q_DECL_NOTHROW
+bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept
 {
     return lhs.numericId() == rhs.numericId();
 }
@@ -5458,7 +5306,7 @@ bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) Q_DECL
 
     Returns the hash value for \a key, using \a seed to seed the calculation.
 */
-uint qHash(QPointingDeviceUniqueId key, uint seed) Q_DECL_NOTHROW
+uint qHash(QPointingDeviceUniqueId key, uint seed) noexcept
 {
     return qHash(key.numericId(), seed);
 }
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 2b1c6a6e31..dc33a83ac0 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -175,24 +175,34 @@ class Q_GUI_EXPORT QWheelEvent : public QInputEvent
 public:
     enum { DefaultDeltasPerStep = 120 };
 
+#if QT_DEPRECATED_SINCE(5, 15)
+    // Actually deprecated since 5.0, in docs
+    QT_DEPRECATED_VERSION_X_5_15("Use the last QWheelEvent constructor taking pixelDelta, angleDelta, phase, and inverted")
     QWheelEvent(const QPointF &pos, int delta,
                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers,
                 Qt::Orientation orient = Qt::Vertical);
+    // Actually deprecated since 5.0, in docs
+    QT_DEPRECATED_VERSION_X_5_15("Use the last QWheelEvent constructor taking pixelDelta, angleDelta, phase, and inverted")
     QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta,
                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers,
                 Qt::Orientation orient = Qt::Vertical);
+    QT_DEPRECATED_VERSION_X_5_15("Use the last QWheelEvent constructor taking pixelDelta, angleDelta, phase, and inverted")
     QWheelEvent(const QPointF &pos, const QPointF& globalPos,
                 QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
+    QT_DEPRECATED_VERSION_X_5_15("Use the last QWheelEvent constructor taking pixelDelta, angleDelta, phase, and inverted")
     QWheelEvent(const QPointF &pos, const QPointF& globalPos,
                 QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase);
+    QT_DEPRECATED_VERSION_X_5_15("Use the last QWheelEvent constructor taking pixelDelta, angleDelta, phase, and inverted")
     QWheelEvent(const QPointF &pos, const QPointF &globalPos, QPoint pixelDelta, QPoint angleDelta,
                 int qt4Delta, Qt::Orientation qt4Orientation, Qt::MouseButtons buttons,
                 Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, Qt::MouseEventSource source);
+    QT_DEPRECATED_VERSION_X_5_15("Use the last QWheelEvent constructor taking pixelDelta, angleDelta, phase, and inverted")
     QWheelEvent(const QPointF &pos, const QPointF &globalPos, QPoint pixelDelta, QPoint angleDelta,
                 int qt4Delta, Qt::Orientation qt4Orientation, Qt::MouseButtons buttons,
                 Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, Qt::MouseEventSource source, bool inverted);
+#endif
 
     QWheelEvent(QPointF pos, QPointF globalPos, QPoint pixelDelta, QPoint angleDelta,
                 Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase,
@@ -203,19 +213,35 @@ public:
     inline QPoint pixelDelta() const { return pixelD; }
     inline QPoint angleDelta() const { return angleD; }
 
+#if QT_DEPRECATED_SINCE(5, 15)
+    // Actually deprecated since 5.0, in docs
+    QT_DEPRECATED_VERSION_X_5_15("Use angleDelta()")
     inline int delta() const  { return qt4D; }
+    // Actually deprecated since 5.0, in docs
+    QT_DEPRECATED_VERSION_X_5_15("Use angleDelta()")
     inline Qt::Orientation orientation() const { return qt4O; }
-
 #ifndef QT_NO_INTEGER_EVENT_COORDINATES
+    QT_DEPRECATED_VERSION_X_5_15("Use position()")
     inline QPoint pos() const { return p.toPoint(); }
+    QT_DEPRECATED_VERSION_X_5_15("Use globalPosition()")
     inline QPoint globalPos()   const { return g.toPoint(); }
+    QT_DEPRECATED_VERSION_X_5_15("Use position()")
     inline int x() const { return int(p.x()); }
+    QT_DEPRECATED_VERSION_X_5_15("Use position()")
     inline int y() const { return int(p.y()); }
+    QT_DEPRECATED_VERSION_X_5_15("Use globalPosition()")
     inline int globalX() const { return int(g.x()); }
+    QT_DEPRECATED_VERSION_X_5_15("Use globalPosition()")
     inline int globalY() const { return int(g.y()); }
 #endif
+    QT_DEPRECATED_VERSION_X_5_15("Use position()")
     inline const QPointF &posF() const { return p; }
+    QT_DEPRECATED_VERSION_X_5_15("Use globalPosition()")
     inline const QPointF &globalPosF()   const { return g; }
+#endif // QT_DEPRECATED_SINCE(5, 15)
+
+    inline QPointF position() const { return p; }
+    inline QPointF globalPosition() const { return g; }
 
     inline Qt::MouseButtons buttons() const { return mouseState; }
 
@@ -231,7 +257,7 @@ protected:
     QPoint angleD;
     int qt4D = 0;
     Qt::Orientation qt4O = Qt::Vertical;
-    Qt::MouseButtons mouseState;
+    Qt::MouseButtons mouseState = Qt::NoButton;
     uint _unused_ : 2; // Kept for binary compatibility
     uint src: 2;
     bool invertedScrolling : 1;
@@ -549,7 +575,7 @@ public:
     };
     class Attribute {
     public:
-        Attribute(AttributeType typ, int s, int l, QVariant val) : type(typ), start(s), length(l), value(qMove(val)) {}
+        Attribute(AttributeType typ, int s, int l, QVariant val) : type(typ), start(s), length(l), value(std::move(val)) {}
         Attribute(AttributeType typ, int s, int l) : type(typ), start(s), length(l), value() {}
 
         AttributeType type;
@@ -811,14 +837,14 @@ class Q_GUI_EXPORT QPointingDeviceUniqueId
     Q_PROPERTY(qint64 numericId READ numericId CONSTANT)
 public:
     Q_ALWAYS_INLINE
-    Q_DECL_CONSTEXPR QPointingDeviceUniqueId() Q_DECL_NOTHROW : m_numericId(-1) {}
+    Q_DECL_CONSTEXPR QPointingDeviceUniqueId() noexcept : m_numericId(-1) {}
     // compiler-generated copy/move ctor/assignment operators are ok!
     // compiler-generated dtor is ok!
 
     static QPointingDeviceUniqueId fromNumericId(qint64 id);
 
-    Q_ALWAYS_INLINE Q_DECL_CONSTEXPR bool isValid() const Q_DECL_NOTHROW { return m_numericId != -1; }
-    qint64 numericId() const Q_DECL_NOTHROW;
+    Q_ALWAYS_INLINE Q_DECL_CONSTEXPR bool isValid() const noexcept { return m_numericId != -1; }
+    qint64 numericId() const noexcept;
 
 private:
     // TODO: for TUIO 2, or any other type of complex token ID, an internal
@@ -829,10 +855,10 @@ private:
 Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_MOVABLE_TYPE);
 template <> class QList<QPointingDeviceUniqueId> {}; // to prevent instantiation: use QVector instead
 
-Q_GUI_EXPORT bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) Q_DECL_NOTHROW;
-inline bool operator!=(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) Q_DECL_NOTHROW
+Q_GUI_EXPORT bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept;
+inline bool operator!=(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept
 { return !operator==(lhs, rhs); }
-Q_GUI_EXPORT uint qHash(QPointingDeviceUniqueId key, uint seed = 0) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(QPointingDeviceUniqueId key, uint seed = 0) noexcept;
 
 
 
@@ -855,19 +881,17 @@ public:
 
         explicit TouchPoint(int id = -1);
         TouchPoint(const TouchPoint &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-        TouchPoint(TouchPoint &&other) Q_DECL_NOEXCEPT
+        TouchPoint(TouchPoint &&other) noexcept
             : d(nullptr)
         { qSwap(d, other.d); }
-        TouchPoint &operator=(TouchPoint &&other) Q_DECL_NOEXCEPT
+        TouchPoint &operator=(TouchPoint &&other) noexcept
         { qSwap(d, other.d); return *this; }
-#endif
         ~TouchPoint();
 
         TouchPoint &operator=(const TouchPoint &other)
         { if ( d != other.d ) { TouchPoint copy(other); swap(copy); } return *this; }
 
-        void swap(TouchPoint &other) Q_DECL_NOEXCEPT
+        void swap(TouchPoint &other) noexcept
         { qSwap(d, other.d); }
 
         int id() const;
@@ -935,6 +959,8 @@ public:
         friend class QGuiApplicationPrivate;
         friend class QApplication;
         friend class QApplicationPrivate;
+        friend class QQuickPointerTouchEvent;
+        friend class QQuickMultiPointTouchArea;
     };
 
 #if QT_DEPRECATED_SINCE(5, 0)
diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h
index 7df4a1e25b..b7645496f8 100644
--- a/src/gui/kernel/qevent_p.h
+++ b/src/gui/kernel/qevent_p.h
@@ -67,13 +67,14 @@ public:
           state(Qt::TouchPointReleased),
           pressure(-1),
           rotation(0),
-          ellipseDiameters(0, 0)
+          ellipseDiameters(0, 0),
+          stationaryWithModifiedProperty(false)
     { }
 
     inline QTouchEventTouchPointPrivate *detach()
     {
         QTouchEventTouchPointPrivate *d = new QTouchEventTouchPointPrivate(*this);
-        d->ref.store(1);
+        d->ref.storeRelaxed(1);
         if (!this->ref.deref())
             delete this;
         return d;
@@ -91,6 +92,7 @@ public:
     QSizeF ellipseDiameters;
     QVector2D velocity;
     QTouchEvent::TouchPoint::InfoFlags flags;
+    bool stationaryWithModifiedProperty : 1;
     QVector<QPointF> rawScreenPositions;
 };
 
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 3c85dbe097..54f3996b6e 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -58,6 +58,7 @@
 #include <QtCore/private/qabstracteventdispatcher_p.h>
 #include <QtCore/qmutex.h>
 #include <QtCore/private/qthread_p.h>
+#include <QtCore/private/qlocking_p.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qlibraryinfo.h>
 #include <QtCore/qnumeric.h>
@@ -68,7 +69,7 @@
 #include <qpalette.h>
 #include <qscreen.h>
 #include "qsessionmanager.h"
-#include <private/qcolorprofile_p.h>
+#include <private/qcolortrclut_p.h>
 #include <private/qscreen_p.h>
 
 #include <QtGui/qgenericpluginfactory.h>
@@ -146,6 +147,8 @@ QString QGuiApplicationPrivate::styleOverride;
 
 Qt::ApplicationState QGuiApplicationPrivate::applicationState = Qt::ApplicationInactive;
 
+Qt::HighDpiScaleFactorRoundingPolicy QGuiApplicationPrivate::highDpiScaleFactorRoundingPolicy =
+    Qt::HighDpiScaleFactorRoundingPolicy::RoundPreferFloor;
 bool QGuiApplicationPrivate::highDpiScalingUpdated = false;
 
 QPointer<QWindow> QGuiApplicationPrivate::currentDragWindow;
@@ -687,6 +690,8 @@ QGuiApplication::~QGuiApplication()
     QGuiApplicationPrivate::lastCursorPosition = {qInf(), qInf()};
     QGuiApplicationPrivate::currentMousePressWindow = QGuiApplicationPrivate::currentMouseWindow = nullptr;
     QGuiApplicationPrivate::applicationState = Qt::ApplicationInactive;
+    QGuiApplicationPrivate::highDpiScaleFactorRoundingPolicy =
+        Qt::HighDpiScaleFactorRoundingPolicy::RoundPreferFloor;
     QGuiApplicationPrivate::highDpiScalingUpdated = false;
     QGuiApplicationPrivate::currentDragWindow = nullptr;
     QGuiApplicationPrivate::tabletDevicePoints.clear();
@@ -1306,6 +1311,60 @@ static void init_plugins(const QList<QByteArray> &pluginList)
     }
 }
 
+#if QT_CONFIG(commandlineparser)
+void QGuiApplicationPrivate::addQtOptions(QList<QCommandLineOption> *options)
+{
+    QCoreApplicationPrivate::addQtOptions(options);
+
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
+    const QByteArray sessionType = qgetenv("XDG_SESSION_TYPE");
+    const bool x11 = sessionType == "x11";
+    // Technically the x11 aliases are only available if platformName is "xcb", but we can't know that here.
+#else
+    const bool x11 = false;
+#endif
+
+    options->append(QCommandLineOption(QStringLiteral("platform"),
+                    QGuiApplication::tr("QPA plugin. See QGuiApplication documentation for available options for each plugin."), QStringLiteral("platformName[:options]")));
+    options->append(QCommandLineOption(QStringLiteral("platformpluginpath"),
+                    QGuiApplication::tr("Path to the platform plugins."), QStringLiteral("path")));
+    options->append(QCommandLineOption(QStringLiteral("platformtheme"),
+                    QGuiApplication::tr("Platform theme."), QStringLiteral("theme")));
+    options->append(QCommandLineOption(QStringLiteral("plugin"),
+                    QGuiApplication::tr("Additional plugins to load, can be specified multiple times."), QStringLiteral("plugin")));
+    options->append(QCommandLineOption(QStringLiteral("qwindowgeometry"),
+                    QGuiApplication::tr("Window geometry for the main window, using the X11-syntax, like 100x100+50+50."), QStringLiteral("geometry")));
+    options->append(QCommandLineOption(QStringLiteral("qwindowicon"),
+                    QGuiApplication::tr("Default window icon."), QStringLiteral("icon")));
+    options->append(QCommandLineOption(QStringLiteral("qwindowtitle"),
+                    QGuiApplication::tr("Title of the first window."), QStringLiteral("title")));
+    options->append(QCommandLineOption(QStringLiteral("reverse"),
+                    QGuiApplication::tr("Sets the application's layout direction to Qt::RightToLeft (debugging helper).")));
+    options->append(QCommandLineOption(QStringLiteral("session"),
+                    QGuiApplication::tr("Restores the application from an earlier session."), QStringLiteral("session")));
+
+    if (x11) {
+         options->append(QCommandLineOption(QStringLiteral("display"),
+                         QGuiApplication::tr("Display name, overrides $DISPLAY."), QStringLiteral("display")));
+         options->append(QCommandLineOption(QStringLiteral("name"),
+                         QGuiApplication::tr("Instance name according to ICCCM 4.1.2.5."), QStringLiteral("name")));
+         options->append(QCommandLineOption(QStringLiteral("nograb"),
+                         QGuiApplication::tr("Disable mouse grabbing (useful in debuggers).")));
+         options->append(QCommandLineOption(QStringLiteral("dograb"),
+                         QGuiApplication::tr("Force mouse grabbing (even when running in a debugger).")));
+         options->append(QCommandLineOption(QStringLiteral("visual"),
+                         QGuiApplication::tr("ID of the X11 Visual to use."), QStringLiteral("id")));
+         // Not using the "QStringList names" solution for those aliases, because it makes the first column too wide
+         options->append(QCommandLineOption(QStringLiteral("geometry"),
+                         QGuiApplication::tr("Alias for --windowgeometry."), QStringLiteral("geometry")));
+         options->append(QCommandLineOption(QStringLiteral("icon"),
+                         QGuiApplication::tr("Alias for --windowicon."), QStringLiteral("icon")));
+         options->append(QCommandLineOption(QStringLiteral("title"),
+                         QGuiApplication::tr("Alias for --windowtitle."), QStringLiteral("title")));
+    }
+}
+#endif // QT_CONFIG(commandlineparser)
+
 void QGuiApplicationPrivate::createPlatformIntegration()
 {
     QHighDpiScaling::initHighDpiScaling();
@@ -1648,8 +1707,6 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate()
     platform_theme = 0;
     delete platform_integration;
     platform_integration = 0;
-    delete m_a8ColorProfile.load();
-    delete m_a32ColorProfile.load();
 
     window_list.clear();
     screen_list.clear();
@@ -1806,7 +1863,20 @@ bool QGuiApplication::event(QEvent *e)
 {
     if(e->type() == QEvent::LanguageChange) {
         setLayoutDirection(qt_detectRTLLanguage()?Qt::RightToLeft:Qt::LeftToRight);
+    } else if (e->type() == QEvent::Quit) {
+        // Close open windows. This is done in order to deliver de-expose
+        // events while the event loop is still running.
+        for (QWindow *topLevelWindow : QGuiApplication::topLevelWindows()) {
+            // Already closed windows will not have a platform window, skip those
+            if (!topLevelWindow->handle())
+                continue;
+            if (!topLevelWindow->close()) {
+                e->ignore();
+                return true;
+            }
+        }
     }
+
     return QCoreApplication::event(e);
 }
 
@@ -1832,7 +1902,11 @@ bool QGuiApplicationPrivate::sendQWindowEventToQPlatformWindow(QWindow *window,
     return platformWindow->windowEvent(event);
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QGuiApplicationPrivate::processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QGuiApplicationPrivate::processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result)
+#endif
 {
     return window->nativeEvent(eventType, message, result);
 }
@@ -1879,6 +1953,9 @@ void QGuiApplicationPrivate::processWindowSystemEvent(QWindowSystemInterfacePriv
         QWindowSystemInterfacePrivate::ApplicationStateChangedEvent * changeEvent = static_cast<QWindowSystemInterfacePrivate::ApplicationStateChangedEvent *>(e);
         QGuiApplicationPrivate::setApplicationState(changeEvent->newState, changeEvent->forcePropagate); }
         break;
+    case QWindowSystemInterfacePrivate::ApplicationTermination:
+        QGuiApplicationPrivate::processApplicationTermination(e);
+        break;
     case QWindowSystemInterfacePrivate::FlushEvents: {
         QWindowSystemInterfacePrivate::FlushEventsEvent *flushEventsEvent = static_cast<QWindowSystemInterfacePrivate::FlushEventsEvent *>(e);
         QWindowSystemInterface::deferredFlushWindowSystemEvents(flushEventsEvent->flags); }
@@ -2183,8 +2260,16 @@ void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::Wh
         return;
     }
 
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
      QWheelEvent ev(localPoint, globalPoint, e->pixelDelta, e->angleDelta, e->qt4Delta, e->qt4Orientation,
                     mouse_buttons, e->modifiers, e->phase, e->source, e->inverted);
+QT_WARNING_POP
+#else
+    QWheelEvent ev(localPoint, globalPoint, e->pixelDelta, e->angleDelta,
+                   mouse_buttons, e->modifiers, e->phase, e->inverted, e->source);
+#endif
      ev.setTimestamp(e->timestamp);
      QGuiApplication::sendSpontaneousEvent(window, &ev);
 #else
@@ -2458,9 +2543,8 @@ void QGuiApplicationPrivate::processCloseEvent(QWindowSystemInterfacePrivate::Cl
 
     QCloseEvent event;
     QGuiApplication::sendSpontaneousEvent(e->window.data(), &event);
-    if (e->accepted) {
-        *(e->accepted) = event.isAccepted();
-    }
+
+    e->eventAccepted = event.isAccepted();
 }
 
 void QGuiApplicationPrivate::processFileOpenEvent(QWindowSystemInterfacePrivate::FileOpenEvent *e)
@@ -2777,10 +2861,12 @@ void QGuiApplicationPrivate::processTouchEvent(QWindowSystemInterfacePrivate::To
             if (touchPoint.state() == Qt::TouchPointStationary) {
                 if (touchInfo.touchPoint.velocity() != touchPoint.velocity()) {
                     touchInfo.touchPoint.setVelocity(touchPoint.velocity());
+                    touchPoint.d->stationaryWithModifiedProperty = true;
                     stationaryTouchPointChangedProperty = true;
                 }
                 if (!qFuzzyCompare(touchInfo.touchPoint.pressure(), touchPoint.pressure())) {
                     touchInfo.touchPoint.setPressure(touchPoint.pressure());
+                    touchPoint.d->stationaryWithModifiedProperty = true;
                     stationaryTouchPointChangedProperty = true;
                 }
             } else {
@@ -3240,7 +3326,7 @@ void QGuiApplicationPrivate::applyWindowGeometrySpecificationTo(QWindow *window)
 QFont QGuiApplication::font()
 {
     Q_ASSERT_X(QGuiApplicationPrivate::self, "QGuiApplication::font()", "no QGuiApplication instance");
-    QMutexLocker locker(&applicationFontMutex);
+    const auto locker = qt_scoped_lock(applicationFontMutex);
     initFontUnlocked();
     return *QGuiApplicationPrivate::app_font;
 }
@@ -3252,7 +3338,7 @@ QFont QGuiApplication::font()
 */
 void QGuiApplication::setFont(const QFont &font)
 {
-    QMutexLocker locker(&applicationFontMutex);
+    auto locker = qt_unique_lock(applicationFontMutex);
     const bool emitChange = !QGuiApplicationPrivate::app_font
                             || (*QGuiApplicationPrivate::app_font != font);
     if (!QGuiApplicationPrivate::app_font)
@@ -3419,6 +3505,13 @@ bool QGuiApplicationPrivate::tryCloseRemainingWindows(QWindowList processedWindo
     return true;
 }
 
+void QGuiApplicationPrivate::processApplicationTermination(QWindowSystemInterfacePrivate::WindowSystemEvent *windowSystemEvent)
+{
+    QEvent event(QEvent::Quit);
+    QGuiApplication::sendSpontaneousEvent(QGuiApplication::instance(), &event);
+    windowSystemEvent->eventAccepted = event.isAccepted();
+}
+
 /*!
     \since 5.2
     \fn Qt::ApplicationState QGuiApplication::applicationState()
@@ -3437,6 +3530,46 @@ Qt::ApplicationState QGuiApplication::applicationState()
 }
 
 /*!
+    \since 5.14
+
+    Sets the high-DPI scale factor rounding policy for the application. The
+    \a policy decides how non-integer scale factors (such as Windows 150%) are
+    handled, for applications that have AA_EnableHighDpiScaling enabled.
+
+    The two principal options are whether fractional scale factors should
+    be rounded to an integer or not. Keeping the scale factor as-is will
+    make the user interface size match the OS setting exactly, but may cause
+    painting errors, for example with the Windows style.
+
+    If rounding is wanted, then which type of rounding should be decided
+    next. Mathematically correct rounding is supported but may not give
+    the best visual results: Consider if you want to render 1.5x as 1x
+    ("small UI") or as 2x ("large UI"). See the Qt::HighDpiScaleFactorRoundingPolicy
+    enum for a complete list of all options.
+
+    This function must be called before creating the application object,
+    and can be overridden by setting the QT_SCALE_FACTOR_ROUNDING_POLICY
+    environment variable. The QGuiApplication::highDpiScaleFactorRoundingPolicy()
+    accessor will reflect the environment, if set.
+
+    The default value is Qt::HighDpiScaleFactorRoundingPolicy::RoundPreferFloor.
+*/
+void QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy policy)
+{
+    QGuiApplicationPrivate::highDpiScaleFactorRoundingPolicy = policy;
+}
+
+/*!
+  \since 5.14
+
+  Returns the high-DPI scale factor rounding policy.
+*/
+Qt::HighDpiScaleFactorRoundingPolicy QGuiApplication::highDpiScaleFactorRoundingPolicy()
+{
+    return QGuiApplicationPrivate::highDpiScaleFactorRoundingPolicy;
+}
+
+/*!
     \since 5.2
     \fn void QGuiApplication::applicationStateChanged(Qt::ApplicationState state)
 
@@ -3976,7 +4109,7 @@ void QGuiApplicationPrivate::notifyThemeChanged()
             sendApplicationPaletteChange();
     }
     if (!(applicationResourceFlags & ApplicationFontExplicitlySet)) {
-        QMutexLocker locker(&applicationFontMutex);
+        const auto locker = qt_scoped_lock(applicationFontMutex);
         clearFontUnlocked();
         initFontUnlocked();
     }
@@ -4000,32 +4133,26 @@ void QGuiApplicationPrivate::notifyDragStarted(const QDrag *drag)
 }
 #endif
 
-const QColorProfile *QGuiApplicationPrivate::colorProfileForA8Text()
+const QColorTrcLut *QGuiApplicationPrivate::colorProfileForA8Text()
 {
 #ifdef Q_OS_WIN
-    QColorProfile *result = m_a8ColorProfile.load();
-    if (!result){
-        QColorProfile *cs = QColorProfile::fromGamma(2.31); // This is a hard-coded thing for Windows text rendering
-        if (!m_a8ColorProfile.testAndSetRelease(0, cs))
-            delete cs;
-        result = m_a8ColorProfile.load();
+    if (!m_a8ColorProfile){
+        QColorTrcLut *cs = QColorTrcLut::fromGamma(2.31); // This is a hard-coded thing for Windows text rendering
+        m_a8ColorProfile.reset(cs);
     }
-    return result;
+    return m_a8ColorProfile.get();
 #else
     return colorProfileForA32Text();
 #endif
 }
 
-const QColorProfile *QGuiApplicationPrivate::colorProfileForA32Text()
+const QColorTrcLut *QGuiApplicationPrivate::colorProfileForA32Text()
 {
-    QColorProfile *result = m_a32ColorProfile.load();
-    if (!result){
-        QColorProfile *cs = QColorProfile::fromGamma(fontSmoothingGamma);
-        if (!m_a32ColorProfile.testAndSetRelease(0, cs))
-            delete cs;
-        result = m_a32ColorProfile.load();
+    if (!m_a32ColorProfile) {
+        QColorTrcLut *cs = QColorTrcLut::fromGamma(fontSmoothingGamma);
+        m_a32ColorProfile.reset(cs);
     }
-    return result;
+    return m_a32ColorProfile.get();
 }
 
 void QGuiApplicationPrivate::_q_updateFocusObject(QObject *object)
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index 5ea72fa0f6..fc74c5299a 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -156,6 +156,9 @@ public:
 
     static Qt::ApplicationState applicationState();
 
+    static void setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy policy);
+    static Qt::HighDpiScaleFactorRoundingPolicy highDpiScaleFactorRoundingPolicy();
+
     static int exec();
     bool notify(QObject *, QEvent *) override;
 
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 714c72ac08..26f65b2f16 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -55,6 +55,7 @@
 #include <QtGui/qguiapplication.h>
 
 #include <QtCore/QPointF>
+#include <QtCore/QSharedPointer>
 #include <QtCore/private/qcoreapplication_p.h>
 
 #include <QtCore/private/qthread_p.h>
@@ -66,7 +67,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QColorProfile;
+class QColorTrcLut;
 class QPlatformIntegration;
 class QPlatformTheme;
 class QPlatformDragQtResponse;
@@ -91,6 +92,9 @@ public:
     virtual void notifyLayoutDirectionChange();
     virtual void notifyActiveWindowChange(QWindow *previous);
 
+#if QT_CONFIG(commandlineparser)
+    void addQtOptions(QList<QCommandLineOption> *options) override;
+#endif
     virtual bool shouldQuit() override;
 
     bool shouldQuitInternal(const QWindowList &processedWindows);
@@ -112,9 +116,9 @@ public:
     static QAbstractEventDispatcher *qt_qpa_core_dispatcher()
     {
         if (QCoreApplication::instance())
-            return QCoreApplication::instance()->d_func()->threadData->eventDispatcher.load();
+            return QCoreApplication::instance()->d_func()->threadData->eventDispatcher.loadRelaxed();
         else
-            return 0;
+            return nullptr;
     }
 
     static void processMouseEvent(QWindowSystemInterfacePrivate::MouseEvent *e);
@@ -137,6 +141,8 @@ public:
 
     static void processWindowSystemEvent(QWindowSystemInterfacePrivate::WindowSystemEvent *e);
 
+    static void processApplicationTermination(QWindowSystemInterfacePrivate::WindowSystemEvent *e);
+
     static void updateFilteredScreenOrientation(QScreen *screen);
     static void reportScreenOrientationChange(QScreen *screen);
     static void processScreenOrientationChange(QWindowSystemInterfacePrivate::ScreenOrientationEvent *e);
@@ -171,7 +177,11 @@ public:
                                                Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
 #endif
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    static bool processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, qintptr *result);
+#else
     static bool processNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result);
+#endif
 
     static bool sendQWindowEventToQPlatformWindow(QWindow *window, QEvent *event);
 
@@ -204,7 +214,7 @@ public:
     static void showModalWindow(QWindow *window);
     static void hideModalWindow(QWindow *window);
     static void updateBlockedStatus(QWindow *window);
-    virtual bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const;
+    virtual bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = nullptr) const;
     virtual bool popupActive() { return false; }
 
     static ulong mousePressTime;
@@ -215,6 +225,7 @@ public:
     static QWindow *currentMouseWindow;
     static QWindow *currentMousePressWindow;
     static Qt::ApplicationState applicationState;
+    static Qt::HighDpiScaleFactorRoundingPolicy highDpiScaleFactorRoundingPolicy;
     static bool highDpiScalingUpdated;
     static QPointer<QWindow> currentDragWindow;
 
@@ -298,8 +309,8 @@ public:
 
     static QInputDeviceManager *inputDeviceManager();
 
-    const QColorProfile *colorProfileForA8Text();
-    const QColorProfile *colorProfileForA32Text();
+    const QColorTrcLut *colorProfileForA8Text();
+    const QColorTrcLut *colorProfileForA32Text();
 
     // hook reimplemented in QApplication to apply the QStyle function on the QIcon
     virtual QPixmap applyQIconStyleHelper(QIcon::Mode, const QPixmap &basePixmap) const { return basePixmap; }
@@ -326,8 +337,8 @@ private:
     static QGuiApplicationPrivate *self;
     static QTouchDevice *m_fakeTouchDevice;
     static int m_fakeMouseSourcePointId;
-    QAtomicPointer<QColorProfile> m_a8ColorProfile;
-    QAtomicPointer<QColorProfile> m_a32ColorProfile;
+    QSharedPointer<QColorTrcLut> m_a8ColorProfile;
+    QSharedPointer<QColorTrcLut> m_a32ColorProfile;
 
     bool ownGlobalShareContext;
 
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index 090217187e..edca8d9423 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -68,7 +68,6 @@
 #include "qdebug.h"
 #include "qmap.h"
 #include "qdatetime.h"
-#include "qeasingcurve.h"
 #include "qlist.h"
 #include "qstring.h"
 #include "qstringlist.h"
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
index 8189eebedd..76548d5d86 100644
--- a/src/gui/kernel/qhighdpiscaling.cpp
+++ b/src/gui/kernel/qhighdpiscaling.cpp
@@ -46,6 +46,9 @@
 #include <private/qguiapplication_p.h>
 
 #include <QtCore/qdebug.h>
+#include <QtCore/qmetaobject.h>
+
+#include <algorithm>
 
 QT_BEGIN_NAMESPACE
 
@@ -53,9 +56,29 @@ Q_LOGGING_CATEGORY(lcScaling, "qt.scaling");
 
 #ifndef QT_NO_HIGHDPISCALING
 static const char legacyDevicePixelEnvVar[] = "QT_DEVICE_PIXEL_RATIO";
+static const char legacyAutoScreenEnvVar[] = "QT_AUTO_SCREEN_SCALE_FACTOR";
+
+static const char enableHighDpiScalingEnvVar[] = "QT_ENABLE_HIGHDPI_SCALING";
 static const char scaleFactorEnvVar[] = "QT_SCALE_FACTOR";
-static const char autoScreenEnvVar[] = "QT_AUTO_SCREEN_SCALE_FACTOR";
 static const char screenFactorsEnvVar[] = "QT_SCREEN_SCALE_FACTORS";
+static const char scaleFactorRoundingPolicyEnvVar[] = "QT_SCALE_FACTOR_ROUNDING_POLICY";
+static const char dpiAdjustmentPolicyEnvVar[] = "QT_DPI_ADJUSTMENT_POLICY";
+static const char usePhysicalDpiEnvVar[] = "QT_USE_PHYSICAL_DPI";
+
+// Per-screen scale factors for named screens set with QT_SCREEN_SCALE_FACTORS
+// are stored here. Use a global hash to keep the factor across screen
+// disconnect/connect cycles where the screen object may be deleted.
+typedef QHash<QString, qreal> QScreenScaleFactorHash;
+Q_GLOBAL_STATIC(QScreenScaleFactorHash, qNamedScreenScaleFactors);
+
+// Reads and interprets the given environment variable as a bool,
+// returns the default value if not set.
+static bool qEnvironmentVariableAsBool(const char *name, bool defaultValue)
+{
+    bool ok = false;
+    int value = qEnvironmentVariableIntValue(name, &ok);
+    return ok ? value > 0 : defaultValue;
+}
 
 static inline qreal initialGlobalScaleFactor()
 {
@@ -63,23 +86,30 @@ static inline qreal initialGlobalScaleFactor()
     qreal result = 1;
     if (qEnvironmentVariableIsSet(scaleFactorEnvVar)) {
         bool ok;
-        const qreal f = qgetenv(scaleFactorEnvVar).toDouble(&ok);
+        const qreal f = qEnvironmentVariable(scaleFactorEnvVar).toDouble(&ok);
         if (ok && f > 0) {
             qCDebug(lcScaling) << "Apply " << scaleFactorEnvVar << f;
             result = f;
         }
     } else {
+        // Check for deprecated environment variables.
         if (qEnvironmentVariableIsSet(legacyDevicePixelEnvVar)) {
             qWarning("Warning: %s is deprecated. Instead use:\n"
                      "   %s to enable platform plugin controlled per-screen factors.\n"
-                     "   %s to set per-screen factors.\n"
+                     "   %s to set per-screen DPI.\n"
                      "   %s to set the application global scale factor.",
-                     legacyDevicePixelEnvVar, autoScreenEnvVar, screenFactorsEnvVar, scaleFactorEnvVar);
+                     legacyDevicePixelEnvVar, legacyAutoScreenEnvVar, screenFactorsEnvVar, scaleFactorEnvVar);
 
             int dpr = qEnvironmentVariableIntValue(legacyDevicePixelEnvVar);
             if (dpr > 0)
                 result = dpr;
         }
+
+        if (qEnvironmentVariableIsSet(legacyAutoScreenEnvVar)) {
+            qWarning("Warning: %s is deprecated. Instead use:\n"
+                     "   %s to enable platform plugin controlled per-screen factors.",
+                     legacyAutoScreenEnvVar, enableHighDpiScalingEnvVar);
+        }
     }
     return result;
 }
@@ -226,7 +256,6 @@ bool QHighDpiScaling::m_usePixelDensity = false; // use scale factor from platfo
 bool QHighDpiScaling::m_pixelDensityScalingActive = false; // pixel density scale factor > 1
 bool QHighDpiScaling::m_globalScalingActive = false; // global scale factor is active
 bool QHighDpiScaling::m_screenFactorSet = false; // QHighDpiScaling::setScreenFactor has been used
-QDpi QHighDpiScaling::m_logicalDpi = QDpi(-1,-1); // The scaled logical DPI of the primary screen
 
 /*
     Initializes the QHighDpiScaling global variables. Called before the
@@ -238,16 +267,215 @@ static inline bool usePixelDensity()
     // Determine if we should set a scale factor based on the pixel density
     // reported by the platform plugin. There are several enablers and several
     // disablers. A single disable may veto all other enablers.
+
+    // First, check of there is an explicit disable.
     if (QCoreApplication::testAttribute(Qt::AA_DisableHighDpiScaling))
         return false;
     bool screenEnvValueOk;
-    const int screenEnvValue = qEnvironmentVariableIntValue(autoScreenEnvVar, &screenEnvValueOk);
+    const int screenEnvValue = qEnvironmentVariableIntValue(legacyAutoScreenEnvVar, &screenEnvValueOk);
     if (screenEnvValueOk && screenEnvValue < 1)
         return false;
+    bool enableEnvValueOk;
+    const int enableEnvValue = qEnvironmentVariableIntValue(enableHighDpiScalingEnvVar, &enableEnvValueOk);
+    if (enableEnvValueOk && enableEnvValue < 1)
+        return false;
+
+    // Then return if there was an enable.
     return QCoreApplication::testAttribute(Qt::AA_EnableHighDpiScaling)
         || (screenEnvValueOk && screenEnvValue > 0)
-        || (qEnvironmentVariableIsSet(legacyDevicePixelEnvVar) &&
-            qgetenv(legacyDevicePixelEnvVar).compare("auto", Qt::CaseInsensitive) == 0);
+        || (enableEnvValueOk && enableEnvValue > 0)
+        || (qEnvironmentVariableIsSet(legacyDevicePixelEnvVar)
+            && qEnvironmentVariable(legacyDevicePixelEnvVar).compare(QLatin1String("auto"), Qt::CaseInsensitive) == 0);
+}
+
+qreal QHighDpiScaling::rawScaleFactor(const QPlatformScreen *screen)
+{
+    // Determine if physical DPI should be used
+    static const bool usePhysicalDpi = qEnvironmentVariableAsBool(usePhysicalDpiEnvVar, false);
+
+    // Calculate scale factor beased on platform screen DPI values
+    qreal factor;
+    QDpi platformBaseDpi = screen->logicalBaseDpi();
+    if (usePhysicalDpi) {
+        qreal platformPhysicalDpi = screen->screen()->physicalDotsPerInch();
+        factor = qreal(platformPhysicalDpi) / qreal(platformBaseDpi.first);
+    } else {
+        const QDpi platformLogicalDpi = QPlatformScreen::overrideDpi(screen->logicalDpi());
+        factor = qreal(platformLogicalDpi.first) / qreal(platformBaseDpi.first);
+    }
+
+    return factor;
+}
+
+template <class EnumType>
+struct EnumLookup
+{
+    const char *name;
+    EnumType value;
+};
+
+template <class EnumType>
+static bool operator==(const EnumLookup<EnumType> &e1, const EnumLookup<EnumType> &e2)
+{
+    return qstricmp(e1.name, e2.name) == 0;
+}
+
+template <class EnumType>
+static QByteArray joinEnumValues(const EnumLookup<EnumType> *i1, const EnumLookup<EnumType> *i2)
+{
+    QByteArray result;
+    for (; i1 < i2; ++i1) {
+        if (!result.isEmpty())
+            result += QByteArrayLiteral(", ");
+        result += i1->name;
+    }
+    return result;
+}
+
+using ScaleFactorRoundingPolicyLookup = EnumLookup<Qt::HighDpiScaleFactorRoundingPolicy>;
+
+static const ScaleFactorRoundingPolicyLookup scaleFactorRoundingPolicyLookup[] =
+{
+    {"Round", Qt::HighDpiScaleFactorRoundingPolicy::Round},
+    {"Ceil", Qt::HighDpiScaleFactorRoundingPolicy::Ceil},
+    {"Floor", Qt::HighDpiScaleFactorRoundingPolicy::Floor},
+    {"RoundPreferFloor", Qt::HighDpiScaleFactorRoundingPolicy::RoundPreferFloor},
+    {"PassThrough", Qt::HighDpiScaleFactorRoundingPolicy::PassThrough}
+};
+
+static Qt::HighDpiScaleFactorRoundingPolicy
+    lookupScaleFactorRoundingPolicy(const QByteArray &v)
+{
+    auto end = std::end(scaleFactorRoundingPolicyLookup);
+    auto it = std::find(std::begin(scaleFactorRoundingPolicyLookup), end,
+                        ScaleFactorRoundingPolicyLookup{v.constData(), Qt::HighDpiScaleFactorRoundingPolicy::Unset});
+    return it != end ? it->value : Qt::HighDpiScaleFactorRoundingPolicy::Unset;
+}
+
+using DpiAdjustmentPolicyLookup = EnumLookup<QHighDpiScaling::DpiAdjustmentPolicy>;
+
+static const DpiAdjustmentPolicyLookup dpiAdjustmentPolicyLookup[] =
+{
+    {"AdjustDpi", QHighDpiScaling::DpiAdjustmentPolicy::Enabled},
+    {"DontAdjustDpi", QHighDpiScaling::DpiAdjustmentPolicy::Disabled},
+    {"AdjustUpOnly", QHighDpiScaling::DpiAdjustmentPolicy::UpOnly}
+};
+
+static QHighDpiScaling::DpiAdjustmentPolicy
+    lookupDpiAdjustmentPolicy(const QByteArray &v)
+{
+    auto end = std::end(dpiAdjustmentPolicyLookup);
+    auto it = std::find(std::begin(dpiAdjustmentPolicyLookup), end,
+                        DpiAdjustmentPolicyLookup{v.constData(), QHighDpiScaling::DpiAdjustmentPolicy::Unset});
+    return it != end ? it->value : QHighDpiScaling::DpiAdjustmentPolicy::Unset;
+}
+
+qreal QHighDpiScaling::roundScaleFactor(qreal rawFactor)
+{
+    // Apply scale factor rounding policy. Using mathematically correct rounding
+    // may not give the most desirable visual results, especially for
+    // critical fractions like .5. In general, rounding down results in visual
+    // sizes that are smaller than the ideal size, and opposite for rounding up.
+    // Rounding down is then preferable since "small UI" is a more acceptable
+    // high-DPI experience than "large UI".
+    static auto scaleFactorRoundingPolicy = Qt::HighDpiScaleFactorRoundingPolicy::Unset;
+
+    // Determine rounding policy
+    if (scaleFactorRoundingPolicy == Qt::HighDpiScaleFactorRoundingPolicy::Unset) {
+        // Check environment
+        if (qEnvironmentVariableIsSet(scaleFactorRoundingPolicyEnvVar)) {
+            QByteArray policyText = qgetenv(scaleFactorRoundingPolicyEnvVar);
+            auto policyEnumValue = lookupScaleFactorRoundingPolicy(policyText);
+            if (policyEnumValue != Qt::HighDpiScaleFactorRoundingPolicy::Unset) {
+                scaleFactorRoundingPolicy = policyEnumValue;
+            } else {
+                auto values = joinEnumValues(std::begin(scaleFactorRoundingPolicyLookup),
+                                             std::end(scaleFactorRoundingPolicyLookup));
+                qWarning("Unknown scale factor rounding policy: %s. Supported values are: %s.",
+                         policyText.constData(), values.constData());
+            }
+        }
+
+        // Check application object if no environment value was set.
+        if (scaleFactorRoundingPolicy == Qt::HighDpiScaleFactorRoundingPolicy::Unset) {
+            scaleFactorRoundingPolicy = QGuiApplication::highDpiScaleFactorRoundingPolicy();
+        } else {
+            // Make application setting reflect environment
+            QGuiApplication::setHighDpiScaleFactorRoundingPolicy(scaleFactorRoundingPolicy);
+        }
+    }
+
+    // Apply rounding policy.
+    qreal roundedFactor = rawFactor;
+    switch (scaleFactorRoundingPolicy) {
+    case Qt::HighDpiScaleFactorRoundingPolicy::Round:
+        roundedFactor = qRound(rawFactor);
+        break;
+    case Qt::HighDpiScaleFactorRoundingPolicy::Ceil:
+        roundedFactor = qCeil(rawFactor);
+        break;
+    case Qt::HighDpiScaleFactorRoundingPolicy::Floor:
+        roundedFactor = qFloor(rawFactor);
+        break;
+    case Qt::HighDpiScaleFactorRoundingPolicy::RoundPreferFloor:
+        // Round up for .75 and higher. This favors "small UI" over "large UI".
+        roundedFactor = rawFactor - qFloor(rawFactor) < 0.75
+            ? qFloor(rawFactor) : qCeil(rawFactor);
+        break;
+    case Qt::HighDpiScaleFactorRoundingPolicy::PassThrough:
+    case Qt::HighDpiScaleFactorRoundingPolicy::Unset:
+        break;
+    }
+
+    // Don't round down to to zero; clamp the minimum (rounded) factor to 1.
+    // This is not a common case but can happen if a display reports a very
+    // low DPI.
+    if (scaleFactorRoundingPolicy != Qt::HighDpiScaleFactorRoundingPolicy::PassThrough)
+        roundedFactor = qMax(roundedFactor, qreal(1));
+
+    return roundedFactor;
+}
+
+QDpi QHighDpiScaling::effectiveLogicalDpi(const QPlatformScreen *screen, qreal rawFactor, qreal roundedFactor)
+{
+    // Apply DPI adjustment policy, if needed. If enabled this will change the
+    // reported logical DPI to account for the difference between the rounded
+    // scale factor and the actual scale factor. The effect is that text size
+    // will be correct for the screen dpi, but may be (slightly) out of sync
+    // with the rest of the UI. The amount of out-of-synch-ness depends on how
+    // well user code handles a non-standard DPI values, but since the
+    // adjustment is small (typically +/- 48 max) this might be OK.
+    static auto dpiAdjustmentPolicy = DpiAdjustmentPolicy::Unset;
+
+    // Determine adjustment policy.
+    if (dpiAdjustmentPolicy == DpiAdjustmentPolicy::Unset) {
+        if (qEnvironmentVariableIsSet(dpiAdjustmentPolicyEnvVar)) {
+            QByteArray policyText = qgetenv(dpiAdjustmentPolicyEnvVar);
+            auto policyEnumValue = lookupDpiAdjustmentPolicy(policyText);
+            if (policyEnumValue != DpiAdjustmentPolicy::Unset) {
+                dpiAdjustmentPolicy = policyEnumValue;
+            } else {
+                auto values = joinEnumValues(std::begin(dpiAdjustmentPolicyLookup),
+                                             std::end(dpiAdjustmentPolicyLookup));
+                qWarning("Unknown DPI adjustment policy: %s. Supported values are: %s.",
+                         policyText.constData(), values.constData());
+            }
+        }
+        if (dpiAdjustmentPolicy == DpiAdjustmentPolicy::Unset)
+            dpiAdjustmentPolicy = DpiAdjustmentPolicy::UpOnly;
+    }
+
+    // Apply adjustment policy.
+    const QDpi baseDpi = screen->logicalBaseDpi();
+    const qreal dpiAdjustmentFactor = rawFactor / roundedFactor;
+
+    // Return the base DPI for cases where there is no adjustment
+    if (dpiAdjustmentPolicy == DpiAdjustmentPolicy::Disabled)
+        return baseDpi;
+    if (dpiAdjustmentPolicy == DpiAdjustmentPolicy::UpOnly && dpiAdjustmentFactor < 1)
+        return baseDpi;
+
+    return QDpi(baseDpi.first * dpiAdjustmentFactor, baseDpi.second * dpiAdjustmentFactor);
 }
 
 void QHighDpiScaling::initHighDpiScaling()
@@ -260,8 +488,6 @@ void QHighDpiScaling::initHighDpiScaling()
 
     m_pixelDensityScalingActive = false; //set in updateHighDpiScaling below
 
-    // we update m_active in updateHighDpiScaling, but while we create the
-    // screens, we have to assume that m_usePixelDensity implies scaling
     m_active = m_globalScalingActive || m_usePixelDensity;
 }
 
@@ -281,22 +507,21 @@ void QHighDpiScaling::updateHighDpiScaling()
     }
     if (qEnvironmentVariableIsSet(screenFactorsEnvVar)) {
         int i = 0;
-        const auto specs = qgetenv(screenFactorsEnvVar).split(';');
-        for (const QByteArray &spec : specs) {
-            QScreen *screen = 0;
-            int equalsPos = spec.lastIndexOf('=');
-            double factor = 0;
+        const QString spec = qEnvironmentVariable(screenFactorsEnvVar);
+        const auto specs = spec.splitRef(QLatin1Char(';'));
+        for (const QStringRef &spec : specs) {
+            int equalsPos = spec.lastIndexOf(QLatin1Char('='));
+            qreal factor = 0;
             if (equalsPos > 0) {
                 // support "name=factor"
-                QByteArray name = spec.mid(0, equalsPos);
-                QByteArray f = spec.mid(equalsPos + 1);
                 bool ok;
-                factor = f.toDouble(&ok);
-                if (ok) {
+                const auto name = spec.left(equalsPos);
+                factor = spec.mid(equalsPos + 1).toDouble(&ok);
+                if (ok && factor > 0 ) {
                     const auto screens = QGuiApplication::screens();
                     for (QScreen *s : screens) {
-                        if (s->name() == QString::fromLocal8Bit(name)) {
-                            screen = s;
+                        if (s->name() == name) {
+                            setScreenFactor(s, factor);
                             break;
                         }
                     }
@@ -305,23 +530,15 @@ void QHighDpiScaling::updateHighDpiScaling()
                 // listing screens in order
                 bool ok;
                 factor = spec.toDouble(&ok);
-                if (ok && i < QGuiApplication::screens().count())
-                    screen = QGuiApplication::screens().at(i);
+                if (ok && factor > 0 && i < QGuiApplication::screens().count()) {
+                    QScreen *screen = QGuiApplication::screens().at(i);
+                    setScreenFactor(screen, factor);
+                }
             }
-            if (screen)
-                setScreenFactor(screen, factor);
             ++i;
         }
     }
-    m_active = m_globalScalingActive || m_screenFactorSet || m_pixelDensityScalingActive;
-
-    QScreen *primaryScreen = QGuiApplication::primaryScreen();
-    if (!primaryScreen)
-        return;
-    QPlatformScreen *platformScreen = primaryScreen->handle();
-    qreal sf = screenSubfactor(platformScreen);
-    QDpi primaryDpi = platformScreen->logicalDpi();
-    m_logicalDpi = QDpi(primaryDpi.first / sf, primaryDpi.second / sf);
+    m_active = m_globalScalingActive || m_screenFactorSet || m_usePixelDensity;
 }
 
 /*
@@ -353,7 +570,14 @@ void QHighDpiScaling::setScreenFactor(QScreen *screen, qreal factor)
         m_screenFactorSet = true;
         m_active = true;
     }
-    screen->setProperty(scaleFactorProperty, QVariant(factor));
+
+    // Prefer associating the factor with screen name over the object
+    // since the screen object may be deleted on screen disconnects.
+    const QString name = screen->name();
+    if (name.isEmpty())
+        screen->setProperty(scaleFactorProperty, QVariant(factor));
+    else
+        qNamedScreenScaleFactors()->insert(name, factor);
 
     // hack to force re-evaluation of screen geometry
     if (screen->handle())
@@ -421,35 +645,50 @@ QPoint QHighDpiScaling::mapPositionFromGlobal(const QPoint &pos, const QPoint &w
 qreal QHighDpiScaling::screenSubfactor(const QPlatformScreen *screen)
 {
     qreal factor = qreal(1.0);
-    if (screen) {
-        if (m_usePixelDensity) {
-            qreal pixelDensity = screen->pixelDensity();
-
-            // Pixel density reported by the screen is sometimes not precise enough,
-            // so recalculate it: divide px (physical pixels) by dp (device-independent pixels)
-            // for both width and height, and then use the average if it is different from
-            // the one initially reported by the screen
-            QRect screenGeometry = screen->geometry();
-            qreal wFactor = qreal(screenGeometry.width()) / qRound(screenGeometry.width() / pixelDensity);
-            qreal hFactor = qreal(screenGeometry.height()) / qRound(screenGeometry.height() / pixelDensity);
-            qreal averageDensity = (wFactor + hFactor) / 2;
-            if (!qFuzzyCompare(pixelDensity, averageDensity))
-                pixelDensity = averageDensity;
-
-            factor *= pixelDensity;
-        }
-        if (m_screenFactorSet) {
-            QVariant screenFactor = screen->screen()->property(scaleFactorProperty);
-            if (screenFactor.isValid())
-                factor *= screenFactor.toReal();
+    if (!screen)
+        return factor;
+
+    // Unlike the other code where factors are combined by multiplication,
+    // factors from QT_SCREEN_SCALE_FACTORS takes precedence over the factor
+    // computed from platform plugin DPI. The rationale is that the user is
+    // setting the factor to override erroneous DPI values.
+    bool screenPropertyUsed = false;
+    if (m_screenFactorSet) {
+        // Check if there is a factor set on the screen object or associated
+        // with the screen name. These are mutually exclusive, so checking
+        // order is not significant.
+        QVariant byIndex = screen->screen()->property(scaleFactorProperty);
+        auto byNameIt = qNamedScreenScaleFactors()->constFind(screen->name());
+        if (byIndex.isValid()) {
+            screenPropertyUsed = true;
+            factor = byIndex.toReal();
+        } else if (byNameIt != qNamedScreenScaleFactors()->cend()) {
+            screenPropertyUsed = true;
+            factor = *byNameIt;
         }
     }
+
+    if (!screenPropertyUsed && m_usePixelDensity)
+        factor = roundScaleFactor(rawScaleFactor(screen));
+
     return factor;
 }
 
-QDpi QHighDpiScaling::logicalDpi()
+QDpi QHighDpiScaling::logicalDpi(const QScreen *screen)
 {
-    return m_logicalDpi;
+    // (Note: m_active test is performed at call site.)
+    if (!screen || !screen->handle())
+        return QDpi(96, 96);
+
+    if (!m_usePixelDensity) {
+        const qreal screenScaleFactor = screenSubfactor(screen->handle());
+        const QDpi dpi = QPlatformScreen::overrideDpi(screen->handle()->logicalDpi());
+        return QDpi{ dpi.first / screenScaleFactor, dpi.second / screenScaleFactor };
+    }
+
+    const qreal scaleFactor = rawScaleFactor(screen->handle());
+    const qreal roundedScaleFactor = roundScaleFactor(scaleFactor);
+    return effectiveLogicalDpi(screen->handle(), scaleFactor, roundedScaleFactor);
 }
 
 QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QPlatformScreen *platformScreen, QPoint *nativePosition)
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index c43641b8c9..f58944a7d2 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -72,11 +72,27 @@ typedef QPair<qreal, qreal> QDpi;
 
 #ifndef QT_NO_HIGHDPISCALING
 class Q_GUI_EXPORT QHighDpiScaling {
+    Q_GADGET
 public:
+    enum class DpiAdjustmentPolicy {
+        Unset,
+        Enabled,
+        Disabled,
+        UpOnly
+    };
+    Q_ENUM(DpiAdjustmentPolicy)
+
+    QHighDpiScaling() = delete;
+    ~QHighDpiScaling() = delete;
+    QHighDpiScaling(const QHighDpiScaling &) = delete;
+    QHighDpiScaling &operator=(const QHighDpiScaling &) = delete;
+    QHighDpiScaling(QHighDpiScaling &&) = delete;
+    QHighDpiScaling &operator=(QHighDpiScaling &&) = delete;
+
     static void initHighDpiScaling();
     static void updateHighDpiScaling();
     static void setGlobalFactor(qreal factor);
-    static void setScreenFactor(QScreen *window, qreal factor);
+    static void setScreenFactor(QScreen *screen, qreal factor);
 
     static bool isActive() { return m_active; }
 
@@ -98,9 +114,12 @@ public:
     static QPoint mapPositionToNative(const QPoint &pos, const QPlatformScreen *platformScreen);
     static QPoint mapPositionToGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window);
     static QPoint mapPositionFromGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window);
-    static QDpi logicalDpi();
+    static QDpi logicalDpi(const QScreen *screen);
 
 private:
+    static qreal rawScaleFactor(const QPlatformScreen *screen);
+    static qreal roundScaleFactor(qreal rawFactor);
+    static QDpi effectiveLogicalDpi(const QPlatformScreen *screen, qreal rawFactor, qreal roundedFactor);
     static qreal screenSubfactor(const QPlatformScreen *screen);
 
     static qreal m_factor;
@@ -292,6 +311,8 @@ public:
     static inline QPoint origin(const QPlatformScreen *) { return QPoint(); }
     static inline QPoint mapPositionFromNative(const QPoint &pos, const QPlatformScreen *) { return pos; }
     static inline QPoint mapPositionToNative(const QPoint &pos, const QPlatformScreen *) { return pos; }
+    static inline QPoint mapPositionToGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window) { return pos; }
+    static inline QPoint mapPositionFromGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window) { return pos; }
     static inline QDpi logicalDpi() { return QDpi(-1,-1); }
 };
 
diff --git a/src/gui/kernel/qinputdevicemanager.cpp b/src/gui/kernel/qinputdevicemanager.cpp
index 6e4e5a9c93..11442407e1 100644
--- a/src/gui/kernel/qinputdevicemanager.cpp
+++ b/src/gui/kernel/qinputdevicemanager.cpp
@@ -75,13 +75,13 @@ int QInputDeviceManager::deviceCount(DeviceType type) const
 
 int QInputDeviceManagerPrivate::deviceCount(QInputDeviceManager::DeviceType type) const
 {
-    return m_deviceCount.value(type);
+    return m_deviceCount[type];
 }
 
 void QInputDeviceManagerPrivate::setDeviceCount(QInputDeviceManager::DeviceType type, int count)
 {
     Q_Q(QInputDeviceManager);
-    if (m_deviceCount.value(type) != count) {
+    if (m_deviceCount[type] != count) {
         m_deviceCount[type] = count;
         emit q->deviceListChanged(type);
     }
diff --git a/src/gui/kernel/qinputdevicemanager_p.h b/src/gui/kernel/qinputdevicemanager_p.h
index 74494d712b..1d20b102e3 100644
--- a/src/gui/kernel/qinputdevicemanager_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p.h
@@ -69,7 +69,9 @@ public:
         DeviceTypePointer,
         DeviceTypeKeyboard,
         DeviceTypeTouch,
-        DeviceTypeTablet
+        DeviceTypeTablet,
+
+        NumDeviceTypes
     };
 
     QInputDeviceManager(QObject *parent = nullptr);
diff --git a/src/gui/kernel/qinputdevicemanager_p_p.h b/src/gui/kernel/qinputdevicemanager_p_p.h
index 0a91252fbc..871f9315c3 100644
--- a/src/gui/kernel/qinputdevicemanager_p_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p_p.h
@@ -52,10 +52,11 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
-#include <QtCore/qmap.h>
 #include <private/qobject_p.h>
 #include "qinputdevicemanager_p.h"
 
+#include <array>
+
 QT_BEGIN_NAMESPACE
 
 class Q_GUI_EXPORT QInputDeviceManagerPrivate : public QObjectPrivate
@@ -68,7 +69,7 @@ public:
     int deviceCount(QInputDeviceManager::DeviceType type) const;
     void setDeviceCount(QInputDeviceManager::DeviceType type, int count);
 
-    QMap<QInputDeviceManager::DeviceType, int> m_deviceCount;
+    std::array<int, QInputDeviceManager::NumDeviceTypes> m_deviceCount;
 
     Qt::KeyboardModifiers keyboardModifiers;
 };
diff --git a/src/gui/kernel/qinputmethod_p.h b/src/gui/kernel/qinputmethod_p.h
index 0c2b739d92..5657edeb4e 100644
--- a/src/gui/kernel/qinputmethod_p.h
+++ b/src/gui/kernel/qinputmethod_p.h
@@ -67,7 +67,7 @@ class QInputMethodPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QInputMethod)
 
 public:
-    inline QInputMethodPrivate() : testContext(0)
+    inline QInputMethodPrivate() : testContext(nullptr)
     {}
     QPlatformInputContext *platformInputContext() const
     {
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 74bf6e6b47..2a86b340af 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -46,9 +46,6 @@
 
 #include "qdebug.h"
 #include <QtCore/qhashfunctions.h>
-#ifndef QT_NO_REGEXP
-# include "qregexp.h"
-#endif
 #ifndef QT_NO_DATASTREAM
 # include "qdatastream.h"
 #endif
@@ -1466,7 +1463,7 @@ bool QKeySequence::operator==(const QKeySequence &other) const
     Calculates the hash value of \a key, using
     \a seed to seed the calculation.
 */
-uint qHash(const QKeySequence &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QKeySequence &key, uint seed) noexcept
 {
     return qHashRange(key.d->key, key.d->key + QKeySequencePrivate::MaxKeyCount, seed);
 }
@@ -1521,7 +1518,7 @@ bool QKeySequence::operator< (const QKeySequence &other) const
 */
 bool QKeySequence::isDetached() const
 {
-    return d->ref.load() == 1;
+    return d->ref.loadRelaxed() == 1;
 }
 
 /*!
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h
index 65f3a93d9c..3dcbbe5941 100644
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@@ -66,7 +66,7 @@ void qt_set_sequence_auto_mnemonic(bool b);
 class QVariant;
 class QKeySequencePrivate;
 
-Q_GUI_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QKeySequence &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_GUI_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QKeySequence &key, uint seed = 0) noexcept;
 
 class Q_GUI_EXPORT QKeySequence
 {
@@ -186,10 +186,8 @@ public:
     operator QVariant() const;
     int operator[](uint i) const;
     QKeySequence &operator=(const QKeySequence &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QKeySequence &operator=(QKeySequence &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
-    void swap(QKeySequence &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    QKeySequence &operator=(QKeySequence &&other) noexcept { swap(other); return *this; }
+    void swap(QKeySequence &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QKeySequence &other) const;
     inline bool operator!= (const QKeySequence &other) const
@@ -214,7 +212,7 @@ private:
 
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks);
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QKeySequence &ks);
-    friend Q_GUI_EXPORT uint qHash(const QKeySequence &key, uint seed) Q_DECL_NOTHROW;
+    friend Q_GUI_EXPORT uint qHash(const QKeySequence &key, uint seed) noexcept;
     friend class QShortcutMap;
     friend class QShortcut;
 
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 3d9f1309c9..638eb1d12f 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -45,6 +45,7 @@
 
 #include <QtCore/QThreadStorage>
 #include <QtCore/QThread>
+#include <QtCore/private/qlocking_p.h>
 
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qopengl_p.h>
@@ -1442,7 +1443,7 @@ QOpenGLContextGroup *QOpenGLContextGroup::currentContextGroup()
 
 void QOpenGLContextGroupPrivate::addContext(QOpenGLContext *ctx)
 {
-    QMutexLocker locker(&m_mutex);
+    const auto locker = qt_scoped_lock(m_mutex);
     m_refs.ref();
     m_shares << ctx;
 }
@@ -1454,7 +1455,7 @@ void QOpenGLContextGroupPrivate::removeContext(QOpenGLContext *ctx)
     bool deleteObject = false;
 
     {
-        QMutexLocker locker(&m_mutex);
+        const auto locker = qt_scoped_lock(m_mutex);
         m_shares.removeOne(ctx);
 
         if (ctx == m_context && !m_shares.isEmpty())
@@ -1502,7 +1503,7 @@ void QOpenGLContextGroupPrivate::cleanup()
 
 void QOpenGLContextGroupPrivate::deletePendingResources(QOpenGLContext *ctx)
 {
-    QMutexLocker locker(&m_mutex);
+    const auto locker = qt_scoped_lock(m_mutex);
 
     const QList<QOpenGLSharedResource *> pending = m_pendingDeletion;
     m_pendingDeletion.clear();
@@ -1543,7 +1544,7 @@ void QOpenGLContextGroupPrivate::deletePendingResources(QOpenGLContext *ctx)
 QOpenGLSharedResource::QOpenGLSharedResource(QOpenGLContextGroup *group)
     : m_group(group)
 {
-    QMutexLocker locker(&m_group->d_func()->m_mutex);
+    const auto locker = qt_scoped_lock(m_group->d_func()->m_mutex);
     m_group->d_func()->m_sharedResources << this;
 }
 
@@ -1559,7 +1560,7 @@ void QOpenGLSharedResource::free()
         return;
     }
 
-    QMutexLocker locker(&m_group->d_func()->m_mutex);
+    const auto locker = qt_scoped_lock(m_group->d_func()->m_mutex);
     m_group->d_func()->m_sharedResources.removeOne(this);
     m_group->d_func()->m_pendingDeletion << this;
 
@@ -1607,8 +1608,7 @@ void QOpenGLSharedResourceGuard::freeResource(QOpenGLContext *context)
     QOpenGLMultiGroupSharedResource instance.
 */
 QOpenGLMultiGroupSharedResource::QOpenGLMultiGroupSharedResource()
-    : active(0),
-      m_mutex(QMutex::Recursive)
+    : active(0)
 {
 #ifdef QT_GL_CONTEXT_RESOURCE_DEBUG
     qDebug("Creating context group resource object %p.", this);
@@ -1631,7 +1631,7 @@ QOpenGLMultiGroupSharedResource::~QOpenGLMultiGroupSharedResource()
         active.deref();
     }
 #ifndef QT_NO_DEBUG
-    if (active.load() != 0) {
+    if (active.loadRelaxed() != 0) {
         qWarning("QtGui: Resources are still available at program shutdown.\n"
                  "          This is possibly caused by a leaked QOpenGLWidget, \n"
                  "          QOpenGLFramebufferObject or QOpenGLPixelBuffer.");
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index 2849d0c58e..833cfb20c3 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -131,8 +131,7 @@ class Q_GUI_EXPORT QOpenGLContextGroupPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QOpenGLContextGroup)
 public:
     QOpenGLContextGroupPrivate()
-        : m_context(0)
-        , m_mutex(QMutex::Recursive)
+        : m_context(nullptr)
         , m_refs(0)
     {
     }
@@ -147,7 +146,7 @@ public:
     QOpenGLContext *m_context;
 
     QList<QOpenGLContext *> m_shares;
-    QMutex m_mutex;
+    QRecursiveMutex m_mutex;
 
     QHash<QOpenGLMultiGroupSharedResource *, QOpenGLSharedResource *> m_resources;
     QAtomicInt m_refs;
@@ -186,7 +185,7 @@ public:
 private:
     QAtomicInt active;
     QList<QOpenGLContextGroup *> m_groups;
-    QMutex m_mutex;
+    QRecursiveMutex m_mutex;
 };
 
 class QPaintEngineEx;
@@ -198,20 +197,20 @@ class Q_GUI_EXPORT QOpenGLContextPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QOpenGLContext)
 public:
     QOpenGLContextPrivate()
-        : qGLContextHandle(0)
-        , qGLContextDeleteFunction(0)
-        , platformGLContext(0)
-        , shareContext(0)
-        , shareGroup(0)
-        , screen(0)
-        , surface(0)
-        , functions(0)
-        , textureFunctions(0)
+        : qGLContextHandle(nullptr)
+        , qGLContextDeleteFunction(nullptr)
+        , platformGLContext(nullptr)
+        , shareContext(nullptr)
+        , shareGroup(nullptr)
+        , screen(nullptr)
+        , surface(nullptr)
+        , functions(nullptr)
+        , textureFunctions(nullptr)
         , max_texture_size(-1)
         , workaround_brokenFBOReadBack(false)
         , workaround_brokenTexSubImage(false)
         , workaround_missingPrecisionQualifiers(false)
-        , active_engine(0)
+        , active_engine(nullptr)
         , qgl_current_fbo_invalid(false)
         , qgl_current_fbo(nullptr)
         , defaultFboRedirect(0)
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 193fd9590d..61dccd77ac 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -830,7 +830,7 @@ bool QPalette::isBrushSet(ColorGroup cg, ColorRole cr) const
 */
 void QPalette::detach()
 {
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         QPalettePrivate *x = new QPalettePrivate;
         for(int grp = 0; grp < (int)NColorGroups; grp++) {
             for(int role = 0; role < (int)NColorRoles; role++)
@@ -1209,7 +1209,7 @@ QDebug operator<<(QDebug dbg, const QPalette &p)
     QDebugStateSaver saver(dbg);
     QDebug nospace = dbg.nospace();
     const uint mask = p.resolve();
-    nospace << "QPalette(resolve=" << hex << showbase << mask << ',';
+    nospace << "QPalette(resolve=" << Qt::hex << Qt::showbase << mask << ',';
     for (int role = 0; role < (int)QPalette::NColorRoles; ++role) {
         if (mask & (1<<role)) {
             if (role)
@@ -1225,7 +1225,7 @@ QDebug operator<<(QDebug dbg, const QPalette &p)
             nospace << ']';
         }
     }
-    nospace << ')' << noshowbase << dec;
+    nospace << ')' << Qt::noshowbase << Qt::dec;
     return dbg;
 }
 #endif
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index e931e01480..d3a840d9ad 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -67,18 +67,16 @@ public:
     QPalette(const QPalette &palette);
     ~QPalette();
     QPalette &operator=(const QPalette &palette);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QPalette(QPalette &&other) Q_DECL_NOTHROW
+    QPalette(QPalette &&other) noexcept
         : d(other.d), data(other.data)
     { other.d = nullptr; }
-    inline QPalette &operator=(QPalette &&other) Q_DECL_NOEXCEPT
+    inline QPalette &operator=(QPalette &&other) noexcept
     {
         for_faster_swapping_dont_use = other.for_faster_swapping_dont_use;
         qSwap(d, other.d); return *this;
     }
-#endif
 
-    void swap(QPalette &other) Q_DECL_NOEXCEPT
+    void swap(QPalette &other) noexcept
     {
         qSwap(d, other.d);
         qSwap(for_faster_swapping_dont_use, other.for_faster_swapping_dont_use);
diff --git a/src/gui/kernel/qpixelformat.h b/src/gui/kernel/qpixelformat.h
index 6b2d6a6ac7..a041a39fc1 100644
--- a/src/gui/kernel/qpixelformat.h
+++ b/src/gui/kernel/qpixelformat.h
@@ -95,7 +95,7 @@ class QPixelFormat
     Q_STATIC_ASSERT(uint(TotalFieldWidthByWidths) == uint(TotalFieldWidthByOffsets));
     Q_STATIC_ASSERT(uint(TotalFieldWidthByWidths) == 8 * sizeof(quint64));
 
-    Q_DECL_CONSTEXPR inline uchar get(Field offset, FieldWidth width) const Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR inline uchar get(Field offset, FieldWidth width) const noexcept
     { return uchar((data >> uint(offset)) & ((Q_UINT64_C(1) << uint(width)) - Q_UINT64_C(1))); }
     Q_DECL_CONSTEXPR static inline quint64 set(Field offset, FieldWidth width, uchar value)
     { return (quint64(value) & ((Q_UINT64_C(1) << uint(width)) - Q_UINT64_C(1))) << uint(offset); }
@@ -160,7 +160,7 @@ public:
         CurrentSystemEndian
     };
 
-    Q_DECL_CONSTEXPR inline QPixelFormat() Q_DECL_NOTHROW : data(0) {}
+    Q_DECL_CONSTEXPR inline QPixelFormat() noexcept : data(0) {}
     Q_DECL_CONSTEXPR inline QPixelFormat(ColorModel colorModel,
                                            uchar firstSize,
                                            uchar secondSize,
@@ -173,47 +173,47 @@ public:
                                            AlphaPremultiplied premultiplied,
                                            TypeInterpretation typeInterpretation,
                                            ByteOrder byteOrder = CurrentSystemEndian,
-                                           uchar subEnum = 0) Q_DECL_NOTHROW;
+                                           uchar subEnum = 0) noexcept;
 
-    Q_DECL_CONSTEXPR inline ColorModel colorModel() const  Q_DECL_NOTHROW { return ColorModel(get(ModelField, ModelFieldWidth)); }
-    Q_DECL_CONSTEXPR inline uchar channelCount() const Q_DECL_NOTHROW { return (get(FirstField, FirstFieldWidth) > 0) +
+    Q_DECL_CONSTEXPR inline ColorModel colorModel() const  noexcept { return ColorModel(get(ModelField, ModelFieldWidth)); }
+    Q_DECL_CONSTEXPR inline uchar channelCount() const noexcept { return (get(FirstField, FirstFieldWidth) > 0) +
                                                                                  (get(SecondField, SecondFieldWidth) > 0) +
                                                                                  (get(ThirdField, ThirdFieldWidth) > 0) +
                                                                                  (get(FourthField, FourthFieldWidth) > 0) +
                                                                                  (get(FifthField, FifthFieldWidth) > 0) +
                                                                                  (get(AlphaField, AlphaFieldWidth) > 0); }
 
-    Q_DECL_CONSTEXPR inline uchar redSize() const Q_DECL_NOTHROW { return get(FirstField, FirstFieldWidth); }
-    Q_DECL_CONSTEXPR inline uchar greenSize() const Q_DECL_NOTHROW { return get(SecondField, SecondFieldWidth); }
-    Q_DECL_CONSTEXPR inline uchar blueSize() const Q_DECL_NOTHROW { return get(ThirdField, ThirdFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar redSize() const noexcept { return get(FirstField, FirstFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar greenSize() const noexcept { return get(SecondField, SecondFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar blueSize() const noexcept { return get(ThirdField, ThirdFieldWidth); }
 
-    Q_DECL_CONSTEXPR inline uchar cyanSize() const Q_DECL_NOTHROW { return get(FirstField, FirstFieldWidth); }
-    Q_DECL_CONSTEXPR inline uchar magentaSize() const Q_DECL_NOTHROW { return get(SecondField, SecondFieldWidth); }
-    Q_DECL_CONSTEXPR inline uchar yellowSize() const Q_DECL_NOTHROW { return get(ThirdField, ThirdFieldWidth); }
-    Q_DECL_CONSTEXPR inline uchar blackSize() const Q_DECL_NOTHROW { return get(FourthField, FourthFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar cyanSize() const noexcept { return get(FirstField, FirstFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar magentaSize() const noexcept { return get(SecondField, SecondFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar yellowSize() const noexcept { return get(ThirdField, ThirdFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar blackSize() const noexcept { return get(FourthField, FourthFieldWidth); }
 
-    Q_DECL_CONSTEXPR inline uchar hueSize() const Q_DECL_NOTHROW { return get(FirstField, FirstFieldWidth); }
-    Q_DECL_CONSTEXPR inline uchar saturationSize() const Q_DECL_NOTHROW { return get(SecondField, SecondFieldWidth); }
-    Q_DECL_CONSTEXPR inline uchar lightnessSize() const Q_DECL_NOTHROW { return get(ThirdField, ThirdFieldWidth); }
-    Q_DECL_CONSTEXPR inline uchar brightnessSize() const Q_DECL_NOTHROW { return get(ThirdField, ThirdFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar hueSize() const noexcept { return get(FirstField, FirstFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar saturationSize() const noexcept { return get(SecondField, SecondFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar lightnessSize() const noexcept { return get(ThirdField, ThirdFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar brightnessSize() const noexcept { return get(ThirdField, ThirdFieldWidth); }
 
-    Q_DECL_CONSTEXPR inline uchar alphaSize() const Q_DECL_NOTHROW { return get(AlphaField, AlphaFieldWidth); }
+    Q_DECL_CONSTEXPR inline uchar alphaSize() const noexcept { return get(AlphaField, AlphaFieldWidth); }
 
-    Q_DECL_CONSTEXPR inline uchar bitsPerPixel() const Q_DECL_NOTHROW { return get(FirstField, FirstFieldWidth) +
+    Q_DECL_CONSTEXPR inline uchar bitsPerPixel() const noexcept { return get(FirstField, FirstFieldWidth) +
                                                                                  get(SecondField, SecondFieldWidth) +
                                                                                  get(ThirdField, ThirdFieldWidth) +
                                                                                  get(FourthField, FourthFieldWidth) +
                                                                                  get(FifthField, FifthFieldWidth) +
                                                                                  get(AlphaField, AlphaFieldWidth); }
 
-    Q_DECL_CONSTEXPR inline AlphaUsage alphaUsage() const Q_DECL_NOTHROW { return AlphaUsage(get(AlphaUsageField, AlphaUsageFieldWidth)); }
-    Q_DECL_CONSTEXPR inline AlphaPosition alphaPosition() const Q_DECL_NOTHROW { return AlphaPosition(get(AlphaPositionField, AlphaPositionFieldWidth)); }
-    Q_DECL_CONSTEXPR inline AlphaPremultiplied premultiplied() const Q_DECL_NOTHROW { return AlphaPremultiplied(get(PremulField, PremulFieldWidth)); }
-    Q_DECL_CONSTEXPR inline TypeInterpretation typeInterpretation() const Q_DECL_NOTHROW { return TypeInterpretation(get(TypeInterpretationField, TypeInterpretationFieldWidth)); }
-    Q_DECL_CONSTEXPR inline ByteOrder byteOrder() const Q_DECL_NOTHROW { return ByteOrder(get(ByteOrderField, ByteOrderFieldWidth)); }
+    Q_DECL_CONSTEXPR inline AlphaUsage alphaUsage() const noexcept { return AlphaUsage(get(AlphaUsageField, AlphaUsageFieldWidth)); }
+    Q_DECL_CONSTEXPR inline AlphaPosition alphaPosition() const noexcept { return AlphaPosition(get(AlphaPositionField, AlphaPositionFieldWidth)); }
+    Q_DECL_CONSTEXPR inline AlphaPremultiplied premultiplied() const noexcept { return AlphaPremultiplied(get(PremulField, PremulFieldWidth)); }
+    Q_DECL_CONSTEXPR inline TypeInterpretation typeInterpretation() const noexcept { return TypeInterpretation(get(TypeInterpretationField, TypeInterpretationFieldWidth)); }
+    Q_DECL_CONSTEXPR inline ByteOrder byteOrder() const noexcept { return ByteOrder(get(ByteOrderField, ByteOrderFieldWidth)); }
 
-    Q_DECL_CONSTEXPR inline YUVLayout yuvLayout() const Q_DECL_NOTHROW { return YUVLayout(get(SubEnumField, SubEnumFieldWidth)); }
-    Q_DECL_CONSTEXPR inline uchar subEnum() const Q_DECL_NOTHROW { return get(SubEnumField, SubEnumFieldWidth); }
+    Q_DECL_CONSTEXPR inline YUVLayout yuvLayout() const noexcept { return YUVLayout(get(SubEnumField, SubEnumFieldWidth)); }
+    Q_DECL_CONSTEXPR inline uchar subEnum() const noexcept { return get(SubEnumField, SubEnumFieldWidth); }
 
 private:
     Q_DECL_CONSTEXPR static inline ByteOrder resolveByteOrder(ByteOrder bo)
@@ -255,7 +255,7 @@ QPixelFormat::QPixelFormat(ColorModel mdl,
                            AlphaPremultiplied premult,
                            TypeInterpretation typeInterp,
                            ByteOrder b_order,
-                           uchar s_enum) Q_DECL_NOTHROW
+                           uchar s_enum) noexcept
     : data(set(ModelField, ModelFieldWidth, uchar(mdl)) |
            set(FirstField, FirstFieldWidth, firstSize) |
            set(SecondField, SecondFieldWidth, secondSize) |
@@ -280,7 +280,7 @@ Q_DECL_CONSTEXPR inline QPixelFormat qPixelFormatRgba(uchar red,
                                                       QPixelFormat::AlphaUsage usage,
                                                       QPixelFormat::AlphaPosition position,
                                                       QPixelFormat::AlphaPremultiplied pmul=QPixelFormat::NotPremultiplied,
-                                                      QPixelFormat::TypeInterpretation typeInt=QPixelFormat::UnsignedInteger) Q_DECL_NOTHROW
+                                                      QPixelFormat::TypeInterpretation typeInt=QPixelFormat::UnsignedInteger) noexcept
 {
     return QPixelFormat(QPixelFormat::RGB,
                         red,
@@ -296,7 +296,7 @@ Q_DECL_CONSTEXPR inline QPixelFormat qPixelFormatRgba(uchar red,
 }
 
 Q_DECL_CONSTEXPR inline QPixelFormat qPixelFormatGrayscale(uchar channelSize,
-                                                           QPixelFormat::TypeInterpretation typeInt=QPixelFormat::UnsignedInteger) Q_DECL_NOTHROW
+                                                           QPixelFormat::TypeInterpretation typeInt=QPixelFormat::UnsignedInteger) noexcept
 {
     return QPixelFormat(QPixelFormat::Grayscale,
                         channelSize,
@@ -312,7 +312,7 @@ Q_DECL_CONSTEXPR inline QPixelFormat qPixelFormatGrayscale(uchar channelSize,
 }
 
 Q_DECL_CONSTEXPR inline QPixelFormat qPixelFormatAlpha(uchar channelSize,
-                                                       QPixelFormat::TypeInterpretation typeInt=QPixelFormat::UnsignedInteger) Q_DECL_NOTHROW
+                                                       QPixelFormat::TypeInterpretation typeInt=QPixelFormat::UnsignedInteger) noexcept
 {
     return QPixelFormat(QPixelFormat::Alpha,
                         0,
@@ -331,7 +331,7 @@ Q_DECL_CONSTEXPR inline QPixelFormat qPixelFormatCmyk(uchar channelSize,
                                                       uchar alfa=0,
                                                       QPixelFormat::AlphaUsage usage=QPixelFormat::IgnoresAlpha,
                                                       QPixelFormat::AlphaPosition position=QPixelFormat::AtBeginning,
-                                                      QPixelFormat::TypeInterpretation typeInt=QPixelFormat::UnsignedInteger) Q_DECL_NOTHROW
+                                                      QPixelFormat::TypeInterpretation typeInt=QPixelFormat::UnsignedInteger) noexcept
 {
     return QPixelFormat(QPixelFormat::CMYK,
                         channelSize,
@@ -350,7 +350,7 @@ Q_DECL_CONSTEXPR inline QPixelFormat qPixelFormatHsl(uchar channelSize,
                                                      uchar alfa=0,
                                                      QPixelFormat::AlphaUsage usage=QPixelFormat::IgnoresAlpha,
                                                      QPixelFormat::AlphaPosition position=QPixelFormat::AtBeginning,
-                                                     QPixelFormat::TypeInterpretation typeInt=QPixelFormat::FloatingPoint) Q_DECL_NOTHROW
+                                                     QPixelFormat::TypeInterpretation typeInt=QPixelFormat::FloatingPoint) noexcept
 {
     return QPixelFormat(QPixelFormat::HSL,
                         channelSize,
@@ -369,7 +369,7 @@ Q_DECL_CONSTEXPR inline QPixelFormat qPixelFormatHsv(uchar channelSize,
                                                      uchar alfa=0,
                                                      QPixelFormat::AlphaUsage usage=QPixelFormat::IgnoresAlpha,
                                                      QPixelFormat::AlphaPosition position=QPixelFormat::AtBeginning,
-                                                     QPixelFormat::TypeInterpretation typeInt=QPixelFormat::FloatingPoint) Q_DECL_NOTHROW
+                                                     QPixelFormat::TypeInterpretation typeInt=QPixelFormat::FloatingPoint) noexcept
 {
     return QPixelFormat(QPixelFormat::HSV,
                         channelSize,
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index d14d575056..4bee153489 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -41,7 +41,9 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QVariant>
+#if QT_CONFIG(regularexpression)
 #include <QtCore/QRegularExpression>
+#endif
 #include <QtCore/QSharedData>
 #if QT_CONFIG(settings)
 #include <QtCore/QSettings>
@@ -786,6 +788,7 @@ const char QPlatformFileDialogHelper::filterRegExp[] =
 // Makes a list of filters from a normal filter string "Image Files (*.png *.jpg)"
 QStringList QPlatformFileDialogHelper::cleanFilterList(const QString &filter)
 {
+#if QT_CONFIG(regularexpression)
     QRegularExpression regexp(QString::fromLatin1(filterRegExp));
     Q_ASSERT(regexp.isValid());
     QString f = filter;
@@ -794,6 +797,9 @@ QStringList QPlatformFileDialogHelper::cleanFilterList(const QString &filter)
     if (match.hasMatch())
         f = match.captured(2);
     return f.split(QLatin1Char(' '), QString::SkipEmptyParts);
+#else
+    return QStringList();
+#endif
 }
 
 // Message dialog
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index f09bec12da..ba800a696f 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -318,7 +318,9 @@ public:
         ShowDirsOnly                = 0x00000001,
         DontResolveSymlinks         = 0x00000002,
         DontConfirmOverwrite        = 0x00000004,
-        DontUseSheet                = 0x00000008,
+#if QT_DEPRECATED_SINCE(5, 14)
+        DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x00000008,
+#endif
         DontUseNativeDialog         = 0x00000010,
         ReadOnly                    = 0x00000020,
         HideNameFilterDetails       = 0x00000040,
diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h
index a3594042ce..d9f349555a 100644
--- a/src/gui/kernel/qplatformintegration.h
+++ b/src/gui/kernel/qplatformintegration.h
@@ -115,7 +115,7 @@ public:
 
     virtual QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const;
     virtual QPlatformWindow *createPlatformWindow(QWindow *window) const = 0;
-    virtual QPlatformWindow *createForeignWindow(QWindow *, WId) const { return 0; }
+    virtual QPlatformWindow *createForeignWindow(QWindow *, WId) const { return nullptr; }
     virtual QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const = 0;
 #ifndef QT_NO_OPENGL
     virtual QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp
index 9c5876550a..f3213bf5ea 100644
--- a/src/gui/kernel/qplatformscreen.cpp
+++ b/src/gui/kernel/qplatformscreen.cpp
@@ -193,6 +193,28 @@ QDpi QPlatformScreen::logicalDpi() const
                 25.4 * s.height() / ps.height());
 }
 
+// Helper function for accessing the platform screen logical dpi
+// which accounts for QT_FONT_DPI.
+QPair<qreal, qreal> QPlatformScreen::overrideDpi(const QPair<qreal, qreal> &in)
+{
+    static const int overrideDpi = qEnvironmentVariableIntValue("QT_FONT_DPI");
+    return overrideDpi > 0 ?  QDpi(overrideDpi, overrideDpi) : in;
+}
+
+/*!
+    Reimplement to return the base logical DPI for the platform. This
+    DPI value should correspond to a standard-DPI (1x) display. The
+    default implementation returns 96.
+
+    QtGui will use this value (together with logicalDpi) to compute
+    the scale factor when high-DPI scaling is enabled:
+        factor = logicalDPI / baseDPI
+*/
+QDpi QPlatformScreen::logicalBaseDpi() const
+{
+    return QDpi(96, 96);
+}
+
 /*!
     Reimplement this function in subclass to return the device pixel ratio
     for the screen. This is the ratio between physical pixels and the
diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h
index b9ecc80320..d7378aed51 100644
--- a/src/gui/kernel/qplatformscreen.h
+++ b/src/gui/kernel/qplatformscreen.h
@@ -115,6 +115,7 @@ public:
 
     virtual QSizeF physicalSize() const;
     virtual QDpi logicalDpi() const;
+    virtual QDpi logicalBaseDpi() const;
     virtual qreal devicePixelRatio() const;
     virtual qreal pixelDensity()  const;
 
@@ -160,6 +161,8 @@ public:
     // The platform screen's geometry in device independent coordinates
     QRect deviceIndependentGeometry() const;
 
+    static QDpi overrideDpi(const QDpi &in);
+
 protected:
     void resizeMaximizedWindows();
 
diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h
index 54c8c70025..356c4ea3ea 100644
--- a/src/gui/kernel/qplatformtheme.h
+++ b/src/gui/kernel/qplatformtheme.h
@@ -309,7 +309,7 @@ public:
 
     virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const;
     virtual QIcon fileIcon(const QFileInfo &fileInfo,
-                           QPlatformTheme::IconOptions iconOptions = 0) const;
+                           QPlatformTheme::IconOptions iconOptions = nullptr) const;
     virtual QIconEngine *createIconEngine(const QString &iconName) const;
 
 #ifndef QT_NO_SHORTCUT
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index 4e95751397..2a0cb1094c 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -348,9 +348,7 @@ void QPlatformWindow::setWindowIcon(const QIcon &icon) { Q_UNUSED(icon); }
 */
 bool QPlatformWindow::close()
 {
-    bool accepted = false;
-    QWindowSystemInterface::handleCloseEvent<QWindowSystemInterface::SynchronousDelivery>(window(), &accepted);
-    return accepted;
+    return QWindowSystemInterface::handleCloseEvent<QWindowSystemInterface::SynchronousDelivery>(window());
 }
 
 /*!
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index 952023dd1b..7adf3db1b8 100644
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -84,8 +84,11 @@ void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen)
     platformScreen->d_func()->screen = q;
     orientation = platformScreen->orientation();
     geometry = platformScreen->deviceIndependentGeometry();
-    availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), QHighDpiScaling::factor(platformScreen), geometry.topLeft());
-    logicalDpi = platformScreen->logicalDpi();
+    availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(),
+                        QHighDpiScaling::factor(platformScreen), geometry.topLeft());
+
+    logicalDpi = QPlatformScreen::overrideDpi(platformScreen->logicalDpi());
+
     refreshRate = platformScreen->refreshRate();
     // safeguard ourselves against buggy platform behavior...
     if (refreshRate < 1.0)
@@ -285,7 +288,7 @@ qreal QScreen::logicalDotsPerInchX() const
 {
     Q_D(const QScreen);
     if (QHighDpiScaling::isActive())
-        return QHighDpiScaling::logicalDpi().first;
+        return QHighDpiScaling::logicalDpi(this).first;
     return d->logicalDpi.first;
 }
 
@@ -301,7 +304,7 @@ qreal QScreen::logicalDotsPerInchY() const
 {
     Q_D(const QScreen);
     if (QHighDpiScaling::isActive())
-        return QHighDpiScaling::logicalDpi().second;
+        return QHighDpiScaling::logicalDpi(this).second;
     return d->logicalDpi.second;
 }
 
@@ -320,7 +323,7 @@ qreal QScreen::logicalDotsPerInchY() const
 qreal QScreen::logicalDotsPerInch() const
 {
     Q_D(const QScreen);
-    QDpi dpi = QHighDpiScaling::isActive() ? QHighDpiScaling::logicalDpi() : d->logicalDpi;
+    QDpi dpi = QHighDpiScaling::isActive() ? QHighDpiScaling::logicalDpi(this) : d->logicalDpi;
     return (dpi.first + dpi.second) * qreal(0.5);
 }
 
@@ -768,7 +771,7 @@ QPixmap QScreen::grabWindow(WId window, int x, int y, int width, int height)
 static inline void formatRect(QDebug &debug, const QRect r)
 {
     debug << r.width() << 'x' << r.height()
-        << forcesign << r.x() << r.y() << noforcesign;
+        << Qt::forcesign << r.x() << r.y() << Qt::noforcesign;
 }
 
 Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen)
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h
index f31658355b..e5988ff829 100644
--- a/src/gui/kernel/qscreen_p.h
+++ b/src/gui/kernel/qscreen_p.h
@@ -64,12 +64,6 @@ class QScreenPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QScreen)
 public:
-    QScreenPrivate()
-        : platformScreen(0)
-        , orientationUpdateMask(0)
-    {
-    }
-
     void setPlatformScreen(QPlatformScreen *screen);
     void updateHighDpi()
     {
@@ -79,16 +73,16 @@ public:
 
     void updatePrimaryOrientation();
 
-    QPlatformScreen *platformScreen;
+    QPlatformScreen *platformScreen = nullptr;
 
     Qt::ScreenOrientations orientationUpdateMask;
-    Qt::ScreenOrientation orientation;
-    Qt::ScreenOrientation filteredOrientation;
-    Qt::ScreenOrientation primaryOrientation;
+    Qt::ScreenOrientation orientation = Qt::PrimaryOrientation;
+    Qt::ScreenOrientation filteredOrientation = Qt::PrimaryOrientation;
+    Qt::ScreenOrientation primaryOrientation = Qt::LandscapeOrientation;
     QRect geometry;
     QRect availableGeometry;
-    QDpi logicalDpi;
-    qreal refreshRate;
+    QDpi logicalDpi = {96, 96};
+    qreal refreshRate = 60;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qsessionmanager.cpp b/src/gui/kernel/qsessionmanager.cpp
index 493a321c74..e5e9c624b2 100644
--- a/src/gui/kernel/qsessionmanager.cpp
+++ b/src/gui/kernel/qsessionmanager.cpp
@@ -123,7 +123,11 @@ QSessionManagerPrivate::QSessionManagerPrivate(const QString &id,
                                                const QString &key)
     : QObjectPrivate()
 {
-    platformSessionManager = QGuiApplicationPrivate::platformIntegration()->createPlatformSessionManager(id, key);
+    if (qApp->testAttribute(Qt::AA_DisableSessionManager)) {
+        platformSessionManager = new QPlatformSessionManager(id, key);
+    } else {
+        platformSessionManager = QGuiApplicationPrivate::platformIntegration()->createPlatformSessionManager(id, key);
+    }
     Q_ASSERT_X(platformSessionManager, "Platform session management",
                "No platform session management, should use the default implementation");
 }
diff --git a/src/gui/kernel/qshapedpixmapdndwindow_p.h b/src/gui/kernel/qshapedpixmapdndwindow_p.h
index d9a6ea4888..5089be7284 100644
--- a/src/gui/kernel/qshapedpixmapdndwindow_p.h
+++ b/src/gui/kernel/qshapedpixmapdndwindow_p.h
@@ -63,7 +63,7 @@ class QShapedPixmapWindow : public QRasterWindow
 {
     Q_OBJECT
 public:
-    explicit QShapedPixmapWindow(QScreen *screen = 0);
+    explicit QShapedPixmapWindow(QScreen *screen = nullptr);
     ~QShapedPixmapWindow();
 
     void setUseCompositing(bool on) { m_useCompositing = on; }
diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
index bd409c124f..d3070a3d1a 100644
--- a/src/gui/kernel/qsimpledrag.cpp
+++ b/src/gui/kernel/qsimpledrag.cpp
@@ -48,7 +48,6 @@
 #include "qpoint.h"
 #include "qbuffer.h"
 #include "qimage.h"
-#include "qregexp.h"
 #include "qdir.h"
 #include "qimagereader.h"
 #include "qimagewriter.h"
diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp
index 9b5b7a6f1e..732ede90d0 100644
--- a/src/gui/kernel/qstylehints.cpp
+++ b/src/gui/kernel/qstylehints.cpp
@@ -65,6 +65,20 @@ static inline QVariant themeableHint(QPlatformTheme::ThemeHint th,
     return QGuiApplicationPrivate::platformIntegration()->styleHint(ih);
 }
 
+static inline QVariant themeableHint(QPlatformTheme::ThemeHint th)
+{
+    if (!QCoreApplication::instance()) {
+        qWarning("Must construct a QGuiApplication before accessing a platform theme hint.");
+        return QVariant();
+    }
+    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
+        const QVariant themeHint = theme->themeHint(th);
+        if (themeHint.isValid())
+            return themeHint;
+    }
+    return QPlatformTheme::defaultThemeHint(th);
+}
+
 class QStyleHintsPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QStyleHints)
@@ -80,6 +94,8 @@ public:
     int m_showShortcutsInContextMenus = -1;
     int m_wheelScrollLines = -1;
     int m_mouseQuickSelectionThreshold = -1;
+    int m_mouseDoubleClickDistance = -1;
+    int m_touchDoubleTapDistance = -1;
 };
 
 /*!
@@ -133,6 +149,34 @@ int QStyleHints::mouseDoubleClickInterval() const
 }
 
 /*!
+    \property QStyleHints::mouseDoubleClickDistance
+    \brief the maximum distance, in pixels, that the mouse can be moved between
+    two consecutive mouse clicks and still have it detected as a double-click
+    \since 5.14
+*/
+int QStyleHints::mouseDoubleClickDistance() const
+{
+    Q_D(const QStyleHints);
+    return d->m_mouseDoubleClickDistance >= 0 ?
+                d->m_mouseDoubleClickDistance :
+                themeableHint(QPlatformTheme::MouseDoubleClickDistance).toInt();
+}
+
+/*!
+    \property QStyleHints::touchDoubleTapDistance
+    \brief the maximum distance, in pixels, that a finger can be moved between
+    two consecutive taps and still have it detected as a double-tap
+    \since 5.14
+*/
+int QStyleHints::touchDoubleTapDistance() const
+{
+    Q_D(const QStyleHints);
+    return d->m_touchDoubleTapDistance >= 0 ?
+                d->m_touchDoubleTapDistance :
+                themeableHint(QPlatformTheme::TouchDoubleTapDistance).toInt();
+}
+
+/*!
     Sets the \a mousePressAndHoldInterval.
     \internal
     \sa mousePressAndHoldInterval()
diff --git a/src/gui/kernel/qstylehints.h b/src/gui/kernel/qstylehints.h
index 9091db9624..30d8fdc64d 100644
--- a/src/gui/kernel/qstylehints.h
+++ b/src/gui/kernel/qstylehints.h
@@ -74,10 +74,14 @@ class Q_GUI_EXPORT QStyleHints : public QObject
     Q_PROPERTY(bool useHoverEffects READ useHoverEffects WRITE setUseHoverEffects NOTIFY useHoverEffectsChanged FINAL)
     Q_PROPERTY(int wheelScrollLines READ wheelScrollLines NOTIFY wheelScrollLinesChanged FINAL)
     Q_PROPERTY(int mouseQuickSelectionThreshold READ mouseQuickSelectionThreshold WRITE setMouseQuickSelectionThreshold NOTIFY mouseQuickSelectionThresholdChanged FINAL)
+    Q_PROPERTY(int mouseDoubleClickDistance READ mouseDoubleClickDistance STORED false CONSTANT FINAL)
+    Q_PROPERTY(int touchDoubleTapDistance READ touchDoubleTapDistance STORED false CONSTANT FINAL)
 
 public:
     void setMouseDoubleClickInterval(int mouseDoubleClickInterval);
     int mouseDoubleClickInterval() const;
+    int mouseDoubleClickDistance() const;
+    int touchDoubleTapDistance() const;
     void setMousePressAndHoldInterval(int mousePressAndHoldInterval);
     int mousePressAndHoldInterval() const;
     void setStartDragDistance(int startDragDistance);
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index 4e2bcad50f..238886220b 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -246,7 +246,7 @@ QSurfaceFormat::QSurfaceFormat(QSurfaceFormat::FormatOptions options) :
 */
 void QSurfaceFormat::detach()
 {
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         QSurfaceFormatPrivate *newd = new QSurfaceFormatPrivate(d);
         if (!d->ref.deref())
             delete d;
diff --git a/src/gui/kernel/qtouchdevice.cpp b/src/gui/kernel/qtouchdevice.cpp
index 511e92566e..8293fddc59 100644
--- a/src/gui/kernel/qtouchdevice.cpp
+++ b/src/gui/kernel/qtouchdevice.cpp
@@ -44,6 +44,7 @@
 #include <QCoreApplication>
 
 #include <private/qdebug_p.h>
+#include <private/qlocking_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -201,15 +202,20 @@ void QTouchDevice::setName(const QString &name)
     d->name = name;
 }
 
-typedef QList<const QTouchDevice *> TouchDevices;
-Q_GLOBAL_STATIC(TouchDevices, deviceList)
 static QBasicMutex devicesMutex;
 
-static void cleanupDevicesList()
+struct TouchDevices {
+    TouchDevices();
+    QList<const QTouchDevice *> list;
+};
+Q_GLOBAL_STATIC(TouchDevices, deviceList)
+
+TouchDevices::TouchDevices()
 {
-    QMutexLocker lock(&devicesMutex);
-    qDeleteAll(*deviceList());
-    deviceList()->clear();
+    qAddPostRoutine([]{
+        const auto locker = qt_scoped_lock(devicesMutex);
+        qDeleteAll(qExchange(deviceList->list, {}));
+    });
 }
 
 /*!
@@ -222,8 +228,8 @@ static void cleanupDevicesList()
   */
 QList<const QTouchDevice *> QTouchDevice::devices()
 {
-    QMutexLocker lock(&devicesMutex);
-    return *deviceList();
+    const auto locker = qt_scoped_lock(devicesMutex);
+    return deviceList->list;
 }
 
 /*!
@@ -231,14 +237,14 @@ QList<const QTouchDevice *> QTouchDevice::devices()
   */
 bool QTouchDevicePrivate::isRegistered(const QTouchDevice *dev)
 {
-    QMutexLocker locker(&devicesMutex);
-    return deviceList()->contains(dev);
+    const auto locker = qt_scoped_lock(devicesMutex);
+    return deviceList->list.contains(dev);
 }
 
 const QTouchDevice *QTouchDevicePrivate::deviceById(quint8 id)
 {
-    QMutexLocker locker(&devicesMutex);
-    for (const QTouchDevice *dev : *deviceList())
+    const auto locker = qt_scoped_lock(devicesMutex);
+    for (const QTouchDevice *dev : qAsConst(deviceList->list))
         if (QTouchDevicePrivate::get(const_cast<QTouchDevice *>(dev))->id == id)
             return dev;
     return nullptr;
@@ -249,10 +255,8 @@ const QTouchDevice *QTouchDevicePrivate::deviceById(quint8 id)
   */
 void QTouchDevicePrivate::registerDevice(const QTouchDevice *dev)
 {
-    QMutexLocker lock(&devicesMutex);
-    if (deviceList()->isEmpty())
-        qAddPostRoutine(cleanupDevicesList);
-    deviceList()->append(dev);
+    const auto locker = qt_scoped_lock(devicesMutex);
+    deviceList->list.append(dev);
 }
 
 /*!
@@ -260,10 +264,8 @@ void QTouchDevicePrivate::registerDevice(const QTouchDevice *dev)
   */
 void QTouchDevicePrivate::unregisterDevice(const QTouchDevice *dev)
 {
-    QMutexLocker lock(&devicesMutex);
-    bool wasRemoved = deviceList()->removeOne(dev);
-    if (wasRemoved && deviceList()->isEmpty())
-        qRemovePostRoutine(cleanupDevicesList);
+    const auto locker = qt_scoped_lock(devicesMutex);
+    deviceList->list.removeOne(dev);
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index ed516c0eed..b71a0c54aa 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -2535,7 +2535,12 @@ void QWindow::tabletEvent(QTabletEvent *ev)
 
     Should return true only if the event was handled.
 */
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWindow::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#endif
 {
     Q_UNUSED(eventType);
     Q_UNUSED(message);
@@ -2844,13 +2849,13 @@ QDebug operator<<(QDebug debug, const QWindow *window)
             if (window->isTopLevel())
                 debug << ", toplevel";
             debug << ", " << geometry.width() << 'x' << geometry.height()
-                << forcesign << geometry.x() << geometry.y() << noforcesign;
+                << Qt::forcesign << geometry.x() << geometry.y() << Qt::noforcesign;
             const QMargins margins = window->frameMargins();
             if (!margins.isNull())
                 debug << ", margins=" << margins;
             debug << ", devicePixelRatio=" << window->devicePixelRatio();
             if (const QPlatformWindow *platformWindow = window->handle())
-                debug << ", winId=0x" << hex << platformWindow->winId() << dec;
+                debug << ", winId=0x" << Qt::hex << platformWindow->winId() << Qt::dec;
             if (const QScreen *screen = window->screen())
                 debug << ", on " << screen->name();
         }
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 1be3c845fe..5ee1d00f5b 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -364,7 +364,11 @@ protected:
 #if QT_CONFIG(tabletevent)
     virtual void tabletEvent(QTabletEvent *);
 #endif
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    virtual bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result);
+#else
     virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result);
+#endif
 
     QWindow(QWindowPrivate &dd, QWindow *parent);
 
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 5367d93e84..5a7ec518fd 100644
--- a/src/gui/kernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
@@ -77,50 +77,15 @@ public:
 
     QWindowPrivate()
         : QObjectPrivate()
-        , surfaceType(QWindow::RasterSurface)
-        , windowFlags(Qt::Window)
-        , parentWindow(0)
-        , platformWindow(0)
-        , visible(false)
-        , visibilityOnDestroy(false)
-        , exposed(false)
-        , windowState(Qt::WindowNoState)
-        , visibility(QWindow::Hidden)
-        , resizeEventPending(true)
-        , receivedExpose(false)
-        , positionPolicy(WindowFrameExclusive)
-        , positionAutomatic(true)
-        , resizeAutomatic(true)
-        , contentOrientation(Qt::PrimaryOrientation)
-        , opacity(qreal(1.0))
-        , minimumSize(0, 0)
-        , maximumSize(QWINDOWSIZE_MAX, QWINDOWSIZE_MAX)
-        , modality(Qt::NonModal)
-        , blockedByModalWindow(false)
-        , updateRequestPending(false)
-        , transientParent(0)
-        , topLevelScreen(0)
-#ifndef QT_NO_CURSOR
-        , cursor(Qt::ArrowCursor)
-        , hasCursor(false)
-#endif
-        , compositing(false)
-#if QT_CONFIG(vulkan)
-        , vulkanInstance(nullptr)
-#endif
     {
         isWindow = true;
     }
 
-    ~QWindowPrivate()
-    {
-    }
-
     void init(QScreen *targetScreen = nullptr);
 
     void maybeQuitOnLastWindowClosed();
 #ifndef QT_NO_CURSOR
-    void setCursor(const QCursor *c = 0);
+    void setCursor(const QCursor *c = nullptr);
     bool applyCursor();
 #endif
 
@@ -164,57 +129,60 @@ public:
 
     static Qt::WindowState effectiveState(Qt::WindowStates);
 
-    QWindow::SurfaceType surfaceType;
-    Qt::WindowFlags windowFlags;
-    QWindow *parentWindow;
-    QPlatformWindow *platformWindow;
-    bool visible;
-    bool visibilityOnDestroy;
-    bool exposed;
+    // ### Qt6: unused
+    virtual bool allowClickThrough(const QPoint &) const { return true; }
+
+    QWindow::SurfaceType surfaceType = QWindow::RasterSurface;
+    Qt::WindowFlags windowFlags = Qt::Window;
+    QWindow *parentWindow = nullptr;
+    QPlatformWindow *platformWindow = nullptr;
+    bool visible= false;
+    bool visibilityOnDestroy = false;
+    bool exposed = false;
     QSurfaceFormat requestedFormat;
     QString windowTitle;
     QString windowFilePath;
     QIcon windowIcon;
     QRect geometry;
-    Qt::WindowStates windowState;
-    QWindow::Visibility visibility;
-    bool resizeEventPending;
-    bool receivedExpose;
-    PositionPolicy positionPolicy;
-    bool positionAutomatic;
+    Qt::WindowStates windowState = Qt::WindowNoState;
+    QWindow::Visibility visibility = QWindow::Hidden;
+    bool resizeEventPending = true;
+    bool receivedExpose = false;
+    PositionPolicy positionPolicy = WindowFrameExclusive;
+    bool positionAutomatic = true;
     // resizeAutomatic suppresses resizing by QPlatformWindow::initialGeometry().
     // It also indicates that width/height=0 is acceptable (for example, for
     // the QRollEffect widget) and is thus not cleared in setGeometry().
     // An alternative approach might be using -1,-1 as a default size.
-    bool resizeAutomatic;
-    Qt::ScreenOrientation contentOrientation;
-    qreal opacity;
+    bool resizeAutomatic = true;
+    Qt::ScreenOrientation contentOrientation = Qt::PrimaryOrientation;
+    qreal opacity= 1;
     QRegion mask;
 
-    QSize minimumSize;
-    QSize maximumSize;
+    QSize minimumSize = {0, 0};
+    QSize maximumSize = {QWINDOWSIZE_MAX, QWINDOWSIZE_MAX};
     QSize baseSize;
     QSize sizeIncrement;
 
-    Qt::WindowModality modality;
-    bool blockedByModalWindow;
+    Qt::WindowModality modality = Qt::NonModal;
+    bool blockedByModalWindow = false;
 
-    bool updateRequestPending;
+    bool updateRequestPending = false;
     bool transientParentPropertySet = false;
 
     QPointer<QWindow> transientParent;
     QPointer<QScreen> topLevelScreen;
 
 #ifndef QT_NO_CURSOR
-    QCursor cursor;
-    bool hasCursor;
+    QCursor cursor = {Qt::ArrowCursor};
+    bool hasCursor = false;
 #endif
 
-    bool compositing;
+    bool compositing = false;
     QElapsedTimer lastComposeTime;
 
 #if QT_CONFIG(vulkan)
-    QVulkanInstance *vulkanInstance;
+    QVulkanInstance *vulkanInstance = nullptr;
 #endif
 };
 
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index 759671fbd7..4f1056e906 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -285,6 +285,12 @@ QT_DEFINE_QPA_EVENT_HANDLER(void, handleApplicationStateChanged, Qt::Application
     QWindowSystemInterfacePrivate::handleWindowSystemEvent<Delivery>(e);
 }
 
+QT_DEFINE_QPA_EVENT_HANDLER(bool, handleApplicationTermination)
+{
+    auto *e = new QWindowSystemInterfacePrivate::WindowSystemEvent(QWindowSystemInterfacePrivate::ApplicationTermination);
+    return QWindowSystemInterfacePrivate::handleWindowSystemEvent<Delivery>(e);
+}
+
 QWindowSystemInterfacePrivate::GeometryChangeEvent::GeometryChangeEvent(QWindow *window, const QRect &newGeometry)
     : WindowSystemEvent(GeometryChange)
     , window(window)
@@ -340,13 +346,11 @@ QT_DEFINE_QPA_EVENT_HANDLER(void, handleExposeEvent, QWindow *window, const QReg
     QWindowSystemInterfacePrivate::handleWindowSystemEvent<Delivery>(e);
 }
 
-QT_DEFINE_QPA_EVENT_HANDLER(void, handleCloseEvent, QWindow *window, bool *accepted)
+QT_DEFINE_QPA_EVENT_HANDLER(bool, handleCloseEvent, QWindow *window)
 {
-    if (window) {
-        QWindowSystemInterfacePrivate::CloseEvent *e =
-                new QWindowSystemInterfacePrivate::CloseEvent(window, accepted);
-        QWindowSystemInterfacePrivate::handleWindowSystemEvent<Delivery>(e);
-    }
+    Q_ASSERT(window);
+    auto *event = new QWindowSystemInterfacePrivate::CloseEvent(window);
+    return QWindowSystemInterfacePrivate::handleWindowSystemEvent<Delivery>(event);
 }
 
 /*!
@@ -619,6 +623,7 @@ bool QWindowSystemInterface::isTouchDeviceRegistered(const QTouchDevice *device)
 static int g_nextPointId = 1;
 
 // map from device-independent point id (arbitrary) to "Qt point" ids
+QMutex QWindowSystemInterfacePrivate::pointIdMapMutex;
 typedef QMap<quint64, int> PointIdMap;
 Q_GLOBAL_STATIC(PointIdMap, g_pointIdMap)
 
@@ -636,6 +641,8 @@ Q_GLOBAL_STATIC(PointIdMap, g_pointIdMap)
 */
 static int acquireCombinedPointId(quint8 deviceId, int pointId)
 {
+    QMutexLocker locker(&QWindowSystemInterfacePrivate::pointIdMapMutex);
+
     quint64 combinedId64 = (quint64(deviceId) << 32) + pointId;
     auto it = g_pointIdMap->constFind(combinedId64);
     int uid;
@@ -695,6 +702,8 @@ QList<QTouchEvent::TouchPoint>
     }
 
     if (states == Qt::TouchPointReleased) {
+        QMutexLocker locker(&QWindowSystemInterfacePrivate::pointIdMapMutex);
+
         // All points on deviceId have been released.
         // Remove all points associated with that device from g_pointIdMap.
         // (On other devices, some touchpoints might still be pressed.
@@ -714,6 +723,7 @@ QList<QTouchEvent::TouchPoint>
 
 void QWindowSystemInterfacePrivate::clearPointIdMap()
 {
+    QMutexLocker locker(&QWindowSystemInterfacePrivate::pointIdMapMutex);
     g_pointIdMap->clear();
     g_nextPointId = 1;
 }
@@ -857,8 +867,8 @@ void QWindowSystemInterface::handleScreenGeometryChange(QScreen *screen, const Q
 
 void QWindowSystemInterface::handleScreenLogicalDotsPerInchChange(QScreen *screen, qreal dpiX, qreal dpiY)
 {
-    QWindowSystemInterfacePrivate::ScreenLogicalDotsPerInchEvent *e =
-            new QWindowSystemInterfacePrivate::ScreenLogicalDotsPerInchEvent(screen, dpiX, dpiY); // ### tja
+    const QDpi effectiveDpi = QPlatformScreen::overrideDpi(QDpi{dpiX, dpiY});
+    auto e = new QWindowSystemInterfacePrivate::ScreenLogicalDotsPerInchEvent(screen, effectiveDpi.first, effectiveDpi.second);
     QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
 }
 
@@ -924,7 +934,11 @@ QPlatformDropQtResponse QWindowSystemInterface::handleDrop(QWindow *window, cons
     \note This function can only be called from the GUI thread.
 */
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWindowSystemInterface::handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QWindowSystemInterface::handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result)
+#endif
 {
     return QGuiApplicationPrivate::processNativeEvent(window, eventType, message, result);
 }
@@ -1111,7 +1125,7 @@ bool QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ProcessEventsFl
     } else {
         sendWindowSystemEvents(flags);
     }
-    return QWindowSystemInterfacePrivate::eventAccepted.load() > 0;
+    return QWindowSystemInterfacePrivate::eventAccepted.loadRelaxed() > 0;
 }
 
 void QWindowSystemInterface::deferredFlushWindowSystemEvents(QEventLoop::ProcessEventsFlags flags)
@@ -1152,7 +1166,7 @@ bool QWindowSystemInterface::sendWindowSystemEvents(QEventLoop::ProcessEventsFla
         // (excluding flush events). This state can then be
         // returned by flushWindowSystemEvents().
         if (event->type != QWindowSystemInterfacePrivate::FlushEvents)
-            QWindowSystemInterfacePrivate::eventAccepted.store(event->eventAccepted);
+            QWindowSystemInterfacePrivate::eventAccepted.storeRelaxed(event->eventAccepted);
 
         delete event;
     }
diff --git a/src/gui/kernel/qwindowsysteminterface.h b/src/gui/kernel/qwindowsysteminterface.h
index bf98c33a1a..d5a4ad30d8 100644
--- a/src/gui/kernel/qwindowsysteminterface.h
+++ b/src/gui/kernel/qwindowsysteminterface.h
@@ -194,7 +194,7 @@ public:
     static void handleExposeEvent(QWindow *window, const QRegion &region);
 
     template<typename Delivery = QWindowSystemInterface::DefaultDelivery>
-    static void handleCloseEvent(QWindow *window, bool *accepted = nullptr);
+    static bool handleCloseEvent(QWindow *window);
 
     template<typename Delivery = QWindowSystemInterface::DefaultDelivery>
     static void handleEnterEvent(QWindow *window, const QPointF &local = QPointF(), const QPointF& global = QPointF());
@@ -215,6 +215,9 @@ public:
     template<typename Delivery = QWindowSystemInterface::DefaultDelivery>
     static void handleApplicationStateChanged(Qt::ApplicationState newState, bool forcePropagate = false);
 
+    template<typename Delivery = QWindowSystemInterface::DefaultDelivery>
+    static bool handleApplicationTermination();
+
 #if QT_CONFIG(draganddrop)
 #if QT_DEPRECATED_SINCE(5, 11)
     QT_DEPRECATED static QPlatformDragQtResponse handleDrag(QWindow *window, const QMimeData *dropData,
@@ -230,7 +233,11 @@ public:
                                               Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
 #endif // QT_CONFIG(draganddrop)
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    static bool handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, qintptr *result);
+#else
     static bool handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result);
+#endif
 
     // Changes to the screen
     static void handleScreenAdded(QPlatformScreen *screen, bool isPrimary = false);
diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h
index 6c818a9030..6e4bce607e 100644
--- a/src/gui/kernel/qwindowsysteminterface_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_p.h
@@ -99,7 +99,8 @@ public:
         ApplicationStateChanged = 0x19,
         FlushEvents = 0x20,
         WindowScreenChanged = 0x21,
-        SafeAreaMarginsChanged = 0x22
+        SafeAreaMarginsChanged = 0x22,
+        ApplicationTermination = 0x23
     };
 
     class WindowSystemEvent {
@@ -123,11 +124,10 @@ public:
 
     class CloseEvent : public WindowSystemEvent {
     public:
-        explicit CloseEvent(QWindow *w, bool *a = 0)
-            : WindowSystemEvent(Close), window(w), accepted(a)
+        explicit CloseEvent(QWindow *w)
+            : WindowSystemEvent(Close), window(w)
             { }
         QPointer<QWindow> window;
-        bool *accepted;
     };
 
     class GeometryChangeEvent : public WindowSystemEvent {
@@ -398,7 +398,7 @@ public:
     class TabletEnterProximityEvent : public InputEvent {
     public:
         TabletEnterProximityEvent(ulong time, int device, int pointerType, qint64 uid)
-            : InputEvent(0, time, TabletEnterProximity, Qt::NoModifier),
+            : InputEvent(nullptr, time, TabletEnterProximity, Qt::NoModifier),
               device(device), pointerType(pointerType), uid(uid) { }
         int device;
         int pointerType;
@@ -408,7 +408,7 @@ public:
     class TabletLeaveProximityEvent : public InputEvent {
     public:
         TabletLeaveProximityEvent(ulong time, int device, int pointerType, qint64 uid)
-            : InputEvent(0, time, TabletLeaveProximity, Qt::NoModifier),
+            : InputEvent(nullptr, time, TabletLeaveProximity, Qt::NoModifier),
               device(device), pointerType(pointerType), uid(uid) { }
         int device;
         int pointerType;
@@ -474,7 +474,7 @@ public:
             for (int i = 0; i < impl.size(); ++i)
                 if (!(impl.at(i)->type & QWindowSystemInterfacePrivate::UserInputEvent))
                     return impl.takeAt(i);
-            return 0;
+            return nullptr;
         }
         bool nonUserInputEventsQueued()
         {
@@ -495,7 +495,7 @@ public:
                 if (impl.at(i)->type == t)
                     return impl.at(i);
             }
-            return 0;
+            return nullptr;
         }
         void remove(const WindowSystemEvent *e)
         {
@@ -529,6 +529,7 @@ public:
 
     static QWaitCondition eventsFlushed;
     static QMutex flushEventMutex;
+    static QMutex pointIdMapMutex;
     static QAtomicInt eventAccepted;
 
     static QList<QTouchEvent::TouchPoint>
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h
index 6a2a9e5bae..692c29c996 100644
--- a/src/gui/math3d/qgenericmatrix.h
+++ b/src/gui/math3d/qgenericmatrix.h
@@ -351,11 +351,11 @@ QDebug operator<<(QDebug dbg, const QGenericMatrix<N, M, T> &m)
     QDebugStateSaver saver(dbg);
     dbg.nospace() << "QGenericMatrix<" << N << ", " << M
         << ", " << QTypeInfo<T>::name()
-        << ">(" << endl << qSetFieldWidth(10);
+        << ">(" << Qt::endl << qSetFieldWidth(10);
     for (int row = 0; row < M; ++row) {
         for (int col = 0; col < N; ++col)
             dbg << m(row, col);
-        dbg << endl;
+        dbg << Qt::endl;
     }
     dbg << qSetFieldWidth(0) << ')';
     return dbg;
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 045fa210c4..ad4cdfdbf4 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -2037,12 +2037,12 @@ QDebug operator<<(QDebug dbg, const QMatrix4x4 &m)
     }
 
     // Output in row-major order because it is more human-readable.
-    dbg.nospace() << "QMatrix4x4(type:" << bits.constData() << endl
+    dbg.nospace() << "QMatrix4x4(type:" << bits.constData() << Qt::endl
         << qSetFieldWidth(10)
-        << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << endl
-        << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << endl
-        << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << endl
-        << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << endl
+        << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << Qt::endl
+        << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << Qt::endl
+        << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << Qt::endl
+        << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << Qt::endl
         << qSetFieldWidth(0) << ')';
     return dbg;
 }
diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp
index 2b1e57a4bb..667d16317f 100644
--- a/src/gui/opengl/qopengl.cpp
+++ b/src/gui/opengl/qopengl.cpp
@@ -80,7 +80,7 @@ QOpenGLExtensionMatcher::QOpenGLExtensionMatcher()
     if (extensionStr) {
         QByteArray ba(extensionStr);
         QList<QByteArray> extensions = ba.split(' ');
-        m_extensions = extensions.toSet();
+        m_extensions = QSet<QByteArray>(extensions.constBegin(), extensions.constEnd());
     } else {
 #ifdef QT_OPENGL_3
         // clear error state
@@ -136,7 +136,7 @@ QDebug operator<<(QDebug d, const QOpenGLConfig::Gpu &g)
     d.nospace();
     d << "Gpu(";
     if (g.isValid()) {
-        d << "vendor=" << hex << showbase <<g.vendorId << ", device=" << g.deviceId
+        d << "vendor=" << Qt::hex << Qt::showbase <<g.vendorId << ", device=" << g.deviceId
           << "version=" << g.driverVersion;
     } else {
         d << 0;
diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp
index 9f1bb76869..462a4fdb3b 100644
--- a/src/gui/opengl/qopengldebug.cpp
+++ b/src/gui/opengl/qopengldebug.cpp
@@ -1807,7 +1807,7 @@ QList<QOpenGLDebugMessage> QOpenGLDebugLogger::loggedMessages() const
 
     \note Message texts are encoded in UTF-8 when they get passed to OpenGL, so
     their size in bytes does not usually match the amount of UTF-16 code units,
-    as returned f.i. by QString::length(). (It does if the message contains
+    as returned, for instance, by QString::length(). (It does if the message contains
     7-bit ASCII only data, which is typical for debug messages.)
 */
 qint64 QOpenGLDebugLogger::maximumMessageLength() const
diff --git a/src/gui/opengl/qopengldebug.h b/src/gui/opengl/qopengldebug.h
index 556ec175e1..7363985d60 100644
--- a/src/gui/opengl/qopengldebug.h
+++ b/src/gui/opengl/qopengldebug.h
@@ -110,12 +110,10 @@ public:
     QOpenGLDebugMessage(const QOpenGLDebugMessage &debugMessage);
 
     QOpenGLDebugMessage &operator=(const QOpenGLDebugMessage &debugMessage);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QOpenGLDebugMessage &operator=(QOpenGLDebugMessage &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QOpenGLDebugMessage &operator=(QOpenGLDebugMessage &&other) noexcept { swap(other); return *this; }
     ~QOpenGLDebugMessage();
 
-    void swap(QOpenGLDebugMessage &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QOpenGLDebugMessage &other) noexcept { qSwap(d, other.d); }
 
     Source source() const;
     Type type() const;
diff --git a/src/gui/opengl/qopenglengineshadermanager_p.h b/src/gui/opengl/qopenglengineshadermanager_p.h
index d43788d777..14c79f5de3 100644
--- a/src/gui/opengl/qopenglengineshadermanager_p.h
+++ b/src/gui/opengl/qopenglengineshadermanager_p.h
@@ -370,7 +370,7 @@ private:
 class QOpenGLEngineShaderProg
 {
 public:
-    QOpenGLEngineShaderProg() : program(0) {}
+    QOpenGLEngineShaderProg() : program(nullptr) {}
 
     ~QOpenGLEngineShaderProg() {
         if (program)
diff --git a/src/gui/opengl/qopengles2ext.h b/src/gui/opengl/qopengles2ext.h
index 8ff50a924e..8517e24267 100644
--- a/src/gui/opengl/qopengles2ext.h
+++ b/src/gui/opengl/qopengles2ext.h
@@ -1,5 +1,5 @@
-#ifndef __gl2ext_h_
-#define __gl2ext_h_ 1
+#ifndef __gles2_gl2ext_h_
+#define __gles2_gl2ext_h_ 1
 
 #if 0
 #pragma qt_no_master_include
@@ -25,7 +25,7 @@ typedef struct __GLsync *GLsync;
 #endif
 
 /*
-** Copyright (c) 2013-2017 The Khronos Group Inc.
+** Copyright (c) 2013-2018 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -57,7 +57,7 @@ typedef struct __GLsync *GLsync;
 #define GL_APIENTRYP GL_APIENTRY*
 #endif
 
-/* Generated on date 20170331 */
+/* Generated on date 20190228 */
 
 /* Generated C header for:
  * API: gles2
@@ -178,6 +178,16 @@ GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, void **params);
 #define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR  0x00000008
 #endif /* GL_KHR_no_error */
 
+#ifndef GL_KHR_parallel_shader_compile
+#define GL_KHR_parallel_shader_compile 1
+#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
+#define GL_COMPLETION_STATUS_KHR          0x91B1
+typedef void (GL_APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
+#endif
+#endif /* GL_KHR_parallel_shader_compile */
+
 #ifndef GL_KHR_robust_buffer_access_behavior
 #define GL_KHR_robust_buffer_access_behavior 1
 #endif /* GL_KHR_robust_buffer_access_behavior */
@@ -343,12 +353,12 @@ GL_APICALL GLboolean GL_APIENTRY glIsEnablediOES (GLenum target, GLuint index);
 typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
 typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
 typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glDrawElementsBaseVertexOES (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
 GL_APICALL void GL_APIENTRY glDrawRangeElementsBaseVertexOES (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
 GL_APICALL void GL_APIENTRY glDrawElementsInstancedBaseVertexOES (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexOES (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
+GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
 #endif
 #endif /* GL_OES_draw_elements_base_vertex */
 
@@ -810,6 +820,22 @@ GL_APICALL void GL_APIENTRY glGetFloati_vOES (GLenum target, GLuint index, GLflo
 #define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE
 #endif /* GL_AMD_compressed_ATC_texture */
 
+#ifndef GL_AMD_framebuffer_multisample_advanced
+#define GL_AMD_framebuffer_multisample_advanced 1
+#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
+#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
+#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
+#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
+#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
+#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_AMD_framebuffer_multisample_advanced */
+
 #ifndef GL_AMD_performance_monitor
 #define GL_AMD_performance_monitor 1
 #define GL_COUNTER_TYPE_AMD               0x8BC0
@@ -1070,6 +1096,20 @@ GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei
 #define GL_SHADER_BINARY_DMP              0x9250
 #endif /* GL_DMP_shader_binary */
 
+#ifndef GL_EXT_EGL_image_array
+#define GL_EXT_EGL_image_array 1
+#endif /* GL_EXT_EGL_image_array */
+
+#ifndef GL_EXT_EGL_image_storage
+#define GL_EXT_EGL_image_storage 1
+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
+GL_APICALL void GL_APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
+#endif
+#endif /* GL_EXT_EGL_image_storage */
+
 #ifndef GL_EXT_YUV_target
 #define GL_EXT_YUV_target 1
 #define GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT    0x8BE7
@@ -1141,6 +1181,20 @@ GL_APICALL void GL_APIENTRY glClearTexSubImageEXT (GLuint texture, GLint level,
 #endif
 #endif /* GL_EXT_clear_texture */
 
+#ifndef GL_EXT_clip_control
+#define GL_EXT_clip_control 1
+#define GL_LOWER_LEFT_EXT                 0x8CA1
+#define GL_UPPER_LEFT_EXT                 0x8CA2
+#define GL_NEGATIVE_ONE_TO_ONE_EXT        0x935E
+#define GL_ZERO_TO_ONE_EXT                0x935F
+#define GL_CLIP_ORIGIN_EXT                0x935C
+#define GL_CLIP_DEPTH_MODE_EXT            0x935D
+typedef void (GL_APIENTRYP PFNGLCLIPCONTROLEXTPROC) (GLenum origin, GLenum depth);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glClipControlEXT (GLenum origin, GLenum depth);
+#endif
+#endif /* GL_EXT_clip_control */
+
 #ifndef GL_EXT_clip_cull_distance
 #define GL_EXT_clip_cull_distance 1
 #define GL_MAX_CLIP_DISTANCES_EXT         0x0D32
@@ -1211,6 +1265,11 @@ GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void);
 #endif
 #endif /* GL_EXT_debug_marker */
 
+#ifndef GL_EXT_depth_clamp
+#define GL_EXT_depth_clamp 1
+#define GL_DEPTH_CLAMP_EXT                0x864F
+#endif /* GL_EXT_depth_clamp */
+
 #ifndef GL_EXT_discard_framebuffer
 #define GL_EXT_discard_framebuffer 1
 #define GL_COLOR_EXT                      0x1800
@@ -1326,12 +1385,10 @@ GL_APICALL GLboolean GL_APIENTRY glIsEnablediEXT (GLenum target, GLuint index);
 typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
 typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
 typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glDrawElementsBaseVertexEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
 GL_APICALL void GL_APIENTRY glDrawRangeElementsBaseVertexEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
 GL_APICALL void GL_APIENTRY glDrawElementsInstancedBaseVertexEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
 #endif
 #endif /* GL_EXT_draw_elements_base_vertex */
 
@@ -1355,6 +1412,17 @@ GL_APICALL void GL_APIENTRY glDrawTransformFeedbackInstancedEXT (GLenum mode, GL
 #endif
 #endif /* GL_EXT_draw_transform_feedback */
 
+#ifndef GL_EXT_external_buffer
+#define GL_EXT_external_buffer 1
+typedef void *GLeglClientBufferEXT;
+typedef void (GL_APIENTRYP PFNGLBUFFERSTORAGEEXTERNALEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+typedef void (GL_APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glBufferStorageExternalEXT (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+GL_APICALL void GL_APIENTRY glNamedBufferStorageExternalEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+#endif
+#endif /* GL_EXT_external_buffer */
+
 #ifndef GL_EXT_float_blend
 #define GL_EXT_float_blend 1
 #endif /* GL_EXT_float_blend */
@@ -1433,6 +1501,85 @@ GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr
 #endif
 #endif /* GL_EXT_map_buffer_range */
 
+#ifndef GL_EXT_memory_object
+#define GL_EXT_memory_object 1
+#define GL_TEXTURE_TILING_EXT             0x9580
+#define GL_DEDICATED_MEMORY_OBJECT_EXT    0x9581
+#define GL_PROTECTED_MEMORY_OBJECT_EXT    0x959B
+#define GL_NUM_TILING_TYPES_EXT           0x9582
+#define GL_TILING_TYPES_EXT               0x9583
+#define GL_OPTIMAL_TILING_EXT             0x9584
+#define GL_LINEAR_TILING_EXT              0x9585
+#define GL_NUM_DEVICE_UUIDS_EXT           0x9596
+#define GL_DEVICE_UUID_EXT                0x9597
+#define GL_DRIVER_UUID_EXT                0x9598
+#define GL_UUID_SIZE_EXT                  16
+typedef void (GL_APIENTRYP PFNGLGETUNSIGNEDBYTEVEXTPROC) (GLenum pname, GLubyte *data);
+typedef void (GL_APIENTRYP PFNGLGETUNSIGNEDBYTEI_VEXTPROC) (GLenum target, GLuint index, GLubyte *data);
+typedef void (GL_APIENTRYP PFNGLDELETEMEMORYOBJECTSEXTPROC) (GLsizei n, const GLuint *memoryObjects);
+typedef GLboolean (GL_APIENTRYP PFNGLISMEMORYOBJECTEXTPROC) (GLuint memoryObject);
+typedef void (GL_APIENTRYP PFNGLCREATEMEMORYOBJECTSEXTPROC) (GLsizei n, GLuint *memoryObjects);
+typedef void (GL_APIENTRYP PFNGLMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, const GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGEMEM2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGEMEM3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLBUFFERSTORAGEMEMEXTPROC) (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGEMEM2DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGEMEM2DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGEMEM3DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGEMEM3DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC) (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetUnsignedBytevEXT (GLenum pname, GLubyte *data);
+GL_APICALL void GL_APIENTRY glGetUnsignedBytei_vEXT (GLenum target, GLuint index, GLubyte *data);
+GL_APICALL void GL_APIENTRY glDeleteMemoryObjectsEXT (GLsizei n, const GLuint *memoryObjects);
+GL_APICALL GLboolean GL_APIENTRY glIsMemoryObjectEXT (GLuint memoryObject);
+GL_APICALL void GL_APIENTRY glCreateMemoryObjectsEXT (GLsizei n, GLuint *memoryObjects);
+GL_APICALL void GL_APIENTRY glMemoryObjectParameterivEXT (GLuint memoryObject, GLenum pname, const GLint *params);
+GL_APICALL void GL_APIENTRY glGetMemoryObjectParameterivEXT (GLuint memoryObject, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glTexStorageMem2DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glTexStorageMem2DMultisampleEXT (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glTexStorageMem3DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glTexStorageMem3DMultisampleEXT (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glBufferStorageMemEXT (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glTextureStorageMem2DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glTextureStorageMem2DMultisampleEXT (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glTextureStorageMem3DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glTextureStorageMem3DMultisampleEXT (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glNamedBufferStorageMemEXT (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset);
+#endif
+#endif /* GL_EXT_memory_object */
+
+#ifndef GL_EXT_memory_object_fd
+#define GL_EXT_memory_object_fd 1
+#define GL_HANDLE_TYPE_OPAQUE_FD_EXT      0x9586
+typedef void (GL_APIENTRYP PFNGLIMPORTMEMORYFDEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glImportMemoryFdEXT (GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
+#endif
+#endif /* GL_EXT_memory_object_fd */
+
+#ifndef GL_EXT_memory_object_win32
+#define GL_EXT_memory_object_win32 1
+#define GL_HANDLE_TYPE_OPAQUE_WIN32_EXT   0x9587
+#define GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT 0x9588
+#define GL_DEVICE_LUID_EXT                0x9599
+#define GL_DEVICE_NODE_MASK_EXT           0x959A
+#define GL_LUID_SIZE_EXT                  8
+#define GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT 0x9589
+#define GL_HANDLE_TYPE_D3D12_RESOURCE_EXT 0x958A
+#define GL_HANDLE_TYPE_D3D11_IMAGE_EXT    0x958B
+#define GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT 0x958C
+typedef void (GL_APIENTRYP PFNGLIMPORTMEMORYWIN32HANDLEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, void *handle);
+typedef void (GL_APIENTRYP PFNGLIMPORTMEMORYWIN32NAMEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, const void *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glImportMemoryWin32HandleEXT (GLuint memory, GLuint64 size, GLenum handleType, void *handle);
+GL_APICALL void GL_APIENTRY glImportMemoryWin32NameEXT (GLuint memory, GLuint64 size, GLenum handleType, const void *name);
+#endif
+#endif /* GL_EXT_memory_object_win32 */
+
 #ifndef GL_EXT_multi_draw_arrays
 #define GL_EXT_multi_draw_arrays 1
 typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
@@ -1598,6 +1745,55 @@ GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location,
 #define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
 #endif /* GL_EXT_sRGB_write_control */
 
+#ifndef GL_EXT_semaphore
+#define GL_EXT_semaphore 1
+#define GL_LAYOUT_GENERAL_EXT             0x958D
+#define GL_LAYOUT_COLOR_ATTACHMENT_EXT    0x958E
+#define GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT 0x958F
+#define GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT 0x9590
+#define GL_LAYOUT_SHADER_READ_ONLY_EXT    0x9591
+#define GL_LAYOUT_TRANSFER_SRC_EXT        0x9592
+#define GL_LAYOUT_TRANSFER_DST_EXT        0x9593
+#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
+#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
+typedef void (GL_APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores);
+typedef void (GL_APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores);
+typedef GLboolean (GL_APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
+typedef void (GL_APIENTRYP PFNGLSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, const GLuint64 *params);
+typedef void (GL_APIENTRYP PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, GLuint64 *params);
+typedef void (GL_APIENTRYP PFNGLWAITSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
+typedef void (GL_APIENTRYP PFNGLSIGNALSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGenSemaphoresEXT (GLsizei n, GLuint *semaphores);
+GL_APICALL void GL_APIENTRY glDeleteSemaphoresEXT (GLsizei n, const GLuint *semaphores);
+GL_APICALL GLboolean GL_APIENTRY glIsSemaphoreEXT (GLuint semaphore);
+GL_APICALL void GL_APIENTRY glSemaphoreParameterui64vEXT (GLuint semaphore, GLenum pname, const GLuint64 *params);
+GL_APICALL void GL_APIENTRY glGetSemaphoreParameterui64vEXT (GLuint semaphore, GLenum pname, GLuint64 *params);
+GL_APICALL void GL_APIENTRY glWaitSemaphoreEXT (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
+GL_APICALL void GL_APIENTRY glSignalSemaphoreEXT (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
+#endif
+#endif /* GL_EXT_semaphore */
+
+#ifndef GL_EXT_semaphore_fd
+#define GL_EXT_semaphore_fd 1
+typedef void (GL_APIENTRYP PFNGLIMPORTSEMAPHOREFDEXTPROC) (GLuint semaphore, GLenum handleType, GLint fd);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glImportSemaphoreFdEXT (GLuint semaphore, GLenum handleType, GLint fd);
+#endif
+#endif /* GL_EXT_semaphore_fd */
+
+#ifndef GL_EXT_semaphore_win32
+#define GL_EXT_semaphore_win32 1
+#define GL_HANDLE_TYPE_D3D12_FENCE_EXT    0x9594
+#define GL_D3D12_FENCE_VALUE_EXT          0x9595
+typedef void (GL_APIENTRYP PFNGLIMPORTSEMAPHOREWIN32HANDLEEXTPROC) (GLuint semaphore, GLenum handleType, void *handle);
+typedef void (GL_APIENTRYP PFNGLIMPORTSEMAPHOREWIN32NAMEEXTPROC) (GLuint semaphore, GLenum handleType, const void *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glImportSemaphoreWin32HandleEXT (GLuint semaphore, GLenum handleType, void *handle);
+GL_APICALL void GL_APIENTRY glImportSemaphoreWin32NameEXT (GLuint semaphore, GLenum handleType, const void *name);
+#endif
+#endif /* GL_EXT_semaphore_win32 */
+
 #ifndef GL_EXT_separate_shader_objects
 #define GL_EXT_separate_shader_objects 1
 #define GL_ACTIVE_PROGRAM_EXT             0x8259
@@ -1703,6 +1899,14 @@ GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLin
 #define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
 #endif /* GL_EXT_shader_framebuffer_fetch */
 
+#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
+#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glFramebufferFetchBarrierEXT (void);
+#endif
+#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
+
 #ifndef GL_EXT_shader_group_vote
 #define GL_EXT_shader_group_vote 1
 #endif /* GL_EXT_shader_group_vote */
@@ -1890,18 +2094,42 @@ GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalf
 #define GL_TEXTURE_ASTC_DECODE_PRECISION_EXT 0x8F69
 #endif /* GL_EXT_texture_compression_astc_decode_mode */
 
+#ifndef GL_EXT_texture_compression_bptc
+#define GL_EXT_texture_compression_bptc 1
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_EXT 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT 0x8E8F
+#endif /* GL_EXT_texture_compression_bptc */
+
 #ifndef GL_EXT_texture_compression_dxt1
 #define GL_EXT_texture_compression_dxt1 1
 #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
 #define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
 #endif /* GL_EXT_texture_compression_dxt1 */
 
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif /* GL_EXT_texture_compression_rgtc */
+
 #ifndef GL_EXT_texture_compression_s3tc
 #define GL_EXT_texture_compression_s3tc 1
 #define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
 #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
 #endif /* GL_EXT_texture_compression_s3tc */
 
+#ifndef GL_EXT_texture_compression_s3tc_srgb
+#define GL_EXT_texture_compression_s3tc_srgb 1
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif /* GL_EXT_texture_compression_s3tc_srgb */
+
 #ifndef GL_EXT_texture_cube_map_array
 #define GL_EXT_texture_cube_map_array 1
 #define GL_TEXTURE_CUBE_MAP_ARRAY_EXT     0x9009
@@ -1923,12 +2151,24 @@ GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalf
 
 #ifndef GL_EXT_texture_filter_minmax
 #define GL_EXT_texture_filter_minmax 1
+#define GL_TEXTURE_REDUCTION_MODE_EXT     0x9366
+#define GL_WEIGHTED_AVERAGE_EXT           0x9367
 #endif /* GL_EXT_texture_filter_minmax */
 
 #ifndef GL_EXT_texture_format_BGRA8888
 #define GL_EXT_texture_format_BGRA8888 1
 #endif /* GL_EXT_texture_format_BGRA8888 */
 
+#ifndef GL_EXT_texture_format_sRGB_override
+#define GL_EXT_texture_format_sRGB_override 1
+#define GL_TEXTURE_FORMAT_SRGB_OVERRIDE_EXT 0x8FBF
+#endif /* GL_EXT_texture_format_sRGB_override */
+
+#ifndef GL_EXT_texture_mirror_clamp_to_edge
+#define GL_EXT_texture_mirror_clamp_to_edge 1
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#endif /* GL_EXT_texture_mirror_clamp_to_edge */
+
 #ifndef GL_EXT_texture_norm16
 #define GL_EXT_texture_norm16 1
 #define GL_R16_EXT                        0x822A
@@ -1938,6 +2178,10 @@ GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalf
 #define GL_RGB16_SNORM_EXT                0x8F9A
 #endif /* GL_EXT_texture_norm16 */
 
+#ifndef GL_EXT_texture_query_lod
+#define GL_EXT_texture_query_lod 1
+#endif /* GL_EXT_texture_query_lod */
+
 #ifndef GL_EXT_texture_rg
 #define GL_EXT_texture_rg 1
 #define GL_RED_EXT                        0x1903
@@ -2019,6 +2263,16 @@ GL_APICALL void GL_APIENTRY glTextureViewEXT (GLuint texture, GLenum target, GLu
 #define GL_UNPACK_SKIP_PIXELS_EXT         0x0CF4
 #endif /* GL_EXT_unpack_subimage */
 
+#ifndef GL_EXT_win32_keyed_mutex
+#define GL_EXT_win32_keyed_mutex 1
+typedef GLboolean (GL_APIENTRYP PFNGLACQUIREKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key, GLuint timeout);
+typedef GLboolean (GL_APIENTRYP PFNGLRELEASEKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL GLboolean GL_APIENTRY glAcquireKeyedMutexWin32EXT (GLuint memory, GLuint64 key, GLuint timeout);
+GL_APICALL GLboolean GL_APIENTRY glReleaseKeyedMutexWin32EXT (GLuint memory, GLuint64 key);
+#endif
+#endif /* GL_EXT_win32_keyed_mutex */
+
 #ifndef GL_EXT_window_rectangles
 #define GL_EXT_window_rectangles 1
 #define GL_INCLUSIVE_EXT                  0x8F10
@@ -2121,6 +2375,11 @@ GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target,
 #define GL_CUBIC_MIPMAP_LINEAR_IMG        0x913B
 #endif /* GL_IMG_texture_filter_cubic */
 
+#ifndef GL_INTEL_blackhole_render
+#define GL_INTEL_blackhole_render 1
+#define GL_BLACKHOLE_RENDER_INTEL         0x83FC
+#endif /* GL_INTEL_blackhole_render */
+
 #ifndef GL_INTEL_conservative_rasterization
 #define GL_INTEL_conservative_rasterization 1
 #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
@@ -2163,7 +2422,7 @@ typedef void (GL_APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
 typedef void (GL_APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
 typedef void (GL_APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
 typedef void (GL_APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
 typedef void (GL_APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
 typedef void (GL_APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #ifdef GL_GLEXT_PROTOTYPES
@@ -2174,12 +2433,22 @@ GL_APICALL void GL_APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
 GL_APICALL void GL_APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
 GL_APICALL void GL_APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
 GL_APICALL void GL_APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
 GL_APICALL void GL_APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
 GL_APICALL void GL_APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #endif
 #endif /* GL_INTEL_performance_query */
 
+#ifndef GL_MESA_framebuffer_flip_y
+#define GL_MESA_framebuffer_flip_y 1
+#define GL_FRAMEBUFFER_FLIP_Y_MESA        0x8BBB
+#endif /* GL_MESA_framebuffer_flip_y */
+
+#ifndef GL_MESA_program_binary_formats
+#define GL_MESA_program_binary_formats 1
+#define GL_PROGRAM_BINARY_FORMAT_MESA     0x875F
+#endif /* GL_MESA_program_binary_formats */
+
 #ifndef GL_MESA_shader_integer_functions
 #define GL_MESA_shader_integer_functions 1
 #endif /* GL_MESA_shader_integer_functions */
@@ -2284,6 +2553,27 @@ GL_APICALL void GL_APIENTRY glBlendBarrierNV (void);
 #define GL_BLEND_ADVANCED_COHERENT_NV     0x9285
 #endif /* GL_NV_blend_equation_advanced_coherent */
 
+#ifndef GL_NV_blend_minmax_factor
+#define GL_NV_blend_minmax_factor 1
+#define GL_FACTOR_MIN_AMD                 0x901C
+#define GL_FACTOR_MAX_AMD                 0x901D
+#endif /* GL_NV_blend_minmax_factor */
+
+#ifndef GL_NV_clip_space_w_scaling
+#define GL_NV_clip_space_w_scaling 1
+#define GL_VIEWPORT_POSITION_W_SCALE_NV   0x937C
+#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D
+#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E
+typedef void (GL_APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+#endif
+#endif /* GL_NV_clip_space_w_scaling */
+
+#ifndef GL_NV_compute_shader_derivatives
+#define GL_NV_compute_shader_derivatives 1
+#endif /* GL_NV_compute_shader_derivatives */
+
 #ifndef GL_NV_conditional_render
 #define GL_NV_conditional_render 1
 #define GL_QUERY_WAIT_NV                  0x8E13
@@ -2310,6 +2600,11 @@ GL_APICALL void GL_APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybit
 #endif
 #endif /* GL_NV_conservative_raster */
 
+#ifndef GL_NV_conservative_raster_pre_snap
+#define GL_NV_conservative_raster_pre_snap 1
+#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
+#endif /* GL_NV_conservative_raster_pre_snap */
+
 #ifndef GL_NV_conservative_raster_pre_snap_triangles
 #define GL_NV_conservative_raster_pre_snap_triangles 1
 #define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
@@ -2655,6 +2950,34 @@ GL_APICALL void GL_APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum
 #endif
 #endif /* GL_NV_internalformat_sample_query */
 
+#ifndef GL_NV_memory_attachment
+#define GL_NV_memory_attachment 1
+#define GL_ATTACHED_MEMORY_OBJECT_NV      0x95A4
+#define GL_ATTACHED_MEMORY_OFFSET_NV      0x95A5
+#define GL_MEMORY_ATTACHABLE_ALIGNMENT_NV 0x95A6
+#define GL_MEMORY_ATTACHABLE_SIZE_NV      0x95A7
+#define GL_MEMORY_ATTACHABLE_NV           0x95A8
+#define GL_DETACHED_MEMORY_INCARNATION_NV 0x95A9
+#define GL_DETACHED_TEXTURES_NV           0x95AA
+#define GL_DETACHED_BUFFERS_NV            0x95AB
+#define GL_MAX_DETACHED_TEXTURES_NV       0x95AC
+#define GL_MAX_DETACHED_BUFFERS_NV        0x95AD
+typedef void (GL_APIENTRYP PFNGLGETMEMORYOBJECTDETACHEDRESOURCESUIVNVPROC) (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params);
+typedef void (GL_APIENTRYP PFNGLRESETMEMORYOBJECTPARAMETERNVPROC) (GLuint memory, GLenum pname);
+typedef void (GL_APIENTRYP PFNGLTEXATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLBUFFERATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLTEXTUREATTACHMEMORYNVPROC) (GLuint texture, GLuint memory, GLuint64 offset);
+typedef void (GL_APIENTRYP PFNGLNAMEDBUFFERATTACHMEMORYNVPROC) (GLuint buffer, GLuint memory, GLuint64 offset);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetMemoryObjectDetachedResourcesuivNV (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params);
+GL_APICALL void GL_APIENTRY glResetMemoryObjectParameterNV (GLuint memory, GLenum pname);
+GL_APICALL void GL_APIENTRY glTexAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glBufferAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glTextureAttachMemoryNV (GLuint texture, GLuint memory, GLuint64 offset);
+GL_APICALL void GL_APIENTRY glNamedBufferAttachMemoryNV (GLuint buffer, GLuint memory, GLuint64 offset);
+#endif
+#endif /* GL_NV_memory_attachment */
+
 #ifndef GL_NV_non_square_matrices
 #define GL_NV_non_square_matrices 1
 #define GL_FLOAT_MAT2x3_NV                0x8B65
@@ -2681,6 +3004,7 @@ GL_APICALL void GL_APIENTRY glUniformMatrix4x3fvNV (GLint location, GLsizei coun
 
 #ifndef GL_NV_path_rendering
 #define GL_NV_path_rendering 1
+typedef double GLdouble;
 #define GL_PATH_FORMAT_SVG_NV             0x9070
 #define GL_PATH_FORMAT_PS_NV              0x9071
 #define GL_STANDARD_FONT_NAME_NV          0x9072
@@ -2891,6 +3215,25 @@ typedef GLenum (GL_APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathNa
 typedef GLenum (GL_APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 typedef void (GL_APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
 typedef void (GL_APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+typedef void (GL_APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (GL_APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (GL_APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (GL_APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (GL_APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (GL_APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (GL_APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (GL_APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (GL_APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (GL_APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (GL_APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (GL_APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (GL_APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (GL_APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GL_APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GL_APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GL_APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GL_APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GL_APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL GLuint GL_APIENTRY glGenPathsNV (GLsizei range);
 GL_APICALL void GL_APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
@@ -2949,6 +3292,25 @@ GL_APICALL GLenum GL_APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLe
 GL_APICALL GLenum GL_APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 GL_APICALL void GL_APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
 GL_APICALL void GL_APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+GL_APICALL void GL_APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GL_APICALL void GL_APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
+GL_APICALL void GL_APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
+GL_APICALL void GL_APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
+GL_APICALL void GL_APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
+GL_APICALL void GL_APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
+GL_APICALL void GL_APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
+GL_APICALL void GL_APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
+GL_APICALL void GL_APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
+GL_APICALL void GL_APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
+GL_APICALL void GL_APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GL_APICALL void GL_APIENTRY glMatrixPopEXT (GLenum mode);
+GL_APICALL void GL_APIENTRY glMatrixPushEXT (GLenum mode);
+GL_APICALL void GL_APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void GL_APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GL_APICALL void GL_APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void GL_APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GL_APICALL void GL_APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void GL_APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
 #endif
 #endif /* GL_NV_path_rendering */
 
@@ -2957,6 +3319,14 @@ GL_APICALL void GL_APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum pro
 #define GL_SHARED_EDGE_NV                 0xC0
 #endif /* GL_NV_path_rendering_shared_edge */
 
+#ifndef GL_NV_pixel_buffer_object
+#define GL_NV_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_NV           0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_NV         0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_NV   0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_NV 0x88EF
+#endif /* GL_NV_pixel_buffer_object */
+
 #ifndef GL_NV_polygon_mode
 #define GL_NV_polygon_mode 1
 #define GL_POLYGON_MODE_NV                0x0B40
@@ -3034,6 +3404,18 @@ GL_APICALL void GL_APIENTRY glResolveDepthValuesNV (void);
 #define GL_NV_sample_mask_override_coverage 1
 #endif /* GL_NV_sample_mask_override_coverage */
 
+#ifndef GL_NV_scissor_exclusive
+#define GL_NV_scissor_exclusive 1
+#define GL_SCISSOR_TEST_EXCLUSIVE_NV      0x9555
+#define GL_SCISSOR_BOX_EXCLUSIVE_NV       0x9556
+typedef void (GL_APIENTRYP PFNGLSCISSOREXCLUSIVENVPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLSCISSOREXCLUSIVEARRAYVNVPROC) (GLuint first, GLsizei count, const GLint *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glScissorExclusiveNV (GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glScissorExclusiveArrayvNV (GLuint first, GLsizei count, const GLint *v);
+#endif
+#endif /* GL_NV_scissor_exclusive */
+
 #ifndef GL_NV_shader_atomic_fp16_vector
 #define GL_NV_shader_atomic_fp16_vector 1
 #endif /* GL_NV_shader_atomic_fp16_vector */
@@ -3052,6 +3434,10 @@ GL_APICALL void GL_APIENTRY glResolveDepthValuesNV (void);
 #define GL_SAMPLER_CUBE_SHADOW_NV         0x8DC5
 #endif /* GL_NV_shadow_samplers_cube */
 
+#ifndef GL_NV_stereo_view_rendering
+#define GL_NV_stereo_view_rendering 1
+#endif /* GL_NV_stereo_view_rendering */
+
 #ifndef GL_NV_texture_border_clamp
 #define GL_NV_texture_border_clamp 1
 #define GL_TEXTURE_BORDER_COLOR_NV        0x1004
@@ -3148,6 +3534,10 @@ GL_APICALL void GL_APIENTRY glFramebufferTextureMultisampleMultiviewOVR (GLenum
 #endif
 #endif /* GL_OVR_multiview_multisampled_render_to_texture */
 
+#ifndef GL_QCOM_YUV_texture_gather
+#define GL_QCOM_YUV_texture_gather 1
+#endif /* GL_QCOM_YUV_texture_gather */
+
 #ifndef GL_QCOM_alpha_test
 #define GL_QCOM_alpha_test 1
 #define GL_ALPHA_TEST_QCOM                0x0BC0
@@ -3245,6 +3635,38 @@ GL_APICALL void GL_APIENTRY glFramebufferFoveationParametersQCOM (GLuint framebu
 #define GL_PERFMON_GLOBAL_MODE_QCOM       0x8FA0
 #endif /* GL_QCOM_perfmon_global_mode */
 
+#ifndef GL_QCOM_shader_framebuffer_fetch_noncoherent
+#define GL_QCOM_shader_framebuffer_fetch_noncoherent 1
+#define GL_FRAMEBUFFER_FETCH_NONCOHERENT_QCOM 0x96A2
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIERQCOMPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glFramebufferFetchBarrierQCOM (void);
+#endif
+#endif /* GL_QCOM_shader_framebuffer_fetch_noncoherent */
+
+#ifndef GL_QCOM_shader_framebuffer_fetch_rate
+#define GL_QCOM_shader_framebuffer_fetch_rate 1
+#endif /* GL_QCOM_shader_framebuffer_fetch_rate */
+
+#ifndef GL_QCOM_texture_foveated
+#define GL_QCOM_texture_foveated 1
+#define GL_TEXTURE_FOVEATED_FEATURE_BITS_QCOM 0x8BFB
+#define GL_TEXTURE_FOVEATED_MIN_PIXEL_DENSITY_QCOM 0x8BFC
+#define GL_TEXTURE_FOVEATED_FEATURE_QUERY_QCOM 0x8BFD
+#define GL_TEXTURE_FOVEATED_NUM_FOCAL_POINTS_QUERY_QCOM 0x8BFE
+#define GL_FRAMEBUFFER_INCOMPLETE_FOVEATION_QCOM 0x8BFF
+typedef void (GL_APIENTRYP PFNGLTEXTUREFOVEATIONPARAMETERSQCOMPROC) (GLuint texture, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glTextureFoveationParametersQCOM (GLuint texture, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
+#endif
+#endif /* GL_QCOM_texture_foveated */
+
+#ifndef GL_QCOM_texture_foveated_subsampled_layout
+#define GL_QCOM_texture_foveated_subsampled_layout 1
+#define GL_FOVEATION_SUBSAMPLED_LAYOUT_METHOD_BIT_QCOM 0x00000004
+#define GL_MAX_SHADER_SUBSAMPLED_IMAGE_UNITS_QCOM 0x8FA1
+#endif /* GL_QCOM_texture_foveated_subsampled_layout */
+
 #ifndef GL_QCOM_tiled_rendering
 #define GL_QCOM_tiled_rendering 1
 #define GL_COLOR_BUFFER_BIT0_QCOM         0x00000001
diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h
index 63873476e4..e3f9205619 100644
--- a/src/gui/opengl/qopenglext.h
+++ b/src/gui/opengl/qopenglext.h
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 /*
-** Copyright (c) 2013-2017 The Khronos Group Inc.
+** Copyright (c) 2013-2018 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -57,7 +57,7 @@ extern "C" {
 #define GLAPI extern
 #endif
 
-#define GL_GLEXT_VERSION 20170325
+#define GL_GLEXT_VERSION 20190228
 
 /* Generated C header for:
  * API: gl
@@ -359,15 +359,17 @@ GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
 #define GL_TEXTURE_FILTER_CONTROL         0x8500
 #define GL_DEPTH_TEXTURE_MODE             0x884B
 #define GL_COMPARE_R_TO_TEXTURE           0x884E
-#define GL_FUNC_ADD                       0x8006
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
+#define GL_BLEND_COLOR                    0x8005
+#define GL_BLEND_EQUATION                 0x8009
 #define GL_CONSTANT_COLOR                 0x8001
 #define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
 #define GL_CONSTANT_ALPHA                 0x8003
 #define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_FUNC_ADD                       0x8006
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
 typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
 typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
@@ -2872,6 +2874,42 @@ GLAPI void APIENTRY glTextureBarrier (void);
 #endif
 #endif /* GL_VERSION_4_5 */
 
+#ifndef GL_VERSION_4_6
+#define GL_VERSION_4_6 1
+#define GL_SHADER_BINARY_FORMAT_SPIR_V    0x9551
+#define GL_SPIR_V_BINARY                  0x9552
+#define GL_PARAMETER_BUFFER               0x80EE
+#define GL_PARAMETER_BUFFER_BINDING       0x80EF
+#define GL_CONTEXT_FLAG_NO_ERROR_BIT      0x00000008
+#define GL_VERTICES_SUBMITTED             0x82EE
+#define GL_PRIMITIVES_SUBMITTED           0x82EF
+#define GL_VERTEX_SHADER_INVOCATIONS      0x82F0
+#define GL_TESS_CONTROL_SHADER_PATCHES    0x82F1
+#define GL_TESS_EVALUATION_SHADER_INVOCATIONS 0x82F2
+#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED 0x82F3
+#define GL_FRAGMENT_SHADER_INVOCATIONS    0x82F4
+#define GL_COMPUTE_SHADER_INVOCATIONS     0x82F5
+#define GL_CLIPPING_INPUT_PRIMITIVES      0x82F6
+#define GL_CLIPPING_OUTPUT_PRIMITIVES     0x82F7
+#define GL_POLYGON_OFFSET_CLAMP           0x8E1B
+#define GL_SPIR_V_EXTENSIONS              0x9553
+#define GL_NUM_SPIR_V_EXTENSIONS          0x9554
+#define GL_TEXTURE_MAX_ANISOTROPY         0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY     0x84FF
+#define GL_TRANSFORM_FEEDBACK_OVERFLOW    0x82EC
+#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW 0x82ED
+typedef void (APIENTRYP PFNGLSPECIALIZESHADERPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpecializeShader (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
+GLAPI void APIENTRY glMultiDrawArraysIndirectCount (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectCount (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glPolygonOffsetClamp (GLfloat factor, GLfloat units, GLfloat clamp);
+#endif
+#endif /* GL_VERSION_4_6 */
+
 #ifndef GL_ARB_ES2_compatibility
 #define GL_ARB_ES2_compatibility 1
 #endif /* GL_ARB_ES2_compatibility */
@@ -3475,8 +3513,6 @@ typedef unsigned short GLhalfARB;
 
 #ifndef GL_ARB_imaging
 #define GL_ARB_imaging 1
-#define GL_BLEND_COLOR                    0x8005
-#define GL_BLEND_EQUATION                 0x8009
 #define GL_CONVOLUTION_1D                 0x8010
 #define GL_CONVOLUTION_2D                 0x8011
 #define GL_SEPARABLE_2D                   0x8012
@@ -3613,11 +3649,11 @@ GLAPI void APIENTRY glResetMinmax (GLenum target);
 #define GL_ARB_indirect_parameters 1
 #define GL_PARAMETER_BUFFER_ARB           0x80EE
 #define GL_PARAMETER_BUFFER_BINDING_ARB   0x80EF
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
 #ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
-GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
 #endif
 #endif /* GL_ARB_indirect_parameters */
 
@@ -3637,6 +3673,25 @@ GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
 #ifndef GL_ARB_internalformat_query2
 #define GL_ARB_internalformat_query2 1
 #define GL_SRGB_DECODE_ARB                0x8299
+#define GL_VIEW_CLASS_EAC_R11             0x9383
+#define GL_VIEW_CLASS_EAC_RG11            0x9384
+#define GL_VIEW_CLASS_ETC2_RGB            0x9385
+#define GL_VIEW_CLASS_ETC2_RGBA           0x9386
+#define GL_VIEW_CLASS_ETC2_EAC_RGBA       0x9387
+#define GL_VIEW_CLASS_ASTC_4x4_RGBA       0x9388
+#define GL_VIEW_CLASS_ASTC_5x4_RGBA       0x9389
+#define GL_VIEW_CLASS_ASTC_5x5_RGBA       0x938A
+#define GL_VIEW_CLASS_ASTC_6x5_RGBA       0x938B
+#define GL_VIEW_CLASS_ASTC_6x6_RGBA       0x938C
+#define GL_VIEW_CLASS_ASTC_8x5_RGBA       0x938D
+#define GL_VIEW_CLASS_ASTC_8x6_RGBA       0x938E
+#define GL_VIEW_CLASS_ASTC_8x8_RGBA       0x938F
+#define GL_VIEW_CLASS_ASTC_10x5_RGBA      0x9390
+#define GL_VIEW_CLASS_ASTC_10x6_RGBA      0x9391
+#define GL_VIEW_CLASS_ASTC_10x8_RGBA      0x9392
+#define GL_VIEW_CLASS_ASTC_10x10_RGBA     0x9393
+#define GL_VIEW_CLASS_ASTC_12x10_RGBA     0x9394
+#define GL_VIEW_CLASS_ASTC_12x12_RGBA     0x9395
 #endif /* GL_ARB_internalformat_query2 */
 
 #ifndef GL_ARB_invalidate_subdata
@@ -3894,6 +3949,10 @@ GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
 #define GL_COORD_REPLACE_ARB              0x8862
 #endif /* GL_ARB_point_sprite */
 
+#ifndef GL_ARB_polygon_offset_clamp
+#define GL_ARB_polygon_offset_clamp 1
+#endif /* GL_ARB_polygon_offset_clamp */
+
 #ifndef GL_ARB_post_depth_coverage
 #define GL_ARB_post_depth_coverage 1
 #endif /* GL_ARB_post_depth_coverage */
@@ -4292,6 +4351,10 @@ GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xo
 #define GL_ARB_sparse_texture_clamp 1
 #endif /* GL_ARB_sparse_texture_clamp */
 
+#ifndef GL_ARB_spirv_extensions
+#define GL_ARB_spirv_extensions 1
+#endif /* GL_ARB_spirv_extensions */
+
 #ifndef GL_ARB_stencil_texturing
 #define GL_ARB_stencil_texturing 1
 #endif /* GL_ARB_stencil_texturing */
@@ -4444,6 +4507,10 @@ GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, void
 #define GL_DOT3_RGBA_ARB                  0x86AF
 #endif /* GL_ARB_texture_env_dot3 */
 
+#ifndef GL_ARB_texture_filter_anisotropic
+#define GL_ARB_texture_filter_anisotropic 1
+#endif /* GL_ARB_texture_filter_anisotropic */
+
 #ifndef GL_ARB_texture_filter_minmax
 #define GL_ARB_texture_filter_minmax 1
 #define GL_TEXTURE_REDUCTION_MODE_ARB     0x9366
@@ -4949,6 +5016,16 @@ GLAPI void APIENTRY glBlendBarrierKHR (void);
 #define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR  0x00000008
 #endif /* GL_KHR_no_error */
 
+#ifndef GL_KHR_parallel_shader_compile
+#define GL_KHR_parallel_shader_compile 1
+#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
+#define GL_COMPLETION_STATUS_KHR          0x91B1
+typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
+#endif
+#endif /* GL_KHR_parallel_shader_compile */
+
 #ifndef GL_KHR_robust_buffer_access_behavior
 #define GL_KHR_robust_buffer_access_behavior 1
 #endif /* GL_KHR_robust_buffer_access_behavior */
@@ -5389,6 +5466,22 @@ GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRG
 #endif
 #endif /* GL_AMD_draw_buffers_blend */
 
+#ifndef GL_AMD_framebuffer_multisample_advanced
+#define GL_AMD_framebuffer_multisample_advanced 1
+#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
+#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
+#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
+#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
+#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
+#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_AMD_framebuffer_multisample_advanced */
+
 #ifndef GL_AMD_framebuffer_sample_positions
 #define GL_AMD_framebuffer_sample_positions 1
 #define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
@@ -5428,6 +5521,10 @@ GLAPI void APIENTRY glGetNamedFramebufferParameterfvAMD (GLuint framebuffer, GLe
 #define GL_FLOAT16_MAT4x3_AMD             0x91CD
 #endif /* GL_AMD_gpu_shader_half_float */
 
+#ifndef GL_AMD_gpu_shader_int16
+#define GL_AMD_gpu_shader_int16 1
+#endif /* GL_AMD_gpu_shader_int16 */
+
 #ifndef GL_AMD_gpu_shader_int64
 #define GL_AMD_gpu_shader_int64 1
 typedef int64_t GLint64EXT;
@@ -5649,6 +5746,14 @@ GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLf
 #define GL_AMD_shader_explicit_vertex_parameter 1
 #endif /* GL_AMD_shader_explicit_vertex_parameter */
 
+#ifndef GL_AMD_shader_gpu_shader_half_float_fetch
+#define GL_AMD_shader_gpu_shader_half_float_fetch 1
+#endif /* GL_AMD_shader_gpu_shader_half_float_fetch */
+
+#ifndef GL_AMD_shader_image_load_store_lod
+#define GL_AMD_shader_image_load_store_lod 1
+#endif /* GL_AMD_shader_image_load_store_lod */
+
 #ifndef GL_AMD_shader_stencil_export
 #define GL_AMD_shader_stencil_export 1
 #endif /* GL_AMD_shader_stencil_export */
@@ -5688,6 +5793,10 @@ GLAPI void APIENTRY glStencilOpValueAMD (GLenum face, GLuint value);
 #endif
 #endif /* GL_AMD_stencil_operation_extended */
 
+#ifndef GL_AMD_texture_gather_bias_lod
+#define GL_AMD_texture_gather_bias_lod 1
+#endif /* GL_AMD_texture_gather_bias_lod */
+
 #ifndef GL_AMD_texture_texture4
 #define GL_AMD_texture_texture4 1
 #endif /* GL_AMD_texture_texture4 */
@@ -6388,6 +6497,17 @@ GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
 #define GL_422_REV_AVERAGE_EXT            0x80CF
 #endif /* GL_EXT_422_pixels */
 
+#ifndef GL_EXT_EGL_image_storage
+#define GL_EXT_EGL_image_storage 1
+typedef void *GLeglImageOES;
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
+GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
+#endif
+#endif /* GL_EXT_EGL_image_storage */
+
 #ifndef GL_EXT_abgr
 #define GL_EXT_abgr 1
 #define GL_ABGR_EXT                       0x8000
@@ -7239,6 +7359,17 @@ GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint en
 #endif
 #endif /* GL_EXT_draw_range_elements */
 
+#ifndef GL_EXT_external_buffer
+#define GL_EXT_external_buffer 1
+typedef void *GLeglClientBufferEXT;
+typedef void (APIENTRYP PFNGLBUFFERSTORAGEEXTERNALEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferStorageExternalEXT (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+GLAPI void APIENTRY glNamedBufferStorageExternalEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+#endif
+#endif /* GL_EXT_external_buffer */
+
 #ifndef GL_EXT_fog_coord
 #define GL_EXT_fog_coord 1
 #define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
@@ -7582,6 +7713,89 @@ GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
 #endif
 #endif /* GL_EXT_light_texture */
 
+#ifndef GL_EXT_memory_object
+#define GL_EXT_memory_object 1
+#define GL_TEXTURE_TILING_EXT             0x9580
+#define GL_DEDICATED_MEMORY_OBJECT_EXT    0x9581
+#define GL_PROTECTED_MEMORY_OBJECT_EXT    0x959B
+#define GL_NUM_TILING_TYPES_EXT           0x9582
+#define GL_TILING_TYPES_EXT               0x9583
+#define GL_OPTIMAL_TILING_EXT             0x9584
+#define GL_LINEAR_TILING_EXT              0x9585
+#define GL_NUM_DEVICE_UUIDS_EXT           0x9596
+#define GL_DEVICE_UUID_EXT                0x9597
+#define GL_DRIVER_UUID_EXT                0x9598
+#define GL_UUID_SIZE_EXT                  16
+typedef void (APIENTRYP PFNGLGETUNSIGNEDBYTEVEXTPROC) (GLenum pname, GLubyte *data);
+typedef void (APIENTRYP PFNGLGETUNSIGNEDBYTEI_VEXTPROC) (GLenum target, GLuint index, GLubyte *data);
+typedef void (APIENTRYP PFNGLDELETEMEMORYOBJECTSEXTPROC) (GLsizei n, const GLuint *memoryObjects);
+typedef GLboolean (APIENTRYP PFNGLISMEMORYOBJECTEXTPROC) (GLuint memoryObject);
+typedef void (APIENTRYP PFNGLCREATEMEMORYOBJECTSEXTPROC) (GLsizei n, GLuint *memoryObjects);
+typedef void (APIENTRYP PFNGLMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLBUFFERSTORAGEMEMEXTPROC) (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM2DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM2DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM3DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM3DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC) (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM1DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUnsignedBytevEXT (GLenum pname, GLubyte *data);
+GLAPI void APIENTRY glGetUnsignedBytei_vEXT (GLenum target, GLuint index, GLubyte *data);
+GLAPI void APIENTRY glDeleteMemoryObjectsEXT (GLsizei n, const GLuint *memoryObjects);
+GLAPI GLboolean APIENTRY glIsMemoryObjectEXT (GLuint memoryObject);
+GLAPI void APIENTRY glCreateMemoryObjectsEXT (GLsizei n, GLuint *memoryObjects);
+GLAPI void APIENTRY glMemoryObjectParameterivEXT (GLuint memoryObject, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetMemoryObjectParameterivEXT (GLuint memoryObject, GLenum pname, GLint *params);
+GLAPI void APIENTRY glTexStorageMem2DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTexStorageMem2DMultisampleEXT (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTexStorageMem3DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTexStorageMem3DMultisampleEXT (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glBufferStorageMemEXT (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem2DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem2DMultisampleEXT (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem3DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem3DMultisampleEXT (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glNamedBufferStorageMemEXT (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTexStorageMem1DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem1DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+#endif
+#endif /* GL_EXT_memory_object */
+
+#ifndef GL_EXT_memory_object_fd
+#define GL_EXT_memory_object_fd 1
+#define GL_HANDLE_TYPE_OPAQUE_FD_EXT      0x9586
+typedef void (APIENTRYP PFNGLIMPORTMEMORYFDEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImportMemoryFdEXT (GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
+#endif
+#endif /* GL_EXT_memory_object_fd */
+
+#ifndef GL_EXT_memory_object_win32
+#define GL_EXT_memory_object_win32 1
+#define GL_HANDLE_TYPE_OPAQUE_WIN32_EXT   0x9587
+#define GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT 0x9588
+#define GL_DEVICE_LUID_EXT                0x9599
+#define GL_DEVICE_NODE_MASK_EXT           0x959A
+#define GL_LUID_SIZE_EXT                  8
+#define GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT 0x9589
+#define GL_HANDLE_TYPE_D3D12_RESOURCE_EXT 0x958A
+#define GL_HANDLE_TYPE_D3D11_IMAGE_EXT    0x958B
+#define GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT 0x958C
+typedef void (APIENTRYP PFNGLIMPORTMEMORYWIN32HANDLEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, void *handle);
+typedef void (APIENTRYP PFNGLIMPORTMEMORYWIN32NAMEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, const void *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImportMemoryWin32HandleEXT (GLuint memory, GLuint64 size, GLenum handleType, void *handle);
+GLAPI void APIENTRY glImportMemoryWin32NameEXT (GLuint memory, GLuint64 size, GLenum handleType, const void *name);
+#endif
+#endif /* GL_EXT_memory_object_win32 */
+
 #ifndef GL_EXT_misc_attribute
 #define GL_EXT_misc_attribute 1
 #endif /* GL_EXT_misc_attribute */
@@ -7823,6 +8037,55 @@ GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei
 #endif
 #endif /* GL_EXT_secondary_color */
 
+#ifndef GL_EXT_semaphore
+#define GL_EXT_semaphore 1
+#define GL_LAYOUT_GENERAL_EXT             0x958D
+#define GL_LAYOUT_COLOR_ATTACHMENT_EXT    0x958E
+#define GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT 0x958F
+#define GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT 0x9590
+#define GL_LAYOUT_SHADER_READ_ONLY_EXT    0x9591
+#define GL_LAYOUT_TRANSFER_SRC_EXT        0x9592
+#define GL_LAYOUT_TRANSFER_DST_EXT        0x9593
+#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
+#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
+typedef void (APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores);
+typedef void (APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores);
+typedef GLboolean (APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
+typedef void (APIENTRYP PFNGLSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, const GLuint64 *params);
+typedef void (APIENTRYP PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, GLuint64 *params);
+typedef void (APIENTRYP PFNGLWAITSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
+typedef void (APIENTRYP PFNGLSIGNALSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenSemaphoresEXT (GLsizei n, GLuint *semaphores);
+GLAPI void APIENTRY glDeleteSemaphoresEXT (GLsizei n, const GLuint *semaphores);
+GLAPI GLboolean APIENTRY glIsSemaphoreEXT (GLuint semaphore);
+GLAPI void APIENTRY glSemaphoreParameterui64vEXT (GLuint semaphore, GLenum pname, const GLuint64 *params);
+GLAPI void APIENTRY glGetSemaphoreParameterui64vEXT (GLuint semaphore, GLenum pname, GLuint64 *params);
+GLAPI void APIENTRY glWaitSemaphoreEXT (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
+GLAPI void APIENTRY glSignalSemaphoreEXT (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
+#endif
+#endif /* GL_EXT_semaphore */
+
+#ifndef GL_EXT_semaphore_fd
+#define GL_EXT_semaphore_fd 1
+typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREFDEXTPROC) (GLuint semaphore, GLenum handleType, GLint fd);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImportSemaphoreFdEXT (GLuint semaphore, GLenum handleType, GLint fd);
+#endif
+#endif /* GL_EXT_semaphore_fd */
+
+#ifndef GL_EXT_semaphore_win32
+#define GL_EXT_semaphore_win32 1
+#define GL_HANDLE_TYPE_D3D12_FENCE_EXT    0x9594
+#define GL_D3D12_FENCE_VALUE_EXT          0x9595
+typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREWIN32HANDLEEXTPROC) (GLuint semaphore, GLenum handleType, void *handle);
+typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREWIN32NAMEEXTPROC) (GLuint semaphore, GLenum handleType, const void *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImportSemaphoreWin32HandleEXT (GLuint semaphore, GLenum handleType, void *handle);
+GLAPI void APIENTRY glImportSemaphoreWin32NameEXT (GLuint semaphore, GLenum handleType, const void *name);
+#endif
+#endif /* GL_EXT_semaphore_win32 */
+
 #ifndef GL_EXT_separate_shader_objects
 #define GL_EXT_separate_shader_objects 1
 #define GL_ACTIVE_PROGRAM_EXT             0x8B8D
@@ -7843,6 +8106,19 @@ GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *strin
 #define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
 #endif /* GL_EXT_separate_specular_color */
 
+#ifndef GL_EXT_shader_framebuffer_fetch
+#define GL_EXT_shader_framebuffer_fetch 1
+#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
+#endif /* GL_EXT_shader_framebuffer_fetch */
+
+#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
+#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
+typedef void (APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void);
+#endif
+#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
+
 #ifndef GL_EXT_shader_image_load_formatted
 #define GL_EXT_shader_image_load_formatted 1
 #endif /* GL_EXT_shader_image_load_formatted */
@@ -8143,6 +8419,8 @@ GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint
 
 #ifndef GL_EXT_texture_filter_minmax
 #define GL_EXT_texture_filter_minmax 1
+#define GL_TEXTURE_REDUCTION_MODE_EXT     0x9366
+#define GL_WEIGHTED_AVERAGE_EXT           0x9367
 #endif /* GL_EXT_texture_filter_minmax */
 
 #ifndef GL_EXT_texture_integer
@@ -8277,6 +8555,11 @@ GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
 #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
 #endif /* GL_EXT_texture_sRGB */
 
+#ifndef GL_EXT_texture_sRGB_R8
+#define GL_EXT_texture_sRGB_R8 1
+#define GL_SR8_EXT                        0x8FBD
+#endif /* GL_EXT_texture_sRGB_R8 */
+
 #ifndef GL_EXT_texture_sRGB_decode
 #define GL_EXT_texture_sRGB_decode 1
 #define GL_TEXTURE_SRGB_DECODE_EXT        0x8A48
@@ -8689,6 +8972,16 @@ GLAPI void APIENTRY glVertexWeightPointerEXT (GLint size, GLenum type, GLsizei s
 #endif
 #endif /* GL_EXT_vertex_weighting */
 
+#ifndef GL_EXT_win32_keyed_mutex
+#define GL_EXT_win32_keyed_mutex 1
+typedef GLboolean (APIENTRYP PFNGLACQUIREKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key, GLuint timeout);
+typedef GLboolean (APIENTRYP PFNGLRELEASEKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAcquireKeyedMutexWin32EXT (GLuint memory, GLuint64 key, GLuint timeout);
+GLAPI GLboolean APIENTRY glReleaseKeyedMutexWin32EXT (GLuint memory, GLuint64 key);
+#endif
+#endif /* GL_EXT_win32_keyed_mutex */
+
 #ifndef GL_EXT_window_rectangles
 #define GL_EXT_window_rectangles 1
 #define GL_INCLUSIVE_EXT                  0x8F10
@@ -8880,6 +9173,11 @@ GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRG
 #define GL_INTERLACE_READ_INGR            0x8568
 #endif /* GL_INGR_interlace_read */
 
+#ifndef GL_INTEL_blackhole_render
+#define GL_INTEL_blackhole_render 1
+#define GL_BLACKHOLE_RENDER_INTEL         0x83FC
+#endif /* GL_INTEL_blackhole_render */
+
 #ifndef GL_INTEL_conservative_rasterization
 #define GL_INTEL_conservative_rasterization 1
 #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
@@ -8961,7 +9259,7 @@ typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
 typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
 typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
 typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
 typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
 typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #ifdef GL_GLEXT_PROTOTYPES
@@ -8972,7 +9270,7 @@ GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
 GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
 GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
 GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
 GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
 GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #endif
@@ -8993,6 +9291,11 @@ GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLen
 #define GL_PACK_INVERT_MESA               0x8758
 #endif /* GL_MESA_pack_invert */
 
+#ifndef GL_MESA_program_binary_formats
+#define GL_MESA_program_binary_formats 1
+#define GL_PROGRAM_BINARY_FORMAT_MESA     0x875F
+#endif /* GL_MESA_program_binary_formats */
+
 #ifndef GL_MESA_resize_buffers
 #define GL_MESA_resize_buffers 1
 typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
@@ -9005,6 +9308,13 @@ GLAPI void APIENTRY glResizeBuffersMESA (void);
 #define GL_MESA_shader_integer_functions 1
 #endif /* GL_MESA_shader_integer_functions */
 
+#ifndef GL_MESA_tile_raster_order
+#define GL_MESA_tile_raster_order 1
+#define GL_TILE_RASTER_ORDER_FIXED_MESA   0x8BB8
+#define GL_TILE_RASTER_ORDER_INCREASING_X_MESA 0x8BB9
+#define GL_TILE_RASTER_ORDER_INCREASING_Y_MESA 0x8BBA
+#endif /* GL_MESA_tile_raster_order */
+
 #ifndef GL_MESA_window_pos
 #define GL_MESA_window_pos 1
 typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
@@ -9231,6 +9541,10 @@ GLAPI void APIENTRY glBlendBarrierNV (void);
 #define GL_BLEND_ADVANCED_COHERENT_NV     0x9285
 #endif /* GL_NV_blend_equation_advanced_coherent */
 
+#ifndef GL_NV_blend_minmax_factor
+#define GL_NV_blend_minmax_factor 1
+#endif /* GL_NV_blend_minmax_factor */
+
 #ifndef GL_NV_blend_square
 #define GL_NV_blend_square 1
 #endif /* GL_NV_blend_square */
@@ -9311,6 +9625,10 @@ GLAPI void APIENTRY glCallCommandListNV (GLuint list);
 #define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC
 #endif /* GL_NV_compute_program5 */
 
+#ifndef GL_NV_compute_shader_derivatives
+#define GL_NV_compute_shader_derivatives 1
+#endif /* GL_NV_compute_shader_derivatives */
+
 #ifndef GL_NV_conditional_render
 #define GL_NV_conditional_render 1
 #define GL_QUERY_WAIT_NV                  0x8E13
@@ -9348,6 +9666,11 @@ GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat valu
 #endif
 #endif /* GL_NV_conservative_raster_dilate */
 
+#ifndef GL_NV_conservative_raster_pre_snap
+#define GL_NV_conservative_raster_pre_snap 1
+#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
+#endif /* GL_NV_conservative_raster_pre_snap */
+
 #ifndef GL_NV_conservative_raster_pre_snap_triangles
 #define GL_NV_conservative_raster_pre_snap_triangles 1
 #define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
@@ -9359,6 +9682,10 @@ GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param)
 #endif
 #endif /* GL_NV_conservative_raster_pre_snap_triangles */
 
+#ifndef GL_NV_conservative_raster_underestimation
+#define GL_NV_conservative_raster_underestimation 1
+#endif /* GL_NV_conservative_raster_underestimation */
+
 #ifndef GL_NV_copy_depth_to_color
 #define GL_NV_copy_depth_to_color 1
 #define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
@@ -9600,6 +9927,10 @@ GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, cons
 #define GL_NV_fragment_program_option 1
 #endif /* GL_NV_fragment_program_option */
 
+#ifndef GL_NV_fragment_shader_barycentric
+#define GL_NV_fragment_shader_barycentric 1
+#endif /* GL_NV_fragment_shader_barycentric */
+
 #ifndef GL_NV_fragment_shader_interlock
 #define GL_NV_fragment_shader_interlock 1
 #endif /* GL_NV_fragment_shader_interlock */
@@ -9667,7 +9998,7 @@ GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachmen
 #define GL_PER_GPU_STORAGE_NV             0x9548
 #define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549
 typedef void (APIENTRYP PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
 typedef void (APIENTRYP PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
 typedef void (APIENTRYP PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
 typedef void (APIENTRYP PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
@@ -9680,7 +10011,7 @@ typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLu
 typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glRenderGpuMaskNV (GLbitfield mask);
-GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
 GLAPI void APIENTRY glMulticastCopyBufferSubDataNV (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
 GLAPI void APIENTRY glMulticastCopyImageSubDataNV (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
 GLAPI void APIENTRY glMulticastBlitFramebufferNV (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
@@ -9884,6 +10215,96 @@ GLAPI void APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum interna
 #define GL_MAX_SPOT_EXPONENT_NV           0x8505
 #endif /* GL_NV_light_max_exponent */
 
+#ifndef GL_NV_memory_attachment
+#define GL_NV_memory_attachment 1
+#define GL_ATTACHED_MEMORY_OBJECT_NV      0x95A4
+#define GL_ATTACHED_MEMORY_OFFSET_NV      0x95A5
+#define GL_MEMORY_ATTACHABLE_ALIGNMENT_NV 0x95A6
+#define GL_MEMORY_ATTACHABLE_SIZE_NV      0x95A7
+#define GL_MEMORY_ATTACHABLE_NV           0x95A8
+#define GL_DETACHED_MEMORY_INCARNATION_NV 0x95A9
+#define GL_DETACHED_TEXTURES_NV           0x95AA
+#define GL_DETACHED_BUFFERS_NV            0x95AB
+#define GL_MAX_DETACHED_TEXTURES_NV       0x95AC
+#define GL_MAX_DETACHED_BUFFERS_NV        0x95AD
+typedef void (APIENTRYP PFNGLGETMEMORYOBJECTDETACHEDRESOURCESUIVNVPROC) (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params);
+typedef void (APIENTRYP PFNGLRESETMEMORYOBJECTPARAMETERNVPROC) (GLuint memory, GLenum pname);
+typedef void (APIENTRYP PFNGLTEXATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLBUFFERATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTUREATTACHMEMORYNVPROC) (GLuint texture, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERATTACHMEMORYNVPROC) (GLuint buffer, GLuint memory, GLuint64 offset);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMemoryObjectDetachedResourcesuivNV (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params);
+GLAPI void APIENTRY glResetMemoryObjectParameterNV (GLuint memory, GLenum pname);
+GLAPI void APIENTRY glTexAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glBufferAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureAttachMemoryNV (GLuint texture, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glNamedBufferAttachMemoryNV (GLuint buffer, GLuint memory, GLuint64 offset);
+#endif
+#endif /* GL_NV_memory_attachment */
+
+#ifndef GL_NV_mesh_shader
+#define GL_NV_mesh_shader 1
+#define GL_MESH_SHADER_NV                 0x9559
+#define GL_TASK_SHADER_NV                 0x955A
+#define GL_MAX_MESH_UNIFORM_BLOCKS_NV     0x8E60
+#define GL_MAX_MESH_TEXTURE_IMAGE_UNITS_NV 0x8E61
+#define GL_MAX_MESH_IMAGE_UNIFORMS_NV     0x8E62
+#define GL_MAX_MESH_UNIFORM_COMPONENTS_NV 0x8E63
+#define GL_MAX_MESH_ATOMIC_COUNTER_BUFFERS_NV 0x8E64
+#define GL_MAX_MESH_ATOMIC_COUNTERS_NV    0x8E65
+#define GL_MAX_MESH_SHADER_STORAGE_BLOCKS_NV 0x8E66
+#define GL_MAX_COMBINED_MESH_UNIFORM_COMPONENTS_NV 0x8E67
+#define GL_MAX_TASK_UNIFORM_BLOCKS_NV     0x8E68
+#define GL_MAX_TASK_TEXTURE_IMAGE_UNITS_NV 0x8E69
+#define GL_MAX_TASK_IMAGE_UNIFORMS_NV     0x8E6A
+#define GL_MAX_TASK_UNIFORM_COMPONENTS_NV 0x8E6B
+#define GL_MAX_TASK_ATOMIC_COUNTER_BUFFERS_NV 0x8E6C
+#define GL_MAX_TASK_ATOMIC_COUNTERS_NV    0x8E6D
+#define GL_MAX_TASK_SHADER_STORAGE_BLOCKS_NV 0x8E6E
+#define GL_MAX_COMBINED_TASK_UNIFORM_COMPONENTS_NV 0x8E6F
+#define GL_MAX_MESH_WORK_GROUP_INVOCATIONS_NV 0x95A2
+#define GL_MAX_TASK_WORK_GROUP_INVOCATIONS_NV 0x95A3
+#define GL_MAX_MESH_TOTAL_MEMORY_SIZE_NV  0x9536
+#define GL_MAX_TASK_TOTAL_MEMORY_SIZE_NV  0x9537
+#define GL_MAX_MESH_OUTPUT_VERTICES_NV    0x9538
+#define GL_MAX_MESH_OUTPUT_PRIMITIVES_NV  0x9539
+#define GL_MAX_TASK_OUTPUT_COUNT_NV       0x953A
+#define GL_MAX_DRAW_MESH_TASKS_COUNT_NV   0x953D
+#define GL_MAX_MESH_VIEWS_NV              0x9557
+#define GL_MESH_OUTPUT_PER_VERTEX_GRANULARITY_NV 0x92DF
+#define GL_MESH_OUTPUT_PER_PRIMITIVE_GRANULARITY_NV 0x9543
+#define GL_MAX_MESH_WORK_GROUP_SIZE_NV    0x953B
+#define GL_MAX_TASK_WORK_GROUP_SIZE_NV    0x953C
+#define GL_MESH_WORK_GROUP_SIZE_NV        0x953E
+#define GL_TASK_WORK_GROUP_SIZE_NV        0x953F
+#define GL_MESH_VERTICES_OUT_NV           0x9579
+#define GL_MESH_PRIMITIVES_OUT_NV         0x957A
+#define GL_MESH_OUTPUT_TYPE_NV            0x957B
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_MESH_SHADER_NV 0x959C
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TASK_SHADER_NV 0x959D
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_MESH_SHADER_NV 0x959E
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TASK_SHADER_NV 0x959F
+#define GL_REFERENCED_BY_MESH_SHADER_NV   0x95A0
+#define GL_REFERENCED_BY_TASK_SHADER_NV   0x95A1
+#define GL_MESH_SUBROUTINE_NV             0x957C
+#define GL_TASK_SUBROUTINE_NV             0x957D
+#define GL_MESH_SUBROUTINE_UNIFORM_NV     0x957E
+#define GL_TASK_SUBROUTINE_UNIFORM_NV     0x957F
+#define GL_MESH_SHADER_BIT_NV             0x00000040
+#define GL_TASK_SHADER_BIT_NV             0x00000080
+typedef void (APIENTRYP PFNGLDRAWMESHTASKSNVPROC) (GLuint first, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWMESHTASKSINDIRECTNVPROC) (GLintptr indirect);
+typedef void (APIENTRYP PFNGLMULTIDRAWMESHTASKSINDIRECTNVPROC) (GLintptr indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWMESHTASKSINDIRECTCOUNTNVPROC) (GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshTasksNV (GLuint first, GLuint count);
+GLAPI void APIENTRY glDrawMeshTasksIndirectNV (GLintptr indirect);
+GLAPI void APIENTRY glMultiDrawMeshTasksIndirectNV (GLintptr indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawMeshTasksIndirectCountNV (GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#endif
+#endif /* GL_NV_mesh_shader */
+
 #ifndef GL_NV_multisample_coverage
 #define GL_NV_multisample_coverage 1
 #endif /* GL_NV_multisample_coverage */
@@ -10311,6 +10732,32 @@ GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
 #endif
 #endif /* GL_NV_primitive_restart */
 
+#ifndef GL_NV_query_resource
+#define GL_NV_query_resource 1
+#define GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV 0x9540
+#define GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV 0x9542
+#define GL_QUERY_RESOURCE_SYS_RESERVED_NV 0x9544
+#define GL_QUERY_RESOURCE_TEXTURE_NV      0x9545
+#define GL_QUERY_RESOURCE_RENDERBUFFER_NV 0x9546
+#define GL_QUERY_RESOURCE_BUFFEROBJECT_NV 0x9547
+typedef GLint (APIENTRYP PFNGLQUERYRESOURCENVPROC) (GLenum queryType, GLint tagId, GLuint bufSize, GLint *buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glQueryResourceNV (GLenum queryType, GLint tagId, GLuint bufSize, GLint *buffer);
+#endif
+#endif /* GL_NV_query_resource */
+
+#ifndef GL_NV_query_resource_tag
+#define GL_NV_query_resource_tag 1
+typedef void (APIENTRYP PFNGLGENQUERYRESOURCETAGNVPROC) (GLsizei n, GLint *tagIds);
+typedef void (APIENTRYP PFNGLDELETEQUERYRESOURCETAGNVPROC) (GLsizei n, const GLint *tagIds);
+typedef void (APIENTRYP PFNGLQUERYRESOURCETAGNVPROC) (GLint tagId, const GLchar *tagString);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueryResourceTagNV (GLsizei n, GLint *tagIds);
+GLAPI void APIENTRY glDeleteQueryResourceTagNV (GLsizei n, const GLint *tagIds);
+GLAPI void APIENTRY glQueryResourceTagNV (GLint tagId, const GLchar *tagString);
+#endif
+#endif /* GL_NV_query_resource_tag */
+
 #ifndef GL_NV_register_combiners
 #define GL_NV_register_combiners 1
 #define GL_REGISTER_COMBINERS_NV          0x8522
@@ -10403,6 +10850,11 @@ GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname,
 #endif
 #endif /* GL_NV_register_combiners2 */
 
+#ifndef GL_NV_representative_fragment_test
+#define GL_NV_representative_fragment_test 1
+#define GL_REPRESENTATIVE_FRAGMENT_TEST_NV 0x937F
+#endif /* GL_NV_representative_fragment_test */
+
 #ifndef GL_NV_robustness_video_memory_purge
 #define GL_NV_robustness_video_memory_purge 1
 #define GL_PURGED_CONTEXT_RESET_NV        0x92BB
@@ -10432,6 +10884,18 @@ GLAPI void APIENTRY glResolveDepthValuesNV (void);
 #define GL_NV_sample_mask_override_coverage 1
 #endif /* GL_NV_sample_mask_override_coverage */
 
+#ifndef GL_NV_scissor_exclusive
+#define GL_NV_scissor_exclusive 1
+#define GL_SCISSOR_TEST_EXCLUSIVE_NV      0x9555
+#define GL_SCISSOR_BOX_EXCLUSIVE_NV       0x9556
+typedef void (APIENTRYP PFNGLSCISSOREXCLUSIVENVPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLSCISSOREXCLUSIVEARRAYVNVPROC) (GLuint first, GLsizei count, const GLint *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glScissorExclusiveNV (GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glScissorExclusiveArrayvNV (GLuint first, GLsizei count, const GLint *v);
+#endif
+#endif /* GL_NV_scissor_exclusive */
+
 #ifndef GL_NV_shader_atomic_counters
 #define GL_NV_shader_atomic_counters 1
 #endif /* GL_NV_shader_atomic_counters */
@@ -10496,6 +10960,10 @@ GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLs
 #define GL_NV_shader_storage_buffer_object 1
 #endif /* GL_NV_shader_storage_buffer_object */
 
+#ifndef GL_NV_shader_texture_footprint
+#define GL_NV_shader_texture_footprint 1
+#endif /* GL_NV_shader_texture_footprint */
+
 #ifndef GL_NV_shader_thread_group
 #define GL_NV_shader_thread_group 1
 #define GL_WARP_SIZE_NV                   0x9339
@@ -10507,6 +10975,47 @@ GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLs
 #define GL_NV_shader_thread_shuffle 1
 #endif /* GL_NV_shader_thread_shuffle */
 
+#ifndef GL_NV_shading_rate_image
+#define GL_NV_shading_rate_image 1
+#define GL_SHADING_RATE_IMAGE_NV          0x9563
+#define GL_SHADING_RATE_NO_INVOCATIONS_NV 0x9564
+#define GL_SHADING_RATE_1_INVOCATION_PER_PIXEL_NV 0x9565
+#define GL_SHADING_RATE_1_INVOCATION_PER_1X2_PIXELS_NV 0x9566
+#define GL_SHADING_RATE_1_INVOCATION_PER_2X1_PIXELS_NV 0x9567
+#define GL_SHADING_RATE_1_INVOCATION_PER_2X2_PIXELS_NV 0x9568
+#define GL_SHADING_RATE_1_INVOCATION_PER_2X4_PIXELS_NV 0x9569
+#define GL_SHADING_RATE_1_INVOCATION_PER_4X2_PIXELS_NV 0x956A
+#define GL_SHADING_RATE_1_INVOCATION_PER_4X4_PIXELS_NV 0x956B
+#define GL_SHADING_RATE_2_INVOCATIONS_PER_PIXEL_NV 0x956C
+#define GL_SHADING_RATE_4_INVOCATIONS_PER_PIXEL_NV 0x956D
+#define GL_SHADING_RATE_8_INVOCATIONS_PER_PIXEL_NV 0x956E
+#define GL_SHADING_RATE_16_INVOCATIONS_PER_PIXEL_NV 0x956F
+#define GL_SHADING_RATE_IMAGE_BINDING_NV  0x955B
+#define GL_SHADING_RATE_IMAGE_TEXEL_WIDTH_NV 0x955C
+#define GL_SHADING_RATE_IMAGE_TEXEL_HEIGHT_NV 0x955D
+#define GL_SHADING_RATE_IMAGE_PALETTE_SIZE_NV 0x955E
+#define GL_MAX_COARSE_FRAGMENT_SAMPLES_NV 0x955F
+#define GL_SHADING_RATE_SAMPLE_ORDER_DEFAULT_NV 0x95AE
+#define GL_SHADING_RATE_SAMPLE_ORDER_PIXEL_MAJOR_NV 0x95AF
+#define GL_SHADING_RATE_SAMPLE_ORDER_SAMPLE_MAJOR_NV 0x95B0
+typedef void (APIENTRYP PFNGLBINDSHADINGRATEIMAGENVPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLGETSHADINGRATEIMAGEPALETTENVPROC) (GLuint viewport, GLuint entry, GLenum *rate);
+typedef void (APIENTRYP PFNGLGETSHADINGRATESAMPLELOCATIONIVNVPROC) (GLenum rate, GLuint samples, GLuint index, GLint *location);
+typedef void (APIENTRYP PFNGLSHADINGRATEIMAGEBARRIERNVPROC) (GLboolean synchronize);
+typedef void (APIENTRYP PFNGLSHADINGRATEIMAGEPALETTENVPROC) (GLuint viewport, GLuint first, GLsizei count, const GLenum *rates);
+typedef void (APIENTRYP PFNGLSHADINGRATESAMPLEORDERNVPROC) (GLenum order);
+typedef void (APIENTRYP PFNGLSHADINGRATESAMPLEORDERCUSTOMNVPROC) (GLenum rate, GLuint samples, const GLint *locations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindShadingRateImageNV (GLuint texture);
+GLAPI void APIENTRY glGetShadingRateImagePaletteNV (GLuint viewport, GLuint entry, GLenum *rate);
+GLAPI void APIENTRY glGetShadingRateSampleLocationivNV (GLenum rate, GLuint samples, GLuint index, GLint *location);
+GLAPI void APIENTRY glShadingRateImageBarrierNV (GLboolean synchronize);
+GLAPI void APIENTRY glShadingRateImagePaletteNV (GLuint viewport, GLuint first, GLsizei count, const GLenum *rates);
+GLAPI void APIENTRY glShadingRateSampleOrderNV (GLenum order);
+GLAPI void APIENTRY glShadingRateSampleOrderCustomNV (GLenum rate, GLuint samples, const GLint *locations);
+#endif
+#endif /* GL_NV_shading_rate_image */
+
 #ifndef GL_NV_stereo_view_rendering
 #define GL_NV_stereo_view_rendering 1
 #endif /* GL_NV_stereo_view_rendering */
@@ -10587,6 +11096,10 @@ GLAPI void APIENTRY glTextureImage3DMultisampleCoverageNV (GLuint texture, GLenu
 #define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
 #endif /* GL_NV_texture_rectangle */
 
+#ifndef GL_NV_texture_rectangle_compressed
+#define GL_NV_texture_rectangle_compressed 1
+#endif /* GL_NV_texture_rectangle_compressed */
+
 #ifndef GL_NV_texture_shader
 #define GL_NV_texture_shader 1
 #define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
@@ -10813,6 +11326,14 @@ GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSur
 #endif
 #endif /* GL_NV_vdpau_interop */
 
+#ifndef GL_NV_vdpau_interop2
+#define GL_NV_vdpau_interop2 1
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACEWITHPICTURESTRUCTURENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames, GLboolean isFrameStructure);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceWithPictureStructureNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames, GLboolean isFrameStructure);
+#endif
+#endif /* GL_NV_vdpau_interop2 */
+
 #ifndef GL_NV_vertex_array_range
 #define GL_NV_vertex_array_range 1
 #define GL_VERTEX_ARRAY_RANGE_NV          0x851D
diff --git a/src/gui/opengl/qopenglextensions_p.h b/src/gui/opengl/qopenglextensions_p.h
index af8ee8201d..137f1e831f 100644
--- a/src/gui/opengl/qopenglextensions_p.h
+++ b/src/gui/opengl/qopenglextensions_p.h
@@ -107,7 +107,7 @@ public:
     QOpenGLExtensionsPrivate *d() const;
 
 private:
-    static bool isInitialized(const QOpenGLFunctionsPrivate *d) { return d != 0; }
+    static bool isInitialized(const QOpenGLFunctionsPrivate *d) { return d != nullptr; }
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLExtensions::OpenGLExtensions)
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index e7631b09ce..5d30891565 100644
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -183,7 +183,7 @@ QT_BEGIN_NAMESPACE
 */
 void QOpenGLFramebufferObjectFormat::detach()
 {
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         QOpenGLFramebufferObjectFormatPrivate *newd
             = new QOpenGLFramebufferObjectFormatPrivate(d);
         if (!d->ref.deref())
diff --git a/src/gui/opengl/qopenglframebufferobject_p.h b/src/gui/opengl/qopenglframebufferobject_p.h
index 778a38b823..644bb6c59b 100644
--- a/src/gui/opengl/qopenglframebufferobject_p.h
+++ b/src/gui/opengl/qopenglframebufferobject_p.h
@@ -109,8 +109,8 @@ public:
 class QOpenGLFramebufferObjectPrivate
 {
 public:
-    QOpenGLFramebufferObjectPrivate() : fbo_guard(0), depth_buffer_guard(0)
-                                  , stencil_buffer_guard(0)
+    QOpenGLFramebufferObjectPrivate() : fbo_guard(nullptr), depth_buffer_guard(nullptr)
+                                  , stencil_buffer_guard(nullptr)
                                   , valid(false) {}
     ~QOpenGLFramebufferObjectPrivate() {}
 
@@ -135,9 +135,9 @@ public:
     QOpenGLExtensions funcs;
 
     struct ColorAttachment {
-        ColorAttachment() : internalFormat(0), guard(0) { }
+        ColorAttachment() : internalFormat(0), guard(nullptr) { }
         ColorAttachment(const QSize &size, GLenum internalFormat)
-            : size(size), internalFormat(internalFormat), guard(0) { }
+            : size(size), internalFormat(internalFormat), guard(nullptr) { }
         QSize size;
         GLenum internalFormat;
         QOpenGLSharedResourceGuard *guard;
diff --git a/src/gui/opengl/qopenglfunctions_1_0.cpp b/src/gui/opengl/qopenglfunctions_1_0.cpp
index 4235c9a339..f017c68fd9 100644
--- a/src/gui/opengl/qopenglfunctions_1_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_0.cpp
@@ -76,11 +76,11 @@ QOpenGLFunctions_1_0::~QOpenGLFunctions_1_0()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_1_1.cpp b/src/gui/opengl/qopenglfunctions_1_1.cpp
index 7d09bb40c1..a819d499f8 100644
--- a/src/gui/opengl/qopenglfunctions_1_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_1.cpp
@@ -78,19 +78,19 @@ QOpenGLFunctions_1_1::~QOpenGLFunctions_1_1()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_1_2.cpp b/src/gui/opengl/qopenglfunctions_1_2.cpp
index 94a9d64660..61db2b4e0f 100644
--- a/src/gui/opengl/qopenglfunctions_1_2.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_2.cpp
@@ -80,27 +80,27 @@ QOpenGLFunctions_1_2::~QOpenGLFunctions_1_2()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_1_3.cpp b/src/gui/opengl/qopenglfunctions_1_3.cpp
index 972ef9ff70..acc223ea74 100644
--- a/src/gui/opengl/qopenglfunctions_1_3.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_3.cpp
@@ -82,35 +82,35 @@ QOpenGLFunctions_1_3::~QOpenGLFunctions_1_3()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_1_4.cpp b/src/gui/opengl/qopenglfunctions_1_4.cpp
index 4b78253301..8e2349dc08 100644
--- a/src/gui/opengl/qopenglfunctions_1_4.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_4.cpp
@@ -84,43 +84,43 @@ QOpenGLFunctions_1_4::~QOpenGLFunctions_1_4()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_1_5.cpp b/src/gui/opengl/qopenglfunctions_1_5.cpp
index 2a0820d0cb..cd81cf8b35 100644
--- a/src/gui/opengl/qopenglfunctions_1_5.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_5.cpp
@@ -85,47 +85,47 @@ QOpenGLFunctions_1_5::~QOpenGLFunctions_1_5()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_2_0.cpp b/src/gui/opengl/qopenglfunctions_2_0.cpp
index 212723aa00..97a8c72fa6 100644
--- a/src/gui/opengl/qopenglfunctions_2_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_2_0.cpp
@@ -87,51 +87,51 @@ QOpenGLFunctions_2_0::~QOpenGLFunctions_2_0()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_2_1.cpp b/src/gui/opengl/qopenglfunctions_2_1.cpp
index b8b255014c..00bdc1bbba 100644
--- a/src/gui/opengl/qopenglfunctions_2_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_2_1.cpp
@@ -88,55 +88,55 @@ QOpenGLFunctions_2_1::~QOpenGLFunctions_2_1()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_3_0.cpp b/src/gui/opengl/qopenglfunctions_3_0.cpp
index 4972c03b1e..2c239dba1f 100644
--- a/src/gui/opengl/qopenglfunctions_3_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_0.cpp
@@ -90,59 +90,59 @@ QOpenGLFunctions_3_0::~QOpenGLFunctions_3_0()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_3_1.cpp b/src/gui/opengl/qopenglfunctions_3_1.cpp
index 9328f5ca89..f62f555c8e 100644
--- a/src/gui/opengl/qopenglfunctions_3_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_1.cpp
@@ -84,43 +84,43 @@ QOpenGLFunctions_3_1::~QOpenGLFunctions_3_1()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
index 709f65edf8..ba7be2d893 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
@@ -92,67 +92,67 @@ QOpenGLFunctions_3_2_Compatibility::~QOpenGLFunctions_3_2_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.cpp b/src/gui/opengl/qopenglfunctions_3_2_core.cpp
index 02c0c78b01..4c1e3eb3da 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_2_core.cpp
@@ -85,47 +85,47 @@ QOpenGLFunctions_3_2_Core::~QOpenGLFunctions_3_2_Core()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
index b034391c86..c750c6e0cc 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
@@ -93,75 +93,75 @@ QOpenGLFunctions_3_3_Compatibility::~QOpenGLFunctions_3_3_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
     if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-        Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.cpp b/src/gui/opengl/qopenglfunctions_3_3_core.cpp
index 7779d92b6a..5723509e32 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_3_core.cpp
@@ -86,51 +86,51 @@ QOpenGLFunctions_3_3_Core::~QOpenGLFunctions_3_3_Core()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
index 4fe4526efc..6ae7643eb5 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
@@ -94,79 +94,79 @@ QOpenGLFunctions_4_0_Compatibility::~QOpenGLFunctions_4_0_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
     if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-        Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.cpp b/src/gui/opengl/qopenglfunctions_4_0_core.cpp
index 4e4e8cc547..cd4fdb8b2b 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_0_core.cpp
@@ -87,55 +87,55 @@ QOpenGLFunctions_4_0_Core::~QOpenGLFunctions_4_0_Core()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
index 41ecb4672a..d104c74bc2 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
@@ -95,83 +95,83 @@ QOpenGLFunctions_4_1_Compatibility::~QOpenGLFunctions_4_1_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
     if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-        Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.cpp b/src/gui/opengl/qopenglfunctions_4_1_core.cpp
index 5a1e1eb42f..7527aba620 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_1_core.cpp
@@ -88,59 +88,59 @@ QOpenGLFunctions_4_1_Core::~QOpenGLFunctions_4_1_Core()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
index fcc049c67b..a5b1b37495 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
@@ -96,87 +96,87 @@ QOpenGLFunctions_4_2_Compatibility::~QOpenGLFunctions_4_2_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
     if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-        Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.cpp b/src/gui/opengl/qopenglfunctions_4_2_core.cpp
index fdfb4db455..1381236926 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_2_core.cpp
@@ -89,63 +89,63 @@ QOpenGLFunctions_4_2_Core::~QOpenGLFunctions_4_2_Core()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
index 131ebc810f..5c0c711d1c 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
@@ -97,91 +97,91 @@ QOpenGLFunctions_4_3_Compatibility::~QOpenGLFunctions_4_3_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
     if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-        Q_ASSERT(d_4_3_Core->refs.load());
+        Q_ASSERT(d_4_3_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
     if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-        Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.cpp b/src/gui/opengl/qopenglfunctions_4_3_core.cpp
index 95e2d7bc43..34460b841e 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_3_core.cpp
@@ -90,67 +90,67 @@ QOpenGLFunctions_4_3_Core::~QOpenGLFunctions_4_3_Core()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
     if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-        Q_ASSERT(d_4_3_Core->refs.load());
+        Q_ASSERT(d_4_3_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
index 5c7170b8fa..907994a3c4 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
@@ -97,95 +97,95 @@ QOpenGLFunctions_4_4_Compatibility::~QOpenGLFunctions_4_4_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
     if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-        Q_ASSERT(d_4_3_Core->refs.load());
+        Q_ASSERT(d_4_3_Core->refs.loadRelaxed());
     }
     if (d_4_4_Core) {
         d_4_4_Core->refs.deref();
-        Q_ASSERT(d_4_4_Core->refs.load());
+        Q_ASSERT(d_4_4_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
     if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-        Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_4_core.cpp b/src/gui/opengl/qopenglfunctions_4_4_core.cpp
index 54833f9058..76c0323f6d 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_4_core.cpp
@@ -91,71 +91,71 @@ QOpenGLFunctions_4_4_Core::~QOpenGLFunctions_4_4_Core()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
     if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-        Q_ASSERT(d_4_3_Core->refs.load());
+        Q_ASSERT(d_4_3_Core->refs.loadRelaxed());
     }
     if (d_4_4_Core) {
         d_4_4_Core->refs.deref();
-        Q_ASSERT(d_4_4_Core->refs.load());
+        Q_ASSERT(d_4_4_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
index f9d2bb9ceb..c415bb06ff 100644
--- a/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
@@ -99,103 +99,103 @@ QOpenGLFunctions_4_5_Compatibility::~QOpenGLFunctions_4_5_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
     if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-        Q_ASSERT(d_4_3_Core->refs.load());
+        Q_ASSERT(d_4_3_Core->refs.loadRelaxed());
     }
     if (d_4_4_Core) {
         d_4_4_Core->refs.deref();
-        Q_ASSERT(d_4_4_Core->refs.load());
+        Q_ASSERT(d_4_4_Core->refs.loadRelaxed());
     }
     if (d_4_5_Core) {
         d_4_5_Core->refs.deref();
-        Q_ASSERT(d_4_5_Core->refs.load());
+        Q_ASSERT(d_4_5_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
     if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-        Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.loadRelaxed());
     }
     if (d_4_5_Deprecated) {
         d_4_5_Deprecated->refs.deref();
-        Q_ASSERT(d_4_5_Deprecated->refs.load());
+        Q_ASSERT(d_4_5_Deprecated->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglfunctions_4_5_core.cpp b/src/gui/opengl/qopenglfunctions_4_5_core.cpp
index a47ebb9ee9..4dfac3579c 100644
--- a/src/gui/opengl/qopenglfunctions_4_5_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_5_core.cpp
@@ -92,75 +92,75 @@ QOpenGLFunctions_4_5_Core::~QOpenGLFunctions_4_5_Core()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
     if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-        Q_ASSERT(d_4_3_Core->refs.load());
+        Q_ASSERT(d_4_3_Core->refs.loadRelaxed());
     }
     if (d_4_4_Core) {
         d_4_4_Core->refs.deref();
-        Q_ASSERT(d_4_4_Core->refs.load());
+        Q_ASSERT(d_4_4_Core->refs.loadRelaxed());
     }
     if (d_4_5_Core) {
         d_4_5_Core->refs.deref();
-        Q_ASSERT(d_4_5_Core->refs.load());
+        Q_ASSERT(d_4_5_Core->refs.loadRelaxed());
     }
 }
 
diff --git a/src/gui/opengl/qopenglgradientcache_p.h b/src/gui/opengl/qopenglgradientcache_p.h
index cbdbbb0c54..1d34223bdd 100644
--- a/src/gui/opengl/qopenglgradientcache_p.h
+++ b/src/gui/opengl/qopenglgradientcache_p.h
@@ -66,7 +66,7 @@ class QOpenGL2GradientCache : public QOpenGLSharedResource
     struct CacheInfo
     {
         inline CacheInfo(QGradientStops s, qreal op, QGradient::InterpolationMode mode) :
-            stops(qMove(s)), opacity(op), interpolationMode(mode) {}
+            stops(std::move(s)), opacity(op), interpolationMode(mode) {}
 
         GLuint texId;
         QGradientStops stops;
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
index 042b9ebd79..47394999c6 100644
--- a/src/gui/opengl/qopenglpaintengine.cpp
+++ b/src/gui/opengl/qopenglpaintengine.cpp
@@ -1474,11 +1474,17 @@ void QOpenGL2PaintEngineEx::renderHintsChanged()
 #ifndef QT_OPENGL_ES_2
     if (!QOpenGLContext::currentContext()->isOpenGLES()) {
         Q_D(QOpenGL2PaintEngineEx);
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         if ((state()->renderHints & QPainter::Antialiasing)
-            || (state()->renderHints & QPainter::HighQualityAntialiasing))
+#if QT_DEPRECATED_SINCE(5, 14)
+            || (state()->renderHints & QPainter::HighQualityAntialiasing)
+#endif
+            )
             d->funcs.glEnable(GL_MULTISAMPLE);
         else
             d->funcs.glDisable(GL_MULTISAMPLE);
+QT_WARNING_POP
     }
 #endif // QT_OPENGL_ES_2
 
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
index 15ac240b89..81f17572b2 100644
--- a/src/gui/opengl/qopenglpaintengine_p.h
+++ b/src/gui/opengl/qopenglpaintengine_p.h
@@ -187,9 +187,9 @@ public:
 
     QOpenGL2PaintEngineExPrivate(QOpenGL2PaintEngineEx *q_ptr) :
             q(q_ptr),
-            shaderManager(0),
+            shaderManager(nullptr),
             width(0), height(0),
-            ctx(0),
+            ctx(nullptr),
             useSystemClip(true),
             elementIndicesVBOId(0),
             opacityArray(0),
@@ -361,9 +361,9 @@ void QOpenGL2PaintEngineExPrivate::uploadData(unsigned int arrayIndex, const GLf
             opacityBuffer.allocate(data, count * sizeof(float));
         }
         if (arrayIndex == QT_OPACITY_ATTR)
-            funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, 0);
+            funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
         else
-            funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, 0);
+            funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
     } else {
         // If we already uploaded the data we don't have to do it again
         if (data == vertexAttribPointers[arrayIndex])
diff --git a/src/gui/opengl/qopenglpixeltransferoptions.h b/src/gui/opengl/qopenglpixeltransferoptions.h
index 2fc52b82d8..195543ae90 100644
--- a/src/gui/opengl/qopenglpixeltransferoptions.h
+++ b/src/gui/opengl/qopenglpixeltransferoptions.h
@@ -55,14 +55,12 @@ class Q_GUI_EXPORT QOpenGLPixelTransferOptions
 public:
     QOpenGLPixelTransferOptions();
     QOpenGLPixelTransferOptions(const QOpenGLPixelTransferOptions &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QOpenGLPixelTransferOptions &operator=(QOpenGLPixelTransferOptions &&other) Q_DECL_NOTHROW
+    QOpenGLPixelTransferOptions &operator=(QOpenGLPixelTransferOptions &&other) noexcept
     { swap(other); return *this; }
-#endif
     QOpenGLPixelTransferOptions &operator=(const QOpenGLPixelTransferOptions &);
     ~QOpenGLPixelTransferOptions();
 
-    void swap(QOpenGLPixelTransferOptions &other) Q_DECL_NOTHROW
+    void swap(QOpenGLPixelTransferOptions &other) noexcept
     { data.swap(other.data); }
 
     void setAlignment(int alignment);
diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
index c3fb375a20..72bdacf43f 100644
--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
@@ -44,7 +44,9 @@
 #include <QStandardPaths>
 #include <QDir>
 #include <QSaveFile>
+#include <QCoreApplication>
 #include <QLoggingCategory>
+#include <QCryptographicHash>
 
 #ifdef Q_OS_UNIX
 #include <sys/mman.h>
@@ -53,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_DECLARE_LOGGING_CATEGORY(DBG_SHADER_CACHE)
+Q_LOGGING_CATEGORY(lcOpenGLProgramDiskCache, "qt.opengl.diskcache")
 
 #ifndef GL_CONTEXT_LOST
 #define GL_CONTEXT_LOST                   0x0507
@@ -63,6 +65,10 @@ Q_DECLARE_LOGGING_CATEGORY(DBG_SHADER_CACHE)
 #define GL_PROGRAM_BINARY_LENGTH          0x8741
 #endif
 
+#ifndef GL_NUM_PROGRAM_BINARY_FORMATS
+#define GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
+#endif
+
 const quint32 BINSHADER_MAGIC = 0x5174;
 const quint32 BINSHADER_VERSION = 0x3;
 const quint32 BINSHADER_QTVERSION = QT_VERSION;
@@ -94,6 +100,15 @@ GLEnvInfo::GLEnvInfo()
         glversion = QByteArray(version);
 }
 
+QByteArray QOpenGLProgramBinaryCache::ProgramDesc::cacheKey() const
+{
+    QCryptographicHash keyBuilder(QCryptographicHash::Sha1);
+    for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : shaders)
+        keyBuilder.addData(shader.source);
+
+    return keyBuilder.result().toHex();
+}
+
 static inline bool qt_ensureWritableDir(const QString &name)
 {
     QDir::root().mkpath(name);
@@ -113,7 +128,7 @@ QOpenGLProgramBinaryCache::QOpenGLProgramBinaryCache()
         m_cacheDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + subPath;
         m_cacheWritable = qt_ensureWritableDir(m_cacheDir);
     }
-    qCDebug(DBG_SHADER_CACHE, "Cache location '%s' writable = %d", qPrintable(m_cacheDir), m_cacheWritable);
+    qCDebug(lcOpenGLProgramDiskCache, "Cache location '%s' writable = %d", qPrintable(m_cacheDir), m_cacheWritable);
 }
 
 QString QOpenGLProgramBinaryCache::cacheFileName(const QByteArray &cacheKey) const
@@ -144,24 +159,24 @@ static inline QByteArray readStr(const uchar **p)
 bool QOpenGLProgramBinaryCache::verifyHeader(const QByteArray &buf) const
 {
     if (buf.size() < BASE_HEADER_SIZE) {
-        qCDebug(DBG_SHADER_CACHE, "Cached size too small");
+        qCDebug(lcOpenGLProgramDiskCache, "Cached size too small");
         return false;
     }
     const uchar *p = reinterpret_cast<const uchar *>(buf.constData());
     if (readUInt(&p) != BINSHADER_MAGIC) {
-        qCDebug(DBG_SHADER_CACHE, "Magic does not match");
+        qCDebug(lcOpenGLProgramDiskCache, "Magic does not match");
         return false;
     }
     if (readUInt(&p) != BINSHADER_VERSION) {
-        qCDebug(DBG_SHADER_CACHE, "Version does not match");
+        qCDebug(lcOpenGLProgramDiskCache, "Version does not match");
         return false;
     }
     if (readUInt(&p) != BINSHADER_QTVERSION) {
-        qCDebug(DBG_SHADER_CACHE, "Qt version does not match");
+        qCDebug(lcOpenGLProgramDiskCache, "Qt version does not match");
         return false;
     }
     if (readUInt(&p) != sizeof(quintptr)) {
-        qCDebug(DBG_SHADER_CACHE, "Architecture does not match");
+        qCDebug(lcOpenGLProgramDiskCache, "Architecture does not match");
         return false;
     }
     return true;
@@ -186,7 +201,7 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat
 
     GLenum err = funcs->glGetError();
     if (err != GL_NO_ERROR) {
-        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
+        qCDebug(lcOpenGLProgramDiskCache, "Program binary failed to load for program %u, size %d, "
                                   "format 0x%x, err = 0x%x",
                 programId, blobSize, blobFormat, err);
         return false;
@@ -194,13 +209,13 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat
     GLint linkStatus = 0;
     funcs->glGetProgramiv(programId, GL_LINK_STATUS, &linkStatus);
     if (linkStatus != GL_TRUE) {
-        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
+        qCDebug(lcOpenGLProgramDiskCache, "Program binary failed to load for program %u, size %d, "
                                   "format 0x%x, linkStatus = 0x%x, err = 0x%x",
                 programId, blobSize, blobFormat, linkStatus, err);
         return false;
     }
 
-    qCDebug(DBG_SHADER_CACHE, "Program binary set for program %u, size %d, format 0x%x, err = 0x%x",
+    qCDebug(lcOpenGLProgramDiskCache, "Program binary set for program %u, size %d, format 0x%x, err = 0x%x",
             programId, blobSize, blobFormat, err);
     return true;
 }
@@ -308,19 +323,19 @@ bool QOpenGLProgramBinaryCache::load(const QByteArray &cacheKey, uint programId)
     if (vendor != info.glvendor) {
         // readStr returns non-null terminated strings just pointing to inside
         // 'p' so must print these via the stream qCDebug and not constData().
-        qCDebug(DBG_SHADER_CACHE) << "GL_VENDOR does not match" << vendor << info.glvendor;
+        qCDebug(lcOpenGLProgramDiskCache) << "GL_VENDOR does not match" << vendor << info.glvendor;
         undertaker.setActive();
         return false;
     }
     QByteArray renderer = readStr(&p);
     if (renderer != info.glrenderer) {
-        qCDebug(DBG_SHADER_CACHE) << "GL_RENDERER does not match" << renderer << info.glrenderer;
+        qCDebug(lcOpenGLProgramDiskCache) << "GL_RENDERER does not match" << renderer << info.glrenderer;
         undertaker.setActive();
         return false;
     }
     QByteArray version = readStr(&p);
     if (version != info.glversion) {
-        qCDebug(DBG_SHADER_CACHE) <<  "GL_VERSION does not match" << version << info.glversion;
+        qCDebug(lcOpenGLProgramDiskCache) <<  "GL_VERSION does not match" << version << info.glversion;
         undertaker.setActive();
         return false;
     }
@@ -373,7 +388,7 @@ void QOpenGLProgramBinaryCache::save(const QByteArray &cacheKey, uint programId)
 
     const int totalSize = headerSize + paddingSize + blobSize;
 
-    qCDebug(DBG_SHADER_CACHE, "Program binary is %d bytes, err = 0x%x, total %d", blobSize, funcs->glGetError(), totalSize);
+    qCDebug(lcOpenGLProgramDiskCache, "Program binary is %d bytes, err = 0x%x, total %d", blobSize, funcs->glGetError(), totalSize);
     if (!blobSize)
         return;
 
@@ -407,19 +422,25 @@ void QOpenGLProgramBinaryCache::save(const QByteArray &cacheKey, uint programId)
 #endif
     funcs->glGetProgramBinary(programId, blobSize, &outSize, &blobFormat, p);
     if (blobSize != outSize) {
-        qCDebug(DBG_SHADER_CACHE, "glGetProgramBinary returned size %d instead of %d", outSize, blobSize);
+        qCDebug(lcOpenGLProgramDiskCache, "glGetProgramBinary returned size %d instead of %d", outSize, blobSize);
         return;
     }
 
     writeUInt(&blobFormatPtr, blobFormat);
 
+#if QT_CONFIG(temporaryfile)
     QSaveFile f(cacheFileName(cacheKey));
     if (f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
         f.write(blob);
         if (!f.commit())
-            qCDebug(DBG_SHADER_CACHE, "Failed to write %s to shader cache", qPrintable(f.fileName()));
+#else
+    QFile f(cacheFileName(cacheKey));
+    if (f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+        if (f.write(blob) < blob.length())
+#endif
+            qCDebug(lcOpenGLProgramDiskCache, "Failed to write %s to shader cache", qPrintable(f.fileName()));
     } else {
-        qCDebug(DBG_SHADER_CACHE, "Failed to create %s in shader cache", qPrintable(f.fileName()));
+        qCDebug(lcOpenGLProgramDiskCache, "Failed to create %s in shader cache", qPrintable(f.fileName()));
     }
 }
 
@@ -436,4 +457,45 @@ void QOpenGLProgramBinaryCache::initializeProgramBinaryOES(QOpenGLContext *conte
 }
 #endif
 
+QOpenGLProgramBinarySupportCheck::QOpenGLProgramBinarySupportCheck(QOpenGLContext *context)
+    : QOpenGLSharedResource(context->shareGroup()),
+      m_supported(false)
+{
+    if (QCoreApplication::testAttribute(Qt::AA_DisableShaderDiskCache)) {
+        qCDebug(lcOpenGLProgramDiskCache, "Shader cache disabled via app attribute");
+        return;
+    }
+    if (qEnvironmentVariableIntValue("QT_DISABLE_SHADER_DISK_CACHE")) {
+        qCDebug(lcOpenGLProgramDiskCache, "Shader cache disabled via env var");
+        return;
+    }
+
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (ctx) {
+        if (ctx->isOpenGLES()) {
+            qCDebug(lcOpenGLProgramDiskCache, "OpenGL ES v%d context", ctx->format().majorVersion());
+            if (ctx->format().majorVersion() >= 3) {
+                m_supported = true;
+            } else {
+                const bool hasExt = ctx->hasExtension("GL_OES_get_program_binary");
+                qCDebug(lcOpenGLProgramDiskCache, "GL_OES_get_program_binary support = %d", hasExt);
+                if (hasExt)
+                    m_supported = true;
+            }
+        } else {
+            const bool hasExt = ctx->hasExtension("GL_ARB_get_program_binary");
+            qCDebug(lcOpenGLProgramDiskCache, "GL_ARB_get_program_binary support = %d", hasExt);
+            if (hasExt)
+                m_supported = true;
+        }
+        if (m_supported) {
+            GLint fmtCount = 0;
+            ctx->functions()->glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &fmtCount);
+            qCDebug(lcOpenGLProgramDiskCache, "Supported binary format count = %d", fmtCount);
+            m_supported = fmtCount > 0;
+        }
+    }
+    qCDebug(lcOpenGLProgramDiskCache, "Shader cache supported = %d", m_supported);
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglprogrambinarycache_p.h b/src/gui/opengl/qopenglprogrambinarycache_p.h
index e181a6ab81..f1cf24cd87 100644
--- a/src/gui/opengl/qopenglprogrambinarycache_p.h
+++ b/src/gui/opengl/qopenglprogrambinarycache_p.h
@@ -52,25 +52,31 @@
 //
 
 #include <QtGui/qtguiglobal.h>
-#include <QtGui/qopenglshaderprogram.h>
 #include <QtCore/qcache.h>
 #include <QtCore/qmutex.h>
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtGui/private/qshader_p.h>
 
 QT_BEGIN_NAMESPACE
 
+// These classes are also used by the OpenGL backend of QRhi. They must
+// therefore stay independent from QOpenGLShader(Program). Must rely only on
+// QOpenGLContext/Functions.
+
 class QOpenGLProgramBinaryCache
 {
 public:
     struct ShaderDesc {
         ShaderDesc() { }
-        ShaderDesc(QOpenGLShader::ShaderType type, const QByteArray &source = QByteArray())
-          : type(type), source(source)
+        ShaderDesc(QShader::Stage stage, const QByteArray &source = QByteArray())
+          : stage(stage), source(source)
         { }
-        QOpenGLShader::ShaderType type;
+        QShader::Stage stage;
         QByteArray source;
     };
     struct ProgramDesc {
         QVector<ShaderDesc> shaders;
+        QByteArray cacheKey() const;
     };
 
     QOpenGLProgramBinaryCache();
@@ -103,6 +109,36 @@ private:
     QMutex m_mutex;
 };
 
+// While unlikely, one application can in theory use contexts with different versions
+// or profiles. Therefore any version- or extension-specific checks must be done on a
+// per-context basis, not just once per process. QOpenGLSharedResource enables this,
+// although it's once-per-sharing-context-group, not per-context. Still, this should
+// be good enough in practice.
+class QOpenGLProgramBinarySupportCheck : public QOpenGLSharedResource
+{
+public:
+    QOpenGLProgramBinarySupportCheck(QOpenGLContext *context);
+    void invalidateResource() override { }
+    void freeResource(QOpenGLContext *) override { }
+
+    bool isSupported() const { return m_supported; }
+
+private:
+    bool m_supported;
+};
+
+class QOpenGLProgramBinarySupportCheckWrapper
+{
+public:
+    QOpenGLProgramBinarySupportCheck *get(QOpenGLContext *context)
+    {
+        return m_resource.value<QOpenGLProgramBinarySupportCheck>(context);
+    }
+
+private:
+    QOpenGLMultiGroupSharedResource m_resource;
+};
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/gui/opengl/qopenglqueryhelper_p.h b/src/gui/opengl/qopenglqueryhelper_p.h
index 60dbf9c743..ad91ca9f96 100644
--- a/src/gui/opengl/qopenglqueryhelper_p.h
+++ b/src/gui/opengl/qopenglqueryhelper_p.h
@@ -65,18 +65,18 @@ class QOpenGLQueryHelper
 {
 public:
     QOpenGLQueryHelper(QOpenGLContext *context)
-        : GetQueryObjectuiv(0),
-          GetQueryObjectiv(0),
-          GetQueryiv(0),
-          EndQuery(0),
-          BeginQuery(0),
-          IsQuery(0),
-          DeleteQueries(0),
-          GenQueries(0),
-          GetInteger64v(0),
-          GetQueryObjectui64v(0),
-          GetQueryObjecti64v(0),
-          QueryCounter(0)
+        : GetQueryObjectuiv(nullptr),
+          GetQueryObjectiv(nullptr),
+          GetQueryiv(nullptr),
+          EndQuery(nullptr),
+          BeginQuery(nullptr),
+          IsQuery(nullptr),
+          DeleteQueries(nullptr),
+          GenQueries(nullptr),
+          GetInteger64v(nullptr),
+          GetQueryObjectui64v(nullptr),
+          GetQueryObjecti64v(nullptr),
+          QueryCounter(nullptr)
     {
         Q_ASSERT(context);
 
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
index 3c7bd4f90d..4986ca573d 100644
--- a/src/gui/opengl/qopenglshaderprogram.cpp
+++ b/src/gui/opengl/qopenglshaderprogram.cpp
@@ -47,8 +47,6 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qvector.h>
 #include <QtCore/qloggingcategory.h>
-#include <QtCore/qcryptographichash.h>
-#include <QtCore/qcoreapplication.h>
 #include <QtGui/qtransform.h>
 #include <QtGui/QColor>
 #include <QtGui/QSurfaceFormat>
@@ -179,7 +177,7 @@ QT_BEGIN_NAMESPACE
            (requires OpenGL >= 4.3 or OpenGL ES >= 3.1).
 */
 
-Q_LOGGING_CATEGORY(DBG_SHADER_CACHE, "qt.opengl.diskcache")
+Q_DECLARE_LOGGING_CATEGORY(lcOpenGLProgramDiskCache)
 
 // For GLES 3.1/3.2
 #ifndef GL_GEOMETRY_SHADER
@@ -210,10 +208,6 @@ Q_LOGGING_CATEGORY(DBG_SHADER_CACHE, "qt.opengl.diskcache")
 #define GL_PATCH_DEFAULT_INNER_LEVEL  0x8E73
 #endif
 
-#ifndef GL_NUM_PROGRAM_BINARY_FORMATS
-#define GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
-#endif
-
 #ifndef QT_OPENGL_ES_2
 static inline bool isFormatGLES(const QSurfaceFormat &f)
 {
@@ -1081,6 +1075,44 @@ bool QOpenGLShaderProgram::addCacheableShaderFromSourceCode(QOpenGLShader::Shade
     return addCacheableShaderFromSourceCode(type, QByteArray(source));
 }
 
+static inline QShader::Stage qt_shaderTypeToStage(QOpenGLShader::ShaderType type)
+{
+    switch (type) {
+    case QOpenGLShader::Vertex:
+        return QShader::VertexStage;
+    case QOpenGLShader::Fragment:
+        return QShader::FragmentStage;
+    case QOpenGLShader::Geometry:
+        return QShader::GeometryStage;
+    case QOpenGLShader::TessellationControl:
+        return QShader::TessellationControlStage;
+    case QOpenGLShader::TessellationEvaluation:
+        return QShader::TessellationEvaluationStage;
+    case QOpenGLShader::Compute:
+        return QShader::ComputeStage;
+    }
+    return QShader::VertexStage;
+}
+
+static inline QOpenGLShader::ShaderType qt_shaderStageToType(QShader::Stage stage)
+{
+    switch (stage) {
+    case QShader::VertexStage:
+        return QOpenGLShader::Vertex;
+    case QShader::TessellationControlStage:
+        return QOpenGLShader::TessellationControl;
+    case QShader::TessellationEvaluationStage:
+        return QOpenGLShader::TessellationEvaluation;
+    case QShader::GeometryStage:
+        return QOpenGLShader::Geometry;
+    case QShader::FragmentStage:
+        return QOpenGLShader::Fragment;
+    case QShader::ComputeStage:
+        return QOpenGLShader::Compute;
+    }
+    return QOpenGLShader::Vertex;
+}
+
 /*!
     \overload
 
@@ -1109,7 +1141,7 @@ bool QOpenGLShaderProgram::addCacheableShaderFromSourceCode(QOpenGLShader::Shade
     if (d->isCacheDisabled())
         return addShaderFromSourceCode(type, source);
 
-    d->binaryProgram.shaders.append(QOpenGLProgramBinaryCache::ShaderDesc(type, source));
+    d->binaryProgram.shaders.append(QOpenGLProgramBinaryCache::ShaderDesc(qt_shaderTypeToStage(type), source));
     return true;
 }
 
@@ -1166,7 +1198,7 @@ bool QOpenGLShaderProgram::addCacheableShaderFromSourceFile(QOpenGLShader::Shade
     if (d->isCacheDisabled())
         return addShaderFromSourceFile(type, fileName);
 
-    QOpenGLProgramBinaryCache::ShaderDesc shader(type);
+    QOpenGLProgramBinaryCache::ShaderDesc shader(qt_shaderTypeToStage(type));
     // NB! It could be tempting to defer reading the file contents and just
     // hash the filename as the cache key, perhaps combined with last-modified
     // timestamp checks. However, this would raise a number of issues (no
@@ -3720,77 +3752,6 @@ bool QOpenGLShader::hasOpenGLShaders(ShaderType type, QOpenGLContext *context)
     return true;
 }
 
-// While unlikely, one application can in theory use contexts with different versions
-// or profiles. Therefore any version- or extension-specific checks must be done on a
-// per-context basis, not just once per process. QOpenGLSharedResource enables this,
-// although it's once-per-sharing-context-group, not per-context. Still, this should
-// be good enough in practice.
-class QOpenGLProgramBinarySupportCheck : public QOpenGLSharedResource
-{
-public:
-    QOpenGLProgramBinarySupportCheck(QOpenGLContext *context);
-    void invalidateResource() override { }
-    void freeResource(QOpenGLContext *) override { }
-
-    bool isSupported() const { return m_supported; }
-
-private:
-    bool m_supported;
-};
-
-QOpenGLProgramBinarySupportCheck::QOpenGLProgramBinarySupportCheck(QOpenGLContext *context)
-    : QOpenGLSharedResource(context->shareGroup()),
-      m_supported(false)
-{
-    if (QCoreApplication::testAttribute(Qt::AA_DisableShaderDiskCache)) {
-        qCDebug(DBG_SHADER_CACHE, "Shader cache disabled via app attribute");
-        return;
-    }
-    if (qEnvironmentVariableIntValue("QT_DISABLE_SHADER_DISK_CACHE")) {
-        qCDebug(DBG_SHADER_CACHE, "Shader cache disabled via env var");
-        return;
-    }
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx) {
-        if (ctx->isOpenGLES()) {
-            qCDebug(DBG_SHADER_CACHE, "OpenGL ES v%d context", ctx->format().majorVersion());
-            if (ctx->format().majorVersion() >= 3) {
-                m_supported = true;
-            } else {
-                const bool hasExt = ctx->hasExtension("GL_OES_get_program_binary");
-                qCDebug(DBG_SHADER_CACHE, "GL_OES_get_program_binary support = %d", hasExt);
-                if (hasExt)
-                    m_supported = true;
-            }
-        } else {
-            const bool hasExt = ctx->hasExtension("GL_ARB_get_program_binary");
-            qCDebug(DBG_SHADER_CACHE, "GL_ARB_get_program_binary support = %d", hasExt);
-            if (hasExt)
-                m_supported = true;
-        }
-        if (m_supported) {
-            GLint fmtCount = 0;
-            ctx->functions()->glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &fmtCount);
-            qCDebug(DBG_SHADER_CACHE, "Supported binary format count = %d", fmtCount);
-            m_supported = fmtCount > 0;
-        }
-    }
-    qCDebug(DBG_SHADER_CACHE, "Shader cache supported = %d", m_supported);
-}
-
-class QOpenGLProgramBinarySupportCheckWrapper
-{
-public:
-    QOpenGLProgramBinarySupportCheck *get(QOpenGLContext *context)
-    {
-        return m_resource.value<QOpenGLProgramBinarySupportCheck>(context);
-    }
-
-private:
-    QOpenGLMultiGroupSharedResource m_resource;
-};
-
 bool QOpenGLShaderProgramPrivate::isCacheDisabled() const
 {
     static QOpenGLProgramBinarySupportCheckWrapper binSupportCheck;
@@ -3801,7 +3762,7 @@ bool QOpenGLShaderProgramPrivate::compileCacheable()
 {
     Q_Q(QOpenGLShaderProgram);
     for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : qAsConst(binaryProgram.shaders)) {
-        QScopedPointer<QOpenGLShader> s(new QOpenGLShader(shader.type, q));
+        QScopedPointer<QOpenGLShader> s(new QOpenGLShader(qt_shaderStageToType(shader.stage), q));
         if (!s->compileSourceCode(shader.source)) {
             log = s->log();
             return false;
@@ -3819,24 +3780,20 @@ bool QOpenGLShaderProgramPrivate::linkBinary()
 
     Q_Q(QOpenGLShaderProgram);
 
-    QCryptographicHash keyBuilder(QCryptographicHash::Sha1);
-    for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : qAsConst(binaryProgram.shaders))
-        keyBuilder.addData(shader.source);
-
-    const QByteArray cacheKey = keyBuilder.result().toHex();
-    if (DBG_SHADER_CACHE().isEnabled(QtDebugMsg))
-        qCDebug(DBG_SHADER_CACHE, "program with %d shaders, cache key %s",
+    const QByteArray cacheKey = binaryProgram.cacheKey();
+    if (lcOpenGLProgramDiskCache().isEnabled(QtDebugMsg))
+        qCDebug(lcOpenGLProgramDiskCache, "program with %d shaders, cache key %s",
                 binaryProgram.shaders.count(), cacheKey.constData());
 
     bool needsCompile = true;
     if (binCache.load(cacheKey, q->programId())) {
-        qCDebug(DBG_SHADER_CACHE, "Program binary received from cache");
+        qCDebug(lcOpenGLProgramDiskCache, "Program binary received from cache");
         needsCompile = false;
     }
 
     bool needsSave = false;
     if (needsCompile) {
-        qCDebug(DBG_SHADER_CACHE, "Program binary not in cache, compiling");
+        qCDebug(lcOpenGLProgramDiskCache, "Program binary not in cache, compiling");
         if (compileCacheable())
             needsSave = true;
         else
diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp
index e04a00e592..61a6202017 100644
--- a/src/gui/opengl/qopengltexture.cpp
+++ b/src/gui/opengl/qopengltexture.cpp
@@ -1467,6 +1467,122 @@ void QOpenGLTexturePrivate::setData(int mipLevel, int layer, int layerCount, QOp
     }
 }
 
+void QOpenGLTexturePrivate::setData(int xOffset, int yOffset, int zOffset, int width, int height, int depth,
+                                    int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
+                                    QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
+                                    const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        Q_UNUSED(yOffset);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(height);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage1D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, width,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target1DArray:
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(yOffset);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(height);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, layer,
+                                      width,
+                                      layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2D:
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, yOffset,
+                                      width, height,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2DArray:
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, yOffset, layer,
+                                      width, height, layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target3D:
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, yOffset, zOffset,
+                                      width, height, depth,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::TargetCubeMap:
+        Q_UNUSED(layer);
+        Q_UNUSED(layerCount);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage2D(textureId, cubeFace, bindingTarget, mipLevel,
+                                      xOffset, yOffset,
+                                      width, height,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::TargetCubeMapArray: {
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        int faceIndex = cubeFace - QOpenGLTexture::CubeMapPositiveX;
+        int layerFace = 6 * layer + faceIndex;
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, yOffset, layerFace,
+                                      width, height,
+                                      layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+    }
+
+    case QOpenGLTexture::TargetRectangle:
+        Q_UNUSED(mipLevel);
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, 0,
+                                      xOffset, yOffset,
+                                      width, height,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+    case QOpenGLTexture::TargetBuffer:
+        // We don't upload pixel data for these targets
+        qWarning("QOpenGLTexture::setData(): Texture target does not support pixel data upload");
+        break;
+    }
+
+    // If requested perform automatic mip map generation
+    if (mipLevel == 0 && autoGenerateMipMaps && mipLevels > 1) {
+        Q_Q(QOpenGLTexture);
+        q->generateMipMaps();
+    }
+}
+
+
 void QOpenGLTexturePrivate::setCompressedData(int mipLevel, int layer, int layerCount,
                                               QOpenGLTexture::CubeMapFace cubeFace,
                                               int dataSize, const void *data,
@@ -3380,6 +3496,153 @@ void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType,
     d->setData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
 }
 
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               0, 0, 1,
+               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
+               sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image. The mip map level the sub image we want to
+    update is specified with \a mipLevel.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             int mipLevel,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               mipLevel, 0, 1,
+               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
+               sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image. The mip map level and layerof the sub image we want to
+    update are specified with \a mipLevel and \a layer.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             int mipLevel, int layer,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               mipLevel, layer, 1,
+               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
+               sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image.The mip map level, layer and cube map face of the sub
+    image we want to update are specified with \a mipLevel, \a layer and \a
+    face.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             int mipLevel, int layer,
+                             CubeMapFace face,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               mipLevel, layer, 1,
+               face, sourceFormat,
+               sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image.The mip map level, starting layer, cube map face and
+    number of layers of the sub image we want to update are specified with \a
+    mipLevel, \a layer, \a face and \a layerCount.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             int mipLevel, int layer,
+                             CubeMapFace face, int layerCount,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               mipLevel, layer, layerCount,
+               face, sourceFormat,
+               sourceType, data, options);
+}
+
 #if QT_DEPRECATED_SINCE(5, 3)
 /*!
     \obsolete
diff --git a/src/gui/opengl/qopengltexture.h b/src/gui/opengl/qopengltexture.h
index c0c5283374..7d984babc8 100644
--- a/src/gui/opengl/qopengltexture.h
+++ b/src/gui/opengl/qopengltexture.h
@@ -485,6 +485,32 @@ public:
     void setData(PixelFormat sourceFormat, PixelType sourceType,
                  const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
 
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth, int mipLevel,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth,
+                 int mipLevel, int layer,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth,
+                 int mipLevel, int layer,
+                 CubeMapFace cubeFace,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth,
+                 int mipLevel, int layer,
+                 CubeMapFace cubeFace, int layerCount,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+
     // Compressed data upload
     // ### Qt 6: remove the non-const void * overloads
 #if QT_DEPRECATED_SINCE(5, 3)
diff --git a/src/gui/opengl/qopengltexture_p.h b/src/gui/opengl/qopengltexture_p.h
index f7694f77bc..9f3457ad0a 100644
--- a/src/gui/opengl/qopengltexture_p.h
+++ b/src/gui/opengl/qopengltexture_p.h
@@ -101,6 +101,10 @@ public:
     void setData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
                  QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
                  const void *data, const QOpenGLPixelTransferOptions * const options);
+    void setData(int xOffset, int yOffset, int zOffset, int width, int height, int depth,
+                 int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
+                 QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options);
     void setCompressedData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
                            int dataSize, const void *data,
                            const QOpenGLPixelTransferOptions * const options);
diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h
index 38c9aede7d..4bea4a463a 100644
--- a/src/gui/opengl/qopengltextureglyphcache_p.h
+++ b/src/gui/opengl/qopengltextureglyphcache_p.h
@@ -139,7 +139,7 @@ public:
 
     inline void setPaintEnginePrivate(QOpenGL2PaintEngineExPrivate *p) { pex = p; }
 
-    inline const QOpenGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : 0; }
+    inline const QOpenGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : nullptr; }
 
     inline int serialNumber() const { return m_serialNumber; }
 
diff --git a/src/gui/opengl/qopengltexturehelper_p.h b/src/gui/opengl/qopengltexturehelper_p.h
index 00f6f9e5aa..62d0125daf 100644
--- a/src/gui/opengl/qopengltexturehelper_p.h
+++ b/src/gui/opengl/qopengltexturehelper_p.h
@@ -167,7 +167,7 @@ public:
 
     inline void glTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                                     GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
-                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = 0)
+                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
     {
         if (options) {
             QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
@@ -181,7 +181,7 @@ public:
 
     inline void glTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset,
                                     GLsizei width, GLsizei height, GLenum format, GLenum type,
-                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = 0)
+                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
     {
         if (options) {
             QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
@@ -195,7 +195,7 @@ public:
 
     inline void glTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset,
                                     GLsizei width, GLenum format, GLenum type,
-                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = 0)
+                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
     {
         if (options) {
             QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
@@ -222,7 +222,7 @@ public:
     inline void glCompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
                                               GLint xoffset, GLsizei width,
                                               GLenum format, GLsizei imageSize, const GLvoid *bits,
-                                              const QOpenGLPixelTransferOptions * const options = 0)
+                                              const QOpenGLPixelTransferOptions * const options = nullptr)
     {
         if (options) {
             QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
@@ -238,7 +238,7 @@ public:
                                               GLint xoffset, GLint yoffset,
                                               GLsizei width, GLsizei height,
                                               GLenum format, GLsizei imageSize, const GLvoid *bits,
-                                              const QOpenGLPixelTransferOptions * const options = 0)
+                                              const QOpenGLPixelTransferOptions * const options = nullptr)
     {
         if (options) {
             QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
@@ -254,7 +254,7 @@ public:
                                               GLint xoffset, GLint yoffset, GLint zoffset,
                                               GLsizei width, GLsizei height, GLsizei depth,
                                               GLenum format, GLsizei imageSize, const GLvoid *bits,
-                                              const QOpenGLPixelTransferOptions * const options = 0)
+                                              const QOpenGLPixelTransferOptions * const options = nullptr)
     {
         if (options) {
             QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
@@ -269,7 +269,7 @@ public:
     inline void glCompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
                                            GLenum internalFormat, GLsizei width,
                                            GLint border, GLsizei imageSize, const GLvoid *bits,
-                                           const QOpenGLPixelTransferOptions * const options = 0)
+                                           const QOpenGLPixelTransferOptions * const options = nullptr)
     {
         if (options) {
             QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
@@ -284,7 +284,7 @@ public:
     inline void glCompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
                                            GLenum internalFormat, GLsizei width, GLsizei height,
                                            GLint border, GLsizei imageSize, const GLvoid *bits,
-                                           const QOpenGLPixelTransferOptions * const options = 0)
+                                           const QOpenGLPixelTransferOptions * const options = nullptr)
 
     {
         if (options) {
@@ -300,7 +300,7 @@ public:
     inline void glCompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
                                            GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth,
                                            GLint border, GLsizei imageSize, const GLvoid *bits,
-                                           const QOpenGLPixelTransferOptions * const options = 0)
+                                           const QOpenGLPixelTransferOptions * const options = nullptr)
     {
         if (options) {
             QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
diff --git a/src/gui/opengl/qopengltextureuploader.cpp b/src/gui/opengl/qopengltextureuploader.cpp
index d9d5403cf3..9e393bc47a 100644
--- a/src/gui/opengl/qopengltextureuploader.cpp
+++ b/src/gui/opengl/qopengltextureuploader.cpp
@@ -65,6 +65,10 @@
 #define GL_RGBA16                         0x805B
 #endif
 
+#ifndef GL_BGR
+#define GL_BGR 0x80E0
+#endif
+
 #ifndef GL_BGRA
 #define GL_BGRA 0x80E1
 #endif
@@ -202,6 +206,20 @@ qsizetype QOpenGLTextureUploader::textureImage(GLenum target, const QImage &imag
         pixelType = GL_UNSIGNED_BYTE;
         targetFormat = QImage::Format_RGB888;
         break;
+    case QImage::Format_BGR888:
+        if (isOpenGL12orBetter) {
+            externalFormat = GL_BGR;
+            internalFormat = GL_RGB;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = QImage::Format_BGR888;
+        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_RED);
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
+            externalFormat = internalFormat = GL_RGB;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = QImage::Format_BGR888;
+        }
+        break;
     case QImage::Format_RGBX8888:
     case QImage::Format_RGBA8888:
     case QImage::Format_RGBA8888_Premultiplied:
diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h
index 99c8565fbc..4835ea4871 100644
--- a/src/gui/opengl/qopenglversionfunctions.h
+++ b/src/gui/opengl/qopenglversionfunctions.h
@@ -103,7 +103,7 @@ struct QOpenGLVersionStatus
     OpenGLStatus status;
 };
 
-inline uint qHash(const QOpenGLVersionStatus &v, uint seed = 0) Q_DECL_NOTHROW
+inline uint qHash(const QOpenGLVersionStatus &v, uint seed = 0) noexcept
 {
     return qHash(static_cast<int>(v.status * 1000)
                + v.version.first * 100 + v.version.second * 10, seed);
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index a90abed4c0..fcf6488edd 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -8,7 +8,15 @@ HEADERS += \
         painting/qbrush.h \
         painting/qcolor.h \
         painting/qcolor_p.h \
-        painting/qcolorprofile_p.h \
+        painting/qcolormatrix_p.h \
+        painting/qcolorspace.h \
+        painting/qcolorspace_p.h \
+        painting/qcolortransferfunction_p.h \
+        painting/qcolortransfertable_p.h \
+        painting/qcolortransform.h \
+        painting/qcolortransform_p.h \
+        painting/qcolortrc_p.h \
+        painting/qcolortrclut_p.h \
         painting/qcosmeticstroker_p.h \
         painting/qdatabuffer_p.h \
         painting/qdrawhelper_p.h \
@@ -17,6 +25,7 @@ HEADERS += \
         painting/qemulationpaintengine_p.h \
         painting/qfixed_p.h \
         painting/qgrayraster_p.h \
+        painting/qicc_p.h \
         painting/qmatrix.h \
         painting/qmemrotate_p.h \
         painting/qoutlinemapper_p.h \
@@ -64,12 +73,15 @@ SOURCES += \
         painting/qblittable.cpp \
         painting/qbrush.cpp \
         painting/qcolor.cpp \
-        painting/qcolorprofile.cpp \
+        painting/qcolorspace.cpp \
+        painting/qcolortransform.cpp \
+        painting/qcolortrclut.cpp \
         painting/qcompositionfunctions.cpp \
         painting/qcosmeticstroker.cpp \
         painting/qdrawhelper.cpp \
         painting/qemulationpaintengine.cpp \
         painting/qgrayraster.c \
+        painting/qicc.cpp \
         painting/qimagescale.cpp \
         painting/qmatrix.cpp \
         painting/qmemrotate.cpp \
@@ -123,23 +135,41 @@ gcc:equals(QT_GCC_MAJOR_VERSION, 5) {
     NO_PCH_SOURCES += painting/qdrawhelper.cpp
 }
 
-SSE2_SOURCES += painting/qdrawhelper_sse2.cpp
-SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp
-SSE4_1_SOURCES += painting/qdrawhelper_sse4.cpp \
-                  painting/qimagescale_sse4.cpp
-ARCH_HASWELL_SOURCES += painting/qdrawhelper_avx2.cpp
+!android {
+    SSE2_SOURCES += painting/qdrawhelper_sse2.cpp
+    SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp
+    SSE4_1_SOURCES += painting/qdrawhelper_sse4.cpp \
+                      painting/qimagescale_sse4.cpp
+    ARCH_HASWELL_SOURCES += painting/qdrawhelper_avx2.cpp
 
-NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp
-NEON_HEADERS += painting/qdrawhelper_neon_p.h
+    NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp
+    NEON_HEADERS += painting/qdrawhelper_neon_p.h
+}
 !uikit:!win32:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as
-!uikit:!win32:!integrity:!contains(QT_ARCH, "arm64") {
+!android:!uikit:!win32:!integrity:!contains(QT_ARCH, "arm64") {
     NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S
     DEFINES += ENABLE_PIXMAN_DRAWHELPERS
 }
 
-MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp
-MIPS_DSP_HEADERS += painting/qdrawhelper_mips_dsp_p.h painting/qt_mips_asm_dsp_p.h
-MIPS_DSP_ASM += painting/qdrawhelper_mips_dsp_asm.S
-MIPS_DSPR2_ASM += painting/qdrawhelper_mips_dspr2_asm.S
+!android {
+    MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp
+    MIPS_DSP_HEADERS += painting/qdrawhelper_mips_dsp_p.h painting/qt_mips_asm_dsp_p.h
+    MIPS_DSP_ASM += painting/qdrawhelper_mips_dsp_asm.S
+    MIPS_DSPR2_ASM += painting/qdrawhelper_mips_dspr2_asm.S
+} else {
+    # see https://developer.android.com/ndk/guides/abis
+    x86 | x86_64 {
+        DEFINES += QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSSE3
+        SOURCES += painting/qdrawhelper_sse2.cpp painting/qdrawhelper_ssse3.cpp
+    }
+    x86_64 {
+        DEFINES += QT_COMPILER_SUPPORTS_SSE4_1 QT_COMPILER_SUPPORTS_SSE4_2
+        SOURCES += painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp
+    }
+    arm64-v8a {
+        SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp
+        HEADERS += painting/qdrawhelper_neon_p.h
+    }
+}
 
 include($$PWD/../../3rdparty/zlib_dependency.pri)
diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index 65e6063fe4..7622262da9 100644
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -47,6 +47,8 @@
 
 #include <private/qnumeric_p.h>
 
+#include <tuple> // for std::tie()
+
 QT_BEGIN_NAMESPACE
 
 //#define QDEBUG_BEZIER
@@ -54,24 +56,6 @@ QT_BEGIN_NAMESPACE
 /*!
   \internal
 */
-QBezier QBezier::fromPoints(const QPointF &p1, const QPointF &p2,
-                            const QPointF &p3, const QPointF &p4)
-{
-    QBezier b;
-    b.x1 = p1.x();
-    b.y1 = p1.y();
-    b.x2 = p2.x();
-    b.y2 = p2.y();
-    b.x3 = p3.x();
-    b.y3 = p3.y();
-    b.x4 = p4.x();
-    b.y4 = p4.y();
-    return b;
-}
-
-/*!
-  \internal
-*/
 QPolygonF QBezier::toPolygon(qreal bezier_flattening_threshold) const
 {
     // flattening is done by splitting the bezier until we can replace the segment by a straight
@@ -145,7 +129,7 @@ void QBezier::addToPolygon(QPolygonF *polygon, qreal bezier_flattening_threshold
             --top;
         } else {
             // split, second half of the polygon goes lower into the stack
-            b->split(b+1, b);
+            std::tie(b[1], b[0]) = b->split();
             levels[top + 1] = --levels[top];
             ++top;
         }
@@ -181,7 +165,7 @@ void QBezier::addToPolygon(QDataBuffer<QPointF> &polygon, qreal bezier_flattenin
             --top;
         } else {
             // split, second half of the polygon goes lower into the stack
-            b->split(b+1, b);
+            std::tie(b[1], b[0]) = b->split();
             levels[top + 1] = --levels[top];
             ++top;
         }
@@ -436,7 +420,7 @@ redo:
                 o += 2;
             --b;
         } else {
-            b->split(b+1, b);
+            std::tie(b[1], b[0]) = b->split();
             ++b;
         }
     }
@@ -478,8 +462,6 @@ qreal QBezier::length(qreal error) const
 
 void QBezier::addIfClose(qreal *length, qreal error) const
 {
-    QBezier left, right;     /* bez poly splits */
-
     qreal len = qreal(0.0);  /* arc length */
     qreal chord;             /* chord length */
 
@@ -490,9 +472,9 @@ void QBezier::addIfClose(qreal *length, qreal error) const
     chord = QLineF(QPointF(x1, y1),QPointF(x4, y4)).length();
 
     if((len-chord) > error) {
-        split(&left, &right);                 /* split in two */
-        left.addIfClose(length, error);       /* try left side */
-        right.addIfClose(length, error);      /* try right side */
+        const auto halves = split();                  /* split in two */
+        halves.first.addIfClose(length, error);       /* try left side */
+        halves.second.addIfClose(length, error);      /* try right side */
         return;
     }
 
diff --git a/src/gui/painting/qbezier_p.h b/src/gui/painting/qbezier_p.h
index f8a91e9ef3..1c49f82416 100644
--- a/src/gui/painting/qbezier_p.h
+++ b/src/gui/painting/qbezier_p.h
@@ -69,7 +69,8 @@ class Q_GUI_EXPORT QBezier
 {
 public:
     static QBezier fromPoints(const QPointF &p1, const QPointF &p2,
-                              const QPointF &p3, const QPointF &p4);
+                              const QPointF &p3, const QPointF &p4)
+    { return {p1.x(), p1.y(), p2.x(), p2.y(), p3.x(), p3.y(), p4.x(), p4.y()}; }
 
     static void coefficients(qreal t, qreal &a, qreal &b, qreal &c, qreal &d);
 
@@ -106,7 +107,7 @@ public:
     inline QLineF endTangent() const;
 
     inline void parameterSplitLeft(qreal t, QBezier *left);
-    inline void split(QBezier *firstHalf, QBezier *secondHalf) const;
+    inline std::pair<QBezier, QBezier> split() const;
 
     int shifted(QBezier *curveSegments, int maxSegmets,
                 qreal offset, float threshold) const;
@@ -222,28 +223,21 @@ inline QPointF QBezier::secondDerivedAt(qreal t) const
                        a * y1 + b * y2 + c * y3 + d * y4);
 }
 
-inline void QBezier::split(QBezier *firstHalf, QBezier *secondHalf) const
+std::pair<QBezier, QBezier> QBezier::split() const
 {
-    Q_ASSERT(firstHalf);
-    Q_ASSERT(secondHalf);
-
-    qreal c = (x2 + x3)*.5;
-    firstHalf->x2 = (x1 + x2)*.5;
-    secondHalf->x3 = (x3 + x4)*.5;
-    firstHalf->x1 = x1;
-    secondHalf->x4 = x4;
-    firstHalf->x3 = (firstHalf->x2 + c)*.5;
-    secondHalf->x2 = (secondHalf->x3 + c)*.5;
-    firstHalf->x4 = secondHalf->x1 = (firstHalf->x3 + secondHalf->x2)*.5;
-
-    c = (y2 + y3)/2;
-    firstHalf->y2 = (y1 + y2)*.5;
-    secondHalf->y3 = (y3 + y4)*.5;
-    firstHalf->y1 = y1;
-    secondHalf->y4 = y4;
-    firstHalf->y3 = (firstHalf->y2 + c)*.5;
-    secondHalf->y2 = (secondHalf->y3 + c)*.5;
-    firstHalf->y4 = secondHalf->y1 = (firstHalf->y3 + secondHalf->y2)*.5;
+    const auto mid = [](QPointF lhs, QPointF rhs) { return (lhs + rhs) * .5; };
+
+    const QPointF mid_12 = mid(pt1(), pt2());
+    const QPointF mid_23 = mid(pt2(), pt3());
+    const QPointF mid_34 = mid(pt3(), pt4());
+    const QPointF mid_12_23 = mid(mid_12, mid_23);
+    const QPointF mid_23_34 = mid(mid_23, mid_34);
+    const QPointF mid_12_23__23_34 = mid(mid_12_23, mid_23_34);
+
+    return {
+        fromPoints(pt1(), mid_12, mid_12_23, mid_12_23__23_34),
+        fromPoints(mid_12_23__23_34, mid_23_34, mid_34, pt4()),
+    };
 }
 
 inline void QBezier::parameterSplitLeft(qreal t, QBezier *left)
diff --git a/src/gui/painting/qblendfunctions_p.h b/src/gui/painting/qblendfunctions_p.h
index 5ea78cdde2..080da98ec4 100644
--- a/src/gui/painting/qblendfunctions_p.h
+++ b/src/gui/painting/qblendfunctions_p.h
@@ -71,10 +71,10 @@ void qt_scale_image_16bit(uchar *destPixels, int dbpl,
     const int ix = 0x00010000 * sx;
     const int iy = 0x00010000 * sy;
 
-//     qDebug() << "scale:" << endl
-//              << " - target" << targetRect << endl
-//              << " - source" << srcRect << endl
-//              << " - clip" << clip << endl
+//     qDebug() << "scale:" << Qt::endl
+//              << " - target" << targetRect << Qt::endl
+//              << " - source" << srcRect << Qt::endl
+//              << " - clip" << clip << Qt::endl
 //              << " - sx=" << sx << " sy=" << sy << " ix=" << ix << " iy=" << iy;
 
     QRect tr = targetRect.normalized().toRect();
@@ -162,10 +162,10 @@ template <typename T> void qt_scale_image_32bit(uchar *destPixels, int dbpl,
     const int ix = 0x00010000 * sx;
     const int iy = 0x00010000 * sy;
 
-//     qDebug() << "scale:" << endl
-//              << " - target" << targetRect << endl
-//              << " - source" << srcRect << endl
-//              << " - clip" << clip << endl
+//     qDebug() << "scale:" << Qt::endl
+//              << " - target" << targetRect << Qt::endl
+//              << " - source" << srcRect << Qt::endl
+//              << " - clip" << clip << Qt::endl
 //              << " - sx=" << sx << " sy=" << sy << " ix=" << ix << " iy=" << iy;
 
     QRect tr = targetRect.normalized().toRect();
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index f56be55325..abb3268dfa 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -352,7 +352,7 @@ public:
     QBrushData *brush;
     QNullBrushData() : brush(new QBrushData)
     {
-        brush->ref.store(1);
+        brush->ref.storeRelaxed(1);
         brush->style = Qt::BrushStyle(0);
         brush->color = Qt::black;
     }
@@ -411,7 +411,7 @@ void QBrush::init(const QColor &color, Qt::BrushStyle style)
         d.reset(new QBrushData);
         break;
     }
-    d->ref.store(1);
+    d->ref.storeRelaxed(1);
     d->style = style;
     d->color = color;
 }
@@ -585,7 +585,7 @@ static Q_DECL_CONSTEXPR inline bool use_same_brushdata(Qt::BrushStyle lhs, Qt::B
 
 void QBrush::detach(Qt::BrushStyle newStyle)
 {
-    if (use_same_brushdata(newStyle, d->style) && d->ref.load() == 1) {
+    if (use_same_brushdata(newStyle, d->style) && d->ref.loadRelaxed() == 1) {
         d->style = newStyle;
         return;
     }
@@ -625,7 +625,7 @@ void QBrush::detach(Qt::BrushStyle newStyle)
         x.reset(new QBrushData);
         break;
     }
-    x->ref.store(1); // must be first lest the QBrushDataPointerDeleter turns into a no-op
+    x->ref.storeRelaxed(1); // must be first lest the QBrushDataPointerDeleter turns into a no-op
     x->style = newStyle;
     x->color = d->color;
     x->transform = d->transform;
@@ -1140,11 +1140,11 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
         if (s.version() >= QDataStream::Qt_5_5) {
             QImage img;
             s >> img;
-            b.setTextureImage(qMove(img));
+            b.setTextureImage(std::move(img));
         } else {
             QPixmap pm;
             s >> pm;
-            b.setTexture(qMove(pm));
+            b.setTexture(std::move(pm));
         }
     } else if (style == Qt::LinearGradientPattern
                || style == Qt::RadialGradientPattern
@@ -1385,22 +1385,29 @@ QGradient::QGradient(Preset preset)
         setCoordinateMode(ObjectMode);
         setSpread(PadSpread);
 
-        const QJsonValue start = presetData[QLatin1Literal("start")];
-        const QJsonValue end = presetData[QLatin1Literal("end")];
-        m_data.linear.x1 = start[QLatin1Literal("x")].toDouble();
-        m_data.linear.y1 = start[QLatin1Literal("y")].toDouble();
-        m_data.linear.x2 = end[QLatin1Literal("x")].toDouble();
-        m_data.linear.y2 = end[QLatin1Literal("y")].toDouble();
+        const QJsonValue start = presetData[QLatin1String("start")];
+        const QJsonValue end = presetData[QLatin1String("end")];
+        m_data.linear.x1 = start[QLatin1String("x")].toDouble();
+        m_data.linear.y1 = start[QLatin1String("y")].toDouble();
+        m_data.linear.x2 = end[QLatin1String("x")].toDouble();
+        m_data.linear.y2 = end[QLatin1String("y")].toDouble();
 
         for (const QJsonValue &stop : presetData[QLatin1String("stops")].toArray()) {
-            setColorAt(stop[QLatin1Literal("position")].toDouble(),
-                QColor(QRgb(stop[QLatin1Literal("color")].toInt())));
+            setColorAt(stop[QLatin1String("position")].toDouble(),
+                QColor(QRgb(stop[QLatin1String("color")].toInt())));
         }
 
         cachedPresets.insert(preset, *this);
     }
 }
 
+/*!
+    \internal
+*/
+QGradient::~QGradient()
+{
+}
+
 QT_END_NAMESPACE
 static void initGradientPresets() { Q_INIT_RESOURCE(qmake_webgradients); }
 Q_CONSTRUCTOR_FUNCTION(initGradientPresets);
@@ -1785,6 +1792,12 @@ QLinearGradient::QLinearGradient(qreal xStart, qreal yStart, qreal xFinalStop, q
 {
 }
 
+/*!
+    \internal
+*/
+QLinearGradient::~QLinearGradient()
+{
+}
 
 /*!
     Returns the start point of this linear gradient in logical coordinates.
@@ -2056,6 +2069,13 @@ QRadialGradient::QRadialGradient(qreal cx, qreal cy, qreal centerRadius, qreal f
 }
 
 /*!
+  \internal
+*/
+QRadialGradient::~QRadialGradient()
+{
+}
+
+/*!
     Returns the center of this radial gradient in logical coordinates.
 
     \sa QGradient::stops()
@@ -2301,6 +2321,13 @@ QConicalGradient::QConicalGradient(qreal cx, qreal cy, qreal angle)
 {
 }
 
+/*!
+    \internal
+*/
+QConicalGradient::~QConicalGradient()
+{
+}
+
 
 /*!
     Constructs a conical with center at (0, 0) starting the
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index aee51c526d..6a4ffab1c5 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -79,11 +79,9 @@ public:
 
     ~QBrush();
     QBrush &operator=(const QBrush &brush);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QBrush &operator=(QBrush &&other) Q_DECL_NOEXCEPT
+    inline QBrush &operator=(QBrush &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
-    inline void swap(QBrush &other) Q_DECL_NOEXCEPT
+    inline void swap(QBrush &other) noexcept
     { qSwap(d, other.d); }
 
     operator QVariant() const;
@@ -161,7 +159,7 @@ inline Qt::BrushStyle QBrush::style() const { return d->style; }
 inline const QColor &QBrush::color() const { return d->color; }
 inline const QMatrix &QBrush::matrix() const { return d->transform.toAffine(); }
 inline QTransform QBrush::transform() const { return d->transform; }
-inline bool QBrush::isDetached() const { return d->ref.load() == 1; }
+inline bool QBrush::isDetached() const { return d->ref.loadRelaxed() == 1; }
 
 
 /*******************************************************************************
@@ -373,11 +371,14 @@ public:
         GagarinView = 178,
         FabledSunset = 179,
         PerfectBlue = 180,
+
+        NumPresets
     };
     Q_ENUM(Preset)
 
     QGradient();
     QGradient(Preset);
+    ~QGradient();
 
     Type type() const { return m_type; }
 
@@ -431,6 +432,7 @@ public:
     QLinearGradient();
     QLinearGradient(const QPointF &start, const QPointF &finalStop);
     QLinearGradient(qreal xStart, qreal yStart, qreal xFinalStop, qreal yFinalStop);
+    ~QLinearGradient();
 
     QPointF start() const;
     void setStart(const QPointF &start);
@@ -455,6 +457,8 @@ public:
     QRadialGradient(const QPointF &center, qreal centerRadius, const QPointF &focalPoint, qreal focalRadius);
     QRadialGradient(qreal cx, qreal cy, qreal centerRadius, qreal fx, qreal fy, qreal focalRadius);
 
+    ~QRadialGradient();
+
     QPointF center() const;
     void setCenter(const QPointF &center);
     inline void setCenter(qreal x, qreal y) { setCenter(QPointF(x, y)); }
@@ -480,6 +484,7 @@ public:
     QConicalGradient();
     QConicalGradient(const QPointF &center, qreal startAngle);
     QConicalGradient(qreal cx, qreal cy, qreal startAngle);
+    ~QConicalGradient();
 
     QPointF center() const;
     void setCenter(const QPointF &center);
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 07202f5b1c..8780cce223 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -39,6 +39,7 @@
 
 #include "qcolor.h"
 #include "qcolor_p.h"
+#include "qfloat16.h"
 #include "qnamespace.h"
 #include "qdatastream.h"
 #include "qvariant.h"
@@ -146,6 +147,7 @@ static bool get_hex_rgb(const QChar *str, size_t len, QRgba64 *rgb)
 #endif
 #define rgb(r,g,b) (0xff000000 | (r << 16) |  (g << 8) | b)
 
+// keep this is in sync with QColorConstants
 static const struct RGBData {
     const char name[21];
     uint  value;
@@ -474,25 +476,43 @@ static QStringList get_colornames()
 
     \section1 Predefined Colors
 
-    There are 20 predefined QColors described by the Qt::GlobalColor enum,
-    including black, white, primary and secondary colors, darker versions
-    of these colors and three shades of gray. QColor also recognizes a
-    variety of color names; the static colorNames() function returns a
-    QStringList color names that QColor knows about.
+    There are 20 predefined QColor objects in the \c{QColorConstants}
+    namespace, including black, white, primary and secondary colors,
+    darker versions of these colors, and three shades of gray.
+    Furthermore, the \c{QColorConstants::Svg} namespace defines QColor
+    objects for the standard \l{https://www.w3.org/TR/SVG11/types.html#ColorKeywords}{SVG color keyword names}.
 
     \image qt-colors.png Qt Colors
 
-    Additionally, the Qt::color0, Qt::color1 and Qt::transparent colors
-    are used for special purposes.
+    The \c{QColorConstants::Color0}, \c{QColorConstants::Color1} and
+    \c{QColorConstants::Transparent} colors are used for special
+    purposes.
 
-    Qt::color0 (zero pixel value) and Qt::color1 (non-zero pixel value)
-    are special colors for drawing in QBitmaps. Painting with Qt::color0
-    sets the bitmap bits to 0 (transparent; i.e., background), and painting
-    with Qt::color1 sets the bits to 1 (opaque; i.e., foreground).
+    \c{QColorConstants::Color0} (zero pixel value) and
+    \c{QColorConstants::Color1} (non-zero pixel value) are special
+    colors for drawing in QBitmaps. Painting with
+    \c{QColorConstants::Color0} sets the bitmap bits to 0 (transparent;
+    i.e., background), and painting with c{QColorConstants::Color1}
+    sets the bits to 1 (opaque; i.e., foreground).
 
-    Qt::transparent is used to indicate a transparent pixel. When painting
-    with this value, a pixel value will be used that is appropriate for the
-    underlying pixel format in use.
+    \c{QColorConstants::Transparent} is used to indicate a transparent
+    pixel. When painting with this value, a pixel value will be used
+    that is appropriate for the underlying pixel format in use.
+
+    For historical reasons, the 20 predefined colors are also available
+    in the Qt::GlobalColor enumeration.
+
+    Finally, QColor recognizes a variety of color names (as strings);
+    the static colorNames() function returns a QStringList color names
+    that QColor knows about.
+
+    \section1 The Extended RGB Color Model
+
+    The extended RGB color model, also known as the scRGB color space,
+    is the same the RGB color model except it allows values under 0.0,
+    and over 1.0. This makes it possible to represent colors that would
+    otherwise be outside the range of the RGB colorspace but still use
+    the same values for colors inside the RGB colorspace.
 
     \section1 The HSV Color Model
 
@@ -577,7 +597,7 @@ static QStringList get_colornames()
     alpha-channel to feature \l {QColor#Alpha-Blended
     Drawing}{alpha-blended drawing}.
 
-    \sa QPalette, QBrush
+    \sa QPalette, QBrush, QColorConstants
 */
 
 #define QCOLOR_INT_RANGE_CHECK(fn, var) \
@@ -603,12 +623,13 @@ static QStringList get_colornames()
 /*!
     \enum QColor::Spec
 
-    The type of color specified, either RGB, HSV, CMYK or HSL.
+    The type of color specified, either RGB, extended RGB, HSV, CMYK or HSL.
 
     \value Rgb
     \value Hsv
     \value Cmyk
     \value Hsl
+    \value ExtendedRgb
     \value Invalid
 
     \sa spec(), convertTo()
@@ -653,7 +674,7 @@ static QStringList get_colornames()
 
     \sa isValid(), {QColor#Predefined Colors}{Predefined Colors}
  */
-QColor::QColor(Qt::GlobalColor color) Q_DECL_NOTHROW
+QColor::QColor(Qt::GlobalColor color) noexcept
 {
 #define QRGB(r, g, b) \
     QRgb(((0xffu << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff)))
@@ -728,7 +749,7 @@ QColor::QColor(Qt::GlobalColor color) Q_DECL_NOTHROW
     \sa fromRgb(), isValid()
 */
 
-QColor::QColor(QRgb color) Q_DECL_NOTHROW
+QColor::QColor(QRgb color) noexcept
 {
     cspec = Rgb;
     ct.argb.alpha = 0xffff;
@@ -746,7 +767,7 @@ QColor::QColor(QRgb color) Q_DECL_NOTHROW
     \sa fromRgba64()
 */
 
-QColor::QColor(QRgba64 rgba64) Q_DECL_NOTHROW
+QColor::QColor(QRgba64 rgba64) noexcept
 {
     setRgba64(rgba64);
 }
@@ -760,7 +781,7 @@ QColor::QColor(QRgba64 rgba64) Q_DECL_NOTHROW
     becomes a valid color by accident.
 */
 
-QColor::QColor(Spec spec) Q_DECL_NOTHROW
+QColor::QColor(Spec spec) noexcept
 {
     switch (spec) {
     case Invalid:
@@ -778,6 +799,10 @@ QColor::QColor(Spec spec) Q_DECL_NOTHROW
     case Hsl:
         setHsl(0, 0, 0, 0);
         break;
+    case ExtendedRgb:
+        cspec = spec;
+        setRgbF(0, 0, 0, 0);
+        break;
     }
 }
 
@@ -872,7 +897,8 @@ QString QColor::name(NameFormat format) const
     \li #AARRGGBB (Since 5.2)
     \li #RRRGGGBBB
     \li #RRRRGGGGBBBB
-    \li A name from the list of colors defined in the list of \l{http://www.w3.org/TR/SVG/types.html#ColorKeywords}{SVG color keyword names}
+    \li A name from the list of colors defined in the list of
+       \l{https://www.w3.org/TR/SVG11/types.html#ColorKeywords}{SVG color keyword names}
        provided by the World Wide Web Consortium; for example, "steelblue" or "gainsboro".
        These color names work on all platforms. Note that these color names are \e not the
        same as defined by the Qt::GlobalColor enums, e.g. "green" and Qt::green does not
@@ -933,7 +959,7 @@ bool QColor::isValidColor(const QString &name)
     \overload
     \since 5.10
 */
-bool QColor::isValidColor(QStringView name) Q_DECL_NOTHROW
+bool QColor::isValidColor(QStringView name) noexcept
 {
     return name.size() && QColor().setColorFromString(name);
 }
@@ -942,7 +968,7 @@ bool QColor::isValidColor(QStringView name) Q_DECL_NOTHROW
     \overload
     \since 5.8
 */
-bool QColor::isValidColor(QLatin1String name) Q_DECL_NOTHROW
+bool QColor::isValidColor(QLatin1String name) noexcept
 {
     return name.size() && QColor().setColorFromString(name);
 }
@@ -1211,6 +1237,17 @@ void QColor::setHsl(int h, int s, int l, int a)
     ct.ahsl.pad        = 0;
 }
 
+static inline qfloat16 &castF16(quint16 &v)
+{
+    // this works because qfloat16 internally is a quint16
+    return *reinterpret_cast<qfloat16 *>(&v);
+}
+
+static inline const qfloat16 &castF16(const quint16 &v)
+{
+    return *reinterpret_cast<const qfloat16 *>(&v);
+}
+
 /*!
     Sets the contents pointed to by \a r, \a g, \a b, and \a a, to the red,
     green, blue, and alpha-channel (transparency) components of the color's
@@ -1226,18 +1263,27 @@ void QColor::getRgbF(qreal *r, qreal *g, qreal *b, qreal *a) const
     if (!r || !g || !b)
         return;
 
-    if (cspec != Invalid && cspec != Rgb) {
+    if (cspec == Invalid)
+        return;
+
+    if (cspec != Rgb && cspec != ExtendedRgb) {
         toRgb().getRgbF(r, g, b, a);
         return;
     }
 
-    *r = ct.argb.red   / qreal(USHRT_MAX);
-    *g = ct.argb.green / qreal(USHRT_MAX);
-    *b = ct.argb.blue  / qreal(USHRT_MAX);
-
-    if (a)
-        *a = ct.argb.alpha / qreal(USHRT_MAX);
-
+    if (cspec == Rgb) {
+        *r = ct.argb.red   / qreal(USHRT_MAX);
+        *g = ct.argb.green / qreal(USHRT_MAX);
+        *b = ct.argb.blue  / qreal(USHRT_MAX);
+        if (a)
+            *a = ct.argb.alpha / qreal(USHRT_MAX);
+    }  else {
+        *r = castF16(ct.argbExtended.redF16);
+        *g = castF16(ct.argbExtended.greenF16);
+        *b = castF16(ct.argbExtended.blueF16);
+        if (a)
+            *a = castF16(ct.argbExtended.alphaF16);
+    }
 }
 
 /*!
@@ -1274,26 +1320,35 @@ void QColor::getRgb(int *r, int *g, int *b, int *a) const
     Sets the color channels of this color to \a r (red), \a g (green),
     \a b (blue) and \a a (alpha, transparency).
 
-    All values must be in the range 0.0-1.0.
+    The alpha value must be in the range 0.0-1.0.
+    If any of the other values are outside the range of 0.0-1.0 the
+    color model will be set as \c ExtendedRgb.
 
     \sa rgb(), getRgbF(), setRgb()
 */
 void QColor::setRgbF(qreal r, qreal g, qreal b, qreal a)
 {
-    if (r < qreal(0.0) || r > qreal(1.0)
-        || g < qreal(0.0) || g > qreal(1.0)
-        || b < qreal(0.0) || b > qreal(1.0)
-        || a < qreal(0.0) || a > qreal(1.0)) {
-        qWarning("QColor::setRgbF: RGB parameters out of range");
+    if (a < qreal(0.0) || a > qreal(1.0)) {
+        qWarning("QColor::setRgbF: Alpha parameter is out of range");
         invalidate();
         return;
     }
-
+    if (r < qreal(0.0) || r > qreal(1.0) ||
+        g < qreal(0.0) || g > qreal(1.0) ||
+        b < qreal(0.0) || b > qreal(1.0) || cspec == ExtendedRgb) {
+        cspec = ExtendedRgb;
+        castF16(ct.argbExtended.redF16)   = qfloat16(r);
+        castF16(ct.argbExtended.greenF16) = qfloat16(g);
+        castF16(ct.argbExtended.blueF16)  = qfloat16(b);
+        castF16(ct.argbExtended.alphaF16) = qfloat16(a);
+        ct.argbExtended.pad   = 0;
+        return;
+    }
     cspec = Rgb;
-    ct.argb.alpha = qRound(a * USHRT_MAX);
     ct.argb.red   = qRound(r * USHRT_MAX);
     ct.argb.green = qRound(g * USHRT_MAX);
     ct.argb.blue  = qRound(b * USHRT_MAX);
+    ct.argb.alpha = qRound(a * USHRT_MAX);
     ct.argb.pad   = 0;
 }
 
@@ -1306,7 +1361,7 @@ void QColor::setRgbF(qreal r, qreal g, qreal b, qreal a)
 */
 void QColor::setRgb(int r, int g, int b, int a)
 {
-    if ((uint)r > 255 || (uint)g > 255 || (uint)b > 255 || (uint)a > 255) {
+    if (!isRgbaValid(r, g, b, a)) {
         qWarning("QColor::setRgb: RGB parameters out of range");
         invalidate();
         return;
@@ -1330,7 +1385,7 @@ void QColor::setRgb(int r, int g, int b, int a)
     \sa setRgba(), rgb(), rgba64()
 */
 
-QRgb QColor::rgba() const Q_DECL_NOTHROW
+QRgb QColor::rgba() const noexcept
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().rgba();
@@ -1342,7 +1397,7 @@ QRgb QColor::rgba() const Q_DECL_NOTHROW
 
     \sa rgba(), rgb(), setRgba64()
 */
-void QColor::setRgba(QRgb rgba) Q_DECL_NOTHROW
+void QColor::setRgba(QRgb rgba) noexcept
 {
     cspec = Rgb;
     ct.argb.alpha = qAlpha(rgba) * 0x101;
@@ -1362,7 +1417,7 @@ void QColor::setRgba(QRgb rgba) Q_DECL_NOTHROW
     \sa setRgba64(), rgba(), rgb()
 */
 
-QRgba64 QColor::rgba64() const Q_DECL_NOTHROW
+QRgba64 QColor::rgba64() const noexcept
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().rgba64();
@@ -1376,7 +1431,7 @@ QRgba64 QColor::rgba64() const Q_DECL_NOTHROW
 
     \sa setRgba(), rgba64()
 */
-void QColor::setRgba64(QRgba64 rgba) Q_DECL_NOTHROW
+void QColor::setRgba64(QRgba64 rgba) noexcept
 {
     cspec = Rgb;
     ct.argb.alpha = rgba.alpha();
@@ -1393,7 +1448,7 @@ void QColor::setRgba64(QRgba64 rgba) Q_DECL_NOTHROW
 
     \sa getRgb(), rgba()
 */
-QRgb QColor::rgb() const Q_DECL_NOTHROW
+QRgb QColor::rgb() const noexcept
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().rgb();
@@ -1405,7 +1460,7 @@ QRgb QColor::rgb() const Q_DECL_NOTHROW
 
     Sets the RGB value to \a rgb. The alpha value is set to opaque.
 */
-void QColor::setRgb(QRgb rgb) Q_DECL_NOTHROW
+void QColor::setRgb(QRgb rgb) noexcept
 {
     cspec = Rgb;
     ct.argb.alpha = 0xffff;
@@ -1420,8 +1475,12 @@ void QColor::setRgb(QRgb rgb) Q_DECL_NOTHROW
 
     \sa setAlpha(), alphaF(), {QColor#Alpha-Blended Drawing}{Alpha-Blended Drawing}
 */
-int QColor::alpha() const Q_DECL_NOTHROW
-{ return ct.argb.alpha >> 8; }
+int QColor::alpha() const noexcept
+{
+    if (cspec == ExtendedRgb)
+        return qRound(qreal(castF16(ct.argbExtended.alphaF16)) * 255);
+    return ct.argb.alpha >> 8;
+}
 
 
 /*!
@@ -1434,6 +1493,11 @@ int QColor::alpha() const Q_DECL_NOTHROW
 void QColor::setAlpha(int alpha)
 {
     QCOLOR_INT_RANGE_CHECK("QColor::setAlpha", alpha);
+    if (cspec == ExtendedRgb) {
+        constexpr qreal f = qreal(1.0) / 255;
+        castF16(ct.argbExtended.alphaF16) = alpha * f;
+        return;
+    }
     ct.argb.alpha = alpha * 0x101;
 }
 
@@ -1442,8 +1506,12 @@ void QColor::setAlpha(int alpha)
 
     \sa setAlphaF(), alpha(), {QColor#Alpha-Blended Drawing}{Alpha-Blended Drawing}
 */
-qreal QColor::alphaF() const Q_DECL_NOTHROW
-{ return ct.argb.alpha / qreal(USHRT_MAX); }
+qreal QColor::alphaF() const noexcept
+{
+    if (cspec == ExtendedRgb)
+        return castF16(ct.argbExtended.alphaF16);
+    return ct.argb.alpha / qreal(USHRT_MAX);
+}
 
 /*!
     Sets the alpha of this color to \a alpha. qreal alpha is specified in the
@@ -1455,6 +1523,10 @@ qreal QColor::alphaF() const Q_DECL_NOTHROW
 void QColor::setAlphaF(qreal alpha)
 {
     QCOLOR_REAL_RANGE_CHECK("QColor::setAlphaF", alpha);
+    if (cspec == ExtendedRgb) {
+        castF16(ct.argbExtended.alphaF16) = alpha;
+        return;
+    }
     qreal tmp = alpha * USHRT_MAX;
     ct.argb.alpha = qRound(tmp);
 }
@@ -1465,7 +1537,7 @@ void QColor::setAlphaF(qreal alpha)
 
     \sa setRed(), redF(), getRgb()
 */
-int QColor::red() const Q_DECL_NOTHROW
+int QColor::red() const noexcept
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().red();
@@ -1492,7 +1564,7 @@ void QColor::setRed(int red)
 
     \sa setGreen(), greenF(), getRgb()
 */
-int QColor::green() const Q_DECL_NOTHROW
+int QColor::green() const noexcept
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().green();
@@ -1520,7 +1592,7 @@ void QColor::setGreen(int green)
 
     \sa setBlue(), blueF(), getRgb()
 */
-int QColor::blue() const Q_DECL_NOTHROW
+int QColor::blue() const noexcept
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().blue();
@@ -1548,27 +1620,31 @@ void QColor::setBlue(int blue)
 
     \sa setRedF(), red(), getRgbF()
 */
-qreal QColor::redF() const Q_DECL_NOTHROW
+qreal QColor::redF() const noexcept
 {
-    if (cspec != Invalid && cspec != Rgb)
-        return toRgb().redF();
-    return ct.argb.red / qreal(USHRT_MAX);
+    if (cspec == Rgb || cspec == Invalid)
+        return ct.argb.red / qreal(USHRT_MAX);
+    if (cspec == ExtendedRgb)
+        return castF16(ct.argbExtended.redF16);
+
+    return toRgb().redF();
 }
 
 
 /*!
-    Sets the red color component of this color to \a red. Float components
-    are specified in the range 0.0-1.0.
+    Sets the red color component of this color to \a red. If \a red lies outside
+    the 0.0-1.0 range, the color model will be changed to \c ExtendedRgb.
 
     \sa redF(), red(), setRgbF()
 */
 void QColor::setRedF(qreal red)
 {
-    QCOLOR_REAL_RANGE_CHECK("QColor::setRedF", red);
-    if (cspec != Rgb)
-        setRgbF(red, greenF(), blueF(), alphaF());
-    else
+    if (cspec == Rgb && red >= qreal(0.0) && red <= qreal(1.0))
         ct.argb.red = qRound(red * USHRT_MAX);
+    else if (cspec == ExtendedRgb)
+        castF16(ct.argbExtended.redF16) = red;
+    else
+        setRgbF(red, greenF(), blueF(), alphaF());
 }
 
 /*!
@@ -1576,27 +1652,31 @@ void QColor::setRedF(qreal red)
 
     \sa setGreenF(), green(), getRgbF()
 */
-qreal QColor::greenF() const Q_DECL_NOTHROW
+qreal QColor::greenF() const noexcept
 {
-    if (cspec != Invalid && cspec != Rgb)
-        return toRgb().greenF();
-    return ct.argb.green / qreal(USHRT_MAX);
+    if (cspec == Rgb || cspec == Invalid)
+        return ct.argb.green / qreal(USHRT_MAX);
+    if (cspec == ExtendedRgb)
+        return castF16(ct.argbExtended.greenF16);
+
+    return toRgb().greenF();
 }
 
 
 /*!
-    Sets the green color component of this color to \a green. Float components
-    are specified in the range 0.0-1.0.
+    Sets the green color component of this color to \a green. If \a green lies outside
+    the 0.0-1.0 range, the color model will be changed to \c ExtendedRgb.
 
     \sa greenF(), green(), setRgbF()
 */
 void QColor::setGreenF(qreal green)
 {
-    QCOLOR_REAL_RANGE_CHECK("QColor::setGreenF", green);
-    if (cspec != Rgb)
-        setRgbF(redF(), green, blueF(), alphaF());
-    else
+    if (cspec == Rgb && green >= qreal(0.0) && green <= qreal(1.0))
         ct.argb.green = qRound(green * USHRT_MAX);
+    else if (cspec == ExtendedRgb)
+        castF16(ct.argbExtended.greenF16) = green;
+    else
+        setRgbF(redF(), green, blueF(), alphaF());
 }
 
 /*!
@@ -1604,26 +1684,29 @@ void QColor::setGreenF(qreal green)
 
      \sa setBlueF(), blue(), getRgbF()
 */
-qreal QColor::blueF() const Q_DECL_NOTHROW
+qreal QColor::blueF() const noexcept
 {
-    if (cspec != Invalid && cspec != Rgb)
-        return toRgb().blueF();
-    return ct.argb.blue / qreal(USHRT_MAX);
+    if (cspec == Rgb || cspec == Invalid)
+        return ct.argb.blue / qreal(USHRT_MAX);
+    if (cspec == ExtendedRgb)
+        return castF16(ct.argbExtended.blueF16);
+
+    return toRgb().blueF();
 }
 
 /*!
-    Sets the blue color component of this color to \a blue. Float components
-    are specified in the range 0.0-1.0.
-
+    Sets the blue color component of this color to \a blue. If \a blue lies outside
+    the 0.0-1.0 range, the color model will be changed to \c ExtendedRgb.
     \sa blueF(), blue(), setRgbF()
 */
 void QColor::setBlueF(qreal blue)
 {
-    QCOLOR_REAL_RANGE_CHECK("QColor::setBlueF", blue);
-    if (cspec != Rgb)
-        setRgbF(redF(), greenF(), blue, alphaF());
-    else
+    if (cspec == Rgb && blue >= qreal(0.0) && blue <= qreal(1.0))
         ct.argb.blue = qRound(blue * USHRT_MAX);
+    else if (cspec == ExtendedRgb)
+        castF16(ct.argbExtended.blueF16) = blue;
+    else
+        setRgbF(redF(), greenF(), blue, alphaF());
 }
 
 /*!
@@ -1634,7 +1717,7 @@ void QColor::setBlueF(qreal blue)
     \sa hsvHue(), hslHue(), hueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
 
-int QColor::hue() const Q_DECL_NOTHROW
+int QColor::hue() const noexcept
 {
     return hsvHue();
 }
@@ -1644,7 +1727,7 @@ int QColor::hue() const Q_DECL_NOTHROW
 
     \sa hueF(), hslHue(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-int QColor::hsvHue() const Q_DECL_NOTHROW
+int QColor::hsvHue() const noexcept
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().hue();
@@ -1660,7 +1743,7 @@ int QColor::hsvHue() const Q_DECL_NOTHROW
     Model}
 */
 
-int QColor::saturation() const Q_DECL_NOTHROW
+int QColor::saturation() const noexcept
 {
     return hsvSaturation();
 }
@@ -1670,7 +1753,7 @@ int QColor::saturation() const Q_DECL_NOTHROW
 
     \sa saturationF(), hslSaturation(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-int QColor::hsvSaturation() const Q_DECL_NOTHROW
+int QColor::hsvSaturation() const noexcept
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().saturation();
@@ -1682,7 +1765,7 @@ int QColor::hsvSaturation() const Q_DECL_NOTHROW
 
     \sa valueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-int QColor::value() const Q_DECL_NOTHROW
+int QColor::value() const noexcept
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().value();
@@ -1696,7 +1779,7 @@ int QColor::value() const Q_DECL_NOTHROW
 
     \sa hsvHueF(), hslHueF(), hue(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-qreal QColor::hueF() const Q_DECL_NOTHROW
+qreal QColor::hueF() const noexcept
 {
     return hsvHueF();
 }
@@ -1707,7 +1790,7 @@ qreal QColor::hueF() const Q_DECL_NOTHROW
     \sa hue(), hslHueF(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color
     Model}
 */
-qreal QColor::hsvHueF() const Q_DECL_NOTHROW
+qreal QColor::hsvHueF() const noexcept
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().hueF();
@@ -1722,7 +1805,7 @@ qreal QColor::hsvHueF() const Q_DECL_NOTHROW
     \sa hsvSaturationF(), hslSaturationF(), saturation(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color
     Model}
 */
-qreal QColor::saturationF() const Q_DECL_NOTHROW
+qreal QColor::saturationF() const noexcept
 {
     return hsvSaturationF();
 }
@@ -1732,7 +1815,7 @@ qreal QColor::saturationF() const Q_DECL_NOTHROW
 
     \sa saturation(), hslSaturationF(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-qreal QColor::hsvSaturationF() const Q_DECL_NOTHROW
+qreal QColor::hsvSaturationF() const noexcept
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().saturationF();
@@ -1744,7 +1827,7 @@ qreal QColor::hsvSaturationF() const Q_DECL_NOTHROW
 
     \sa value(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-qreal QColor::valueF() const Q_DECL_NOTHROW
+qreal QColor::valueF() const noexcept
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().valueF();
@@ -1758,7 +1841,7 @@ qreal QColor::valueF() const Q_DECL_NOTHROW
 
     \sa hslHueF(), hsvHue(), getHsl(), {QColor#The HSL Color Model}{The HSL Color Model}
 */
-int QColor::hslHue() const Q_DECL_NOTHROW
+int QColor::hslHue() const noexcept
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().hslHue();
@@ -1772,7 +1855,7 @@ int QColor::hslHue() const Q_DECL_NOTHROW
 
     \sa hslSaturationF(), hsvSaturation(), getHsl(), {QColor#The HSL Color Model}{The HSL Color Model}
 */
-int QColor::hslSaturation() const Q_DECL_NOTHROW
+int QColor::hslSaturation() const noexcept
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().hslSaturation();
@@ -1786,7 +1869,7 @@ int QColor::hslSaturation() const Q_DECL_NOTHROW
 
     \sa lightnessF(), getHsl()
 */
-int QColor::lightness() const Q_DECL_NOTHROW
+int QColor::lightness() const noexcept
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().lightness();
@@ -1800,7 +1883,7 @@ int QColor::lightness() const Q_DECL_NOTHROW
 
     \sa hslHue(), hsvHueF(), getHslF()
 */
-qreal QColor::hslHueF() const Q_DECL_NOTHROW
+qreal QColor::hslHueF() const noexcept
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().hslHueF();
@@ -1814,7 +1897,7 @@ qreal QColor::hslHueF() const Q_DECL_NOTHROW
 
     \sa hslSaturation(), hsvSaturationF(), getHslF(), {QColor#The HSL Color Model}{The HSL Color Model}
 */
-qreal QColor::hslSaturationF() const Q_DECL_NOTHROW
+qreal QColor::hslSaturationF() const noexcept
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().hslSaturationF();
@@ -1828,7 +1911,7 @@ qreal QColor::hslSaturationF() const Q_DECL_NOTHROW
 
     \sa value(), getHslF()
 */
-qreal QColor::lightnessF() const Q_DECL_NOTHROW
+qreal QColor::lightnessF() const noexcept
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().lightnessF();
@@ -1840,7 +1923,7 @@ qreal QColor::lightnessF() const Q_DECL_NOTHROW
 
     \sa cyanF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-int QColor::cyan() const Q_DECL_NOTHROW
+int QColor::cyan() const noexcept
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().cyan();
@@ -1852,7 +1935,7 @@ int QColor::cyan() const Q_DECL_NOTHROW
 
     \sa magentaF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-int QColor::magenta() const Q_DECL_NOTHROW
+int QColor::magenta() const noexcept
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().magenta();
@@ -1864,7 +1947,7 @@ int QColor::magenta() const Q_DECL_NOTHROW
 
     \sa yellowF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-int QColor::yellow() const Q_DECL_NOTHROW
+int QColor::yellow() const noexcept
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().yellow();
@@ -1877,7 +1960,7 @@ int QColor::yellow() const Q_DECL_NOTHROW
     \sa blackF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 
 */
-int QColor::black() const Q_DECL_NOTHROW
+int QColor::black() const noexcept
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().black();
@@ -1889,7 +1972,7 @@ int QColor::black() const Q_DECL_NOTHROW
 
     \sa cyan(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-qreal QColor::cyanF() const Q_DECL_NOTHROW
+qreal QColor::cyanF() const noexcept
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().cyanF();
@@ -1901,7 +1984,7 @@ qreal QColor::cyanF() const Q_DECL_NOTHROW
 
     \sa magenta(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-qreal QColor::magentaF() const Q_DECL_NOTHROW
+qreal QColor::magentaF() const noexcept
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().magentaF();
@@ -1913,7 +1996,7 @@ qreal QColor::magentaF() const Q_DECL_NOTHROW
 
      \sa yellow(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-qreal QColor::yellowF() const Q_DECL_NOTHROW
+qreal QColor::yellowF() const noexcept
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().yellowF();
@@ -1925,7 +2008,7 @@ qreal QColor::yellowF() const Q_DECL_NOTHROW
 
     \sa black(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-qreal QColor::blackF() const Q_DECL_NOTHROW
+qreal QColor::blackF() const noexcept
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().blackF();
@@ -1933,18 +2016,43 @@ qreal QColor::blackF() const Q_DECL_NOTHROW
 }
 
 /*!
+    Create and returns an extended RGB QColor based on this color.
+    \since 5.14
+
+    \sa toRgb, convertTo()
+*/
+QColor QColor::toExtendedRgb() const noexcept
+{
+    if (!isValid() || cspec == ExtendedRgb)
+        return *this;
+    if (cspec != Rgb)
+        return toRgb().toExtendedRgb();
+
+    constexpr qreal f = qreal(1.0) / USHRT_MAX;
+    QColor color;
+    color.cspec = ExtendedRgb;
+    castF16(color.ct.argbExtended.alphaF16) = qfloat16(ct.argb.alpha * f);
+    castF16(color.ct.argbExtended.redF16)   = qfloat16(ct.argb.red   * f);
+    castF16(color.ct.argbExtended.greenF16) = qfloat16(ct.argb.green * f);
+    castF16(color.ct.argbExtended.blueF16)  = qfloat16(ct.argb.blue  * f);
+    color.ct.argbExtended.pad = 0;
+    return color;
+}
+
+/*!
     Create and returns an RGB QColor based on this color.
 
     \sa fromRgb(), convertTo(), isValid()
 */
-QColor QColor::toRgb() const Q_DECL_NOTHROW
+QColor QColor::toRgb() const noexcept
 {
     if (!isValid() || cspec == Rgb)
         return *this;
 
     QColor color;
     color.cspec = Rgb;
-    color.ct.argb.alpha = ct.argb.alpha;
+    if (cspec != ExtendedRgb)
+        color.ct.argb.alpha = ct.argb.alpha;
     color.ct.argb.pad = 0;
 
     switch (cspec) {
@@ -2066,6 +2174,12 @@ QColor QColor::toRgb() const Q_DECL_NOTHROW
             color.ct.argb.blue  = qRound((qreal(1.0) - (y * (qreal(1.0) - k) + k)) * USHRT_MAX);
             break;
         }
+    case ExtendedRgb:
+        color.ct.argb.alpha = qRound(USHRT_MAX * qreal(castF16(ct.argbExtended.alphaF16)));
+        color.ct.argb.red   = qRound(USHRT_MAX * qBound(qreal(0.0), qreal(castF16(ct.argbExtended.redF16)),   qreal(1.0)));
+        color.ct.argb.green = qRound(USHRT_MAX * qBound(qreal(0.0), qreal(castF16(ct.argbExtended.greenF16)), qreal(1.0)));
+        color.ct.argb.blue  = qRound(USHRT_MAX * qBound(qreal(0.0), qreal(castF16(ct.argbExtended.blueF16)),  qreal(1.0)));
+        break;
     default:
         break;
     }
@@ -2083,7 +2197,7 @@ QColor QColor::toRgb() const Q_DECL_NOTHROW
 
     \sa fromHsv(), convertTo(), isValid(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-QColor QColor::toHsv() const Q_DECL_NOTHROW
+QColor QColor::toHsv() const noexcept
 {
     if (!isValid() || cspec == Hsv)
         return *this;
@@ -2134,7 +2248,7 @@ QColor QColor::toHsv() const Q_DECL_NOTHROW
 
     \sa fromHsl(), convertTo(), isValid(), {QColor#The HSL Color Model}{The HSL Color Model}
 */
-QColor QColor::toHsl() const Q_DECL_NOTHROW
+QColor QColor::toHsl() const noexcept
 {
     if (!isValid() || cspec == Hsl)
         return *this;
@@ -2190,7 +2304,7 @@ QColor QColor::toHsl() const Q_DECL_NOTHROW
 
     \sa fromCmyk(), convertTo(), isValid(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-QColor QColor::toCmyk() const Q_DECL_NOTHROW
+QColor QColor::toCmyk() const noexcept
 {
     if (!isValid() || cspec == Cmyk)
         return *this;
@@ -2231,13 +2345,15 @@ QColor QColor::toCmyk() const Q_DECL_NOTHROW
     return color;
 }
 
-QColor QColor::convertTo(QColor::Spec colorSpec) const Q_DECL_NOTHROW
+QColor QColor::convertTo(QColor::Spec colorSpec) const noexcept
 {
     if (colorSpec == cspec)
         return *this;
     switch (colorSpec) {
     case Rgb:
         return toRgb();
+    case ExtendedRgb:
+        return toExtendedRgb();
     case Hsv:
         return toHsv();
     case Cmyk:
@@ -2262,7 +2378,7 @@ QColor QColor::convertTo(QColor::Spec colorSpec) const Q_DECL_NOTHROW
     \sa fromRgba(), fromRgbF(), toRgb(), isValid()
 */
 
-QColor QColor::fromRgb(QRgb rgb) Q_DECL_NOTHROW
+QColor QColor::fromRgb(QRgb rgb) noexcept
 {
     return fromRgb(qRed(rgb), qGreen(rgb), qBlue(rgb));
 }
@@ -2278,7 +2394,7 @@ QColor QColor::fromRgb(QRgb rgb) Q_DECL_NOTHROW
     \sa fromRgb(), fromRgba64(), isValid()
 */
 
-QColor QColor::fromRgba(QRgb rgba) Q_DECL_NOTHROW
+QColor QColor::fromRgba(QRgb rgba) noexcept
 {
     return fromRgb(qRed(rgba), qGreen(rgba), qBlue(rgba), qAlpha(rgba));
 }
@@ -2294,10 +2410,7 @@ QColor QColor::fromRgba(QRgb rgba) Q_DECL_NOTHROW
 */
 QColor QColor::fromRgb(int r, int g, int b, int a)
 {
-    if (r < 0 || r > 255
-        || g < 0 || g > 255
-        || b < 0 || b > 255
-        || a < 0 || a > 255) {
+    if (!isRgbaValid(r, g, b, a)) {
         qWarning("QColor::fromRgb: RGB parameters out of range");
         return QColor();
     }
@@ -2317,20 +2430,32 @@ QColor QColor::fromRgb(int r, int g, int b, int a)
     color values, \a r (red), \a g (green), \a b (blue), and \a a
     (alpha-channel, i.e. transparency).
 
-    All the values must be in the range 0.0-1.0.
+    The alpha value must be in the range 0.0-1.0.
+    If any of the other values are outside the range of 0.0-1.0 the
+    color model will be set as \c ExtendedRgb.
 
     \sa fromRgb(), fromRgba64(), toRgb(), isValid()
 */
 QColor QColor::fromRgbF(qreal r, qreal g, qreal b, qreal a)
 {
-    if (r < qreal(0.0) || r > qreal(1.0)
-        || g < qreal(0.0) || g > qreal(1.0)
-        || b < qreal(0.0) || b > qreal(1.0)
-        || a < qreal(0.0) || a > qreal(1.0)) {
-        qWarning("QColor::fromRgbF: RGB parameters out of range");
+    if (a < qreal(0.0) || a > qreal(1.0)) {
+        qWarning("QColor::fromRgbF: Alpha parameter out of range");
         return QColor();
     }
 
+    if (r < qreal(0.0) || r > qreal(1.0)
+            || g < qreal(0.0) || g > qreal(1.0)
+            || b < qreal(0.0) || b > qreal(1.0)) {
+        QColor color;
+        color.cspec = ExtendedRgb;
+        castF16(color.ct.argbExtended.alphaF16) = qfloat16(a);
+        castF16(color.ct.argbExtended.redF16)   = qfloat16(r);
+        castF16(color.ct.argbExtended.greenF16) = qfloat16(g);
+        castF16(color.ct.argbExtended.blueF16)  = qfloat16(b);
+        color.ct.argbExtended.pad   = 0;
+        return color;
+    }
+
     QColor color;
     color.cspec = Rgb;
     color.ct.argb.alpha = qRound(a * USHRT_MAX);
@@ -2351,7 +2476,7 @@ QColor QColor::fromRgbF(qreal r, qreal g, qreal b, qreal a)
 
     \sa fromRgb(), fromRgbF(), toRgb(), isValid()
 */
-QColor QColor::fromRgba64(ushort r, ushort g, ushort b, ushort a) Q_DECL_NOTHROW
+QColor QColor::fromRgba64(ushort r, ushort g, ushort b, ushort a) noexcept
 {
     QColor color;
     color.setRgba64(qRgba64(r, g, b, a));
@@ -2366,7 +2491,7 @@ QColor QColor::fromRgba64(ushort r, ushort g, ushort b, ushort a) Q_DECL_NOTHROW
 
     \sa fromRgb(), fromRgbF(), toRgb(), isValid()
 */
-QColor QColor::fromRgba64(QRgba64 rgba64) Q_DECL_NOTHROW
+QColor QColor::fromRgba64(QRgba64 rgba64) noexcept
 {
     QColor color;
     color.setRgba64(rgba64);
@@ -2714,7 +2839,7 @@ QColor QColor::fromCmykF(qreal c, qreal m, qreal y, qreal k, qreal a)
 
     \sa darker(), isValid()
 */
-QColor QColor::lighter(int factor) const Q_DECL_NOTHROW
+QColor QColor::lighter(int factor) const noexcept
 {
     if (factor <= 0)                                // invalid lightness factor
         return *this;
@@ -2759,7 +2884,7 @@ QColor QColor::lighter(int factor) const Q_DECL_NOTHROW
 
     \sa lighter(), isValid()
 */
-QColor QColor::darker(int factor) const Q_DECL_NOTHROW
+QColor QColor::darker(int factor) const noexcept
 {
     if (factor <= 0)                                // invalid darkness factor
         return *this;
@@ -2779,7 +2904,7 @@ QColor QColor::darker(int factor) const Q_DECL_NOTHROW
 
     Use lighter(\a factor) instead.
 */
-QColor QColor::light(int factor) const Q_DECL_NOTHROW
+QColor QColor::light(int factor) const noexcept
 {
     return lighter(factor);
 }
@@ -2789,7 +2914,7 @@ QColor QColor::light(int factor) const Q_DECL_NOTHROW
 
     Use darker(\a factor) instead.
 */
-QColor QColor::dark(int factor) const Q_DECL_NOTHROW
+QColor QColor::dark(int factor) const noexcept
 {
     return darker(factor);
 }
@@ -2799,7 +2924,7 @@ QColor QColor::dark(int factor) const Q_DECL_NOTHROW
 /*!
     Assigns a copy of \a color to this color, and returns a reference to it.
 */
-QColor &QColor::operator=(const QColor &color) Q_DECL_NOTHROW
+QColor &QColor::operator=(const QColor &color) noexcept
 {
     cspec = color.cspec;
     ct.argb = color.ct.argb;
@@ -2810,7 +2935,7 @@ QColor &QColor::operator=(const QColor &color) Q_DECL_NOTHROW
 /*! \overload
     Assigns a copy of \a color and returns a reference to this color.
  */
-QColor &QColor::operator=(Qt::GlobalColor color) Q_DECL_NOTHROW
+QColor &QColor::operator=(Qt::GlobalColor color) noexcept
 {
     return operator=(QColor(color));
 }
@@ -2819,7 +2944,7 @@ QColor &QColor::operator=(Qt::GlobalColor color) Q_DECL_NOTHROW
     Returns \c true if this color has the same RGB and alpha values as \a color;
     otherwise returns \c false.
 */
-bool QColor::operator==(const QColor &color) const Q_DECL_NOTHROW
+bool QColor::operator==(const QColor &color) const noexcept
 {
     if (cspec == Hsl && cspec == color.cspec) {
         return (ct.argb.alpha == color.ct.argb.alpha
@@ -2846,7 +2971,7 @@ bool QColor::operator==(const QColor &color) const Q_DECL_NOTHROW
     Returns \c true if this color has a different RGB and alpha values from
     \a color; otherwise returns \c false.
 */
-bool QColor::operator!=(const QColor &color) const Q_DECL_NOTHROW
+bool QColor::operator!=(const QColor &color) const noexcept
 { return !operator==(color); }
 
 
@@ -2863,7 +2988,7 @@ QColor::operator QVariant() const
     Marks the color as invalid and sets all components to zero (alpha is set
     to fully opaque for compatibility with Qt 3).
 */
-void QColor::invalidate() Q_DECL_NOTHROW
+void QColor::invalidate() noexcept
 {
     cspec = Invalid;
     ct.argb.alpha = USHRT_MAX;
@@ -2885,6 +3010,8 @@ QDebug operator<<(QDebug dbg, const QColor &c)
         dbg.nospace() << "QColor(Invalid)";
     else if (c.spec() == QColor::Rgb)
         dbg.nospace() << "QColor(ARGB " << c.alphaF() << ", " << c.redF() << ", " << c.greenF() << ", " << c.blueF() << ')';
+    else if (c.spec() == QColor::ExtendedRgb)
+        dbg.nospace() << "QColor(Ext. ARGB " << c.alphaF() << ", " << c.redF() << ", " << c.greenF() << ", " << c.blueF() << ')';
     else if (c.spec() == QColor::Hsv)
         dbg.nospace() << "QColor(AHSV " << c.alphaF() << ", " << c.hueF() << ", " << c.saturationF() << ", " << c.valueF() << ')';
     else if (c.spec() == QColor::Cmyk)
@@ -3134,4 +3261,41 @@ const uint qt_inv_premul_factor[256] = {
     \sa QColor::rgb(), QColor::rgba()
 */
 
+/*!
+    \namespace QColorConstants
+    \inmodule QtGui
+
+    \brief The QColorConstants namespace contains QColor predefined constants.
+
+    These constants are usable everywhere a QColor object is expected:
+
+    \code
+    painter.setBrush(QColorConstants::Svg::lightblue);
+    \endcode
+
+    Their usage is much cheaper than e.g. passing a string to QColor's constructor,
+    as they don't require any parsing of the string, and always result in a valid
+    QColor object:
+
+    \badcode
+    object.setColor(QColor("lightblue")); // expensive
+    \endcode
+
+    \section1 Qt Colors
+
+    The following colors are defined in the \c{QColorConstants} namespace:
+
+    \include qt-colors.qdocinc
+
+    \section1 SVG Colors
+
+    The following table lists the available
+    \l {http://www.w3.org/TR/SVG/types.html#ColorKeywords}{SVG colors}.
+    They are available in the \c{QColorConstants::Svg} inner namespace.
+
+    \include svg-colors.qdocinc
+
+    \sa QColor, Qt::GlobalColor
+*/
+
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index 4822612cf8..f0d7dd23ad 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -64,35 +64,43 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QColor &);
 class Q_GUI_EXPORT QColor
 {
 public:
-    enum Spec { Invalid, Rgb, Hsv, Cmyk, Hsl };
+    enum Spec { Invalid, Rgb, Hsv, Cmyk, Hsl, ExtendedRgb };
     enum NameFormat { HexRgb, HexArgb };
 
-    inline QColor() Q_DECL_NOTHROW;
-    QColor(Qt::GlobalColor color) Q_DECL_NOTHROW;
-    inline QColor(int r, int g, int b, int a = 255);
-    QColor(QRgb rgb) Q_DECL_NOTHROW;
-    QColor(QRgba64 rgba64) Q_DECL_NOTHROW;
+    Q_DECL_CONSTEXPR QColor() noexcept
+        : cspec(Invalid), ct(USHRT_MAX, 0, 0, 0, 0) {}
+    QColor(Qt::GlobalColor color) noexcept;
+    Q_DECL_CONSTEXPR QColor(int r, int g, int b, int a = 255) noexcept
+        : cspec(isRgbaValid(r, g, b, a) ? Rgb : Invalid),
+          ct(cspec == Rgb ? a * 0x0101 : 0,
+             cspec == Rgb ? r * 0x0101 : 0,
+             cspec == Rgb ? g * 0x0101 : 0,
+             cspec == Rgb ? b * 0x0101 : 0,
+             0) {}
+    QColor(QRgb rgb) noexcept;
+    QColor(QRgba64 rgba64) noexcept;
 #if QT_STRINGVIEW_LEVEL < 2
     inline QColor(const QString& name);
 #endif
     explicit inline QColor(QStringView name);
     inline QColor(const char *aname) : QColor(QLatin1String(aname)) {}
     inline QColor(QLatin1String name);
-    QColor(Spec spec) Q_DECL_NOTHROW;
+    QColor(Spec spec) noexcept;
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    inline QColor(const QColor &color) Q_DECL_NOTHROW; // ### Qt 6: remove all of these, the trivial ones are fine.
-# ifdef Q_COMPILER_RVALUE_REFS
-    QColor(QColor &&other) Q_DECL_NOTHROW : cspec(other.cspec), ct(other.ct) {}
-    QColor &operator=(QColor &&other) Q_DECL_NOTHROW
+    // ### Qt 6: remove all of these, the trivial ones are fine.
+    Q_DECL_CONSTEXPR QColor(const QColor &color) noexcept
+        : cspec(color.cspec), ct(color.ct)
+    {}
+    Q_DECL_CONSTEXPR QColor(QColor &&other) noexcept : cspec(other.cspec), ct(other.ct) {}
+    QColor &operator=(QColor &&other) noexcept
     { cspec = other.cspec; ct = other.ct; return *this; }
-# endif
-    QColor &operator=(const QColor &) Q_DECL_NOTHROW;
+    QColor &operator=(const QColor &) noexcept;
 #endif // Qt < 6
 
-    QColor &operator=(Qt::GlobalColor color) Q_DECL_NOTHROW;
+    QColor &operator=(Qt::GlobalColor color) noexcept;
 
-    bool isValid() const Q_DECL_NOTHROW;
+    bool isValid() const noexcept;
 
     // ### Qt 6: merge overloads
     QString name() const;
@@ -106,25 +114,25 @@ public:
 
     static QStringList colorNames();
 
-    inline Spec spec() const Q_DECL_NOTHROW
+    inline Spec spec() const noexcept
     { return cspec; }
 
-    int alpha() const Q_DECL_NOTHROW;
+    int alpha() const noexcept;
     void setAlpha(int alpha);
 
-    qreal alphaF() const Q_DECL_NOTHROW;
+    qreal alphaF() const noexcept;
     void setAlphaF(qreal alpha);
 
-    int red() const Q_DECL_NOTHROW;
-    int green() const Q_DECL_NOTHROW;
-    int blue() const Q_DECL_NOTHROW;
+    int red() const noexcept;
+    int green() const noexcept;
+    int blue() const noexcept;
     void setRed(int red);
     void setGreen(int green);
     void setBlue(int blue);
 
-    qreal redF() const Q_DECL_NOTHROW;
-    qreal greenF() const Q_DECL_NOTHROW;
-    qreal blueF() const Q_DECL_NOTHROW;
+    qreal redF() const noexcept;
+    qreal greenF() const noexcept;
+    qreal blueF() const noexcept;
     void setRedF(qreal red);
     void setGreenF(qreal green);
     void setBlueF(qreal blue);
@@ -135,26 +143,26 @@ public:
     void getRgbF(qreal *r, qreal *g, qreal *b, qreal *a = nullptr) const;
     void setRgbF(qreal r, qreal g, qreal b, qreal a = 1.0);
 
-    QRgba64 rgba64() const Q_DECL_NOTHROW;
-    void setRgba64(QRgba64 rgba) Q_DECL_NOTHROW;
+    QRgba64 rgba64() const noexcept;
+    void setRgba64(QRgba64 rgba) noexcept;
 
-    QRgb rgba() const Q_DECL_NOTHROW;
-    void setRgba(QRgb rgba) Q_DECL_NOTHROW;
+    QRgb rgba() const noexcept;
+    void setRgba(QRgb rgba) noexcept;
 
-    QRgb rgb() const Q_DECL_NOTHROW;
-    void setRgb(QRgb rgb) Q_DECL_NOTHROW;
+    QRgb rgb() const noexcept;
+    void setRgb(QRgb rgb) noexcept;
 
-    int hue() const Q_DECL_NOTHROW; // 0 <= hue < 360
-    int saturation() const Q_DECL_NOTHROW;
-    int hsvHue() const Q_DECL_NOTHROW; // 0 <= hue < 360
-    int hsvSaturation() const Q_DECL_NOTHROW;
-    int value() const Q_DECL_NOTHROW;
+    int hue() const noexcept; // 0 <= hue < 360
+    int saturation() const noexcept;
+    int hsvHue() const noexcept; // 0 <= hue < 360
+    int hsvSaturation() const noexcept;
+    int value() const noexcept;
 
-    qreal hueF() const Q_DECL_NOTHROW; // 0.0 <= hueF < 360.0
-    qreal saturationF() const Q_DECL_NOTHROW;
-    qreal hsvHueF() const Q_DECL_NOTHROW; // 0.0 <= hueF < 360.0
-    qreal hsvSaturationF() const Q_DECL_NOTHROW;
-    qreal valueF() const Q_DECL_NOTHROW;
+    qreal hueF() const noexcept; // 0.0 <= hueF < 360.0
+    qreal saturationF() const noexcept;
+    qreal hsvHueF() const noexcept; // 0.0 <= hueF < 360.0
+    qreal hsvSaturationF() const noexcept;
+    qreal valueF() const noexcept;
 
     void getHsv(int *h, int *s, int *v, int *a = nullptr) const;
     void setHsv(int h, int s, int v, int a = 255);
@@ -162,15 +170,15 @@ public:
     void getHsvF(qreal *h, qreal *s, qreal *v, qreal *a = nullptr) const;
     void setHsvF(qreal h, qreal s, qreal v, qreal a = 1.0);
 
-    int cyan() const Q_DECL_NOTHROW;
-    int magenta() const Q_DECL_NOTHROW;
-    int yellow() const Q_DECL_NOTHROW;
-    int black() const Q_DECL_NOTHROW;
+    int cyan() const noexcept;
+    int magenta() const noexcept;
+    int yellow() const noexcept;
+    int black() const noexcept;
 
-    qreal cyanF() const Q_DECL_NOTHROW;
-    qreal magentaF() const Q_DECL_NOTHROW;
-    qreal yellowF() const Q_DECL_NOTHROW;
-    qreal blackF() const Q_DECL_NOTHROW;
+    qreal cyanF() const noexcept;
+    qreal magentaF() const noexcept;
+    qreal yellowF() const noexcept;
+    qreal blackF() const noexcept;
 
     void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr); // ### Qt 6: remove
     void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr) const;
@@ -180,13 +188,13 @@ public:
     void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr) const;
     void setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a = 1.0);
 
-    int hslHue() const Q_DECL_NOTHROW; // 0 <= hue < 360
-    int hslSaturation() const Q_DECL_NOTHROW;
-    int lightness() const Q_DECL_NOTHROW;
+    int hslHue() const noexcept; // 0 <= hue < 360
+    int hslSaturation() const noexcept;
+    int lightness() const noexcept;
 
-    qreal hslHueF() const Q_DECL_NOTHROW; // 0.0 <= hueF < 360.0
-    qreal hslSaturationF() const Q_DECL_NOTHROW;
-    qreal lightnessF() const Q_DECL_NOTHROW;
+    qreal hslHueF() const noexcept; // 0.0 <= hueF < 360.0
+    qreal hslSaturationF() const noexcept;
+    qreal lightnessF() const noexcept;
 
     void getHsl(int *h, int *s, int *l, int *a = nullptr) const;
     void setHsl(int h, int s, int l, int a = 255);
@@ -194,21 +202,22 @@ public:
     void getHslF(qreal *h, qreal *s, qreal *l, qreal *a = nullptr) const;
     void setHslF(qreal h, qreal s, qreal l, qreal a = 1.0);
 
-    QColor toRgb() const Q_DECL_NOTHROW;
-    QColor toHsv() const Q_DECL_NOTHROW;
-    QColor toCmyk() const Q_DECL_NOTHROW;
-    QColor toHsl() const Q_DECL_NOTHROW;
+    QColor toRgb() const noexcept;
+    QColor toHsv() const noexcept;
+    QColor toCmyk() const noexcept;
+    QColor toHsl() const noexcept;
+    QColor toExtendedRgb() const noexcept;
 
-    Q_REQUIRED_RESULT QColor convertTo(Spec colorSpec) const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT QColor convertTo(Spec colorSpec) const noexcept;
 
-    static QColor fromRgb(QRgb rgb) Q_DECL_NOTHROW;
-    static QColor fromRgba(QRgb rgba) Q_DECL_NOTHROW;
+    static QColor fromRgb(QRgb rgb) noexcept;
+    static QColor fromRgba(QRgb rgba) noexcept;
 
     static QColor fromRgb(int r, int g, int b, int a = 255);
     static QColor fromRgbF(qreal r, qreal g, qreal b, qreal a = 1.0);
 
-    static QColor fromRgba64(ushort r, ushort g, ushort b, ushort a = USHRT_MAX) Q_DECL_NOTHROW;
-    static QColor fromRgba64(QRgba64 rgba) Q_DECL_NOTHROW;
+    static QColor fromRgba64(ushort r, ushort g, ushort b, ushort a = USHRT_MAX) noexcept;
+    static QColor fromRgba64(QRgba64 rgba) noexcept;
 
     static QColor fromHsv(int h, int s, int v, int a = 255);
     static QColor fromHsvF(qreal h, qreal s, qreal v, qreal a = 1.0);
@@ -221,32 +230,42 @@ public:
 
 #if QT_DEPRECATED_SINCE(5, 13)
     QT_DEPRECATED_X("Use QColor::lighter() instead")
-    Q_REQUIRED_RESULT QColor light(int f = 150) const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT QColor light(int f = 150) const noexcept;
     QT_DEPRECATED_X("Use QColor::darker() instead")
-    Q_REQUIRED_RESULT QColor dark(int f = 200) const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT QColor dark(int f = 200) const noexcept;
 #endif
-    Q_REQUIRED_RESULT QColor lighter(int f = 150) const Q_DECL_NOTHROW;
-    Q_REQUIRED_RESULT QColor darker(int f = 200) const Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT QColor lighter(int f = 150) const noexcept;
+    Q_REQUIRED_RESULT QColor darker(int f = 200) const noexcept;
 
-    bool operator==(const QColor &c) const Q_DECL_NOTHROW;
-    bool operator!=(const QColor &c) const Q_DECL_NOTHROW;
+    bool operator==(const QColor &c) const noexcept;
+    bool operator!=(const QColor &c) const noexcept;
 
     operator QVariant() const;
 
 #if QT_STRINGVIEW_LEVEL < 2
     static bool isValidColor(const QString &name);
 #endif
-    static bool isValidColor(QStringView) Q_DECL_NOTHROW;
-    static bool isValidColor(QLatin1String) Q_DECL_NOTHROW;
+    static bool isValidColor(QStringView) noexcept;
+    static bool isValidColor(QLatin1String) noexcept;
 
 private:
 
-    void invalidate() Q_DECL_NOTHROW;
+    void invalidate() noexcept;
     template <typename String>
     bool setColorFromString(String name);
 
+    static Q_DECL_CONSTEXPR bool isRgbaValid(int r, int g, int b, int a = 255) noexcept Q_DECL_CONST_FUNCTION
+    {
+        return uint(r) <= 255 && uint(g) <= 255 && uint(b) <= 255 && uint(a) <= 255;
+    }
+
     Spec cspec;
-    union {
+    union CT {
+#ifdef Q_COMPILER_UNIFORM_INIT
+        CT() {} // doesn't init anything, thus can't be constexpr
+        Q_DECL_CONSTEXPR explicit CT(ushort a1, ushort a2, ushort a3, ushort a4, ushort a5) noexcept
+            : array{a1, a2, a3, a4, a5} {}
+#endif
         struct {
             ushort alpha;
             ushort red;
@@ -275,6 +294,13 @@ private:
             ushort lightness;
             ushort pad;
         } ahsl;
+        struct {
+            ushort alphaF16;
+            ushort redF16;
+            ushort greenF16;
+            ushort blueF16;
+            ushort pad;
+        } argbExtended;
         ushort array[5];
     } ct;
 
@@ -283,15 +309,15 @@ private:
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QColor &);
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QColor &);
 #endif
+
+#ifdef Q_COMPILER_UNIFORM_INIT
+public: // can't give friendship to a namespace, so it needs to be public
+    Q_DECL_CONSTEXPR explicit QColor(Spec spec, ushort a1, ushort a2, ushort a3, ushort a4, ushort a5=0) noexcept
+        : cspec(spec), ct(a1, a2, a3, a4, a5) {}
+#endif // Q_COMPILER_UNIFORM_INIT
 };
 Q_DECLARE_TYPEINFO(QColor, QT_VERSION >= QT_VERSION_CHECK(6,0,0) ? Q_MOVABLE_TYPE : Q_RELOCATABLE_TYPE);
 
-inline QColor::QColor() Q_DECL_NOTHROW
-{ invalidate(); }
-
-inline QColor::QColor(int r, int g, int b, int a)
-{ setRgb(r, g, b, a); }
-
 inline QColor::QColor(QLatin1String aname)
 { setNamedColor(aname); }
 
@@ -303,15 +329,190 @@ inline QColor::QColor(const QString& aname)
 { setNamedColor(aname); }
 #endif
 
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-inline QColor::QColor(const QColor &acolor) Q_DECL_NOTHROW
-    : cspec(acolor.cspec)
-{ ct.argb = acolor.ct.argb; }
-#endif
-
-inline bool QColor::isValid() const Q_DECL_NOTHROW
+inline bool QColor::isValid() const noexcept
 { return cspec != Invalid; }
 
+// define these namespaces even if the contents are ifdef'd out
+namespace QColorConstants
+{
+namespace Svg {}
+
+#if defined(Q_COMPILER_CONSTEXPR) & defined(Q_COMPILER_UNIFORM_INIT)
+    // Qt::GlobalColor names
+    constexpr Q_DECL_UNUSED QColor Color0      {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor Color1      {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor Black       {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor White       {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor DarkGray    {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x80 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor Gray        {QColor::Rgb, 0xff * 0x101, 0xa0 * 0x101, 0xa0 * 0x101, 0xa4 * 0x101};
+    constexpr Q_DECL_UNUSED QColor LightGray   {QColor::Rgb, 0xff * 0x101, 0xc0 * 0x101, 0xc0 * 0x101, 0xc0 * 0x101};
+    constexpr Q_DECL_UNUSED QColor Red         {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor Green       {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor Blue        {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor Cyan        {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor Magenta     {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor Yellow      {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor DarkRed     {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor DarkGreen   {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x80 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor DarkBlue    {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor DarkCyan    {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x80 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor DarkMagenta {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x00 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor DarkYellow  {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x80 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor Transparent {QColor::Rgb, 0x00 * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+
+    // SVG names supported by QColor (see qcolor.cpp).
+namespace Svg {
+    constexpr Q_DECL_UNUSED QColor aliceblue                {QColor::Rgb, 0xff * 0x101, 0xf0 * 0x101, 0xf8 * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor antiquewhite             {QColor::Rgb, 0xff * 0x101, 0xfa * 0x101, 0xeb * 0x101, 0xd7 * 0x101};
+    constexpr Q_DECL_UNUSED QColor aqua                     {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor aquamarine               {QColor::Rgb, 0xff * 0x101, 0x7f * 0x101, 0xff * 0x101, 0xd4 * 0x101};
+    constexpr Q_DECL_UNUSED QColor azure                    {QColor::Rgb, 0xff * 0x101, 0xf0 * 0x101, 0xff * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor beige                    {QColor::Rgb, 0xff * 0x101, 0xf5 * 0x101, 0xf5 * 0x101, 0xdc * 0x101};
+    constexpr Q_DECL_UNUSED QColor bisque                   {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xe4 * 0x101, 0xc4 * 0x101};
+    constexpr Q_DECL_UNUSED QColor black                    {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor blanchedalmond           {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xeb * 0x101, 0xcd * 0x101};
+    constexpr Q_DECL_UNUSED QColor blue                     {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor blueviolet               {QColor::Rgb, 0xff * 0x101, 0x8a * 0x101, 0x2b * 0x101, 0xe2 * 0x101};
+    constexpr Q_DECL_UNUSED QColor brown                    {QColor::Rgb, 0xff * 0x101, 0xa5 * 0x101, 0x2a * 0x101, 0x2a * 0x101};
+    constexpr Q_DECL_UNUSED QColor burlywood                {QColor::Rgb, 0xff * 0x101, 0xde * 0x101, 0xb8 * 0x101, 0x87 * 0x101};
+    constexpr Q_DECL_UNUSED QColor cadetblue                {QColor::Rgb, 0xff * 0x101, 0x5f * 0x101, 0x9e * 0x101, 0xa0 * 0x101};
+    constexpr Q_DECL_UNUSED QColor chartreuse               {QColor::Rgb, 0xff * 0x101, 0x7f * 0x101, 0xff * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor chocolate                {QColor::Rgb, 0xff * 0x101, 0xd2 * 0x101, 0x69 * 0x101, 0x1e * 0x101};
+    constexpr Q_DECL_UNUSED QColor coral                    {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x7f * 0x101, 0x50 * 0x101};
+    constexpr Q_DECL_UNUSED QColor cornflowerblue           {QColor::Rgb, 0xff * 0x101, 0x64 * 0x101, 0x95 * 0x101, 0xed * 0x101};
+    constexpr Q_DECL_UNUSED QColor cornsilk                 {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xf8 * 0x101, 0xdc * 0x101};
+    constexpr Q_DECL_UNUSED QColor crimson                  {QColor::Rgb, 0xff * 0x101, 0xdc * 0x101, 0x14 * 0x101, 0x3c * 0x101};
+    constexpr Q_DECL_UNUSED QColor cyan                     {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkblue                 {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0x8b * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkcyan                 {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x8b * 0x101, 0x8b * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkgoldenrod            {QColor::Rgb, 0xff * 0x101, 0xb8 * 0x101, 0x86 * 0x101, 0x0b * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkgray                 {QColor::Rgb, 0xff * 0x101, 0xa9 * 0x101, 0xa9 * 0x101, 0xa9 * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkgreen                {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x64 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkgrey                 {QColor::Rgb, 0xff * 0x101, 0xa9 * 0x101, 0xa9 * 0x101, 0xa9 * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkkhaki                {QColor::Rgb, 0xff * 0x101, 0xbd * 0x101, 0xb7 * 0x101, 0x6b * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkmagenta              {QColor::Rgb, 0xff * 0x101, 0x8b * 0x101, 0x00 * 0x101, 0x8b * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkolivegreen           {QColor::Rgb, 0xff * 0x101, 0x55 * 0x101, 0x6b * 0x101, 0x2f * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkorange               {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x8c * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkorchid               {QColor::Rgb, 0xff * 0x101, 0x99 * 0x101, 0x32 * 0x101, 0xcc * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkred                  {QColor::Rgb, 0xff * 0x101, 0x8b * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor darksalmon               {QColor::Rgb, 0xff * 0x101, 0xe9 * 0x101, 0x96 * 0x101, 0x7a * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkseagreen             {QColor::Rgb, 0xff * 0x101, 0x8f * 0x101, 0xbc * 0x101, 0x8f * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkslateblue            {QColor::Rgb, 0xff * 0x101, 0x48 * 0x101, 0x3d * 0x101, 0x8b * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkslategray            {QColor::Rgb, 0xff * 0x101, 0x2f * 0x101, 0x4f * 0x101, 0x4f * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkslategrey            {QColor::Rgb, 0xff * 0x101, 0x2f * 0x101, 0x4f * 0x101, 0x4f * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkturquoise            {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xce * 0x101, 0xd1 * 0x101};
+    constexpr Q_DECL_UNUSED QColor darkviolet               {QColor::Rgb, 0xff * 0x101, 0x94 * 0x101, 0x00 * 0x101, 0xd3 * 0x101};
+    constexpr Q_DECL_UNUSED QColor deeppink                 {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x14 * 0x101, 0x93 * 0x101};
+    constexpr Q_DECL_UNUSED QColor deepskyblue              {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xbf * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor dimgray                  {QColor::Rgb, 0xff * 0x101, 0x69 * 0x101, 0x69 * 0x101, 0x69 * 0x101};
+    constexpr Q_DECL_UNUSED QColor dimgrey                  {QColor::Rgb, 0xff * 0x101, 0x69 * 0x101, 0x69 * 0x101, 0x69 * 0x101};
+    constexpr Q_DECL_UNUSED QColor dodgerblue               {QColor::Rgb, 0xff * 0x101, 0x1e * 0x101, 0x90 * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor firebrick                {QColor::Rgb, 0xff * 0x101, 0xb2 * 0x101, 0x22 * 0x101, 0x22 * 0x101};
+    constexpr Q_DECL_UNUSED QColor floralwhite              {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xfa * 0x101, 0xf0 * 0x101};
+    constexpr Q_DECL_UNUSED QColor forestgreen              {QColor::Rgb, 0xff * 0x101, 0x22 * 0x101, 0x8b * 0x101, 0x22 * 0x101};
+    constexpr Q_DECL_UNUSED QColor fuchsia                  {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor gainsboro                {QColor::Rgb, 0xff * 0x101, 0xdc * 0x101, 0xdc * 0x101, 0xdc * 0x101};
+    constexpr Q_DECL_UNUSED QColor ghostwhite               {QColor::Rgb, 0xff * 0x101, 0xf8 * 0x101, 0xf8 * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor gold                     {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xd7 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor goldenrod                {QColor::Rgb, 0xff * 0x101, 0xda * 0x101, 0xa5 * 0x101, 0x20 * 0x101};
+    constexpr Q_DECL_UNUSED QColor gray                     {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x80 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor green                    {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x80 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor greenyellow              {QColor::Rgb, 0xff * 0x101, 0xad * 0x101, 0xff * 0x101, 0x2f * 0x101};
+    constexpr Q_DECL_UNUSED QColor grey                     {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x80 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor honeydew                 {QColor::Rgb, 0xff * 0x101, 0xf0 * 0x101, 0xff * 0x101, 0xf0 * 0x101};
+    constexpr Q_DECL_UNUSED QColor hotpink                  {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x69 * 0x101, 0xb4 * 0x101};
+    constexpr Q_DECL_UNUSED QColor indianred                {QColor::Rgb, 0xff * 0x101, 0xcd * 0x101, 0x5c * 0x101, 0x5c * 0x101};
+    constexpr Q_DECL_UNUSED QColor indigo                   {QColor::Rgb, 0xff * 0x101, 0x4b * 0x101, 0x00 * 0x101, 0x82 * 0x101};
+    constexpr Q_DECL_UNUSED QColor ivory                    {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101, 0xf0 * 0x101};
+    constexpr Q_DECL_UNUSED QColor khaki                    {QColor::Rgb, 0xff * 0x101, 0xf0 * 0x101, 0xe6 * 0x101, 0x8c * 0x101};
+    constexpr Q_DECL_UNUSED QColor lavender                 {QColor::Rgb, 0xff * 0x101, 0xe6 * 0x101, 0xe6 * 0x101, 0xfa * 0x101};
+    constexpr Q_DECL_UNUSED QColor lavenderblush            {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xf0 * 0x101, 0xf5 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lawngreen                {QColor::Rgb, 0xff * 0x101, 0x7c * 0x101, 0xfc * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lemonchiffon             {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xfa * 0x101, 0xcd * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightblue                {QColor::Rgb, 0xff * 0x101, 0xad * 0x101, 0xd8 * 0x101, 0xe6 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightcoral               {QColor::Rgb, 0xff * 0x101, 0xf0 * 0x101, 0x80 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightcyan                {QColor::Rgb, 0xff * 0x101, 0xe0 * 0x101, 0xff * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightgoldenrodyellow     {QColor::Rgb, 0xff * 0x101, 0xfa * 0x101, 0xfa * 0x101, 0xd2 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightgray                {QColor::Rgb, 0xff * 0x101, 0xd3 * 0x101, 0xd3 * 0x101, 0xd3 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightgreen               {QColor::Rgb, 0xff * 0x101, 0x90 * 0x101, 0xee * 0x101, 0x90 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightgrey                {QColor::Rgb, 0xff * 0x101, 0xd3 * 0x101, 0xd3 * 0x101, 0xd3 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightpink                {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xb6 * 0x101, 0xc1 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightsalmon              {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xa0 * 0x101, 0x7a * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightseagreen            {QColor::Rgb, 0xff * 0x101, 0x20 * 0x101, 0xb2 * 0x101, 0xaa * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightskyblue             {QColor::Rgb, 0xff * 0x101, 0x87 * 0x101, 0xce * 0x101, 0xfa * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightslategray           {QColor::Rgb, 0xff * 0x101, 0x77 * 0x101, 0x88 * 0x101, 0x99 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightslategrey           {QColor::Rgb, 0xff * 0x101, 0x77 * 0x101, 0x88 * 0x101, 0x99 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightsteelblue           {QColor::Rgb, 0xff * 0x101, 0xb0 * 0x101, 0xc4 * 0x101, 0xde * 0x101};
+    constexpr Q_DECL_UNUSED QColor lightyellow              {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101, 0xe0 * 0x101};
+    constexpr Q_DECL_UNUSED QColor lime                     {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor limegreen                {QColor::Rgb, 0xff * 0x101, 0x32 * 0x101, 0xcd * 0x101, 0x32 * 0x101};
+    constexpr Q_DECL_UNUSED QColor linen                    {QColor::Rgb, 0xff * 0x101, 0xfa * 0x101, 0xf0 * 0x101, 0xe6 * 0x101};
+    constexpr Q_DECL_UNUSED QColor magenta                  {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor maroon                   {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumaquamarine         {QColor::Rgb, 0xff * 0x101, 0x66 * 0x101, 0xcd * 0x101, 0xaa * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumblue               {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0xcd * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumorchid             {QColor::Rgb, 0xff * 0x101, 0xba * 0x101, 0x55 * 0x101, 0xd3 * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumpurple             {QColor::Rgb, 0xff * 0x101, 0x93 * 0x101, 0x70 * 0x101, 0xdb * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumseagreen           {QColor::Rgb, 0xff * 0x101, 0x3c * 0x101, 0xb3 * 0x101, 0x71 * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumslateblue          {QColor::Rgb, 0xff * 0x101, 0x7b * 0x101, 0x68 * 0x101, 0xee * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumspringgreen        {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xfa * 0x101, 0x9a * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumturquoise          {QColor::Rgb, 0xff * 0x101, 0x48 * 0x101, 0xd1 * 0x101, 0xcc * 0x101};
+    constexpr Q_DECL_UNUSED QColor mediumvioletred          {QColor::Rgb, 0xff * 0x101, 0xc7 * 0x101, 0x15 * 0x101, 0x85 * 0x101};
+    constexpr Q_DECL_UNUSED QColor midnightblue             {QColor::Rgb, 0xff * 0x101, 0x19 * 0x101, 0x19 * 0x101, 0x70 * 0x101};
+    constexpr Q_DECL_UNUSED QColor mintcream                {QColor::Rgb, 0xff * 0x101, 0xf5 * 0x101, 0xff * 0x101, 0xfa * 0x101};
+    constexpr Q_DECL_UNUSED QColor mistyrose                {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xe4 * 0x101, 0xe1 * 0x101};
+    constexpr Q_DECL_UNUSED QColor moccasin                 {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xe4 * 0x101, 0xb5 * 0x101};
+    constexpr Q_DECL_UNUSED QColor navajowhite              {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xde * 0x101, 0xad * 0x101};
+    constexpr Q_DECL_UNUSED QColor navy                     {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor oldlace                  {QColor::Rgb, 0xff * 0x101, 0xfd * 0x101, 0xf5 * 0x101, 0xe6 * 0x101};
+    constexpr Q_DECL_UNUSED QColor olive                    {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x80 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor olivedrab                {QColor::Rgb, 0xff * 0x101, 0x6b * 0x101, 0x8e * 0x101, 0x23 * 0x101};
+    constexpr Q_DECL_UNUSED QColor orange                   {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xa5 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor orangered                {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x45 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor orchid                   {QColor::Rgb, 0xff * 0x101, 0xda * 0x101, 0x70 * 0x101, 0xd6 * 0x101};
+    constexpr Q_DECL_UNUSED QColor palegoldenrod            {QColor::Rgb, 0xff * 0x101, 0xee * 0x101, 0xe8 * 0x101, 0xaa * 0x101};
+    constexpr Q_DECL_UNUSED QColor palegreen                {QColor::Rgb, 0xff * 0x101, 0x98 * 0x101, 0xfb * 0x101, 0x98 * 0x101};
+    constexpr Q_DECL_UNUSED QColor paleturquoise            {QColor::Rgb, 0xff * 0x101, 0xaf * 0x101, 0xee * 0x101, 0xee * 0x101};
+    constexpr Q_DECL_UNUSED QColor palevioletred            {QColor::Rgb, 0xff * 0x101, 0xdb * 0x101, 0x70 * 0x101, 0x93 * 0x101};
+    constexpr Q_DECL_UNUSED QColor papayawhip               {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xef * 0x101, 0xd5 * 0x101};
+    constexpr Q_DECL_UNUSED QColor peachpuff                {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xda * 0x101, 0xb9 * 0x101};
+    constexpr Q_DECL_UNUSED QColor peru                     {QColor::Rgb, 0xff * 0x101, 0xcd * 0x101, 0x85 * 0x101, 0x3f * 0x101};
+    constexpr Q_DECL_UNUSED QColor pink                     {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xc0 * 0x101, 0xcb * 0x101};
+    constexpr Q_DECL_UNUSED QColor plum                     {QColor::Rgb, 0xff * 0x101, 0xdd * 0x101, 0xa0 * 0x101, 0xdd * 0x101};
+    constexpr Q_DECL_UNUSED QColor powderblue               {QColor::Rgb, 0xff * 0x101, 0xb0 * 0x101, 0xe0 * 0x101, 0xe6 * 0x101};
+    constexpr Q_DECL_UNUSED QColor purple                   {QColor::Rgb, 0xff * 0x101, 0x80 * 0x101, 0x00 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor red                      {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x00 * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor rosybrown                {QColor::Rgb, 0xff * 0x101, 0xbc * 0x101, 0x8f * 0x101, 0x8f * 0x101};
+    constexpr Q_DECL_UNUSED QColor royalblue                {QColor::Rgb, 0xff * 0x101, 0x41 * 0x101, 0x69 * 0x101, 0xe1 * 0x101};
+    constexpr Q_DECL_UNUSED QColor saddlebrown              {QColor::Rgb, 0xff * 0x101, 0x8b * 0x101, 0x45 * 0x101, 0x13 * 0x101};
+    constexpr Q_DECL_UNUSED QColor salmon                   {QColor::Rgb, 0xff * 0x101, 0xfa * 0x101, 0x80 * 0x101, 0x72 * 0x101};
+    constexpr Q_DECL_UNUSED QColor sandybrown               {QColor::Rgb, 0xff * 0x101, 0xf4 * 0x101, 0xa4 * 0x101, 0x60 * 0x101};
+    constexpr Q_DECL_UNUSED QColor seagreen                 {QColor::Rgb, 0xff * 0x101, 0x2e * 0x101, 0x8b * 0x101, 0x57 * 0x101};
+    constexpr Q_DECL_UNUSED QColor seashell                 {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xf5 * 0x101, 0xee * 0x101};
+    constexpr Q_DECL_UNUSED QColor sienna                   {QColor::Rgb, 0xff * 0x101, 0xa0 * 0x101, 0x52 * 0x101, 0x2d * 0x101};
+    constexpr Q_DECL_UNUSED QColor silver                   {QColor::Rgb, 0xff * 0x101, 0xc0 * 0x101, 0xc0 * 0x101, 0xc0 * 0x101};
+    constexpr Q_DECL_UNUSED QColor skyblue                  {QColor::Rgb, 0xff * 0x101, 0x87 * 0x101, 0xce * 0x101, 0xeb * 0x101};
+    constexpr Q_DECL_UNUSED QColor slateblue                {QColor::Rgb, 0xff * 0x101, 0x6a * 0x101, 0x5a * 0x101, 0xcd * 0x101};
+    constexpr Q_DECL_UNUSED QColor slategray                {QColor::Rgb, 0xff * 0x101, 0x70 * 0x101, 0x80 * 0x101, 0x90 * 0x101};
+    constexpr Q_DECL_UNUSED QColor slategrey                {QColor::Rgb, 0xff * 0x101, 0x70 * 0x101, 0x80 * 0x101, 0x90 * 0x101};
+    constexpr Q_DECL_UNUSED QColor snow                     {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xfa * 0x101, 0xfa * 0x101};
+    constexpr Q_DECL_UNUSED QColor springgreen              {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0xff * 0x101, 0x7f * 0x101};
+    constexpr Q_DECL_UNUSED QColor steelblue                {QColor::Rgb, 0xff * 0x101, 0x46 * 0x101, 0x82 * 0x101, 0xb4 * 0x101};
+    constexpr Q_DECL_UNUSED QColor tan                      {QColor::Rgb, 0xff * 0x101, 0xd2 * 0x101, 0xb4 * 0x101, 0x8c * 0x101};
+    constexpr Q_DECL_UNUSED QColor teal                     {QColor::Rgb, 0xff * 0x101, 0x00 * 0x101, 0x80 * 0x101, 0x80 * 0x101};
+    constexpr Q_DECL_UNUSED QColor thistle                  {QColor::Rgb, 0xff * 0x101, 0xd8 * 0x101, 0xbf * 0x101, 0xd8 * 0x101};
+    constexpr Q_DECL_UNUSED QColor tomato                   {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0x63 * 0x101, 0x47 * 0x101};
+    constexpr Q_DECL_UNUSED QColor turquoise                {QColor::Rgb, 0xff * 0x101, 0x40 * 0x101, 0xe0 * 0x101, 0xd0 * 0x101};
+    constexpr Q_DECL_UNUSED QColor violet                   {QColor::Rgb, 0xff * 0x101, 0xee * 0x101, 0x82 * 0x101, 0xee * 0x101};
+    constexpr Q_DECL_UNUSED QColor wheat                    {QColor::Rgb, 0xff * 0x101, 0xf5 * 0x101, 0xde * 0x101, 0xb3 * 0x101};
+    constexpr Q_DECL_UNUSED QColor white                    {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101};
+    constexpr Q_DECL_UNUSED QColor whitesmoke               {QColor::Rgb, 0xff * 0x101, 0xf5 * 0x101, 0xf5 * 0x101, 0xf5 * 0x101};
+    constexpr Q_DECL_UNUSED QColor yellow                   {QColor::Rgb, 0xff * 0x101, 0xff * 0x101, 0xff * 0x101, 0x00 * 0x101};
+    constexpr Q_DECL_UNUSED QColor yellowgreen              {QColor::Rgb, 0xff * 0x101, 0x9a * 0x101, 0xcd * 0x101, 0x32 * 0x101};
+}  // namespace Svg
+#endif // Q_COMPILER_CONSTEXPR && Q_COMPILER_UNIFORM_INIT
+}  // namespace QColorLiterals
+
 QT_END_NAMESPACE
 
 #endif // QCOLOR_H
diff --git a/src/gui/painting/qcolormatrix_p.h b/src/gui/painting/qcolormatrix_p.h
new file mode 100644
index 0000000000..edb2d32258
--- /dev/null
+++ b/src/gui/painting/qcolormatrix_p.h
@@ -0,0 +1,237 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOLORMATRIX_H
+#define QCOLORMATRIX_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/qtguiglobal.h>
+#include <QtCore/qpoint.h>
+#include <cmath>
+
+QT_BEGIN_NAMESPACE
+
+// An abstract 3 value color
+class QColorVector
+{
+public:
+    QColorVector() = default;
+    Q_DECL_CONSTEXPR QColorVector(float x, float y, float z) : x(x), y(y), z(z) { }
+    explicit Q_DECL_CONSTEXPR QColorVector(const QPointF &chr) // from XY chromaticity
+            : x(chr.x() / chr.y())
+            , y(1.0f)
+            , z((1.0 - chr.x() - chr.y()) / chr.y())
+    { }
+    float x = 0.0f; // X, x or red
+    float y = 0.0f; // Y, y or green
+    float z = 0.0f; // Z, Y or blue
+    float _unused = 0.0f;
+
+    friend inline bool operator==(const QColorVector &v1, const QColorVector &v2);
+    friend inline bool operator!=(const QColorVector &v1, const QColorVector &v2);
+    bool isNull() const
+    {
+        return !x && !y && !z;
+    }
+
+    static bool isValidChromaticity(const QPointF &chr)
+    {
+        if (chr.x() < qreal(0.0) || chr.x() > qreal(1.0))
+            return false;
+        if (chr.y() <= qreal(0.0) || chr.y() > qreal(1.0))
+            return false;
+        if (chr.x() + chr.y() > qreal(1.0))
+            return false;
+        return true;
+    }
+
+    // Common whitepoints:
+    static Q_DECL_CONSTEXPR QPointF D50Chromaticity() { return QPointF(0.34567, 0.35850); }
+    static Q_DECL_CONSTEXPR QPointF D65Chromaticity() { return QPointF(0.31271, 0.32902); }
+    static Q_DECL_CONSTEXPR QColorVector D50() { return QColorVector(D50Chromaticity()); }
+    static Q_DECL_CONSTEXPR QColorVector D65() { return QColorVector(D65Chromaticity()); }
+};
+
+inline bool operator==(const QColorVector &v1, const QColorVector &v2)
+{
+    return (std::abs(v1.x - v2.x) < (1.0f / 2048.0f))
+        && (std::abs(v1.y - v2.y) < (1.0f / 2048.0f))
+        && (std::abs(v1.z - v2.z) < (1.0f / 2048.0f));
+}
+
+inline bool operator!=(const QColorVector &v1, const QColorVector &v2)
+{
+    return !(v1 == v2);
+}
+
+
+// A matrix mapping 3 value colors.
+// Not using QMatrix because only floats are needed and performance is critical.
+class QColorMatrix
+{
+public:
+    // We are storing the matrix transposed as that is more convenient:
+    QColorVector r;
+    QColorVector g;
+    QColorVector b;
+
+    friend inline bool operator==(const QColorMatrix &m1, const QColorMatrix &m2);
+    friend inline bool operator!=(const QColorMatrix &m1, const QColorMatrix &m2);
+
+    bool isNull() const
+    {
+        return r.isNull() && g.isNull() && b.isNull();
+    }
+    bool isValid() const
+    {
+        // A color matrix must be invertible
+        float det = r.x * (b.z * g.y - g.z * b.y) -
+                    r.y * (b.z * g.x - g.z * b.x) +
+                    r.z * (b.y * g.x - g.y * b.x);
+        return !qFuzzyIsNull(det);
+    }
+
+    QColorMatrix inverted() const
+    {
+        float det = r.x * (b.z * g.y - g.z * b.y) -
+                    r.y * (b.z * g.x - g.z * b.x) +
+                    r.z * (b.y * g.x - g.y * b.x);
+        det = 1.0f / det;
+        QColorMatrix inv;
+        inv.r.x = (g.y * b.z - b.y * g.z) * det;
+        inv.r.y = (b.y * r.z - r.y * b.z) * det;
+        inv.r.z = (r.y * g.z - g.y * r.z) * det;
+        inv.g.x = (b.x * g.z - g.x * b.z) * det;
+        inv.g.y = (r.x * b.z - b.x * r.z) * det;
+        inv.g.z = (g.x * r.z - r.x * g.z) * det;
+        inv.b.x = (g.x * b.y - b.x * g.y) * det;
+        inv.b.y = (b.x * r.y - r.x * b.y) * det;
+        inv.b.z = (r.x * g.y - g.x * r.y) * det;
+        return inv;
+    }
+    QColorMatrix operator*(const QColorMatrix &o) const
+    {
+        QColorMatrix comb;
+        comb.r.x = r.x * o.r.x + g.x * o.r.y + b.x * o.r.z;
+        comb.g.x = r.x * o.g.x + g.x * o.g.y + b.x * o.g.z;
+        comb.b.x = r.x * o.b.x + g.x * o.b.y + b.x * o.b.z;
+
+        comb.r.y = r.y * o.r.x + g.y * o.r.y + b.y * o.r.z;
+        comb.g.y = r.y * o.g.x + g.y * o.g.y + b.y * o.g.z;
+        comb.b.y = r.y * o.b.x + g.y * o.b.y + b.y * o.b.z;
+
+        comb.r.z = r.z * o.r.x + g.z * o.r.y + b.z * o.r.z;
+        comb.g.z = r.z * o.g.x + g.z * o.g.y + b.z * o.g.z;
+        comb.b.z = r.z * o.b.x + g.z * o.b.y + b.z * o.b.z;
+        return comb;
+
+    }
+    QColorVector map(const QColorVector &c) const
+    {
+        return QColorVector { c.x * r.x + c.y * g.x + c.z * b.x,
+                              c.x * r.y + c.y * g.y + c.z * b.y,
+                              c.x * r.z + c.y * g.z + c.z * b.z };
+    }
+    QColorMatrix transposed() const
+    {
+        return QColorMatrix { { r.x, g.x, b.x },
+                              { r.y, g.y, b.y },
+                              { r.z, g.z, b.z } };
+    }
+
+    static QColorMatrix identity()
+    {
+        return { { 1.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } };
+    }
+    static QColorMatrix fromScale(QColorVector v)
+    {
+        return QColorMatrix { { v.x,  0.0f, 0.0f },
+                              { 0.0f, v.y,  0.0f },
+                              { 0.0f, 0.0f, v.z  } };
+    }
+    // These are used to recognize matrices from ICC profiles:
+    static QColorMatrix toXyzFromSRgb()
+    {
+        return QColorMatrix { { 0.4360217452f, 0.2224751115f, 0.0139281144f },
+                              { 0.3851087987f, 0.7169067264f, 0.0971015394f },
+                              { 0.1430812478f, 0.0606181994f, 0.7141585946f } };
+    }
+    static QColorMatrix toXyzFromAdobeRgb()
+    {
+        return QColorMatrix { { 0.6097189188f, 0.3111021519f, 0.0194766335f },
+                              { 0.2052682191f, 0.6256770492f, 0.0608891509f },
+                              { 0.1492247432f, 0.0632209629f, 0.7448224425f } };
+    }
+    static QColorMatrix toXyzFromDciP3D65()
+    {
+        return QColorMatrix { { 0.5150973201f, 0.2411795557f, -0.0010491034f },
+                              { 0.2919696569f, 0.6922441125f,  0.0418830328f },
+                              { 0.1571449190f, 0.0665764511f,  0.7843542695f } };
+    }
+    static QColorMatrix toXyzFromProPhotoRgb()
+    {
+        return QColorMatrix { { 0.7976672649f, 0.2880374491f, 0.0000000000f },
+                              { 0.1351922452f, 0.7118769884f, 0.0000000000f },
+                              { 0.0313525312f, 0.0000856627f, 0.8251883388f } };
+    }
+};
+
+inline bool operator==(const QColorMatrix &m1, const QColorMatrix &m2)
+{
+    return (m1.r == m2.r) && (m1.g == m2.g) && (m1.b == m2.b);
+}
+
+inline bool operator!=(const QColorMatrix &m1, const QColorMatrix &m2)
+{
+    return !(m1 == m2);
+}
+
+QT_END_NAMESPACE
+
+#endif // QCOLORMATRIX_P_H
diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp
new file mode 100644
index 0000000000..937bb505c9
--- /dev/null
+++ b/src/gui/painting/qcolorspace.cpp
@@ -0,0 +1,796 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qcolorspace.h"
+#include "qcolorspace_p.h"
+
+#include "qcolortransform.h"
+#include "qcolormatrix_p.h"
+#include "qcolortransferfunction_p.h"
+#include "qcolortransform_p.h"
+#include "qicc_p.h"
+
+#include <qmath.h>
+#include <qtransform.h>
+
+#include <qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+QBasicMutex QColorSpacePrivate::s_lutWriteLock;
+
+QColorSpacePrimaries::QColorSpacePrimaries(QColorSpace::Primaries primaries)
+{
+    switch (primaries) {
+    case QColorSpace::Primaries::SRgb:
+        redPoint   = QPointF(0.640, 0.330);
+        greenPoint = QPointF(0.300, 0.600);
+        bluePoint  = QPointF(0.150, 0.060);
+        whitePoint = QColorVector::D65Chromaticity();
+        break;
+    case QColorSpace::Primaries::DciP3D65:
+        redPoint   = QPointF(0.680, 0.320);
+        greenPoint = QPointF(0.265, 0.690);
+        bluePoint  = QPointF(0.150, 0.060);
+        whitePoint = QColorVector::D65Chromaticity();
+        break;
+    case QColorSpace::Primaries::AdobeRgb:
+        redPoint   = QPointF(0.640, 0.330);
+        greenPoint = QPointF(0.210, 0.710);
+        bluePoint  = QPointF(0.150, 0.060);
+        whitePoint = QColorVector::D65Chromaticity();
+        break;
+    case QColorSpace::Primaries::ProPhotoRgb:
+        redPoint   = QPointF(0.7347, 0.2653);
+        greenPoint = QPointF(0.1596, 0.8404);
+        bluePoint  = QPointF(0.0366, 0.0001);
+        whitePoint = QColorVector::D50Chromaticity();
+        break;
+    default:
+        Q_UNREACHABLE();
+    }
+}
+
+bool QColorSpacePrimaries::areValid() const
+{
+    if (!QColorVector::isValidChromaticity(redPoint))
+        return false;
+    if (!QColorVector::isValidChromaticity(greenPoint))
+        return false;
+    if (!QColorVector::isValidChromaticity(bluePoint))
+        return false;
+    if (!QColorVector::isValidChromaticity(whitePoint))
+        return false;
+    return true;
+}
+
+QColorMatrix QColorSpacePrimaries::toXyzMatrix() const
+{
+    // This converts to XYZ in some undefined scale.
+    QColorMatrix toXyz = { QColorVector(redPoint),
+                           QColorVector(greenPoint),
+                           QColorVector(bluePoint) };
+
+    // Since the white point should be (1.0, 1.0, 1.0) in the
+    // input, we can figure out the scale by using the
+    // inverse conversion on the white point.
+    QColorVector wXyz(whitePoint);
+    QColorVector whiteScale = toXyz.inverted().map(wXyz);
+
+    // Now we have scaled conversion to XYZ relative to the given whitepoint
+    toXyz = toXyz * QColorMatrix::fromScale(whiteScale);
+
+    // But we want a conversion to XYZ relative to D50
+    QColorVector wXyzD50 = QColorVector::D50();
+
+    if (wXyz != wXyzD50) {
+        // Do chromatic adaptation to map our white point to XYZ D50.
+
+        // The Bradford method chromatic adaptation matrix:
+        QColorMatrix abrad = { {  0.8951f, -0.7502f,  0.0389f },
+                               {  0.2664f,  1.7135f, -0.0685f },
+                               { -0.1614f,  0.0367f,  1.0296f } };
+        QColorMatrix abradinv = { {  0.9869929f, 0.4323053f, -0.0085287f },
+                                  { -0.1470543f, 0.5183603f,  0.0400428f },
+                                  {  0.1599627f, 0.0492912f,  0.9684867f } };
+
+        QColorVector srcCone = abrad.map(wXyz);
+        QColorVector dstCone = abrad.map(wXyzD50);
+
+        QColorMatrix wToD50 = { { dstCone.x / srcCone.x, 0, 0 },
+                                { 0, dstCone.y / srcCone.y, 0 },
+                                { 0, 0, dstCone.z / srcCone.z } };
+
+
+        QColorMatrix chromaticAdaptation = abradinv * (wToD50 * abrad);
+        toXyz = chromaticAdaptation * toXyz;
+    }
+
+    return toXyz;
+}
+
+QColorSpacePrivate::QColorSpacePrivate()
+{
+}
+
+QColorSpacePrivate::QColorSpacePrivate(QColorSpace::NamedColorSpace namedColorSpace)
+        : namedColorSpace(namedColorSpace)
+{
+    switch (namedColorSpace) {
+    case QColorSpace::SRgb:
+        primaries = QColorSpace::Primaries::SRgb;
+        transferFunction = QColorSpace::TransferFunction::SRgb;
+        description = QStringLiteral("sRGB");
+        break;
+    case QColorSpace::SRgbLinear:
+        primaries = QColorSpace::Primaries::SRgb;
+        transferFunction = QColorSpace::TransferFunction::Linear;
+        description = QStringLiteral("Linear sRGB");
+        break;
+    case QColorSpace::AdobeRgb:
+        primaries = QColorSpace::Primaries::AdobeRgb;
+        transferFunction = QColorSpace::TransferFunction::Gamma;
+        gamma = 2.19921875f; // Not quite 2.2, see https://www.adobe.com/digitalimag/pdfs/AdobeRGB1998.pdf
+        description = QStringLiteral("Adobe RGB");
+        break;
+    case QColorSpace::DisplayP3:
+        primaries = QColorSpace::Primaries::DciP3D65;
+        transferFunction = QColorSpace::TransferFunction::SRgb;
+        description = QStringLiteral("Display P3");
+        break;
+    case QColorSpace::ProPhotoRgb:
+        primaries = QColorSpace::Primaries::ProPhotoRgb;
+        transferFunction = QColorSpace::TransferFunction::ProPhotoRgb;
+        description = QStringLiteral("ProPhoto RGB");
+        break;
+    default:
+        Q_UNREACHABLE();
+    }
+    initialize();
+}
+
+QColorSpacePrivate::QColorSpacePrivate(QColorSpace::Primaries primaries, QColorSpace::TransferFunction fun, float gamma)
+        : primaries(primaries)
+        , transferFunction(fun)
+        , gamma(gamma)
+{
+    identifyColorSpace();
+    initialize();
+}
+
+QColorSpacePrivate::QColorSpacePrivate(const QColorSpacePrimaries &primaries,
+                                       QColorSpace::TransferFunction fun,
+                                       float gamma)
+        : primaries(QColorSpace::Primaries::Custom)
+        , transferFunction(fun)
+        , gamma(gamma)
+{
+    Q_ASSERT(primaries.areValid());
+    toXyz = primaries.toXyzMatrix();
+    whitePoint = QColorVector(primaries.whitePoint);
+    identifyColorSpace();
+    setTransferFunction();
+}
+
+void QColorSpacePrivate::identifyColorSpace()
+{
+    switch (primaries) {
+    case QColorSpace::Primaries::SRgb:
+        if (transferFunction == QColorSpace::TransferFunction::SRgb) {
+            namedColorSpace = QColorSpace::SRgb;
+            if (description.isEmpty())
+                description = QStringLiteral("sRGB");
+            return;
+        }
+        if (transferFunction == QColorSpace::TransferFunction::Linear) {
+            namedColorSpace = QColorSpace::SRgbLinear;
+            if (description.isEmpty())
+                description = QStringLiteral("Linear sRGB");
+            return;
+        }
+        break;
+    case QColorSpace::Primaries::AdobeRgb:
+        if (transferFunction == QColorSpace::TransferFunction::Gamma) {
+            if (qAbs(gamma - 2.19921875f) < (1/1024.0f)) {
+                namedColorSpace = QColorSpace::AdobeRgb;
+                if (description.isEmpty())
+                    description = QStringLiteral("Adobe RGB");
+                return;
+            }
+        }
+        break;
+    case QColorSpace::Primaries::DciP3D65:
+        if (transferFunction == QColorSpace::TransferFunction::SRgb) {
+            namedColorSpace = QColorSpace::DisplayP3;
+            if (description.isEmpty())
+                description = QStringLiteral("Display P3");
+            return;
+        }
+        break;
+    case QColorSpace::Primaries::ProPhotoRgb:
+        if (transferFunction == QColorSpace::TransferFunction::ProPhotoRgb) {
+            namedColorSpace = QColorSpace::ProPhotoRgb;
+            if (description.isEmpty())
+                description = QStringLiteral("ProPhoto RGB");
+            return;
+        }
+        if (transferFunction == QColorSpace::TransferFunction::Gamma) {
+            // ProPhoto RGB's curve is effectively gamma 1.8 for 8bit precision.
+            if (qAbs(gamma - 1.8f) < (1/1024.0f)) {
+                namedColorSpace = QColorSpace::ProPhotoRgb;
+                if (description.isEmpty())
+                    description = QStringLiteral("ProPhoto RGB");
+                return;
+            }
+        }
+        break;
+    default:
+        break;
+    }
+
+    namedColorSpace = Unknown;
+}
+
+void QColorSpacePrivate::initialize()
+{
+    setToXyzMatrix();
+    setTransferFunction();
+}
+
+void QColorSpacePrivate::setToXyzMatrix()
+{
+    if (primaries == QColorSpace::Primaries::Custom) {
+        toXyz = QColorMatrix();
+        whitePoint = QColorVector::D50();
+        return;
+    }
+    QColorSpacePrimaries colorSpacePrimaries(primaries);
+    toXyz = colorSpacePrimaries.toXyzMatrix();
+    whitePoint = QColorVector(colorSpacePrimaries.whitePoint);
+}
+
+void QColorSpacePrivate::setTransferFunction()
+{
+    switch (transferFunction) {
+    case QColorSpace::TransferFunction::Linear:
+        trc[0].m_type = QColorTrc::Type::Function;
+        trc[0].m_fun = QColorTransferFunction();
+        if (qFuzzyIsNull(gamma))
+            gamma = 1.0f;
+        break;
+    case QColorSpace::TransferFunction::Gamma:
+        trc[0].m_type = QColorTrc::Type::Function;
+        trc[0].m_fun = QColorTransferFunction::fromGamma(gamma);
+        break;
+    case QColorSpace::TransferFunction::SRgb:
+        trc[0].m_type = QColorTrc::Type::Function;
+        trc[0].m_fun = QColorTransferFunction::fromSRgb();
+        if (qFuzzyIsNull(gamma))
+            gamma = 2.31f;
+        break;
+    case QColorSpace::TransferFunction::ProPhotoRgb:
+        trc[0].m_type = QColorTrc::Type::Function;
+        trc[0].m_fun = QColorTransferFunction::fromProPhotoRgb();
+        if (qFuzzyIsNull(gamma))
+            gamma = 1.8f;
+        break;
+    case QColorSpace::TransferFunction::Custom:
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    trc[1] = trc[0];
+    trc[2] = trc[0];
+}
+
+QColorTransform QColorSpacePrivate::transformationToColorSpace(const QColorSpacePrivate *out) const
+{
+    Q_ASSERT(out);
+    QColorTransform combined;
+    auto ptr = new QColorTransformPrivate;
+    combined.d = ptr;
+    combined.d->ref.ref();
+    ptr->colorSpaceIn = this;
+    ptr->colorSpaceOut = out;
+    ptr->colorMatrix = out->toXyz.inverted() * toXyz;
+    return combined;
+}
+
+/*!
+    \class QColorSpace
+    \brief The QColorSpace class provides a color space abstraction.
+    \since 5.14
+
+    \ingroup painting
+    \ingroup appearance
+    \inmodule QtGui
+
+    Color values can be interpreted in different ways, and based on the interpretation
+    can live in different spaces. We call this \e {color spaces}.
+
+    QColorSpace provides access to creating several predefined color spaces and
+    can generate QColorTransforms for converting colors from one color space to
+    another.
+
+    QColorSpace can also represent color spaces defined by ICC profiles or embedded
+    in images, that do not otherwise fit the predefined color spaces.
+
+    A color space can generally speaking be conceived as a combination of set of primary
+    colors and a transfer function. The primaries defines the axes of the color space, and
+    the transfer function how values are mapped on the axes.
+    The primaries are defined by three primary colors that represent exactly how red, green,
+    and blue look in this particular color space, and a white color that represents where
+    and how bright pure white is. The range of colors expressable by the primary colors is
+    called the gamut, and a color space that can represent a wider range of colors is also
+    known as a wide-gamut color space.
+
+    The transfer function or gamma curve determines how each component in the
+    color space is encoded. These are used because human perception does not operate
+    linearly, and the transfer functions try to ensure that colors will seem evenly
+    spaced to human eyes.
+*/
+
+
+/*!
+    \enum QColorSpace::NamedColorSpace
+
+    Predefined color spaces.
+
+    \value SRgb The sRGB color space, which Qt operates in by default. It is a close approximation
+    of how most classic monitors operate, and a mode most software and hardware support.
+    \l{http://www.color.org/chardata/rgb/srgb.xalter}{ICC registration of sRGB}.
+    \value SRgbLinear The sRGB color space with linear gamma. Useful for gamma-corrected blending.
+    \value AdobeRgb The Adobe RGB color space is a classic wide-gamut color space, using a gamma of 2.2.
+    \l{http://www.color.org/chardata/rgb/adobergb.xalter}{ICC registration of Adobe RGB (1998)}
+    \value DisplayP3 A color-space using the primaries of DCI-P3, but with the whitepoint and transfer
+    function of sRGB. Common in modern wide-gamut screens.
+    \l{http://www.color.org/chardata/rgb/DCIP3.xalter}{ICC registration of DCI-P3}
+    \value ProPhotoRgb The Pro Photo RGB color space, also known as ROMM RGB is a very wide gamut color space.
+    \l{http://www.color.org/chardata/rgb/rommrgb.xalter}{ICC registration of ROMM RGB}
+*/
+
+/*!
+    \enum QColorSpace::Primaries
+
+    Predefined sets of primary colors.
+
+    \value Custom The primaries are undefined or does not match any predefined sets.
+    \value SRgb The sRGB primaries
+    \value AdobeRgb The Adobe RGB primaries
+    \value DciP3D65 The DCI-P3 primaries with the D65 whitepoint
+    \value ProPhotoRgb The ProPhoto RGB primaries with the D50 whitepoint
+*/
+
+/*!
+    \enum QColorSpace::TransferFunction
+
+    Predefined transfer functions or gamma curves.
+
+    \value Custom The custom or null transfer function
+    \value Linear The linear transfer functions
+    \value Gamma A transfer function that is a real gamma curve based on the value of gamma()
+    \value SRgb The sRGB transfer function, composed of linear and gamma parts
+    \value ProPhotoRgb The ProPhoto RGB transfer function, composed of linear and gamma parts
+*/
+
+/*!
+    Creates a new colorspace object that represents an undefined and invalid colorspace.
+ */
+QColorSpace::QColorSpace()
+{
+}
+
+/*!
+    Creates a new colorspace object that represents a \a namedColorSpace.
+ */
+QColorSpace::QColorSpace(NamedColorSpace namedColorSpace)
+{
+    static QColorSpacePrivate *predefinedColorspacePrivates[QColorSpace::ProPhotoRgb + 1];
+    if (!predefinedColorspacePrivates[namedColorSpace]) {
+        predefinedColorspacePrivates[namedColorSpace] = new QColorSpacePrivate(namedColorSpace);
+        predefinedColorspacePrivates[namedColorSpace]->ref.ref();
+    }
+    d_ptr = predefinedColorspacePrivates[namedColorSpace];
+    d_ptr->ref.ref();
+    Q_ASSERT(isValid());
+}
+
+/*!
+    Creates a custom color space with the primaries \a primaries, using the transfer function \a fun and
+    optionally \a gamma.
+ */
+QColorSpace::QColorSpace(QColorSpace::Primaries primaries, QColorSpace::TransferFunction fun, float gamma)
+        : d_ptr(new QColorSpacePrivate(primaries, fun, gamma))
+{
+    d_ptr->ref.ref();
+}
+
+/*!
+    Creates a custom color space with the primaries \a primaries, using a gamma transfer function of
+    \a gamma.
+ */
+QColorSpace::QColorSpace(QColorSpace::Primaries primaries, float gamma)
+        : d_ptr(new QColorSpacePrivate(primaries, TransferFunction::Gamma, gamma))
+{
+    d_ptr->ref.ref();
+}
+
+/*!
+    Creates a custom colorspace with a primaries based on the chromaticities of the primary colors \a whitePoint,
+    \a redPoint, \a greenPoint and \a bluePoint, and using the transfer function \a fun and optionally \a gamma.
+ */
+QColorSpace::QColorSpace(const QPointF &whitePoint, const QPointF &redPoint,
+                         const QPointF &greenPoint, const QPointF &bluePoint,
+                         QColorSpace::TransferFunction fun, float gamma)
+{
+    QColorSpacePrimaries primaries(whitePoint, redPoint, greenPoint, bluePoint);
+    if (!primaries.areValid()) {
+        qWarning() << "QColorSpace attempted constructed from invalid primaries:" << whitePoint << redPoint << greenPoint << bluePoint;
+        d_ptr = nullptr;
+        return;
+    }
+    d_ptr = new QColorSpacePrivate(primaries, fun, gamma);
+    d_ptr->ref.ref();
+}
+
+QColorSpace::~QColorSpace()
+{
+    if (d_ptr && !d_ptr->ref.deref())
+        delete d_ptr;
+}
+
+QColorSpace::QColorSpace(const QColorSpace &colorSpace)
+        : d_ptr(colorSpace.d_ptr)
+{
+    if (d_ptr)
+        d_ptr->ref.ref();
+}
+
+QColorSpace &QColorSpace::operator=(const QColorSpace &colorSpace)
+{
+    QColorSpacePrivate *oldD = d_ptr;
+    d_ptr = colorSpace.d_ptr;
+    if (d_ptr)
+        d_ptr->ref.ref();
+    if (oldD && !oldD->ref.deref())
+        delete oldD;
+    return *this;
+}
+
+/*! \fn void QColorSpace::swap(QColorSpace &other)
+
+    Swaps color space \a other with this color space. This operation is very fast and
+    never fails.
+*/
+
+/*!
+    Returns the predefined primaries of the color space
+    or \c primaries::Custom if it doesn't match any of them.
+*/
+QColorSpace::Primaries QColorSpace::primaries() const noexcept
+{
+    if (Q_UNLIKELY(!d_ptr))
+        return QColorSpace::Primaries::Custom;
+    return d_ptr->primaries;
+}
+
+/*!
+    Returns the predefined transfer function of the color space
+    or \c TransferFunction::Custom if it doesn't match any of them.
+
+    \sa gamma(), setTransferFunction(), withTransferFunction()
+*/
+QColorSpace::TransferFunction QColorSpace::transferFunction() const noexcept
+{
+    if (Q_UNLIKELY(!d_ptr))
+        return QColorSpace::TransferFunction::Custom;
+    return d_ptr->transferFunction;
+}
+
+/*!
+    Returns the gamma value of color spaces with \c TransferFunction::Gamma,
+    an approximate gamma value for other predefined color spaces, or
+    0.0 if no approximate gamma is known.
+
+    \sa transferFunction()
+*/
+float QColorSpace::gamma() const noexcept
+{
+    if (Q_UNLIKELY(!d_ptr))
+        return 0.0f;
+    return d_ptr->gamma;
+}
+
+/*!
+    Sets the transfer function to \a transferFunction and \a gamma.
+
+    \sa transferFunction(), gamma(), withTransferFunction()
+*/
+void QColorSpace::setTransferFunction(QColorSpace::TransferFunction transferFunction, float gamma)
+{
+    if (!isValid() || transferFunction == QColorSpace::TransferFunction::Custom)
+        return;
+    if (d_ptr->transferFunction == transferFunction && d_ptr->gamma == gamma)
+        return;
+    QColorSpacePrivate::getWritable(*this);  // detach
+    d_ptr->description.clear();
+    d_ptr->transferFunction = transferFunction;
+    d_ptr->gamma = gamma;
+    d_ptr->identifyColorSpace();
+    d_ptr->setTransferFunction();
+}
+
+/*!
+    Returns a copy of this color space, except using the transfer function
+    \a transferFunction and \a gamma.
+
+    \sa transferFunction(), gamma(), setTransferFunction()
+*/
+QColorSpace QColorSpace::withTransferFunction(QColorSpace::TransferFunction transferFunction, float gamma) const
+{
+    if (!isValid() || transferFunction == QColorSpace::TransferFunction::Custom)
+        return *this;
+    if (d_ptr->transferFunction == transferFunction && d_ptr->gamma == gamma)
+        return *this;
+    QColorSpace out(*this);
+    out.setTransferFunction(transferFunction, gamma);
+    return out;
+}
+
+/*!
+    Sets the primaries to those of the \a primariesId set.
+
+    \sa primaries()
+*/
+void QColorSpace::setPrimaries(QColorSpace::Primaries primariesId)
+{
+    if (!isValid() || primariesId == QColorSpace::Primaries::Custom)
+        return;
+    if (d_ptr->primaries == primariesId)
+        return;
+    QColorSpacePrivate::getWritable(*this);  // detach
+    d_ptr->description.clear();
+    d_ptr->primaries = primariesId;
+    d_ptr->identifyColorSpace();
+    d_ptr->setToXyzMatrix();
+}
+
+/*!
+    Set primaries to the chromaticities of \a whitePoint, \a redPoint, \a greenPoint
+    and \a bluePoint.
+
+    \sa primaries()
+*/
+void QColorSpace::setPrimaries(const QPointF &whitePoint, const QPointF &redPoint,
+                               const QPointF &greenPoint, const QPointF &bluePoint)
+{
+    if (!isValid())
+        return;
+    QColorSpacePrimaries primaries(whitePoint, redPoint, greenPoint, bluePoint);
+    if (!primaries.areValid())
+        return;
+    QColorMatrix toXyz = primaries.toXyzMatrix();
+    if (QColorVector(primaries.whitePoint) == d_ptr->whitePoint && toXyz == d_ptr->toXyz)
+        return;
+    QColorSpacePrivate::getWritable(*this);  // detach
+    d_ptr->description.clear();
+    d_ptr->primaries = QColorSpace::Primaries::Custom;
+    d_ptr->toXyz = toXyz;
+    d_ptr->whitePoint = QColorVector(primaries.whitePoint);
+    d_ptr->identifyColorSpace();
+}
+
+/*!
+    Returns an ICC profile representing the color space.
+
+    If the color space was generated from an ICC profile, that profile
+    is returned, otherwise one is generated.
+
+    \note Even invalid color spaces may return the ICC profile if they
+    were generated from one, to allow applications to implement wider
+    support themselves.
+
+    \sa fromIccProfile()
+*/
+QByteArray QColorSpace::iccProfile() const
+{
+    if (Q_UNLIKELY(!d_ptr))
+        return QByteArray();
+    if (!d_ptr->iccProfile.isEmpty())
+        return d_ptr->iccProfile;
+    if (!isValid())
+        return QByteArray();
+    return QIcc::toIccProfile(*this);
+}
+
+/*!
+    Creates a QColorSpace from ICC profile \a iccProfile.
+
+    \note Not all ICC profiles are supported. QColorSpace only supports
+    RGB-XYZ ICC profiles that are three-component matrix-based.
+
+    If the ICC profile is not supported an invalid QColorSpace is returned
+    where you can still read the original ICC profile using iccProfile().
+
+    \sa iccProfile()
+*/
+QColorSpace QColorSpace::fromIccProfile(const QByteArray &iccProfile)
+{
+    QColorSpace colorSpace;
+    if (QIcc::fromIccProfile(iccProfile, &colorSpace))
+        return colorSpace;
+    QColorSpacePrivate *d = QColorSpacePrivate::getWritable(colorSpace);
+    d->iccProfile = iccProfile;
+    return colorSpace;
+}
+
+/*!
+    Returns \c true if the color space is valid.
+*/
+bool QColorSpace::isValid() const noexcept
+{
+    return d_ptr
+        && d_ptr->toXyz.isValid()
+        && d_ptr->trc[0].isValid() && d_ptr->trc[1].isValid() && d_ptr->trc[2].isValid();
+}
+
+/*!
+    \relates QColorSpace
+    Returns \c true if colorspace \a colorSpace1 is equal to colorspace \a colorSpace2;
+    otherwise returns \c false
+*/
+bool operator==(const QColorSpace &colorSpace1, const QColorSpace &colorSpace2)
+{
+    if (colorSpace1.d_ptr == colorSpace2.d_ptr)
+        return true;
+    if (!colorSpace1.d_ptr || !colorSpace2.d_ptr)
+        return false;
+
+    if (colorSpace1.d_ptr->namedColorSpace && colorSpace2.d_ptr->namedColorSpace)
+        return colorSpace1.d_ptr->namedColorSpace == colorSpace2.d_ptr->namedColorSpace;
+
+    const bool valid1 = colorSpace1.isValid();
+    const bool valid2 = colorSpace2.isValid();
+    if (!valid1 && !valid2)
+        return colorSpace1.d_ptr->iccProfile == colorSpace2.d_ptr->iccProfile;
+    else if (!valid1 || !valid2)
+        return false;
+
+    // At this point one or both color spaces are unknown but valid, and must be compared in detail instead
+
+    if (colorSpace1.primaries() != QColorSpace::Primaries::Custom && colorSpace2.primaries() != QColorSpace::Primaries::Custom) {
+        if (colorSpace1.primaries() != colorSpace2.primaries())
+            return false;
+    } else {
+        if (colorSpace1.d_ptr->toXyz != colorSpace2.d_ptr->toXyz)
+            return false;
+    }
+
+    if (colorSpace1.transferFunction() != QColorSpace::TransferFunction::Custom &&
+            colorSpace2.transferFunction() != QColorSpace::TransferFunction::Custom) {
+        if (colorSpace1.transferFunction() != colorSpace2.transferFunction())
+            return false;
+        if (colorSpace1.transferFunction() == QColorSpace::TransferFunction::Gamma)
+            return (qAbs(colorSpace1.gamma() - colorSpace2.gamma()) <= (1.0f / 512.0f));
+        return true;
+    }
+
+    if (colorSpace1.d_ptr->trc[0] != colorSpace2.d_ptr->trc[0] ||
+        colorSpace1.d_ptr->trc[1] != colorSpace2.d_ptr->trc[1] ||
+        colorSpace1.d_ptr->trc[2] != colorSpace2.d_ptr->trc[2])
+        return false;
+
+    return true;
+}
+
+/*!
+    \fn bool operator!=(const QColorSpace &colorSpace1, const QColorSpace &colorSpace2)
+    \relates QColorSpace
+
+    Returns \c true if colorspace \a colorSpace1 is not equal to colorspace \a colorSpace2;
+    otherwise returns \c false
+*/
+
+/*!
+    Generates and returns a color space transformation from this color space to
+    \a colorspace.
+*/
+QColorTransform QColorSpace::transformationToColorSpace(const QColorSpace &colorspace) const
+{
+    if (!isValid() || !colorspace.isValid())
+        return QColorTransform();
+
+    return d_ptr->transformationToColorSpace(colorspace.d_ptr);
+}
+
+/*****************************************************************************
+  QColorSpace stream functions
+ *****************************************************************************/
+#if !defined(QT_NO_DATASTREAM)
+/*!
+    \fn QDataStream &operator<<(QDataStream &stream, const QColorSpace &colorSpace)
+    \relates QColorSpace
+
+    Writes the given \a colorSpace to the given \a stream as an ICC profile.
+
+    \sa QColorSpace::iccProfile(), {Serializing Qt Data Types}
+*/
+
+QDataStream &operator<<(QDataStream &s, const QColorSpace &image)
+{
+    s << image.iccProfile();
+    return s;
+}
+
+/*!
+    \fn QDataStream &operator>>(QDataStream &stream, QColorSpace &colorSpace)
+    \relates QColorSpace
+
+    Reads a color space from the given \a stream and stores it in the given
+    \a colorSpace.
+
+    \sa QColorSpace::fromIccProfile(), {Serializing Qt Data Types}
+*/
+
+QDataStream &operator>>(QDataStream &s, QColorSpace &colorSpace)
+{
+    QByteArray iccProfile;
+    s >> iccProfile;
+    colorSpace = QColorSpace::fromIccProfile(iccProfile);
+    return s;
+}
+#endif // QT_NO_DATASTREAM
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QColorSpace &colorSpace)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg << "QColorSpace(";
+    if (colorSpace.d_ptr->namedColorSpace)
+        dbg << colorSpace.d_ptr->namedColorSpace << ", ";
+    dbg << colorSpace.primaries() << ", " << colorSpace.transferFunction();
+    dbg << ", gamma=" << colorSpace.gamma();
+    dbg << ')';
+    return dbg;
+}
+#endif
+
+QT_END_NAMESPACE
diff --git a/src/gui/painting/qcolorspace.h b/src/gui/painting/qcolorspace.h
new file mode 100644
index 0000000000..e6bc62d58a
--- /dev/null
+++ b/src/gui/painting/qcolorspace.h
@@ -0,0 +1,158 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOLORSPACE_H
+#define QCOLORSPACE_H
+
+#include <QtGui/qtguiglobal.h>
+#include <QtGui/qcolortransform.h>
+#include <QtCore/qobjectdefs.h>
+#include <QtCore/qshareddata.h>
+
+QT_BEGIN_NAMESPACE
+
+class QColorSpacePrivate;
+class QPointF;
+
+class Q_GUI_EXPORT QColorSpace
+{
+    Q_GADGET
+public:
+    enum NamedColorSpace {
+        SRgb = 1,
+        SRgbLinear,
+        AdobeRgb,
+        DisplayP3,
+        ProPhotoRgb
+    };
+    Q_ENUM(NamedColorSpace)
+    enum class Primaries {
+        Custom = 0,
+        SRgb,
+        AdobeRgb,
+        DciP3D65,
+        ProPhotoRgb
+    };
+    Q_ENUM(Primaries)
+    enum class TransferFunction {
+        Custom = 0,
+        Linear,
+        Gamma,
+        SRgb,
+        ProPhotoRgb
+    };
+    Q_ENUM(TransferFunction)
+
+    QColorSpace();
+    QColorSpace(NamedColorSpace namedColorSpace);
+    QColorSpace(Primaries primaries, TransferFunction fun, float gamma = 0.0f);
+    QColorSpace(Primaries primaries, float gamma);
+    QColorSpace(const QPointF &whitePoint, const QPointF &redPoint,
+                const QPointF &greenPoint, const QPointF &bluePoint,
+                TransferFunction fun, float gamma = 0.0f);
+    ~QColorSpace();
+
+    QColorSpace(const QColorSpace &colorSpace);
+    QColorSpace &operator=(const QColorSpace &colorSpace);
+
+    QColorSpace(QColorSpace &&colorSpace) noexcept
+            : d_ptr(qExchange(colorSpace.d_ptr, nullptr))
+    { }
+    QColorSpace &operator=(QColorSpace &&colorSpace) noexcept
+    {
+        // Make the deallocation of this->d_ptr happen in ~QColorSpace()
+        QColorSpace(std::move(colorSpace)).swap(*this);
+        return *this;
+    }
+
+    void swap(QColorSpace &colorSpace) noexcept
+    { qSwap(d_ptr, colorSpace.d_ptr); }
+
+    Primaries primaries() const noexcept;
+    TransferFunction transferFunction() const noexcept;
+    float gamma() const noexcept;
+
+    void setTransferFunction(TransferFunction transferFunction, float gamma = 0.0f);
+    QColorSpace withTransferFunction(TransferFunction transferFunction, float gamma = 0.0f) const;
+
+    void setPrimaries(Primaries primariesId);
+    void setPrimaries(const QPointF &whitePoint, const QPointF &redPoint,
+                      const QPointF &greenPoint, const QPointF &bluePoint);
+
+    bool isValid() const noexcept;
+
+    friend Q_GUI_EXPORT bool operator==(const QColorSpace &colorSpace1, const QColorSpace &colorSpace2);
+    friend inline bool operator!=(const QColorSpace &colorSpace1, const QColorSpace &colorSpace2);
+
+    static QColorSpace fromIccProfile(const QByteArray &iccProfile);
+    QByteArray iccProfile() const;
+
+    QColorTransform transformationToColorSpace(const QColorSpace &colorspace) const;
+
+
+private:
+    Q_DECLARE_PRIVATE(QColorSpace)
+    QColorSpacePrivate *d_ptr = nullptr;
+
+#ifndef QT_NO_DEBUG_STREAM
+    friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QColorSpace &colorSpace);
+#endif
+};
+
+bool Q_GUI_EXPORT operator==(const QColorSpace &colorSpace1, const QColorSpace &colorSpace2);
+inline bool operator!=(const QColorSpace &colorSpace1, const QColorSpace &colorSpace2)
+{
+    return !(colorSpace1 == colorSpace2);
+}
+
+Q_DECLARE_SHARED(QColorSpace)
+
+// QColorSpace stream functions
+#if !defined(QT_NO_DATASTREAM)
+Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QColorSpace &);
+Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QColorSpace &);
+#endif
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QColorSpace &);
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QCOLORSPACE_P_H
diff --git a/src/gui/painting/qcolorspace_p.h b/src/gui/painting/qcolorspace_p.h
new file mode 100644
index 0000000000..e7add19ed3
--- /dev/null
+++ b/src/gui/painting/qcolorspace_p.h
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOLORSPACE_P_H
+#define QCOLORSPACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qcolorspace.h"
+#include "qcolormatrix_p.h"
+#include "qcolortrc_p.h"
+#include "qcolortrclut_p.h"
+
+#include <QtCore/qmutex.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qshareddata.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_AUTOTEST_EXPORT QColorSpacePrimaries
+{
+public:
+   QColorSpacePrimaries() = default;
+   QColorSpacePrimaries(QColorSpace::Primaries primaries);
+   QColorSpacePrimaries(QPointF whitePoint,
+                        QPointF redPoint,
+                        QPointF greenPoint,
+                        QPointF bluePoint)
+           : whitePoint(whitePoint)
+           , redPoint(redPoint)
+           , greenPoint(greenPoint)
+           , bluePoint(bluePoint)
+   { }
+
+   QColorMatrix toXyzMatrix() const;
+   bool areValid() const;
+
+   QPointF whitePoint;
+   QPointF redPoint;
+   QPointF greenPoint;
+   QPointF bluePoint;
+};
+
+class QColorSpacePrivate : public QSharedData
+{
+public:
+    QColorSpacePrivate();
+    QColorSpacePrivate(QColorSpace::NamedColorSpace namedColorSpace);
+    QColorSpacePrivate(QColorSpace::Primaries primaries, QColorSpace::TransferFunction fun, float gamma);
+    QColorSpacePrivate(const QColorSpacePrimaries &primaries, QColorSpace::TransferFunction fun, float gamma);
+    QColorSpacePrivate(const QColorSpacePrivate &other) = default;
+
+    // named different from get to avoid accidental detachs
+    static QColorSpacePrivate *getWritable(QColorSpace &colorSpace)
+    {
+        if (!colorSpace.d_ptr) {
+            colorSpace.d_ptr = new QColorSpacePrivate;
+            colorSpace.d_ptr->ref.ref();
+        } else if (colorSpace.d_ptr->ref.loadRelaxed() != 1) {
+            colorSpace.d_ptr->ref.deref();
+            colorSpace.d_ptr = new QColorSpacePrivate(*colorSpace.d_ptr);
+            colorSpace.d_ptr->ref.ref();
+        }
+        Q_ASSERT(colorSpace.d_ptr->ref.loadRelaxed() == 1);
+        return colorSpace.d_ptr;
+    }
+
+    static const QColorSpacePrivate *get(const QColorSpace &colorSpace)
+    {
+        return colorSpace.d_ptr;
+    }
+
+    void initialize();
+    void setToXyzMatrix();
+    void setTransferFunction();
+    void identifyColorSpace();
+    QColorTransform transformationToColorSpace(const QColorSpacePrivate *out) const;
+
+    static constexpr QColorSpace::NamedColorSpace Unknown = QColorSpace::NamedColorSpace(0);
+    QColorSpace::NamedColorSpace namedColorSpace = Unknown;
+
+    QColorSpace::Primaries primaries = QColorSpace::Primaries::Custom;
+    QColorSpace::TransferFunction transferFunction = QColorSpace::TransferFunction::Custom;
+    float gamma = 0.0f;
+    QColorVector whitePoint;
+
+    QColorTrc trc[3];
+    QColorMatrix toXyz;
+
+    QString description;
+    QByteArray iccProfile;
+
+    static QBasicMutex s_lutWriteLock;
+    struct LUT {
+        LUT() = default;
+        ~LUT() = default;
+        LUT(const LUT &other)
+        {
+            if (other.generated.loadAcquire()) {
+                table[0] = other.table[0];
+                table[1] = other.table[1];
+                table[2] = other.table[2];
+                generated.storeRelaxed(1);
+            }
+        }
+        QSharedPointer<QColorTrcLut> &operator[](int i) { return table[i]; }
+        const QSharedPointer<QColorTrcLut> &operator[](int i) const  { return table[i]; }
+        QSharedPointer<QColorTrcLut> table[3];
+        QAtomicInt generated;
+    } mutable lut;
+};
+
+QT_END_NAMESPACE
+
+#endif // QCOLORSPACE_P_H
diff --git a/src/gui/painting/qcolortransferfunction_p.h b/src/gui/painting/qcolortransferfunction_p.h
new file mode 100644
index 0000000000..0575dbd888
--- /dev/null
+++ b/src/gui/painting/qcolortransferfunction_p.h
@@ -0,0 +1,203 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOLORTRANSFERFUNCTION_P_H
+#define QCOLORTRANSFERFUNCTION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qtguiglobal_p.h>
+
+#include <cmath>
+
+QT_BEGIN_NAMESPACE
+
+// Defines a ICC parametric curve type 4
+class Q_GUI_EXPORT QColorTransferFunction
+{
+public:
+    QColorTransferFunction() noexcept
+            : m_a(1.0f), m_b(0.0f), m_c(1.0f), m_d(0.0f), m_e(0.0f), m_f(0.0f), m_g(1.0f), m_flags(0)
+    { }
+    QColorTransferFunction(float a, float b, float c, float d, float e, float f, float g) noexcept
+            : m_a(a), m_b(b), m_c(c), m_d(d), m_e(e), m_f(f), m_g(g), m_flags(0)
+    { }
+
+    bool isGamma() const
+    {
+        updateHints();
+        return m_flags & quint32(Hints::IsGamma);
+    }
+    bool isLinear() const
+    {
+        updateHints();
+        return m_flags & quint32(Hints::IsLinear);
+    }
+    bool isSRgb() const
+    {
+        updateHints();
+        return m_flags & quint32(Hints::IsSRgb);
+    }
+
+    float apply(float x) const
+    {
+        if (x < m_d)
+            return m_c * x + m_f;
+        else
+            return std::pow(m_a * x + m_b, m_g) + m_e;
+    }
+
+    QColorTransferFunction inverted() const
+    {
+        float a, b, c, d, e, f, g;
+
+        d = m_c * m_d + m_f;
+
+        if (!qFuzzyIsNull(m_c)) {
+            c = 1.0f / m_c;
+            f = -m_f / m_c;
+        } else {
+            c = 0.0f;
+            f = 0.0f;
+        }
+
+        if (!qFuzzyIsNull(m_a) && !qFuzzyIsNull(m_g)) {
+            a = std::pow(1.0f / m_a, m_g);
+            b = -a * m_e;
+            e = -m_b / m_a;
+            g = 1.0f / m_g;
+        } else {
+            a = 0.0f;
+            b = 0.0f;
+            e = 1.0f;
+            g = 1.0f;
+        }
+
+        return QColorTransferFunction(a, b, c, d, e, f, g);
+    }
+
+    // A few predefined curves:
+    static QColorTransferFunction fromGamma(float gamma)
+    {
+        return QColorTransferFunction(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, gamma);
+    }
+    static QColorTransferFunction fromSRgb()
+    {
+        return QColorTransferFunction(1.0f / 1.055f, 0.055f / 1.055f, 1.0f / 12.92f, 0.04045f, 0.0f, 0.0f, 2.4f);
+    }
+    static QColorTransferFunction fromProPhotoRgb()
+    {
+        return QColorTransferFunction(1.0f, 0.0f, 1.0f / 16.0f, 16.0f / 512.0f, 0.0f, 0.0f, 1.8f);
+    }
+    bool matches(const QColorTransferFunction &o) const
+    {
+        return paramCompare(m_a, o.m_a) && paramCompare(m_b, o.m_b)
+            && paramCompare(m_c, o.m_c) && paramCompare(m_d, o.m_d)
+            && paramCompare(m_e, o.m_e) && paramCompare(m_f, o.m_f)
+            && paramCompare(m_g, o.m_g);
+    }
+    friend inline bool operator==(const QColorTransferFunction &f1, const QColorTransferFunction &f2);
+    friend inline bool operator!=(const QColorTransferFunction &f1, const QColorTransferFunction &f2);
+
+    float m_a;
+    float m_b;
+    float m_c;
+    float m_d;
+    float m_e;
+    float m_f;
+    float m_g;
+
+private:
+    static inline bool paramCompare(float p1, float p2)
+    {
+        // Much fuzzier than fuzzy compare.
+        // It tries match parameters that has been passed through a 8.8
+        // fixed point form.
+        return (qAbs(p1 - p2) <= (1.0f / 512.0f));
+    }
+
+    void updateHints() const
+    {
+        if (m_flags & quint32(Hints::Calculated))
+            return;
+        // We do not consider the case with m_d = 1.0f linear or simple,
+        // since it wouldn't be linear for applyExtended().
+        bool simple = paramCompare(m_a, 1.0f) && paramCompare(m_b, 0.0f)
+                                              && paramCompare(m_d, 0.0f)
+                                              && paramCompare(m_e, 0.0f);
+        if (simple) {
+            m_flags |= quint32(Hints::IsGamma);
+            if (qFuzzyCompare(m_g, 1.0f))
+                m_flags |= quint32(Hints::IsLinear);
+        } else {
+            if (*this == fromSRgb())
+                m_flags |= quint32(Hints::IsSRgb);
+        }
+        m_flags |= quint32(Hints::Calculated);
+    }
+    enum class Hints : quint32 {
+        Calculated = 1,
+        IsGamma = 2,
+        IsLinear = 4,
+        IsSRgb = 8
+    };
+    mutable quint32 m_flags;
+};
+
+inline bool operator==(const QColorTransferFunction &f1, const QColorTransferFunction &f2)
+{
+    return f1.matches(f2);
+}
+inline bool operator!=(const QColorTransferFunction &f1, const QColorTransferFunction &f2)
+{
+    return !f1.matches(f2);
+}
+
+QT_END_NAMESPACE
+
+#endif // QCOLORTRANSFERFUNCTION_P_H
diff --git a/src/gui/painting/qcolortransfertable_p.h b/src/gui/painting/qcolortransfertable_p.h
new file mode 100644
index 0000000000..c8b2f7bd92
--- /dev/null
+++ b/src/gui/painting/qcolortransfertable_p.h
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOLORTRANSFERTABLE_P_H
+#define QCOLORTRANSFERTABLE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qtguiglobal_p.h>
+#include "qcolortransferfunction_p.h"
+
+#include <QVector>
+#include <cmath>
+
+QT_BEGIN_NAMESPACE
+
+// Defines either an ICC TRC 'curve' or a lut8/lut16 A or B table
+class Q_GUI_EXPORT QColorTransferTable
+{
+public:
+    QColorTransferTable() noexcept
+            : m_tableSize(0)
+    { }
+    QColorTransferTable(uint32_t size, const QVector<uint8_t> &table) noexcept
+            : m_tableSize(size)
+            , m_table8(table)
+    { }
+    QColorTransferTable(uint32_t size, const QVector<uint16_t> &table) noexcept
+            : m_tableSize(size)
+            , m_table16(table)
+    { }
+
+    bool isValid() const
+    {
+        if (m_tableSize < 2)
+            return false;
+
+#if !defined(QT_NO_DEBUG)
+        // The table must describe an injective curve:
+        if (!m_table8.isEmpty()) {
+            uint8_t val = 0;
+            for (uint i = 0; i < m_tableSize; ++i) {
+                Q_ASSERT(m_table8[i] >= val);
+                val = m_table8[i];
+            }
+        }
+        if (!m_table16.isEmpty()) {
+            uint16_t val = 0;
+            for (uint i = 0; i < m_tableSize; ++i) {
+                Q_ASSERT(m_table16[i] >= val);
+                val = m_table16[i];
+            }
+        }
+#endif
+        return !m_table8.isEmpty() || !m_table16.isEmpty();
+    }
+
+    float apply(float x) const
+    {
+        x = std::min(std::max(x, 0.0f), 1.0f);
+        x *= m_tableSize - 1;
+        uint32_t lo = (int)std::floor(x);
+        uint32_t hi = std::min(lo + 1, m_tableSize);
+        float frac = x - lo;
+        if (!m_table16.isEmpty())
+            return (m_table16[lo] * (1.0f - frac) + m_table16[hi] * frac) * (1.0f/65535.0f);
+        if (!m_table8.isEmpty())
+            return (m_table8[lo] * (1.0f - frac) + m_table8[hi] * frac) * (1.0f/255.0f);
+        return x;
+    }
+
+    // Apply inverse, optimized by giving a previous result a value < x.
+    float applyInverse(float x, float resultLargerThan = 0.0f) const
+    {
+        Q_ASSERT(resultLargerThan >= 0.0f && resultLargerThan <= 1.0f);
+        if (x <= 0.0f)
+            return 0.0f;
+        if (x >= 1.0f)
+            return 1.0f;
+        if (!m_table16.isEmpty()) {
+            float v = x * 65535.0f;
+            uint i = std::floor(resultLargerThan * (m_tableSize - 1)) + 1;
+            for ( ; i < m_tableSize; ++i) {
+                if (m_table16[i] > v)
+                    break;
+            }
+            if (i >= m_tableSize - 1)
+                return 1.0f;
+            float y1 = m_table16[i - 1];
+            float y2 = m_table16[i];
+            Q_ASSERT(x >= y1 && x < y2);
+            float fr = (v - y1) / (y2 - y1);
+            return (i + fr) * (1.0f / (m_tableSize - 1));
+
+        }
+        if (!m_table8.isEmpty()) {
+            float v = x * 255.0f;
+            uint i = std::floor(resultLargerThan * (m_tableSize - 1)) + 1;
+            for ( ; i < m_tableSize; ++i) {
+                if (m_table8[i] > v)
+                    break;
+            }
+            if (i >= m_tableSize - 1)
+                return 1.0f;
+            float y1 = m_table8[i - 1];
+            float y2 = m_table8[i];
+            Q_ASSERT(x >= y1 && x < y2);
+            float fr = (v - y1) / (y2 - y1);
+            return (i + fr) * (1.0f / (m_tableSize - 1));
+        }
+        return x;
+    }
+
+    bool asColorTransferFunction(QColorTransferFunction *transferFn)
+    {
+        Q_ASSERT(isValid());
+        Q_ASSERT(transferFn);
+        if (!m_table8.isEmpty() && (m_table8[0] != 0 || m_table8[m_tableSize - 1] != 255))
+            return false;
+        if (!m_table16.isEmpty() && (m_table16[0] != 0 || m_table16[m_tableSize - 1] != 65535))
+            return false;
+        if (m_tableSize == 2) {
+            *transferFn = QColorTransferFunction(); // Linear
+            return true;
+        }
+        // The following heuristics are based on those from Skia:
+        if (m_tableSize == 26 && !m_table16.isEmpty()) {
+            // code.facebook.com/posts/411525055626587/under-the-hood-improving-facebook-photos
+            if (m_table16[6] != 3062)
+                return false;
+            if (m_table16[12] != 12824)
+                return false;
+            if (m_table16[18] != 31237)
+                return false;
+            *transferFn = QColorTransferFunction::fromSRgb();
+            return true;
+        }
+        if (m_tableSize == 1024 && !m_table16.isEmpty()) {
+            // HP and Canon sRGB gamma tables:
+            if (m_table16[257] != 3366)
+                return false;
+            if (m_table16[513] != 14116)
+                return false;
+            if (m_table16[768] != 34318)
+                return false;
+            *transferFn = QColorTransferFunction::fromSRgb();
+            return true;
+        }
+        if (m_tableSize == 4096 && !m_table16.isEmpty()) {
+            // Nikon, Epson, and lcms2 sRGB gamma tables:
+            if (m_table16[515] != 960)
+                return false;
+            if (m_table16[1025] != 3342)
+                return false;
+            if (m_table16[2051] != 14079)
+                return false;
+            *transferFn = QColorTransferFunction::fromSRgb();
+            return true;
+        }
+        return false;
+    }
+    friend inline bool operator!=(const QColorTransferTable &t1, const QColorTransferTable &t2);
+    friend inline bool operator==(const QColorTransferTable &t1, const QColorTransferTable &t2);
+
+    uint32_t m_tableSize;
+    QVector<uint8_t> m_table8;
+    QVector<uint16_t> m_table16;
+};
+
+inline bool operator!=(const QColorTransferTable &t1, const QColorTransferTable &t2)
+{
+    if (t1.m_tableSize != t2.m_tableSize)
+        return true;
+    if (t1.m_table8.isEmpty() != t2.m_table8.isEmpty())
+        return true;
+    if (t1.m_table16.isEmpty() != t2.m_table16.isEmpty())
+        return true;
+    if (!t1.m_table8.isEmpty()) {
+        for (quint32 i = 0; i < t1.m_tableSize; ++i) {
+            if (t1.m_table8[i] != t2.m_table8[i])
+                return true;
+        }
+    }
+    if (!t1.m_table16.isEmpty()) {
+        for (quint32 i = 0; i < t1.m_tableSize; ++i) {
+            if (t1.m_table16[i] != t2.m_table16[i])
+                return true;
+        }
+    }
+    return false;
+}
+
+inline bool operator==(const QColorTransferTable &t1, const QColorTransferTable &t2)
+{
+    return !(t1 != t2);
+}
+
+QT_END_NAMESPACE
+
+#endif // QCOLORTRANSFERTABLE_P_H
diff --git a/src/gui/painting/qcolortransform.cpp b/src/gui/painting/qcolortransform.cpp
new file mode 100644
index 0000000000..10ccefed74
--- /dev/null
+++ b/src/gui/painting/qcolortransform.cpp
@@ -0,0 +1,720 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include "qcolortransform.h"
+#include "qcolortransform_p.h"
+
+#include "qcolormatrix_p.h"
+#include "qcolorspace_p.h"
+#include "qcolortrc_p.h"
+#include "qcolortrclut_p.h"
+
+#include <QtCore/qatomic.h>
+#include <QtCore/qmath.h>
+#include <QtGui/qcolor.h>
+#include <QtGui/qtransform.h>
+#include <QtCore/private/qsimd_p.h>
+
+#include <qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+QColorTrcLut *lutFromTrc(const QColorTrc &trc)
+{
+    if (trc.m_type == QColorTrc::Type::Table)
+        return QColorTrcLut::fromTransferTable(trc.m_table);
+    if (trc.m_type == QColorTrc::Type::Function)
+        return QColorTrcLut::fromTransferFunction(trc.m_fun);
+    qWarning() << "TRC uninitialized";
+    return nullptr;
+}
+
+void QColorTransformPrivate::updateLutsIn() const
+{
+    if (colorSpaceIn->lut.generated.loadAcquire())
+        return;
+    QMutexLocker lock(&QColorSpacePrivate::s_lutWriteLock);
+    if (colorSpaceIn->lut.generated.loadRelaxed())
+        return;
+
+    for (int i = 0; i < 3; ++i) {
+        if (!colorSpaceIn->trc[i].isValid())
+            return;
+    }
+
+    if (colorSpaceIn->trc[0] == colorSpaceIn->trc[1] && colorSpaceIn->trc[0] == colorSpaceIn->trc[2]) {
+        colorSpaceIn->lut[0].reset(lutFromTrc(colorSpaceIn->trc[0]));
+        colorSpaceIn->lut[1] = colorSpaceIn->lut[0];
+        colorSpaceIn->lut[2] = colorSpaceIn->lut[0];
+    } else {
+        for (int i = 0; i < 3; ++i)
+            colorSpaceIn->lut[i].reset(lutFromTrc(colorSpaceIn->trc[i]));
+    }
+
+    colorSpaceIn->lut.generated.storeRelease(1);
+}
+
+void QColorTransformPrivate::updateLutsOut() const
+{
+    if (colorSpaceOut->lut.generated.loadAcquire())
+        return;
+    QMutexLocker lock(&QColorSpacePrivate::s_lutWriteLock);
+    if (colorSpaceOut->lut.generated.loadRelaxed())
+        return;
+    for (int i = 0; i < 3; ++i) {
+        if (!colorSpaceOut->trc[i].isValid())
+            return;
+    }
+
+    if (colorSpaceOut->trc[0] == colorSpaceOut->trc[1] && colorSpaceOut->trc[0] == colorSpaceOut->trc[2]) {
+        colorSpaceOut->lut[0].reset(lutFromTrc(colorSpaceOut->trc[0]));
+        colorSpaceOut->lut[1] = colorSpaceOut->lut[0];
+        colorSpaceOut->lut[2] = colorSpaceOut->lut[0];
+    } else {
+        for (int i = 0; i < 3; ++i)
+            colorSpaceOut->lut[i].reset(lutFromTrc(colorSpaceOut->trc[i]));
+    }
+
+    colorSpaceOut->lut.generated.storeRelease(1);
+}
+
+/*!
+    \class QColorTransform
+    \brief The QColorTransform class is a transformation between color spaces.
+    \since 5.14
+
+    \ingroup painting
+    \ingroup appearance
+    \inmodule QtGui
+
+    QColorTransform is an instantiation of a transformation between color spaces.
+    It can be applied on color and pixels to convert them from one color space to
+    another.
+
+    Setting up a QColorTransform takes some preprocessing, so keeping around
+    QColorTransforms that you need often is recommended, instead of generating
+    them on the fly.
+*/
+
+
+QColorTransform::QColorTransform(const QColorTransform &colorTransform) noexcept
+    : d(colorTransform.d)
+{
+    if (d)
+        d->ref.ref();
+}
+
+
+QColorTransform::~QColorTransform()
+{
+    if (d && !d->ref.deref())
+        delete d;
+}
+
+/*!
+    Applies the color transformation on the QRgb value \a argb.
+
+    The input should be opaque or unpremultiplied.
+*/
+QRgb QColorTransform::map(QRgb argb) const
+{
+    if (!d)
+        return argb;
+    constexpr float f = 1.0f / 255.0f;
+    QColorVector c = { qRed(argb) * f, qGreen(argb) * f, qBlue(argb) * f };
+    c.x = d->colorSpaceIn->trc[0].apply(c.x);
+    c.y = d->colorSpaceIn->trc[1].apply(c.y);
+    c.z = d->colorSpaceIn->trc[2].apply(c.z);
+    c = d->colorMatrix.map(c);
+    c.x = std::max(0.0f, std::min(1.0f, c.x));
+    c.y = std::max(0.0f, std::min(1.0f, c.y));
+    c.z = std::max(0.0f, std::min(1.0f, c.z));
+    if (d->colorSpaceOut->lut.generated.loadAcquire()) {
+        c.x = d->colorSpaceOut->lut[0]->fromLinear(c.x);
+        c.y = d->colorSpaceOut->lut[1]->fromLinear(c.y);
+        c.z = d->colorSpaceOut->lut[2]->fromLinear(c.z);
+    } else {
+        c.x = d->colorSpaceOut->trc[0].applyInverse(c.x);
+        c.y = d->colorSpaceOut->trc[1].applyInverse(c.y);
+        c.z = d->colorSpaceOut->trc[2].applyInverse(c.z);
+    }
+
+    return qRgba(c.x * 255 + 0.5f, c.y * 255 + 0.5f, c.z * 255 + 0.5f, qAlpha(argb));
+}
+
+/*!
+    Applies the color transformation on the QRgba64 value \a rgba64.
+
+    The input should be opaque or unpremultiplied.
+*/
+QRgba64 QColorTransform::map(QRgba64 rgba64) const
+{
+    if (!d)
+        return rgba64;
+    constexpr float f = 1.0f / 65535.0f;
+    QColorVector c = { rgba64.red() * f, rgba64.green() * f, rgba64.blue() * f };
+    c.x = d->colorSpaceIn->trc[0].apply(c.x);
+    c.y = d->colorSpaceIn->trc[1].apply(c.y);
+    c.z = d->colorSpaceIn->trc[2].apply(c.z);
+    c = d->colorMatrix.map(c);
+    c.x = std::max(0.0f, std::min(1.0f, c.x));
+    c.y = std::max(0.0f, std::min(1.0f, c.y));
+    c.z = std::max(0.0f, std::min(1.0f, c.z));
+    if (d->colorSpaceOut->lut.generated.loadAcquire()) {
+        c.x = d->colorSpaceOut->lut[0]->fromLinear(c.x);
+        c.y = d->colorSpaceOut->lut[1]->fromLinear(c.y);
+        c.z = d->colorSpaceOut->lut[2]->fromLinear(c.z);
+    } else {
+        c.x = d->colorSpaceOut->trc[0].applyInverse(c.x);
+        c.y = d->colorSpaceOut->trc[1].applyInverse(c.y);
+        c.z = d->colorSpaceOut->trc[2].applyInverse(c.z);
+    }
+
+    return QRgba64::fromRgba64(c.x * 65535, c.y * 65535, c.z * 65535, rgba64.alpha());
+}
+
+/*!
+    Applies the color transformation on the QColor value \a color.
+
+*/
+QColor QColorTransform::map(const QColor &color) const
+{
+    if (!d)
+        return color;
+    QColor clr = color;
+    if (color.spec() != QColor::ExtendedRgb || color.spec() != QColor::Rgb)
+        clr = clr.toRgb();
+
+    QColorVector c = { (float)clr.redF(), (float)clr.greenF(), (float)clr.blueF() };
+    if (clr.spec() == QColor::ExtendedRgb) {
+        c.x = d->colorSpaceIn->trc[0].applyExtended(c.x);
+        c.y = d->colorSpaceIn->trc[1].applyExtended(c.y);
+        c.z = d->colorSpaceIn->trc[2].applyExtended(c.z);
+    } else {
+        c.x = d->colorSpaceIn->trc[0].apply(c.x);
+        c.y = d->colorSpaceIn->trc[1].apply(c.y);
+        c.z = d->colorSpaceIn->trc[2].apply(c.z);
+    }
+    c = d->colorMatrix.map(c);
+    bool inGamut = c.x >= 0.0f && c.x <= 1.0f && c.y >= 0.0f && c.y <= 1.0f && c.z >= 0.0f && c.z <= 1.0f;
+    if (inGamut) {
+        if (d->colorSpaceOut->lut.generated.loadAcquire()) {
+            c.x = d->colorSpaceOut->lut[0]->fromLinear(c.x);
+            c.y = d->colorSpaceOut->lut[1]->fromLinear(c.y);
+            c.z = d->colorSpaceOut->lut[2]->fromLinear(c.z);
+        } else {
+            c.x = d->colorSpaceOut->trc[0].applyInverse(c.x);
+            c.y = d->colorSpaceOut->trc[1].applyInverse(c.y);
+            c.z = d->colorSpaceOut->trc[2].applyInverse(c.z);
+        }
+    } else {
+        c.x = d->colorSpaceOut->trc[0].applyInverseExtended(c.x);
+        c.y = d->colorSpaceOut->trc[1].applyInverseExtended(c.y);
+        c.z = d->colorSpaceOut->trc[2].applyInverseExtended(c.z);
+    }
+    QColor out;
+    out.setRgbF(c.x, c.y, c.z, color.alphaF());
+    return out;
+}
+
+// Optimized sub-routines for fast block based conversion:
+
+static void applyMatrix(QColorVector *buffer, const qsizetype len, const QColorMatrix &colorMatrix)
+{
+#if defined(__SSE2__)
+    const __m128 minV = _mm_set1_ps(0.0f);
+    const __m128 maxV = _mm_set1_ps(1.0f);
+    const __m128 xMat = _mm_loadu_ps(&colorMatrix.r.x);
+    const __m128 yMat = _mm_loadu_ps(&colorMatrix.g.x);
+    const __m128 zMat = _mm_loadu_ps(&colorMatrix.b.x);
+    for (qsizetype j = 0; j < len; ++j) {
+        __m128 c = _mm_loadu_ps(&buffer[j].x);
+        __m128 cx = _mm_shuffle_ps(c, c, _MM_SHUFFLE(0, 0, 0, 0));
+        __m128 cy = _mm_shuffle_ps(c, c, _MM_SHUFFLE(1, 1, 1, 1));
+        __m128 cz = _mm_shuffle_ps(c, c, _MM_SHUFFLE(2, 2, 2, 2));
+        cx = _mm_mul_ps(cx, xMat);
+        cy = _mm_mul_ps(cy, yMat);
+        cz = _mm_mul_ps(cz, zMat);
+        cx = _mm_add_ps(cx, cy);
+        cx = _mm_add_ps(cx, cz);
+        // Clamp:
+        cx = _mm_min_ps(cx, maxV);
+        cx = _mm_max_ps(cx, minV);
+        _mm_storeu_ps(&buffer[j].x, cx);
+    }
+#else
+    for (int j = 0; j < len; ++j) {
+        const QColorVector cv = colorMatrix.map(buffer[j]);
+        buffer[j].x = std::max(0.0f, std::min(1.0f, cv.x));
+        buffer[j].y = std::max(0.0f, std::min(1.0f, cv.y));
+        buffer[j].z = std::max(0.0f, std::min(1.0f, cv.z));
+    }
+#endif
+}
+
+template<typename T>
+static void loadPremultiplied(QColorVector *buffer, const T *src, const qsizetype len, const QColorTransformPrivate *d_ptr);
+template<typename T>
+static void loadUnpremultiplied(QColorVector *buffer, const T *src, const qsizetype len, const QColorTransformPrivate *d_ptr);
+
+#if defined(__SSE2__)
+// Load to [0-alpha] in 4x32 SIMD
+template<typename T>
+static inline void loadP(const T &p, __m128i &v);
+
+template<>
+inline void loadP<QRgb>(const QRgb &p, __m128i &v)
+{
+    v = _mm_cvtsi32_si128(p);
+#if defined(__SSE4_1__)
+    v = _mm_cvtepu8_epi32(v);
+#else
+    v = _mm_unpacklo_epi8(v, _mm_setzero_si128());
+    v = _mm_unpacklo_epi16(v, _mm_setzero_si128());
+#endif
+}
+
+template<>
+inline void loadP<QRgba64>(const QRgba64 &p, __m128i &v)
+{
+    v = _mm_loadl_epi64((const __m128i *)&p);
+#if defined(__SSE4_1__)
+    v = _mm_cvtepu16_epi32(v);
+#else
+    v = _mm_unpacklo_epi16(v, _mm_setzero_si128());
+#endif
+    // Shuffle to ARGB as the template below expects it
+    v = _mm_shuffle_epi32(v, _MM_SHUFFLE(3, 0, 1, 2));
+}
+
+template<typename T>
+static void loadPremultiplied(QColorVector *buffer, const T *src, const qsizetype len, const QColorTransformPrivate *d_ptr)
+{
+    const __m128 v4080 = _mm_set1_ps(4080.f);
+    const __m128 iFF00 = _mm_set1_ps(1.0f / (255 * 256));
+    for (qsizetype i = 0; i < len; ++i) {
+        __m128i v;
+        loadP<T>(src[i], v);
+        __m128 vf = _mm_cvtepi32_ps(v);
+        // Approximate 1/a:
+        __m128 va = _mm_shuffle_ps(vf, vf, _MM_SHUFFLE(3, 3, 3, 3));
+        __m128 via = _mm_rcp_ps(va);
+        via = _mm_sub_ps(_mm_add_ps(via, via), _mm_mul_ps(via, _mm_mul_ps(via, va)));
+        // v * (1/a)
+        vf = _mm_mul_ps(vf, via);
+
+        // Handle zero alpha
+        __m128 vAlphaMask = _mm_cmpeq_ps(va, _mm_set1_ps(0.0f));
+        vf = _mm_andnot_ps(vAlphaMask, vf);
+
+        // LUT
+        v = _mm_cvtps_epi32(_mm_mul_ps(vf, v4080));
+        const int ridx = _mm_extract_epi16(v, 4);
+        const int gidx = _mm_extract_epi16(v, 2);
+        const int bidx = _mm_extract_epi16(v, 0);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceIn->lut[0]->m_toLinear[ridx], 0);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceIn->lut[1]->m_toLinear[gidx], 2);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceIn->lut[2]->m_toLinear[bidx], 4);
+        vf = _mm_mul_ps(_mm_cvtepi32_ps(v), iFF00);
+
+        _mm_storeu_ps(&buffer[i].x, vf);
+    }
+}
+
+// Load to [0-4080] in 4x32 SIMD
+template<typename T>
+static inline void loadPU(const T &p, __m128i &v);
+
+template<>
+inline void loadPU<QRgb>(const QRgb &p, __m128i &v)
+{
+    v = _mm_cvtsi32_si128(p);
+#if defined(__SSE4_1__)
+    v = _mm_cvtepu8_epi32(v);
+#else
+    v = _mm_unpacklo_epi8(v, _mm_setzero_si128());
+    v = _mm_unpacklo_epi16(v, _mm_setzero_si128());
+#endif
+    v = _mm_slli_epi32(v, 4);
+}
+
+template<>
+inline void loadPU<QRgba64>(const QRgba64 &p, __m128i &v)
+{
+    v = _mm_loadl_epi64((const __m128i *)&p);
+    v = _mm_sub_epi16(v, _mm_srli_epi16(v, 8));
+#if defined(__SSE4_1__)
+    v = _mm_cvtepu16_epi32(v);
+#else
+    v = _mm_unpacklo_epi16(v, _mm_setzero_si128());
+#endif
+    v = _mm_srli_epi32(v, 4);
+    // Shuffle to ARGB as the template below expects it
+    v = _mm_shuffle_epi32(v, _MM_SHUFFLE(3, 0, 1, 2));
+}
+
+template<typename T>
+void loadUnpremultiplied(QColorVector *buffer, const T *src, const qsizetype len, const QColorTransformPrivate *d_ptr)
+{
+    const __m128 iFF00 = _mm_set1_ps(1.0f / (255 * 256));
+    for (qsizetype i = 0; i < len; ++i) {
+        __m128i v;
+        loadPU<T>(src[i], v);
+        const int ridx = _mm_extract_epi16(v, 4);
+        const int gidx = _mm_extract_epi16(v, 2);
+        const int bidx = _mm_extract_epi16(v, 0);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceIn->lut[0]->m_toLinear[ridx], 0);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceIn->lut[1]->m_toLinear[gidx], 2);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceIn->lut[2]->m_toLinear[bidx], 4);
+        __m128 vf = _mm_mul_ps(_mm_cvtepi32_ps(v), iFF00);
+        _mm_storeu_ps(&buffer[i].x, vf);
+    }
+}
+
+#else
+template<>
+void loadPremultiplied<QRgb>(QColorVector *buffer, const QRgb *src, const qsizetype len, const QColorTransformPrivate *d_ptr)
+{
+    for (qsizetype i = 0; i < len; ++i) {
+        const uint p = src[i];
+        const int a = qAlpha(p);
+        if (a) {
+            const float ia = 4080.0f / a;
+            const int ridx = int(qRed(p)   * ia + 0.5f);
+            const int gidx = int(qGreen(p) * ia + 0.5f);
+            const int bidx = int(qBlue(p)  * ia + 0.5f);
+            buffer[i].x = d_ptr->colorSpaceIn->lut[0]->m_toLinear[ridx] * (1.0f / (255 * 256));
+            buffer[i].y = d_ptr->colorSpaceIn->lut[1]->m_toLinear[gidx] * (1.0f / (255 * 256));
+            buffer[i].z = d_ptr->colorSpaceIn->lut[2]->m_toLinear[bidx] * (1.0f / (255 * 256));
+        } else {
+            buffer[i].x = buffer[i].y = buffer[i].z = 0.0f;
+        }
+    }
+}
+
+template<>
+void loadPremultiplied<QRgba64>(QColorVector *buffer, const QRgba64 *src, const qsizetype len, const QColorTransformPrivate *d_ptr)
+{
+    for (qsizetype i = 0; i < len; ++i) {
+        const QRgba64 &p = src[i];
+        const int a = p.alpha();
+        if (a) {
+            const float ia = 4080.0f / a;
+            const int ridx = int(p.red()   * ia + 0.5f);
+            const int gidx = int(p.green() * ia + 0.5f);
+            const int bidx = int(p.blue()  * ia + 0.5f);
+            buffer[i].x = d_ptr->colorSpaceIn->lut[0]->m_toLinear[ridx] * (1.0f / (255 * 256));
+            buffer[i].y = d_ptr->colorSpaceIn->lut[1]->m_toLinear[gidx] * (1.0f / (255 * 256));
+            buffer[i].z = d_ptr->colorSpaceIn->lut[2]->m_toLinear[bidx] * (1.0f / (255 * 256));
+        } else {
+            buffer[i].x = buffer[i].y = buffer[i].z = 0.0f;
+        }
+    }
+}
+
+template<>
+void loadUnpremultiplied<QRgb>(QColorVector *buffer, const QRgb *src, const qsizetype len, const QColorTransformPrivate *d_ptr)
+{
+    for (qsizetype i = 0; i < len; ++i) {
+        const uint p = src[i];
+        buffer[i].x = d_ptr->colorSpaceIn->lut[0]->u8ToLinearF32(qRed(p));
+        buffer[i].y = d_ptr->colorSpaceIn->lut[1]->u8ToLinearF32(qGreen(p));
+        buffer[i].z = d_ptr->colorSpaceIn->lut[2]->u8ToLinearF32(qBlue(p));
+    }
+}
+
+template<>
+void loadUnpremultiplied<QRgba64>(QColorVector *buffer, const QRgba64 *src, const qsizetype len, const QColorTransformPrivate *d_ptr)
+{
+    for (qsizetype i = 0; i < len; ++i) {
+        const QRgba64 &p = src[i];
+        buffer[i].x = d_ptr->colorSpaceIn->lut[0]->u16ToLinearF32(p.red());
+        buffer[i].y = d_ptr->colorSpaceIn->lut[1]->u16ToLinearF32(p.green());
+        buffer[i].z = d_ptr->colorSpaceIn->lut[2]->u16ToLinearF32(p.blue());
+    }
+}
+#endif
+
+static void storePremultiplied(QRgb *dst, const QRgb *src, const QColorVector *buffer, const qsizetype len,
+                               const QColorTransformPrivate *d_ptr)
+{
+#if defined(__SSE2__)
+    const __m128 v4080 = _mm_set1_ps(4080.f);
+    const __m128 iFF00 = _mm_set1_ps(1.0f / (255 * 256));
+    for (qsizetype i = 0; i < len; ++i) {
+        const int a = qAlpha(src[i]);
+        __m128 vf = _mm_loadu_ps(&buffer[i].x);
+        __m128i v = _mm_cvtps_epi32(_mm_mul_ps(vf, v4080));
+        __m128 va = _mm_set1_ps(a);
+        va = _mm_mul_ps(va, iFF00);
+        const int ridx = _mm_extract_epi16(v, 0);
+        const int gidx = _mm_extract_epi16(v, 2);
+        const int bidx = _mm_extract_epi16(v, 4);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[0]->m_fromLinear[ridx], 4);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[1]->m_fromLinear[gidx], 2);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[2]->m_fromLinear[bidx], 0);
+        vf = _mm_cvtepi32_ps(v);
+        vf = _mm_mul_ps(vf, va);
+        v = _mm_cvtps_epi32(vf);
+        v = _mm_packs_epi32(v, v);
+        v = _mm_insert_epi16(v, a, 3);
+        v = _mm_packus_epi16(v, v);
+        dst[i] = _mm_cvtsi128_si32(v);
+    }
+#else
+    for (qsizetype i = 0; i < len; ++i) {
+        const int a = qAlpha(src[i]);
+        const float fa = a / (255.0f * 256.0f);
+        const float r = d_ptr->colorSpaceOut->lut[0]->m_fromLinear[int(buffer[i].x * 4080.0f + 0.5f)];
+        const float g = d_ptr->colorSpaceOut->lut[1]->m_fromLinear[int(buffer[i].y * 4080.0f + 0.5f)];
+        const float b = d_ptr->colorSpaceOut->lut[2]->m_fromLinear[int(buffer[i].z * 4080.0f + 0.5f)];
+        dst[i] = qRgba(r * fa + 0.5f, g * fa + 0.5f, b * fa + 0.5f, a);
+    }
+#endif
+}
+
+static void storeUnpremultiplied(QRgb *dst, const QRgb *src, const QColorVector *buffer, const qsizetype len,
+                                 const QColorTransformPrivate *d_ptr)
+{
+#if defined(__SSE2__)
+    const __m128 v4080 = _mm_set1_ps(4080.f);
+    for (qsizetype i = 0; i < len; ++i) {
+        const int a = qAlpha(src[i]);
+        __m128 vf = _mm_loadu_ps(&buffer[i].x);
+        __m128i v = _mm_cvtps_epi32(_mm_mul_ps(vf, v4080));
+        const int ridx = _mm_extract_epi16(v, 0);
+        const int gidx = _mm_extract_epi16(v, 2);
+        const int bidx = _mm_extract_epi16(v, 4);
+        v = _mm_setzero_si128();
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[0]->m_fromLinear[ridx], 2);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[1]->m_fromLinear[gidx], 1);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[2]->m_fromLinear[bidx], 0);
+        v = _mm_add_epi16(v, _mm_set1_epi16(0x80));
+        v = _mm_srli_epi16(v, 8);
+        v = _mm_insert_epi16(v, a, 3);
+        v = _mm_packus_epi16(v, v);
+        dst[i] = _mm_cvtsi128_si32(v);
+    }
+#else
+    for (qsizetype i = 0; i < len; ++i) {
+        const int r = d_ptr->colorSpaceOut->lut[0]->u8FromLinearF32(buffer[i].x);
+        const int g = d_ptr->colorSpaceOut->lut[1]->u8FromLinearF32(buffer[i].y);
+        const int b = d_ptr->colorSpaceOut->lut[2]->u8FromLinearF32(buffer[i].z);
+        dst[i] = (src[i] & 0xff000000) | (r << 16) | (g << 8) | (b << 0);
+    }
+#endif
+}
+
+static void storeOpaque(QRgb *dst, const QRgb *src, const QColorVector *buffer, const qsizetype len,
+                        const QColorTransformPrivate *d_ptr)
+{
+    Q_UNUSED(src);
+#if defined(__SSE2__)
+    const __m128 v4080 = _mm_set1_ps(4080.f);
+    for (qsizetype i = 0; i < len; ++i) {
+        __m128 vf = _mm_loadu_ps(&buffer[i].x);
+        __m128i v = _mm_cvtps_epi32(_mm_mul_ps(vf, v4080));
+        const int ridx = _mm_extract_epi16(v, 0);
+        const int gidx = _mm_extract_epi16(v, 2);
+        const int bidx = _mm_extract_epi16(v, 4);
+        v = _mm_setzero_si128();
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[0]->m_fromLinear[ridx], 2);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[1]->m_fromLinear[gidx], 1);
+        v = _mm_insert_epi16(v, d_ptr->colorSpaceOut->lut[2]->m_fromLinear[bidx], 0);
+        v = _mm_add_epi16(v, _mm_set1_epi16(0x80));
+        v = _mm_srli_epi16(v, 8);
+        v = _mm_insert_epi16(v, 255, 3);
+        v = _mm_packus_epi16(v, v);
+        dst[i] = _mm_cvtsi128_si32(v);
+    }
+#else
+    for (qsizetype i = 0; i < len; ++i) {
+        const int r = d_ptr->colorSpaceOut->lut[0]->u8FromLinearF32(buffer[i].x);
+        const int g = d_ptr->colorSpaceOut->lut[1]->u8FromLinearF32(buffer[i].y);
+        const int b = d_ptr->colorSpaceOut->lut[2]->u8FromLinearF32(buffer[i].z);
+        dst[i] = 0xff000000 | (r << 16) | (g << 8) | (b << 0);
+    }
+#endif
+}
+
+static void storePremultiplied(QRgba64 *dst, const QRgba64 *src, const QColorVector *buffer, const qsizetype len,
+                               const QColorTransformPrivate *d_ptr)
+{
+    for (qsizetype i = 0; i < len; ++i) {
+        const int a = src[i].alpha();
+        const float fa = a / (255.0f * 256.0f);
+        const float r = d_ptr->colorSpaceOut->lut[0]->m_fromLinear[int(buffer[i].x * 4080.0f + 0.5f)];
+        const float g = d_ptr->colorSpaceOut->lut[1]->m_fromLinear[int(buffer[i].y * 4080.0f + 0.5f)];
+        const float b = d_ptr->colorSpaceOut->lut[2]->m_fromLinear[int(buffer[i].z * 4080.0f + 0.5f)];
+        dst[i] = qRgba64(r * fa + 0.5f, g * fa + 0.5f, b * fa + 0.5f, a);
+    }
+}
+
+static void storeUnpremultiplied(QRgba64 *dst, const QRgba64 *src, const QColorVector *buffer, const qsizetype len,
+                                 const QColorTransformPrivate *d_ptr)
+{
+    for (qsizetype i = 0; i < len; ++i) {
+         const int r = d_ptr->colorSpaceOut->lut[0]->u16FromLinearF32(buffer[i].x);
+         const int g = d_ptr->colorSpaceOut->lut[1]->u16FromLinearF32(buffer[i].y);
+         const int b = d_ptr->colorSpaceOut->lut[2]->u16FromLinearF32(buffer[i].z);
+         dst[i] = qRgba64(r, g, b, src[i].alpha());
+    }
+}
+
+static void storeOpaque(QRgba64 *dst, const QRgba64 *src, const QColorVector *buffer, const qsizetype len,
+                        const QColorTransformPrivate *d_ptr)
+{
+    Q_UNUSED(src);
+    for (qsizetype i = 0; i < len; ++i) {
+        const int r = d_ptr->colorSpaceOut->lut[0]->u16FromLinearF32(buffer[i].x);
+        const int g = d_ptr->colorSpaceOut->lut[1]->u16FromLinearF32(buffer[i].y);
+        const int b = d_ptr->colorSpaceOut->lut[2]->u16FromLinearF32(buffer[i].z);
+        dst[i] = qRgba64(r, g, b, 0xFFFF);
+    }
+}
+
+static constexpr qsizetype WorkBlockSize = 256;
+
+template <typename T, int Count = 1>
+class QUninitialized
+{
+public:
+    operator T*() { return reinterpret_cast<T *>(this); }
+private:
+    alignas(T) char data[sizeof(T) * Count];
+};
+
+template<typename T>
+void QColorTransformPrivate::apply(T *dst, const T *src, qsizetype count, TransformFlags flags) const
+{
+    if (!colorMatrix.isValid())
+        return;
+
+    updateLutsIn();
+    updateLutsOut();
+
+    bool doApplyMatrix = (colorMatrix != QColorMatrix::identity());
+
+    QUninitialized<QColorVector, WorkBlockSize> buffer;
+
+    qsizetype i = 0;
+    while (i < count) {
+        const qsizetype len = qMin(count - i, WorkBlockSize);
+        if (flags & InputPremultiplied)
+            loadPremultiplied(buffer, src + i, len, this);
+        else
+            loadUnpremultiplied(buffer, src + i, len, this);
+
+        if (doApplyMatrix)
+            applyMatrix(buffer, len, colorMatrix);
+
+        if (flags & InputOpaque)
+            storeOpaque(dst + i, src + i, buffer, len, this);
+        else if (flags & OutputPremultiplied)
+            storePremultiplied(dst + i, src + i, buffer, len, this);
+        else
+            storeUnpremultiplied(dst + i, src + i, buffer, len, this);
+
+        i += len;
+    }
+}
+
+/*!
+    \internal
+    \enum QColorTransformPrivate::TransformFlag
+
+    Defines how the transform is to be applied.
+
+    \value Unpremultiplied The input and output should both be unpremultiplied.
+    \value InputOpaque The input is guaranteed to be opaque.
+    \value InputPremultiplied The input is premultiplied.
+    \value OutputPremultiplied The output should be premultiplied.
+    \value Premultiplied Both input and output should both be premultiplied.
+*/
+
+/*!
+    \internal
+    Prepares a color transformation for fast application. You do not need to
+    call this explicitly as it will be called implicitly on the first transforms, but
+    if you want predictable performance on the first transforms, you can perform it
+    in advance.
+
+    \sa QColorTransform::map(), apply()
+*/
+void QColorTransformPrivate::prepare()
+{
+    updateLutsIn();
+    updateLutsOut();
+}
+
+/*!
+    \internal
+    Applies the color transformation on \a count QRgb pixels starting from
+    \a src and stores the result in \a dst.
+
+    Thread-safe if prepare() has been called first.
+
+    Assumes unpremultiplied data by default. Set \a flags to change defaults.
+
+    \sa prepare()
+*/
+void QColorTransformPrivate::apply(QRgb *dst, const QRgb *src, qsizetype count, TransformFlags flags) const
+{
+    apply<QRgb>(dst, src, count, flags);
+}
+
+/*!
+    \internal
+    Applies the color transformation on \a count QRgba64 pixels starting from
+    \a src and stores the result in \a dst.
+
+    Thread-safe if prepare() has been called first.
+
+    Assumes unpremultiplied data by default. Set \a flags to change defaults.
+
+    \sa prepare()
+*/
+void QColorTransformPrivate::apply(QRgba64 *dst, const QRgba64 *src, qsizetype count, TransformFlags flags) const
+{
+    apply<QRgba64>(dst, src, count, flags);
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/gui/painting/qcolortransform.h b/src/gui/painting/qcolortransform.h
new file mode 100644
index 0000000000..94b6b3a385
--- /dev/null
+++ b/src/gui/painting/qcolortransform.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOLORTRANSFORM_H
+#define QCOLORTRANSFORM_H
+
+#include <QtGui/qtguiglobal.h>
+#include <QtGui/qrgb.h>
+
+QT_BEGIN_NAMESPACE
+
+class QColor;
+class QRgba64;
+class QColorSpacePrivate;
+class QColorTransformPrivate;
+
+class QColorTransform
+{
+public:
+    QColorTransform() noexcept : d(nullptr) { }
+    Q_GUI_EXPORT ~QColorTransform();
+    Q_GUI_EXPORT QColorTransform(const QColorTransform &colorTransform) noexcept;
+    QColorTransform(QColorTransform &&colorTransform) noexcept
+            : d{qExchange(colorTransform.d, nullptr)}
+    { }
+    QColorTransform &operator=(const QColorTransform &other) noexcept
+    {
+        QColorTransform{other}.swap(*this);
+        return *this;
+    }
+    QColorTransform &operator=(QColorTransform &&other) noexcept
+    {
+        QColorTransform{std::move(other)}.swap(*this);
+        return *this;
+    }
+
+    void swap(QColorTransform &other) noexcept { qSwap(d, other.d); }
+
+    Q_GUI_EXPORT QRgb map(QRgb argb) const;
+    Q_GUI_EXPORT QRgba64 map(QRgba64 rgba64) const;
+    Q_GUI_EXPORT QColor map(const QColor &color) const;
+
+private:
+    friend class QColorSpace;
+    friend class QColorSpacePrivate;
+    friend class QImage;
+
+    const QColorTransformPrivate *d;
+};
+
+Q_DECLARE_SHARED(QColorTransform)
+
+QT_END_NAMESPACE
+
+#endif // QCOLORTRANSFORM_H
diff --git a/src/gui/painting/qcolortransform_p.h b/src/gui/painting/qcolortransform_p.h
new file mode 100644
index 0000000000..5d7116248d
--- /dev/null
+++ b/src/gui/painting/qcolortransform_p.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOLORTRANSFORM_P_H
+#define QCOLORTRANSFORM_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qcolormatrix_p.h"
+#include "qcolorspace_p.h"
+
+#include <QtCore/qshareddata.h>
+
+QT_BEGIN_NAMESPACE
+
+class QColorTransformPrivate : public QSharedData
+{
+public:
+    QColorMatrix colorMatrix;
+    QExplicitlySharedDataPointer<const QColorSpacePrivate> colorSpaceIn;
+    QExplicitlySharedDataPointer<const QColorSpacePrivate> colorSpaceOut;
+
+    void updateLutsIn() const;
+    void updateLutsOut() const;
+    bool simpleGammaCorrection() const;
+
+    void prepare();
+    enum TransformFlag {
+        Unpremultiplied = 0,
+        InputOpaque = 1,
+        InputPremultiplied = 2,
+        OutputPremultiplied = 4,
+        Premultiplied = (InputPremultiplied | OutputPremultiplied)
+    };
+    Q_DECLARE_FLAGS(TransformFlags, TransformFlag)
+
+    void apply(QRgb *dst, const QRgb *src, qsizetype count, TransformFlags flags = Unpremultiplied) const;
+    void apply(QRgba64 *dst, const QRgba64 *src, qsizetype count, TransformFlags flags = Unpremultiplied) const;
+
+    template<typename T>
+    void apply(T *dst, const T *src, qsizetype count, TransformFlags flags) const;
+};
+
+QT_END_NAMESPACE
+
+#endif // QCOLORTRANSFORM_P_H
diff --git a/src/gui/painting/qcolortrc_p.h b/src/gui/painting/qcolortrc_p.h
new file mode 100644
index 0000000000..3ef9d442fc
--- /dev/null
+++ b/src/gui/painting/qcolortrc_p.h
@@ -0,0 +1,148 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCOLORTRC_P_H
+#define QCOLORTRC_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qtguiglobal_p.h>
+#include "qcolortransferfunction_p.h"
+#include "qcolortransfertable_p.h"
+
+QT_BEGIN_NAMESPACE
+
+
+// Defines an ICC TRC (Tone Reproduction Curve)
+class Q_GUI_EXPORT QColorTrc
+{
+public:
+    QColorTrc() noexcept : m_type(Type::Uninitialized)
+    { }
+    QColorTrc(const QColorTransferFunction &fun) : m_type(Type::Function), m_fun(fun)
+    { }
+    QColorTrc(const QColorTransferTable &table) : m_type(Type::Table), m_table(table)
+    { }
+
+    enum class Type {
+        Uninitialized,
+        Function,
+        Table
+    };
+
+    bool isLinear() const
+    {
+        return m_type == Type::Uninitialized || (m_type == Type::Function && m_fun.isLinear());
+    }
+    bool isValid() const
+    {
+        return m_type != Type::Uninitialized;
+    }
+    float apply(float x) const
+    {
+        if (m_type == Type::Table)
+            return m_table.apply(x);
+        if (m_type == Type::Function)
+            return m_fun.apply(x);
+        return x;
+    }
+    float applyExtended(float x) const
+    {
+        if (x >= 0.0f && x <= 1.0f)
+            return apply(x);
+        if (m_type == Type::Function)
+            return std::copysign(m_fun.apply(std::abs(x)), x);
+        if (m_type == Type::Table)
+            return x < 0.0f ? 0.0f : 1.0f;
+        return x;
+    }
+    float applyInverse(float x) const
+    {
+        if (m_type == Type::Table)
+            return m_table.applyInverse(x);
+        if (m_type == Type::Function)
+            return m_fun.inverted().apply(x);
+        return x;
+    }
+    float applyInverseExtended(float x) const
+    {
+        if (x >= 0.0f && x <= 1.0f)
+            return applyInverse(x);
+        if (m_type == Type::Function)
+            return std::copysign(applyInverse(x), x);
+        if (m_type == Type::Table)
+            return x < 0.0f ? 0.0f : 1.0f;
+        return x;
+    }
+
+    friend inline bool operator!=(const QColorTrc &o1, const QColorTrc &o2);
+    friend inline bool operator==(const QColorTrc &o1, const QColorTrc &o2);
+
+    Type m_type;
+    QColorTransferFunction m_fun;
+    QColorTransferTable m_table;
+};
+
+inline bool operator!=(const QColorTrc &o1, const QColorTrc &o2)
+{
+    if (o1.m_type != o2.m_type)
+        return true;
+    if (o1.m_type == QColorTrc::Type::Function)
+        return o1.m_fun != o2.m_fun;
+    if (o1.m_type == QColorTrc::Type::Table)
+        return o1.m_table != o2.m_table;
+    return false;
+}
+inline bool operator==(const QColorTrc &o1, const QColorTrc &o2)
+{
+    return !(o1 != o2);
+}
+
+QT_END_NAMESPACE
+
+#endif // QCOLORTRC
diff --git a/src/gui/painting/qcolorprofile.cpp b/src/gui/painting/qcolortrclut.cpp
index 3b7b0a248b..268d7252b4 100644
--- a/src/gui/painting/qcolorprofile.cpp
+++ b/src/gui/painting/qcolortrclut.cpp
@@ -37,14 +37,16 @@
 **
 ****************************************************************************/
 
-#include "qcolorprofile_p.h"
+#include "qcolortrclut_p.h"
+#include "qcolortransferfunction_p.h"
+#include "qcolortransfertable_p.h"
 #include <qmath.h>
 
 QT_BEGIN_NAMESPACE
 
-QColorProfile *QColorProfile::fromGamma(qreal gamma)
+QColorTrcLut *QColorTrcLut::fromGamma(qreal gamma)
 {
-    QColorProfile *cp = new QColorProfile;
+    QColorTrcLut *cp = new QColorTrcLut;
 
     for (int i = 0; i <= (255 * 16); ++i) {
         cp->m_toLinear[i] = ushort(qRound(qPow(i / qreal(255 * 16), gamma) * (255 * 256)));
@@ -54,31 +56,28 @@ QColorProfile *QColorProfile::fromGamma(qreal gamma)
     return cp;
 }
 
-static qreal srgbToLinear(qreal v)
+QColorTrcLut *QColorTrcLut::fromTransferFunction(const QColorTransferFunction &fun)
 {
-    const qreal a = 0.055;
-    if (v <= qreal(0.04045))
-        return v / qreal(12.92);
-    else
-        return qPow((v + a) / (qreal(1) + a), qreal(2.4));
-}
+    QColorTrcLut *cp = new QColorTrcLut;
+    QColorTransferFunction inv = fun.inverted();
 
-static qreal linearToSrgb(qreal v)
-{
-    const qreal a = 0.055;
-    if (v <= qreal(0.0031308))
-        return v * qreal(12.92);
-    else
-        return (qreal(1) + a) * qPow(v, qreal(1.0 / 2.4)) - a;
+    for (int i = 0; i <= (255 * 16); ++i) {
+        cp->m_toLinear[i] = ushort(qRound(fun.apply(i / qreal(255 * 16)) * (255 * 256)));
+        cp->m_fromLinear[i] = ushort(qRound(inv.apply(i / qreal(255 * 16)) * (255 * 256)));
+    }
+
+    return cp;
 }
 
-QColorProfile *QColorProfile::fromSRgb()
+QColorTrcLut *QColorTrcLut::fromTransferTable(const QColorTransferTable &table)
 {
-    QColorProfile *cp = new QColorProfile;
+    QColorTrcLut *cp = new QColorTrcLut;
 
+    float minInverse = 0.0f;
     for (int i = 0; i <= (255 * 16); ++i) {
-        cp->m_toLinear[i] = ushort(qRound(srgbToLinear(i / qreal(255 * 16)) * (255 * 256)));
-        cp->m_fromLinear[i] = ushort(qRound(linearToSrgb(i / qreal(255 * 16)) * (255 * 256)));
+        cp->m_toLinear[i] = ushort(qBound(0, qRound(table.apply(i / qreal(255 * 16)) * (255 * 256)), 65280));
+        minInverse = table.applyInverse(i / qreal(255 * 16), minInverse);
+        cp->m_fromLinear[i] = ushort(qBound(0, qRound(minInverse * (255 * 256)), 65280));
     }
 
     return cp;
diff --git a/src/gui/painting/qcolorprofile_p.h b/src/gui/painting/qcolortrclut_p.h
index 425e9abace..76a6a60803 100644
--- a/src/gui/painting/qcolorprofile_p.h
+++ b/src/gui/painting/qcolortrclut_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QCOLORPROFILE_P_H
-#define QCOLORPROFILE_P_H
+#ifndef QCOLORTRCLUT_P_H
+#define QCOLORTRCLUT_P_H
 
 //
 //  W A R N I N G
@@ -52,21 +52,29 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
+#include <QtCore/qsharedpointer.h>
 #include <QtGui/qrgb.h>
 #include <QtGui/qrgba64.h>
 
+#include <cmath>
+
 #if defined(__SSE2__)
 #include <emmintrin.h>
 #elif defined(__ARM_NEON__) || defined(__ARM_NEON)
 #include <arm_neon.h>
 #endif
+
 QT_BEGIN_NAMESPACE
 
-class Q_GUI_EXPORT QColorProfile
+class QColorTransferFunction;
+class QColorTransferTable;
+
+class Q_GUI_EXPORT QColorTrcLut : public QEnableSharedFromThis<QColorTrcLut>
 {
 public:
-    static QColorProfile *fromGamma(qreal gamma);
-    static QColorProfile *fromSRgb();
+    static QColorTrcLut *fromGamma(qreal gamma);
+    static QColorTrcLut *fromTransferFunction(const QColorTransferFunction &transfn);
+    static QColorTrcLut *fromTransferTable(const QColorTransferTable &transTable);
 
     // The following methods all convert opaque or unpremultiplied colors:
 
@@ -121,6 +129,25 @@ public:
         return convertWithTable(rgb64, m_toLinear);
     }
 
+    float u8ToLinearF32(int c) const
+    {
+        ushort v = m_toLinear[c << 4];
+        return v * (1.0f / (255*256));
+    }
+
+    float u16ToLinearF32(int c) const
+    {
+        c -= (c >> 8);
+        ushort v = m_toLinear[c >> 4];
+        return v * (1.0f / (255*256));
+    }
+
+    float toLinear(float f) const
+    {
+        ushort v = m_toLinear[(int)(f * (255 * 16) + 0.5f)];
+        return v * (1.0f / (255*256));
+    }
+
     QRgb fromLinear64(QRgba64 rgb64) const
     {
 #if defined(__SSE2__)
@@ -176,8 +203,31 @@ public:
         return convertWithTable(rgb64, m_fromLinear);
     }
 
+    int u8FromLinearF32(float f) const
+    {
+        ushort v = m_fromLinear[(int)(f * (255 * 16) + 0.5f)];
+        return (v + 0x80) >> 8;
+    }
+    int u16FromLinearF32(float f) const
+    {
+        ushort v = m_fromLinear[(int)(f * (255 * 16) + 0.5f)];
+        return v + (v >> 8);
+    }
+    float fromLinear(float f) const
+    {
+        ushort v = m_fromLinear[(int)(f * (255 * 16) + 0.5f)];
+        return v * (1.0f / (255*256));
+    }
+
+    // We translate to 0-65280 (255*256) instead to 0-65535 to make simple
+    // shifting an accurate conversion.
+    // We translate from 0-4080 (255*16) for the same speed up, and to keep
+    // the tables small enough to fit in most inner caches.
+    ushort m_toLinear[(255 * 16) + 1]; // [0-4080] -> [0-65280]
+    ushort m_fromLinear[(255 * 16) + 1]; // [0-4080] -> [0-65280]
+
 private:
-    QColorProfile() { }
+    QColorTrcLut() { }
 
     Q_ALWAYS_INLINE static QRgb convertWithTable(QRgb rgb32, const ushort *table)
     {
@@ -230,16 +280,8 @@ private:
         return QRgba64::fromRgba64(r, g, b, rgb64.alpha());
 #endif
     }
-
-    // We translate to 0-65280 (255*256) instead to 0-65535 to make simple
-    // shifting an accurate conversion.
-    // We translate from 0-4080 (255*16) for the same speed up, and to keep
-    // the tables small enough to fit in most inner caches.
-    ushort m_toLinear[(255 * 16) + 1]; // [0-4080] -> [0-65280]
-    ushort m_fromLinear[(255 * 16) + 1]; // [0-4080] -> [0-65280]
-
 };
 
 QT_END_NAMESPACE
 
-#endif // QCOLORPROFILE_P_H
+#endif // QCOLORTRCLUT_P_H
diff --git a/src/gui/painting/qcompositionfunctions.cpp b/src/gui/painting/qcompositionfunctions.cpp
index 0ce4cfb297..ced213e36d 100644
--- a/src/gui/painting/qcompositionfunctions.cpp
+++ b/src/gui/painting/qcompositionfunctions.cpp
@@ -137,6 +137,7 @@ struct Rgba64OperationsBase
     { ::memcpy(dest, src, len * sizeof(Type)); }
 };
 
+#if QT_CONFIG(raster_64bit)
 const Rgba64OperationsBase::Type Rgba64OperationsBase::clear = QRgba64::fromRgba64(0);
 
 struct Rgba64OperationsC : public Rgba64OperationsBase
@@ -309,10 +310,8 @@ struct Rgba64OperationsNEON : public Rgba64OperationsBase
         return interpolate65535(x, a1, y, a2);
     }
 };
-
 #endif
 
-typedef Argb32OperationsC Argb32Operations;
 #if defined(__SSE2__)
 typedef Rgba64OperationsSSE2 Rgba64Operations;
 #elif defined(__ARM_NEON__)
@@ -320,6 +319,9 @@ typedef Rgba64OperationsNEON Rgba64Operations;
 #else
 typedef Rgba64OperationsC Rgba64Operations;
 #endif
+#endif // QT_CONFIG(raster_64bit)
+
+typedef Argb32OperationsC Argb32Operations;
 
 /*
   result = 0
@@ -343,20 +345,23 @@ void QT_FASTCALL comp_func_solid_Clear(uint *dest, int length, uint, uint const_
     comp_func_Clear_template<Argb32Operations>(dest, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_Clear_rgb64(QRgba64 *dest, int length, QRgba64, uint const_alpha)
+void QT_FASTCALL comp_func_Clear(uint *dest, const uint *, int length, uint const_alpha)
 {
-    comp_func_Clear_template<Rgba64Operations>(dest, length, const_alpha);
+    comp_func_Clear_template<Argb32Operations>(dest, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_Clear(uint *dest, const uint *, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_Clear_rgb64(QRgba64 *dest, int length, QRgba64, uint const_alpha)
 {
-    comp_func_Clear_template<Argb32Operations>(dest, length, const_alpha);
+    comp_func_Clear_template<Rgba64Operations>(dest, length, const_alpha);
 }
 
 void QT_FASTCALL comp_func_Clear_rgb64(QRgba64 *dest, const QRgba64 *, int length, uint const_alpha)
 {
     comp_func_Clear_template<Rgba64Operations>(dest, length, const_alpha);
 }
+#endif
+
 
 /*
   result = s
@@ -399,36 +404,40 @@ void QT_FASTCALL comp_func_solid_Source(uint *dest, int length, uint color, uint
     comp_func_solid_Source_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_Source_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_Source(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_Source_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_Source_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_Source(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_Source_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_Source_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_Source_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_Source_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_Source_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 void QT_FASTCALL comp_func_solid_Destination(uint *, int, uint, uint)
 {
 }
 
-void QT_FASTCALL comp_func_solid_Destination_rgb64(QRgba64 *, int, QRgba64, uint)
+void QT_FASTCALL comp_func_Destination(uint *, const uint *, int, uint)
 {
 }
 
-void QT_FASTCALL comp_func_Destination(uint *, const uint *, int, uint)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_Destination_rgb64(QRgba64 *, int, QRgba64, uint)
 {
 }
 
 void QT_FASTCALL comp_func_Destination_rgb64(QRgba64 *, const QRgba64 *, int, uint)
 {
 }
+#endif
 
 /*
   result = s + d * sia
@@ -483,20 +492,22 @@ void QT_FASTCALL comp_func_solid_SourceOver(uint *dest, int length, uint color,
     comp_func_solid_SourceOver_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_SourceOver_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_SourceOver(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_SourceOver_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_SourceOver_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_SourceOver(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_SourceOver_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_SourceOver_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_SourceOver_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_SourceOver_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_SourceOver_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
   result = d + s * dia
@@ -542,20 +553,22 @@ void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length, uint co
     comp_func_solid_DestinationOver_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_DestinationOver_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_DestinationOver(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_DestinationOver_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_DestinationOver_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_DestinationOver(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_DestinationOver_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_DestinationOver_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_DestinationOver_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_DestinationOver_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_DestinationOver_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
   result = s * da
@@ -606,20 +619,22 @@ void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint color, ui
     comp_func_solid_SourceIn_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_SourceIn_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_SourceIn(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_SourceIn_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_SourceIn_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_SourceIn(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_SourceIn_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_SourceIn_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_SourceIn_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_SourceIn_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_SourceIn_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
   result = d * sa
@@ -665,20 +680,22 @@ void QT_FASTCALL comp_func_solid_DestinationIn(uint *dest, int length, uint colo
     comp_func_solid_DestinationIn_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_DestinationIn_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_DestinationIn(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_DestinationIn_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_DestinationIn_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_DestinationIn(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_DestinationIn_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_DestinationIn_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_DestinationIn_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_DestinationIn_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_DestinationIn_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
   result = s * dia
@@ -727,20 +744,22 @@ void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint color, u
     comp_func_solid_SourceOut_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_SourceOut_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_SourceOut(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_SourceOut_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_SourceOut_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_SourceOut(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_SourceOut_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_SourceOut_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_SourceOut_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_SourceOut_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_SourceOut_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
   result = d * sia
@@ -786,20 +805,22 @@ void QT_FASTCALL comp_func_solid_DestinationOut(uint *dest, int length, uint col
     comp_func_solid_DestinationOut_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_DestinationOut_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_DestinationOut(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_DestinationOut_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_DestinationOut_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_DestinationOut(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_DestinationOut_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_DestinationOut_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_DestinationOut_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_DestinationOut_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_DestinationOut_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
   result = s*da + d*sia
@@ -845,20 +866,22 @@ void QT_FASTCALL comp_func_solid_SourceAtop(uint *dest, int length, uint color,
     comp_func_solid_SourceAtop_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_SourceAtop_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_SourceAtop(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_SourceAtop_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_SourceAtop_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_SourceAtop(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_SourceAtop_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_SourceAtop_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_SourceAtop_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_SourceAtop_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_SourceAtop_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
   result = d*sa + s*dia
@@ -909,20 +932,22 @@ void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length, uint co
     comp_func_solid_DestinationAtop_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_DestinationAtop_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_DestinationAtop(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_DestinationAtop_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_DestinationAtop_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_DestinationAtop(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_DestinationAtop_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_DestinationAtop_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_DestinationAtop_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_DestinationAtop_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_DestinationAtop_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
   result = d*sia + s*dia
@@ -969,20 +994,22 @@ void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color, uint co
     comp_func_solid_XOR_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_XOR_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_XOR(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_XOR_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_XOR_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_XOR(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_XOR_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_XOR_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_XOR_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_XOR_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_XOR_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 struct QFullCoverage {
     inline void store(uint *dest, const uint src) const
@@ -1078,20 +1105,22 @@ void QT_FASTCALL comp_func_solid_Plus(uint *dest, int length, uint color, uint c
     comp_func_solid_Plus_template<Argb32Operations>(dest, length, color, const_alpha);
 }
 
-void QT_FASTCALL comp_func_solid_Plus_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+void QT_FASTCALL comp_func_Plus(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
-    comp_func_solid_Plus_template<Rgba64Operations>(dest, length, color, const_alpha);
+    comp_func_Plus_template<Argb32Operations>(dest, src, length, const_alpha);
 }
 
-void QT_FASTCALL comp_func_Plus(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_Plus_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
-    comp_func_Plus_template<Argb32Operations>(dest, src, length, const_alpha);
+    comp_func_solid_Plus_template<Rgba64Operations>(dest, length, color, const_alpha);
 }
 
 void QT_FASTCALL comp_func_Plus_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     comp_func_Plus_template<Rgba64Operations>(dest, src, length, const_alpha);
 }
+#endif
 
 /*
     Dca' = Sca.Dca + Sca.(1 - Da) + Dca.(1 - Sa)
@@ -1101,11 +1130,6 @@ static inline int multiply_op(int dst, int src, int da, int sa)
     return qt_div_255(src * dst + src * (255 - da) + dst * (255 - sa));
 }
 
-static inline uint multiply_op_rgb64(uint dst, uint src, uint da, uint sa)
-{
-    return qt_div_65535(src * dst + src * (65535 - da) + dst * (65535 - sa));
-}
-
 template <typename T>
 static inline void comp_func_solid_Multiply_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -1129,6 +1153,20 @@ static inline void comp_func_solid_Multiply_impl(uint *dest, int length, uint co
     }
 }
 
+void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_Multiply_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_Multiply_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
+static inline uint multiply_op_rgb64(uint dst, uint src, uint da, uint sa)
+{
+    return qt_div_65535(src * dst + src * (65535 - da) + dst * (65535 - sa));
+}
+
 template <typename T>
 static inline void comp_func_solid_Multiply_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -1152,14 +1190,6 @@ static inline void comp_func_solid_Multiply_impl(QRgba64 *dest, int length, QRgb
     }
 }
 
-void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_Multiply_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_Multiply_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_Multiply_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1167,6 +1197,7 @@ void QT_FASTCALL comp_func_solid_Multiply_rgb64(QRgba64 *dest, int length, QRgba
     else
         comp_func_solid_Multiply_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_Multiply_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -1189,6 +1220,15 @@ static inline void comp_func_Multiply_impl(uint *Q_DECL_RESTRICT dest, const uin
     }
 }
 
+void QT_FASTCALL comp_func_Multiply(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_Multiply_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_Multiply_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_Multiply_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -1210,14 +1250,6 @@ static inline void comp_func_Multiply_impl(QRgba64 *Q_DECL_RESTRICT dest, const
     }
 }
 
-void QT_FASTCALL comp_func_Multiply(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_Multiply_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_Multiply_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_Multiply_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1225,6 +1257,7 @@ void QT_FASTCALL comp_func_Multiply_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const Q
     else
         comp_func_Multiply_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
     Dca' = (Sca.Da + Dca.Sa - Sca.Dca) + Sca.(1 - Da) + Dca.(1 - Sa)
@@ -1253,6 +1286,15 @@ static inline void comp_func_solid_Screen_impl(uint *dest, int length, uint colo
     }
 }
 
+void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_Screen_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_Screen_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_solid_Screen_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -1276,14 +1318,6 @@ static inline void comp_func_solid_Screen_impl(QRgba64 *dest, int length, QRgba6
     }
 }
 
-void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_Screen_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_Screen_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_Screen_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1291,6 +1325,7 @@ void QT_FASTCALL comp_func_solid_Screen_rgb64(QRgba64 *dest, int length, QRgba64
     else
         comp_func_solid_Screen_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_Screen_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -1313,6 +1348,15 @@ static inline void comp_func_Screen_impl(uint *Q_DECL_RESTRICT dest, const uint
     }
 }
 
+void QT_FASTCALL comp_func_Screen(uint *dest, const uint *src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_Screen_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_Screen_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_Screen_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -1334,14 +1378,6 @@ static inline void comp_func_Screen_impl(QRgba64 *Q_DECL_RESTRICT dest, const QR
     }
 }
 
-void QT_FASTCALL comp_func_Screen(uint *dest, const uint *src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_Screen_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_Screen_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_Screen_rgb64(QRgba64 *dest, const QRgba64 *src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1349,6 +1385,7 @@ void QT_FASTCALL comp_func_Screen_rgb64(QRgba64 *dest, const QRgba64 *src, int l
     else
         comp_func_Screen_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
     if 2.Dca < Da
@@ -1365,15 +1402,6 @@ static inline int overlay_op(int dst, int src, int da, int sa)
         return qt_div_255(sa * da - 2 * (da - dst) * (sa - src) + temp);
 }
 
-static inline uint overlay_op_rgb64(uint dst, uint src, uint da, uint sa)
-{
-    const uint temp = src * (65535 - da) + dst * (65535 - sa);
-    if (2 * dst < da)
-        return qt_div_65535(2 * src * dst + temp);
-    else
-        return qt_div_65535(sa * da - 2 * (da - dst) * (sa - src) + temp);
-}
-
 template <typename T>
 static inline void comp_func_solid_Overlay_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -1397,6 +1425,24 @@ static inline void comp_func_solid_Overlay_impl(uint *dest, int length, uint col
     }
 }
 
+void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_Overlay_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_Overlay_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
+static inline uint overlay_op_rgb64(uint dst, uint src, uint da, uint sa)
+{
+    const uint temp = src * (65535 - da) + dst * (65535 - sa);
+    if (2 * dst < da)
+        return qt_div_65535(2 * src * dst + temp);
+    else
+        return qt_div_65535(sa * da - 2 * (da - dst) * (sa - src) + temp);
+}
+
 template <typename T>
 static inline void comp_func_solid_Overlay_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -1420,14 +1466,6 @@ static inline void comp_func_solid_Overlay_impl(QRgba64 *dest, int length, QRgba
     }
 }
 
-void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_Overlay_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_Overlay_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_Overlay_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1435,6 +1473,7 @@ void QT_FASTCALL comp_func_solid_Overlay_rgb64(QRgba64 *dest, int length, QRgba6
     else
         comp_func_solid_Overlay_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_Overlay_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -1457,6 +1496,15 @@ static inline void comp_func_Overlay_impl(uint *Q_DECL_RESTRICT dest, const uint
     }
 }
 
+void QT_FASTCALL comp_func_Overlay(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_Overlay_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_Overlay_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_Overlay_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -1478,14 +1526,6 @@ static inline void comp_func_Overlay_impl(QRgba64 *Q_DECL_RESTRICT dest, const Q
     }
 }
 
-void QT_FASTCALL comp_func_Overlay(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_Overlay_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_Overlay_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_Overlay_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1493,6 +1533,7 @@ void QT_FASTCALL comp_func_Overlay_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QR
     else
         comp_func_Overlay_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
     Dca' = min(Sca.Da, Dca.Sa) + Sca.(1 - Da) + Dca.(1 - Sa)
@@ -1503,11 +1544,6 @@ static inline int darken_op(int dst, int src, int da, int sa)
     return qt_div_255(qMin(src * da, dst * sa) + src * (255 - da) + dst * (255 - sa));
 }
 
-static inline uint darken_op_rgb64(uint dst, uint src, uint da, uint sa)
-{
-    return qt_div_65535(qMin(src * da, dst * sa) + src * (65535 - da) + dst * (65535 - sa));
-}
-
 template <typename T>
 static inline void comp_func_solid_Darken_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -1531,6 +1567,20 @@ static inline void comp_func_solid_Darken_impl(uint *dest, int length, uint colo
     }
 }
 
+void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_Darken_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_Darken_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
+static inline uint darken_op_rgb64(uint dst, uint src, uint da, uint sa)
+{
+    return qt_div_65535(qMin(src * da, dst * sa) + src * (65535 - da) + dst * (65535 - sa));
+}
+
 template <typename T>
 static inline void comp_func_solid_Darken_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -1554,14 +1604,6 @@ static inline void comp_func_solid_Darken_impl(QRgba64 *dest, int length, QRgba6
     }
 }
 
-void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_Darken_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_Darken_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_Darken_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1569,6 +1611,7 @@ void QT_FASTCALL comp_func_solid_Darken_rgb64(QRgba64 *dest, int length, QRgba64
     else
         comp_func_solid_Darken_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_Darken_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -1591,6 +1634,15 @@ static inline void comp_func_Darken_impl(uint *Q_DECL_RESTRICT dest, const uint
     }
 }
 
+void QT_FASTCALL comp_func_Darken(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_Darken_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_Darken_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_Darken_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -1612,14 +1664,6 @@ static inline void comp_func_Darken_impl(QRgba64 *Q_DECL_RESTRICT dest, const QR
     }
 }
 
-void QT_FASTCALL comp_func_Darken(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_Darken_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_Darken_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_Darken_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1627,6 +1671,7 @@ void QT_FASTCALL comp_func_Darken_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRg
     else
         comp_func_Darken_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
    Dca' = max(Sca.Da, Dca.Sa) + Sca.(1 - Da) + Dca.(1 - Sa)
@@ -1637,11 +1682,6 @@ static inline int lighten_op(int dst, int src, int da, int sa)
     return qt_div_255(qMax(src * da, dst * sa) + src * (255 - da) + dst * (255 - sa));
 }
 
-static inline uint lighten_op_rgb64(uint dst, uint src, uint da, uint sa)
-{
-    return qt_div_65535(qMax(src * da, dst * sa) + src * (65535 - da) + dst * (65535 - sa));
-}
-
 template <typename T>
 static inline void comp_func_solid_Lighten_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -1665,6 +1705,21 @@ static inline void comp_func_solid_Lighten_impl(uint *dest, int length, uint col
     }
 }
 
+void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_Lighten_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_Lighten_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+
+#if QT_CONFIG(raster_64bit)
+static inline uint lighten_op_rgb64(uint dst, uint src, uint da, uint sa)
+{
+    return qt_div_65535(qMax(src * da, dst * sa) + src * (65535 - da) + dst * (65535 - sa));
+}
+
 template <typename T>
 static inline void comp_func_solid_Lighten_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -1688,14 +1743,6 @@ static inline void comp_func_solid_Lighten_impl(QRgba64 *dest, int length, QRgba
     }
 }
 
-void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_Lighten_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_Lighten_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_Lighten_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1703,6 +1750,7 @@ void QT_FASTCALL comp_func_solid_Lighten_rgb64(QRgba64 *dest, int length, QRgba6
     else
         comp_func_solid_Lighten_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_Lighten_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -1725,6 +1773,15 @@ static inline void comp_func_Lighten_impl(uint *Q_DECL_RESTRICT dest, const uint
     }
 }
 
+void QT_FASTCALL comp_func_Lighten(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_Lighten_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_Lighten_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_Lighten_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -1746,14 +1803,6 @@ static inline void comp_func_Lighten_impl(QRgba64 *Q_DECL_RESTRICT dest, const Q
     }
 }
 
-void QT_FASTCALL comp_func_Lighten(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_Lighten_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_Lighten_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_Lighten_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1761,6 +1810,7 @@ void QT_FASTCALL comp_func_Lighten_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QR
     else
         comp_func_Lighten_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
    if Sca.Da + Dca.Sa > Sa.Da
@@ -1785,21 +1835,6 @@ static inline int color_dodge_op(int dst, int src, int da, int sa)
         return qt_div_255(255 * dst_sa / (255 - 255 * src / sa) + temp);
 }
 
-static inline uint color_dodge_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa)
-{
-    const qint64 sa_da = sa * da;
-    const qint64 dst_sa = dst * sa;
-    const qint64 src_da = src * da;
-
-    const qint64 temp = src * (65535 - da) + dst * (65535 - sa);
-    if (src_da + dst_sa > sa_da)
-        return qt_div_65535(sa_da + temp);
-    else if (src == sa || sa == 0)
-        return qt_div_65535(temp);
-    else
-        return qt_div_65535(65535 * dst_sa / (65535 - 65535 * src / sa) + temp);
-}
-
 template <typename T>
 static inline void comp_func_solid_ColorDodge_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -1823,6 +1858,30 @@ static inline void comp_func_solid_ColorDodge_impl(uint *dest, int length, uint
     }
 }
 
+void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_ColorDodge_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_ColorDodge_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
+static inline uint color_dodge_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa)
+{
+    const qint64 sa_da = sa * da;
+    const qint64 dst_sa = dst * sa;
+    const qint64 src_da = src * da;
+
+    const qint64 temp = src * (65535 - da) + dst * (65535 - sa);
+    if (src_da + dst_sa > sa_da)
+        return qt_div_65535(sa_da + temp);
+    else if (src == sa || sa == 0)
+        return qt_div_65535(temp);
+    else
+        return qt_div_65535(65535 * dst_sa / (65535 - 65535 * src / sa) + temp);
+}
+
 template <typename T>
 static inline void comp_func_solid_ColorDodge_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -1846,14 +1905,6 @@ static inline void comp_func_solid_ColorDodge_impl(QRgba64 *dest, int length, QR
     }
 }
 
-void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_ColorDodge_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_ColorDodge_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_ColorDodge_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1861,6 +1912,7 @@ void QT_FASTCALL comp_func_solid_ColorDodge_rgb64(QRgba64 *dest, int length, QRg
     else
         comp_func_solid_ColorDodge_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_ColorDodge_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -1883,6 +1935,15 @@ static inline void comp_func_ColorDodge_impl(uint *Q_DECL_RESTRICT dest, const u
     }
 }
 
+void QT_FASTCALL comp_func_ColorDodge(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_ColorDodge_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_ColorDodge_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_ColorDodge_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -1904,14 +1965,6 @@ static inline void comp_func_ColorDodge_impl(QRgba64 *Q_DECL_RESTRICT dest, cons
     }
 }
 
-void QT_FASTCALL comp_func_ColorDodge(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_ColorDodge_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_ColorDodge_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_ColorDodge_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -1919,6 +1972,7 @@ void QT_FASTCALL comp_func_ColorDodge_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const
     else
         comp_func_ColorDodge_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
    if Sca.Da + Dca.Sa < Sa.Da
@@ -1943,21 +1997,6 @@ static inline int color_burn_op(int dst, int src, int da, int sa)
     return qt_div_255(sa * (src_da + dst_sa - sa_da) / src + temp);
 }
 
-static inline uint color_burn_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa)
-{
-    const qint64 src_da = src * da;
-    const qint64 dst_sa = dst * sa;
-    const qint64 sa_da = sa * da;
-
-    const qint64 temp = src * (65535 - da) + dst * (65535 - sa);
-
-    if (src_da + dst_sa < sa_da)
-        return qt_div_65535(temp);
-    else if (src == 0)
-        return qt_div_65535(dst_sa + temp);
-    return qt_div_65535(sa * (src_da + dst_sa - sa_da) / src + temp);
-}
-
 template <typename T>
 static inline void comp_func_solid_ColorBurn_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -1981,6 +2020,30 @@ static inline void comp_func_solid_ColorBurn_impl(uint *dest, int length, uint c
     }
 }
 
+void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_ColorBurn_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_ColorBurn_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
+static inline uint color_burn_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa)
+{
+    const qint64 src_da = src * da;
+    const qint64 dst_sa = dst * sa;
+    const qint64 sa_da = sa * da;
+
+    const qint64 temp = src * (65535 - da) + dst * (65535 - sa);
+
+    if (src_da + dst_sa < sa_da)
+        return qt_div_65535(temp);
+    else if (src == 0)
+        return qt_div_65535(dst_sa + temp);
+    return qt_div_65535(sa * (src_da + dst_sa - sa_da) / src + temp);
+}
+
 template <typename T>
 static inline void comp_func_solid_ColorBurn_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -2004,14 +2067,6 @@ static inline void comp_func_solid_ColorBurn_impl(QRgba64 *dest, int length, QRg
     }
 }
 
-void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_ColorBurn_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_ColorBurn_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_ColorBurn_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2019,6 +2074,7 @@ void QT_FASTCALL comp_func_solid_ColorBurn_rgb64(QRgba64 *dest, int length, QRgb
     else
         comp_func_solid_ColorBurn_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_ColorBurn_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -2041,6 +2097,15 @@ static inline void comp_func_ColorBurn_impl(uint *Q_DECL_RESTRICT dest, const ui
     }
 }
 
+void QT_FASTCALL comp_func_ColorBurn(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_ColorBurn_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_ColorBurn_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_ColorBurn_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -2062,14 +2127,6 @@ static inline void comp_func_ColorBurn_impl(QRgba64 *Q_DECL_RESTRICT dest, const
     }
 }
 
-void QT_FASTCALL comp_func_ColorBurn(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_ColorBurn_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_ColorBurn_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_ColorBurn_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2077,6 +2134,7 @@ void QT_FASTCALL comp_func_ColorBurn_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const
     else
         comp_func_ColorBurn_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
     if 2.Sca < Sa
@@ -2094,16 +2152,6 @@ static inline uint hardlight_op(int dst, int src, int da, int sa)
         return qt_div_255(sa * da - 2 * (da - dst) * (sa - src) + temp);
 }
 
-static inline uint hardlight_op_rgb64(uint dst, uint src, uint da, uint sa)
-{
-    const uint temp = src * (65535 - da) + dst * (65535 - sa);
-
-    if (2 * src < sa)
-        return qt_div_65535(2 * src * dst + temp);
-    else
-        return qt_div_65535(sa * da - 2 * (da - dst) * (sa - src) + temp);
-}
-
 template <typename T>
 static inline void comp_func_solid_HardLight_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -2127,6 +2175,25 @@ static inline void comp_func_solid_HardLight_impl(uint *dest, int length, uint c
     }
 }
 
+void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_HardLight_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_HardLight_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
+static inline uint hardlight_op_rgb64(uint dst, uint src, uint da, uint sa)
+{
+    const uint temp = src * (65535 - da) + dst * (65535 - sa);
+
+    if (2 * src < sa)
+        return qt_div_65535(2 * src * dst + temp);
+    else
+        return qt_div_65535(sa * da - 2 * (da - dst) * (sa - src) + temp);
+}
+
 template <typename T>
 static inline void comp_func_solid_HardLight_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -2150,14 +2217,6 @@ static inline void comp_func_solid_HardLight_impl(QRgba64 *dest, int length, QRg
     }
 }
 
-void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_HardLight_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_HardLight_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_HardLight_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2165,6 +2224,7 @@ void QT_FASTCALL comp_func_solid_HardLight_rgb64(QRgba64 *dest, int length, QRgb
     else
         comp_func_solid_HardLight_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_HardLight_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -2187,6 +2247,15 @@ static inline void comp_func_HardLight_impl(uint *Q_DECL_RESTRICT dest, const ui
     }
 }
 
+void QT_FASTCALL comp_func_HardLight(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_HardLight_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_HardLight_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_HardLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -2208,14 +2277,6 @@ static inline void comp_func_HardLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const
     }
 }
 
-void QT_FASTCALL comp_func_HardLight(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_HardLight_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_HardLight_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_HardLight_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2223,6 +2284,7 @@ void QT_FASTCALL comp_func_HardLight_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const
     else
         comp_func_HardLight_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
     if 2.Sca <= Sa
@@ -2247,22 +2309,6 @@ static inline int soft_light_op(int dst, int src, int da, int sa)
     }
 }
 
-static inline uint soft_light_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa)
-{
-    const qint64 src2 = src << 1;
-    const qint64 dst_np = da != 0 ? (65535 * dst) / da : 0;
-    const qint64 temp = (src * (65535 - da) + dst * (65535 - sa)) * 65535;
-    const qint64 factor = qint64(65535) * 65535;
-
-    if (src2 < sa)
-        return (dst * (sa * 65535 + (src2 - sa) * (65535 - dst_np)) + temp) / factor;
-    else if (4 * dst <= da)
-        return (dst * sa * 65535 + da * (src2 - sa) * ((((16 * dst_np - 12 * 65535) * dst_np + 3 * factor) * dst_np) / factor) + temp) / factor;
-    else {
-        return (dst * sa * 65535 + da * (src2 - sa) * (int(qSqrt(qreal(dst_np * 65535))) - dst_np) + temp) / factor;
-    }
-}
-
 template <typename T>
 static inline void comp_func_solid_SoftLight_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -2286,6 +2332,23 @@ static inline void comp_func_solid_SoftLight_impl(uint *dest, int length, uint c
     }
 }
 
+#if QT_CONFIG(raster_64bit)
+static inline uint soft_light_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa)
+{
+    const qint64 src2 = src << 1;
+    const qint64 dst_np = da != 0 ? (65535 * dst) / da : 0;
+    const qint64 temp = (src * (65535 - da) + dst * (65535 - sa)) * 65535;
+    const qint64 factor = qint64(65535) * 65535;
+
+    if (src2 < sa)
+        return (dst * (sa * 65535 + (src2 - sa) * (65535 - dst_np)) + temp) / factor;
+    else if (4 * dst <= da)
+        return (dst * sa * 65535 + da * (src2 - sa) * ((((16 * dst_np - 12 * 65535) * dst_np + 3 * factor) * dst_np) / factor) + temp) / factor;
+    else {
+        return (dst * sa * 65535 + da * (src2 - sa) * (int(qSqrt(qreal(dst_np * 65535))) - dst_np) + temp) / factor;
+    }
+}
+
 template <typename T>
 static inline void comp_func_solid_SoftLight_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -2308,6 +2371,7 @@ static inline void comp_func_solid_SoftLight_impl(QRgba64 *dest, int length, QRg
         coverage.store(&dest[i], qRgba64(r, g, b, a));
     }
 }
+#endif
 
 void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, uint const_alpha)
 {
@@ -2317,14 +2381,6 @@ void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, u
         comp_func_solid_SoftLight_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
 
-void QT_FASTCALL comp_func_solid_SoftLight_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_SoftLight_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_SoftLight_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 template <typename T>
 static inline void comp_func_SoftLight_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -2346,6 +2402,23 @@ static inline void comp_func_SoftLight_impl(uint *Q_DECL_RESTRICT dest, const ui
     }
 }
 
+void QT_FASTCALL comp_func_SoftLight(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_SoftLight_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_SoftLight_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
+void QT_FASTCALL comp_func_solid_SoftLight_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_SoftLight_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_SoftLight_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
 template <typename T>
 static inline void comp_func_SoftLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -2367,14 +2440,6 @@ static inline void comp_func_SoftLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const
     }
 }
 
-void QT_FASTCALL comp_func_SoftLight(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_SoftLight_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_SoftLight_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_SoftLight_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2382,6 +2447,7 @@ void QT_FASTCALL comp_func_SoftLight_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const
     else
         comp_func_SoftLight_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
    Dca' = abs(Dca.Sa - Sca.Da) + Sca.(1 - Da) + Dca.(1 - Sa)
@@ -2392,11 +2458,6 @@ static inline int difference_op(int dst, int src, int da, int sa)
     return src + dst - qt_div_255(2 * qMin(src * da, dst * sa));
 }
 
-static inline uint difference_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa)
-{
-    return src + dst - qt_div_65535(2 * qMin(src * da, dst * sa));
-}
-
 template <typename T>
 static inline void comp_func_solid_Difference_impl(uint *dest, int length, uint color, const T &coverage)
 {
@@ -2420,6 +2481,20 @@ static inline void comp_func_solid_Difference_impl(uint *dest, int length, uint
     }
 }
 
+void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_Difference_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_Difference_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
+static inline uint difference_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa)
+{
+    return src + dst - qt_div_65535(2 * qMin(src * da, dst * sa));
+}
+
 template <typename T>
 static inline void comp_func_solid_Difference_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -2443,14 +2518,6 @@ static inline void comp_func_solid_Difference_impl(QRgba64 *dest, int length, QR
     }
 }
 
-void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_Difference_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_Difference_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_Difference_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2458,6 +2525,7 @@ void QT_FASTCALL comp_func_solid_Difference_rgb64(QRgba64 *dest, int length, QRg
     else
         comp_func_solid_Difference_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_Difference_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -2480,6 +2548,15 @@ static inline void comp_func_Difference_impl(uint *Q_DECL_RESTRICT dest, const u
     }
 }
 
+void QT_FASTCALL comp_func_Difference(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_Difference_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_Difference_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_Difference_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -2501,14 +2578,6 @@ static inline void comp_func_Difference_impl(QRgba64 *Q_DECL_RESTRICT dest, cons
     }
 }
 
-void QT_FASTCALL comp_func_Difference(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_Difference_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_Difference_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_Difference_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2516,6 +2585,7 @@ void QT_FASTCALL comp_func_Difference_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const
     else
         comp_func_Difference_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 /*
     Dca' = (Sca.Da + Dca.Sa - 2.Sca.Dca) + Sca.(1 - Da) + Dca.(1 - Sa)
@@ -2543,6 +2613,15 @@ static inline void QT_FASTCALL comp_func_solid_Exclusion_impl(uint *dest, int le
     }
 }
 
+void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_solid_Exclusion_impl(dest, length, color, QFullCoverage());
+    else
+        comp_func_solid_Exclusion_impl(dest, length, color, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void QT_FASTCALL comp_func_solid_Exclusion_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage)
 {
@@ -2567,14 +2646,6 @@ static inline void QT_FASTCALL comp_func_solid_Exclusion_impl(QRgba64 *dest, int
 }
 
 
-void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_solid_Exclusion_impl(dest, length, color, QFullCoverage());
-    else
-        comp_func_solid_Exclusion_impl(dest, length, color, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_solid_Exclusion_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2582,6 +2653,7 @@ void QT_FASTCALL comp_func_solid_Exclusion_rgb64(QRgba64 *dest, int length, QRgb
     else
         comp_func_solid_Exclusion_impl(dest, length, color, QPartialCoverage(const_alpha));
 }
+#endif
 
 template <typename T>
 static inline void comp_func_Exclusion_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage)
@@ -2604,6 +2676,15 @@ static inline void comp_func_Exclusion_impl(uint *Q_DECL_RESTRICT dest, const ui
     }
 }
 
+void QT_FASTCALL comp_func_Exclusion(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
+{
+    if (const_alpha == 255)
+        comp_func_Exclusion_impl(dest, src, length, QFullCoverage());
+    else
+        comp_func_Exclusion_impl(dest, src, length, QPartialCoverage(const_alpha));
+}
+
+#if QT_CONFIG(raster_64bit)
 template <typename T>
 static inline void comp_func_Exclusion_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage)
 {
@@ -2625,14 +2706,6 @@ static inline void comp_func_Exclusion_impl(QRgba64 *Q_DECL_RESTRICT dest, const
     }
 }
 
-void QT_FASTCALL comp_func_Exclusion(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha)
-{
-    if (const_alpha == 255)
-        comp_func_Exclusion_impl(dest, src, length, QFullCoverage());
-    else
-        comp_func_Exclusion_impl(dest, src, length, QPartialCoverage(const_alpha));
-}
-
 void QT_FASTCALL comp_func_Exclusion_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha)
 {
     if (const_alpha == 255)
@@ -2640,6 +2713,7 @@ void QT_FASTCALL comp_func_Exclusion_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const
     else
         comp_func_Exclusion_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
+#endif
 
 void QT_FASTCALL rasterop_solid_SourceOrDestination(uint *dest,
                                                     int length,
@@ -2989,6 +3063,7 @@ CompositionFunctionSolid qt_functionForModeSolid_C[] = {
 };
 
 CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = {
+#if QT_CONFIG(raster_64bit)
         comp_func_solid_SourceOver_rgb64,
         comp_func_solid_DestinationOver_rgb64,
         comp_func_solid_Clear_rgb64,
@@ -3013,6 +3088,10 @@ CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = {
         comp_func_solid_SoftLight_rgb64,
         comp_func_solid_Difference_rgb64,
         comp_func_solid_Exclusion_rgb64,
+#else
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
         0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0
 };
@@ -3059,6 +3138,7 @@ CompositionFunction qt_functionForMode_C[] = {
 };
 
 CompositionFunction64 qt_functionForMode64_C[] = {
+#if QT_CONFIG(raster_64bit)
         comp_func_SourceOver_rgb64,
         comp_func_DestinationOver_rgb64,
         comp_func_Clear_rgb64,
@@ -3083,6 +3163,10 @@ CompositionFunction64 qt_functionForMode64_C[] = {
         comp_func_SoftLight_rgb64,
         comp_func_Difference_rgb64,
         comp_func_Exclusion_rgb64,
+#else
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
         0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0
 };
diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h
index 082ddee30f..8571b0476a 100644
--- a/src/gui/painting/qcosmeticstroker_p.h
+++ b/src/gui/painting/qcosmeticstroker_p.h
@@ -98,8 +98,8 @@ public:
         : state(s),
           deviceRect(dr_unclipped),
           clip(dr),
-          pattern(0),
-          reversePattern(0),
+          pattern(nullptr),
+          reversePattern(nullptr),
           patternSize(0),
           patternLength(0),
           patternOffset(0),
diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h
index 28d5f6d6c5..181d19da0b 100644
--- a/src/gui/painting/qdatabuffer_p.h
+++ b/src/gui/painting/qdatabuffer_p.h
@@ -69,7 +69,7 @@ public:
             buffer = (Type*) malloc(capacity * sizeof(Type));
             Q_CHECK_PTR(buffer);
         } else {
-            buffer = 0;
+            buffer = nullptr;
         }
         siz = 0;
     }
@@ -128,7 +128,7 @@ public:
             Q_CHECK_PTR(buffer);
         } else {
             free(buffer);
-            buffer = 0;
+            buffer = nullptr;
         }
     }
 
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 533ad39b86..e5f752b94e 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -43,7 +43,7 @@
 #include <qstylehints.h>
 #include <qguiapplication.h>
 #include <qatomic.h>
-#include <private/qcolorprofile_p.h>
+#include <private/qcolortrclut_p.h>
 #include <private/qdrawhelper_p.h>
 #include <private/qpaintengine_raster_p.h>
 #include <private/qpainter_p.h>
@@ -88,6 +88,7 @@ template<> Q_DECL_CONSTEXPR uint redWidth<QImage::Format_RGB444>() { return 4; }
 template<> Q_DECL_CONSTEXPR uint redWidth<QImage::Format_RGB555>() { return 5; }
 template<> Q_DECL_CONSTEXPR uint redWidth<QImage::Format_RGB666>() { return 6; }
 template<> Q_DECL_CONSTEXPR uint redWidth<QImage::Format_RGB888>() { return 8; }
+template<> Q_DECL_CONSTEXPR uint redWidth<QImage::Format_BGR888>() { return 8; }
 template<> Q_DECL_CONSTEXPR uint redWidth<QImage::Format_ARGB4444_Premultiplied>() { return 4; }
 template<> Q_DECL_CONSTEXPR uint redWidth<QImage::Format_ARGB8555_Premultiplied>() { return 5; }
 template<> Q_DECL_CONSTEXPR uint redWidth<QImage::Format_ARGB8565_Premultiplied>() { return 5; }
@@ -101,6 +102,7 @@ template<> Q_DECL_CONSTEXPR uint redShift<QImage::Format_RGB444>() { return  8;
 template<> Q_DECL_CONSTEXPR uint redShift<QImage::Format_RGB555>() { return 10; }
 template<> Q_DECL_CONSTEXPR uint redShift<QImage::Format_RGB666>() { return 12; }
 template<> Q_DECL_CONSTEXPR uint redShift<QImage::Format_RGB888>() { return 16; }
+template<> Q_DECL_CONSTEXPR uint redShift<QImage::Format_BGR888>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint redShift<QImage::Format_ARGB4444_Premultiplied>() { return  8; }
 template<> Q_DECL_CONSTEXPR uint redShift<QImage::Format_ARGB8555_Premultiplied>() { return 18; }
 template<> Q_DECL_CONSTEXPR uint redShift<QImage::Format_ARGB8565_Premultiplied>() { return 19; }
@@ -119,6 +121,7 @@ template<> Q_DECL_CONSTEXPR uint greenWidth<QImage::Format_RGB444>() { return 4;
 template<> Q_DECL_CONSTEXPR uint greenWidth<QImage::Format_RGB555>() { return 5; }
 template<> Q_DECL_CONSTEXPR uint greenWidth<QImage::Format_RGB666>() { return 6; }
 template<> Q_DECL_CONSTEXPR uint greenWidth<QImage::Format_RGB888>() { return 8; }
+template<> Q_DECL_CONSTEXPR uint greenWidth<QImage::Format_BGR888>() { return 8; }
 template<> Q_DECL_CONSTEXPR uint greenWidth<QImage::Format_ARGB4444_Premultiplied>() { return 4; }
 template<> Q_DECL_CONSTEXPR uint greenWidth<QImage::Format_ARGB8555_Premultiplied>() { return 5; }
 template<> Q_DECL_CONSTEXPR uint greenWidth<QImage::Format_ARGB8565_Premultiplied>() { return 6; }
@@ -132,6 +135,7 @@ template<> Q_DECL_CONSTEXPR uint greenShift<QImage::Format_RGB444>() { return 4;
 template<> Q_DECL_CONSTEXPR uint greenShift<QImage::Format_RGB555>() { return 5; }
 template<> Q_DECL_CONSTEXPR uint greenShift<QImage::Format_RGB666>() { return 6; }
 template<> Q_DECL_CONSTEXPR uint greenShift<QImage::Format_RGB888>() { return 8; }
+template<> Q_DECL_CONSTEXPR uint greenShift<QImage::Format_BGR888>() { return 8; }
 template<> Q_DECL_CONSTEXPR uint greenShift<QImage::Format_ARGB4444_Premultiplied>() { return  4; }
 template<> Q_DECL_CONSTEXPR uint greenShift<QImage::Format_ARGB8555_Premultiplied>() { return 13; }
 template<> Q_DECL_CONSTEXPR uint greenShift<QImage::Format_ARGB8565_Premultiplied>() { return 13; }
@@ -150,6 +154,7 @@ template<> Q_DECL_CONSTEXPR uint blueWidth<QImage::Format_RGB444>() { return 4;
 template<> Q_DECL_CONSTEXPR uint blueWidth<QImage::Format_RGB555>() { return 5; }
 template<> Q_DECL_CONSTEXPR uint blueWidth<QImage::Format_RGB666>() { return 6; }
 template<> Q_DECL_CONSTEXPR uint blueWidth<QImage::Format_RGB888>() { return 8; }
+template<> Q_DECL_CONSTEXPR uint blueWidth<QImage::Format_BGR888>() { return 8; }
 template<> Q_DECL_CONSTEXPR uint blueWidth<QImage::Format_ARGB4444_Premultiplied>() { return 4; }
 template<> Q_DECL_CONSTEXPR uint blueWidth<QImage::Format_ARGB8555_Premultiplied>() { return 5; }
 template<> Q_DECL_CONSTEXPR uint blueWidth<QImage::Format_ARGB8565_Premultiplied>() { return 5; }
@@ -163,6 +168,7 @@ template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_RGB444>() { return 0;
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_RGB555>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_RGB666>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_RGB888>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_BGR888>() { return 16; }
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_ARGB4444_Premultiplied>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_ARGB8555_Premultiplied>() { return 8; }
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_ARGB8565_Premultiplied>() { return 8; }
@@ -181,6 +187,7 @@ template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB444>() { return 0;
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB555>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB666>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB888>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_BGR888>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_ARGB4444_Premultiplied>() { return  4; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_ARGB8555_Premultiplied>() { return  8; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_ARGB8565_Premultiplied>() { return  8; }
@@ -194,6 +201,7 @@ template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB444>() { return 0;
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB555>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB666>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB888>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_BGR888>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_ARGB4444_Premultiplied>() { return 12; }
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_ARGB8555_Premultiplied>() { return  0; }
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_ARGB8565_Premultiplied>() { return  0; }
@@ -214,6 +222,7 @@ template<> constexpr QPixelLayout::BPP bitsPerPixel<QImage::Format_RGB444>() { r
 template<> constexpr QPixelLayout::BPP bitsPerPixel<QImage::Format_RGB555>() { return QPixelLayout::BPP16; }
 template<> constexpr QPixelLayout::BPP bitsPerPixel<QImage::Format_RGB666>() { return QPixelLayout::BPP24; }
 template<> constexpr QPixelLayout::BPP bitsPerPixel<QImage::Format_RGB888>() { return QPixelLayout::BPP24; }
+template<> constexpr QPixelLayout::BPP bitsPerPixel<QImage::Format_BGR888>() { return QPixelLayout::BPP24; }
 template<> constexpr QPixelLayout::BPP bitsPerPixel<QImage::Format_ARGB4444_Premultiplied>() { return QPixelLayout::BPP16; }
 template<> constexpr QPixelLayout::BPP bitsPerPixel<QImage::Format_ARGB8555_Premultiplied>() { return QPixelLayout::BPP24; }
 template<> constexpr QPixelLayout::BPP bitsPerPixel<QImage::Format_ARGB8565_Premultiplied>() { return QPixelLayout::BPP24; }
@@ -660,8 +669,7 @@ static void QT_FASTCALL rbSwap_rgb30(uchar *d, const uchar *s, int count)
 {
     const uint *src = reinterpret_cast<const uint *>(s);
     uint *dest = reinterpret_cast<uint *>(d);
-    for (int i = 0; i < count; ++i)
-        dest[i] = qRgbSwapRgb30(src[i]);
+    UNALIASED_CONVERSION_LOOP(dest, src, count, qRgbSwapRgb30);
 }
 
 template<QImage::Format Format> Q_DECL_CONSTEXPR static inline QPixelLayout pixelLayoutRGB()
@@ -1117,6 +1125,7 @@ static const QRgba64 *QT_FASTCALL fetchARGB32PMToRGBA64PM(QRgba64 *buffer, const
     return convertARGB32PMToRGBA64PM(buffer, reinterpret_cast<const uint *>(src) + index, count, nullptr, nullptr);
 }
 
+#if QT_CONFIG(raster_64bit)
 static void convertRGBA64ToRGBA64PM(QRgba64 *buffer, int count)
 {
     for (int i = 0; i < count; ++i)
@@ -1126,6 +1135,7 @@ static void convertRGBA64ToRGBA64PM(QRgba64 *buffer, int count)
 static void convertRGBA64PMToRGBA64PM(QRgba64 *, int)
 {
 }
+#endif
 
 static const QRgba64 *QT_FASTCALL fetchRGBA64ToRGBA64PM(QRgba64 *buffer, const uchar *src, int index, int count,
                                                         const QVector<QRgb> *, QDitherInfo *)
@@ -1526,7 +1536,8 @@ QPixelLayout qPixelLayouts[QImage::NImageFormats] = {
     { false, false, QPixelLayout::BPP16, nullptr,
       convertGrayscale16ToRGB32, convertGrayscale16ToRGBA64,
       fetchGrayscale16ToRGB32, fetchGrayscale16ToRGBA64,
-      storeGrayscale16FromARGB32PM, storeGrayscale16FromRGB32 } // Format_Grayscale16
+      storeGrayscale16FromARGB32PM, storeGrayscale16FromRGB32 }, // Format_Grayscale16
+    pixelLayoutRGB<QImage::Format_BGR888>(),
 };
 
 Q_STATIC_ASSERT(sizeof(qPixelLayouts) / sizeof(*qPixelLayouts) == QImage::NImageFormats);
@@ -1641,7 +1652,8 @@ ConvertAndStorePixelsFunc64 qStoreFromRGBA64PM[QImage::NImageFormats] = {
     storeRGBX64FromRGBA64PM,
     storeRGBA64FromRGBA64PM,
     storeRGBA64PMFromRGBA64PM,
-    storeGray16FromRGBA64PM
+    storeGray16FromRGBA64PM,
+    storeGenericFromRGBA64PM<QImage::Format_BGR888>,
 };
 
 /*
@@ -1699,22 +1711,6 @@ static uint *QT_FASTCALL destFetchUndefined(uint *buffer, QRasterBuffer *, int,
     return buffer;
 }
 
-static QRgba64 *QT_FASTCALL destFetch64(QRgba64 *buffer, QRasterBuffer *rasterBuffer, int x, int y, int length)
-{
-    const QPixelLayout *layout = &qPixelLayouts[rasterBuffer->format];
-    return const_cast<QRgba64 *>(layout->fetchToRGBA64PM(buffer, rasterBuffer->scanLine(y), x, length, nullptr, nullptr));
-}
-
-static QRgba64 * QT_FASTCALL destFetchRGB64(QRgba64 *, QRasterBuffer *rasterBuffer, int x, int y, int)
-{
-    return (QRgba64 *)rasterBuffer->scanLine(y) + x;
-}
-
-static QRgba64 * QT_FASTCALL destFetch64Undefined(QRgba64 *buffer, QRasterBuffer *, int, int, int)
-{
-    return buffer;
-}
-
 static DestFetchProc destFetchProc[QImage::NImageFormats] =
 {
     0,                  // Format_Invalid
@@ -1746,8 +1742,26 @@ static DestFetchProc destFetchProc[QImage::NImageFormats] =
     destFetch,          // Format_RGBA64
     destFetch,          // Format_RGBA64_Premultiplied
     destFetch,          // Format_Grayscale16
+    destFetch,          // Format_BGR888
 };
 
+#if QT_CONFIG(raster_64bit)
+static QRgba64 *QT_FASTCALL destFetch64(QRgba64 *buffer, QRasterBuffer *rasterBuffer, int x, int y, int length)
+{
+    const QPixelLayout *layout = &qPixelLayouts[rasterBuffer->format];
+    return const_cast<QRgba64 *>(layout->fetchToRGBA64PM(buffer, rasterBuffer->scanLine(y), x, length, nullptr, nullptr));
+}
+
+static QRgba64 * QT_FASTCALL destFetchRGB64(QRgba64 *, QRasterBuffer *rasterBuffer, int x, int y, int)
+{
+    return (QRgba64 *)rasterBuffer->scanLine(y) + x;
+}
+
+static QRgba64 * QT_FASTCALL destFetch64Undefined(QRgba64 *buffer, QRasterBuffer *, int, int, int)
+{
+    return buffer;
+}
+
 static DestFetchProc64 destFetchProc64[QImage::NImageFormats] =
 {
     0,                  // Format_Invalid
@@ -1779,7 +1793,9 @@ static DestFetchProc64 destFetchProc64[QImage::NImageFormats] =
     destFetch64,        // Format_RGBA64
     destFetchRGB64,     // Format_RGBA64_Premultiplied
     destFetch64,        // Format_Grayscale16
+    destFetch64,        // Format_BGR888
 };
+#endif
 
 /*
    Returns the color in the mono destination color table
@@ -1887,21 +1903,6 @@ static void QT_FASTCALL destStore(QRasterBuffer *rasterBuffer, int x, int y, con
     store(dest, buffer, x, length, nullptr, nullptr);
 }
 
-static void QT_FASTCALL destStore64(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length)
-{
-    auto store = qStoreFromRGBA64PM[rasterBuffer->format];
-    uchar *dest = rasterBuffer->scanLine(y);
-    store(dest, buffer, x, length, nullptr, nullptr);
-}
-
-static void QT_FASTCALL destStore64RGBA64(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length)
-{
-    QRgba64 *dest = reinterpret_cast<QRgba64*>(rasterBuffer->scanLine(y)) + x;
-    for (int i = 0; i < length; ++i) {
-        dest[i] = buffer[i].unpremultiplied();
-    }
-}
-
 static DestStoreProc destStoreProc[QImage::NImageFormats] =
 {
     0,                  // Format_Invalid
@@ -1933,8 +1934,25 @@ static DestStoreProc destStoreProc[QImage::NImageFormats] =
     destStore,          // Format_RGBA64
     destStore,          // Format_RGBA64_Premultiplied
     destStore,          // Format_Grayscale16
+    destStore,          // Format_BGR888
 };
 
+#if QT_CONFIG(raster_64bit)
+static void QT_FASTCALL destStore64(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length)
+{
+    auto store = qStoreFromRGBA64PM[rasterBuffer->format];
+    uchar *dest = rasterBuffer->scanLine(y);
+    store(dest, buffer, x, length, nullptr, nullptr);
+}
+
+static void QT_FASTCALL destStore64RGBA64(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length)
+{
+    QRgba64 *dest = reinterpret_cast<QRgba64*>(rasterBuffer->scanLine(y)) + x;
+    for (int i = 0; i < length; ++i) {
+        dest[i] = buffer[i].unpremultiplied();
+    }
+}
+
 static DestStoreProc64 destStoreProc64[QImage::NImageFormats] =
 {
     0,                  // Format_Invalid
@@ -1966,7 +1984,9 @@ static DestStoreProc64 destStoreProc64[QImage::NImageFormats] =
     destStore64RGBA64,  // Format_RGBA64
     0,                  // Format_RGBA64_Premultiplied
     destStore64,        // Format_Grayscale16
+    destStore64,        // Format_BGR888
 };
+#endif
 
 /*
   Source fetches
@@ -2017,6 +2037,7 @@ static const uint *QT_FASTCALL fetchUntransformedRGB16(uint *buffer, const Opera
     return buffer;
 }
 
+#if QT_CONFIG(raster_64bit)
 static const QRgba64 *QT_FASTCALL fetchUntransformed64(QRgba64 *buffer, const Operator *,
                                                        const QSpanData *data, int y, int x, int length)
 {
@@ -2030,6 +2051,7 @@ static const QRgba64 *QT_FASTCALL fetchUntransformedRGBA64PM(QRgba64 *, const Op
     const uchar *scanLine = data->texture.scanLine(y);
     return reinterpret_cast<const QRgba64 *>(scanLine) + x;
 }
+#endif
 
 template<TextureBlendType blendType>
 inline void fetchTransformed_pixelBounds(int max, int l1, int l2, int &v)
@@ -2237,6 +2259,7 @@ static const uint *QT_FASTCALL fetchTransformed(uint *buffer, const Operator *,
     return buffer;
 }
 
+#if QT_CONFIG(raster_64bit)
 template<TextureBlendType blendType>  /* either BlendTransformed or BlendTransformedTiled */
 static const QRgba64 *QT_FASTCALL fetchTransformed64(QRgba64 *buffer, const Operator *, const QSpanData *data,
                                                      int y, int x, int length)
@@ -2257,6 +2280,7 @@ static const QRgba64 *QT_FASTCALL fetchTransformed64(QRgba64 *buffer, const Oper
         convertRGBA64ToRGBA64PM(buffer, length);
     return buffer;
 }
+#endif
 
 /** \internal
   interpolate 4 argb pixels with the distx and disty factor.
@@ -3558,6 +3582,7 @@ static const uint *QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Oper
     return buffer;
 }
 
+#if QT_CONFIG(raster_64bit)
 template<TextureBlendType blendType>
 static const QRgba64 *QT_FASTCALL fetchTransformedBilinear64_uint32(QRgba64 *buffer, const QSpanData *data,
                                                                     int y, int x, int length)
@@ -3878,6 +3903,7 @@ static const QRgba64 *QT_FASTCALL fetchTransformedBilinear64(QRgba64 *buffer, co
         return fetchTransformedBilinear64_uint64<blendType>(buffer, data, y, x, length);
     return fetchTransformedBilinear64_uint32<blendType>(buffer, data, y, x, length);
 }
+#endif
 
 // FetchUntransformed can have more specialized methods added depending on SIMD features.
 static SourceFetchProc sourceFetchUntransformed[QImage::NImageFormats] = {
@@ -3910,6 +3936,7 @@ static SourceFetchProc sourceFetchUntransformed[QImage::NImageFormats] = {
     fetchUntransformed,         // RGBA64
     fetchUntransformed,         // RGBA64_Premultiplied
     fetchUntransformed,         // Grayscale16
+    fetchUntransformed,         // BGR888
 };
 
 static const SourceFetchProc sourceFetchGeneric[NBlendTypes] = {
@@ -3948,6 +3975,20 @@ static SourceFetchProc sourceFetchAny32[NBlendTypes] = {
     fetchTransformedBilinear<BlendTransformedBilinearTiled, QPixelLayout::BPP32>    // TransformedBilinearTiled
 };
 
+static inline SourceFetchProc getSourceFetch(TextureBlendType blendType, QImage::Format format)
+{
+    if (format == QImage::Format_RGB32 || format == QImage::Format_ARGB32_Premultiplied)
+        return sourceFetchARGB32PM[blendType];
+    if (blendType == BlendUntransformed || blendType == BlendTiled)
+        return sourceFetchUntransformed[format];
+    if (qPixelLayouts[format].bpp == QPixelLayout::BPP16)
+        return sourceFetchAny16[blendType];
+    if (qPixelLayouts[format].bpp == QPixelLayout::BPP32)
+        return sourceFetchAny32[blendType];
+    return sourceFetchGeneric[blendType];
+}
+
+#if QT_CONFIG(raster_64bit)
 static const SourceFetchProc64 sourceFetchGeneric64[NBlendTypes] = {
     fetchUntransformed64,                                     // Untransformed
     fetchUntransformed64,                                     // Tiled
@@ -3966,25 +4007,13 @@ static const SourceFetchProc64 sourceFetchRGBA64PM[NBlendTypes] = {
     fetchTransformedBilinear64<BlendTransformedBilinearTiled> // BilinearTiled
 };
 
-static inline SourceFetchProc getSourceFetch(TextureBlendType blendType, QImage::Format format)
-{
-    if (format == QImage::Format_RGB32 || format == QImage::Format_ARGB32_Premultiplied)
-        return sourceFetchARGB32PM[blendType];
-    if (blendType == BlendUntransformed || blendType == BlendTiled)
-        return sourceFetchUntransformed[format];
-    if (qPixelLayouts[format].bpp == QPixelLayout::BPP16)
-        return sourceFetchAny16[blendType];
-    if (qPixelLayouts[format].bpp == QPixelLayout::BPP32)
-        return sourceFetchAny32[blendType];
-    return sourceFetchGeneric[blendType];
-}
-
 static inline SourceFetchProc64 getSourceFetch64(TextureBlendType blendType, QImage::Format format)
 {
     if (format == QImage::Format_RGBX64 || format == QImage::Format_RGBA64_Premultiplied)
         return sourceFetchRGBA64PM[blendType];
     return sourceFetchGeneric64[blendType];
 }
+#endif
 
 
 #define FIXPT_BITS 8
@@ -3996,11 +4025,13 @@ static uint qt_gradient_pixel_fixed(const QGradientData *data, int fixed_pos)
     return data->colorTable32[qt_gradient_clamp(data, ipos)];
 }
 
+#if QT_CONFIG(raster_64bit)
 static const QRgba64& qt_gradient_pixel64_fixed(const QGradientData *data, int fixed_pos)
 {
     int ipos = (fixed_pos + (FIXPT_SIZE / 2)) >> FIXPT_BITS;
     return data->colorTable64[qt_gradient_clamp(data, ipos)];
 }
+#endif
 
 static void QT_FASTCALL getLinearGradientValues(LinearGradientValues *v, const QSpanData *data)
 {
@@ -4034,6 +4065,7 @@ public:
     }
 };
 
+#if QT_CONFIG(raster_64bit)
 class GradientBase64
 {
 public:
@@ -4052,6 +4084,7 @@ public:
         qt_memfill64((quint64*)buffer, fill, length);
     }
 };
+#endif
 
 template<class GradientBase, typename BlendType>
 static inline const BlendType * QT_FASTCALL qt_fetch_linear_gradient_template(
@@ -4129,11 +4162,13 @@ static const uint * QT_FASTCALL qt_fetch_linear_gradient(uint *buffer, const Ope
     return qt_fetch_linear_gradient_template<GradientBase32, uint>(buffer, op, data, y, x, length);
 }
 
+#if QT_CONFIG(raster_64bit)
 static const QRgba64 * QT_FASTCALL qt_fetch_linear_gradient_rgb64(QRgba64 *buffer, const Operator *op, const QSpanData *data,
                                                                  int y, int x, int length)
 {
     return qt_fetch_linear_gradient_template<GradientBase64, QRgba64>(buffer, op, data, y, x, length);
 }
+#endif
 
 static void QT_FASTCALL getRadialGradientValues(RadialGradientValues *v, const QSpanData *data)
 {
@@ -4195,11 +4230,13 @@ const uint * QT_FASTCALL qt_fetch_radial_gradient_plain(uint *buffer, const Oper
 
 static SourceFetchProc qt_fetch_radial_gradient = qt_fetch_radial_gradient_plain;
 
+#if QT_CONFIG(raster_64bit)
 const QRgba64 * QT_FASTCALL qt_fetch_radial_gradient_rgb64(QRgba64 *buffer, const Operator *op, const QSpanData *data,
                                                         int y, int x, int length)
 {
     return qt_fetch_radial_gradient_template<RadialFetchPlain<GradientBase64>, QRgba64>(buffer, op, data, y, x, length);
 }
+#endif
 
 template <class GradientBase, typename BlendType>
 static inline const BlendType * QT_FASTCALL qt_fetch_conical_gradient_template(
@@ -4258,23 +4295,29 @@ static const uint * QT_FASTCALL qt_fetch_conical_gradient(uint *buffer, const Op
     return qt_fetch_conical_gradient_template<GradientBase32, uint>(buffer, data, y, x, length);
 }
 
+#if QT_CONFIG(raster_64bit)
 static const QRgba64 * QT_FASTCALL qt_fetch_conical_gradient_rgb64(QRgba64 *buffer, const Operator *, const QSpanData *data,
                                                                    int y, int x, int length)
 {
     return qt_fetch_conical_gradient_template<GradientBase64, QRgba64>(buffer, data, y, x, length);
 }
+#endif
 
 extern CompositionFunctionSolid qt_functionForModeSolid_C[];
 extern CompositionFunctionSolid64 qt_functionForModeSolid64_C[];
 
 static const CompositionFunctionSolid *functionForModeSolid = qt_functionForModeSolid_C;
+#if QT_CONFIG(raster_64bit)
 static const CompositionFunctionSolid64 *functionForModeSolid64 = qt_functionForModeSolid64_C;
+#endif
 
 extern CompositionFunction qt_functionForMode_C[];
 extern CompositionFunction64 qt_functionForMode64_C[];
 
 static const CompositionFunction *functionForMode = qt_functionForMode_C;
+#if QT_CONFIG(raster_64bit)
 static const CompositionFunction64 *functionForMode64 = qt_functionForMode64_C;
+#endif
 
 static TextureBlendType getBlendType(const QSpanData *data)
 {
@@ -4306,41 +4349,58 @@ static inline Operator getOperator(const QSpanData *data, const QSpan *spans, in
     case QSpanData::Solid:
         solidSource = data->solidColor.isOpaque();
         op.srcFetch = 0;
+#if QT_CONFIG(raster_64bit)
         op.srcFetch64 = 0;
+#endif
         break;
     case QSpanData::LinearGradient:
         solidSource = !data->gradient.alphaColor;
         getLinearGradientValues(&op.linear, data);
         op.srcFetch = qt_fetch_linear_gradient;
+#if QT_CONFIG(raster_64bit)
         op.srcFetch64 = qt_fetch_linear_gradient_rgb64;
+#endif
         break;
     case QSpanData::RadialGradient:
         solidSource = !data->gradient.alphaColor;
         getRadialGradientValues(&op.radial, data);
         op.srcFetch = qt_fetch_radial_gradient;
+#if QT_CONFIG(raster_64bit)
         op.srcFetch64 = qt_fetch_radial_gradient_rgb64;
+#endif
         break;
     case QSpanData::ConicalGradient:
         solidSource = !data->gradient.alphaColor;
         op.srcFetch = qt_fetch_conical_gradient;
+#if QT_CONFIG(raster_64bit)
         op.srcFetch64 = qt_fetch_conical_gradient_rgb64;
+#endif
         break;
     case QSpanData::Texture:
         solidSource = !data->texture.hasAlpha;
         op.srcFetch = getSourceFetch(getBlendType(data), data->texture.format);
+#if QT_CONFIG(raster_64bit)
         op.srcFetch64 = getSourceFetch64(getBlendType(data), data->texture.format);;
+#endif
         break;
     default:
         Q_UNREACHABLE();
         break;
     }
+#if !QT_CONFIG(raster_64bit)
+    op.srcFetch64 = 0;
+#endif
 
     op.mode = data->rasterBuffer->compositionMode;
     if (op.mode == QPainter::CompositionMode_SourceOver && solidSource)
         op.mode = QPainter::CompositionMode_Source;
 
     op.destFetch = destFetchProc[data->rasterBuffer->format];
+#if QT_CONFIG(raster_64bit)
     op.destFetch64 = destFetchProc64[data->rasterBuffer->format];
+#else
+    op.destFetch64 = 0;
+#endif
     if (op.mode == QPainter::CompositionMode_Source &&
             (data->type != QSpanData::Texture || data->texture.const_alpha == 256)) {
         const QSpan *lastSpan = spans + spanCount;
@@ -4357,18 +4417,25 @@ static inline Operator getOperator(const QSpanData *data, const QSpan *spans, in
             // But don't clear passthrough destFetch as they are just as fast and save destStore.
             if (op.destFetch != destFetchARGB32P)
                 op.destFetch = destFetchUndefined;
+#if QT_CONFIG(raster_64bit)
             if (op.destFetch64 != destFetchRGB64)
                 op.destFetch64 = destFetch64Undefined;
+#endif
         }
     }
 
     op.destStore = destStoreProc[data->rasterBuffer->format];
-    op.destStore64 = destStoreProc64[data->rasterBuffer->format];
-
     op.funcSolid = functionForModeSolid[op.mode];
-    op.funcSolid64 = functionForModeSolid64[op.mode];
     op.func = functionForMode[op.mode];
+#if QT_CONFIG(raster_64bit)
+    op.destStore64 = destStoreProc64[data->rasterBuffer->format];
+    op.funcSolid64 = functionForModeSolid64[op.mode];
     op.func64 = functionForMode64[op.mode];
+#else
+    op.destStore64 = 0;
+    op.funcSolid64 = 0;
+    op.func64 = 0;
+#endif
 
     return op;
 }
@@ -4475,6 +4542,7 @@ static void blend_color_argb(int count, const QSpan *spans, void *userData)
 
 void blend_color_generic_rgb64(int count, const QSpan *spans, void *userData)
 {
+#if QT_CONFIG(raster_64bit)
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
     Operator op = getOperator(data, nullptr, 0);
     if (!op.funcSolid64) {
@@ -4509,6 +4577,9 @@ void blend_color_generic_rgb64(int count, const QSpan *spans, void *userData)
         }
         ++spans;
     }
+#else
+    blend_color_generic(count, spans, userData);
+#endif
 }
 
 static void blend_color_rgb16(int count, const QSpan *spans, void *userData)
@@ -4689,6 +4760,7 @@ public:
     }
 };
 
+#if QT_CONFIG(raster_64bit)
 class BlendSrcGenericRGB64 : public QBlendBase<QRgba64>
 {
 public:
@@ -4719,6 +4791,7 @@ public:
             op.destStore64(data->rasterBuffer, x, y, dest, len);
     }
 };
+#endif
 
 static void blend_src_generic(int count, const QSpan *spans, void *userData)
 {
@@ -4727,6 +4800,7 @@ static void blend_src_generic(int count, const QSpan *spans, void *userData)
     handleSpans(count, spans, data, blend);
 }
 
+#if QT_CONFIG(raster_64bit)
 static void blend_src_generic_rgb64(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
@@ -4740,6 +4814,7 @@ static void blend_src_generic_rgb64(int count, const QSpan *spans, void *userDat
         handleSpans(count, spans, data, blend32);
     }
 }
+#endif
 
 static void blend_untransformed_generic(int count, const QSpan *spans, void *userData)
 {
@@ -4787,6 +4862,7 @@ static void blend_untransformed_generic(int count, const QSpan *spans, void *use
     }
 }
 
+#if QT_CONFIG(raster_64bit)
 static void blend_untransformed_generic_rgb64(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
@@ -4836,6 +4912,7 @@ static void blend_untransformed_generic_rgb64(int count, const QSpan *spans, voi
         }
     }
 }
+#endif
 
 static void blend_untransformed_argb(int count, const QSpan *spans, void *userData)
 {
@@ -5036,6 +5113,7 @@ static void blend_tiled_generic(int count, const QSpan *spans, void *userData)
     }
 }
 
+#if QT_CONFIG(raster_64bit)
 static void blend_tiled_generic_rgb64(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
@@ -5131,6 +5209,7 @@ static void blend_tiled_generic_rgb64(int count, const QSpan *spans, void *userD
         ++spans;
     }
 }
+#endif
 
 static void blend_tiled_argb(int count, const QSpan *spans, void *userData)
 {
@@ -5307,6 +5386,7 @@ static const ProcessSpans processTextureSpansGeneric[NBlendTypes] = {
     blend_src_generic                   // TransformedBilinearTiled
 };
 
+#if QT_CONFIG(raster_64bit)
 static const ProcessSpans processTextureSpansGeneric64[NBlendTypes] = {
     blend_untransformed_generic_rgb64,  // Untransformed
     blend_tiled_generic_rgb64,          // Tiled
@@ -5315,6 +5395,7 @@ static const ProcessSpans processTextureSpansGeneric64[NBlendTypes] = {
     blend_src_generic_rgb64,            // TransformedBilinear
     blend_src_generic_rgb64             // TransformedBilinearTiled
 };
+#endif
 
 void qBlendTexture(int count, const QSpan *spans, void *userData)
 {
@@ -5328,6 +5409,7 @@ void qBlendTexture(int count, const QSpan *spans, void *userData)
     case QImage::Format_RGB16:
         proc = processTextureSpansRGB16[blendType];
         break;
+#if QT_CONFIG(raster_64bit)
 #if defined(__SSE2__) || defined(__ARM_NEON__) || (Q_PROCESSOR_WORDSIZE == 8)
     case QImage::Format_ARGB32:
     case QImage::Format_RGBA8888:
@@ -5342,6 +5424,7 @@ void qBlendTexture(int count, const QSpan *spans, void *userData)
     case QImage::Format_Grayscale16:
         proc = processTextureSpansGeneric64[blendType];
         break;
+#endif // QT_CONFIG(raster_64bit)
     case QImage::Format_Invalid:
         Q_UNREACHABLE();
         return;
@@ -5409,7 +5492,11 @@ static void blend_vertical_gradient(int count, const QSpan *spans, void *userDat
     while (count--) {
         int y = spans->y;
 
+#if QT_CONFIG(raster_64bit)
         data->solidColor = qt_gradient_pixel64_fixed(&data->gradient, yinc * y + off);
+#else
+        data->solidColor = QRgba64::fromArgb32(qt_gradient_pixel_fixed(&data->gradient, yinc * y + off));
+#endif
         blend_color(1, spans, userData);
         ++spans;
     }
@@ -5432,6 +5519,7 @@ void qBlendGradient(int count, const QSpan *spans, void *userData)
         if (isVerticalGradient)
             return blend_vertical_gradient_argb(count, spans, userData);
         return blend_src_generic(count, spans, userData);
+#if QT_CONFIG(raster_64bit)
 #if defined(__SSE2__) || defined(__ARM_NEON__) || (Q_PROCESSOR_WORDSIZE == 8)
     case QImage::Format_ARGB32:
     case QImage::Format_RGBA8888:
@@ -5446,6 +5534,7 @@ void qBlendGradient(int count, const QSpan *spans, void *userData)
         if (isVerticalGradient)
             return blend_vertical_gradient<blend_color_generic_rgb64>(count, spans, userData);
         return blend_src_generic_rgb64(count, spans, userData);
+#endif // QT_CONFIG(raster_64bit)
     case QImage::Format_Invalid:
         break;
     default:
@@ -5555,29 +5644,77 @@ inline static void qt_bitmapblit_quint16(QRasterBuffer *rasterBuffer,
                                     map, mapWidth, mapHeight, mapStride);
 }
 
-static inline void alphamapblend_generic(int coverage, QRgba64 *dest, int x, const QRgba64 &srcLinear, const QRgba64 &src, const QColorProfile *colorProfile)
+static inline void grayBlendPixel(quint32 *dst, int coverage, QRgba64 srcLinear, const QColorTrcLut *colorProfile)
+{
+    // Do a gammacorrected gray alphablend...
+    const QRgba64 dstLinear = colorProfile ? colorProfile->toLinear64(*dst) : QRgba64::fromArgb32(*dst);
+
+    QRgba64 blend = interpolate255(srcLinear, coverage, dstLinear, 255 - coverage);
+
+    *dst = colorProfile ? colorProfile->fromLinear64(blend) : toArgb32(blend);
+}
+
+static inline void alphamapblend_argb32(quint32 *dst, int coverage, QRgba64 srcLinear, quint32 src, const QColorTrcLut *colorProfile)
 {
     if (coverage == 0) {
         // nothing
-    } else if (coverage == 255) {
-        dest[x] = src;
+    } else if (coverage == 255 || !colorProfile) {
+        blend_pixel(*dst, src, coverage);
+    } else if (*dst < 0xff000000) {
+        // Give up and do a naive gray alphablend. Needed to deal with ARGB32 and invalid ARGB32_premultiplied, see QTBUG-60571
+        blend_pixel(*dst, src, coverage);
+    } else if (src >= 0xff000000) {
+        grayBlendPixel(dst, coverage, srcLinear, colorProfile);
     } else {
-        QRgba64 dstColor = dest[x];
-        if (colorProfile) {
-            if (dstColor.isOpaque())
-                dstColor = colorProfile->toLinear(dstColor);
-            else if (!dstColor.isTransparent())
-                dstColor = colorProfile->toLinear(dstColor.unpremultiplied()).premultiplied();
-        }
+        // First do naive blend with text-color
+        QRgb s = *dst;
+        blend_pixel(s, src);
+        // Then gamma-corrected blend with glyph shape
+        QRgba64 s64 = colorProfile ? colorProfile->toLinear64(s) : QRgba64::fromArgb32(s);
+        grayBlendPixel(dst, coverage, s64, colorProfile);
+    }
+}
 
-        dstColor = interpolate255(srcLinear, coverage, dstColor, 255 - coverage);
-        if (colorProfile) {
-            if (dstColor.isOpaque())
-                dstColor = colorProfile->fromLinear(dstColor);
-            else if (!dstColor.isTransparent())
-                dstColor = colorProfile->fromLinear(dstColor.unpremultiplied()).premultiplied();
-        }
-        dest[x] = dstColor;
+#if QT_CONFIG(raster_64bit)
+
+static inline void grayBlendPixel(QRgba64 &dst, int coverage, QRgba64 srcLinear, const QColorTrcLut *colorProfile)
+{
+    // Do a gammacorrected gray alphablend...
+    QRgba64 dstColor = dst;
+    if (colorProfile) {
+        if (dstColor.isOpaque())
+            dstColor = colorProfile->toLinear(dstColor);
+        else if (!dstColor.isTransparent())
+            dstColor = colorProfile->toLinear(dstColor.unpremultiplied()).premultiplied();
+    }
+
+    blend_pixel(dstColor, srcLinear, coverage);
+
+    if (colorProfile) {
+        if (dstColor.isOpaque())
+            dstColor = colorProfile->fromLinear(dstColor);
+        else if (!dstColor.isTransparent())
+            dstColor = colorProfile->fromLinear(dstColor.unpremultiplied()).premultiplied();
+    }
+    dst = dstColor;
+}
+
+static inline void alphamapblend_generic(int coverage, QRgba64 *dest, int x, const QRgba64 &srcLinear, const QRgba64 &src, const QColorTrcLut *colorProfile)
+{
+    if (coverage == 0) {
+        // nothing
+    } else if (coverage == 255) {
+        blend_pixel(dest[x], src);
+    } else if (src.isOpaque()) {
+        grayBlendPixel(dest[x], coverage, srcLinear, colorProfile);
+    } else {
+        // First do naive blend with text-color
+        QRgba64 s = dest[x];
+        blend_pixel(s, src);
+        // Then gamma-corrected blend with glyph shape
+        if (colorProfile)
+            s = colorProfile->toLinear(s);
+        grayBlendPixel(dest[x], coverage, s, colorProfile);
     }
 }
 
@@ -5590,18 +5727,14 @@ static void qt_alphamapblit_generic(QRasterBuffer *rasterBuffer,
     if (color.isTransparent())
         return;
 
-    const QColorProfile *colorProfile = nullptr;
+    const QColorTrcLut *colorProfile = nullptr;
 
     if (useGammaCorrection)
         colorProfile = QGuiApplicationPrivate::instance()->colorProfileForA8Text();
 
     QRgba64 srcColor = color;
-    if (colorProfile) {
-        if (color.isOpaque())
-            srcColor = colorProfile->toLinear(srcColor);
-        else
-            srcColor = colorProfile->toLinear(srcColor.unpremultiplied()).premultiplied();
-    }
+    if (colorProfile && color.isOpaque())
+        srcColor = colorProfile->toLinear(srcColor);
 
     alignas(8) QRgba64 buffer[BufferSize];
     const DestFetchProc64 destFetch64 = destFetchProc64[rasterBuffer->format];
@@ -5656,6 +5789,81 @@ static void qt_alphamapblit_generic(QRasterBuffer *rasterBuffer,
         } // for (yp -> bottom)
     }
 }
+#else
+static void qt_alphamapblit_generic(QRasterBuffer *rasterBuffer,
+                                    int x, int y, const QRgba64 &color,
+                                    const uchar *map,
+                                    int mapWidth, int mapHeight, int mapStride,
+                                    const QClipData *clip, bool useGammaCorrection)
+{
+    if (color.isTransparent())
+        return;
+
+    const quint32 c = color.toArgb32();
+
+    const QColorTrcLut *colorProfile = nullptr;
+
+    if (useGammaCorrection)
+        colorProfile = QGuiApplicationPrivate::instance()->colorProfileForA8Text();
+
+    QRgba64 srcColor = color;
+    if (colorProfile && color.isOpaque())
+        srcColor = colorProfile->toLinear(srcColor);
+
+    quint32 buffer[BufferSize];
+    const DestFetchProc destFetch = destFetchProc[rasterBuffer->format];
+    const DestStoreProc destStore = destStoreProc[rasterBuffer->format];
+
+    if (!clip) {
+        for (int ly = 0; ly < mapHeight; ++ly) {
+            int i = x;
+            int length = mapWidth;
+            while (length > 0) {
+                int l = qMin(BufferSize, length);
+                quint32 *dest = destFetch(buffer, rasterBuffer, i, y + ly, l);
+                for (int j=0; j < l; ++j) {
+                    const int coverage = map[j + (i - x)];
+                    alphamapblend_argb32(dest + j, coverage, srcColor, c, colorProfile);
+                }
+                if (destStore)
+                    destStore(rasterBuffer, i, y + ly, dest, l);
+                length -= l;
+                i += l;
+            }
+            map += mapStride;
+        }
+    } else {
+        int bottom = qMin(y + mapHeight, rasterBuffer->height());
+
+        int top = qMax(y, 0);
+        map += (top - y) * mapStride;
+
+        const_cast<QClipData *>(clip)->initialize();
+        for (int yp = top; yp<bottom; ++yp) {
+            const QClipData::ClipLine &line = clip->m_clipLines[yp];
+
+            for (int i=0; i<line.count; ++i) {
+                const QSpan &clip = line.spans[i];
+
+                int start = qMax<int>(x, clip.x);
+                int end = qMin<int>(x + mapWidth, clip.x + clip.len);
+                if (end <= start)
+                    continue;
+                Q_ASSERT(end - start <= BufferSize);
+                quint32 *dest = destFetch(buffer, rasterBuffer, start, clip.y, end - start);
+
+                for (int xp=start; xp<end; ++xp) {
+                    const int coverage = map[xp - x];
+                    alphamapblend_argb32(dest + xp - x, coverage, srcColor, color, colorProfile);
+                }
+                if (destStore)
+                    destStore(rasterBuffer, start, clip.y, dest, end - start);
+            } // for (i -> line.count)
+            map += mapStride;
+        } // for (yp -> bottom)
+    }
+}
+#endif
 
 static inline void alphamapblend_quint16(int coverage, quint16 *dest, int x, const quint16 srcColor)
 {
@@ -5675,7 +5883,7 @@ void qt_alphamapblit_quint16(QRasterBuffer *rasterBuffer,
                              int mapWidth, int mapHeight, int mapStride,
                              const QClipData *clip, bool useGammaCorrection)
 {
-    if (useGammaCorrection) {
+    if (useGammaCorrection || !color.isOpaque()) {
         qt_alphamapblit_generic(rasterBuffer, x, y, color, map, mapWidth, mapHeight, mapStride, clip, useGammaCorrection);
         return;
     }
@@ -5716,44 +5924,6 @@ void qt_alphamapblit_quint16(QRasterBuffer *rasterBuffer,
     }
 }
 
-static inline void rgbBlendPixel(quint32 *dst, int coverage, QRgba64 slinear, const QColorProfile *colorProfile)
-{
-    // Do a gammacorrected RGB alphablend...
-    const QRgba64 dlinear = colorProfile ? colorProfile->toLinear64(*dst) : QRgba64::fromArgb32(*dst);
-
-    QRgba64 blend = rgbBlend(dlinear, slinear, coverage);
-
-    *dst = colorProfile ? colorProfile->fromLinear64(blend) : toArgb32(blend);
-}
-
-static inline void grayBlendPixel(quint32 *dst, int coverage, QRgba64 srcLinear, const QColorProfile *colorProfile)
-{
-    // Do a gammacorrected gray alphablend...
-    const QRgba64 dstLinear = colorProfile ? colorProfile->toLinear64(*dst) : QRgba64::fromArgb32(*dst);
-
-    QRgba64 blend = interpolate255(srcLinear, coverage, dstLinear, 255 - coverage);
-
-    *dst = colorProfile ? colorProfile->fromLinear64(blend) : toArgb32(blend);
-}
-
-static inline void alphamapblend_argb32(quint32 *dst, int coverage, QRgba64 srcLinear, quint32 src, const QColorProfile *colorProfile)
-{
-    if (coverage == 0) {
-        // nothing
-    } else if (coverage == 255) {
-        *dst = src;
-    } else if (!colorProfile) {
-        *dst = INTERPOLATE_PIXEL_255(src, coverage, *dst, 255 - coverage);
-    } else {
-        if (*dst >= 0xff000000) {
-            grayBlendPixel(dst, coverage, srcLinear, colorProfile);
-        } else {
-            // Give up and do a naive gray alphablend. Needed to deal with ARGB32 and invalid ARGB32_premultiplied, see QTBUG-60571
-            *dst = INTERPOLATE_PIXEL_255(src, coverage, *dst, 255 - coverage);
-        }
-    }
-}
-
 static void qt_alphamapblit_argb32(QRasterBuffer *rasterBuffer,
                                    int x, int y, const QRgba64 &color,
                                    const uchar *map,
@@ -5766,18 +5936,14 @@ static void qt_alphamapblit_argb32(QRasterBuffer *rasterBuffer,
     if (color.isTransparent())
         return;
 
-    const QColorProfile *colorProfile = nullptr;
+    const QColorTrcLut *colorProfile = nullptr;
 
     if (useGammaCorrection)
         colorProfile = QGuiApplicationPrivate::instance()->colorProfileForA8Text();
 
     QRgba64 srcColor = color;
-    if (colorProfile) {
-        if (color.isOpaque())
-            srcColor = colorProfile->toLinear(srcColor);
-        else
-            srcColor = colorProfile->toLinear(srcColor.unpremultiplied()).premultiplied();
-    }
+    if (colorProfile && color.isOpaque())
+        srcColor = colorProfile->toLinear(srcColor);
 
     if (!clip) {
         quint32 *dest = reinterpret_cast<quint32*>(rasterBuffer->scanLine(y)) + x;
@@ -5822,6 +5988,16 @@ static inline int qRgbAvg(QRgb rgb)
     return (qRed(rgb) * 5 + qGreen(rgb) * 6 + qBlue(rgb) * 5) / 16;
 }
 
+static inline void rgbBlendPixel(quint32 *dst, int coverage, QRgba64 slinear, const QColorTrcLut *colorProfile)
+{
+    // Do a gammacorrected RGB alphablend...
+    const QRgba64 dlinear = colorProfile ? colorProfile->toLinear64(*dst) : QRgba64::fromArgb32(*dst);
+
+    QRgba64 blend = rgbBlend(dlinear, slinear, coverage);
+
+    *dst = colorProfile ? colorProfile->fromLinear64(blend) : toArgb32(blend);
+}
+
 static inline QRgb rgbBlend(QRgb d, QRgb s, uint rgbAlpha)
 {
 #if defined(__SSE2__)
@@ -5862,42 +6038,59 @@ static inline QRgb rgbBlend(QRgb d, QRgb s, uint rgbAlpha)
 #endif
 }
 
-static inline void alphargbblend_generic(uint coverage, QRgba64 *dest, int x, const QRgba64 &srcLinear, const QRgba64 &src, const QColorProfile *colorProfile)
+static inline void alphargbblend_argb32(quint32 *dst, uint coverage, const QRgba64 &srcLinear, quint32 src, const QColorTrcLut *colorProfile)
 {
     if (coverage == 0xff000000) {
         // nothing
-    } else if (coverage == 0xffffffff) {
-        dest[x] = src;
+    } else if (coverage == 0xffffffff && qAlpha(src) == 255) {
+        blend_pixel(*dst, src);
+    } else if (!colorProfile) {
+        *dst = rgbBlend(*dst, src, coverage);
+    } else if (*dst < 0xff000000) {
+        // Give up and do a naive gray alphablend. Needed to deal with ARGB32 and invalid ARGB32_premultiplied, see QTBUG-60571
+        blend_pixel(*dst, src, qRgbAvg(coverage));
+    } else if (srcLinear.isOpaque()) {
+        rgbBlendPixel(dst, coverage, srcLinear, colorProfile);
     } else {
-        QRgba64 dstColor = dest[x];
-        if (dstColor.isOpaque()) {
-            if (colorProfile)
-                dstColor = colorProfile->toLinear(dstColor);
-            dstColor = rgbBlend(dstColor, srcLinear, coverage);
-            if (colorProfile)
-                dstColor = colorProfile->fromLinear(dstColor);
-            dest[x] = dstColor;
-        } else {
-            // Do a gray alphablend.
-            alphamapblend_generic(qRgbAvg(coverage), dest, x, srcLinear, src, colorProfile);
-        }
+        // First do naive blend with text-color
+        QRgb s = *dst;
+        blend_pixel(s, src);
+        // Then gamma-corrected blend with glyph shape
+        QRgba64 s64 = colorProfile ? colorProfile->toLinear64(s) : QRgba64::fromArgb32(s);
+        rgbBlendPixel(dst, coverage, s64, colorProfile);
     }
 }
 
-static inline void alphargbblend_argb32(quint32 *dst, uint coverage, const QRgba64 &srcLinear, quint32 src, const QColorProfile *colorProfile)
+#if QT_CONFIG(raster_64bit)
+static inline void rgbBlendPixel(QRgba64 &dst, int coverage, QRgba64 slinear, const QColorTrcLut *colorProfile)
+{
+    // Do a gammacorrected RGB alphablend...
+    const QRgba64 dlinear = colorProfile ? colorProfile->toLinear64(dst) : dst;
+
+    QRgba64 blend = rgbBlend(dlinear, slinear, coverage);
+
+    dst = colorProfile ? colorProfile->fromLinear(blend) : blend;
+}
+
+static inline void alphargbblend_generic(uint coverage, QRgba64 *dest, int x, const QRgba64 &srcLinear, const QRgba64 &src, const QColorTrcLut *colorProfile)
 {
     if (coverage == 0xff000000) {
         // nothing
     } else if (coverage == 0xffffffff) {
-        *dst = src;
-    } else if (*dst < 0xff000000) {
-        // Give up and do a naive gray alphablend. Needed to deal with ARGB32 and invalid ARGB32_premultiplied, see QTBUG-60571
-        const int a = qRgbAvg(coverage);
-        *dst = INTERPOLATE_PIXEL_255(src, a, *dst, 255 - a);
-    } else if (!colorProfile) {
-        *dst = rgbBlend(*dst, src, coverage);
-    } else  {
-        rgbBlendPixel(dst, coverage, srcLinear, colorProfile);
+        blend_pixel(dest[x], src);
+    } else if (!dest[x].isOpaque()) {
+        // Do a gray alphablend.
+        alphamapblend_generic(qRgbAvg(coverage), dest, x, srcLinear, src, colorProfile);
+    } else if (src.isOpaque()) {
+        rgbBlendPixel(dest[x], coverage, srcLinear, colorProfile);
+    } else {
+        // First do naive blend with text-color
+        QRgba64 s = dest[x];
+        blend_pixel(s, src);
+        // Then gamma-corrected blend with glyph shape
+        if (colorProfile)
+            s = colorProfile->toLinear(s);
+        rgbBlendPixel(dest[x], coverage, s, colorProfile);
     }
 }
 
@@ -5909,18 +6102,14 @@ static void qt_alphargbblit_generic(QRasterBuffer *rasterBuffer,
     if (color.isTransparent())
         return;
 
-    const QColorProfile *colorProfile = nullptr;
+    const QColorTrcLut *colorProfile = nullptr;
 
     if (useGammaCorrection)
         colorProfile = QGuiApplicationPrivate::instance()->colorProfileForA32Text();
 
     QRgba64 srcColor = color;
-    if (colorProfile) {
-        if (color.isOpaque())
-            srcColor = colorProfile->toLinear(srcColor);
-        else
-            srcColor = colorProfile->toLinear(srcColor.unpremultiplied()).premultiplied();
-    }
+    if (colorProfile && color.isOpaque())
+        srcColor = colorProfile->toLinear(srcColor);
 
     alignas(8) QRgba64 buffer[BufferSize];
     const DestFetchProc64 destFetch64 = destFetchProc64[rasterBuffer->format];
@@ -5975,6 +6164,80 @@ static void qt_alphargbblit_generic(QRasterBuffer *rasterBuffer,
         } // for (yp -> bottom)
     }
 }
+#else
+static void qt_alphargbblit_generic(QRasterBuffer *rasterBuffer,
+                                    int x, int y, const QRgba64 &color,
+                                    const uint *src, int mapWidth, int mapHeight, int srcStride,
+                                    const QClipData *clip, bool useGammaCorrection)
+{
+    if (color.isTransparent())
+        return;
+
+    const quint32 c = color.toArgb32();
+
+    const QColorTrcLut *colorProfile = nullptr;
+
+    if (useGammaCorrection)
+        colorProfile = QGuiApplicationPrivate::instance()->colorProfileForA32Text();
+
+    QRgba64 srcColor = color;
+    if (colorProfile && color.isOpaque())
+        srcColor = colorProfile->toLinear(srcColor);
+
+    quint32 buffer[BufferSize];
+    const DestFetchProc destFetch = destFetchProc[rasterBuffer->format];
+    const DestStoreProc destStore = destStoreProc[rasterBuffer->format];
+
+    if (!clip) {
+        for (int ly = 0; ly < mapHeight; ++ly) {
+            int i = x;
+            int length = mapWidth;
+            while (length > 0) {
+                int l = qMin(BufferSize, length);
+                quint32 *dest = destFetch(buffer, rasterBuffer, i, y + ly, l);
+                for (int j=0; j < l; ++j) {
+                    const uint coverage = src[j + (i - x)];
+                    alphargbblend_argb32(dest + j, coverage, srcColor, c, colorProfile);
+                }
+                if (destStore)
+                    destStore(rasterBuffer, i, y + ly, dest, l);
+                length -= l;
+                i += l;
+            }
+            src += srcStride;
+        }
+    } else {
+        int bottom = qMin(y + mapHeight, rasterBuffer->height());
+
+        int top = qMax(y, 0);
+        src += (top - y) * srcStride;
+
+        const_cast<QClipData *>(clip)->initialize();
+        for (int yp = top; yp<bottom; ++yp) {
+            const QClipData::ClipLine &line = clip->m_clipLines[yp];
+
+            for (int i=0; i<line.count; ++i) {
+                const QSpan &clip = line.spans[i];
+
+                int start = qMax<int>(x, clip.x);
+                int end = qMin<int>(x + mapWidth, clip.x + clip.len);
+                if (end <= start)
+                    continue;
+                Q_ASSERT(end - start <= BufferSize);
+                quint32 *dest = destFetch(buffer, rasterBuffer, start, clip.y, end - start);
+
+                for (int xp=start; xp<end; ++xp) {
+                    const uint coverage = src[xp - x];
+                    alphargbblend_argb32(dest + xp - start, coverage, srcColor, c, colorProfile);
+                }
+                if (destStore)
+                    destStore(rasterBuffer, start, clip.y, dest, end - start);
+            } // for (i -> line.count)
+            src += srcStride;
+        } // for (yp -> bottom)
+    }
+}
+#endif
 
 static void qt_alphargbblit_argb32(QRasterBuffer *rasterBuffer,
                                    int x, int y, const QRgba64 &color,
@@ -5986,18 +6249,14 @@ static void qt_alphargbblit_argb32(QRasterBuffer *rasterBuffer,
 
     const quint32 c = color.toArgb32();
 
-    const QColorProfile *colorProfile = nullptr;
+    const QColorTrcLut *colorProfile = nullptr;
 
     if (useGammaCorrection)
         colorProfile = QGuiApplicationPrivate::instance()->colorProfileForA32Text();
 
     QRgba64 srcColor = color;
-    if (colorProfile) {
-        if (color.isOpaque())
-            srcColor = colorProfile->toLinear(srcColor);
-        else
-            srcColor = colorProfile->toLinear(srcColor.unpremultiplied()).premultiplied();
-    }
+    if (colorProfile && color.isOpaque())
+        srcColor = colorProfile->toLinear(srcColor);
 
     if (!clip) {
         quint32 *dst = reinterpret_cast<quint32*>(rasterBuffer->scanLine(y)) + x;
@@ -6354,6 +6613,14 @@ DrawHelper qDrawHelper[QImage::NImageFormats] =
         qt_alphargbblit_generic,
         qt_rectfill_quint16
     },
+    // Format_BGR888
+    {
+        blend_color_generic,
+        0,
+        qt_alphamapblit_generic,
+        qt_alphargbblit_generic,
+        qt_rectfill_quint24
+    },
 };
 
 #if !defined(__SSE2__)
@@ -6515,6 +6782,9 @@ static void qInitDrawhelperFunctions()
         qBlendFunctions[QImage::Format_RGBX8888][QImage::Format_RGBA8888_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
         qBlendFunctions[QImage::Format_RGBA8888_Premultiplied][QImage::Format_RGBA8888_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
         sourceFetchUntransformed[QImage::Format_RGB888] = qt_fetchUntransformed_888_ssse3;
+        extern void QT_FASTCALL rbSwap_888_ssse3(uchar *dst, const uchar *src, int count);
+        qPixelLayouts[QImage::Format_RGB888].rbSwap = rbSwap_888_ssse3;
+        qPixelLayouts[QImage::Format_BGR888].rbSwap = rbSwap_888_ssse3;
     }
 #endif // SSSE3
 
@@ -6565,8 +6835,10 @@ static void qInitDrawhelperFunctions()
         qPixelLayouts[QImage::Format_A2RGB30_Premultiplied].storeFromARGB32PM = storeA2RGB30PMFromARGB32PM_sse4<PixelOrderRGB>;
         qStoreFromRGBA64PM[QImage::Format_ARGB32] = storeARGB32FromRGBA64PM_sse4;
         qStoreFromRGBA64PM[QImage::Format_RGBA8888] = storeRGBA8888FromRGBA64PM_sse4;
+#if QT_CONFIG(raster_64bit)
         destStoreProc64[QImage::Format_ARGB32] = destStore64ARGB32_sse4;
         destStoreProc64[QImage::Format_RGBA8888] = destStore64RGBA8888_sse4;
+#endif
     }
 #endif
 
@@ -6590,18 +6862,19 @@ static void qInitDrawhelperFunctions()
         qBlendFunctions[QImage::Format_RGBA8888_Premultiplied][QImage::Format_RGBA8888_Premultiplied] = qt_blend_argb32_on_argb32_avx2;
 
         extern void QT_FASTCALL comp_func_Source_avx2(uint *destPixels, const uint *srcPixels, int length, uint const_alpha);
-        extern void QT_FASTCALL comp_func_Source_rgb64_avx2(QRgba64 *destPixels, const QRgba64 *srcPixels, int length, uint const_alpha);
         extern void QT_FASTCALL comp_func_SourceOver_avx2(uint *destPixels, const uint *srcPixels, int length, uint const_alpha);
-        extern void QT_FASTCALL comp_func_SourceOver_rgb64_avx2(QRgba64 *destPixels, const QRgba64 *srcPixels, int length, uint const_alpha);
         extern void QT_FASTCALL comp_func_solid_SourceOver_avx2(uint *destPixels, int length, uint color, uint const_alpha);
-        extern void QT_FASTCALL comp_func_solid_SourceOver_rgb64_avx2(QRgba64 *destPixels, int length, QRgba64 color, uint const_alpha);
-
         qt_functionForMode_C[QPainter::CompositionMode_Source] = comp_func_Source_avx2;
-        qt_functionForMode64_C[QPainter::CompositionMode_Source] = comp_func_Source_rgb64_avx2;
         qt_functionForMode_C[QPainter::CompositionMode_SourceOver] = comp_func_SourceOver_avx2;
-        qt_functionForMode64_C[QPainter::CompositionMode_SourceOver] = comp_func_SourceOver_rgb64_avx2;
         qt_functionForModeSolid_C[QPainter::CompositionMode_SourceOver] = comp_func_solid_SourceOver_avx2;
+#if QT_CONFIG(raster_64bit)
+        extern void QT_FASTCALL comp_func_Source_rgb64_avx2(QRgba64 *destPixels, const QRgba64 *srcPixels, int length, uint const_alpha);
+        extern void QT_FASTCALL comp_func_SourceOver_rgb64_avx2(QRgba64 *destPixels, const QRgba64 *srcPixels, int length, uint const_alpha);
+        extern void QT_FASTCALL comp_func_solid_SourceOver_rgb64_avx2(QRgba64 *destPixels, int length, QRgba64 color, uint const_alpha);
+        qt_functionForMode64_C[QPainter::CompositionMode_Source] = comp_func_Source_rgb64_avx2;
+        qt_functionForMode64_C[QPainter::CompositionMode_SourceOver] = comp_func_SourceOver_rgb64_avx2;
         qt_functionForModeSolid64_C[QPainter::CompositionMode_SourceOver] = comp_func_solid_SourceOver_rgb64_avx2;
+#endif
 
         extern void QT_FASTCALL fetchTransformedBilinearARGB32PM_simple_scale_helper_avx2(uint *b, uint *end, const QTextureData &image,
                                                                                           int &fx, int &fy, int fdx, int /*fdy*/);
@@ -6625,6 +6898,7 @@ static void qInitDrawhelperFunctions()
         qPixelLayouts[QImage::Format_RGBA8888].fetchToARGB32PM = fetchRGBA8888ToARGB32PM_avx2;
         qPixelLayouts[QImage::Format_RGBA8888].convertToARGB32PM = convertRGBA8888ToARGB32PM_avx2;
 
+#if QT_CONFIG(raster_64bit)
         extern const QRgba64 * QT_FASTCALL convertARGB32ToRGBA64PM_avx2(QRgba64 *, const uint *, int, const QVector<QRgb> *, QDitherInfo *);
         extern const QRgba64 * QT_FASTCALL convertRGBA8888ToRGBA64PM_avx2(QRgba64 *, const uint *, int count, const QVector<QRgb> *, QDitherInfo *);
         extern const QRgba64 *QT_FASTCALL fetchARGB32ToRGBA64PM_avx2(QRgba64 *, const uchar *, int, int, const QVector<QRgb> *, QDitherInfo *);
@@ -6633,6 +6907,7 @@ static void qInitDrawhelperFunctions()
         qPixelLayouts[QImage::Format_RGBX8888].convertToRGBA64PM = convertRGBA8888ToRGBA64PM_avx2;
         qPixelLayouts[QImage::Format_ARGB32].fetchToRGBA64PM = fetchARGB32ToRGBA64PM_avx2;
         qPixelLayouts[QImage::Format_RGBX8888].fetchToRGBA64PM = fetchRGBA8888ToRGBA64PM_avx2;
+#endif
     }
 #endif
 
diff --git a/src/gui/painting/qdrawhelper_avx2.cpp b/src/gui/painting/qdrawhelper_avx2.cpp
index 2b3cc9b226..fb50cb6a50 100644
--- a/src/gui/painting/qdrawhelper_avx2.cpp
+++ b/src/gui/painting/qdrawhelper_avx2.cpp
@@ -396,6 +396,7 @@ void QT_FASTCALL comp_func_SourceOver_avx2(uint *destPixels, const uint *srcPixe
         BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_AVX2(dst, src, length, const_alpha);
 }
 
+#if QT_CONFIG(raster_64bit)
 void QT_FASTCALL comp_func_SourceOver_rgb64_avx2(QRgba64 *dst, const QRgba64 *src, int length, uint const_alpha)
 {
     Q_ASSERT(const_alpha < 256); // const_alpha is in [0-255]
@@ -453,6 +454,7 @@ void QT_FASTCALL comp_func_SourceOver_rgb64_avx2(QRgba64 *dst, const QRgba64 *sr
             blend_pixel(dst[x], src[x], const_alpha);
     }
 }
+#endif
 
 void QT_FASTCALL comp_func_Source_avx2(uint *dst, const uint *src, int length, uint const_alpha)
 {
@@ -485,6 +487,7 @@ void QT_FASTCALL comp_func_Source_avx2(uint *dst, const uint *src, int length, u
     }
 }
 
+#if QT_CONFIG(raster_64bit)
 void QT_FASTCALL comp_func_Source_rgb64_avx2(QRgba64 *dst, const QRgba64 *src, int length, uint const_alpha)
 {
     Q_ASSERT(const_alpha < 256); // const_alpha is in [0-255]
@@ -517,6 +520,7 @@ void QT_FASTCALL comp_func_Source_rgb64_avx2(QRgba64 *dst, const QRgba64 *src, i
             dst[x] = interpolate65535(src[x], ca, dst[x], cia);
     }
 }
+#endif
 
 void QT_FASTCALL comp_func_solid_SourceOver_avx2(uint *destPixels, int length, uint color, uint const_alpha)
 {
@@ -549,6 +553,7 @@ void QT_FASTCALL comp_func_solid_SourceOver_avx2(uint *destPixels, int length, u
     }
 }
 
+#if QT_CONFIG(raster_64bit)
 void QT_FASTCALL comp_func_solid_SourceOver_rgb64_avx2(QRgba64 *destPixels, int length, QRgba64 color, uint const_alpha)
 {
     Q_ASSERT(const_alpha < 256); // const_alpha is in [0-255]
@@ -579,6 +584,7 @@ void QT_FASTCALL comp_func_solid_SourceOver_rgb64_avx2(QRgba64 *destPixels, int
             destPixels[x] = color + multiplyAlpha65535(destPixels[x], minusAlphaOfColor);
     }
 }
+#endif
 
 #define interpolate_4_pixels_16_avx2(tlr1, tlr2, blr1, blr2, distx, disty, colorMask, v_256, b)  \
 { \
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h
index 37108949d6..dd42b96d79 100644
--- a/src/gui/painting/qdrawhelper_p.h
+++ b/src/gui/painting/qdrawhelper_p.h
@@ -296,7 +296,9 @@ struct QGradientData
 #define GRADIENT_STOPTABLE_SIZE 1024
 #define GRADIENT_STOPTABLE_SIZE_SHIFT 10
 
+#if QT_CONFIG(raster_64bit)
     const QRgba64 *colorTable64; //[GRADIENT_STOPTABLE_SIZE];
+#endif
     const QRgb *colorTable32; //[GRADIENT_STOPTABLE_SIZE];
 
     uint alphaColor : 1;
@@ -328,7 +330,7 @@ struct QTextureData
 
 struct QSpanData
 {
-    QSpanData() : tempImage(0) {}
+    QSpanData() : tempImage(nullptr) {}
     ~QSpanData() { delete tempImage; }
 
     QRasterBuffer *rasterBuffer;
@@ -402,11 +404,13 @@ static inline uint qt_gradient_pixel(const QGradientData *data, qreal pos)
     return data->colorTable32[qt_gradient_clamp(data, ipos)];
 }
 
+#if QT_CONFIG(raster_64bit)
 static inline const QRgba64& qt_gradient_pixel64(const QGradientData *data, qreal pos)
 {
     int ipos = int(pos * (GRADIENT_STOPTABLE_SIZE - 1) + qreal(0.5));
     return data->colorTable64[qt_gradient_clamp(data, ipos)];
 }
+#endif
 
 static inline qreal qRadialDeterminant(qreal a, qreal b, qreal c)
 {
@@ -667,6 +671,8 @@ static Q_ALWAYS_INLINE void blend_pixel(quint32 &dst, const quint32 src)
 
 static Q_ALWAYS_INLINE void blend_pixel(quint32 &dst, const quint32 src, const int const_alpha)
 {
+    if (const_alpha == 255)
+        return blend_pixel(dst, src);
     if (src != 0) {
         const quint32 s = BYTE_MUL(src, const_alpha);
         dst = s + BYTE_MUL(dst, qAlpha(~s));
diff --git a/src/gui/painting/qdrawhelper_sse4.cpp b/src/gui/painting/qdrawhelper_sse4.cpp
index e387026972..68d887ae6d 100644
--- a/src/gui/painting/qdrawhelper_sse4.cpp
+++ b/src/gui/painting/qdrawhelper_sse4.cpp
@@ -417,6 +417,7 @@ void QT_FASTCALL storeA2RGB30PMFromARGB32PM_sse4(uchar *dest, const uint *src, i
         d[i] = qConvertArgb32ToA2rgb30_sse4<PixelOrder>(src[i]);
 }
 
+#if QT_CONFIG(raster_64bit)
 void QT_FASTCALL destStore64ARGB32_sse4(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length)
 {
     uint *dest = (uint*)rasterBuffer->scanLine(y) + x;
@@ -428,6 +429,7 @@ void QT_FASTCALL destStore64RGBA8888_sse4(QRasterBuffer *rasterBuffer, int x, in
     uint *dest = (uint*)rasterBuffer->scanLine(y) + x;
     convertARGBFromRGBA64PM_sse4<true>(dest, buffer, length);
 }
+#endif
 
 void QT_FASTCALL storeARGB32FromRGBA64PM_sse4(uchar *dest, const QRgba64 *src, int index, int count,
                                               const QVector<QRgb> *, QDitherInfo *)
diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp
index 35d61c3e6c..14d7047bb6 100644
--- a/src/gui/painting/qdrawhelper_ssse3.cpp
+++ b/src/gui/painting/qdrawhelper_ssse3.cpp
@@ -40,7 +40,7 @@
 
 #include <private/qdrawhelper_x86_p.h>
 
-#ifdef QT_COMPILER_SUPPORTS_SSSE3
+#if defined(QT_COMPILER_SUPPORTS_SSSE3)
 
 #include <private/qdrawingprimitive_sse2_p.h>
 
@@ -254,6 +254,49 @@ void qt_memfill24_ssse3(quint24 *dest, quint24 color, qsizetype count)
     }
 }
 
+void QT_FASTCALL rbSwap_888_ssse3(uchar *dst, const uchar *src, int count)
+{
+    int i = 0;
+
+    const static __m128i shuffleMask1 = _mm_setr_epi8(2, 1, 0, 5, 4, 3, 8, 7, 6, 11, 10, 9, 14, 13, 12, /*!!*/15);
+    const static __m128i shuffleMask2 = _mm_setr_epi8(0, /*!!*/1, 4, 3, 2, 7, 6, 5, 10, 9, 8, 13, 12, 11, /*!!*/14, 15);
+    const static __m128i shuffleMask3 = _mm_setr_epi8(/*!!*/0, 3, 2, 1, 6, 5, 4, 9, 8, 7, 12, 11, 10, 15, 14, 13);
+
+    for (; i + 15 < count; i += 16) {
+        __m128i s1 = _mm_loadu_si128((const __m128i *)src);
+        __m128i s2 = _mm_loadu_si128((const __m128i *)(src + 16));
+        __m128i s3 = _mm_loadu_si128((const __m128i *)(src + 32));
+        s1 = _mm_shuffle_epi8(s1, shuffleMask1);
+        s2 = _mm_shuffle_epi8(s2, shuffleMask2);
+        s3 = _mm_shuffle_epi8(s3, shuffleMask3);
+        _mm_storeu_si128((__m128i *)dst, s1);
+        _mm_storeu_si128((__m128i *)(dst + 16), s2);
+        _mm_storeu_si128((__m128i *)(dst + 32), s3);
+
+        // Now fix the last four misplaced values
+        std::swap(dst[15], dst[17]);
+        std::swap(dst[30], dst[32]);
+
+        src += 48;
+        dst += 48;
+    }
+
+    if (src != dst) {
+        SIMD_EPILOGUE(i, count, 15) {
+            dst[0] = src[2];
+            dst[1] = src[1];
+            dst[2] = src[0];
+            dst += 3;
+            src += 3;
+        }
+    } else {
+        SIMD_EPILOGUE(i, count, 15) {
+            std::swap(dst[0], dst[2]);
+            dst += 3;
+        }
+    }
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_COMPILER_SUPPORTS_SSSE3
diff --git a/src/gui/painting/qicc.cpp b/src/gui/painting/qicc.cpp
new file mode 100644
index 0000000000..18f212f8e9
--- /dev/null
+++ b/src/gui/painting/qicc.cpp
@@ -0,0 +1,776 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qicc_p.h"
+
+#include <qbuffer.h>
+#include <qbytearray.h>
+#include <qdatastream.h>
+#include <qendian.h>
+#include <qloggingcategory.h>
+#include <qstring.h>
+
+#include "qcolorspace_p.h"
+#include "qcolortrc_p.h"
+
+QT_BEGIN_NAMESPACE
+Q_LOGGING_CATEGORY(lcIcc, "qt.gui.icc")
+
+struct ICCProfileHeader
+{
+    quint32_be profileSize;
+
+    quint32_be preferredCmmType;
+
+    quint32_be profileVersion;
+    quint32_be profileClass;
+    quint32_be inputColorSpace;
+    quint32_be pcs;
+    quint32_be datetime[3];
+    quint32_be signature;
+    quint32_be platformSignature;
+    quint32_be flags;
+    quint32_be deviceManufacturer;
+    quint32_be deviceModel;
+    quint32_be deviceAttributes[2];
+
+    quint32_be renderingIntent;
+    qint32_be  illuminantXyz[3];
+
+    quint32_be creatorSignature;
+    quint32_be profileId[4];
+
+    quint32_be reserved[7];
+
+// Technically after the header, but easier to include here:
+    quint32_be tagCount;
+};
+
+constexpr quint32 IccTag(uchar a, uchar b, uchar c, uchar d)
+{
+    return (a << 24) | (b << 16) | (c << 8) | d;
+}
+
+enum class ProfileClass : quint32 {
+    Input       = IccTag('s', 'c', 'r', 'n'),
+    Display     = IccTag('m', 'n', 't', 'r'),
+    // Not supported:
+    Output      = IccTag('p', 'r', 't', 'r'),
+    ColorSpace  = IccTag('s', 'p', 'a', 'c'),
+};
+
+enum class Tag : quint32 {
+    acsp = IccTag('a', 'c', 's', 'p'),
+    RGB_ = IccTag('R', 'G', 'B', ' '),
+    XYZ_ = IccTag('X', 'Y', 'Z', ' '),
+    rXYZ = IccTag('r', 'X', 'Y', 'Z'),
+    gXYZ = IccTag('g', 'X', 'Y', 'Z'),
+    bXYZ = IccTag('b', 'X', 'Y', 'Z'),
+    rTRC = IccTag('r', 'T', 'R', 'C'),
+    gTRC = IccTag('g', 'T', 'R', 'C'),
+    bTRC = IccTag('b', 'T', 'R', 'C'),
+    A2B0 = IccTag('A', '2', 'B', '0'),
+    A2B1 = IccTag('A', '2', 'B', '1'),
+    B2A0 = IccTag('B', '2', 'A', '0'),
+    B2A1 = IccTag('B', '2', 'A', '1'),
+    desc = IccTag('d', 'e', 's', 'c'),
+    text = IccTag('t', 'e', 'x', 't'),
+    cprt = IccTag('c', 'p', 'r', 't'),
+    curv = IccTag('c', 'u', 'r', 'v'),
+    para = IccTag('p', 'a', 'r', 'a'),
+    wtpt = IccTag('w', 't', 'p', 't'),
+    bkpt = IccTag('b', 'k', 'p', 't'),
+    mft1 = IccTag('m', 'f', 't', '1'),
+    mft2 = IccTag('m', 'f', 't', '2'),
+    mluc = IccTag('m', 'l', 'u', 'c'),
+    mAB_ = IccTag('m', 'A', 'B', ' '),
+    mBA_ = IccTag('m', 'B', 'A', ' '),
+    chad = IccTag('c', 'h', 'a', 'd'),
+    sf32 = IccTag('s', 'f', '3', '2'),
+
+    // Apple extensions for ICCv2:
+    aarg = IccTag('a', 'a', 'r', 'g'),
+    aagg = IccTag('a', 'a', 'g', 'g'),
+    aabg = IccTag('a', 'a', 'b', 'g'),
+};
+
+inline uint qHash(const Tag &key, uint seed = 0)
+{
+    return qHash(quint32(key), seed);
+}
+
+namespace QIcc {
+
+struct TagTableEntry
+{
+    quint32_be signature;
+    quint32_be offset;
+    quint32_be size;
+};
+
+struct GenericTagData {
+    quint32_be type;
+    quint32_be null;
+};
+
+struct XYZTagData : GenericTagData {
+    qint32_be fixedX;
+    qint32_be fixedY;
+    qint32_be fixedZ;
+};
+
+struct CurvTagData : GenericTagData {
+    quint32_be valueCount;
+    quint16_be value[1];
+};
+
+struct ParaTagData : GenericTagData {
+    quint16_be curveType;
+    quint16_be null2;
+    quint32_be parameter[1];
+};
+
+struct DescTagData : GenericTagData {
+    quint32_be asciiDescriptionLength;
+    char asciiDescription[1];
+    // .. we ignore the rest
+};
+
+struct MlucTagRecord {
+    quint16_be languageCode;
+    quint16_be countryCode;
+    quint32_be size;
+    quint32_be offset;
+};
+
+struct MlucTagData : GenericTagData {
+    quint32_be recordCount;
+    quint32_be recordSize; // = sizeof(MlucTagRecord)
+    MlucTagRecord records[1];
+};
+
+// For both mAB and mBA
+struct mABTagData : GenericTagData {
+    quint8 inputChannels;
+    quint8 outputChannels;
+    quint8 padding[2];
+    quint32_be bCurvesOffset;
+    quint32_be matrixOffset;
+    quint32_be mCurvesOffset;
+    quint32_be clutOffset;
+    quint32_be aCurvesOffset;
+};
+
+struct Sf32TagData : GenericTagData {
+    quint32_be value[1];
+};
+
+static int toFixedS1516(float x)
+{
+    return int(x * 65536.0f + 0.5f);
+}
+
+static float fromFixedS1516(int x)
+{
+    return x * (1.0f / 65536.0f);
+}
+
+static bool isValidIccProfile(const ICCProfileHeader &header)
+{
+    if (header.signature != uint(Tag::acsp)) {
+        qCWarning(lcIcc, "Failed ICC signature test");
+        return false;
+    }
+
+    // Don't overflow 32bit integers:
+    if (header.tagCount >= INT32_MAX / sizeof(TagTableEntry))
+        return false;
+    if (header.profileSize - sizeof(ICCProfileHeader) < header.tagCount * sizeof(TagTableEntry)) {
+        qCWarning(lcIcc, "Failed basic size sanity");
+        return false;
+    }
+
+    if (header.profileClass != uint(ProfileClass::Input)
+        && header.profileClass != uint(ProfileClass::Display)) {
+        qCWarning(lcIcc, "Unsupported ICC profile class %x", quint32(header.profileClass));
+        return false;
+    }
+    if (header.inputColorSpace != 0x52474220 /* 'RGB '*/) {
+        qCWarning(lcIcc, "Unsupported ICC input color space %x", quint32(header.inputColorSpace));
+        return false;
+    }
+    if (header.pcs != 0x58595a20 /* 'XYZ '*/) {
+        // ### support PCSLAB
+        qCWarning(lcIcc, "Unsupported ICC profile connection space %x", quint32(header.pcs));
+        return false;
+    }
+
+    QColorVector illuminant;
+    illuminant.x = fromFixedS1516(header.illuminantXyz[0]);
+    illuminant.y = fromFixedS1516(header.illuminantXyz[1]);
+    illuminant.z = fromFixedS1516(header.illuminantXyz[2]);
+    if (illuminant != QColorVector::D50()) {
+        qCWarning(lcIcc, "Invalid ICC illuminant");
+        return false;
+    }
+
+    return true;
+}
+
+static int writeColorTrc(QDataStream &stream, const QColorTrc &trc)
+{
+    if (trc.isLinear()) {
+        stream << uint(Tag::curv) << uint(0);
+        stream << uint(0);
+        return 12;
+    }
+
+    if (trc.m_type == QColorTrc::Type::Function) {
+        const QColorTransferFunction &fun = trc.m_fun;
+        stream << uint(Tag::para) << uint(0);
+        if (fun.isGamma()) {
+            stream << ushort(0) << ushort(0);
+            stream << toFixedS1516(fun.m_g);
+            return 12 + 4;
+        }
+        bool type3 = qFuzzyIsNull(fun.m_e) && qFuzzyIsNull(fun.m_f);
+        stream << ushort(type3 ? 3 : 4) << ushort(0);
+        stream << toFixedS1516(fun.m_g);
+        stream << toFixedS1516(fun.m_a);
+        stream << toFixedS1516(fun.m_b);
+        stream << toFixedS1516(fun.m_c);
+        stream << toFixedS1516(fun.m_d);
+        if (type3)
+            return 12 + 5 * 4;
+        stream << toFixedS1516(fun.m_e);
+        stream << toFixedS1516(fun.m_f);
+        return 12 + 7 * 4;
+    }
+
+    Q_ASSERT(trc.m_type == QColorTrc::Type::Table);
+    stream << uint(Tag::curv) << uint(0);
+    stream << uint(trc.m_table.m_tableSize);
+    if (!trc.m_table.m_table16.isEmpty()) {
+        for (uint i = 0; i < trc.m_table.m_tableSize; ++i) {
+            stream << ushort(trc.m_table.m_table16[i]);
+        }
+    } else {
+        for (uint i = 0; i < trc.m_table.m_tableSize; ++i) {
+            stream << ushort(trc.m_table.m_table8[i] * 257U);
+        }
+    }
+    return 12 + 2 * trc.m_table.m_tableSize;
+}
+
+QByteArray toIccProfile(const QColorSpace &space)
+{
+    if (!space.isValid())
+        return QByteArray();
+
+    const QColorSpacePrivate *spaceDPtr = QColorSpacePrivate::get(space);
+
+    constexpr int tagCount = 9;
+    constexpr uint profileDataOffset = 128 + 4 + 12 * tagCount;
+    constexpr uint variableTagTableOffsets = 128 + 4 + 12 * 5;
+    uint currentOffset = 0;
+    uint rTrcOffset, gTrcOffset, bTrcOffset;
+    uint rTrcSize, gTrcSize, bTrcSize;
+    uint descOffset, descSize;
+
+    QBuffer buffer;
+    buffer.open(QIODevice::WriteOnly);
+    QDataStream stream(&buffer);
+
+    // Profile header:
+    stream << uint(0); // Size, we will update this later
+    stream << uint(0);
+    stream << uint(0x02400000); // Version 2.4 (note we use 'para' from version 4)
+    stream << uint(ProfileClass::Display);
+    stream << uint(Tag::RGB_);
+    stream << uint(Tag::XYZ_);
+    stream << uint(0) << uint(0) << uint(0);
+    stream << uint(Tag::acsp);
+    stream << uint(0) << uint(0) << uint(0);
+    stream << uint(0) << uint(0) << uint(0);
+    stream << uint(1); // Rendering intent
+    stream << uint(0x0000f6d6); // D50 X
+    stream << uint(0x00010000); // D50 Y
+    stream << uint(0x0000d32d); // D50 Z
+    stream << IccTag('Q','t', QT_VERSION_MAJOR, QT_VERSION_MINOR);
+    stream << uint(0) << uint(0) << uint(0) << uint(0);
+    stream << uint(0) << uint(0) << uint(0) << uint(0) << uint(0) << uint(0) << uint(0);
+
+    // Tag table:
+    stream << uint(tagCount);
+    stream << uint(Tag::rXYZ) << uint(profileDataOffset + 00) << uint(20);
+    stream << uint(Tag::gXYZ) << uint(profileDataOffset + 20) << uint(20);
+    stream << uint(Tag::bXYZ) << uint(profileDataOffset + 40) << uint(20);
+    stream << uint(Tag::wtpt) << uint(profileDataOffset + 60) << uint(20);
+    stream << uint(Tag::cprt) << uint(profileDataOffset + 80) << uint(12);
+    // From here the offset and size will be updated later:
+    stream << uint(Tag::rTRC) << uint(0) << uint(0);
+    stream << uint(Tag::gTRC) << uint(0) << uint(0);
+    stream << uint(Tag::bTRC) << uint(0) << uint(0);
+    stream << uint(Tag::desc) << uint(0) << uint(0);
+    // TODO: consider adding 'chad' tag (required in ICC >=4 when we have non-D50 whitepoint)
+    currentOffset = profileDataOffset;
+
+    // Tag data:
+    stream << uint(Tag::XYZ_) << uint(0);
+    stream << toFixedS1516(spaceDPtr->toXyz.r.x);
+    stream << toFixedS1516(spaceDPtr->toXyz.r.y);
+    stream << toFixedS1516(spaceDPtr->toXyz.r.z);
+    stream << uint(Tag::XYZ_) << uint(0);
+    stream << toFixedS1516(spaceDPtr->toXyz.g.x);
+    stream << toFixedS1516(spaceDPtr->toXyz.g.y);
+    stream << toFixedS1516(spaceDPtr->toXyz.g.z);
+    stream << uint(Tag::XYZ_) << uint(0);
+    stream << toFixedS1516(spaceDPtr->toXyz.b.x);
+    stream << toFixedS1516(spaceDPtr->toXyz.b.y);
+    stream << toFixedS1516(spaceDPtr->toXyz.b.z);
+    stream << uint(Tag::XYZ_) << uint(0);
+    stream << toFixedS1516(spaceDPtr->whitePoint.x);
+    stream << toFixedS1516(spaceDPtr->whitePoint.y);
+    stream << toFixedS1516(spaceDPtr->whitePoint.z);
+    stream << uint(Tag::text) << uint(0);
+    stream << uint(IccTag('N', '/', 'A', '\0'));
+    currentOffset += 92;
+
+    // From now on the data is variable sized:
+    rTrcOffset = currentOffset;
+    rTrcSize = writeColorTrc(stream, spaceDPtr->trc[0]);
+    currentOffset += rTrcSize;
+    if (spaceDPtr->trc[0] == spaceDPtr->trc[1]) {
+        gTrcOffset = rTrcOffset;
+        gTrcSize = rTrcSize;
+    } else {
+        gTrcOffset = currentOffset;
+        gTrcSize = writeColorTrc(stream, spaceDPtr->trc[1]);
+        currentOffset += gTrcSize;
+    }
+    if (spaceDPtr->trc[0] == spaceDPtr->trc[2]) {
+        bTrcOffset = rTrcOffset;
+        bTrcSize = rTrcSize;
+    } else {
+        bTrcOffset = currentOffset;
+        bTrcSize = writeColorTrc(stream, spaceDPtr->trc[2]);
+        currentOffset += bTrcSize;
+    }
+
+    descOffset = currentOffset;
+    QByteArray description = spaceDPtr->description.toUtf8();
+    stream << uint(Tag::desc) << uint(0);
+    stream << uint(description.size() + 1);
+    stream.writeRawData(description.constData(), description.size() + 1);
+    stream << uint(0) << uint(0);
+    stream << ushort(0) << uchar(0);
+    QByteArray macdesc(67, '\0');
+    stream.writeRawData(macdesc.constData(), 67);
+    descSize = 90 + description.size() + 1;
+    currentOffset += descSize;
+
+    buffer.close();
+    QByteArray iccProfile = buffer.buffer();
+    // Now write final size
+    *(quint32_be *)iccProfile.data() = iccProfile.size();
+    // And the final indices and sizes of variable size tags:
+    *(quint32_be *)(iccProfile.data() + variableTagTableOffsets + 4) = rTrcOffset;
+    *(quint32_be *)(iccProfile.data() + variableTagTableOffsets + 8) = rTrcSize;
+    *(quint32_be *)(iccProfile.data() + variableTagTableOffsets + 12 + 4) = gTrcOffset;
+    *(quint32_be *)(iccProfile.data() + variableTagTableOffsets + 12 + 8) = gTrcSize;
+    *(quint32_be *)(iccProfile.data() + variableTagTableOffsets + 2 * 12 + 4) = bTrcOffset;
+    *(quint32_be *)(iccProfile.data() + variableTagTableOffsets + 2 * 12 + 8) = bTrcSize;
+    *(quint32_be *)(iccProfile.data() + variableTagTableOffsets + 3 * 12 + 4) = descOffset;
+    *(quint32_be *)(iccProfile.data() + variableTagTableOffsets + 3 * 12 + 8) = descSize;
+
+#if !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS)
+    const ICCProfileHeader *iccHeader = (const ICCProfileHeader *)iccProfile.constData();
+    Q_ASSERT(qsizetype(iccHeader->profileSize) == qsizetype(iccProfile.size()));
+    Q_ASSERT(isValidIccProfile(*iccHeader));
+#endif
+
+    return iccProfile;
+}
+
+struct TagEntry {
+    quint32 offset;
+    quint32 size;
+};
+
+bool parseXyzData(const QByteArray &data, const TagEntry &tagEntry, QColorVector &colorVector)
+{
+    if (tagEntry.size < sizeof(XYZTagData)) {
+        qCWarning(lcIcc) << "Undersized XYZ tag";
+        return false;
+    }
+    const XYZTagData *xyz = reinterpret_cast<const XYZTagData *>(data.constData() + tagEntry.offset);
+    if (xyz->type != quint32(Tag::XYZ_)) {
+        qCWarning(lcIcc) << "Bad XYZ content type";
+        return false;
+    }
+    const float x = fromFixedS1516(xyz->fixedX);
+    const float y = fromFixedS1516(xyz->fixedY);
+    const float z = fromFixedS1516(xyz->fixedZ);
+
+    colorVector = QColorVector(x, y, z);
+    return true;
+}
+
+bool parseTRC(const QByteArray &data, const TagEntry &tagEntry, QColorTrc &gamma)
+{
+    const GenericTagData *trcData = reinterpret_cast<const GenericTagData *>(data.constData() + tagEntry.offset);
+    if (trcData->type == quint32(Tag::curv)) {
+        const CurvTagData *curv = static_cast<const CurvTagData *>(trcData);
+        if (curv->valueCount > (1 << 16))
+            return false;
+        if (tagEntry.size - 12 < 2 * curv->valueCount)
+            return false;
+        if (curv->valueCount == 0) {
+            gamma.m_type = QColorTrc::Type::Function;
+            gamma.m_fun = QColorTransferFunction(); // Linear
+        } else if (curv->valueCount == 1) {
+            float g = curv->value[0] * (1.0f / 256.0f);
+            gamma.m_type = QColorTrc::Type::Function;
+            gamma.m_fun = QColorTransferFunction::fromGamma(g);
+        } else {
+            QVector<quint16> tabl;
+            tabl.resize(curv->valueCount);
+            for (uint i = 0; i < curv->valueCount; ++i)
+                tabl[i] = curv->value[i];
+            QColorTransferTable table = QColorTransferTable(curv->valueCount, std::move(tabl));
+            QColorTransferFunction curve;
+            if (!table.asColorTransferFunction(&curve)) {
+                gamma.m_type = QColorTrc::Type::Table;
+                gamma.m_table = table;
+            } else {
+                qCDebug(lcIcc) << "Detected curv table as function";
+                gamma.m_type = QColorTrc::Type::Function;
+                gamma.m_fun = curve;
+            }
+        }
+        return true;
+    }
+    if (trcData->type == quint32(Tag::para)) {
+        if (tagEntry.size < sizeof(ParaTagData))
+            return false;
+        const ParaTagData *para = static_cast<const ParaTagData *>(trcData);
+        switch (para->curveType) {
+        case 0: {
+            float g = fromFixedS1516(para->parameter[0]);
+            gamma.m_type = QColorTrc::Type::Function;
+            gamma.m_fun = QColorTransferFunction::fromGamma(g);
+            break;
+        }
+        case 1: {
+            if (tagEntry.size < sizeof(ParaTagData) + 2 * 4)
+                return false;
+            float g = fromFixedS1516(para->parameter[0]);
+            float a = fromFixedS1516(para->parameter[1]);
+            float b = fromFixedS1516(para->parameter[2]);
+            float d = -b / a;
+            gamma.m_type = QColorTrc::Type::Function;
+            gamma.m_fun = QColorTransferFunction(a, b, 0.0f, d, 0.0f, 0.0f, g);
+            break;
+        }
+        case 2: {
+            if (tagEntry.size < sizeof(ParaTagData) + 3 * 4)
+                return false;
+            float g = fromFixedS1516(para->parameter[0]);
+            float a = fromFixedS1516(para->parameter[1]);
+            float b = fromFixedS1516(para->parameter[2]);
+            float c = fromFixedS1516(para->parameter[3]);
+            float d = -b / a;
+            gamma.m_type = QColorTrc::Type::Function;
+            gamma.m_fun = QColorTransferFunction(a, b, 0.0f, d, c, c, g);
+            break;
+        }
+        case 3: {
+            if (tagEntry.size < sizeof(ParaTagData) + 4 * 4)
+                return false;
+            float g = fromFixedS1516(para->parameter[0]);
+            float a = fromFixedS1516(para->parameter[1]);
+            float b = fromFixedS1516(para->parameter[2]);
+            float c = fromFixedS1516(para->parameter[3]);
+            float d = fromFixedS1516(para->parameter[4]);
+            gamma.m_type = QColorTrc::Type::Function;
+            gamma.m_fun = QColorTransferFunction(a, b, c, d, 0.0f, 0.0f, g);
+            break;
+        }
+        case 4: {
+            if (tagEntry.size < sizeof(ParaTagData) + 6 * 4)
+                return false;
+            float g = fromFixedS1516(para->parameter[0]);
+            float a = fromFixedS1516(para->parameter[1]);
+            float b = fromFixedS1516(para->parameter[2]);
+            float c = fromFixedS1516(para->parameter[3]);
+            float d = fromFixedS1516(para->parameter[4]);
+            float e = fromFixedS1516(para->parameter[5]);
+            float f = fromFixedS1516(para->parameter[6]);
+            gamma.m_type = QColorTrc::Type::Function;
+            gamma.m_fun = QColorTransferFunction(a, b, c, d, e, f, g);
+            break;
+        }
+        default:
+            qCWarning(lcIcc)  << "Unknown para type" << uint(para->curveType);
+            return false;
+        }
+        return true;
+    }
+    qCWarning(lcIcc) << "Invalid TRC data type";
+    return false;
+}
+
+bool parseDesc(const QByteArray &data, const TagEntry &tagEntry, QString &descName)
+{
+    const GenericTagData *tag = (const GenericTagData *)(data.constData() + tagEntry.offset);
+
+    // Either 'desc' (ICCv2) or 'mluc' (ICCv4)
+    if (tag->type == quint32(Tag::desc)) {
+        if (tagEntry.size < sizeof(DescTagData))
+            return false;
+        const DescTagData *desc = (const DescTagData *)(data.constData() + tagEntry.offset);
+        const quint32 len = desc->asciiDescriptionLength;
+        if (len < 1)
+            return false;
+        if (tagEntry.size - 12 < len)
+            return false;
+        if (desc->asciiDescription[len - 1] != '\0')
+            return false;
+        descName = QString::fromLatin1(desc->asciiDescription, len - 1);
+        return true;
+    }
+    if (tag->type != quint32(Tag::mluc))
+        return false;
+
+    if (tagEntry.size < sizeof(MlucTagData))
+        return false;
+    const MlucTagData *mluc = (const MlucTagData *)(data.constData() + tagEntry.offset);
+    if (mluc->recordCount < 1)
+        return false;
+    if (mluc->recordSize < 12)
+        return false;
+    // We just use the primary record regardless of language or country.
+    const quint32 stringOffset = mluc->records[0].offset;
+    const quint32 stringSize = mluc->records[0].size;
+    if (tagEntry.size < stringOffset || tagEntry.size - stringOffset < stringSize )
+        return false;
+    if ((stringSize | stringOffset) & 1)
+        return false;
+    quint32 stringLen = stringSize / 2;
+    const ushort *unicodeString = (const ushort *)(data.constData() + tagEntry.offset + stringOffset);
+    // The given length shouldn't include 0-termination, but might.
+    if (stringLen > 1 && unicodeString[stringLen - 1] == 0)
+        --stringLen;
+    QVarLengthArray<quint16> utf16hostendian(stringLen);
+    qFromBigEndian<ushort>(unicodeString, stringLen, utf16hostendian.data());
+    descName = QString::fromUtf16(utf16hostendian.data(), stringLen);
+    return true;
+}
+
+bool fromIccProfile(const QByteArray &data, QColorSpace *colorSpace)
+{
+    if (data.size() < qsizetype(sizeof(ICCProfileHeader))) {
+        qCWarning(lcIcc) << "fromIccProfile: failed size sanity 1";
+        return false;
+    }
+    const ICCProfileHeader *header = (const ICCProfileHeader *)data.constData();
+    if (!isValidIccProfile(*header)) {
+        qCWarning(lcIcc) << "fromIccProfile: failed general sanity check";
+        return false;
+    }
+    if (qsizetype(header->profileSize) > data.size()) {
+        qCWarning(lcIcc) << "fromIccProfile: failed size sanity 2";
+        return false;
+    }
+
+    // Read tag index
+    const TagTableEntry *tagTable = (const TagTableEntry *)(data.constData() + sizeof(ICCProfileHeader));
+    const qsizetype offsetToData = sizeof(ICCProfileHeader) + header->tagCount * sizeof(TagTableEntry);
+    if (offsetToData > data.size()) {
+        qCWarning(lcIcc) << "fromIccProfile: failed index size sanity";
+        return false;
+    }
+
+    QHash<Tag, TagEntry> tagIndex;
+    for (uint i = 0; i < header->tagCount; ++i) {
+        // Sanity check tag sizes and offsets:
+        if (qsizetype(tagTable[i].offset) < offsetToData) {
+            qCWarning(lcIcc) << "fromIccProfile: failed tag offset sanity 1";
+            return false;
+        }
+        // Checked separately from (+ size) to handle overflow.
+        if (tagTable[i].offset > header->profileSize) {
+            qCWarning(lcIcc) << "fromIccProfile: failed tag offset sanity 2";
+            return false;
+        }
+        if (tagTable[i].size < 12) {
+            qCWarning(lcIcc) << "fromIccProfile: failed minimal tag size sanity";
+            return false;
+        }
+        if (tagTable[i].size > header->profileSize - tagTable[i].offset) {
+            qCWarning(lcIcc) << "fromIccProfile: failed tag offset + size sanity";
+            return false;
+        }
+        if (tagTable[i].offset & 0x03) {
+            qCWarning(lcIcc) << "fromIccProfile: invalid tag offset alignment";
+            return false;
+        }
+//        printf("'%4s' %d %d\n", (const char *)&tagTable[i].signature,
+//                                quint32(tagTable[i].offset),
+//                                quint32(tagTable[i].size));
+        tagIndex.insert(Tag(quint32(tagTable[i].signature)), { tagTable[i].offset, tagTable[i].size });
+    }
+
+    // Check the profile is three-component matrix based (what we currently support):
+    if (!tagIndex.contains(Tag::rXYZ) || !tagIndex.contains(Tag::gXYZ) || !tagIndex.contains(Tag::bXYZ) ||
+        !tagIndex.contains(Tag::rTRC) || !tagIndex.contains(Tag::gTRC) || !tagIndex.contains(Tag::bTRC) ||
+        !tagIndex.contains(Tag::wtpt)) {
+        qCWarning(lcIcc) << "fromIccProfile: Unsupported ICC profile - not three component matrix based";
+        return false;
+    }
+
+    QColorSpacePrivate *colorspaceDPtr = QColorSpacePrivate::getWritable(*colorSpace);
+
+    // Parse XYZ tags
+    if (!parseXyzData(data, tagIndex[Tag::rXYZ], colorspaceDPtr->toXyz.r))
+        return false;
+    if (!parseXyzData(data, tagIndex[Tag::gXYZ], colorspaceDPtr->toXyz.g))
+        return false;
+    if (!parseXyzData(data, tagIndex[Tag::bXYZ], colorspaceDPtr->toXyz.b))
+        return false;
+    if (!parseXyzData(data, tagIndex[Tag::wtpt], colorspaceDPtr->whitePoint))
+        return false;
+
+    colorspaceDPtr->primaries = QColorSpace::Primaries::Custom;
+    if (colorspaceDPtr->toXyz == QColorMatrix::toXyzFromSRgb()) {
+        qCDebug(lcIcc) << "fromIccProfile: sRGB primaries detected";
+        colorspaceDPtr->primaries = QColorSpace::Primaries::SRgb;
+    } else if (colorspaceDPtr->toXyz == QColorMatrix::toXyzFromAdobeRgb()) {
+        qCDebug(lcIcc) << "fromIccProfile: Adobe RGB primaries detected";
+        colorspaceDPtr->primaries = QColorSpace::Primaries::AdobeRgb;
+    } else if (colorspaceDPtr->toXyz == QColorMatrix::toXyzFromDciP3D65()) {
+        qCDebug(lcIcc) << "fromIccProfile: DCI-P3 D65 primaries detected";
+        colorspaceDPtr->primaries = QColorSpace::Primaries::DciP3D65;
+    }
+    if (colorspaceDPtr->toXyz == QColorMatrix::toXyzFromProPhotoRgb()) {
+        qCDebug(lcIcc) << "fromIccProfile: ProPhoto RGB primaries detected";
+        colorspaceDPtr->primaries = QColorSpace::Primaries::ProPhotoRgb;
+    }
+    // Reset the matrix to our canonical values:
+    if (colorspaceDPtr->primaries != QColorSpace::Primaries::Custom)
+        colorspaceDPtr->setToXyzMatrix();
+
+    // Parse TRC tags
+    TagEntry rTrc;
+    TagEntry gTrc;
+    TagEntry bTrc;
+    if (tagIndex.contains(Tag::aarg) && tagIndex.contains(Tag::aagg) && tagIndex.contains(Tag::aabg)) {
+        // Apple extension for parametric version of TRCs in ICCv2:
+        rTrc = tagIndex[Tag::aarg];
+        gTrc = tagIndex[Tag::aagg];
+        bTrc = tagIndex[Tag::aabg];
+    } else {
+        rTrc = tagIndex[Tag::rTRC];
+        gTrc = tagIndex[Tag::gTRC];
+        bTrc = tagIndex[Tag::bTRC];
+    }
+
+    QColorTrc rCurve;
+    QColorTrc gCurve;
+    QColorTrc bCurve;
+    if (!parseTRC(data, rTrc, rCurve)) {
+        qCWarning(lcIcc) << "fromIccProfile: Invalid rTRC";
+        return false;
+    }
+    if (!parseTRC(data, gTrc, gCurve)) {
+        qCWarning(lcIcc) << "fromIccProfile: Invalid gTRC";
+        return false;
+    }
+    if (!parseTRC(data, bTrc, bCurve)) {
+        qCWarning(lcIcc) << "fromIccProfile: Invalid bTRC";
+        return false;
+    }
+    if (rCurve == gCurve && gCurve == bCurve && rCurve.m_type == QColorTrc::Type::Function) {
+        if (rCurve.m_fun.isLinear()) {
+            qCDebug(lcIcc) << "fromIccProfile: Linear gamma detected";
+            colorspaceDPtr->trc[0] = QColorTransferFunction();
+            colorspaceDPtr->transferFunction = QColorSpace::TransferFunction::Linear;
+            colorspaceDPtr->gamma = 1.0f;
+        } else if (rCurve.m_fun.isGamma()) {
+            qCDebug(lcIcc) << "fromIccProfile: Simple gamma detected";
+            colorspaceDPtr->trc[0] = QColorTransferFunction::fromGamma(rCurve.m_fun.m_g);
+            colorspaceDPtr->transferFunction = QColorSpace::TransferFunction::Gamma;
+            colorspaceDPtr->gamma = rCurve.m_fun.m_g;
+        } else if (rCurve.m_fun.isSRgb()) {
+            qCDebug(lcIcc) << "fromIccProfile: sRGB gamma detected";
+            colorspaceDPtr->trc[0] = QColorTransferFunction::fromSRgb();
+            colorspaceDPtr->transferFunction = QColorSpace::TransferFunction::SRgb;
+        } else {
+            colorspaceDPtr->trc[0] = rCurve;
+            colorspaceDPtr->transferFunction = QColorSpace::TransferFunction::Custom;
+        }
+
+        colorspaceDPtr->trc[1] = colorspaceDPtr->trc[0];
+        colorspaceDPtr->trc[2] = colorspaceDPtr->trc[0];
+    } else {
+        colorspaceDPtr->trc[0] = rCurve;
+        colorspaceDPtr->trc[1] = gCurve;
+        colorspaceDPtr->trc[2] = bCurve;
+        colorspaceDPtr->transferFunction = QColorSpace::TransferFunction::Custom;
+    }
+
+    if (tagIndex.contains(Tag::desc)) {
+        if (!parseDesc(data, tagIndex[Tag::desc], colorspaceDPtr->description))
+            qCWarning(lcIcc) << "fromIccProfile: Failed to parse description";
+        else
+            qCDebug(lcIcc) << "fromIccProfile: Description" << colorspaceDPtr->description;
+    }
+
+    colorspaceDPtr->identifyColorSpace();
+    if (colorspaceDPtr->namedColorSpace)
+        qCDebug(lcIcc) << "fromIccProfile: Named colorspace detected: " << QColorSpace::NamedColorSpace(colorspaceDPtr->namedColorSpace);
+
+    colorspaceDPtr->iccProfile = data;
+
+    return true;
+}
+
+} // namespace QIcc
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/mirclient/qmirclientdebugextension.h b/src/gui/painting/qicc_p.h
index 0596561d77..2a4658b84b 100644
--- a/src/plugins/platforms/mirclient/qmirclientdebugextension.h
+++ b/src/gui/painting/qicc_p.h
@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Canonical, Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,27 +37,34 @@
 **
 ****************************************************************************/
 
+#ifndef QICC_P_H
+#define QICC_P_H
 
-#ifndef QMIRCLIENTDEBUGEXTENSION_H
-#define QMIRCLIENTDEBUGEXTENSION_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
-#include <QPoint>
-#include <QLibrary>
-struct MirSurface;
+#include <QtCore/qbytearray.h>
+#include <QtGui/qtguiglobal.h>
 
-typedef bool (*MapperPrototype)(MirSurface* surface, int x, int y, int* screenX, int* screenY);
+QT_BEGIN_NAMESPACE
 
+class QColorSpace;
 
-class QMirClientDebugExtension
-{
-public:
-    QMirClientDebugExtension();
+namespace QIcc {
 
-    QPoint mapSurfacePointToScreen(MirSurface *, const QPoint &point);
+bool fromIccProfile(const QByteArray &data, QColorSpace *colorSpace);
+QByteArray toIccProfile(const QColorSpace &space);
 
-private:
-    QLibrary m_mirclientDebug;
-    MapperPrototype m_mapper;
-};
+}
 
-#endif // QMIRCLIENTDEBUGEXTENSION_H
+QT_END_NAMESPACE
+
+#endif // QICC_P_H
diff --git a/src/gui/painting/qimagescale.cpp b/src/gui/painting/qimagescale.cpp
index 8a5274bd37..0d7205b483 100644
--- a/src/gui/painting/qimagescale.cpp
+++ b/src/gui/painting/qimagescale.cpp
@@ -528,6 +528,7 @@ static void qt_qimageScaleAARGBA_down_xy(QImageScaleInfo *isi, unsigned int *des
     }
 }
 
+#if QT_CONFIG(raster_64bit)
 static void qt_qimageScaleRgba64_up_x_down_y(QImageScaleInfo *isi, QRgba64 *dest,
                                              int dw, int dh, int dow, int sow);
 
@@ -728,6 +729,7 @@ static void qt_qimageScaleRgba64_down_xy(QImageScaleInfo *isi, QRgba64 *dest,
         }
     }
 }
+#endif
 
 static void qt_qimageScaleAARGB_up_x_down_y(QImageScaleInfo *isi, unsigned int *dest,
                                             int dw, int dh, int dow, int sow);
@@ -945,10 +947,13 @@ QImage qSmoothScaleImage(const QImage &src, int dw, int dh)
         return QImage();
     }
 
+#if QT_CONFIG(raster_64bit)
     if (src.depth() > 32)
         qt_qimageScaleRgba64(scaleinfo, (QRgba64 *)buffer.scanLine(0),
                              dw, dh, dw, src.bytesPerLine() / 8);
-    else if (src.hasAlphaChannel())
+    else
+#endif
+    if (src.hasAlphaChannel())
         qt_qimageScaleAARGBA(scaleinfo, (unsigned int *)buffer.scanLine(0),
                              dw, dh, dw, src.bytesPerLine() / 4);
     else
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 24b33243da..b1f01332b6 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -248,7 +248,7 @@ QMatrix::QMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy)
 /*!
      Constructs a matrix that is a copy of the given \a matrix.
  */
-QMatrix::QMatrix(const QMatrix &matrix) Q_DECL_NOTHROW
+QMatrix::QMatrix(const QMatrix &matrix) noexcept
     : _m11(matrix._m11)
     , _m12(matrix._m12)
     , _m21(matrix._m21)
@@ -989,7 +989,7 @@ bool QMatrix::operator==(const QMatrix &m) const
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
 */
-uint qHash(const QMatrix &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QMatrix &key, uint seed) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.m11());
@@ -1068,7 +1068,7 @@ QMatrix QMatrix::operator *(const QMatrix &m) const
 /*!
     Assigns the given \a matrix's values to this matrix.
 */
-QMatrix &QMatrix::operator=(const QMatrix &matrix) Q_DECL_NOTHROW
+QMatrix &QMatrix::operator=(const QMatrix &matrix) noexcept
 {
     _m11 = matrix._m11;
     _m12 = matrix._m12;
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index d8a4fcfb1c..a167260ade 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -64,12 +64,12 @@ public:
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     // ### Qt 6: remove; the compiler-generated ones are fine!
-    QMatrix &operator=(QMatrix &&other) Q_DECL_NOTHROW // = default
+    QMatrix &operator=(QMatrix &&other) noexcept // = default
     { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(QMatrix)); return *this; }
-    QMatrix &operator=(const QMatrix &) Q_DECL_NOTHROW; // = default
-    QMatrix(QMatrix &&other) Q_DECL_NOTHROW // = default
+    QMatrix &operator=(const QMatrix &) noexcept; // = default
+    QMatrix(QMatrix &&other) noexcept // = default
     { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(QMatrix)); }
-    QMatrix(const QMatrix &other) Q_DECL_NOTHROW; // = default
+    QMatrix(const QMatrix &other) noexcept; // = default
 #endif
 
     void setMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
@@ -140,7 +140,7 @@ private:
 };
 Q_DECLARE_TYPEINFO(QMatrix, Q_MOVABLE_TYPE);
 
-Q_GUI_EXPORT Q_DECL_CONST_FUNCTION uint qHash(const QMatrix &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_GUI_EXPORT Q_DECL_CONST_FUNCTION uint qHash(const QMatrix &key, uint seed = 0) noexcept;
 
 // mathematical semantics
 inline QPoint operator*(const QPoint &p, const QMatrix &m)
diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp
index b2d02182c3..2074f98069 100644
--- a/src/gui/painting/qoutlinemapper.cpp
+++ b/src/gui/painting/qoutlinemapper.cpp
@@ -42,6 +42,7 @@
 #include "qbezier_p.h"
 #include "qmath.h"
 #include "qpainterpath_p.h"
+#include "qscopedvaluerollback.h"
 
 #include <stdlib.h>
 
@@ -354,7 +355,7 @@ void QOutlineMapper::clipElements(const QPointF *elements,
     // instead of going through convenience functionallity, but since
     // this part of code hardly every used, it shouldn't matter.
 
-    m_in_clip_elements = true;
+    QScopedValueRollback<bool> in_clip_elements(m_in_clip_elements, true);
 
     QPainterPath path;
 
@@ -397,8 +398,6 @@ void QOutlineMapper::clipElements(const QPointF *elements,
         convertPath(clippedPath);
         m_transform = oldTransform;
     }
-
-    m_in_clip_elements = false;
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h
index 71999fbdee..04a68797c2 100644
--- a/src/gui/painting/qoutlinemapper_p.h
+++ b/src/gui/painting/qoutlinemapper_p.h
@@ -180,13 +180,13 @@ public:
     QT_FT_Outline *outline() {
         if (m_valid)
             return &m_outline;
-        return 0;
+        return nullptr;
     }
 
     QT_FT_Outline *convertPath(const QPainterPath &path);
     QT_FT_Outline *convertPath(const QVectorPath &path);
 
-    inline QPainterPath::ElementType *elementTypes() const { return m_element_types.size() == 0 ? 0 : m_element_types.data(); }
+    inline QPainterPath::ElementType *elementTypes() const { return m_element_types.size() == 0 ? nullptr : m_element_types.data(); }
 
 public:
     QDataBuffer<QPainterPath::ElementType> m_element_types;
diff --git a/src/gui/painting/qpagedpaintdevice.cpp b/src/gui/painting/qpagedpaintdevice.cpp
index 0c2123f9a6..3fdd0206b7 100644
--- a/src/gui/painting/qpagedpaintdevice.cpp
+++ b/src/gui/painting/qpagedpaintdevice.cpp
@@ -42,6 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
+// ### Qt 6: remove when the deprecated constructor is removed
 class QDummyPagedPaintDevicePrivate : public QPagedPaintDevicePrivate
 {
     bool setPageLayout(const QPageLayout &newPageLayout) override
diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h
index 1c37c17fa3..21e23e0eb4 100644
--- a/src/gui/painting/qpagedpaintdevice.h
+++ b/src/gui/painting/qpagedpaintdevice.h
@@ -213,6 +213,7 @@ public:
         Envelope10 = Comm10E
     };
 
+    // keep in sync with QPdfEngine::PdfVersion!
     enum PdfVersion { PdfVersion_1_4, PdfVersion_A1b, PdfVersion_1_6 };
 
     // ### Qt6 Make these virtual
diff --git a/src/gui/painting/qpagelayout.h b/src/gui/painting/qpagelayout.h
index b41689d33b..7ee0ce7a76 100644
--- a/src/gui/painting/qpagelayout.h
+++ b/src/gui/painting/qpagelayout.h
@@ -82,13 +82,11 @@ public:
                 const QMarginsF &margins, Unit units = Point,
                 const QMarginsF &minMargins = QMarginsF(0, 0, 0, 0));
     QPageLayout(const QPageLayout &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QPageLayout &operator=(QPageLayout &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QPageLayout &operator=(QPageLayout &&other) noexcept { swap(other); return *this; }
     QPageLayout &operator=(const QPageLayout &other);
     ~QPageLayout();
 
-    void swap(QPageLayout &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QPageLayout &other) noexcept { qSwap(d, other.d); }
 
     friend Q_GUI_EXPORT bool operator==(const QPageLayout &lhs, const QPageLayout &rhs);
     bool isEquivalentTo(const QPageLayout &other) const;
diff --git a/src/gui/painting/qpagesize.cpp b/src/gui/painting/qpagesize.cpp
index a1c9f6e417..c98ca8a1fb 100644
--- a/src/gui/painting/qpagesize.cpp
+++ b/src/gui/painting/qpagesize.cpp
@@ -222,8 +222,6 @@ static const int qt_windowsConversion[][2] = {
     {DMPAPER_PENV_10_ROTATED,               DMPAPER_PENV_10}  // Is = DMPAPER_LAST, use as loop terminator
 };
 
-static const int windowsConversionCount = int(sizeof(qt_windowsConversion) / sizeof(qt_windowsConversion[0]));
-
 // Standard sizes data
 struct StandardPageSize {
     QPageSize::PageSizeId id;
@@ -423,9 +421,9 @@ static QPageSize::PageSizeId qt_idForWindowsID(int windowsId, QSize *match = 0)
     if (windowsId <= DMPAPER_NONE || windowsId > DMPAPER_LAST)
         return QPageSize::Custom;
     // Check if one of the unsupported values, convert to valid value if is
-    for (int i = 0; i < windowsConversionCount; ++i) {
-        if (qt_windowsConversion[i][0] == windowsId) {
-            windowsId = qt_windowsConversion[i][1];
+    for (const auto &it : qt_windowsConversion) {
+        if (it[0] == windowsId) {
+            windowsId = it[1];
             break;
         }
     }
diff --git a/src/gui/painting/qpagesize.h b/src/gui/painting/qpagesize.h
index 82054824b4..133274760f 100644
--- a/src/gui/painting/qpagesize.h
+++ b/src/gui/painting/qpagesize.h
@@ -236,14 +236,12 @@ public:
                        const QString &name = QString(),
                        SizeMatchPolicy matchPolicy = FuzzyMatch);
     QPageSize(const QPageSize &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QPageSize &operator=(QPageSize &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QPageSize &operator=(QPageSize &&other) noexcept { swap(other); return *this; }
     QPageSize &operator=(const QPageSize &other);
     ~QPageSize();
 
 
-    void swap(QPageSize &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QPageSize &other) noexcept { qSwap(d, other.d); }
 
     friend Q_GUI_EXPORT bool operator==(const QPageSize &lhs, const QPageSize &rhs);
     bool isEquivalentTo(const QPageSize &other) const;
diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp
index faaa316085..0ddfba6ee9 100644
--- a/src/gui/painting/qpaintdevice.cpp
+++ b/src/gui/painting/qpaintdevice.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QPaintDevice::QPaintDevice() Q_DECL_NOEXCEPT
+QPaintDevice::QPaintDevice() noexcept
 {
     reserved = 0;
     painters = 0;
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h
index 9458b4ba9a..5f8dad205d 100644
--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
@@ -90,7 +90,7 @@ public:
 
     static inline qreal devicePixelRatioFScale() { return 0x10000; }
 protected:
-    QPaintDevice() Q_DECL_NOEXCEPT;
+    QPaintDevice() noexcept;
     virtual int metric(PaintDeviceMetric metric) const;
     virtual void initPainter(QPainter *painter) const;
     virtual QPaintDevice *redirected(QPoint *offset) const;
diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
index 8ac3fcff5c..40b9474165 100644
--- a/src/gui/painting/qpaintengine_p.h
+++ b/src/gui/painting/qpaintengine_p.h
@@ -65,7 +65,7 @@ class Q_GUI_EXPORT QPaintEnginePrivate
 {
     Q_DECLARE_PUBLIC(QPaintEngine)
 public:
-    QPaintEnginePrivate() : pdev(0), q_ptr(0), currentClipDevice(0), hasSystemTransform(0),
+    QPaintEnginePrivate() : pdev(nullptr), q_ptr(nullptr), currentClipDevice(nullptr), hasSystemTransform(0),
                             hasSystemViewport(0) {}
     virtual ~QPaintEnginePrivate();
 
@@ -138,8 +138,8 @@ public:
 
     static QPaintEnginePrivate *get(QPaintEngine *paintEngine) { return paintEngine->d_func(); }
 
-    virtual QPaintEngine *aggregateEngine() { return 0; }
-    virtual Qt::HANDLE nativeHandle() { return 0; }
+    virtual QPaintEngine *aggregateEngine() { return nullptr; }
+    virtual Qt::HANDLE nativeHandle() { return nullptr; }
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 5bdf3299c9..40c822076b 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -555,35 +555,6 @@ bool QRasterPaintEngine::end()
 /*!
     \internal
 */
-void QRasterPaintEngine::releaseBuffer()
-{
-    Q_D(QRasterPaintEngine);
-    d->rasterBuffer.reset(new QRasterBuffer);
-}
-
-/*!
-    \internal
-*/
-QSize QRasterPaintEngine::size() const
-{
-    Q_D(const QRasterPaintEngine);
-    return QSize(d->rasterBuffer->width(), d->rasterBuffer->height());
-}
-
-/*!
-    \internal
-*/
-#ifndef QT_NO_DEBUG
-void QRasterPaintEngine::saveBuffer(const QString &s) const
-{
-    Q_D(const QRasterPaintEngine);
-    d->rasterBuffer->bufferImage().save(s, "PNG");
-}
-#endif
-
-/*!
-    \internal
-*/
 void QRasterPaintEngine::updateMatrix(const QTransform &matrix)
 {
     QRasterPaintEngineState *s = state();
@@ -871,8 +842,8 @@ void QRasterPaintEngine::updateRasterState()
         const QPainter::CompositionMode mode = s->composition_mode;
         s->flags.fast_text = (s->penData.type == QSpanData::Solid)
                        && s->intOpacity == 256
-                       && (mode == QPainter::CompositionMode_Source
-                           || (mode == QPainter::CompositionMode_SourceOver
+                       && (mode == QPainter::CompositionMode_SourceOver
+                           || (mode == QPainter::CompositionMode_Source
                                && s->penData.solidColor.isOpaque()));
     }
 
@@ -927,13 +898,20 @@ void QRasterPaintEngine::renderHintsChanged()
     QRasterPaintEngineState *s = state();
 
 #ifdef QT_DEBUG_DRAW
-    qDebug() << "QRasterPaintEngine::renderHintsChanged()" << hex << s->renderHints;
+    qDebug() << "QRasterPaintEngine::renderHintsChanged()" << Qt::hex << s->renderHints;
 #endif
 
     bool was_aa = s->flags.antialiased;
     bool was_bilinear = s->flags.bilinear;
 
-    s->flags.antialiased = bool(s->renderHints & (QPainter::Antialiasing | QPainter::HighQualityAntialiasing));
+    s->flags.antialiased = bool(s->renderHints & QPainter::Antialiasing);
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+    if (s->renderHints & QPainter::HighQualityAntialiasing)
+        s->flags.antialiased = true;
+QT_WARNING_POP
+#endif
     s->flags.bilinear = bool(s->renderHints & QPainter::SmoothPixmapTransform);
     s->flags.legacy_rounding = !bool(s->renderHints & QPainter::Antialiasing) && bool(s->renderHints & QPainter::Qt4CompatiblePainting);
 
@@ -1341,7 +1319,7 @@ void QRasterPaintEngine::clip(const QRect &rect, Qt::ClipOperation op)
         QPaintEngineEx::clip(rect, op);
         return;
 
-    } else if (!setClipRectInDeviceCoords(s->matrix.mapRect(rect), op)) {
+    } else if (!setClipRectInDeviceCoords(s->matrix.mapRect(QRectF(rect)).toRect(), op)) {
         QPaintEngineEx::clip(rect, op);
         return;
     }
@@ -1774,7 +1752,7 @@ void QRasterPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
     QRectF rf = path.controlPointRect();
     qDebug() << "QRasterPaintEngine::fill(): "
              << "size=" << path.elementCount()
-             << ", hints=" << hex << path.hints()
+             << ", hints=" << Qt::hex << path.hints()
              << rf << brush;
 #endif
 
@@ -2239,7 +2217,7 @@ void QRasterPaintEngine::drawImage(const QPointF &p, const QImage &img)
         const QClipData *clip = d->clip();
         QPointF pt(p.x() + s->matrix.dx(), p.y() + s->matrix.dy());
 
-        if (d->canUseImageBlitting(d->rasterBuffer->compositionMode, img)) {
+        if (d->canUseImageBlitting(d->rasterBuffer->compositionMode, img, pt, img.rect())) {
             if (!clip) {
                 d->blitImage(pt, img, d->deviceRect);
                 return;
@@ -2310,7 +2288,12 @@ namespace {
         return NoRotation;
     }
 
-    inline bool isPixelAligned(const QRectF &rect) {
+    inline bool isPixelAligned(const QPointF &pt)
+    {
+        return QPointF(pt.toPoint()) == pt;
+    }
+    inline bool isPixelAligned(const QRectF &rect)
+    {
         return QRectF(rect.toRect()) == rect;
     }
 }
@@ -2378,17 +2361,12 @@ void QRasterPaintEngine::drawImage(const QRectF &r, const QImage &img, const QRe
 
     const QClipData *clip = d->clip();
 
-    if (s->matrix.type() > QTransform::TxTranslate
+    if (s->matrix.type() == QTransform::TxRotate
         && !stretch_sr
         && (!clip || clip->hasRectClip)
         && s->intOpacity == 256
         && (d->rasterBuffer->compositionMode == QPainter::CompositionMode_SourceOver
-            || d->rasterBuffer->compositionMode == QPainter::CompositionMode_Source)
-        && d->rasterBuffer->format == img.format()
-        && (d->rasterBuffer->format == QImage::Format_RGB16
-            || d->rasterBuffer->format == QImage::Format_RGB32
-            || (d->rasterBuffer->format == QImage::Format_ARGB32_Premultiplied
-                && d->rasterBuffer->compositionMode == QPainter::CompositionMode_Source)))
+            || d->rasterBuffer->compositionMode == QPainter::CompositionMode_Source))
     {
         RotationType rotationType = qRotationType(s->matrix);
         const QPixelLayout::BPP plBpp = qPixelLayouts[d->rasterBuffer->format].bpp;
@@ -2396,9 +2374,7 @@ void QRasterPaintEngine::drawImage(const QRectF &r, const QImage &img, const QRe
         if (rotationType != NoRotation && qMemRotateFunctions[plBpp][rotationType] && img.rect().contains(sr.toAlignedRect())) {
             QRectF transformedTargetRect = s->matrix.mapRect(r);
 
-            if ((!(s->renderHints & QPainter::SmoothPixmapTransform) && !(s->renderHints & QPainter::Antialiasing))
-                || (isPixelAligned(transformedTargetRect) && isPixelAligned(sr)))
-            {
+            if (d->canUseImageBlitting(d->rasterBuffer->compositionMode, img, transformedTargetRect.topRight(), sr)) {
                 QRect clippedTransformedTargetRect = transformedTargetRect.toRect().intersected(clip ? clip->clipRect : d->deviceRect);
                 if (clippedTransformedTargetRect.isNull())
                     return;
@@ -2532,8 +2508,8 @@ void QRasterPaintEngine::drawImage(const QRectF &r, const QImage &img, const QRe
         fillPath(path, &d->image_filler_xform);
         s->matrix = m;
     } else {
-        if (d->canUseImageBlitting(d->rasterBuffer->compositionMode, img)) {
-            QPointF pt(r.x() + s->matrix.dx(), r.y() + s->matrix.dy());
+        QPointF pt(r.x() + s->matrix.dx(), r.y() + s->matrix.dy());
+        if (d->canUseImageBlitting(d->rasterBuffer->compositionMode, img, pt, sr)) {
             if (!clip) {
                 d->blitImage(pt, img, d->deviceRect, sr.toRect());
                 return;
@@ -2544,7 +2520,6 @@ void QRasterPaintEngine::drawImage(const QRectF &r, const QImage &img, const QRe
         } else if (d->canUseFastImageBlending(d->rasterBuffer->compositionMode, img)) {
             SrcOverBlendFunc func = qBlendFunctions[d->rasterBuffer->format][img.format()];
             if (func) {
-                QPointF pt(r.x() + s->matrix.dx(), r.y() + s->matrix.dy());
                 if (!clip) {
                     d->drawImage(pt, img, func, d->deviceRect, s->intOpacity, sr.toRect());
                     return;
@@ -3779,12 +3754,22 @@ bool QRasterPaintEnginePrivate::canUseFastImageBlending(QPainter::CompositionMod
                    && !image.hasAlphaChannel()));
 }
 
-bool QRasterPaintEnginePrivate::canUseImageBlitting(QPainter::CompositionMode mode, const QImage &image) const
+bool QRasterPaintEnginePrivate::canUseImageBlitting(QPainter::CompositionMode mode, const QImage &image, const QPointF &pt, const QRectF &sr) const
 {
     Q_Q(const QRasterPaintEngine);
+
+    if (!(mode == QPainter::CompositionMode_Source
+          || (mode == QPainter::CompositionMode_SourceOver
+              && !image.hasAlphaChannel())))
+        return false;
+
     const QRasterPaintEngineState *s = q->state();
+    Q_ASSERT(s->matrix.type() <= QTransform::TxTranslate || s->matrix.type() == QTransform::TxRotate);
 
-    if (!s->flags.fast_images || s->intOpacity != 256 || qt_depthForFormat(rasterBuffer->format) < 8)
+    if (s->intOpacity != 256
+        || image.depth() < 8
+        || ((s->renderHints & (QPainter::SmoothPixmapTransform | QPainter::Antialiasing))
+            && (!isPixelAligned(pt) || !isPixelAligned(sr))))
         return false;
 
     QImage::Format dFormat = rasterBuffer->format;
@@ -3792,18 +3777,13 @@ bool QRasterPaintEnginePrivate::canUseImageBlitting(QPainter::CompositionMode mo
     // Formats must match or source format must be a subset of destination format
     if (dFormat != sFormat && image.pixelFormat().alphaUsage() == QPixelFormat::IgnoresAlpha) {
         if ((sFormat == QImage::Format_RGB32 && dFormat == QImage::Format_ARGB32)
-            || (sFormat == QImage::Format_RGBX8888 && dFormat == QImage::Format_RGBA8888))
+            || (sFormat == QImage::Format_RGBX8888 && dFormat == QImage::Format_RGBA8888)
+            || (sFormat == QImage::Format_RGBX64 && dFormat == QImage::Format_RGBA64))
             sFormat = dFormat;
         else
             sFormat = qt_maybeAlphaVersionWithSameDepth(sFormat); // this returns premul formats
     }
-    if (dFormat != sFormat)
-        return false;
-
-    return s->matrix.type() <= QTransform::TxTranslate
-           && (mode == QPainter::CompositionMode_Source
-               || (mode == QPainter::CompositionMode_SourceOver
-                   && !image.hasAlphaChannel()));
+    return (dFormat == sFormat);
 }
 
 QImage QRasterBuffer::colorizeBitmap(const QImage &image, const QColor &color)
@@ -3860,11 +3840,6 @@ QImage::Format QRasterBuffer::prepare(QImage *image)
     return format;
 }
 
-void QRasterBuffer::resetBuffer(int val)
-{
-    memset(m_buffer, val, m_height*bytes_per_line);
-}
-
 QClipData::QClipData(int height)
 {
     clipSpanHeight = height;
@@ -4291,55 +4266,13 @@ static void qt_span_clip(int count, const QSpan *spans, void *userData)
     }
 }
 
-#ifndef QT_NO_DEBUG
-QImage QRasterBuffer::bufferImage() const
-{
-    QImage image(m_width, m_height, QImage::Format_ARGB32_Premultiplied);
-
-    for (int y = 0; y < m_height; ++y) {
-        uint *span = (uint *)const_cast<QRasterBuffer *>(this)->scanLine(y);
-
-        for (int x=0; x<m_width; ++x) {
-            uint argb = span[x];
-            image.setPixel(x, y, argb);
-        }
-    }
-    return image;
-}
-#endif
-
-
-void QRasterBuffer::flushToARGBImage(QImage *target) const
-{
-    int w = qMin(m_width, target->width());
-    int h = qMin(m_height, target->height());
-
-    for (int y=0; y<h; ++y) {
-        uint *sourceLine = (uint *)const_cast<QRasterBuffer *>(this)->scanLine(y);
-        QRgb *dest = (QRgb *) target->scanLine(y);
-        for (int x=0; x<w; ++x) {
-            QRgb pixel = sourceLine[x];
-            int alpha = qAlpha(pixel);
-            if (!alpha) {
-                dest[x] = 0;
-            } else {
-                dest[x] = (alpha << 24)
-                        | ((255*qRed(pixel)/alpha) << 16)
-                        | ((255*qGreen(pixel)/alpha) << 8)
-                        | ((255*qBlue(pixel)/alpha) << 0);
-            }
-        }
-    }
-}
-
-
 class QGradientCache
 {
 public:
     struct CacheInfo : QSpanData::Pinnable
     {
         inline CacheInfo(QGradientStops s, int op, QGradient::InterpolationMode mode) :
-            stops(qMove(s)), opacity(op), interpolationMode(mode) {}
+            stops(std::move(s)), opacity(op), interpolationMode(mode) {}
         QRgba64 buffer64[GRADIENT_STOPTABLE_SIZE];
         QRgb buffer32[GRADIENT_STOPTABLE_SIZE];
         QGradientStops stops;
@@ -4382,7 +4315,7 @@ protected:
     QSharedPointer<const CacheInfo> addCacheElement(quint64 hash_val, const QGradient &gradient, int opacity) {
         if (cache.size() == maxCacheSize()) {
             // may remove more than 1, but OK
-            cache.erase(cache.begin() + QRandomGenerator::global()->bounded(maxCacheSize()));
+            cache.erase(std::next(cache.begin(), QRandomGenerator::global()->bounded(maxCacheSize())));
         }
         auto cache_entry = QSharedPointer<CacheInfo>::create(gradient.stops(), opacity, gradient.interpolationMode());
         generateGradientColorTable(gradient, cache_entry->buffer64, paletteSize(), opacity);
@@ -4626,7 +4559,9 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode
 
             auto cacheInfo = qt_gradient_cache()->getBuffer(*g, alpha);
             gradient.colorTable32 = cacheInfo->buffer32;
+#if QT_CONFIG(raster_64bit)
             gradient.colorTable64 = cacheInfo->buffer64;
+#endif
             cachedGradient = std::move(cacheInfo);
 
             gradient.spread = g->spread();
@@ -4648,7 +4583,9 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode
 
             auto cacheInfo = qt_gradient_cache()->getBuffer(*g, alpha);
             gradient.colorTable32 = cacheInfo->buffer32;
+#if QT_CONFIG(raster_64bit)
             gradient.colorTable64 = cacheInfo->buffer64;
+#endif
             cachedGradient = std::move(cacheInfo);
 
             gradient.spread = g->spread();
@@ -4674,7 +4611,9 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode
 
             auto cacheInfo = qt_gradient_cache()->getBuffer(*g, alpha);
             gradient.colorTable32 = cacheInfo->buffer32;
+#if QT_CONFIG(raster_64bit)
             gradient.colorTable64 = cacheInfo->buffer64;
+#endif
             cachedGradient = std::move(cacheInfo);
 
             gradient.spread = QGradient::RepeatSpread;
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 5d527207a4..089aadc3f7 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -208,15 +208,6 @@ public:
     ClipType clipType() const;
     QRect clipBoundingRect() const;
 
-    void releaseBuffer();
-
-    QSize size() const;
-
-#ifndef QT_NO_DEBUG
-    void saveBuffer(const QString &s) const;
-#endif
-
-
 #ifdef Q_OS_WIN
     void setDC(HDC hdc);
     HDC getDC() const;
@@ -315,7 +306,7 @@ public:
 
     void recalculateFastImages();
     bool canUseFastImageBlending(QPainter::CompositionMode mode, const QImage &image) const;
-    bool canUseImageBlitting(QPainter::CompositionMode mode, const QImage &image) const;
+    bool canUseImageBlitting(QPainter::CompositionMode mode, const QImage &image, const QPointF &pt, const QRectF &sr) const;
 
     QPaintDevice *device;
     QScopedPointer<QOutlineMapper> outlineMapper;
@@ -435,27 +426,16 @@ inline void QClipData::appendSpans(const QSpan *s, int num)
 class QRasterBuffer
 {
 public:
-    QRasterBuffer() : m_width(0), m_height(0), m_buffer(0) { init(); }
+    QRasterBuffer() : m_width(0), m_height(0), m_buffer(nullptr) { init(); }
 
     ~QRasterBuffer();
 
     void init();
 
     QImage::Format prepare(QImage *image);
-    QImage::Format prepare(QPixmap *pix);
-    void prepare(int w, int h);
-    void prepareBuffer(int w, int h);
-
-    void resetBuffer(int val=0);
 
     uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * qsizetype(bytes_per_line); }
 
-#ifndef QT_NO_DEBUG
-    QImage bufferImage() const;
-#endif
-
-    void flushToARGBImage(QImage *image) const;
-
     int width() const { return m_width; }
     int height() const { return m_height; }
     int bytesPerLine() const { return bytes_per_line; }
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index 22d3fb3001..8314e8bc8a 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -140,7 +140,7 @@ QDebug Q_GUI_EXPORT &operator<<(QDebug &s, const QVectorPath &path)
     QDebugStateSaver saver(s);
     QRectF rf = path.controlPointRect();
     s << "QVectorPath(size:" << path.elementCount()
-      << " hints:" << hex << path.hints()
+      << " hints:" << Qt::hex << path.hints()
       << rf << ')';
     return s;
 }
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index f9e9563f10..3ce54c20be 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -283,7 +283,7 @@ bool QPainterPrivate::attachPainterPrivate(QPainter *q, QPaintDevice *pdev)
     Q_ASSERT(q->d_ptr->state);
 
     // Now initialize the painter with correct widget properties.
-    q->initFrom(pdev);
+    q->d_ptr->initFrom(pdev);
     QPoint offset;
     pdev->redirected(&offset);
     offset += q->d_ptr->engine->coordinateOffset();
@@ -1560,22 +1560,28 @@ void QPainter::initFrom(const QPaintDevice *device)
 {
     Q_ASSERT_X(device, "QPainter::initFrom(const QPaintDevice *device)", "QPaintDevice cannot be 0");
     Q_D(QPainter);
-    if (!d->engine) {
+    d->initFrom(device);
+}
+#endif
+
+void QPainterPrivate::initFrom(const QPaintDevice *device)
+{
+    if (!engine) {
         qWarning("QPainter::initFrom: Painter not active, aborted");
         return;
     }
 
-    device->initPainter(this);
+    Q_Q(QPainter);
+    device->initPainter(q);
 
-    if (d->extended) {
-        d->extended->penChanged();
-    } else if (d->engine) {
-        d->engine->setDirty(QPaintEngine::DirtyPen);
-        d->engine->setDirty(QPaintEngine::DirtyBrush);
-        d->engine->setDirty(QPaintEngine::DirtyFont);
+    if (extended) {
+        extended->penChanged();
+    } else if (engine) {
+        engine->setDirty(QPaintEngine::DirtyPen);
+        engine->setDirty(QPaintEngine::DirtyBrush);
+        engine->setDirty(QPaintEngine::DirtyFont);
     }
 }
-#endif
 
 /*!
     Saves the current painter state (pushes the state onto a stack). A
@@ -1843,7 +1849,7 @@ bool QPainter::begin(QPaintDevice *pd)
     // Copy painter properties from original paint device,
     // required for QPixmap::grabWidget()
     if (d->original_device->devType() == QInternal::Widget) {
-        initFrom(d->original_device);
+        d->initFrom(d->original_device);
     } else {
         d->state->layoutDirection = Qt::LayoutDirectionAuto;
         // make sure we have a font compatible with the paintdevice
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 843f24e3e1..3394da63c7 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -89,8 +89,10 @@ public:
         Antialiasing = 0x01,
         TextAntialiasing = 0x02,
         SmoothPixmapTransform = 0x04,
-        HighQualityAntialiasing = 0x08,
-        NonCosmeticDefaultPen = 0x10,
+#if QT_DEPRECATED_SINCE(5, 14)
+        HighQualityAntialiasing Q_DECL_ENUMERATOR_DEPRECATED_X("Use Antialiasing instead") = 0x08,
+        NonCosmeticDefaultPen Q_DECL_ENUMERATOR_DEPRECATED_X("Default pen is non-cosmetic now") = 0x10,
+#endif
         Qt4CompatiblePainting = 0x20,
         LosslessImageRendering = 0x40,
     };
diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
index 930180e9fa..29d4880eb9 100644
--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@@ -54,6 +54,8 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtGui/private/qtguiglobal_p.h>
 #include "QtGui/qbrush.h"
+#include "QtGui/qcolorspace.h"
+#include "QtGui/qcolortransform.h"
 #include "QtGui/qfont.h"
 #include "QtGui/qpen.h"
 #include "QtGui/qregion.h"
@@ -191,9 +193,9 @@ class QPainterPrivate
     Q_DECLARE_PUBLIC(QPainter)
 public:
     QPainterPrivate(QPainter *painter)
-    : q_ptr(painter), d_ptrs(0), state(0), dummyState(0), txinv(0), inDestructor(false), d_ptrs_size(0),
-        refcount(1), device(0), original_device(0), helper_device(0), engine(0), emulationEngine(0),
-        extended(0)
+    : q_ptr(painter), d_ptrs(nullptr), state(nullptr), dummyState(nullptr), txinv(0), inDestructor(false), d_ptrs_size(0),
+        refcount(1), device(nullptr), original_device(nullptr), helper_device(nullptr), engine(nullptr), emulationEngine(nullptr),
+        extended(nullptr)
     {
     }
 
@@ -254,6 +256,7 @@ public:
     QTransform hidpiScaleTransform() const;
     static bool attachPainterPrivate(QPainter *q, QPaintDevice *pdev);
     void detachPainterPrivate(QPainter *q);
+    void initFrom(const QPaintDevice *device);
 
     QPaintDevice *device;
     QPaintDevice *original_device;
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 8516d73537..1fb37ece56 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -93,7 +93,7 @@ struct QPainterPathPrivateDeleter
 {
     static inline void cleanup(QPainterPathPrivate *d)
     {
-        // note - we must up-cast to QPainterPathData since QPainterPathPrivate
+        // note - we must downcast to QPainterPathData since QPainterPathPrivate
         // has a non-virtual destructor!
         if (d && !d->ref.deref())
             delete static_cast<QPainterPathData *>(d);
@@ -545,7 +545,7 @@ void QPainterPath::setElementPositionAt(int i, qreal x, qreal y)
 /*!
     Constructs an empty QPainterPath object.
 */
-QPainterPath::QPainterPath() Q_DECL_NOEXCEPT
+QPainterPath::QPainterPath() noexcept
     : d_ptr(0)
 {
 }
@@ -578,7 +578,7 @@ QPainterPath::QPainterPath(const QPointF &startPoint)
 
 void QPainterPath::detach()
 {
-    if (d_ptr->ref.load() != 1)
+    if (d_ptr->ref.loadRelaxed() != 1)
         detach_helper();
     setDirty(true);
 }
@@ -1855,10 +1855,9 @@ static void qt_painterpath_isect_curve(const QBezier &bezier, const QPointF &pt,
         }
 
         // split curve and try again...
-        QBezier first_half, second_half;
-        bezier.split(&first_half, &second_half);
-        qt_painterpath_isect_curve(first_half, pt, winding, depth + 1);
-        qt_painterpath_isect_curve(second_half, pt, winding, depth + 1);
+        const auto halves = bezier.split();
+        qt_painterpath_isect_curve(halves.first,  pt, winding, depth + 1);
+        qt_painterpath_isect_curve(halves.second, pt, winding, depth + 1);
     }
 }
 
@@ -2013,10 +2012,9 @@ static bool qt_isect_curve_horizontal(const QBezier &bezier, qreal y, qreal x1,
         if (depth == 32 || (bounds.width() < lower_bound && bounds.height() < lower_bound))
             return true;
 
-        QBezier first_half, second_half;
-        bezier.split(&first_half, &second_half);
-        if (qt_isect_curve_horizontal(first_half, y, x1, x2, depth + 1)
-            || qt_isect_curve_horizontal(second_half, y, x1, x2, depth + 1))
+        const auto halves = bezier.split();
+        if (qt_isect_curve_horizontal(halves.first, y, x1, x2, depth + 1)
+            || qt_isect_curve_horizontal(halves.second, y, x1, x2, depth + 1))
             return true;
     }
     return false;
@@ -2032,10 +2030,9 @@ static bool qt_isect_curve_vertical(const QBezier &bezier, qreal x, qreal y1, qr
         if (depth == 32 || (bounds.width() < lower_bound && bounds.height() < lower_bound))
             return true;
 
-        QBezier first_half, second_half;
-        bezier.split(&first_half, &second_half);
-        if (qt_isect_curve_vertical(first_half, x, y1, y2, depth + 1)
-            || qt_isect_curve_vertical(second_half, x, y1, y2, depth + 1))
+        const auto halves = bezier.split();
+        if (qt_isect_curve_vertical(halves.first, x, y1, y2, depth + 1)
+            || qt_isect_curve_vertical(halves.second, x, y1, y2, depth + 1))
             return true;
     }
      return false;
@@ -3520,8 +3517,7 @@ void QPainterPath::setDirty(bool dirty)
 {
     d_func()->dirtyBounds        = dirty;
     d_func()->dirtyControlBounds = dirty;
-    delete d_func()->pathConverter;
-    d_func()->pathConverter = 0;
+    d_func()->pathConverter.reset();
     d_func()->convex = false;
 }
 
@@ -3597,10 +3593,10 @@ void QPainterPath::computeControlPointRect() const
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug s, const QPainterPath &p)
 {
-    s.nospace() << "QPainterPath: Element count=" << p.elementCount() << endl;
+    s.nospace() << "QPainterPath: Element count=" << p.elementCount() << Qt::endl;
     const char *types[] = {"MoveTo", "LineTo", "CurveTo", "CurveToData"};
     for (int i=0; i<p.elementCount(); ++i) {
-        s.nospace() << " -> " << types[p.elementAt(i).type] << "(x=" << p.elementAt(i).x << ", y=" << p.elementAt(i).y << ')' << endl;
+        s.nospace() << " -> " << types[p.elementAt(i).type] << "(x=" << p.elementAt(i).x << ", y=" << p.elementAt(i).y << ')' << Qt::endl;
 
     }
     return s;
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index a69a192767..ed5be667b7 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -88,17 +88,15 @@ public:
         inline bool operator!=(const Element &e) const { return !operator==(e); }
     };
 
-    QPainterPath() Q_DECL_NOEXCEPT;
+    QPainterPath() noexcept;
     explicit QPainterPath(const QPointF &startPoint);
     QPainterPath(const QPainterPath &other);
     QPainterPath &operator=(const QPainterPath &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QPainterPath &operator=(QPainterPath &&other) Q_DECL_NOEXCEPT
+    inline QPainterPath &operator=(QPainterPath &&other) noexcept
     { qSwap(d_ptr, other.d_ptr); return *this; }
-#endif
     ~QPainterPath();
 
-    inline void swap(QPainterPath &other) Q_DECL_NOEXCEPT { d_ptr.swap(other.d_ptr); }
+    inline void swap(QPainterPath &other) noexcept { d_ptr.swap(other.d_ptr); }
 
     void clear();
     void reserve(int size);
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index 567f155210..a420e0b3d9 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -62,8 +62,11 @@
 #include <private/qvectorpath_p.h>
 #include <private/qstroker_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
+// ### Qt 6: merge with QPainterPathData
 class QPainterPathPrivate
 {
 public:
@@ -80,7 +83,19 @@ public:
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPainterPath &);
 #endif
 
-    QPainterPathPrivate() : ref(1) {}
+    QPainterPathPrivate() noexcept
+        : ref(1)
+    {
+    }
+
+    QPainterPathPrivate(const QPainterPathPrivate &other) noexcept
+        : ref(1),
+          elements(other.elements)
+    {
+    }
+
+    QPainterPathPrivate &operator=(const QPainterPathPrivate &) = delete;
+    ~QPainterPathPrivate() = default;
 
 private:
     QAtomicInt ref;
@@ -166,30 +181,30 @@ public:
     QPainterPathData() :
         cStart(0),
         fillRule(Qt::OddEvenFill),
+        require_moveTo(false),
         dirtyBounds(false),
         dirtyControlBounds(false),
-        pathConverter(0)
+        convex(false),
+        pathConverter(nullptr)
     {
-        require_moveTo = false;
-        convex = false;
     }
 
     QPainterPathData(const QPainterPathData &other) :
-        QPainterPathPrivate(), cStart(other.cStart), fillRule(other.fillRule),
+        QPainterPathPrivate(other),
+        cStart(other.cStart),
+        fillRule(other.fillRule),
         bounds(other.bounds),
         controlBounds(other.controlBounds),
+        require_moveTo(false),
         dirtyBounds(other.dirtyBounds),
         dirtyControlBounds(other.dirtyControlBounds),
         convex(other.convex),
-        pathConverter(0)
+        pathConverter(nullptr)
     {
-        require_moveTo = false;
-        elements = other.elements;
     }
 
-    ~QPainterPathData() {
-        delete pathConverter;
-    }
+    QPainterPathData &operator=(const QPainterPathData &) = delete;
+    ~QPainterPathData() = default;
 
     inline bool isClosed() const;
     inline void close();
@@ -198,7 +213,7 @@ public:
 
     const QVectorPath &vectorPath() {
         if (!pathConverter)
-            pathConverter = new QVectorPathConverter(elements, fillRule, convex);
+            pathConverter.reset(new QVectorPathConverter(elements, fillRule, convex));
         return pathConverter->path;
     }
 
@@ -213,7 +228,7 @@ public:
     uint dirtyControlBounds : 1;
     uint convex : 1;
 
-    QVectorPathConverter *pathConverter;
+    std::unique_ptr<QVectorPathConverter> pathConverter;
 };
 
 
@@ -266,7 +281,7 @@ inline bool QPainterPathData::isClosed() const
 
 inline void QPainterPathData::close()
 {
-    Q_ASSERT(ref.load() == 1);
+    Q_ASSERT(ref.loadRelaxed() == 1);
     require_moveTo = true;
     const QPainterPath::Element &first = elements.at(cStart);
     QPainterPath::Element &last = elements.last();
@@ -293,7 +308,7 @@ inline void QPainterPathData::maybeMoveTo()
 
 inline void QPainterPathData::clear()
 {
-    Q_ASSERT(ref.load() == 1);
+    Q_ASSERT(ref.loadRelaxed() == 1);
 
     elements.clear();
 
@@ -307,8 +322,7 @@ inline void QPainterPathData::clear()
     dirtyControlBounds = false;
     convex = false;
 
-    delete pathConverter;
-    pathConverter = nullptr;
+    pathConverter.reset();
 }
 #define KAPPA qreal(0.5522847498)
 
diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h
index c25a479807..9444a87b71 100644
--- a/src/gui/painting/qpathclipper_p.h
+++ b/src/gui/painting/qpathclipper_p.h
@@ -82,7 +82,7 @@ public:
     bool intersect();
     bool contains();
 
-    static bool pathToRect(const QPainterPath &path, QRectF *rect = 0);
+    static bool pathToRect(const QPainterPath &path, QRectF *rect = nullptr);
     static QPainterPath intersect(const QPainterPath &path, const QRectF &rect);
 
 private:
@@ -394,7 +394,7 @@ inline const QPathSegments::Intersection *QPathSegments::intersectionAt(int inde
 {
     const int intersection = m_segments.at(index).intersection;
     if (intersection < 0)
-        return 0;
+        return nullptr;
     else
         return &m_intersections.at(intersection);
 }
@@ -428,12 +428,12 @@ inline int QWingedEdge::edgeCount() const
 
 inline QPathEdge *QWingedEdge::edge(int edge)
 {
-    return edge < 0 ? 0 : &m_edges.at(edge);
+    return edge < 0 ? nullptr : &m_edges.at(edge);
 }
 
 inline const QPathEdge *QWingedEdge::edge(int edge) const
 {
-    return edge < 0 ? 0 : &m_edges.at(edge);
+    return edge < 0 ? nullptr : &m_edges.at(edge);
 }
 
 inline int QWingedEdge::vertexCount() const
@@ -449,12 +449,12 @@ inline int QWingedEdge::addVertex(const QPointF &p)
 
 inline QPathVertex *QWingedEdge::vertex(int vertex)
 {
-    return vertex < 0 ? 0 : &m_vertices.at(vertex);
+    return vertex < 0 ? nullptr : &m_vertices.at(vertex);
 }
 
 inline const QPathVertex *QWingedEdge::vertex(int vertex) const
 {
-    return vertex < 0 ? 0 : &m_vertices.at(vertex);
+    return vertex < 0 ? nullptr : &m_vertices.at(vertex);
 }
 
 inline QPathEdge::Traversal QWingedEdge::flip(QPathEdge::Traversal traversal)
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index 6bdc82a8e9..f560e1f0f0 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -1570,12 +1570,14 @@ void QPdfEnginePrivate::writeHeader()
 {
     addXrefEntry(0,false);
 
-    static const QHash<QPdfEngine::PdfVersion, const char *> mapping {
-        {QPdfEngine::Version_1_4, "1.4"},
-        {QPdfEngine::Version_A1b, "1.4"},
-        {QPdfEngine::Version_1_6, "1.6"}
+    // Keep in sync with QPdfEngine::PdfVersion!
+    static const char mapping[][4] = {
+        "1.4", // Version_1_4
+        "1.4", // Version_A1b
+        "1.6", // Version_1_6
     };
-    const char *verStr = mapping.value(pdfVersion, "1.4");
+    static const size_t numMappings = sizeof mapping / sizeof *mapping;
+    const char *verStr = mapping[size_t(pdfVersion) < numMappings ? pdfVersion : 0];
 
     xprintf("%%PDF-%s\n", verStr);
     xprintf("%%\303\242\303\243\n");
@@ -1671,19 +1673,19 @@ int QPdfEnginePrivate::writeXmpMetaData()
     const QDateTime now = QDateTime::currentDateTime();
     const QDate date = now.date();
     const QTime time = now.time();
-
-    QString timeStr;
-    timeStr.sprintf("%d-%02d-%02dT%02d:%02d:%02d", date.year(), date.month(), date.day(),
-                                                   time.hour(), time.minute(), time.second());
+    const QString timeStr =
+            QString::asprintf("%d-%02d-%02dT%02d:%02d:%02d",
+                              date.year(), date.month(), date.day(),
+                              time.hour(), time.minute(), time.second());
 
     const int offset = now.offsetFromUtc();
     const int hours  = (offset / 60) / 60;
     const int mins   = (offset / 60) % 60;
     QString tzStr;
     if (offset < 0)
-        tzStr.sprintf("-%02d:%02d", -hours, -mins);
+        tzStr = QString::asprintf("-%02d:%02d", -hours, -mins);
     else if (offset > 0)
-        tzStr.sprintf("+%02d:%02d", hours , mins);
+        tzStr = QString::asprintf("+%02d:%02d", hours , mins);
     else
         tzStr = QLatin1String("Z");
 
diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h
index e337c61f64..89e549614a 100644
--- a/src/gui/painting/qpdf_p.h
+++ b/src/gui/painting/qpdf_p.h
@@ -168,6 +168,7 @@ class Q_GUI_EXPORT QPdfEngine : public QPaintEngine
     Q_DECLARE_PRIVATE(QPdfEngine)
     friend class QPdfWriter;
 public:
+    // keep in sync with QPagedPaintDevice::PdfVersion and QPdfEnginePrivate::writeHeader()::mapping!
     enum PdfVersion
     {
         Version_1_4,
diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp
index 258939a763..bf7e2d3dca 100644
--- a/src/gui/painting/qpdfwriter.cpp
+++ b/src/gui/painting/qpdfwriter.cpp
@@ -170,17 +170,11 @@ void QPdfWriter::setPdfVersion(PdfVersion version)
 {
     Q_D(QPdfWriter);
 
-    static const QHash<QPdfWriter::PdfVersion, QPdfEngine::PdfVersion> engineMapping {
-        {QPdfWriter::PdfVersion_1_4, QPdfEngine::Version_1_4},
-        {QPdfWriter::PdfVersion_A1b, QPdfEngine::Version_A1b},
-        {QPdfWriter::PdfVersion_1_6, QPdfEngine::Version_1_6}
-    };
-
     if (d->pdfVersion == version)
         return;
 
     d->pdfVersion = version;
-    d->engine->setPdfVersion(engineMapping.value(version, QPdfEngine::Version_1_4));
+    d->engine->setPdfVersion(static_cast<QPdfEngine::PdfVersion>(static_cast<int>(version)));
 }
 
 /*!
@@ -379,6 +373,9 @@ int QPdfWriter::resolution() const
 */
 #endif
 
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 /*!
     \reimp
 
@@ -404,6 +401,8 @@ void QPdfWriter::setPageSizeMM(const QSizeF &size)
 {
     setPageSize(QPageSize(size, QPageSize::Millimeter));
 }
+QT_WARNING_POP
+#endif
 
 /*!
     \internal
@@ -427,6 +426,9 @@ bool QPdfWriter::newPage()
 }
 
 
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 /*!
     \reimp
 
@@ -438,6 +440,8 @@ void QPdfWriter::setMargins(const Margins &m)
 {
     setPageMargins(QMarginsF(m.left, m.top, m.right, m.bottom), QPageLayout::Millimeter);
 }
+QT_WARNING_POP
+#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/painting/qpdfwriter.h b/src/gui/painting/qpdfwriter.h
index b260805b2b..668081e008 100644
--- a/src/gui/painting/qpdfwriter.h
+++ b/src/gui/painting/qpdfwriter.h
@@ -86,10 +86,14 @@ public:
     using QPagedPaintDevice::setPageSize;
 #endif
 
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use setPageSize(QPageSize(id)) instead")
     void setPageSize(PageSize size) override;
+    QT_DEPRECATED_X("Use setPageSize(QPageSize(size, QPageSize::Millimeter)) instead")
     void setPageSizeMM(const QSizeF &size) override;
-
+    QT_DEPRECATED_X("Use setPageMargins(QMarginsF(l, t, r, b), QPageLayout::Millimeter) instead")
     void setMargins(const Margins &m) override;
+#endif
 
 protected:
     QPaintEngine *paintEngine() const override;
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index 778c770b82..dc6e3e04d0 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -322,7 +322,7 @@ QPen::QPen(const QBrush &brush, qreal width, Qt::PenStyle s, Qt::PenCapStyle c,
     Constructs a pen that is a copy of the given \a pen.
 */
 
-QPen::QPen(const QPen &p) Q_DECL_NOTHROW
+QPen::QPen(const QPen &p) noexcept
 {
     d = p.d;
     if (d)
@@ -363,13 +363,13 @@ QPen::~QPen()
 
 void QPen::detach()
 {
-    if (d->ref.load() == 1)
+    if (d->ref.loadRelaxed() == 1)
         return;
 
     QPenData *x = new QPenData(*static_cast<QPenData *>(d));
     if (!d->ref.deref())
         delete d;
-    x->ref.store(1);
+    x->ref.storeRelaxed(1);
     d = x;
 }
 
@@ -381,7 +381,7 @@ void QPen::detach()
     this pen.
 */
 
-QPen &QPen::operator=(const QPen &p) Q_DECL_NOTHROW
+QPen &QPen::operator=(const QPen &p) noexcept
 {
     QPen(p).swap(*this);
     return *this;
@@ -885,7 +885,7 @@ bool QPen::operator==(const QPen &p) const
 
 bool QPen::isDetached()
 {
-    return d->ref.load() == 1;
+    return d->ref.loadRelaxed() == 1;
 }
 
 
diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h
index 03abfb3d7d..10b11d1d85 100644
--- a/src/gui/painting/qpen.h
+++ b/src/gui/painting/qpen.h
@@ -65,18 +65,16 @@ public:
     QPen(const QColor &color);
     QPen(const QBrush &brush, qreal width, Qt::PenStyle s = Qt::SolidLine,
          Qt::PenCapStyle c = Qt::SquareCap, Qt::PenJoinStyle j = Qt::BevelJoin);
-    QPen(const QPen &pen) Q_DECL_NOTHROW;
+    QPen(const QPen &pen) noexcept;
 
     ~QPen();
 
-    QPen &operator=(const QPen &pen) Q_DECL_NOTHROW;
-#ifdef Q_COMPILER_RVALUE_REFS
-    QPen(QPen &&other) Q_DECL_NOTHROW
+    QPen &operator=(const QPen &pen) noexcept;
+    QPen(QPen &&other) noexcept
         : d(other.d) { other.d = nullptr; }
-    QPen &operator=(QPen &&other) Q_DECL_NOTHROW
+    QPen &operator=(QPen &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
-    void swap(QPen &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QPen &other) noexcept { qSwap(d, other.d); }
 
     Qt::PenStyle style() const;
     void setStyle(Qt::PenStyle);
diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
index c71d82546a..45e90bd99b 100644
--- a/src/gui/painting/qplatformbackingstore.cpp
+++ b/src/gui/painting/qplatformbackingstore.cpp
@@ -338,7 +338,16 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
         }
     }
 
-    if (!d_ptr->context->makeCurrent(window)) {
+    bool current = d_ptr->context->makeCurrent(window);
+
+    if (!current && !d_ptr->context->isValid()) {
+        delete d_ptr->blitter;
+        d_ptr->blitter = nullptr;
+        d_ptr->textureId = 0;
+        current = d_ptr->context->create() && d_ptr->context->makeCurrent(window);
+    }
+
+    if (!current) {
         qCWarning(lcQpaBackingStore, "composeAndFlush: makeCurrent() failed");
         return;
     }
@@ -446,14 +455,22 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
             d_ptr->blitter->setRedBlueSwizzle(false);
     }
 
-    // There is no way to tell if the OpenGL-rendered content is premultiplied or not.
-    // For compatibility, assume that it is not, and use normal alpha blend always.
-    if (d_ptr->premultiplied)
-        funcs->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
-
     // Textures for renderToTexture widgets that have WA_AlwaysStackOnTop set.
+    bool blendIsPremultiplied = d_ptr->premultiplied;
     for (int i = 0; i < textures->count(); ++i) {
-        if (textures->flags(i).testFlag(QPlatformTextureList::StacksOnTop))
+        const QPlatformTextureList::Flags flags = textures->flags(i);
+        if (flags.testFlag(QPlatformTextureList::NeedsPremultipliedAlphaBlending)) {
+            if (!blendIsPremultiplied) {
+                funcs->glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
+                blendIsPremultiplied = true;
+            }
+        } else {
+            if (blendIsPremultiplied) {
+                funcs->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
+                blendIsPremultiplied = false;
+            }
+        }
+        if (flags.testFlag(QPlatformTextureList::StacksOnTop))
             blitTextureForWidget(textures, i, window, deviceWindowRect, d_ptr->blitter, offset, canUseSrgb);
     }
 
diff --git a/src/gui/painting/qplatformbackingstore.h b/src/gui/painting/qplatformbackingstore.h
index de5ba964dc..4f08b0092f 100644
--- a/src/gui/painting/qplatformbackingstore.h
+++ b/src/gui/painting/qplatformbackingstore.h
@@ -81,11 +81,12 @@ class Q_GUI_EXPORT QPlatformTextureList : public QObject
 public:
     enum Flag {
         StacksOnTop = 0x01,
-        TextureIsSrgb = 0x02
+        TextureIsSrgb = 0x02,
+        NeedsPremultipliedAlphaBlending = 0x04
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 
-    explicit QPlatformTextureList(QObject *parent = 0);
+    explicit QPlatformTextureList(QObject *parent = nullptr);
     ~QPlatformTextureList();
 
     int count() const;
@@ -99,7 +100,7 @@ public:
     bool isLocked() const;
 
     void appendTexture(void *source, GLuint textureId, const QRect &geometry,
-                       const QRect &clipRect = QRect(), Flags flags = 0);
+                       const QRect &clipRect = QRect(), Flags flags = nullptr);
     void clear();
 
  Q_SIGNALS:
diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h
index 8e74a499fd..93fab55aa1 100644
--- a/src/gui/painting/qpolygon.h
+++ b/src/gui/painting/qpolygon.h
@@ -60,18 +60,14 @@ public:
     inline ~QPolygon() {}
     inline explicit QPolygon(int size);
     inline /*implicit*/ QPolygon(const QVector<QPoint> &v) : QVector<QPoint>(v) {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    /*implicit*/ QPolygon(QVector<QPoint> &&v) Q_DECL_NOTHROW : QVector<QPoint>(std::move(v)) {}
-#endif
+    /*implicit*/ QPolygon(QVector<QPoint> &&v) noexcept : QVector<QPoint>(std::move(v)) {}
     QPolygon(const QRect &r, bool closed=false);
     QPolygon(int nPoints, const int *points);
     QPolygon(const QPolygon &other) : QVector<QPoint>(other) {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    QPolygon(QPolygon &&other) Q_DECL_NOTHROW : QVector<QPoint>(std::move(other)) {}
-    QPolygon &operator=(QPolygon &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QPolygon(QPolygon &&other) noexcept : QVector<QPoint>(std::move(other)) {}
+    QPolygon &operator=(QPolygon &&other) noexcept { swap(other); return *this; }
     QPolygon &operator=(const QPolygon &other) { QVector<QPoint>::operator=(other); return *this; }
-    void swap(QPolygon &other) Q_DECL_NOTHROW { QVector<QPoint>::swap(other); } // prevent QVector<QPoint><->QPolygon swaps
+    void swap(QPolygon &other) noexcept { QVector<QPoint>::swap(other); } // prevent QVector<QPoint><->QPolygon swaps
 
     operator QVariant() const;
 
@@ -145,16 +141,12 @@ public:
     inline ~QPolygonF() {}
     inline explicit QPolygonF(int size);
     inline /*implicit*/ QPolygonF(const QVector<QPointF> &v) : QVector<QPointF>(v) {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    /* implicit */ QPolygonF(QVector<QPointF> &&v) Q_DECL_NOTHROW : QVector<QPointF>(std::move(v)) {}
-#endif
+    /* implicit */ QPolygonF(QVector<QPointF> &&v) noexcept : QVector<QPointF>(std::move(v)) {}
     QPolygonF(const QRectF &r);
     /*implicit*/ QPolygonF(const QPolygon &a);
     inline QPolygonF(const QPolygonF &a) : QVector<QPointF>(a) {}
-#ifdef Q_COMPILER_RVALUE_REFS
-    QPolygonF(QPolygonF &&other) Q_DECL_NOTHROW : QVector<QPointF>(std::move(other)) {}
-    QPolygonF &operator=(QPolygonF &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QPolygonF(QPolygonF &&other) noexcept : QVector<QPointF>(std::move(other)) {}
+    QPolygonF &operator=(QPolygonF &&other) noexcept { swap(other); return *this; }
     QPolygonF &operator=(const QPolygonF &other) { QVector<QPointF>::operator=(other); return *this; }
     inline void swap(QPolygonF &other) { QVector<QPointF>::swap(other); } // prevent QVector<QPointF><->QPolygonF swaps
 
diff --git a/src/gui/painting/qrbtree_p.h b/src/gui/painting/qrbtree_p.h
index d3ee23a91c..42e88889a1 100644
--- a/src/gui/painting/qrbtree_p.h
+++ b/src/gui/painting/qrbtree_p.h
@@ -60,7 +60,7 @@ struct QRBTree
 {
     struct Node
     {
-        inline Node() : parent(0), left(0), right(0), red(true) { }
+        inline Node() : parent(nullptr), left(nullptr), right(nullptr), red(true) { }
         inline ~Node() {if (left) delete left; if (right) delete right;}
         T data;
         Node *parent;
@@ -69,7 +69,7 @@ struct QRBTree
         bool red;
     };
 
-    inline QRBTree() : root(0), freeList(0) { }
+    inline QRBTree() : root(nullptr), freeList(nullptr) { }
     inline ~QRBTree();
 
     inline void clear();
@@ -120,7 +120,7 @@ inline QRBTree<T>::~QRBTree()
     while (freeList) {
         // Avoid recursively calling the destructor, as this list may become large.
         Node *next = freeList->right;
-        freeList->right = 0;
+        freeList->right = nullptr;
         delete freeList;
         freeList = next;
     }
@@ -131,7 +131,7 @@ inline void QRBTree<T>::clear()
 {
     if (root)
         delete root;
-    root = 0;
+    root = nullptr;
 }
 
 template <class T>
@@ -359,7 +359,7 @@ void QRBTree<T>::detach(Node *node) // call this before removing a node.
     ref = child;
     if (child)
         child->parent = node->parent;
-    node->left = node->right = node->parent = 0;
+    node->left = node->right = node->parent = nullptr;
 }
 
 // 'node' must be black. rebalance will reduce the depth of black nodes by one in the sibling tree.
@@ -513,7 +513,7 @@ inline void QRBTree<T>::deleteNode(Node *&node)
     detach(node);
     node->right = freeList;
     freeList = node;
-    node = 0;
+    node = nullptr;
 }
 
 template <class T>
@@ -522,7 +522,7 @@ inline typename QRBTree<T>::Node *QRBTree<T>::newNode()
     if (freeList) {
         Node *node = freeList;
         freeList = freeList->right;
-        node->parent = node->left = node->right = 0;
+        node->parent = node->left = node->right = nullptr;
         node->red = true;
         return node;
     }
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 69d48fcc58..82f5be2b65 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -1233,10 +1233,10 @@ struct QRegionPrivate {
         }
     }
 
-    const QRect *begin() const Q_DECL_NOTHROW
+    const QRect *begin() const noexcept
     { return numRects == 1 ? &extents : rects.data(); } // avoid vectorize()
 
-    const QRect *end() const Q_DECL_NOTHROW
+    const QRect *end() const noexcept
     { return begin() + numRects; }
 
     inline void append(const QRect *r);
@@ -4267,7 +4267,7 @@ QRegion QRegion::xored(const QRegion &r) const
     }
 }
 
-QRect QRegion::boundingRect() const Q_DECL_NOTHROW
+QRect QRegion::boundingRect() const noexcept
 {
     if (isEmpty())
         return QRect();
@@ -4325,12 +4325,12 @@ QVector<QRect> QRegion::rects() const
 }
 #endif
 
-QRegion::const_iterator QRegion::begin() const Q_DECL_NOTHROW
+QRegion::const_iterator QRegion::begin() const noexcept
 {
     return d->qt_rgn ? d->qt_rgn->begin() : nullptr;
 }
 
-QRegion::const_iterator QRegion::end() const Q_DECL_NOTHROW
+QRegion::const_iterator QRegion::end() const noexcept
 {
     return d->qt_rgn ? d->qt_rgn->end() : nullptr;
 }
@@ -4367,7 +4367,7 @@ void QRegion::setRects(const QRect *rects, int num)
     }
 }
 
-int QRegion::rectCount() const Q_DECL_NOTHROW
+int QRegion::rectCount() const noexcept
 {
     return (d->qt_rgn ? d->qt_rgn->numRects : 0);
 }
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 9fe6ed5675..54de916198 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -69,30 +69,28 @@ public:
     QRegion(const QRect &r, RegionType t = Rectangle);
     QRegion(const QPolygon &pa, Qt::FillRule fillRule = Qt::OddEvenFill);
     QRegion(const QRegion &region);
-    QRegion(QRegion &&other) Q_DECL_NOTHROW
+    QRegion(QRegion &&other) noexcept
         : d(other.d) { other.d = const_cast<QRegionData*>(&shared_empty); }
     QRegion(const QBitmap &bitmap);
     ~QRegion();
     QRegion &operator=(const QRegion &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QRegion &operator=(QRegion &&other) Q_DECL_NOEXCEPT
+    inline QRegion &operator=(QRegion &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
-    inline void swap(QRegion &other) Q_DECL_NOEXCEPT { qSwap(d, other.d); }
+    inline void swap(QRegion &other) noexcept { qSwap(d, other.d); }
     bool isEmpty() const;
     bool isNull() const;
 
     typedef const QRect *const_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-    const_iterator begin()  const Q_DECL_NOTHROW;
-    const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); }
-    const_iterator end()    const Q_DECL_NOTHROW;
-    const_iterator cend()   const Q_DECL_NOTHROW { return end(); }
-    const_reverse_iterator rbegin()  const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
-    const_reverse_iterator rend()    const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crend()   const Q_DECL_NOTHROW { return rend(); }
+    const_iterator begin()  const noexcept;
+    const_iterator cbegin() const noexcept { return begin(); }
+    const_iterator end()    const noexcept;
+    const_iterator cend()   const noexcept { return end(); }
+    const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+    const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend()   const noexcept { return rend(); }
 
     bool contains(const QPoint &p) const;
     bool contains(const QRect &r) const;
@@ -121,13 +119,13 @@ public:
     bool intersects(const QRegion &r) const;
     bool intersects(const QRect &r) const;
 
-    QRect boundingRect() const Q_DECL_NOTHROW;
+    QRect boundingRect() const noexcept;
 #if QT_DEPRECATED_SINCE(5, 11)
     QT_DEPRECATED_X("Use begin()/end() instead")
     QVector<QRect> rects() const;
 #endif
     void setRects(const QRect *rect, int num);
-    int rectCount() const Q_DECL_NOTHROW;
+    int rectCount() const noexcept;
 #ifdef Q_COMPILER_MANGLES_RETURN_TYPE
     // ### Qt 6: remove these, they're kept for MSVC compat
     const QRegion operator|(const QRegion &r) const;
diff --git a/src/gui/painting/qrgba64_p.h b/src/gui/painting/qrgba64_p.h
index ca879de27c..d145dbfbea 100644
--- a/src/gui/painting/qrgba64_p.h
+++ b/src/gui/painting/qrgba64_p.h
@@ -284,6 +284,8 @@ static Q_ALWAYS_INLINE void blend_pixel(QRgba64 &dst, QRgba64 src)
 
 static Q_ALWAYS_INLINE void blend_pixel(QRgba64 &dst, QRgba64 src, const int const_alpha)
 {
+    if (const_alpha == 255)
+        return blend_pixel(dst, src);
     if (!src.isTransparent()) {
         src = multiplyAlpha255(src, const_alpha);
         dst = src + multiplyAlpha65535(dst, 65535 - src.alpha());
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index 90c06788e1..271d3ba6bf 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -173,15 +173,12 @@ template <class Iterator> bool qt_stroke_side(Iterator *it, QStroker *stroker,
                                               bool capFirst, QLineF *startTangent);
 
 /*******************************************************************************
- * QLineF::angle gives us the smalles angle between two lines. Here we
- * want to identify the line's angle direction on the unit circle.
+ * QLineF::angleTo gives us the angle between two lines with respecting the direction.
+ * Here we want to identify the line's angle direction on the unit circle.
  */
 static inline qreal adapted_angle_on_x(const QLineF &line)
 {
-    qreal angle = line.angle(QLineF(0, 0, 1, 0));
-    if (line.dy() > 0)
-        angle = 360 - angle;
-    return angle;
+    return QLineF(0, 0, 1, 0).angleTo(line);
 }
 
 QStrokerOps::QStrokerOps()
@@ -459,7 +456,7 @@ void QStroker::joinPoints(qfixed focal_x, qfixed focal_y, const QLineF &nextLine
     QLineF prevLine(qt_fixed_to_real(m_back2X), qt_fixed_to_real(m_back2Y),
                     qt_fixed_to_real(m_back1X), qt_fixed_to_real(m_back1Y));
     QPointF isect;
-    QLineF::IntersectType type = prevLine.intersect(nextLine, &isect);
+    QLineF::IntersectionType type = prevLine.intersects(nextLine, &isect);
 
     if (join == FlatJoin) {
         QLineF shortCut(prevLine.p2(), nextLine.p1());
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 06fa4bf95e..7a3dd04965 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -73,7 +73,7 @@ int QTextureGlyphCache::calculateSubPixelPositionCount(glyph_t glyph) const
             if (path.isEmpty())
                 break;
 
-            images[numImages++] = qMove(img);
+            images[numImages++] = std::move(img);
         } else {
             bool found = false;
             for (int j = 0; j < numImages; ++j) {
@@ -83,7 +83,7 @@ int QTextureGlyphCache::calculateSubPixelPositionCount(glyph_t glyph) const
                 }
             }
             if (!found)
-                images[numImages++] = qMove(img);
+                images[numImages++] = std::move(img);
         }
     }
 
@@ -285,6 +285,8 @@ QImageTextureGlyphCache::~QImageTextureGlyphCache()
 void QImageTextureGlyphCache::resizeTextureData(int width, int height)
 {
     m_image = m_image.copy(0, 0, width, height);
+    // Regions not part of the copy are initialized to 0, and that is just what
+    // we need.
 }
 
 void QImageTextureGlyphCache::createTextureData(int width, int height)
@@ -305,6 +307,12 @@ void QImageTextureGlyphCache::createTextureData(int width, int height)
     default:
         Q_UNREACHABLE();
     }
+
+    // Regions not touched by the glyphs must be initialized to 0. (such
+    // locations may in fact be sampled with styled (shifted) text materials)
+    // When resizing, the QImage copy() does this implicitly but the initial
+    // contents must be zeroed out explicitly here.
+    m_image.fill(0);
 }
 
 void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g, QFixed subPixelPosition)
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index c105e89e50..b6fc7230a8 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -75,7 +75,7 @@ class Q_GUI_EXPORT QTextureGlyphCache : public QFontEngineGlyphCache
 {
 public:
     QTextureGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix, const QColor &color = QColor())
-        : QFontEngineGlyphCache(format, matrix, color), m_current_fontengine(0),
+        : QFontEngineGlyphCache(format, matrix, color), m_current_fontengine(nullptr),
                                                m_w(0), m_h(0), m_cx(0), m_cy(0), m_currentRowHeight(0)
         { }
 
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 816514a695..d75b66c50b 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -265,7 +265,9 @@ QTransform::QTransform()
     , m_13(0), m_23(0), m_33(1)
     , m_type(TxNone)
     , m_dirty(TxNone)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     , d(nullptr)
+#endif
 {
 }
 
@@ -284,7 +286,9 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h13,
     , m_13(h13), m_23(h23), m_33(h33)
     , m_type(TxNone)
     , m_dirty(TxProject)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     , d(nullptr)
+#endif
 {
 }
 
@@ -301,7 +305,9 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h21,
     , m_13(0), m_23(0), m_33(1)
     , m_type(TxNone)
     , m_dirty(TxShear)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     , d(nullptr)
+#endif
 {
 }
 
@@ -317,7 +323,9 @@ QTransform::QTransform(const QMatrix &mtx)
       m_13(0), m_23(0), m_33(1)
     , m_type(TxNone)
     , m_dirty(TxShear)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     , d(nullptr)
+#endif
 {
 }
 
@@ -795,7 +803,7 @@ bool QTransform::operator==(const QTransform &o) const
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
 */
-uint qHash(const QTransform &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QTransform &key, uint seed) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.m11());
@@ -1021,7 +1029,7 @@ QTransform QTransform::operator*(const QTransform &m) const
 /*!
     Assigns the given \a matrix's values to this matrix.
 */
-QTransform & QTransform::operator=(const QTransform &matrix) Q_DECL_NOTHROW
+QTransform & QTransform::operator=(const QTransform &matrix) noexcept
 {
     affine._m11 = matrix.affine._m11;
     affine._m12 = matrix.affine._m12;
@@ -1521,12 +1529,12 @@ QRegion QTransform::map(const QRegion &r) const
         QRegion res;
         if (m11() < 0 || m22() < 0) {
             for (const QRect &rect : r)
-                res += mapRect(rect);
+                res += mapRect(QRectF(rect)).toRect();
         } else {
             QVarLengthArray<QRect, 32> rects;
             rects.reserve(r.rectCount());
             for (const QRect &rect : r) {
-                QRect nr = mapRect(rect);
+                QRect nr = mapRect(QRectF(rect)).toRect();
                 if (!nr.isEmpty())
                     rects.append(nr);
             }
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index 1e322d435a..b220770144 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -77,13 +77,13 @@ public:
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     // ### Qt 6: remove; the compiler-generated ones are fine!
-    QTransform &operator=(QTransform &&other) Q_DECL_NOTHROW // = default
+    QTransform &operator=(QTransform &&other) noexcept // = default
     { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(QTransform)); return *this; }
-    QTransform &operator=(const QTransform &) Q_DECL_NOTHROW; // = default
-    QTransform(QTransform &&other) Q_DECL_NOTHROW // = default
+    QTransform &operator=(const QTransform &) noexcept; // = default
+    QTransform(QTransform &&other) noexcept // = default
         : affine(Qt::Uninitialized)
     { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(QTransform)); }
-    QTransform(const QTransform &other) Q_DECL_NOTHROW // = default
+    QTransform(const QTransform &other) noexcept // = default
         : affine(Qt::Uninitialized)
     { memcpy(static_cast<void *>(this), static_cast<const void *>(&other), sizeof(QTransform)); }
 #endif
@@ -176,7 +176,9 @@ private:
         , m_13(h13), m_23(h23), m_33(h33)
         , m_type(TxNone)
         , m_dirty(TxProject)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         , d(nullptr)
+#endif
     {
     }
     inline QTransform(bool)
@@ -184,7 +186,9 @@ private:
         , m_13(0), m_23(0), m_33(1)
         , m_type(TxNone)
         , m_dirty(TxNone)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         , d(nullptr)
+#endif
     {
     }
     inline TransformationType inline_type() const;
@@ -202,7 +206,7 @@ private:
 };
 Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE);
 
-Q_GUI_EXPORT Q_DECL_CONST_FUNCTION uint qHash(const QTransform &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_GUI_EXPORT Q_DECL_CONST_FUNCTION uint qHash(const QTransform &key, uint seed = 0) noexcept;
 
 /******* inlines *****/
 inline QTransform::TransformationType QTransform::inline_type() const
diff --git a/src/gui/painting/qtriangulator_p.h b/src/gui/painting/qtriangulator_p.h
index 0abf87308a..177e5e66ed 100644
--- a/src/gui/painting/qtriangulator_p.h
+++ b/src/gui/painting/qtriangulator_p.h
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_GUI_EXPORT QVertexIndexVector
+class QVertexIndexVector
 {
 public:
     enum Type {
@@ -93,19 +93,6 @@ public:
         return indices16.size();
     }
 
-    QVertexIndexVector() = default;
-    QVertexIndexVector(const QVertexIndexVector &) = default;
-    inline QVertexIndexVector &operator = (const QVertexIndexVector &other)
-    {
-        if (t == UnsignedInt)
-            indices32 = other.indices32;
-        else
-            indices16 = other.indices16;
-
-        t = other.t;
-        return *this;
-    }
-
 private:
 
     Type t;
@@ -113,23 +100,15 @@ private:
     QVector<quint16> indices16;
 };
 
-struct Q_GUI_EXPORT QTriangleSet
+struct QTriangleSet
 {
-    inline QTriangleSet() { }
-    inline QTriangleSet(const QTriangleSet &other) : vertices(other.vertices), indices(other.indices) { }
-    QTriangleSet &operator = (const QTriangleSet &other) {vertices = other.vertices; indices = other.indices; return *this;}
-
     // The vertices of a triangle are given by: (x[i[n]], y[i[n]]), (x[j[n]], y[j[n]]), (x[k[n]], y[k[n]]), n = 0, 1, ...
     QVector<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...]
     QVertexIndexVector indices; // [i[0], j[0], k[0], i[1], j[1], k[1], i[2], ...]
 };
 
-struct Q_GUI_EXPORT QPolylineSet
+struct QPolylineSet
 {
-    inline QPolylineSet() { }
-    inline QPolylineSet(const QPolylineSet &other) : vertices(other.vertices), indices(other.indices) { }
-    QPolylineSet &operator = (const QPolylineSet &other) {vertices = other.vertices; indices = other.indices; return *this;}
-
     QVector<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...]
     QVertexIndexVector indices; // End of polyline is marked with -1.
 };
diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h
index 1b649a5d2a..df5772d4cc 100644
--- a/src/gui/painting/qvectorpath_p.h
+++ b/src/gui/painting/qvectorpath_p.h
@@ -106,7 +106,7 @@ public:
     // ### Falcon: introduca a struct XY for points so lars is not so confused...
     QVectorPath(const qreal *points,
                 int count,
-                const QPainterPath::ElementType *elements = 0,
+                const QPainterPath::ElementType *elements = nullptr,
                 uint hints = ArbitraryShapeHint)
         : m_elements(elements),
           m_points(points),
@@ -128,12 +128,12 @@ public:
     inline bool hasExplicitOpen() const { return m_hints & ExplicitOpen; }
     inline bool hasWindingFill() const { return m_hints & WindingFill; }
 
-    inline void makeCacheable() const { m_hints |= ShouldUseCacheHint; m_cache = 0; }
+    inline void makeCacheable() const { m_hints |= ShouldUseCacheHint; m_cache = nullptr; }
     inline uint hints() const { return m_hints; }
 
     inline const QPainterPath::ElementType *elements() const { return m_elements; }
     inline const qreal *points() const { return m_points; }
-    inline bool isEmpty() const { return m_points == 0; }
+    inline bool isEmpty() const { return m_points == nullptr; }
 
     inline int elementCount() const { return m_count; }
     inline const QPainterPath convertToPainterPath() const;
@@ -165,7 +165,7 @@ public:
                 return e;
             e = e->next;
         }
-        return 0;
+        return nullptr;
     }
 
     template <typename T> static inline bool isRect(const T *pts, int elementCount) {
diff --git a/src/gui/platform/wasm/qwasmlocalfileaccess.cpp b/src/gui/platform/wasm/qwasmlocalfileaccess.cpp
index 83f9415c69..85c894a74a 100644
--- a/src/gui/platform/wasm/qwasmlocalfileaccess.cpp
+++ b/src/gui/platform/wasm/qwasmlocalfileaccess.cpp
@@ -164,6 +164,43 @@ void openFile(const std::string &accept,
     openFiles(accept, FileSelectMode::SingleFile, fileDialogClosedWithInt, acceptFile, fileDataReady);
 }
 
+void saveFile(const char *content, size_t size, const std::string &fileNameHint)
+{
+    // Save a file by creating programatically clicking a download
+    // link to an object url to a Blob containing the file content.
+    // File content is copied once, so that the passed in content
+    // buffer can be released as soon as this function returns - we
+    // don't know for how long the browser will retain the TypedArray
+    // view used to create the Blob.
+
+    emscripten::val document = emscripten::val::global("document");
+    emscripten::val window = emscripten::val::global("window");
+
+    emscripten::val fileContentView = emscripten::val(emscripten::typed_memory_view(size, content));
+    emscripten::val fileContentCopy = emscripten::val::global("ArrayBuffer").new_(size);
+    emscripten::val fileContentCopyView = emscripten::val::global("Uint8Array").new_(fileContentCopy);
+    fileContentCopyView.call<void>("set", fileContentView);
+
+    emscripten::val contentArray = emscripten::val::array();
+    contentArray.call<void>("push", fileContentCopyView);
+    emscripten::val type = emscripten::val::object();
+    type.set("type","application/octet-stream");
+    emscripten::val contentBlob = emscripten::val::global("Blob").new_(contentArray, type);
+
+    emscripten::val contentUrl = window["URL"].call<emscripten::val>("createObjectURL", contentBlob);
+    emscripten::val contentLink = document.call<emscripten::val>("createElement", std::string("a"));
+    contentLink.set("href", contentUrl);
+    contentLink.set("download", fileNameHint);
+    contentLink.set("style", "display:none");
+
+    emscripten::val body = document["body"];
+    body.call<void>("appendChild", contentLink);
+    contentLink.call<void>("click");
+    body.call<void>("removeChild", contentLink);
+
+    window["URL"].call<emscripten::val>("revokeObjectURL", contentUrl);
+}
+
 } // namespace QWasmLocalFileAccess
 
 QT_END_NAMESPACE
diff --git a/src/gui/platform/wasm/qwasmlocalfileaccess_p.h b/src/gui/platform/wasm/qwasmlocalfileaccess_p.h
index 794db8d9b2..ccd88570c8 100644
--- a/src/gui/platform/wasm/qwasmlocalfileaccess_p.h
+++ b/src/gui/platform/wasm/qwasmlocalfileaccess_p.h
@@ -71,6 +71,8 @@ void openFile(const std::string &accept,
     const std::function<char *(uint64_t size, const std::string name)> &acceptFile,
     const std::function<void()> &fileDataReady);
 
+void saveFile(const char *content, size_t size, const std::string &fileNameHint);
+
 } // namespace QWasmLocalFileAccess
 
 QT_END_NAMESPACE
diff --git a/src/gui/rhi/cs_tdr_p.h b/src/gui/rhi/cs_tdr_p.h
new file mode 100644
index 0000000000..620a4a101d
--- /dev/null
+++ b/src/gui/rhi/cs_tdr_p.h
@@ -0,0 +1,225 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CS_TDR_P_H
+#define CS_TDR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+#ifdef Q_OS_WIN
+
+#include <qt_windows.h>
+
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 10.1
+//
+//
+// Buffer Definitions:
+//
+// cbuffer ConstantBuffer
+// {
+//
+//   uint zero;                         // Offset:    0 Size:     4
+//
+// }
+//
+//
+// Resource Bindings:
+//
+// Name                                 Type  Format         Dim      HLSL Bind  Count
+// ------------------------------ ---------- ------- ----------- -------------- ------
+// uav                                   UAV    uint         buf             u0      1
+// ConstantBuffer                    cbuffer      NA          NA            cb0      1
+//
+//
+//
+// Input signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// no Input
+//
+// Output signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// no Output
+cs_5_0
+dcl_globalFlags refactoringAllowed
+dcl_constantbuffer CB0[1], immediateIndexed
+dcl_uav_typed_buffer (uint,uint,uint,uint) u0
+dcl_input vThreadID.x
+dcl_thread_group 256, 1, 1
+loop
+  breakc_nz cb0[0].x
+  store_uav_typed u0.xyzw, vThreadID.xxxx, cb0[0].xxxx
+endloop
+ret
+// Approximately 5 instruction slots used
+#endif
+
+const BYTE g_killDeviceByTimingOut[] =
+{
+     68,  88,  66,  67, 217,  62,
+    220,  38, 136,  51,  86, 245,
+    161,  96,  18,  35, 141,  17,
+     26,  13,   1,   0,   0,   0,
+    164,   2,   0,   0,   5,   0,
+      0,   0,  52,   0,   0,   0,
+    100,   1,   0,   0, 116,   1,
+      0,   0, 132,   1,   0,   0,
+      8,   2,   0,   0,  82,  68,
+     69,  70,  40,   1,   0,   0,
+      1,   0,   0,   0, 144,   0,
+      0,   0,   2,   0,   0,   0,
+     60,   0,   0,   0,   0,   5,
+     83,  67,   0,   1,   0,   0,
+      0,   1,   0,   0,  82,  68,
+     49,  49,  60,   0,   0,   0,
+     24,   0,   0,   0,  32,   0,
+      0,   0,  40,   0,   0,   0,
+     36,   0,   0,   0,  12,   0,
+      0,   0,   0,   0,   0,   0,
+    124,   0,   0,   0,   4,   0,
+      0,   0,   4,   0,   0,   0,
+      1,   0,   0,   0, 255, 255,
+    255, 255,   0,   0,   0,   0,
+      1,   0,   0,   0,   0,   0,
+      0,   0, 128,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   1,   0,   0,   0,
+      0,   0,   0,   0, 117,  97,
+    118,   0,  67, 111, 110, 115,
+    116,  97, 110, 116,  66, 117,
+    102, 102, 101, 114,   0, 171,
+    128,   0,   0,   0,   1,   0,
+      0,   0, 168,   0,   0,   0,
+     16,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+    208,   0,   0,   0,   0,   0,
+      0,   0,   4,   0,   0,   0,
+      2,   0,   0,   0, 220,   0,
+      0,   0,   0,   0,   0,   0,
+    255, 255, 255, 255,   0,   0,
+      0,   0, 255, 255, 255, 255,
+      0,   0,   0,   0, 122, 101,
+    114, 111,   0, 100, 119, 111,
+    114, 100,   0, 171,   0,   0,
+     19,   0,   1,   0,   1,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+    213,   0,   0,   0,  77, 105,
+     99, 114, 111, 115, 111, 102,
+    116,  32,  40,  82,  41,  32,
+     72,  76,  83,  76,  32,  83,
+    104,  97, 100, 101, 114,  32,
+     67, 111, 109, 112, 105, 108,
+    101, 114,  32,  49,  48,  46,
+     49,   0,  73,  83,  71,  78,
+      8,   0,   0,   0,   0,   0,
+      0,   0,   8,   0,   0,   0,
+     79,  83,  71,  78,   8,   0,
+      0,   0,   0,   0,   0,   0,
+      8,   0,   0,   0,  83,  72,
+     69,  88, 124,   0,   0,   0,
+     80,   0,   5,   0,  31,   0,
+      0,   0, 106,   8,   0,   1,
+     89,   0,   0,   4,  70, 142,
+     32,   0,   0,   0,   0,   0,
+      1,   0,   0,   0, 156,   8,
+      0,   4,   0, 224,  17,   0,
+      0,   0,   0,   0,  68,  68,
+      0,   0,  95,   0,   0,   2,
+     18,   0,   2,   0, 155,   0,
+      0,   4,   0,   1,   0,   0,
+      1,   0,   0,   0,   1,   0,
+      0,   0,  48,   0,   0,   1,
+      3,   0,   4,   4,  10, 128,
+     32,   0,   0,   0,   0,   0,
+      0,   0,   0,   0, 164,   0,
+      0,   7, 242, 224,  17,   0,
+      0,   0,   0,   0,   6,   0,
+      2,   0,   6, 128,  32,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,  22,   0,   0,   1,
+     62,   0,   0,   1,  83,  84,
+     65,  84, 148,   0,   0,   0,
+      5,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      1,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   2,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      1,   0,   0,   0
+};
+
+#endif // Q_OS_WIN
+
+#endif // CS_TDR_P_H
diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
new file mode 100644
index 0000000000..8ef98d2e42
--- /dev/null
+++ b/src/gui/rhi/qrhi.cpp
@@ -0,0 +1,5709 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qrhi_p_p.h"
+#include <qmath.h>
+#include <QLoggingCategory>
+
+#include "qrhinull_p_p.h"
+#ifndef QT_NO_OPENGL
+#include "qrhigles2_p_p.h"
+#endif
+#if QT_CONFIG(vulkan)
+#include "qrhivulkan_p_p.h"
+#endif
+#ifdef Q_OS_WIN
+#include "qrhid3d11_p_p.h"
+#endif
+//#ifdef Q_OS_DARWIN
+#ifdef Q_OS_MACOS
+#include "qrhimetal_p_p.h"
+#endif
+
+QT_BEGIN_NAMESPACE
+
+Q_LOGGING_CATEGORY(QRHI_LOG_INFO, "qt.rhi.general")
+
+/*!
+    \class QRhi
+    \internal
+    \inmodule QtGui
+
+    \brief Accelerated 2D/3D graphics API abstraction.
+
+    The Qt Rendering Hardware Interface is an abstraction for hardware accelerated
+    graphics APIs, such as, \l{https://www.khronos.org/opengl/}{OpenGL},
+    \l{https://www.khronos.org/opengles/}{OpenGL ES},
+    \l{https://docs.microsoft.com/en-us/windows/desktop/direct3d}{Direct3D},
+    \l{https://developer.apple.com/metal/}{Metal}, and
+    \l{https://www.khronos.org/vulkan/}{Vulkan}.
+
+    Some of the main design goals are:
+
+    \list
+
+    \li Simple, minimal, understandable, extensible. Follow the proven path of the
+    Qt Quick scenegraph.
+
+    \li Aim to be a product - and in the bigger picture, part of a product (Qt) -
+    that is usable out of the box both by internal (such as, Qt Quick) and,
+    eventually, external users.
+
+    \li Not a complete 1:1 wrapper for any of the underlying APIs. The feature set
+    is tuned towards the needs of Qt's 2D and 3D offering (QPainter, Qt Quick, Qt
+    3D Studio). Iterate and evolve in a sustainable manner.
+
+    \li Intrinsically cross-platform, without reinventing: abstracting
+    cross-platform aspects of certain APIs (such as, OpenGL context creation and
+    windowing system interfaces, Vulkan instance and surface management) is not in
+    scope here. These are delegated to the existing QtGui facilities (QWindow,
+    QOpenGLContext, QVulkanInstance) and its backing QPA architecture.
+
+    \endlist
+
+    Each QRhi instance is backed by a backend for a specific graphics API. The
+    selection of the backend is a run time choice and is up to the application
+    or library that creates the QRhi instance. Some backends are available on
+    multiple platforms (OpenGL, Vulkan, Null), while APIs specific to a given
+    platform are only available when running on the platform in question (Metal
+    on macOS/iOS/tvOS, Direct3D on Windows).
+
+    The available backends currently are:
+
+    \list
+
+    \li OpenGL 2.1 or OpenGL ES 2.0 or newer. Some extensions are utilized when
+    present, for example to enable multisample framebuffers.
+
+    \li Direct3D 11.1
+
+    \li Metal
+
+    \li Vulkan 1.0, optionally with some extensions that are part of Vulkan 1.1
+
+    \li Null - A "dummy" backend that issues no graphics calls at all.
+
+    \endlist
+
+    In order to allow shader code to be written once in Qt applications and
+    libraries, all shaders are expected to be written in a single language
+    which is then compiled into SPIR-V. Versions for various shading language
+    are then generated from that, together with reflection information (inputs,
+    outputs, shader resources). This is then packed into easily and efficiently
+    serializable QShader instances. The compilers and tools to generate such
+    shaders are not part of QRhi, but the core classes for using such shaders,
+    QShader and QShaderDescription, are.
+
+    \section2 Design Fundamentals
+
+    A QRhi cannot be instantiated directly. Instead, use the create()
+    function. Delete the QRhi instance normally to release the graphics device.
+
+    \section3 Resources
+
+    Instances of classes deriving from QRhiResource, such as, QRhiBuffer,
+    QRhiTexture, etc., encapsulate zero, one, or more native graphics
+    resources. Instances of such classes are always created via the \c new
+    functions of the QRhi, such as, newBuffer(), newTexture(),
+    newTextureRenderTarget(), newSwapChain().
+
+    \badcode
+        vbuf = rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(vertexData));
+        if (!vbuf->build()) { error }
+        ...
+        delete vbuf;
+    \endcode
+
+    \list
+
+    \li The returned value from both create() and functions like newBuffer() is
+    owned by the caller.
+
+    \li Just creating a QRhiResource subclass never allocates or initializes any
+    native resources. That is only done when calling the \c build function of a
+    subclass, for example, QRhiBuffer::build() or QRhiTexture::build().
+
+    \li The exception is
+    QRhiTextureRenderTarget::newCompatibleRenderPassDescriptor() and
+    QRhiSwapChain::newCompatibleRenderPassDescriptor(). There is no \c build
+    operation for these and the returned object is immediately active.
+
+    \li The resource objects themselves are treated as immutable: once a
+    resource is built, changing any parameters via the setters, such as,
+    QRhiTexture::setPixelSize(), has no effect, unless the underlying native
+    resource is released and \c build is called again. See more about resource
+    reuse in the sections below.
+
+    \li The underlying native resources are scheduled for releasing by the
+    QRhiResource destructor, or by calling QRhiResource::release(). Backends
+    often queue release requests and defer executing them to an unspecified
+    time, this is hidden from the applications. This way applications do not
+    have to worry about releasing native resources that may still be in use by
+    an in-flight frame.
+
+    \li Note that this does not mean that a QRhiResource can freely be
+    destroyed or release()'d within a frame (that is, in a
+    \l{QRhiCommandBuffer::beginFrame()}{beginFrame()} -
+    \l{QRhiCommandBuffer::endFrame()}{endFrame()} section). As a general rule,
+    all referenced QRhiResource objects must stay unchanged until the frame is
+    submitted by calling \l{QRhiCommandBuffer::endFrame()}{endFrame()}. To ease
+    this, QRhiResource::releaseAndDestroyLater() is provided as a convenience.
+
+    \endlist
+
+    \section3 Command buffers and deferred command execution
+
+    Regardless of the design and capabilities of the underlying graphics API,
+    all QRhi backends implement some level of command buffers. No
+    QRhiCommandBuffer function issues any native bind or draw command (such as,
+    \c glDrawElements) directly. Commands are always recorded in a queue,
+    either native or provided by the QRhi backend. The command buffer is
+    submitted, and so execution starts only upon QRhi::endFrame() or
+    QRhi::finish().
+
+    The deferred nature has consequences for some types of objects. For example,
+    writing to a dynamic buffer multiple times within a frame, in case such
+    buffers are backed by host-visible memory, will result in making the
+    results of all writes are visible to all draw calls in the command buffer
+    of the frame, regardless of when the dynamic buffer update was recorded
+    relative to a draw call.
+
+    Furthermore, instances of QRhiResource subclasses must be treated immutable
+    within a frame in which they are referenced in any way. Create or rebuild
+    all resources upfront, before starting to record commands for the next
+    frame. Reusing a QRhiResource instance within a frame (by rebuilding it and
+    then referencing it again in the same \c{beginFrame - endFrame} section)
+    should be avoided as it may lead to unexpected results, depending on the
+    backend.
+
+    As a general rule, all referenced QRhiResource objects must stay valid and
+    unmodified until the frame is submitted by calling
+    \l{QRhiCommandBuffer::endFrame()}{endFrame()}. On the other hand, calling
+    \l{QRhiResource::release()}{release()} or destroying the QRhiResource are
+    always safe once the frame is submitted, regardless of the status of the
+    underlying native resources (which may still be in use by the GPU - but
+    that is taken care of internally).
+
+    Unlike APIs like OpenGL, upload and copy type of commands cannot be mixed
+    with draw commands. The typical renderer will involve a sequence similar to
+    the following: \c{(re)build resources} - \c{begin frame} - \c{record
+    uploads and copies} - \c{start renderpass} - \c{record draw calls} - \c{end
+    renderpass} - \c{end frame}. Recording copy type of operations happens via
+    QRhiResourceUpdateBatch. Such operations are committed typically on
+    \l{QRhiCommandBuffer::beginPass()}{beginPass()}.
+
+    When working with legacy rendering engines designed for OpenGL, the
+    migration to QRhi often involves redesigning from having a single \c render
+    step (that performs copies and uploads, clears buffers, and issues draw
+    calls, all mixed together) to a clearly separated, two phase \c prepare -
+    \c render setup where the \c render step only starts a renderpass and
+    records draw calls, while all resource creation and queuing of updates,
+    uploads and copies happens beforehand, in the \c prepare step.
+
+    QRhi does not at the moment allow freely creating and submitting command
+    buffers. This may be lifted in the future to some extent, in particular if
+    compute support is introduced, but the model of well defined
+    \c{frame-start} and \c{frame-end} points, combined with a dedicated,
+    "frame" command buffer, where \c{frame-end} implies presenting, is going to
+    remain the primary way of operating since this is what fits Qt's various UI
+    technologies best.
+
+    \section3 Threading
+
+    A QRhi instance and the associated resources can be created and used on any
+    thread but all usage must be limited to that one single thread. When
+    rendering to multiple QWindows in an application, having a dedicated thread
+    and QRhi instance for each window is often advisable, as this can eliminate
+    issues with unexpected throttling caused by presenting to multiple windows.
+    Conceptually that is then the same as how Qt Quick scene graph's threaded
+    render loop operates when working directly with OpenGL: one thread for each
+    window, one QOpenGLContext for each thread. When moving onto QRhi,
+    QOpenGLContext is replaced by QRhi, making the migration straightforward.
+
+    When it comes to externally created native objects, such as OpenGL contexts
+    passed in via QRhiGles2NativeHandles, it is up to the application to ensure
+    they are not misused by other threads.
+
+    Resources are not shareable between QRhi instances. This is an intentional
+    choice since QRhi hides most queue, command buffer, and resource
+    synchronization related tasks, and provides no API for them. Safe and
+    efficient concurrent use of graphics resources from multiple threads is
+    tied to those concepts, however, and is thus a topic that is currently out
+    of scope, but may be introduced in the future.
+
+    \note The Metal backend requires that an autorelease pool is available on
+    the rendering thread, ideally wrapping each iteration of the render loop.
+    This needs no action from the users of QRhi when rendering on the main
+    (gui) thread, but becomes important when a separate, dedicated render
+    thread is used.
+
+    \section3 Resource synchronization
+
+    QRhi does not expose APIs for resource barriers or image layout
+    transitions. Such synchronization is done implicitly by the backends, where
+    applicable (for example, Vulkan), by tracking resource usage as necessary.
+    Buffer and image barriers are inserted before render or compute passes
+    transparently to the application.
+
+    \note Resources within a render or compute pass are expected to be bound to
+    a single usage during that pass. For example, a buffer can be used as
+    vertex, index, uniform, or storage buffer, but not a combination of them
+    within a single pass. However, it is perfectly fine to use a buffer as a
+    storage buffer in a compute pass, and then as a vertex buffer in a render
+    pass, for example, assuming the buffer declared both usages upon creation.
+
+    \note Textures have this rule relaxed in certain cases, because using two
+    subresources (typically two different mip levels) of the same texture for
+    different access (one for load, one for store) is supported even within the
+    same pass.
+
+    \section3 Resource reuse
+
+    From the user's point of view a QRhiResource is reusable immediately after
+    calling QRhiResource::release(). With the exception of swapchains, calling
+    \c build() on an already built object does an implicit \c release(). This
+    provides a handy shortcut to reuse a QRhiResource instance with different
+    parameters, with a new native graphics object underneath.
+
+    The importance of reusing the same object lies in the fact that some
+    objects reference other objects: for example, a QRhiShaderResourceBindings
+    can reference QRhiBuffer, QRhiTexture, and QRhiSampler instances. If in a
+    later frame one of these buffers need to be resized or a sampler parameter
+    needs changing, destroying and creating a whole new QRhiBuffer or
+    QRhiSampler would invalidate all references to the old instance. By just
+    changing the appropriate parameters via QRhiBuffer::setSize() or similar
+    and then calling QRhiBuffer::build(), everything works as expected and
+    there is no need to touch the QRhiShaderResourceBindings at all, even
+    though there is a good chance that under the hood the QRhiBuffer is now
+    backed by a whole new native buffer.
+
+    \badcode
+        ubuf = rhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 256);
+        ubuf->build();
+
+        srb = rhi->newShaderResourceBindings()
+        srb->setBindings({
+            QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, ubuf)
+        });
+        srb->build();
+
+        ...
+
+        // now in a later frame we need to grow the buffer to a larger size
+        ubuf->setSize(512);
+        ubuf->build(); // same as ubuf->release(); ubuf->build();
+
+        // that's it, srb needs no changes whatsoever
+    \endcode
+
+    \section3 Pooled objects
+
+    In addition to resources, there are pooled objects as well, such as,
+    QRhiResourceUpdateBatch. An instance is retrieved via a \c next function,
+    such as, nextResourceUpdateBatch(). The caller does not own the returned
+    instance in this case. The only valid way of operating here is calling
+    functions on the QRhiResourceUpdateBatch and then passing it to
+    QRhiCommandBuffer::beginPass() or QRhiCommandBuffer::endPass(). These
+    functions take care of returning the batch to the pool. Alternatively, a
+    batch can be "canceled" and returned to the pool without processing by
+    calling QRhiResourceUpdateBatch::release().
+
+    A typical pattern is thus:
+
+    \badcode
+        QRhiResourceUpdateBatch *resUpdates = rhi->nextResourceUpdateBatch();
+        ...
+        resUpdates->updateDynamicBuffer(ubuf, 0, 64, mvp.constData());
+        if (!image.isNull()) {
+            resUpdates->uploadTexture(texture, image);
+            image = QImage();
+        }
+        ...
+        QRhiCommandBuffer *cb = m_sc->currentFrameCommandBuffer();
+        cb->beginPass(swapchain->currentFrameRenderTarget(), clearCol, clearDs, resUpdates);
+    \endcode
+
+    \section3 Swapchain specifics
+
+    QRhiSwapChain features some special semantics due to the peculiar nature of
+    swapchains.
+
+    \list
+
+    \li It has no \c build but rather a QRhiSwapChain::buildOrResize().
+    Repeatedly calling this function is \b not the same as calling
+    QRhiSwapChain::release() followed by QRhiSwapChain::buildOrResize(). This
+    is because swapchains often have ways to handle the case where buffers need
+    to be resized in a manner that is more efficient than a brute force
+    destroying and recreating from scratch.
+
+    \li An active QRhiSwapChain must be released by calling
+    \l{QRhiSwapChain::release()}{release()}, or by destroying the object, before
+    the QWindow's underlying QPlatformWindow, and so the associated native
+    window object, is destroyed. It should not be postponed because releasing
+    the swapchain may become problematic (and with some APIs, like Vulkan, is
+    explicitly disallowed) when the native window is not around anymore, for
+    example because the QPlatformWindow got destroyed upon getting a
+    QWindow::close(). Therefore, releasing the swapchain must happen whenever
+    the targeted QWindow sends the
+    QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed event. If the event does
+    not arrive before the destruction of the QWindow - this can happen when
+    using QCoreApplication::quit() -, then check QWindow::handle() after the
+    event loop exits and invoke the swapchain release when non-null (meaning
+    the underlying native window is still around).
+
+    \endlist
+
+    \section3 Ownership
+
+    The general rule is no ownership transfer. Creating a QRhi with an already
+    existing graphics device does not mean the QRhi takes ownership of the
+    device object. Similarly, ownership is not given away when a device or
+    texture object is "exported" via QRhi::nativeHandles() or
+    QRhiTexture::nativeHandles(). Most importantly, passing pointers in structs
+    and via setters does not transfer ownership.
+
+    \section2 Troubleshooting
+
+    Errors are printed to the output via qWarning(). Additional debug messages
+    can be enabled via the following logging categories. Messages from these
+    categories are not printed by default unless explicitly enabled via
+    QRhi::EnableProfiling or the facilities of QLoggingCategory (such as, the
+    \c QT_LOGGING_RULES environment variable).
+
+    \list
+    \li \c{qt.rhi.general}
+    \endlist
+
+    It is strongly advised to inspect the output with the logging categories
+    (\c{qt.rhi.*}) enabled whenever a QRhi-based application is not behaving as
+    expected.
+ */
+
+/*!
+    \enum QRhi::Implementation
+    Describes which graphics API-specific backend gets used by a QRhi instance.
+
+    \value Null
+    \value Vulkan
+    \value OpenGLES2
+    \value D3D11
+    \value Metal
+ */
+
+/*!
+    \enum QRhi::Flag
+    Describes what special features to enable.
+
+    \value EnableProfiling Enables gathering timing (CPU, GPU) and resource
+    (QRhiBuffer, QRhiTexture, etc.) information and additional metadata. See
+    QRhiProfiler. Avoid enabling in production builds as it may involve a
+    performance penalty. Also enables debug messages from the \c{qt.rhi.*}
+    logging categories.
+
+    \value EnableDebugMarkers Enables debug marker groups. Without this frame
+    debugging features like making debug groups and custom resource name
+    visible in external GPU debugging tools will not be available and functions
+    like QRhiCommandBuffer::debugMarkBegin() will become a no-op. Avoid
+    enabling in production builds as it may involve a performance penalty.
+
+    \value PreferSoftwareRenderer Indicates that backends should prefer
+    choosing an adapter or physical device that renders in software on the CPU.
+    For example, with Direct3D there is typically a "Basic Render Driver"
+    adapter available with \c{DXGI_ADAPTER_FLAG_SOFTWARE}. Setting this flag
+    requests the backend to choose that adapter over any other, as long as no
+    specific adapter was forced by other backend-specific means. With Vulkan
+    this maps to preferring physical devices with
+    \c{VK_PHYSICAL_DEVICE_TYPE_CPU}. When not available, or when it is not
+    possible to decide if an adapter/device is software-based, this flag is
+    ignored. It may also be ignored with graphics APIs that have no concept and
+    means of enumerating adapters/devices.
+ */
+
+/*!
+    \enum QRhi::FrameOpResult
+    Describes the result of operations that can have a soft failure.
+
+    \value FrameOpSuccess Success
+
+    \value FrameOpError Unspecified error
+
+    \value FrameOpSwapChainOutOfDate The swapchain is in an inconsistent state
+    internally. This can be recoverable by attempting to repeat the operation
+    (such as, beginFrame()) later.
+
+    \value FrameOpDeviceLost The graphics device was lost. This can be
+    recoverable by attempting to repeat the operation (such as, beginFrame())
+    after releasing and reinitializing all objects backed by native graphics
+    resources. See isDeviceLost().
+ */
+
+/*!
+    \enum QRhi::Feature
+    Flag values to indicate what features are supported by the backend currently in use.
+
+    \value MultisampleTexture Indicates that textures with a sample count larger
+    than 1 are supported.
+
+    \value MultisampleRenderBuffer Indicates that renderbuffers with a sample
+    count larger than 1 are supported.
+
+    \value DebugMarkers Indicates that debug marker groups (and so
+    QRhiCommandBuffer::debugMarkBegin()) are supported.
+
+    \value Timestamps Indicates that command buffer timestamps are supported.
+    Relevant for QRhiProfiler::gpuFrameTimes().
+
+    \value Instancing Indicates that instanced drawing is supported.
+
+    \value CustomInstanceStepRate Indicates that instance step rates other than
+    1 are supported.
+
+    \value PrimitiveRestart Indicates that restarting the assembly of
+    primitives when encountering an index value of 0xFFFF
+    (\l{QRhiCommandBuffer::IndexUInt16}{IndexUInt16}) or 0xFFFFFFFF
+    (\l{QRhiCommandBuffer::IndexUInt32}{IndexUInt32}) is enabled, for certain
+    primitive topologies at least. QRhi will try to enable this with all
+    backends, but in some cases it will not be supported. Dynamically
+    controlling primitive restart is not possible since with some APIs
+    primitive restart with a fixed index is always on. Applications must assume
+    that whenever this feature is reported as supported, the above mentioned
+    index values \c may be treated specially, depending on the topology. The
+    only two topologies where primitive restart is guaranteed to behave
+    identically across backends, as long as this feature is reported as
+    supported, are \l{QRhiGraphicsPipeline::LineStrip}{LineStrip} and
+    \l{QRhiGraphicsPipeline::TriangleStrip}{TriangleStrip}.
+
+    \value NonDynamicUniformBuffers Indicates that creating buffers with the
+    usage \l{QRhiBuffer::UniformBuffer}{UniformBuffer} and the types
+    \l{QRhiBuffer::Immutable}{Immutable} or \l{QRhiBuffer::Static}{Static} is
+    supported. When reported as unsupported, uniform (constant) buffers must be
+    created as \l{QRhiBuffer::Dynamic}{Dynamic}. (which is recommended
+    regardless)
+
+    \value NonFourAlignedEffectiveIndexBufferOffset Indicates that effective
+    index buffer offsets (\c{indexOffset + firstIndex * indexComponentSize})
+    that are not 4 byte aligned are supported. When not supported, attempting
+    to issue a \l{QRhiCommandBuffer::drawIndexed()}{drawIndexed()} with a
+    non-aligned effective offset may lead to unspecified behavior.
+
+    \value NPOTTextureRepeat Indicates that the
+    \l{QRhiSampler::Repeat}{Repeat} wrap mode and mipmap filtering modes are
+    supported for textures with a non-power-of-two size. In practice this can
+    only be false with OpenGL ES 2.0 implementations without
+    \c{GL_OES_texture_npot}.
+
+    \value RedOrAlpha8IsRed Indicates that the
+    \l{QRhiTexture::RED_OR_ALPHA8}{RED_OR_ALPHA8} format maps to a one
+    component 8-bit \c red format. This is the case for all backends except
+    OpenGL, where \c{GL_ALPHA}, a one component 8-bit \c alpha format, is used
+    instead. This is relevant for shader code that samples from the texture.
+
+    \value ElementIndexUint Indicates that 32-bit unsigned integer elements are
+    supported in the index buffer. In practice this is true everywhere except
+    when running on plain OpenGL ES 2.0 implementations without the necessary
+    extension. When false, only 16-bit unsigned elements are supported in the
+    index buffer.
+
+    \value Compute Indicates that compute shaders, image load/store, and
+    storage buffers are supported.
+
+    \value WideLines Indicates that lines with a width other than 1 are
+    supported. When reported as not supported, the line width set on the
+    graphics pipeline state is ignored. This can always be false with some
+    backends (D3D11, Metal). With Vulkan, the value depends on the
+    implementation.
+
+    \value VertexShaderPointSize Indicates that the size of rasterized points
+    set via \c{gl_PointSize} in the vertex shader is taken into account. When
+    reported as not supported, drawing points with a size other than 1 is not
+    supported. Setting \c{gl_PointSize} in the shader is still valid then, but
+    is ignored. (for example, when generating HLSL, the assignment is silently
+    dropped from the generated code) Note that some APIs (Metal, Vulkan)
+    require the point size to be set in the shader explicitly whenever drawing
+    points, even when the size is 1, as they do not automatically default to 1.
+
+    \value BaseVertex Indicates that \l{QRhiCommandBuffer::drawIndexed()}{drawIndexed()}
+    supports the \c vertexOffset argument. When reported as not supported, the
+    vertexOffset value in an indexed draw is ignored.
+
+    \value BaseInstance Indicates that instanced draw commands support the \c
+    firstInstance argument. When reported as not supported, the firstInstance
+    value is ignored and the instance ID starts from 0.
+
+    \value TriangleFanTopology Indicates that QRhiGraphicsPipeline::setTopology()
+    supports QRhiGraphicsPipeline::TriangleFan.
+
+    \value ReadBackNonUniformBuffer Indicates that
+    \l{QRhiResourceUpdateBatch::readBackBuffer()}{reading buffer contents} is
+    supported for QRhiBuffer instances with a usage different than
+    UniformBuffer. While this is supported in the majority of cases, it will be
+    unsupported with OpenGL ES older than 3.0.
+
+    \value ReadBackNonBaseMipLevel Indicates that specifying a mip level other
+    than 0 is supported when reading back texture contents. When not supported,
+    specifying a non-zero level in QRhiReadbackDescription leads to returning
+    an all-zero image. In practice this feature will be unsupported with OpenGL
+    ES 2.0, while it will likely be supported everywhere else.
+ */
+
+/*!
+    \enum QRhi::BeginFrameFlag
+    Flag values for QRhi::beginFrame()
+
+    \value ExternalContentsInPass Specifies that one or more render or compute
+    passes in this frame will call QRhiCommandBuffer::beginExternal(). Some
+    backends, Vulkan in particular, will fail if this flag is not set and
+    beginExternal() is still called.
+ */
+
+/*!
+    \enum QRhi::EndFrameFlag
+    Flag values for QRhi::endFrame()
+
+    \value SkipPresent Specifies that no present command is to be queued or no
+    swapBuffers call is to be made. This way no image is presented. Generating
+    multiple frames with all having this flag set is not recommended (except,
+    for example, for benchmarking purposes - but keep in mind that backends may
+    behave differently when it comes to waiting for command completion without
+    presenting so the results are not comparable between them)
+ */
+
+/*!
+    \enum QRhi::ResourceLimit
+    Describes the resource limit to query.
+
+    \value TextureSizeMin Minimum texture width and height. This is typically
+    1. The minimum texture size is handled gracefully, meaning attempting to
+    create a texture with an empty size will instead create a texture with the
+    minimum size.
+
+    \value TextureSizeMax Maximum texture width and height. This depends on the
+    graphics API and sometimes the platform or implementation as well.
+    Typically the value is in the range 4096 - 16384. Attempting to create
+    textures larger than this is expected to fail.
+
+    \value MaxColorAttachments The maximum number of color attachments for a
+    QRhiTextureRenderTarget, in case multiple render targets are supported. When
+    MRT is not supported, the value is 1. Otherwise this is typically 8, but
+    watch out for the fact that OpenGL only mandates 4 as the minimum, and that
+    is what some OpenGL ES implementations provide.
+
+    \value FramesInFlight The number of frames the backend may keep "in
+    flight". The value has no relevance, and is unspecified, with backends like
+    OpenGL and Direct3D 11. With backends like Vulkan or Metal, it is the
+    responsibility of QRhi to block whenever starting a new frame and finding
+    the CPU is already \c{N - 1} frames ahead of the GPU (because the command
+    buffer submitted in frame no. \c{current} - \c{N} has not yet completed).
+    The value N is what is returned from here, and is typically 2. This can be
+    relevant to applications that integrate rendering done directly with the
+    graphics API, as such rendering code may want to perform double (if the
+    value is 2) buffering for resources, such as, buffers, similarly to the
+    QRhi backends themselves. The current frame slot index (a value running 0,
+    1, .., N-1, then wrapping around) is retrievable from
+    QRhi::currentFrameSlot().
+ */
+
+/*!
+    \class QRhiInitParams
+    \internal
+    \inmodule QtGui
+    \brief Base class for backend-specific initialization parameters.
+
+    Contains fields that are relevant to all backends.
+ */
+
+/*!
+    \class QRhiDepthStencilClearValue
+    \internal
+    \inmodule QtGui
+    \brief Specifies clear values for a depth or stencil buffer.
+ */
+
+/*!
+    \fn QRhiDepthStencilClearValue::QRhiDepthStencilClearValue()
+
+    Constructs a depth/stencil clear value with depth clear value 1.0f and
+    stencil clear value 0.
+ */
+
+/*!
+    Constructs a depth/stencil clear value with depth clear value \a d and
+    stencil clear value \a s.
+ */
+QRhiDepthStencilClearValue::QRhiDepthStencilClearValue(float d, quint32 s)
+    : m_d(d),
+      m_s(s)
+{
+}
+
+/*!
+    \return \c true if the values in the two QRhiDepthStencilClearValue objects
+    \a a and \a b are equal.
+
+    \relates QRhiDepthStencilClearValue
+ */
+bool operator==(const QRhiDepthStencilClearValue &a, const QRhiDepthStencilClearValue &b) Q_DECL_NOTHROW
+{
+    return a.depthClearValue() == b.depthClearValue()
+            && a.stencilClearValue() == b.stencilClearValue();
+}
+
+/*!
+    \return \c false if the values in the two QRhiDepthStencilClearValue
+    objects \a a and \a b are equal; otherwise returns \c true.
+
+    \relates QRhiDepthStencilClearValue
+*/
+bool operator!=(const QRhiDepthStencilClearValue &a, const QRhiDepthStencilClearValue &b) Q_DECL_NOTHROW
+{
+    return !(a == b);
+}
+
+/*!
+    \return the hash value for \a v, using \a seed to seed the calculation.
+
+    \relates QRhiDepthStencilClearValue
+ */
+uint qHash(const QRhiDepthStencilClearValue &v, uint seed) Q_DECL_NOTHROW
+{
+    return seed * (uint(qFloor(qreal(v.depthClearValue()) * 100)) + v.stencilClearValue());
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QRhiDepthStencilClearValue &v)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "QRhiDepthStencilClearValue(depth-clear=" << v.depthClearValue()
+                  << " stencil-clear=" << v.stencilClearValue()
+                  << ')';
+    return dbg;
+}
+#endif
+
+/*!
+    \class QRhiViewport
+    \internal
+    \inmodule QtGui
+    \brief Specifies a viewport rectangle.
+
+    Used with QRhiCommandBuffer::setViewport().
+
+    QRhi assumes OpenGL-style viewport coordinates, meaning x and y are
+    bottom-left. Negative width or height are not allowed.
+
+    Typical usage is like the following:
+
+    \badcode
+      const QSize outputSizeInPixels = swapchain->currentPixelSize();
+      const QRhiViewport viewport(0, 0, outputSizeInPixels.width(), outputSizeInPixels.height());
+      cb->beginPass(swapchain->currentFrameRenderTarget(), { 0, 0, 0, 1 }, { 1, 0 });
+      cb->setGraphicsPipeline(ps);
+      cb->setViewport(viewport);
+      ...
+    \endcode
+
+    \sa QRhiCommandBuffer::setViewport(), QRhi::clipSpaceCorrMatrix(), QRhiScissor
+ */
+
+/*!
+    \fn QRhiViewport::QRhiViewport()
+
+    Constructs a viewport description with an empty rectangle and a depth range
+    of 0.0f - 1.0f.
+
+    \sa QRhi::clipSpaceCorrMatrix()
+ */
+
+/*!
+    Constructs a viewport description with the rectangle specified by \a x, \a
+    y, \a w, \a h and the depth range \a minDepth and \a maxDepth.
+
+    \note \a x and \a y are assumed to be the bottom-left position. \a w and \a
+    h should not be negative, the viewport will be ignored by
+    QRhiCommandBuffer::setViewport() otherwise.
+
+    \sa QRhi::clipSpaceCorrMatrix()
+ */
+QRhiViewport::QRhiViewport(float x, float y, float w, float h, float minDepth, float maxDepth)
+    : m_rect { { x, y, w, h } },
+      m_minDepth(minDepth),
+      m_maxDepth(maxDepth)
+{
+}
+
+/*!
+    \return \c true if the values in the two QRhiViewport objects
+    \a a and \a b are equal.
+
+    \relates QRhiViewport
+ */
+bool operator==(const QRhiViewport &a, const QRhiViewport &b) Q_DECL_NOTHROW
+{
+    return a.viewport() == b.viewport()
+            && a.minDepth() == b.minDepth()
+            && a.maxDepth() == b.maxDepth();
+}
+
+/*!
+    \return \c false if the values in the two QRhiViewport
+    objects \a a and \a b are equal; otherwise returns \c true.
+
+    \relates QRhiViewport
+*/
+bool operator!=(const QRhiViewport &a, const QRhiViewport &b) Q_DECL_NOTHROW
+{
+    return !(a == b);
+}
+
+/*!
+    \return the hash value for \a v, using \a seed to seed the calculation.
+
+    \relates QRhiViewport
+ */
+uint qHash(const QRhiViewport &v, uint seed) Q_DECL_NOTHROW
+{
+    const std::array<float, 4> r = v.viewport();
+    return seed + uint(r[0]) + uint(r[1]) + uint(r[2]) + uint(r[3])
+            + uint(qFloor(qreal(v.minDepth()) * 100)) + uint(qFloor(qreal(v.maxDepth()) * 100));
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QRhiViewport &v)
+{
+    QDebugStateSaver saver(dbg);
+    const std::array<float, 4> r = v.viewport();
+    dbg.nospace() << "QRhiViewport(bottom-left-x=" << r[0]
+                  << " bottom-left-y=" << r[1]
+                  << " width=" << r[2]
+                  << " height=" << r[3]
+                  << " minDepth=" << v.minDepth()
+                  << " maxDepth=" << v.maxDepth()
+                  << ')';
+    return dbg;
+}
+#endif
+
+/*!
+    \class QRhiScissor
+    \internal
+    \inmodule QtGui
+    \brief Specifies a scissor rectangle.
+
+    Used with QRhiCommandBuffer::setScissor(). Setting a scissor rectangle is
+    only possible with a QRhiGraphicsPipeline that has
+    QRhiGraphicsPipeline::UsesScissor set.
+
+    QRhi assumes OpenGL-style scissor coordinates, meaning x and y are
+    bottom-left. Negative width or height are not allowed. However, apart from
+    that, the flexible OpenGL semantics apply: negative x and y, partially out
+    of bounds rectangles, etc. will be handled gracefully, clamping as
+    appropriate. Therefore, any rendering logic targeting OpenGL can feed
+    scissor rectangles into QRhiScissor as-is, without any adaptation.
+
+    \sa QRhiCommandBuffer::setScissor(), QRhiViewport
+ */
+
+/*!
+    \fn QRhiScissor::QRhiScissor()
+
+    Constructs an empty scissor.
+ */
+
+/*!
+    Constructs a scissor with the rectangle specified by \a x, \a y, \a w, and
+    \a h.
+
+    \note \a x and \a y are assumed to be the bottom-left position. Negative \a w
+    or \a h are not allowed, such scissor rectangles will be ignored by
+    QRhiCommandBuffer. Other than that, the flexible OpenGL semantics apply:
+    negative x and y, partially out of bounds rectangles, etc. will be handled
+    gracefully, clamping as appropriate.
+ */
+QRhiScissor::QRhiScissor(int x, int y, int w, int h)
+    : m_rect { { x, y, w, h } }
+{
+}
+
+/*!
+    \return \c true if the values in the two QRhiScissor objects
+    \a a and \a b are equal.
+
+    \relates QRhiScissor
+ */
+bool operator==(const QRhiScissor &a, const QRhiScissor &b) Q_DECL_NOTHROW
+{
+    return a.scissor() == b.scissor();
+}
+
+/*!
+    \return \c false if the values in the two QRhiScissor
+    objects \a a and \a b are equal; otherwise returns \c true.
+
+    \relates QRhiScissor
+*/
+bool operator!=(const QRhiScissor &a, const QRhiScissor &b) Q_DECL_NOTHROW
+{
+    return !(a == b);
+}
+
+/*!
+    \return the hash value for \a v, using \a seed to seed the calculation.
+
+    \relates QRhiScissor
+ */
+uint qHash(const QRhiScissor &v, uint seed) Q_DECL_NOTHROW
+{
+    const std::array<int, 4> r = v.scissor();
+    return seed + uint(r[0]) + uint(r[1]) + uint(r[2]) + uint(r[3]);
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QRhiScissor &s)
+{
+    QDebugStateSaver saver(dbg);
+    const std::array<int, 4> r = s.scissor();
+    dbg.nospace() << "QRhiScissor(bottom-left-x=" << r[0]
+                  << " bottom-left-y=" << r[1]
+                  << " width=" << r[2]
+                  << " height=" << r[3]
+                  << ')';
+    return dbg;
+}
+#endif
+
+/*!
+    \class QRhiVertexInputBinding
+    \internal
+    \inmodule QtGui
+    \brief Describes a vertex input binding.
+
+    Specifies the stride (in bytes, must be a multiple of 4), the
+    classification and optionally the instance step rate.
+
+    As an example, assume a vertex shader with the following inputs:
+
+    \badcode
+        layout(location = 0) in vec4 position;
+        layout(location = 1) in vec2 texcoord;
+    \endcode
+
+    Now let's assume also that 3 component vertex positions \c{(x, y, z)} and 2
+    component texture coordinates \c{(u, v)} are provided in a non-interleaved
+    format in a buffer (or separate buffers even). Definining two bindings
+    could then be done like this:
+
+    \badcode
+        QRhiVertexInputLayout inputLayout;
+        inputLayout.setBindings({
+            { 3 * sizeof(float) },
+            { 2 * sizeof(float) }
+        });
+    \endcode
+
+    Only the stride is interesting here since instancing is not used. The
+    binding number is given by the index of the QRhiVertexInputBinding
+    element in the bindings vector of the QRhiVertexInputLayout.
+
+    Once a graphics pipeline with this vertex input layout is bound, the vertex
+    inputs could be set up like the following for drawing a cube with 36
+    vertices, assuming we have a single buffer with first the positions and
+    then the texture coordinates:
+
+    \badcode
+        const QRhiCommandBuffer::VertexInput vbufBindings[] = {
+            { cubeBuf, 0 },
+            { cubeBuf, 36 * 3 * sizeof(float) }
+        };
+        cb->setVertexInput(0, 2, vbufBindings);
+    \endcode
+
+    Note how the index defined by \c {startBinding + i}, where \c i is the
+    index in the second argument of
+    \l{QRhiCommandBuffer::setVertexInput()}{setVertexInput()}, matches the
+    index of the corresponding entry in the \c bindings vector of the
+    QRhiVertexInputLayout.
+
+    \note the stride must always be a multiple of 4.
+
+    \sa QRhiCommandBuffer::setVertexInput()
+ */
+
+/*!
+    \enum QRhiVertexInputBinding::Classification
+    Describes the input data classification.
+
+    \value PerVertex Data is per-vertex
+    \value PerInstance Data is per-instance
+ */
+
+/*!
+    \fn QRhiVertexInputBinding::QRhiVertexInputBinding()
+
+    Constructs a default vertex input binding description.
+ */
+
+/*!
+    Constructs a vertex input binding description with the specified \a stride,
+    classification \a cls, and instance step rate \a stepRate.
+
+    \note \a stepRate other than 1 is only supported when
+    QRhi::CustomInstanceStepRate is reported to be supported.
+ */
+QRhiVertexInputBinding::QRhiVertexInputBinding(quint32 stride, Classification cls, int stepRate)
+    : m_stride(stride),
+      m_classification(cls),
+      m_instanceStepRate(stepRate)
+{
+}
+
+/*!
+    \return \c true if the values in the two QRhiVertexInputBinding objects
+    \a a and \a b are equal.
+
+    \relates QRhiVertexInputBinding
+ */
+bool operator==(const QRhiVertexInputBinding &a, const QRhiVertexInputBinding &b) Q_DECL_NOTHROW
+{
+    return a.stride() == b.stride()
+            && a.classification() == b.classification()
+            && a.instanceStepRate() == b.instanceStepRate();
+}
+
+/*!
+    \return \c false if the values in the two QRhiVertexInputBinding
+    objects \a a and \a b are equal; otherwise returns \c true.
+
+    \relates QRhiVertexInputBinding
+*/
+bool operator!=(const QRhiVertexInputBinding &a, const QRhiVertexInputBinding &b) Q_DECL_NOTHROW
+{
+    return !(a == b);
+}
+
+/*!
+    \return the hash value for \a v, using \a seed to seed the calculation.
+
+    \relates QRhiVertexInputBinding
+ */
+uint qHash(const QRhiVertexInputBinding &v, uint seed) Q_DECL_NOTHROW
+{
+    return seed + v.stride() + v.classification();
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QRhiVertexInputBinding &b)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "QRhiVertexInputBinding(stride=" << b.stride()
+                  << " cls=" << b.classification()
+                  << " step-rate=" << b.instanceStepRate()
+                  << ')';
+    return dbg;
+}
+#endif
+
+/*!
+    \class QRhiVertexInputAttribute
+    \internal
+    \inmodule QtGui
+    \brief Describes a single vertex input element.
+
+    The members specify the binding number, location, format, and offset for a
+    single vertex input element.
+
+    \note For HLSL it is assumed that the vertex shader uses
+    \c{TEXCOORD<location>} as the semantic for each input. Hence no separate
+    semantic name and index.
+
+    As an example, assume a vertex shader with the following inputs:
+
+    \badcode
+        layout(location = 0) in vec4 position;
+        layout(location = 1) in vec2 texcoord;
+    \endcode
+
+    Now let's assume that we have 3 component vertex positions \c{(x, y, z)}
+    and 2 component texture coordinates \c{(u, v)} are provided in a
+    non-interleaved format in a buffer (or separate buffers even). Once two
+    bindings are defined, the attributes could be specified as:
+
+    \badcode
+        QRhiVertexInputLayout inputLayout;
+        inputLayout.setBindings({
+            { 3 * sizeof(float) },
+            { 2 * sizeof(float) }
+        });
+        inputLayout.setAttributes({
+            { 0, 0, QRhiVertexInputAttribute::Float3, 0 },
+            { 1, 1, QRhiVertexInputAttribute::Float2, 0 }
+        });
+    \endcode
+
+    Once a graphics pipeline with this vertex input layout is bound, the vertex
+    inputs could be set up like the following for drawing a cube with 36
+    vertices, assuming we have a single buffer with first the positions and
+    then the texture coordinates:
+
+    \badcode
+        const QRhiCommandBuffer::VertexInput vbufBindings[] = {
+            { cubeBuf, 0 },
+            { cubeBuf, 36 * 3 * sizeof(float) }
+        };
+        cb->setVertexInput(0, 2, vbufBindings);
+    \endcode
+
+    When working with interleaved data, there will typically be just one
+    binding, with multiple attributes referring to that same buffer binding
+    point:
+
+    \badcode
+        QRhiVertexInputLayout inputLayout;
+        inputLayout.setBindings({
+            { 5 * sizeof(float) }
+        });
+        inputLayout.setAttributes({
+            { 0, 0, QRhiVertexInputAttribute::Float3, 0 },
+            { 0, 1, QRhiVertexInputAttribute::Float2, 3 * sizeof(float) }
+        });
+    \endcode
+
+    and then:
+
+    \badcode
+        const QRhiCommandBuffer::VertexInput vbufBinding(interleavedCubeBuf, 0);
+        cb->setVertexInput(0, 1, &vbufBinding);
+    \endcode
+
+    \sa QRhiCommandBuffer::setVertexInput()
+ */
+
+/*!
+    \enum QRhiVertexInputAttribute::Format
+    Specifies the type of the element data.
+
+    \value Float4 Four component float vector
+    \value Float3 Three component float vector
+    \value Float2 Two component float vector
+    \value Float Float
+    \value UNormByte4 Four component normalized unsigned byte vector
+    \value UNormByte2 Two component normalized unsigned byte vector
+    \value UNormByte Normalized unsigned byte
+ */
+
+/*!
+    \fn QRhiVertexInputAttribute::QRhiVertexInputAttribute()
+
+    Constructs a default vertex input attribute description.
+ */
+
+/*!
+    Constructs a vertex input attribute description with the specified \a
+    binding number, \a location, \a format, and \a offset.
+ */
+QRhiVertexInputAttribute::QRhiVertexInputAttribute(int binding, int location, Format format, quint32 offset)
+    : m_binding(binding),
+      m_location(location),
+      m_format(format),
+      m_offset(offset)
+{
+}
+
+/*!
+    \return \c true if the values in the two QRhiVertexInputAttribute objects
+    \a a and \a b are equal.
+
+    \relates QRhiVertexInputAttribute
+ */
+bool operator==(const QRhiVertexInputAttribute &a, const QRhiVertexInputAttribute &b) Q_DECL_NOTHROW
+{
+    return a.binding() == b.binding()
+            && a.location() == b.location()
+            && a.format() == b.format()
+            && a.offset() == b.offset();
+}
+
+/*!
+    \return \c false if the values in the two QRhiVertexInputAttribute
+    objects \a a and \a b are equal; otherwise returns \c true.
+
+    \relates QRhiVertexInputAttribute
+*/
+bool operator!=(const QRhiVertexInputAttribute &a, const QRhiVertexInputAttribute &b) Q_DECL_NOTHROW
+{
+    return !(a == b);
+}
+
+/*!
+    \return the hash value for \a v, using \a seed to seed the calculation.
+
+    \relates QRhiVertexInputAttribute
+ */
+uint qHash(const QRhiVertexInputAttribute &v, uint seed) Q_DECL_NOTHROW
+{
+    return seed + uint(v.binding()) + uint(v.location()) + uint(v.format()) + v.offset();
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QRhiVertexInputAttribute &a)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "QRhiVertexInputAttribute(binding=" << a.binding()
+                  << " location=" << a.location()
+                  << " format=" << a.format()
+                  << " offset=" << a.offset()
+                  << ')';
+    return dbg;
+}
+#endif
+
+/*!
+    \class QRhiVertexInputLayout
+    \internal
+    \inmodule QtGui
+    \brief Describes the layout of vertex inputs consumed by a vertex shader.
+
+    The vertex input layout is defined by the collections of
+    QRhiVertexInputBinding and QRhiVertexInputAttribute.
+ */
+
+/*!
+    \fn QRhiVertexInputLayout::QRhiVertexInputLayout()
+
+    Constructs an empty vertex input layout description.
+ */
+
+/*!
+    \return \c true if the values in the two QRhiVertexInputLayout objects
+    \a a and \a b are equal.
+
+    \relates QRhiVertexInputLayout
+ */
+bool operator==(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) Q_DECL_NOTHROW
+{
+    return a.m_bindings == b.m_bindings && a.m_attributes == b.m_attributes;
+}
+
+/*!
+    \return \c false if the values in the two QRhiVertexInputLayout
+    objects \a a and \a b are equal; otherwise returns \c true.
+
+    \relates QRhiVertexInputLayout
+*/
+bool operator!=(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) Q_DECL_NOTHROW
+{
+    return !(a == b);
+}
+
+/*!
+    \return the hash value for \a v, using \a seed to seed the calculation.
+
+    \relates QRhiVertexInputLayout
+ */
+uint qHash(const QRhiVertexInputLayout &v, uint seed) Q_DECL_NOTHROW
+{
+    return qHash(v.m_bindings, seed) + qHash(v.m_attributes, seed);
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+template<typename T, int N>
+QDebug operator<<(QDebug dbg, const QVarLengthArray<T, N> &vla)
+{
+    return QtPrivate::printSequentialContainer(dbg, "VLA", vla);
+}
+
+QDebug operator<<(QDebug dbg, const QRhiVertexInputLayout &v)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "QRhiVertexInputLayout(bindings=" << v.m_bindings
+                  << " attributes=" << v.m_attributes
+                  << ')';
+    return dbg;
+}
+#endif
+
+/*!
+    \class QRhiShaderStage
+    \internal
+    \inmodule QtGui
+    \brief Specifies the type and the shader code for a shader stage in the pipeline.
+ */
+
+/*!
+    \enum QRhiShaderStage::Type
+    Specifies the type of the shader stage.
+
+    \value Vertex Vertex stage
+    \value Fragment Fragment (pixel) stage
+    \value Compute Compute stage (this may not always be supported at run time)
+ */
+
+/*!
+    \fn QRhiShaderStage::QRhiShaderStage()
+
+    Constructs a shader stage description for the vertex stage with an empty
+    QShader.
+ */
+
+/*!
+    Constructs a shader stage description with the \a type of the stage and the
+    \a shader.
+
+    The shader variant \a v defaults to QShader::StandardShader. A
+    QShader contains multiple source and binary versions of a shader.
+    In addition, it can also contain variants of the shader with slightly
+    modified code. \a v can then be used to select the desired variant.
+ */
+QRhiShaderStage::QRhiShaderStage(Type type, const QShader &shader, QShader::Variant v)
+    : m_type(type),
+      m_shader(shader),
+      m_shaderVariant(v)
+{
+}
+
+/*!
+    \return \c true if the values in the two QRhiShaderStage objects
+    \a a and \a b are equal.
+
+    \relates QRhiShaderStage
+ */
+bool operator==(const QRhiShaderStage &a, const QRhiShaderStage &b) Q_DECL_NOTHROW
+{
+    return a.type() == b.type()
+            && a.shader() == b.shader()
+            && a.shaderVariant() == b.shaderVariant();
+}
+
+/*!
+    \return \c false if the values in the two QRhiShaderStage
+    objects \a a and \a b are equal; otherwise returns \c true.
+
+    \relates QRhiShaderStage
+*/
+bool operator!=(const QRhiShaderStage &a, const QRhiShaderStage &b) Q_DECL_NOTHROW
+{
+    return !(a == b);
+}
+
+/*!
+    \return the hash value for \a v, using \a seed to seed the calculation.
+
+    \relates QRhiShaderStage
+ */
+uint qHash(const QRhiShaderStage &v, uint seed) Q_DECL_NOTHROW
+{
+    return v.type() + qHash(v.shader(), seed) + v.shaderVariant();
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QRhiShaderStage &s)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "QRhiShaderStage(type=" << s.type()
+                  << " shader=" << s.shader()
+                  << " variant=" << s.shaderVariant()
+                  << ')';
+    return dbg;
+}
+#endif
+
+/*!
+    \class QRhiColorAttachment
+    \internal
+    \inmodule QtGui
+    \brief Describes the a single color attachment of a render target.
+
+    A color attachment is either a QRhiTexture or a QRhiRenderBuffer. The
+    former, when texture() is set, is used in most cases.
+
+    \note texture() and renderBuffer() cannot be both set (be non-null at the
+    same time).
+
+    Setting renderBuffer instead is recommended only when multisampling is
+    needed. Relying on QRhi::MultisampleRenderBuffer is a better choice than
+    QRhi::MultisampleTexture in practice since the former is available in more
+    run time configurations (e.g. when running on OpenGL ES 3.0 which has no
+    support for multisample textures, but does support multisample
+    renderbuffers).
+
+    When targeting a non-multisample texture, the layer() and level()
+    indicate the targeted layer (face index \c{0-5} for cubemaps) and mip
+    level.
+
+    When texture() or renderBuffer() is multisample, resolveTexture() can be
+    set optionally. When set, samples are resolved automatically into that
+    (non-multisample) texture at the end of the render pass. When rendering
+    into a multisample renderbuffers, this is the only way to get resolved,
+    non-multisample content out of them. Multisample textures allow sampling in
+    shaders so for them this is just one option.
+
+    \note when resolving is enabled, the multisample data may not be written
+    out at all. This means that the multisample texture() must not be used
+    afterwards with shaders for sampling when resolveTexture() is set.
+ */
+
+/*!
+    \fn QRhiColorAttachment::QRhiColorAttachment()
+
+    Constructs an empty color attachment description.
+ */
+
+/*!
+    Constructs a color attachment description that specifies \a texture as the
+    associated color buffer.
+ */
+QRhiColorAttachment::QRhiColorAttachment(QRhiTexture *texture)
+    : m_texture(texture)
+{
+}
+
+/*!
+    Constructs a color attachment description that specifies \a renderBuffer as
+    the associated color buffer.
+ */
+QRhiColorAttachment::QRhiColorAttachment(QRhiRenderBuffer *renderBuffer)
+    : m_renderBuffer(renderBuffer)
+{
+}
+
+/*!
+    \class QRhiTextureRenderTargetDescription
+    \internal
+    \inmodule QtGui
+    \brief Describes the color and depth or depth/stencil attachments of a render target.
+
+    A texture render target has zero or more textures as color attachments,
+    zero or one renderbuffer as combined depth/stencil buffer or zero or one
+    texture as depth buffer.
+
+    \note depthStencilBuffer() and depthTexture() cannot be both set (cannot be
+    non-null at the same time).
+ */
+
+/*!
+    \fn QRhiTextureRenderTargetDescription::QRhiTextureRenderTargetDescription()
+
+    Constructs an empty texture render target description.
+ */
+
+/*!
+    Constructs a texture render target description with one attachment
+    described by \a colorAttachment.
+ */
+QRhiTextureRenderTargetDescription::QRhiTextureRenderTargetDescription(const QRhiColorAttachment &colorAttachment)
+{
+    m_colorAttachments.append(colorAttachment);
+}
+
+/*!
+    Constructs a texture render target description with two attachments, a
+    color attachment described by \a colorAttachment, and a depth/stencil
+    attachment with \a depthStencilBuffer.
+ */
+QRhiTextureRenderTargetDescription::QRhiTextureRenderTargetDescription(const QRhiColorAttachment &colorAttachment,
+                                                                       QRhiRenderBuffer *depthStencilBuffer)
+    : m_depthStencilBuffer(depthStencilBuffer)
+{
+    m_colorAttachments.append(colorAttachment);
+}
+
+/*!
+    Constructs a texture render target description with two attachments, a
+    color attachment described by \a colorAttachment, and a depth attachment
+    with \a depthTexture.
+
+    \note \a depthTexture must have a suitable format, such as QRhiTexture::D16
+    or QRhiTexture::D32F.
+ */
+QRhiTextureRenderTargetDescription::QRhiTextureRenderTargetDescription(const QRhiColorAttachment &colorAttachment,
+                                                                       QRhiTexture *depthTexture)
+    : m_depthTexture(depthTexture)
+{
+    m_colorAttachments.append(colorAttachment);
+}
+
+/*!
+    \class QRhiTextureSubresourceUploadDescription
+    \internal
+    \inmodule QtGui
+    \brief Describes the source for one mip level in a layer in a texture upload operation.
+
+    The source content is specified either as a QImage or as a raw blob. The
+    former is only allowed for uncompressed textures with a format that can be
+    mapped to QImage, while the latter is supported for all formats, including
+    floating point and compressed.
+
+    \note image() and data() cannot be both set at the same time.
+
+    destinationTopLeft() specifies the top-left corner of the target
+    rectangle. Defaults to (0, 0).
+
+    An empty sourceSize() (the default) indicates that size is assumed to be
+    the size of the subresource. With QImage-based uploads this implies that
+    the size of the source image() must match the subresource. When providing
+    raw data instead, sufficient number of bytes must be provided in data().
+
+    \note With compressed textures the first upload must always match the
+    subresource size due to graphics API limitations with some backends.
+
+    sourceTopLeft() is supported only for QImage-based uploads, and specifies
+    the top-left corner of the source rectangle.
+
+    \note Setting sourceSize() or sourceTopLeft() may trigger a QImage copy
+    internally, depending on the format and the backend.
+
+    When providing raw data, the stride (row pitch, row length in bytes) of the
+    provided data must be equal to \c{width * pixelSize} where \c pixelSize is
+    the number of bytes used for one pixel, and there must be no additional
+    padding between rows. There is no row start alignment requirement.
+
+    \note The format of the source data must be compatible with the texture
+    format. With many graphics APIs the data is copied as-is into a staging
+    buffer, there is no intermediate format conversion provided by QRhi. This
+    applies to floating point formats as well, with, for example, RGBA16F
+    requiring half floats in the source data.
+ */
+
+/*!
+    \fn QRhiTextureSubresourceUploadDescription::QRhiTextureSubresourceUploadDescription()
+
+    Constructs an empty subresource description.
+
+    \note an empty QRhiTextureSubresourceUploadDescription is not useful on its
+    own and should not be submitted to a QRhiTextureUploadEntry. At minimum
+    image or data must be set first.
+ */
+
+/*!
+    Constructs a mip level description with a \a image.
+
+    The \l{QImage::size()}{size} of \a image must match the size of the mip
+    level. For level 0 that is the \l{QRhiTexture::pixelSize()}{texture size}.
+
+    The bit depth of \a image must be compatible with the
+    \l{QRhiTexture::Format}{texture format}.
+
+    To describe a partial upload, call setSourceSize(), setSourceTopLeft(), or
+    setDestinationTopLeft() afterwards.
+ */
+QRhiTextureSubresourceUploadDescription::QRhiTextureSubresourceUploadDescription(const QImage &image)
+    : m_image(image)
+{
+}
+
+/*!
+    Constructs a mip level description with the image data is specified by \a
+    data and \a size. This is suitable for floating point and compressed
+    formats as well.
+
+    \a data can safely be destroyed or changed once this function returns.
+ */
+QRhiTextureSubresourceUploadDescription::QRhiTextureSubresourceUploadDescription(const void *data, int size)
+    : m_data(reinterpret_cast<const char *>(data), size)
+{
+}
+
+/*!
+    \class QRhiTextureUploadEntry
+    \internal
+    \inmodule QtGui
+    \brief Describes one layer (face for cubemaps) in a texture upload operation.
+ */
+
+/*!
+    \fn QRhiTextureUploadEntry::QRhiTextureUploadEntry()
+
+    Constructs an empty QRhiTextureUploadEntry targeting layer 0 and level 0.
+
+    \note an empty QRhiTextureUploadEntry should not be submitted without
+    setting a QRhiTextureSubresourceUploadDescription via setDescription()
+    first.
+ */
+
+/*!
+    Constructs a QRhiTextureUploadEntry targeting the given \a layer and mip
+    \a level, with the subresource contents described by \a desc.
+ */
+QRhiTextureUploadEntry::QRhiTextureUploadEntry(int layer, int level,
+                                               const QRhiTextureSubresourceUploadDescription &desc)
+    : m_layer(layer),
+      m_level(level),
+      m_desc(desc)
+{
+}
+
+/*!
+    \class QRhiTextureUploadDescription
+    \internal
+    \inmodule QtGui
+    \brief Describes a texture upload operation.
+
+    Used with QRhiResourceUpdateBatch::uploadTexture(). That function has two
+    variants: one taking a QImage and one taking a
+    QRhiTextureUploadDescription. The former is a convenience version,
+    internally creating a QRhiTextureUploadDescription with a single image
+    targeting level 0 for layer 0. However, when cubemaps, pre-generated mip
+    images, or compressed textures are involved, applications will have to work
+    directly with this class instead.
+
+    QRhiTextureUploadDescription also enables specifying batched uploads, which
+    are useful for example when generating an atlas or glyph cache texture:
+    multiple, partial uploads for the same subresource (meaning the same layer
+    and level) are supported, and can be, depending on the backend and the
+    underlying graphics API, more efficient when batched into the same
+    QRhiTextureUploadDescription as opposed to issuing individual
+    \l{QRhiResourceUpdateBatch::uploadTexture()}{uploadTexture()} commands for
+    each of them.
+
+    \note Cubemaps have one layer for each of the six faces in the order +X,
+    -X, +Y, -Y, +Z, -Z.
+
+    For example, specifying the faces of a cubemap could look like the following:
+
+    \badcode
+        QImage faces[6];
+        ...
+        QVector<QRhiTextureUploadEntry> entries;
+        for (int i = 0; i < 6; ++i)
+          entries.append(QRhiTextureUploadEntry(i, 0, faces[i]));
+        QRhiTextureUploadDescription desc(entries);
+        resourceUpdates->uploadTexture(texture, desc);
+    \endcode
+
+    Another example that specifies mip images for a compressed texture:
+
+    \badcode
+        QRhiTextureUploadDescription desc;
+        const int mipCount = rhi->mipLevelsForSize(compressedTexture->pixelSize());
+        for (int level = 0; level < mipCount; ++level) {
+            const QByteArray compressedDataForLevel = ..
+            desc.append(QRhiTextureUploadEntry(0, level, compressedDataForLevel));
+        }
+        resourceUpdates->uploadTexture(compressedTexture, desc);
+    \endcode
+
+    With partial uploads targeting the same subresource, it is recommended to
+    batch them into a single upload request, whenever possible:
+
+    \badcode
+      QRhiTextureSubresourceUploadDescription subresDesc(image);
+      subresDesc.setSourceSize(QSize(10, 10));
+      subResDesc.setDestinationTopLeft(QPoint(50, 40));
+      QRhiTextureUploadEntry entry(0, 0, subresDesc); // layer 0, level 0
+
+      QRhiTextureSubresourceUploadDescription subresDesc2(image);
+      subresDesc2.setSourceSize(QSize(30, 40));
+      subResDesc2.setDestinationTopLeft(QPoint(100, 200));
+      QRhiTextureUploadEntry entry2(0, 0, subresDesc2); // layer 0, level 0, i.e. same subresource
+
+      QRhiTextureUploadDescription desc({ entry, entry2});
+      resourceUpdates->uploadTexture(texture, desc);
+    \endcode
+ */
+
+/*!
+    \fn QRhiTextureUploadDescription::QRhiTextureUploadDescription()
+
+    Constructs an empty texture upload description.
+ */
+
+/*!
+    Constructs a texture upload description with a single subresource upload
+    described by \a entry.
+ */
+QRhiTextureUploadDescription::QRhiTextureUploadDescription(const QRhiTextureUploadEntry &entry)
+{
+    m_entries.append(entry);
+}
+
+/*!
+    Constructs a texture upload description with the specified \a list of entries.
+
+    \note \a list can also contain multiple QRhiTextureUploadEntry elements
+    with the the same layer and level. This makes sense when those uploads are
+    partial, meaning their subresource description has a source size or image
+    smaller than the subresource dimensions, and can be more efficient than
+    issuing separate uploadTexture()'s.
+ */
+QRhiTextureUploadDescription::QRhiTextureUploadDescription(std::initializer_list<QRhiTextureUploadEntry> list)
+    : m_entries(list)
+{
+}
+
+/*!
+    \class QRhiTextureCopyDescription
+    \internal
+    \inmodule QtGui
+    \brief Describes a texture-to-texture copy operation.
+
+    An empty pixelSize() indicates that the entire subresource is to be copied.
+    A default constructed copy description therefore leads to copying the
+    entire subresource at level 0 of layer 0.
+
+    \note The source texture must be created with
+    QRhiTexture::UsedAsTransferSource.
+
+    \note The source and destination rectangles defined by pixelSize(),
+    sourceTopLeft(), and destinationTopLeft() must fit the source and
+    destination textures, respectively. The behavior is undefined otherwise.
+ */
+
+/*!
+    \fn QRhiTextureCopyDescription::QRhiTextureCopyDescription()
+
+    Constructs an empty texture copy description.
+ */
+
+/*!
+    \class QRhiReadbackDescription
+    \internal
+    \inmodule QtGui
+    \brief Describes a readback (reading back texture contents from possibly GPU-only memory) operation.
+
+    The source of the readback operation is either a QRhiTexture or the
+    current backbuffer of the currently targeted QRhiSwapChain. When
+    texture() is not set, the swapchain is used. Otherwise the specified
+    QRhiTexture is treated as the source.
+
+    \note Textures used in readbacks must be created with
+    QRhiTexture::UsedAsTransferSource.
+
+    \note Swapchains used in readbacks must be created with
+    QRhiSwapChain::UsedAsTransferSource.
+
+    layer() and level() are only applicable when the source is a QRhiTexture.
+
+    \note Multisample textures cannot be read back. Readbacks are supported for
+    multisample swapchain buffers however.
+ */
+
+/*!
+    \fn QRhiReadbackDescription::QRhiReadbackDescription()
+
+    Constructs an empty texture readback description.
+
+    \note The source texture is set to null by default, which is still a valid
+    readback: it specifies that the backbuffer of the current swapchain is to
+    be read back. (current meaning the frame's target swapchain at the time of
+    committing the QRhiResourceUpdateBatch with the
+    \l{QRhiResourceUpdateBatch::readBackTexture()}{texture readback} on it)
+ */
+
+/*!
+    Constructs an texture readback description that specifies that level 0 of
+    layer 0 of \a texture is to be read back.
+
+    \note \a texture can also be null in which case this constructor is
+    identical to the argumentless variant.
+ */
+QRhiReadbackDescription::QRhiReadbackDescription(QRhiTexture *texture)
+    : m_texture(texture)
+{
+}
+
+/*!
+    \class QRhiReadbackResult
+    \internal
+    \inmodule QtGui
+    \brief Describes the results of a potentially asynchronous readback operation.
+
+    When \l completed is set, the function is invoked when the \l data is
+    available. \l format and \l pixelSize are set upon completion together with
+    \l data.
+ */
+
+/*!
+    \class QRhiNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Base class for classes exposing backend-specific collections of native resource objects.
+ */
+
+/*!
+    \class QRhiResource
+    \internal
+    \inmodule QtGui
+    \brief Base class for classes encapsulating native resource objects.
+ */
+
+/*!
+    \fn QRhiResource::Type QRhiResource::resourceType() const
+
+    \return the type of the resource.
+ */
+
+/*!
+    \internal
+ */
+QRhiResource::QRhiResource(QRhiImplementation *rhi)
+    : m_rhi(rhi)
+{
+    m_id = QRhiGlobalObjectIdGenerator::newId();
+}
+
+/*!
+    Destructor.
+
+    Releases (or requests deferred releasing of) the underlying native graphics
+    resources, if there are any.
+
+    \note Resources referenced by commands for the current frame should not be
+    released until the frame is submitted by QRhi::endFrame().
+
+    \sa release()
+ */
+QRhiResource::~QRhiResource()
+{
+    // release() cannot be called here, it being virtual; it is up to the
+    // subclasses to do that.
+}
+
+/*!
+    \fn void QRhiResource::release()
+
+    Releases (or requests deferred releasing of) the underlying native graphics
+    resources. Safe to call multiple times, subsequent invocations will be a
+    no-op then.
+
+    Once release() is called, the QRhiResource instance can be reused, by
+    calling \c build() again. That will then result in creating new native
+    graphics resources underneath.
+
+    \note Resources referenced by commands for the current frame should not be
+    released until the frame is submitted by QRhi::endFrame().
+
+    The QRhiResource destructor also performs the same task, so calling this
+    function is not necessary before destroying a QRhiResource.
+
+    \sa releaseAndDestroyLater()
+ */
+
+/*!
+    When called without a frame being recorded, this function is equivalent to
+    deleting the object. Between a QRhi::beginFrame() and QRhi::endFrame()
+    however the behavior is different: the QRhiResource will not be destroyed
+    until the frame is submitted via QRhi::endFrame(), thus satisfying the QRhi
+    requirement of not altering QRhiResource objects that are referenced by the
+    frame being recorded.
+
+    \sa release()
+ */
+void QRhiResource::releaseAndDestroyLater()
+{
+    m_rhi->addReleaseAndDestroyLater(this);
+}
+
+/*!
+    \return the currently set object name. By default the name is empty.
+ */
+QByteArray QRhiResource::name() const
+{
+    return m_objectName;
+}
+
+/*!
+    Sets a \a name for the object.
+
+    This has two uses: to get descriptive names for the native graphics
+    resources visible in graphics debugging tools, such as
+    \l{https://renderdoc.org/}{RenderDoc} and
+    \l{https://developer.apple.com/xcode/}{XCode}, and in the output stream of
+    QRhiProfiler.
+
+    When it comes to naming native objects by relaying the name via the
+    appropriate graphics API, note that the name is ignored when
+    QRhi::DebugMarkers are not supported, and may, depending on the backend,
+    also be ignored when QRhi::EnableDebugMarkers is not set.
+
+    \note The name may be ignored for objects other than buffers,
+    renderbuffers, and textures, depending on the backend.
+
+    \note The name may be modified. For slotted resources, such as a QRhiBuffer
+    backed by multiple native buffers, QRhi will append a suffix to make the
+    underlying native buffers easily distinguishable from each other.
+ */
+void QRhiResource::setName(const QByteArray &name)
+{
+    m_objectName = name;
+    m_objectName.replace(',', '_'); // cannot contain comma for QRhiProfiler
+}
+
+/*!
+    \return the global, unique identifier of this QRhiResource.
+
+    User code rarely needs to deal with the value directly. It is used
+    internally for tracking and bookkeeping purposes.
+ */
+quint64 QRhiResource::globalResourceId() const
+{
+    return m_id;
+}
+
+/*!
+    \class QRhiBuffer
+    \internal
+    \inmodule QtGui
+    \brief Vertex, index, or uniform (constant) buffer resource.
+ */
+
+/*!
+    \enum QRhiBuffer::Type
+    Specifies storage type of buffer resource.
+
+    \value Immutable Indicates that the data is not expected to change ever
+    after the initial upload. Under the hood such buffer resources are
+    typically placed in device local (GPU) memory (on systems where
+    applicable). Uploading new data is possible, but may be expensive. The
+    upload typically happens by copying to a separate, host visible staging
+    buffer from which a GPU buffer-to-buffer copy is issued into the actual
+    GPU-only buffer.
+
+    \value Static Indicates that the data is expected to change only
+    infrequently. Typically placed in device local (GPU) memory, where
+    applicable. On backends where host visible staging buffers are used for
+    uploading, the staging buffers are kept around for this type, unlike with
+    Immutable, so subsequent uploads do not suffer in performance. Frequent
+    updates, especially updates in consecutive frames, should be avoided.
+
+    \value Dynamic Indicates that the data is expected to change frequently.
+    Not recommended for large buffers. Typically backed by host visible memory
+    in 2 copies in order to allow for changing without stalling the graphics
+    pipeline. The double buffering is managed transparently to the applications
+    and is not exposed in the API here in any form. This is the recommended,
+    and, with some backends, the only possible, type for buffers with
+    UniformBuffer usage.
+ */
+
+/*!
+    \enum QRhiBuffer::UsageFlag
+    Flag values to specify how the buffer is going to be used.
+
+    \value VertexBuffer Vertex buffer. This allows the QRhiBuffer to be used in
+    \l{setVertexInput()}{QRhiCommandBuffer::setVertexInput()}.
+
+    \value IndexBuffer Index buffer. This allows the QRhiBuffer to be used in
+    \l{setVertexInput()}{QRhiCommandBuffer::setVertexInput()}.
+
+    \value UniformBuffer Uniform buffer (also called constant buffer). This
+    allows the QRhiBuffer to be used in combination with
+    \l{UniformBuffer}{QRhiShaderResourceBinding::UniformBuffer}. When
+    \l{QRhi::NonDynamicUniformBuffers}{NonDynamicUniformBuffers} is reported as
+    not supported, this usage can only be combined with the type Dynamic.
+
+    \value StorageBuffer Storage buffer. This allows the QRhiBuffer to be used
+    in combination with \l{BufferLoad}{QRhiShaderResourceBinding::BufferLoad},
+    \l{BufferStore}{QRhiShaderResourceBinding::BufferStore}, or
+    \l{BufferLoadStore}{QRhiShaderResourceBinding::BufferLoadStore}. This usage
+    can only be combined with the types Immutable or Static, and is only
+    available when the \l{QRhi::Compute}{Compute feature} is reported as
+    supported.
+ */
+
+/*!
+    \fn void QRhiBuffer::setSize(int sz)
+
+    Sets the size of the buffer in bytes. The size is normally specified in
+    QRhi::newBuffer() so this function is only used when the size has to be
+    changed. As with other setters, the size only takes effect when calling
+    build(), and for already built buffers this involves releasing the previous
+    native resource and creating new ones under the hood.
+
+    Backends may choose to allocate buffers bigger than \a sz in order to
+    fulfill alignment requirements. This is hidden from the applications and
+    size() will always report the size requested in \a sz.
+ */
+
+/*!
+    \internal
+ */
+QRhiBuffer::QRhiBuffer(QRhiImplementation *rhi, Type type_, UsageFlags usage_, int size_)
+    : QRhiResource(rhi),
+      m_type(type_), m_usage(usage_), m_size(size_)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiBuffer::resourceType() const
+{
+    return Buffer;
+}
+
+/*!
+    \fn bool QRhiBuffer::build()
+
+    Creates the corresponding native graphics resources. If there are already
+    resources present due to an earlier build() with no corresponding
+    release(), then release() is called implicitly first.
+
+    \return \c true when successful, \c false when a graphics operation failed.
+    Regardless of the return value, calling release() is always safe.
+ */
+
+/*!
+    \class QRhiRenderBuffer
+    \internal
+    \inmodule QtGui
+    \brief Renderbuffer resource.
+
+    Renderbuffers cannot be sampled or read but have some benefits over
+    textures in some cases:
+
+    A DepthStencil renderbuffer may be lazily allocated and be backed by
+    transient memory with some APIs. On some platforms this may mean the
+    depth/stencil buffer uses no physical backing at all.
+
+    Color renderbuffers are useful since QRhi::MultisampleRenderBuffer may be
+    supported even when QRhi::MultisampleTexture is not.
+
+    How the renderbuffer is implemented by a backend is not exposed to the
+    applications. In some cases it may be backed by ordinary textures, while in
+    others there may be a different kind of native resource used.
+
+    Renderbuffers that are used as (and are only used as) depth-stencil buffers
+    in combination with a QRhiSwapChain's color buffers should have the
+    UsedWithSwapChainOnly flag set. This serves a double purpose: such buffers,
+    depending on the backend and the underlying APIs, be more efficient, and
+    QRhi provides automatic sizing behavior to match the color buffers, which
+    means calling setPixelSize() and build() are not necessary for such
+    renderbuffers.
+ */
+
+/*!
+    \enum QRhiRenderBuffer::Type
+    Specifies the type of the renderbuffer
+
+    \value DepthStencil Combined depth/stencil
+    \value Color Color
+ */
+
+/*!
+    \enum QRhiRenderBuffer::Flag
+    Flag values for flags() and setFlags()
+
+    \value UsedWithSwapChainOnly For DepthStencil renderbuffers this indicates
+    that the renderbuffer is only used in combination with a QRhiSwapChain, and
+    never in any other way. This provides automatic sizing and resource
+    rebuilding, so calling setPixelSize() or build() is not needed whenever
+    this flag is set. This flag value may also trigger backend-specific
+    behavior, for example with OpenGL, where a separate windowing system
+    interface API is in use (EGL, GLX, etc.), the flag is especially important
+    as it avoids creating any actual renderbuffer resource as there is already
+    a windowing system provided depth/stencil buffer as requested by
+    QSurfaceFormat.
+ */
+
+/*!
+    \internal
+ */
+QRhiRenderBuffer::QRhiRenderBuffer(QRhiImplementation *rhi, Type type_, const QSize &pixelSize_,
+                                   int sampleCount_, Flags flags_)
+    : QRhiResource(rhi),
+      m_type(type_), m_pixelSize(pixelSize_), m_sampleCount(sampleCount_), m_flags(flags_)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiRenderBuffer::resourceType() const
+{
+    return RenderBuffer;
+}
+
+/*!
+    \fn bool QRhiRenderBuffer::build()
+
+    Creates the corresponding native graphics resources. If there are already
+    resources present due to an earlier build() with no corresponding
+    release(), then release() is called implicitly first.
+
+    \return \c true when successful, \c false when a graphics operation failed.
+    Regardless of the return value, calling release() is always safe.
+ */
+
+/*!
+    \fn QRhiTexture::Format QRhiRenderBuffer::backingFormat() const
+
+    \internal
+ */
+
+/*!
+    \class QRhiTexture
+    \internal
+    \inmodule QtGui
+    \brief Texture resource.
+ */
+
+/*!
+    \enum QRhiTexture::Flag
+
+    Flag values to specify how the texture is going to be used. Not honoring
+    the flags set before build() and attempting to use the texture in ways that
+    was not declared upfront can lead to unspecified behavior or decreased
+    performance depending on the backend and the underlying graphics API.
+
+    \value RenderTarget The texture going to be used in combination with
+    QRhiTextureRenderTarget.
+
+    \value CubeMap The texture is a cubemap. Such textures have 6 layers, one
+    for each face in the order of +X, -X, +Y, -Y, +Z, -Z. Cubemap textures
+    cannot be multisample.
+
+     \value MipMapped The texture has mipmaps. The appropriate mip count is
+     calculated automatically and can also be retrieved via
+     QRhi::mipLevelsForSize(). The images for the mip levels have to be
+     provided in the texture uploaded or generated via
+     QRhiResourceUpdateBatch::generateMips(). Multisample textures cannot have
+     mipmaps.
+
+    \value sRGB Use an sRGB format.
+
+    \value UsedAsTransferSource The texture is used as the source of a texture
+    copy or readback, meaning the texture is given as the source in
+    QRhiResourceUpdateBatch::copyTexture() or
+    QRhiResourceUpdateBatch::readBackTexture().
+
+     \value UsedWithGenerateMips The texture is going to be used with
+     QRhiResourceUpdateBatch::generateMips().
+
+     \value UsedWithLoadStore The texture is going to be used with image
+     load/store operations, for example, in a compute shader.
+ */
+
+/*!
+    \enum QRhiTexture::Format
+
+    Specifies the texture format. See also QRhi::isTextureFormatSupported() and
+    note that flags() can modify the format when QRhiTexture::sRGB is set.
+
+    \value UnknownFormat Not a valid format. This cannot be passed to setFormat().
+
+    \value RGBA8 Four component, unsigned normalized 8 bit per component. Always supported.
+
+    \value BGRA8 Four component, unsigned normalized 8 bit per component.
+
+    \value R8 One component, unsigned normalized 8 bit.
+
+    \value R16 One component, unsigned normalized 16 bit.
+
+    \value RED_OR_ALPHA8 Either same as R8, or is a similar format with the component swizzled to alpha,
+    depending on \l{QRhi::RedOrAlpha8IsRed}{RedOrAlpha8IsRed}.
+
+    \value RGBA16F Four components, 16-bit float per component.
+
+    \value RGBA32F Four components, 32-bit float per component.
+
+    \value D16 16-bit depth (normalized unsigned integer)
+
+    \value D32F 32-bit depth (32-bit float)
+
+    \value BC1
+    \value BC2
+    \value BC3
+    \value BC4
+    \value BC5
+    \value BC6H
+    \value BC7
+
+    \value ETC2_RGB8
+    \value ETC2_RGB8A1
+    \value ETC2_RGBA8
+
+    \value ASTC_4x4
+    \value ASTC_5x4
+    \value ASTC_5x5
+    \value ASTC_6x5
+    \value ASTC_6x6
+    \value ASTC_8x5
+    \value ASTC_8x6
+    \value ASTC_8x8
+    \value ASTC_10x5
+    \value ASTC_10x6
+    \value ASTC_10x8
+    \value ASTC_10x10
+    \value ASTC_12x10
+    \value ASTC_12x12
+ */
+
+/*!
+    \internal
+ */
+QRhiTexture::QRhiTexture(QRhiImplementation *rhi, Format format_, const QSize &pixelSize_,
+                         int sampleCount_, Flags flags_)
+    : QRhiResource(rhi),
+      m_format(format_), m_pixelSize(pixelSize_), m_sampleCount(sampleCount_), m_flags(flags_)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiTexture::resourceType() const
+{
+    return Texture;
+}
+
+/*!
+    \fn bool QRhiTexture::build()
+
+    Creates the corresponding native graphics resources. If there are already
+    resources present due to an earlier build() with no corresponding
+    release(), then release() is called implicitly first.
+
+    \return \c true when successful, \c false when a graphics operation failed.
+    Regardless of the return value, calling release() is always safe.
+ */
+
+/*!
+    \return a pointer to a backend-specific QRhiNativeHandles subclass, such as
+    QRhiVulkanTextureNativeHandles. The returned value is null when exposing
+    the underlying native resources is not supported by the backend.
+
+    \sa QRhiVulkanTextureNativeHandles, QRhiD3D11TextureNativeHandles,
+    QRhiMetalTextureNativeHandles, QRhiGles2TextureNativeHandles
+ */
+const QRhiNativeHandles *QRhiTexture::nativeHandles()
+{
+    return nullptr;
+}
+
+/*!
+    Similar to build() except that no new native textures are created. Instead,
+    the texture from \a src is used.
+
+    This allows importing an existing native texture object (which must belong
+    to the same device or sharing context, depending on the graphics API) from
+    an external graphics engine.
+
+    \note format(), pixelSize(), sampleCount(), and flags() must still be set
+    correctly. Passing incorrect sizes and other values to QRhi::newTexture()
+    and then following it with a buildFrom() expecting that the native texture
+    object alone is sufficient to deduce such values is \b wrong and will lead
+    to problems.
+
+    \note QRhiTexture does not take ownership of the texture object. release()
+    does not free the object or any associated memory.
+
+    The opposite of this operation, exposing a QRhiTexture-created native
+    texture object to a foreign engine, is possible via nativeHandles().
+
+    \sa QRhiVulkanTextureNativeHandles, QRhiD3D11TextureNativeHandles,
+    QRhiMetalTextureNativeHandles, QRhiGles2TextureNativeHandles
+ */
+bool QRhiTexture::buildFrom(const QRhiNativeHandles *src)
+{
+    Q_UNUSED(src);
+    return false;
+}
+
+/*!
+    \class QRhiSampler
+    \internal
+    \inmodule QtGui
+    \brief Sampler resource.
+ */
+
+/*!
+    \enum QRhiSampler::Filter
+    Specifies the minification, magnification, or mipmap filtering
+
+    \value None Applicable only for mipmapMode(), indicates no mipmaps to be used
+    \value Nearest
+    \value Linear
+ */
+
+/*!
+    \enum QRhiSampler::AddressMode
+    Specifies the addressing mode
+
+    \value Repeat
+    \value ClampToEdge
+    \value Border
+    \value Mirror
+    \value MirrorOnce
+ */
+
+/*!
+    \enum QRhiSampler::CompareOp
+    Specifies the texture comparison function.
+
+    \value Never (default)
+    \value Less
+    \value Equal
+    \value LessOrEqual
+    \value Greater
+    \value NotEqual
+    \value GreaterOrEqual
+    \value Always
+ */
+
+/*!
+    \internal
+ */
+QRhiSampler::QRhiSampler(QRhiImplementation *rhi,
+                         Filter magFilter_, Filter minFilter_, Filter mipmapMode_,
+                         AddressMode u_, AddressMode v_)
+    : QRhiResource(rhi),
+      m_magFilter(magFilter_), m_minFilter(minFilter_), m_mipmapMode(mipmapMode_),
+      m_addressU(u_), m_addressV(v_),
+      m_addressW(QRhiSampler::ClampToEdge),
+      m_compareOp(QRhiSampler::Never)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiSampler::resourceType() const
+{
+    return Sampler;
+}
+
+/*!
+    \class QRhiRenderPassDescriptor
+    \internal
+    \inmodule QtGui
+    \brief Render pass resource.
+
+    A render pass, if such a concept exists in the underlying graphics API, is
+    a collection of attachments (color, depth, stencil) and describes how those
+    attachments are used.
+ */
+
+/*!
+    \internal
+ */
+QRhiRenderPassDescriptor::QRhiRenderPassDescriptor(QRhiImplementation *rhi)
+    : QRhiResource(rhi)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiRenderPassDescriptor::resourceType() const
+{
+    return RenderPassDescriptor;
+}
+
+/*!
+    \return a pointer to a backend-specific QRhiNativeHandles subclass, such as
+    QRhiVulkanRenderPassNativeHandles. The returned value is null when exposing
+    the underlying native resources is not supported by the backend.
+
+    \sa QRhiVulkanRenderPassNativeHandles
+ */
+const QRhiNativeHandles *QRhiRenderPassDescriptor::nativeHandles()
+{
+    return nullptr;
+}
+
+/*!
+    \class QRhiRenderTarget
+    \internal
+    \inmodule QtGui
+    \brief Represents an onscreen (swapchain) or offscreen (texture) render target.
+ */
+
+/*!
+    \internal
+ */
+QRhiRenderTarget::QRhiRenderTarget(QRhiImplementation *rhi)
+    : QRhiResource(rhi)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiRenderTarget::resourceType() const
+{
+    return RenderTarget;
+}
+
+/*!
+    \fn QSize QRhiRenderTarget::pixelSize() const
+
+    \return the size in pixels.
+ */
+
+/*!
+    \fn float QRhiRenderTarget::devicePixelRatio() const
+
+    \return the device pixel ratio. For QRhiTextureRenderTarget this is always
+    1. For targets retrieved from a QRhiSwapChain the value reflects the
+    \l{QWindow::devicePixelRatio()}{device pixel ratio} of the targeted
+    QWindow.
+ */
+
+/*!
+    \class QRhiTextureRenderTarget
+    \internal
+    \inmodule QtGui
+    \brief Texture render target resource.
+
+    A texture render target allows rendering into one or more textures,
+    optionally with a depth texture or depth/stencil renderbuffer.
+
+    \note Textures used in combination with QRhiTextureRenderTarget must be
+    created with the QRhiTexture::RenderTarget flag.
+
+    The simplest example of creating a render target with a texture as its
+    single color attachment:
+
+    \badcode
+        texture = rhi->newTexture(QRhiTexture::RGBA8, size, 1, QRhiTexture::RenderTarget);
+        texture->build();
+        rt = rhi->newTextureRenderTarget({ texture });
+        rp = rt->newCompatibleRenderPassDescriptor();
+        rt->setRenderPassDescriptor(rt);
+        rt->build();
+        // rt can now be used with beginPass()
+    \endcode
+ */
+
+/*!
+    \enum QRhiTextureRenderTarget::Flag
+
+    Flag values describing the load/store behavior for the render target. The
+    load/store behavior may be baked into native resources under the hood,
+    depending on the backend, and therefore it needs to be known upfront and
+    cannot be changed without rebuilding (and so releasing and creating new
+    native resources).
+
+    \value PreserveColorContents Indicates that the contents of the color
+    attachments is to be loaded when starting a render pass, instead of
+    clearing. This is potentially more expensive, especially on mobile (tiled)
+    GPUs, but allows preserving the existing contents between passes.
+
+    \value PreserveDepthStencilContents Indicates that the contents of the
+    depth texture is to be loaded when starting a render pass, instead
+    clearing. Only applicable when a texture is used as the depth buffer
+    (QRhiTextureRenderTargetDescription::depthTexture() is set) because
+    depth/stencil renderbuffers may not have any physical backing and data may
+    not be written out in the first place.
+ */
+
+/*!
+    \internal
+ */
+QRhiTextureRenderTarget::QRhiTextureRenderTarget(QRhiImplementation *rhi,
+                                                 const QRhiTextureRenderTargetDescription &desc_,
+                                                 Flags flags_)
+    : QRhiRenderTarget(rhi),
+      m_desc(desc_),
+      m_flags(flags_)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiTextureRenderTarget::resourceType() const
+{
+    return TextureRenderTarget;
+}
+
+/*!
+    \fn QRhiRenderPassDescriptor *QRhiTextureRenderTarget::newCompatibleRenderPassDescriptor()
+
+    \return a new QRhiRenderPassDescriptor that is compatible with this render
+    target.
+
+    The returned value is used in two ways: it can be passed to
+    setRenderPassDescriptor() and
+    QRhiGraphicsPipeline::setRenderPassDescriptor(). A render pass descriptor
+    describes the attachments (color, depth/stencil) and the load/store
+    behavior that can be affected by flags(). A QRhiGraphicsPipeline can only
+    be used in combination with a render target that has the same
+    QRhiRenderPassDescriptor set.
+
+    Two QRhiTextureRenderTarget instances can share the same render pass
+    descriptor as long as they have the same number and type of attachments.
+    The associated QRhiTexture or QRhiRenderBuffer instances are not part of
+    the render pass descriptor so those can differ in the two
+    QRhiTextureRenderTarget intances.
+
+    \note resources, such as QRhiTexture instances, referenced in description()
+    must already be built
+
+    \sa build()
+ */
+
+/*!
+    \fn bool QRhiTextureRenderTarget::build()
+
+    Creates the corresponding native graphics resources. If there are already
+    resources present due to an earlier build() with no corresponding
+    release(), then release() is called implicitly first.
+
+    \note renderPassDescriptor() must be set before calling build(). To obtain
+    a QRhiRenderPassDescriptor compatible with the render target, call
+    newCompatibleRenderPassDescriptor() before build() but after setting all
+    other parameters, such as description() and flags(). To save resources,
+    reuse the same QRhiRenderPassDescriptor with multiple
+    QRhiTextureRenderTarget instances, whenever possible. Sharing the same
+    render pass descriptor is only possible when the render targets have the
+    same number and type of attachments (the actual textures can differ) and
+    the same flags.
+
+    \note resources, such as QRhiTexture instances, referenced in description()
+    must already be built
+
+    \return \c true when successful, \c false when a graphics operation failed.
+    Regardless of the return value, calling release() is always safe.
+ */
+
+/*!
+    \class QRhiShaderResourceBindings
+    \internal
+    \inmodule QtGui
+    \brief Encapsulates resources for making buffer, texture, sampler resources visible to shaders.
+
+    A QRhiShaderResourceBindings is a collection of QRhiShaderResourceBinding
+    objects, each of which describe a single binding.
+
+    Take a fragment shader with the following interface:
+
+    \badcode
+        layout(std140, binding = 0) uniform buf {
+            mat4 mvp;
+            int flip;
+        } ubuf;
+
+        layout(binding = 1) uniform sampler2D tex;
+    \endcode
+
+    To make resources visible to the shader, the following
+    QRhiShaderResourceBindings could be created and then passed to
+    QRhiGraphicsPipeline::setShaderResourceBindings():
+
+    \badcode
+        srb = rhi->newShaderResourceBindings();
+        srb->setBindings({
+            QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, ubuf),
+            QRhiShaderResourceBinding::sampledTexture(1, QRhiShaderResourceBinding::FragmentStage, texture, sampler)
+        });
+        srb->build();
+        ...
+        ps = rhi->newGraphicsPipeline();
+        ...
+        ps->setShaderResourceBindings(srb);
+        ps->build();
+        ...
+        cb->setGraphicsPipeline(ps);
+        cb->setShaderResources(); // binds srb
+    \endcode
+
+    This assumes that \c ubuf is a QRhiBuffer, \c texture is a QRhiTexture,
+    while \a sampler is a QRhiSampler. The example also assumes that the
+    uniform block is present in the vertex shader as well so the same buffer is
+    made visible to the vertex stage too.
+
+    \section3 Advanced usage
+
+    Building on the above example, let's assume that a pass now needs to use
+    the exact same pipeline and shaders with a different texture. Creating a
+    whole separate QRhiGraphicsPipeline just for this would be an overkill.
+    This is why QRhiCommandBuffer::setShaderResources() allows specifying a \a
+    srb argument. As long as the layouts (so the number of bindings and the
+    binding points) match between two QRhiShaderResourceBindings, they can both
+    be used with the same pipeline, assuming the pipeline was built with one of
+    them in the first place.
+
+    \badcode
+        srb2 = rhi->newShaderResourceBindings();
+        ...
+        cb->setGraphicsPipeline(ps);
+        cb->setShaderResources(srb2); // binds srb2
+    \endcode
+ */
+
+/*!
+    \internal
+ */
+QRhiShaderResourceBindings::QRhiShaderResourceBindings(QRhiImplementation *rhi)
+    : QRhiResource(rhi)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiShaderResourceBindings::resourceType() const
+{
+    return ShaderResourceBindings;
+}
+
+/*!
+    \return \c true if the layout is compatible with \a other. The layout does
+    not include the actual resource (such as, buffer or texture) and related
+    parameters (such as, offset or size). It does include the binding point,
+    pipeline stage, and resource type, however. The number and order of the
+    bindings must also match in order to be compatible.
+
+    When there is a QRhiGraphicsPipeline created with this
+    QRhiShaderResourceBindings, and the function returns \c true, \a other can
+    then safely be passed to QRhiCommandBuffer::setShaderResources(), and so
+    be used with the pipeline in place of this QRhiShaderResourceBindings.
+
+    This function can be called before build() as well. The bindings must
+    already be set via setBindings() however.
+ */
+bool QRhiShaderResourceBindings::isLayoutCompatible(const QRhiShaderResourceBindings *other) const
+{
+    const int count = m_bindings.count();
+    if (count != other->m_bindings.count())
+        return false;
+
+    for (int i = 0; i < count; ++i) {
+        if (!m_bindings[i].isLayoutCompatible(other->m_bindings.at(i)))
+            return false;
+    }
+
+    return true;
+}
+
+/*!
+    \class QRhiShaderResourceBinding
+    \internal
+    \inmodule QtGui
+    \brief Describes the shader resource for a single binding point.
+
+    A QRhiShaderResourceBinding cannot be constructed directly. Instead, use
+    the static functions uniformBuffer(), sampledTexture() to get an instance.
+ */
+
+/*!
+    \enum QRhiShaderResourceBinding::Type
+    Specifies type of the shader resource bound to a binding point
+
+    \value UniformBuffer Uniform buffer
+
+    \value SampledTexture Combined image sampler
+
+    \value ImageLoad Image load (with GLSL this maps to doing imageLoad() on a
+    single level - and either one or all layers - of a texture exposed to the
+    shader as an image object)
+
+    \value ImageStore Image store (with GLSL this maps to doing imageStore() or
+    imageAtomic*() on a single level - and either one or all layers - of a
+    texture exposed to the shader as an image object)
+
+    \value ImageLoadStore Image load and store
+
+    \value BufferLoad Storage buffer store (with GLSL this maps to reading from
+    a shader storage buffer)
+
+    \value BufferStore Storage buffer store (with GLSL this maps to writing to
+    a shader storage buffer)
+
+    \value BufferLoadStore Storage buffer load and store
+ */
+
+/*!
+    \enum QRhiShaderResourceBinding::StageFlag
+    Flag values to indicate which stages the shader resource is visible in
+
+    \value VertexStage Vertex stage
+    \value FragmentStage Fragment (pixel) stage
+    \value ComputeStage Compute stage
+ */
+
+/*!
+    \internal
+ */
+QRhiShaderResourceBinding::QRhiShaderResourceBinding()
+{
+    // Zero out everything, including possible padding, because will use
+    // qHashBits on it.
+    memset(&d.u, 0, sizeof(d.u));
+}
+
+/*!
+    \return \c true if the layout is compatible with \a other. The layout does not
+    include the actual resource (such as, buffer or texture) and related
+    parameters (such as, offset or size).
+
+    For example, \c a and \c b below are not equal, but are compatible layout-wise:
+
+    \badcode
+        auto a = QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage, buffer);
+        auto b = QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage, someOtherBuffer, 256);
+    \endcode
+ */
+bool QRhiShaderResourceBinding::isLayoutCompatible(const QRhiShaderResourceBinding &other) const
+{
+    return d.binding == other.d.binding && d.stage == other.d.stage && d.type == other.d.type;
+}
+
+/*!
+    \return a shader resource binding for the given binding number, pipeline
+    stages, and buffer specified by \a binding, \a stage, and \a buf.
+
+    \note \a buf must have been created with QRhiBuffer::UniformBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::uniformBuffer(
+        int binding, StageFlags stage, QRhiBuffer *buf)
+{
+    QRhiShaderResourceBinding b;
+    b.d.binding = binding;
+    b.d.stage = stage;
+    b.d.type = UniformBuffer;
+    b.d.u.ubuf.buf = buf;
+    b.d.u.ubuf.offset = 0;
+    b.d.u.ubuf.maybeSize = 0; // entire buffer
+    b.d.u.ubuf.hasDynamicOffset = false;
+    return b;
+}
+
+/*!
+    \return a shader resource binding for the given binding number, pipeline
+    stages, and buffer specified by \a binding, \a stage, and \a buf. This
+    overload binds a region only, as specified by \a offset and \a size.
+
+    \note It is up to the user to ensure the offset is aligned to
+    QRhi::ubufAlignment().
+
+    \note \a size must be greater than 0.
+
+    \note \a buf must have been created with QRhiBuffer::UniformBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::uniformBuffer(
+        int binding, StageFlags stage, QRhiBuffer *buf, int offset, int size)
+{
+    Q_ASSERT(size > 0);
+    QRhiShaderResourceBinding b = uniformBuffer(binding, stage, buf);
+    b.d.u.ubuf.offset = offset;
+    b.d.u.ubuf.maybeSize = size;
+    return b;
+}
+
+/*!
+    \return a shader resource binding for the given binding number, pipeline
+    stages, and buffer specified by \a binding, \a stage, and \a buf. The
+    uniform buffer is assumed to have dynamic offset. The dynamic offset can be
+    specified in QRhiCommandBuffer::setShaderResources(), thus allowing using
+    varying offset values without creating new bindings for the buffer. The
+    size of the bound region is specified by \a size. Like with non-dynamic
+    offsets, \c{offset + size} cannot exceed the size of \a buf.
+
+    \note \a buf must have been created with QRhiBuffer::UniformBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::uniformBufferWithDynamicOffset(
+        int binding, StageFlags stage, QRhiBuffer *buf, int size)
+{
+    QRhiShaderResourceBinding b = uniformBuffer(binding, stage, buf, 0, size);
+    b.d.u.ubuf.hasDynamicOffset = true;
+    return b;
+}
+
+/*!
+    \return a shader resource binding for the given binding number, pipeline
+    stages, texture, and sampler specified by \a binding, \a stage, \a tex,
+    \a sampler.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::sampledTexture(
+        int binding, StageFlags stage, QRhiTexture *tex, QRhiSampler *sampler)
+{
+    QRhiShaderResourceBinding b;
+    b.d.binding = binding;
+    b.d.stage = stage;
+    b.d.type = SampledTexture;
+    b.d.u.stex.tex = tex;
+    b.d.u.stex.sampler = sampler;
+    return b;
+}
+
+/*!
+   \return a shader resource binding for a read-only storage image with the
+   given \a binding number and pipeline \a stage. The image load operations
+   will have access to all layers of the specified \a level. (so if the texture
+   is a cubemap, the shader must use imageCube instead of image2D)
+
+   \note \a tex must have been created with QRhiTexture::UsedWithLoadStore.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::imageLoad(
+        int binding, StageFlags stage, QRhiTexture *tex, int level)
+{
+    QRhiShaderResourceBinding b;
+    b.d.binding = binding;
+    b.d.stage = stage;
+    b.d.type = ImageLoad;
+    b.d.u.simage.tex = tex;
+    b.d.u.simage.level = level;
+    return b;
+}
+
+/*!
+   \return a shader resource binding for a write-only storage image with the
+   given \a binding number and pipeline \a stage. The image store operations
+   will have access to all layers of the specified \a level. (so if the texture
+   is a cubemap, the shader must use imageCube instead of image2D)
+
+   \note \a tex must have been created with QRhiTexture::UsedWithLoadStore.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::imageStore(
+        int binding, StageFlags stage, QRhiTexture *tex, int level)
+{
+    QRhiShaderResourceBinding b = imageLoad(binding, stage, tex, level);
+    b.d.type = ImageStore;
+    return b;
+}
+
+/*!
+   \return a shader resource binding for a read/write storage image with the
+   given \a binding number and pipeline \a stage. The image load/store operations
+   will have access to all layers of the specified \a level. (so if the texture
+   is a cubemap, the shader must use imageCube instead of image2D)
+
+   \note \a tex must have been created with QRhiTexture::UsedWithLoadStore.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::imageLoadStore(
+        int binding, StageFlags stage, QRhiTexture *tex, int level)
+{
+    QRhiShaderResourceBinding b = imageLoad(binding, stage, tex, level);
+    b.d.type = ImageLoadStore;
+    return b;
+}
+
+/*!
+    \return a shader resource binding for a read-only storage buffer with the
+    given \a binding number and pipeline \a stage.
+
+    \note \a buf must have been created with QRhiBuffer::StorageBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::bufferLoad(
+        int binding, StageFlags stage, QRhiBuffer *buf)
+{
+    QRhiShaderResourceBinding b;
+    b.d.binding = binding;
+    b.d.stage = stage;
+    b.d.type = BufferLoad;
+    b.d.u.sbuf.buf = buf;
+    b.d.u.sbuf.offset = 0;
+    b.d.u.sbuf.maybeSize = 0; // entire buffer
+    return b;
+}
+
+/*!
+    \return a shader resource binding for a read-only storage buffer with the
+    given \a binding number and pipeline \a stage. This overload binds a region
+    only, as specified by \a offset and \a size.
+
+    \note \a buf must have been created with QRhiBuffer::StorageBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::bufferLoad(
+        int binding, StageFlags stage, QRhiBuffer *buf, int offset, int size)
+{
+    Q_ASSERT(size > 0);
+    QRhiShaderResourceBinding b = bufferLoad(binding, stage, buf);
+    b.d.u.sbuf.offset = offset;
+    b.d.u.sbuf.maybeSize = size;
+    return b;
+}
+
+/*!
+    \return a shader resource binding for a write-only storage buffer with the
+    given \a binding number and pipeline \a stage.
+
+    \note \a buf must have been created with QRhiBuffer::StorageBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::bufferStore(
+        int binding, StageFlags stage, QRhiBuffer *buf)
+{
+    QRhiShaderResourceBinding b = bufferLoad(binding, stage, buf);
+    b.d.type = BufferStore;
+    return b;
+}
+
+/*!
+    \return a shader resource binding for a write-only storage buffer with the
+    given \a binding number and pipeline \a stage. This overload binds a region
+    only, as specified by \a offset and \a size.
+
+    \note \a buf must have been created with QRhiBuffer::StorageBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::bufferStore(
+        int binding, StageFlags stage, QRhiBuffer *buf, int offset, int size)
+{
+    Q_ASSERT(size > 0);
+    QRhiShaderResourceBinding b = bufferStore(binding, stage, buf);
+    b.d.u.sbuf.offset = offset;
+    b.d.u.sbuf.maybeSize = size;
+    return b;
+}
+
+/*!
+    \return a shader resource binding for a read-write storage buffer with the
+    given \a binding number and pipeline \a stage.
+
+    \note \a buf must have been created with QRhiBuffer::StorageBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::bufferLoadStore(
+        int binding, StageFlags stage, QRhiBuffer *buf)
+{
+    QRhiShaderResourceBinding b = bufferLoad(binding, stage, buf);
+    b.d.type = BufferLoadStore;
+    return b;
+}
+
+/*!
+    \return a shader resource binding for a read-write storage buffer with the
+    given \a binding number and pipeline \a stage. This overload binds a region
+    only, as specified by \a offset and \a size.
+
+    \note \a buf must have been created with QRhiBuffer::StorageBuffer.
+ */
+QRhiShaderResourceBinding QRhiShaderResourceBinding::bufferLoadStore(
+        int binding, StageFlags stage, QRhiBuffer *buf, int offset, int size)
+{
+    Q_ASSERT(size > 0);
+    QRhiShaderResourceBinding b = bufferLoadStore(binding, stage, buf);
+    b.d.u.sbuf.offset = offset;
+    b.d.u.sbuf.maybeSize = size;
+    return b;
+}
+
+/*!
+    \return \c true if the contents of the two QRhiShaderResourceBinding
+    objects \a a and \a b are equal. This includes the resources (buffer,
+    texture) and related parameters (offset, size) as well. To only compare
+    layouts (binding point, pipeline stage, resource type), use
+    \l{QRhiShaderResourceBinding::isLayoutCompatible()}{isLayoutCompatible()}
+    instead.
+
+    \relates QRhiShaderResourceBinding
+ */
+bool operator==(const QRhiShaderResourceBinding &a, const QRhiShaderResourceBinding &b) Q_DECL_NOTHROW
+{
+    const QRhiShaderResourceBinding::Data *da = a.data();
+    const QRhiShaderResourceBinding::Data *db = b.data();
+
+    if (da == db)
+        return true;
+
+
+    if (da->binding != db->binding
+            || da->stage != db->stage
+            || da->type != db->type)
+    {
+        return false;
+    }
+
+    switch (da->type) {
+    case QRhiShaderResourceBinding::UniformBuffer:
+        if (da->u.ubuf.buf != db->u.ubuf.buf
+                || da->u.ubuf.offset != db->u.ubuf.offset
+                || da->u.ubuf.maybeSize != db->u.ubuf.maybeSize)
+        {
+            return false;
+        }
+        break;
+    case QRhiShaderResourceBinding::SampledTexture:
+        if (da->u.stex.tex != db->u.stex.tex
+                || da->u.stex.sampler != db->u.stex.sampler)
+        {
+            return false;
+        }
+        break;
+    case QRhiShaderResourceBinding::ImageLoad:
+        Q_FALLTHROUGH();
+    case QRhiShaderResourceBinding::ImageStore:
+        Q_FALLTHROUGH();
+    case QRhiShaderResourceBinding::ImageLoadStore:
+        if (da->u.simage.tex != db->u.simage.tex
+                || da->u.simage.level != db->u.simage.level)
+        {
+            return false;
+        }
+        break;
+    case QRhiShaderResourceBinding::BufferLoad:
+        Q_FALLTHROUGH();
+    case QRhiShaderResourceBinding::BufferStore:
+        Q_FALLTHROUGH();
+    case QRhiShaderResourceBinding::BufferLoadStore:
+        if (da->u.sbuf.buf != db->u.sbuf.buf
+                || da->u.sbuf.offset != db->u.sbuf.offset
+                || da->u.sbuf.maybeSize != db->u.sbuf.maybeSize)
+        {
+            return false;
+        }
+        break;
+    default:
+        Q_UNREACHABLE();
+        return false;
+    }
+
+    return true;
+}
+
+/*!
+    \return \c false if all the bindings in the two QRhiShaderResourceBinding
+    objects \a a and \a b are equal; otherwise returns \c true.
+
+    \relates QRhiShaderResourceBinding
+ */
+bool operator!=(const QRhiShaderResourceBinding &a, const QRhiShaderResourceBinding &b) Q_DECL_NOTHROW
+{
+    return !(a == b);
+}
+
+/*!
+    \return the hash value for \a b, using \a seed to seed the calculation.
+
+    \relates QRhiShaderResourceBinding
+ */
+uint qHash(const QRhiShaderResourceBinding &b, uint seed) Q_DECL_NOTHROW
+{
+    const QRhiShaderResourceBinding::Data *d = b.data();
+    return seed + uint(d->binding) + 10 * uint(d->stage) + 100 * uint(d->type)
+            + qHashBits(&d->u, sizeof(d->u), seed);
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QRhiShaderResourceBinding &b)
+{
+    QDebugStateSaver saver(dbg);
+    const QRhiShaderResourceBinding::Data *d = b.data();
+    dbg.nospace() << "QRhiShaderResourceBinding("
+                  << "binding=" << d->binding
+                  << " stage=" << d->stage
+                  << " type=" << d->type;
+    switch (d->type) {
+    case QRhiShaderResourceBinding::UniformBuffer:
+        dbg.nospace() << " UniformBuffer("
+                      << "buffer=" << d->u.ubuf.buf
+                      << " offset=" << d->u.ubuf.offset
+                      << " maybeSize=" << d->u.ubuf.maybeSize
+                      << ')';
+        break;
+    case QRhiShaderResourceBinding::SampledTexture:
+        dbg.nospace() << " SampledTexture("
+                      << "texture=" << d->u.stex.tex
+                      << " sampler=" << d->u.stex.sampler
+                      << ')';
+        break;
+    case QRhiShaderResourceBinding::ImageLoad:
+        dbg.nospace() << " ImageLoad("
+                      << "texture=" << d->u.simage.tex
+                      << " level=" << d->u.simage.level
+                      << ')';
+        break;
+    case QRhiShaderResourceBinding::ImageStore:
+        dbg.nospace() << " ImageStore("
+                      << "texture=" << d->u.simage.tex
+                      << " level=" << d->u.simage.level
+                      << ')';
+        break;
+    case QRhiShaderResourceBinding::ImageLoadStore:
+        dbg.nospace() << " ImageLoadStore("
+                      << "texture=" << d->u.simage.tex
+                      << " level=" << d->u.simage.level
+                      << ')';
+        break;
+    case QRhiShaderResourceBinding::BufferLoad:
+        dbg.nospace() << " BufferLoad("
+                      << "buffer=" << d->u.sbuf.buf
+                      << " offset=" << d->u.sbuf.offset
+                      << " maybeSize=" << d->u.sbuf.maybeSize
+                      << ')';
+        break;
+    case QRhiShaderResourceBinding::BufferStore:
+        dbg.nospace() << " BufferStore("
+                      << "buffer=" << d->u.sbuf.buf
+                      << " offset=" << d->u.sbuf.offset
+                      << " maybeSize=" << d->u.sbuf.maybeSize
+                      << ')';
+        break;
+    case QRhiShaderResourceBinding::BufferLoadStore:
+        dbg.nospace() << " BufferLoadStore("
+                      << "buffer=" << d->u.sbuf.buf
+                      << " offset=" << d->u.sbuf.offset
+                      << " maybeSize=" << d->u.sbuf.maybeSize
+                      << ')';
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    dbg.nospace() << ')';
+    return dbg;
+}
+#endif
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QRhiShaderResourceBindings &srb)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "QRhiShaderResourceBindings("
+                  << srb.m_bindings
+                  << ')';
+    return dbg;
+}
+#endif
+
+/*!
+    \class QRhiGraphicsPipeline
+    \internal
+    \inmodule QtGui
+    \brief Graphics pipeline state resource.
+
+    \note Setting the shader stages is mandatory. There must be at least one
+    stage, and there must be a vertex stage.
+
+    \note Setting the shader resource bindings is mandatory. The referenced
+    QRhiShaderResourceBindings must already be built by the time build() is
+    called. Associating with a QRhiShaderResourceBindings that has no bindings
+    is also valid, as long as no shader in any stage expects any resources.
+
+    \note Setting the render pass descriptor is mandatory. To obtain a
+    QRhiRenderPassDescriptor that can be passed to setRenderPassDescriptor(),
+    use either QRhiTextureRenderTarget::newCompatibleRenderPassDescriptor() or
+    QRhiSwapChain::newCompatibleRenderPassDescriptor().
+
+    \note Setting the vertex input layout is mandatory.
+
+    \note sampleCount() defaults to 1 and must match the sample count of the
+    render target's color and depth stencil attachments.
+
+    \note The depth test, depth write, and stencil test are disabled by
+    default.
+
+    \note stencilReadMask() and stencilWriteMask() apply to both faces. They
+    both default to 0xFF.
+ */
+
+/*!
+    \fn void QRhiGraphicsPipeline::setTargetBlends(const QVector<TargetBlend> &blends)
+
+    Sets the blend specification for color attachments. Each element in \a
+    blends corresponds to a color attachment of the render target.
+
+    By default no blends are set, which is a shortcut to disabling blending and
+    enabling color write for all four channels.
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::Flag
+
+    Flag values for describing the dynamic state of the pipeline. The viewport is always dynamic.
+
+    \value UsesBlendConstants Indicates that a blend color constant will be set
+    via QRhiCommandBuffer::setBlendConstants()
+
+    \value UsesStencilRef Indicates that a stencil reference value will be set
+    via QRhiCommandBuffer::setStencilRef()
+
+    \value UsesScissor Indicates that a scissor rectangle will be set via
+    QRhiCommandBuffer::setScissor()
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::Topology
+    Specifies the primitive topology
+
+    \value Triangles (default)
+    \value TriangleStrip
+    \value TriangleFan (only available if QRhi::TriangleFanTopology is supported)
+    \value Lines
+    \value LineStrip
+    \value Points
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::CullMode
+    Specifies the culling mode
+
+    \value None No culling (default)
+    \value Front Cull front faces
+    \value Back Cull back faces
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::FrontFace
+    Specifies the front face winding order
+
+    \value CCW Counter clockwise (default)
+    \value CW Clockwise
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::ColorMaskComponent
+    Flag values for specifying the color write mask
+
+    \value R
+    \value G
+    \value B
+    \value A
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::BlendFactor
+    Specifies the blend factor
+
+    \value Zero
+    \value One
+    \value SrcColor
+    \value OneMinusSrcColor
+    \value DstColor
+    \value OneMinusDstColor
+    \value SrcAlpha
+    \value OneMinusSrcAlpha
+    \value DstAlpha
+    \value OneMinusDstAlpha
+    \value ConstantColor
+    \value OneMinusConstantColor
+    \value ConstantAlpha
+    \value OneMinusConstantAlpha
+    \value SrcAlphaSaturate
+    \value Src1Color
+    \value OneMinusSrc1Color
+    \value Src1Alpha
+    \value OneMinusSrc1Alpha
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::BlendOp
+    Specifies the blend operation
+
+    \value Add
+    \value Subtract
+    \value ReverseSubtract
+    \value Min
+    \value Max
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::CompareOp
+    Specifies the depth or stencil comparison function
+
+    \value Never
+    \value Less (default for depth)
+    \value Equal
+    \value LessOrEqual
+    \value Greater
+    \value NotEqual
+    \value GreaterOrEqual
+    \value Always (default for stencil)
+ */
+
+/*!
+    \enum QRhiGraphicsPipeline::StencilOp
+    Specifies the stencil operation
+
+    \value StencilZero
+    \value Keep (default)
+    \value Replace
+    \value IncrementAndClamp
+    \value DecrementAndClamp
+    \value Invert
+    \value IncrementAndWrap
+    \value DecrementAndWrap
+ */
+
+/*!
+    \class QRhiGraphicsPipeline::TargetBlend
+    \internal
+    \inmodule QtGui
+    \brief Describes the blend state for one color attachment.
+
+    Defaults to color write enabled, blending disabled. The blend values are
+    set up for pre-multiplied alpha (One, OneMinusSrcAlpha, One,
+    OneMinusSrcAlpha) by default.
+ */
+
+/*!
+    \class QRhiGraphicsPipeline::StencilOpState
+    \internal
+    \inmodule QtGui
+    \brief Describes the stencil operation state.
+ */
+
+/*!
+    \internal
+ */
+QRhiGraphicsPipeline::QRhiGraphicsPipeline(QRhiImplementation *rhi)
+    : QRhiResource(rhi)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiGraphicsPipeline::resourceType() const
+{
+    return GraphicsPipeline;
+}
+
+/*!
+    \fn bool QRhiGraphicsPipeline::build()
+
+    Creates the corresponding native graphics resources. If there are already
+    resources present due to an earlier build() with no corresponding
+    release(), then release() is called implicitly first.
+
+    \return \c true when successful, \c false when a graphics operation failed.
+    Regardless of the return value, calling release() is always safe.
+ */
+
+/*!
+    \fn void QRhiGraphicsPipeline::setDepthTest(bool enable)
+
+    Enables or disables depth testing. Both depth test and the writing out of
+    depth data are disabled by default.
+
+    \sa setDepthWrite()
+ */
+
+/*!
+    \fn void QRhiGraphicsPipeline::setDepthWrite(bool enable)
+
+    Controls the writing out of depth data into the depth buffer. By default
+    this is disabled. Depth write is typically enabled together with the depth
+    test.
+
+    \note Enabling depth write without having depth testing enabled may not
+    lead to the desired result, and should be avoided.
+
+    \sa setDepthTest()
+ */
+
+/*!
+    \class QRhiSwapChain
+    \internal
+    \inmodule QtGui
+    \brief Swapchain resource.
+
+    A swapchain enables presenting rendering results to a surface. A swapchain
+    is typically backed by a set of color buffers. Of these, one is displayed
+    at a time.
+
+    Below is a typical pattern for creating and managing a swapchain and some
+    associated resources in order to render onto a QWindow:
+
+    \badcode
+      void init()
+      {
+          sc = rhi->newSwapChain();
+          ds = rhi->newRenderBuffer(QRhiRenderBuffer::DepthStencil,
+                                    QSize(), // no need to set the size here due to UsedWithSwapChainOnly
+                                    1,
+                                    QRhiRenderBuffer::UsedWithSwapChainOnly);
+          sc->setWindow(window);
+          sc->setDepthStencil(ds);
+          rp = sc->newCompatibleRenderPassDescriptor();
+          sc->setRenderPassDescriptor(rp);
+          resizeSwapChain();
+      }
+
+      void resizeSwapChain()
+      {
+          hasSwapChain = sc->buildOrResize();
+      }
+
+      void render()
+      {
+          if (!hasSwapChain || notExposed)
+              return;
+
+          if (sc->currentPixelSize() != sc->surfacePixelSize() || newlyExposed) {
+              resizeSwapChain();
+              if (!hasSwapChain)
+                  return;
+              newlyExposed = false;
+          }
+
+          rhi->beginFrame(sc);
+          // ...
+          rhi->endFrame(sc);
+      }
+    \endcode
+
+    Avoid relying on QWindow resize events to resize swapchains, especially
+    considering that surface sizes may not always fully match the QWindow
+    reported dimensions. The safe, cross-platform approach is to do the check
+    via surfacePixelSize() whenever starting a new frame.
+
+    Releasing the swapchain must happen while the QWindow and the underlying
+    native window is fully up and running. Building on the previous example:
+
+    \badcode
+        void releaseSwapChain()
+        {
+            if (hasSwapChain) {
+                sc->release();
+                hasSwapChain = false;
+            }
+        }
+
+        // assuming Window is our QWindow subclass
+        bool Window::event(QEvent *e)
+        {
+            switch (e->type()) {
+            case QEvent::UpdateRequest: // for QWindow::requestUpdate()
+                render();
+                break;
+            case QEvent::PlatformSurface:
+                if (static_cast<QPlatformSurfaceEvent *>(e)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed)
+                    releaseSwapChain();
+                break;
+            default:
+                break;
+            }
+            return QWindow::event(e);
+        }
+    \endcode
+
+    Initializing the swapchain and starting to render the first frame cannot
+    start at any time. The safe, cross-platform approach is to rely on expose
+    events. QExposeEvent is a loosely specified event that is sent whenever a
+    window gets mapped, obscured, and resized, depending on the platform.
+
+    \badcode
+        void Window::exposeEvent(QExposeEvent *)
+        {
+            // initialize and start rendering when the window becomes usable for graphics purposes
+            if (isExposed() && !running) {
+                running = true;
+                init();
+            }
+
+            // stop pushing frames when not exposed or size becomes 0
+            if ((!isExposed() || (hasSwapChain && sc->surfacePixelSize().isEmpty())) && running)
+                notExposed = true;
+
+            // continue when exposed again and the surface has a valid size
+            if (isExposed() && running && notExposed && !sc->surfacePixelSize().isEmpty()) {
+                notExposed = false;
+                newlyExposed = true;
+            }
+
+            if (isExposed() && !sc->surfacePixelSize().isEmpty())
+                render();
+        }
+    \endcode
+
+    Once the rendering has started, a simple way to request a new frame is
+    QWindow::requestUpdate(). While on some platforms this is merely a small
+    timer, on others it has a specific implementation: for instance on macOS or
+    iOS it may be backed by
+    \l{https://developer.apple.com/documentation/corevideo/cvdisplaylink?language=objc}{CVDisplayLink}.
+    The example above is already prepared for update requests by handling
+    QEvent::UpdateRequest.
+
+    While acting as a QRhiRenderTarget, QRhiSwapChain also manages a
+    QRhiCommandBuffer. Calling QRhi::endFrame() submits the recorded commands
+    and also enqueues a \c present request. The default behavior is to do this
+    with a swap interval of 1, meaning synchronizing to the display's vertical
+    refresh is enabled. Thus the rendering thread calling beginFrame() and
+    endFrame() will get throttled to vsync. On some backends this can be
+    disabled by passing QRhiSwapChain:NoVSync in flags().
+
+    Multisampling (MSAA) is handled transparently to the applications when
+    requested via setSampleCount(). Where applicable, QRhiSwapChain will take
+    care of creating additional color buffers and issuing a multisample resolve
+    command at the end of a frame. For OpenGL, it is necessary to request the
+    appropriate sample count also via QSurfaceFormat, by calling
+    QSurfaceFormat::setDefaultFormat() before initializing the QRhi.
+ */
+
+/*!
+    \enum QRhiSwapChain::Flag
+    Flag values to describe swapchain properties
+
+    \value SurfaceHasPreMulAlpha Indicates that the target surface has
+    transparency with premultiplied alpha. For example, this is what Qt Quick
+    uses when the alpha channel is enabled on the target QWindow, because the
+    scenegraph rendrerer always outputs fragments with alpha multiplied into
+    the red, green, and blue values. To ensure identical behavior across
+    platforms, always set QSurfaceFormat::alphaBufferSize() to a non-zero value
+    on the target QWindow whenever this flag is set on the swapchain.
+
+    \value SurfaceHasNonPreMulAlpha Indicates the target surface has
+    transparency with non-premultiplied alpha. Be aware that this may not be
+    supported on some systems, if the system compositor always expects content
+    with premultiplied alpha. In that case the behavior with this flag set is
+    expected to be equivalent to SurfaceHasPreMulAlpha.
+
+    \value sRGB Requests to pick an sRGB format for the swapchain and/or its
+    render target views, where applicable. Note that this implies that sRGB
+    framebuffer update and blending will get enabled for all content targeting
+    this swapchain, and opting out is not possible. For OpenGL, set
+    \l{QSurfaceFormat::sRGBColorSpace}{sRGBColorSpace} on the QSurfaceFormat of
+    the QWindow in addition.
+
+    \value UsedAsTransferSource Indicates the the swapchain will be used as the
+    source of a readback in QRhiResourceUpdateBatch::readBackTexture().
+
+    \value NoVSync Requests disabling waiting for vertical sync, also avoiding
+    throttling the rendering thread. The behavior is backend specific and
+    applicable only where it is possible to control this. Some may ignore the
+    request altogether. For OpenGL, try instead setting the swap interval to 0
+    on the QWindow via QSurfaceFormat::setSwapInterval().
+
+    \value MinimalBufferCount Requests creating the swapchain with the minimum
+    number of buffers, which is in practice 2, unless the graphics
+    implementation has a higher minimum number than that. Only applicable with
+    backends where such control is available via the graphics API, for example,
+    Vulkan. By default it is up to the backend to decide what number of buffers
+    it requests (in practice this is almost always either 2 or 3), and it is
+    not the applications' concern. However, on Vulkan for instance the backend
+    will likely prefer the higher number (3), for example to avoid odd
+    performance issues with some Vulkan implementations on mobile devices. It
+    could be that on some platforms it can prove to be beneficial to force the
+    lower buffer count (2), so this flag allows forcing that. Note that all
+    this has no effect on the number of frames kept in flight, so the CPU
+    (QRhi) will still prepare frames at most \c{N - 1} frames ahead of the GPU,
+    even when the swapchain image buffer count larger than \c N. (\c{N} =
+    QRhi::FramesInFlight and typically 2).
+ */
+
+/*!
+    \internal
+ */
+QRhiSwapChain::QRhiSwapChain(QRhiImplementation *rhi)
+    : QRhiResource(rhi)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiSwapChain::resourceType() const
+{
+    return SwapChain;
+}
+
+/*!
+    \fn QSize QRhiSwapChain::currentPixelSize() const
+
+    \return the size with which the swapchain was last successfully built. Use
+    this to decide if buildOrResize() needs to be called again: if
+    \c{currentPixelSize() != surfacePixelSize()} then the swapchain needs to be
+    resized.
+
+    \note Typical rendering logic will call this function to get the output
+    size when starting to prepare a new frame, and base dependent calculations
+    (such as, the viewport) on the size returned from this function.
+
+    While in many cases the value is the same as \c{QWindow::size() *
+    QWindow::devicePixelRatio()}, relying on the QWindow-reported size is not
+    guaranteed to be correct on all platforms and graphics API implementations.
+    Using this function is therefore strongly recommended whenever there is a
+    need to identify the dimensions, in pixels, of the output layer or surface.
+
+    This also has the added benefit of avoiding potential data races when QRhi
+    is used on a dedicated rendering thread, because the need to call QWindow
+    functions, that may then access data updated on the main thread, is
+    avoided.
+
+    \sa surfacePixelSize()
+  */
+
+/*!
+    \fn QSize QRhiSwapChain::surfacePixelSize()
+
+    \return The size of the window's associated surface or layer.
+
+    \warning Do not assume this is the same as \c{QWindow::size() *
+    QWindow::devicePixelRatio()}. With some graphics APIs and windowing system
+    interfaces (for example, Vulkan) there is a theoretical possibility for a
+    surface to assume a size different from the associated window. To support
+    these cases, rendering logic must always base size-derived calculations
+    (such as, viewports) on the size reported from QRhiSwapChain, and never on
+    the size queried from QWindow.
+
+    \note Can also be called before buildOrResize(), if at least window() is
+    already set) This in combination with currentPixelSize() allows to detect
+    when a swapchain needs to be resized. However, watch out for the fact that
+    the size of the underlying native object (surface, layer, or similar) is
+    "live", so whenever this function is called, it returns the latest value
+    reported by the underlying implementation, without any atomicity guarantee.
+    Therefore, using this function to determine pixel sizes for graphics
+    resources that are used in a frame is strongly discouraged. Rely on
+    currentPixelSize() instead which returns a size that is atomic and will not
+    change between buildOrResize() invocations.
+
+    \note For depth-stencil buffers used in combination with the swapchain's
+    color buffers, it is strongly recommended to rely on the automatic sizing
+    and rebuilding behavior provided by the
+    QRhiRenderBuffer:UsedWithSwapChainOnly flag. Avoid querying the surface
+    size via this function just to get a size that can be passed to
+    QRhiRenderBuffer::setPixelSize() as that would suffer from the lack of
+    atomicity as described above.
+
+    \sa currentPixelSize()
+  */
+
+/*!
+    \fn QRhiCommandBuffer *QRhiSwapChain::currentFrameCommandBuffer()
+
+    \return a command buffer on which rendering commands can be recorded. Only
+    valid within a QRhi::beginFrame() - QRhi::endFrame() block where
+    beginFrame() was called with this swapchain.
+
+    \note the value must not be cached and reused between frames
+*/
+
+/*!
+    \fn QRhiRenderTarget *QRhiSwapChain::currentFrameRenderTarget()
+
+    \return a render target that can used with beginPass() in order to render
+    the the swapchain's current backbuffer. Only valid within a
+    QRhi::beginFrame() - QRhi::endFrame() block where beginFrame() was called
+    with this swapchain.
+
+    \note the value must not be cached and reused between frames
+ */
+
+/*!
+    \fn bool QRhiSwapChain::buildOrResize()
+
+    Creates the swapchain if not already done and resizes the swapchain buffers
+    to match the current size of the targeted surface. Call this whenever the
+    size of the target surface is different than before.
+
+    \note call release() only when the swapchain needs to be released
+    completely, typically upon
+    QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed. To perform resizing, just
+    call buildOrResize().
+
+    \return \c true when successful, \c false when a graphics operation failed.
+    Regardless of the return value, calling release() is always safe.
+ */
+
+/*!
+    \class QRhiComputePipeline
+    \internal
+    \inmodule QtGui
+    \brief Compute pipeline state resource.
+
+    \note Setting the shader resource bindings is mandatory. The referenced
+    QRhiShaderResourceBindings must already be built by the time build() is
+    called.
+
+    \note Setting the shader is mandatory.
+ */
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiComputePipeline::resourceType() const
+{
+    return ComputePipeline;
+}
+
+/*!
+    \internal
+ */
+QRhiComputePipeline::QRhiComputePipeline(QRhiImplementation *rhi)
+    : QRhiResource(rhi)
+{
+}
+
+/*!
+    \class QRhiCommandBuffer
+    \internal
+    \inmodule QtGui
+    \brief Command buffer resource.
+
+    Not creatable by applications at the moment. The only ways to obtain a
+    valid QRhiCommandBuffer are to get it from the targeted swapchain via
+    QRhiSwapChain::currentFrameCommandBuffer(), or, in case of rendering
+    completely offscreen, initializing one via QRhi::beginOffscreenFrame().
+ */
+
+/*!
+    \enum QRhiCommandBuffer::IndexFormat
+    Specifies the index data type
+
+    \value IndexUInt16 Unsigned 16-bit (quint16)
+    \value IndexUInt32 Unsigned 32-bit (quint32)
+ */
+
+/*!
+    \typedef QRhiCommandBuffer::DynamicOffset
+
+    Synonym for QPair<int, quint32>. The first entry is the binding, the second
+    is the offset in the buffer.
+*/
+
+/*!
+    \typedef QRhiCommandBuffer::VertexInput
+
+    Synonym for QPair<QRhiBuffer *, quint32>. The second entry is an offset in
+    the buffer specified by the first.
+*/
+
+/*!
+    \internal
+ */
+QRhiCommandBuffer::QRhiCommandBuffer(QRhiImplementation *rhi)
+    : QRhiResource(rhi)
+{
+}
+
+/*!
+    \return the resource type.
+ */
+QRhiResource::Type QRhiCommandBuffer::resourceType() const
+{
+    return CommandBuffer;
+}
+
+#ifndef QT_NO_DEBUG
+static const char *resourceTypeStr(QRhiResource *res)
+{
+    switch (res->resourceType()) {
+    case QRhiResource::Buffer:
+        return "Buffer";
+    case QRhiResource::Texture:
+        return "Texture";
+    case QRhiResource::Sampler:
+        return "Sampler";
+    case QRhiResource::RenderBuffer:
+        return "RenderBuffer";
+    case QRhiResource::RenderPassDescriptor:
+        return "RenderPassDescriptor";
+    case QRhiResource::RenderTarget:
+        return "RenderTarget";
+    case QRhiResource::TextureRenderTarget:
+        return "TextureRenderTarget";
+    case QRhiResource::ShaderResourceBindings:
+        return "ShaderResourceBindings";
+    case QRhiResource::GraphicsPipeline:
+        return "GraphicsPipeline";
+    case QRhiResource::SwapChain:
+        return "SwapChain";
+    case QRhiResource::ComputePipeline:
+        return "ComputePipeline";
+    case QRhiResource::CommandBuffer:
+        return "CommandBuffer";
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    return "";
+}
+#endif
+
+QRhiImplementation::~QRhiImplementation()
+{
+    qDeleteAll(resUpdPool);
+
+    // Be nice and show something about leaked stuff. Though we may not get
+    // this far with some backends where the allocator or the api may check
+    // and freak out for unfreed graphics objects in the derived dtor already.
+#ifndef QT_NO_DEBUG
+    if (!resources.isEmpty()) {
+        qWarning("QRhi %p going down with %d unreleased resources that own native graphics objects. This is not nice.",
+                 q, resources.count());
+        for (QRhiResource *res : qAsConst(resources)) {
+            qWarning("  %s resource %p (%s)", resourceTypeStr(res), res, res->m_objectName.constData());
+            res->m_rhi = nullptr;
+        }
+    }
+#endif
+}
+
+bool QRhiImplementation::isCompressedFormat(QRhiTexture::Format format) const
+{
+    return (format >= QRhiTexture::BC1 && format <= QRhiTexture::BC7)
+            || (format >= QRhiTexture::ETC2_RGB8 && format <= QRhiTexture::ETC2_RGBA8)
+            || (format >= QRhiTexture::ASTC_4x4 && format <= QRhiTexture::ASTC_12x12);
+}
+
+void QRhiImplementation::compressedFormatInfo(QRhiTexture::Format format, const QSize &size,
+                                              quint32 *bpl, quint32 *byteSize,
+                                              QSize *blockDim) const
+{
+    int xdim = 4;
+    int ydim = 4;
+    quint32 blockSize = 0;
+
+    switch (format) {
+    case QRhiTexture::BC1:
+        blockSize = 8;
+        break;
+    case QRhiTexture::BC2:
+        blockSize = 16;
+        break;
+    case QRhiTexture::BC3:
+        blockSize = 16;
+        break;
+    case QRhiTexture::BC4:
+        blockSize = 8;
+        break;
+    case QRhiTexture::BC5:
+        blockSize = 16;
+        break;
+    case QRhiTexture::BC6H:
+        blockSize = 16;
+        break;
+    case QRhiTexture::BC7:
+        blockSize = 16;
+        break;
+
+    case QRhiTexture::ETC2_RGB8:
+        blockSize = 8;
+        break;
+    case QRhiTexture::ETC2_RGB8A1:
+        blockSize = 8;
+        break;
+    case QRhiTexture::ETC2_RGBA8:
+        blockSize = 16;
+        break;
+
+    case QRhiTexture::ASTC_4x4:
+        blockSize = 16;
+        break;
+    case QRhiTexture::ASTC_5x4:
+        blockSize = 16;
+        xdim = 5;
+        break;
+    case QRhiTexture::ASTC_5x5:
+        blockSize = 16;
+        xdim = ydim = 5;
+        break;
+    case QRhiTexture::ASTC_6x5:
+        blockSize = 16;
+        xdim = 6;
+        ydim = 5;
+        break;
+    case QRhiTexture::ASTC_6x6:
+        blockSize = 16;
+        xdim = ydim = 6;
+        break;
+    case QRhiTexture::ASTC_8x5:
+        blockSize = 16;
+        xdim = 8;
+        ydim = 5;
+        break;
+    case QRhiTexture::ASTC_8x6:
+        blockSize = 16;
+        xdim = 8;
+        ydim = 6;
+        break;
+    case QRhiTexture::ASTC_8x8:
+        blockSize = 16;
+        xdim = ydim = 8;
+        break;
+    case QRhiTexture::ASTC_10x5:
+        blockSize = 16;
+        xdim = 10;
+        ydim = 5;
+        break;
+    case QRhiTexture::ASTC_10x6:
+        blockSize = 16;
+        xdim = 10;
+        ydim = 6;
+        break;
+    case QRhiTexture::ASTC_10x8:
+        blockSize = 16;
+        xdim = 10;
+        ydim = 8;
+        break;
+    case QRhiTexture::ASTC_10x10:
+        blockSize = 16;
+        xdim = ydim = 10;
+        break;
+    case QRhiTexture::ASTC_12x10:
+        blockSize = 16;
+        xdim = 12;
+        ydim = 10;
+        break;
+    case QRhiTexture::ASTC_12x12:
+        blockSize = 16;
+        xdim = ydim = 12;
+        break;
+
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    const quint32 wblocks = uint((size.width() + xdim - 1) / xdim);
+    const quint32 hblocks = uint((size.height() + ydim - 1) / ydim);
+
+    if (bpl)
+        *bpl = wblocks * blockSize;
+    if (byteSize)
+        *byteSize = wblocks * hblocks * blockSize;
+    if (blockDim)
+        *blockDim = QSize(xdim, ydim);
+}
+
+void QRhiImplementation::textureFormatInfo(QRhiTexture::Format format, const QSize &size,
+                                           quint32 *bpl, quint32 *byteSize) const
+{
+    if (isCompressedFormat(format)) {
+        compressedFormatInfo(format, size, bpl, byteSize, nullptr);
+        return;
+    }
+
+    quint32 bpc = 0;
+    switch (format) {
+    case QRhiTexture::RGBA8:
+        bpc = 4;
+        break;
+    case QRhiTexture::BGRA8:
+        bpc = 4;
+        break;
+    case QRhiTexture::R8:
+        bpc = 1;
+        break;
+    case QRhiTexture::R16:
+        bpc = 2;
+        break;
+    case QRhiTexture::RED_OR_ALPHA8:
+        bpc = 1;
+        break;
+
+    case QRhiTexture::RGBA16F:
+        bpc = 8;
+        break;
+    case QRhiTexture::RGBA32F:
+        bpc = 16;
+        break;
+
+    case QRhiTexture::D16:
+        bpc = 2;
+        break;
+    case QRhiTexture::D32F:
+        bpc = 4;
+        break;
+
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    if (bpl)
+        *bpl = uint(size.width()) * bpc;
+    if (byteSize)
+        *byteSize = uint(size.width() * size.height()) * bpc;
+}
+
+// Approximate because it excludes subresource alignment or multisampling.
+quint32 QRhiImplementation::approxByteSizeForTexture(QRhiTexture::Format format, const QSize &baseSize,
+                                                     int mipCount, int layerCount)
+{
+    quint32 approxSize = 0;
+    for (int level = 0; level < mipCount; ++level) {
+        quint32 byteSize = 0;
+        const QSize size(qFloor(qreal(qMax(1, baseSize.width() >> level))),
+                         qFloor(qreal(qMax(1, baseSize.height() >> level))));
+        textureFormatInfo(format, size, nullptr, &byteSize);
+        approxSize += byteSize;
+    }
+    approxSize *= uint(layerCount);
+    return approxSize;
+}
+
+bool QRhiImplementation::sanityCheckGraphicsPipeline(QRhiGraphicsPipeline *ps)
+{
+    if (ps->cbeginShaderStages() == ps->cendShaderStages()) {
+        qWarning("Cannot build a graphics pipeline without any stages");
+        return false;
+    }
+
+    bool hasVertexStage = false;
+    for (auto it = ps->cbeginShaderStages(), itEnd = ps->cendShaderStages(); it != itEnd; ++it) {
+        if (!it->shader().isValid()) {
+            qWarning("Empty shader passed to graphics pipeline");
+            return false;
+        }
+        if (it->type() == QRhiShaderStage::Vertex) {
+            hasVertexStage = true;
+            const QRhiVertexInputLayout inputLayout = ps->vertexInputLayout();
+            if (inputLayout.cbeginAttributes() == inputLayout.cendAttributes()) {
+                qWarning("Vertex stage present without any vertex inputs");
+                return false;
+            }
+        }
+    }
+    if (!hasVertexStage) {
+        qWarning("Cannot build a graphics pipeline without a vertex stage");
+        return false;
+    }
+
+    if (!ps->renderPassDescriptor()) {
+        qWarning("Cannot build a graphics pipeline without a QRhiRenderPassDescriptor");
+        return false;
+    }
+
+    if (!ps->shaderResourceBindings()) {
+        qWarning("Cannot build a graphics pipeline without QRhiShaderResourceBindings");
+        return false;
+    }
+
+    return true;
+}
+
+/*!
+    \internal
+ */
+QRhi::QRhi()
+{
+}
+
+/*!
+    Destructor. Destroys the backend and releases resources.
+ */
+QRhi::~QRhi()
+{
+    if (!d)
+        return;
+
+    qDeleteAll(d->pendingReleaseAndDestroyResources);
+    d->pendingReleaseAndDestroyResources.clear();
+
+    runCleanup();
+
+    d->destroy();
+    delete d;
+}
+
+/*!
+    \return a new QRhi instance with a backend for the graphics API specified by \a impl.
+
+    \a params must point to an instance of one of the backend-specific
+    subclasses of QRhiInitParams, such as, QRhiVulkanInitParams,
+    QRhiMetalInitParams, QRhiD3D11InitParams, QRhiGles2InitParams. See these
+    classes for examples on creating a QRhi.
+
+    \a flags is optional. It is used to enable profile and debug related
+    features that are potentially expensive and should only be used during
+    development.
+ */
+QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRhiNativeHandles *importDevice)
+{
+    QScopedPointer<QRhi> r(new QRhi);
+
+    switch (impl) {
+    case Null:
+        r->d = new QRhiNull(static_cast<QRhiNullInitParams *>(params));
+        break;
+    case Vulkan:
+#if QT_CONFIG(vulkan)
+        r->d = new QRhiVulkan(static_cast<QRhiVulkanInitParams *>(params),
+                              static_cast<QRhiVulkanNativeHandles *>(importDevice));
+        break;
+#else
+        Q_UNUSED(importDevice);
+        qWarning("This build of Qt has no Vulkan support");
+        break;
+#endif
+    case OpenGLES2:
+#ifndef QT_NO_OPENGL
+        r->d = new QRhiGles2(static_cast<QRhiGles2InitParams *>(params),
+                             static_cast<QRhiGles2NativeHandles *>(importDevice));
+        break;
+#else
+        qWarning("This build of Qt has no OpenGL support");
+        break;
+#endif
+    case D3D11:
+#ifdef Q_OS_WIN
+        r->d = new QRhiD3D11(static_cast<QRhiD3D11InitParams *>(params),
+                             static_cast<QRhiD3D11NativeHandles *>(importDevice));
+        break;
+#else
+        qWarning("This platform has no Direct3D 11 support");
+        break;
+#endif
+    case Metal:
+//#ifdef Q_OS_DARWIN
+#ifdef Q_OS_MACOS
+        r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params),
+                             static_cast<QRhiMetalNativeHandles *>(importDevice));
+        break;
+#else
+        qWarning("This platform has no Metal support");
+        break;
+#endif
+    default:
+        break;
+    }
+
+    if (r->d) {
+        r->d->q = r.data();
+
+        if (flags.testFlag(EnableProfiling)) {
+            QRhiProfilerPrivate *profD = QRhiProfilerPrivate::get(&r->d->profiler);
+            profD->rhiDWhenEnabled = r->d;
+            const_cast<QLoggingCategory &>(QRHI_LOG_INFO()).setEnabled(QtDebugMsg, true);
+        }
+
+        // Play nice with QSG_INFO since that is still the most commonly used
+        // way to get graphics info printed from Qt Quick apps, and the Quick
+        // scenegraph is our primary user.
+        if (qEnvironmentVariableIsSet("QSG_INFO"))
+            const_cast<QLoggingCategory &>(QRHI_LOG_INFO()).setEnabled(QtDebugMsg, true);
+
+        r->d->debugMarkers = flags.testFlag(EnableDebugMarkers);
+
+        if (r->d->create(flags)) {
+            r->d->implType = impl;
+            r->d->implThread = QThread::currentThread();
+            return r.take();
+        }
+    }
+
+    return nullptr;
+}
+
+/*!
+    \return the backend type for this QRhi.
+ */
+QRhi::Implementation QRhi::backend() const
+{
+    return d->implType;
+}
+
+/*!
+    \return the thread on which the QRhi was \l{QRhi::create()}{initialized}.
+ */
+QThread *QRhi::thread() const
+{
+    return d->implThread;
+}
+
+/*!
+    Registers a \a callback that is invoked either when the QRhi is destroyed,
+    or when runCleanup() is called.
+
+    The callback will run with the graphics resource still available, so this
+    provides an opportunity for the application to cleanly release QRhiResource
+    instances belonging to the QRhi. This is particularly useful for managing
+    the lifetime of resources stored in \c cache type of objects, where the
+    cache holds QRhiResources or objects containing QRhiResources.
+
+    \sa runCleanup(), ~QRhi()
+ */
+void QRhi::addCleanupCallback(const CleanupCallback &callback)
+{
+    d->addCleanupCallback(callback);
+}
+
+/*!
+    Invokes all registered cleanup functions. The list of cleanup callbacks it
+    then cleared. Normally destroying the QRhi does this automatically, but
+    sometimes it can be useful to trigger cleanup in order to release all
+    cached, non-essential resources.
+
+    \sa addCleanupCallback()
+ */
+void QRhi::runCleanup()
+{
+    for (const CleanupCallback &f : qAsConst(d->cleanupCallbacks))
+        f(this);
+
+    d->cleanupCallbacks.clear();
+}
+
+/*!
+    \class QRhiResourceUpdateBatch
+    \internal
+    \inmodule QtGui
+    \brief Records upload and copy type of operations.
+
+    With QRhi it is no longer possible to perform copy type of operations at
+    arbitrary times. Instead, all such operations are recorded into batches
+    that are then passed, most commonly, to QRhiCommandBuffer::beginPass().
+    What then happens under the hood is hidden from the application: the
+    underlying implementations can defer and implement these operations in
+    various different ways.
+
+    A resource update batch owns no graphics resources and does not perform any
+    actual operations on its own. It should rather be viewed as a command
+    buffer for update, upload, and copy type of commands.
+
+    To get an available, empty batch from the pool, call
+    QRhi::nextResourceUpdateBatch().
+ */
+
+/*!
+    \internal
+ */
+QRhiResourceUpdateBatch::QRhiResourceUpdateBatch(QRhiImplementation *rhi)
+    : d(new QRhiResourceUpdateBatchPrivate)
+{
+    d->q = this;
+    d->rhi = rhi;
+}
+
+QRhiResourceUpdateBatch::~QRhiResourceUpdateBatch()
+{
+    delete d;
+}
+
+/*!
+    \return the batch to the pool. This should only be used when the batch is
+    not passed to one of QRhiCommandBuffer::beginPass(),
+    QRhiCommandBuffer::endPass(), or QRhiCommandBuffer::resourceUpdate()
+    because these implicitly call release().
+
+    \note QRhiResourceUpdateBatch instances must never by \c deleted by
+    applications.
+ */
+void QRhiResourceUpdateBatch::release()
+{
+    d->free();
+}
+
+/*!
+    Copies all queued operations from the \a other batch into this one.
+
+    \note \a other is not changed in any way, typically it will still need a
+    release()
+
+    This allows for a convenient pattern where resource updates that are
+    already known during the initialization step are collected into a batch
+    that is then merged into another when starting to first render pass later
+    on:
+
+    \badcode
+    void init()
+    {
+        ...
+        initialUpdates = rhi->nextResourceUpdateBatch();
+        initialUpdates->uploadStaticBuffer(vbuf, vertexData);
+        initialUpdates->uploadStaticBuffer(ibuf, indexData);
+        ...
+    }
+
+    void render()
+    {
+        ...
+        QRhiResourceUpdateBatch *resUpdates = rhi->nextResourceUpdateBatch();
+        if (initialUpdates) {
+            resUpdates->merge(initialUpdates);
+            initialUpdates->release();
+            initialUpdates = nullptr;
+        }
+        resUpdates->updateDynamicBuffer(...);
+        ...
+        cb->beginPass(rt, clearCol, clearDs, resUpdates);
+    }
+    \endcode
+ */
+void QRhiResourceUpdateBatch::merge(QRhiResourceUpdateBatch *other)
+{
+    d->merge(other->d);
+}
+
+/*!
+    Enqueues updating a region of a QRhiBuffer \a buf created with the type
+    QRhiBuffer::Dynamic.
+
+    The region is specified \a offset and \a size. The actual bytes to write
+    are specified by \a data which must have at least \a size bytes available.
+    \a data can safely be destroyed or changed once this function returns.
+
+    \note If host writes are involved, which is the case with
+    updateDynamicBuffer() typically as such buffers are backed by host visible
+    memory with most backends, they may accumulate within a frame. Thus pass 1
+    reading a region changed by a batch passed to pass 2 may see the changes
+    specified in pass 2's update batch.
+
+    \note QRhi transparently manages double buffering in order to prevent
+    stalling the graphics pipeline. The fact that a QRhiBuffer may have
+    multiple native underneath can be safely ignored when using the QRhi and
+    QRhiResourceUpdateBatch.
+ */
+void QRhiResourceUpdateBatch::updateDynamicBuffer(QRhiBuffer *buf, int offset, int size, const void *data)
+{
+    if (size > 0)
+        d->bufferOps.append(QRhiResourceUpdateBatchPrivate::BufferOp::dynamicUpdate(buf, offset, size, data));
+}
+
+/*!
+    Enqueues updating a region of a QRhiBuffer \a buf created with the type
+    QRhiBuffer::Immutable or QRhiBuffer::Static.
+
+    The region is specified \a offset and \a size. The actual bytes to write
+    are specified by \a data which must have at least \a size bytes available.
+    \a data can safely be destroyed or changed once this function returns.
+ */
+void QRhiResourceUpdateBatch::uploadStaticBuffer(QRhiBuffer *buf, int offset, int size, const void *data)
+{
+    if (size > 0)
+        d->bufferOps.append(QRhiResourceUpdateBatchPrivate::BufferOp::staticUpload(buf, offset, size, data));
+}
+
+/*!
+    Enqueues updating the entire QRhiBuffer \a buf created with the type
+    QRhiBuffer::Immutable or QRhiBuffer::Static.
+ */
+void QRhiResourceUpdateBatch::uploadStaticBuffer(QRhiBuffer *buf, const void *data)
+{
+    if (buf->size() > 0)
+        d->bufferOps.append(QRhiResourceUpdateBatchPrivate::BufferOp::staticUpload(buf, 0, 0, data));
+}
+
+/*!
+    Enqueues reading back a region of the QRhiBuffer \a buf. The size of the
+    region is specified by \a size in bytes, \a offset is the offset in bytes
+    to start reading from.
+
+    A readback is asynchronous. \a result contains a callback that is invoked
+    when the operation has completed. The data is provided in
+    QRhiBufferReadbackResult::data. Upon successful completion that QByteArray
+    will have a size equal to \a size. On failure the QByteArray will be empty.
+
+    \note Reading buffers with a usage different than QRhiBuffer::UniformBuffer
+    is supported only when the QRhi::ReadBackNonUniformBuffer feature is
+    reported as supported.
+
+    \a readBackTexture(), QRhi::isFeatureSupported()
+ */
+void QRhiResourceUpdateBatch::readBackBuffer(QRhiBuffer *buf, int offset, int size, QRhiBufferReadbackResult *result)
+{
+    d->bufferOps.append(QRhiResourceUpdateBatchPrivate::BufferOp::read(buf, offset, size, result));
+}
+
+/*!
+    Enqueues uploading the image data for one or more mip levels in one or more
+    layers of the texture \a tex.
+
+    The details of the copy (source QImage or compressed texture data, regions,
+    target layers and levels) are described in \a desc.
+ */
+void QRhiResourceUpdateBatch::uploadTexture(QRhiTexture *tex, const QRhiTextureUploadDescription &desc)
+{
+    if (desc.cbeginEntries() != desc.cendEntries())
+        d->textureOps.append(QRhiResourceUpdateBatchPrivate::TextureOp::upload(tex, desc));
+}
+
+/*!
+    Enqueues uploading the image data for mip level 0 of layer 0 of the texture
+    \a tex.
+
+    \a tex must have an uncompressed format. Its format must also be compatible
+    with the QImage::format() of \a image. The source data is given in \a
+    image.
+ */
+void QRhiResourceUpdateBatch::uploadTexture(QRhiTexture *tex, const QImage &image)
+{
+    uploadTexture(tex, QRhiTextureUploadEntry(0, 0, image));
+}
+
+/*!
+   Enqueues a texture-to-texture copy operation from \a src into \a dst as
+   described by \a desc.
+
+   \note The source texture \a src must be created with
+   QRhiTexture::UsedAsTransferSource.
+ */
+void QRhiResourceUpdateBatch::copyTexture(QRhiTexture *dst, QRhiTexture *src, const QRhiTextureCopyDescription &desc)
+{
+    d->textureOps.append(QRhiResourceUpdateBatchPrivate::TextureOp::copy(dst, src, desc));
+}
+
+/*!
+   Enqueues a texture-to-host copy operation as described by \a rb.
+
+   Normally \a rb will specify a QRhiTexture as the source. However, when the
+   swapchain in the current frame was created with
+   QRhiSwapChain::UsedAsTransferSource, it can also be the source of the
+   readback. For this, leave the texture set to null in \a rb.
+
+   Unlike other operations, the results here need to be processed by the
+   application. Therefore, \a result provides not just the data but also a
+   callback as operations on the batch are asynchronous by nature:
+
+   \badcode
+      beginFrame(sc);
+      beginPass
+      ...
+      QRhiReadbackResult *rbResult = new QRhiReadbackResult;
+      rbResult->completed = [rbResult] {
+          {
+              const QImage::Format fmt = QImage::Format_RGBA8888_Premultiplied; // fits QRhiTexture::RGBA8
+              const uchar *p = reinterpret_cast<const uchar *>(rbResult->data.constData());
+              QImage image(p, rbResult->pixelSize.width(), rbResult->pixelSize.height(), fmt);
+              image.save("result.png");
+          }
+          delete rbResult;
+      };
+      u = nextResourceUpdateBatch();
+      QRhiReadbackDescription rb; // no texture -> uses the current backbuffer of sc
+      u->readBackTexture(rb, rbResult);
+      endPass(u);
+      endFrame(sc);
+   \endcode
+
+   \note The texture must be created with QRhiTexture::UsedAsTransferSource.
+
+   \note Multisample textures cannot be read back.
+
+   \note The readback returns raw byte data, in order to allow the applications
+   to interpret it in any way they see fit. Be aware of the blending settings
+   of rendering code: if the blending is set up to rely on premultiplied alpha,
+   the results of the readback must also be interpreted as Premultiplied.
+
+   \note When interpreting the resulting raw data, be aware that the readback
+   happens with a byte ordered format. A \l{QRhiTexture::RGBA8}{RGBA8} texture
+   maps therefore to byte ordered QImage formats, such as,
+   QImage::Format_RGBA8888.
+ */
+void QRhiResourceUpdateBatch::readBackTexture(const QRhiReadbackDescription &rb, QRhiReadbackResult *result)
+{
+    d->textureOps.append(QRhiResourceUpdateBatchPrivate::TextureOp::read(rb, result));
+}
+
+/*!
+   Enqueues a mipmap generation operation for the specified \a layer of texture
+   \a tex.
+
+   \note The texture must be created with QRhiTexture::MipMapped and
+   QRhiTexture::UsedWithGenerateMips.
+ */
+void QRhiResourceUpdateBatch::generateMips(QRhiTexture *tex, int layer)
+{
+    d->textureOps.append(QRhiResourceUpdateBatchPrivate::TextureOp::genMips(tex, layer));
+}
+
+/*!
+   \return an available, empty batch to which copy type of operations can be
+   recorded.
+
+   \note the return value is not owned by the caller and must never be
+   destroyed. Instead, the batch is returned the the pool for reuse by passing
+   it to QRhiCommandBuffer::beginPass(), QRhiCommandBuffer::endPass(), or
+   QRhiCommandBuffer::resourceUpdate(), or by calling
+   QRhiResourceUpdateBatch::release() on it.
+
+   \note Can be called outside beginFrame() - endFrame() as well since a batch
+   instance just collects data on its own, it does not perform any operations.
+ */
+QRhiResourceUpdateBatch *QRhi::nextResourceUpdateBatch()
+{
+    auto nextFreeBatch = [this]() -> QRhiResourceUpdateBatch * {
+        for (int i = 0, ie = d->resUpdPoolMap.count(); i != ie; ++i) {
+            if (!d->resUpdPoolMap.testBit(i)) {
+                d->resUpdPoolMap.setBit(i);
+                QRhiResourceUpdateBatch *u = d->resUpdPool[i];
+                QRhiResourceUpdateBatchPrivate::get(u)->poolIndex = i;
+                return u;
+            }
+        }
+        return nullptr;
+    };
+
+    QRhiResourceUpdateBatch *u = nextFreeBatch();
+    if (!u) {
+        const int oldSize = d->resUpdPool.count();
+        const int newSize = oldSize + 4;
+        d->resUpdPool.resize(newSize);
+        d->resUpdPoolMap.resize(newSize);
+        for (int i = oldSize; i < newSize; ++i)
+            d->resUpdPool[i] = new QRhiResourceUpdateBatch(d);
+        u = nextFreeBatch();
+        Q_ASSERT(u);
+    }
+
+    return u;
+}
+
+void QRhiResourceUpdateBatchPrivate::free()
+{
+    Q_ASSERT(poolIndex >= 0 && rhi->resUpdPool[poolIndex] == q);
+
+    bufferOps.clear();
+    textureOps.clear();
+
+    rhi->resUpdPoolMap.clearBit(poolIndex);
+    poolIndex = -1;
+}
+
+void QRhiResourceUpdateBatchPrivate::merge(QRhiResourceUpdateBatchPrivate *other)
+{
+    bufferOps.reserve(bufferOps.size() + other->bufferOps.size());
+    for (const BufferOp &op : qAsConst(other->bufferOps))
+        bufferOps.append(op);
+
+    textureOps.reserve(textureOps.size() + other->textureOps.size());
+    for (const TextureOp &op : qAsConst(other->textureOps))
+        textureOps.append(op);
+}
+
+/*!
+    Sometimes committing resource updates is necessary without starting a
+    render pass. Not often needed, updates should typically be passed to
+    beginPass (or endPass, in case of readbacks) instead.
+
+    \note Cannot be called inside a pass.
+ */
+void QRhiCommandBuffer::resourceUpdate(QRhiResourceUpdateBatch *resourceUpdates)
+{
+    if (resourceUpdates)
+        m_rhi->resourceUpdate(this, resourceUpdates);
+}
+
+/*!
+    Records starting a new render pass targeting the render target \a rt.
+
+    \a resourceUpdates, when not null, specifies a resource update batch that
+    is to be committed and then released.
+
+    The color and depth/stencil buffers of the render target are normally
+    cleared. The clear values are specified in \a colorClearValue and \a
+    depthStencilClearValue. The exception is when the render target was created
+    with QRhiTextureRenderTarget::PreserveColorContents and/or
+    QRhiTextureRenderTarget::PreserveDepthStencilContents. The clear values are
+    ignored then.
+
+    \note Enabling preserved color or depth contents leads to decreased
+    performance depending on the underlying hardware. Mobile GPUs with tiled
+    architecture benefit from not having to reload the previous contents into
+    the tile buffer. Similarly, a QRhiTextureRenderTarget with a QRhiTexture as
+    the depth buffer is less efficient than a QRhiRenderBuffer since using a
+    depth texture triggers requiring writing the data out to it, while with
+    renderbuffers this is not needed (as the API does not allow sampling or
+    reading from a renderbuffer).
+
+    \note Do not assume that any state or resource bindings persist between
+    passes.
+
+    \note The QRhiCommandBuffer's \c set and \c draw functions can only be
+    called inside a pass. Also, with the exception of setGraphicsPipeline(),
+    they expect to have a pipeline set already on the command buffer.
+    Unspecified issues may arise otherwise, depending on the backend.
+ */
+void QRhiCommandBuffer::beginPass(QRhiRenderTarget *rt,
+                                  const QColor &colorClearValue,
+                                  const QRhiDepthStencilClearValue &depthStencilClearValue,
+                                  QRhiResourceUpdateBatch *resourceUpdates)
+{
+    m_rhi->beginPass(this, rt, colorClearValue, depthStencilClearValue, resourceUpdates);
+}
+
+/*!
+    Records ending the current render pass.
+
+    \a resourceUpdates, when not null, specifies a resource update batch that
+    is to be committed and then released.
+ */
+void QRhiCommandBuffer::endPass(QRhiResourceUpdateBatch *resourceUpdates)
+{
+    m_rhi->endPass(this, resourceUpdates);
+}
+
+/*!
+    Records setting a new graphics pipeline \a ps.
+
+    \note This function must be called before recording other \c set or \c draw
+    commands on the command buffer.
+
+    \note QRhi will optimize out unnecessary invocations within a pass, so
+    therefore overoptimizing to avoid calls to this function is not necessary
+    on the applications' side.
+
+    \note This function can only be called inside a render pass, meaning
+    between a beginPass() and endPass() call.
+ */
+void QRhiCommandBuffer::setGraphicsPipeline(QRhiGraphicsPipeline *ps)
+{
+    m_rhi->setGraphicsPipeline(this, ps);
+}
+
+/*!
+    Records binding a set of shader resources, such as, uniform buffers or
+    textures, that are made visible to one or more shader stages.
+
+    \a srb can be null in which case the current graphics or compute pipeline's
+    associated QRhiShaderResourceBindings is used. When \a srb is non-null, it
+    must be
+    \l{QRhiShaderResourceBindings::isLayoutCompatible()}{layout-compatible},
+    meaning the layout (number of bindings, the type and binding number of each
+    binding) must fully match the QRhiShaderResourceBindings that was
+    associated with the pipeline at the time of calling the pipeline's build().
+
+    There are cases when a seemingly unnecessary setShaderResources() call is
+    mandatory: when rebuilding a resource referenced from \a srb, for example
+    changing the size of a QRhiBuffer followed by a QRhiBuffer::build(), this
+    is the place where associated native objects (such as descriptor sets in
+    case of Vulkan) are updated to refer to the current native resources that
+    back the QRhiBuffer, QRhiTexture, QRhiSampler objects referenced from \a
+    srb. In this case setShaderResources() must be called even if \a srb is
+    the same as in the last call.
+
+    \a dynamicOffsets allows specifying buffer offsets for uniform buffers that
+    were associated with \a srb via
+    QRhiShaderResourceBinding::uniformBufferWithDynamicOffset(). This is
+    different from providing the offset in the \a srb itself: dynamic offsets
+    do not require building a new QRhiShaderResourceBindings for every
+    different offset, can avoid writing the underlying descriptors (with
+    backends where applicable), and so they may be more efficient. Each element
+    of \a dynamicOffsets is a \c binding - \c offset pair.
+    \a dynamicOffsetCount specifies the number of elements in \a dynamicOffsets.
+
+    \note All offsets in \a dynamicOffsets must be byte aligned to the value
+    returned from QRhi::ubufAlignment().
+
+    \note QRhi will optimize out unnecessary invocations within a pass (taking
+    the conditions described above into account), so therefore overoptimizing
+    to avoid calls to this function is not necessary on the applications' side.
+
+    \note This function can only be called inside a render or compute pass,
+    meaning between a beginPass() and endPass(), or beginComputePass() and
+    endComputePass().
+ */
+void QRhiCommandBuffer::setShaderResources(QRhiShaderResourceBindings *srb,
+                                           int dynamicOffsetCount,
+                                           const DynamicOffset *dynamicOffsets)
+{
+    m_rhi->setShaderResources(this, srb, dynamicOffsetCount, dynamicOffsets);
+}
+
+/*!
+    Records vertex input bindings.
+
+    The index buffer used by subsequent drawIndexed() commands is specified by
+    \a indexBuf, \a indexOffset, and \a indexFormat. \a indexBuf can be set to
+    null when indexed drawing is not needed.
+
+    Vertex buffer bindings are batched. \a startBinding specifies the first
+    binding number. The recorded command then binds each buffer from \a
+    bindings to the binding point \c{startBinding + i} where \c i is the index
+    in \a bindings. Each element in \a bindings specifies a QRhiBuffer and an
+    offset.
+
+    Superfluous vertex input and index changes in the same pass are ignored
+    automatically with most backends and therefore applications do not need to
+    overoptimize to avoid calls to this function.
+
+    \note This function can only be called inside a render pass, meaning
+    between a beginPass() and endPass() call.
+
+    As a simple example, take a vertex shader with two inputs:
+
+    \badcode
+        layout(location = 0) in vec4 position;
+        layout(location = 1) in vec3 color;
+    \endcode
+
+    and assume we have the data available in interleaved format, using only 2
+    floats for position (so 5 floats per vertex: x, y, r, g, b). A QRhiGraphicsPipeline for
+    this shader can then be created using the input layout:
+
+    \badcode
+        QRhiVertexInputLayout inputLayout;
+        inputLayout.setBindings({
+            { 5 * sizeof(float) }
+        });
+        inputLayout.setAttributes({
+            { 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+            { 0, 1, QRhiVertexInputAttribute::Float3, 2 * sizeof(float) }
+        });
+    \endcode
+
+    Here there is one buffer binding (binding number 0), with two inputs
+    referencing it. When recording the pass, once the pipeline is set, the
+    vertex bindings can be specified simply like the following (using C++11
+    initializer syntax), assuming vbuf is the QRhiBuffer with all the
+    interleaved position+color data:
+
+    \badcode
+        const QRhiCommandBuffer::VertexInput vbufBinding(vbuf, 0);
+        cb->setVertexInput(0, 1, &vbufBinding);
+    \endcode
+ */
+void QRhiCommandBuffer::setVertexInput(int startBinding, int bindingCount, const VertexInput *bindings,
+                                       QRhiBuffer *indexBuf, quint32 indexOffset,
+                                       IndexFormat indexFormat)
+{
+    m_rhi->setVertexInput(this, startBinding, bindingCount, bindings, indexBuf, indexOffset, indexFormat);
+}
+
+/*!
+    Records setting the active viewport rectangle specified in \a viewport.
+
+    With backends where the underlying graphics API has scissoring always
+    enabled, this function also sets the scissor to match the viewport whenever
+    the active QRhiGraphicsPipeline does not have
+    \l{QRhiGraphicsPipeline::UsesScissor}{UsesScissor} set.
+
+    \note QRhi assumes OpenGL-style viewport coordinates, meaning x and y are
+    bottom-left.
+
+    \note This function can only be called inside a render pass, meaning
+    between a beginPass() and endPass() call.
+ */
+void QRhiCommandBuffer::setViewport(const QRhiViewport &viewport)
+{
+    m_rhi->setViewport(this, viewport);
+}
+
+/*!
+    Records setting the active scissor rectangle specified in \a scissor.
+
+    This can only be called when the bound pipeline has
+    \l{QRhiGraphicsPipeline::UsesScissor}{UsesScissor} set. When the flag is
+    set on the active pipeline, this function must be called because scissor
+    testing will get enabled and so a scissor rectangle must be provided.
+
+    \note QRhi assumes OpenGL-style viewport coordinates, meaning x and y are
+    bottom-left.
+
+    \note This function can only be called inside a render pass, meaning
+    between a beginPass() and endPass() call.
+ */
+void QRhiCommandBuffer::setScissor(const QRhiScissor &scissor)
+{
+    m_rhi->setScissor(this, scissor);
+}
+
+/*!
+    Records setting the active blend constants to \a c.
+
+    This can only be called when the bound pipeline has
+    QRhiGraphicsPipeline::UsesBlendConstants set.
+
+    \note This function can only be called inside a render pass, meaning
+    between a beginPass() and endPass() call.
+ */
+void QRhiCommandBuffer::setBlendConstants(const QColor &c)
+{
+    m_rhi->setBlendConstants(this, c);
+}
+
+/*!
+    Records setting the active stencil reference value to \a refValue.
+
+    This can only be called when the bound pipeline has
+    QRhiGraphicsPipeline::UsesStencilRef set.
+
+    \note This function can only be called inside a render pass, meaning between
+    a beginPass() and endPass() call.
+ */
+void QRhiCommandBuffer::setStencilRef(quint32 refValue)
+{
+    m_rhi->setStencilRef(this, refValue);
+}
+
+/*!
+    Records a non-indexed draw.
+
+    The number of vertices is specified in \a vertexCount. For instanced
+    drawing set \a instanceCount to a value other than 1. \a firstVertex is the
+    index of the first vertex to draw. When drawing multiple instances, the
+    first instance ID is specified by \a firstInstance.
+
+    \note \a firstInstance may not be supported, and is ignored when the
+    QRhi::BaseInstance feature is reported as not supported. The first ID is
+    always 0 in that case.
+
+    \note This function can only be called inside a render pass, meaning
+    between a beginPass() and endPass() call.
+ */
+void QRhiCommandBuffer::draw(quint32 vertexCount,
+                             quint32 instanceCount,
+                             quint32 firstVertex,
+                             quint32 firstInstance)
+{
+    m_rhi->draw(this, vertexCount, instanceCount, firstVertex, firstInstance);
+}
+
+/*!
+    Records an indexed draw.
+
+    The number of vertices is specified in \a indexCount. \a firstIndex is the
+    base index. The effective offset in the index buffer is given by
+    \c{indexOffset + firstIndex * n} where \c n is 2 or 4 depending on the
+    index element type. \c indexOffset is specified in setVertexInput().
+
+    \note The effective offset in the index buffer must be 4 byte aligned with
+    some backends (for example, Metal). With these backends the
+    \l{QRhi::NonFourAlignedEffectiveIndexBufferOffset}{NonFourAlignedEffectiveIndexBufferOffset}
+    feature will be reported as not-supported.
+
+    For instanced drawing set \a instanceCount to a value other than 1. When
+    drawing multiple instances, the first instance ID is specified by \a
+    firstInstance.
+
+    \note \a firstInstance may not be supported, and is ignored when the
+    QRhi::BaseInstance feature is reported as not supported. The first ID is
+    always 0 in that case.
+
+    \a vertexOffset (also called \c{base vertex}) is a signed value that is
+    added to the element index before indexing into the vertex buffer. Support
+    for this is not always available, and the value is ignored when the feature
+    QRhi::BaseVertex is reported as unsupported.
+
+    \note This function can only be called inside a render pass, meaning
+    between a beginPass() and endPass() call.
+ */
+void QRhiCommandBuffer::drawIndexed(quint32 indexCount,
+                                    quint32 instanceCount,
+                                    quint32 firstIndex,
+                                    qint32 vertexOffset,
+                                    quint32 firstInstance)
+{
+    m_rhi->drawIndexed(this, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance);
+}
+
+/*!
+    Records a named debug group on the command buffer. This is shown in
+    graphics debugging tools such as \l{https://renderdoc.org/}{RenderDoc} and
+    \l{https://developer.apple.com/xcode/}{XCode}. The end of the grouping is
+    indicated by debugMarkEnd().
+
+    \note Ignored when QRhi::DebugMarkers are not supported or
+    QRhi::EnableDebugMarkers is not set.
+
+    \note Can be called anywhere within the frame, both inside and outside of passes.
+ */
+void QRhiCommandBuffer::debugMarkBegin(const QByteArray &name)
+{
+    m_rhi->debugMarkBegin(this, name);
+}
+
+/*!
+    Records the end of a debug group.
+
+    \note Ignored when QRhi::DebugMarkers are not supported or
+    QRhi::EnableDebugMarkers is not set.
+
+    \note Can be called anywhere within the frame, both inside and outside of passes.
+ */
+void QRhiCommandBuffer::debugMarkEnd()
+{
+    m_rhi->debugMarkEnd(this);
+}
+
+/*!
+    Inserts a debug message \a msg into the command stream.
+
+    \note Ignored when QRhi::DebugMarkers are not supported or
+    QRhi::EnableDebugMarkers is not set.
+
+    \note With some backends debugMarkMsg() is only supported inside a pass and
+    is ignored when called outside a pass. With others it is recorded anywhere
+    within the frame.
+ */
+void QRhiCommandBuffer::debugMarkMsg(const QByteArray &msg)
+{
+    m_rhi->debugMarkMsg(this, msg);
+}
+
+/*!
+    Records starting a new compute pass.
+
+    \a resourceUpdates, when not null, specifies a resource update batch that
+    is to be committed and then released.
+
+    \note Do not assume that any state or resource bindings persist between
+    passes.
+
+    \note A compute pass can record setComputePipeline(), setShaderResources(),
+    and dispatch() calls, not graphics ones. General functionality, such as,
+    debug markers and beginExternal() is available both in render and compute
+    passes.
+
+    \note Compute is only available when the \l{QRhi::Compute}{Compute} feature
+    is reported as supported.
+ */
+void QRhiCommandBuffer::beginComputePass(QRhiResourceUpdateBatch *resourceUpdates)
+{
+    m_rhi->beginComputePass(this, resourceUpdates);
+}
+
+/*!
+    Records ending the current compute pass.
+
+    \a resourceUpdates, when not null, specifies a resource update batch that
+    is to be committed and then released.
+ */
+void QRhiCommandBuffer::endComputePass(QRhiResourceUpdateBatch *resourceUpdates)
+{
+    m_rhi->endComputePass(this, resourceUpdates);
+}
+
+/*!
+    Records setting a new compute pipeline \a ps.
+
+    \note This function must be called before recording setShaderResources() or
+    dispatch() commands on the command buffer.
+
+    \note QRhi will optimize out unnecessary invocations within a pass, so
+    therefore overoptimizing to avoid calls to this function is not necessary
+    on the applications' side.
+
+    \note This function can only be called inside a compute pass, meaning
+    between a beginComputePass() and endComputePass() call.
+ */
+void QRhiCommandBuffer::setComputePipeline(QRhiComputePipeline *ps)
+{
+    m_rhi->setComputePipeline(this, ps);
+}
+
+/*!
+    Records dispatching compute work items, with \a x, \a y, and \a z
+    specifying the number of local workgroups in the corresponding dimension.
+
+    \note This function can only be called inside a compute pass, meaning
+    between a beginComputePass() and endComputePass() call.
+ */
+void QRhiCommandBuffer::dispatch(int x, int y, int z)
+{
+    m_rhi->dispatch(this, x, y, z);
+}
+
+/*!
+    \return a pointer to a backend-specific QRhiNativeHandles subclass, such as
+    QRhiVulkanCommandBufferNativeHandles. The returned value is null when
+    exposing the underlying native resources is not supported by, or not
+    applicable to, the backend.
+
+    \sa QRhiVulkanCommandBufferNativeHandles,
+    QRhiMetalCommandBufferNativeHandles, beginExternal(), endExternal()
+ */
+const QRhiNativeHandles *QRhiCommandBuffer::nativeHandles()
+{
+    return m_rhi->nativeHandles(this);
+}
+
+/*!
+    To be called when the application before the application is about to
+    enqueue commands to the current pass' command buffer by calling graphics
+    API functions directly.
+
+    \note This is only available when the intent was declared up front in
+    beginFrame(). Therefore this function must only be called when the frame
+    was started with specifying QRhi::ExternalContentsInPass in the flags
+    passed to QRhi::beginFrame().
+
+    With Vulkan or Metal one can query the native command buffer or encoder
+    objects via nativeHandles() and enqueue commands to them. With OpenGL or
+    Direct3D 11 the (device) context can be retrieved from
+    QRhi::nativeHandles(). However, this must never be done without ensuring
+    the QRhiCommandBuffer's state stays up-to-date. Hence the requirement for
+    wrapping any externally added command recording between beginExternal() and
+    endExternal(). Conceptually this is the same as QPainter's
+    \l{QPainter::beginNativePainting()}{beginNativePainting()} and
+    \l{QPainter::endNativePainting()}{endNativePainting()} functions.
+
+    For OpenGL in particular, this function has an additional task: it makes
+    sure the context is made current on the current thread.
+
+    \note Once beginExternal() is called, no other render pass specific
+    functions (\c set* or \c draw*) must be called on the
+    QRhiCommandBuffer until endExternal().
+
+    \warning Some backends may return a native command buffer object from
+    QRhiCommandBuffer::nativeHandles() that is different from the primary one
+    when inside a beginExternal() - endExternal() block. Therefore it is
+    important to (re)query the native command buffer object after calling
+    beginExternal(). In practical terms this means that with Vulkan for example
+    the externally recorded Vulkan commands are placed onto a secondary command
+    buffer (with VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT).
+    nativeHandles() returns this secondary command buffer when called between
+    begin/endExternal.
+
+    \sa endExternal(), nativeHandles()
+ */
+void QRhiCommandBuffer::beginExternal()
+{
+    m_rhi->beginExternal(this);
+}
+
+/*!
+    To be called once the externally added commands are recorded to the command
+    buffer or context.
+
+    \note All QRhiCommandBuffer state must be assumed as invalid after calling
+    this function. Pipelines, vertex and index buffers, and other state must be
+    set again if more draw calls are recorded after the external commands.
+
+    \sa beginExternal(), nativeHandles()
+ */
+void QRhiCommandBuffer::endExternal()
+{
+    m_rhi->endExternal(this);
+}
+
+/*!
+    \return the value (typically an offset) \a v aligned to the uniform buffer
+    alignment given by by ubufAlignment().
+ */
+int QRhi::ubufAligned(int v) const
+{
+    const int byteAlign = ubufAlignment();
+    return (v + byteAlign - 1) & ~(byteAlign - 1);
+}
+
+/*!
+    \return the number of mip levels for a given \a size.
+ */
+int QRhi::mipLevelsForSize(const QSize &size) const
+{
+    return qFloor(std::log2(qMax(size.width(), size.height()))) + 1;
+}
+
+/*!
+    \return the texture image size for a given \a mipLevel, calculated based on
+    the level 0 size given in \a baseLevelSize.
+ */
+QSize QRhi::sizeForMipLevel(int mipLevel, const QSize &baseLevelSize) const
+{
+    const int w = qMax(1, baseLevelSize.width() >> mipLevel);
+    const int h = qMax(1, baseLevelSize.height() >> mipLevel);
+    return QSize(w, h);
+}
+
+/*!
+    \return \c true if the underlying graphics API has the Y axis pointing up
+    in framebuffers and images.
+
+    In practice this is \c true for OpenGL only.
+ */
+bool QRhi::isYUpInFramebuffer() const
+{
+    return d->isYUpInFramebuffer();
+}
+
+/*!
+    \return \c true if the underlying graphics API has the Y axis pointing up
+    in its normalized device coordinate system.
+
+    In practice this is \c false for Vulkan only.
+
+    \note clipSpaceCorrMatrix() includes the corresponding adjustment (to make
+    Y point up) in its returned matrix.
+ */
+bool QRhi::isYUpInNDC() const
+{
+    return d->isYUpInNDC();
+}
+
+/*!
+    \return \c true if the underlying graphics API uses depth 0 - 1 in clip
+    space.
+
+    In practice this is \c false for OpenGL only.
+
+    \note clipSpaceCorrMatrix() includes the corresponding adjustment in its
+    returned matrix.
+ */
+bool QRhi::isClipDepthZeroToOne() const
+{
+    return d->isClipDepthZeroToOne();
+}
+
+/*!
+    \return a matrix that can be used to allow applications keep using
+    OpenGL-targeted vertex data and perspective projection matrices (such as,
+    the ones generated by QMatrix4x4::perspective()), regardless of the
+    backend. Once \c{this_matrix * mvp} is used instead of just \c mvp, vertex
+    data with Y up and viewports with depth range 0 - 1 can be used without
+    considering what backend and so graphics API is going to be used at run
+    time.
+
+    See
+    \l{https://matthewwellings.com/blog/the-new-vulkan-coordinate-system/}{this
+    page} for a discussion of the topic from Vulkan perspective.
+ */
+QMatrix4x4 QRhi::clipSpaceCorrMatrix() const
+{
+    return d->clipSpaceCorrMatrix();
+}
+
+/*!
+    \return \c true if the specified texture \a format modified by \a flags is
+    supported.
+
+    The query is supported both for uncompressed and compressed formats.
+ */
+bool QRhi::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const
+{
+    return d->isTextureFormatSupported(format, flags);
+}
+
+/*!
+    \return \c true if the specified \a feature is supported
+ */
+bool QRhi::isFeatureSupported(QRhi::Feature feature) const
+{
+    return d->isFeatureSupported(feature);
+}
+
+/*!
+    \return the value for the specified resource \a limit.
+
+    The values are expected to be queried by the backends upon initialization,
+    meaning calling this function is a light operation.
+ */
+int QRhi::resourceLimit(ResourceLimit limit) const
+{
+    return d->resourceLimit(limit);
+}
+
+/*!
+    \return a pointer to the backend-specific collection of native objects
+    for the device, context, and similar concepts used by the backend.
+
+    Cast to QRhiVulkanNativeHandles, QRhiD3D11NativeHandles,
+    QRhiGles2NativeHandles, QRhiMetalNativeHandles as appropriate.
+
+    \note No ownership is transferred, neither for the returned pointer nor for
+    any native objects.
+ */
+const QRhiNativeHandles *QRhi::nativeHandles()
+{
+    return d->nativeHandles();
+}
+
+/*!
+    With OpenGL this makes the OpenGL context current on the current thread.
+    The function has no effect with other backends.
+
+    Calling this function is relevant typically in Qt framework code, when one
+    has to ensure external OpenGL code provided by the application can still
+    run like it did before with direct usage of OpenGL, as long as the QRhi is
+    using the OpenGL backend.
+
+    \return false when failed, similarly to QOpenGLContext::makeCurrent(). When
+    the operation failed, isDeviceLost() can be called to determine if there
+    was a loss of context situation. Such a check is equivalent to checking via
+    QOpenGLContext::isValid().
+
+    \sa QOpenGLContext::makeCurrent(), QOpenGLContext::isValid()
+ */
+bool QRhi::makeThreadLocalNativeContextCurrent()
+{
+    return d->makeThreadLocalNativeContextCurrent();
+}
+
+/*!
+    \return the associated QRhiProfiler instance.
+
+    An instance is always available for each QRhi, but it is not very useful
+    without EnableProfiling because no data is collected without setting the
+    flag upon creation.
+  */
+QRhiProfiler *QRhi::profiler()
+{
+    return &d->profiler;
+}
+
+/*!
+    Attempts to release resources in the backend's caches. This can include both
+    CPU and GPU resources.  Only memory and resources that can be recreated
+    automatically are in scope. As an example, if the backend's
+    QRhiGraphicsPipeline implementation maintains a cache of shader compilation
+    results, calling this function leads to emptying that cache, thus
+    potentially freeing up memory and graphics resources.
+
+    Calling this function makes sense in resource constrained environments,
+    where at a certain point there is a need to ensure minimal resource usage,
+    at the expense of performance.
+ */
+void QRhi::releaseCachedResources()
+{
+    d->releaseCachedResources();
+}
+
+/*!
+    \return true if the graphics device was lost.
+
+    The loss of the device is typically detected in beginFrame(), endFrame() or
+    QRhiSwapChain::buildOrResize(), depending on the backend and the underlying
+    native APIs. The most common is endFrame() because that is where presenting
+    happens. With some backends QRhiSwapChain::buildOrResize() can also fail
+    due to a device loss. Therefore this function is provided as a generic way
+    to check if a device loss was detected by a previous operation.
+
+    When the device is lost, no further operations should be done via the QRhi.
+    Rather, all QRhi resources should be released, followed by destroying the
+    QRhi. A new QRhi can then be attempted to be created. If successful, all
+    graphics resources must be reinitialized. If not, try again later,
+    repeatedly.
+
+    While simple applications may decide to not care about device loss,
+    on the commonly used desktop platforms a device loss can happen
+    due to a variety of reasons, including physically disconnecting the
+    graphics adapter, disabling the device or driver, uninstalling or upgrading
+    the graphics driver, or due to errors that lead to a graphics device reset.
+    Some of these can happen under perfectly normal circumstances as well, for
+    example the upgrade of the graphics driver to a newer version is a common
+    task that can happen at any time while a Qt application is running. Users
+    may very well expect applications to be able to survive this, even when the
+    application is actively using an API like OpenGL or Direct3D.
+
+    Qt's own frameworks built on top of QRhi, such as, Qt Quick, can be
+    expected to handle and take appropriate measures when a device loss occurs.
+    If the data for graphics resources, such as textures and buffers, are still
+    available on the CPU side, such an event may not be noticeable on the
+    application level at all since graphics resources can seamlessly be
+    reinitialized then. However, applications and libraries working directly
+    with QRhi are expected to be prepared to check and handle device loss
+    situations themselves.
+
+    \note With OpenGL, applications may need to opt-in to context reset
+    notifications by setting QSurfaceFormat::ResetNotification on the
+    QOpenGLContext. This is typically done by enabling the flag in
+    QRhiGles2InitParams::format. Keep in mind however that some systems may
+    generate context resets situations even when this flag is not set.
+ */
+bool QRhi::isDeviceLost() const
+{
+    return d->isDeviceLost();
+}
+
+/*!
+    \return a new graphics pipeline resource.
+
+    \sa QRhiResource::release()
+ */
+QRhiGraphicsPipeline *QRhi::newGraphicsPipeline()
+{
+    return d->createGraphicsPipeline();
+}
+
+/*!
+    \return a new compute pipeline resource.
+
+    \note Compute is only available when the \l{QRhi::Compute}{Compute} feature
+    is reported as supported.
+
+    \sa QRhiResource::release()
+ */
+QRhiComputePipeline *QRhi::newComputePipeline()
+{
+    return d->createComputePipeline();
+}
+
+/*!
+    \return a new shader resource binding collection resource.
+
+    \sa QRhiResource::release()
+ */
+QRhiShaderResourceBindings *QRhi::newShaderResourceBindings()
+{
+    return d->createShaderResourceBindings();
+}
+
+/*!
+    \return a new buffer with the specified \a type, \a usage, and \a size.
+
+    \note Some \a usage and \a type combinations may not be supported by all
+    backends. See \l{QRhiBuffer::UsageFlag}{UsageFlags} and
+    \l{QRhi::NonDynamicUniformBuffers}{the feature flags}.
+
+    \note Backends may choose to allocate buffers bigger than \a size. This is
+    done transparently to applications, so there are no special restrictions on
+    the value of \a size. QRhiBuffer::size() will always report back the value
+    that was requested in \a size.
+
+    \sa QRhiResource::release()
+ */
+QRhiBuffer *QRhi::newBuffer(QRhiBuffer::Type type,
+                            QRhiBuffer::UsageFlags usage,
+                            int size)
+{
+    return d->createBuffer(type, usage, size);
+}
+
+/*!
+    \return a new renderbuffer with the specified \a type, \a pixelSize, \a
+    sampleCount, and \a flags.
+
+    \sa QRhiResource::release()
+ */
+QRhiRenderBuffer *QRhi::newRenderBuffer(QRhiRenderBuffer::Type type,
+                                        const QSize &pixelSize,
+                                        int sampleCount,
+                                        QRhiRenderBuffer::Flags flags)
+{
+    return d->createRenderBuffer(type, pixelSize, sampleCount, flags);
+}
+
+/*!
+    \return a new texture with the specified \a format, \a pixelSize, \a
+    sampleCount, and \a flags.
+
+    \note \a format specifies the requested internal and external format,
+    meaning the data to be uploaded to the texture will need to be in a
+    compatible format, while the native texture may (but is not guaranteed to,
+    in case of OpenGL at least) use this format internally.
+
+    \sa QRhiResource::release()
+ */
+QRhiTexture *QRhi::newTexture(QRhiTexture::Format format,
+                              const QSize &pixelSize,
+                              int sampleCount,
+                              QRhiTexture::Flags flags)
+{
+    return d->createTexture(format, pixelSize, sampleCount, flags);
+}
+
+/*!
+    \return a new sampler with the specified magnification filter \a magFilter,
+    minification filter \a minFilter, mipmapping mode \a mipmapMpde, and S/T
+    addressing modes \a u and \a v.
+
+    \sa QRhiResource::release()
+ */
+QRhiSampler *QRhi::newSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                              QRhiSampler::Filter mipmapMode,
+                              QRhiSampler:: AddressMode u, QRhiSampler::AddressMode v)
+{
+    return d->createSampler(magFilter, minFilter, mipmapMode, u, v);
+}
+
+/*!
+    \return a new texture render target with color and depth/stencil
+    attachments given in \a desc, and with the specified \a flags.
+
+    \sa QRhiResource::release()
+ */
+
+QRhiTextureRenderTarget *QRhi::newTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                      QRhiTextureRenderTarget::Flags flags)
+{
+    return d->createTextureRenderTarget(desc, flags);
+}
+
+/*!
+    \return a new swapchain.
+
+    \sa QRhiResource::release(), QRhiSwapChain::buildOrResize()
+ */
+QRhiSwapChain *QRhi::newSwapChain()
+{
+    return d->createSwapChain();
+}
+
+/*!
+    Starts a new frame targeting the next available buffer of \a swapChain.
+
+    A frame consists of resource updates and one or more render and compute
+    passes.
+
+    \a flags can indicate certain special cases. For example, the fact that
+    QRhiCommandBuffer::beginExternal() will be called within this new frame
+    must be declared up front by setting the ExternalContentsInPass flag.
+
+    The high level pattern of rendering into a QWindow using a swapchain:
+
+    \list
+
+    \li Create a swapchain.
+
+    \li Call QRhiSwapChain::buildOrResize() whenever the surface size is
+    different than before.
+
+    \li Call QRhiSwapChain::release() on
+    QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed.
+
+    \li Then on every frame:
+    \badcode
+       beginFrame(sc);
+       updates = nextResourceUpdateBatch();
+       updates->...
+       QRhiCommandBuffer *cb = sc->currentFrameCommandBuffer();
+       cb->beginPass(sc->currentFrameRenderTarget(), colorClear, dsClear, updates);
+       ...
+       cb->endPass();
+       ... // more passes as necessary
+       endFrame(sc);
+    \endcode
+
+    \endlist
+
+    \return QRhi::FrameOpSuccess on success, or another QRhi::FrameOpResult
+    value on failure. Some of these should be treated as soft, "try again
+    later" type of errors: When QRhi::FrameOpSwapChainOutOfDate is returned,
+    the swapchain is to be resized or updated by calling
+    QRhiSwapChain::buildOrResize(). The application should then attempt to
+    generate a new frame. QRhi::FrameOpDeviceLost means the graphics device is
+    lost but this may also be recoverable by releasing all resources, including
+    the QRhi itself, and then recreating all resources. See isDeviceLost() for
+    further discussion.
+
+    \sa endFrame(), beginOffscreenFrame(), isDeviceLost()
+ */
+QRhi::FrameOpResult QRhi::beginFrame(QRhiSwapChain *swapChain, BeginFrameFlags flags)
+{
+    if (d->inFrame)
+        qWarning("Attempted to call beginFrame() within a still active frame; ignored");
+
+    QRhi::FrameOpResult r = !d->inFrame ? d->beginFrame(swapChain, flags) : FrameOpSuccess;
+    if (r == FrameOpSuccess)
+        d->inFrame = true;
+
+    return r;
+}
+
+/*!
+    Ends, commits, and presents a frame that was started in the last
+    beginFrame() on \a swapChain.
+
+    Double (or triple) buffering is managed internally by the QRhiSwapChain and
+    QRhi.
+
+    \a flags can optionally be used to change the behavior in certain ways.
+    Passing QRhi::SkipPresent skips queuing the Present command or calling
+    swapBuffers.
+
+    \return QRhi::FrameOpSuccess on success, or another QRhi::FrameOpResult
+    value on failure. Some of these should be treated as soft, "try again
+    later" type of errors: When QRhi::FrameOpSwapChainOutOfDate is returned,
+    the swapchain is to be resized or updated by calling
+    QRhiSwapChain::buildOrResize(). The application should then attempt to
+    generate a new frame. QRhi::FrameOpDeviceLost means the graphics device is
+    lost but this may also be recoverable by releasing all resources, including
+    the QRhi itself, and then recreating all resources. See isDeviceLost() for
+    further discussion.
+
+    \sa beginFrame(), isDeviceLost()
+ */
+QRhi::FrameOpResult QRhi::endFrame(QRhiSwapChain *swapChain, EndFrameFlags flags)
+{
+    if (!d->inFrame)
+        qWarning("Attempted to call endFrame() without an active frame; ignored");
+
+    QRhi::FrameOpResult r = d->inFrame ? d->endFrame(swapChain, flags) : FrameOpSuccess;
+    d->inFrame = false;
+    // releaseAndDestroyLater is a high level QRhi concept the backends know
+    // nothing about - handle it here.
+    qDeleteAll(d->pendingReleaseAndDestroyResources);
+    d->pendingReleaseAndDestroyResources.clear();
+
+    return r;
+}
+
+/*!
+    \return true when there is an active frame, meaning there was a
+    beginFrame() (or beginOffscreenFrame()) with no corresponding endFrame()
+    (or endOffscreenFrame()) yet.
+
+    \sa currentFrameSlot(), beginFrame(), endFrame()
+ */
+bool QRhi::isRecordingFrame() const
+{
+    return d->inFrame;
+}
+
+/*!
+    \return the current frame slot index while recording a frame. Unspecified
+    when called outside an active frame (that is, when isRecordingFrame() is \c
+    false).
+
+    With backends like Vulkan or Metal, it is the responsibility of the QRhi
+    backend to block whenever starting a new frame and finding the CPU is
+    already \c{FramesInFlight - 1} frames ahead of the GPU (because the command
+    buffer submitted in frame no. \c{current} - \c{FramesInFlight} has not yet
+    completed).
+
+    Resources that tend to change between frames (such as, the native buffer
+    object backing a QRhiBuffer with type QRhiBuffer::Dynamic) exist in
+    multiple versions, so that each frame, that can be submitted while a
+    previous one is still being processed, works with its own copy, thus
+    avoiding the need to stall the pipeline when preparing the frame. (The
+    contents of a resource that may still be in use in the GPU should not be
+    touched, but simply always waiting for the previous frame to finish would
+    reduce GPU utilization and ultimately, performance and efficiency.)
+
+    Conceptually this is somewhat similar to copy-on-write schemes used by some
+    C++ containers and other types. It may also be similar to what an OpenGL or
+    Direct 3D 11 implementation performs internally for certain type of objects.
+
+    In practice, such double (or tripple) buffering resources is realized in
+    the Vulkan, Metal, and similar QRhi backends by having a fixed number of
+    native resource (such as, VkBuffer) \c slots behind a QRhiResource. That
+    can then be indexed by a frame slot index running 0, 1, ..,
+    FramesInFlight-1, and then wrapping around.
+
+    All this is managed transparently to the users of QRhi. However,
+    applications that integrate rendering done directly with the graphics API
+    may want to perform a similar double or tripple buffering of their own
+    graphics resources. That is then most easily achieved by knowing the values
+    of the maximum number of in-flight frames (retrievable via resourceLimit())
+    and the current frame (slot) index (returned by this function).
+
+    \sa isRecordingFrame(), beginFrame(), endFrame()
+ */
+int QRhi::currentFrameSlot() const
+{
+    return d->currentFrameSlot;
+}
+
+/*!
+    Starts a new offscreen frame. Provides a command buffer suitable for
+    recording rendering commands in \a cb. \a flags is used to indicate
+    certain special cases, just like with beginFrame().
+
+    \note The QRhiCommandBuffer stored to *cb is not owned by the caller.
+
+    Rendering without a swapchain is possible as well. The typical use case is
+    to use it in completely offscreen applications, e.g. to generate image
+    sequences by rendering and reading back without ever showing a window.
+
+    Usage in on-screen applications (so beginFrame, endFrame,
+    beginOffscreenFrame, endOffscreenFrame, beginFrame, ...) is possible too
+    but it does reduce parallelism so it should be done only infrequently.
+
+    Offscreen frames do not let the CPU - potentially - generate another frame
+    while the GPU is still processing the previous one. This has the side
+    effect that if readbacks are scheduled, the results are guaranteed to be
+    available once endOffscreenFrame() returns. That is not the case with
+    frames targeting a swapchain.
+
+    The skeleton of rendering a frame without a swapchain and then reading the
+    frame contents back could look like the following:
+
+    \badcode
+          QRhiReadbackResult rbResult;
+          QRhiCommandBuffer *cb;
+          beginOffscreenFrame(&cb);
+          beginPass
+          ...
+          u = nextResourceUpdateBatch();
+          u->readBackTexture(rb, &rbResult);
+          endPass(u);
+          endOffscreenFrame();
+          // image data available in rbResult
+   \endcode
+
+   \sa endOffscreenFrame(), beginFrame()
+ */
+QRhi::FrameOpResult QRhi::beginOffscreenFrame(QRhiCommandBuffer **cb, BeginFrameFlags flags)
+{
+    if (d->inFrame)
+        qWarning("Attempted to call beginOffscreenFrame() within a still active frame; ignored");
+
+    QRhi::FrameOpResult r = !d->inFrame ? d->beginOffscreenFrame(cb, flags) : FrameOpSuccess;
+    if (r == FrameOpSuccess)
+        d->inFrame = true;
+
+    return r;
+}
+
+/*!
+    Ends and waits for the offscreen frame.
+
+    \sa beginOffscreenFrame()
+ */
+QRhi::FrameOpResult QRhi::endOffscreenFrame(EndFrameFlags flags)
+{
+    if (!d->inFrame)
+        qWarning("Attempted to call endOffscreenFrame() without an active frame; ignored");
+
+    QRhi::FrameOpResult r = d->inFrame ? d->endOffscreenFrame(flags) : FrameOpSuccess;
+    d->inFrame = false;
+    qDeleteAll(d->pendingReleaseAndDestroyResources);
+    d->pendingReleaseAndDestroyResources.clear();
+
+    return r;
+}
+
+/*!
+    Waits for any work on the graphics queue (where applicable) to complete,
+    then executes all deferred operations, like completing readbacks and
+    resource releases. Can be called inside and outside of a frame, but not
+    inside a pass. Inside a frame it implies submitting any work on the
+    command buffer.
+
+    \note Avoid this function. One case where it may be needed is when the
+    results of an enqueued readback in a swapchain-based frame are needed at a
+    fixed given point and so waiting for the results is desired.
+ */
+QRhi::FrameOpResult QRhi::finish()
+{
+    return d->finish();
+}
+
+/*!
+    \return the list of supported sample counts.
+
+    A typical example would be (1, 2, 4, 8).
+
+    With some backend this list of supported values is fixed in advance, while
+    with some others the (physical) device properties indicate what is
+    supported at run time.
+ */
+QVector<int> QRhi::supportedSampleCounts() const
+{
+    return d->supportedSampleCounts();
+}
+
+/*!
+    \return the minimum uniform buffer offset alignment in bytes. This is
+    typically 256.
+
+    Attempting to bind a uniform buffer region with an offset not aligned to
+    this value will lead to failures depending on the backend and the
+    underlying graphics API.
+
+    \sa ubufAligned()
+ */
+int QRhi::ubufAlignment() const
+{
+    return d->ubufAlignment();
+}
+
+static QBasicAtomicInteger<QRhiGlobalObjectIdGenerator::Type> counter = Q_BASIC_ATOMIC_INITIALIZER(0);
+
+QRhiGlobalObjectIdGenerator::Type QRhiGlobalObjectIdGenerator::newId()
+{
+    return counter.fetchAndAddRelaxed(1) + 1;
+}
+
+bool QRhiPassResourceTracker::isEmpty() const
+{
+    return m_buffers.isEmpty() && m_textures.isEmpty();
+}
+
+void QRhiPassResourceTracker::reset()
+{
+    m_buffers.clear();
+    m_textures.clear();
+}
+
+static inline QRhiPassResourceTracker::BufferStage earlierStage(QRhiPassResourceTracker::BufferStage a,
+                                                                QRhiPassResourceTracker::BufferStage b)
+{
+    return QRhiPassResourceTracker::BufferStage(qMin(int(a), int(b)));
+}
+
+void QRhiPassResourceTracker::registerBuffer(QRhiBuffer *buf, int slot, BufferAccess *access, BufferStage *stage,
+                                             const UsageState &state)
+{
+    auto it = m_buffers.find(buf);
+    if (it != m_buffers.end()) {
+        if (it->access != *access) {
+            const QByteArray name = buf->name();
+            qWarning("Buffer %p (%s) used with different accesses within the same pass, this is not allowed.",
+                     buf, name.constData());
+            return;
+        }
+        if (it->stage != *stage) {
+            it->stage = earlierStage(it->stage, *stage);
+            *stage = it->stage;
+        }
+        return;
+    }
+
+    Buffer b;
+    b.slot = slot;
+    b.access = *access;
+    b.stage = *stage;
+    b.stateAtPassBegin = state; // first use -> initial state
+    m_buffers.insert(buf, b);
+}
+
+static inline QRhiPassResourceTracker::TextureStage earlierStage(QRhiPassResourceTracker::TextureStage a,
+                                                                 QRhiPassResourceTracker::TextureStage b)
+{
+    return QRhiPassResourceTracker::TextureStage(qMin(int(a), int(b)));
+}
+
+static inline bool isImageLoadStore(QRhiPassResourceTracker::TextureAccess access)
+{
+    return access == QRhiPassResourceTracker::TexStorageLoad
+            || access == QRhiPassResourceTracker::TexStorageStore
+            || access == QRhiPassResourceTracker::TexStorageLoadStore;
+}
+
+void QRhiPassResourceTracker::registerTexture(QRhiTexture *tex, TextureAccess *access, TextureStage *stage,
+                                              const UsageState &state)
+{
+    auto it = m_textures.find(tex);
+    if (it != m_textures.end()) {
+        if (it->access != *access) {
+            // Different subresources of a texture may be used for both load
+            // and store in the same pass. (think reading from one mip level
+            // and writing to another one in a compute shader) This we can
+            // handle by treating the entire resource as read-write.
+            if (isImageLoadStore(it->access) && isImageLoadStore(*access)) {
+                it->access = QRhiPassResourceTracker::TexStorageLoadStore;
+                *access = it->access;
+            } else {
+                const QByteArray name = tex->name();
+                qWarning("Texture %p (%s) used with different accesses within the same pass, this is not allowed.",
+                         tex, name.constData());
+            }
+        }
+        if (it->stage != *stage) {
+            it->stage = earlierStage(it->stage, *stage);
+            *stage = it->stage;
+        }
+        return;
+    }
+
+    Texture t;
+    t.access = *access;
+    t.stage = *stage;
+    t.stateAtPassBegin = state; // first use -> initial state
+    m_textures.insert(tex, t);
+}
+
+QRhiPassResourceTracker::BufferStage QRhiPassResourceTracker::toPassTrackerBufferStage(QRhiShaderResourceBinding::StageFlags stages)
+{
+    // pick the earlier stage (as this is going to be dstAccessMask)
+    if (stages.testFlag(QRhiShaderResourceBinding::VertexStage))
+        return QRhiPassResourceTracker::BufVertexStage;
+    if (stages.testFlag(QRhiShaderResourceBinding::FragmentStage))
+        return QRhiPassResourceTracker::BufFragmentStage;
+    if (stages.testFlag(QRhiShaderResourceBinding::ComputeStage))
+        return QRhiPassResourceTracker::BufComputeStage;
+
+    Q_UNREACHABLE();
+    return QRhiPassResourceTracker::BufVertexStage;
+}
+
+QRhiPassResourceTracker::TextureStage QRhiPassResourceTracker::toPassTrackerTextureStage(QRhiShaderResourceBinding::StageFlags stages)
+{
+    // pick the earlier stage (as this is going to be dstAccessMask)
+    if (stages.testFlag(QRhiShaderResourceBinding::VertexStage))
+        return QRhiPassResourceTracker::TexVertexStage;
+    if (stages.testFlag(QRhiShaderResourceBinding::FragmentStage))
+        return QRhiPassResourceTracker::TexFragmentStage;
+    if (stages.testFlag(QRhiShaderResourceBinding::ComputeStage))
+        return QRhiPassResourceTracker::TexComputeStage;
+
+    Q_UNREACHABLE();
+    return QRhiPassResourceTracker::TexVertexStage;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qrhi_p.h b/src/gui/rhi/qrhi_p.h
new file mode 100644
index 0000000000..907924c788
--- /dev/null
+++ b/src/gui/rhi/qrhi_p.h
@@ -0,0 +1,1555 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHI_H
+#define QRHI_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/qtguiglobal.h>
+#include <QSize>
+#include <QMatrix4x4>
+#include <QVector>
+#include <QVarLengthArray>
+#include <QThread>
+#include <QColor>
+#include <QImage>
+#include <functional>
+#include <array>
+#include <private/qshader_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QWindow;
+class QRhiImplementation;
+class QRhiBuffer;
+class QRhiRenderBuffer;
+class QRhiTexture;
+class QRhiSampler;
+class QRhiCommandBuffer;
+class QRhiResourceUpdateBatch;
+class QRhiResourceUpdateBatchPrivate;
+class QRhiProfiler;
+
+class Q_GUI_EXPORT QRhiDepthStencilClearValue
+{
+public:
+    QRhiDepthStencilClearValue() = default;
+    QRhiDepthStencilClearValue(float d, quint32 s);
+
+    float depthClearValue() const { return m_d; }
+    void setDepthClearValue(float d) { m_d = d; }
+
+    quint32 stencilClearValue() const { return m_s; }
+    void setStencilClearValue(quint32 s) { m_s = s; }
+
+private:
+    float m_d = 1.0f;
+    quint32 m_s = 0;
+};
+
+Q_DECLARE_TYPEINFO(QRhiDepthStencilClearValue, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QRhiDepthStencilClearValue &a, const QRhiDepthStencilClearValue &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator!=(const QRhiDepthStencilClearValue &a, const QRhiDepthStencilClearValue &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRhiDepthStencilClearValue &v, uint seed = 0) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiDepthStencilClearValue &);
+#endif
+
+class Q_GUI_EXPORT QRhiViewport
+{
+public:
+    QRhiViewport() = default;
+    QRhiViewport(float x, float y, float w, float h, float minDepth = 0.0f, float maxDepth = 1.0f);
+
+    std::array<float, 4> viewport() const { return m_rect; }
+    void setViewport(float x, float y, float w, float h) {
+        m_rect[0] = x; m_rect[1] = y; m_rect[2] = w; m_rect[3] = h;
+    }
+
+    float minDepth() const { return m_minDepth; }
+    void setMinDepth(float minDepth) { m_minDepth = minDepth; }
+
+    float maxDepth() const { return m_maxDepth; }
+    void setMaxDepth(float maxDepth) { m_maxDepth = maxDepth; }
+
+private:
+    std::array<float, 4> m_rect { { 0.0f, 0.0f, 0.0f, 0.0f } };
+    float m_minDepth = 0.0f;
+    float m_maxDepth = 1.0f;
+};
+
+Q_DECLARE_TYPEINFO(QRhiViewport, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QRhiViewport &a, const QRhiViewport &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator!=(const QRhiViewport &a, const QRhiViewport &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRhiViewport &v, uint seed = 0) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiViewport &);
+#endif
+
+class Q_GUI_EXPORT QRhiScissor
+{
+public:
+    QRhiScissor() = default;
+    QRhiScissor(int x, int y, int w, int h);
+
+    std::array<int, 4> scissor() const { return m_rect; }
+    void setScissor(int x, int y, int w, int h) {
+        m_rect[0] = x; m_rect[1] = y; m_rect[2] = w; m_rect[3] = h;
+    }
+
+private:
+    std::array<int, 4> m_rect { { 0, 0, 0, 0 } };
+};
+
+Q_DECLARE_TYPEINFO(QRhiScissor, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QRhiScissor &a, const QRhiScissor &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator!=(const QRhiScissor &a, const QRhiScissor &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRhiScissor &v, uint seed = 0) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiScissor &);
+#endif
+
+class Q_GUI_EXPORT QRhiVertexInputBinding
+{
+public:
+    enum Classification {
+        PerVertex,
+        PerInstance
+    };
+
+    QRhiVertexInputBinding() = default;
+    QRhiVertexInputBinding(quint32 stride, Classification cls = PerVertex, int stepRate = 1);
+
+    quint32 stride() const { return m_stride; }
+    void setStride(quint32 s) { m_stride = s; }
+
+    Classification classification() const { return m_classification; }
+    void setClassification(Classification c) { m_classification = c; }
+
+    int instanceStepRate() const { return m_instanceStepRate; }
+    void setInstanceStepRate(int rate) { m_instanceStepRate = rate; }
+
+private:
+    quint32 m_stride = 0;
+    Classification m_classification = PerVertex;
+    int m_instanceStepRate = 1;
+};
+
+Q_DECLARE_TYPEINFO(QRhiVertexInputBinding, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QRhiVertexInputBinding &a, const QRhiVertexInputBinding &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator!=(const QRhiVertexInputBinding &a, const QRhiVertexInputBinding &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRhiVertexInputBinding &v, uint seed = 0) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiVertexInputBinding &);
+#endif
+
+class Q_GUI_EXPORT QRhiVertexInputAttribute
+{
+public:
+    enum Format {
+        Float4,
+        Float3,
+        Float2,
+        Float,
+        UNormByte4,
+        UNormByte2,
+        UNormByte
+    };
+
+    QRhiVertexInputAttribute() = default;
+    QRhiVertexInputAttribute(int binding, int location, Format format, quint32 offset);
+
+    int binding() const { return m_binding; }
+    void setBinding(int b) { m_binding = b; }
+
+    int location() const { return m_location; }
+    void setLocation(int loc) { m_location = loc; }
+
+    Format format() const { return m_format; }
+    void setFormt(Format f) { m_format = f; }
+
+    quint32 offset() const { return m_offset; }
+    void setOffset(quint32 ofs) { m_offset = ofs; }
+
+private:
+    int m_binding = 0;
+    int m_location = 0;
+    Format m_format = Float4;
+    quint32 m_offset = 0;
+};
+
+Q_DECLARE_TYPEINFO(QRhiVertexInputAttribute, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QRhiVertexInputAttribute &a, const QRhiVertexInputAttribute &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator!=(const QRhiVertexInputAttribute &a, const QRhiVertexInputAttribute &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRhiVertexInputAttribute &v, uint seed = 0) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiVertexInputAttribute &);
+#endif
+
+class Q_GUI_EXPORT QRhiVertexInputLayout
+{
+public:
+    QRhiVertexInputLayout() = default;
+
+    void setBindings(std::initializer_list<QRhiVertexInputBinding> list) { m_bindings = list; }
+    template<typename InputIterator>
+    void setBindings(InputIterator first, InputIterator last)
+    {
+        m_bindings.clear();
+        std::copy(first, last, std::back_inserter(m_bindings));
+    }
+    void setBindings(const QVector<QRhiVertexInputBinding> &bindings) // compat., to be removed
+    {
+        setBindings(bindings.cbegin(), bindings.cend());
+    }
+    const QRhiVertexInputBinding *cbeginBindings() const { return m_bindings.cbegin(); }
+    const QRhiVertexInputBinding *cendBindings() const { return m_bindings.cend(); }
+    const QRhiVertexInputBinding *bindingAt(int index) const { return &m_bindings.at(index); }
+
+    void setAttributes(std::initializer_list<QRhiVertexInputAttribute> list) { m_attributes = list; }
+    template<typename InputIterator>
+    void setAttributes(InputIterator first, InputIterator last)
+    {
+        m_attributes.clear();
+        std::copy(first, last, std::back_inserter(m_attributes));
+    }
+    void setAttributes(const QVector<QRhiVertexInputAttribute> &attributes) // compat., to be removed
+    {
+        setAttributes(attributes.cbegin(), attributes.cend());
+    }
+    const QRhiVertexInputAttribute *cbeginAttributes() const { return m_attributes.cbegin(); }
+    const QRhiVertexInputAttribute *cendAttributes() const { return m_attributes.cend(); }
+
+private:
+    QVarLengthArray<QRhiVertexInputBinding, 8> m_bindings;
+    QVarLengthArray<QRhiVertexInputAttribute, 8> m_attributes;
+
+    friend Q_GUI_EXPORT bool operator==(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) Q_DECL_NOTHROW;
+    friend Q_GUI_EXPORT uint qHash(const QRhiVertexInputLayout &v, uint seed) Q_DECL_NOTHROW;
+    friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiVertexInputLayout &);
+};
+
+Q_DECLARE_TYPEINFO(QRhiVertexInputLayout, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator!=(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRhiVertexInputLayout &v, uint seed = 0) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiVertexInputLayout &);
+#endif
+
+class Q_GUI_EXPORT QRhiShaderStage
+{
+public:
+    enum Type {
+        Vertex,
+        Fragment,
+        Compute
+    };
+
+    QRhiShaderStage() = default;
+    QRhiShaderStage(Type type, const QShader &shader,
+                    QShader::Variant v = QShader::StandardShader);
+
+    Type type() const { return m_type; }
+    void setType(Type t) { m_type = t; }
+
+    QShader shader() const { return m_shader; }
+    void setShader(const QShader &s) { m_shader = s; }
+
+    QShader::Variant shaderVariant() const { return m_shaderVariant; }
+    void setShaderVariant(QShader::Variant v) { m_shaderVariant = v; }
+
+private:
+    Type m_type = Vertex;
+    QShader m_shader;
+    QShader::Variant m_shaderVariant = QShader::StandardShader;
+};
+
+Q_DECLARE_TYPEINFO(QRhiShaderStage, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QRhiShaderStage &a, const QRhiShaderStage &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator!=(const QRhiShaderStage &a, const QRhiShaderStage &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRhiShaderStage &s, uint seed = 0) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiShaderStage &);
+#endif
+
+using QRhiGraphicsShaderStage = QRhiShaderStage;
+
+class Q_GUI_EXPORT QRhiShaderResourceBinding
+{
+public:
+    enum Type {
+        UniformBuffer,
+        SampledTexture,
+        ImageLoad,
+        ImageStore,
+        ImageLoadStore,
+        BufferLoad,
+        BufferStore,
+        BufferLoadStore
+    };
+
+    enum StageFlag {
+        VertexStage = 1 << 0,
+        FragmentStage = 1 << 1,
+        ComputeStage = 1 << 2
+    };
+    Q_DECLARE_FLAGS(StageFlags, StageFlag)
+
+    QRhiShaderResourceBinding();
+
+    bool isLayoutCompatible(const QRhiShaderResourceBinding &other) const;
+
+    static QRhiShaderResourceBinding uniformBuffer(int binding, StageFlags stage, QRhiBuffer *buf);
+    static QRhiShaderResourceBinding uniformBuffer(int binding, StageFlags stage, QRhiBuffer *buf, int offset, int size);
+    static QRhiShaderResourceBinding uniformBufferWithDynamicOffset(int binding, StageFlags stage, QRhiBuffer *buf, int size);
+
+    static QRhiShaderResourceBinding sampledTexture(int binding, StageFlags stage, QRhiTexture *tex, QRhiSampler *sampler);
+
+    static QRhiShaderResourceBinding imageLoad(int binding, StageFlags stage, QRhiTexture *tex, int level);
+    static QRhiShaderResourceBinding imageStore(int binding, StageFlags stage, QRhiTexture *tex, int level);
+    static QRhiShaderResourceBinding imageLoadStore(int binding, StageFlags stage, QRhiTexture *tex, int level);
+
+    static QRhiShaderResourceBinding bufferLoad(int binding, StageFlags stage, QRhiBuffer *buf);
+    static QRhiShaderResourceBinding bufferLoad(int binding, StageFlags stage, QRhiBuffer *buf, int offset, int size);
+    static QRhiShaderResourceBinding bufferStore(int binding, StageFlags stage, QRhiBuffer *buf);
+    static QRhiShaderResourceBinding bufferStore(int binding, StageFlags stage, QRhiBuffer *buf, int offset, int size);
+    static QRhiShaderResourceBinding bufferLoadStore(int binding, StageFlags stage, QRhiBuffer *buf);
+    static QRhiShaderResourceBinding bufferLoadStore(int binding, StageFlags stage, QRhiBuffer *buf, int offset, int size);
+
+    struct Data
+    {
+        int binding;
+        QRhiShaderResourceBinding::StageFlags stage;
+        QRhiShaderResourceBinding::Type type;
+        struct UniformBufferData {
+            QRhiBuffer *buf;
+            int offset;
+            int maybeSize;
+            bool hasDynamicOffset;
+        };
+        struct SampledTextureData {
+            QRhiTexture *tex;
+            QRhiSampler *sampler;
+        };
+        struct StorageImageData {
+            QRhiTexture *tex;
+            int level;
+        };
+        struct StorageBufferData {
+            QRhiBuffer *buf;
+            int offset;
+            int maybeSize;
+        };
+        union {
+            UniformBufferData ubuf;
+            SampledTextureData stex;
+            StorageImageData simage;
+            StorageBufferData sbuf;
+        } u;
+    };
+
+    Data *data() { return &d; }
+    const Data *data() const { return &d; }
+
+private:
+    Data d;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiShaderResourceBinding::StageFlags)
+
+Q_DECLARE_TYPEINFO(QRhiShaderResourceBinding, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QRhiShaderResourceBinding &a, const QRhiShaderResourceBinding &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator!=(const QRhiShaderResourceBinding &a, const QRhiShaderResourceBinding &b) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRhiShaderResourceBinding &b, uint seed = 0) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiShaderResourceBinding &);
+#endif
+
+class Q_GUI_EXPORT QRhiColorAttachment
+{
+public:
+    QRhiColorAttachment() = default;
+    QRhiColorAttachment(QRhiTexture *texture);
+    QRhiColorAttachment(QRhiRenderBuffer *renderBuffer);
+
+    QRhiTexture *texture() const { return m_texture; }
+    void setTexture(QRhiTexture *tex) { m_texture = tex; }
+
+    QRhiRenderBuffer *renderBuffer() const { return m_renderBuffer; }
+    void setRenderBuffer(QRhiRenderBuffer *rb) { m_renderBuffer = rb; }
+
+    int layer() const { return m_layer; }
+    void setLayer(int layer) { m_layer = layer; }
+
+    int level() const { return m_level; }
+    void setLevel(int level) { m_level = level; }
+
+    QRhiTexture *resolveTexture() const { return m_resolveTexture; }
+    void setResolveTexture(QRhiTexture *tex) { m_resolveTexture = tex; }
+
+    int resolveLayer() const { return m_resolveLayer; }
+    void setResolveLayer(int layer) { m_resolveLayer = layer; }
+
+    int resolveLevel() const { return m_resolveLevel; }
+    void setResolveLevel(int level) { m_resolveLevel = level; }
+
+private:
+    QRhiTexture *m_texture = nullptr;
+    QRhiRenderBuffer *m_renderBuffer = nullptr;
+    int m_layer = 0;
+    int m_level = 0;
+    QRhiTexture *m_resolveTexture = nullptr;
+    int m_resolveLayer = 0;
+    int m_resolveLevel = 0;
+};
+
+Q_DECLARE_TYPEINFO(QRhiColorAttachment, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QRhiTextureRenderTargetDescription
+{
+public:
+    QRhiTextureRenderTargetDescription() = default;
+    QRhiTextureRenderTargetDescription(const QRhiColorAttachment &colorAttachment);
+    QRhiTextureRenderTargetDescription(const QRhiColorAttachment &colorAttachment, QRhiRenderBuffer *depthStencilBuffer);
+    QRhiTextureRenderTargetDescription(const QRhiColorAttachment &colorAttachment, QRhiTexture *depthTexture);
+
+    void setColorAttachments(std::initializer_list<QRhiColorAttachment> list) { m_colorAttachments = list; }
+    template<typename InputIterator>
+    void setColorAttachments(InputIterator first, InputIterator last)
+    {
+        m_colorAttachments.clear();
+        std::copy(first, last, std::back_inserter(m_colorAttachments));
+    }
+    const QRhiColorAttachment *cbeginColorAttachments() const { return m_colorAttachments.cbegin(); }
+    const QRhiColorAttachment *cendColorAttachments() const { return m_colorAttachments.cend(); }
+    const QRhiColorAttachment *colorAttachmentAt(int index) const { return &m_colorAttachments.at(index); }
+
+    QRhiRenderBuffer *depthStencilBuffer() const { return m_depthStencilBuffer; }
+    void setDepthStencilBuffer(QRhiRenderBuffer *renderBuffer) { m_depthStencilBuffer = renderBuffer; }
+
+    QRhiTexture *depthTexture() const { return m_depthTexture; }
+    void setDepthTexture(QRhiTexture *texture) { m_depthTexture = texture; }
+
+private:
+    QVarLengthArray<QRhiColorAttachment, 8> m_colorAttachments;
+    QRhiRenderBuffer *m_depthStencilBuffer = nullptr;
+    QRhiTexture *m_depthTexture = nullptr;
+};
+
+Q_DECLARE_TYPEINFO(QRhiTextureRenderTargetDescription, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QRhiTextureSubresourceUploadDescription
+{
+public:
+    QRhiTextureSubresourceUploadDescription() = default;
+    QRhiTextureSubresourceUploadDescription(const QImage &image);
+    QRhiTextureSubresourceUploadDescription(const void *data, int size);
+
+    QImage image() const { return m_image; }
+    void setImage(const QImage &image) { m_image = image; }
+
+    QByteArray data() const { return m_data; }
+    void setData(const QByteArray &data) { m_data = data; }
+
+    QPoint destinationTopLeft() const { return m_destinationTopLeft; }
+    void setDestinationTopLeft(const QPoint &p) { m_destinationTopLeft = p; }
+
+    QSize sourceSize() const { return m_sourceSize; }
+    void setSourceSize(const QSize &size) { m_sourceSize = size; }
+
+    QPoint sourceTopLeft() const { return m_sourceTopLeft; }
+    void setSourceTopLeft(const QPoint &p) { m_sourceTopLeft = p; }
+
+private:
+    QImage m_image;
+    QByteArray m_data;
+    QPoint m_destinationTopLeft;
+    QSize m_sourceSize;
+    QPoint m_sourceTopLeft;
+};
+
+Q_DECLARE_TYPEINFO(QRhiTextureSubresourceUploadDescription, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QRhiTextureUploadEntry
+{
+public:
+    QRhiTextureUploadEntry() = default;
+    QRhiTextureUploadEntry(int layer, int level, const QRhiTextureSubresourceUploadDescription &desc);
+
+    int layer() const { return m_layer; }
+    void setLayer(int layer) { m_layer = layer; }
+
+    int level() const { return m_level; }
+    void setLevel(int level) { m_level = level; }
+
+    QRhiTextureSubresourceUploadDescription description() const { return m_desc; }
+    void setDescription(const QRhiTextureSubresourceUploadDescription &desc) { m_desc = desc; }
+
+private:
+    int m_layer = 0;
+    int m_level = 0;
+    QRhiTextureSubresourceUploadDescription m_desc;
+};
+
+Q_DECLARE_TYPEINFO(QRhiTextureUploadEntry, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QRhiTextureUploadDescription
+{
+public:
+    QRhiTextureUploadDescription() = default;
+    QRhiTextureUploadDescription(const QRhiTextureUploadEntry &entry);
+    QRhiTextureUploadDescription(std::initializer_list<QRhiTextureUploadEntry> list);
+    QRhiTextureUploadDescription(const QVector<QRhiTextureUploadEntry> &entries) // compat., to be removed
+        : m_entries(entries.cbegin(), entries.cend())
+    { }
+
+    void setEntries(std::initializer_list<QRhiTextureUploadEntry> list) { m_entries = list; }
+    template<typename InputIterator>
+    void setEntries(InputIterator first, InputIterator last)
+    {
+        m_entries.clear();
+        std::copy(first, last, std::back_inserter(m_entries));
+    }
+    const QRhiTextureUploadEntry *cbeginEntries() const { return m_entries.cbegin(); }
+    const QRhiTextureUploadEntry *cendEntries() const { return m_entries.cend(); }
+
+private:
+    QVarLengthArray<QRhiTextureUploadEntry, 16> m_entries;
+};
+
+Q_DECLARE_TYPEINFO(QRhiTextureUploadDescription, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QRhiTextureCopyDescription
+{
+public:
+    QRhiTextureCopyDescription() = default;
+
+    QSize pixelSize() const { return m_pixelSize; }
+    void setPixelSize(const QSize &sz) { m_pixelSize = sz; }
+
+    int sourceLayer() const { return m_sourceLayer; }
+    void setSourceLayer(int layer) { m_sourceLayer = layer; }
+
+    int sourceLevel() const { return m_sourceLevel; }
+    void setSourceLevel(int level) { m_sourceLevel = level; }
+
+    QPoint sourceTopLeft() const { return m_sourceTopLeft; }
+    void setSourceTopLeft(const QPoint &p) { m_sourceTopLeft = p; }
+
+    int destinationLayer() const { return m_destinationLayer; }
+    void setDestinationLayer(int layer) { m_destinationLayer = layer; }
+
+    int destinationLevel() const { return m_destinationLevel; }
+    void setDestinationLevel(int level) { m_destinationLevel = level; }
+
+    QPoint destinationTopLeft() const { return m_destinationTopLeft; }
+    void setDestinationTopLeft(const QPoint &p) { m_destinationTopLeft = p; }
+
+private:
+    QSize m_pixelSize;
+    int m_sourceLayer = 0;
+    int m_sourceLevel = 0;
+    QPoint m_sourceTopLeft;
+    int m_destinationLayer = 0;
+    int m_destinationLevel = 0;
+    QPoint m_destinationTopLeft;
+};
+
+Q_DECLARE_TYPEINFO(QRhiTextureCopyDescription, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QRhiReadbackDescription
+{
+public:
+    QRhiReadbackDescription() = default;
+    QRhiReadbackDescription(QRhiTexture *texture);
+
+    QRhiTexture *texture() const { return m_texture; }
+    void setTexture(QRhiTexture *tex) { m_texture = tex; }
+
+    int layer() const { return m_layer; }
+    void setLayer(int layer) { m_layer = layer; }
+
+    int level() const { return m_level; }
+    void setLevel(int level) { m_level = level; }
+
+private:
+    QRhiTexture *m_texture = nullptr;
+    int m_layer = 0;
+    int m_level = 0;
+};
+
+Q_DECLARE_TYPEINFO(QRhiReadbackDescription, Q_MOVABLE_TYPE);
+
+struct Q_GUI_EXPORT QRhiNativeHandles
+{
+};
+
+class Q_GUI_EXPORT QRhiResource
+{
+public:
+    enum Type {
+        Buffer,
+        Texture,
+        Sampler,
+        RenderBuffer,
+        RenderPassDescriptor,
+        RenderTarget,
+        TextureRenderTarget,
+        ShaderResourceBindings,
+        GraphicsPipeline,
+        SwapChain,
+        ComputePipeline,
+        CommandBuffer
+    };
+
+    virtual ~QRhiResource();
+
+    virtual Type resourceType() const = 0;
+
+    virtual void release() = 0;
+    void releaseAndDestroyLater();
+
+    QByteArray name() const;
+    void setName(const QByteArray &name);
+
+    quint64 globalResourceId() const;
+
+protected:
+    QRhiResource(QRhiImplementation *rhi);
+    Q_DISABLE_COPY(QRhiResource)
+    friend class QRhiImplementation;
+    QRhiImplementation *m_rhi = nullptr;
+    quint64 m_id;
+    QByteArray m_objectName;
+};
+
+class Q_GUI_EXPORT QRhiBuffer : public QRhiResource
+{
+public:
+    enum Type {
+        Immutable,
+        Static,
+        Dynamic
+    };
+
+    enum UsageFlag {
+        VertexBuffer = 1 << 0,
+        IndexBuffer = 1 << 1,
+        UniformBuffer = 1 << 2,
+        StorageBuffer = 1 << 3
+    };
+    Q_DECLARE_FLAGS(UsageFlags, UsageFlag)
+
+    QRhiResource::Type resourceType() const override;
+
+    Type type() const { return m_type; }
+    void setType(Type t) { m_type = t; }
+
+    UsageFlags usage() const { return m_usage; }
+    void setUsage(UsageFlags u) { m_usage = u; }
+
+    int size() const { return m_size; }
+    void setSize(int sz) { m_size = sz; }
+
+    virtual bool build() = 0;
+
+protected:
+    QRhiBuffer(QRhiImplementation *rhi, Type type_, UsageFlags usage_, int size_);
+    Type m_type;
+    UsageFlags m_usage;
+    int m_size;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiBuffer::UsageFlags)
+
+class Q_GUI_EXPORT QRhiTexture : public QRhiResource
+{
+public:
+    enum Flag {
+        RenderTarget = 1 << 0,
+        CubeMap = 1 << 2,
+        MipMapped = 1 << 3,
+        sRGB = 1 << 4,
+        UsedAsTransferSource = 1 << 5,
+        UsedWithGenerateMips = 1 << 6,
+        UsedWithLoadStore = 1 << 7
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    enum Format {
+        UnknownFormat,
+
+        RGBA8,
+        BGRA8,
+        R8,
+        R16,
+        RED_OR_ALPHA8,
+
+        RGBA16F,
+        RGBA32F,
+
+        D16,
+        D32F,
+
+        BC1,
+        BC2,
+        BC3,
+        BC4,
+        BC5,
+        BC6H,
+        BC7,
+
+        ETC2_RGB8,
+        ETC2_RGB8A1,
+        ETC2_RGBA8,
+
+        ASTC_4x4,
+        ASTC_5x4,
+        ASTC_5x5,
+        ASTC_6x5,
+        ASTC_6x6,
+        ASTC_8x5,
+        ASTC_8x6,
+        ASTC_8x8,
+        ASTC_10x5,
+        ASTC_10x6,
+        ASTC_10x8,
+        ASTC_10x10,
+        ASTC_12x10,
+        ASTC_12x12
+    };
+
+    QRhiResource::Type resourceType() const override;
+
+    Format format() const { return m_format; }
+    void setFormat(Format fmt) { m_format = fmt; }
+
+    QSize pixelSize() const { return m_pixelSize; }
+    void setPixelSize(const QSize &sz) { m_pixelSize = sz; }
+
+    Flags flags() const { return m_flags; }
+    void setFlags(Flags f) { m_flags = f; }
+
+    int sampleCount() const { return m_sampleCount; }
+    void setSampleCount(int s) { m_sampleCount = s; }
+
+    virtual bool build() = 0;
+    virtual const QRhiNativeHandles *nativeHandles();
+    virtual bool buildFrom(const QRhiNativeHandles *src);
+
+protected:
+    QRhiTexture(QRhiImplementation *rhi, Format format_, const QSize &pixelSize_,
+                int sampleCount_, Flags flags_);
+    Format m_format;
+    QSize m_pixelSize;
+    int m_sampleCount;
+    Flags m_flags;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiTexture::Flags)
+
+class Q_GUI_EXPORT QRhiSampler : public QRhiResource
+{
+public:
+    enum Filter {
+        None,
+        Nearest,
+        Linear
+    };
+
+    enum AddressMode {
+        Repeat,
+        ClampToEdge,
+        Border,
+        Mirror,
+        MirrorOnce
+    };
+
+    enum CompareOp {
+        Never,
+        Less,
+        Equal,
+        LessOrEqual,
+        Greater,
+        NotEqual,
+        GreaterOrEqual,
+        Always
+    };
+
+    QRhiResource::Type resourceType() const override;
+
+    Filter magFilter() const { return m_magFilter; }
+    void setMagFilter(Filter f) { m_magFilter = f; }
+
+    Filter minFilter() const { return m_minFilter; }
+    void setMinFilter(Filter f) { m_minFilter = f; }
+
+    Filter mipmapMode() const { return m_mipmapMode; }
+    void setMipmapMode(Filter f) { m_mipmapMode = f; }
+
+    AddressMode addressU() const { return m_addressU; }
+    void setAddressU(AddressMode mode) { m_addressU = mode; }
+
+    AddressMode addressV() const { return m_addressV; }
+    void setAddressV(AddressMode mode) { m_addressV = mode; }
+
+    AddressMode addressW() const { return m_addressW; }
+    void setAddressW(AddressMode mode) { m_addressW = mode; }
+
+    CompareOp textureCompareOp() const { return m_compareOp; }
+    void setTextureCompareOp(CompareOp op) { m_compareOp = op; }
+
+    virtual bool build() = 0;
+
+protected:
+    QRhiSampler(QRhiImplementation *rhi,
+                Filter magFilter_, Filter minFilter_, Filter mipmapMode_,
+                AddressMode u_, AddressMode v_);
+    Filter m_magFilter;
+    Filter m_minFilter;
+    Filter m_mipmapMode;
+    AddressMode m_addressU;
+    AddressMode m_addressV;
+    AddressMode m_addressW;
+    CompareOp m_compareOp;
+};
+
+class Q_GUI_EXPORT QRhiRenderBuffer : public QRhiResource
+{
+public:
+    enum Type {
+        DepthStencil,
+        Color
+    };
+
+    enum Flag {
+        UsedWithSwapChainOnly = 1 << 0
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    QRhiResource::Type resourceType() const override;
+
+    Type type() const { return m_type; }
+    void setType(Type t) { m_type = t; }
+
+    QSize pixelSize() const { return m_pixelSize; }
+    void setPixelSize(const QSize &sz) { m_pixelSize = sz; }
+
+    int sampleCount() const { return m_sampleCount; }
+    void setSampleCount(int s) { m_sampleCount = s; }
+
+    Flags flags() const { return m_flags; }
+    void setFlags(Flags h) { m_flags = h; }
+
+    virtual bool build() = 0;
+
+    virtual QRhiTexture::Format backingFormat() const = 0;
+
+protected:
+    QRhiRenderBuffer(QRhiImplementation *rhi, Type type_, const QSize &pixelSize_,
+                     int sampleCount_, Flags flags_);
+    Type m_type;
+    QSize m_pixelSize;
+    int m_sampleCount;
+    Flags m_flags;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiRenderBuffer::Flags)
+
+class Q_GUI_EXPORT QRhiRenderPassDescriptor : public QRhiResource
+{
+public:
+    QRhiResource::Type resourceType() const override;
+
+    virtual const QRhiNativeHandles *nativeHandles();
+
+protected:
+    QRhiRenderPassDescriptor(QRhiImplementation *rhi);
+};
+
+class Q_GUI_EXPORT QRhiRenderTarget : public QRhiResource
+{
+public:
+    QRhiResource::Type resourceType() const override;
+
+    virtual QSize pixelSize() const = 0;
+    virtual float devicePixelRatio() const = 0;
+    virtual int sampleCount() const = 0;
+
+    QRhiRenderPassDescriptor *renderPassDescriptor() const { return m_renderPassDesc; }
+    void setRenderPassDescriptor(QRhiRenderPassDescriptor *desc) { m_renderPassDesc = desc; }
+
+protected:
+    QRhiRenderTarget(QRhiImplementation *rhi);
+    QRhiRenderPassDescriptor *m_renderPassDesc = nullptr;
+};
+
+class Q_GUI_EXPORT QRhiTextureRenderTarget : public QRhiRenderTarget
+{
+public:
+    enum Flag {
+        PreserveColorContents = 1 << 0,
+        PreserveDepthStencilContents = 1 << 1
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    QRhiResource::Type resourceType() const override;
+
+    QRhiTextureRenderTargetDescription description() const { return m_desc; }
+    void setDescription(const QRhiTextureRenderTargetDescription &desc) { m_desc = desc; }
+
+    Flags flags() const { return m_flags; }
+    void setFlags(Flags f) { m_flags = f; }
+
+    virtual QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() = 0;
+
+    virtual bool build() = 0;
+
+protected:
+    QRhiTextureRenderTarget(QRhiImplementation *rhi, const QRhiTextureRenderTargetDescription &desc_, Flags flags_);
+    QRhiTextureRenderTargetDescription m_desc;
+    Flags m_flags;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiTextureRenderTarget::Flags)
+
+class Q_GUI_EXPORT QRhiShaderResourceBindings : public QRhiResource
+{
+public:
+    QRhiResource::Type resourceType() const override;
+
+    void setBindings(std::initializer_list<QRhiShaderResourceBinding> list) { m_bindings = list; }
+
+    template<typename InputIterator>
+    void setBindings(InputIterator first, InputIterator last)
+    {
+        m_bindings.clear();
+        std::copy(first, last, std::back_inserter(m_bindings));
+    }
+
+    void setBindings(const QVector<QRhiShaderResourceBinding> &bindings) // compat., to be removed
+    {
+        setBindings(bindings.cbegin(), bindings.cend());
+    }
+
+    const QRhiShaderResourceBinding *cbeginBindings() const { return m_bindings.cbegin(); }
+    const QRhiShaderResourceBinding *cendBindings() const { return m_bindings.cend(); }
+
+    bool isLayoutCompatible(const QRhiShaderResourceBindings *other) const;
+
+    virtual bool build() = 0;
+
+protected:
+    QRhiShaderResourceBindings(QRhiImplementation *rhi);
+    QVarLengthArray<QRhiShaderResourceBinding, 8> m_bindings;
+#ifndef QT_NO_DEBUG_STREAM
+    friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiShaderResourceBindings &);
+#endif
+};
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiShaderResourceBindings &);
+#endif
+
+class Q_GUI_EXPORT QRhiGraphicsPipeline : public QRhiResource
+{
+public:
+    enum Flag {
+        UsesBlendConstants = 1 << 0,
+        UsesStencilRef = 1 << 1,
+        UsesScissor = 1 << 2
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    enum Topology {
+        Triangles,
+        TriangleStrip,
+        TriangleFan,
+        Lines,
+        LineStrip,
+        Points
+    };
+
+    enum CullMode {
+        None,
+        Front,
+        Back
+    };
+
+    enum FrontFace {
+        CCW,
+        CW
+    };
+
+    enum ColorMaskComponent {
+        R = 1 << 0,
+        G = 1 << 1,
+        B = 1 << 2,
+        A = 1 << 3
+    };
+    Q_DECLARE_FLAGS(ColorMask, ColorMaskComponent)
+
+    enum BlendFactor {
+        Zero,
+        One,
+        SrcColor,
+        OneMinusSrcColor,
+        DstColor,
+        OneMinusDstColor,
+        SrcAlpha,
+        OneMinusSrcAlpha,
+        DstAlpha,
+        OneMinusDstAlpha,
+        ConstantColor,
+        OneMinusConstantColor,
+        ConstantAlpha,
+        OneMinusConstantAlpha,
+        SrcAlphaSaturate,
+        Src1Color,
+        OneMinusSrc1Color,
+        Src1Alpha,
+        OneMinusSrc1Alpha
+    };
+
+    enum BlendOp {
+        Add,
+        Subtract,
+        ReverseSubtract,
+        Min,
+        Max
+    };
+
+    struct TargetBlend {
+        ColorMask colorWrite = ColorMask(0xF); // R | G | B | A
+        bool enable = false;
+        BlendFactor srcColor = One;
+        BlendFactor dstColor = OneMinusSrcAlpha;
+        BlendOp opColor = Add;
+        BlendFactor srcAlpha = One;
+        BlendFactor dstAlpha = OneMinusSrcAlpha;
+        BlendOp opAlpha = Add;
+    };
+
+    enum CompareOp {
+        Never,
+        Less,
+        Equal,
+        LessOrEqual,
+        Greater,
+        NotEqual,
+        GreaterOrEqual,
+        Always
+    };
+
+    enum StencilOp {
+        StencilZero,
+        Keep,
+        Replace,
+        IncrementAndClamp,
+        DecrementAndClamp,
+        Invert,
+        IncrementAndWrap,
+        DecrementAndWrap
+    };
+
+    struct StencilOpState {
+        StencilOp failOp = Keep;
+        StencilOp depthFailOp = Keep;
+        StencilOp passOp = Keep;
+        CompareOp compareOp = Always;
+    };
+
+    QRhiResource::Type resourceType() const override;
+
+    Flags flags() const { return m_flags; }
+    void setFlags(Flags f) { m_flags = f; }
+
+    Topology topology() const { return m_topology; }
+    void setTopology(Topology t) { m_topology = t; }
+
+    CullMode cullMode() const { return m_cullMode; }
+    void setCullMode(CullMode mode) { m_cullMode = mode; }
+
+    FrontFace frontFace() const { return m_frontFace; }
+    void setFrontFace(FrontFace f) { m_frontFace = f; }
+
+    void setTargetBlends(std::initializer_list<TargetBlend> list) { m_targetBlends = list; }
+    template<typename InputIterator>
+    void setTargetBlends(InputIterator first, InputIterator last)
+    {
+        m_targetBlends.clear();
+        std::copy(first, last, std::back_inserter(m_targetBlends));
+    }
+    const TargetBlend *cbeginTargetBlends() const { return m_targetBlends.cbegin(); }
+    const TargetBlend *cendTargetBlends() const { return m_targetBlends.cend(); }
+
+    bool hasDepthTest() const { return m_depthTest; }
+    void setDepthTest(bool enable) { m_depthTest = enable; }
+
+    bool hasDepthWrite() const { return m_depthWrite; }
+    void setDepthWrite(bool enable) { m_depthWrite = enable; }
+
+    CompareOp depthOp() const { return m_depthOp; }
+    void setDepthOp(CompareOp op) { m_depthOp = op; }
+
+    bool hasStencilTest() const { return m_stencilTest; }
+    void setStencilTest(bool enable) { m_stencilTest = enable; }
+
+    StencilOpState stencilFront() const { return m_stencilFront; }
+    void setStencilFront(const StencilOpState &state) { m_stencilFront = state; }
+
+    StencilOpState stencilBack() const { return m_stencilBack; }
+    void setStencilBack(const StencilOpState &state) { m_stencilBack = state; }
+
+    quint32 stencilReadMask() const { return m_stencilReadMask; }
+    void setStencilReadMask(quint32 mask) { m_stencilReadMask = mask; }
+
+    quint32 stencilWriteMask() const { return m_stencilWriteMask; }
+    void setStencilWriteMask(quint32 mask) { m_stencilWriteMask = mask; }
+
+    int sampleCount() const { return m_sampleCount; }
+    void setSampleCount(int s) { m_sampleCount = s; }
+
+    float lineWidth() const { return m_lineWidth; }
+    void setLineWidth(float width) { m_lineWidth = width; }
+
+    void setShaderStages(std::initializer_list<QRhiShaderStage> list) { m_shaderStages = list; }
+    template<typename InputIterator>
+    void setShaderStages(InputIterator first, InputIterator last)
+    {
+        m_shaderStages.clear();
+        std::copy(first, last, std::back_inserter(m_shaderStages));
+    }
+    void setShaderStages(const QVector<QRhiShaderStage> &stages) // compat., to be removed
+    {
+        setShaderStages(stages.cbegin(), stages.cend());
+    }
+    const QRhiShaderStage *cbeginShaderStages() const { return m_shaderStages.cbegin(); }
+    const QRhiShaderStage *cendShaderStages() const { return m_shaderStages.cend(); }
+
+    QRhiVertexInputLayout vertexInputLayout() const { return m_vertexInputLayout; }
+    void setVertexInputLayout(const QRhiVertexInputLayout &layout) { m_vertexInputLayout = layout; }
+
+    QRhiShaderResourceBindings *shaderResourceBindings() const { return m_shaderResourceBindings; }
+    void setShaderResourceBindings(QRhiShaderResourceBindings *srb) { m_shaderResourceBindings = srb; }
+
+    QRhiRenderPassDescriptor *renderPassDescriptor() const { return m_renderPassDesc; }
+    void setRenderPassDescriptor(QRhiRenderPassDescriptor *desc) { m_renderPassDesc = desc; }
+
+    virtual bool build() = 0;
+
+protected:
+    QRhiGraphicsPipeline(QRhiImplementation *rhi);
+    Flags m_flags;
+    Topology m_topology = Triangles;
+    CullMode m_cullMode = None;
+    FrontFace m_frontFace = CCW;
+    QVarLengthArray<TargetBlend, 8> m_targetBlends;
+    bool m_depthTest = false;
+    bool m_depthWrite = false;
+    CompareOp m_depthOp = Less;
+    bool m_stencilTest = false;
+    StencilOpState m_stencilFront;
+    StencilOpState m_stencilBack;
+    quint32 m_stencilReadMask = 0xFF;
+    quint32 m_stencilWriteMask = 0xFF;
+    int m_sampleCount = 1;
+    float m_lineWidth = 1.0f;
+    QVarLengthArray<QRhiShaderStage, 4> m_shaderStages;
+    QRhiVertexInputLayout m_vertexInputLayout;
+    QRhiShaderResourceBindings *m_shaderResourceBindings = nullptr;
+    QRhiRenderPassDescriptor *m_renderPassDesc = nullptr;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiGraphicsPipeline::Flags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiGraphicsPipeline::ColorMask)
+Q_DECLARE_TYPEINFO(QRhiGraphicsPipeline::TargetBlend, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QRhiSwapChain : public QRhiResource
+{
+public:
+    enum Flag {
+        SurfaceHasPreMulAlpha = 1 << 0,
+        SurfaceHasNonPreMulAlpha = 1 << 1,
+        sRGB = 1 << 2,
+        UsedAsTransferSource = 1 << 3,
+        NoVSync = 1 << 4,
+        MinimalBufferCount = 1 << 5
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    QRhiResource::Type resourceType() const override;
+
+    QWindow *window() const { return m_window; }
+    void setWindow(QWindow *window) { m_window = window; }
+
+    Flags flags() const { return m_flags; }
+    void setFlags(Flags f) { m_flags = f; }
+
+    QRhiRenderBuffer *depthStencil() const { return m_depthStencil; }
+    void setDepthStencil(QRhiRenderBuffer *ds) { m_depthStencil = ds; }
+
+    int sampleCount() const { return m_sampleCount; }
+    void setSampleCount(int samples) { m_sampleCount = samples; }
+
+    QRhiRenderPassDescriptor *renderPassDescriptor() const { return m_renderPassDesc; }
+    void setRenderPassDescriptor(QRhiRenderPassDescriptor *desc) { m_renderPassDesc = desc; }
+
+    QSize currentPixelSize() const { return m_currentPixelSize; }
+
+    virtual QRhiCommandBuffer *currentFrameCommandBuffer() = 0;
+    virtual QRhiRenderTarget *currentFrameRenderTarget() = 0;
+    virtual QSize surfacePixelSize() = 0;
+    virtual QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() = 0;
+    virtual bool buildOrResize() = 0;
+
+protected:
+    QRhiSwapChain(QRhiImplementation *rhi);
+    QWindow *m_window = nullptr;
+    Flags m_flags;
+    QRhiRenderBuffer *m_depthStencil = nullptr;
+    int m_sampleCount = 1;
+    QRhiRenderPassDescriptor *m_renderPassDesc = nullptr;
+    QSize m_currentPixelSize;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiSwapChain::Flags)
+
+class Q_GUI_EXPORT QRhiComputePipeline : public QRhiResource
+{
+public:
+    QRhiResource::Type resourceType() const override;
+    virtual bool build() = 0;
+
+    QRhiShaderStage shaderStage() const { return m_shaderStage; }
+    void setShaderStage(const QRhiShaderStage &stage) { m_shaderStage = stage; }
+
+    QRhiShaderResourceBindings *shaderResourceBindings() const { return m_shaderResourceBindings; }
+    void setShaderResourceBindings(QRhiShaderResourceBindings *srb) { m_shaderResourceBindings = srb; }
+
+protected:
+    QRhiComputePipeline(QRhiImplementation *rhi);
+    QRhiShaderStage m_shaderStage;
+    QRhiShaderResourceBindings *m_shaderResourceBindings = nullptr;
+};
+
+class Q_GUI_EXPORT QRhiCommandBuffer : public QRhiResource
+{
+public:
+    enum IndexFormat {
+        IndexUInt16,
+        IndexUInt32
+    };
+
+    QRhiResource::Type resourceType() const override;
+
+    void resourceUpdate(QRhiResourceUpdateBatch *resourceUpdates);
+
+    void beginPass(QRhiRenderTarget *rt,
+                   const QColor &colorClearValue,
+                   const QRhiDepthStencilClearValue &depthStencilClearValue,
+                   QRhiResourceUpdateBatch *resourceUpdates = nullptr);
+    void endPass(QRhiResourceUpdateBatch *resourceUpdates = nullptr);
+
+    void setGraphicsPipeline(QRhiGraphicsPipeline *ps);
+    using DynamicOffset = QPair<int, quint32>; // binding, offset
+    void setShaderResources(QRhiShaderResourceBindings *srb = nullptr,
+                            int dynamicOffsetCount = 0,
+                            const DynamicOffset *dynamicOffsets = nullptr);
+    using VertexInput = QPair<QRhiBuffer *, quint32>; // buffer, offset
+    void setVertexInput(int startBinding, int bindingCount, const VertexInput *bindings,
+                        QRhiBuffer *indexBuf = nullptr, quint32 indexOffset = 0,
+                        IndexFormat indexFormat = IndexUInt16);
+
+    void setViewport(const QRhiViewport &viewport);
+    void setScissor(const QRhiScissor &scissor);
+    void setBlendConstants(const QColor &c);
+    void setStencilRef(quint32 refValue);
+
+    void draw(quint32 vertexCount,
+              quint32 instanceCount = 1,
+              quint32 firstVertex = 0,
+              quint32 firstInstance = 0);
+
+    void drawIndexed(quint32 indexCount,
+                     quint32 instanceCount = 1,
+                     quint32 firstIndex = 0,
+                     qint32 vertexOffset = 0,
+                     quint32 firstInstance = 0);
+
+    void debugMarkBegin(const QByteArray &name);
+    void debugMarkEnd();
+    void debugMarkMsg(const QByteArray &msg);
+
+    void beginComputePass(QRhiResourceUpdateBatch *resourceUpdates = nullptr);
+    void endComputePass(QRhiResourceUpdateBatch *resourceUpdates = nullptr);
+    void setComputePipeline(QRhiComputePipeline *ps);
+    void dispatch(int x, int y, int z);
+
+    const QRhiNativeHandles *nativeHandles();
+    void beginExternal();
+    void endExternal();
+
+protected:
+    QRhiCommandBuffer(QRhiImplementation *rhi);
+};
+
+struct Q_GUI_EXPORT QRhiReadbackResult
+{
+    std::function<void()> completed = nullptr;
+    QRhiTexture::Format format;
+    QSize pixelSize;
+    QByteArray data;
+}; // non-movable due to the std::function
+
+struct Q_GUI_EXPORT QRhiBufferReadbackResult
+{
+    std::function<void()> completed = nullptr;
+    QByteArray data;
+};
+
+class Q_GUI_EXPORT QRhiResourceUpdateBatch
+{
+public:
+    ~QRhiResourceUpdateBatch();
+
+    void release();
+
+    void merge(QRhiResourceUpdateBatch *other);
+
+    void updateDynamicBuffer(QRhiBuffer *buf, int offset, int size, const void *data);
+    void uploadStaticBuffer(QRhiBuffer *buf, int offset, int size, const void *data);
+    void uploadStaticBuffer(QRhiBuffer *buf, const void *data);
+    void readBackBuffer(QRhiBuffer *buf, int offset, int size, QRhiBufferReadbackResult *result);
+    void uploadTexture(QRhiTexture *tex, const QRhiTextureUploadDescription &desc);
+    void uploadTexture(QRhiTexture *tex, const QImage &image);
+    void copyTexture(QRhiTexture *dst, QRhiTexture *src, const QRhiTextureCopyDescription &desc = QRhiTextureCopyDescription());
+    void readBackTexture(const QRhiReadbackDescription &rb, QRhiReadbackResult *result);
+    void generateMips(QRhiTexture *tex, int layer = 0);
+
+private:
+    QRhiResourceUpdateBatch(QRhiImplementation *rhi);
+    Q_DISABLE_COPY(QRhiResourceUpdateBatch)
+    QRhiResourceUpdateBatchPrivate *d;
+    friend class QRhiResourceUpdateBatchPrivate;
+    friend class QRhi;
+};
+
+struct Q_GUI_EXPORT QRhiInitParams
+{
+};
+
+class Q_GUI_EXPORT QRhi
+{
+public:
+    enum Implementation {
+        Null,
+        Vulkan,
+        OpenGLES2,
+        D3D11,
+        Metal
+    };
+
+    enum Flag {
+        EnableProfiling = 1 << 0,
+        EnableDebugMarkers = 1 << 1,
+        PreferSoftwareRenderer = 1 << 2
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    enum FrameOpResult {
+        FrameOpSuccess = 0,
+        FrameOpError,
+        FrameOpSwapChainOutOfDate,
+        FrameOpDeviceLost
+    };
+
+    enum Feature {
+        MultisampleTexture = 1,
+        MultisampleRenderBuffer,
+        DebugMarkers,
+        Timestamps,
+        Instancing,
+        CustomInstanceStepRate,
+        PrimitiveRestart,
+        NonDynamicUniformBuffers,
+        NonFourAlignedEffectiveIndexBufferOffset,
+        NPOTTextureRepeat,
+        RedOrAlpha8IsRed,
+        ElementIndexUint,
+        Compute,
+        WideLines,
+        VertexShaderPointSize,
+        BaseVertex,
+        BaseInstance,
+        TriangleFanTopology,
+        ReadBackNonUniformBuffer,
+        ReadBackNonBaseMipLevel
+    };
+
+    enum BeginFrameFlag {
+        ExternalContentsInPass = 0x01
+    };
+    Q_DECLARE_FLAGS(BeginFrameFlags, BeginFrameFlag)
+
+    enum EndFrameFlag {
+        SkipPresent = 1 << 0
+    };
+    Q_DECLARE_FLAGS(EndFrameFlags, EndFrameFlag)
+
+    enum ResourceLimit {
+        TextureSizeMin = 1,
+        TextureSizeMax,
+        MaxColorAttachments,
+        FramesInFlight
+    };
+
+    ~QRhi();
+
+    static QRhi *create(Implementation impl,
+                        QRhiInitParams *params,
+                        Flags flags = Flags(),
+                        QRhiNativeHandles *importDevice = nullptr);
+
+    Implementation backend() const;
+    QThread *thread() const;
+
+    using CleanupCallback = std::function<void(QRhi *)>;
+    void addCleanupCallback(const CleanupCallback &callback);
+    void runCleanup();
+
+    QRhiGraphicsPipeline *newGraphicsPipeline();
+    QRhiComputePipeline *newComputePipeline();
+    QRhiShaderResourceBindings *newShaderResourceBindings();
+
+    QRhiBuffer *newBuffer(QRhiBuffer::Type type,
+                          QRhiBuffer::UsageFlags usage,
+                          int size);
+
+    QRhiRenderBuffer *newRenderBuffer(QRhiRenderBuffer::Type type,
+                                      const QSize &pixelSize,
+                                      int sampleCount = 1,
+                                      QRhiRenderBuffer::Flags flags = QRhiRenderBuffer::Flags());
+
+    QRhiTexture *newTexture(QRhiTexture::Format format,
+                            const QSize &pixelSize,
+                            int sampleCount = 1,
+                            QRhiTexture::Flags flags = QRhiTexture::Flags());
+
+    QRhiSampler *newSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                            QRhiSampler::Filter mipmapMode,
+                            QRhiSampler::AddressMode u, QRhiSampler::AddressMode v);
+
+    QRhiTextureRenderTarget *newTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                    QRhiTextureRenderTarget::Flags flags = QRhiTextureRenderTarget::Flags());
+
+    QRhiSwapChain *newSwapChain();
+    FrameOpResult beginFrame(QRhiSwapChain *swapChain, BeginFrameFlags flags = BeginFrameFlags());
+    FrameOpResult endFrame(QRhiSwapChain *swapChain, EndFrameFlags flags = EndFrameFlags());
+    bool isRecordingFrame() const;
+    int currentFrameSlot() const;
+
+    FrameOpResult beginOffscreenFrame(QRhiCommandBuffer **cb, BeginFrameFlags flags = BeginFrameFlags());
+    FrameOpResult endOffscreenFrame(EndFrameFlags flags = EndFrameFlags());
+
+    QRhi::FrameOpResult finish();
+
+    QRhiResourceUpdateBatch *nextResourceUpdateBatch();
+
+    QVector<int> supportedSampleCounts() const;
+
+    int ubufAlignment() const;
+    int ubufAligned(int v) const;
+
+    int mipLevelsForSize(const QSize &size) const;
+    QSize sizeForMipLevel(int mipLevel, const QSize &baseLevelSize) const;
+
+    bool isYUpInFramebuffer() const;
+    bool isYUpInNDC() const;
+    bool isClipDepthZeroToOne() const;
+
+    QMatrix4x4 clipSpaceCorrMatrix() const;
+
+    bool isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags = QRhiTexture::Flags()) const;
+    bool isFeatureSupported(QRhi::Feature feature) const;
+    int resourceLimit(ResourceLimit limit) const;
+
+    const QRhiNativeHandles *nativeHandles();
+    bool makeThreadLocalNativeContextCurrent();
+
+    QRhiProfiler *profiler();
+
+    static const int MAX_LAYERS = 6; // cubemaps only
+    static const int MAX_LEVELS = 16; // a width and/or height of 65536 should be enough for everyone
+
+    void releaseCachedResources();
+
+    bool isDeviceLost() const;
+
+protected:
+    QRhi();
+
+private:
+    Q_DISABLE_COPY(QRhi)
+    QRhiImplementation *d = nullptr;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhi::Flags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhi::BeginFrameFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QRhi::EndFrameFlags)
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhi_p_p.h b/src/gui/rhi/qrhi_p_p.h
new file mode 100644
index 0000000000..baffe28202
--- /dev/null
+++ b/src/gui/rhi/qrhi_p_p.h
@@ -0,0 +1,551 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHI_P_H
+#define QRHI_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrhi_p.h"
+#include "qrhiprofiler_p_p.h"
+#include <QBitArray>
+#include <QAtomicInt>
+#include <QLoggingCategory>
+
+QT_BEGIN_NAMESPACE
+
+#define QRHI_RES(t, x) static_cast<t *>(x)
+#define QRHI_RES_RHI(t) t *rhiD = static_cast<t *>(m_rhi)
+#define QRHI_PROF QRhiProfilerPrivate *rhiP = m_rhi->profilerPrivateOrNull()
+#define QRHI_PROF_F(f) for (bool qrhip_enabled = rhiP != nullptr; qrhip_enabled; qrhip_enabled = false) rhiP->f
+
+Q_DECLARE_LOGGING_CATEGORY(QRHI_LOG_INFO)
+
+class QRhiImplementation
+{
+public:
+    virtual ~QRhiImplementation();
+
+    virtual bool create(QRhi::Flags flags) = 0;
+    virtual void destroy() = 0;
+
+    virtual QRhiGraphicsPipeline *createGraphicsPipeline() = 0;
+    virtual QRhiComputePipeline *createComputePipeline() = 0;
+    virtual QRhiShaderResourceBindings *createShaderResourceBindings() = 0;
+    virtual QRhiBuffer *createBuffer(QRhiBuffer::Type type,
+                                     QRhiBuffer::UsageFlags usage,
+                                     int size) = 0;
+    virtual QRhiRenderBuffer *createRenderBuffer(QRhiRenderBuffer::Type type,
+                                                 const QSize &pixelSize,
+                                                 int sampleCount,
+                                                 QRhiRenderBuffer::Flags flags) = 0;
+    virtual QRhiTexture *createTexture(QRhiTexture::Format format,
+                                       const QSize &pixelSize,
+                                       int sampleCount,
+                                       QRhiTexture::Flags flags) = 0;
+    virtual QRhiSampler *createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                                       QRhiSampler::Filter mipmapMode,
+                                       QRhiSampler:: AddressMode u, QRhiSampler::AddressMode v) = 0;
+
+    virtual QRhiTextureRenderTarget *createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                               QRhiTextureRenderTarget::Flags flags) = 0;
+
+    virtual QRhiSwapChain *createSwapChain() = 0;
+    virtual QRhi::FrameOpResult beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags) = 0;
+    virtual QRhi::FrameOpResult endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags) = 0;
+    virtual QRhi::FrameOpResult beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags) = 0;
+    virtual QRhi::FrameOpResult endOffscreenFrame(QRhi::EndFrameFlags flags) = 0;
+    virtual QRhi::FrameOpResult finish() = 0;
+
+    virtual void resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) = 0;
+
+    virtual void beginPass(QRhiCommandBuffer *cb,
+                           QRhiRenderTarget *rt,
+                           const QColor &colorClearValue,
+                           const QRhiDepthStencilClearValue &depthStencilClearValue,
+                           QRhiResourceUpdateBatch *resourceUpdates) = 0;
+    virtual void endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) = 0;
+
+    virtual void setGraphicsPipeline(QRhiCommandBuffer *cb,
+                                     QRhiGraphicsPipeline *ps) = 0;
+
+    virtual void setShaderResources(QRhiCommandBuffer *cb,
+                                    QRhiShaderResourceBindings *srb,
+                                    int dynamicOffsetCount,
+                                    const QRhiCommandBuffer::DynamicOffset *dynamicOffsets) = 0;
+
+    virtual void setVertexInput(QRhiCommandBuffer *cb,
+                                int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                                QRhiBuffer *indexBuf, quint32 indexOffset,
+                                QRhiCommandBuffer::IndexFormat indexFormat) = 0;
+
+    virtual void setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport) = 0;
+    virtual void setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor) = 0;
+    virtual void setBlendConstants(QRhiCommandBuffer *cb, const QColor &c) = 0;
+    virtual void setStencilRef(QRhiCommandBuffer *cb, quint32 refValue) = 0;
+
+    virtual void draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+                      quint32 instanceCount, quint32 firstVertex, quint32 firstInstance) = 0;
+    virtual void drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                             quint32 instanceCount, quint32 firstIndex,
+                             qint32 vertexOffset, quint32 firstInstance) = 0;
+
+    virtual void debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name) = 0;
+    virtual void debugMarkEnd(QRhiCommandBuffer *cb) = 0;
+    virtual void debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg) = 0;
+
+    virtual void beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) = 0;
+    virtual void endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) = 0;
+    virtual void setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps) = 0;
+    virtual void dispatch(QRhiCommandBuffer *cb, int x, int y, int z) = 0;
+
+    virtual const QRhiNativeHandles *nativeHandles(QRhiCommandBuffer *cb) = 0;
+    virtual void beginExternal(QRhiCommandBuffer *cb) = 0;
+    virtual void endExternal(QRhiCommandBuffer *cb) = 0;
+
+    virtual QVector<int> supportedSampleCounts() const = 0;
+    virtual int ubufAlignment() const = 0;
+    virtual bool isYUpInFramebuffer() const = 0;
+    virtual bool isYUpInNDC() const = 0;
+    virtual bool isClipDepthZeroToOne() const = 0;
+    virtual QMatrix4x4 clipSpaceCorrMatrix() const = 0;
+    virtual bool isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const = 0;
+    virtual bool isFeatureSupported(QRhi::Feature feature) const = 0;
+    virtual int resourceLimit(QRhi::ResourceLimit limit) const = 0;
+    virtual const QRhiNativeHandles *nativeHandles() = 0;
+    virtual void sendVMemStatsToProfiler() = 0;
+    virtual bool makeThreadLocalNativeContextCurrent() = 0;
+    virtual void releaseCachedResources() = 0;
+    virtual bool isDeviceLost() const = 0;
+
+    bool isCompressedFormat(QRhiTexture::Format format) const;
+    void compressedFormatInfo(QRhiTexture::Format format, const QSize &size,
+                              quint32 *bpl, quint32 *byteSize,
+                              QSize *blockDim) const;
+    void textureFormatInfo(QRhiTexture::Format format, const QSize &size,
+                           quint32 *bpl, quint32 *byteSize) const;
+    quint32 approxByteSizeForTexture(QRhiTexture::Format format, const QSize &baseSize,
+                                     int mipCount, int layerCount);
+
+    QRhiProfilerPrivate *profilerPrivateOrNull()
+    {
+        // return null when QRhi::EnableProfiling was not set
+        QRhiProfilerPrivate *p = QRhiProfilerPrivate::get(&profiler);
+        return p->rhiDWhenEnabled ? p : nullptr;
+    }
+
+    // only really care about resources that own native graphics resources underneath
+    void registerResource(QRhiResource *res)
+    {
+        resources.insert(res);
+    }
+
+    void unregisterResource(QRhiResource *res)
+    {
+        resources.remove(res);
+    }
+
+    QSet<QRhiResource *> activeResources() const
+    {
+        return resources;
+    }
+
+    void addReleaseAndDestroyLater(QRhiResource *res)
+    {
+        if (inFrame)
+            pendingReleaseAndDestroyResources.insert(res);
+        else
+            delete res;
+    }
+
+    void addCleanupCallback(const QRhi::CleanupCallback &callback)
+    {
+        cleanupCallbacks.append(callback);
+    }
+
+    bool sanityCheckGraphicsPipeline(QRhiGraphicsPipeline *ps);
+
+    QRhi *q;
+
+    static const int MAX_SHADER_CACHE_ENTRIES = 128;
+
+protected:
+    bool debugMarkers = false;
+    int currentFrameSlot = 0; // for vk, mtl, and similar. unused by gl and d3d11.
+    bool inFrame = false;
+
+private:
+    QRhi::Implementation implType;
+    QThread *implThread;
+    QRhiProfiler profiler;
+    QVarLengthArray<QRhiResourceUpdateBatch *, 4> resUpdPool;
+    QBitArray resUpdPoolMap;
+    QSet<QRhiResource *> resources;
+    QSet<QRhiResource *> pendingReleaseAndDestroyResources;
+    QVector<QRhi::CleanupCallback> cleanupCallbacks;
+
+    friend class QRhi;
+    friend class QRhiResourceUpdateBatchPrivate;
+};
+
+template<typename T, size_t N>
+bool qrhi_toTopLeftRenderTargetRect(const QSize &outputSize, const std::array<T, N> &r,
+                                    T *x, T *y, T *w, T *h)
+{
+    // x,y are bottom-left in QRhiScissor and QRhiViewport but top-left in
+    // Vulkan/Metal/D3D. Our input is an OpenGL-style scissor rect where both
+    // negative x or y, and partly or completely out of bounds rects are
+    // allowed. The only thing the input here cannot have is a negative width
+    // or height. We must handle all other input gracefully, clamping to a zero
+    // width or height rect in the worst case, and ensuring the resulting rect
+    // is inside the rendertarget's bounds because some APIs' validation/debug
+    // layers are allergic to out of bounds scissor or viewport rects.
+
+    const T outputWidth = outputSize.width();
+    const T outputHeight = outputSize.height();
+    const T inputWidth = r[2];
+    const T inputHeight = r[3];
+
+    if (inputWidth < 0 || inputHeight < 0)
+        return false;
+
+    *x = r[0];
+    *y = outputHeight - (r[1] + inputHeight);
+
+    const T widthOffset = *x < 0 ? -*x : 0;
+    const T heightOffset = *y < 0 ? -*y : 0;
+
+    *x = qBound<T>(0, *x, outputWidth - 1);
+    *y = qBound<T>(0, *y, outputHeight - 1);
+    *w = qMax<T>(0, inputWidth - widthOffset);
+    *h = qMax<T>(0, inputHeight - heightOffset);
+
+    if (*x + *w > outputWidth)
+        *w = qMax<T>(0, outputWidth - *x - 1);
+    if (*y + *h > outputHeight)
+        *h = qMax<T>(0, outputHeight - *y - 1);
+
+    return true;
+}
+
+class QRhiResourceUpdateBatchPrivate
+{
+public:
+    struct BufferOp {
+        enum Type {
+            DynamicUpdate,
+            StaticUpload,
+            Read
+        };
+        Type type;
+        QRhiBuffer *buf;
+        int offset;
+        QByteArray data;
+        int readSize;
+        QRhiBufferReadbackResult *result;
+
+        static BufferOp dynamicUpdate(QRhiBuffer *buf, int offset, int size, const void *data)
+        {
+            BufferOp op;
+            op.type = DynamicUpdate;
+            op.buf = buf;
+            op.offset = offset;
+            op.data = QByteArray(reinterpret_cast<const char *>(data), size ? size : buf->size());
+            return op;
+        }
+
+        static BufferOp staticUpload(QRhiBuffer *buf, int offset, int size, const void *data)
+        {
+            BufferOp op;
+            op.type = StaticUpload;
+            op.buf = buf;
+            op.offset = offset;
+            op.data = QByteArray(reinterpret_cast<const char *>(data), size ? size : buf->size());
+            return op;
+        }
+
+        static BufferOp read(QRhiBuffer *buf, int offset, int size, QRhiBufferReadbackResult *result)
+        {
+            BufferOp op;
+            op.type = Read;
+            op.buf = buf;
+            op.offset = offset;
+            op.readSize = size;
+            op.result = result;
+            return op;
+        }
+    };
+
+    struct TextureOp {
+        enum Type {
+            Upload,
+            Copy,
+            Read,
+            GenMips
+        };
+        Type type;
+        QRhiTexture *dst;
+        // Specifying multiple uploads for a subresource must be supported.
+        // In the backend this can then end up, where applicable, as a
+        // single, batched copy operation with only one set of barriers.
+        // This helps when doing for example glyph cache fills.
+        QVector<QRhiTextureSubresourceUploadDescription> subresDesc[QRhi::MAX_LAYERS][QRhi::MAX_LEVELS];
+        QRhiTexture *src;
+        QRhiTextureCopyDescription desc;
+        QRhiReadbackDescription rb;
+        QRhiReadbackResult *result;
+        int layer;
+
+        static TextureOp upload(QRhiTexture *tex, const QRhiTextureUploadDescription &desc)
+        {
+            TextureOp op;
+            op.type = Upload;
+            op.dst = tex;
+            for (auto it = desc.cbeginEntries(), itEnd = desc.cendEntries(); it != itEnd; ++it)
+                op.subresDesc[it->layer()][it->level()].append(it->description());
+            return op;
+        }
+
+        static TextureOp copy(QRhiTexture *dst, QRhiTexture *src, const QRhiTextureCopyDescription &desc)
+        {
+            TextureOp op;
+            op.type = Copy;
+            op.dst = dst;
+            op.src = src;
+            op.desc = desc;
+            return op;
+        }
+
+        static TextureOp read(const QRhiReadbackDescription &rb, QRhiReadbackResult *result)
+        {
+            TextureOp op;
+            op.type = Read;
+            op.rb = rb;
+            op.result = result;
+            return op;
+        }
+
+        static TextureOp genMips(QRhiTexture *tex, int layer)
+        {
+            TextureOp op;
+            op.type = GenMips;
+            op.dst = tex;
+            op.layer = layer;
+            return op;
+        }
+    };
+
+    QVarLengthArray<BufferOp, 1024> bufferOps;
+    QVarLengthArray<TextureOp, 256> textureOps;
+
+    QRhiResourceUpdateBatch *q = nullptr;
+    QRhiImplementation *rhi = nullptr;
+    int poolIndex = -1;
+
+    void free();
+    void merge(QRhiResourceUpdateBatchPrivate *other);
+
+    static QRhiResourceUpdateBatchPrivate *get(QRhiResourceUpdateBatch *b) { return b->d; }
+};
+
+Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::BufferOp, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::TextureOp, Q_MOVABLE_TYPE);
+
+template<typename T>
+struct QRhiBatchedBindings
+{
+    void feed(int binding, T resource) { // binding must be strictly increasing
+        if (curBinding == -1 || binding > curBinding + 1) {
+            finish();
+            curBatch.startBinding = binding;
+            curBatch.resources.clear();
+            curBatch.resources.append(resource);
+        } else {
+            Q_ASSERT(binding == curBinding + 1);
+            curBatch.resources.append(resource);
+        }
+        curBinding = binding;
+    }
+
+    void finish() {
+        if (!curBatch.resources.isEmpty())
+            batches.append(curBatch);
+    }
+
+    void clear() {
+        batches.clear();
+        curBatch.resources.clear();
+        curBinding = -1;
+    }
+
+    struct Batch {
+        uint startBinding;
+        QVarLengthArray<T, 4> resources;
+
+        bool operator==(const Batch &other) const
+        {
+            return startBinding == other.startBinding && resources == other.resources;
+        }
+
+        bool operator!=(const Batch &other) const
+        {
+            return !operator==(other);
+        }
+    };
+
+    QVarLengthArray<Batch, 4> batches; // sorted by startBinding
+
+    bool operator==(const QRhiBatchedBindings<T> &other) const
+    {
+        return batches == other.batches;
+    }
+
+    bool operator!=(const QRhiBatchedBindings<T> &other) const
+    {
+        return !operator==(other);
+    }
+
+private:
+    Batch curBatch;
+    int curBinding = -1;
+};
+
+class QRhiGlobalObjectIdGenerator
+{
+public:
+#ifdef Q_ATOMIC_INT64_IS_SUPPORTED
+    using Type = quint64;
+#else
+    using Type = quint32;
+#endif
+    static Type newId();
+};
+
+class QRhiPassResourceTracker
+{
+public:
+    bool isEmpty() const;
+    void reset();
+
+    struct UsageState {
+        int layout;
+        int access;
+        int stage;
+    };
+
+    enum BufferStage {
+        BufVertexInputStage,
+        BufVertexStage,
+        BufFragmentStage,
+        BufComputeStage
+    };
+
+    enum BufferAccess {
+        BufVertexInput,
+        BufIndexRead,
+        BufUniformRead,
+        BufStorageLoad,
+        BufStorageStore,
+        BufStorageLoadStore
+    };
+
+    void registerBuffer(QRhiBuffer *buf, int slot, BufferAccess *access, BufferStage *stage,
+                        const UsageState &state);
+
+    enum TextureStage {
+        TexVertexStage,
+        TexFragmentStage,
+        TexColorOutputStage,
+        TexDepthOutputStage,
+        TexComputeStage
+    };
+
+    enum TextureAccess {
+        TexSample,
+        TexColorOutput,
+        TexDepthOutput,
+        TexStorageLoad,
+        TexStorageStore,
+        TexStorageLoadStore
+    };
+
+    void registerTexture(QRhiTexture *tex, TextureAccess *access, TextureStage *stage,
+                         const UsageState &state);
+
+    struct Buffer {
+        int slot;
+        BufferAccess access;
+        BufferStage stage;
+        UsageState stateAtPassBegin;
+    };
+
+    using BufferIterator = QHash<QRhiBuffer *, Buffer>::const_iterator;
+    BufferIterator cbeginBuffers() const { return m_buffers.cbegin(); }
+    BufferIterator cendBuffers() const { return m_buffers.cend(); }
+
+    struct Texture {
+        TextureAccess access;
+        TextureStage stage;
+        UsageState stateAtPassBegin;
+    };
+
+    using TextureIterator = QHash<QRhiTexture *, Texture>::const_iterator;
+    TextureIterator cbeginTextures() const { return m_textures.cbegin(); }
+    TextureIterator cendTextures() const { return m_textures.cend(); }
+
+    static BufferStage toPassTrackerBufferStage(QRhiShaderResourceBinding::StageFlags stages);
+    static TextureStage toPassTrackerTextureStage(QRhiShaderResourceBinding::StageFlags stages);
+
+private:
+    QHash<QRhiBuffer *, Buffer> m_buffers;
+    QHash<QRhiTexture *, Texture> m_textures;
+};
+
+Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Buffer, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Texture, Q_MOVABLE_TYPE);
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp
new file mode 100644
index 0000000000..717f3e6d6c
--- /dev/null
+++ b/src/gui/rhi/qrhid3d11.cpp
@@ -0,0 +1,4110 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qrhid3d11_p_p.h"
+#include "qshader_p.h"
+#include "cs_tdr_p.h"
+#include <QWindow>
+#include <QOperatingSystemVersion>
+#include <qmath.h>
+#include <private/qsystemlibrary_p.h>
+
+#include <d3dcompiler.h>
+#include <comdef.h>
+
+QT_BEGIN_NAMESPACE
+
+/*
+  Direct3D 11 backend. Provides a double-buffered flip model (FLIP_DISCARD)
+  swapchain. Textures and "static" buffers are USAGE_DEFAULT, leaving it to
+  UpdateSubResource to upload the data in any way it sees fit. "Dynamic"
+  buffers are USAGE_DYNAMIC and updating is done by mapping with WRITE_DISCARD.
+  (so here QRhiBuffer keeps a copy of the buffer contents and all of it is
+  memcpy'd every time, leaving the rest (juggling with the memory area Map
+  returns) to the driver).
+*/
+
+/*!
+    \class QRhiD3D11InitParams
+    \internal
+    \inmodule QtGui
+    \brief Direct3D 11 specific initialization parameters.
+
+    A D3D11-based QRhi needs no special parameters for initialization. If
+    desired, enableDebugLayer can be set to \c true to enable the Direct3D
+    debug layer. This can be useful during development, but should be avoided
+    in production builds.
+
+    \badcode
+        QRhiD3D11InitParams params;
+        params.enableDebugLayer = true;
+        rhi = QRhi::create(QRhi::D3D11, &params);
+    \endcode
+
+    \note QRhiSwapChain should only be used in combination with QWindow
+    instances that have their surface type set to QSurface::OpenGLSurface.
+    There are currently no Direct3D specifics in the Windows platform support
+    of Qt and therefore there is no separate QSurface type available.
+
+    \section2 Working with existing Direct3D 11 devices
+
+    When interoperating with another graphics engine, it may be necessary to
+    get a QRhi instance that uses the same Direct3D device. This can be
+    achieved by passing a pointer to a QRhiD3D11NativeHandles to
+    QRhi::create(). Both the device and the device context must be set to a
+    non-null value then.
+
+    The QRhi does not take ownership of any of the external objects.
+
+    \note QRhi works with immediate contexts only. Deferred contexts are not
+    used in any way.
+
+    \note Regardless of using an imported or a QRhi-created device context, the
+    \c ID3D11DeviceContext1 interface (Direct3D 11.1) must be supported.
+    Initialization will fail otherwise.
+ */
+
+/*!
+    \class QRhiD3D11NativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Holds the D3D device and device context used by the QRhi.
+
+    \note The class uses \c{void *} as the type since including the COM-based
+    \c{d3d11.h} headers is not acceptable here. The actual types are
+    \c{ID3D11Device *} and \c{ID3D11DeviceContext *}.
+ */
+
+/*!
+    \class QRhiD3D11TextureNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Holds the D3D texture object that is backing a QRhiTexture instance.
+
+    \note The class uses \c{void *} as the type since including the COM-based
+    \c{d3d11.h} headers is not acceptable here. The actual type is
+    \c{ID3D11Texture2D *}.
+ */
+
+// help mingw with its ancient sdk headers
+#ifndef DXGI_ADAPTER_FLAG_SOFTWARE
+#define DXGI_ADAPTER_FLAG_SOFTWARE 2
+#endif
+
+QRhiD3D11::QRhiD3D11(QRhiD3D11InitParams *params, QRhiD3D11NativeHandles *importDevice)
+    : ofr(this),
+      deviceCurse(this)
+{
+    debugLayer = params->enableDebugLayer;
+
+    deviceCurse.framesToActivate = params->framesUntilKillingDeviceViaTdr;
+    deviceCurse.permanent = params->repeatDeviceKill;
+
+    importedDevice = importDevice != nullptr;
+    if (importedDevice) {
+        dev = reinterpret_cast<ID3D11Device *>(importDevice->dev);
+        if (dev) {
+            ID3D11DeviceContext *ctx = reinterpret_cast<ID3D11DeviceContext *>(importDevice->context);
+            if (SUCCEEDED(ctx->QueryInterface(IID_ID3D11DeviceContext1, reinterpret_cast<void **>(&context)))) {
+                // get rid of the ref added by QueryInterface
+                ctx->Release();
+            } else {
+                qWarning("ID3D11DeviceContext1 not supported by context, cannot import");
+                importedDevice = false;
+            }
+        } else {
+            qWarning("No ID3D11Device given, cannot import");
+            importedDevice = false;
+        }
+    }
+}
+
+static QString comErrorMessage(HRESULT hr)
+{
+#ifndef Q_OS_WINRT
+    const _com_error comError(hr);
+#else
+    const _com_error comError(hr, nullptr);
+#endif
+    QString result = QLatin1String("Error 0x") + QString::number(ulong(hr), 16);
+    if (const wchar_t *msg = comError.ErrorMessage())
+        result += QLatin1String(": ") + QString::fromWCharArray(msg);
+    return result;
+}
+
+template <class Int>
+inline Int aligned(Int v, Int byteAlign)
+{
+    return (v + byteAlign - 1) & ~(byteAlign - 1);
+}
+
+static IDXGIFactory1 *createDXGIFactory2()
+{
+    IDXGIFactory1 *result = nullptr;
+    if (QOperatingSystemVersion::current() > QOperatingSystemVersion::Windows7) {
+        using PtrCreateDXGIFactory2 = HRESULT (WINAPI *)(UINT, REFIID, void **);
+        QSystemLibrary dxgilib(QStringLiteral("dxgi"));
+        if (auto createDXGIFactory2 = reinterpret_cast<PtrCreateDXGIFactory2>(dxgilib.resolve("CreateDXGIFactory2"))) {
+            const HRESULT hr = createDXGIFactory2(0, IID_IDXGIFactory2, reinterpret_cast<void **>(&result));
+            if (FAILED(hr)) {
+                qWarning("CreateDXGIFactory2() failed to create DXGI factory: %s", qPrintable(comErrorMessage(hr)));
+                result = nullptr;
+            }
+        } else {
+            qWarning("Unable to resolve CreateDXGIFactory2()");
+        }
+    }
+    return result;
+}
+
+static IDXGIFactory1 *createDXGIFactory1()
+{
+    IDXGIFactory1 *result = nullptr;
+    const HRESULT hr = CreateDXGIFactory1(IID_IDXGIFactory1, reinterpret_cast<void **>(&result));
+    if (FAILED(hr)) {
+        qWarning("CreateDXGIFactory1() failed to create DXGI factory: %s", qPrintable(comErrorMessage(hr)));
+        result = nullptr;
+    }
+    return result;
+}
+
+bool QRhiD3D11::create(QRhi::Flags flags)
+{
+    Q_UNUSED(flags);
+
+    uint devFlags = 0;
+    if (debugLayer)
+        devFlags |= D3D11_CREATE_DEVICE_DEBUG;
+
+    dxgiFactory = createDXGIFactory2();
+    if (dxgiFactory != nullptr) {
+        hasDxgi2 = true;
+        supportsFlipDiscardSwapchain = QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10
+                && !qEnvironmentVariableIntValue("QT_D3D_NO_FLIP");
+    } else {
+        dxgiFactory = createDXGIFactory1();
+        hasDxgi2 = false;
+        supportsFlipDiscardSwapchain = false;
+    }
+
+    if (dxgiFactory == nullptr)
+        return false;
+
+    qCDebug(QRHI_LOG_INFO, "DXGI 1.2 = %s, FLIP_DISCARD swapchain supported = %s",
+            hasDxgi2 ? "true" : "false", supportsFlipDiscardSwapchain ? "true" : "false");
+
+    if (!importedDevice) {
+        IDXGIAdapter1 *adapterToUse = nullptr;
+        IDXGIAdapter1 *adapter;
+        int requestedAdapterIndex = -1;
+        if (qEnvironmentVariableIsSet("QT_D3D_ADAPTER_INDEX"))
+            requestedAdapterIndex = qEnvironmentVariableIntValue("QT_D3D_ADAPTER_INDEX");
+
+        if (requestedAdapterIndex < 0 && flags.testFlag(QRhi::PreferSoftwareRenderer)) {
+            for (int adapterIndex = 0; dxgiFactory->EnumAdapters1(UINT(adapterIndex), &adapter) != DXGI_ERROR_NOT_FOUND; ++adapterIndex) {
+                DXGI_ADAPTER_DESC1 desc;
+                adapter->GetDesc1(&desc);
+                adapter->Release();
+                if (desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE) {
+                    requestedAdapterIndex = adapterIndex;
+                    break;
+                }
+            }
+        }
+
+        for (int adapterIndex = 0; dxgiFactory->EnumAdapters1(UINT(adapterIndex), &adapter) != DXGI_ERROR_NOT_FOUND; ++adapterIndex) {
+            DXGI_ADAPTER_DESC1 desc;
+            adapter->GetDesc1(&desc);
+            const QString name = QString::fromUtf16(reinterpret_cast<char16_t *>(desc.Description));
+            qCDebug(QRHI_LOG_INFO, "Adapter %d: '%s' (vendor 0x%X device 0x%X flags 0x%X)",
+                    adapterIndex,
+                    qPrintable(name),
+                    desc.VendorId,
+                    desc.DeviceId,
+                    desc.Flags);
+            if (!adapterToUse && (requestedAdapterIndex < 0 || requestedAdapterIndex == adapterIndex)) {
+                adapterToUse = adapter;
+                qCDebug(QRHI_LOG_INFO, "  using this adapter");
+            } else {
+                adapter->Release();
+            }
+        }
+        if (!adapterToUse) {
+            qWarning("No adapter");
+            return false;
+        }
+
+        ID3D11DeviceContext *ctx = nullptr;
+        HRESULT hr = D3D11CreateDevice(adapterToUse, D3D_DRIVER_TYPE_UNKNOWN, nullptr, devFlags,
+                                       nullptr, 0, D3D11_SDK_VERSION,
+                                       &dev, &featureLevel, &ctx);
+        adapterToUse->Release();
+        if (FAILED(hr)) {
+            qWarning("Failed to create D3D11 device and context: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+        if (SUCCEEDED(ctx->QueryInterface(IID_ID3D11DeviceContext1, reinterpret_cast<void **>(&context)))) {
+            ctx->Release();
+        } else {
+            qWarning("ID3D11DeviceContext1 not supported");
+            return false;
+        }
+    } else {
+        Q_ASSERT(dev && context);
+        featureLevel = dev->GetFeatureLevel();
+    }
+
+    if (FAILED(context->QueryInterface(IID_ID3DUserDefinedAnnotation, reinterpret_cast<void **>(&annotations))))
+        annotations = nullptr;
+
+    deviceLost = false;
+
+    nativeHandlesStruct.dev = dev;
+    nativeHandlesStruct.context = context;
+
+    if (deviceCurse.framesToActivate > 0)
+        deviceCurse.initResources();
+
+    return true;
+}
+
+void QRhiD3D11::clearShaderCache()
+{
+    for (Shader &s : m_shaderCache)
+        s.s->Release();
+
+    m_shaderCache.clear();
+}
+
+void QRhiD3D11::destroy()
+{
+    finishActiveReadbacks();
+
+    clearShaderCache();
+
+    deviceCurse.releaseResources();
+
+    if (annotations) {
+        annotations->Release();
+        annotations = nullptr;
+    }
+
+    if (!importedDevice) {
+        if (context) {
+            context->Release();
+            context = nullptr;
+        }
+        if (dev) {
+            dev->Release();
+            dev = nullptr;
+        }
+    }
+
+    if (dxgiFactory) {
+        dxgiFactory->Release();
+        dxgiFactory = nullptr;
+    }
+}
+
+void QRhiD3D11::reportLiveObjects(ID3D11Device *device)
+{
+    // this works only when params.enableDebugLayer was true
+    ID3D11Debug *debug;
+    if (SUCCEEDED(device->QueryInterface(IID_ID3D11Debug, reinterpret_cast<void **>(&debug)))) {
+        debug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL);
+        debug->Release();
+    }
+}
+
+QVector<int> QRhiD3D11::supportedSampleCounts() const
+{
+    return { 1, 2, 4, 8 };
+}
+
+DXGI_SAMPLE_DESC QRhiD3D11::effectiveSampleCount(int sampleCount) const
+{
+    DXGI_SAMPLE_DESC desc;
+    desc.Count = 1;
+    desc.Quality = 0;
+
+    // Stay compatible with QSurfaceFormat and friends where samples == 0 means the same as 1.
+    int s = qBound(1, sampleCount, 64);
+
+    if (!supportedSampleCounts().contains(s)) {
+        qWarning("Attempted to set unsupported sample count %d", sampleCount);
+        return desc;
+    }
+
+    desc.Count = UINT(s);
+    if (s > 1)
+        desc.Quality = UINT(D3D11_STANDARD_MULTISAMPLE_PATTERN);
+    else
+        desc.Quality = 0;
+
+    return desc;
+}
+
+QRhiSwapChain *QRhiD3D11::createSwapChain()
+{
+    return new QD3D11SwapChain(this);
+}
+
+QRhiBuffer *QRhiD3D11::createBuffer(QRhiBuffer::Type type, QRhiBuffer::UsageFlags usage, int size)
+{
+    return new QD3D11Buffer(this, type, usage, size);
+}
+
+int QRhiD3D11::ubufAlignment() const
+{
+    return 256;
+}
+
+bool QRhiD3D11::isYUpInFramebuffer() const
+{
+    return false;
+}
+
+bool QRhiD3D11::isYUpInNDC() const
+{
+    return true;
+}
+
+bool QRhiD3D11::isClipDepthZeroToOne() const
+{
+    return true;
+}
+
+QMatrix4x4 QRhiD3D11::clipSpaceCorrMatrix() const
+{
+    // Like with Vulkan, but Y is already good.
+
+    static QMatrix4x4 m;
+    if (m.isIdentity()) {
+        // NB the ctor takes row-major
+        m = QMatrix4x4(1.0f, 0.0f, 0.0f, 0.0f,
+                       0.0f, 1.0f, 0.0f, 0.0f,
+                       0.0f, 0.0f, 0.5f, 0.5f,
+                       0.0f, 0.0f, 0.0f, 1.0f);
+    }
+    return m;
+}
+
+bool QRhiD3D11::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const
+{
+    Q_UNUSED(flags);
+
+    if (format >= QRhiTexture::ETC2_RGB8 && format <= QRhiTexture::ASTC_12x12)
+        return false;
+
+    return true;
+}
+
+bool QRhiD3D11::isFeatureSupported(QRhi::Feature feature) const
+{
+    switch (feature) {
+    case QRhi::MultisampleTexture:
+        return true;
+    case QRhi::MultisampleRenderBuffer:
+        return true;
+    case QRhi::DebugMarkers:
+        return annotations != nullptr;
+    case QRhi::Timestamps:
+        return true;
+    case QRhi::Instancing:
+        return true;
+    case QRhi::CustomInstanceStepRate:
+        return true;
+    case QRhi::PrimitiveRestart:
+        return true;
+    case QRhi::NonDynamicUniformBuffers:
+        return false; // because UpdateSubresource cannot deal with this
+    case QRhi::NonFourAlignedEffectiveIndexBufferOffset:
+        return true;
+    case QRhi::NPOTTextureRepeat:
+        return true;
+    case QRhi::RedOrAlpha8IsRed:
+        return true;
+    case QRhi::ElementIndexUint:
+        return true;
+    case QRhi::Compute:
+        return true;
+    case QRhi::WideLines:
+        return false;
+    case QRhi::VertexShaderPointSize:
+        return false;
+    case QRhi::BaseVertex:
+        return true;
+    case QRhi::BaseInstance:
+        return true;
+    case QRhi::TriangleFanTopology:
+        return false;
+    case QRhi::ReadBackNonUniformBuffer:
+        return true;
+    case QRhi::ReadBackNonBaseMipLevel:
+        return true;
+    default:
+        Q_UNREACHABLE();
+        return false;
+    }
+}
+
+int QRhiD3D11::resourceLimit(QRhi::ResourceLimit limit) const
+{
+    switch (limit) {
+    case QRhi::TextureSizeMin:
+        return 1;
+    case QRhi::TextureSizeMax:
+        return D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;
+    case QRhi::MaxColorAttachments:
+        return 8;
+    case QRhi::FramesInFlight:
+        return 2; // dummy
+    default:
+        Q_UNREACHABLE();
+        return 0;
+    }
+}
+
+const QRhiNativeHandles *QRhiD3D11::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+void QRhiD3D11::sendVMemStatsToProfiler()
+{
+    // nothing to do here
+}
+
+bool QRhiD3D11::makeThreadLocalNativeContextCurrent()
+{
+    // not applicable
+    return false;
+}
+
+void QRhiD3D11::releaseCachedResources()
+{
+    clearShaderCache();
+}
+
+bool QRhiD3D11::isDeviceLost() const
+{
+    return deviceLost;
+}
+
+QRhiRenderBuffer *QRhiD3D11::createRenderBuffer(QRhiRenderBuffer::Type type, const QSize &pixelSize,
+                                                int sampleCount, QRhiRenderBuffer::Flags flags)
+{
+    return new QD3D11RenderBuffer(this, type, pixelSize, sampleCount, flags);
+}
+
+QRhiTexture *QRhiD3D11::createTexture(QRhiTexture::Format format, const QSize &pixelSize,
+                                      int sampleCount, QRhiTexture::Flags flags)
+{
+    return new QD3D11Texture(this, format, pixelSize, sampleCount, flags);
+}
+
+QRhiSampler *QRhiD3D11::createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                                      QRhiSampler::Filter mipmapMode,
+                                      QRhiSampler::AddressMode u, QRhiSampler::AddressMode v)
+{
+    return new QD3D11Sampler(this, magFilter, minFilter, mipmapMode, u, v);
+}
+
+QRhiTextureRenderTarget *QRhiD3D11::createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                              QRhiTextureRenderTarget::Flags flags)
+{
+    return new QD3D11TextureRenderTarget(this, desc, flags);
+}
+
+QRhiGraphicsPipeline *QRhiD3D11::createGraphicsPipeline()
+{
+    return new QD3D11GraphicsPipeline(this);
+}
+
+QRhiComputePipeline *QRhiD3D11::createComputePipeline()
+{
+    return new QD3D11ComputePipeline(this);
+}
+
+QRhiShaderResourceBindings *QRhiD3D11::createShaderResourceBindings()
+{
+    return new QD3D11ShaderResourceBindings(this);
+}
+
+void QRhiD3D11::setGraphicsPipeline(QRhiCommandBuffer *cb, QRhiGraphicsPipeline *ps)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+    QD3D11GraphicsPipeline *psD = QRHI_RES(QD3D11GraphicsPipeline, ps);
+    const bool pipelineChanged = cbD->currentGraphicsPipeline != ps || cbD->currentPipelineGeneration != psD->generation;
+
+    if (pipelineChanged) {
+        cbD->currentGraphicsPipeline = ps;
+        cbD->currentComputePipeline = nullptr;
+        cbD->currentPipelineGeneration = psD->generation;
+
+        QD3D11CommandBuffer::Command cmd;
+        cmd.cmd = QD3D11CommandBuffer::Command::BindGraphicsPipeline;
+        cmd.args.bindGraphicsPipeline.ps = psD;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiD3D11::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBindings *srb,
+                                   int dynamicOffsetCount,
+                                   const QRhiCommandBuffer::DynamicOffset *dynamicOffsets)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass != QD3D11CommandBuffer::NoPass);
+    QD3D11GraphicsPipeline *gfxPsD = QRHI_RES(QD3D11GraphicsPipeline, cbD->currentGraphicsPipeline);
+    QD3D11ComputePipeline *compPsD = QRHI_RES(QD3D11ComputePipeline, cbD->currentComputePipeline);
+
+    if (!srb) {
+        if (gfxPsD)
+            srb = gfxPsD->m_shaderResourceBindings;
+        else
+            srb = compPsD->m_shaderResourceBindings;
+    }
+
+    QD3D11ShaderResourceBindings *srbD = QRHI_RES(QD3D11ShaderResourceBindings, srb);
+
+    bool hasDynamicOffsetInSrb = false;
+    bool srbUpdate = false;
+    for (int i = 0, ie = srbD->sortedBindings.count(); i != ie; ++i) {
+        const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings.at(i).data();
+        QD3D11ShaderResourceBindings::BoundResourceData &bd(srbD->boundResourceData[i]);
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+        {
+            QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, b->u.ubuf.buf);
+            if (bufD->m_type == QRhiBuffer::Dynamic)
+                executeBufferHostWritesForCurrentFrame(bufD);
+
+            if (bufD->generation != bd.ubuf.generation || bufD->m_id != bd.ubuf.id) {
+                srbUpdate = true;
+                bd.ubuf.id = bufD->m_id;
+                bd.ubuf.generation = bufD->generation;
+            }
+
+            if (b->u.ubuf.hasDynamicOffset)
+                hasDynamicOffsetInSrb = true;
+        }
+            break;
+        case QRhiShaderResourceBinding::SampledTexture:
+        {
+            QD3D11Texture *texD = QRHI_RES(QD3D11Texture, b->u.stex.tex);
+            QD3D11Sampler *samplerD = QRHI_RES(QD3D11Sampler, b->u.stex.sampler);
+            if (texD->generation != bd.stex.texGeneration
+                    || texD->m_id != bd.stex.texId
+                    || samplerD->generation != bd.stex.samplerGeneration
+                    || samplerD->m_id != bd.stex.samplerId)
+            {
+                srbUpdate = true;
+                bd.stex.texId = texD->m_id;
+                bd.stex.texGeneration = texD->generation;
+                bd.stex.samplerId = samplerD->m_id;
+                bd.stex.samplerGeneration = samplerD->generation;
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::ImageLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageLoadStore:
+        {
+            QD3D11Texture *texD = QRHI_RES(QD3D11Texture, b->u.simage.tex);
+            if (texD->generation != bd.simage.generation || texD->m_id != bd.simage.id) {
+                srbUpdate = true;
+                bd.simage.id = texD->m_id;
+                bd.simage.generation = texD->generation;
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::BufferLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferLoadStore:
+        {
+            QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, b->u.sbuf.buf);
+            if (bufD->generation != bd.sbuf.generation || bufD->m_id != bd.sbuf.id) {
+                srbUpdate = true;
+                bd.sbuf.id = bufD->m_id;
+                bd.sbuf.generation = bufD->generation;
+            }
+        }
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    if (srbUpdate)
+        updateShaderResourceBindings(srbD);
+
+    const bool srbChanged = gfxPsD ? (cbD->currentGraphicsSrb != srb) : (cbD->currentComputeSrb != srb);
+    const bool srbRebuilt = cbD->currentSrbGeneration != srbD->generation;
+
+    if (srbChanged || srbRebuilt || srbUpdate || hasDynamicOffsetInSrb) {
+        if (gfxPsD) {
+            cbD->currentGraphicsSrb = srb;
+            cbD->currentComputeSrb = nullptr;
+        } else {
+            cbD->currentGraphicsSrb = nullptr;
+            cbD->currentComputeSrb = srb;
+        }
+        cbD->currentSrbGeneration = srbD->generation;
+
+        QD3D11CommandBuffer::Command cmd;
+        cmd.cmd = QD3D11CommandBuffer::Command::BindShaderResources;
+        cmd.args.bindShaderResources.srb = srbD;
+        // dynamic offsets have to be applied at the time of executing the bind
+        // operations, not here
+        cmd.args.bindShaderResources.offsetOnlyChange = !srbChanged && !srbRebuilt && !srbUpdate && hasDynamicOffsetInSrb;
+        cmd.args.bindShaderResources.dynamicOffsetCount = 0;
+        if (hasDynamicOffsetInSrb) {
+            if (dynamicOffsetCount < QD3D11CommandBuffer::Command::MAX_UBUF_BINDINGS) {
+                cmd.args.bindShaderResources.dynamicOffsetCount = dynamicOffsetCount;
+                uint *p = cmd.args.bindShaderResources.dynamicOffsetPairs;
+                for (int i = 0; i < dynamicOffsetCount; ++i) {
+                    const QRhiCommandBuffer::DynamicOffset &dynOfs(dynamicOffsets[i]);
+                    const uint binding = uint(dynOfs.first);
+                    Q_ASSERT(aligned(dynOfs.second, quint32(256)) == dynOfs.second);
+                    const uint offsetInConstants = dynOfs.second / 16;
+                    *p++ = binding;
+                    *p++ = offsetInConstants;
+                }
+            } else {
+                qWarning("Too many dynamic offsets (%d, max is %d)",
+                         dynamicOffsetCount, QD3D11CommandBuffer::Command::MAX_UBUF_BINDINGS);
+            }
+        }
+
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiD3D11::setVertexInput(QRhiCommandBuffer *cb,
+                               int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                               QRhiBuffer *indexBuf, quint32 indexOffset, QRhiCommandBuffer::IndexFormat indexFormat)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+
+    bool needsBindVBuf = false;
+    for (int i = 0; i < bindingCount; ++i) {
+        const int inputSlot = startBinding + i;
+        QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, bindings[i].first);
+        Q_ASSERT(bufD->m_usage.testFlag(QRhiBuffer::VertexBuffer));
+        if (bufD->m_type == QRhiBuffer::Dynamic)
+            executeBufferHostWritesForCurrentFrame(bufD);
+
+        if (cbD->currentVertexBuffers[inputSlot] != bufD->buffer
+                || cbD->currentVertexOffsets[inputSlot] != bindings[i].second)
+        {
+            needsBindVBuf = true;
+            cbD->currentVertexBuffers[inputSlot] = bufD->buffer;
+            cbD->currentVertexOffsets[inputSlot] = bindings[i].second;
+        }
+    }
+
+    if (needsBindVBuf) {
+        QD3D11CommandBuffer::Command cmd;
+        cmd.cmd = QD3D11CommandBuffer::Command::BindVertexBuffers;
+        cmd.args.bindVertexBuffers.startSlot = startBinding;
+        cmd.args.bindVertexBuffers.slotCount = bindingCount;
+        QD3D11GraphicsPipeline *psD = QRHI_RES(QD3D11GraphicsPipeline, cbD->currentGraphicsPipeline);
+        const QRhiVertexInputLayout &inputLayout(psD->m_vertexInputLayout);
+        const int inputBindingCount = inputLayout.cendBindings() - inputLayout.cbeginBindings();
+        for (int i = 0, ie = qMin(bindingCount, inputBindingCount); i != ie; ++i) {
+            QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, bindings[i].first);
+            cmd.args.bindVertexBuffers.buffers[i] = bufD->buffer;
+            cmd.args.bindVertexBuffers.offsets[i] = bindings[i].second;
+            cmd.args.bindVertexBuffers.strides[i] = inputLayout.bindingAt(i)->stride();
+        }
+        cbD->commands.append(cmd);
+    }
+
+    if (indexBuf) {
+        QD3D11Buffer *ibufD = QRHI_RES(QD3D11Buffer, indexBuf);
+        Q_ASSERT(ibufD->m_usage.testFlag(QRhiBuffer::IndexBuffer));
+        if (ibufD->m_type == QRhiBuffer::Dynamic)
+            executeBufferHostWritesForCurrentFrame(ibufD);
+
+        const DXGI_FORMAT dxgiFormat = indexFormat == QRhiCommandBuffer::IndexUInt16 ? DXGI_FORMAT_R16_UINT
+                                                                                     : DXGI_FORMAT_R32_UINT;
+        if (cbD->currentIndexBuffer != ibufD->buffer
+                || cbD->currentIndexOffset != indexOffset
+                || cbD->currentIndexFormat != dxgiFormat)
+        {
+            cbD->currentIndexBuffer = ibufD->buffer;
+            cbD->currentIndexOffset = indexOffset;
+            cbD->currentIndexFormat = dxgiFormat;
+
+            QD3D11CommandBuffer::Command cmd;
+            cmd.cmd = QD3D11CommandBuffer::Command::BindIndexBuffer;
+            cmd.args.bindIndexBuffer.buffer = ibufD->buffer;
+            cmd.args.bindIndexBuffer.offset = indexOffset;
+            cmd.args.bindIndexBuffer.format = dxgiFormat;
+            cbD->commands.append(cmd);
+        }
+    }
+}
+
+void QRhiD3D11::setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+    Q_ASSERT(cbD->currentTarget);
+    const QSize outputSize = cbD->currentTarget->pixelSize();
+
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::Viewport;
+
+    // d3d expects top-left, QRhiViewport is bottom-left
+    float x, y, w, h;
+    if (!qrhi_toTopLeftRenderTargetRect(outputSize, viewport.viewport(), &x, &y, &w, &h))
+        return;
+
+    cmd.args.viewport.x = x;
+    cmd.args.viewport.y = y;
+    cmd.args.viewport.w = w;
+    cmd.args.viewport.h = h;
+    cmd.args.viewport.d0 = viewport.minDepth();
+    cmd.args.viewport.d1 = viewport.maxDepth();
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+    Q_ASSERT(cbD->currentTarget);
+    const QSize outputSize = cbD->currentTarget->pixelSize();
+
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::Scissor;
+
+    // d3d expects top-left, QRhiScissor is bottom-left
+    int x, y, w, h;
+    if (!qrhi_toTopLeftRenderTargetRect(outputSize, scissor.scissor(), &x, &y, &w, &h))
+        return;
+
+    cmd.args.scissor.x = x;
+    cmd.args.scissor.y = y;
+    cmd.args.scissor.w = w;
+    cmd.args.scissor.h = h;
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::setBlendConstants(QRhiCommandBuffer *cb, const QColor &c)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::BlendConstants;
+    cmd.args.blendConstants.ps = QRHI_RES(QD3D11GraphicsPipeline, cbD->currentGraphicsPipeline);
+    cmd.args.blendConstants.c[0] = float(c.redF());
+    cmd.args.blendConstants.c[1] = float(c.greenF());
+    cmd.args.blendConstants.c[2] = float(c.blueF());
+    cmd.args.blendConstants.c[3] = float(c.alphaF());
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::StencilRef;
+    cmd.args.stencilRef.ps = QRHI_RES(QD3D11GraphicsPipeline, cbD->currentGraphicsPipeline);
+    cmd.args.stencilRef.ref = refValue;
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+                     quint32 instanceCount, quint32 firstVertex, quint32 firstInstance)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::Draw;
+    cmd.args.draw.ps = QRHI_RES(QD3D11GraphicsPipeline, cbD->currentGraphicsPipeline);
+    cmd.args.draw.vertexCount = vertexCount;
+    cmd.args.draw.instanceCount = instanceCount;
+    cmd.args.draw.firstVertex = firstVertex;
+    cmd.args.draw.firstInstance = firstInstance;
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                            quint32 instanceCount, quint32 firstIndex, qint32 vertexOffset, quint32 firstInstance)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::DrawIndexed;
+    cmd.args.drawIndexed.ps = QRHI_RES(QD3D11GraphicsPipeline, cbD->currentGraphicsPipeline);
+    cmd.args.drawIndexed.indexCount = indexCount;
+    cmd.args.drawIndexed.instanceCount = instanceCount;
+    cmd.args.drawIndexed.firstIndex = firstIndex;
+    cmd.args.drawIndexed.vertexOffset = vertexOffset;
+    cmd.args.drawIndexed.firstInstance = firstInstance;
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name)
+{
+    if (!debugMarkers || !annotations)
+        return;
+
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::DebugMarkBegin;
+    strncpy(cmd.args.debugMark.s, name.constData(), sizeof(cmd.args.debugMark.s));
+    cmd.args.debugMark.s[sizeof(cmd.args.debugMark.s) - 1] = '\0';
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::debugMarkEnd(QRhiCommandBuffer *cb)
+{
+    if (!debugMarkers || !annotations)
+        return;
+
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::DebugMarkEnd;
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg)
+{
+    if (!debugMarkers || !annotations)
+        return;
+
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::DebugMarkMsg;
+    strncpy(cmd.args.debugMark.s, msg.constData(), sizeof(cmd.args.debugMark.s));
+    cmd.args.debugMark.s[sizeof(cmd.args.debugMark.s) - 1] = '\0';
+    cbD->commands.append(cmd);
+}
+
+const QRhiNativeHandles *QRhiD3D11::nativeHandles(QRhiCommandBuffer *cb)
+{
+    Q_UNUSED(cb);
+    return nullptr;
+}
+
+void QRhiD3D11::beginExternal(QRhiCommandBuffer *cb)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    // no timestampSwapChain, in order to avoid timestamp mess
+    executeCommandBuffer(cbD);
+    cbD->resetCommands();
+}
+
+void QRhiD3D11::endExternal(QRhiCommandBuffer *cb)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->commands.isEmpty());
+    cbD->resetCachedState();
+    if (cbD->currentTarget) { // could be compute, no rendertarget then
+        QD3D11CommandBuffer::Command fbCmd;
+        fbCmd.cmd = QD3D11CommandBuffer::Command::SetRenderTarget;
+        fbCmd.args.setRenderTarget.rt = cbD->currentTarget;
+        cbD->commands.append(fbCmd);
+    }
+}
+
+QRhi::FrameOpResult QRhiD3D11::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags)
+{
+    Q_UNUSED(flags);
+
+    QD3D11SwapChain *swapChainD = QRHI_RES(QD3D11SwapChain, swapChain);
+    contextState.currentSwapChain = swapChainD;
+    const int currentFrameSlot = swapChainD->currentFrameSlot;
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+
+    if (swapChainD->timestampActive[currentFrameSlot]) {
+        ID3D11Query *tsDisjoint = swapChainD->timestampDisjointQuery[currentFrameSlot];
+        const int tsIdx = QD3D11SwapChain::BUFFER_COUNT * currentFrameSlot;
+        ID3D11Query *tsStart = swapChainD->timestampQuery[tsIdx];
+        ID3D11Query *tsEnd = swapChainD->timestampQuery[tsIdx + 1];
+        quint64 timestamps[2];
+        D3D11_QUERY_DATA_TIMESTAMP_DISJOINT dj;
+        bool ok = true;
+        ok &= context->GetData(tsDisjoint, &dj, sizeof(dj), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK;
+        ok &= context->GetData(tsEnd, &timestamps[1], sizeof(quint64), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK;
+        // this above is often not ready, not even in frame_where_recorded+2,
+        // not clear why. so make the whole thing async and do not touch the
+        // queries until they are finally all available in frame this+2 or
+        // this+4 or ...
+        ok &= context->GetData(tsStart, &timestamps[0], sizeof(quint64), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK;
+        if (ok) {
+            if (!dj.Disjoint && dj.Frequency) {
+                const float elapsedMs = (timestamps[1] - timestamps[0]) / float(dj.Frequency) * 1000.0f;
+                // finally got a value, just report it, the profiler cares about min/max/avg anyway
+                QRHI_PROF_F(swapChainFrameGpuTime(swapChain, elapsedMs));
+            }
+            swapChainD->timestampActive[currentFrameSlot] = false;
+        } // else leave timestampActive set to true, will retry in a subsequent beginFrame
+    }
+
+    swapChainD->cb.resetState();
+
+    swapChainD->rt.d.rtv[0] = swapChainD->sampleDesc.Count > 1 ?
+                swapChainD->msaaRtv[currentFrameSlot] : swapChainD->backBufferRtv;
+    swapChainD->rt.d.dsv = swapChainD->ds ? swapChainD->ds->dsv : nullptr;
+
+    QRHI_PROF_F(beginSwapChainFrame(swapChain));
+
+    finishActiveReadbacks();
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiD3D11::endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags)
+{
+    QD3D11SwapChain *swapChainD = QRHI_RES(QD3D11SwapChain, swapChain);
+    Q_ASSERT(contextState.currentSwapChain = swapChainD);
+    const int currentFrameSlot = swapChainD->currentFrameSlot;
+
+    ID3D11Query *tsDisjoint = swapChainD->timestampDisjointQuery[currentFrameSlot];
+    const int tsIdx = QD3D11SwapChain::BUFFER_COUNT * currentFrameSlot;
+    ID3D11Query *tsStart = swapChainD->timestampQuery[tsIdx];
+    ID3D11Query *tsEnd = swapChainD->timestampQuery[tsIdx + 1];
+    const bool recordTimestamps = tsDisjoint && tsStart && tsEnd && !swapChainD->timestampActive[currentFrameSlot];
+
+    // send all commands to the context
+    if (recordTimestamps)
+        executeCommandBuffer(&swapChainD->cb, swapChainD);
+    else
+        executeCommandBuffer(&swapChainD->cb);
+
+    if (swapChainD->sampleDesc.Count > 1) {
+        context->ResolveSubresource(swapChainD->backBufferTex, 0,
+                                    swapChainD->msaaTex[currentFrameSlot], 0,
+                                    swapChainD->colorFormat);
+    }
+
+    // this is here because we want to include the time spent on the resolve as well
+    if (recordTimestamps) {
+        context->End(tsEnd);
+        context->End(tsDisjoint);
+        swapChainD->timestampActive[currentFrameSlot] = true;
+    }
+
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    // this must be done before the Present
+    QRHI_PROF_F(endSwapChainFrame(swapChain, swapChainD->frameCount + 1));
+
+    if (!flags.testFlag(QRhi::SkipPresent)) {
+        const UINT presentFlags = 0;
+        HRESULT hr = swapChainD->swapChain->Present(swapChainD->swapInterval, presentFlags);
+        if (hr == DXGI_ERROR_DEVICE_REMOVED || hr == DXGI_ERROR_DEVICE_RESET) {
+            qWarning("Device loss detected in Present()");
+            deviceLost = true;
+            return QRhi::FrameOpDeviceLost;
+        } else if (FAILED(hr)) {
+            qWarning("Failed to present: %s", qPrintable(comErrorMessage(hr)));
+            return QRhi::FrameOpError;
+        }
+
+        // move on to the next buffer
+        swapChainD->currentFrameSlot = (swapChainD->currentFrameSlot + 1) % QD3D11SwapChain::BUFFER_COUNT;
+    } else {
+        context->Flush();
+    }
+
+    swapChainD->frameCount += 1;
+    contextState.currentSwapChain = nullptr;
+
+    if (deviceCurse.framesToActivate > 0) {
+        deviceCurse.framesLeft -= 1;
+        if (deviceCurse.framesLeft == 0) {
+            deviceCurse.framesLeft = deviceCurse.framesToActivate;
+            if (!deviceCurse.permanent)
+                deviceCurse.framesToActivate = -1;
+
+            deviceCurse.activate();
+        } else if (deviceCurse.framesLeft % 100 == 0) {
+            qDebug("Impending doom: %d frames left", deviceCurse.framesLeft);
+        }
+    }
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiD3D11::beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    ofr.active = true;
+
+    ofr.cbWrapper.resetState();
+    *cb = &ofr.cbWrapper;
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiD3D11::endOffscreenFrame(QRhi::EndFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    ofr.active = false;
+
+    executeCommandBuffer(&ofr.cbWrapper);
+
+    finishActiveReadbacks();
+
+    return QRhi::FrameOpSuccess;
+}
+
+static inline DXGI_FORMAT toD3DTextureFormat(QRhiTexture::Format format, QRhiTexture::Flags flags)
+{
+    const bool srgb = flags.testFlag(QRhiTexture::sRGB);
+    switch (format) {
+    case QRhiTexture::RGBA8:
+        return srgb ? DXGI_FORMAT_R8G8B8A8_UNORM_SRGB : DXGI_FORMAT_R8G8B8A8_UNORM;
+    case QRhiTexture::BGRA8:
+        return srgb ? DXGI_FORMAT_B8G8R8A8_UNORM_SRGB : DXGI_FORMAT_B8G8R8A8_UNORM;
+    case QRhiTexture::R8:
+        return DXGI_FORMAT_R8_UNORM;
+    case QRhiTexture::R16:
+        return DXGI_FORMAT_R16_UNORM;
+    case QRhiTexture::RED_OR_ALPHA8:
+        return DXGI_FORMAT_R8_UNORM;
+
+    case QRhiTexture::RGBA16F:
+        return DXGI_FORMAT_R16G16B16A16_FLOAT;
+    case QRhiTexture::RGBA32F:
+        return DXGI_FORMAT_R32G32B32A32_FLOAT;
+
+    case QRhiTexture::D16:
+        return DXGI_FORMAT_R16_TYPELESS;
+    case QRhiTexture::D32F:
+        return DXGI_FORMAT_R32_TYPELESS;
+
+    case QRhiTexture::BC1:
+        return srgb ? DXGI_FORMAT_BC1_UNORM_SRGB : DXGI_FORMAT_BC1_UNORM;
+    case QRhiTexture::BC2:
+        return srgb ? DXGI_FORMAT_BC2_UNORM_SRGB : DXGI_FORMAT_BC2_UNORM;
+    case QRhiTexture::BC3:
+        return srgb ? DXGI_FORMAT_BC3_UNORM_SRGB : DXGI_FORMAT_BC3_UNORM;
+    case QRhiTexture::BC4:
+        return DXGI_FORMAT_BC4_UNORM;
+    case QRhiTexture::BC5:
+        return DXGI_FORMAT_BC5_UNORM;
+    case QRhiTexture::BC6H:
+        return DXGI_FORMAT_BC6H_UF16;
+    case QRhiTexture::BC7:
+        return srgb ? DXGI_FORMAT_BC7_UNORM_SRGB : DXGI_FORMAT_BC7_UNORM;
+
+    case QRhiTexture::ETC2_RGB8:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ETC2_RGB8A1:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ETC2_RGBA8:
+        qWarning("QRhiD3D11 does not support ETC2 textures");
+        return DXGI_FORMAT_R8G8B8A8_UNORM;
+
+    case QRhiTexture::ASTC_4x4:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_5x4:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_5x5:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_6x5:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_6x6:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_8x5:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_8x6:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_8x8:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_10x5:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_10x6:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_10x8:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_10x10:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_12x10:
+        Q_FALLTHROUGH();
+    case QRhiTexture::ASTC_12x12:
+        qWarning("QRhiD3D11 does not support ASTC textures");
+        return DXGI_FORMAT_R8G8B8A8_UNORM;
+
+    default:
+        Q_UNREACHABLE();
+        return DXGI_FORMAT_R8G8B8A8_UNORM;
+    }
+}
+
+static inline QRhiTexture::Format colorTextureFormatFromDxgiFormat(DXGI_FORMAT format, QRhiTexture::Flags *flags)
+{
+    switch (format) {
+    case DXGI_FORMAT_R8G8B8A8_UNORM:
+        return QRhiTexture::RGBA8;
+    case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
+        if (flags)
+            (*flags) |= QRhiTexture::sRGB;
+        return QRhiTexture::RGBA8;
+    case DXGI_FORMAT_B8G8R8A8_UNORM:
+        return QRhiTexture::BGRA8;
+    case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
+        if (flags)
+            (*flags) |= QRhiTexture::sRGB;
+        return QRhiTexture::BGRA8;
+    case DXGI_FORMAT_R8_UNORM:
+        return QRhiTexture::R8;
+    case DXGI_FORMAT_R16_UNORM:
+        return QRhiTexture::R16;
+    default: // this cannot assert, must warn and return unknown
+        qWarning("DXGI_FORMAT %d is not a recognized uncompressed color format", format);
+        break;
+    }
+    return QRhiTexture::UnknownFormat;
+}
+
+static inline bool isDepthTextureFormat(QRhiTexture::Format format)
+{
+    switch (format) {
+    case QRhiTexture::Format::D16:
+        Q_FALLTHROUGH();
+    case QRhiTexture::Format::D32F:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
+QRhi::FrameOpResult QRhiD3D11::finish()
+{
+    if (inFrame) {
+        if (ofr.active) {
+            Q_ASSERT(!contextState.currentSwapChain);
+            Q_ASSERT(ofr.cbWrapper.recordingPass == QD3D11CommandBuffer::NoPass);
+            executeCommandBuffer(&ofr.cbWrapper);
+            ofr.cbWrapper.resetCommands();
+        } else {
+            Q_ASSERT(contextState.currentSwapChain);
+            Q_ASSERT(contextState.currentSwapChain->cb.recordingPass == QD3D11CommandBuffer::NoPass);
+            executeCommandBuffer(&contextState.currentSwapChain->cb); // no timestampSwapChain, in order to avoid timestamp mess
+            contextState.currentSwapChain->cb.resetCommands();
+        }
+    }
+
+    finishActiveReadbacks();
+
+    return QRhi::FrameOpSuccess;
+}
+
+void QRhiD3D11::enqueueSubresUpload(QD3D11Texture *texD, QD3D11CommandBuffer *cbD,
+                                    int layer, int level, const QRhiTextureSubresourceUploadDescription &subresDesc)
+{
+    UINT subres = D3D11CalcSubresource(UINT(level), UINT(layer), texD->mipLevelCount);
+    const QPoint dp = subresDesc.destinationTopLeft();
+    D3D11_BOX box;
+    box.front = 0;
+    // back, right, bottom are exclusive
+    box.back = 1;
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::UpdateSubRes;
+    cmd.args.updateSubRes.dst = texD->tex;
+    cmd.args.updateSubRes.dstSubRes = subres;
+
+    bool cmdValid = true;
+    if (!subresDesc.image().isNull()) {
+        QImage img = subresDesc.image();
+        QSize size = img.size();
+        int bpl = img.bytesPerLine();
+        if (!subresDesc.sourceSize().isEmpty() || !subresDesc.sourceTopLeft().isNull()) {
+            const QPoint sp = subresDesc.sourceTopLeft();
+            if (!subresDesc.sourceSize().isEmpty())
+                size = subresDesc.sourceSize();
+            if (img.depth() == 32) {
+                const int offset = sp.y() * img.bytesPerLine() + sp.x() * 4;
+                cmd.args.updateSubRes.src = cbD->retainImage(img) + offset;
+            } else {
+                img = img.copy(sp.x(), sp.y(), size.width(), size.height());
+                bpl = img.bytesPerLine();
+                cmd.args.updateSubRes.src = cbD->retainImage(img);
+            }
+        } else {
+            cmd.args.updateSubRes.src = cbD->retainImage(img);
+        }
+        box.left = UINT(dp.x());
+        box.top = UINT(dp.y());
+        box.right = UINT(dp.x() + size.width());
+        box.bottom = UINT(dp.y() + size.height());
+        cmd.args.updateSubRes.hasDstBox = true;
+        cmd.args.updateSubRes.dstBox = box;
+        cmd.args.updateSubRes.srcRowPitch = UINT(bpl);
+    } else if (!subresDesc.data().isEmpty() && isCompressedFormat(texD->m_format)) {
+        const QSize size = subresDesc.sourceSize().isEmpty() ? q->sizeForMipLevel(level, texD->m_pixelSize)
+                                                             : subresDesc.sourceSize();
+        quint32 bpl = 0;
+        QSize blockDim;
+        compressedFormatInfo(texD->m_format, size, &bpl, nullptr, &blockDim);
+        // Everything must be a multiple of the block width and
+        // height, so e.g. a mip level of size 2x2 will be 4x4 when it
+        // comes to the actual data.
+        box.left = UINT(aligned(dp.x(), blockDim.width()));
+        box.top = UINT(aligned(dp.y(), blockDim.height()));
+        box.right = UINT(aligned(dp.x() + size.width(), blockDim.width()));
+        box.bottom = UINT(aligned(dp.y() + size.height(), blockDim.height()));
+        cmd.args.updateSubRes.hasDstBox = true;
+        cmd.args.updateSubRes.dstBox = box;
+        cmd.args.updateSubRes.src = cbD->retainData(subresDesc.data());
+        cmd.args.updateSubRes.srcRowPitch = bpl;
+    } else if (!subresDesc.data().isEmpty()) {
+        const QSize size = subresDesc.sourceSize().isEmpty() ? q->sizeForMipLevel(level, texD->m_pixelSize)
+                                                             : subresDesc.sourceSize();
+        quint32 bpl = 0;
+        textureFormatInfo(texD->m_format, size, &bpl, nullptr);
+        box.left = UINT(dp.x());
+        box.top = UINT(dp.y());
+        box.right = UINT(dp.x() + size.width());
+        box.bottom = UINT(dp.y() + size.height());
+        cmd.args.updateSubRes.hasDstBox = true;
+        cmd.args.updateSubRes.dstBox = box;
+        cmd.args.updateSubRes.src = cbD->retainData(subresDesc.data());
+        cmd.args.updateSubRes.srcRowPitch = bpl;
+    } else {
+        qWarning("Invalid texture upload for %p layer=%d mip=%d", texD, layer, level);
+        cmdValid = false;
+    }
+    if (cmdValid)
+        cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    QRhiResourceUpdateBatchPrivate *ud = QRhiResourceUpdateBatchPrivate::get(resourceUpdates);
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+
+    for (const QRhiResourceUpdateBatchPrivate::BufferOp &u : ud->bufferOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::DynamicUpdate) {
+            QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, u.buf);
+            Q_ASSERT(bufD->m_type == QRhiBuffer::Dynamic);
+            memcpy(bufD->dynBuf.data() + u.offset, u.data.constData(), size_t(u.data.size()));
+            bufD->hasPendingDynamicUpdates = true;
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::StaticUpload) {
+            QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, u.buf);
+            Q_ASSERT(bufD->m_type != QRhiBuffer::Dynamic);
+            Q_ASSERT(u.offset + u.data.size() <= bufD->m_size);
+            QD3D11CommandBuffer::Command cmd;
+            cmd.cmd = QD3D11CommandBuffer::Command::UpdateSubRes;
+            cmd.args.updateSubRes.dst = bufD->buffer;
+            cmd.args.updateSubRes.dstSubRes = 0;
+            cmd.args.updateSubRes.src = cbD->retainData(u.data);
+            cmd.args.updateSubRes.srcRowPitch = 0;
+            // Specify the region (even when offset is 0 and all data is provided)
+            // since the ID3D11Buffer's size is rounded up to be a multiple of 256
+            // while the data we have has the original size.
+            D3D11_BOX box;
+            box.left = UINT(u.offset);
+            box.top = box.front = 0;
+            box.back = box.bottom = 1;
+            box.right = UINT(u.offset + u.data.size()); // no -1: right, bottom, back are exclusive, see D3D11_BOX doc
+            cmd.args.updateSubRes.hasDstBox = true;
+            cmd.args.updateSubRes.dstBox = box;
+            cbD->commands.append(cmd);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::Read) {
+            QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, u.buf);
+            if (bufD->m_type == QRhiBuffer::Dynamic) {
+                u.result->data.resize(u.readSize);
+                memcpy(u.result->data.data(), bufD->dynBuf.constData() + u.offset, size_t(u.readSize));
+            } else {
+                BufferReadback readback;
+                readback.result = u.result;
+                readback.byteSize = u.readSize;
+
+                D3D11_BUFFER_DESC desc;
+                memset(&desc, 0, sizeof(desc));
+                desc.ByteWidth = readback.byteSize;
+                desc.Usage = D3D11_USAGE_STAGING;
+                desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+                HRESULT hr = dev->CreateBuffer(&desc, nullptr, &readback.stagingBuf);
+                if (FAILED(hr)) {
+                    qWarning("Failed to create buffer: %s", qPrintable(comErrorMessage(hr)));
+                    continue;
+                }
+                QRHI_PROF_F(newReadbackBuffer(qint64(qintptr(readback.stagingBuf)), bufD, readback.byteSize));
+
+                QD3D11CommandBuffer::Command cmd;
+                cmd.cmd = QD3D11CommandBuffer::Command::CopySubRes;
+                cmd.args.copySubRes.dst = readback.stagingBuf;
+                cmd.args.copySubRes.dstSubRes = 0;
+                cmd.args.copySubRes.dstX = 0;
+                cmd.args.copySubRes.dstY = 0;
+                cmd.args.copySubRes.src = bufD->buffer;
+                cmd.args.copySubRes.srcSubRes = 0;
+                cmd.args.copySubRes.hasSrcBox = true;
+                D3D11_BOX box;
+                box.left = UINT(u.offset);
+                box.top = box.front = 0;
+                box.back = box.bottom = 1;
+                box.right = UINT(u.offset + u.readSize);
+                cmd.args.copySubRes.srcBox = box;
+                cbD->commands.append(cmd);
+
+                activeBufferReadbacks.append(readback);
+            }
+            if (u.result->completed)
+                u.result->completed();
+        }
+    }
+
+    for (const QRhiResourceUpdateBatchPrivate::TextureOp &u : ud->textureOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Upload) {
+            QD3D11Texture *texD = QRHI_RES(QD3D11Texture, u.dst);
+            for (int layer = 0; layer < QRhi::MAX_LAYERS; ++layer) {
+                for (int level = 0; level < QRhi::MAX_LEVELS; ++level) {
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                        enqueueSubresUpload(texD, cbD, layer, level, subresDesc);
+                }
+            }
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Copy) {
+            Q_ASSERT(u.src && u.dst);
+            QD3D11Texture *srcD = QRHI_RES(QD3D11Texture, u.src);
+            QD3D11Texture *dstD = QRHI_RES(QD3D11Texture, u.dst);
+            UINT srcSubRes = D3D11CalcSubresource(UINT(u.desc.sourceLevel()), UINT(u.desc.sourceLayer()), srcD->mipLevelCount);
+            UINT dstSubRes = D3D11CalcSubresource(UINT(u.desc.destinationLevel()), UINT(u.desc.destinationLayer()), dstD->mipLevelCount);
+            const QPoint dp = u.desc.destinationTopLeft();
+            const QSize mipSize = q->sizeForMipLevel(u.desc.sourceLevel(), srcD->m_pixelSize);
+            const QSize copySize = u.desc.pixelSize().isEmpty() ? mipSize : u.desc.pixelSize();
+            const QPoint sp = u.desc.sourceTopLeft();
+            D3D11_BOX srcBox;
+            srcBox.left = UINT(sp.x());
+            srcBox.top = UINT(sp.y());
+            srcBox.front = 0;
+            // back, right, bottom are exclusive
+            srcBox.right = srcBox.left + UINT(copySize.width());
+            srcBox.bottom = srcBox.top + UINT(copySize.height());
+            srcBox.back = 1;
+            QD3D11CommandBuffer::Command cmd;
+            cmd.cmd = QD3D11CommandBuffer::Command::CopySubRes;
+            cmd.args.copySubRes.dst = dstD->tex;
+            cmd.args.copySubRes.dstSubRes = dstSubRes;
+            cmd.args.copySubRes.dstX = UINT(dp.x());
+            cmd.args.copySubRes.dstY = UINT(dp.y());
+            cmd.args.copySubRes.src = srcD->tex;
+            cmd.args.copySubRes.srcSubRes = srcSubRes;
+            cmd.args.copySubRes.hasSrcBox = true;
+            cmd.args.copySubRes.srcBox = srcBox;
+            cbD->commands.append(cmd);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Read) {
+            TextureReadback readback;
+            readback.desc = u.rb;
+            readback.result = u.result;
+
+            ID3D11Resource *src;
+            DXGI_FORMAT dxgiFormat;
+            QSize pixelSize;
+            QRhiTexture::Format format;
+            UINT subres = 0;
+            QD3D11Texture *texD = QRHI_RES(QD3D11Texture, u.rb.texture());
+            QD3D11SwapChain *swapChainD = nullptr;
+
+            if (texD) {
+                if (texD->sampleDesc.Count > 1) {
+                    qWarning("Multisample texture cannot be read back");
+                    continue;
+                }
+                src = texD->tex;
+                dxgiFormat = texD->dxgiFormat;
+                pixelSize = q->sizeForMipLevel(u.rb.level(), texD->m_pixelSize);
+                format = texD->m_format;
+                subres = D3D11CalcSubresource(UINT(u.rb.level()), UINT(u.rb.layer()), texD->mipLevelCount);
+            } else {
+                Q_ASSERT(contextState.currentSwapChain);
+                swapChainD = QRHI_RES(QD3D11SwapChain, contextState.currentSwapChain);
+                if (swapChainD->sampleDesc.Count > 1) {
+                    // Unlike with textures, reading back a multisample swapchain image
+                    // has to be supported. Insert a resolve.
+                    QD3D11CommandBuffer::Command rcmd;
+                    rcmd.cmd = QD3D11CommandBuffer::Command::ResolveSubRes;
+                    rcmd.args.resolveSubRes.dst = swapChainD->backBufferTex;
+                    rcmd.args.resolveSubRes.dstSubRes = 0;
+                    rcmd.args.resolveSubRes.src = swapChainD->msaaTex[swapChainD->currentFrameSlot];
+                    rcmd.args.resolveSubRes.srcSubRes = 0;
+                    rcmd.args.resolveSubRes.format = swapChainD->colorFormat;
+                    cbD->commands.append(rcmd);
+                }
+                src = swapChainD->backBufferTex;
+                dxgiFormat = swapChainD->colorFormat;
+                pixelSize = swapChainD->pixelSize;
+                format = colorTextureFormatFromDxgiFormat(dxgiFormat, nullptr);
+                if (format == QRhiTexture::UnknownFormat)
+                    continue;
+            }
+            quint32 byteSize = 0;
+            quint32 bpl = 0;
+            textureFormatInfo(format, pixelSize, &bpl, &byteSize);
+
+            D3D11_TEXTURE2D_DESC desc;
+            memset(&desc, 0, sizeof(desc));
+            desc.Width = UINT(pixelSize.width());
+            desc.Height = UINT(pixelSize.height());
+            desc.MipLevels = 1;
+            desc.ArraySize = 1;
+            desc.Format = dxgiFormat;
+            desc.SampleDesc.Count = 1;
+            desc.Usage = D3D11_USAGE_STAGING;
+            desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+            ID3D11Texture2D *stagingTex;
+            HRESULT hr = dev->CreateTexture2D(&desc, nullptr, &stagingTex);
+            if (FAILED(hr)) {
+                qWarning("Failed to create readback staging texture: %s", qPrintable(comErrorMessage(hr)));
+                return;
+            }
+            QRHI_PROF_F(newReadbackBuffer(qint64(qintptr(stagingTex)),
+                                          texD ? static_cast<QRhiResource *>(texD) : static_cast<QRhiResource *>(swapChainD),
+                                          byteSize));
+
+            QD3D11CommandBuffer::Command cmd;
+            cmd.cmd = QD3D11CommandBuffer::Command::CopySubRes;
+            cmd.args.copySubRes.dst = stagingTex;
+            cmd.args.copySubRes.dstSubRes = 0;
+            cmd.args.copySubRes.dstX = 0;
+            cmd.args.copySubRes.dstY = 0;
+            cmd.args.copySubRes.src = src;
+            cmd.args.copySubRes.srcSubRes = subres;
+            cmd.args.copySubRes.hasSrcBox = false;
+            cbD->commands.append(cmd);
+
+            readback.stagingTex = stagingTex;
+            readback.byteSize = byteSize;
+            readback.bpl = bpl;
+            readback.pixelSize = pixelSize;
+            readback.format = format;
+
+            activeTextureReadbacks.append(readback);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::GenMips) {
+            Q_ASSERT(u.dst->flags().testFlag(QRhiTexture::UsedWithGenerateMips));
+            QD3D11CommandBuffer::Command cmd;
+            cmd.cmd = QD3D11CommandBuffer::Command::GenMip;
+            cmd.args.genMip.srv = QRHI_RES(QD3D11Texture, u.dst)->srv;
+            cbD->commands.append(cmd);
+        }
+    }
+
+    ud->free();
+}
+
+void QRhiD3D11::finishActiveReadbacks()
+{
+    QVarLengthArray<std::function<void()>, 4> completedCallbacks;
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+
+    for (int i = activeTextureReadbacks.count() - 1; i >= 0; --i) {
+        const QRhiD3D11::TextureReadback &readback(activeTextureReadbacks[i]);
+        readback.result->format = readback.format;
+        readback.result->pixelSize = readback.pixelSize;
+
+        D3D11_MAPPED_SUBRESOURCE mp;
+        HRESULT hr = context->Map(readback.stagingTex, 0, D3D11_MAP_READ, 0, &mp);
+        if (SUCCEEDED(hr)) {
+            readback.result->data.resize(int(readback.byteSize));
+            // nothing says the rows are tightly packed in the texture, must take
+            // the stride into account
+            char *dst = readback.result->data.data();
+            char *src = static_cast<char *>(mp.pData);
+            for (int y = 0, h = readback.pixelSize.height(); y != h; ++y) {
+                memcpy(dst, src, readback.bpl);
+                dst += readback.bpl;
+                src += mp.RowPitch;
+            }
+            context->Unmap(readback.stagingTex, 0);
+        } else {
+            qWarning("Failed to map readback staging texture: %s", qPrintable(comErrorMessage(hr)));
+        }
+
+        readback.stagingTex->Release();
+        QRHI_PROF_F(releaseReadbackBuffer(qint64(qintptr(readback.stagingTex))));
+
+        if (readback.result->completed)
+            completedCallbacks.append(readback.result->completed);
+
+        activeTextureReadbacks.removeAt(i);
+    }
+
+    for (int i = activeBufferReadbacks.count() - 1; i >= 0; --i) {
+        const QRhiD3D11::BufferReadback &readback(activeBufferReadbacks[i]);
+
+        D3D11_MAPPED_SUBRESOURCE mp;
+        HRESULT hr = context->Map(readback.stagingBuf, 0, D3D11_MAP_READ, 0, &mp);
+        if (SUCCEEDED(hr)) {
+            readback.result->data.resize(int(readback.byteSize));
+            memcpy(readback.result->data.data(), mp.pData, readback.byteSize);
+            context->Unmap(readback.stagingBuf, 0);
+        } else {
+            qWarning("Failed to map readback staging texture: %s", qPrintable(comErrorMessage(hr)));
+        }
+
+        readback.stagingBuf->Release();
+        QRHI_PROF_F(releaseReadbackBuffer(qint64(qintptr(readback.stagingBuf))));
+
+        if (readback.result->completed)
+            completedCallbacks.append(readback.result->completed);
+
+        activeBufferReadbacks.removeAt(i);
+    }
+
+    for (auto f : completedCallbacks)
+        f();
+}
+
+static inline QD3D11RenderTargetData *rtData(QRhiRenderTarget *rt)
+{
+    switch (rt->resourceType()) {
+    case QRhiResource::RenderTarget:
+        return &QRHI_RES(QD3D11ReferenceRenderTarget, rt)->d;
+    case QRhiResource::TextureRenderTarget:
+        return &QRHI_RES(QD3D11TextureRenderTarget, rt)->d;
+    default:
+        Q_UNREACHABLE();
+        return nullptr;
+    }
+}
+
+void QRhiD3D11::resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    Q_ASSERT(QRHI_RES(QD3D11CommandBuffer, cb)->recordingPass == QD3D11CommandBuffer::NoPass);
+
+    enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+void QRhiD3D11::beginPass(QRhiCommandBuffer *cb,
+                          QRhiRenderTarget *rt,
+                          const QColor &colorClearValue,
+                          const QRhiDepthStencilClearValue &depthStencilClearValue,
+                          QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::NoPass);
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+
+    bool wantsColorClear = true;
+    bool wantsDsClear = true;
+    QD3D11RenderTargetData *rtD = rtData(rt);
+    if (rt->resourceType() == QRhiRenderTarget::TextureRenderTarget) {
+        QD3D11TextureRenderTarget *rtTex = QRHI_RES(QD3D11TextureRenderTarget, rt);
+        wantsColorClear = !rtTex->m_flags.testFlag(QRhiTextureRenderTarget::PreserveColorContents);
+        wantsDsClear = !rtTex->m_flags.testFlag(QRhiTextureRenderTarget::PreserveDepthStencilContents);
+    }
+
+    QD3D11CommandBuffer::Command fbCmd;
+    fbCmd.cmd = QD3D11CommandBuffer::Command::ResetShaderResources;
+    cbD->commands.append(fbCmd);
+    fbCmd.cmd = QD3D11CommandBuffer::Command::SetRenderTarget;
+    fbCmd.args.setRenderTarget.rt = rt;
+    cbD->commands.append(fbCmd);
+
+    QD3D11CommandBuffer::Command clearCmd;
+    clearCmd.cmd = QD3D11CommandBuffer::Command::Clear;
+    clearCmd.args.clear.rt = rt;
+    clearCmd.args.clear.mask = 0;
+    if (rtD->colorAttCount && wantsColorClear)
+        clearCmd.args.clear.mask |= QD3D11CommandBuffer::Command::Color;
+    if (rtD->dsAttCount && wantsDsClear)
+        clearCmd.args.clear.mask |= QD3D11CommandBuffer::Command::Depth | QD3D11CommandBuffer::Command::Stencil;
+
+    clearCmd.args.clear.c[0] = float(colorClearValue.redF());
+    clearCmd.args.clear.c[1] = float(colorClearValue.greenF());
+    clearCmd.args.clear.c[2] = float(colorClearValue.blueF());
+    clearCmd.args.clear.c[3] = float(colorClearValue.alphaF());
+    clearCmd.args.clear.d = depthStencilClearValue.depthClearValue();
+    clearCmd.args.clear.s = depthStencilClearValue.stencilClearValue();
+    cbD->commands.append(clearCmd);
+
+    cbD->recordingPass = QD3D11CommandBuffer::RenderPass;
+    cbD->currentTarget = rt;
+
+    cbD->resetCachedShaderResourceState();
+}
+
+void QRhiD3D11::endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::RenderPass);
+
+    if (cbD->currentTarget->resourceType() == QRhiResource::TextureRenderTarget) {
+        QD3D11TextureRenderTarget *rtTex = QRHI_RES(QD3D11TextureRenderTarget, cbD->currentTarget);
+        for (auto it = rtTex->m_desc.cbeginColorAttachments(), itEnd = rtTex->m_desc.cendColorAttachments();
+             it != itEnd; ++it)
+        {
+            const QRhiColorAttachment &colorAtt(*it);
+            if (!colorAtt.resolveTexture())
+                continue;
+
+            QD3D11Texture *dstTexD = QRHI_RES(QD3D11Texture, colorAtt.resolveTexture());
+            QD3D11Texture *srcTexD = QRHI_RES(QD3D11Texture, colorAtt.texture());
+            QD3D11RenderBuffer *srcRbD = QRHI_RES(QD3D11RenderBuffer, colorAtt.renderBuffer());
+            Q_ASSERT(srcTexD || srcRbD);
+            QD3D11CommandBuffer::Command cmd;
+            cmd.cmd = QD3D11CommandBuffer::Command::ResolveSubRes;
+            cmd.args.resolveSubRes.dst = dstTexD->tex;
+            cmd.args.resolveSubRes.dstSubRes = D3D11CalcSubresource(UINT(colorAtt.resolveLevel()),
+                                                                    UINT(colorAtt.resolveLayer()),
+                                                                    dstTexD->mipLevelCount);
+            if (srcTexD) {
+                cmd.args.resolveSubRes.src = srcTexD->tex;
+                if (srcTexD->dxgiFormat != dstTexD->dxgiFormat) {
+                    qWarning("Resolve source and destination formats do not match");
+                    continue;
+                }
+                if (srcTexD->sampleDesc.Count <= 1) {
+                    qWarning("Cannot resolve a non-multisample texture");
+                    continue;
+                }
+                if (srcTexD->m_pixelSize != dstTexD->m_pixelSize) {
+                    qWarning("Resolve source and destination sizes do not match");
+                    continue;
+                }
+            } else {
+                cmd.args.resolveSubRes.src = srcRbD->tex;
+                if (srcRbD->dxgiFormat != dstTexD->dxgiFormat) {
+                    qWarning("Resolve source and destination formats do not match");
+                    continue;
+                }
+                if (srcRbD->m_pixelSize != dstTexD->m_pixelSize) {
+                    qWarning("Resolve source and destination sizes do not match");
+                    continue;
+                }
+            }
+            cmd.args.resolveSubRes.srcSubRes = D3D11CalcSubresource(0, UINT(colorAtt.layer()), 1);
+            cmd.args.resolveSubRes.format = dstTexD->dxgiFormat;
+            cbD->commands.append(cmd);
+        }
+    }
+
+    cbD->recordingPass = QD3D11CommandBuffer::NoPass;
+    cbD->currentTarget = nullptr;
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+void QRhiD3D11::beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::NoPass);
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::ResetShaderResources;
+    cbD->commands.append(cmd);
+
+    cbD->recordingPass = QD3D11CommandBuffer::ComputePass;
+
+    cbD->resetCachedShaderResourceState();
+}
+
+void QRhiD3D11::endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::ComputePass);
+
+    cbD->recordingPass = QD3D11CommandBuffer::NoPass;
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+void QRhiD3D11::setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::ComputePass);
+    QD3D11ComputePipeline *psD = QRHI_RES(QD3D11ComputePipeline, ps);
+    const bool pipelineChanged = cbD->currentComputePipeline != ps || cbD->currentPipelineGeneration != psD->generation;
+
+    if (pipelineChanged) {
+        cbD->currentGraphicsPipeline = nullptr;
+        cbD->currentComputePipeline = psD;
+        cbD->currentPipelineGeneration = psD->generation;
+
+        QD3D11CommandBuffer::Command cmd;
+        cmd.cmd = QD3D11CommandBuffer::Command::BindComputePipeline;
+        cmd.args.bindComputePipeline.ps = psD;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiD3D11::dispatch(QRhiCommandBuffer *cb, int x, int y, int z)
+{
+    QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::ComputePass);
+
+    QD3D11CommandBuffer::Command cmd;
+    cmd.cmd = QD3D11CommandBuffer::Command::Dispatch;
+    cmd.args.dispatch.x = UINT(x);
+    cmd.args.dispatch.y = UINT(y);
+    cmd.args.dispatch.z = UINT(z);
+    cbD->commands.append(cmd);
+}
+
+void QRhiD3D11::updateShaderResourceBindings(QD3D11ShaderResourceBindings *srbD)
+{
+    srbD->vsubufs.clear();
+    srbD->vsubufoffsets.clear();
+    srbD->vsubufsizes.clear();
+
+    srbD->fsubufs.clear();
+    srbD->fsubufoffsets.clear();
+    srbD->fsubufsizes.clear();
+
+    srbD->csubufs.clear();
+    srbD->csubufoffsets.clear();
+    srbD->csubufsizes.clear();
+
+    srbD->vssamplers.clear();
+    srbD->vsshaderresources.clear();
+
+    srbD->fssamplers.clear();
+    srbD->fsshaderresources.clear();
+
+    srbD->cssamplers.clear();
+    srbD->csshaderresources.clear();
+
+    srbD->csUAVs.clear();
+
+    for (int i = 0, ie = srbD->sortedBindings.count(); i != ie; ++i) {
+        const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings.at(i).data();
+        QD3D11ShaderResourceBindings::BoundResourceData &bd(srbD->boundResourceData[i]);
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+        {
+            QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, b->u.ubuf.buf);
+            Q_ASSERT(aligned(b->u.ubuf.offset, 256) == b->u.ubuf.offset);
+            bd.ubuf.id = bufD->m_id;
+            bd.ubuf.generation = bufD->generation;
+            // dynamic ubuf offsets are not considered here, those are baked in
+            // at a later stage, which is good as vsubufoffsets and friends are
+            // per-srb, not per-setShaderResources call
+            const uint offsetInConstants = uint(b->u.ubuf.offset) / 16;
+            // size must be 16 mult. (in constants, i.e. multiple of 256 bytes).
+            // We can round up if needed since the buffers's actual size
+            // (ByteWidth) is always a multiple of 256.
+            const uint sizeInConstants = uint(aligned(b->u.ubuf.maybeSize ? b->u.ubuf.maybeSize : bufD->m_size, 256) / 16);
+            if (b->stage.testFlag(QRhiShaderResourceBinding::VertexStage)) {
+                srbD->vsubufs.feed(b->binding, bufD->buffer);
+                srbD->vsubufoffsets.feed(b->binding, offsetInConstants);
+                srbD->vsubufsizes.feed(b->binding, sizeInConstants);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::FragmentStage)) {
+                srbD->fsubufs.feed(b->binding, bufD->buffer);
+                srbD->fsubufoffsets.feed(b->binding, offsetInConstants);
+                srbD->fsubufsizes.feed(b->binding, sizeInConstants);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) {
+                srbD->csubufs.feed(b->binding, bufD->buffer);
+                srbD->csubufoffsets.feed(b->binding, offsetInConstants);
+                srbD->csubufsizes.feed(b->binding, sizeInConstants);
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::SampledTexture:
+        {
+            // A sampler with binding N is mapped to a HLSL sampler and texture
+            // with registers sN and tN by SPIRV-Cross.
+            QD3D11Texture *texD = QRHI_RES(QD3D11Texture, b->u.stex.tex);
+            QD3D11Sampler *samplerD = QRHI_RES(QD3D11Sampler, b->u.stex.sampler);
+            bd.stex.texId = texD->m_id;
+            bd.stex.texGeneration = texD->generation;
+            bd.stex.samplerId = samplerD->m_id;
+            bd.stex.samplerGeneration = samplerD->generation;
+            if (b->stage.testFlag(QRhiShaderResourceBinding::VertexStage)) {
+                srbD->vssamplers.feed(b->binding, samplerD->samplerState);
+                srbD->vsshaderresources.feed(b->binding, texD->srv);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::FragmentStage)) {
+                srbD->fssamplers.feed(b->binding, samplerD->samplerState);
+                srbD->fsshaderresources.feed(b->binding, texD->srv);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) {
+                srbD->cssamplers.feed(b->binding, samplerD->samplerState);
+                srbD->csshaderresources.feed(b->binding, texD->srv);
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::ImageLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageLoadStore:
+        {
+            QD3D11Texture *texD = QRHI_RES(QD3D11Texture, b->u.simage.tex);
+            bd.simage.id = texD->m_id;
+            bd.simage.generation = texD->generation;
+            if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) {
+                ID3D11UnorderedAccessView *uav = texD->unorderedAccessViewForLevel(b->u.simage.level);
+                if (uav)
+                    srbD->csUAVs.feed(b->binding, uav);
+            } else {
+                qWarning("Unordered access only supported at compute stage");
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::BufferLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferLoadStore:
+        {
+            QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, b->u.sbuf.buf);
+            bd.sbuf.id = bufD->m_id;
+            bd.sbuf.generation = bufD->generation;
+            if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) {
+                ID3D11UnorderedAccessView *uav = bufD->unorderedAccessView();
+                if (uav)
+                    srbD->csUAVs.feed(b->binding, uav);
+            } else {
+                qWarning("Unordered access only supported at compute stage");
+            }
+        }
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    srbD->vsubufs.finish();
+    srbD->vsubufoffsets.finish();
+    srbD->vsubufsizes.finish();
+
+    srbD->fsubufs.finish();
+    srbD->fsubufoffsets.finish();
+    srbD->fsubufsizes.finish();
+
+    srbD->csubufs.finish();
+    srbD->csubufoffsets.finish();
+    srbD->csubufsizes.finish();
+
+    srbD->vssamplers.finish();
+    srbD->vsshaderresources.finish();
+
+    srbD->fssamplers.finish();
+    srbD->fsshaderresources.finish();
+
+    srbD->cssamplers.finish();
+    srbD->csshaderresources.finish();
+
+    srbD->csUAVs.finish();
+}
+
+void QRhiD3D11::executeBufferHostWritesForCurrentFrame(QD3D11Buffer *bufD)
+{
+    if (!bufD->hasPendingDynamicUpdates)
+        return;
+
+    Q_ASSERT(bufD->m_type == QRhiBuffer::Dynamic);
+    bufD->hasPendingDynamicUpdates = false;
+    D3D11_MAPPED_SUBRESOURCE mp;
+    HRESULT hr = context->Map(bufD->buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mp);
+    if (SUCCEEDED(hr)) {
+        memcpy(mp.pData, bufD->dynBuf.constData(), size_t(bufD->dynBuf.size()));
+        context->Unmap(bufD->buffer, 0);
+    } else {
+        qWarning("Failed to map buffer: %s", qPrintable(comErrorMessage(hr)));
+    }
+}
+
+static void applyDynamicOffsets(QVarLengthArray<UINT, 4> *offsets,
+                                int batchIndex,
+                                QRhiBatchedBindings<ID3D11Buffer *> *ubufs,
+                                QRhiBatchedBindings<UINT> *ubufoffsets,
+                                const uint *dynOfsPairs, int dynOfsPairCount)
+{
+    const int count = ubufs->batches[batchIndex].resources.count();
+    const UINT startBinding = ubufs->batches[batchIndex].startBinding;
+    *offsets = ubufoffsets->batches[batchIndex].resources;
+    for (int b = 0; b < count; ++b) {
+        for (int di = 0; di < dynOfsPairCount; ++di) {
+            const uint binding = dynOfsPairs[2 * di];
+            if (binding == startBinding + UINT(b)) {
+                const uint offsetInConstants = dynOfsPairs[2 * di + 1];
+                (*offsets)[b] = offsetInConstants;
+                break;
+            }
+        }
+    }
+}
+
+void QRhiD3D11::bindShaderResources(QD3D11ShaderResourceBindings *srbD,
+                                    const uint *dynOfsPairs, int dynOfsPairCount,
+                                    bool offsetOnlyChange)
+{
+    if (!offsetOnlyChange) {
+        for (const auto &batch : srbD->vssamplers.batches)
+            context->VSSetSamplers(batch.startBinding, UINT(batch.resources.count()), batch.resources.constData());
+
+        for (const auto &batch : srbD->vsshaderresources.batches) {
+            context->VSSetShaderResources(batch.startBinding, UINT(batch.resources.count()), batch.resources.constData());
+            contextState.vsHighestActiveSrvBinding = qMax<int>(contextState.vsHighestActiveSrvBinding,
+                                                               int(batch.startBinding) + batch.resources.count() - 1);
+        }
+
+        for (const auto &batch : srbD->fssamplers.batches)
+            context->PSSetSamplers(batch.startBinding, UINT(batch.resources.count()), batch.resources.constData());
+
+        for (const auto &batch : srbD->fsshaderresources.batches) {
+            context->PSSetShaderResources(batch.startBinding, UINT(batch.resources.count()), batch.resources.constData());
+            contextState.fsHighestActiveSrvBinding = qMax<int>(contextState.fsHighestActiveSrvBinding,
+                                                               int(batch.startBinding) + batch.resources.count() - 1);
+        }
+
+        for (const auto &batch : srbD->cssamplers.batches)
+            context->CSSetSamplers(batch.startBinding, UINT(batch.resources.count()), batch.resources.constData());
+
+        for (const auto &batch : srbD->csshaderresources.batches) {
+            context->CSSetShaderResources(batch.startBinding, UINT(batch.resources.count()), batch.resources.constData());
+            contextState.csHighestActiveSrvBinding = qMax<int>(contextState.csHighestActiveSrvBinding,
+                                                               int(batch.startBinding) + batch.resources.count() - 1);
+        }
+    }
+
+    for (int i = 0, ie = srbD->vsubufs.batches.count(); i != ie; ++i) {
+        if (!dynOfsPairCount) {
+            context->VSSetConstantBuffers1(srbD->vsubufs.batches[i].startBinding,
+                                           UINT(srbD->vsubufs.batches[i].resources.count()),
+                                           srbD->vsubufs.batches[i].resources.constData(),
+                                           srbD->vsubufoffsets.batches[i].resources.constData(),
+                                           srbD->vsubufsizes.batches[i].resources.constData());
+        } else {
+            QVarLengthArray<UINT, 4> offsets;
+            applyDynamicOffsets(&offsets, i, &srbD->vsubufs, &srbD->vsubufoffsets, dynOfsPairs, dynOfsPairCount);
+            context->VSSetConstantBuffers1(srbD->vsubufs.batches[i].startBinding,
+                                           UINT(srbD->vsubufs.batches[i].resources.count()),
+                                           srbD->vsubufs.batches[i].resources.constData(),
+                                           offsets.constData(),
+                                           srbD->vsubufsizes.batches[i].resources.constData());
+        }
+    }
+
+    for (int i = 0, ie = srbD->fsubufs.batches.count(); i != ie; ++i) {
+        if (!dynOfsPairCount) {
+            context->PSSetConstantBuffers1(srbD->fsubufs.batches[i].startBinding,
+                                           UINT(srbD->fsubufs.batches[i].resources.count()),
+                                           srbD->fsubufs.batches[i].resources.constData(),
+                                           srbD->fsubufoffsets.batches[i].resources.constData(),
+                                           srbD->fsubufsizes.batches[i].resources.constData());
+        } else {
+            QVarLengthArray<UINT, 4> offsets;
+            applyDynamicOffsets(&offsets, i, &srbD->fsubufs, &srbD->fsubufoffsets, dynOfsPairs, dynOfsPairCount);
+            context->PSSetConstantBuffers1(srbD->fsubufs.batches[i].startBinding,
+                                           UINT(srbD->fsubufs.batches[i].resources.count()),
+                                           srbD->fsubufs.batches[i].resources.constData(),
+                                           offsets.constData(),
+                                           srbD->fsubufsizes.batches[i].resources.constData());
+        }
+    }
+
+    for (int i = 0, ie = srbD->csubufs.batches.count(); i != ie; ++i) {
+        if (!dynOfsPairCount) {
+            context->CSSetConstantBuffers1(srbD->csubufs.batches[i].startBinding,
+                                           UINT(srbD->csubufs.batches[i].resources.count()),
+                                           srbD->csubufs.batches[i].resources.constData(),
+                                           srbD->csubufoffsets.batches[i].resources.constData(),
+                                           srbD->csubufsizes.batches[i].resources.constData());
+        } else {
+            QVarLengthArray<UINT, 4> offsets;
+            applyDynamicOffsets(&offsets, i, &srbD->csubufs, &srbD->csubufoffsets, dynOfsPairs, dynOfsPairCount);
+            context->CSSetConstantBuffers1(srbD->csubufs.batches[i].startBinding,
+                                           UINT(srbD->csubufs.batches[i].resources.count()),
+                                           srbD->csubufs.batches[i].resources.constData(),
+                                           offsets.constData(),
+                                           srbD->csubufsizes.batches[i].resources.constData());
+        }
+    }
+
+    for (int i = 0, ie = srbD->csUAVs.batches.count(); i != ie; ++i) {
+        const uint startBinding = srbD->csUAVs.batches[i].startBinding;
+        const uint count = uint(srbD->csUAVs.batches[i].resources.count());
+        context->CSSetUnorderedAccessViews(startBinding,
+                                           count,
+                                           srbD->csUAVs.batches[i].resources.constData(),
+                                           nullptr);
+        contextState.csHighestActiveUavBinding = qMax<int>(contextState.csHighestActiveUavBinding,
+                                                           int(startBinding + count - 1));
+    }
+}
+
+void QRhiD3D11::resetShaderResources()
+{
+    // Output cannot be bound on input etc.
+
+    if (contextState.vsHasIndexBufferBound) {
+        context->IASetIndexBuffer(nullptr, DXGI_FORMAT_R16_UINT, 0);
+        contextState.vsHasIndexBufferBound = false;
+    }
+
+    if (contextState.vsHighestActiveVertexBufferBinding >= 0) {
+        const int count = contextState.vsHighestActiveVertexBufferBinding + 1;
+        QVarLengthArray<ID3D11Buffer *, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT> nullbufs(count);
+        for (int i = 0; i < count; ++i)
+            nullbufs[i] = nullptr;
+        QVarLengthArray<UINT, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT> nullstrides(count);
+        for (int i = 0; i < count; ++i)
+            nullstrides[i] = 0;
+        QVarLengthArray<UINT, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT> nulloffsets(count);
+        for (int i = 0; i < count; ++i)
+            nulloffsets[i] = 0;
+        context->IASetVertexBuffers(0, UINT(count), nullbufs.constData(), nullstrides.constData(), nulloffsets.constData());
+        contextState.vsHighestActiveVertexBufferBinding = -1;
+    }
+
+    int nullsrvCount = qMax(contextState.vsHighestActiveSrvBinding, contextState.fsHighestActiveSrvBinding);
+    nullsrvCount = qMax(nullsrvCount, contextState.csHighestActiveSrvBinding);
+    nullsrvCount += 1;
+    if (nullsrvCount > 0) {
+        QVarLengthArray<ID3D11ShaderResourceView *,
+                D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT> nullsrvs(nullsrvCount);
+        for (int i = 0; i < nullsrvs.count(); ++i)
+            nullsrvs[i] = nullptr;
+        if (contextState.vsHighestActiveSrvBinding >= 0) {
+            context->VSSetShaderResources(0, UINT(contextState.vsHighestActiveSrvBinding + 1), nullsrvs.constData());
+            contextState.vsHighestActiveSrvBinding = -1;
+        }
+        if (contextState.fsHighestActiveSrvBinding >= 0) {
+            context->PSSetShaderResources(0, UINT(contextState.fsHighestActiveSrvBinding + 1), nullsrvs.constData());
+            contextState.fsHighestActiveSrvBinding = -1;
+        }
+        if (contextState.csHighestActiveSrvBinding >= 0) {
+            context->CSSetShaderResources(0, UINT(contextState.csHighestActiveSrvBinding + 1), nullsrvs.constData());
+            contextState.csHighestActiveSrvBinding = -1;
+        }
+    }
+
+    if (contextState.csHighestActiveUavBinding >= 0) {
+        const int nulluavCount = contextState.csHighestActiveUavBinding + 1;
+        QVarLengthArray<ID3D11UnorderedAccessView *,
+                D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT> nulluavs(nulluavCount);
+        for (int i = 0; i < nulluavCount; ++i)
+            nulluavs[i] = nullptr;
+        context->CSSetUnorderedAccessViews(0, UINT(nulluavCount), nulluavs.constData(), nullptr);
+        contextState.csHighestActiveUavBinding = -1;
+    }
+}
+
+void QRhiD3D11::executeCommandBuffer(QD3D11CommandBuffer *cbD, QD3D11SwapChain *timestampSwapChain)
+{
+    quint32 stencilRef = 0;
+    float blendConstants[] = { 1, 1, 1, 1 };
+
+    if (timestampSwapChain) {
+        const int currentFrameSlot = timestampSwapChain->currentFrameSlot;
+        ID3D11Query *tsDisjoint = timestampSwapChain->timestampDisjointQuery[currentFrameSlot];
+        const int tsIdx = QD3D11SwapChain::BUFFER_COUNT * currentFrameSlot;
+        ID3D11Query *tsStart = timestampSwapChain->timestampQuery[tsIdx];
+        if (tsDisjoint && tsStart && !timestampSwapChain->timestampActive[currentFrameSlot]) {
+            // The timestamps seem to include vsync time with Present(1), except
+            // when running on a non-primary gpu. This is not ideal. So try working
+            // it around by issuing a semi-fake OMSetRenderTargets early and
+            // writing the first timestamp only afterwards.
+            context->Begin(tsDisjoint);
+            QD3D11RenderTargetData *rtD = rtData(&timestampSwapChain->rt);
+            context->OMSetRenderTargets(UINT(rtD->colorAttCount), rtD->colorAttCount ? rtD->rtv : nullptr, rtD->dsv);
+            context->End(tsStart); // just record a timestamp, no Begin needed
+        }
+    }
+
+    for (const QD3D11CommandBuffer::Command &cmd : qAsConst(cbD->commands)) {
+        switch (cmd.cmd) {
+        case QD3D11CommandBuffer::Command::ResetShaderResources:
+            resetShaderResources();
+            break;
+        case QD3D11CommandBuffer::Command::SetRenderTarget:
+        {
+            QD3D11RenderTargetData *rtD = rtData(cmd.args.setRenderTarget.rt);
+            context->OMSetRenderTargets(UINT(rtD->colorAttCount), rtD->colorAttCount ? rtD->rtv : nullptr, rtD->dsv);
+        }
+            break;
+        case QD3D11CommandBuffer::Command::Clear:
+        {
+            QD3D11RenderTargetData *rtD = rtData(cmd.args.clear.rt);
+            if (cmd.args.clear.mask & QD3D11CommandBuffer::Command::Color) {
+                for (int i = 0; i < rtD->colorAttCount; ++i)
+                    context->ClearRenderTargetView(rtD->rtv[i], cmd.args.clear.c);
+            }
+            uint ds = 0;
+            if (cmd.args.clear.mask & QD3D11CommandBuffer::Command::Depth)
+                ds |= D3D11_CLEAR_DEPTH;
+            if (cmd.args.clear.mask & QD3D11CommandBuffer::Command::Stencil)
+                ds |= D3D11_CLEAR_STENCIL;
+            if (ds)
+                context->ClearDepthStencilView(rtD->dsv, ds, cmd.args.clear.d, UINT8(cmd.args.clear.s));
+        }
+            break;
+        case QD3D11CommandBuffer::Command::Viewport:
+        {
+            D3D11_VIEWPORT v;
+            v.TopLeftX = cmd.args.viewport.x;
+            v.TopLeftY = cmd.args.viewport.y;
+            v.Width = cmd.args.viewport.w;
+            v.Height = cmd.args.viewport.h;
+            v.MinDepth = cmd.args.viewport.d0;
+            v.MaxDepth = cmd.args.viewport.d1;
+            context->RSSetViewports(1, &v);
+        }
+            break;
+        case QD3D11CommandBuffer::Command::Scissor:
+        {
+            D3D11_RECT r;
+            r.left = cmd.args.scissor.x;
+            r.top = cmd.args.scissor.y;
+            // right and bottom are exclusive
+            r.right = cmd.args.scissor.x + cmd.args.scissor.w;
+            r.bottom = cmd.args.scissor.y + cmd.args.scissor.h;
+            context->RSSetScissorRects(1, &r);
+        }
+            break;
+        case QD3D11CommandBuffer::Command::BindVertexBuffers:
+            contextState.vsHighestActiveVertexBufferBinding = qMax<int>(
+                        contextState.vsHighestActiveVertexBufferBinding,
+                        cmd.args.bindVertexBuffers.startSlot + cmd.args.bindVertexBuffers.slotCount - 1);
+            context->IASetVertexBuffers(UINT(cmd.args.bindVertexBuffers.startSlot),
+                                        UINT(cmd.args.bindVertexBuffers.slotCount),
+                                        cmd.args.bindVertexBuffers.buffers,
+                                        cmd.args.bindVertexBuffers.strides,
+                                        cmd.args.bindVertexBuffers.offsets);
+            break;
+        case QD3D11CommandBuffer::Command::BindIndexBuffer:
+            contextState.vsHasIndexBufferBound = true;
+            context->IASetIndexBuffer(cmd.args.bindIndexBuffer.buffer,
+                                      cmd.args.bindIndexBuffer.format,
+                                      cmd.args.bindIndexBuffer.offset);
+            break;
+        case QD3D11CommandBuffer::Command::BindGraphicsPipeline:
+        {
+            QD3D11GraphicsPipeline *psD = cmd.args.bindGraphicsPipeline.ps;
+            context->VSSetShader(psD->vs, nullptr, 0);
+            context->PSSetShader(psD->fs, nullptr, 0);
+            context->IASetPrimitiveTopology(psD->d3dTopology);
+            context->IASetInputLayout(psD->inputLayout);
+            context->OMSetDepthStencilState(psD->dsState, stencilRef);
+            context->OMSetBlendState(psD->blendState, blendConstants, 0xffffffff);
+            context->RSSetState(psD->rastState);
+        }
+            break;
+        case QD3D11CommandBuffer::Command::BindShaderResources:
+            bindShaderResources(cmd.args.bindShaderResources.srb,
+                                cmd.args.bindShaderResources.dynamicOffsetPairs,
+                                cmd.args.bindShaderResources.dynamicOffsetCount,
+                                cmd.args.bindShaderResources.offsetOnlyChange);
+            break;
+        case QD3D11CommandBuffer::Command::StencilRef:
+            stencilRef = cmd.args.stencilRef.ref;
+            context->OMSetDepthStencilState(cmd.args.stencilRef.ps->dsState, stencilRef);
+            break;
+        case QD3D11CommandBuffer::Command::BlendConstants:
+            memcpy(blendConstants, cmd.args.blendConstants.c, 4 * sizeof(float));
+            context->OMSetBlendState(cmd.args.blendConstants.ps->blendState, blendConstants, 0xffffffff);
+            break;
+        case QD3D11CommandBuffer::Command::Draw:
+            if (cmd.args.draw.ps) {
+                if (cmd.args.draw.instanceCount == 1)
+                    context->Draw(cmd.args.draw.vertexCount, cmd.args.draw.firstVertex);
+                else
+                    context->DrawInstanced(cmd.args.draw.vertexCount, cmd.args.draw.instanceCount,
+                                           cmd.args.draw.firstVertex, cmd.args.draw.firstInstance);
+            } else {
+                qWarning("No graphics pipeline active for draw; ignored");
+            }
+            break;
+        case QD3D11CommandBuffer::Command::DrawIndexed:
+            if (cmd.args.drawIndexed.ps) {
+                if (cmd.args.drawIndexed.instanceCount == 1)
+                    context->DrawIndexed(cmd.args.drawIndexed.indexCount, cmd.args.drawIndexed.firstIndex,
+                                         cmd.args.drawIndexed.vertexOffset);
+                else
+                    context->DrawIndexedInstanced(cmd.args.drawIndexed.indexCount, cmd.args.drawIndexed.instanceCount,
+                                                  cmd.args.drawIndexed.firstIndex, cmd.args.drawIndexed.vertexOffset,
+                                                  cmd.args.drawIndexed.firstInstance);
+            } else {
+                qWarning("No graphics pipeline active for drawIndexed; ignored");
+            }
+            break;
+        case QD3D11CommandBuffer::Command::UpdateSubRes:
+            context->UpdateSubresource(cmd.args.updateSubRes.dst, cmd.args.updateSubRes.dstSubRes,
+                                       cmd.args.updateSubRes.hasDstBox ? &cmd.args.updateSubRes.dstBox : nullptr,
+                                       cmd.args.updateSubRes.src, cmd.args.updateSubRes.srcRowPitch, 0);
+            break;
+        case QD3D11CommandBuffer::Command::CopySubRes:
+            context->CopySubresourceRegion(cmd.args.copySubRes.dst, cmd.args.copySubRes.dstSubRes,
+                                           cmd.args.copySubRes.dstX, cmd.args.copySubRes.dstY, 0,
+                                           cmd.args.copySubRes.src, cmd.args.copySubRes.srcSubRes,
+                                           cmd.args.copySubRes.hasSrcBox ? &cmd.args.copySubRes.srcBox : nullptr);
+            break;
+        case QD3D11CommandBuffer::Command::ResolveSubRes:
+            context->ResolveSubresource(cmd.args.resolveSubRes.dst, cmd.args.resolveSubRes.dstSubRes,
+                                        cmd.args.resolveSubRes.src, cmd.args.resolveSubRes.srcSubRes,
+                                        cmd.args.resolveSubRes.format);
+            break;
+        case QD3D11CommandBuffer::Command::GenMip:
+            context->GenerateMips(cmd.args.genMip.srv);
+            break;
+        case QD3D11CommandBuffer::Command::DebugMarkBegin:
+            annotations->BeginEvent(reinterpret_cast<LPCWSTR>(QString::fromLatin1(cmd.args.debugMark.s).utf16()));
+            break;
+        case QD3D11CommandBuffer::Command::DebugMarkEnd:
+            annotations->EndEvent();
+            break;
+        case QD3D11CommandBuffer::Command::DebugMarkMsg:
+            annotations->SetMarker(reinterpret_cast<LPCWSTR>(QString::fromLatin1(cmd.args.debugMark.s).utf16()));
+            break;
+        case QD3D11CommandBuffer::Command::BindComputePipeline:
+            context->CSSetShader(cmd.args.bindComputePipeline.ps->cs, nullptr, 0);
+            break;
+        case QD3D11CommandBuffer::Command::Dispatch:
+            context->Dispatch(cmd.args.dispatch.x, cmd.args.dispatch.y, cmd.args.dispatch.z);
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+QD3D11Buffer::QD3D11Buffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size)
+    : QRhiBuffer(rhi, type, usage, size)
+{
+}
+
+QD3D11Buffer::~QD3D11Buffer()
+{
+    release();
+}
+
+void QD3D11Buffer::release()
+{
+    if (!buffer)
+        return;
+
+    dynBuf.clear();
+
+    buffer->Release();
+    buffer = nullptr;
+
+    if (uav) {
+        uav->Release();
+        uav = nullptr;
+    }
+
+    QRHI_RES_RHI(QRhiD3D11);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseBuffer(this));
+    rhiD->unregisterResource(this);
+}
+
+static inline uint toD3DBufferUsage(QRhiBuffer::UsageFlags usage)
+{
+    int u = 0;
+    if (usage.testFlag(QRhiBuffer::VertexBuffer))
+        u |= D3D11_BIND_VERTEX_BUFFER;
+    if (usage.testFlag(QRhiBuffer::IndexBuffer))
+        u |= D3D11_BIND_INDEX_BUFFER;
+    if (usage.testFlag(QRhiBuffer::UniformBuffer))
+        u |= D3D11_BIND_CONSTANT_BUFFER;
+    if (usage.testFlag(QRhiBuffer::StorageBuffer))
+        u |= D3D11_BIND_UNORDERED_ACCESS;
+    return uint(u);
+}
+
+bool QD3D11Buffer::build()
+{
+    if (buffer)
+        release();
+
+    if (m_usage.testFlag(QRhiBuffer::UniformBuffer) && m_type != Dynamic) {
+        qWarning("UniformBuffer must always be combined with Dynamic on D3D11");
+        return false;
+    }
+
+    if (m_usage.testFlag(QRhiBuffer::StorageBuffer) && m_type == Dynamic) {
+        qWarning("StorageBuffer cannot be combined with Dynamic");
+        return false;
+    }
+
+    const int nonZeroSize = m_size <= 0 ? 256 : m_size;
+    const int roundedSize = aligned(nonZeroSize, m_usage.testFlag(QRhiBuffer::UniformBuffer) ? 256 : 4);
+
+    D3D11_BUFFER_DESC desc;
+    memset(&desc, 0, sizeof(desc));
+    desc.ByteWidth = UINT(roundedSize);
+    desc.Usage = m_type == Dynamic ? D3D11_USAGE_DYNAMIC : D3D11_USAGE_DEFAULT;
+    desc.BindFlags = toD3DBufferUsage(m_usage);
+    desc.CPUAccessFlags = m_type == Dynamic ? D3D11_CPU_ACCESS_WRITE : 0;
+    desc.MiscFlags = m_usage.testFlag(QRhiBuffer::StorageBuffer) ? D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS : 0;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    HRESULT hr = rhiD->dev->CreateBuffer(&desc, nullptr, &buffer);
+    if (FAILED(hr)) {
+        qWarning("Failed to create buffer: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    if (m_type == Dynamic) {
+        dynBuf.resize(m_size);
+        hasPendingDynamicUpdates = false;
+    }
+
+    if (!m_objectName.isEmpty())
+        buffer->SetPrivateData(WKPDID_D3DDebugObjectName, UINT(m_objectName.size()), m_objectName.constData());
+
+    QRHI_PROF;
+    QRHI_PROF_F(newBuffer(this, quint32(roundedSize), m_type == Dynamic ? 2 : 1, m_type == Dynamic ? 1 : 0));
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+ID3D11UnorderedAccessView *QD3D11Buffer::unorderedAccessView()
+{
+    if (uav)
+        return uav;
+
+    // SPIRV-Cross generated HLSL uses RWByteAddressBuffer
+    D3D11_UNORDERED_ACCESS_VIEW_DESC desc;
+    memset(&desc, 0, sizeof(desc));
+    desc.Format = DXGI_FORMAT_R32_TYPELESS;
+    desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER;
+    desc.Buffer.FirstElement = 0;
+    desc.Buffer.NumElements = UINT(aligned(m_size, 4) / 4);
+    desc.Buffer.Flags = D3D11_BUFFER_UAV_FLAG_RAW;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    HRESULT hr = rhiD->dev->CreateUnorderedAccessView(buffer, &desc, &uav);
+    if (FAILED(hr)) {
+        qWarning("Failed to create UAV: %s", qPrintable(comErrorMessage(hr)));
+        return nullptr;
+    }
+
+    return uav;
+}
+
+QD3D11RenderBuffer::QD3D11RenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                                       int sampleCount, QRhiRenderBuffer::Flags flags)
+    : QRhiRenderBuffer(rhi, type, pixelSize, sampleCount, flags)
+{
+}
+
+QD3D11RenderBuffer::~QD3D11RenderBuffer()
+{
+    release();
+}
+
+void QD3D11RenderBuffer::release()
+{
+    if (!tex)
+        return;
+
+    if (dsv) {
+        dsv->Release();
+        dsv = nullptr;
+    }
+
+    if (rtv) {
+        rtv->Release();
+        rtv = nullptr;
+    }
+
+    tex->Release();
+    tex = nullptr;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseRenderBuffer(this));
+    rhiD->unregisterResource(this);
+}
+
+bool QD3D11RenderBuffer::build()
+{
+    if (tex)
+        release();
+
+    if (m_pixelSize.isEmpty())
+        return false;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    sampleDesc = rhiD->effectiveSampleCount(m_sampleCount);
+
+    D3D11_TEXTURE2D_DESC desc;
+    memset(&desc, 0, sizeof(desc));
+    desc.Width = UINT(m_pixelSize.width());
+    desc.Height = UINT(m_pixelSize.height());
+    desc.MipLevels = 1;
+    desc.ArraySize = 1;
+    desc.SampleDesc = sampleDesc;
+    desc.Usage = D3D11_USAGE_DEFAULT;
+
+    if (m_type == Color) {
+        dxgiFormat = DXGI_FORMAT_R8G8B8A8_UNORM;
+        desc.Format = dxgiFormat;
+        desc.BindFlags = D3D11_BIND_RENDER_TARGET;
+        HRESULT hr = rhiD->dev->CreateTexture2D(&desc, nullptr, &tex);
+        if (FAILED(hr)) {
+            qWarning("Failed to create color renderbuffer: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+        D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
+        memset(&rtvDesc, 0, sizeof(rtvDesc));
+        rtvDesc.Format = dxgiFormat;
+        rtvDesc.ViewDimension = desc.SampleDesc.Count > 1 ? D3D11_RTV_DIMENSION_TEXTURE2DMS
+                                                          : D3D11_RTV_DIMENSION_TEXTURE2D;
+        hr = rhiD->dev->CreateRenderTargetView(tex, &rtvDesc, &rtv);
+        if (FAILED(hr)) {
+            qWarning("Failed to create rtv: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+    } else if (m_type == DepthStencil) {
+        dxgiFormat = DXGI_FORMAT_D24_UNORM_S8_UINT;
+        desc.Format = dxgiFormat;
+        desc.BindFlags = D3D11_BIND_DEPTH_STENCIL;
+        HRESULT hr = rhiD->dev->CreateTexture2D(&desc, nullptr, &tex);
+        if (FAILED(hr)) {
+            qWarning("Failed to create depth-stencil buffer: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+        D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc;
+        memset(&dsvDesc, 0, sizeof(dsvDesc));
+        dsvDesc.Format = dxgiFormat;
+        dsvDesc.ViewDimension = desc.SampleDesc.Count > 1 ? D3D11_DSV_DIMENSION_TEXTURE2DMS
+                                                          : D3D11_DSV_DIMENSION_TEXTURE2D;
+        hr = rhiD->dev->CreateDepthStencilView(tex, &dsvDesc, &dsv);
+        if (FAILED(hr)) {
+            qWarning("Failed to create dsv: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+    } else {
+        return false;
+    }
+
+    if (!m_objectName.isEmpty())
+        tex->SetPrivateData(WKPDID_D3DDebugObjectName, UINT(m_objectName.size()), m_objectName.constData());
+
+    QRHI_PROF;
+    QRHI_PROF_F(newRenderBuffer(this, false, false, int(sampleDesc.Count)));
+
+    rhiD->registerResource(this);
+    return true;
+}
+
+QRhiTexture::Format QD3D11RenderBuffer::backingFormat() const
+{
+    return m_type == Color ? QRhiTexture::RGBA8 : QRhiTexture::UnknownFormat;
+}
+
+QD3D11Texture::QD3D11Texture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                             int sampleCount, Flags flags)
+    : QRhiTexture(rhi, format, pixelSize, sampleCount, flags)
+{
+    for (int i = 0; i < QRhi::MAX_LEVELS; ++i)
+        perLevelViews[i] = nullptr;
+}
+
+QD3D11Texture::~QD3D11Texture()
+{
+    release();
+}
+
+void QD3D11Texture::release()
+{
+    if (!tex)
+        return;
+
+    if (srv) {
+        srv->Release();
+        srv = nullptr;
+    }
+
+    for (int i = 0; i < QRhi::MAX_LEVELS; ++i) {
+        if (perLevelViews[i]) {
+            perLevelViews[i]->Release();
+            perLevelViews[i] = nullptr;
+        }
+    }
+
+    if (owns)
+        tex->Release();
+
+    tex = nullptr;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseTexture(this));
+    rhiD->unregisterResource(this);
+}
+
+static inline DXGI_FORMAT toD3DDepthTextureSRVFormat(QRhiTexture::Format format)
+{
+    switch (format) {
+    case QRhiTexture::Format::D16:
+        return DXGI_FORMAT_R16_FLOAT;
+    case QRhiTexture::Format::D32F:
+        return DXGI_FORMAT_R32_FLOAT;
+    default:
+        Q_UNREACHABLE();
+        return DXGI_FORMAT_R32_FLOAT;
+    }
+}
+
+static inline DXGI_FORMAT toD3DDepthTextureDSVFormat(QRhiTexture::Format format)
+{
+    switch (format) {
+    case QRhiTexture::Format::D16:
+        return DXGI_FORMAT_D16_UNORM;
+    case QRhiTexture::Format::D32F:
+        return DXGI_FORMAT_D32_FLOAT;
+    default:
+        Q_UNREACHABLE();
+        return DXGI_FORMAT_D32_FLOAT;
+    }
+}
+
+bool QD3D11Texture::prepareBuild(QSize *adjustedSize)
+{
+    if (tex)
+        release();
+
+    const QSize size = m_pixelSize.isEmpty() ? QSize(1, 1) : m_pixelSize;
+    const bool isDepth = isDepthTextureFormat(m_format);
+    const bool isCube = m_flags.testFlag(CubeMap);
+    const bool hasMipMaps = m_flags.testFlag(MipMapped);
+
+    QRHI_RES_RHI(QRhiD3D11);
+    dxgiFormat = toD3DTextureFormat(m_format, m_flags);
+    mipLevelCount = uint(hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1);
+    sampleDesc = rhiD->effectiveSampleCount(m_sampleCount);
+    if (sampleDesc.Count > 1) {
+        if (isCube) {
+            qWarning("Cubemap texture cannot be multisample");
+            return false;
+        }
+        if (hasMipMaps) {
+            qWarning("Multisample texture cannot have mipmaps");
+            return false;
+        }
+    }
+    if (isDepth && hasMipMaps) {
+        qWarning("Depth texture cannot have mipmaps");
+        return false;
+    }
+
+    if (adjustedSize)
+        *adjustedSize = size;
+
+    return true;
+}
+
+bool QD3D11Texture::finishBuild()
+{
+    QRHI_RES_RHI(QRhiD3D11);
+    const bool isDepth = isDepthTextureFormat(m_format);
+    const bool isCube = m_flags.testFlag(CubeMap);
+
+    D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
+    memset(&srvDesc, 0, sizeof(srvDesc));
+    srvDesc.Format = isDepth ? toD3DDepthTextureSRVFormat(m_format) : dxgiFormat;
+    if (isCube) {
+        srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
+        srvDesc.TextureCube.MipLevels = mipLevelCount;
+    } else {
+        if (sampleDesc.Count > 1) {
+            srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS;
+        } else {
+            srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+            srvDesc.Texture2D.MipLevels = mipLevelCount;
+        }
+    }
+
+    HRESULT hr = rhiD->dev->CreateShaderResourceView(tex, &srvDesc, &srv);
+    if (FAILED(hr)) {
+        qWarning("Failed to create srv: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    nativeHandlesStruct.texture = tex;
+
+    generation += 1;
+    return true;
+}
+
+bool QD3D11Texture::build()
+{
+    QSize size;
+    if (!prepareBuild(&size))
+        return false;
+
+    const bool isDepth = isDepthTextureFormat(m_format);
+    const bool isCube = m_flags.testFlag(CubeMap);
+
+    uint bindFlags = D3D11_BIND_SHADER_RESOURCE;
+    uint miscFlags = isCube ? D3D11_RESOURCE_MISC_TEXTURECUBE : 0;
+    if (m_flags.testFlag(RenderTarget)) {
+        if (isDepth)
+            bindFlags |= D3D11_BIND_DEPTH_STENCIL;
+        else
+            bindFlags |= D3D11_BIND_RENDER_TARGET;
+    }
+    if (m_flags.testFlag(UsedWithGenerateMips)) {
+        if (isDepth) {
+            qWarning("Depth texture cannot have mipmaps generated");
+            return false;
+        }
+        bindFlags |= D3D11_BIND_RENDER_TARGET;
+        miscFlags |= D3D11_RESOURCE_MISC_GENERATE_MIPS;
+    }
+    if (m_flags.testFlag(UsedWithLoadStore))
+        bindFlags |= D3D11_BIND_UNORDERED_ACCESS;
+
+    D3D11_TEXTURE2D_DESC desc;
+    memset(&desc, 0, sizeof(desc));
+    desc.Width = UINT(size.width());
+    desc.Height = UINT(size.height());
+    desc.MipLevels = mipLevelCount;
+    desc.ArraySize = isCube ? 6 : 1;
+    desc.Format = dxgiFormat;
+    desc.SampleDesc = sampleDesc;
+    desc.Usage = D3D11_USAGE_DEFAULT;
+    desc.BindFlags = bindFlags;
+    desc.MiscFlags = miscFlags;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    HRESULT hr = rhiD->dev->CreateTexture2D(&desc, nullptr, &tex);
+    if (FAILED(hr)) {
+        qWarning("Failed to create texture: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    if (!finishBuild())
+        return false;
+
+    if (!m_objectName.isEmpty())
+        tex->SetPrivateData(WKPDID_D3DDebugObjectName, UINT(m_objectName.size()), m_objectName.constData());
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, true, int(mipLevelCount), isCube ? 6 : 1, int(sampleDesc.Count)));
+
+    owns = true;
+    rhiD->registerResource(this);
+    return true;
+}
+
+bool QD3D11Texture::buildFrom(const QRhiNativeHandles *src)
+{
+    const QRhiD3D11TextureNativeHandles *h = static_cast<const QRhiD3D11TextureNativeHandles *>(src);
+    if (!h || !h->texture)
+        return false;
+
+    if (!prepareBuild())
+        return false;
+
+    tex = static_cast<ID3D11Texture2D *>(h->texture);
+
+    if (!finishBuild())
+        return false;
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, false, int(mipLevelCount), m_flags.testFlag(CubeMap) ? 6 : 1, int(sampleDesc.Count)));
+
+    owns = false;
+    QRHI_RES_RHI(QRhiD3D11);
+    rhiD->registerResource(this);
+    return true;
+}
+
+const QRhiNativeHandles *QD3D11Texture::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+ID3D11UnorderedAccessView *QD3D11Texture::unorderedAccessViewForLevel(int level)
+{
+    if (perLevelViews[level])
+        return perLevelViews[level];
+
+    const bool isCube = m_flags.testFlag(CubeMap);
+    D3D11_UNORDERED_ACCESS_VIEW_DESC desc;
+    memset(&desc, 0, sizeof(desc));
+    desc.Format = dxgiFormat;
+    if (isCube) {
+        desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2DARRAY;
+        desc.Texture2DArray.MipSlice = UINT(level);
+        desc.Texture2DArray.FirstArraySlice = 0;
+        desc.Texture2DArray.ArraySize = 6;
+    } else {
+        desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D;
+        desc.Texture2D.MipSlice = UINT(level);
+    }
+
+    QRHI_RES_RHI(QRhiD3D11);
+    ID3D11UnorderedAccessView *uav = nullptr;
+    HRESULT hr = rhiD->dev->CreateUnorderedAccessView(tex, &desc, &uav);
+    if (FAILED(hr)) {
+        qWarning("Failed to create UAV: %s", qPrintable(comErrorMessage(hr)));
+        return nullptr;
+    }
+
+    perLevelViews[level] = uav;
+    return uav;
+}
+
+QD3D11Sampler::QD3D11Sampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                             AddressMode u, AddressMode v)
+    : QRhiSampler(rhi, magFilter, minFilter, mipmapMode, u, v)
+{
+}
+
+QD3D11Sampler::~QD3D11Sampler()
+{
+    release();
+}
+
+void QD3D11Sampler::release()
+{
+    if (!samplerState)
+        return;
+
+    samplerState->Release();
+    samplerState = nullptr;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    rhiD->unregisterResource(this);
+}
+
+static inline D3D11_FILTER toD3DFilter(QRhiSampler::Filter minFilter, QRhiSampler::Filter magFilter, QRhiSampler::Filter mipFilter)
+{
+    if (minFilter == QRhiSampler::Nearest) {
+        if (magFilter == QRhiSampler::Nearest) {
+            if (mipFilter == QRhiSampler::Linear)
+                return D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR;
+            else
+                return D3D11_FILTER_MIN_MAG_MIP_POINT;
+        } else {
+            if (mipFilter == QRhiSampler::Linear)
+                return D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR;
+            else
+                return D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT;
+        }
+    } else {
+        if (magFilter == QRhiSampler::Nearest) {
+            if (mipFilter == QRhiSampler::Linear)
+                return D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR;
+            else
+                return D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT;
+        } else {
+            if (mipFilter == QRhiSampler::Linear)
+                return D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+            else
+                return D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
+        }
+    }
+
+    Q_UNREACHABLE();
+    return D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+}
+
+static inline D3D11_TEXTURE_ADDRESS_MODE toD3DAddressMode(QRhiSampler::AddressMode m)
+{
+    switch (m) {
+    case QRhiSampler::Repeat:
+        return D3D11_TEXTURE_ADDRESS_WRAP;
+    case QRhiSampler::ClampToEdge:
+        return D3D11_TEXTURE_ADDRESS_CLAMP;
+    case QRhiSampler::Border:
+        return D3D11_TEXTURE_ADDRESS_BORDER;
+    case QRhiSampler::Mirror:
+        return D3D11_TEXTURE_ADDRESS_MIRROR;
+    case QRhiSampler::MirrorOnce:
+        return D3D11_TEXTURE_ADDRESS_MIRROR_ONCE;
+    default:
+        Q_UNREACHABLE();
+        return D3D11_TEXTURE_ADDRESS_CLAMP;
+    }
+}
+
+static inline D3D11_COMPARISON_FUNC toD3DTextureComparisonFunc(QRhiSampler::CompareOp op)
+{
+    switch (op) {
+    case QRhiSampler::Never:
+        return D3D11_COMPARISON_NEVER;
+    case QRhiSampler::Less:
+        return D3D11_COMPARISON_LESS;
+    case QRhiSampler::Equal:
+        return D3D11_COMPARISON_EQUAL;
+    case QRhiSampler::LessOrEqual:
+        return D3D11_COMPARISON_LESS_EQUAL;
+    case QRhiSampler::Greater:
+        return D3D11_COMPARISON_GREATER;
+    case QRhiSampler::NotEqual:
+        return D3D11_COMPARISON_NOT_EQUAL;
+    case QRhiSampler::GreaterOrEqual:
+        return D3D11_COMPARISON_GREATER_EQUAL;
+    case QRhiSampler::Always:
+        return D3D11_COMPARISON_ALWAYS;
+    default:
+        Q_UNREACHABLE();
+        return D3D11_COMPARISON_NEVER;
+    }
+}
+
+bool QD3D11Sampler::build()
+{
+    if (samplerState)
+        release();
+
+    D3D11_SAMPLER_DESC desc;
+    memset(&desc, 0, sizeof(desc));
+    desc.Filter = toD3DFilter(m_minFilter, m_magFilter, m_mipmapMode);
+    if (m_compareOp != Never)
+        desc.Filter = D3D11_FILTER(desc.Filter | 0x80);
+    desc.AddressU = toD3DAddressMode(m_addressU);
+    desc.AddressV = toD3DAddressMode(m_addressV);
+    desc.AddressW = toD3DAddressMode(m_addressW);
+    desc.MaxAnisotropy = 1.0f;
+    desc.ComparisonFunc = toD3DTextureComparisonFunc(m_compareOp);
+    desc.MaxLOD = m_mipmapMode == None ? 0.0f : 1000.0f;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    HRESULT hr = rhiD->dev->CreateSamplerState(&desc, &samplerState);
+    if (FAILED(hr)) {
+        qWarning("Failed to create sampler state: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+// dummy, no Vulkan-style RenderPass+Framebuffer concept here
+QD3D11RenderPassDescriptor::QD3D11RenderPassDescriptor(QRhiImplementation *rhi)
+    : QRhiRenderPassDescriptor(rhi)
+{
+}
+
+QD3D11RenderPassDescriptor::~QD3D11RenderPassDescriptor()
+{
+    release();
+}
+
+void QD3D11RenderPassDescriptor::release()
+{
+    // nothing to do here
+}
+
+QD3D11ReferenceRenderTarget::QD3D11ReferenceRenderTarget(QRhiImplementation *rhi)
+    : QRhiRenderTarget(rhi),
+      d(rhi)
+{
+}
+
+QD3D11ReferenceRenderTarget::~QD3D11ReferenceRenderTarget()
+{
+    release();
+}
+
+void QD3D11ReferenceRenderTarget::release()
+{
+    // nothing to do here
+}
+
+QSize QD3D11ReferenceRenderTarget::pixelSize() const
+{
+    return d.pixelSize;
+}
+
+float QD3D11ReferenceRenderTarget::devicePixelRatio() const
+{
+    return d.dpr;
+}
+
+int QD3D11ReferenceRenderTarget::sampleCount() const
+{
+    return d.sampleCount;
+}
+
+QD3D11TextureRenderTarget::QD3D11TextureRenderTarget(QRhiImplementation *rhi,
+                                                     const QRhiTextureRenderTargetDescription &desc,
+                                                     Flags flags)
+    : QRhiTextureRenderTarget(rhi, desc, flags),
+      d(rhi)
+{
+    for (int i = 0; i < QD3D11RenderTargetData::MAX_COLOR_ATTACHMENTS; ++i) {
+        ownsRtv[i] = false;
+        rtv[i] = nullptr;
+    }
+}
+
+QD3D11TextureRenderTarget::~QD3D11TextureRenderTarget()
+{
+    release();
+}
+
+void QD3D11TextureRenderTarget::release()
+{
+    QRHI_RES_RHI(QRhiD3D11);
+
+    if (!rtv[0] && !dsv)
+        return;
+
+    if (dsv) {
+        if (ownsDsv)
+            dsv->Release();
+        dsv = nullptr;
+    }
+
+    for (int i = 0; i < QD3D11RenderTargetData::MAX_COLOR_ATTACHMENTS; ++i) {
+        if (rtv[i]) {
+            if (ownsRtv[i])
+                rtv[i]->Release();
+            rtv[i] = nullptr;
+        }
+    }
+
+    rhiD->unregisterResource(this);
+}
+
+QRhiRenderPassDescriptor *QD3D11TextureRenderTarget::newCompatibleRenderPassDescriptor()
+{
+    return new QD3D11RenderPassDescriptor(m_rhi);
+}
+
+bool QD3D11TextureRenderTarget::build()
+{
+    if (rtv[0] || dsv)
+        release();
+
+    const bool hasColorAttachments = m_desc.cbeginColorAttachments() != m_desc.cendColorAttachments();
+    Q_ASSERT(hasColorAttachments || m_desc.depthTexture());
+    Q_ASSERT(!m_desc.depthStencilBuffer() || !m_desc.depthTexture());
+    const bool hasDepthStencil = m_desc.depthStencilBuffer() || m_desc.depthTexture();
+
+    QRHI_RES_RHI(QRhiD3D11);
+
+    d.colorAttCount = 0;
+    int attIndex = 0;
+    for (auto it = m_desc.cbeginColorAttachments(), itEnd = m_desc.cendColorAttachments(); it != itEnd; ++it, ++attIndex) {
+        d.colorAttCount += 1;
+        const QRhiColorAttachment &colorAtt(*it);
+        QRhiTexture *texture = colorAtt.texture();
+        QRhiRenderBuffer *rb = colorAtt.renderBuffer();
+        Q_ASSERT(texture || rb);
+        if (texture) {
+            QD3D11Texture *texD = QRHI_RES(QD3D11Texture, texture);
+            D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
+            memset(&rtvDesc, 0, sizeof(rtvDesc));
+            rtvDesc.Format = toD3DTextureFormat(texD->format(), texD->flags());
+            if (texD->flags().testFlag(QRhiTexture::CubeMap)) {
+                rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
+                rtvDesc.Texture2DArray.MipSlice = UINT(colorAtt.level());
+                rtvDesc.Texture2DArray.FirstArraySlice = UINT(colorAtt.layer());
+                rtvDesc.Texture2DArray.ArraySize = 1;
+            } else {
+                if (texD->sampleDesc.Count > 1) {
+                    rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS;
+                } else {
+                    rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
+                    rtvDesc.Texture2D.MipSlice = UINT(colorAtt.level());
+                }
+            }
+            HRESULT hr = rhiD->dev->CreateRenderTargetView(texD->tex, &rtvDesc, &rtv[attIndex]);
+            if (FAILED(hr)) {
+                qWarning("Failed to create rtv: %s", qPrintable(comErrorMessage(hr)));
+                return false;
+            }
+            ownsRtv[attIndex] = true;
+            if (attIndex == 0) {
+                d.pixelSize = texD->pixelSize();
+                d.sampleCount = int(texD->sampleDesc.Count);
+            }
+        } else if (rb) {
+            QD3D11RenderBuffer *rbD = QRHI_RES(QD3D11RenderBuffer, rb);
+            ownsRtv[attIndex] = false;
+            rtv[attIndex] = rbD->rtv;
+            if (attIndex == 0) {
+                d.pixelSize = rbD->pixelSize();
+                d.sampleCount = int(rbD->sampleDesc.Count);
+            }
+        }
+    }
+    d.dpr = 1;
+
+    if (hasDepthStencil) {
+        if (m_desc.depthTexture()) {
+            ownsDsv = true;
+            QD3D11Texture *depthTexD = QRHI_RES(QD3D11Texture, m_desc.depthTexture());
+            D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc;
+            memset(&dsvDesc, 0, sizeof(dsvDesc));
+            dsvDesc.Format = toD3DDepthTextureDSVFormat(depthTexD->format());
+            dsvDesc.ViewDimension = depthTexD->sampleDesc.Count > 1 ? D3D11_DSV_DIMENSION_TEXTURE2DMS
+                                                                    : D3D11_DSV_DIMENSION_TEXTURE2D;
+            HRESULT hr = rhiD->dev->CreateDepthStencilView(depthTexD->tex, &dsvDesc, &dsv);
+            if (FAILED(hr)) {
+                qWarning("Failed to create dsv: %s", qPrintable(comErrorMessage(hr)));
+                return false;
+            }
+            if (d.colorAttCount == 0) {
+                d.pixelSize = depthTexD->pixelSize();
+                d.sampleCount = int(depthTexD->sampleDesc.Count);
+            }
+        } else {
+            ownsDsv = false;
+            QD3D11RenderBuffer *depthRbD = QRHI_RES(QD3D11RenderBuffer, m_desc.depthStencilBuffer());
+            dsv = depthRbD->dsv;
+            if (d.colorAttCount == 0) {
+                d.pixelSize = m_desc.depthStencilBuffer()->pixelSize();
+                d.sampleCount = int(depthRbD->sampleDesc.Count);
+            }
+        }
+        d.dsAttCount = 1;
+    } else {
+        d.dsAttCount = 0;
+    }
+
+    for (int i = 0; i < QD3D11RenderTargetData::MAX_COLOR_ATTACHMENTS; ++i)
+        d.rtv[i] = i < d.colorAttCount ? rtv[i] : nullptr;
+
+    d.dsv = dsv;
+    d.rp = QRHI_RES(QD3D11RenderPassDescriptor, m_renderPassDesc);
+
+    rhiD->registerResource(this);
+    return true;
+}
+
+QSize QD3D11TextureRenderTarget::pixelSize() const
+{
+    return d.pixelSize;
+}
+
+float QD3D11TextureRenderTarget::devicePixelRatio() const
+{
+    return d.dpr;
+}
+
+int QD3D11TextureRenderTarget::sampleCount() const
+{
+    return d.sampleCount;
+}
+
+QD3D11ShaderResourceBindings::QD3D11ShaderResourceBindings(QRhiImplementation *rhi)
+    : QRhiShaderResourceBindings(rhi)
+{
+}
+
+QD3D11ShaderResourceBindings::~QD3D11ShaderResourceBindings()
+{
+    release();
+}
+
+void QD3D11ShaderResourceBindings::release()
+{
+    sortedBindings.clear();
+}
+
+bool QD3D11ShaderResourceBindings::build()
+{
+    if (!sortedBindings.isEmpty())
+        release();
+
+    std::copy(m_bindings.cbegin(), m_bindings.cend(), std::back_inserter(sortedBindings));
+    std::sort(sortedBindings.begin(), sortedBindings.end(),
+              [](const QRhiShaderResourceBinding &a, const QRhiShaderResourceBinding &b)
+    {
+        return a.data()->binding < b.data()->binding;
+    });
+
+    boundResourceData.resize(sortedBindings.count());
+
+    QRHI_RES_RHI(QRhiD3D11);
+    rhiD->updateShaderResourceBindings(this);
+
+    generation += 1;
+    return true;
+}
+
+QD3D11GraphicsPipeline::QD3D11GraphicsPipeline(QRhiImplementation *rhi)
+    : QRhiGraphicsPipeline(rhi)
+{
+}
+
+QD3D11GraphicsPipeline::~QD3D11GraphicsPipeline()
+{
+    release();
+}
+
+void QD3D11GraphicsPipeline::release()
+{
+    QRHI_RES_RHI(QRhiD3D11);
+
+    if (!dsState)
+        return;
+
+    dsState->Release();
+    dsState = nullptr;
+
+    if (blendState) {
+        blendState->Release();
+        blendState = nullptr;
+    }
+
+    if (inputLayout) {
+        inputLayout->Release();
+        inputLayout = nullptr;
+    }
+
+    if (rastState) {
+        rastState->Release();
+        rastState = nullptr;
+    }
+
+    if (vs) {
+        vs->Release();
+        vs = nullptr;
+    }
+
+    if (fs) {
+        fs->Release();
+        fs = nullptr;
+    }
+
+    rhiD->unregisterResource(this);
+}
+
+static inline D3D11_CULL_MODE toD3DCullMode(QRhiGraphicsPipeline::CullMode c)
+{
+    switch (c) {
+    case QRhiGraphicsPipeline::None:
+        return D3D11_CULL_NONE;
+    case QRhiGraphicsPipeline::Front:
+        return D3D11_CULL_FRONT;
+    case QRhiGraphicsPipeline::Back:
+        return D3D11_CULL_BACK;
+    default:
+        Q_UNREACHABLE();
+        return D3D11_CULL_NONE;
+    }
+}
+
+static inline D3D11_COMPARISON_FUNC toD3DCompareOp(QRhiGraphicsPipeline::CompareOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::Never:
+        return D3D11_COMPARISON_NEVER;
+    case QRhiGraphicsPipeline::Less:
+        return D3D11_COMPARISON_LESS;
+    case QRhiGraphicsPipeline::Equal:
+        return D3D11_COMPARISON_EQUAL;
+    case QRhiGraphicsPipeline::LessOrEqual:
+        return D3D11_COMPARISON_LESS_EQUAL;
+    case QRhiGraphicsPipeline::Greater:
+        return D3D11_COMPARISON_GREATER;
+    case QRhiGraphicsPipeline::NotEqual:
+        return D3D11_COMPARISON_NOT_EQUAL;
+    case QRhiGraphicsPipeline::GreaterOrEqual:
+        return D3D11_COMPARISON_GREATER_EQUAL;
+    case QRhiGraphicsPipeline::Always:
+        return D3D11_COMPARISON_ALWAYS;
+    default:
+        Q_UNREACHABLE();
+        return D3D11_COMPARISON_ALWAYS;
+    }
+}
+
+static inline D3D11_STENCIL_OP toD3DStencilOp(QRhiGraphicsPipeline::StencilOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::StencilZero:
+        return D3D11_STENCIL_OP_ZERO;
+    case QRhiGraphicsPipeline::Keep:
+        return D3D11_STENCIL_OP_KEEP;
+    case QRhiGraphicsPipeline::Replace:
+        return D3D11_STENCIL_OP_REPLACE;
+    case QRhiGraphicsPipeline::IncrementAndClamp:
+        return D3D11_STENCIL_OP_INCR_SAT;
+    case QRhiGraphicsPipeline::DecrementAndClamp:
+        return D3D11_STENCIL_OP_DECR_SAT;
+    case QRhiGraphicsPipeline::Invert:
+        return D3D11_STENCIL_OP_INVERT;
+    case QRhiGraphicsPipeline::IncrementAndWrap:
+        return D3D11_STENCIL_OP_INCR;
+    case QRhiGraphicsPipeline::DecrementAndWrap:
+        return D3D11_STENCIL_OP_DECR;
+    default:
+        Q_UNREACHABLE();
+        return D3D11_STENCIL_OP_KEEP;
+    }
+}
+
+static inline DXGI_FORMAT toD3DAttributeFormat(QRhiVertexInputAttribute::Format format)
+{
+    switch (format) {
+    case QRhiVertexInputAttribute::Float4:
+        return DXGI_FORMAT_R32G32B32A32_FLOAT;
+    case QRhiVertexInputAttribute::Float3:
+        return DXGI_FORMAT_R32G32B32_FLOAT;
+    case QRhiVertexInputAttribute::Float2:
+        return DXGI_FORMAT_R32G32_FLOAT;
+    case QRhiVertexInputAttribute::Float:
+        return DXGI_FORMAT_R32_FLOAT;
+    case QRhiVertexInputAttribute::UNormByte4:
+        return DXGI_FORMAT_R8G8B8A8_UNORM;
+    case QRhiVertexInputAttribute::UNormByte2:
+        return DXGI_FORMAT_R8G8_UNORM;
+    case QRhiVertexInputAttribute::UNormByte:
+        return DXGI_FORMAT_R8_UNORM;
+    default:
+        Q_UNREACHABLE();
+        return DXGI_FORMAT_R32G32B32A32_FLOAT;
+    }
+}
+
+static inline D3D11_PRIMITIVE_TOPOLOGY toD3DTopology(QRhiGraphicsPipeline::Topology t)
+{
+    switch (t) {
+    case QRhiGraphicsPipeline::Triangles:
+        return D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
+    case QRhiGraphicsPipeline::TriangleStrip:
+        return D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP;
+    case QRhiGraphicsPipeline::Lines:
+        return D3D11_PRIMITIVE_TOPOLOGY_LINELIST;
+    case QRhiGraphicsPipeline::LineStrip:
+        return D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP;
+    case QRhiGraphicsPipeline::Points:
+        return D3D11_PRIMITIVE_TOPOLOGY_POINTLIST;
+    default:
+        Q_UNREACHABLE();
+        return D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
+    }
+}
+
+static inline UINT8 toD3DColorWriteMask(QRhiGraphicsPipeline::ColorMask c)
+{
+    UINT8 f = 0;
+    if (c.testFlag(QRhiGraphicsPipeline::R))
+        f |= D3D11_COLOR_WRITE_ENABLE_RED;
+    if (c.testFlag(QRhiGraphicsPipeline::G))
+        f |= D3D11_COLOR_WRITE_ENABLE_GREEN;
+    if (c.testFlag(QRhiGraphicsPipeline::B))
+        f |= D3D11_COLOR_WRITE_ENABLE_BLUE;
+    if (c.testFlag(QRhiGraphicsPipeline::A))
+        f |= D3D11_COLOR_WRITE_ENABLE_ALPHA;
+    return f;
+}
+
+static inline D3D11_BLEND toD3DBlendFactor(QRhiGraphicsPipeline::BlendFactor f)
+{
+    switch (f) {
+    case QRhiGraphicsPipeline::Zero:
+        return D3D11_BLEND_ZERO;
+    case QRhiGraphicsPipeline::One:
+        return D3D11_BLEND_ONE;
+    case QRhiGraphicsPipeline::SrcColor:
+        return D3D11_BLEND_SRC_COLOR;
+    case QRhiGraphicsPipeline::OneMinusSrcColor:
+        return D3D11_BLEND_INV_SRC_COLOR;
+    case QRhiGraphicsPipeline::DstColor:
+        return D3D11_BLEND_DEST_COLOR;
+    case QRhiGraphicsPipeline::OneMinusDstColor:
+        return D3D11_BLEND_INV_DEST_COLOR;
+    case QRhiGraphicsPipeline::SrcAlpha:
+        return D3D11_BLEND_SRC_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusSrcAlpha:
+        return D3D11_BLEND_INV_SRC_ALPHA;
+    case QRhiGraphicsPipeline::DstAlpha:
+        return D3D11_BLEND_DEST_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusDstAlpha:
+        return D3D11_BLEND_INV_DEST_ALPHA;
+    case QRhiGraphicsPipeline::ConstantColor:
+        Q_FALLTHROUGH();
+    case QRhiGraphicsPipeline::ConstantAlpha:
+        return D3D11_BLEND_BLEND_FACTOR;
+    case QRhiGraphicsPipeline::OneMinusConstantColor:
+        Q_FALLTHROUGH();
+    case QRhiGraphicsPipeline::OneMinusConstantAlpha:
+        return D3D11_BLEND_INV_BLEND_FACTOR;
+    case QRhiGraphicsPipeline::SrcAlphaSaturate:
+        return D3D11_BLEND_SRC_ALPHA_SAT;
+    case QRhiGraphicsPipeline::Src1Color:
+        return D3D11_BLEND_SRC1_COLOR;
+    case QRhiGraphicsPipeline::OneMinusSrc1Color:
+        return D3D11_BLEND_INV_SRC1_COLOR;
+    case QRhiGraphicsPipeline::Src1Alpha:
+        return D3D11_BLEND_SRC1_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusSrc1Alpha:
+        return D3D11_BLEND_INV_SRC1_ALPHA;
+    default:
+        Q_UNREACHABLE();
+        return D3D11_BLEND_ZERO;
+    }
+}
+
+static inline D3D11_BLEND_OP toD3DBlendOp(QRhiGraphicsPipeline::BlendOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::Add:
+        return D3D11_BLEND_OP_ADD;
+    case QRhiGraphicsPipeline::Subtract:
+        return D3D11_BLEND_OP_SUBTRACT;
+    case QRhiGraphicsPipeline::ReverseSubtract:
+        return D3D11_BLEND_OP_REV_SUBTRACT;
+    case QRhiGraphicsPipeline::Min:
+        return D3D11_BLEND_OP_MIN;
+    case QRhiGraphicsPipeline::Max:
+        return D3D11_BLEND_OP_MAX;
+    default:
+        Q_UNREACHABLE();
+        return D3D11_BLEND_OP_ADD;
+    }
+}
+
+static pD3DCompile resolveD3DCompile()
+{
+    for (const wchar_t *libraryName : {L"D3DCompiler_47", L"D3DCompiler_43"}) {
+        QSystemLibrary library(libraryName);
+        if (library.load()) {
+            if (auto symbol = library.resolve("D3DCompile"))
+                return reinterpret_cast<pD3DCompile>(symbol);
+        }
+    }
+    return nullptr;
+}
+
+static QByteArray compileHlslShaderSource(const QShader &shader, QShader::Variant shaderVariant, QString *error)
+{
+    QShaderCode dxbc = shader.shader({ QShader::DxbcShader, 50, shaderVariant });
+    if (!dxbc.shader().isEmpty())
+        return dxbc.shader();
+
+    QShaderCode hlslSource = shader.shader({ QShader::HlslShader, 50, shaderVariant });
+    if (hlslSource.shader().isEmpty()) {
+        qWarning() << "No HLSL (shader model 5.0) code found in baked shader" << shader;
+        return QByteArray();
+    }
+
+    const char *target;
+    switch (shader.stage()) {
+    case QShader::VertexStage:
+        target = "vs_5_0";
+        break;
+    case QShader::TessellationControlStage:
+        target = "hs_5_0";
+        break;
+    case QShader::TessellationEvaluationStage:
+        target = "ds_5_0";
+        break;
+    case QShader::GeometryStage:
+        target = "gs_5_0";
+        break;
+    case QShader::FragmentStage:
+        target = "ps_5_0";
+        break;
+    case QShader::ComputeStage:
+        target = "cs_5_0";
+        break;
+    default:
+        Q_UNREACHABLE();
+        return QByteArray();
+    }
+
+    static const pD3DCompile d3dCompile = resolveD3DCompile();
+    if (d3dCompile == nullptr) {
+        qWarning("Unable to resolve function D3DCompile()");
+        return QByteArray();
+    }
+
+    ID3DBlob *bytecode = nullptr;
+    ID3DBlob *errors = nullptr;
+    HRESULT hr = d3dCompile(hlslSource.shader().constData(), SIZE_T(hlslSource.shader().size()),
+                            nullptr, nullptr, nullptr,
+                            hlslSource.entryPoint().constData(), target, 0, 0, &bytecode, &errors);
+    if (FAILED(hr) || !bytecode) {
+        qWarning("HLSL shader compilation failed: 0x%x", uint(hr));
+        if (errors) {
+            *error = QString::fromUtf8(static_cast<const char *>(errors->GetBufferPointer()),
+                                       int(errors->GetBufferSize()));
+            errors->Release();
+        }
+        return QByteArray();
+    }
+
+    QByteArray result;
+    result.resize(int(bytecode->GetBufferSize()));
+    memcpy(result.data(), bytecode->GetBufferPointer(), size_t(result.size()));
+    bytecode->Release();
+    return result;
+}
+
+bool QD3D11GraphicsPipeline::build()
+{
+    if (dsState)
+        release();
+
+    QRHI_RES_RHI(QRhiD3D11);
+    if (!rhiD->sanityCheckGraphicsPipeline(this))
+        return false;
+
+    D3D11_RASTERIZER_DESC rastDesc;
+    memset(&rastDesc, 0, sizeof(rastDesc));
+    rastDesc.FillMode = D3D11_FILL_SOLID;
+    rastDesc.CullMode = toD3DCullMode(m_cullMode);
+    rastDesc.FrontCounterClockwise = m_frontFace == CCW;
+    rastDesc.ScissorEnable = m_flags.testFlag(UsesScissor);
+    rastDesc.MultisampleEnable = rhiD->effectiveSampleCount(m_sampleCount).Count > 1;
+    HRESULT hr = rhiD->dev->CreateRasterizerState(&rastDesc, &rastState);
+    if (FAILED(hr)) {
+        qWarning("Failed to create rasterizer state: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    D3D11_DEPTH_STENCIL_DESC dsDesc;
+    memset(&dsDesc, 0, sizeof(dsDesc));
+    dsDesc.DepthEnable = m_depthTest;
+    dsDesc.DepthWriteMask = m_depthWrite ? D3D11_DEPTH_WRITE_MASK_ALL : D3D11_DEPTH_WRITE_MASK_ZERO;
+    dsDesc.DepthFunc = toD3DCompareOp(m_depthOp);
+    dsDesc.StencilEnable = m_stencilTest;
+    if (m_stencilTest) {
+        dsDesc.StencilReadMask = UINT8(m_stencilReadMask);
+        dsDesc.StencilWriteMask = UINT8(m_stencilWriteMask);
+        dsDesc.FrontFace.StencilFailOp = toD3DStencilOp(m_stencilFront.failOp);
+        dsDesc.FrontFace.StencilDepthFailOp = toD3DStencilOp(m_stencilFront.depthFailOp);
+        dsDesc.FrontFace.StencilPassOp = toD3DStencilOp(m_stencilFront.passOp);
+        dsDesc.FrontFace.StencilFunc = toD3DCompareOp(m_stencilFront.compareOp);
+        dsDesc.BackFace.StencilFailOp = toD3DStencilOp(m_stencilBack.failOp);
+        dsDesc.BackFace.StencilDepthFailOp = toD3DStencilOp(m_stencilBack.depthFailOp);
+        dsDesc.BackFace.StencilPassOp = toD3DStencilOp(m_stencilBack.passOp);
+        dsDesc.BackFace.StencilFunc = toD3DCompareOp(m_stencilBack.compareOp);
+    }
+    hr = rhiD->dev->CreateDepthStencilState(&dsDesc, &dsState);
+    if (FAILED(hr)) {
+        qWarning("Failed to create depth-stencil state: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    D3D11_BLEND_DESC blendDesc;
+    memset(&blendDesc, 0, sizeof(blendDesc));
+    blendDesc.IndependentBlendEnable = m_targetBlends.count() > 1;
+    for (int i = 0, ie = m_targetBlends.count(); i != ie; ++i) {
+        const QRhiGraphicsPipeline::TargetBlend &b(m_targetBlends[i]);
+        D3D11_RENDER_TARGET_BLEND_DESC blend;
+        memset(&blend, 0, sizeof(blend));
+        blend.BlendEnable = b.enable;
+        blend.SrcBlend = toD3DBlendFactor(b.srcColor);
+        blend.DestBlend = toD3DBlendFactor(b.dstColor);
+        blend.BlendOp = toD3DBlendOp(b.opColor);
+        blend.SrcBlendAlpha = toD3DBlendFactor(b.srcAlpha);
+        blend.DestBlendAlpha = toD3DBlendFactor(b.dstAlpha);
+        blend.BlendOpAlpha = toD3DBlendOp(b.opAlpha);
+        blend.RenderTargetWriteMask = toD3DColorWriteMask(b.colorWrite);
+        blendDesc.RenderTarget[i] = blend;
+    }
+    if (m_targetBlends.isEmpty()) {
+        D3D11_RENDER_TARGET_BLEND_DESC blend;
+        memset(&blend, 0, sizeof(blend));
+        blend.RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
+        blendDesc.RenderTarget[0] = blend;
+    }
+    hr = rhiD->dev->CreateBlendState(&blendDesc, &blendState);
+    if (FAILED(hr)) {
+        qWarning("Failed to create blend state: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    QByteArray vsByteCode;
+    for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+        auto cacheIt = rhiD->m_shaderCache.constFind(shaderStage);
+        if (cacheIt != rhiD->m_shaderCache.constEnd()) {
+            switch (shaderStage.type()) {
+            case QRhiShaderStage::Vertex:
+                vs = static_cast<ID3D11VertexShader *>(cacheIt->s);
+                vs->AddRef();
+                vsByteCode = cacheIt->bytecode;
+                break;
+            case QRhiShaderStage::Fragment:
+                fs = static_cast<ID3D11PixelShader *>(cacheIt->s);
+                fs->AddRef();
+                break;
+            default:
+                break;
+            }
+        } else {
+            QString error;
+            const QByteArray bytecode = compileHlslShaderSource(shaderStage.shader(), shaderStage.shaderVariant(), &error);
+            if (bytecode.isEmpty()) {
+                qWarning("HLSL shader compilation failed: %s", qPrintable(error));
+                return false;
+            }
+
+            if (rhiD->m_shaderCache.count() >= QRhiD3D11::MAX_SHADER_CACHE_ENTRIES) {
+                // Use the simplest strategy: too many cached shaders -> drop them all.
+                rhiD->clearShaderCache();
+            }
+
+            switch (shaderStage.type()) {
+            case QRhiShaderStage::Vertex:
+                hr = rhiD->dev->CreateVertexShader(bytecode.constData(), SIZE_T(bytecode.size()), nullptr, &vs);
+                if (FAILED(hr)) {
+                    qWarning("Failed to create vertex shader: %s", qPrintable(comErrorMessage(hr)));
+                    return false;
+                }
+                vsByteCode = bytecode;
+                rhiD->m_shaderCache.insert(shaderStage, QRhiD3D11::Shader(vs, bytecode));
+                vs->AddRef();
+                break;
+            case QRhiShaderStage::Fragment:
+                hr = rhiD->dev->CreatePixelShader(bytecode.constData(), SIZE_T(bytecode.size()), nullptr, &fs);
+                if (FAILED(hr)) {
+                    qWarning("Failed to create pixel shader: %s", qPrintable(comErrorMessage(hr)));
+                    return false;
+                }
+                rhiD->m_shaderCache.insert(shaderStage, QRhiD3D11::Shader(fs, bytecode));
+                fs->AddRef();
+                break;
+            default:
+                break;
+            }
+        }
+    }
+
+    d3dTopology = toD3DTopology(m_topology);
+
+    if (!vsByteCode.isEmpty()) {
+        QVarLengthArray<D3D11_INPUT_ELEMENT_DESC, 4> inputDescs;
+        for (auto it = m_vertexInputLayout.cbeginAttributes(), itEnd = m_vertexInputLayout.cendAttributes();
+             it != itEnd; ++it)
+        {
+            D3D11_INPUT_ELEMENT_DESC desc;
+            memset(&desc, 0, sizeof(desc));
+            // the output from SPIRV-Cross uses TEXCOORD<location> as the semantic
+            desc.SemanticName = "TEXCOORD";
+            desc.SemanticIndex = UINT(it->location());
+            desc.Format = toD3DAttributeFormat(it->format());
+            desc.InputSlot = UINT(it->binding());
+            desc.AlignedByteOffset = it->offset();
+            const QRhiVertexInputBinding *inputBinding = m_vertexInputLayout.bindingAt(it->binding());
+            if (inputBinding->classification() == QRhiVertexInputBinding::PerInstance) {
+                desc.InputSlotClass = D3D11_INPUT_PER_INSTANCE_DATA;
+                desc.InstanceDataStepRate = UINT(inputBinding->instanceStepRate());
+            } else {
+                desc.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+            }
+            inputDescs.append(desc);
+        }
+        hr = rhiD->dev->CreateInputLayout(inputDescs.constData(), UINT(inputDescs.count()),
+                                          vsByteCode, SIZE_T(vsByteCode.size()), &inputLayout);
+        if (FAILED(hr)) {
+            qWarning("Failed to create input layout: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+    }
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QD3D11ComputePipeline::QD3D11ComputePipeline(QRhiImplementation *rhi)
+    : QRhiComputePipeline(rhi)
+{
+}
+
+QD3D11ComputePipeline::~QD3D11ComputePipeline()
+{
+    release();
+}
+
+void QD3D11ComputePipeline::release()
+{
+    QRHI_RES_RHI(QRhiD3D11);
+
+    if (!cs)
+        return;
+
+    cs->Release();
+    cs = nullptr;
+
+    rhiD->unregisterResource(this);
+}
+
+bool QD3D11ComputePipeline::build()
+{
+    if (cs)
+        release();
+
+    QRHI_RES_RHI(QRhiD3D11);
+
+    auto cacheIt = rhiD->m_shaderCache.constFind(m_shaderStage);
+    if (cacheIt != rhiD->m_shaderCache.constEnd()) {
+        cs = static_cast<ID3D11ComputeShader *>(cacheIt->s);
+    } else {
+        QString error;
+        const QByteArray bytecode = compileHlslShaderSource(m_shaderStage.shader(), m_shaderStage.shaderVariant(), &error);
+        if (bytecode.isEmpty()) {
+            qWarning("HLSL compute shader compilation failed: %s", qPrintable(error));
+            return false;
+        }
+
+        HRESULT hr = rhiD->dev->CreateComputeShader(bytecode.constData(), SIZE_T(bytecode.size()), nullptr, &cs);
+        if (FAILED(hr)) {
+            qWarning("Failed to create compute shader: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+
+        if (rhiD->m_shaderCache.count() >= QRhiD3D11::MAX_SHADER_CACHE_ENTRIES)
+            rhiD->clearShaderCache();
+
+        rhiD->m_shaderCache.insert(m_shaderStage, QRhiD3D11::Shader(cs, bytecode));
+    }
+
+    cs->AddRef();
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QD3D11CommandBuffer::QD3D11CommandBuffer(QRhiImplementation *rhi)
+    : QRhiCommandBuffer(rhi)
+{
+    resetState();
+}
+
+QD3D11CommandBuffer::~QD3D11CommandBuffer()
+{
+    release();
+}
+
+void QD3D11CommandBuffer::release()
+{
+    // nothing to do here
+}
+
+QD3D11SwapChain::QD3D11SwapChain(QRhiImplementation *rhi)
+    : QRhiSwapChain(rhi),
+      rt(rhi),
+      cb(rhi)
+{
+    backBufferTex = nullptr;
+    backBufferRtv = nullptr;
+    for (int i = 0; i < BUFFER_COUNT; ++i) {
+        msaaTex[i] = nullptr;
+        msaaRtv[i] = nullptr;
+        timestampActive[i] = false;
+        timestampDisjointQuery[i] = nullptr;
+        timestampQuery[2 * i] = nullptr;
+        timestampQuery[2 * i + 1] = nullptr;
+    }
+}
+
+QD3D11SwapChain::~QD3D11SwapChain()
+{
+    release();
+}
+
+void QD3D11SwapChain::releaseBuffers()
+{
+    if (backBufferRtv) {
+        backBufferRtv->Release();
+        backBufferRtv = nullptr;
+    }
+    if (backBufferTex) {
+        backBufferTex->Release();
+        backBufferTex = nullptr;
+    }
+    for (int i = 0; i < BUFFER_COUNT; ++i) {
+        if (msaaRtv[i]) {
+            msaaRtv[i]->Release();
+            msaaRtv[i] = nullptr;
+        }
+        if (msaaTex[i]) {
+            msaaTex[i]->Release();
+            msaaTex[i] = nullptr;
+        }
+    }
+}
+
+void QD3D11SwapChain::release()
+{
+    if (!swapChain)
+        return;
+
+    releaseBuffers();
+
+    for (int i = 0; i < BUFFER_COUNT; ++i) {
+        if (timestampDisjointQuery[i]) {
+            timestampDisjointQuery[i]->Release();
+            timestampDisjointQuery[i] = nullptr;
+        }
+        for (int j = 0; j < 2; ++j) {
+            const int idx = BUFFER_COUNT * i + j;
+            if (timestampQuery[idx]) {
+                timestampQuery[idx]->Release();
+                timestampQuery[idx] = nullptr;
+            }
+        }
+    }
+
+    swapChain->Release();
+    swapChain = nullptr;
+
+    QRHI_PROF;
+    QRHI_PROF_F(releaseSwapChain(this));
+
+    QRHI_RES_RHI(QRhiD3D11);
+    rhiD->unregisterResource(this);
+}
+
+QRhiCommandBuffer *QD3D11SwapChain::currentFrameCommandBuffer()
+{
+    return &cb;
+}
+
+QRhiRenderTarget *QD3D11SwapChain::currentFrameRenderTarget()
+{
+    return &rt;
+}
+
+QSize QD3D11SwapChain::surfacePixelSize()
+{
+    Q_ASSERT(m_window);
+    return m_window->size() * m_window->devicePixelRatio();
+}
+
+QRhiRenderPassDescriptor *QD3D11SwapChain::newCompatibleRenderPassDescriptor()
+{
+    return new QD3D11RenderPassDescriptor(m_rhi);
+}
+
+bool QD3D11SwapChain::newColorBuffer(const QSize &size, DXGI_FORMAT format, DXGI_SAMPLE_DESC sampleDesc,
+                                     ID3D11Texture2D **tex, ID3D11RenderTargetView **rtv) const
+{
+    D3D11_TEXTURE2D_DESC desc;
+    memset(&desc, 0, sizeof(desc));
+    desc.Width = UINT(size.width());
+    desc.Height = UINT(size.height());
+    desc.MipLevels = 1;
+    desc.ArraySize = 1;
+    desc.Format = format;
+    desc.SampleDesc = sampleDesc;
+    desc.Usage = D3D11_USAGE_DEFAULT;
+    desc.BindFlags = D3D11_BIND_RENDER_TARGET;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    HRESULT hr = rhiD->dev->CreateTexture2D(&desc, nullptr, tex);
+    if (FAILED(hr)) {
+        qWarning("Failed to create color buffer texture: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
+    memset(&rtvDesc, 0, sizeof(rtvDesc));
+    rtvDesc.Format = format;
+    rtvDesc.ViewDimension = sampleDesc.Count > 1 ? D3D11_RTV_DIMENSION_TEXTURE2DMS : D3D11_RTV_DIMENSION_TEXTURE2D;
+    hr = rhiD->dev->CreateRenderTargetView(*tex, &rtvDesc, rtv);
+    if (FAILED(hr)) {
+        qWarning("Failed to create color buffer rtv: %s", qPrintable(comErrorMessage(hr)));
+        (*tex)->Release();
+        *tex = nullptr;
+        return false;
+    }
+
+    return true;
+}
+
+bool QD3D11SwapChain::buildOrResize()
+{
+    // Can be called multiple times due to window resizes - that is not the
+    // same as a simple release+build (as with other resources). Just need to
+    // resize the buffers then.
+
+    const bool needsRegistration = !window || window != m_window;
+
+    // except if the window actually changes
+    if (window && window != m_window)
+        release();
+
+    window = m_window;
+    m_currentPixelSize = surfacePixelSize();
+    pixelSize = m_currentPixelSize;
+
+    if (pixelSize.isEmpty())
+        return false;
+
+    colorFormat = DXGI_FORMAT_R8G8B8A8_UNORM;
+    const DXGI_FORMAT srgbAdjustedFormat = m_flags.testFlag(sRGB) ?
+                DXGI_FORMAT_R8G8B8A8_UNORM_SRGB : DXGI_FORMAT_R8G8B8A8_UNORM;
+
+    const UINT swapChainFlags = 0;
+
+    QRHI_RES_RHI(QRhiD3D11);
+    bool useFlipDiscard = rhiD->hasDxgi2 && rhiD->supportsFlipDiscardSwapchain;
+    if (!swapChain) {
+        HWND hwnd = reinterpret_cast<HWND>(window->winId());
+        sampleDesc = rhiD->effectiveSampleCount(m_sampleCount);
+
+        // Take a shortcut for alpha: our QWindow is OpenGLSurface so whatever
+        // the platform plugin does to enable transparency for OpenGL window
+        // will be sufficient for us too on the legacy (DISCARD) path. For
+        // FLIP_DISCARD we'd need to use DirectComposition (create a
+        // IDCompositionDevice/Target/Visual), avoid that for now.
+        if (m_flags.testFlag(SurfaceHasPreMulAlpha) || m_flags.testFlag(SurfaceHasNonPreMulAlpha)) {
+            useFlipDiscard = false;
+            if (window->requestedFormat().alphaBufferSize() <= 0)
+                qWarning("Swapchain says surface has alpha but the window has no alphaBufferSize set. "
+                         "This may lead to problems.");
+        }
+
+        HRESULT hr;
+        if (useFlipDiscard) {
+            // We use FLIP_DISCARD which implies a buffer count of 2 (as opposed to the
+            // old DISCARD with back buffer count == 1). This makes no difference for
+            // the rest of the stuff except that automatic MSAA is unsupported and
+            // needs to be implemented via a custom multisample render target and an
+            // explicit resolve.
+
+            DXGI_SWAP_CHAIN_DESC1 desc;
+            memset(&desc, 0, sizeof(desc));
+            desc.Width = UINT(pixelSize.width());
+            desc.Height = UINT(pixelSize.height());
+            desc.Format = colorFormat;
+            desc.SampleDesc.Count = 1;
+            desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
+            desc.BufferCount = BUFFER_COUNT;
+            desc.Scaling = DXGI_SCALING_STRETCH;
+            desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
+            // Do not bother with AlphaMode, if won't work unless we go through
+            // DirectComposition. Instead, we just take the other (DISCARD)
+            // path for now when alpha is requested.
+            desc.Flags = swapChainFlags;
+
+            IDXGISwapChain1 *sc1;
+            hr = static_cast<IDXGIFactory2 *>(rhiD->dxgiFactory)->CreateSwapChainForHwnd(rhiD->dev, hwnd, &desc,
+                                                                                         nullptr, nullptr, &sc1);
+            if (SUCCEEDED(hr))
+                swapChain = sc1;
+        } else {
+            // Windows 7 for instance. Use DISCARD mode. Regardless, keep on
+            // using our manual resolve for symmetry with the FLIP_DISCARD code
+            // path when MSAA is requested.
+
+            DXGI_SWAP_CHAIN_DESC desc;
+            memset(&desc, 0, sizeof(desc));
+            desc.BufferDesc.Width = UINT(pixelSize.width());
+            desc.BufferDesc.Height = UINT(pixelSize.height());
+            desc.BufferDesc.RefreshRate.Numerator = 60;
+            desc.BufferDesc.RefreshRate.Denominator = 1;
+            desc.BufferDesc.Format = colorFormat;
+            desc.SampleDesc.Count = 1;
+            desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
+            desc.BufferCount = 1;
+            desc.OutputWindow = hwnd;
+            desc.Windowed = true;
+            desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
+            desc.Flags = swapChainFlags;
+
+            hr = rhiD->dxgiFactory->CreateSwapChain(rhiD->dev, &desc, &swapChain);
+        }
+        if (FAILED(hr)) {
+            qWarning("Failed to create D3D11 swapchain: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+        rhiD->dxgiFactory->MakeWindowAssociation(hwnd, DXGI_MWA_NO_ALT_ENTER);
+    } else {
+        releaseBuffers();
+        const UINT count = useFlipDiscard ? BUFFER_COUNT : 1;
+        HRESULT hr = swapChain->ResizeBuffers(count, UINT(pixelSize.width()), UINT(pixelSize.height()),
+                                              colorFormat, swapChainFlags);
+        if (hr == DXGI_ERROR_DEVICE_REMOVED || hr == DXGI_ERROR_DEVICE_RESET) {
+            qWarning("Device loss detected in ResizeBuffers()");
+            rhiD->deviceLost = true;
+            return false;
+        } else if (FAILED(hr)) {
+            qWarning("Failed to resize D3D11 swapchain: %s", qPrintable(comErrorMessage(hr)));
+            return false;
+        }
+    }
+
+    // This looks odd (for FLIP_DISCARD, esp. compared with backends for Vulkan
+    // & co.) but the backbuffer is always at index 0, with magic underneath.
+    // Some explanation from
+    // https://docs.microsoft.com/en-us/windows/win32/direct3ddxgi/dxgi-1-4-improvements
+    //
+    // "In Direct3D 11, applications could call GetBuffer( 0, … ) only once.
+    // Every call to Present implicitly changed the resource identity of the
+    // returned interface. Direct3D 12 no longer supports that implicit
+    // resource identity change, due to the CPU overhead required and the
+    // flexible resource descriptor design. As a result, the application must
+    // manually call GetBuffer for every each buffer created with the
+    // swapchain."
+
+    // So just query index 0 once (per resize) and be done with it.
+    HRESULT hr = swapChain->GetBuffer(0, IID_ID3D11Texture2D, reinterpret_cast<void **>(&backBufferTex));
+    if (FAILED(hr)) {
+        qWarning("Failed to query swapchain backbuffer: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+    D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
+    memset(&rtvDesc, 0, sizeof(rtvDesc));
+    rtvDesc.Format = srgbAdjustedFormat;
+    rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
+    hr = rhiD->dev->CreateRenderTargetView(backBufferTex, &rtvDesc, &backBufferRtv);
+    if (FAILED(hr)) {
+        qWarning("Failed to create rtv for swapchain backbuffer: %s", qPrintable(comErrorMessage(hr)));
+        return false;
+    }
+
+    // Try to reduce stalls by having a dedicated MSAA texture per swapchain buffer.
+    for (int i = 0; i < BUFFER_COUNT; ++i) {
+        if (sampleDesc.Count > 1) {
+            if (!newColorBuffer(pixelSize, srgbAdjustedFormat, sampleDesc, &msaaTex[i], &msaaRtv[i]))
+                return false;
+        }
+    }
+
+    if (m_depthStencil && m_depthStencil->sampleCount() != m_sampleCount) {
+        qWarning("Depth-stencil buffer's sampleCount (%d) does not match color buffers' sample count (%d). Expect problems.",
+                 m_depthStencil->sampleCount(), m_sampleCount);
+    }
+    if (m_depthStencil && m_depthStencil->pixelSize() != pixelSize) {
+        if (m_depthStencil->flags().testFlag(QRhiRenderBuffer::UsedWithSwapChainOnly)) {
+            m_depthStencil->setPixelSize(pixelSize);
+            if (!m_depthStencil->build())
+                qWarning("Failed to rebuild swapchain's associated depth-stencil buffer for size %dx%d",
+                         pixelSize.width(), pixelSize.height());
+        } else {
+            qWarning("Depth-stencil buffer's size (%dx%d) does not match the surface size (%dx%d). Expect problems.",
+                     m_depthStencil->pixelSize().width(), m_depthStencil->pixelSize().height(),
+                     pixelSize.width(), pixelSize.height());
+        }
+    }
+
+    currentFrameSlot = 0;
+    frameCount = 0;
+    ds = m_depthStencil ? QRHI_RES(QD3D11RenderBuffer, m_depthStencil) : nullptr;
+    swapInterval = m_flags.testFlag(QRhiSwapChain::NoVSync) ? 0 : 1;
+
+    QD3D11ReferenceRenderTarget *rtD = QRHI_RES(QD3D11ReferenceRenderTarget, &rt);
+    rtD->d.rp = QRHI_RES(QD3D11RenderPassDescriptor, m_renderPassDesc);
+    rtD->d.pixelSize = pixelSize;
+    rtD->d.dpr = float(window->devicePixelRatio());
+    rtD->d.sampleCount = int(sampleDesc.Count);
+    rtD->d.colorAttCount = 1;
+    rtD->d.dsAttCount = m_depthStencil ? 1 : 0;
+
+    QRHI_PROF;
+    QRHI_PROF_F(resizeSwapChain(this, BUFFER_COUNT, sampleDesc.Count > 1 ? BUFFER_COUNT : 0, int(sampleDesc.Count)));
+    if (rhiP) {
+        D3D11_QUERY_DESC queryDesc;
+        memset(&queryDesc, 0, sizeof(queryDesc));
+        for (int i = 0; i < BUFFER_COUNT; ++i) {
+            if (!timestampDisjointQuery[i]) {
+                queryDesc.Query = D3D11_QUERY_TIMESTAMP_DISJOINT;
+                HRESULT hr = rhiD->dev->CreateQuery(&queryDesc, &timestampDisjointQuery[i]);
+                if (FAILED(hr)) {
+                    qWarning("Failed to create timestamp disjoint query: %s", qPrintable(comErrorMessage(hr)));
+                    break;
+                }
+            }
+            queryDesc.Query = D3D11_QUERY_TIMESTAMP;
+            for (int j = 0; j < 2; ++j) {
+                const int idx = BUFFER_COUNT * i + j; // one pair per buffer (frame)
+                if (!timestampQuery[idx]) {
+                    HRESULT hr = rhiD->dev->CreateQuery(&queryDesc, &timestampQuery[idx]);
+                    if (FAILED(hr)) {
+                        qWarning("Failed to create timestamp query: %s", qPrintable(comErrorMessage(hr)));
+                        break;
+                    }
+                }
+            }
+        }
+        // timestamp queries are optional so we can go on even if they failed
+    }
+
+    if (needsRegistration)
+        rhiD->registerResource(this);
+
+    return true;
+}
+
+void QRhiD3D11::DeviceCurse::initResources()
+{
+    framesLeft = framesToActivate;
+
+    HRESULT hr = q->dev->CreateComputeShader(g_killDeviceByTimingOut, sizeof(g_killDeviceByTimingOut), nullptr, &cs);
+    if (FAILED(hr)) {
+        qWarning("Failed to create compute shader: %s", qPrintable(comErrorMessage(hr)));
+        return;
+    }
+}
+
+void QRhiD3D11::DeviceCurse::releaseResources()
+{
+    if (cs) {
+        cs->Release();
+        cs = nullptr;
+    }
+}
+
+void QRhiD3D11::DeviceCurse::activate()
+{
+    if (!cs)
+        return;
+
+    qDebug("Activating Curse. Goodbye Cruel World.");
+
+    q->context->CSSetShader(cs, nullptr, 0);
+    q->context->Dispatch(256, 1, 1);
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qrhid3d11_p.h b/src/gui/rhi/qrhid3d11_p.h
new file mode 100644
index 0000000000..5df1843b1e
--- /dev/null
+++ b/src/gui/rhi/qrhid3d11_p.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHID3D11_H
+#define QRHID3D11_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qrhi_p.h>
+
+// no d3d includes here, to prevent precompiled header mess (due to this being
+// a public header)
+
+QT_BEGIN_NAMESPACE
+
+struct Q_GUI_EXPORT QRhiD3D11InitParams : public QRhiInitParams
+{
+    bool enableDebugLayer = false;
+
+    int framesUntilKillingDeviceViaTdr = -1;
+    bool repeatDeviceKill = false;
+};
+
+struct Q_GUI_EXPORT QRhiD3D11NativeHandles : public QRhiNativeHandles
+{
+    void *dev = nullptr;
+    void *context = nullptr;
+};
+
+struct Q_GUI_EXPORT QRhiD3D11TextureNativeHandles : public QRhiNativeHandles
+{
+    void *texture = nullptr; // ID3D11Texture2D*
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhid3d11_p_p.h b/src/gui/rhi/qrhid3d11_p_p.h
new file mode 100644
index 0000000000..26de34ae0a
--- /dev/null
+++ b/src/gui/rhi/qrhid3d11_p_p.h
@@ -0,0 +1,725 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHID3D11_P_H
+#define QRHID3D11_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrhid3d11_p.h"
+#include "qrhi_p_p.h"
+#include "qshaderdescription_p.h"
+#include <QWindow>
+
+#include <d3d11_1.h>
+#include <dxgi1_3.h>
+
+QT_BEGIN_NAMESPACE
+
+struct QD3D11Buffer : public QRhiBuffer
+{
+    QD3D11Buffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size);
+    ~QD3D11Buffer();
+    void release() override;
+    bool build() override;
+
+    ID3D11UnorderedAccessView *unorderedAccessView();
+
+    ID3D11Buffer *buffer = nullptr;
+    QByteArray dynBuf;
+    bool hasPendingDynamicUpdates = false;
+    ID3D11UnorderedAccessView *uav = nullptr;
+    uint generation = 0;
+    friend class QRhiD3D11;
+};
+
+struct QD3D11RenderBuffer : public QRhiRenderBuffer
+{
+    QD3D11RenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                       int sampleCount, QRhiRenderBuffer::Flags flags);
+    ~QD3D11RenderBuffer();
+    void release() override;
+    bool build() override;
+    QRhiTexture::Format backingFormat() const override;
+
+    ID3D11Texture2D *tex = nullptr;
+    ID3D11DepthStencilView *dsv = nullptr;
+    ID3D11RenderTargetView *rtv = nullptr;
+    DXGI_FORMAT dxgiFormat;
+    DXGI_SAMPLE_DESC sampleDesc;
+    friend class QRhiD3D11;
+};
+
+struct QD3D11Texture : public QRhiTexture
+{
+    QD3D11Texture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                  int sampleCount, Flags flags);
+    ~QD3D11Texture();
+    void release() override;
+    bool build() override;
+    bool buildFrom(const QRhiNativeHandles *src) override;
+    const QRhiNativeHandles *nativeHandles() override;
+
+    bool prepareBuild(QSize *adjustedSize = nullptr);
+    bool finishBuild();
+    ID3D11UnorderedAccessView *unorderedAccessViewForLevel(int level);
+
+    ID3D11Texture2D *tex = nullptr;
+    bool owns = true;
+    ID3D11ShaderResourceView *srv = nullptr;
+    DXGI_FORMAT dxgiFormat;
+    uint mipLevelCount = 0;
+    DXGI_SAMPLE_DESC sampleDesc;
+    QRhiD3D11TextureNativeHandles nativeHandlesStruct;
+    ID3D11UnorderedAccessView *perLevelViews[QRhi::MAX_LEVELS];
+    uint generation = 0;
+    friend class QRhiD3D11;
+};
+
+struct QD3D11Sampler : public QRhiSampler
+{
+    QD3D11Sampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                  AddressMode u, AddressMode v);
+    ~QD3D11Sampler();
+    void release() override;
+    bool build() override;
+
+    ID3D11SamplerState *samplerState = nullptr;
+    uint generation = 0;
+    friend class QRhiD3D11;
+};
+
+struct QD3D11RenderPassDescriptor : public QRhiRenderPassDescriptor
+{
+    QD3D11RenderPassDescriptor(QRhiImplementation *rhi);
+    ~QD3D11RenderPassDescriptor();
+    void release() override;
+};
+
+struct QD3D11RenderTargetData
+{
+    QD3D11RenderTargetData(QRhiImplementation *)
+    {
+        for (int i = 0; i < MAX_COLOR_ATTACHMENTS; ++i)
+            rtv[i] = nullptr;
+    }
+
+    QD3D11RenderPassDescriptor *rp = nullptr;
+    QSize pixelSize;
+    float dpr = 1;
+    int sampleCount = 1;
+    int colorAttCount = 0;
+    int dsAttCount = 0;
+
+    static const int MAX_COLOR_ATTACHMENTS = 8;
+    ID3D11RenderTargetView *rtv[MAX_COLOR_ATTACHMENTS];
+    ID3D11DepthStencilView *dsv = nullptr;
+};
+
+struct QD3D11ReferenceRenderTarget : public QRhiRenderTarget
+{
+    QD3D11ReferenceRenderTarget(QRhiImplementation *rhi);
+    ~QD3D11ReferenceRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QD3D11RenderTargetData d;
+};
+
+struct QD3D11TextureRenderTarget : public QRhiTextureRenderTarget
+{
+    QD3D11TextureRenderTarget(QRhiImplementation *rhi, const QRhiTextureRenderTargetDescription &desc, Flags flags);
+    ~QD3D11TextureRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool build() override;
+
+    QD3D11RenderTargetData d;
+    bool ownsRtv[QD3D11RenderTargetData::MAX_COLOR_ATTACHMENTS];
+    ID3D11RenderTargetView *rtv[QD3D11RenderTargetData::MAX_COLOR_ATTACHMENTS];
+    bool ownsDsv = false;
+    ID3D11DepthStencilView *dsv = nullptr;
+    friend class QRhiD3D11;
+};
+
+struct QD3D11ShaderResourceBindings : public QRhiShaderResourceBindings
+{
+    QD3D11ShaderResourceBindings(QRhiImplementation *rhi);
+    ~QD3D11ShaderResourceBindings();
+    void release() override;
+    bool build() override;
+
+    QVarLengthArray<QRhiShaderResourceBinding, 8> sortedBindings;
+    uint generation = 0;
+
+    // Keep track of the generation number of each referenced QRhi* to be able
+    // to detect that the batched bindings are out of date.
+    struct BoundUniformBufferData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundSampledTextureData {
+        quint64 texId;
+        uint texGeneration;
+        quint64 samplerId;
+        uint samplerGeneration;
+    };
+    struct BoundStorageImageData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundStorageBufferData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundResourceData {
+        union {
+            BoundUniformBufferData ubuf;
+            BoundSampledTextureData stex;
+            BoundStorageImageData simage;
+            BoundStorageBufferData sbuf;
+        };
+    };
+    QVarLengthArray<BoundResourceData, 8> boundResourceData;
+
+    QRhiBatchedBindings<ID3D11Buffer *> vsubufs;
+    QRhiBatchedBindings<UINT> vsubufoffsets;
+    QRhiBatchedBindings<UINT> vsubufsizes;
+
+    QRhiBatchedBindings<ID3D11Buffer *> fsubufs;
+    QRhiBatchedBindings<UINT> fsubufoffsets;
+    QRhiBatchedBindings<UINT> fsubufsizes;
+
+    QRhiBatchedBindings<ID3D11Buffer *> csubufs;
+    QRhiBatchedBindings<UINT> csubufoffsets;
+    QRhiBatchedBindings<UINT> csubufsizes;
+
+    QRhiBatchedBindings<ID3D11SamplerState *> vssamplers;
+    QRhiBatchedBindings<ID3D11ShaderResourceView *> vsshaderresources;
+
+    QRhiBatchedBindings<ID3D11SamplerState *> fssamplers;
+    QRhiBatchedBindings<ID3D11ShaderResourceView *> fsshaderresources;
+
+    QRhiBatchedBindings<ID3D11SamplerState *> cssamplers;
+    QRhiBatchedBindings<ID3D11ShaderResourceView *> csshaderresources;
+
+    QRhiBatchedBindings<ID3D11UnorderedAccessView *> csUAVs;
+
+    friend class QRhiD3D11;
+};
+
+Q_DECLARE_TYPEINFO(QD3D11ShaderResourceBindings::BoundResourceData, Q_MOVABLE_TYPE);
+
+struct QD3D11GraphicsPipeline : public QRhiGraphicsPipeline
+{
+    QD3D11GraphicsPipeline(QRhiImplementation *rhi);
+    ~QD3D11GraphicsPipeline();
+    void release() override;
+    bool build() override;
+
+    ID3D11DepthStencilState *dsState = nullptr;
+    ID3D11BlendState *blendState = nullptr;
+    ID3D11VertexShader *vs = nullptr;
+    ID3D11PixelShader *fs = nullptr;
+    ID3D11InputLayout *inputLayout = nullptr;
+    D3D11_PRIMITIVE_TOPOLOGY d3dTopology = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
+    ID3D11RasterizerState *rastState = nullptr;
+    uint generation = 0;
+    friend class QRhiD3D11;
+};
+
+struct QD3D11ComputePipeline : public QRhiComputePipeline
+{
+    QD3D11ComputePipeline(QRhiImplementation *rhi);
+    ~QD3D11ComputePipeline();
+    void release() override;
+    bool build() override;
+
+    ID3D11ComputeShader *cs = nullptr;
+    uint generation = 0;
+    friend class QRhiD3D11;
+};
+
+struct QD3D11SwapChain;
+
+struct QD3D11CommandBuffer : public QRhiCommandBuffer
+{
+    QD3D11CommandBuffer(QRhiImplementation *rhi);
+    ~QD3D11CommandBuffer();
+    void release() override;
+
+    struct Command {
+        enum Cmd {
+            ResetShaderResources,
+            SetRenderTarget,
+            Clear,
+            Viewport,
+            Scissor,
+            BindVertexBuffers,
+            BindIndexBuffer,
+            BindGraphicsPipeline,
+            BindShaderResources,
+            StencilRef,
+            BlendConstants,
+            Draw,
+            DrawIndexed,
+            UpdateSubRes,
+            CopySubRes,
+            ResolveSubRes,
+            GenMip,
+            DebugMarkBegin,
+            DebugMarkEnd,
+            DebugMarkMsg,
+            BindComputePipeline,
+            Dispatch
+        };
+        enum ClearFlag { Color = 1, Depth = 2, Stencil = 4 };
+        Cmd cmd;
+
+        static const int MAX_UBUF_BINDINGS = 32; // should be D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT but 128 is a waste of space for our purposes
+
+        // QRhi*/QD3D11* references should be kept at minimum (so no
+        // QRhiTexture/Buffer/etc. pointers).
+        union {
+            struct {
+                QRhiRenderTarget *rt;
+            } setRenderTarget;
+            struct {
+                QRhiRenderTarget *rt;
+                int mask;
+                float c[4];
+                float d;
+                quint32 s;
+            } clear;
+            struct {
+                float x, y, w, h;
+                float d0, d1;
+            } viewport;
+            struct {
+                int x, y, w, h;
+            } scissor;
+            struct {
+                int startSlot;
+                int slotCount;
+                ID3D11Buffer *buffers[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+                UINT offsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+                UINT strides[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+            } bindVertexBuffers;
+            struct {
+                ID3D11Buffer *buffer;
+                quint32 offset;
+                DXGI_FORMAT format;
+            } bindIndexBuffer;
+            struct {
+                QD3D11GraphicsPipeline *ps;
+            } bindGraphicsPipeline;
+            struct {
+                QD3D11ShaderResourceBindings *srb;
+                bool offsetOnlyChange;
+                int dynamicOffsetCount;
+                uint dynamicOffsetPairs[MAX_UBUF_BINDINGS * 2]; // binding, offsetInConstants
+            } bindShaderResources;
+            struct {
+                QD3D11GraphicsPipeline *ps;
+                quint32 ref;
+            } stencilRef;
+            struct {
+                QD3D11GraphicsPipeline *ps;
+                float c[4];
+            } blendConstants;
+            struct {
+                QD3D11GraphicsPipeline *ps;
+                quint32 vertexCount;
+                quint32 instanceCount;
+                quint32 firstVertex;
+                quint32 firstInstance;
+            } draw;
+            struct {
+                QD3D11GraphicsPipeline *ps;
+                quint32 indexCount;
+                quint32 instanceCount;
+                quint32 firstIndex;
+                qint32 vertexOffset;
+                quint32 firstInstance;
+            } drawIndexed;
+            struct {
+                ID3D11Resource *dst;
+                UINT dstSubRes;
+                bool hasDstBox;
+                D3D11_BOX dstBox;
+                const void *src; // must come from retain*()
+                UINT srcRowPitch;
+            } updateSubRes;
+            struct {
+                ID3D11Resource *dst;
+                UINT dstSubRes;
+                UINT dstX;
+                UINT dstY;
+                ID3D11Resource *src;
+                UINT srcSubRes;
+                bool hasSrcBox;
+                D3D11_BOX srcBox;
+            } copySubRes;
+            struct {
+                ID3D11Resource *dst;
+                UINT dstSubRes;
+                ID3D11Resource *src;
+                UINT srcSubRes;
+                DXGI_FORMAT format;
+            } resolveSubRes;
+            struct {
+                ID3D11ShaderResourceView *srv;
+            } genMip;
+            struct {
+                char s[64];
+            } debugMark;
+            struct {
+                QD3D11ComputePipeline *ps;
+            } bindComputePipeline;
+            struct {
+                UINT x;
+                UINT y;
+                UINT z;
+            } dispatch;
+        } args;
+    };
+
+    enum PassType {
+        NoPass,
+        RenderPass,
+        ComputePass
+    };
+
+    QVector<Command> commands;
+    PassType recordingPass;
+    QRhiRenderTarget *currentTarget;
+    QRhiGraphicsPipeline *currentGraphicsPipeline;
+    QRhiComputePipeline *currentComputePipeline;
+    uint currentPipelineGeneration;
+    QRhiShaderResourceBindings *currentGraphicsSrb;
+    QRhiShaderResourceBindings *currentComputeSrb;
+    uint currentSrbGeneration;
+    ID3D11Buffer *currentIndexBuffer;
+    quint32 currentIndexOffset;
+    DXGI_FORMAT currentIndexFormat;
+    ID3D11Buffer *currentVertexBuffers[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+    quint32 currentVertexOffsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+
+    QVector<QByteArray> dataRetainPool;
+    QVector<QImage> imageRetainPool;
+
+    // relies heavily on implicit sharing (no copies of the actual data will be made)
+    const uchar *retainData(const QByteArray &data) {
+        dataRetainPool.append(data);
+        return reinterpret_cast<const uchar *>(dataRetainPool.constLast().constData());
+    }
+    const uchar *retainImage(const QImage &image) {
+        imageRetainPool.append(image);
+        return imageRetainPool.constLast().constBits();
+    }
+    void resetCommands() {
+        commands.clear();
+        dataRetainPool.clear();
+        imageRetainPool.clear();
+    }
+    void resetState() {
+        recordingPass = NoPass;
+        currentTarget = nullptr;
+        resetCommands();
+        resetCachedState();
+    }
+    void resetCachedState() {
+        currentGraphicsPipeline = nullptr;
+        currentComputePipeline = nullptr;
+        currentPipelineGeneration = 0;
+        resetCachedShaderResourceState();
+    }
+    void resetCachedShaderResourceState() {
+        currentGraphicsSrb = nullptr;
+        currentComputeSrb = nullptr;
+        currentSrbGeneration = 0;
+        currentIndexBuffer = nullptr;
+        currentIndexOffset = 0;
+        currentIndexFormat = DXGI_FORMAT_R16_UINT;
+        memset(currentVertexBuffers, 0, sizeof(currentVertexBuffers));
+        memset(currentVertexOffsets, 0, sizeof(currentVertexOffsets));
+    }
+};
+
+Q_DECLARE_TYPEINFO(QD3D11CommandBuffer::Command, Q_MOVABLE_TYPE);
+
+struct QD3D11SwapChain : public QRhiSwapChain
+{
+    QD3D11SwapChain(QRhiImplementation *rhi);
+    ~QD3D11SwapChain();
+    void release() override;
+
+    QRhiCommandBuffer *currentFrameCommandBuffer() override;
+    QRhiRenderTarget *currentFrameRenderTarget() override;
+
+    QSize surfacePixelSize() override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool buildOrResize() override;
+
+    void releaseBuffers();
+    bool newColorBuffer(const QSize &size, DXGI_FORMAT format, DXGI_SAMPLE_DESC sampleDesc,
+                        ID3D11Texture2D **tex, ID3D11RenderTargetView **rtv) const;
+
+    QWindow *window = nullptr;
+    QSize pixelSize;
+    QD3D11ReferenceRenderTarget rt;
+    QD3D11CommandBuffer cb;
+    DXGI_FORMAT colorFormat;
+    IDXGISwapChain *swapChain = nullptr;
+    static const int BUFFER_COUNT = 2;
+    ID3D11Texture2D *backBufferTex;
+    ID3D11RenderTargetView *backBufferRtv;
+    ID3D11Texture2D *msaaTex[BUFFER_COUNT];
+    ID3D11RenderTargetView *msaaRtv[BUFFER_COUNT];
+    DXGI_SAMPLE_DESC sampleDesc;
+    int currentFrameSlot = 0;
+    int frameCount = 0;
+    QD3D11RenderBuffer *ds = nullptr;
+    bool timestampActive[BUFFER_COUNT];
+    ID3D11Query *timestampDisjointQuery[BUFFER_COUNT];
+    ID3D11Query *timestampQuery[BUFFER_COUNT * 2];
+    UINT swapInterval = 1;
+};
+
+class QRhiD3D11 : public QRhiImplementation
+{
+public:
+    QRhiD3D11(QRhiD3D11InitParams *params, QRhiD3D11NativeHandles *importDevice = nullptr);
+
+    bool create(QRhi::Flags flags) override;
+    void destroy() override;
+
+    QRhiGraphicsPipeline *createGraphicsPipeline() override;
+    QRhiComputePipeline *createComputePipeline() override;
+    QRhiShaderResourceBindings *createShaderResourceBindings() override;
+    QRhiBuffer *createBuffer(QRhiBuffer::Type type,
+                             QRhiBuffer::UsageFlags usage,
+                             int size) override;
+    QRhiRenderBuffer *createRenderBuffer(QRhiRenderBuffer::Type type,
+                                         const QSize &pixelSize,
+                                         int sampleCount,
+                                         QRhiRenderBuffer::Flags flags) override;
+    QRhiTexture *createTexture(QRhiTexture::Format format,
+                               const QSize &pixelSize,
+                               int sampleCount,
+                               QRhiTexture::Flags flags) override;
+    QRhiSampler *createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                               QRhiSampler::Filter mipmapMode,
+                               QRhiSampler:: AddressMode u, QRhiSampler::AddressMode v) override;
+
+    QRhiTextureRenderTarget *createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                       QRhiTextureRenderTarget::Flags flags) override;
+
+    QRhiSwapChain *createSwapChain() override;
+    QRhi::FrameOpResult beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endOffscreenFrame(QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult finish() override;
+
+    void resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void beginPass(QRhiCommandBuffer *cb,
+                   QRhiRenderTarget *rt,
+                   const QColor &colorClearValue,
+                   const QRhiDepthStencilClearValue &depthStencilClearValue,
+                   QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void setGraphicsPipeline(QRhiCommandBuffer *cb,
+                             QRhiGraphicsPipeline *ps) override;
+
+    void setShaderResources(QRhiCommandBuffer *cb,
+                            QRhiShaderResourceBindings *srb,
+                            int dynamicOffsetCount,
+                            const QRhiCommandBuffer::DynamicOffset *dynamicOffsets) override;
+
+    void setVertexInput(QRhiCommandBuffer *cb,
+                        int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                        QRhiBuffer *indexBuf, quint32 indexOffset,
+                        QRhiCommandBuffer::IndexFormat indexFormat) override;
+
+    void setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport) override;
+    void setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor) override;
+    void setBlendConstants(QRhiCommandBuffer *cb, const QColor &c) override;
+    void setStencilRef(QRhiCommandBuffer *cb, quint32 refValue) override;
+
+    void draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+              quint32 instanceCount, quint32 firstVertex, quint32 firstInstance) override;
+
+    void drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                     quint32 instanceCount, quint32 firstIndex,
+                     qint32 vertexOffset, quint32 firstInstance) override;
+
+    void debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name) override;
+    void debugMarkEnd(QRhiCommandBuffer *cb) override;
+    void debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg) override;
+
+    void beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps) override;
+    void dispatch(QRhiCommandBuffer *cb, int x, int y, int z) override;
+
+    const QRhiNativeHandles *nativeHandles(QRhiCommandBuffer *cb) override;
+    void beginExternal(QRhiCommandBuffer *cb) override;
+    void endExternal(QRhiCommandBuffer *cb) override;
+
+    QVector<int> supportedSampleCounts() const override;
+    int ubufAlignment() const override;
+    bool isYUpInFramebuffer() const override;
+    bool isYUpInNDC() const override;
+    bool isClipDepthZeroToOne() const override;
+    QMatrix4x4 clipSpaceCorrMatrix() const override;
+    bool isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const override;
+    bool isFeatureSupported(QRhi::Feature feature) const override;
+    int resourceLimit(QRhi::ResourceLimit limit) const override;
+    const QRhiNativeHandles *nativeHandles() override;
+    void sendVMemStatsToProfiler() override;
+    bool makeThreadLocalNativeContextCurrent() override;
+    void releaseCachedResources() override;
+    bool isDeviceLost() const override;
+
+    void enqueueSubresUpload(QD3D11Texture *texD, QD3D11CommandBuffer *cbD,
+                             int layer, int level, const QRhiTextureSubresourceUploadDescription &subresDesc);
+    void enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates);
+    void updateShaderResourceBindings(QD3D11ShaderResourceBindings *srbD);
+    void executeBufferHostWritesForCurrentFrame(QD3D11Buffer *bufD);
+    void bindShaderResources(QD3D11ShaderResourceBindings *srbD,
+                             const uint *dynOfsPairs, int dynOfsPairCount,
+                             bool offsetOnlyChange);
+    void resetShaderResources();
+    void executeCommandBuffer(QD3D11CommandBuffer *cbD, QD3D11SwapChain *timestampSwapChain = nullptr);
+    DXGI_SAMPLE_DESC effectiveSampleCount(int sampleCount) const;
+    void finishActiveReadbacks();
+    void reportLiveObjects(ID3D11Device *device);
+    void clearShaderCache();
+
+    bool debugLayer = false;
+    bool importedDevice = false;
+    ID3D11Device *dev = nullptr;
+    ID3D11DeviceContext1 *context = nullptr;
+    D3D_FEATURE_LEVEL featureLevel;
+    ID3DUserDefinedAnnotation *annotations = nullptr;
+    IDXGIFactory1 *dxgiFactory = nullptr;
+    bool hasDxgi2 = false;
+    bool supportsFlipDiscardSwapchain = false;
+    bool deviceLost = false;
+    QRhiD3D11NativeHandles nativeHandlesStruct;
+
+    struct {
+        int vsHighestActiveVertexBufferBinding = -1;
+        bool vsHasIndexBufferBound = false;
+        int vsHighestActiveSrvBinding = -1;
+        int fsHighestActiveSrvBinding = -1;
+        int csHighestActiveSrvBinding = -1;
+        int csHighestActiveUavBinding = -1;
+        QD3D11SwapChain *currentSwapChain = nullptr;
+    } contextState;
+
+    struct OffscreenFrame {
+        OffscreenFrame(QRhiImplementation *rhi) : cbWrapper(rhi) { }
+        bool active = false;
+        QD3D11CommandBuffer cbWrapper;
+    } ofr;
+
+    struct TextureReadback {
+        QRhiReadbackDescription desc;
+        QRhiReadbackResult *result;
+        ID3D11Texture2D *stagingTex;
+        quint32 byteSize;
+        quint32 bpl;
+        QSize pixelSize;
+        QRhiTexture::Format format;
+    };
+    QVector<TextureReadback> activeTextureReadbacks;
+    struct BufferReadback {
+        QRhiBufferReadbackResult *result;
+        quint32 byteSize;
+        ID3D11Buffer *stagingBuf;
+    };
+    QVector<BufferReadback> activeBufferReadbacks;
+
+    struct Shader {
+        Shader() = default;
+        Shader(IUnknown *s, const QByteArray &bytecode) : s(s), bytecode(bytecode) { }
+        IUnknown *s;
+        QByteArray bytecode;
+    };
+    QHash<QRhiShaderStage, Shader> m_shaderCache;
+
+    struct DeviceCurse {
+        DeviceCurse(QRhiD3D11 *impl) : q(impl) { }
+        QRhiD3D11 *q;
+        int framesToActivate = -1;
+        bool permanent = false;
+        int framesLeft = 0;
+        ID3D11ComputeShader *cs = nullptr;
+
+        void initResources();
+        void releaseResources();
+        void activate();
+    } deviceCurse;
+};
+
+Q_DECLARE_TYPEINFO(QRhiD3D11::TextureReadback, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiD3D11::BufferReadback, Q_MOVABLE_TYPE);
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
new file mode 100644
index 0000000000..dec28cac9b
--- /dev/null
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -0,0 +1,3927 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qrhigles2_p_p.h"
+#include <QWindow>
+#include <QOffscreenSurface>
+#include <QOpenGLContext>
+#include <QtGui/private/qopenglextensions_p.h>
+#include <QtGui/private/qopenglprogrambinarycache_p.h>
+#include <qmath.h>
+
+QT_BEGIN_NAMESPACE
+
+/*
+  OpenGL backend. Binding vertex attribute locations and decomposing uniform
+  buffers into uniforms are handled transparently to the application via the
+  reflection data (QShaderDescription). Real uniform buffers are never used,
+  regardless of the GLSL version. Textures and buffers feature no special
+  logic, it's all just glTexSubImage2D and glBufferSubData (with "dynamic"
+  buffers set to GL_DYNAMIC_DRAW). The swapchain and the associated
+  renderbuffer for depth-stencil will be dummies since we have no control over
+  the underlying buffers here. While the baseline here is plain GLES 2.0, some
+  modern GL(ES) features like multisample renderbuffers, blits, and compute are
+  used when available. Also functional with core profile contexts.
+*/
+
+/*!
+    \class QRhiGles2InitParams
+    \internal
+    \inmodule QtGui
+    \brief OpenGL specific initialization parameters.
+
+    An OpenGL-based QRhi needs an already created QOffscreenSurface at minimum.
+    Additionally, while optional, it is recommended that the QWindow the first
+    QRhiSwapChain will target is passed in as well.
+
+    \badcode
+        QOffscreenSurface *fallbackSurface = QRhiGles2InitParams::newFallbackSurface();
+        QRhiGles2InitParams params;
+        params.fallbackSurface = fallbackSurface;
+        params.window = window;
+        rhi = QRhi::create(QRhi::OpenGLES2, &params);
+    \endcode
+
+    By default QRhi creates a QOpenGLContext on its own. This approach works
+    well in most cases, included threaded scenarios, where there is a dedicated
+    QRhi for each rendering thread. As there will be a QOpenGLContext for each
+    QRhi, the OpenGL context requirements (a context can only be current on one
+    thread) are satisfied. The implicitly created context is destroyed
+    automatically together with the QRhi.
+
+    The QSurfaceFormat for the context is specified in \l format. The
+    constructor sets this to QSurfaceFormat::defaultFormat() so applications
+    that use QSurfaceFormat::setDefaultFormat() do not need to set the format
+    again.
+
+    \note The depth and stencil buffer sizes are set automatically to 24 and 8
+    when no size was explicitly set for these buffers in \l format. As there
+    are possible adjustments to \l format, applications can use
+    adjustedFormat() to query the effective format that is passed to
+    QOpenGLContext::setFormat() internally.
+
+    A QOffscreenSurface has to be specified in \l fallbackSurface. In order to
+    prevent mistakes in threaded situations, this is never created
+    automatically by the QRhi since, like QWindow, QOffscreenSurface can only
+    be created on the gui/main thread.
+
+    As a convenience, applications can use newFallbackSurface() which creates
+    and returns a QOffscreenSurface that is compatible with the QOpenGLContext
+    that is going to be created by the QRhi afterwards. Note that the ownership
+    of the returned QOffscreenSurface is transferred to the caller and the QRhi
+    will not destroy it.
+
+    \note QRhiSwapChain can only target QWindow instances that have their
+    surface type set to QSurface::OpenGLSurface.
+
+    \note \l window is optional. It is recommended to specify it whenever
+    possible, in order to avoid problems on multi-adapter and multi-screen
+    systems. When \l window is not set, the very first
+    QOpenGLContext::makeCurrent() happens with \l fallbackSurface which may be
+    an invisible window on some platforms (for example, Windows) and that may
+    trigger unexpected problems in some cases.
+
+    \section2 Working with existing OpenGL contexts
+
+    When interoperating with another graphics engine, it may be necessary to
+    get a QRhi instance that uses the same OpenGL context. This can be achieved
+    by passing a pointer to a QRhiGles2NativeHandles to QRhi::create(). The
+    \l{QRhiGles2NativeHandles::context}{context} must be set to a non-null
+    value.
+
+    An alternative approach is to create a QOpenGLContext that
+    \l{QOpenGLContext::setShareContext()}{shares resources} with the other
+    engine's context and passing in that context via QRhiGles2NativeHandles.
+
+    The QRhi does not take ownership of the QOpenGLContext passed in via
+    QRhiGles2NativeHandles.
+ */
+
+/*!
+    \class QRhiGles2NativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Holds the OpenGL context used by the QRhi.
+ */
+
+/*!
+    \class QRhiGles2TextureNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Holds the OpenGL texture object that is backing a QRhiTexture instance.
+ */
+
+#ifndef GL_BGRA
+#define GL_BGRA                           0x80E1
+#endif
+
+#ifndef GL_R8
+#define GL_R8                             0x8229
+#endif
+
+#ifndef GL_R16
+#define GL_R16                            0x822A
+#endif
+
+#ifndef GL_RED
+#define GL_RED                            0x1903
+#endif
+
+#ifndef GL_RGBA8
+#define GL_RGBA8                          0x8058
+#endif
+
+#ifndef GL_RGBA32F
+#define GL_RGBA32F                        0x8814
+#endif
+
+#ifndef GL_RGBA16F
+#define GL_RGBA16F                        0x881A
+#endif
+
+#ifndef GL_HALF_FLOAT
+#define GL_HALF_FLOAT                     0x140B
+#endif
+
+#ifndef GL_DEPTH_COMPONENT16
+#define GL_DEPTH_COMPONENT16              0x81A5
+#endif
+
+#ifndef GL_DEPTH_COMPONENT24
+#define GL_DEPTH_COMPONENT24              0x81A6
+#endif
+
+#ifndef GL_DEPTH_COMPONENT32F
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#endif
+
+#ifndef GL_STENCIL_INDEX
+#define GL_STENCIL_INDEX                  0x1901
+#endif
+
+#ifndef GL_STENCIL_INDEX8
+#define GL_STENCIL_INDEX8                 0x8D48
+#endif
+
+#ifndef GL_DEPTH24_STENCIL8
+#define GL_DEPTH24_STENCIL8               0x88F0
+#endif
+
+#ifndef GL_DEPTH_STENCIL_ATTACHMENT
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#endif
+
+#ifndef GL_DEPTH_STENCIL
+#define GL_DEPTH_STENCIL                  0x84F9
+#endif
+
+#ifndef GL_PRIMITIVE_RESTART_FIXED_INDEX
+#define GL_PRIMITIVE_RESTART_FIXED_INDEX  0x8D69
+#endif
+
+#ifndef GL_FRAMEBUFFER_SRGB
+#define GL_FRAMEBUFFER_SRGB 0x8DB9
+#endif
+
+#ifndef GL_READ_FRAMEBUFFER
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#endif
+
+#ifndef GL_DRAW_FRAMEBUFFER
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#endif
+
+#ifndef GL_MAX_DRAW_BUFFERS
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#endif
+
+#ifndef GL_TEXTURE_COMPARE_MODE
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#endif
+
+#ifndef GL_COMPARE_REF_TO_TEXTURE
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#endif
+
+#ifndef GL_TEXTURE_COMPARE_FUNC
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#endif
+
+#ifndef GL_MAX_SAMPLES
+#define GL_MAX_SAMPLES                    0x8D57
+#endif
+
+#ifndef GL_SHADER_STORAGE_BUFFER
+#define GL_SHADER_STORAGE_BUFFER          0x90D2
+#endif
+
+#ifndef GL_READ_ONLY
+#define GL_READ_ONLY                      0x88B8
+#endif
+
+#ifndef GL_WRITE_ONLY
+#define GL_WRITE_ONLY                     0x88B9
+#endif
+
+#ifndef GL_READ_WRITE
+#define GL_READ_WRITE                     0x88BA
+#endif
+
+#ifndef GL_COMPUTE_SHADER
+#define GL_COMPUTE_SHADER                 0x91B9
+#endif
+
+#ifndef GL_ALL_BARRIER_BITS
+#define GL_ALL_BARRIER_BITS               0xFFFFFFFF
+#endif
+
+#ifndef GL_VERTEX_PROGRAM_POINT_SIZE
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#endif
+
+#ifndef GL_POINT_SPRITE
+#define GL_POINT_SPRITE                   0x8861
+#endif
+
+#ifndef GL_MAP_READ_BIT
+#define GL_MAP_READ_BIT                   0x0001
+#endif
+
+Q_DECLARE_LOGGING_CATEGORY(lcOpenGLProgramDiskCache)
+
+/*!
+    Constructs a new QRhiGles2InitParams.
+
+    \l format is set to QSurfaceFormat::defaultFormat().
+ */
+QRhiGles2InitParams::QRhiGles2InitParams()
+{
+    format = QSurfaceFormat::defaultFormat();
+}
+
+/*!
+    \return the QSurfaceFormat that will be set on the QOpenGLContext before
+    calling QOpenGLContext::create(). This format is based on \a format, but
+    may be adjusted. Applicable only when QRhi creates the context.
+    Applications are advised to set this format on their QWindow in order to
+    avoid potential BAD_MATCH failures.
+ */
+QSurfaceFormat QRhiGles2InitParams::adjustedFormat(const QSurfaceFormat &format)
+{
+    QSurfaceFormat fmt = format;
+
+    if (fmt.depthBufferSize() == -1)
+        fmt.setDepthBufferSize(24);
+    if (fmt.stencilBufferSize() == -1)
+        fmt.setStencilBufferSize(8);
+
+    return fmt;
+}
+
+/*!
+    \return a new QOffscreenSurface that can be used with a QRhi by passing it
+    via a QRhiGles2InitParams.
+
+    \a format is adjusted as appropriate in order to avoid having problems
+    afterwards due to an incompatible context and surface.
+
+    \note This function must only be called on the gui/main thread.
+
+    \note It is the application's responsibility to destroy the returned
+    QOffscreenSurface on the gui/main thread once the associated QRhi has been
+    destroyed. The QRhi will not destroy the QOffscreenSurface.
+ */
+QOffscreenSurface *QRhiGles2InitParams::newFallbackSurface(const QSurfaceFormat &format)
+{
+    QSurfaceFormat fmt = adjustedFormat(format);
+
+    // To resolve all fields in the format as much as possible, create a context.
+    // This may be heavy, but allows avoiding BAD_MATCH on some systems.
+    QOpenGLContext tempContext;
+    tempContext.setFormat(fmt);
+    if (tempContext.create())
+        fmt = tempContext.format();
+    else
+        qWarning("QRhiGles2: Failed to create temporary context");
+
+    QOffscreenSurface *s = new QOffscreenSurface;
+    s->setFormat(fmt);
+    s->create();
+
+    return s;
+}
+
+QRhiGles2::QRhiGles2(QRhiGles2InitParams *params, QRhiGles2NativeHandles *importDevice)
+    : ofr(this)
+{
+    requestedFormat = QRhiGles2InitParams::adjustedFormat(params->format);
+    fallbackSurface = params->fallbackSurface;
+    maybeWindow = params->window; // may be null
+
+    importedContext = importDevice != nullptr;
+    if (importedContext) {
+        ctx = importDevice->context;
+        if (!ctx) {
+            qWarning("No OpenGL context given, cannot import");
+            importedContext = false;
+        }
+    }
+}
+
+bool QRhiGles2::ensureContext(QSurface *surface) const
+{
+    bool nativeWindowGone = false;
+    if (surface && surface->surfaceClass() == QSurface::Window && !surface->surfaceHandle()) {
+        surface = fallbackSurface;
+        nativeWindowGone = true;
+    }
+
+    if (!surface)
+        surface = fallbackSurface;
+
+    if (needsMakeCurrent)
+        needsMakeCurrent = false;
+    else if (!nativeWindowGone && QOpenGLContext::currentContext() == ctx && (surface == fallbackSurface || ctx->surface() == surface))
+        return true;
+
+    if (!ctx->makeCurrent(surface)) {
+        if (ctx->isValid()) {
+            qWarning("QRhiGles2: Failed to make context current. Expect bad things to happen.");
+        } else {
+            qWarning("QRhiGles2: Context is lost.");
+            contextLost = true;
+        }
+        return false;
+    }
+
+    return true;
+}
+
+bool QRhiGles2::create(QRhi::Flags flags)
+{
+    Q_UNUSED(flags);
+    Q_ASSERT(fallbackSurface);
+
+    if (!importedContext) {
+        ctx = new QOpenGLContext;
+        ctx->setFormat(requestedFormat);
+        if (!ctx->create()) {
+            qWarning("QRhiGles2: Failed to create context");
+            delete ctx;
+            ctx = nullptr;
+            return false;
+        }
+        qCDebug(QRHI_LOG_INFO) << "Created OpenGL context" << ctx->format();
+    }
+
+    if (!ensureContext(maybeWindow ? maybeWindow : fallbackSurface)) // see 'window' discussion in QRhiGles2InitParams comments
+        return false;
+
+    f = static_cast<QOpenGLExtensions *>(ctx->extraFunctions());
+
+    const char *vendor = reinterpret_cast<const char *>(f->glGetString(GL_VENDOR));
+    const char *renderer = reinterpret_cast<const char *>(f->glGetString(GL_RENDERER));
+    const char *version = reinterpret_cast<const char *>(f->glGetString(GL_VERSION));
+    if (vendor && renderer && version)
+        qCDebug(QRHI_LOG_INFO, "OpenGL VENDOR: %s RENDERER: %s VERSION: %s", vendor, renderer, version);
+
+    const QSurfaceFormat actualFormat = ctx->format();
+
+    caps.ctxMajor = actualFormat.majorVersion();
+    caps.ctxMinor = actualFormat.minorVersion();
+
+    GLint n = 0;
+    f->glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &n);
+    supportedCompressedFormats.resize(n);
+    if (n > 0)
+        f->glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS, supportedCompressedFormats.data());
+
+    f->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &caps.maxTextureSize);
+
+    if (caps.ctxMajor >= 3 || actualFormat.renderableType() == QSurfaceFormat::OpenGL) {
+        f->glGetIntegerv(GL_MAX_DRAW_BUFFERS, &caps.maxDrawBuffers);
+        f->glGetIntegerv(GL_MAX_SAMPLES, &caps.maxSamples);
+        caps.maxSamples = qMax(1, caps.maxSamples);
+    } else {
+        caps.maxDrawBuffers = 1;
+        caps.maxSamples = 1;
+    }
+
+    caps.msaaRenderBuffer = f->hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)
+            && f->hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit);
+
+    caps.npotTextureFull = f->hasOpenGLFeature(QOpenGLFunctions::NPOTTextures)
+            && f->hasOpenGLFeature(QOpenGLFunctions::NPOTTextureRepeat);
+
+    caps.gles = actualFormat.renderableType() == QSurfaceFormat::OpenGLES;
+    if (caps.gles)
+        caps.fixedIndexPrimitiveRestart = caps.ctxMajor >= 3; // ES 3.0
+    else
+        caps.fixedIndexPrimitiveRestart = caps.ctxMajor > 4 || (caps.ctxMajor == 4 && caps.ctxMinor >= 3); // 4.3
+
+    if (caps.fixedIndexPrimitiveRestart)
+        f->glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
+
+    caps.bgraExternalFormat = f->hasOpenGLExtension(QOpenGLExtensions::BGRATextureFormat);
+    caps.bgraInternalFormat = caps.bgraExternalFormat && caps.gles;
+    caps.r8Format = f->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats);
+    caps.r16Format = f->hasOpenGLExtension(QOpenGLExtensions::Sized16Formats);
+    caps.floatFormats = caps.ctxMajor >= 3; // 3.0 or ES 3.0
+    caps.depthTexture = caps.ctxMajor >= 3; // 3.0 or ES 3.0
+    caps.packedDepthStencil = f->hasOpenGLExtension(QOpenGLExtensions::PackedDepthStencil);
+#ifdef Q_OS_WASM
+    caps.needsDepthStencilCombinedAttach = true;
+#else
+    caps.needsDepthStencilCombinedAttach = false;
+#endif
+    caps.srgbCapableDefaultFramebuffer = f->hasOpenGLExtension(QOpenGLExtensions::SRGBFrameBuffer);
+    caps.coreProfile = actualFormat.profile() == QSurfaceFormat::CoreProfile;
+
+    if (caps.gles)
+        caps.uniformBuffers = caps.ctxMajor >= 3; // ES 3.0
+    else
+        caps.uniformBuffers = caps.ctxMajor > 3 || (caps.ctxMajor == 3 && caps.ctxMinor >= 1); // 3.1
+
+    caps.elementIndexUint = f->hasOpenGLExtension(QOpenGLExtensions::ElementIndexUint);
+    caps.depth24 = f->hasOpenGLExtension(QOpenGLExtensions::Depth24);
+    caps.rgba8Format = f->hasOpenGLExtension(QOpenGLExtensions::Sized8Formats);
+
+    if (caps.gles)
+        caps.instancing = caps.ctxMajor >= 3; // ES 3.0
+    else
+        caps.instancing = caps.ctxMajor > 3 || (caps.ctxMajor == 3 && caps.ctxMinor >= 3); // 3.3
+
+    caps.baseVertex = caps.ctxMajor > 3 || (caps.ctxMajor == 3 && caps.ctxMinor >= 2); // 3.2 or ES 3.2
+
+    if (caps.gles)
+        caps.compute = caps.ctxMajor > 3 || (caps.ctxMajor == 3 && caps.ctxMinor >= 1); // ES 3.1
+    else
+        caps.compute = caps.ctxMajor > 4 || (caps.ctxMajor == 4 && caps.ctxMinor >= 3); // 4.3
+
+    if (caps.gles)
+        caps.textureCompareMode = caps.ctxMajor >= 3; // ES 3.0
+    else
+        caps.textureCompareMode = true;
+
+    // proper as in ES 3.0 (glMapBufferRange), not the old glMapBuffer
+    // extension(s) (which is not in ES 3.0...messy)
+    caps.properMapBuffer = f->hasOpenGLExtension(QOpenGLExtensions::MapBufferRange);
+
+    if (caps.gles)
+        caps.nonBaseLevelFramebufferTexture = caps.ctxMajor >= 3; // ES 3.0
+    else
+        caps.nonBaseLevelFramebufferTexture = true;
+
+    if (!caps.gles) {
+        f->glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
+        f->glEnable(GL_POINT_SPRITE);
+    } // else (with gles) these are always on
+
+    nativeHandlesStruct.context = ctx;
+
+    contextLost = false;
+
+    return true;
+}
+
+void QRhiGles2::destroy()
+{
+    if (!f)
+        return;
+
+    ensureContext();
+    executeDeferredReleases();
+
+    if (vao) {
+        f->glDeleteVertexArrays(1, &vao);
+        vao = 0;
+    }
+
+    for (uint shader : m_shaderCache)
+        f->glDeleteShader(shader);
+    m_shaderCache.clear();
+
+    if (!importedContext) {
+        delete ctx;
+        ctx = nullptr;
+    }
+
+    f = nullptr;
+}
+
+void QRhiGles2::executeDeferredReleases()
+{
+    for (int i = releaseQueue.count() - 1; i >= 0; --i) {
+        const QRhiGles2::DeferredReleaseEntry &e(releaseQueue[i]);
+        switch (e.type) {
+        case QRhiGles2::DeferredReleaseEntry::Buffer:
+            f->glDeleteBuffers(1, &e.buffer.buffer);
+            break;
+        case QRhiGles2::DeferredReleaseEntry::Pipeline:
+            f->glDeleteProgram(e.pipeline.program);
+            break;
+        case QRhiGles2::DeferredReleaseEntry::Texture:
+            f->glDeleteTextures(1, &e.texture.texture);
+            break;
+        case QRhiGles2::DeferredReleaseEntry::RenderBuffer:
+            f->glDeleteRenderbuffers(1, &e.renderbuffer.renderbuffer);
+            f->glDeleteRenderbuffers(1, &e.renderbuffer.renderbuffer2);
+            break;
+        case QRhiGles2::DeferredReleaseEntry::TextureRenderTarget:
+            f->glDeleteFramebuffers(1, &e.textureRenderTarget.framebuffer);
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+        releaseQueue.removeAt(i);
+    }
+}
+
+QVector<int> QRhiGles2::supportedSampleCounts() const
+{
+    if (supportedSampleCountList.isEmpty()) {
+        // 1, 2, 4, 8, ...
+        for (int i = 1; i <= caps.maxSamples; i *= 2)
+            supportedSampleCountList.append(i);
+    }
+    return supportedSampleCountList;
+}
+
+int QRhiGles2::effectiveSampleCount(int sampleCount) const
+{
+    // Stay compatible with QSurfaceFormat and friends where samples == 0 means the same as 1.
+    const int s = qBound(1, sampleCount, 64);
+    if (!supportedSampleCounts().contains(s)) {
+        qWarning("Attempted to set unsupported sample count %d", sampleCount);
+        return 1;
+    }
+    return s;
+}
+
+QRhiSwapChain *QRhiGles2::createSwapChain()
+{
+    return new QGles2SwapChain(this);
+}
+
+QRhiBuffer *QRhiGles2::createBuffer(QRhiBuffer::Type type, QRhiBuffer::UsageFlags usage, int size)
+{
+    return new QGles2Buffer(this, type, usage, size);
+}
+
+int QRhiGles2::ubufAlignment() const
+{
+    // No real uniform buffers are used so no need to pretend there is any
+    // alignment requirement.
+    return 1;
+}
+
+bool QRhiGles2::isYUpInFramebuffer() const
+{
+    return true;
+}
+
+bool QRhiGles2::isYUpInNDC() const
+{
+    return true;
+}
+
+bool QRhiGles2::isClipDepthZeroToOne() const
+{
+    return false;
+}
+
+QMatrix4x4 QRhiGles2::clipSpaceCorrMatrix() const
+{
+    return QMatrix4x4(); // identity
+}
+
+static inline GLenum toGlCompressedTextureFormat(QRhiTexture::Format format, QRhiTexture::Flags flags)
+{
+    const bool srgb = flags.testFlag(QRhiTexture::sRGB);
+    switch (format) {
+    case QRhiTexture::BC1:
+        return srgb ? 0x8C4C : 0x83F0;
+    case QRhiTexture::BC3:
+        return srgb ? 0x8C4E : 0x83F2;
+    case QRhiTexture::BC5:
+        return srgb ? 0x8C4F : 0x83F3;
+
+    case QRhiTexture::ETC2_RGB8:
+        return srgb ? 0x9275 : 0x9274;
+    case QRhiTexture::ETC2_RGB8A1:
+        return srgb ? 0x9277 : 0x9276;
+    case QRhiTexture::ETC2_RGBA8:
+        return srgb ? 0x9279 : 0x9278;
+
+    case QRhiTexture::ASTC_4x4:
+        return srgb ? 0x93D0 : 0x93B0;
+    case QRhiTexture::ASTC_5x4:
+        return srgb ? 0x93D1 : 0x93B1;
+    case QRhiTexture::ASTC_5x5:
+        return srgb ? 0x93D2 : 0x93B2;
+    case QRhiTexture::ASTC_6x5:
+        return srgb ? 0x93D3 : 0x93B3;
+    case QRhiTexture::ASTC_6x6:
+        return srgb ? 0x93D4 : 0x93B4;
+    case QRhiTexture::ASTC_8x5:
+        return srgb ? 0x93D5 : 0x93B5;
+    case QRhiTexture::ASTC_8x6:
+        return srgb ? 0x93D6 : 0x93B6;
+    case QRhiTexture::ASTC_8x8:
+        return srgb ? 0x93D7 : 0x93B7;
+    case QRhiTexture::ASTC_10x5:
+        return srgb ? 0x93D8 : 0x93B8;
+    case QRhiTexture::ASTC_10x6:
+        return srgb ? 0x93D9 : 0x93B9;
+    case QRhiTexture::ASTC_10x8:
+        return srgb ? 0x93DA : 0x93BA;
+    case QRhiTexture::ASTC_10x10:
+        return srgb ? 0x93DB : 0x93BB;
+    case QRhiTexture::ASTC_12x10:
+        return srgb ? 0x93DC : 0x93BC;
+    case QRhiTexture::ASTC_12x12:
+        return srgb ? 0x93DD : 0x93BD;
+
+    default:
+        return 0; // this is reachable, just return an invalid format
+    }
+}
+
+bool QRhiGles2::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const
+{
+    if (isCompressedFormat(format))
+        return supportedCompressedFormats.contains(GLint(toGlCompressedTextureFormat(format, flags)));
+
+    switch (format) {
+    case QRhiTexture::D16:
+        Q_FALLTHROUGH();
+    case QRhiTexture::D32F:
+        return caps.depthTexture;
+
+    case QRhiTexture::BGRA8:
+        return caps.bgraExternalFormat;
+
+    case QRhiTexture::R8:
+        return caps.r8Format;
+
+    case QRhiTexture::R16:
+        return caps.r16Format;
+
+    case QRhiTexture::RGBA16F:
+        Q_FALLTHROUGH();
+    case QRhiTexture::RGBA32F:
+        return caps.floatFormats;
+
+    default:
+        break;
+    }
+
+    return true;
+}
+
+bool QRhiGles2::isFeatureSupported(QRhi::Feature feature) const
+{
+    switch (feature) {
+    case QRhi::MultisampleTexture:
+        return false;
+    case QRhi::MultisampleRenderBuffer:
+        return caps.msaaRenderBuffer;
+    case QRhi::DebugMarkers:
+        return false;
+    case QRhi::Timestamps:
+        return false;
+    case QRhi::Instancing:
+        return caps.instancing;
+    case QRhi::CustomInstanceStepRate:
+        return false;
+    case QRhi::PrimitiveRestart:
+        return caps.fixedIndexPrimitiveRestart;
+    case QRhi::NonDynamicUniformBuffers:
+        return true;
+    case QRhi::NonFourAlignedEffectiveIndexBufferOffset:
+        return true;
+    case QRhi::NPOTTextureRepeat:
+        return caps.npotTextureFull;
+    case QRhi::RedOrAlpha8IsRed:
+        return caps.coreProfile;
+    case QRhi::ElementIndexUint:
+        return caps.elementIndexUint;
+    case QRhi::Compute:
+        return caps.compute;
+    case QRhi::WideLines:
+        return true;
+    case QRhi::VertexShaderPointSize:
+        return true;
+    case QRhi::BaseVertex:
+        return caps.baseVertex;
+    case QRhi::BaseInstance:
+        return false; // not in ES 3.2, so won't bother
+    case QRhi::TriangleFanTopology:
+        return true;
+    case QRhi::ReadBackNonUniformBuffer:
+        return !caps.gles || caps.properMapBuffer;
+    case QRhi::ReadBackNonBaseMipLevel:
+        return caps.nonBaseLevelFramebufferTexture;
+    default:
+        Q_UNREACHABLE();
+        return false;
+    }
+}
+
+int QRhiGles2::resourceLimit(QRhi::ResourceLimit limit) const
+{
+    switch (limit) {
+    case QRhi::TextureSizeMin:
+        return 1;
+    case QRhi::TextureSizeMax:
+        return caps.maxTextureSize;
+    case QRhi::MaxColorAttachments:
+        return caps.maxDrawBuffers;
+    case QRhi::FramesInFlight:
+        return 2; // dummy
+    default:
+        Q_UNREACHABLE();
+        return 0;
+    }
+}
+
+const QRhiNativeHandles *QRhiGles2::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+void QRhiGles2::sendVMemStatsToProfiler()
+{
+    // nothing to do here
+}
+
+bool QRhiGles2::makeThreadLocalNativeContextCurrent()
+{
+    if (inFrame && !ofr.active)
+        return ensureContext(currentSwapChain->surface);
+    else
+        return ensureContext();
+}
+
+void QRhiGles2::releaseCachedResources()
+{
+    if (!ensureContext())
+        return;
+
+    for (uint shader : m_shaderCache)
+        f->glDeleteShader(shader);
+
+    m_shaderCache.clear();
+}
+
+bool QRhiGles2::isDeviceLost() const
+{
+    return contextLost;
+}
+
+QRhiRenderBuffer *QRhiGles2::createRenderBuffer(QRhiRenderBuffer::Type type, const QSize &pixelSize,
+                                                int sampleCount, QRhiRenderBuffer::Flags flags)
+{
+    return new QGles2RenderBuffer(this, type, pixelSize, sampleCount, flags);
+}
+
+QRhiTexture *QRhiGles2::createTexture(QRhiTexture::Format format, const QSize &pixelSize,
+                                      int sampleCount, QRhiTexture::Flags flags)
+{
+    return new QGles2Texture(this, format, pixelSize, sampleCount, flags);
+}
+
+QRhiSampler *QRhiGles2::createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                                      QRhiSampler::Filter mipmapMode,
+                                      QRhiSampler::AddressMode u, QRhiSampler::AddressMode v)
+{
+    return new QGles2Sampler(this, magFilter, minFilter, mipmapMode, u, v);
+}
+
+QRhiTextureRenderTarget *QRhiGles2::createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                              QRhiTextureRenderTarget::Flags flags)
+{
+    return new QGles2TextureRenderTarget(this, desc, flags);
+}
+
+QRhiGraphicsPipeline *QRhiGles2::createGraphicsPipeline()
+{
+    return new QGles2GraphicsPipeline(this);
+}
+
+QRhiShaderResourceBindings *QRhiGles2::createShaderResourceBindings()
+{
+    return new QGles2ShaderResourceBindings(this);
+}
+
+QRhiComputePipeline *QRhiGles2::createComputePipeline()
+{
+    return new QGles2ComputePipeline(this);
+}
+
+void QRhiGles2::setGraphicsPipeline(QRhiCommandBuffer *cb, QRhiGraphicsPipeline *ps)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+    QGles2GraphicsPipeline *psD = QRHI_RES(QGles2GraphicsPipeline, ps);
+    const bool pipelineChanged = cbD->currentGraphicsPipeline != ps || cbD->currentPipelineGeneration != psD->generation;
+
+    if (pipelineChanged) {
+        cbD->currentGraphicsPipeline = ps;
+        cbD->currentComputePipeline = nullptr;
+        cbD->currentPipelineGeneration = psD->generation;
+
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::BindGraphicsPipeline;
+        cmd.args.bindGraphicsPipeline.ps = ps;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiGles2::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBindings *srb,
+                                   int dynamicOffsetCount,
+                                   const QRhiCommandBuffer::DynamicOffset *dynamicOffsets)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass != QGles2CommandBuffer::NoPass);
+    QGles2GraphicsPipeline *gfxPsD = QRHI_RES(QGles2GraphicsPipeline, cbD->currentGraphicsPipeline);
+    QGles2ComputePipeline *compPsD = QRHI_RES(QGles2ComputePipeline, cbD->currentComputePipeline);
+
+    if (!srb) {
+        if (gfxPsD)
+            srb = gfxPsD->m_shaderResourceBindings;
+        else
+            srb = compPsD->m_shaderResourceBindings;
+    }
+
+    QRhiPassResourceTracker &passResTracker(cbD->passResTrackers[cbD->currentPassResTrackerIndex]);
+    QGles2ShaderResourceBindings *srbD = QRHI_RES(QGles2ShaderResourceBindings, srb);
+    bool hasDynamicOffsetInSrb = false;
+    for (int i = 0, ie = srbD->m_bindings.count(); i != ie; ++i) {
+        const QRhiShaderResourceBinding::Data *b = srbD->m_bindings.at(i).data();
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+            // no BufUniformRead / AccessUniform because no real uniform buffers are used
+            if (b->u.ubuf.hasDynamicOffset)
+                hasDynamicOffsetInSrb = true;
+            break;
+        case QRhiShaderResourceBinding::SampledTexture:
+            trackedRegisterTexture(&passResTracker,
+                                   QRHI_RES(QGles2Texture, b->u.stex.tex),
+                                   QRhiPassResourceTracker::TexSample,
+                                   QRhiPassResourceTracker::toPassTrackerTextureStage(b->stage));
+            break;
+        case QRhiShaderResourceBinding::ImageLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageLoadStore:
+        {
+            QGles2Texture *texD = QRHI_RES(QGles2Texture, b->u.simage.tex);
+            QRhiPassResourceTracker::TextureAccess access;
+            if (b->type == QRhiShaderResourceBinding::ImageLoad)
+                access = QRhiPassResourceTracker::TexStorageLoad;
+            else if (b->type == QRhiShaderResourceBinding::ImageStore)
+                access = QRhiPassResourceTracker::TexStorageStore;
+            else
+                access = QRhiPassResourceTracker::TexStorageLoadStore;
+            trackedRegisterTexture(&passResTracker, texD, access,
+                                   QRhiPassResourceTracker::toPassTrackerTextureStage(b->stage));
+        }
+            break;
+        case QRhiShaderResourceBinding::BufferLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferLoadStore:
+        {
+            QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, b->u.sbuf.buf);
+            QRhiPassResourceTracker::BufferAccess access;
+            if (b->type == QRhiShaderResourceBinding::BufferLoad)
+                access = QRhiPassResourceTracker::BufStorageLoad;
+            else if (b->type == QRhiShaderResourceBinding::BufferStore)
+                access = QRhiPassResourceTracker::BufStorageStore;
+            else
+                access = QRhiPassResourceTracker::BufStorageLoadStore;
+            trackedRegisterBuffer(&passResTracker, bufD, access,
+                                  QRhiPassResourceTracker::toPassTrackerBufferStage(b->stage));
+        }
+            break;
+        default:
+            break;
+        }
+    }
+
+    const bool srbChanged = gfxPsD ? (cbD->currentGraphicsSrb != srb) : (cbD->currentComputeSrb != srb);
+    const bool srbRebuilt = cbD->currentSrbGeneration != srbD->generation;
+
+    if (srbChanged || srbRebuilt || hasDynamicOffsetInSrb) {
+        if (gfxPsD) {
+            cbD->currentGraphicsSrb = srb;
+            cbD->currentComputeSrb = nullptr;
+        } else {
+            cbD->currentGraphicsSrb = nullptr;
+            cbD->currentComputeSrb = srb;
+        }
+        cbD->currentSrbGeneration = srbD->generation;
+
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::BindShaderResources;
+        cmd.args.bindShaderResources.maybeGraphicsPs = gfxPsD;
+        cmd.args.bindShaderResources.maybeComputePs = compPsD;
+        cmd.args.bindShaderResources.srb = srb;
+        cmd.args.bindShaderResources.dynamicOffsetCount = 0;
+        if (hasDynamicOffsetInSrb) {
+            if (dynamicOffsetCount < QGles2CommandBuffer::Command::MAX_UBUF_BINDINGS) {
+                cmd.args.bindShaderResources.dynamicOffsetCount = dynamicOffsetCount;
+                uint *p = cmd.args.bindShaderResources.dynamicOffsetPairs;
+                for (int i = 0; i < dynamicOffsetCount; ++i) {
+                    const QRhiCommandBuffer::DynamicOffset &dynOfs(dynamicOffsets[i]);
+                    *p++ = uint(dynOfs.first);
+                    *p++ = dynOfs.second;
+                }
+            } else {
+                qWarning("Too many dynamic offsets (%d, max is %d)",
+                         dynamicOffsetCount, QGles2CommandBuffer::Command::MAX_UBUF_BINDINGS);
+            }
+        }
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiGles2::setVertexInput(QRhiCommandBuffer *cb,
+                               int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                               QRhiBuffer *indexBuf, quint32 indexOffset, QRhiCommandBuffer::IndexFormat indexFormat)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+    QRhiPassResourceTracker &passResTracker(cbD->passResTrackers[cbD->currentPassResTrackerIndex]);
+
+    for (int i = 0; i < bindingCount; ++i) {
+        QRhiBuffer *buf = bindings[i].first;
+        quint32 ofs = bindings[i].second;
+        QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, buf);
+        Q_ASSERT(bufD->m_usage.testFlag(QRhiBuffer::VertexBuffer));
+
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::BindVertexBuffer;
+        cmd.args.bindVertexBuffer.ps = cbD->currentGraphicsPipeline;
+        cmd.args.bindVertexBuffer.buffer = bufD->buffer;
+        cmd.args.bindVertexBuffer.offset = ofs;
+        cmd.args.bindVertexBuffer.binding = startBinding + i;
+        cbD->commands.append(cmd);
+
+        trackedRegisterBuffer(&passResTracker, bufD, QRhiPassResourceTracker::BufVertexInput,
+                              QRhiPassResourceTracker::BufVertexInputStage);
+    }
+
+    if (indexBuf) {
+        QGles2Buffer *ibufD = QRHI_RES(QGles2Buffer, indexBuf);
+        Q_ASSERT(ibufD->m_usage.testFlag(QRhiBuffer::IndexBuffer));
+
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::BindIndexBuffer;
+        cmd.args.bindIndexBuffer.buffer = ibufD->buffer;
+        cmd.args.bindIndexBuffer.offset = indexOffset;
+        cmd.args.bindIndexBuffer.type = indexFormat == QRhiCommandBuffer::IndexUInt16 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT;
+        cbD->commands.append(cmd);
+
+        trackedRegisterBuffer(&passResTracker, ibufD, QRhiPassResourceTracker::BufIndexRead,
+                              QRhiPassResourceTracker::BufVertexInputStage);
+    }
+}
+
+void QRhiGles2::setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = QGles2CommandBuffer::Command::Viewport;
+    const std::array<float, 4> r = viewport.viewport();
+    // A negative width or height is an error. A negative x or y is not.
+    if (r[2] < 0.0f || r[3] < 0.0f)
+        return;
+
+    cmd.args.viewport.x = r[0];
+    cmd.args.viewport.y = r[1];
+    cmd.args.viewport.w = r[2];
+    cmd.args.viewport.h = r[3];
+    cmd.args.viewport.d0 = viewport.minDepth();
+    cmd.args.viewport.d1 = viewport.maxDepth();
+    cbD->commands.append(cmd);
+}
+
+void QRhiGles2::setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = QGles2CommandBuffer::Command::Scissor;
+    const std::array<int, 4> r = scissor.scissor();
+    // A negative width or height is an error. A negative x or y is not.
+    if (r[2] < 0 || r[3] < 0)
+        return;
+
+    cmd.args.scissor.x = r[0];
+    cmd.args.scissor.y = r[1];
+    cmd.args.scissor.w = r[2];
+    cmd.args.scissor.h = r[3];
+    cbD->commands.append(cmd);
+}
+
+void QRhiGles2::setBlendConstants(QRhiCommandBuffer *cb, const QColor &c)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = QGles2CommandBuffer::Command::BlendConstants;
+    cmd.args.blendConstants.r = float(c.redF());
+    cmd.args.blendConstants.g = float(c.greenF());
+    cmd.args.blendConstants.b = float(c.blueF());
+    cmd.args.blendConstants.a = float(c.alphaF());
+    cbD->commands.append(cmd);
+}
+
+void QRhiGles2::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = QGles2CommandBuffer::Command::StencilRef;
+    cmd.args.stencilRef.ref = refValue;
+    cmd.args.stencilRef.ps = cbD->currentGraphicsPipeline;
+    cbD->commands.append(cmd);
+}
+
+void QRhiGles2::draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+                     quint32 instanceCount, quint32 firstVertex, quint32 firstInstance)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = QGles2CommandBuffer::Command::Draw;
+    cmd.args.draw.ps = cbD->currentGraphicsPipeline;
+    cmd.args.draw.vertexCount = vertexCount;
+    cmd.args.draw.firstVertex = firstVertex;
+    cmd.args.draw.instanceCount = instanceCount;
+    cmd.args.draw.baseInstance = firstInstance;
+    cbD->commands.append(cmd);
+}
+
+void QRhiGles2::drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                            quint32 instanceCount, quint32 firstIndex, qint32 vertexOffset, quint32 firstInstance)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = QGles2CommandBuffer::Command::DrawIndexed;
+    cmd.args.drawIndexed.ps = cbD->currentGraphicsPipeline;
+    cmd.args.drawIndexed.indexCount = indexCount;
+    cmd.args.drawIndexed.firstIndex = firstIndex;
+    cmd.args.drawIndexed.instanceCount = instanceCount;
+    cmd.args.drawIndexed.baseInstance = firstInstance;
+    cmd.args.drawIndexed.baseVertex = vertexOffset;
+    cbD->commands.append(cmd);
+}
+
+void QRhiGles2::debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name)
+{
+    if (!debugMarkers)
+        return;
+
+    Q_UNUSED(cb);
+    Q_UNUSED(name);
+}
+
+void QRhiGles2::debugMarkEnd(QRhiCommandBuffer *cb)
+{
+    if (!debugMarkers)
+        return;
+
+    Q_UNUSED(cb);
+}
+
+void QRhiGles2::debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg)
+{
+    if (!debugMarkers)
+        return;
+
+    Q_UNUSED(cb);
+    Q_UNUSED(msg);
+}
+
+const QRhiNativeHandles *QRhiGles2::nativeHandles(QRhiCommandBuffer *cb)
+{
+    Q_UNUSED(cb);
+    return nullptr;
+}
+
+static void addBoundaryCommand(QGles2CommandBuffer *cbD, QGles2CommandBuffer::Command::Cmd type)
+{
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = type;
+    cbD->commands.append(cmd);
+}
+
+void QRhiGles2::beginExternal(QRhiCommandBuffer *cb)
+{
+    if (ofr.active) {
+        Q_ASSERT(!currentSwapChain);
+        if (!ensureContext())
+            return;
+    } else {
+        Q_ASSERT(currentSwapChain);
+        if (!ensureContext(currentSwapChain->surface))
+            return;
+    }
+
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    executeCommandBuffer(cbD);
+    cbD->resetCommands();
+
+    if (vao)
+        f->glBindVertexArray(0);
+}
+
+void QRhiGles2::endExternal(QRhiCommandBuffer *cb)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->commands.isEmpty() && cbD->currentPassResTrackerIndex == -1);
+
+    cbD->resetCachedState();
+
+    if (cbD->recordingPass != QGles2CommandBuffer::NoPass) {
+        // Commands that come after this point need a resource tracker and also
+        // a BarriersForPass command enqueued. (the ones we had from
+        // beginPass() are now gone since beginExternal() processed all that
+        // due to calling executeCommandBuffer()).
+        enqueueBarriersForPass(cbD);
+    }
+
+    addBoundaryCommand(cbD, QGles2CommandBuffer::Command::ResetFrame);
+
+    if (cbD->currentTarget)
+        enqueueBindFramebuffer(cbD->currentTarget, cbD);
+}
+
+QRhi::FrameOpResult QRhiGles2::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags)
+{
+    Q_UNUSED(flags);
+
+    QGles2SwapChain *swapChainD = QRHI_RES(QGles2SwapChain, swapChain);
+    if (!ensureContext(swapChainD->surface))
+        return contextLost ? QRhi::FrameOpDeviceLost : QRhi::FrameOpError;
+
+    currentSwapChain = swapChainD;
+
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    QRHI_PROF_F(beginSwapChainFrame(swapChain));
+
+    executeDeferredReleases();
+    swapChainD->cb.resetState();
+
+    addBoundaryCommand(&swapChainD->cb, QGles2CommandBuffer::Command::BeginFrame);
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiGles2::endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags)
+{
+    QGles2SwapChain *swapChainD = QRHI_RES(QGles2SwapChain, swapChain);
+    Q_ASSERT(currentSwapChain == swapChainD);
+
+    addBoundaryCommand(&swapChainD->cb, QGles2CommandBuffer::Command::EndFrame);
+
+    if (!ensureContext(swapChainD->surface))
+        return contextLost ? QRhi::FrameOpDeviceLost : QRhi::FrameOpError;
+
+    executeCommandBuffer(&swapChainD->cb);
+
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    // this must be done before the swap
+    QRHI_PROF_F(endSwapChainFrame(swapChain, swapChainD->frameCount + 1));
+
+    if (swapChainD->surface && !flags.testFlag(QRhi::SkipPresent)) {
+        ctx->swapBuffers(swapChainD->surface);
+        needsMakeCurrent = true;
+    } else {
+        f->glFlush();
+    }
+
+    swapChainD->frameCount += 1;
+    currentSwapChain = nullptr;
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiGles2::beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    if (!ensureContext())
+        return contextLost ? QRhi::FrameOpDeviceLost : QRhi::FrameOpError;
+
+    ofr.active = true;
+
+    executeDeferredReleases();
+    ofr.cbWrapper.resetState();
+
+    addBoundaryCommand(&ofr.cbWrapper, QGles2CommandBuffer::Command::BeginFrame);
+    *cb = &ofr.cbWrapper;
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiGles2::endOffscreenFrame(QRhi::EndFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    Q_ASSERT(ofr.active);
+    ofr.active = false;
+
+    addBoundaryCommand(&ofr.cbWrapper, QGles2CommandBuffer::Command::EndFrame);
+
+    if (!ensureContext())
+        return contextLost ? QRhi::FrameOpDeviceLost : QRhi::FrameOpError;
+
+    executeCommandBuffer(&ofr.cbWrapper);
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiGles2::finish()
+{
+    if (inFrame) {
+        if (ofr.active) {
+            Q_ASSERT(!currentSwapChain);
+            Q_ASSERT(ofr.cbWrapper.recordingPass == QGles2CommandBuffer::NoPass);
+            if (!ensureContext())
+                return contextLost ? QRhi::FrameOpDeviceLost : QRhi::FrameOpError;
+            executeCommandBuffer(&ofr.cbWrapper);
+            ofr.cbWrapper.resetCommands();
+        } else {
+            Q_ASSERT(currentSwapChain);
+            Q_ASSERT(currentSwapChain->cb.recordingPass == QGles2CommandBuffer::NoPass);
+            if (!ensureContext(currentSwapChain->surface))
+                return contextLost ? QRhi::FrameOpDeviceLost : QRhi::FrameOpError;
+            executeCommandBuffer(&currentSwapChain->cb);
+            currentSwapChain->cb.resetCommands();
+        }
+    }
+    return QRhi::FrameOpSuccess;
+}
+
+void QRhiGles2::trackedBufferBarrier(QGles2CommandBuffer *cbD, QGles2Buffer *bufD, QGles2Buffer::Access access)
+{
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::NoPass); // this is for resource updates only
+    const QGles2Buffer::Access prevAccess = bufD->usageState.access;
+    if (access == prevAccess)
+        return;
+
+    if (prevAccess == QGles2Buffer::AccessStorageWrite || prevAccess == QGles2Buffer::AccessStorageReadWrite) {
+        // Generating the minimal barrier set is way too complicated to do
+        // correctly (prevAccess is overwritten so we won't have proper
+        // tracking across multiple passes) so setting all barrier bits will do
+        // for now.
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::Barrier;
+        cmd.args.barrier.barriers = GL_ALL_BARRIER_BITS;
+        cbD->commands.append(cmd);
+    }
+
+    bufD->usageState.access = access;
+}
+
+void QRhiGles2::trackedImageBarrier(QGles2CommandBuffer *cbD, QGles2Texture *texD, QGles2Texture::Access access)
+{
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::NoPass); // this is for resource updates only
+    const QGles2Texture::Access prevAccess = texD->usageState.access;
+    if (access == prevAccess)
+        return;
+
+    if (prevAccess == QGles2Texture::AccessStorageWrite || prevAccess == QGles2Texture::AccessStorageReadWrite) {
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::Barrier;
+        cmd.args.barrier.barriers = GL_ALL_BARRIER_BITS;
+        cbD->commands.append(cmd);
+    }
+
+    texD->usageState.access = access;
+}
+
+void QRhiGles2::enqueueSubresUpload(QGles2Texture *texD, QGles2CommandBuffer *cbD,
+                                    int layer, int level, const QRhiTextureSubresourceUploadDescription &subresDesc)
+{
+    trackedImageBarrier(cbD, texD, QGles2Texture::AccessUpdate);
+    const bool isCompressed = isCompressedFormat(texD->m_format);
+    const bool isCubeMap = texD->m_flags.testFlag(QRhiTexture::CubeMap);
+    const GLenum faceTargetBase = isCubeMap ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : texD->target;
+    const QPoint dp = subresDesc.destinationTopLeft();
+    const QByteArray rawData = subresDesc.data();
+    if (!subresDesc.image().isNull()) {
+        QImage img = subresDesc.image();
+        QSize size = img.size();
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::SubImage;
+        if (!subresDesc.sourceSize().isEmpty() || !subresDesc.sourceTopLeft().isNull()) {
+            const QPoint sp = subresDesc.sourceTopLeft();
+            if (!subresDesc.sourceSize().isEmpty())
+                size = subresDesc.sourceSize();
+            img = img.copy(sp.x(), sp.y(), size.width(), size.height());
+        }
+        cmd.args.subImage.target = texD->target;
+        cmd.args.subImage.texture = texD->texture;
+        cmd.args.subImage.faceTarget = faceTargetBase + uint(layer);
+        cmd.args.subImage.level = level;
+        cmd.args.subImage.dx = dp.x();
+        cmd.args.subImage.dy = dp.y();
+        cmd.args.subImage.w = size.width();
+        cmd.args.subImage.h = size.height();
+        cmd.args.subImage.glformat = texD->glformat;
+        cmd.args.subImage.gltype = texD->gltype;
+        cmd.args.subImage.rowStartAlign = 4;
+        cmd.args.subImage.data = cbD->retainImage(img);
+        cbD->commands.append(cmd);
+    } else if (!rawData.isEmpty() && isCompressed) {
+        const QSize size = subresDesc.sourceSize().isEmpty() ? q->sizeForMipLevel(level, texD->m_pixelSize)
+                                                             : subresDesc.sourceSize();
+        if (texD->specified) {
+            QGles2CommandBuffer::Command cmd;
+            cmd.cmd = QGles2CommandBuffer::Command::CompressedSubImage;
+            cmd.args.compressedSubImage.target = texD->target;
+            cmd.args.compressedSubImage.texture = texD->texture;
+            cmd.args.compressedSubImage.faceTarget = faceTargetBase + uint(layer);
+            cmd.args.compressedSubImage.level = level;
+            cmd.args.compressedSubImage.dx = dp.x();
+            cmd.args.compressedSubImage.dy = dp.y();
+            cmd.args.compressedSubImage.w = size.width();
+            cmd.args.compressedSubImage.h = size.height();
+            cmd.args.compressedSubImage.glintformat = texD->glintformat;
+            cmd.args.compressedSubImage.size = rawData.size();
+            cmd.args.compressedSubImage.data = cbD->retainData(rawData);
+            cbD->commands.append(cmd);
+        } else {
+            QGles2CommandBuffer::Command cmd;
+            cmd.cmd = QGles2CommandBuffer::Command::CompressedImage;
+            cmd.args.compressedImage.target = texD->target;
+            cmd.args.compressedImage.texture = texD->texture;
+            cmd.args.compressedImage.faceTarget = faceTargetBase + uint(layer);
+            cmd.args.compressedImage.level = level;
+            cmd.args.compressedImage.glintformat = texD->glintformat;
+            cmd.args.compressedImage.w = size.width();
+            cmd.args.compressedImage.h = size.height();
+            cmd.args.compressedImage.size = rawData.size();
+            cmd.args.compressedImage.data = cbD->retainData(rawData);
+            cbD->commands.append(cmd);
+        }
+    } else if (!rawData.isEmpty()) {
+        const QSize size = subresDesc.sourceSize().isEmpty() ? q->sizeForMipLevel(level, texD->m_pixelSize)
+                                                             : subresDesc.sourceSize();
+        quint32 bpl = 0;
+        textureFormatInfo(texD->m_format, size, &bpl, nullptr);
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::SubImage;
+        cmd.args.subImage.target = texD->target;
+        cmd.args.subImage.texture = texD->texture;
+        cmd.args.subImage.faceTarget = faceTargetBase + uint(layer);
+        cmd.args.subImage.level = level;
+        cmd.args.subImage.dx = dp.x();
+        cmd.args.subImage.dy = dp.y();
+        cmd.args.subImage.w = size.width();
+        cmd.args.subImage.h = size.height();
+        cmd.args.subImage.glformat = texD->glformat;
+        cmd.args.subImage.gltype = texD->gltype;
+        // Default unpack alignment (row start aligment
+        // requirement) is 4. QImage guarantees 4 byte aligned
+        // row starts, but our raw data here does not.
+        cmd.args.subImage.rowStartAlign = (bpl & 3) ? 1 : 4;
+        cmd.args.subImage.data = cbD->retainData(rawData);
+        cbD->commands.append(cmd);
+    } else {
+        qWarning("Invalid texture upload for %p layer=%d mip=%d", texD, layer, level);
+    }
+}
+
+void QRhiGles2::enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    QRhiResourceUpdateBatchPrivate *ud = QRhiResourceUpdateBatchPrivate::get(resourceUpdates);
+
+    for (const QRhiResourceUpdateBatchPrivate::BufferOp &u : ud->bufferOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::DynamicUpdate) {
+            QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, u.buf);
+            Q_ASSERT(bufD->m_type == QRhiBuffer::Dynamic);
+            if (bufD->m_usage.testFlag(QRhiBuffer::UniformBuffer)) {
+                memcpy(bufD->ubuf.data() + u.offset, u.data.constData(), size_t(u.data.size()));
+            } else {
+                trackedBufferBarrier(cbD, bufD, QGles2Buffer::AccessUpdate);
+                QGles2CommandBuffer::Command cmd;
+                cmd.cmd = QGles2CommandBuffer::Command::BufferSubData;
+                cmd.args.bufferSubData.target = bufD->targetForDataOps;
+                cmd.args.bufferSubData.buffer = bufD->buffer;
+                cmd.args.bufferSubData.offset = u.offset;
+                cmd.args.bufferSubData.size = u.data.size();
+                cmd.args.bufferSubData.data = cbD->retainData(u.data);
+                cbD->commands.append(cmd);
+            }
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::StaticUpload) {
+            QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, u.buf);
+            Q_ASSERT(bufD->m_type != QRhiBuffer::Dynamic);
+            Q_ASSERT(u.offset + u.data.size() <= bufD->m_size);
+            if (bufD->m_usage.testFlag(QRhiBuffer::UniformBuffer)) {
+                memcpy(bufD->ubuf.data() + u.offset, u.data.constData(), size_t(u.data.size()));
+            } else {
+                trackedBufferBarrier(cbD, bufD, QGles2Buffer::AccessUpdate);
+                QGles2CommandBuffer::Command cmd;
+                cmd.cmd = QGles2CommandBuffer::Command::BufferSubData;
+                cmd.args.bufferSubData.target = bufD->targetForDataOps;
+                cmd.args.bufferSubData.buffer = bufD->buffer;
+                cmd.args.bufferSubData.offset = u.offset;
+                cmd.args.bufferSubData.size = u.data.size();
+                cmd.args.bufferSubData.data = cbD->retainData(u.data);
+                cbD->commands.append(cmd);
+            }
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::Read) {
+            QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, u.buf);
+            if (bufD->m_usage.testFlag(QRhiBuffer::UniformBuffer)) {
+                u.result->data.resize(u.readSize);
+                memcpy(u.result->data.data(), bufD->ubuf.constData() + u.offset, size_t(u.readSize));
+                if (u.result->completed)
+                    u.result->completed();
+            } else {
+                QGles2CommandBuffer::Command cmd;
+                cmd.cmd = QGles2CommandBuffer::Command::GetBufferSubData;
+                cmd.args.getBufferSubData.result = u.result;
+                cmd.args.getBufferSubData.target = bufD->targetForDataOps;
+                cmd.args.getBufferSubData.buffer = bufD->buffer;
+                cmd.args.getBufferSubData.offset = u.offset;
+                cmd.args.getBufferSubData.size = u.readSize;
+                cbD->commands.append(cmd);
+            }
+        }
+    }
+
+    for (const QRhiResourceUpdateBatchPrivate::TextureOp &u : ud->textureOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Upload) {
+            QGles2Texture *texD = QRHI_RES(QGles2Texture, u.dst);
+            for (int layer = 0; layer < QRhi::MAX_LAYERS; ++layer) {
+                for (int level = 0; level < QRhi::MAX_LEVELS; ++level) {
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                        enqueueSubresUpload(texD, cbD, layer, level, subresDesc);
+                }
+            }
+            texD->specified = true;
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Copy) {
+            Q_ASSERT(u.src && u.dst);
+            QGles2Texture *srcD = QRHI_RES(QGles2Texture, u.src);
+            QGles2Texture *dstD = QRHI_RES(QGles2Texture, u.dst);
+
+            trackedImageBarrier(cbD, srcD, QGles2Texture::AccessRead);
+            trackedImageBarrier(cbD, dstD, QGles2Texture::AccessUpdate);
+
+            const QSize mipSize = q->sizeForMipLevel(u.desc.sourceLevel(), srcD->m_pixelSize);
+            const QSize copySize = u.desc.pixelSize().isEmpty() ? mipSize : u.desc.pixelSize();
+            // do not translate coordinates, even if sp is bottom-left from gl's pov
+            const QPoint sp = u.desc.sourceTopLeft();
+            const QPoint dp = u.desc.destinationTopLeft();
+
+            const GLenum srcFaceTargetBase = srcD->m_flags.testFlag(QRhiTexture::CubeMap)
+                    ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : srcD->target;
+            const GLenum dstFaceTargetBase = dstD->m_flags.testFlag(QRhiTexture::CubeMap)
+                    ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : dstD->target;
+
+            QGles2CommandBuffer::Command cmd;
+            cmd.cmd = QGles2CommandBuffer::Command::CopyTex;
+
+            cmd.args.copyTex.srcFaceTarget = srcFaceTargetBase + uint(u.desc.sourceLayer());
+            cmd.args.copyTex.srcTexture = srcD->texture;
+            cmd.args.copyTex.srcLevel = u.desc.sourceLevel();
+            cmd.args.copyTex.srcX = sp.x();
+            cmd.args.copyTex.srcY = sp.y();
+
+            cmd.args.copyTex.dstTarget = dstD->target;
+            cmd.args.copyTex.dstTexture = dstD->texture;
+            cmd.args.copyTex.dstFaceTarget = dstFaceTargetBase + uint(u.desc.destinationLayer());
+            cmd.args.copyTex.dstLevel = u.desc.destinationLevel();
+            cmd.args.copyTex.dstX = dp.x();
+            cmd.args.copyTex.dstY = dp.y();
+
+            cmd.args.copyTex.w = copySize.width();
+            cmd.args.copyTex.h = copySize.height();
+
+            cbD->commands.append(cmd);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Read) {
+            QGles2CommandBuffer::Command cmd;
+            cmd.cmd = QGles2CommandBuffer::Command::ReadPixels;
+            cmd.args.readPixels.result = u.result;
+            QGles2Texture *texD = QRHI_RES(QGles2Texture, u.rb.texture());
+            if (texD)
+                trackedImageBarrier(cbD, texD, QGles2Texture::AccessRead);
+            cmd.args.readPixels.texture = texD ? texD->texture : 0;
+            if (texD) {
+                const QSize readImageSize = q->sizeForMipLevel(u.rb.level(), texD->m_pixelSize);
+                cmd.args.readPixels.w = readImageSize.width();
+                cmd.args.readPixels.h = readImageSize.height();
+                cmd.args.readPixels.format = texD->m_format;
+                const GLenum faceTargetBase = texD->m_flags.testFlag(QRhiTexture::CubeMap)
+                        ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : texD->target;
+                cmd.args.readPixels.readTarget = faceTargetBase + uint(u.rb.layer());
+                cmd.args.readPixels.level = u.rb.level();
+            }
+            cbD->commands.append(cmd);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::GenMips) {
+            QGles2Texture *texD = QRHI_RES(QGles2Texture, u.dst);
+            trackedImageBarrier(cbD, texD, QGles2Texture::AccessFramebuffer);
+            QGles2CommandBuffer::Command cmd;
+            cmd.cmd = QGles2CommandBuffer::Command::GenMip;
+            cmd.args.genMip.target = texD->target;
+            cmd.args.genMip.texture = texD->texture;
+            cbD->commands.append(cmd);
+        }
+    }
+
+    ud->free();
+}
+
+static inline GLenum toGlTopology(QRhiGraphicsPipeline::Topology t)
+{
+    switch (t) {
+    case QRhiGraphicsPipeline::Triangles:
+        return GL_TRIANGLES;
+    case QRhiGraphicsPipeline::TriangleStrip:
+        return GL_TRIANGLE_STRIP;
+    case QRhiGraphicsPipeline::TriangleFan:
+        return GL_TRIANGLE_FAN;
+    case QRhiGraphicsPipeline::Lines:
+        return GL_LINES;
+    case QRhiGraphicsPipeline::LineStrip:
+        return GL_LINE_STRIP;
+    case QRhiGraphicsPipeline::Points:
+        return GL_POINTS;
+    default:
+        Q_UNREACHABLE();
+        return GL_TRIANGLES;
+    }
+}
+
+static inline GLenum toGlCullMode(QRhiGraphicsPipeline::CullMode c)
+{
+    switch (c) {
+    case QRhiGraphicsPipeline::Front:
+        return GL_FRONT;
+    case QRhiGraphicsPipeline::Back:
+        return GL_BACK;
+    default:
+        Q_UNREACHABLE();
+        return GL_BACK;
+    }
+}
+
+static inline GLenum toGlFrontFace(QRhiGraphicsPipeline::FrontFace f)
+{
+    switch (f) {
+    case QRhiGraphicsPipeline::CCW:
+        return GL_CCW;
+    case QRhiGraphicsPipeline::CW:
+        return GL_CW;
+    default:
+        Q_UNREACHABLE();
+        return GL_CCW;
+    }
+}
+
+static inline GLenum toGlBlendFactor(QRhiGraphicsPipeline::BlendFactor f)
+{
+    switch (f) {
+    case QRhiGraphicsPipeline::Zero:
+        return GL_ZERO;
+    case QRhiGraphicsPipeline::One:
+        return GL_ONE;
+    case QRhiGraphicsPipeline::SrcColor:
+        return GL_SRC_COLOR;
+    case QRhiGraphicsPipeline::OneMinusSrcColor:
+        return GL_ONE_MINUS_SRC_COLOR;
+    case QRhiGraphicsPipeline::DstColor:
+        return GL_DST_COLOR;
+    case QRhiGraphicsPipeline::OneMinusDstColor:
+        return GL_ONE_MINUS_DST_COLOR;
+    case QRhiGraphicsPipeline::SrcAlpha:
+        return GL_SRC_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusSrcAlpha:
+        return GL_ONE_MINUS_SRC_ALPHA;
+    case QRhiGraphicsPipeline::DstAlpha:
+        return GL_DST_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusDstAlpha:
+        return GL_ONE_MINUS_DST_ALPHA;
+    case QRhiGraphicsPipeline::ConstantColor:
+        return GL_CONSTANT_COLOR;
+    case QRhiGraphicsPipeline::OneMinusConstantColor:
+        return GL_ONE_MINUS_CONSTANT_COLOR;
+    case QRhiGraphicsPipeline::ConstantAlpha:
+        return GL_CONSTANT_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusConstantAlpha:
+        return GL_ONE_MINUS_CONSTANT_ALPHA;
+    case QRhiGraphicsPipeline::SrcAlphaSaturate:
+        return GL_SRC_ALPHA_SATURATE;
+    case QRhiGraphicsPipeline::Src1Color:
+        Q_FALLTHROUGH();
+    case QRhiGraphicsPipeline::OneMinusSrc1Color:
+        Q_FALLTHROUGH();
+    case QRhiGraphicsPipeline::Src1Alpha:
+        Q_FALLTHROUGH();
+    case QRhiGraphicsPipeline::OneMinusSrc1Alpha:
+        qWarning("Unsupported blend factor %d", f);
+        return GL_ZERO;
+    default:
+        Q_UNREACHABLE();
+        return GL_ZERO;
+    }
+}
+
+static inline GLenum toGlBlendOp(QRhiGraphicsPipeline::BlendOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::Add:
+        return GL_FUNC_ADD;
+    case QRhiGraphicsPipeline::Subtract:
+        return GL_FUNC_SUBTRACT;
+    case QRhiGraphicsPipeline::ReverseSubtract:
+        return GL_FUNC_REVERSE_SUBTRACT;
+    case QRhiGraphicsPipeline::Min:
+        return GL_MIN;
+    case QRhiGraphicsPipeline::Max:
+        return GL_MAX;
+    default:
+        Q_UNREACHABLE();
+        return GL_FUNC_ADD;
+    }
+}
+
+static inline GLenum toGlCompareOp(QRhiGraphicsPipeline::CompareOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::Never:
+        return GL_NEVER;
+    case QRhiGraphicsPipeline::Less:
+        return GL_LESS;
+    case QRhiGraphicsPipeline::Equal:
+        return GL_EQUAL;
+    case QRhiGraphicsPipeline::LessOrEqual:
+        return GL_LEQUAL;
+    case QRhiGraphicsPipeline::Greater:
+        return GL_GREATER;
+    case QRhiGraphicsPipeline::NotEqual:
+        return GL_NOTEQUAL;
+    case QRhiGraphicsPipeline::GreaterOrEqual:
+        return GL_GEQUAL;
+    case QRhiGraphicsPipeline::Always:
+        return GL_ALWAYS;
+    default:
+        Q_UNREACHABLE();
+        return GL_ALWAYS;
+    }
+}
+
+static inline GLenum toGlStencilOp(QRhiGraphicsPipeline::StencilOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::StencilZero:
+        return GL_ZERO;
+    case QRhiGraphicsPipeline::Keep:
+        return GL_KEEP;
+    case QRhiGraphicsPipeline::Replace:
+        return GL_REPLACE;
+    case QRhiGraphicsPipeline::IncrementAndClamp:
+        return GL_INCR;
+    case QRhiGraphicsPipeline::DecrementAndClamp:
+        return GL_DECR;
+    case QRhiGraphicsPipeline::Invert:
+        return GL_INVERT;
+    case QRhiGraphicsPipeline::IncrementAndWrap:
+        return GL_INCR_WRAP;
+    case QRhiGraphicsPipeline::DecrementAndWrap:
+        return GL_DECR_WRAP;
+    default:
+        Q_UNREACHABLE();
+        return GL_KEEP;
+    }
+}
+
+static inline GLenum toGlMinFilter(QRhiSampler::Filter f, QRhiSampler::Filter m)
+{
+    switch (f) {
+    case QRhiSampler::Nearest:
+        if (m == QRhiSampler::None)
+            return GL_NEAREST;
+        else
+            return m == QRhiSampler::Nearest ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST_MIPMAP_LINEAR;
+    case QRhiSampler::Linear:
+        if (m == QRhiSampler::None)
+            return GL_LINEAR;
+        else
+            return m == QRhiSampler::Nearest ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR_MIPMAP_LINEAR;
+    default:
+        Q_UNREACHABLE();
+        return GL_LINEAR;
+    }
+}
+
+static inline GLenum toGlMagFilter(QRhiSampler::Filter f)
+{
+    switch (f) {
+    case QRhiSampler::Nearest:
+        return GL_NEAREST;
+    case QRhiSampler::Linear:
+        return GL_LINEAR;
+    default:
+        Q_UNREACHABLE();
+        return GL_LINEAR;
+    }
+}
+
+static inline GLenum toGlWrapMode(QRhiSampler::AddressMode m)
+{
+    switch (m) {
+    case QRhiSampler::Repeat:
+        return GL_REPEAT;
+    case QRhiSampler::ClampToEdge:
+        return GL_CLAMP_TO_EDGE;
+    case QRhiSampler::Mirror:
+        return GL_MIRRORED_REPEAT;
+    case QRhiSampler::MirrorOnce:
+        Q_FALLTHROUGH();
+    case QRhiSampler::Border:
+        qWarning("Unsupported wrap mode %d", m);
+        return GL_CLAMP_TO_EDGE;
+    default:
+        Q_UNREACHABLE();
+        return GL_CLAMP_TO_EDGE;
+    }
+}
+
+static inline GLenum toGlTextureCompareFunc(QRhiSampler::CompareOp op)
+{
+    switch (op) {
+    case QRhiSampler::Never:
+        return GL_NEVER;
+    case QRhiSampler::Less:
+        return GL_LESS;
+    case QRhiSampler::Equal:
+        return GL_EQUAL;
+    case QRhiSampler::LessOrEqual:
+        return GL_LEQUAL;
+    case QRhiSampler::Greater:
+        return GL_GREATER;
+    case QRhiSampler::NotEqual:
+        return GL_NOTEQUAL;
+    case QRhiSampler::GreaterOrEqual:
+        return GL_GEQUAL;
+    case QRhiSampler::Always:
+        return GL_ALWAYS;
+    default:
+        Q_UNREACHABLE();
+        return GL_NEVER;
+    }
+}
+
+static inline QGles2Buffer::Access toGlAccess(QRhiPassResourceTracker::BufferAccess access)
+{
+    switch (access) {
+    case QRhiPassResourceTracker::BufVertexInput:
+        return QGles2Buffer::AccessVertex;
+    case QRhiPassResourceTracker::BufIndexRead:
+        return QGles2Buffer::AccessIndex;
+    case QRhiPassResourceTracker::BufUniformRead:
+        return QGles2Buffer::AccessUniform;
+    case QRhiPassResourceTracker::BufStorageLoad:
+        return QGles2Buffer::AccessStorageRead;
+    case QRhiPassResourceTracker::BufStorageStore:
+        return QGles2Buffer::AccessStorageWrite;
+    case QRhiPassResourceTracker::BufStorageLoadStore:
+        return QGles2Buffer::AccessStorageReadWrite;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    return QGles2Buffer::AccessNone;
+}
+
+static inline QRhiPassResourceTracker::UsageState toPassTrackerUsageState(const QGles2Buffer::UsageState &bufUsage)
+{
+    QRhiPassResourceTracker::UsageState u;
+    u.layout = 0; // N/A
+    u.access = bufUsage.access;
+    u.stage = 0; // N/A
+    return u;
+}
+
+static inline QGles2Texture::Access toGlAccess(QRhiPassResourceTracker::TextureAccess access)
+{
+    switch (access) {
+    case QRhiPassResourceTracker::TexSample:
+        return QGles2Texture::AccessSample;
+    case QRhiPassResourceTracker::TexColorOutput:
+        return QGles2Texture::AccessFramebuffer;
+    case QRhiPassResourceTracker::TexDepthOutput:
+        return QGles2Texture::AccessFramebuffer;
+    case QRhiPassResourceTracker::TexStorageLoad:
+        return QGles2Texture::AccessStorageRead;
+    case QRhiPassResourceTracker::TexStorageStore:
+        return QGles2Texture::AccessStorageWrite;
+    case QRhiPassResourceTracker::TexStorageLoadStore:
+        return QGles2Texture::AccessStorageReadWrite;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    return QGles2Texture::AccessNone;
+}
+
+static inline QRhiPassResourceTracker::UsageState toPassTrackerUsageState(const QGles2Texture::UsageState &texUsage)
+{
+    QRhiPassResourceTracker::UsageState u;
+    u.layout = 0; // N/A
+    u.access = texUsage.access;
+    u.stage = 0; // N/A
+    return u;
+}
+
+void QRhiGles2::trackedRegisterBuffer(QRhiPassResourceTracker *passResTracker,
+                                      QGles2Buffer *bufD,
+                                      QRhiPassResourceTracker::BufferAccess access,
+                                      QRhiPassResourceTracker::BufferStage stage)
+{
+    QGles2Buffer::UsageState &u(bufD->usageState);
+    passResTracker->registerBuffer(bufD, 0, &access, &stage, toPassTrackerUsageState(u));
+    u.access = toGlAccess(access);
+}
+
+void QRhiGles2::trackedRegisterTexture(QRhiPassResourceTracker *passResTracker,
+                                       QGles2Texture *texD,
+                                       QRhiPassResourceTracker::TextureAccess access,
+                                       QRhiPassResourceTracker::TextureStage stage)
+{
+    QGles2Texture::UsageState &u(texD->usageState);
+    passResTracker->registerTexture(texD, &access, &stage, toPassTrackerUsageState(u));
+    u.access = toGlAccess(access);
+}
+
+void QRhiGles2::executeCommandBuffer(QRhiCommandBuffer *cb)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    GLenum indexType = GL_UNSIGNED_SHORT;
+    quint32 indexStride = sizeof(quint16);
+    quint32 indexOffset = 0;
+
+    for (const QGles2CommandBuffer::Command &cmd : qAsConst(cbD->commands)) {
+        switch (cmd.cmd) {
+        case QGles2CommandBuffer::Command::BeginFrame:
+            if (caps.coreProfile) {
+                if (!vao)
+                    f->glGenVertexArrays(1, &vao);
+                f->glBindVertexArray(vao);
+            }
+            break;
+        case QGles2CommandBuffer::Command::EndFrame:
+            if (vao)
+                f->glBindVertexArray(0);
+            break;
+        case QGles2CommandBuffer::Command::ResetFrame:
+            if (vao)
+                f->glBindVertexArray(vao);
+            break;
+        case QGles2CommandBuffer::Command::Viewport:
+            f->glViewport(GLint(cmd.args.viewport.x), GLint(cmd.args.viewport.y), GLsizei(cmd.args.viewport.w), GLsizei(cmd.args.viewport.h));
+            f->glDepthRangef(cmd.args.viewport.d0, cmd.args.viewport.d1);
+            break;
+        case QGles2CommandBuffer::Command::Scissor:
+            f->glScissor(cmd.args.scissor.x, cmd.args.scissor.y, cmd.args.scissor.w, cmd.args.scissor.h);
+            break;
+        case QGles2CommandBuffer::Command::BlendConstants:
+            f->glBlendColor(cmd.args.blendConstants.r, cmd.args.blendConstants.g, cmd.args.blendConstants.b, cmd.args.blendConstants.a);
+            break;
+        case QGles2CommandBuffer::Command::StencilRef:
+        {
+            QGles2GraphicsPipeline *psD = QRHI_RES(QGles2GraphicsPipeline, cmd.args.stencilRef.ps);
+            if (psD) {
+                f->glStencilFuncSeparate(GL_FRONT, toGlCompareOp(psD->m_stencilFront.compareOp), GLint(cmd.args.stencilRef.ref), psD->m_stencilReadMask);
+                f->glStencilFuncSeparate(GL_BACK, toGlCompareOp(psD->m_stencilBack.compareOp), GLint(cmd.args.stencilRef.ref), psD->m_stencilReadMask);
+            } else {
+                qWarning("No graphics pipeline active for setStencilRef; ignored");
+            }
+        }
+            break;
+        case QGles2CommandBuffer::Command::BindVertexBuffer:
+        {
+            QGles2GraphicsPipeline *psD = QRHI_RES(QGles2GraphicsPipeline, cmd.args.bindVertexBuffer.ps);
+            if (psD) {
+                for (auto it = psD->m_vertexInputLayout.cbeginAttributes(), itEnd = psD->m_vertexInputLayout.cendAttributes();
+                     it != itEnd; ++it)
+                {
+                    const int bindingIdx = it->binding();
+                    if (bindingIdx != cmd.args.bindVertexBuffer.binding)
+                        continue;
+
+                    // we do not support more than one vertex buffer
+                    f->glBindBuffer(GL_ARRAY_BUFFER, cmd.args.bindVertexBuffer.buffer);
+
+                    const QRhiVertexInputBinding *inputBinding = psD->m_vertexInputLayout.bindingAt(bindingIdx);
+                    const int stride = int(inputBinding->stride());
+                    int size = 1;
+                    GLenum type = GL_FLOAT;
+                    bool normalize = false;
+                    switch (it->format()) {
+                    case QRhiVertexInputAttribute::Float4:
+                        type = GL_FLOAT;
+                        size = 4;
+                        break;
+                    case QRhiVertexInputAttribute::Float3:
+                        type = GL_FLOAT;
+                        size = 3;
+                        break;
+                    case QRhiVertexInputAttribute::Float2:
+                        type = GL_FLOAT;
+                        size = 2;
+                        break;
+                    case QRhiVertexInputAttribute::Float:
+                        type = GL_FLOAT;
+                        size = 1;
+                        break;
+                    case QRhiVertexInputAttribute::UNormByte4:
+                        type = GL_UNSIGNED_BYTE;
+                        normalize = true;
+                        size = 4;
+                        break;
+                    case QRhiVertexInputAttribute::UNormByte2:
+                        type = GL_UNSIGNED_BYTE;
+                        normalize = true;
+                        size = 2;
+                        break;
+                    case QRhiVertexInputAttribute::UNormByte:
+                        type = GL_UNSIGNED_BYTE;
+                        normalize = true;
+                        size = 1;
+                        break;
+                    default:
+                        break;
+                    }
+
+                    const int locationIdx = it->location();
+                    quint32 ofs = it->offset() + cmd.args.bindVertexBuffer.offset;
+                    f->glVertexAttribPointer(GLuint(locationIdx), size, type, normalize, stride,
+                                             reinterpret_cast<const GLvoid *>(quintptr(ofs)));
+                    f->glEnableVertexAttribArray(GLuint(locationIdx));
+                    if (inputBinding->classification() == QRhiVertexInputBinding::PerInstance && caps.instancing)
+                        f->glVertexAttribDivisor(GLuint(locationIdx), GLuint(inputBinding->instanceStepRate()));
+                }
+            } else {
+                qWarning("No graphics pipeline active for setVertexInput; ignored");
+            }
+        }
+            break;
+        case QGles2CommandBuffer::Command::BindIndexBuffer:
+            indexType = cmd.args.bindIndexBuffer.type;
+            indexStride = indexType == GL_UNSIGNED_SHORT ? sizeof(quint16) : sizeof(quint32);
+            indexOffset = cmd.args.bindIndexBuffer.offset;
+            f->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cmd.args.bindIndexBuffer.buffer);
+            break;
+        case QGles2CommandBuffer::Command::Draw:
+        {
+            QGles2GraphicsPipeline *psD = QRHI_RES(QGles2GraphicsPipeline, cmd.args.draw.ps);
+            if (psD) {
+                if (cmd.args.draw.instanceCount == 1 || !caps.instancing) {
+                    f->glDrawArrays(psD->drawMode, GLint(cmd.args.draw.firstVertex), GLsizei(cmd.args.draw.vertexCount));
+                } else {
+                    f->glDrawArraysInstanced(psD->drawMode, GLint(cmd.args.draw.firstVertex), GLsizei(cmd.args.draw.vertexCount),
+                                             GLsizei(cmd.args.draw.instanceCount));
+                }
+            } else {
+                qWarning("No graphics pipeline active for draw; ignored");
+            }
+        }
+            break;
+        case QGles2CommandBuffer::Command::DrawIndexed:
+        {
+            QGles2GraphicsPipeline *psD = QRHI_RES(QGles2GraphicsPipeline, cmd.args.drawIndexed.ps);
+            if (psD) {
+                const GLvoid *ofs = reinterpret_cast<const GLvoid *>(
+                            quintptr(cmd.args.drawIndexed.firstIndex * indexStride + indexOffset));
+                if (cmd.args.drawIndexed.instanceCount == 1 || !caps.instancing) {
+                    if (cmd.args.drawIndexed.baseVertex != 0 && caps.baseVertex) {
+                        f->glDrawElementsBaseVertex(psD->drawMode,
+                                                    GLsizei(cmd.args.drawIndexed.indexCount),
+                                                    indexType,
+                                                    ofs,
+                                                    cmd.args.drawIndexed.baseVertex);
+                    } else {
+                        f->glDrawElements(psD->drawMode,
+                                          GLsizei(cmd.args.drawIndexed.indexCount),
+                                          indexType,
+                                          ofs);
+                    }
+                } else {
+                    if (cmd.args.drawIndexed.baseVertex != 0 && caps.baseVertex) {
+                        f->glDrawElementsInstancedBaseVertex(psD->drawMode,
+                                                             GLsizei(cmd.args.drawIndexed.indexCount),
+                                                             indexType,
+                                                             ofs,
+                                                             GLsizei(cmd.args.drawIndexed.instanceCount),
+                                                             cmd.args.drawIndexed.baseVertex);
+                    } else {
+                        f->glDrawElementsInstanced(psD->drawMode,
+                                                   GLsizei(cmd.args.drawIndexed.indexCount),
+                                                   indexType,
+                                                   ofs,
+                                                   GLsizei(cmd.args.drawIndexed.instanceCount));
+                    }
+                }
+            } else {
+                qWarning("No graphics pipeline active for drawIndexed; ignored");
+            }
+        }
+            break;
+        case QGles2CommandBuffer::Command::BindGraphicsPipeline:
+            executeBindGraphicsPipeline(cmd.args.bindGraphicsPipeline.ps);
+            break;
+        case QGles2CommandBuffer::Command::BindShaderResources:
+            bindShaderResources(cmd.args.bindShaderResources.maybeGraphicsPs,
+                                cmd.args.bindShaderResources.maybeComputePs,
+                                cmd.args.bindShaderResources.srb,
+                                cmd.args.bindShaderResources.dynamicOffsetPairs,
+                                cmd.args.bindShaderResources.dynamicOffsetCount);
+            break;
+        case QGles2CommandBuffer::Command::BindFramebuffer:
+            if (cmd.args.bindFramebuffer.fbo) {
+                f->glBindFramebuffer(GL_FRAMEBUFFER, cmd.args.bindFramebuffer.fbo);
+                if (caps.maxDrawBuffers > 1) {
+                    const int colorAttCount = cmd.args.bindFramebuffer.colorAttCount;
+                    QVarLengthArray<GLenum, 8> bufs;
+                    for (int i = 0; i < colorAttCount; ++i)
+                        bufs.append(GL_COLOR_ATTACHMENT0 + uint(i));
+                    f->glDrawBuffers(colorAttCount, bufs.constData());
+                }
+            } else {
+                f->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject());
+                if (caps.maxDrawBuffers > 1) {
+                    GLenum bufs = GL_BACK;
+                    f->glDrawBuffers(1, &bufs);
+                }
+            }
+            if (caps.srgbCapableDefaultFramebuffer) {
+                if (cmd.args.bindFramebuffer.srgb)
+                    f->glEnable(GL_FRAMEBUFFER_SRGB);
+                else
+                    f->glDisable(GL_FRAMEBUFFER_SRGB);
+            }
+            break;
+        case QGles2CommandBuffer::Command::Clear:
+            f->glDisable(GL_SCISSOR_TEST);
+            if (cmd.args.clear.mask & GL_COLOR_BUFFER_BIT) {
+                f->glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+                f->glClearColor(cmd.args.clear.c[0], cmd.args.clear.c[1], cmd.args.clear.c[2], cmd.args.clear.c[3]);
+            }
+            if (cmd.args.clear.mask & GL_DEPTH_BUFFER_BIT) {
+                f->glDepthMask(GL_TRUE);
+                f->glClearDepthf(cmd.args.clear.d);
+            }
+            if (cmd.args.clear.mask & GL_STENCIL_BUFFER_BIT)
+                f->glClearStencil(GLint(cmd.args.clear.s));
+            f->glClear(cmd.args.clear.mask);
+            break;
+        case QGles2CommandBuffer::Command::BufferSubData:
+            f->glBindBuffer(cmd.args.bufferSubData.target, cmd.args.bufferSubData.buffer);
+            f->glBufferSubData(cmd.args.bufferSubData.target, cmd.args.bufferSubData.offset, cmd.args.bufferSubData.size,
+                               cmd.args.bufferSubData.data);
+            break;
+        case QGles2CommandBuffer::Command::GetBufferSubData:
+        {
+            QRhiBufferReadbackResult *result = cmd.args.getBufferSubData.result;
+            f->glBindBuffer(cmd.args.getBufferSubData.target, cmd.args.getBufferSubData.buffer);
+            if (caps.gles) {
+                if (caps.properMapBuffer) {
+                    void *p = f->glMapBufferRange(cmd.args.getBufferSubData.target,
+                                                  cmd.args.getBufferSubData.offset,
+                                                  cmd.args.getBufferSubData.size,
+                                                  GL_MAP_READ_BIT);
+                    if (p) {
+                        result->data.resize(cmd.args.getBufferSubData.size);
+                        memcpy(result->data.data(), p, size_t(cmd.args.getBufferSubData.size));
+                        f->glUnmapBuffer(cmd.args.getBufferSubData.target);
+                    }
+                }
+            } else {
+                result->data.resize(cmd.args.getBufferSubData.size);
+                f->glGetBufferSubData(cmd.args.getBufferSubData.target,
+                                      cmd.args.getBufferSubData.offset,
+                                      cmd.args.getBufferSubData.size,
+                                      result->data.data());
+            }
+            if (result->completed)
+                result->completed();
+        }
+            break;
+        case QGles2CommandBuffer::Command::CopyTex:
+        {
+            GLuint fbo;
+            f->glGenFramebuffers(1, &fbo);
+            f->glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+            f->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                      cmd.args.copyTex.srcFaceTarget, cmd.args.copyTex.srcTexture, cmd.args.copyTex.srcLevel);
+            f->glBindTexture(cmd.args.copyTex.dstTarget, cmd.args.copyTex.dstTexture);
+            f->glCopyTexSubImage2D(cmd.args.copyTex.dstFaceTarget, cmd.args.copyTex.dstLevel,
+                                   cmd.args.copyTex.dstX, cmd.args.copyTex.dstY,
+                                   cmd.args.copyTex.srcX, cmd.args.copyTex.srcY,
+                                   cmd.args.copyTex.w, cmd.args.copyTex.h);
+            f->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject());
+            f->glDeleteFramebuffers(1, &fbo);
+        }
+            break;
+        case QGles2CommandBuffer::Command::ReadPixels:
+        {
+            QRhiReadbackResult *result = cmd.args.readPixels.result;
+            GLuint tex = cmd.args.readPixels.texture;
+            GLuint fbo = 0;
+            int mipLevel = 0;
+            if (tex) {
+                result->pixelSize = QSize(cmd.args.readPixels.w, cmd.args.readPixels.h);
+                result->format = cmd.args.readPixels.format;
+                mipLevel = cmd.args.readPixels.level;
+                if (mipLevel == 0 || caps.nonBaseLevelFramebufferTexture) {
+                    f->glGenFramebuffers(1, &fbo);
+                    f->glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+                    f->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                              cmd.args.readPixels.readTarget, cmd.args.readPixels.texture, mipLevel);
+                }
+            } else {
+                result->pixelSize = currentSwapChain->pixelSize;
+                result->format = QRhiTexture::RGBA8;
+                // readPixels handles multisample resolving implicitly
+            }
+            result->data.resize(result->pixelSize.width() * result->pixelSize.height() * 4);
+            if (mipLevel == 0 || caps.nonBaseLevelFramebufferTexture) {
+                // With GLES (2.0?) GL_RGBA is the only mandated readback format, so stick with it.
+                f->glReadPixels(0, 0, result->pixelSize.width(), result->pixelSize.height(),
+                                GL_RGBA, GL_UNSIGNED_BYTE,
+                                result->data.data());
+            } else {
+                result->data.fill('\0');
+            }
+            if (fbo) {
+                f->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject());
+                f->glDeleteFramebuffers(1, &fbo);
+            }
+            if (result->completed)
+                result->completed();
+        }
+            break;
+        case QGles2CommandBuffer::Command::SubImage:
+            f->glBindTexture(cmd.args.subImage.target, cmd.args.subImage.texture);
+            if (cmd.args.subImage.rowStartAlign != 4)
+                f->glPixelStorei(GL_UNPACK_ALIGNMENT, cmd.args.subImage.rowStartAlign);
+            f->glTexSubImage2D(cmd.args.subImage.faceTarget, cmd.args.subImage.level,
+                               cmd.args.subImage.dx, cmd.args.subImage.dy,
+                               cmd.args.subImage.w, cmd.args.subImage.h,
+                               cmd.args.subImage.glformat, cmd.args.subImage.gltype,
+                               cmd.args.subImage.data);
+            if (cmd.args.subImage.rowStartAlign != 4)
+                f->glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+            break;
+        case QGles2CommandBuffer::Command::CompressedImage:
+            f->glBindTexture(cmd.args.compressedImage.target, cmd.args.compressedImage.texture);
+            f->glCompressedTexImage2D(cmd.args.compressedImage.faceTarget, cmd.args.compressedImage.level,
+                                      cmd.args.compressedImage.glintformat,
+                                      cmd.args.compressedImage.w, cmd.args.compressedImage.h, 0,
+                                      cmd.args.compressedImage.size, cmd.args.compressedImage.data);
+            break;
+        case QGles2CommandBuffer::Command::CompressedSubImage:
+            f->glBindTexture(cmd.args.compressedSubImage.target, cmd.args.compressedSubImage.texture);
+            f->glCompressedTexSubImage2D(cmd.args.compressedSubImage.faceTarget, cmd.args.compressedSubImage.level,
+                                         cmd.args.compressedSubImage.dx, cmd.args.compressedSubImage.dy,
+                                         cmd.args.compressedSubImage.w, cmd.args.compressedSubImage.h,
+                                         cmd.args.compressedSubImage.glintformat,
+                                         cmd.args.compressedSubImage.size, cmd.args.compressedSubImage.data);
+            break;
+        case QGles2CommandBuffer::Command::BlitFromRenderbuffer:
+        {
+            GLuint fbo[2];
+            f->glGenFramebuffers(2, fbo);
+            f->glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo[0]);
+            f->glFramebufferRenderbuffer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                         GL_RENDERBUFFER, cmd.args.blitFromRb.renderbuffer);
+            f->glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo[1]);
+
+            f->glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, cmd.args.blitFromRb.target,
+                                      cmd.args.blitFromRb.texture, cmd.args.blitFromRb.dstLevel);
+            f->glBlitFramebuffer(0, 0, cmd.args.blitFromRb.w, cmd.args.blitFromRb.h,
+                                 0, 0, cmd.args.blitFromRb.w, cmd.args.blitFromRb.h,
+                                 GL_COLOR_BUFFER_BIT,
+                                 GL_LINEAR);
+            f->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject());
+        }
+            break;
+        case QGles2CommandBuffer::Command::GenMip:
+            f->glBindTexture(cmd.args.genMip.target, cmd.args.genMip.texture);
+            f->glGenerateMipmap(cmd.args.genMip.target);
+            break;
+        case QGles2CommandBuffer::Command::BindComputePipeline:
+        {
+            QGles2ComputePipeline *psD = QRHI_RES(QGles2ComputePipeline, cmd.args.bindComputePipeline.ps);
+            f->glUseProgram(psD->program);
+        }
+            break;
+        case QGles2CommandBuffer::Command::Dispatch:
+            f->glDispatchCompute(cmd.args.dispatch.x, cmd.args.dispatch.y, cmd.args.dispatch.z);
+            break;
+        case QGles2CommandBuffer::Command::BarriersForPass:
+        {
+            GLbitfield barriers = 0;
+            QRhiPassResourceTracker &tracker(cbD->passResTrackers[cmd.args.barriersForPass.trackerIndex]);
+            // we only care about after-write, not any other accesses, and
+            // cannot tell if something was written in a shader several passes
+            // ago: now the previously written resource may be used with an
+            // access that was not in the previous passes, result in a missing
+            // barrier in theory. Hence setting all barrier bits whenever
+            // something previously written is used for the first time in a
+            // subsequent pass.
+            for (auto it = tracker.cbeginBuffers(), itEnd = tracker.cendBuffers(); it != itEnd; ++it) {
+                QGles2Buffer::Access accessBeforePass = QGles2Buffer::Access(it->stateAtPassBegin.access);
+                if (accessBeforePass == QGles2Buffer::AccessStorageWrite
+                        || accessBeforePass == QGles2Buffer::AccessStorageReadWrite)
+                {
+                    barriers |= GL_ALL_BARRIER_BITS;
+                }
+            }
+            for (auto it = tracker.cbeginTextures(), itEnd = tracker.cendTextures(); it != itEnd; ++it) {
+                QGles2Texture::Access accessBeforePass = QGles2Texture::Access(it->stateAtPassBegin.access);
+                if (accessBeforePass == QGles2Texture::AccessStorageWrite
+                        || accessBeforePass == QGles2Texture::AccessStorageReadWrite)
+                {
+                    barriers |= GL_ALL_BARRIER_BITS;
+                }
+            }
+            if (barriers)
+                f->glMemoryBarrier(barriers);
+        }
+            break;
+        case QGles2CommandBuffer::Command::Barrier:
+            f->glMemoryBarrier(cmd.args.barrier.barriers);
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+void QRhiGles2::executeBindGraphicsPipeline(QRhiGraphicsPipeline *ps)
+{
+    QGles2GraphicsPipeline *psD = QRHI_RES(QGles2GraphicsPipeline, ps);
+
+    // No state tracking logic as of now. Could introduce something to reduce
+    // the number of gl* calls (when using and changing between multiple
+    // pipelines), but then begin/endExternal() should invalidate the cached
+    // state as appropriate.
+
+    if (psD->m_flags.testFlag(QRhiGraphicsPipeline::UsesScissor))
+        f->glEnable(GL_SCISSOR_TEST);
+    else
+        f->glDisable(GL_SCISSOR_TEST);
+    if (psD->m_cullMode == QRhiGraphicsPipeline::None) {
+        f->glDisable(GL_CULL_FACE);
+    } else {
+        f->glEnable(GL_CULL_FACE);
+        f->glCullFace(toGlCullMode(psD->m_cullMode));
+    }
+    f->glFrontFace(toGlFrontFace(psD->m_frontFace));
+    if (!psD->m_targetBlends.isEmpty()) {
+        const QRhiGraphicsPipeline::TargetBlend &blend(psD->m_targetBlends.first()); // no MRT
+        GLboolean wr = blend.colorWrite.testFlag(QRhiGraphicsPipeline::R);
+        GLboolean wg = blend.colorWrite.testFlag(QRhiGraphicsPipeline::G);
+        GLboolean wb = blend.colorWrite.testFlag(QRhiGraphicsPipeline::B);
+        GLboolean wa = blend.colorWrite.testFlag(QRhiGraphicsPipeline::A);
+        f->glColorMask(wr, wg, wb, wa);
+        if (blend.enable) {
+            f->glEnable(GL_BLEND);
+            f->glBlendFuncSeparate(toGlBlendFactor(blend.srcColor),
+                                   toGlBlendFactor(blend.dstColor),
+                                   toGlBlendFactor(blend.srcAlpha),
+                                   toGlBlendFactor(blend.dstAlpha));
+            f->glBlendEquationSeparate(toGlBlendOp(blend.opColor), toGlBlendOp(blend.opAlpha));
+        } else {
+            f->glDisable(GL_BLEND);
+        }
+    } else {
+        f->glDisable(GL_BLEND);
+        f->glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+    }
+    if (psD->m_depthTest)
+        f->glEnable(GL_DEPTH_TEST);
+    else
+        f->glDisable(GL_DEPTH_TEST);
+    if (psD->m_depthWrite)
+        f->glDepthMask(GL_TRUE);
+    else
+        f->glDepthMask(GL_FALSE);
+    f->glDepthFunc(toGlCompareOp(psD->m_depthOp));
+    if (psD->m_stencilTest) {
+        f->glEnable(GL_STENCIL_TEST);
+        f->glStencilFuncSeparate(GL_FRONT, toGlCompareOp(psD->m_stencilFront.compareOp), 0, psD->m_stencilReadMask);
+        f->glStencilOpSeparate(GL_FRONT,
+                               toGlStencilOp(psD->m_stencilFront.failOp),
+                               toGlStencilOp(psD->m_stencilFront.depthFailOp),
+                               toGlStencilOp(psD->m_stencilFront.passOp));
+        f->glStencilMaskSeparate(GL_FRONT, psD->m_stencilWriteMask);
+        f->glStencilFuncSeparate(GL_BACK, toGlCompareOp(psD->m_stencilBack.compareOp), 0, psD->m_stencilReadMask);
+        f->glStencilOpSeparate(GL_BACK,
+                               toGlStencilOp(psD->m_stencilBack.failOp),
+                               toGlStencilOp(psD->m_stencilBack.depthFailOp),
+                               toGlStencilOp(psD->m_stencilBack.passOp));
+        f->glStencilMaskSeparate(GL_BACK, psD->m_stencilWriteMask);
+    } else {
+        f->glDisable(GL_STENCIL_TEST);
+    }
+
+    if (psD->topology() == QRhiGraphicsPipeline::Lines || psD->topology() == QRhiGraphicsPipeline::LineStrip)
+        f->glLineWidth(psD->m_lineWidth);
+
+    f->glUseProgram(psD->program);
+}
+
+void QRhiGles2::bindShaderResources(QRhiGraphicsPipeline *maybeGraphicsPs, QRhiComputePipeline *maybeComputePs,
+                                    QRhiShaderResourceBindings *srb,
+                                    const uint *dynOfsPairs, int dynOfsCount)
+{
+    QGles2ShaderResourceBindings *srbD = QRHI_RES(QGles2ShaderResourceBindings, srb);
+    int texUnit = 0;
+
+    for (int i = 0, ie = srbD->m_bindings.count(); i != ie; ++i) {
+        const QRhiShaderResourceBinding::Data *b = srbD->m_bindings.at(i).data();
+
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+        {
+            int viewOffset = b->u.ubuf.offset;
+            if (dynOfsCount) {
+                for (int j = 0; j < dynOfsCount; ++j) {
+                    if (dynOfsPairs[2 * j] == uint(b->binding)) {
+                        viewOffset = int(dynOfsPairs[2 * j + 1]);
+                        break;
+                    }
+                }
+            }
+            QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, b->u.ubuf.buf);
+            const QByteArray bufView = QByteArray::fromRawData(bufD->ubuf.constData() + viewOffset,
+                                                               b->u.ubuf.maybeSize ? b->u.ubuf.maybeSize : bufD->m_size);
+            QVector<QGles2UniformDescription> &uniforms(maybeGraphicsPs ? QRHI_RES(QGles2GraphicsPipeline, maybeGraphicsPs)->uniforms
+                                                                        : QRHI_RES(QGles2ComputePipeline, maybeComputePs)->uniforms);
+            for (QGles2UniformDescription &uniform : uniforms) {
+                if (uniform.binding == b->binding) {
+                    // in a uniform buffer everything is at least 4 byte aligned
+                    // so this should not cause unaligned reads
+                    const void *src = bufView.constData() + uniform.offset;
+
+                    switch (uniform.type) {
+                    case QShaderDescription::Float:
+                        f->glUniform1f(uniform.glslLocation, *reinterpret_cast<const float *>(src));
+                        break;
+                    case QShaderDescription::Vec2:
+                        f->glUniform2fv(uniform.glslLocation, 1, reinterpret_cast<const float *>(src));
+                        break;
+                    case QShaderDescription::Vec3:
+                        f->glUniform3fv(uniform.glslLocation, 1, reinterpret_cast<const float *>(src));
+                        break;
+                    case QShaderDescription::Vec4:
+                        f->glUniform4fv(uniform.glslLocation, 1, reinterpret_cast<const float *>(src));
+                        break;
+                    case QShaderDescription::Mat2:
+                        f->glUniformMatrix2fv(uniform.glslLocation, 1, GL_FALSE, reinterpret_cast<const float *>(src));
+                        break;
+                    case QShaderDescription::Mat3:
+                        f->glUniformMatrix3fv(uniform.glslLocation, 1, GL_FALSE, reinterpret_cast<const float *>(src));
+                        break;
+                    case QShaderDescription::Mat4:
+                        f->glUniformMatrix4fv(uniform.glslLocation, 1, GL_FALSE, reinterpret_cast<const float *>(src));
+                        break;
+                    case QShaderDescription::Int:
+                        f->glUniform1i(uniform.glslLocation, *reinterpret_cast<const qint32 *>(src));
+                        break;
+                    case QShaderDescription::Int2:
+                        f->glUniform2iv(uniform.glslLocation, 1, reinterpret_cast<const qint32 *>(src));
+                        break;
+                    case QShaderDescription::Int3:
+                        f->glUniform3iv(uniform.glslLocation, 1, reinterpret_cast<const qint32 *>(src));
+                        break;
+                    case QShaderDescription::Int4:
+                        f->glUniform4iv(uniform.glslLocation, 1, reinterpret_cast<const qint32 *>(src));
+                        break;
+                    case QShaderDescription::Uint:
+                        f->glUniform1ui(uniform.glslLocation, *reinterpret_cast<const quint32 *>(src));
+                        break;
+                    case QShaderDescription::Uint2:
+                        f->glUniform2uiv(uniform.glslLocation, 1, reinterpret_cast<const quint32 *>(src));
+                        break;
+                    case QShaderDescription::Uint3:
+                        f->glUniform3uiv(uniform.glslLocation, 1, reinterpret_cast<const quint32 *>(src));
+                        break;
+                    case QShaderDescription::Uint4:
+                        f->glUniform4uiv(uniform.glslLocation, 1, reinterpret_cast<const quint32 *>(src));
+                        break;
+                    case QShaderDescription::Bool: // a glsl bool is 4 bytes, like (u)int
+                        f->glUniform1i(uniform.glslLocation, *reinterpret_cast<const qint32 *>(src));
+                        break;
+                    case QShaderDescription::Bool2:
+                        f->glUniform2iv(uniform.glslLocation, 1, reinterpret_cast<const qint32 *>(src));
+                        break;
+                    case QShaderDescription::Bool3:
+                        f->glUniform3iv(uniform.glslLocation, 1, reinterpret_cast<const qint32 *>(src));
+                        break;
+                    case QShaderDescription::Bool4:
+                        f->glUniform4iv(uniform.glslLocation, 1, reinterpret_cast<const qint32 *>(src));
+                        break;
+                    // ### more types
+                    default:
+                        break;
+                    }
+                }
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::SampledTexture:
+        {
+            QGles2Texture *texD = QRHI_RES(QGles2Texture, b->u.stex.tex);
+            QGles2Sampler *samplerD = QRHI_RES(QGles2Sampler, b->u.stex.sampler);
+            QVector<QGles2SamplerDescription> &samplers(maybeGraphicsPs ? QRHI_RES(QGles2GraphicsPipeline, maybeGraphicsPs)->samplers
+                                                                        : QRHI_RES(QGles2ComputePipeline, maybeComputePs)->samplers);
+
+            for (QGles2SamplerDescription &sampler : samplers) {
+                if (sampler.binding == b->binding) {
+                    f->glActiveTexture(GL_TEXTURE0 + uint(texUnit));
+                    f->glBindTexture(texD->target, texD->texture);
+
+                    if (texD->samplerState != samplerD->d) {
+                        f->glTexParameteri(texD->target, GL_TEXTURE_MIN_FILTER, GLint(samplerD->d.glminfilter));
+                        f->glTexParameteri(texD->target, GL_TEXTURE_MAG_FILTER, GLint(samplerD->d.glmagfilter));
+                        f->glTexParameteri(texD->target, GL_TEXTURE_WRAP_S, GLint(samplerD->d.glwraps));
+                        f->glTexParameteri(texD->target, GL_TEXTURE_WRAP_T, GLint(samplerD->d.glwrapt));
+                        // 3D textures not supported by GLES 2.0 or by us atm...
+                        //f->glTexParameteri(texD->target, GL_TEXTURE_WRAP_R, samplerD->d.glwrapr);
+                        if (caps.textureCompareMode) {
+                            if (samplerD->d.gltexcomparefunc != GL_NEVER) {
+                                f->glTexParameteri(texD->target, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+                                f->glTexParameteri(texD->target, GL_TEXTURE_COMPARE_FUNC, GLint(samplerD->d.gltexcomparefunc));
+                            } else {
+                                f->glTexParameteri(texD->target, GL_TEXTURE_COMPARE_MODE, GL_NONE);
+                            }
+                        }
+                        texD->samplerState = samplerD->d;
+                    }
+
+                    f->glUniform1i(sampler.glslLocation, texUnit);
+                    ++texUnit;
+                }
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::ImageLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageLoadStore:
+        {
+            QGles2Texture *texD = QRHI_RES(QGles2Texture, b->u.simage.tex);
+            const bool layered = texD->m_flags.testFlag(QRhiTexture::CubeMap);
+            GLenum access = GL_READ_WRITE;
+            if (b->type == QRhiShaderResourceBinding::ImageLoad)
+                access = GL_READ_ONLY;
+            else if (b->type == QRhiShaderResourceBinding::ImageStore)
+                access = GL_WRITE_ONLY;
+            f->glBindImageTexture(GLuint(b->binding), texD->texture,
+                                  b->u.simage.level, layered, 0,
+                                  access, texD->glsizedintformat);
+        }
+            break;
+        case QRhiShaderResourceBinding::BufferLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferLoadStore:
+        {
+            QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, b->u.sbuf.buf);
+            if (b->u.sbuf.offset == 0 && b->u.sbuf.maybeSize == 0)
+                f->glBindBufferBase(GL_SHADER_STORAGE_BUFFER, GLuint(b->binding), bufD->buffer);
+            else
+                f->glBindBufferRange(GL_SHADER_STORAGE_BUFFER, GLuint(b->binding), bufD->buffer,
+                                     b->u.sbuf.offset, b->u.sbuf.maybeSize ? b->u.sbuf.maybeSize : bufD->m_size);
+        }
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    if (texUnit > 1)
+        f->glActiveTexture(GL_TEXTURE0);
+}
+
+void QRhiGles2::resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    Q_ASSERT(QRHI_RES(QGles2CommandBuffer, cb)->recordingPass == QGles2CommandBuffer::NoPass);
+
+    enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+QGles2RenderTargetData *QRhiGles2::enqueueBindFramebuffer(QRhiRenderTarget *rt, QGles2CommandBuffer *cbD,
+                                                          bool *wantsColorClear, bool *wantsDsClear)
+{
+    QGles2RenderTargetData *rtD = nullptr;
+    QRhiPassResourceTracker &passResTracker(cbD->passResTrackers[cbD->currentPassResTrackerIndex]);
+
+    QGles2CommandBuffer::Command fbCmd;
+    fbCmd.cmd = QGles2CommandBuffer::Command::BindFramebuffer;
+
+    switch (rt->resourceType()) {
+    case QRhiResource::RenderTarget:
+        rtD = &QRHI_RES(QGles2ReferenceRenderTarget, rt)->d;
+        if (wantsColorClear)
+            *wantsColorClear = true;
+        if (wantsDsClear)
+            *wantsDsClear = true;
+        fbCmd.args.bindFramebuffer.fbo = 0;
+        fbCmd.args.bindFramebuffer.colorAttCount = 1;
+        break;
+    case QRhiResource::TextureRenderTarget:
+    {
+        QGles2TextureRenderTarget *rtTex = QRHI_RES(QGles2TextureRenderTarget, rt);
+        rtD = &rtTex->d;
+        if (wantsColorClear)
+            *wantsColorClear = !rtTex->m_flags.testFlag(QRhiTextureRenderTarget::PreserveColorContents);
+        if (wantsDsClear)
+            *wantsDsClear = !rtTex->m_flags.testFlag(QRhiTextureRenderTarget::PreserveDepthStencilContents);
+        fbCmd.args.bindFramebuffer.fbo = rtTex->framebuffer;
+        fbCmd.args.bindFramebuffer.colorAttCount = rtD->colorAttCount;
+
+        for (auto it = rtTex->m_desc.cbeginColorAttachments(), itEnd = rtTex->m_desc.cendColorAttachments();
+             it != itEnd; ++it)
+        {
+            const QRhiColorAttachment &colorAtt(*it);
+            QGles2Texture *texD = QRHI_RES(QGles2Texture, colorAtt.texture());
+            QGles2Texture *resolveTexD = QRHI_RES(QGles2Texture, colorAtt.resolveTexture());
+            if (texD) {
+                trackedRegisterTexture(&passResTracker, texD,
+                                       QRhiPassResourceTracker::TexColorOutput,
+                                       QRhiPassResourceTracker::TexColorOutputStage);
+            }
+            if (resolveTexD) {
+                trackedRegisterTexture(&passResTracker, resolveTexD,
+                                       QRhiPassResourceTracker::TexColorOutput,
+                                       QRhiPassResourceTracker::TexColorOutputStage);
+            }
+            // renderbuffers cannot be written in shaders (no image store) so
+            // they do not matter here
+        }
+        if (rtTex->m_desc.depthTexture()) {
+            trackedRegisterTexture(&passResTracker, QRHI_RES(QGles2Texture, rtTex->m_desc.depthTexture()),
+                                   QRhiPassResourceTracker::TexDepthOutput,
+                                   QRhiPassResourceTracker::TexDepthOutputStage);
+        }
+    }
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    fbCmd.args.bindFramebuffer.srgb = rtD->srgbUpdateAndBlend;
+    cbD->commands.append(fbCmd);
+
+    return rtD;
+}
+
+void QRhiGles2::enqueueBarriersForPass(QGles2CommandBuffer *cbD)
+{
+    cbD->passResTrackers.append(QRhiPassResourceTracker());
+    cbD->currentPassResTrackerIndex = cbD->passResTrackers.count() - 1;
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = QGles2CommandBuffer::Command::BarriersForPass;
+    cmd.args.barriersForPass.trackerIndex = cbD->currentPassResTrackerIndex;
+    cbD->commands.append(cmd);
+}
+
+void QRhiGles2::beginPass(QRhiCommandBuffer *cb,
+                          QRhiRenderTarget *rt,
+                          const QColor &colorClearValue,
+                          const QRhiDepthStencilClearValue &depthStencilClearValue,
+                          QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::NoPass);
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+
+    // Get a new resource tracker. Then add a command that will generate
+    // glMemoryBarrier() calls based on that tracker when submitted.
+    enqueueBarriersForPass(cbD);
+
+    bool wantsColorClear, wantsDsClear;
+    QGles2RenderTargetData *rtD = enqueueBindFramebuffer(rt, cbD, &wantsColorClear, &wantsDsClear);
+
+    QGles2CommandBuffer::Command clearCmd;
+    clearCmd.cmd = QGles2CommandBuffer::Command::Clear;
+    clearCmd.args.clear.mask = 0;
+    if (rtD->colorAttCount && wantsColorClear)
+        clearCmd.args.clear.mask |= GL_COLOR_BUFFER_BIT;
+    if (rtD->dsAttCount && wantsDsClear)
+        clearCmd.args.clear.mask |= GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
+    clearCmd.args.clear.c[0] = float(colorClearValue.redF());
+    clearCmd.args.clear.c[1] = float(colorClearValue.greenF());
+    clearCmd.args.clear.c[2] = float(colorClearValue.blueF());
+    clearCmd.args.clear.c[3] = float(colorClearValue.alphaF());
+    clearCmd.args.clear.d = depthStencilClearValue.depthClearValue();
+    clearCmd.args.clear.s = depthStencilClearValue.stencilClearValue();
+    cbD->commands.append(clearCmd);
+
+    cbD->recordingPass = QGles2CommandBuffer::RenderPass;
+    cbD->currentTarget = rt;
+
+    cbD->resetCachedState();
+}
+
+void QRhiGles2::endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::RenderPass);
+
+    if (cbD->currentTarget->resourceType() == QRhiResource::TextureRenderTarget) {
+        QGles2TextureRenderTarget *rtTex = QRHI_RES(QGles2TextureRenderTarget, cbD->currentTarget);
+        if (rtTex->m_desc.cbeginColorAttachments() != rtTex->m_desc.cendColorAttachments()) {
+            // handle only 1 color attachment and only (msaa) renderbuffer
+            const QRhiColorAttachment &colorAtt(*rtTex->m_desc.cbeginColorAttachments());
+            if (colorAtt.resolveTexture()) {
+                Q_ASSERT(colorAtt.renderBuffer());
+                QGles2RenderBuffer *rbD = QRHI_RES(QGles2RenderBuffer, colorAtt.renderBuffer());
+                const QSize size = colorAtt.resolveTexture()->pixelSize();
+                if (rbD->pixelSize() != size) {
+                    qWarning("Resolve source (%dx%d) and target (%dx%d) size does not match",
+                             rbD->pixelSize().width(), rbD->pixelSize().height(), size.width(), size.height());
+                }
+                QGles2CommandBuffer::Command cmd;
+                cmd.cmd = QGles2CommandBuffer::Command::BlitFromRenderbuffer;
+                cmd.args.blitFromRb.renderbuffer = rbD->renderbuffer;
+                cmd.args.blitFromRb.w = size.width();
+                cmd.args.blitFromRb.h = size.height();
+                QGles2Texture *colorTexD = QRHI_RES(QGles2Texture, colorAtt.resolveTexture());
+                const GLenum faceTargetBase = colorTexD->m_flags.testFlag(QRhiTexture::CubeMap) ? GL_TEXTURE_CUBE_MAP_POSITIVE_X
+                                                                                                : colorTexD->target;
+                cmd.args.blitFromRb.target = faceTargetBase + uint(colorAtt.resolveLayer());
+                cmd.args.blitFromRb.texture = colorTexD->texture;
+                cmd.args.blitFromRb.dstLevel = colorAtt.resolveLevel();
+                cbD->commands.append(cmd);
+            }
+        }
+    }
+
+    cbD->recordingPass = QGles2CommandBuffer::NoPass;
+    cbD->currentTarget = nullptr;
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+void QRhiGles2::beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::NoPass);
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+
+    enqueueBarriersForPass(cbD);
+
+    cbD->recordingPass = QGles2CommandBuffer::ComputePass;
+
+    cbD->resetCachedState();
+}
+
+void QRhiGles2::endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::ComputePass);
+
+    cbD->recordingPass = QGles2CommandBuffer::NoPass;
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+void QRhiGles2::setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::ComputePass);
+    QGles2ComputePipeline *psD = QRHI_RES(QGles2ComputePipeline, ps);
+    const bool pipelineChanged = cbD->currentComputePipeline != ps || cbD->currentPipelineGeneration != psD->generation;
+
+    if (pipelineChanged) {
+        cbD->currentGraphicsPipeline = nullptr;
+        cbD->currentComputePipeline = ps;
+        cbD->currentPipelineGeneration = psD->generation;
+
+        QGles2CommandBuffer::Command cmd;
+        cmd.cmd = QGles2CommandBuffer::Command::BindComputePipeline;
+        cmd.args.bindComputePipeline.ps = ps;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiGles2::dispatch(QRhiCommandBuffer *cb, int x, int y, int z)
+{
+    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::ComputePass);
+
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = QGles2CommandBuffer::Command::Dispatch;
+    cmd.args.dispatch.x = GLuint(x);
+    cmd.args.dispatch.y = GLuint(y);
+    cmd.args.dispatch.z = GLuint(z);
+    cbD->commands.append(cmd);
+}
+
+static inline GLenum toGlShaderType(QRhiShaderStage::Type type)
+{
+    switch (type) {
+    case QRhiShaderStage::Vertex:
+        return GL_VERTEX_SHADER;
+    case QRhiShaderStage::Fragment:
+        return GL_FRAGMENT_SHADER;
+    case QRhiShaderStage::Compute:
+        return GL_COMPUTE_SHADER;
+    default:
+        Q_UNREACHABLE();
+        return GL_VERTEX_SHADER;
+    }
+}
+
+QByteArray QRhiGles2::shaderSource(const QRhiShaderStage &shaderStage, int *glslVersion)
+{
+    const QShader bakedShader = shaderStage.shader();
+    QVector<int> versionsToTry;
+    QByteArray source;
+    if (caps.gles) {
+        if (caps.ctxMajor > 3 || (caps.ctxMajor == 3 && caps.ctxMinor >= 2)) {
+            versionsToTry << 320 << 310 << 300 << 100;
+        } else if (caps.ctxMajor == 3 && caps.ctxMinor == 1) {
+            versionsToTry << 310 << 300 << 100;
+        } else if (caps.ctxMajor == 3 && caps.ctxMinor == 0) {
+            versionsToTry << 300 << 100;
+        } else {
+            versionsToTry << 100;
+        }
+        for (int v : versionsToTry) {
+            QShaderVersion ver(v, QShaderVersion::GlslEs);
+            source = bakedShader.shader({ QShader::GlslShader, ver, shaderStage.shaderVariant() }).shader();
+            if (!source.isEmpty()) {
+                if (glslVersion)
+                    *glslVersion = v;
+                break;
+            }
+        }
+    } else {
+        if (caps.ctxMajor > 4 || (caps.ctxMajor == 4 && caps.ctxMinor >= 6)) {
+            versionsToTry << 460 << 450 << 440 << 430 << 420 << 410 << 400 << 330 << 150;
+        } else if (caps.ctxMajor == 4 && caps.ctxMinor == 5) {
+            versionsToTry << 450 << 440 << 430 << 420 << 410 << 400 << 330 << 150;
+        } else if (caps.ctxMajor == 4 && caps.ctxMinor == 4) {
+            versionsToTry << 440 << 430 << 420 << 410 << 400 << 330 << 150;
+        } else if (caps.ctxMajor == 4 && caps.ctxMinor == 3) {
+            versionsToTry << 430 << 420 << 410 << 400 << 330 << 150;
+        } else if (caps.ctxMajor == 4 && caps.ctxMinor == 2) {
+            versionsToTry << 420 << 410 << 400 << 330 << 150;
+        } else if (caps.ctxMajor == 4 && caps.ctxMinor == 1) {
+            versionsToTry << 410 << 400 << 330 << 150;
+        } else if (caps.ctxMajor == 4 && caps.ctxMinor == 0) {
+            versionsToTry << 400 << 330 << 150;
+        } else if (caps.ctxMajor == 3 && caps.ctxMinor == 3) {
+            versionsToTry << 330 << 150;
+        } else if (caps.ctxMajor == 3 && caps.ctxMinor == 2) {
+            versionsToTry << 150;
+        }
+        if (!caps.coreProfile)
+            versionsToTry << 120;
+        for (int v : versionsToTry) {
+            source = bakedShader.shader({ QShader::GlslShader, v, shaderStage.shaderVariant() }).shader();
+            if (!source.isEmpty()) {
+                if (glslVersion)
+                    *glslVersion = v;
+                break;
+            }
+        }
+    }
+    if (source.isEmpty()) {
+        qWarning() << "No GLSL shader code found (versions tried: " << versionsToTry
+                   << ") in baked shader" << bakedShader;
+    }
+    return source;
+}
+
+bool QRhiGles2::compileShader(GLuint program, const QRhiShaderStage &shaderStage, int *glslVersion)
+{
+    const QByteArray source = shaderSource(shaderStage, glslVersion);
+    if (source.isEmpty())
+        return false;
+
+    GLuint shader;
+    auto cacheIt = m_shaderCache.constFind(shaderStage);
+    if (cacheIt != m_shaderCache.constEnd()) {
+        shader = *cacheIt;
+    } else {
+        shader = f->glCreateShader(toGlShaderType(shaderStage.type()));
+        const char *srcStr = source.constData();
+        const GLint srcLength = source.count();
+        f->glShaderSource(shader, 1, &srcStr, &srcLength);
+        f->glCompileShader(shader);
+        GLint compiled = 0;
+        f->glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
+        if (!compiled) {
+            GLint infoLogLength = 0;
+            f->glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
+            QByteArray log;
+            if (infoLogLength > 1) {
+                GLsizei length = 0;
+                log.resize(infoLogLength);
+                f->glGetShaderInfoLog(shader, infoLogLength, &length, log.data());
+            }
+            qWarning("Failed to compile shader: %s\nSource was:\n%s", log.constData(), source.constData());
+            return false;
+        }
+        if (m_shaderCache.count() >= MAX_SHADER_CACHE_ENTRIES) {
+            // Use the simplest strategy: too many cached shaders -> drop them all.
+            for (uint shader : m_shaderCache)
+                f->glDeleteShader(shader); // does not actually get released yet when attached to a not-yet-released program
+            m_shaderCache.clear();
+        }
+        m_shaderCache.insert(shaderStage, shader);
+    }
+
+    f->glAttachShader(program, shader);
+
+    return true;
+}
+
+bool QRhiGles2::linkProgram(GLuint program)
+{
+    f->glLinkProgram(program);
+    GLint linked = 0;
+    f->glGetProgramiv(program, GL_LINK_STATUS, &linked);
+    if (!linked) {
+        GLint infoLogLength = 0;
+        f->glGetProgramiv(program, GL_INFO_LOG_LENGTH, &infoLogLength);
+        QByteArray log;
+        if (infoLogLength > 1) {
+            GLsizei length = 0;
+            log.resize(infoLogLength);
+            f->glGetProgramInfoLog(program, infoLogLength, &length, log.data());
+        }
+        qWarning("Failed to link shader program: %s", log.constData());
+        return false;
+    }
+    return true;
+}
+
+void QRhiGles2::gatherUniforms(GLuint program, const QShaderDescription::UniformBlock &ub,
+                               QVector<QGles2UniformDescription> *dst)
+{
+    const QByteArray prefix = ub.structName.toUtf8() + '.';
+    for (const QShaderDescription::BlockVariable &blockMember : ub.members) {
+        // ### no array support for now
+        QGles2UniformDescription uniform;
+        uniform.type = blockMember.type;
+        const QByteArray name = prefix + blockMember.name.toUtf8();
+        uniform.glslLocation = f->glGetUniformLocation(program, name.constData());
+        if (uniform.glslLocation >= 0) {
+            uniform.binding = ub.binding;
+            uniform.offset = uint(blockMember.offset);
+            uniform.size = blockMember.size;
+            dst->append(uniform);
+        }
+    }
+}
+
+void QRhiGles2::gatherSamplers(GLuint program, const QShaderDescription::InOutVariable &v,
+                               QVector<QGles2SamplerDescription> *dst)
+{
+    QGles2SamplerDescription sampler;
+    const QByteArray name = v.name.toUtf8();
+    sampler.glslLocation = f->glGetUniformLocation(program, name.constData());
+    if (sampler.glslLocation >= 0) {
+        sampler.binding = v.binding;
+        dst->append(sampler);
+    }
+}
+
+bool QRhiGles2::isProgramBinaryDiskCacheEnabled() const
+{
+    static QOpenGLProgramBinarySupportCheckWrapper checker;
+    return checker.get(ctx)->isSupported();
+}
+
+static QOpenGLProgramBinaryCache qrhi_programBinaryCache;
+
+static inline QShader::Stage toShaderStage(QRhiShaderStage::Type type)
+{
+    switch (type) {
+    case QRhiShaderStage::Vertex:
+        return QShader::VertexStage;
+    case QRhiShaderStage::Fragment:
+        return QShader::FragmentStage;
+    case QRhiShaderStage::Compute:
+        return QShader::ComputeStage;
+    default:
+        Q_UNREACHABLE();
+        return QShader::VertexStage;
+    }
+}
+
+QRhiGles2::DiskCacheResult QRhiGles2::tryLoadFromDiskCache(const QRhiShaderStage *stages, int stageCount,
+                                                           GLuint program, QByteArray *cacheKey)
+{
+    QRhiGles2::DiskCacheResult result = QRhiGles2::DiskCacheMiss;
+    QByteArray diskCacheKey;
+
+    if (isProgramBinaryDiskCacheEnabled()) {
+        QOpenGLProgramBinaryCache::ProgramDesc binaryProgram;
+        for (int i = 0; i < stageCount; ++i) {
+            const QRhiShaderStage &stage(stages[i]);
+            const QByteArray source = shaderSource(stage, nullptr);
+            if (source.isEmpty())
+                return QRhiGles2::DiskCacheError;
+            binaryProgram.shaders.append(QOpenGLProgramBinaryCache::ShaderDesc(toShaderStage(stage.type()), source));
+        }
+
+        diskCacheKey = binaryProgram.cacheKey();
+        if (qrhi_programBinaryCache.load(diskCacheKey, program)) {
+            qCDebug(lcOpenGLProgramDiskCache, "Program binary received from cache, program %u, key %s",
+                    program, diskCacheKey.constData());
+            result = QRhiGles2::DiskCacheHit;
+        }
+    }
+
+    if (cacheKey)
+        *cacheKey = diskCacheKey;
+
+    return result;
+}
+
+void QRhiGles2::trySaveToDiskCache(GLuint program, const QByteArray &cacheKey)
+{
+    if (isProgramBinaryDiskCacheEnabled()) {
+        qCDebug(lcOpenGLProgramDiskCache, "Saving program binary, program %u, key %s",
+                program, cacheKey.constData());
+        qrhi_programBinaryCache.save(cacheKey, program);
+    }
+}
+
+QGles2Buffer::QGles2Buffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size)
+    : QRhiBuffer(rhi, type, usage, size)
+{
+}
+
+QGles2Buffer::~QGles2Buffer()
+{
+    release();
+}
+
+void QGles2Buffer::release()
+{
+    if (!buffer)
+        return;
+
+    QRhiGles2::DeferredReleaseEntry e;
+    e.type = QRhiGles2::DeferredReleaseEntry::Buffer;
+
+    e.buffer.buffer = buffer;
+
+    buffer = 0;
+
+    QRHI_RES_RHI(QRhiGles2);
+    rhiD->releaseQueue.append(e);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseBuffer(this));
+    rhiD->unregisterResource(this);
+}
+
+bool QGles2Buffer::build()
+{
+    if (buffer)
+        release();
+
+    QRHI_RES_RHI(QRhiGles2);
+    QRHI_PROF;
+
+    const int nonZeroSize = m_size <= 0 ? 256 : m_size;
+
+    if (m_usage.testFlag(QRhiBuffer::UniformBuffer)) {
+        if (int(m_usage) != QRhiBuffer::UniformBuffer) {
+            qWarning("Uniform buffer: multiple usages specified, this is not supported by the OpenGL backend");
+            return false;
+        }
+        ubuf.resize(nonZeroSize);
+        QRHI_PROF_F(newBuffer(this, uint(nonZeroSize), 0, 1));
+        return true;
+    }
+
+    if (!rhiD->ensureContext())
+        return false;
+
+    targetForDataOps = GL_ARRAY_BUFFER;
+    if (m_usage.testFlag(QRhiBuffer::IndexBuffer))
+        targetForDataOps = GL_ELEMENT_ARRAY_BUFFER;
+    else if (m_usage.testFlag(QRhiBuffer::StorageBuffer))
+        targetForDataOps = GL_SHADER_STORAGE_BUFFER;
+
+    rhiD->f->glGenBuffers(1, &buffer);
+    rhiD->f->glBindBuffer(targetForDataOps, buffer);
+    rhiD->f->glBufferData(targetForDataOps, nonZeroSize, nullptr, m_type == Dynamic ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
+
+    usageState.access = AccessNone;
+
+    QRHI_PROF_F(newBuffer(this, uint(nonZeroSize), 1, 0));
+    rhiD->registerResource(this);
+    return true;
+}
+
+QGles2RenderBuffer::QGles2RenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                                       int sampleCount, QRhiRenderBuffer::Flags flags)
+    : QRhiRenderBuffer(rhi, type, pixelSize, sampleCount, flags)
+{
+}
+
+QGles2RenderBuffer::~QGles2RenderBuffer()
+{
+    release();
+}
+
+void QGles2RenderBuffer::release()
+{
+    if (!renderbuffer)
+        return;
+
+    QRhiGles2::DeferredReleaseEntry e;
+    e.type = QRhiGles2::DeferredReleaseEntry::RenderBuffer;
+
+    e.renderbuffer.renderbuffer = renderbuffer;
+    e.renderbuffer.renderbuffer2 = stencilRenderbuffer;
+
+    renderbuffer = 0;
+    stencilRenderbuffer = 0;
+
+    QRHI_RES_RHI(QRhiGles2);
+    rhiD->releaseQueue.append(e);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseRenderBuffer(this));
+    rhiD->unregisterResource(this);
+}
+
+bool QGles2RenderBuffer::build()
+{
+    if (renderbuffer)
+        release();
+
+    QRHI_RES_RHI(QRhiGles2);
+    QRHI_PROF;
+    samples = rhiD->effectiveSampleCount(m_sampleCount);
+
+    if (m_flags.testFlag(UsedWithSwapChainOnly)) {
+        if (m_type == DepthStencil) {
+            QRHI_PROF_F(newRenderBuffer(this, false, true, samples));
+            return true;
+        }
+
+        qWarning("RenderBuffer: UsedWithSwapChainOnly is meaningless in combination with Color");
+    }
+
+    if (!rhiD->ensureContext())
+        return false;
+
+    rhiD->f->glGenRenderbuffers(1, &renderbuffer);
+    rhiD->f->glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
+
+    const QSize size = m_pixelSize.isEmpty() ? QSize(1, 1) : m_pixelSize;
+
+    switch (m_type) {
+    case QRhiRenderBuffer::DepthStencil:
+        if (rhiD->caps.msaaRenderBuffer && samples > 1) {
+            const GLenum storage = rhiD->caps.needsDepthStencilCombinedAttach ? GL_DEPTH_STENCIL : GL_DEPTH24_STENCIL8;
+            rhiD->f->glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, storage,
+                                                      size.width(), size.height());
+            stencilRenderbuffer = 0;
+        } else if (rhiD->caps.packedDepthStencil || rhiD->caps.needsDepthStencilCombinedAttach) {
+            const GLenum storage = rhiD->caps.needsDepthStencilCombinedAttach ? GL_DEPTH_STENCIL : GL_DEPTH24_STENCIL8;
+            rhiD->f->glRenderbufferStorage(GL_RENDERBUFFER, storage,
+                                           size.width(), size.height());
+            stencilRenderbuffer = 0;
+        } else {
+            GLenum depthStorage = GL_DEPTH_COMPONENT;
+            if (rhiD->caps.gles) {
+                if (rhiD->caps.depth24)
+                    depthStorage = GL_DEPTH_COMPONENT24;
+                else
+                    depthStorage = GL_DEPTH_COMPONENT16; // plain ES 2.0 only has this
+            }
+            const GLenum stencilStorage = rhiD->caps.gles ? GL_STENCIL_INDEX8 : GL_STENCIL_INDEX;
+            rhiD->f->glRenderbufferStorage(GL_RENDERBUFFER, depthStorage,
+                                           size.width(), size.height());
+            rhiD->f->glGenRenderbuffers(1, &stencilRenderbuffer);
+            rhiD->f->glBindRenderbuffer(GL_RENDERBUFFER, stencilRenderbuffer);
+            rhiD->f->glRenderbufferStorage(GL_RENDERBUFFER, stencilStorage,
+                                           size.width(), size.height());
+        }
+        QRHI_PROF_F(newRenderBuffer(this, false, false, samples));
+        break;
+    case QRhiRenderBuffer::Color:
+        if (rhiD->caps.msaaRenderBuffer && samples > 1)
+            rhiD->f->glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, GL_RGBA8,
+                                                      size.width(), size.height());
+        else
+            rhiD->f->glRenderbufferStorage(GL_RENDERBUFFER, rhiD->caps.rgba8Format ? GL_RGBA8 : GL_RGBA4,
+                                           size.width(), size.height());
+        QRHI_PROF_F(newRenderBuffer(this, false, false, samples));
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    rhiD->registerResource(this);
+    return true;
+}
+
+QRhiTexture::Format QGles2RenderBuffer::backingFormat() const
+{
+    return m_type == Color ? QRhiTexture::RGBA8 : QRhiTexture::UnknownFormat;
+}
+
+QGles2Texture::QGles2Texture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                             int sampleCount, Flags flags)
+    : QRhiTexture(rhi, format, pixelSize, sampleCount, flags)
+{
+}
+
+QGles2Texture::~QGles2Texture()
+{
+    release();
+}
+
+void QGles2Texture::release()
+{
+    if (!texture)
+        return;
+
+    QRhiGles2::DeferredReleaseEntry e;
+    e.type = QRhiGles2::DeferredReleaseEntry::Texture;
+
+    e.texture.texture = texture;
+
+    texture = 0;
+    specified = false;
+    nativeHandlesStruct.texture = 0;
+
+    QRHI_RES_RHI(QRhiGles2);
+    if (owns)
+        rhiD->releaseQueue.append(e);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseTexture(this));
+    rhiD->unregisterResource(this);
+}
+
+bool QGles2Texture::prepareBuild(QSize *adjustedSize)
+{
+    if (texture)
+        release();
+
+    QRHI_RES_RHI(QRhiGles2);
+    if (!rhiD->ensureContext())
+        return false;
+
+    const QSize size = m_pixelSize.isEmpty() ? QSize(1, 1) : m_pixelSize;
+
+    const bool isCube = m_flags.testFlag(CubeMap);
+    const bool hasMipMaps = m_flags.testFlag(MipMapped);
+    const bool isCompressed = rhiD->isCompressedFormat(m_format);
+
+    target = isCube ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D;
+    mipLevelCount = hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1;
+    gltype = GL_UNSIGNED_BYTE;
+
+    if (isCompressed) {
+        if (m_flags.testFlag(UsedWithLoadStore)) {
+            qWarning("Compressed texture cannot be used with image load/store");
+            return false;
+        }
+        glintformat = toGlCompressedTextureFormat(m_format, m_flags);
+        if (!glintformat) {
+            qWarning("Compressed format %d not mappable to GL compressed format", m_format);
+            return false;
+        }
+        glsizedintformat = glintformat;
+        glformat = GL_RGBA;
+    } else {
+        switch (m_format) {
+        case QRhiTexture::RGBA8:
+            glintformat = GL_RGBA;
+            glsizedintformat = rhiD->caps.rgba8Format ? GL_RGBA8 : GL_RGBA;
+            glformat = GL_RGBA;
+            break;
+        case QRhiTexture::BGRA8:
+            glintformat = rhiD->caps.bgraInternalFormat ? GL_BGRA : GL_RGBA;
+            glsizedintformat = rhiD->caps.rgba8Format ? GL_RGBA8 : GL_RGBA;
+            glformat = GL_BGRA;
+            break;
+        case QRhiTexture::R16:
+            glintformat = GL_R16;
+            glsizedintformat = glintformat;
+            glformat = GL_RED;
+            gltype = GL_UNSIGNED_SHORT;
+            break;
+        case QRhiTexture::R8:
+            glintformat = GL_R8;
+            glsizedintformat = glintformat;
+            glformat = GL_RED;
+            break;
+        case QRhiTexture::RED_OR_ALPHA8:
+            glintformat = rhiD->caps.coreProfile ? GL_R8 : GL_ALPHA;
+            glsizedintformat = glintformat;
+            glformat = rhiD->caps.coreProfile ? GL_RED : GL_ALPHA;
+            break;
+        case QRhiTexture::RGBA16F:
+            glintformat = GL_RGBA16F;
+            glsizedintformat = glintformat;
+            glformat = GL_RGBA;
+            gltype = GL_HALF_FLOAT;
+            break;
+        case QRhiTexture::RGBA32F:
+            glintformat = GL_RGBA32F;
+            glsizedintformat = glintformat;
+            glformat = GL_RGBA;
+            gltype = GL_FLOAT;
+            break;
+        case QRhiTexture::D16:
+            glintformat = GL_DEPTH_COMPONENT16;
+            glsizedintformat = glintformat;
+            glformat = GL_DEPTH_COMPONENT;
+            gltype = GL_UNSIGNED_SHORT;
+            break;
+        case QRhiTexture::D32F:
+            glintformat = GL_DEPTH_COMPONENT32F;
+            glsizedintformat = glintformat;
+            glformat = GL_DEPTH_COMPONENT;
+            gltype = GL_FLOAT;
+            break;
+        default:
+            Q_UNREACHABLE();
+            glintformat = GL_RGBA;
+            glsizedintformat = rhiD->caps.rgba8Format ? GL_RGBA8 : GL_RGBA;
+            glformat = GL_RGBA;
+            break;
+        }
+    }
+
+    samplerState = QGles2SamplerData();
+
+    usageState.access = AccessNone;
+
+    if (adjustedSize)
+        *adjustedSize = size;
+
+    return true;
+}
+
+bool QGles2Texture::build()
+{
+    QSize size;
+    if (!prepareBuild(&size))
+        return false;
+
+    QRHI_RES_RHI(QRhiGles2);
+    rhiD->f->glGenTextures(1, &texture);
+
+    const bool isCube = m_flags.testFlag(CubeMap);
+    const bool hasMipMaps = m_flags.testFlag(MipMapped);
+    const bool isCompressed = rhiD->isCompressedFormat(m_format);
+    if (!isCompressed) {
+        rhiD->f->glBindTexture(target, texture);
+        if (!m_flags.testFlag(UsedWithLoadStore)) {
+            if (hasMipMaps || isCube) {
+                const GLenum faceTargetBase = isCube ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : target;
+                for (int layer = 0, layerCount = isCube ? 6 : 1; layer != layerCount; ++layer) {
+                    for (int level = 0; level != mipLevelCount; ++level) {
+                        const QSize mipSize = rhiD->q->sizeForMipLevel(level, size);
+                        rhiD->f->glTexImage2D(faceTargetBase + uint(layer), level, GLint(glintformat),
+                                              mipSize.width(), mipSize.height(), 0,
+                                              glformat, gltype, nullptr);
+                    }
+                }
+            } else {
+                rhiD->f->glTexImage2D(target, 0, GLint(glintformat), size.width(), size.height(),
+                                      0, glformat, gltype, nullptr);
+            }
+        } else {
+            // Must be specified with immutable storage functions otherwise
+            // bindImageTexture may fail. Also, the internal format must be a
+            // sized format here.
+            rhiD->f->glTexStorage2D(target, mipLevelCount, glsizedintformat, size.width(), size.height());
+        }
+        specified = true;
+    } else {
+        // Cannot use glCompressedTexImage2D without valid data, so defer.
+        // Compressed textures will not be used as render targets so this is
+        // not an issue.
+        specified = false;
+    }
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, true, mipLevelCount, isCube ? 6 : 1, 1));
+
+    owns = true;
+    nativeHandlesStruct.texture = texture;
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+bool QGles2Texture::buildFrom(const QRhiNativeHandles *src)
+{
+    const QRhiGles2TextureNativeHandles *h = static_cast<const QRhiGles2TextureNativeHandles *>(src);
+    if (!h || !h->texture)
+        return false;
+
+    if (!prepareBuild())
+        return false;
+
+    texture = h->texture;
+    specified = true;
+
+    QRHI_RES_RHI(QRhiGles2);
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, false, mipLevelCount, m_flags.testFlag(CubeMap) ? 6 : 1, 1));
+
+    owns = false;
+    nativeHandlesStruct.texture = texture;
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+const QRhiNativeHandles *QGles2Texture::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+QGles2Sampler::QGles2Sampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                             AddressMode u, AddressMode v)
+    : QRhiSampler(rhi, magFilter, minFilter, mipmapMode, u, v)
+{
+}
+
+QGles2Sampler::~QGles2Sampler()
+{
+    release();
+}
+
+void QGles2Sampler::release()
+{
+    // nothing to do here
+}
+
+bool QGles2Sampler::build()
+{
+    d.glminfilter = toGlMinFilter(m_minFilter, m_mipmapMode);
+    d.glmagfilter = toGlMagFilter(m_magFilter);
+    d.glwraps = toGlWrapMode(m_addressU);
+    d.glwrapt = toGlWrapMode(m_addressV);
+    d.glwrapr = toGlWrapMode(m_addressW);
+    d.gltexcomparefunc = toGlTextureCompareFunc(m_compareOp);
+
+    generation += 1;
+    return true;
+}
+
+// dummy, no Vulkan-style RenderPass+Framebuffer concept here
+QGles2RenderPassDescriptor::QGles2RenderPassDescriptor(QRhiImplementation *rhi)
+    : QRhiRenderPassDescriptor(rhi)
+{
+}
+
+QGles2RenderPassDescriptor::~QGles2RenderPassDescriptor()
+{
+    release();
+}
+
+void QGles2RenderPassDescriptor::release()
+{
+    // nothing to do here
+}
+
+QGles2ReferenceRenderTarget::QGles2ReferenceRenderTarget(QRhiImplementation *rhi)
+    : QRhiRenderTarget(rhi),
+      d(rhi)
+{
+}
+
+QGles2ReferenceRenderTarget::~QGles2ReferenceRenderTarget()
+{
+    release();
+}
+
+void QGles2ReferenceRenderTarget::release()
+{
+    // nothing to do here
+}
+
+QSize QGles2ReferenceRenderTarget::pixelSize() const
+{
+    return d.pixelSize;
+}
+
+float QGles2ReferenceRenderTarget::devicePixelRatio() const
+{
+    return d.dpr;
+}
+
+int QGles2ReferenceRenderTarget::sampleCount() const
+{
+    return d.sampleCount;
+}
+
+QGles2TextureRenderTarget::QGles2TextureRenderTarget(QRhiImplementation *rhi,
+                                                     const QRhiTextureRenderTargetDescription &desc,
+                                                     Flags flags)
+    : QRhiTextureRenderTarget(rhi, desc, flags),
+      d(rhi)
+{
+}
+
+QGles2TextureRenderTarget::~QGles2TextureRenderTarget()
+{
+    release();
+}
+
+void QGles2TextureRenderTarget::release()
+{
+    if (!framebuffer)
+        return;
+
+    QRhiGles2::DeferredReleaseEntry e;
+    e.type = QRhiGles2::DeferredReleaseEntry::TextureRenderTarget;
+
+    e.textureRenderTarget.framebuffer = framebuffer;
+
+    framebuffer = 0;
+
+    QRHI_RES_RHI(QRhiGles2);
+    rhiD->releaseQueue.append(e);
+
+    rhiD->unregisterResource(this);
+}
+
+QRhiRenderPassDescriptor *QGles2TextureRenderTarget::newCompatibleRenderPassDescriptor()
+{
+    return new QGles2RenderPassDescriptor(m_rhi);
+}
+
+bool QGles2TextureRenderTarget::build()
+{
+    QRHI_RES_RHI(QRhiGles2);
+
+    if (framebuffer)
+        release();
+
+    const bool hasColorAttachments = m_desc.cbeginColorAttachments() != m_desc.cendColorAttachments();
+    Q_ASSERT(hasColorAttachments || m_desc.depthTexture());
+    Q_ASSERT(!m_desc.depthStencilBuffer() || !m_desc.depthTexture());
+    const bool hasDepthStencil = m_desc.depthStencilBuffer() || m_desc.depthTexture();
+
+    if (hasColorAttachments) {
+        const int count = m_desc.cendColorAttachments() - m_desc.cbeginColorAttachments();
+        if (count > rhiD->caps.maxDrawBuffers) {
+            qWarning("QGles2TextureRenderTarget: Too many color attachments (%d, max is %d)",
+                     count, rhiD->caps.maxDrawBuffers);
+        }
+    }
+    if (m_desc.depthTexture() && !rhiD->caps.depthTexture)
+        qWarning("QGles2TextureRenderTarget: Depth texture is not supported and will be ignored");
+
+    if (!rhiD->ensureContext())
+        return false;
+
+    rhiD->f->glGenFramebuffers(1, &framebuffer);
+    rhiD->f->glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
+
+    d.colorAttCount = 0;
+    int attIndex = 0;
+    for (auto it = m_desc.cbeginColorAttachments(), itEnd = m_desc.cendColorAttachments(); it != itEnd; ++it, ++attIndex) {
+        d.colorAttCount += 1;
+        const QRhiColorAttachment &colorAtt(*it);
+        QRhiTexture *texture = colorAtt.texture();
+        QRhiRenderBuffer *renderBuffer = colorAtt.renderBuffer();
+        Q_ASSERT(texture || renderBuffer);
+        if (texture) {
+            QGles2Texture *texD = QRHI_RES(QGles2Texture, texture);
+            Q_ASSERT(texD->texture && texD->specified);
+            const GLenum faceTargetBase = texD->flags().testFlag(QRhiTexture::CubeMap) ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : texD->target;
+            rhiD->f->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + uint(attIndex), faceTargetBase + uint(colorAtt.layer()),
+                                            texD->texture, colorAtt.level());
+            if (attIndex == 0) {
+                d.pixelSize = texD->pixelSize();
+                d.sampleCount = 1;
+            }
+        } else if (renderBuffer) {
+            QGles2RenderBuffer *rbD = QRHI_RES(QGles2RenderBuffer, renderBuffer);
+            rhiD->f->glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + uint(attIndex), GL_RENDERBUFFER, rbD->renderbuffer);
+            if (attIndex == 0) {
+                d.pixelSize = rbD->pixelSize();
+                d.sampleCount = rbD->samples;
+            }
+        }
+    }
+
+    if (hasDepthStencil) {
+        if (m_desc.depthStencilBuffer()) {
+            QGles2RenderBuffer *depthRbD = QRHI_RES(QGles2RenderBuffer, m_desc.depthStencilBuffer());
+            if (rhiD->caps.needsDepthStencilCombinedAttach) {
+                rhiD->f->glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
+                                                   depthRbD->renderbuffer);
+            } else {
+                rhiD->f->glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
+                                                   depthRbD->renderbuffer);
+                if (depthRbD->stencilRenderbuffer)
+                    rhiD->f->glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
+                                                       depthRbD->stencilRenderbuffer);
+                else // packed
+                    rhiD->f->glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
+                                                       depthRbD->renderbuffer);
+            }
+            if (d.colorAttCount == 0) {
+                d.pixelSize = depthRbD->pixelSize();
+                d.sampleCount = depthRbD->samples;
+            }
+        } else {
+            QGles2Texture *depthTexD = QRHI_RES(QGles2Texture, m_desc.depthTexture());
+            rhiD->f->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, depthTexD->texture, 0);
+            if (d.colorAttCount == 0) {
+                d.pixelSize = depthTexD->pixelSize();
+                d.sampleCount = 1;
+            }
+        }
+        d.dsAttCount = 1;
+    } else {
+        d.dsAttCount = 0;
+    }
+
+    d.dpr = 1;
+    d.rp = QRHI_RES(QGles2RenderPassDescriptor, m_renderPassDesc);
+
+    GLenum status = rhiD->f->glCheckFramebufferStatus(GL_FRAMEBUFFER);
+    if (status != GL_NO_ERROR && status != GL_FRAMEBUFFER_COMPLETE) {
+        qWarning("Framebuffer incomplete: 0x%x", status);
+        return false;
+    }
+
+    rhiD->registerResource(this);
+    return true;
+}
+
+QSize QGles2TextureRenderTarget::pixelSize() const
+{
+    return d.pixelSize;
+}
+
+float QGles2TextureRenderTarget::devicePixelRatio() const
+{
+    return d.dpr;
+}
+
+int QGles2TextureRenderTarget::sampleCount() const
+{
+    return d.sampleCount;
+}
+
+QGles2ShaderResourceBindings::QGles2ShaderResourceBindings(QRhiImplementation *rhi)
+    : QRhiShaderResourceBindings(rhi)
+{
+}
+
+QGles2ShaderResourceBindings::~QGles2ShaderResourceBindings()
+{
+    release();
+}
+
+void QGles2ShaderResourceBindings::release()
+{
+    // nothing to do here
+}
+
+bool QGles2ShaderResourceBindings::build()
+{
+    generation += 1;
+    return true;
+}
+
+QGles2GraphicsPipeline::QGles2GraphicsPipeline(QRhiImplementation *rhi)
+    : QRhiGraphicsPipeline(rhi)
+{
+}
+
+QGles2GraphicsPipeline::~QGles2GraphicsPipeline()
+{
+    release();
+}
+
+void QGles2GraphicsPipeline::release()
+{
+    if (!program)
+        return;
+
+    QRhiGles2::DeferredReleaseEntry e;
+    e.type = QRhiGles2::DeferredReleaseEntry::Pipeline;
+
+    e.pipeline.program = program;
+
+    program = 0;
+    uniforms.clear();
+    samplers.clear();
+
+    QRHI_RES_RHI(QRhiGles2);
+    rhiD->releaseQueue.append(e);
+
+    rhiD->unregisterResource(this);
+}
+
+bool QGles2GraphicsPipeline::build()
+{
+    QRHI_RES_RHI(QRhiGles2);
+
+    if (program)
+        release();
+
+    if (!rhiD->ensureContext())
+        return false;
+
+    if (!rhiD->sanityCheckGraphicsPipeline(this))
+        return false;
+
+    drawMode = toGlTopology(m_topology);
+
+    program = rhiD->f->glCreateProgram();
+
+    QByteArray diskCacheKey;
+    QRhiGles2::DiskCacheResult diskCacheResult = rhiD->tryLoadFromDiskCache(m_shaderStages.constData(),
+                                                                            m_shaderStages.count(),
+                                                                            program,
+                                                                            &diskCacheKey);
+    if (diskCacheResult == QRhiGles2::DiskCacheError)
+        return false;
+
+    const bool needsCompile = diskCacheResult == QRhiGles2::DiskCacheMiss;
+
+    QShaderDescription vsDesc;
+    QShaderDescription fsDesc;
+    for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+        const bool isVertex = shaderStage.type() == QRhiShaderStage::Vertex;
+        const bool isFragment = shaderStage.type() == QRhiShaderStage::Fragment;
+        if (isVertex) {
+            if (needsCompile && !rhiD->compileShader(program, shaderStage, nullptr))
+                return false;
+            vsDesc = shaderStage.shader().description();
+        } else if (isFragment) {
+            if (needsCompile && !rhiD->compileShader(program, shaderStage, nullptr))
+                return false;
+            fsDesc = shaderStage.shader().description();
+        }
+    }
+
+    for (auto inVar : vsDesc.inputVariables()) {
+        const QByteArray name = inVar.name.toUtf8();
+        rhiD->f->glBindAttribLocation(program, GLuint(inVar.location), name.constData());
+    }
+
+    if (needsCompile && !rhiD->linkProgram(program))
+        return false;
+
+    if (needsCompile)
+        rhiD->trySaveToDiskCache(program, diskCacheKey);
+
+    for (const QShaderDescription::UniformBlock &ub : vsDesc.uniformBlocks())
+        rhiD->gatherUniforms(program, ub, &uniforms);
+
+    for (const QShaderDescription::UniformBlock &ub : fsDesc.uniformBlocks())
+        rhiD->gatherUniforms(program, ub, &uniforms);
+
+    for (const QShaderDescription::InOutVariable &v : vsDesc.combinedImageSamplers())
+        rhiD->gatherSamplers(program, v, &samplers);
+
+    for (const QShaderDescription::InOutVariable &v : fsDesc.combinedImageSamplers())
+        rhiD->gatherSamplers(program, v, &samplers);
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QGles2ComputePipeline::QGles2ComputePipeline(QRhiImplementation *rhi)
+    : QRhiComputePipeline(rhi)
+{
+}
+
+QGles2ComputePipeline::~QGles2ComputePipeline()
+{
+    release();
+}
+
+void QGles2ComputePipeline::release()
+{
+    if (!program)
+        return;
+
+    QRhiGles2::DeferredReleaseEntry e;
+    e.type = QRhiGles2::DeferredReleaseEntry::Pipeline;
+
+    e.pipeline.program = program;
+
+    program = 0;
+    uniforms.clear();
+    samplers.clear();
+
+    QRHI_RES_RHI(QRhiGles2);
+    rhiD->releaseQueue.append(e);
+
+    rhiD->unregisterResource(this);
+}
+
+bool QGles2ComputePipeline::build()
+{
+    QRHI_RES_RHI(QRhiGles2);
+
+    if (program)
+        release();
+
+    if (!rhiD->ensureContext())
+        return false;
+
+    program = rhiD->f->glCreateProgram();
+    QShaderDescription csDesc;
+
+    QByteArray diskCacheKey;
+    QRhiGles2::DiskCacheResult diskCacheResult = rhiD->tryLoadFromDiskCache(&m_shaderStage, 1, program, &diskCacheKey);
+    if (diskCacheResult == QRhiGles2::DiskCacheError)
+        return false;
+
+    const bool needsCompile = diskCacheResult == QRhiGles2::DiskCacheMiss;
+
+    if (needsCompile && !rhiD->compileShader(program, m_shaderStage, nullptr))
+        return false;
+
+    csDesc = m_shaderStage.shader().description();
+
+    if (needsCompile && !rhiD->linkProgram(program))
+        return false;
+
+    if (needsCompile)
+        rhiD->trySaveToDiskCache(program, diskCacheKey);
+
+    for (const QShaderDescription::UniformBlock &ub : csDesc.uniformBlocks())
+        rhiD->gatherUniforms(program, ub, &uniforms);
+    for (const QShaderDescription::InOutVariable &v : csDesc.combinedImageSamplers())
+        rhiD->gatherSamplers(program, v, &samplers);
+
+    // storage images and buffers need no special steps here
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QGles2CommandBuffer::QGles2CommandBuffer(QRhiImplementation *rhi)
+    : QRhiCommandBuffer(rhi)
+{
+    resetState();
+}
+
+QGles2CommandBuffer::~QGles2CommandBuffer()
+{
+    release();
+}
+
+void QGles2CommandBuffer::release()
+{
+    // nothing to do here
+}
+
+QGles2SwapChain::QGles2SwapChain(QRhiImplementation *rhi)
+    : QRhiSwapChain(rhi),
+      rt(rhi),
+      cb(rhi)
+{
+}
+
+QGles2SwapChain::~QGles2SwapChain()
+{
+    release();
+}
+
+void QGles2SwapChain::release()
+{
+    QRHI_PROF;
+    QRHI_PROF_F(releaseSwapChain(this));
+}
+
+QRhiCommandBuffer *QGles2SwapChain::currentFrameCommandBuffer()
+{
+    return &cb;
+}
+
+QRhiRenderTarget *QGles2SwapChain::currentFrameRenderTarget()
+{
+    return &rt;
+}
+
+QSize QGles2SwapChain::surfacePixelSize()
+{
+    Q_ASSERT(m_window);
+    return m_window->size() * m_window->devicePixelRatio();
+}
+
+QRhiRenderPassDescriptor *QGles2SwapChain::newCompatibleRenderPassDescriptor()
+{
+    return new QGles2RenderPassDescriptor(m_rhi);
+}
+
+bool QGles2SwapChain::buildOrResize()
+{
+    surface = m_window;
+    m_currentPixelSize = surfacePixelSize();
+    pixelSize = m_currentPixelSize;
+
+    if (m_depthStencil && m_depthStencil->flags().testFlag(QRhiRenderBuffer::UsedWithSwapChainOnly)
+            && m_depthStencil->pixelSize() != pixelSize)
+    {
+        m_depthStencil->setPixelSize(pixelSize);
+        m_depthStencil->build();
+    }
+
+    rt.d.rp = QRHI_RES(QGles2RenderPassDescriptor, m_renderPassDesc);
+    rt.d.pixelSize = pixelSize;
+    rt.d.dpr = float(m_window->devicePixelRatio());
+    rt.d.sampleCount = qBound(1, m_sampleCount, 64);
+    rt.d.colorAttCount = 1;
+    rt.d.dsAttCount = m_depthStencil ? 1 : 0;
+    rt.d.srgbUpdateAndBlend = m_flags.testFlag(QRhiSwapChain::sRGB);
+
+    frameCount = 0;
+
+    QRHI_PROF;
+    // make something up
+    QRHI_PROF_F(resizeSwapChain(this, 2, m_sampleCount > 1 ? 2 : 0, m_sampleCount));
+
+    return true;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qrhigles2_p.h b/src/gui/rhi/qrhigles2_p.h
new file mode 100644
index 0000000000..7f7c8b4c40
--- /dev/null
+++ b/src/gui/rhi/qrhigles2_p.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIGLES2_H
+#define QRHIGLES2_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qrhi_p.h>
+#include <QtGui/qsurfaceformat.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLContext;
+class QOffscreenSurface;
+class QWindow;
+
+struct Q_GUI_EXPORT QRhiGles2InitParams : public QRhiInitParams
+{
+    QRhiGles2InitParams();
+
+    QSurfaceFormat format;
+    QOffscreenSurface *fallbackSurface = nullptr;
+    QWindow *window = nullptr;
+
+    static QOffscreenSurface *newFallbackSurface(const QSurfaceFormat &format = QSurfaceFormat::defaultFormat());
+    static QSurfaceFormat adjustedFormat(const QSurfaceFormat &format = QSurfaceFormat::defaultFormat());
+};
+
+struct Q_GUI_EXPORT QRhiGles2NativeHandles : public QRhiNativeHandles
+{
+    QOpenGLContext *context = nullptr;
+};
+
+struct Q_GUI_EXPORT QRhiGles2TextureNativeHandles : public QRhiNativeHandles
+{
+    uint texture = 0;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhigles2_p_p.h b/src/gui/rhi/qrhigles2_p_p.h
new file mode 100644
index 0000000000..cc945876e6
--- /dev/null
+++ b/src/gui/rhi/qrhigles2_p_p.h
@@ -0,0 +1,841 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIGLES2_P_H
+#define QRHIGLES2_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrhigles2_p.h"
+#include "qrhi_p_p.h"
+#include "qshaderdescription_p.h"
+#include <qopengl.h>
+#include <QSurface>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLExtensions;
+
+struct QGles2Buffer : public QRhiBuffer
+{
+    QGles2Buffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size);
+    ~QGles2Buffer();
+    void release() override;
+    bool build() override;
+
+    GLuint buffer = 0;
+    GLenum targetForDataOps;
+    QByteArray ubuf;
+    enum Access {
+        AccessNone,
+        AccessVertex,
+        AccessIndex,
+        AccessUniform,
+        AccessStorageRead,
+        AccessStorageWrite,
+        AccessStorageReadWrite,
+        AccessUpdate
+    };
+    struct UsageState {
+        Access access;
+    };
+    UsageState usageState;
+    friend class QRhiGles2;
+};
+
+struct QGles2RenderBuffer : public QRhiRenderBuffer
+{
+    QGles2RenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                       int sampleCount, QRhiRenderBuffer::Flags flags);
+    ~QGles2RenderBuffer();
+    void release() override;
+    bool build() override;
+    QRhiTexture::Format backingFormat() const override;
+
+    GLuint renderbuffer = 0;
+    GLuint stencilRenderbuffer = 0; // when packed depth-stencil not supported
+    int samples;
+    friend class QRhiGles2;
+};
+
+struct QGles2SamplerData
+{
+    GLenum glminfilter = 0;
+    GLenum glmagfilter = 0;
+    GLenum glwraps = 0;
+    GLenum glwrapt = 0;
+    GLenum glwrapr = 0;
+    GLenum gltexcomparefunc = 0;
+};
+
+inline bool operator==(const QGles2SamplerData &a, const QGles2SamplerData &b)
+{
+    return a.glminfilter == b.glminfilter
+            && a.glmagfilter == b.glmagfilter
+            && a.glwraps == b.glwraps
+            && a.glwrapt == b.glwrapt
+            && a.glwrapr == b.glwrapr
+            && a.gltexcomparefunc == b.gltexcomparefunc;
+}
+
+inline bool operator!=(const QGles2SamplerData &a, const QGles2SamplerData &b)
+{
+    return !(a == b);
+}
+
+struct QGles2Texture : public QRhiTexture
+{
+    QGles2Texture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                  int sampleCount, Flags flags);
+    ~QGles2Texture();
+    void release() override;
+    bool build() override;
+    bool buildFrom(const QRhiNativeHandles *src) override;
+    const QRhiNativeHandles *nativeHandles() override;
+
+    bool prepareBuild(QSize *adjustedSize = nullptr);
+
+    GLuint texture = 0;
+    bool owns = true;
+    GLenum target;
+    GLenum glintformat;
+    GLenum glsizedintformat;
+    GLenum glformat;
+    GLenum gltype;
+    QGles2SamplerData samplerState;
+    bool specified = false;
+    int mipLevelCount = 0;
+    QRhiGles2TextureNativeHandles nativeHandlesStruct;
+    enum Access {
+        AccessNone,
+        AccessSample,
+        AccessFramebuffer,
+        AccessStorageRead,
+        AccessStorageWrite,
+        AccessStorageReadWrite,
+        AccessUpdate,
+        AccessRead
+    };
+    struct UsageState {
+        Access access;
+    };
+    UsageState usageState;
+
+    uint generation = 0;
+    friend class QRhiGles2;
+};
+
+struct QGles2Sampler : public QRhiSampler
+{
+    QGles2Sampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                  AddressMode u, AddressMode v);
+    ~QGles2Sampler();
+    void release() override;
+    bool build() override;
+
+    QGles2SamplerData d;
+    uint generation = 0;
+    friend class QRhiGles2;
+};
+
+struct QGles2RenderPassDescriptor : public QRhiRenderPassDescriptor
+{
+    QGles2RenderPassDescriptor(QRhiImplementation *rhi);
+    ~QGles2RenderPassDescriptor();
+    void release() override;
+};
+
+struct QGles2RenderTargetData
+{
+    QGles2RenderTargetData(QRhiImplementation *) { }
+
+    QGles2RenderPassDescriptor *rp = nullptr;
+    QSize pixelSize;
+    float dpr = 1;
+    int sampleCount = 1;
+    int colorAttCount = 0;
+    int dsAttCount = 0;
+    bool srgbUpdateAndBlend = false;
+};
+
+struct QGles2ReferenceRenderTarget : public QRhiRenderTarget
+{
+    QGles2ReferenceRenderTarget(QRhiImplementation *rhi);
+    ~QGles2ReferenceRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QGles2RenderTargetData d;
+};
+
+struct QGles2TextureRenderTarget : public QRhiTextureRenderTarget
+{
+    QGles2TextureRenderTarget(QRhiImplementation *rhi, const QRhiTextureRenderTargetDescription &desc, Flags flags);
+    ~QGles2TextureRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool build() override;
+
+    QGles2RenderTargetData d;
+    GLuint framebuffer = 0;
+    friend class QRhiGles2;
+};
+
+struct QGles2ShaderResourceBindings : public QRhiShaderResourceBindings
+{
+    QGles2ShaderResourceBindings(QRhiImplementation *rhi);
+    ~QGles2ShaderResourceBindings();
+    void release() override;
+    bool build() override;
+
+    uint generation = 0;
+    friend class QRhiGles2;
+};
+
+struct QGles2UniformDescription
+{
+    QShaderDescription::VariableType type;
+    int glslLocation;
+    int binding;
+    uint offset;
+    int size;
+};
+
+Q_DECLARE_TYPEINFO(QGles2UniformDescription, Q_MOVABLE_TYPE);
+
+struct QGles2SamplerDescription
+{
+    int glslLocation;
+    int binding;
+};
+
+Q_DECLARE_TYPEINFO(QGles2SamplerDescription, Q_MOVABLE_TYPE);
+
+struct QGles2GraphicsPipeline : public QRhiGraphicsPipeline
+{
+    QGles2GraphicsPipeline(QRhiImplementation *rhi);
+    ~QGles2GraphicsPipeline();
+    void release() override;
+    bool build() override;
+
+    GLuint program = 0;
+    GLenum drawMode = GL_TRIANGLES;
+    QVector<QGles2UniformDescription> uniforms;
+    QVector<QGles2SamplerDescription> samplers;
+    uint generation = 0;
+    friend class QRhiGles2;
+};
+
+struct QGles2ComputePipeline : public QRhiComputePipeline
+{
+    QGles2ComputePipeline(QRhiImplementation *rhi);
+    ~QGles2ComputePipeline();
+    void release() override;
+    bool build() override;
+
+    GLuint program = 0;
+    QVector<QGles2UniformDescription> uniforms;
+    QVector<QGles2SamplerDescription> samplers;
+    uint generation = 0;
+    friend class QRhiGles2;
+};
+
+struct QGles2CommandBuffer : public QRhiCommandBuffer
+{
+    QGles2CommandBuffer(QRhiImplementation *rhi);
+    ~QGles2CommandBuffer();
+    void release() override;
+
+    struct Command {
+        enum Cmd {
+            BeginFrame,
+            EndFrame,
+            ResetFrame,
+            Viewport,
+            Scissor,
+            BlendConstants,
+            StencilRef,
+            BindVertexBuffer,
+            BindIndexBuffer,
+            Draw,
+            DrawIndexed,
+            BindGraphicsPipeline,
+            BindShaderResources,
+            BindFramebuffer,
+            Clear,
+            BufferSubData,
+            GetBufferSubData,
+            CopyTex,
+            ReadPixels,
+            SubImage,
+            CompressedImage,
+            CompressedSubImage,
+            BlitFromRenderbuffer,
+            GenMip,
+            BindComputePipeline,
+            Dispatch,
+            BarriersForPass,
+            Barrier
+        };
+        Cmd cmd;
+
+        static const int MAX_UBUF_BINDINGS = 32; // should be more than enough
+
+        // QRhi*/QGles2* references should be kept at minimum (so no
+        // QRhiTexture/Buffer/etc. pointers).
+        union {
+            struct {
+                float x, y, w, h;
+                float d0, d1;
+            } viewport;
+            struct {
+                int x, y, w, h;
+            } scissor;
+            struct {
+                float r, g, b, a;
+            } blendConstants;
+            struct {
+                quint32 ref;
+                QRhiGraphicsPipeline *ps;
+            } stencilRef;
+            struct {
+                QRhiGraphicsPipeline *ps;
+                GLuint buffer;
+                quint32 offset;
+                int binding;
+            } bindVertexBuffer;
+            struct {
+                GLuint buffer;
+                quint32 offset;
+                GLenum type;
+            } bindIndexBuffer;
+            struct {
+                QRhiGraphicsPipeline *ps;
+                quint32 vertexCount;
+                quint32 firstVertex;
+                quint32 instanceCount;
+                quint32 baseInstance;
+            } draw;
+            struct {
+                QRhiGraphicsPipeline *ps;
+                quint32 indexCount;
+                quint32 firstIndex;
+                quint32 instanceCount;
+                quint32 baseInstance;
+                qint32 baseVertex;
+            } drawIndexed;
+            struct {
+                QRhiGraphicsPipeline *ps;
+            } bindGraphicsPipeline;
+            struct {
+                QRhiGraphicsPipeline *maybeGraphicsPs;
+                QRhiComputePipeline *maybeComputePs;
+                QRhiShaderResourceBindings *srb;
+                int dynamicOffsetCount;
+                uint dynamicOffsetPairs[MAX_UBUF_BINDINGS * 2]; // binding, offsetInConstants
+            } bindShaderResources;
+            struct {
+                GLbitfield mask;
+                float c[4];
+                float d;
+                quint32 s;
+            } clear;
+            struct {
+                GLuint fbo;
+                bool srgb;
+                int colorAttCount;
+            } bindFramebuffer;
+            struct {
+                GLenum target;
+                GLuint buffer;
+                int offset;
+                int size;
+                const void *data; // must come from retainData()
+            } bufferSubData;
+            struct {
+                QRhiBufferReadbackResult *result;
+                GLenum target;
+                GLuint buffer;
+                int offset;
+                int size;
+            } getBufferSubData;
+            struct {
+                GLenum srcFaceTarget;
+                GLuint srcTexture;
+                int srcLevel;
+                int srcX;
+                int srcY;
+                GLenum dstTarget;
+                GLuint dstTexture;
+                GLenum dstFaceTarget;
+                int dstLevel;
+                int dstX;
+                int dstY;
+                int w;
+                int h;
+            } copyTex;
+            struct {
+                QRhiReadbackResult *result;
+                GLuint texture;
+                int w;
+                int h;
+                QRhiTexture::Format format;
+                GLenum readTarget;
+                int level;
+            } readPixels;
+            struct {
+                GLenum target;
+                GLuint texture;
+                GLenum faceTarget;
+                int level;
+                int dx;
+                int dy;
+                int w;
+                int h;
+                GLenum glformat;
+                GLenum gltype;
+                int rowStartAlign;
+                const void *data; // must come from retainImage()
+            } subImage;
+            struct {
+                GLenum target;
+                GLuint texture;
+                GLenum faceTarget;
+                int level;
+                GLenum glintformat;
+                int w;
+                int h;
+                int size;
+                const void *data; // must come from retainData()
+            } compressedImage;
+            struct {
+                GLenum target;
+                GLuint texture;
+                GLenum faceTarget;
+                int level;
+                int dx;
+                int dy;
+                int w;
+                int h;
+                GLenum glintformat;
+                int size;
+                const void *data; // must come from retainData()
+            } compressedSubImage;
+            struct {
+                GLuint renderbuffer;
+                int w;
+                int h;
+                GLenum target;
+                GLuint texture;
+                int dstLevel;
+            } blitFromRb;
+            struct {
+                GLenum target;
+                GLuint texture;
+            } genMip;
+            struct {
+                QRhiComputePipeline *ps;
+            } bindComputePipeline;
+            struct {
+                GLuint x;
+                GLuint y;
+                GLuint z;
+            } dispatch;
+            struct {
+                int trackerIndex;
+            } barriersForPass;
+            struct {
+                GLbitfield barriers;
+            } barrier;
+        } args;
+    };
+
+    enum PassType {
+        NoPass,
+        RenderPass,
+        ComputePass
+    };
+
+    QVector<Command> commands;
+    QVarLengthArray<QRhiPassResourceTracker, 8> passResTrackers;
+    int currentPassResTrackerIndex;
+
+    PassType recordingPass;
+    QRhiRenderTarget *currentTarget;
+    QRhiGraphicsPipeline *currentGraphicsPipeline;
+    QRhiComputePipeline *currentComputePipeline;
+    uint currentPipelineGeneration;
+    QRhiShaderResourceBindings *currentGraphicsSrb;
+    QRhiShaderResourceBindings *currentComputeSrb;
+    uint currentSrbGeneration;
+
+    QVector<QByteArray> dataRetainPool;
+    QVector<QImage> imageRetainPool;
+
+    // relies heavily on implicit sharing (no copies of the actual data will be made)
+    const void *retainData(const QByteArray &data) {
+        dataRetainPool.append(data);
+        return dataRetainPool.constLast().constData();
+    }
+    const void *retainImage(const QImage &image) {
+        imageRetainPool.append(image);
+        return imageRetainPool.constLast().constBits();
+    }
+    void resetCommands() {
+        commands.clear();
+        dataRetainPool.clear();
+        imageRetainPool.clear();
+
+        passResTrackers.clear();
+        currentPassResTrackerIndex = -1;
+    }
+    void resetState() {
+        recordingPass = NoPass;
+        currentTarget = nullptr;
+        resetCommands();
+        resetCachedState();
+    }
+    void resetCachedState() {
+        currentGraphicsPipeline = nullptr;
+        currentComputePipeline = nullptr;
+        currentPipelineGeneration = 0;
+        currentGraphicsSrb = nullptr;
+        currentComputeSrb = nullptr;
+        currentSrbGeneration = 0;
+    }
+};
+
+Q_DECLARE_TYPEINFO(QGles2CommandBuffer::Command, Q_MOVABLE_TYPE);
+
+struct QGles2SwapChain : public QRhiSwapChain
+{
+    QGles2SwapChain(QRhiImplementation *rhi);
+    ~QGles2SwapChain();
+    void release() override;
+
+    QRhiCommandBuffer *currentFrameCommandBuffer() override;
+    QRhiRenderTarget *currentFrameRenderTarget() override;
+
+    QSize surfacePixelSize() override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool buildOrResize() override;
+
+    QSurface *surface = nullptr;
+    QSize pixelSize;
+    QGles2ReferenceRenderTarget rt;
+    QGles2CommandBuffer cb;
+    int frameCount = 0;
+};
+
+class QRhiGles2 : public QRhiImplementation
+{
+public:
+    QRhiGles2(QRhiGles2InitParams *params, QRhiGles2NativeHandles *importDevice = nullptr);
+
+    bool create(QRhi::Flags flags) override;
+    void destroy() override;
+
+    QRhiGraphicsPipeline *createGraphicsPipeline() override;
+    QRhiComputePipeline *createComputePipeline() override;
+    QRhiShaderResourceBindings *createShaderResourceBindings() override;
+    QRhiBuffer *createBuffer(QRhiBuffer::Type type,
+                             QRhiBuffer::UsageFlags usage,
+                             int size) override;
+    QRhiRenderBuffer *createRenderBuffer(QRhiRenderBuffer::Type type,
+                                         const QSize &pixelSize,
+                                         int sampleCount,
+                                         QRhiRenderBuffer::Flags flags) override;
+    QRhiTexture *createTexture(QRhiTexture::Format format,
+                               const QSize &pixelSize,
+                               int sampleCount,
+                               QRhiTexture::Flags flags) override;
+    QRhiSampler *createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                               QRhiSampler::Filter mipmapMode,
+                               QRhiSampler:: AddressMode u, QRhiSampler::AddressMode v) override;
+
+    QRhiTextureRenderTarget *createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                       QRhiTextureRenderTarget::Flags flags) override;
+
+    QRhiSwapChain *createSwapChain() override;
+    QRhi::FrameOpResult beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endOffscreenFrame(QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult finish() override;
+
+    void resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void beginPass(QRhiCommandBuffer *cb,
+                   QRhiRenderTarget *rt,
+                   const QColor &colorClearValue,
+                   const QRhiDepthStencilClearValue &depthStencilClearValue,
+                   QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void setGraphicsPipeline(QRhiCommandBuffer *cb,
+                             QRhiGraphicsPipeline *ps) override;
+
+    void setShaderResources(QRhiCommandBuffer *cb,
+                            QRhiShaderResourceBindings *srb,
+                            int dynamicOffsetCount,
+                            const QRhiCommandBuffer::DynamicOffset *dynamicOffsets) override;
+
+    void setVertexInput(QRhiCommandBuffer *cb,
+                        int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                        QRhiBuffer *indexBuf, quint32 indexOffset,
+                        QRhiCommandBuffer::IndexFormat indexFormat) override;
+
+    void setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport) override;
+    void setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor) override;
+    void setBlendConstants(QRhiCommandBuffer *cb, const QColor &c) override;
+    void setStencilRef(QRhiCommandBuffer *cb, quint32 refValue) override;
+
+    void draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+              quint32 instanceCount, quint32 firstVertex, quint32 firstInstance) override;
+
+    void drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                     quint32 instanceCount, quint32 firstIndex,
+                     qint32 vertexOffset, quint32 firstInstance) override;
+
+    void debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name) override;
+    void debugMarkEnd(QRhiCommandBuffer *cb) override;
+    void debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg) override;
+
+    void beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps) override;
+    void dispatch(QRhiCommandBuffer *cb, int x, int y, int z) override;
+
+    const QRhiNativeHandles *nativeHandles(QRhiCommandBuffer *cb) override;
+    void beginExternal(QRhiCommandBuffer *cb) override;
+    void endExternal(QRhiCommandBuffer *cb) override;
+
+    QVector<int> supportedSampleCounts() const override;
+    int ubufAlignment() const override;
+    bool isYUpInFramebuffer() const override;
+    bool isYUpInNDC() const override;
+    bool isClipDepthZeroToOne() const override;
+    QMatrix4x4 clipSpaceCorrMatrix() const override;
+    bool isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const override;
+    bool isFeatureSupported(QRhi::Feature feature) const override;
+    int resourceLimit(QRhi::ResourceLimit limit) const override;
+    const QRhiNativeHandles *nativeHandles() override;
+    void sendVMemStatsToProfiler() override;
+    bool makeThreadLocalNativeContextCurrent() override;
+    void releaseCachedResources() override;
+    bool isDeviceLost() const override;
+
+    bool ensureContext(QSurface *surface = nullptr) const;
+    void executeDeferredReleases();
+    void trackedBufferBarrier(QGles2CommandBuffer *cbD, QGles2Buffer *bufD, QGles2Buffer::Access access);
+    void trackedImageBarrier(QGles2CommandBuffer *cbD, QGles2Texture *texD, QGles2Texture::Access access);
+    void enqueueSubresUpload(QGles2Texture *texD, QGles2CommandBuffer *cbD,
+                             int layer, int level, const QRhiTextureSubresourceUploadDescription &subresDesc);
+    void enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates);
+    void trackedRegisterBuffer(QRhiPassResourceTracker *passResTracker,
+                               QGles2Buffer *bufD,
+                               QRhiPassResourceTracker::BufferAccess access,
+                               QRhiPassResourceTracker::BufferStage stage);
+    void trackedRegisterTexture(QRhiPassResourceTracker *passResTracker,
+                                QGles2Texture *texD,
+                                QRhiPassResourceTracker::TextureAccess access,
+                                QRhiPassResourceTracker::TextureStage stage);
+    void executeCommandBuffer(QRhiCommandBuffer *cb);
+    void executeBindGraphicsPipeline(QRhiGraphicsPipeline *ps);
+    void bindShaderResources(QRhiGraphicsPipeline *maybeGraphicsPs, QRhiComputePipeline *maybeComputePs,
+                             QRhiShaderResourceBindings *srb,
+                             const uint *dynOfsPairs, int dynOfsCount);
+    QGles2RenderTargetData *enqueueBindFramebuffer(QRhiRenderTarget *rt, QGles2CommandBuffer *cbD,
+                                                   bool *wantsColorClear = nullptr, bool *wantsDsClear = nullptr);
+    void enqueueBarriersForPass(QGles2CommandBuffer *cbD);
+    int effectiveSampleCount(int sampleCount) const;
+    QByteArray shaderSource(const QRhiShaderStage &shaderStage, int *glslVersion);
+    bool compileShader(GLuint program, const QRhiShaderStage &shaderStage, int *glslVersion);
+    bool linkProgram(GLuint program);
+    void gatherUniforms(GLuint program, const QShaderDescription::UniformBlock &ub,
+                        QVector<QGles2UniformDescription> *dst);
+    void gatherSamplers(GLuint program, const QShaderDescription::InOutVariable &v,
+                        QVector<QGles2SamplerDescription> *dst);
+    bool isProgramBinaryDiskCacheEnabled() const;
+
+    enum DiskCacheResult {
+        DiskCacheHit,
+        DiskCacheMiss,
+        DiskCacheError
+    };
+    DiskCacheResult tryLoadFromDiskCache(const QRhiShaderStage *stages, int stageCount,
+                                         GLuint program, QByteArray *cacheKey);
+    void trySaveToDiskCache(GLuint program, const QByteArray &cacheKey);
+
+    QOpenGLContext *ctx = nullptr;
+    bool importedContext = false;
+    QSurfaceFormat requestedFormat;
+    QSurface *fallbackSurface = nullptr;
+    QWindow *maybeWindow = nullptr;
+    mutable bool needsMakeCurrent = false;
+    QOpenGLExtensions *f = nullptr;
+    uint vao = 0;
+    struct Caps {
+        Caps()
+            : ctxMajor(2),
+              ctxMinor(0),
+              maxTextureSize(2048),
+              maxDrawBuffers(4),
+              msaaRenderBuffer(false),
+              npotTextureFull(true),
+              gles(false),
+              fixedIndexPrimitiveRestart(false),
+              bgraExternalFormat(false),
+              bgraInternalFormat(false),
+              r8Format(false),
+              r16Format(false),
+              floatFormats(false),
+              depthTexture(false),
+              packedDepthStencil(false),
+              needsDepthStencilCombinedAttach(false),
+              srgbCapableDefaultFramebuffer(false),
+              coreProfile(false),
+              uniformBuffers(false),
+              elementIndexUint(false),
+              depth24(false),
+              rgba8Format(false),
+              instancing(false),
+              baseVertex(false),
+              compute(false),
+              textureCompareMode(false),
+              properMapBuffer(false),
+              nonBaseLevelFramebufferTexture(false)
+        { }
+        int ctxMajor;
+        int ctxMinor;
+        int maxTextureSize;
+        int maxDrawBuffers;
+        int maxSamples;
+        // Multisample fb and blit are supported (GLES 3.0 or OpenGL 3.x). Not
+        // the same as multisample textures!
+        uint msaaRenderBuffer : 1;
+        uint npotTextureFull : 1;
+        uint gles : 1;
+        uint fixedIndexPrimitiveRestart : 1;
+        uint bgraExternalFormat : 1;
+        uint bgraInternalFormat : 1;
+        uint r8Format : 1;
+        uint r16Format : 1;
+        uint floatFormats : 1;
+        uint depthTexture : 1;
+        uint packedDepthStencil : 1;
+        uint needsDepthStencilCombinedAttach : 1;
+        uint srgbCapableDefaultFramebuffer : 1;
+        uint coreProfile : 1;
+        uint uniformBuffers : 1;
+        uint elementIndexUint : 1;
+        uint depth24 : 1;
+        uint rgba8Format : 1;
+        uint instancing : 1;
+        uint baseVertex : 1;
+        uint compute : 1;
+        uint textureCompareMode : 1;
+        uint properMapBuffer : 1;
+        uint nonBaseLevelFramebufferTexture : 1;
+    } caps;
+    QGles2SwapChain *currentSwapChain = nullptr;
+    QVector<GLint> supportedCompressedFormats;
+    mutable QVector<int> supportedSampleCountList;
+    QRhiGles2NativeHandles nativeHandlesStruct;
+    mutable bool contextLost = false;
+
+    struct DeferredReleaseEntry {
+        enum Type {
+            Buffer,
+            Pipeline,
+            Texture,
+            RenderBuffer,
+            TextureRenderTarget
+        };
+        Type type;
+        union {
+            struct {
+                GLuint buffer;
+            } buffer;
+            struct {
+                GLuint program;
+            } pipeline;
+            struct {
+                GLuint texture;
+            } texture;
+            struct {
+                GLuint renderbuffer;
+                GLuint renderbuffer2;
+            } renderbuffer;
+            struct {
+                GLuint framebuffer;
+            } textureRenderTarget;
+        };
+    };
+    QVector<DeferredReleaseEntry> releaseQueue;
+
+    struct OffscreenFrame {
+        OffscreenFrame(QRhiImplementation *rhi) : cbWrapper(rhi) { }
+        bool active = false;
+        QGles2CommandBuffer cbWrapper;
+    } ofr;
+
+    QHash<QRhiShaderStage, uint> m_shaderCache;
+};
+
+Q_DECLARE_TYPEINFO(QRhiGles2::DeferredReleaseEntry, Q_MOVABLE_TYPE);
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
new file mode 100644
index 0000000000..5f14d917b8
--- /dev/null
+++ b/src/gui/rhi/qrhimetal.mm
@@ -0,0 +1,3686 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qrhimetal_p_p.h"
+#include "qshader_p.h"
+#include "qshaderdescription_p.h"
+#include <QGuiApplication>
+#include <QWindow>
+#include <qmath.h>
+
+#ifdef Q_OS_MACOS
+#include <AppKit/AppKit.h>
+#endif
+
+#include <Metal/Metal.h>
+#include <QuartzCore/CAMetalLayer.h>
+
+QT_BEGIN_NAMESPACE
+
+/*
+    Metal backend. Double buffers and throttles to vsync. "Dynamic" buffers are
+    Shared (host visible) and duplicated (to help having 2 frames in flight),
+    "static" and "immutable" are Managed on macOS and Shared on iOS/tvOS.
+    Textures are Private (device local) and a host visible staging buffer is
+    used to upload data to them. Does not rely on strong objects refs from
+    command buffers but does rely on the automatic resource tracking of the
+    command encoders. Assumes that an autorelease pool (ideally per frame) is
+    available on the thread on which QRhi is used.
+*/
+
+#if __has_feature(objc_arc)
+#error ARC not supported
+#endif
+
+// Note: we expect everything here pass the Metal API validation when running
+// in Debug mode in XCode. Some of the issues that break validation are not
+// obvious and not visible when running outside XCode.
+//
+// An exception is the nextDrawable Called Early blah blah warning, which is
+// plain and simply false.
+
+/*!
+    \class QRhiMetalInitParams
+    \inmodule QtRhi
+    \brief Metal specific initialization parameters.
+
+    A Metal-based QRhi needs no special parameters for initialization.
+
+    \badcode
+        QRhiMetalInitParams params;
+        rhi = QRhi::create(QRhi::Metal, &params);
+    \endcode
+
+    \note Metal API validation cannot be enabled by the application. Instead,
+    run the debug build of the application in XCode. Generating a
+    \c{.xcodeproj} file via \c{qmake -spec macx-xcode} provides a convenient
+    way to enable this.
+
+    \note QRhiSwapChain can only target QWindow instances that have their
+    surface type set to QSurface::MetalSurface.
+
+    \section2 Working with existing Metal devices
+
+    When interoperating with another graphics engine, it may be necessary to
+    get a QRhi instance that uses the same Metal device. This can be achieved
+    by passing a pointer to a QRhiMetalNativeHandles to QRhi::create(). The
+    device must be set to a non-null value then. Optionally, a command queue
+    object can be specified as well.
+
+    The QRhi does not take ownership of any of the external objects.
+ */
+
+/*!
+    \class QRhiMetalNativeHandles
+    \inmodule QtRhi
+    \brief Holds the Metal device used by the QRhi.
+
+    \note The class uses \c{void *} as the type since including the Objective C
+    headers is not acceptable here. The actual types are \c{id<MTLDevice>} and
+    \c{id<MTLCommandQueue>}.
+ */
+
+/*!
+    \class QRhiMetalTextureNativeHandles
+    \inmodule QtRhi
+    \brief Holds the Metal texture object that is backing a QRhiTexture instance.
+
+    \note The class uses \c{void *} as the type since including the Objective C
+    headers is not acceptable here. The actual type is \c{id<MTLTexture>}.
+ */
+
+/*!
+    \class QRhiMetalCommandBufferNativeHandles
+    \inmodule QtRhi
+    \brief Holds the MTLCommandBuffer and MTLRenderCommandEncoder objects that are backing a QRhiCommandBuffer.
+
+    \note The command buffer object is only guaranteed to be valid while
+    recording a frame, that is, between a \l{QRhi::beginFrame()}{beginFrame()}
+    - \l{QRhi::endFrame()}{endFrame()} or
+    \l{QRhi::beginOffscreenFrame()}{beginOffscreenFrame()} -
+    \l{QRhi::endOffsrceenFrame()}{endOffscreenFrame()} pair.
+
+    \note The command encoder is only valid while recording a pass, that is,
+    between \l{QRhiCommandBuffer::beginPass()} -
+    \l{QRhiCommandBuffer::endPass()}.
+ */
+
+struct QMetalShader
+{
+    id<MTLLibrary> lib = nil;
+    id<MTLFunction> func = nil;
+    std::array<uint, 3> localSize;
+
+    void release() {
+        [lib release];
+        lib = nil;
+        [func release];
+        func = nil;
+    }
+};
+
+struct QRhiMetalData
+{
+    QRhiMetalData(QRhiImplementation *rhi) : ofr(rhi) { }
+
+    id<MTLDevice> dev = nil;
+    id<MTLCommandQueue> cmdQueue = nil;
+
+    MTLRenderPassDescriptor *createDefaultRenderPass(bool hasDepthStencil,
+                                                     const QColor &colorClearValue,
+                                                     const QRhiDepthStencilClearValue &depthStencilClearValue,
+                                                     int colorAttCount);
+    id<MTLLibrary> createMetalLib(const QShader &shader, QShader::Variant shaderVariant,
+                                  QString *error, QByteArray *entryPoint);
+    id<MTLFunction> createMSLShaderFunction(id<MTLLibrary> lib, const QByteArray &entryPoint);
+
+    struct DeferredReleaseEntry {
+        enum Type {
+            Buffer,
+            RenderBuffer,
+            Texture,
+            Sampler,
+            StagingBuffer
+        };
+        Type type;
+        int lastActiveFrameSlot; // -1 if not used otherwise 0..FRAMES_IN_FLIGHT-1
+        union {
+            struct {
+                id<MTLBuffer> buffers[QMTL_FRAMES_IN_FLIGHT];
+            } buffer;
+            struct {
+                id<MTLTexture> texture;
+            } renderbuffer;
+            struct {
+                id<MTLTexture> texture;
+                id<MTLBuffer> stagingBuffers[QMTL_FRAMES_IN_FLIGHT];
+                id<MTLTexture> views[QRhi::MAX_LEVELS];
+            } texture;
+            struct {
+                id<MTLSamplerState> samplerState;
+            } sampler;
+            struct {
+                id<MTLBuffer> buffer;
+            } stagingBuffer;
+        };
+    };
+    QVector<DeferredReleaseEntry> releaseQueue;
+
+    struct OffscreenFrame {
+        OffscreenFrame(QRhiImplementation *rhi) : cbWrapper(rhi) { }
+        bool active = false;
+        QMetalCommandBuffer cbWrapper;
+    } ofr;
+
+    struct TextureReadback {
+        int activeFrameSlot = -1;
+        QRhiReadbackDescription desc;
+        QRhiReadbackResult *result;
+        id<MTLBuffer> buf;
+        quint32 bufSize;
+        QSize pixelSize;
+        QRhiTexture::Format format;
+    };
+    QVector<TextureReadback> activeTextureReadbacks;
+
+    API_AVAILABLE(macos(10.13), ios(11.0)) MTLCaptureManager *captureMgr;
+    API_AVAILABLE(macos(10.13), ios(11.0)) id<MTLCaptureScope> captureScope = nil;
+
+    static const int TEXBUF_ALIGN = 256; // probably not accurate
+
+    QHash<QRhiShaderStage, QMetalShader> shaderCache;
+};
+
+Q_DECLARE_TYPEINFO(QRhiMetalData::DeferredReleaseEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiMetalData::TextureReadback, Q_MOVABLE_TYPE);
+
+struct QMetalBufferData
+{
+    bool managed;
+    bool slotted;
+    id<MTLBuffer> buf[QMTL_FRAMES_IN_FLIGHT];
+    QVarLengthArray<QRhiResourceUpdateBatchPrivate::BufferOp, 16> pendingUpdates[QMTL_FRAMES_IN_FLIGHT];
+};
+
+struct QMetalRenderBufferData
+{
+    MTLPixelFormat format;
+    id<MTLTexture> tex = nil;
+};
+
+struct QMetalTextureData
+{
+    QMetalTextureData(QMetalTexture *t) : q(t) { }
+
+    QMetalTexture *q;
+    MTLPixelFormat format;
+    id<MTLTexture> tex = nil;
+    id<MTLBuffer> stagingBuf[QMTL_FRAMES_IN_FLIGHT];
+    bool owns = true;
+    id<MTLTexture> perLevelViews[QRhi::MAX_LEVELS];
+
+    id<MTLTexture> viewForLevel(int level);
+};
+
+struct QMetalSamplerData
+{
+    id<MTLSamplerState> samplerState = nil;
+};
+
+struct QMetalCommandBufferData
+{
+    id<MTLCommandBuffer> cb;
+    id<MTLRenderCommandEncoder> currentRenderPassEncoder;
+    id<MTLComputeCommandEncoder> currentComputePassEncoder;
+    MTLRenderPassDescriptor *currentPassRpDesc;
+    int currentFirstVertexBinding;
+    QRhiBatchedBindings<id<MTLBuffer> > currentVertexInputsBuffers;
+    QRhiBatchedBindings<NSUInteger> currentVertexInputOffsets;
+};
+
+struct QMetalRenderTargetData
+{
+    QSize pixelSize;
+    float dpr = 1;
+    int sampleCount = 1;
+    int colorAttCount = 0;
+    int dsAttCount = 0;
+
+    struct ColorAtt {
+        bool needsDrawableForTex = false;
+        id<MTLTexture> tex = nil;
+        int layer = 0;
+        int level = 0;
+        bool needsDrawableForResolveTex = false;
+        id<MTLTexture> resolveTex = nil;
+        int resolveLayer = 0;
+        int resolveLevel = 0;
+    };
+
+    struct {
+        ColorAtt colorAtt[QMetalRenderPassDescriptor::MAX_COLOR_ATTACHMENTS];
+        id<MTLTexture> dsTex = nil;
+        bool hasStencil = false;
+        bool depthNeedsStore = false;
+    } fb;
+};
+
+struct QMetalGraphicsPipelineData
+{
+    id<MTLRenderPipelineState> ps = nil;
+    id<MTLDepthStencilState> ds = nil;
+    MTLPrimitiveType primitiveType;
+    MTLWinding winding;
+    MTLCullMode cullMode;
+    QMetalShader vs;
+    QMetalShader fs;
+};
+
+struct QMetalComputePipelineData
+{
+    id<MTLComputePipelineState> ps = nil;
+    QMetalShader cs;
+    MTLSize localSize;
+};
+
+struct QMetalSwapChainData
+{
+    CAMetalLayer *layer = nullptr;
+    id<CAMetalDrawable> curDrawable;
+    dispatch_semaphore_t sem[QMTL_FRAMES_IN_FLIGHT];
+    MTLRenderPassDescriptor *rp = nullptr;
+    id<MTLTexture> msaaTex[QMTL_FRAMES_IN_FLIGHT];
+    QRhiTexture::Format rhiColorFormat;
+    MTLPixelFormat colorFormat;
+};
+
+QRhiMetal::QRhiMetal(QRhiMetalInitParams *params, QRhiMetalNativeHandles *importDevice)
+{
+    Q_UNUSED(params);
+
+    d = new QRhiMetalData(this);
+
+    importedDevice = importDevice != nullptr;
+    if (importedDevice) {
+        if (d->dev) {
+            d->dev = (id<MTLDevice>) importDevice->dev;
+            importedCmdQueue = importDevice->cmdQueue != nullptr;
+            if (importedCmdQueue)
+                d->cmdQueue = (id<MTLCommandQueue>) importDevice->cmdQueue;
+        } else {
+            qWarning("No MTLDevice given, cannot import");
+            importedDevice = false;
+        }
+    }
+}
+
+QRhiMetal::~QRhiMetal()
+{
+    delete d;
+}
+
+template <class Int>
+inline Int aligned(Int v, Int byteAlign)
+{
+    return (v + byteAlign - 1) & ~(byteAlign - 1);
+}
+
+bool QRhiMetal::create(QRhi::Flags flags)
+{
+    Q_UNUSED(flags);
+
+    if (importedDevice)
+        [d->dev retain];
+    else
+        d->dev = MTLCreateSystemDefaultDevice();
+
+    if (!d->dev) {
+        qWarning("No MTLDevice");
+        return false;
+    }
+
+    qCDebug(QRHI_LOG_INFO, "Metal device: %s", qPrintable(QString::fromNSString([d->dev name])));
+
+    if (importedCmdQueue)
+        [d->cmdQueue retain];
+    else
+        d->cmdQueue = [d->dev newCommandQueue];
+
+    if (@available(macOS 10.13, iOS 11.0, *)) {
+        d->captureMgr = [MTLCaptureManager sharedCaptureManager];
+        // Have a custom capture scope as well which then shows up in XCode as
+        // an option when capturing, and becomes especially useful when having
+        // multiple windows with multiple QRhis.
+        d->captureScope = [d->captureMgr newCaptureScopeWithCommandQueue: d->cmdQueue];
+        const QString label = QString::asprintf("Qt capture scope for QRhi %p", this);
+        d->captureScope.label = label.toNSString();
+    }
+
+#if defined(Q_OS_MACOS)
+    caps.maxTextureSize = 16384;
+#elif defined(Q_OS_TVOS)
+    if ([d->dev supportsFeatureSet: MTLFeatureSet(30003)]) // MTLFeatureSet_tvOS_GPUFamily2_v1
+        caps.maxTextureSize = 16384;
+    else
+        caps.maxTextureSize = 8192;
+#elif defined(Q_OS_IOS)
+    // welcome to feature set hell
+    if ([d->dev supportsFeatureSet: MTLFeatureSet(16)] // MTLFeatureSet_iOS_GPUFamily5_v1
+            || [d->dev supportsFeatureSet: MTLFeatureSet(11)] // MTLFeatureSet_iOS_GPUFamily4_v1
+            || [d->dev supportsFeatureSet: MTLFeatureSet(4)]) // MTLFeatureSet_iOS_GPUFamily3_v1
+    {
+        caps.maxTextureSize = 16384;
+    } else if ([d->dev supportsFeatureSet: MTLFeatureSet(3)] // MTLFeatureSet_iOS_GPUFamily2_v2
+            || [d->dev supportsFeatureSet: MTLFeatureSet(2)]) // MTLFeatureSet_iOS_GPUFamily1_v2
+    {
+        caps.maxTextureSize = 8192;
+    } else {
+        caps.maxTextureSize = 4096;
+    }
+#endif
+
+    nativeHandlesStruct.dev = d->dev;
+    nativeHandlesStruct.cmdQueue = d->cmdQueue;
+
+    return true;
+}
+
+void QRhiMetal::destroy()
+{
+    executeDeferredReleases(true);
+    finishActiveReadbacks(true);
+
+    for (QMetalShader &s : d->shaderCache)
+        s.release();
+    d->shaderCache.clear();
+
+    if (@available(macOS 10.13, iOS 11.0, *)) {
+        [d->captureScope release];
+        d->captureScope = nil;
+    }
+
+    [d->cmdQueue release];
+    if (!importedCmdQueue)
+        d->cmdQueue = nil;
+
+    [d->dev release];
+    if (!importedDevice)
+        d->dev = nil;
+}
+
+QVector<int> QRhiMetal::supportedSampleCounts() const
+{
+    return { 1, 2, 4, 8 };
+}
+
+int QRhiMetal::effectiveSampleCount(int sampleCount) const
+{
+    // Stay compatible with QSurfaceFormat and friends where samples == 0 means the same as 1.
+    const int s = qBound(1, sampleCount, 64);
+    if (!supportedSampleCounts().contains(s)) {
+        qWarning("Attempted to set unsupported sample count %d", sampleCount);
+        return 1;
+    }
+    return s;
+}
+
+QRhiSwapChain *QRhiMetal::createSwapChain()
+{
+    return new QMetalSwapChain(this);
+}
+
+QRhiBuffer *QRhiMetal::createBuffer(QRhiBuffer::Type type, QRhiBuffer::UsageFlags usage, int size)
+{
+    return new QMetalBuffer(this, type, usage, size);
+}
+
+int QRhiMetal::ubufAlignment() const
+{
+    return 256;
+}
+
+bool QRhiMetal::isYUpInFramebuffer() const
+{
+    return false;
+}
+
+bool QRhiMetal::isYUpInNDC() const
+{
+    return true;
+}
+
+bool QRhiMetal::isClipDepthZeroToOne() const
+{
+    return true;
+}
+
+QMatrix4x4 QRhiMetal::clipSpaceCorrMatrix() const
+{
+    // depth range 0..1
+    static QMatrix4x4 m;
+    if (m.isIdentity()) {
+        // NB the ctor takes row-major
+        m = QMatrix4x4(1.0f, 0.0f, 0.0f, 0.0f,
+                       0.0f, 1.0f, 0.0f, 0.0f,
+                       0.0f, 0.0f, 0.5f, 0.5f,
+                       0.0f, 0.0f, 0.0f, 1.0f);
+    }
+    return m;
+}
+
+bool QRhiMetal::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const
+{
+    Q_UNUSED(flags);
+
+#ifdef Q_OS_MACOS
+    if (format >= QRhiTexture::ETC2_RGB8 && format <= QRhiTexture::ETC2_RGBA8)
+        return false;
+    if (format >= QRhiTexture::ASTC_4x4 && format <= QRhiTexture::ASTC_12x12)
+        return false;
+#else
+    if (format >= QRhiTexture::BC1 && format <= QRhiTexture::BC7)
+        return false;
+#endif
+
+    return true;
+}
+
+bool QRhiMetal::isFeatureSupported(QRhi::Feature feature) const
+{
+    switch (feature) {
+    case QRhi::MultisampleTexture:
+        return true;
+    case QRhi::MultisampleRenderBuffer:
+        return true;
+    case QRhi::DebugMarkers:
+        return true;
+    case QRhi::Timestamps:
+        return false;
+    case QRhi::Instancing:
+        return true;
+    case QRhi::CustomInstanceStepRate:
+        return true;
+    case QRhi::PrimitiveRestart:
+        return true;
+    case QRhi::NonDynamicUniformBuffers:
+        return true;
+    case QRhi::NonFourAlignedEffectiveIndexBufferOffset:
+        return false;
+    case QRhi::NPOTTextureRepeat:
+        return true;
+    case QRhi::RedOrAlpha8IsRed:
+        return true;
+    case QRhi::ElementIndexUint:
+        return true;
+    case QRhi::Compute:
+        return true;
+    case QRhi::WideLines:
+        return false;
+    case QRhi::VertexShaderPointSize:
+        return true;
+    case QRhi::BaseVertex:
+        return true;
+    case QRhi::BaseInstance:
+        return true;
+    case QRhi::TriangleFanTopology:
+        return false;
+    case QRhi::ReadBackNonUniformBuffer:
+        return true;
+    case QRhi::ReadBackNonBaseMipLevel:
+        return true;
+    default:
+        Q_UNREACHABLE();
+        return false;
+    }
+}
+
+int QRhiMetal::resourceLimit(QRhi::ResourceLimit limit) const
+{
+    switch (limit) {
+    case QRhi::TextureSizeMin:
+        return 1;
+    case QRhi::TextureSizeMax:
+        return caps.maxTextureSize;
+    case QRhi::MaxColorAttachments:
+        return 8;
+    case QRhi::FramesInFlight:
+        return QMTL_FRAMES_IN_FLIGHT;
+    default:
+        Q_UNREACHABLE();
+        return 0;
+    }
+}
+
+const QRhiNativeHandles *QRhiMetal::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+void QRhiMetal::sendVMemStatsToProfiler()
+{
+    // nothing to do here
+}
+
+bool QRhiMetal::makeThreadLocalNativeContextCurrent()
+{
+    // not applicable
+    return false;
+}
+
+void QRhiMetal::releaseCachedResources()
+{
+    for (QMetalShader &s : d->shaderCache)
+        s.release();
+
+    d->shaderCache.clear();
+}
+
+bool QRhiMetal::isDeviceLost() const
+{
+    return false;
+}
+
+QRhiRenderBuffer *QRhiMetal::createRenderBuffer(QRhiRenderBuffer::Type type, const QSize &pixelSize,
+                                                int sampleCount, QRhiRenderBuffer::Flags flags)
+{
+    return new QMetalRenderBuffer(this, type, pixelSize, sampleCount, flags);
+}
+
+QRhiTexture *QRhiMetal::createTexture(QRhiTexture::Format format, const QSize &pixelSize,
+                                      int sampleCount, QRhiTexture::Flags flags)
+{
+    return new QMetalTexture(this, format, pixelSize, sampleCount, flags);
+}
+
+QRhiSampler *QRhiMetal::createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                                      QRhiSampler::Filter mipmapMode,
+                                      QRhiSampler::AddressMode u, QRhiSampler::AddressMode v)
+{
+    return new QMetalSampler(this, magFilter, minFilter, mipmapMode, u, v);
+}
+
+QRhiTextureRenderTarget *QRhiMetal::createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                              QRhiTextureRenderTarget::Flags flags)
+{
+    return new QMetalTextureRenderTarget(this, desc, flags);
+}
+
+QRhiGraphicsPipeline *QRhiMetal::createGraphicsPipeline()
+{
+    return new QMetalGraphicsPipeline(this);
+}
+
+QRhiComputePipeline *QRhiMetal::createComputePipeline()
+{
+    return new QMetalComputePipeline(this);
+}
+
+QRhiShaderResourceBindings *QRhiMetal::createShaderResourceBindings()
+{
+    return new QMetalShaderResourceBindings(this);
+}
+
+void QRhiMetal::enqueueShaderResourceBindings(QMetalShaderResourceBindings *srbD, QMetalCommandBuffer *cbD,
+                                              int dynamicOffsetCount,
+                                              const QRhiCommandBuffer::DynamicOffset *dynamicOffsets,
+                                              bool offsetOnlyChange)
+{
+    static const int KNOWN_STAGES = 3;
+    struct {
+        QRhiBatchedBindings<id<MTLBuffer> > buffers;
+        QRhiBatchedBindings<NSUInteger> bufferOffsets;
+        QRhiBatchedBindings<id<MTLTexture> > textures;
+        QRhiBatchedBindings<id<MTLSamplerState> > samplers;
+    } res[KNOWN_STAGES];
+
+    for (const QRhiShaderResourceBinding &binding : qAsConst(srbD->sortedBindings)) {
+        const QRhiShaderResourceBinding::Data *b = binding.data();
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+        {
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.ubuf.buf);
+            id<MTLBuffer> mtlbuf = bufD->d->buf[bufD->d->slotted ? currentFrameSlot : 0];
+            uint offset = uint(b->u.ubuf.offset);
+            for (int i = 0; i < dynamicOffsetCount; ++i) {
+                const QRhiCommandBuffer::DynamicOffset &dynOfs(dynamicOffsets[i]);
+                if (dynOfs.first == b->binding) {
+                    offset = dynOfs.second;
+                    break;
+                }
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::VertexStage)) {
+                res[0].buffers.feed(b->binding, mtlbuf);
+                res[0].bufferOffsets.feed(b->binding, offset);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::FragmentStage)) {
+                res[1].buffers.feed(b->binding, mtlbuf);
+                res[1].bufferOffsets.feed(b->binding, offset);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) {
+                res[2].buffers.feed(b->binding, mtlbuf);
+                res[2].bufferOffsets.feed(b->binding, offset);
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::SampledTexture:
+        {
+            QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.stex.tex);
+            QMetalSampler *samplerD = QRHI_RES(QMetalSampler, b->u.stex.sampler);
+            if (b->stage.testFlag(QRhiShaderResourceBinding::VertexStage)) {
+                res[0].textures.feed(b->binding, texD->d->tex);
+                res[0].samplers.feed(b->binding, samplerD->d->samplerState);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::FragmentStage)) {
+                res[1].textures.feed(b->binding, texD->d->tex);
+                res[1].samplers.feed(b->binding, samplerD->d->samplerState);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) {
+                res[2].textures.feed(b->binding, texD->d->tex);
+                res[2].samplers.feed(b->binding, samplerD->d->samplerState);
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::ImageLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageLoadStore:
+        {
+            QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.simage.tex);
+            id<MTLTexture> t = texD->d->viewForLevel(b->u.simage.level);
+            if (b->stage.testFlag(QRhiShaderResourceBinding::VertexStage))
+                res[0].textures.feed(b->binding, t);
+            if (b->stage.testFlag(QRhiShaderResourceBinding::FragmentStage))
+                res[1].textures.feed(b->binding, t);
+            if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage))
+                res[2].textures.feed(b->binding, t);
+        }
+            break;
+        case QRhiShaderResourceBinding::BufferLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferLoadStore:
+        {
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.sbuf.buf);
+            id<MTLBuffer> mtlbuf = bufD->d->buf[0];
+            uint offset = uint(b->u.sbuf.offset);
+            if (b->stage.testFlag(QRhiShaderResourceBinding::VertexStage)) {
+                res[0].buffers.feed(b->binding, mtlbuf);
+                res[0].bufferOffsets.feed(b->binding, offset);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::FragmentStage)) {
+                res[1].buffers.feed(b->binding, mtlbuf);
+                res[1].bufferOffsets.feed(b->binding, offset);
+            }
+            if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) {
+                res[2].buffers.feed(b->binding, mtlbuf);
+                res[2].bufferOffsets.feed(b->binding, offset);
+            }
+        }
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    for (int idx = 0; idx < KNOWN_STAGES; ++idx) {
+        res[idx].buffers.finish();
+        res[idx].bufferOffsets.finish();
+
+        for (int i = 0, ie = res[idx].buffers.batches.count(); i != ie; ++i) {
+            const auto &bufferBatch(res[idx].buffers.batches[i]);
+            const auto &offsetBatch(res[idx].bufferOffsets.batches[i]);
+            switch (idx) {
+            case 0:
+                [cbD->d->currentRenderPassEncoder setVertexBuffers: bufferBatch.resources.constData()
+                  offsets: offsetBatch.resources.constData()
+                  withRange: NSMakeRange(bufferBatch.startBinding, NSUInteger(bufferBatch.resources.count()))];
+                break;
+            case 1:
+                [cbD->d->currentRenderPassEncoder setFragmentBuffers: bufferBatch.resources.constData()
+                  offsets: offsetBatch.resources.constData()
+                  withRange: NSMakeRange(bufferBatch.startBinding, NSUInteger(bufferBatch.resources.count()))];
+                break;
+            case 2:
+                [cbD->d->currentComputePassEncoder setBuffers: bufferBatch.resources.constData()
+                  offsets: offsetBatch.resources.constData()
+                  withRange: NSMakeRange(bufferBatch.startBinding, NSUInteger(bufferBatch.resources.count()))];
+                break;
+            default:
+                Q_UNREACHABLE();
+                break;
+            }
+        }
+
+        if (offsetOnlyChange)
+            continue;
+
+        res[idx].textures.finish();
+        res[idx].samplers.finish();
+
+        for (int i = 0, ie = res[idx].textures.batches.count(); i != ie; ++i) {
+            const auto &batch(res[idx].textures.batches[i]);
+            switch (idx) {
+            case 0:
+                [cbD->d->currentRenderPassEncoder setVertexTextures: batch.resources.constData()
+                  withRange: NSMakeRange(batch.startBinding, NSUInteger(batch.resources.count()))];
+                break;
+            case 1:
+                [cbD->d->currentRenderPassEncoder setFragmentTextures: batch.resources.constData()
+                  withRange: NSMakeRange(batch.startBinding, NSUInteger(batch.resources.count()))];
+                break;
+            case 2:
+                [cbD->d->currentComputePassEncoder setTextures: batch.resources.constData()
+                  withRange: NSMakeRange(batch.startBinding, NSUInteger(batch.resources.count()))];
+                break;
+            default:
+                Q_UNREACHABLE();
+                break;
+            }
+        }
+        for (int i = 0, ie = res[idx].samplers.batches.count(); i != ie; ++i) {
+            const auto &batch(res[idx].samplers.batches[i]);
+            switch (idx) {
+            case 0:
+                [cbD->d->currentRenderPassEncoder setVertexSamplerStates: batch.resources.constData()
+                  withRange: NSMakeRange(batch.startBinding, NSUInteger(batch.resources.count()))];
+                break;
+            case 1:
+                [cbD->d->currentRenderPassEncoder setFragmentSamplerStates: batch.resources.constData()
+                  withRange: NSMakeRange(batch.startBinding, NSUInteger(batch.resources.count()))];
+                break;
+            case 2:
+                [cbD->d->currentComputePassEncoder setSamplerStates: batch.resources.constData()
+                  withRange: NSMakeRange(batch.startBinding, NSUInteger(batch.resources.count()))];
+                break;
+            default:
+                Q_UNREACHABLE();
+                break;
+            }
+        }
+    }
+}
+
+void QRhiMetal::setGraphicsPipeline(QRhiCommandBuffer *cb, QRhiGraphicsPipeline *ps)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+    QMetalGraphicsPipeline *psD = QRHI_RES(QMetalGraphicsPipeline, ps);
+
+    if (cbD->currentGraphicsPipeline != ps || cbD->currentPipelineGeneration != psD->generation) {
+        cbD->currentGraphicsPipeline = ps;
+        cbD->currentComputePipeline = nullptr;
+        cbD->currentPipelineGeneration = psD->generation;
+
+        [cbD->d->currentRenderPassEncoder setRenderPipelineState: psD->d->ps];
+        [cbD->d->currentRenderPassEncoder setDepthStencilState: psD->d->ds];
+
+        if (cbD->currentCullMode == -1 || psD->d->cullMode != uint(cbD->currentCullMode)) {
+            [cbD->d->currentRenderPassEncoder setCullMode: psD->d->cullMode];
+            cbD->currentCullMode = int(psD->d->cullMode);
+        }
+        if (cbD->currentFrontFaceWinding == -1 || psD->d->winding != uint(cbD->currentFrontFaceWinding)) {
+            [cbD->d->currentRenderPassEncoder setFrontFacingWinding: psD->d->winding];
+            cbD->currentFrontFaceWinding = int(psD->d->winding);
+        }
+    }
+
+    psD->lastActiveFrameSlot = currentFrameSlot;
+}
+
+void QRhiMetal::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBindings *srb,
+                                   int dynamicOffsetCount,
+                                   const QRhiCommandBuffer::DynamicOffset *dynamicOffsets)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass != QMetalCommandBuffer::NoPass);
+    QMetalGraphicsPipeline *gfxPsD = QRHI_RES(QMetalGraphicsPipeline, cbD->currentGraphicsPipeline);
+    QMetalComputePipeline *compPsD = QRHI_RES(QMetalComputePipeline, cbD->currentComputePipeline);
+
+    if (!srb) {
+        if (gfxPsD)
+            srb = gfxPsD->m_shaderResourceBindings;
+        else
+            srb = compPsD->m_shaderResourceBindings;
+    }
+
+    QMetalShaderResourceBindings *srbD = QRHI_RES(QMetalShaderResourceBindings, srb);
+    bool hasSlottedResourceInSrb = false;
+    bool hasDynamicOffsetInSrb = false;
+    bool resNeedsRebind = false;
+
+    // do buffer writes, figure out if we need to rebind, and mark as in-use
+    for (int i = 0, ie = srbD->sortedBindings.count(); i != ie; ++i) {
+        const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings.at(i).data();
+        QMetalShaderResourceBindings::BoundResourceData &bd(srbD->boundResourceData[i]);
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+        {
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.ubuf.buf);
+            Q_ASSERT(bufD->m_usage.testFlag(QRhiBuffer::UniformBuffer));
+            executeBufferHostWritesForCurrentFrame(bufD);
+            if (bufD->d->slotted)
+                hasSlottedResourceInSrb = true;
+            if (b->u.ubuf.hasDynamicOffset)
+                hasDynamicOffsetInSrb = true;
+            if (bufD->generation != bd.ubuf.generation || bufD->m_id != bd.ubuf.id) {
+                resNeedsRebind = true;
+                bd.ubuf.id = bufD->m_id;
+                bd.ubuf.generation = bufD->generation;
+            }
+            bufD->lastActiveFrameSlot = currentFrameSlot;
+        }
+            break;
+        case QRhiShaderResourceBinding::SampledTexture:
+        {
+            QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.stex.tex);
+            QMetalSampler *samplerD = QRHI_RES(QMetalSampler, b->u.stex.sampler);
+            if (texD->generation != bd.stex.texGeneration
+                    || texD->m_id != bd.stex.texId
+                    || samplerD->generation != bd.stex.samplerGeneration
+                    || samplerD->m_id != bd.stex.samplerId)
+            {
+                resNeedsRebind = true;
+                bd.stex.texId = texD->m_id;
+                bd.stex.texGeneration = texD->generation;
+                bd.stex.samplerId = samplerD->m_id;
+                bd.stex.samplerGeneration = samplerD->generation;
+            }
+            texD->lastActiveFrameSlot = currentFrameSlot;
+            samplerD->lastActiveFrameSlot = currentFrameSlot;
+        }
+            break;
+        case QRhiShaderResourceBinding::ImageLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageLoadStore:
+        {
+            QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.simage.tex);
+            if (texD->generation != bd.simage.generation || texD->m_id != bd.simage.id) {
+                resNeedsRebind = true;
+                bd.simage.id = texD->m_id;
+                bd.simage.generation = texD->generation;
+            }
+            texD->lastActiveFrameSlot = currentFrameSlot;
+        }
+            break;
+        case QRhiShaderResourceBinding::BufferLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferLoadStore:
+        {
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.sbuf.buf);
+            Q_ASSERT(bufD->m_usage.testFlag(QRhiBuffer::StorageBuffer));
+            executeBufferHostWritesForCurrentFrame(bufD);
+            if (bufD->generation != bd.sbuf.generation || bufD->m_id != bd.sbuf.id) {
+                resNeedsRebind = true;
+                bd.sbuf.id = bufD->m_id;
+                bd.sbuf.generation = bufD->generation;
+            }
+            bufD->lastActiveFrameSlot = currentFrameSlot;
+        }
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    // make sure the resources for the correct slot get bound
+    const int resSlot = hasSlottedResourceInSrb ? currentFrameSlot : 0;
+    if (hasSlottedResourceInSrb && cbD->currentResSlot != resSlot)
+        resNeedsRebind = true;
+
+    const bool srbChanged = gfxPsD ? (cbD->currentGraphicsSrb != srb) : (cbD->currentComputeSrb != srb);
+    const bool srbRebuilt = cbD->currentSrbGeneration != srbD->generation;
+
+    // dynamic uniform buffer offsets always trigger a rebind
+    if (hasDynamicOffsetInSrb || resNeedsRebind || srbChanged || srbRebuilt) {
+        if (gfxPsD) {
+            cbD->currentGraphicsSrb = srb;
+            cbD->currentComputeSrb = nullptr;
+        } else {
+            cbD->currentGraphicsSrb = nullptr;
+            cbD->currentComputeSrb = srb;
+        }
+        cbD->currentSrbGeneration = srbD->generation;
+        cbD->currentResSlot = resSlot;
+
+        const bool offsetOnlyChange = hasDynamicOffsetInSrb && !resNeedsRebind && !srbChanged && !srbRebuilt;
+        enqueueShaderResourceBindings(srbD, cbD, dynamicOffsetCount, dynamicOffsets, offsetOnlyChange);
+    }
+}
+
+void QRhiMetal::setVertexInput(QRhiCommandBuffer *cb,
+                               int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                               QRhiBuffer *indexBuf, quint32 indexOffset, QRhiCommandBuffer::IndexFormat indexFormat)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+
+    QRhiBatchedBindings<id<MTLBuffer> > buffers;
+    QRhiBatchedBindings<NSUInteger> offsets;
+    for (int i = 0; i < bindingCount; ++i) {
+        QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, bindings[i].first);
+        executeBufferHostWritesForCurrentFrame(bufD);
+        bufD->lastActiveFrameSlot = currentFrameSlot;
+        id<MTLBuffer> mtlbuf = bufD->d->buf[bufD->d->slotted ? currentFrameSlot : 0];
+        buffers.feed(startBinding + i, mtlbuf);
+        offsets.feed(startBinding + i, bindings[i].second);
+    }
+    buffers.finish();
+    offsets.finish();
+
+    // same binding space for vertex and constant buffers - work it around
+    QRhiShaderResourceBindings *srb = cbD->currentGraphicsSrb;
+    // There's nothing guaranteeing setShaderResources() was called before
+    // setVertexInput()... but whatever srb will get bound will have to be
+    // layout-compatible anyways so maxBinding is the same.
+    if (!srb)
+        srb = cbD->currentGraphicsPipeline->shaderResourceBindings();
+    const int firstVertexBinding = QRHI_RES(QMetalShaderResourceBindings, srb)->maxBinding + 1;
+
+    if (firstVertexBinding != cbD->d->currentFirstVertexBinding
+            || buffers != cbD->d->currentVertexInputsBuffers
+            || offsets != cbD->d->currentVertexInputOffsets)
+    {
+        cbD->d->currentFirstVertexBinding = firstVertexBinding;
+        cbD->d->currentVertexInputsBuffers = buffers;
+        cbD->d->currentVertexInputOffsets = offsets;
+
+        for (int i = 0, ie = buffers.batches.count(); i != ie; ++i) {
+            const auto &bufferBatch(buffers.batches[i]);
+            const auto &offsetBatch(offsets.batches[i]);
+            [cbD->d->currentRenderPassEncoder setVertexBuffers:
+                bufferBatch.resources.constData()
+              offsets: offsetBatch.resources.constData()
+              withRange: NSMakeRange(uint(firstVertexBinding) + bufferBatch.startBinding, NSUInteger(bufferBatch.resources.count()))];
+        }
+    }
+
+    if (indexBuf) {
+        QMetalBuffer *ibufD = QRHI_RES(QMetalBuffer, indexBuf);
+        executeBufferHostWritesForCurrentFrame(ibufD);
+        ibufD->lastActiveFrameSlot = currentFrameSlot;
+        cbD->currentIndexBuffer = indexBuf;
+        cbD->currentIndexOffset = indexOffset;
+        cbD->currentIndexFormat = indexFormat;
+    } else {
+        cbD->currentIndexBuffer = nullptr;
+    }
+}
+
+void QRhiMetal::setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+    const QSize outputSize = cbD->currentTarget->pixelSize();
+
+    // x,y is top-left in MTLViewportRect but bottom-left in QRhiViewport
+    float x, y, w, h;
+    if (!qrhi_toTopLeftRenderTargetRect(outputSize, viewport.viewport(), &x, &y, &w, &h))
+        return;
+
+    MTLViewport vp;
+    vp.originX = double(x);
+    vp.originY = double(y);
+    vp.width = double(w);
+    vp.height = double(h);
+    vp.znear = double(viewport.minDepth());
+    vp.zfar = double(viewport.maxDepth());
+
+    [cbD->d->currentRenderPassEncoder setViewport: vp];
+
+    if (!QRHI_RES(QMetalGraphicsPipeline, cbD->currentGraphicsPipeline)->m_flags.testFlag(QRhiGraphicsPipeline::UsesScissor)) {
+        MTLScissorRect s;
+        s.x = NSUInteger(x);
+        s.y = NSUInteger(y);
+        s.width = NSUInteger(w);
+        s.height = NSUInteger(h);
+        [cbD->d->currentRenderPassEncoder setScissorRect: s];
+    }
+}
+
+void QRhiMetal::setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+    Q_ASSERT(QRHI_RES(QMetalGraphicsPipeline, cbD->currentGraphicsPipeline)->m_flags.testFlag(QRhiGraphicsPipeline::UsesScissor));
+    const QSize outputSize = cbD->currentTarget->pixelSize();
+
+    // x,y is top-left in MTLScissorRect but bottom-left in QRhiScissor
+    int x, y, w, h;
+    if (!qrhi_toTopLeftRenderTargetRect(outputSize, scissor.scissor(), &x, &y, &w, &h))
+        return;
+
+    MTLScissorRect s;
+    s.x = NSUInteger(x);
+    s.y = NSUInteger(y);
+    s.width = NSUInteger(w);
+    s.height = NSUInteger(h);
+
+    [cbD->d->currentRenderPassEncoder setScissorRect: s];
+}
+
+void QRhiMetal::setBlendConstants(QRhiCommandBuffer *cb, const QColor &c)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+
+    [cbD->d->currentRenderPassEncoder setBlendColorRed: float(c.redF())
+      green: float(c.greenF()) blue: float(c.blueF()) alpha: float(c.alphaF())];
+}
+
+void QRhiMetal::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+
+    [cbD->d->currentRenderPassEncoder setStencilReferenceValue: refValue];
+}
+
+void QRhiMetal::draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+                     quint32 instanceCount, quint32 firstVertex, quint32 firstInstance)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+
+    [cbD->d->currentRenderPassEncoder drawPrimitives:
+        QRHI_RES(QMetalGraphicsPipeline, cbD->currentGraphicsPipeline)->d->primitiveType
+      vertexStart: firstVertex vertexCount: vertexCount instanceCount: instanceCount baseInstance: firstInstance];
+}
+
+void QRhiMetal::drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                            quint32 instanceCount, quint32 firstIndex, qint32 vertexOffset, quint32 firstInstance)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+
+    if (!cbD->currentIndexBuffer)
+        return;
+
+    const quint32 indexOffset = cbD->currentIndexOffset + firstIndex * (cbD->currentIndexFormat == QRhiCommandBuffer::IndexUInt16 ? 2 : 4);
+    Q_ASSERT(indexOffset == aligned<quint32>(indexOffset, 4));
+
+    QMetalBuffer *ibufD = QRHI_RES(QMetalBuffer, cbD->currentIndexBuffer);
+    id<MTLBuffer> mtlbuf = ibufD->d->buf[ibufD->d->slotted ? currentFrameSlot : 0];
+
+    [cbD->d->currentRenderPassEncoder drawIndexedPrimitives: QRHI_RES(QMetalGraphicsPipeline, cbD->currentGraphicsPipeline)->d->primitiveType
+      indexCount: indexCount
+      indexType: cbD->currentIndexFormat == QRhiCommandBuffer::IndexUInt16 ? MTLIndexTypeUInt16 : MTLIndexTypeUInt32
+      indexBuffer: mtlbuf
+      indexBufferOffset: indexOffset
+      instanceCount: instanceCount
+      baseVertex: vertexOffset
+      baseInstance: firstInstance];
+}
+
+void QRhiMetal::debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name)
+{
+    if (!debugMarkers)
+        return;
+
+    NSString *str = [NSString stringWithUTF8String: name.constData()];
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    if (cbD->recordingPass != QMetalCommandBuffer::NoPass) {
+        [cbD->d->currentRenderPassEncoder pushDebugGroup: str];
+    } else {
+        if (@available(macOS 10.13, iOS 11.0, *))
+            [cbD->d->cb pushDebugGroup: str];
+    }
+}
+
+void QRhiMetal::debugMarkEnd(QRhiCommandBuffer *cb)
+{
+    if (!debugMarkers)
+        return;
+
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    if (cbD->recordingPass != QMetalCommandBuffer::NoPass) {
+        [cbD->d->currentRenderPassEncoder popDebugGroup];
+    } else {
+        if (@available(macOS 10.13, iOS 11.0, *))
+            [cbD->d->cb popDebugGroup];
+    }
+}
+
+void QRhiMetal::debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg)
+{
+    if (!debugMarkers)
+        return;
+
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    if (cbD->recordingPass != QMetalCommandBuffer::NoPass)
+        [cbD->d->currentRenderPassEncoder insertDebugSignpost: [NSString stringWithUTF8String: msg.constData()]];
+}
+
+const QRhiNativeHandles *QRhiMetal::nativeHandles(QRhiCommandBuffer *cb)
+{
+    return QRHI_RES(QMetalCommandBuffer, cb)->nativeHandles();
+}
+
+void QRhiMetal::beginExternal(QRhiCommandBuffer *cb)
+{
+    Q_UNUSED(cb);
+}
+
+void QRhiMetal::endExternal(QRhiCommandBuffer *cb)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    cbD->resetPerPassCachedState();
+}
+
+QRhi::FrameOpResult QRhiMetal::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags)
+{
+    Q_UNUSED(flags);
+
+    QMetalSwapChain *swapChainD = QRHI_RES(QMetalSwapChain, swapChain);
+
+    // This is a bit messed up since for this swapchain we want to wait for the
+    // commands+present to complete, while for others just for the commands
+    // (for this same frame slot) but not sure how to do that in a sane way so
+    // wait for full cb completion for now.
+    for (QMetalSwapChain *sc : qAsConst(swapchains)) {
+        dispatch_semaphore_t sem = sc->d->sem[swapChainD->currentFrameSlot];
+        dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
+        if (sc != swapChainD)
+            dispatch_semaphore_signal(sem);
+    }
+
+    currentSwapChain = swapChainD;
+    currentFrameSlot = swapChainD->currentFrameSlot;
+    if (swapChainD->ds)
+        swapChainD->ds->lastActiveFrameSlot = currentFrameSlot;
+
+    if (@available(macOS 10.13, iOS 11.0, *))
+        [d->captureScope beginScope];
+
+    // Do not let the command buffer mess with the refcount of objects. We do
+    // have a proper render loop and will manage lifetimes similarly to other
+    // backends (Vulkan).
+    swapChainD->cbWrapper.d->cb = [d->cmdQueue commandBufferWithUnretainedReferences];
+
+    QMetalRenderTargetData::ColorAtt colorAtt;
+    if (swapChainD->samples > 1) {
+        colorAtt.tex = swapChainD->d->msaaTex[currentFrameSlot];
+        colorAtt.needsDrawableForResolveTex = true;
+    } else {
+        colorAtt.needsDrawableForTex = true;
+    }
+
+    swapChainD->rtWrapper.d->fb.colorAtt[0] = colorAtt;
+    swapChainD->rtWrapper.d->fb.dsTex = swapChainD->ds ? swapChainD->ds->d->tex : nil;
+    swapChainD->rtWrapper.d->fb.hasStencil = swapChainD->ds ? true : false;
+    swapChainD->rtWrapper.d->fb.depthNeedsStore = false;
+
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    QRHI_PROF_F(beginSwapChainFrame(swapChain));
+
+    executeDeferredReleases();
+    swapChainD->cbWrapper.resetState();
+    finishActiveReadbacks();
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiMetal::endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags)
+{
+    QMetalSwapChain *swapChainD = QRHI_RES(QMetalSwapChain, swapChain);
+    Q_ASSERT(currentSwapChain == swapChainD);
+
+    const bool needsPresent = !flags.testFlag(QRhi::SkipPresent);
+    if (needsPresent)
+        [swapChainD->cbWrapper.d->cb presentDrawable: swapChainD->d->curDrawable];
+
+    // Must not hold on to the drawable, regardless of needsPresent.
+    // (internally it is autoreleased or something, it seems)
+    swapChainD->d->curDrawable = nil;
+
+    __block int thisFrameSlot = currentFrameSlot;
+    [swapChainD->cbWrapper.d->cb addCompletedHandler: ^(id<MTLCommandBuffer>) {
+        dispatch_semaphore_signal(swapChainD->d->sem[thisFrameSlot]);
+    }];
+
+    [swapChainD->cbWrapper.d->cb commit];
+
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    QRHI_PROF_F(endSwapChainFrame(swapChain, swapChainD->frameCount + 1));
+
+    if (@available(macOS 10.13, iOS 11.0, *))
+        [d->captureScope endScope];
+
+    if (needsPresent)
+        swapChainD->currentFrameSlot = (swapChainD->currentFrameSlot + 1) % QMTL_FRAMES_IN_FLIGHT;
+
+    swapChainD->frameCount += 1;
+    currentSwapChain = nullptr;
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiMetal::beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags)
+{
+    Q_UNUSED(flags);
+
+    currentFrameSlot = (currentFrameSlot + 1) % QMTL_FRAMES_IN_FLIGHT;
+    if (swapchains.count() > 1) {
+        for (QMetalSwapChain *sc : qAsConst(swapchains)) {
+            // wait+signal is the general pattern to ensure the commands for a
+            // given frame slot have completed (if sem is 1, we go 0 then 1; if
+            // sem is 0 we go -1, block, completion increments to 0, then us to 1)
+            dispatch_semaphore_t sem = sc->d->sem[currentFrameSlot];
+            dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
+            dispatch_semaphore_signal(sem);
+        }
+    }
+
+    d->ofr.active = true;
+    *cb = &d->ofr.cbWrapper;
+    d->ofr.cbWrapper.d->cb = [d->cmdQueue commandBufferWithUnretainedReferences];
+
+    executeDeferredReleases();
+    d->ofr.cbWrapper.resetState();
+    finishActiveReadbacks();
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiMetal::endOffscreenFrame(QRhi::EndFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    Q_ASSERT(d->ofr.active);
+    d->ofr.active = false;
+
+    [d->ofr.cbWrapper.d->cb commit];
+
+    // offscreen frames wait for completion, unlike swapchain ones
+    [d->ofr.cbWrapper.d->cb waitUntilCompleted];
+
+    finishActiveReadbacks(true);
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiMetal::finish()
+{
+    id<MTLCommandBuffer> cb = nil;
+    QMetalSwapChain *swapChainD = nullptr;
+    if (inFrame) {
+        if (d->ofr.active) {
+            Q_ASSERT(!currentSwapChain);
+            Q_ASSERT(d->ofr.cbWrapper.recordingPass == QMetalCommandBuffer::NoPass);
+            cb = d->ofr.cbWrapper.d->cb;
+        } else {
+            Q_ASSERT(currentSwapChain);
+            swapChainD = currentSwapChain;
+            Q_ASSERT(swapChainD->cbWrapper.recordingPass == QMetalCommandBuffer::NoPass);
+            cb = swapChainD->cbWrapper.d->cb;
+        }
+    }
+
+    for (QMetalSwapChain *sc : qAsConst(swapchains)) {
+        for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+            if (currentSwapChain && sc == currentSwapChain && i == currentFrameSlot) {
+                // no wait as this is the thing we're going to be commit below and
+                // beginFrame decremented sem already and going to be signaled by endFrame
+                continue;
+            }
+            dispatch_semaphore_t sem = sc->d->sem[i];
+            dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
+            dispatch_semaphore_signal(sem);
+        }
+    }
+
+    if (cb) {
+        [cb commit];
+        [cb waitUntilCompleted];
+    }
+
+    if (inFrame) {
+        if (d->ofr.active)
+            d->ofr.cbWrapper.d->cb = [d->cmdQueue commandBufferWithUnretainedReferences];
+        else
+            swapChainD->cbWrapper.d->cb = [d->cmdQueue commandBufferWithUnretainedReferences];
+    }
+
+    executeDeferredReleases(true);
+
+    finishActiveReadbacks(true);
+
+    return QRhi::FrameOpSuccess;
+}
+
+MTLRenderPassDescriptor *QRhiMetalData::createDefaultRenderPass(bool hasDepthStencil,
+                                                                const QColor &colorClearValue,
+                                                                const QRhiDepthStencilClearValue &depthStencilClearValue,
+                                                                int colorAttCount)
+{
+    MTLRenderPassDescriptor *rp = [MTLRenderPassDescriptor renderPassDescriptor];
+    MTLClearColor c = MTLClearColorMake(colorClearValue.redF(), colorClearValue.greenF(), colorClearValue.blueF(),
+                                        colorClearValue.alphaF());
+
+    for (uint i = 0; i < uint(colorAttCount); ++i) {
+        rp.colorAttachments[i].loadAction = MTLLoadActionClear;
+        rp.colorAttachments[i].storeAction = MTLStoreActionStore;
+        rp.colorAttachments[i].clearColor = c;
+    }
+
+    if (hasDepthStencil) {
+        rp.depthAttachment.loadAction = MTLLoadActionClear;
+        rp.depthAttachment.storeAction = MTLStoreActionDontCare;
+        rp.stencilAttachment.loadAction = MTLLoadActionClear;
+        rp.stencilAttachment.storeAction = MTLStoreActionDontCare;
+        rp.depthAttachment.clearDepth = double(depthStencilClearValue.depthClearValue());
+        rp.stencilAttachment.clearStencil = depthStencilClearValue.stencilClearValue();
+    }
+
+    return rp;
+}
+
+qsizetype QRhiMetal::subresUploadByteSize(const QRhiTextureSubresourceUploadDescription &subresDesc) const
+{
+    qsizetype size = 0;
+    const qsizetype imageSizeBytes = subresDesc.image().isNull() ?
+                subresDesc.data().size() : subresDesc.image().sizeInBytes();
+    if (imageSizeBytes > 0)
+        size += aligned<qsizetype>(imageSizeBytes, QRhiMetalData::TEXBUF_ALIGN);
+    return size;
+}
+
+void QRhiMetal::enqueueSubresUpload(QMetalTexture *texD, void *mp, void *blitEncPtr,
+                                    int layer, int level, const QRhiTextureSubresourceUploadDescription &subresDesc,
+                                    qsizetype *curOfs)
+{
+    const QPoint dp = subresDesc.destinationTopLeft();
+    const QByteArray rawData = subresDesc.data();
+    QImage img = subresDesc.image();
+    id<MTLBlitCommandEncoder> blitEnc = (id<MTLBlitCommandEncoder>) blitEncPtr;
+
+    if (!img.isNull()) {
+        const qsizetype fullImageSizeBytes = img.sizeInBytes();
+        int w = img.width();
+        int h = img.height();
+        int bpl = img.bytesPerLine();
+        int srcOffset = 0;
+
+        if (!subresDesc.sourceSize().isEmpty() || !subresDesc.sourceTopLeft().isNull()) {
+            const int sx = subresDesc.sourceTopLeft().x();
+            const int sy = subresDesc.sourceTopLeft().y();
+            if (!subresDesc.sourceSize().isEmpty()) {
+                w = subresDesc.sourceSize().width();
+                h = subresDesc.sourceSize().height();
+            }
+            if (img.depth() == 32) {
+                memcpy(reinterpret_cast<char *>(mp) + *curOfs, img.constBits(), size_t(fullImageSizeBytes));
+                srcOffset = sy * bpl + sx * 4;
+                // bpl remains set to the original image's row stride
+            } else {
+                img = img.copy(sx, sy, w, h);
+                bpl = img.bytesPerLine();
+                Q_ASSERT(img.sizeInBytes() <= fullImageSizeBytes);
+                memcpy(reinterpret_cast<char *>(mp) + *curOfs, img.constBits(), size_t(img.sizeInBytes()));
+            }
+        } else {
+            memcpy(reinterpret_cast<char *>(mp) + *curOfs, img.constBits(), size_t(fullImageSizeBytes));
+        }
+
+        [blitEnc copyFromBuffer: texD->d->stagingBuf[currentFrameSlot]
+                                 sourceOffset: NSUInteger(*curOfs + srcOffset)
+                                 sourceBytesPerRow: NSUInteger(bpl)
+                                 sourceBytesPerImage: 0
+                                 sourceSize: MTLSizeMake(NSUInteger(w), NSUInteger(h), 1)
+          toTexture: texD->d->tex
+          destinationSlice: NSUInteger(layer)
+          destinationLevel: NSUInteger(level)
+          destinationOrigin: MTLOriginMake(NSUInteger(dp.x()), NSUInteger(dp.y()), 0)
+          options: MTLBlitOptionNone];
+
+        *curOfs += aligned<qsizetype>(fullImageSizeBytes, QRhiMetalData::TEXBUF_ALIGN);
+    } else if (!rawData.isEmpty() && isCompressedFormat(texD->m_format)) {
+        const QSize subresSize = q->sizeForMipLevel(level, texD->m_pixelSize);
+        const int subresw = subresSize.width();
+        const int subresh = subresSize.height();
+        int w, h;
+        if (subresDesc.sourceSize().isEmpty()) {
+            w = subresw;
+            h = subresh;
+        } else {
+            w = subresDesc.sourceSize().width();
+            h = subresDesc.sourceSize().height();
+        }
+
+        quint32 bpl = 0;
+        QSize blockDim;
+        compressedFormatInfo(texD->m_format, QSize(w, h), &bpl, nullptr, &blockDim);
+
+        const int dx = aligned(dp.x(), blockDim.width());
+        const int dy = aligned(dp.y(), blockDim.height());
+        if (dx + w != subresw)
+            w = aligned(w, blockDim.width());
+        if (dy + h != subresh)
+            h = aligned(h, blockDim.height());
+
+        memcpy(reinterpret_cast<char *>(mp) + *curOfs, rawData.constData(), size_t(rawData.size()));
+
+        [blitEnc copyFromBuffer: texD->d->stagingBuf[currentFrameSlot]
+                                 sourceOffset: NSUInteger(*curOfs)
+                                 sourceBytesPerRow: bpl
+                                 sourceBytesPerImage: 0
+                                 sourceSize: MTLSizeMake(NSUInteger(w), NSUInteger(h), 1)
+          toTexture: texD->d->tex
+          destinationSlice: NSUInteger(layer)
+          destinationLevel: NSUInteger(level)
+          destinationOrigin: MTLOriginMake(NSUInteger(dx), NSUInteger(dy), 0)
+          options: MTLBlitOptionNone];
+
+        *curOfs += aligned(rawData.size(), QRhiMetalData::TEXBUF_ALIGN);
+    } else if (!rawData.isEmpty()) {
+        const QSize subresSize = q->sizeForMipLevel(level, texD->m_pixelSize);
+        const int subresw = subresSize.width();
+        const int subresh = subresSize.height();
+        int w, h;
+        if (subresDesc.sourceSize().isEmpty()) {
+            w = subresw;
+            h = subresh;
+        } else {
+            w = subresDesc.sourceSize().width();
+            h = subresDesc.sourceSize().height();
+        }
+
+        quint32 bpl = 0;
+        textureFormatInfo(texD->m_format, QSize(w, h), &bpl, nullptr);
+        memcpy(reinterpret_cast<char *>(mp) + *curOfs, rawData.constData(), size_t(rawData.size()));
+
+        [blitEnc copyFromBuffer: texD->d->stagingBuf[currentFrameSlot]
+                                 sourceOffset: NSUInteger(*curOfs)
+                                 sourceBytesPerRow: bpl
+                                 sourceBytesPerImage: 0
+                                 sourceSize: MTLSizeMake(NSUInteger(w), NSUInteger(h), 1)
+          toTexture: texD->d->tex
+          destinationSlice: NSUInteger(layer)
+          destinationLevel: NSUInteger(level)
+          destinationOrigin: MTLOriginMake(NSUInteger(dp.x()), NSUInteger(dp.y()), 0)
+          options: MTLBlitOptionNone];
+
+        *curOfs += aligned(rawData.size(), QRhiMetalData::TEXBUF_ALIGN);
+    } else {
+        qWarning("Invalid texture upload for %p layer=%d mip=%d", texD, layer, level);
+    }
+}
+
+void QRhiMetal::enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    QRhiResourceUpdateBatchPrivate *ud = QRhiResourceUpdateBatchPrivate::get(resourceUpdates);
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+
+    for (const QRhiResourceUpdateBatchPrivate::BufferOp &u : ud->bufferOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::DynamicUpdate) {
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, u.buf);
+            Q_ASSERT(bufD->m_type == QRhiBuffer::Dynamic);
+            for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i)
+                bufD->d->pendingUpdates[i].append(u);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::StaticUpload) {
+            // Due to the Metal API the handling of static and dynamic buffers is
+            // basically the same. So go through the same pendingUpdates machinery.
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, u.buf);
+            Q_ASSERT(bufD->m_type != QRhiBuffer::Dynamic);
+            Q_ASSERT(u.offset + u.data.size() <= bufD->m_size);
+            for (int i = 0, ie = bufD->d->slotted ? QMTL_FRAMES_IN_FLIGHT : 1; i != ie; ++i)
+                bufD->d->pendingUpdates[i].append(
+                            QRhiResourceUpdateBatchPrivate::BufferOp::dynamicUpdate(u.buf, u.offset, u.data.size(), u.data.constData()));
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::Read) {
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, u.buf);
+            executeBufferHostWritesForCurrentFrame(bufD);
+            const int idx = bufD->d->slotted ? currentFrameSlot : 0;
+            char *p = reinterpret_cast<char *>([bufD->d->buf[idx] contents]);
+            if (p) {
+                u.result->data.resize(u.readSize);
+                memcpy(u.result->data.data(), p + u.offset, size_t(u.readSize));
+            }
+            if (u.result->completed)
+                u.result->completed();
+        }
+    }
+
+    id<MTLBlitCommandEncoder> blitEnc = nil;
+    auto ensureBlit = [&blitEnc, cbD, this] {
+        if (!blitEnc) {
+            blitEnc = [cbD->d->cb blitCommandEncoder];
+            if (debugMarkers)
+                [blitEnc pushDebugGroup: @"Texture upload/copy"];
+        }
+    };
+
+    for (const QRhiResourceUpdateBatchPrivate::TextureOp &u : ud->textureOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Upload) {
+            QMetalTexture *utexD = QRHI_RES(QMetalTexture, u.dst);
+            qsizetype stagingSize = 0;
+            for (int layer = 0; layer < QRhi::MAX_LAYERS; ++layer) {
+                for (int level = 0; level < QRhi::MAX_LEVELS; ++level) {
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                        stagingSize += subresUploadByteSize(subresDesc);
+                }
+            }
+
+            ensureBlit();
+            Q_ASSERT(!utexD->d->stagingBuf[currentFrameSlot]);
+            utexD->d->stagingBuf[currentFrameSlot] = [d->dev newBufferWithLength: NSUInteger(stagingSize)
+                        options: MTLResourceStorageModeShared];
+            QRHI_PROF_F(newTextureStagingArea(utexD, currentFrameSlot, quint32(stagingSize)));
+
+            void *mp = [utexD->d->stagingBuf[currentFrameSlot] contents];
+            qsizetype curOfs = 0;
+            for (int layer = 0; layer < QRhi::MAX_LAYERS; ++layer) {
+                for (int level = 0; level < QRhi::MAX_LEVELS; ++level) {
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                        enqueueSubresUpload(utexD, mp, blitEnc, layer, level, subresDesc, &curOfs);
+                }
+            }
+
+            utexD->lastActiveFrameSlot = currentFrameSlot;
+
+            QRhiMetalData::DeferredReleaseEntry e;
+            e.type = QRhiMetalData::DeferredReleaseEntry::StagingBuffer;
+            e.lastActiveFrameSlot = currentFrameSlot;
+            e.stagingBuffer.buffer = utexD->d->stagingBuf[currentFrameSlot];
+            utexD->d->stagingBuf[currentFrameSlot] = nil;
+            d->releaseQueue.append(e);
+            QRHI_PROF_F(releaseTextureStagingArea(utexD, currentFrameSlot));
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Copy) {
+            Q_ASSERT(u.src && u.dst);
+            QMetalTexture *srcD = QRHI_RES(QMetalTexture, u.src);
+            QMetalTexture *dstD = QRHI_RES(QMetalTexture, u.dst);
+            const QPoint dp = u.desc.destinationTopLeft();
+            const QSize mipSize = q->sizeForMipLevel(u.desc.sourceLevel(), srcD->m_pixelSize);
+            const QSize copySize = u.desc.pixelSize().isEmpty() ? mipSize : u.desc.pixelSize();
+            const QPoint sp = u.desc.sourceTopLeft();
+
+            ensureBlit();
+            [blitEnc copyFromTexture: srcD->d->tex
+                                      sourceSlice: NSUInteger(u.desc.sourceLayer())
+                                      sourceLevel: NSUInteger(u.desc.sourceLevel())
+                                      sourceOrigin: MTLOriginMake(NSUInteger(sp.x()), NSUInteger(sp.y()), 0)
+                                      sourceSize: MTLSizeMake(NSUInteger(copySize.width()), NSUInteger(copySize.height()), 1)
+                                      toTexture: dstD->d->tex
+                                      destinationSlice: NSUInteger(u.desc.destinationLayer())
+                                      destinationLevel: NSUInteger(u.desc.destinationLevel())
+                                      destinationOrigin: MTLOriginMake(NSUInteger(dp.x()), NSUInteger(dp.y()), 0)];
+
+            srcD->lastActiveFrameSlot = dstD->lastActiveFrameSlot = currentFrameSlot;
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Read) {
+            QRhiMetalData::TextureReadback readback;
+            readback.activeFrameSlot = currentFrameSlot;
+            readback.desc = u.rb;
+            readback.result = u.result;
+
+            QMetalTexture *texD = QRHI_RES(QMetalTexture, u.rb.texture());
+            QMetalSwapChain *swapChainD = nullptr;
+            id<MTLTexture> src;
+            QSize srcSize;
+            if (texD) {
+                if (texD->samples > 1) {
+                    qWarning("Multisample texture cannot be read back");
+                    continue;
+                }
+                readback.pixelSize = q->sizeForMipLevel(u.rb.level(), texD->m_pixelSize);
+                readback.format = texD->m_format;
+                src = texD->d->tex;
+                srcSize = readback.pixelSize;
+                texD->lastActiveFrameSlot = currentFrameSlot;
+            } else {
+                Q_ASSERT(currentSwapChain);
+                swapChainD = QRHI_RES(QMetalSwapChain, currentSwapChain);
+                readback.pixelSize = swapChainD->pixelSize;
+                readback.format = swapChainD->d->rhiColorFormat;
+                // Multisample swapchains need nothing special since resolving
+                // happens when ending a renderpass.
+                const QMetalRenderTargetData::ColorAtt &colorAtt(swapChainD->rtWrapper.d->fb.colorAtt[0]);
+                src = colorAtt.resolveTex ? colorAtt.resolveTex : colorAtt.tex;
+                srcSize = swapChainD->rtWrapper.d->pixelSize;
+            }
+
+            quint32 bpl = 0;
+            textureFormatInfo(readback.format, readback.pixelSize, &bpl, &readback.bufSize);
+            readback.buf = [d->dev newBufferWithLength: readback.bufSize options: MTLResourceStorageModeShared];
+
+            QRHI_PROF_F(newReadbackBuffer(qint64(qintptr(readback.buf)),
+                                          texD ? static_cast<QRhiResource *>(texD) : static_cast<QRhiResource *>(swapChainD),
+                                          readback.bufSize));
+
+            ensureBlit();
+            [blitEnc copyFromTexture: src
+                                      sourceSlice: NSUInteger(u.rb.layer())
+                                      sourceLevel: NSUInteger(u.rb.level())
+                                      sourceOrigin: MTLOriginMake(0, 0, 0)
+                                      sourceSize: MTLSizeMake(NSUInteger(srcSize.width()), NSUInteger(srcSize.height()), 1)
+                                      toBuffer: readback.buf
+                                      destinationOffset: 0
+                                      destinationBytesPerRow: bpl
+                                      destinationBytesPerImage: 0
+                                      options: MTLBlitOptionNone];
+
+            d->activeTextureReadbacks.append(readback);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::GenMips) {
+            QMetalTexture *utexD = QRHI_RES(QMetalTexture, u.dst);
+            ensureBlit();
+            [blitEnc generateMipmapsForTexture: utexD->d->tex];
+            utexD->lastActiveFrameSlot = currentFrameSlot;
+        }
+    }
+
+    if (blitEnc) {
+        if (debugMarkers)
+            [blitEnc popDebugGroup];
+        [blitEnc endEncoding];
+    }
+
+    ud->free();
+}
+
+// this handles all types of buffers, not just Dynamic
+void QRhiMetal::executeBufferHostWritesForCurrentFrame(QMetalBuffer *bufD)
+{
+    const int idx = bufD->d->slotted ? currentFrameSlot : 0;
+    if (bufD->d->pendingUpdates[idx].isEmpty())
+        return;
+
+    void *p = [bufD->d->buf[idx] contents];
+    int changeBegin = -1;
+    int changeEnd = -1;
+    for (const QRhiResourceUpdateBatchPrivate::BufferOp &u : qAsConst(bufD->d->pendingUpdates[idx])) {
+        Q_ASSERT(bufD == QRHI_RES(QMetalBuffer, u.buf));
+        memcpy(static_cast<char *>(p) + u.offset, u.data.constData(), size_t(u.data.size()));
+        if (changeBegin == -1 || u.offset < changeBegin)
+            changeBegin = u.offset;
+        if (changeEnd == -1 || u.offset + u.data.size() > changeEnd)
+            changeEnd = u.offset + u.data.size();
+    }
+    if (changeBegin >= 0 && bufD->d->managed)
+        [bufD->d->buf[idx] didModifyRange: NSMakeRange(NSUInteger(changeBegin), NSUInteger(changeEnd - changeBegin))];
+
+    bufD->d->pendingUpdates[idx].clear();
+}
+
+void QRhiMetal::resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    Q_ASSERT(QRHI_RES(QMetalCommandBuffer, cb)->recordingPass == QMetalCommandBuffer::NoPass);
+
+    enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+void QRhiMetal::beginPass(QRhiCommandBuffer *cb,
+                          QRhiRenderTarget *rt,
+                          const QColor &colorClearValue,
+                          const QRhiDepthStencilClearValue &depthStencilClearValue,
+                          QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::NoPass);
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+
+    QMetalRenderTargetData *rtD = nullptr;
+    switch (rt->resourceType()) {
+    case QRhiResource::RenderTarget:
+        rtD = QRHI_RES(QMetalReferenceRenderTarget, rt)->d;
+        cbD->d->currentPassRpDesc = d->createDefaultRenderPass(rtD->dsAttCount, colorClearValue, depthStencilClearValue, rtD->colorAttCount);
+        if (rtD->colorAttCount) {
+            QMetalRenderTargetData::ColorAtt &color0(rtD->fb.colorAtt[0]);
+            if (color0.needsDrawableForTex || color0.needsDrawableForResolveTex) {
+                Q_ASSERT(currentSwapChain);
+                QMetalSwapChain *swapChainD = QRHI_RES(QMetalSwapChain, currentSwapChain);
+                if (!swapChainD->d->curDrawable)
+                    swapChainD->d->curDrawable = [swapChainD->d->layer nextDrawable];
+                if (!swapChainD->d->curDrawable) {
+                    qWarning("No drawable");
+                    return;
+                }
+                id<MTLTexture> scTex = swapChainD->d->curDrawable.texture;
+                if (color0.needsDrawableForTex) {
+                    color0.tex = scTex;
+                    color0.needsDrawableForTex = false;
+                } else {
+                    color0.resolveTex = scTex;
+                    color0.needsDrawableForResolveTex = false;
+                }
+            }
+        }
+        break;
+    case QRhiResource::TextureRenderTarget:
+    {
+        QMetalTextureRenderTarget *rtTex = QRHI_RES(QMetalTextureRenderTarget, rt);
+        rtD = rtTex->d;
+        cbD->d->currentPassRpDesc = d->createDefaultRenderPass(rtD->dsAttCount, colorClearValue, depthStencilClearValue, rtD->colorAttCount);
+        if (rtTex->m_flags.testFlag(QRhiTextureRenderTarget::PreserveColorContents)) {
+            for (uint i = 0; i < uint(rtD->colorAttCount); ++i)
+                cbD->d->currentPassRpDesc.colorAttachments[i].loadAction = MTLLoadActionLoad;
+        }
+        if (rtD->dsAttCount && rtTex->m_flags.testFlag(QRhiTextureRenderTarget::PreserveDepthStencilContents)) {
+            cbD->d->currentPassRpDesc.depthAttachment.loadAction = MTLLoadActionLoad;
+            cbD->d->currentPassRpDesc.stencilAttachment.loadAction = MTLLoadActionLoad;
+        }
+        for (auto it = rtTex->m_desc.cbeginColorAttachments(), itEnd = rtTex->m_desc.cendColorAttachments();
+             it != itEnd; ++it)
+        {
+            if (it->texture())
+                QRHI_RES(QMetalTexture, it->texture())->lastActiveFrameSlot = currentFrameSlot;
+            else if (it->renderBuffer())
+                QRHI_RES(QMetalRenderBuffer, it->renderBuffer())->lastActiveFrameSlot = currentFrameSlot;
+            if (it->resolveTexture())
+                QRHI_RES(QMetalTexture, it->resolveTexture())->lastActiveFrameSlot = currentFrameSlot;
+        }
+        if (rtTex->m_desc.depthStencilBuffer())
+            QRHI_RES(QMetalRenderBuffer, rtTex->m_desc.depthStencilBuffer())->lastActiveFrameSlot = currentFrameSlot;
+        if (rtTex->m_desc.depthTexture())
+            QRHI_RES(QMetalTexture, rtTex->m_desc.depthTexture())->lastActiveFrameSlot = currentFrameSlot;
+    }
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    for (uint i = 0; i < uint(rtD->colorAttCount); ++i) {
+        cbD->d->currentPassRpDesc.colorAttachments[i].texture = rtD->fb.colorAtt[i].tex;
+        cbD->d->currentPassRpDesc.colorAttachments[i].slice = NSUInteger(rtD->fb.colorAtt[i].layer);
+        cbD->d->currentPassRpDesc.colorAttachments[i].level = NSUInteger(rtD->fb.colorAtt[i].level);
+        if (rtD->fb.colorAtt[i].resolveTex) {
+            cbD->d->currentPassRpDesc.colorAttachments[i].storeAction = MTLStoreActionMultisampleResolve;
+            cbD->d->currentPassRpDesc.colorAttachments[i].resolveTexture = rtD->fb.colorAtt[i].resolveTex;
+            cbD->d->currentPassRpDesc.colorAttachments[i].resolveSlice = NSUInteger(rtD->fb.colorAtt[i].resolveLayer);
+            cbD->d->currentPassRpDesc.colorAttachments[i].resolveLevel = NSUInteger(rtD->fb.colorAtt[i].resolveLevel);
+        }
+    }
+
+    if (rtD->dsAttCount) {
+        Q_ASSERT(rtD->fb.dsTex);
+        cbD->d->currentPassRpDesc.depthAttachment.texture = rtD->fb.dsTex;
+        cbD->d->currentPassRpDesc.stencilAttachment.texture = rtD->fb.hasStencil ? rtD->fb.dsTex : nil;
+        if (rtD->fb.depthNeedsStore) // Depth/Stencil is set to DontCare by default, override if  needed
+            cbD->d->currentPassRpDesc.depthAttachment.storeAction = MTLStoreActionStore;
+    }
+
+    cbD->d->currentRenderPassEncoder = [cbD->d->cb renderCommandEncoderWithDescriptor: cbD->d->currentPassRpDesc];
+
+    cbD->resetPerPassState();
+
+    cbD->recordingPass = QMetalCommandBuffer::RenderPass;
+    cbD->currentTarget = rt;
+}
+
+void QRhiMetal::endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::RenderPass);
+
+    [cbD->d->currentRenderPassEncoder endEncoding];
+
+    cbD->recordingPass = QMetalCommandBuffer::NoPass;
+    cbD->currentTarget = nullptr;
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+void QRhiMetal::beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::NoPass);
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+
+    cbD->d->currentComputePassEncoder = [cbD->d->cb computeCommandEncoder];
+    cbD->resetPerPassState();
+    cbD->recordingPass = QMetalCommandBuffer::ComputePass;
+}
+
+void QRhiMetal::endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::ComputePass);
+
+    [cbD->d->currentComputePassEncoder endEncoding];
+    cbD->recordingPass = QMetalCommandBuffer::NoPass;
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cb, resourceUpdates);
+}
+
+void QRhiMetal::setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::ComputePass);
+    QMetalComputePipeline *psD = QRHI_RES(QMetalComputePipeline, ps);
+
+    if (cbD->currentComputePipeline != ps || cbD->currentPipelineGeneration != psD->generation) {
+        cbD->currentGraphicsPipeline = nullptr;
+        cbD->currentComputePipeline = ps;
+        cbD->currentPipelineGeneration = psD->generation;
+
+        [cbD->d->currentComputePassEncoder setComputePipelineState: psD->d->ps];
+    }
+
+    psD->lastActiveFrameSlot = currentFrameSlot;
+}
+
+void QRhiMetal::dispatch(QRhiCommandBuffer *cb, int x, int y, int z)
+{
+    QMetalCommandBuffer *cbD = QRHI_RES(QMetalCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QMetalCommandBuffer::ComputePass);
+    QMetalComputePipeline *psD = QRHI_RES(QMetalComputePipeline, cbD->currentComputePipeline);
+
+    [cbD->d->currentComputePassEncoder dispatchThreadgroups: MTLSizeMake(NSUInteger(x), NSUInteger(y), NSUInteger(z))
+      threadsPerThreadgroup: psD->d->localSize];
+}
+
+static void qrhimtl_releaseBuffer(const QRhiMetalData::DeferredReleaseEntry &e)
+{
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i)
+        [e.buffer.buffers[i] release];
+}
+
+static void qrhimtl_releaseRenderBuffer(const QRhiMetalData::DeferredReleaseEntry &e)
+{
+    [e.renderbuffer.texture release];
+}
+
+static void qrhimtl_releaseTexture(const QRhiMetalData::DeferredReleaseEntry &e)
+{
+    [e.texture.texture release];
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i)
+        [e.texture.stagingBuffers[i] release];
+    for (int i = 0; i < QRhi::MAX_LEVELS; ++i)
+        [e.texture.views[i] release];
+}
+
+static void qrhimtl_releaseSampler(const QRhiMetalData::DeferredReleaseEntry &e)
+{
+    [e.sampler.samplerState release];
+}
+
+void QRhiMetal::executeDeferredReleases(bool forced)
+{
+    for (int i = d->releaseQueue.count() - 1; i >= 0; --i) {
+        const QRhiMetalData::DeferredReleaseEntry &e(d->releaseQueue[i]);
+        if (forced || currentFrameSlot == e.lastActiveFrameSlot || e.lastActiveFrameSlot < 0) {
+            switch (e.type) {
+            case QRhiMetalData::DeferredReleaseEntry::Buffer:
+                qrhimtl_releaseBuffer(e);
+                break;
+            case QRhiMetalData::DeferredReleaseEntry::RenderBuffer:
+                qrhimtl_releaseRenderBuffer(e);
+                break;
+            case QRhiMetalData::DeferredReleaseEntry::Texture:
+                qrhimtl_releaseTexture(e);
+                break;
+            case QRhiMetalData::DeferredReleaseEntry::Sampler:
+                qrhimtl_releaseSampler(e);
+                break;
+            case QRhiMetalData::DeferredReleaseEntry::StagingBuffer:
+                [e.stagingBuffer.buffer release];
+                break;
+            default:
+                break;
+            }
+            d->releaseQueue.removeAt(i);
+        }
+    }
+}
+
+void QRhiMetal::finishActiveReadbacks(bool forced)
+{
+    QVarLengthArray<std::function<void()>, 4> completedCallbacks;
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+
+    for (int i = d->activeTextureReadbacks.count() - 1; i >= 0; --i) {
+        const QRhiMetalData::TextureReadback &readback(d->activeTextureReadbacks[i]);
+        if (forced || currentFrameSlot == readback.activeFrameSlot || readback.activeFrameSlot < 0) {
+            readback.result->format = readback.format;
+            readback.result->pixelSize = readback.pixelSize;
+            readback.result->data.resize(int(readback.bufSize));
+            void *p = [readback.buf contents];
+            memcpy(readback.result->data.data(), p, readback.bufSize);
+            [readback.buf release];
+
+            QRHI_PROF_F(releaseReadbackBuffer(qint64(qintptr(readback.buf))));
+
+            if (readback.result->completed)
+                completedCallbacks.append(readback.result->completed);
+
+            d->activeTextureReadbacks.removeAt(i);
+        }
+    }
+
+    for (auto f : completedCallbacks)
+        f();
+}
+
+QMetalBuffer::QMetalBuffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size)
+    : QRhiBuffer(rhi, type, usage, size),
+      d(new QMetalBufferData)
+{
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i)
+        d->buf[i] = nil;
+}
+
+QMetalBuffer::~QMetalBuffer()
+{
+    release();
+    delete d;
+}
+
+void QMetalBuffer::release()
+{
+    if (!d->buf[0])
+        return;
+
+    QRhiMetalData::DeferredReleaseEntry e;
+    e.type = QRhiMetalData::DeferredReleaseEntry::Buffer;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+        e.buffer.buffers[i] = d->buf[i];
+        d->buf[i] = nil;
+        d->pendingUpdates[i].clear();
+    }
+
+    QRHI_RES_RHI(QRhiMetal);
+    rhiD->d->releaseQueue.append(e);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseBuffer(this));
+    rhiD->unregisterResource(this);
+}
+
+bool QMetalBuffer::build()
+{
+    if (d->buf[0])
+        release();
+
+    if (m_usage.testFlag(QRhiBuffer::StorageBuffer) && m_type == Dynamic) {
+        qWarning("StorageBuffer cannot be combined with Dynamic");
+        return false;
+    }
+
+    const uint nonZeroSize = m_size <= 0 ? 256 : uint(m_size);
+    const uint roundedSize = m_usage.testFlag(QRhiBuffer::UniformBuffer) ? aligned<uint>(nonZeroSize, 256) : nonZeroSize;
+
+    d->managed = false;
+    MTLResourceOptions opts = MTLResourceStorageModeShared;
+#ifdef Q_OS_MACOS
+    if (m_type != Dynamic) {
+        opts = MTLResourceStorageModeManaged;
+        d->managed = true;
+    }
+#endif
+
+    // Have QMTL_FRAMES_IN_FLIGHT versions regardless of the type, for now.
+    // This is because writing to a Managed buffer (which is what Immutable and
+    // Static maps to on macOS) is not safe when another frame reading from the
+    // same buffer is still in flight.
+    d->slotted = !m_usage.testFlag(QRhiBuffer::StorageBuffer); // except for SSBOs written in the shader
+
+    QRHI_RES_RHI(QRhiMetal);
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+        if (i == 0 || d->slotted) {
+            d->buf[i] = [rhiD->d->dev newBufferWithLength: roundedSize options: opts];
+            if (!m_objectName.isEmpty()) {
+                if (!d->slotted) {
+                    d->buf[i].label = [NSString stringWithUTF8String: m_objectName.constData()];
+                } else {
+                    const QByteArray name = m_objectName + '/' + QByteArray::number(i);
+                    d->buf[i].label = [NSString stringWithUTF8String: name.constData()];
+                }
+            }
+        }
+    }
+
+    QRHI_PROF;
+    QRHI_PROF_F(newBuffer(this, roundedSize, d->slotted ? QMTL_FRAMES_IN_FLIGHT : 1, 0));
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QMetalRenderBuffer::QMetalRenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                                       int sampleCount, QRhiRenderBuffer::Flags flags)
+    : QRhiRenderBuffer(rhi, type, pixelSize, sampleCount, flags),
+      d(new QMetalRenderBufferData)
+{
+}
+
+QMetalRenderBuffer::~QMetalRenderBuffer()
+{
+    release();
+    delete d;
+}
+
+void QMetalRenderBuffer::release()
+{
+    if (!d->tex)
+        return;
+
+    QRhiMetalData::DeferredReleaseEntry e;
+    e.type = QRhiMetalData::DeferredReleaseEntry::RenderBuffer;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.renderbuffer.texture = d->tex;
+    d->tex = nil;
+
+    QRHI_RES_RHI(QRhiMetal);
+    rhiD->d->releaseQueue.append(e);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseRenderBuffer(this));
+    rhiD->unregisterResource(this);
+}
+
+bool QMetalRenderBuffer::build()
+{
+    if (d->tex)
+        release();
+
+    if (m_pixelSize.isEmpty())
+        return false;
+
+    QRHI_RES_RHI(QRhiMetal);
+    samples = rhiD->effectiveSampleCount(m_sampleCount);
+
+    MTLTextureDescriptor *desc = [[MTLTextureDescriptor alloc] init];
+    desc.textureType = samples > 1 ? MTLTextureType2DMultisample : MTLTextureType2D;
+    desc.width = NSUInteger(m_pixelSize.width());
+    desc.height = NSUInteger(m_pixelSize.height());
+    if (samples > 1)
+        desc.sampleCount = NSUInteger(samples);
+    desc.resourceOptions = MTLResourceStorageModePrivate;
+    desc.usage = MTLTextureUsageRenderTarget;
+
+    bool transientBacking = false;
+    switch (m_type) {
+    case DepthStencil:
+#ifdef Q_OS_MACOS
+        desc.storageMode = MTLStorageModePrivate;
+#else
+        desc.storageMode = MTLResourceStorageModeMemoryless;
+        transientBacking = true;
+#endif
+        d->format = rhiD->d->dev.depth24Stencil8PixelFormatSupported
+                ? MTLPixelFormatDepth24Unorm_Stencil8 : MTLPixelFormatDepth32Float_Stencil8;
+        desc.pixelFormat = d->format;
+        break;
+    case Color:
+        desc.storageMode = MTLStorageModePrivate;
+        d->format = MTLPixelFormatRGBA8Unorm;
+        desc.pixelFormat = d->format;
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    d->tex = [rhiD->d->dev newTextureWithDescriptor: desc];
+    [desc release];
+
+    if (!m_objectName.isEmpty())
+        d->tex.label = [NSString stringWithUTF8String: m_objectName.constData()];
+
+    QRHI_PROF;
+    QRHI_PROF_F(newRenderBuffer(this, transientBacking, false, samples));
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QRhiTexture::Format QMetalRenderBuffer::backingFormat() const
+{
+    return m_type == Color ? QRhiTexture::RGBA8 : QRhiTexture::UnknownFormat;
+}
+
+QMetalTexture::QMetalTexture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                             int sampleCount, Flags flags)
+    : QRhiTexture(rhi, format, pixelSize, sampleCount, flags),
+      d(new QMetalTextureData(this))
+{
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i)
+        d->stagingBuf[i] = nil;
+
+    for (int i = 0; i < QRhi::MAX_LEVELS; ++i)
+        d->perLevelViews[i] = nil;
+}
+
+QMetalTexture::~QMetalTexture()
+{
+    release();
+    delete d;
+}
+
+void QMetalTexture::release()
+{
+    if (!d->tex)
+        return;
+
+    QRhiMetalData::DeferredReleaseEntry e;
+    e.type = QRhiMetalData::DeferredReleaseEntry::Texture;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.texture.texture = d->owns ? d->tex : nil;
+    d->tex = nil;
+    nativeHandlesStruct.texture = nullptr;
+
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+        e.texture.stagingBuffers[i] = d->stagingBuf[i];
+        d->stagingBuf[i] = nil;
+    }
+
+    for (int i = 0; i < QRhi::MAX_LEVELS; ++i) {
+        e.texture.views[i] = d->perLevelViews[i];
+        d->perLevelViews[i] = nil;
+    }
+
+    QRHI_RES_RHI(QRhiMetal);
+    rhiD->d->releaseQueue.append(e);
+    QRHI_PROF;
+    QRHI_PROF_F(releaseTexture(this));
+    rhiD->unregisterResource(this);
+}
+
+static inline MTLPixelFormat toMetalTextureFormat(QRhiTexture::Format format, QRhiTexture::Flags flags)
+{
+    const bool srgb = flags.testFlag(QRhiTexture::sRGB);
+    switch (format) {
+    case QRhiTexture::RGBA8:
+        return srgb ? MTLPixelFormatRGBA8Unorm_sRGB : MTLPixelFormatRGBA8Unorm;
+    case QRhiTexture::BGRA8:
+        return srgb ? MTLPixelFormatBGRA8Unorm_sRGB : MTLPixelFormatBGRA8Unorm;
+    case QRhiTexture::R8:
+#ifdef Q_OS_MACOS
+        return MTLPixelFormatR8Unorm;
+#else
+        return srgb ? MTLPixelFormatR8Unorm_sRGB : MTLPixelFormatR8Unorm;
+#endif
+    case QRhiTexture::R16:
+        return MTLPixelFormatR16Unorm;
+    case QRhiTexture::RED_OR_ALPHA8:
+        return MTLPixelFormatR8Unorm;
+
+    case QRhiTexture::RGBA16F:
+        return MTLPixelFormatRGBA16Float;
+    case QRhiTexture::RGBA32F:
+        return MTLPixelFormatRGBA32Float;
+
+    case QRhiTexture::D16:
+#ifdef Q_OS_MACOS
+        return MTLPixelFormatDepth16Unorm;
+#else
+        return MTLPixelFormatDepth32Float;
+#endif
+    case QRhiTexture::D32F:
+        return MTLPixelFormatDepth32Float;
+
+#ifdef Q_OS_MACOS
+    case QRhiTexture::BC1:
+        return srgb ? MTLPixelFormatBC1_RGBA_sRGB : MTLPixelFormatBC1_RGBA;
+    case QRhiTexture::BC2:
+        return srgb ? MTLPixelFormatBC2_RGBA_sRGB : MTLPixelFormatBC2_RGBA;
+    case QRhiTexture::BC3:
+        return srgb ? MTLPixelFormatBC3_RGBA_sRGB : MTLPixelFormatBC3_RGBA;
+    case QRhiTexture::BC4:
+        return MTLPixelFormatBC4_RUnorm;
+    case QRhiTexture::BC5:
+        qWarning("QRhiMetal does not support BC5");
+        return MTLPixelFormatRGBA8Unorm;
+    case QRhiTexture::BC6H:
+        return MTLPixelFormatBC6H_RGBUfloat;
+    case QRhiTexture::BC7:
+        return srgb ? MTLPixelFormatBC7_RGBAUnorm_sRGB : MTLPixelFormatBC7_RGBAUnorm;
+#else
+    case QRhiTexture::BC1:
+    case QRhiTexture::BC2:
+    case QRhiTexture::BC3:
+    case QRhiTexture::BC4:
+    case QRhiTexture::BC5:
+    case QRhiTexture::BC6H:
+    case QRhiTexture::BC7:
+        qWarning("QRhiMetal: BCx compression not supported on this platform");
+        return MTLPixelFormatRGBA8Unorm;
+#endif
+
+#ifndef Q_OS_MACOS
+    case QRhiTexture::ETC2_RGB8:
+        return srgb ? MTLPixelFormatETC2_RGB8_sRGB : MTLPixelFormatETC2_RGB8;
+    case QRhiTexture::ETC2_RGB8A1:
+        return srgb ? MTLPixelFormatETC2_RGB8A1_sRGB : MTLPixelFormatETC2_RGB8A1;
+    case QRhiTexture::ETC2_RGBA8:
+        return srgb ? MTLPixelFormatEAC_RGBA8_sRGB : MTLPixelFormatEAC_RGBA8;
+
+    case QRhiTexture::ASTC_4x4:
+        return srgb ? MTLPixelFormatASTC_4x4_sRGB : MTLPixelFormatASTC_4x4_LDR;
+    case QRhiTexture::ASTC_5x4:
+        return srgb ? MTLPixelFormatASTC_5x4_sRGB : MTLPixelFormatASTC_5x4_LDR;
+    case QRhiTexture::ASTC_5x5:
+        return srgb ? MTLPixelFormatASTC_5x5_sRGB : MTLPixelFormatASTC_5x5_LDR;
+    case QRhiTexture::ASTC_6x5:
+        return srgb ? MTLPixelFormatASTC_6x5_sRGB : MTLPixelFormatASTC_6x5_LDR;
+    case QRhiTexture::ASTC_6x6:
+        return srgb ? MTLPixelFormatASTC_6x6_sRGB : MTLPixelFormatASTC_6x6_LDR;
+    case QRhiTexture::ASTC_8x5:
+        return srgb ? MTLPixelFormatASTC_8x5_sRGB : MTLPixelFormatASTC_8x5_LDR;
+    case QRhiTexture::ASTC_8x6:
+        return srgb ? MTLPixelFormatASTC_8x6_sRGB : MTLPixelFormatASTC_8x6_LDR;
+    case QRhiTexture::ASTC_8x8:
+        return srgb ? MTLPixelFormatASTC_8x8_sRGB : MTLPixelFormatASTC_8x8_LDR;
+    case QRhiTexture::ASTC_10x5:
+        return srgb ? MTLPixelFormatASTC_10x5_sRGB : MTLPixelFormatASTC_10x5_LDR;
+    case QRhiTexture::ASTC_10x6:
+        return srgb ? MTLPixelFormatASTC_10x6_sRGB : MTLPixelFormatASTC_10x6_LDR;
+    case QRhiTexture::ASTC_10x8:
+        return srgb ? MTLPixelFormatASTC_10x8_sRGB : MTLPixelFormatASTC_10x8_LDR;
+    case QRhiTexture::ASTC_10x10:
+        return srgb ? MTLPixelFormatASTC_10x10_sRGB : MTLPixelFormatASTC_10x10_LDR;
+    case QRhiTexture::ASTC_12x10:
+        return srgb ? MTLPixelFormatASTC_12x10_sRGB : MTLPixelFormatASTC_12x10_LDR;
+    case QRhiTexture::ASTC_12x12:
+        return srgb ? MTLPixelFormatASTC_12x12_sRGB : MTLPixelFormatASTC_12x12_LDR;
+#else
+    case QRhiTexture::ETC2_RGB8:
+    case QRhiTexture::ETC2_RGB8A1:
+    case QRhiTexture::ETC2_RGBA8:
+        qWarning("QRhiMetal: ETC2 compression not supported on this platform");
+        return MTLPixelFormatRGBA8Unorm;
+
+    case QRhiTexture::ASTC_4x4:
+    case QRhiTexture::ASTC_5x4:
+    case QRhiTexture::ASTC_5x5:
+    case QRhiTexture::ASTC_6x5:
+    case QRhiTexture::ASTC_6x6:
+    case QRhiTexture::ASTC_8x5:
+    case QRhiTexture::ASTC_8x6:
+    case QRhiTexture::ASTC_8x8:
+    case QRhiTexture::ASTC_10x5:
+    case QRhiTexture::ASTC_10x6:
+    case QRhiTexture::ASTC_10x8:
+    case QRhiTexture::ASTC_10x10:
+    case QRhiTexture::ASTC_12x10:
+    case QRhiTexture::ASTC_12x12:
+        qWarning("QRhiMetal: ASTC compression not supported on this platform");
+        return MTLPixelFormatRGBA8Unorm;
+#endif
+
+    default:
+        Q_UNREACHABLE();
+        return MTLPixelFormatRGBA8Unorm;
+    }
+}
+
+bool QMetalTexture::prepareBuild(QSize *adjustedSize)
+{
+    if (d->tex)
+        release();
+
+    const QSize size = m_pixelSize.isEmpty() ? QSize(1, 1) : m_pixelSize;
+    const bool isCube = m_flags.testFlag(CubeMap);
+    const bool hasMipMaps = m_flags.testFlag(MipMapped);
+
+    QRHI_RES_RHI(QRhiMetal);
+    d->format = toMetalTextureFormat(m_format, m_flags);
+    mipLevelCount = hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1;
+    samples = rhiD->effectiveSampleCount(m_sampleCount);
+    if (samples > 1) {
+        if (isCube) {
+            qWarning("Cubemap texture cannot be multisample");
+            return false;
+        }
+        if (hasMipMaps) {
+            qWarning("Multisample texture cannot have mipmaps");
+            return false;
+        }
+    }
+
+    if (adjustedSize)
+        *adjustedSize = size;
+
+    return true;
+}
+
+bool QMetalTexture::build()
+{
+    QSize size;
+    if (!prepareBuild(&size))
+        return false;
+
+    MTLTextureDescriptor *desc = [[MTLTextureDescriptor alloc] init];
+
+    const bool isCube = m_flags.testFlag(CubeMap);
+    if (isCube)
+        desc.textureType = MTLTextureTypeCube;
+    else
+        desc.textureType = samples > 1 ? MTLTextureType2DMultisample : MTLTextureType2D;
+    desc.pixelFormat = d->format;
+    desc.width = NSUInteger(size.width());
+    desc.height = NSUInteger(size.height());
+    desc.mipmapLevelCount = NSUInteger(mipLevelCount);
+    if (samples > 1)
+        desc.sampleCount = NSUInteger(samples);
+    desc.resourceOptions = MTLResourceStorageModePrivate;
+    desc.storageMode = MTLStorageModePrivate;
+    desc.usage = MTLTextureUsageShaderRead;
+    if (m_flags.testFlag(RenderTarget))
+        desc.usage |= MTLTextureUsageRenderTarget;
+    if (m_flags.testFlag(UsedWithLoadStore))
+        desc.usage |= MTLTextureUsageShaderWrite;
+
+    QRHI_RES_RHI(QRhiMetal);
+    d->tex = [rhiD->d->dev newTextureWithDescriptor: desc];
+    [desc release];
+
+    if (!m_objectName.isEmpty())
+        d->tex.label = [NSString stringWithUTF8String: m_objectName.constData()];
+
+    d->owns = true;
+    nativeHandlesStruct.texture = d->tex;
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, true, mipLevelCount, isCube ? 6 : 1, samples));
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+bool QMetalTexture::buildFrom(const QRhiNativeHandles *src)
+{
+    const QRhiMetalTextureNativeHandles *h = static_cast<const QRhiMetalTextureNativeHandles *>(src);
+    if (!h || !h->texture)
+        return false;
+
+    if (!prepareBuild())
+        return false;
+
+    d->tex = (id<MTLTexture>) h->texture;
+
+    d->owns = false;
+    nativeHandlesStruct.texture = d->tex;
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, false, mipLevelCount, m_flags.testFlag(CubeMap) ? 6 : 1, samples));
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    QRHI_RES_RHI(QRhiMetal);
+    rhiD->registerResource(this);
+    return true;
+}
+
+const QRhiNativeHandles *QMetalTexture::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+id<MTLTexture> QMetalTextureData::viewForLevel(int level)
+{
+    Q_ASSERT(level >= 0 && level < int(q->mipLevelCount));
+    if (perLevelViews[level])
+        return perLevelViews[level];
+
+    const MTLTextureType type = [tex textureType];
+    const bool isCube = q->m_flags.testFlag(QRhiTexture::CubeMap);
+    id<MTLTexture> view = [tex newTextureViewWithPixelFormat: format textureType: type
+            levels: NSMakeRange(NSUInteger(level), 1) slices: NSMakeRange(0, isCube ? 6 : 1)];
+
+    perLevelViews[level] = view;
+    return view;
+}
+
+QMetalSampler::QMetalSampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                             AddressMode u, AddressMode v)
+    : QRhiSampler(rhi, magFilter, minFilter, mipmapMode, u, v),
+      d(new QMetalSamplerData)
+{
+}
+
+QMetalSampler::~QMetalSampler()
+{
+    release();
+    delete d;
+}
+
+void QMetalSampler::release()
+{
+    if (!d->samplerState)
+        return;
+
+    QRhiMetalData::DeferredReleaseEntry e;
+    e.type = QRhiMetalData::DeferredReleaseEntry::Sampler;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.sampler.samplerState = d->samplerState;
+    d->samplerState = nil;
+
+    QRHI_RES_RHI(QRhiMetal);
+    rhiD->d->releaseQueue.append(e);
+    rhiD->unregisterResource(this);
+}
+
+static inline MTLSamplerMinMagFilter toMetalFilter(QRhiSampler::Filter f)
+{
+    switch (f) {
+    case QRhiSampler::Nearest:
+        return MTLSamplerMinMagFilterNearest;
+    case QRhiSampler::Linear:
+        return MTLSamplerMinMagFilterLinear;
+    default:
+        Q_UNREACHABLE();
+        return MTLSamplerMinMagFilterNearest;
+    }
+}
+
+static inline MTLSamplerMipFilter toMetalMipmapMode(QRhiSampler::Filter f)
+{
+    switch (f) {
+    case QRhiSampler::None:
+        return MTLSamplerMipFilterNotMipmapped;
+    case QRhiSampler::Nearest:
+        return MTLSamplerMipFilterNearest;
+    case QRhiSampler::Linear:
+        return MTLSamplerMipFilterLinear;
+    default:
+        Q_UNREACHABLE();
+        return MTLSamplerMipFilterNotMipmapped;
+    }
+}
+
+static inline MTLSamplerAddressMode toMetalAddressMode(QRhiSampler::AddressMode m)
+{
+    switch (m) {
+    case QRhiSampler::Repeat:
+        return MTLSamplerAddressModeRepeat;
+    case QRhiSampler::ClampToEdge:
+        return MTLSamplerAddressModeClampToEdge;
+    case QRhiSampler::Border:
+        return MTLSamplerAddressModeClampToBorderColor;
+    case QRhiSampler::Mirror:
+        return MTLSamplerAddressModeMirrorRepeat;
+    case QRhiSampler::MirrorOnce:
+        return MTLSamplerAddressModeMirrorClampToEdge;
+    default:
+        Q_UNREACHABLE();
+        return MTLSamplerAddressModeClampToEdge;
+    }
+}
+
+static inline MTLCompareFunction toMetalTextureCompareFunction(QRhiSampler::CompareOp op)
+{
+    switch (op) {
+    case QRhiSampler::Never:
+        return MTLCompareFunctionNever;
+    case QRhiSampler::Less:
+        return MTLCompareFunctionLess;
+    case QRhiSampler::Equal:
+        return MTLCompareFunctionEqual;
+    case QRhiSampler::LessOrEqual:
+        return MTLCompareFunctionLessEqual;
+    case QRhiSampler::Greater:
+        return MTLCompareFunctionGreater;
+    case QRhiSampler::NotEqual:
+        return MTLCompareFunctionNotEqual;
+    case QRhiSampler::GreaterOrEqual:
+        return MTLCompareFunctionGreaterEqual;
+    case QRhiSampler::Always:
+        return MTLCompareFunctionAlways;
+    default:
+        Q_UNREACHABLE();
+        return MTLCompareFunctionNever;
+    }
+}
+
+bool QMetalSampler::build()
+{
+    if (d->samplerState)
+        release();
+
+    MTLSamplerDescriptor *desc = [[MTLSamplerDescriptor alloc] init];
+    desc.minFilter = toMetalFilter(m_minFilter);
+    desc.magFilter = toMetalFilter(m_magFilter);
+    desc.mipFilter = toMetalMipmapMode(m_mipmapMode);
+    desc.sAddressMode = toMetalAddressMode(m_addressU);
+    desc.tAddressMode = toMetalAddressMode(m_addressV);
+    desc.rAddressMode = toMetalAddressMode(m_addressW);
+    desc.compareFunction = toMetalTextureCompareFunction(m_compareOp);
+
+    QRHI_RES_RHI(QRhiMetal);
+    d->samplerState = [rhiD->d->dev newSamplerStateWithDescriptor: desc];
+    [desc release];
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+// dummy, no Vulkan-style RenderPass+Framebuffer concept here.
+// We do have MTLRenderPassDescriptor of course, but it will be created on the fly for each pass.
+QMetalRenderPassDescriptor::QMetalRenderPassDescriptor(QRhiImplementation *rhi)
+    : QRhiRenderPassDescriptor(rhi)
+{
+}
+
+QMetalRenderPassDescriptor::~QMetalRenderPassDescriptor()
+{
+    release();
+}
+
+void QMetalRenderPassDescriptor::release()
+{
+    // nothing to do here
+}
+
+QMetalReferenceRenderTarget::QMetalReferenceRenderTarget(QRhiImplementation *rhi)
+    : QRhiRenderTarget(rhi),
+      d(new QMetalRenderTargetData)
+{
+}
+
+QMetalReferenceRenderTarget::~QMetalReferenceRenderTarget()
+{
+    release();
+    delete d;
+}
+
+void QMetalReferenceRenderTarget::release()
+{
+    // nothing to do here
+}
+
+QSize QMetalReferenceRenderTarget::pixelSize() const
+{
+    return d->pixelSize;
+}
+
+float QMetalReferenceRenderTarget::devicePixelRatio() const
+{
+    return d->dpr;
+}
+
+int QMetalReferenceRenderTarget::sampleCount() const
+{
+    return d->sampleCount;
+}
+
+QMetalTextureRenderTarget::QMetalTextureRenderTarget(QRhiImplementation *rhi,
+                                                     const QRhiTextureRenderTargetDescription &desc,
+                                                     Flags flags)
+    : QRhiTextureRenderTarget(rhi, desc, flags),
+      d(new QMetalRenderTargetData)
+{
+}
+
+QMetalTextureRenderTarget::~QMetalTextureRenderTarget()
+{
+    release();
+    delete d;
+}
+
+void QMetalTextureRenderTarget::release()
+{
+    // nothing to do here
+}
+
+QRhiRenderPassDescriptor *QMetalTextureRenderTarget::newCompatibleRenderPassDescriptor()
+{
+    const int colorAttachmentCount = m_desc.cendColorAttachments() - m_desc.cbeginColorAttachments();
+    QMetalRenderPassDescriptor *rpD = new QMetalRenderPassDescriptor(m_rhi);
+    rpD->colorAttachmentCount = colorAttachmentCount;
+    rpD->hasDepthStencil = m_desc.depthStencilBuffer() || m_desc.depthTexture();
+
+    for (int i = 0; i < colorAttachmentCount; ++i) {
+        const QRhiColorAttachment *colorAtt = m_desc.colorAttachmentAt(i);
+        QMetalTexture *texD = QRHI_RES(QMetalTexture, colorAtt->texture());
+        QMetalRenderBuffer *rbD = QRHI_RES(QMetalRenderBuffer, colorAtt->renderBuffer());
+        rpD->colorFormat[i] = int(texD ? texD->d->format : rbD->d->format);
+    }
+
+    if (m_desc.depthTexture())
+        rpD->dsFormat = int(QRHI_RES(QMetalTexture, m_desc.depthTexture())->d->format);
+    else if (m_desc.depthStencilBuffer())
+        rpD->dsFormat = int(QRHI_RES(QMetalRenderBuffer, m_desc.depthStencilBuffer())->d->format);
+
+    return rpD;
+}
+
+bool QMetalTextureRenderTarget::build()
+{
+    const bool hasColorAttachments = m_desc.cbeginColorAttachments() != m_desc.cendColorAttachments();
+    Q_ASSERT(hasColorAttachments || m_desc.depthTexture());
+    Q_ASSERT(!m_desc.depthStencilBuffer() || !m_desc.depthTexture());
+    const bool hasDepthStencil = m_desc.depthStencilBuffer() || m_desc.depthTexture();
+
+    d->colorAttCount = 0;
+    int attIndex = 0;
+    for (auto it = m_desc.cbeginColorAttachments(), itEnd = m_desc.cendColorAttachments(); it != itEnd; ++it, ++attIndex) {
+        d->colorAttCount += 1;
+        QMetalTexture *texD = QRHI_RES(QMetalTexture, it->texture());
+        QMetalRenderBuffer *rbD = QRHI_RES(QMetalRenderBuffer, it->renderBuffer());
+        Q_ASSERT(texD || rbD);
+        id<MTLTexture> dst = nil;
+        if (texD) {
+            dst = texD->d->tex;
+            if (attIndex == 0) {
+                d->pixelSize = texD->pixelSize();
+                d->sampleCount = texD->samples;
+            }
+        } else if (rbD) {
+            dst = rbD->d->tex;
+            if (attIndex == 0) {
+                d->pixelSize = rbD->pixelSize();
+                d->sampleCount = rbD->samples;
+            }
+        }
+        QMetalRenderTargetData::ColorAtt colorAtt;
+        colorAtt.tex = dst;
+        colorAtt.layer = it->layer();
+        colorAtt.level = it->level();
+        QMetalTexture *resTexD = QRHI_RES(QMetalTexture, it->resolveTexture());
+        colorAtt.resolveTex = resTexD ? resTexD->d->tex : nil;
+        colorAtt.resolveLayer = it->resolveLayer();
+        colorAtt.resolveLevel = it->resolveLevel();
+        d->fb.colorAtt[attIndex] = colorAtt;
+    }
+    d->dpr = 1;
+
+    if (hasDepthStencil) {
+        if (m_desc.depthTexture()) {
+            QMetalTexture *depthTexD = QRHI_RES(QMetalTexture, m_desc.depthTexture());
+            d->fb.dsTex = depthTexD->d->tex;
+            d->fb.hasStencil = false;
+            d->fb.depthNeedsStore = true;
+            if (d->colorAttCount == 0) {
+                d->pixelSize = depthTexD->pixelSize();
+                d->sampleCount = depthTexD->samples;
+            }
+        } else {
+            QMetalRenderBuffer *depthRbD = QRHI_RES(QMetalRenderBuffer, m_desc.depthStencilBuffer());
+            d->fb.dsTex = depthRbD->d->tex;
+            d->fb.hasStencil = true;
+            d->fb.depthNeedsStore = false;
+            if (d->colorAttCount == 0) {
+                d->pixelSize = depthRbD->pixelSize();
+                d->sampleCount = depthRbD->samples;
+            }
+        }
+        d->dsAttCount = 1;
+    } else {
+        d->dsAttCount = 0;
+    }
+
+    return true;
+}
+
+QSize QMetalTextureRenderTarget::pixelSize() const
+{
+    return d->pixelSize;
+}
+
+float QMetalTextureRenderTarget::devicePixelRatio() const
+{
+    return d->dpr;
+}
+
+int QMetalTextureRenderTarget::sampleCount() const
+{
+    return d->sampleCount;
+}
+
+QMetalShaderResourceBindings::QMetalShaderResourceBindings(QRhiImplementation *rhi)
+    : QRhiShaderResourceBindings(rhi)
+{
+}
+
+QMetalShaderResourceBindings::~QMetalShaderResourceBindings()
+{
+    release();
+}
+
+void QMetalShaderResourceBindings::release()
+{
+    sortedBindings.clear();
+    maxBinding = -1;
+}
+
+bool QMetalShaderResourceBindings::build()
+{
+    if (!sortedBindings.isEmpty())
+        release();
+
+    std::copy(m_bindings.cbegin(), m_bindings.cend(), std::back_inserter(sortedBindings));
+    std::sort(sortedBindings.begin(), sortedBindings.end(),
+              [](const QRhiShaderResourceBinding &a, const QRhiShaderResourceBinding &b)
+    {
+        return a.data()->binding < b.data()->binding;
+    });
+    if (!sortedBindings.isEmpty())
+        maxBinding = sortedBindings.last().data()->binding;
+    else
+        maxBinding = -1;
+
+    boundResourceData.resize(sortedBindings.count());
+
+    for (int i = 0, ie = sortedBindings.count(); i != ie; ++i) {
+        const QRhiShaderResourceBinding::Data *b = sortedBindings.at(i).data();
+        QMetalShaderResourceBindings::BoundResourceData &bd(boundResourceData[i]);
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+        {
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.ubuf.buf);
+            bd.ubuf.id = bufD->m_id;
+            bd.ubuf.generation = bufD->generation;
+        }
+            break;
+        case QRhiShaderResourceBinding::SampledTexture:
+        {
+            QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.stex.tex);
+            QMetalSampler *samplerD = QRHI_RES(QMetalSampler, b->u.stex.sampler);
+            bd.stex.texId = texD->m_id;
+            bd.stex.texGeneration = texD->generation;
+            bd.stex.samplerId = samplerD->m_id;
+            bd.stex.samplerGeneration = samplerD->generation;
+        }
+            break;
+        case QRhiShaderResourceBinding::ImageLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageLoadStore:
+        {
+            QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.simage.tex);
+            bd.simage.id = texD->m_id;
+            bd.simage.generation = texD->generation;
+        }
+            break;
+        case QRhiShaderResourceBinding::BufferLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferLoadStore:
+        {
+            QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.sbuf.buf);
+            bd.sbuf.id = bufD->m_id;
+            bd.sbuf.generation = bufD->generation;
+        }
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    generation += 1;
+    return true;
+}
+
+QMetalGraphicsPipeline::QMetalGraphicsPipeline(QRhiImplementation *rhi)
+    : QRhiGraphicsPipeline(rhi),
+      d(new QMetalGraphicsPipelineData)
+{
+}
+
+QMetalGraphicsPipeline::~QMetalGraphicsPipeline()
+{
+    release();
+    delete d;
+}
+
+void QMetalGraphicsPipeline::release()
+{
+    QRHI_RES_RHI(QRhiMetal);
+
+    d->vs.release();
+    d->fs.release();
+
+    [d->ds release];
+    d->ds = nil;
+
+    if (!d->ps)
+        return;
+
+    [d->ps release];
+    d->ps = nil;
+
+    rhiD->unregisterResource(this);
+}
+
+static inline MTLVertexFormat toMetalAttributeFormat(QRhiVertexInputAttribute::Format format)
+{
+    switch (format) {
+    case QRhiVertexInputAttribute::Float4:
+        return MTLVertexFormatFloat4;
+    case QRhiVertexInputAttribute::Float3:
+        return MTLVertexFormatFloat3;
+    case QRhiVertexInputAttribute::Float2:
+        return MTLVertexFormatFloat2;
+    case QRhiVertexInputAttribute::Float:
+        return MTLVertexFormatFloat;
+    case QRhiVertexInputAttribute::UNormByte4:
+        return MTLVertexFormatUChar4Normalized;
+    case QRhiVertexInputAttribute::UNormByte2:
+        return MTLVertexFormatUChar2Normalized;
+    case QRhiVertexInputAttribute::UNormByte:
+        if (@available(macOS 10.13, iOS 11.0, *))
+            return MTLVertexFormatUCharNormalized;
+        else
+            Q_UNREACHABLE();
+    default:
+        Q_UNREACHABLE();
+        return MTLVertexFormatFloat4;
+    }
+}
+
+static inline MTLBlendFactor toMetalBlendFactor(QRhiGraphicsPipeline::BlendFactor f)
+{
+    switch (f) {
+    case QRhiGraphicsPipeline::Zero:
+        return MTLBlendFactorZero;
+    case QRhiGraphicsPipeline::One:
+        return MTLBlendFactorOne;
+    case QRhiGraphicsPipeline::SrcColor:
+        return MTLBlendFactorSourceColor;
+    case QRhiGraphicsPipeline::OneMinusSrcColor:
+        return MTLBlendFactorOneMinusSourceColor;
+    case QRhiGraphicsPipeline::DstColor:
+        return MTLBlendFactorDestinationColor;
+    case QRhiGraphicsPipeline::OneMinusDstColor:
+        return MTLBlendFactorOneMinusDestinationColor;
+    case QRhiGraphicsPipeline::SrcAlpha:
+        return MTLBlendFactorSourceAlpha;
+    case QRhiGraphicsPipeline::OneMinusSrcAlpha:
+        return MTLBlendFactorOneMinusSourceAlpha;
+    case QRhiGraphicsPipeline::DstAlpha:
+        return MTLBlendFactorDestinationAlpha;
+    case QRhiGraphicsPipeline::OneMinusDstAlpha:
+        return MTLBlendFactorOneMinusDestinationAlpha;
+    case QRhiGraphicsPipeline::ConstantColor:
+        return MTLBlendFactorBlendColor;
+    case QRhiGraphicsPipeline::ConstantAlpha:
+        return MTLBlendFactorBlendAlpha;
+    case QRhiGraphicsPipeline::OneMinusConstantColor:
+        return MTLBlendFactorOneMinusBlendColor;
+    case QRhiGraphicsPipeline::OneMinusConstantAlpha:
+        return MTLBlendFactorOneMinusBlendAlpha;
+    case QRhiGraphicsPipeline::SrcAlphaSaturate:
+        return MTLBlendFactorSourceAlphaSaturated;
+    case QRhiGraphicsPipeline::Src1Color:
+        return MTLBlendFactorSource1Color;
+    case QRhiGraphicsPipeline::OneMinusSrc1Color:
+        return MTLBlendFactorOneMinusSource1Color;
+    case QRhiGraphicsPipeline::Src1Alpha:
+        return MTLBlendFactorSource1Alpha;
+    case QRhiGraphicsPipeline::OneMinusSrc1Alpha:
+        return MTLBlendFactorOneMinusSource1Alpha;
+    default:
+        Q_UNREACHABLE();
+        return MTLBlendFactorZero;
+    }
+}
+
+static inline MTLBlendOperation toMetalBlendOp(QRhiGraphicsPipeline::BlendOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::Add:
+        return MTLBlendOperationAdd;
+    case QRhiGraphicsPipeline::Subtract:
+        return MTLBlendOperationSubtract;
+    case QRhiGraphicsPipeline::ReverseSubtract:
+        return MTLBlendOperationReverseSubtract;
+    case QRhiGraphicsPipeline::Min:
+        return MTLBlendOperationMin;
+    case QRhiGraphicsPipeline::Max:
+        return MTLBlendOperationMax;
+    default:
+        Q_UNREACHABLE();
+        return MTLBlendOperationAdd;
+    }
+}
+
+static inline uint toMetalColorWriteMask(QRhiGraphicsPipeline::ColorMask c)
+{
+    uint f = 0;
+    if (c.testFlag(QRhiGraphicsPipeline::R))
+        f |= MTLColorWriteMaskRed;
+    if (c.testFlag(QRhiGraphicsPipeline::G))
+        f |= MTLColorWriteMaskGreen;
+    if (c.testFlag(QRhiGraphicsPipeline::B))
+        f |= MTLColorWriteMaskBlue;
+    if (c.testFlag(QRhiGraphicsPipeline::A))
+        f |= MTLColorWriteMaskAlpha;
+    return f;
+}
+
+static inline MTLCompareFunction toMetalCompareOp(QRhiGraphicsPipeline::CompareOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::Never:
+        return MTLCompareFunctionNever;
+    case QRhiGraphicsPipeline::Less:
+        return MTLCompareFunctionLess;
+    case QRhiGraphicsPipeline::Equal:
+        return MTLCompareFunctionEqual;
+    case QRhiGraphicsPipeline::LessOrEqual:
+        return MTLCompareFunctionLessEqual;
+    case QRhiGraphicsPipeline::Greater:
+        return MTLCompareFunctionGreater;
+    case QRhiGraphicsPipeline::NotEqual:
+        return MTLCompareFunctionNotEqual;
+    case QRhiGraphicsPipeline::GreaterOrEqual:
+        return MTLCompareFunctionGreaterEqual;
+    case QRhiGraphicsPipeline::Always:
+        return MTLCompareFunctionAlways;
+    default:
+        Q_UNREACHABLE();
+        return MTLCompareFunctionAlways;
+    }
+}
+
+static inline MTLStencilOperation toMetalStencilOp(QRhiGraphicsPipeline::StencilOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::StencilZero:
+        return MTLStencilOperationZero;
+    case QRhiGraphicsPipeline::Keep:
+        return MTLStencilOperationKeep;
+    case QRhiGraphicsPipeline::Replace:
+        return MTLStencilOperationReplace;
+    case QRhiGraphicsPipeline::IncrementAndClamp:
+        return MTLStencilOperationIncrementClamp;
+    case QRhiGraphicsPipeline::DecrementAndClamp:
+        return MTLStencilOperationDecrementClamp;
+    case QRhiGraphicsPipeline::Invert:
+        return MTLStencilOperationInvert;
+    case QRhiGraphicsPipeline::IncrementAndWrap:
+        return MTLStencilOperationIncrementWrap;
+    case QRhiGraphicsPipeline::DecrementAndWrap:
+        return MTLStencilOperationDecrementWrap;
+    default:
+        Q_UNREACHABLE();
+        return MTLStencilOperationKeep;
+    }
+}
+
+static inline MTLPrimitiveType toMetalPrimitiveType(QRhiGraphicsPipeline::Topology t)
+{
+    switch (t) {
+    case QRhiGraphicsPipeline::Triangles:
+        return MTLPrimitiveTypeTriangle;
+    case QRhiGraphicsPipeline::TriangleStrip:
+        return MTLPrimitiveTypeTriangleStrip;
+    case QRhiGraphicsPipeline::Lines:
+        return MTLPrimitiveTypeLine;
+    case QRhiGraphicsPipeline::LineStrip:
+        return MTLPrimitiveTypeLineStrip;
+    case QRhiGraphicsPipeline::Points:
+        return MTLPrimitiveTypePoint;
+    default:
+        Q_UNREACHABLE();
+        return MTLPrimitiveTypeTriangle;
+    }
+}
+
+static inline MTLCullMode toMetalCullMode(QRhiGraphicsPipeline::CullMode c)
+{
+    switch (c) {
+    case QRhiGraphicsPipeline::None:
+        return MTLCullModeNone;
+    case QRhiGraphicsPipeline::Front:
+        return MTLCullModeFront;
+    case QRhiGraphicsPipeline::Back:
+        return MTLCullModeBack;
+    default:
+        Q_UNREACHABLE();
+        return MTLCullModeNone;
+    }
+}
+
+id<MTLLibrary> QRhiMetalData::createMetalLib(const QShader &shader, QShader::Variant shaderVariant,
+                                             QString *error, QByteArray *entryPoint)
+{
+    QShaderCode mtllib = shader.shader({ QShader::MetalLibShader, 12, shaderVariant });
+    if (!mtllib.shader().isEmpty()) {
+        dispatch_data_t data = dispatch_data_create(mtllib.shader().constData(),
+                                                    size_t(mtllib.shader().size()),
+                                                    dispatch_get_global_queue(0, 0),
+                                                    DISPATCH_DATA_DESTRUCTOR_DEFAULT);
+        NSError *err = nil;
+        id<MTLLibrary> lib = [dev newLibraryWithData: data error: &err];
+        dispatch_release(data);
+        if (!err) {
+            *entryPoint = mtllib.entryPoint();
+            return lib;
+        } else {
+            const QString msg = QString::fromNSString(err.localizedDescription);
+            qWarning("Failed to load metallib from baked shader: %s", qPrintable(msg));
+        }
+    }
+
+    QShaderCode mslSource = shader.shader({ QShader::MslShader, 12, shaderVariant });
+    if (mslSource.shader().isEmpty()) {
+        qWarning() << "No MSL 1.2 code found in baked shader" << shader;
+        return nil;
+    }
+
+    NSString *src = [NSString stringWithUTF8String: mslSource.shader().constData()];
+    MTLCompileOptions *opts = [[MTLCompileOptions alloc] init];
+    opts.languageVersion = MTLLanguageVersion1_2;
+    NSError *err = nil;
+    id<MTLLibrary> lib = [dev newLibraryWithSource: src options: opts error: &err];
+    [opts release];
+    // src is autoreleased
+
+    if (err) {
+        const QString msg = QString::fromNSString(err.localizedDescription);
+        *error = msg;
+        return nil;
+    }
+
+    *entryPoint = mslSource.entryPoint();
+    return lib;
+}
+
+id<MTLFunction> QRhiMetalData::createMSLShaderFunction(id<MTLLibrary> lib, const QByteArray &entryPoint)
+{
+    NSString *name = [NSString stringWithUTF8String: entryPoint.constData()];
+    id<MTLFunction> f = [lib newFunctionWithName: name];
+    [name release];
+    return f;
+}
+
+bool QMetalGraphicsPipeline::build()
+{
+    if (d->ps)
+        release();
+
+    QRHI_RES_RHI(QRhiMetal);
+    if (!rhiD->sanityCheckGraphicsPipeline(this))
+        return false;
+
+    // same binding space for vertex and constant buffers - work it around
+    const int firstVertexBinding = QRHI_RES(QMetalShaderResourceBindings, m_shaderResourceBindings)->maxBinding + 1;
+
+    MTLVertexDescriptor *inputLayout = [MTLVertexDescriptor vertexDescriptor];
+    for (auto it = m_vertexInputLayout.cbeginAttributes(), itEnd = m_vertexInputLayout.cendAttributes();
+         it != itEnd; ++it)
+    {
+        const uint loc = uint(it->location());
+        inputLayout.attributes[loc].format = toMetalAttributeFormat(it->format());
+        inputLayout.attributes[loc].offset = NSUInteger(it->offset());
+        inputLayout.attributes[loc].bufferIndex = NSUInteger(firstVertexBinding + it->binding());
+    }
+    int bindingIndex = 0;
+    for (auto it = m_vertexInputLayout.cbeginBindings(), itEnd = m_vertexInputLayout.cendBindings();
+         it != itEnd; ++it, ++bindingIndex)
+    {
+        const uint layoutIdx = uint(firstVertexBinding + bindingIndex);
+        inputLayout.layouts[layoutIdx].stepFunction =
+                it->classification() == QRhiVertexInputBinding::PerInstance
+                ? MTLVertexStepFunctionPerInstance : MTLVertexStepFunctionPerVertex;
+        inputLayout.layouts[layoutIdx].stepRate = NSUInteger(it->instanceStepRate());
+        inputLayout.layouts[layoutIdx].stride = it->stride();
+    }
+
+    MTLRenderPipelineDescriptor *rpDesc = [[MTLRenderPipelineDescriptor alloc] init];
+
+    rpDesc.vertexDescriptor = inputLayout;
+
+    // mutability cannot be determined (slotted buffers could be set as
+    // MTLMutabilityImmutable, but then we potentially need a different
+    // descriptor for each buffer combination as this depends on the actual
+    // buffers not just the resource binding layout) so leave it at the default
+
+    for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+        auto cacheIt = rhiD->d->shaderCache.constFind(shaderStage);
+        if (cacheIt != rhiD->d->shaderCache.constEnd()) {
+            switch (shaderStage.type()) {
+            case QRhiShaderStage::Vertex:
+                d->vs = *cacheIt;
+                [d->vs.lib retain];
+                [d->vs.func retain];
+                rpDesc.vertexFunction = d->vs.func;
+                break;
+            case QRhiShaderStage::Fragment:
+                d->fs = *cacheIt;
+                [d->fs.lib retain];
+                [d->fs.func retain];
+                rpDesc.fragmentFunction = d->fs.func;
+                break;
+            default:
+                break;
+            }
+        } else {
+            QString error;
+            QByteArray entryPoint;
+            id<MTLLibrary> lib = rhiD->d->createMetalLib(shaderStage.shader(), shaderStage.shaderVariant(), &error, &entryPoint);
+            if (!lib) {
+                qWarning("MSL shader compilation failed: %s", qPrintable(error));
+                return false;
+            }
+            id<MTLFunction> func = rhiD->d->createMSLShaderFunction(lib, entryPoint);
+            if (!func) {
+                qWarning("MSL function for entry point %s not found", entryPoint.constData());
+                [lib release];
+                return false;
+            }
+            if (rhiD->d->shaderCache.count() >= QRhiMetal::MAX_SHADER_CACHE_ENTRIES) {
+                // Use the simplest strategy: too many cached shaders -> drop them all.
+                for (QMetalShader &s : rhiD->d->shaderCache)
+                    s.release();
+                rhiD->d->shaderCache.clear();
+            }
+            switch (shaderStage.type()) {
+            case QRhiShaderStage::Vertex:
+                d->vs.lib = lib;
+                d->vs.func = func;
+                rhiD->d->shaderCache.insert(shaderStage, d->vs);
+                [d->vs.lib retain];
+                [d->vs.func retain];
+                rpDesc.vertexFunction = func;
+                break;
+            case QRhiShaderStage::Fragment:
+                d->fs.lib = lib;
+                d->fs.func = func;
+                rhiD->d->shaderCache.insert(shaderStage, d->fs);
+                [d->fs.lib retain];
+                [d->fs.func retain];
+                rpDesc.fragmentFunction = func;
+                break;
+            default:
+                [func release];
+                [lib release];
+                break;
+            }
+        }
+    }
+
+    QMetalRenderPassDescriptor *rpD = QRHI_RES(QMetalRenderPassDescriptor, m_renderPassDesc);
+
+    if (rpD->colorAttachmentCount) {
+        // defaults when no targetBlends are provided
+        rpDesc.colorAttachments[0].pixelFormat = MTLPixelFormat(rpD->colorFormat[0]);
+        rpDesc.colorAttachments[0].writeMask = MTLColorWriteMaskAll;
+        rpDesc.colorAttachments[0].blendingEnabled = false;
+
+        Q_ASSERT(m_targetBlends.count() == rpD->colorAttachmentCount
+                 || (m_targetBlends.isEmpty() && rpD->colorAttachmentCount == 1));
+
+        for (uint i = 0, ie = uint(m_targetBlends.count()); i != ie; ++i) {
+            const QRhiGraphicsPipeline::TargetBlend &b(m_targetBlends[int(i)]);
+            rpDesc.colorAttachments[i].pixelFormat = MTLPixelFormat(rpD->colorFormat[i]);
+            rpDesc.colorAttachments[i].blendingEnabled = b.enable;
+            rpDesc.colorAttachments[i].sourceRGBBlendFactor = toMetalBlendFactor(b.srcColor);
+            rpDesc.colorAttachments[i].destinationRGBBlendFactor = toMetalBlendFactor(b.dstColor);
+            rpDesc.colorAttachments[i].rgbBlendOperation = toMetalBlendOp(b.opColor);
+            rpDesc.colorAttachments[i].sourceAlphaBlendFactor = toMetalBlendFactor(b.srcAlpha);
+            rpDesc.colorAttachments[i].destinationAlphaBlendFactor = toMetalBlendFactor(b.dstAlpha);
+            rpDesc.colorAttachments[i].alphaBlendOperation = toMetalBlendOp(b.opAlpha);
+            rpDesc.colorAttachments[i].writeMask = toMetalColorWriteMask(b.colorWrite);
+        }
+    }
+
+    if (rpD->hasDepthStencil) {
+        // Must only be set when a depth-stencil buffer will actually be bound,
+        // validation blows up otherwise.
+        MTLPixelFormat fmt = MTLPixelFormat(rpD->dsFormat);
+        rpDesc.depthAttachmentPixelFormat = fmt;
+        if (fmt != MTLPixelFormatDepth16Unorm && fmt != MTLPixelFormatDepth32Float)
+            rpDesc.stencilAttachmentPixelFormat = fmt;
+    }
+
+    rpDesc.sampleCount = NSUInteger(rhiD->effectiveSampleCount(m_sampleCount));
+
+    NSError *err = nil;
+    d->ps = [rhiD->d->dev newRenderPipelineStateWithDescriptor: rpDesc error: &err];
+    if (!d->ps) {
+        const QString msg = QString::fromNSString(err.localizedDescription);
+        qWarning("Failed to create render pipeline state: %s", qPrintable(msg));
+        [rpDesc release];
+        return false;
+    }
+    [rpDesc release];
+
+    MTLDepthStencilDescriptor *dsDesc = [[MTLDepthStencilDescriptor alloc] init];
+    dsDesc.depthCompareFunction = m_depthTest ? toMetalCompareOp(m_depthOp) : MTLCompareFunctionAlways;
+    dsDesc.depthWriteEnabled = m_depthWrite;
+    if (m_stencilTest) {
+        dsDesc.frontFaceStencil = [[MTLStencilDescriptor alloc] init];
+        dsDesc.frontFaceStencil.stencilFailureOperation = toMetalStencilOp(m_stencilFront.failOp);
+        dsDesc.frontFaceStencil.depthFailureOperation = toMetalStencilOp(m_stencilFront.depthFailOp);
+        dsDesc.frontFaceStencil.depthStencilPassOperation = toMetalStencilOp(m_stencilFront.passOp);
+        dsDesc.frontFaceStencil.stencilCompareFunction = toMetalCompareOp(m_stencilFront.compareOp);
+        dsDesc.frontFaceStencil.readMask = m_stencilReadMask;
+        dsDesc.frontFaceStencil.writeMask = m_stencilWriteMask;
+
+        dsDesc.backFaceStencil = [[MTLStencilDescriptor alloc] init];
+        dsDesc.backFaceStencil.stencilFailureOperation = toMetalStencilOp(m_stencilBack.failOp);
+        dsDesc.backFaceStencil.depthFailureOperation = toMetalStencilOp(m_stencilBack.depthFailOp);
+        dsDesc.backFaceStencil.depthStencilPassOperation = toMetalStencilOp(m_stencilBack.passOp);
+        dsDesc.backFaceStencil.stencilCompareFunction = toMetalCompareOp(m_stencilBack.compareOp);
+        dsDesc.backFaceStencil.readMask = m_stencilReadMask;
+        dsDesc.backFaceStencil.writeMask = m_stencilWriteMask;
+    }
+
+    d->ds = [rhiD->d->dev newDepthStencilStateWithDescriptor: dsDesc];
+    [dsDesc release];
+
+    d->primitiveType = toMetalPrimitiveType(m_topology);
+    d->winding = m_frontFace == CCW ? MTLWindingCounterClockwise : MTLWindingClockwise;
+    d->cullMode = toMetalCullMode(m_cullMode);
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QMetalComputePipeline::QMetalComputePipeline(QRhiImplementation *rhi)
+    : QRhiComputePipeline(rhi),
+      d(new QMetalComputePipelineData)
+{
+}
+
+QMetalComputePipeline::~QMetalComputePipeline()
+{
+    release();
+    delete d;
+}
+
+void QMetalComputePipeline::release()
+{
+    QRHI_RES_RHI(QRhiMetal);
+
+    d->cs.release();
+
+    if (!d->ps)
+        return;
+
+    [d->ps release];
+    d->ps = nil;
+
+    rhiD->unregisterResource(this);
+}
+
+bool QMetalComputePipeline::build()
+{
+    if (d->ps)
+        release();
+
+    QRHI_RES_RHI(QRhiMetal);
+
+    auto cacheIt = rhiD->d->shaderCache.constFind(m_shaderStage);
+    if (cacheIt != rhiD->d->shaderCache.constEnd()) {
+        d->cs = *cacheIt;
+    } else {
+        const QShader shader = m_shaderStage.shader();
+        QString error;
+        QByteArray entryPoint;
+        id<MTLLibrary> lib = rhiD->d->createMetalLib(shader, m_shaderStage.shaderVariant(),
+                                                     &error, &entryPoint);
+        if (!lib) {
+            qWarning("MSL shader compilation failed: %s", qPrintable(error));
+            return false;
+        }
+        id<MTLFunction> func = rhiD->d->createMSLShaderFunction(lib, entryPoint);
+        if (!func) {
+            qWarning("MSL function for entry point %s not found", entryPoint.constData());
+            [lib release];
+            return false;
+        }
+        d->cs.lib = lib;
+        d->cs.func = func;
+        d->cs.localSize = shader.description().computeShaderLocalSize();
+
+        if (rhiD->d->shaderCache.count() >= QRhiMetal::MAX_SHADER_CACHE_ENTRIES) {
+            for (QMetalShader &s : rhiD->d->shaderCache)
+                s.release();
+            rhiD->d->shaderCache.clear();
+        }
+        rhiD->d->shaderCache.insert(m_shaderStage, d->cs);
+    }
+
+    [d->cs.lib retain];
+    [d->cs.func retain];
+
+    d->localSize = MTLSizeMake(d->cs.localSize[0], d->cs.localSize[1], d->cs.localSize[2]);
+
+    NSError *err = nil;
+    d->ps = [rhiD->d->dev newComputePipelineStateWithFunction: d->cs.func error: &err];
+    if (!d->ps) {
+        const QString msg = QString::fromNSString(err.localizedDescription);
+        qWarning("Failed to create render pipeline state: %s", qPrintable(msg));
+        return false;
+    }
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QMetalCommandBuffer::QMetalCommandBuffer(QRhiImplementation *rhi)
+    : QRhiCommandBuffer(rhi),
+      d(new QMetalCommandBufferData)
+{
+    resetState();
+}
+
+QMetalCommandBuffer::~QMetalCommandBuffer()
+{
+    release();
+    delete d;
+}
+
+void QMetalCommandBuffer::release()
+{
+    // nothing to do here, we do not own the MTL cb object
+}
+
+const QRhiNativeHandles *QMetalCommandBuffer::nativeHandles()
+{
+    nativeHandlesStruct.commandBuffer = d->cb;
+    nativeHandlesStruct.encoder = d->currentRenderPassEncoder;
+    return &nativeHandlesStruct;
+}
+
+void QMetalCommandBuffer::resetState()
+{
+    d->currentRenderPassEncoder = nil;
+    d->currentComputePassEncoder = nil;
+    d->currentPassRpDesc = nil;
+    resetPerPassState();
+}
+
+void QMetalCommandBuffer::resetPerPassState()
+{
+    recordingPass = NoPass;
+    currentTarget = nullptr;
+    resetPerPassCachedState();
+}
+
+void QMetalCommandBuffer::resetPerPassCachedState()
+{
+    currentGraphicsPipeline = nullptr;
+    currentComputePipeline = nullptr;
+    currentPipelineGeneration = 0;
+    currentGraphicsSrb = nullptr;
+    currentComputeSrb = nullptr;
+    currentSrbGeneration = 0;
+    currentResSlot = -1;
+    currentIndexBuffer = nullptr;
+    currentIndexOffset = 0;
+    currentIndexFormat = QRhiCommandBuffer::IndexUInt16;
+    currentCullMode = -1;
+    currentFrontFaceWinding = -1;
+
+    d->currentFirstVertexBinding = -1;
+    d->currentVertexInputsBuffers.clear();
+    d->currentVertexInputOffsets.clear();
+}
+
+QMetalSwapChain::QMetalSwapChain(QRhiImplementation *rhi)
+    : QRhiSwapChain(rhi),
+      rtWrapper(rhi),
+      cbWrapper(rhi),
+      d(new QMetalSwapChainData)
+{
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+        d->sem[i] = nullptr;
+        d->msaaTex[i] = nil;
+    }
+}
+
+QMetalSwapChain::~QMetalSwapChain()
+{
+    release();
+    delete d;
+}
+
+void QMetalSwapChain::release()
+{
+    if (!d->layer)
+        return;
+
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+        if (d->sem[i]) {
+            // the semaphores cannot be released if they do not have the initial value
+            dispatch_semaphore_wait(d->sem[i], DISPATCH_TIME_FOREVER);
+            dispatch_semaphore_signal(d->sem[i]);
+
+            dispatch_release(d->sem[i]);
+            d->sem[i] = nullptr;
+        }
+    }
+
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+        [d->msaaTex[i] release];
+        d->msaaTex[i] = nil;
+    }
+
+    d->layer = nullptr;
+
+    QRHI_RES_RHI(QRhiMetal);
+    rhiD->swapchains.remove(this);
+
+    QRHI_PROF;
+    QRHI_PROF_F(releaseSwapChain(this));
+
+    rhiD->unregisterResource(this);
+}
+
+QRhiCommandBuffer *QMetalSwapChain::currentFrameCommandBuffer()
+{
+    return &cbWrapper;
+}
+
+QRhiRenderTarget *QMetalSwapChain::currentFrameRenderTarget()
+{
+    return &rtWrapper;
+}
+
+QSize QMetalSwapChain::surfacePixelSize()
+{
+    Q_ASSERT(m_window);
+    return m_window->size() * m_window->devicePixelRatio();
+}
+
+QRhiRenderPassDescriptor *QMetalSwapChain::newCompatibleRenderPassDescriptor()
+{
+    chooseFormats(); // ensure colorFormat and similar are filled out
+
+    QRHI_RES_RHI(QRhiMetal);
+    QMetalRenderPassDescriptor *rpD = new QMetalRenderPassDescriptor(m_rhi);
+    rpD->colorAttachmentCount = 1;
+    rpD->hasDepthStencil = m_depthStencil != nullptr;
+
+    rpD->colorFormat[0] = int(d->colorFormat);
+
+    // m_depthStencil may not be built yet so cannot rely on computed fields in it
+    rpD->dsFormat = rhiD->d->dev.depth24Stencil8PixelFormatSupported
+            ? MTLPixelFormatDepth24Unorm_Stencil8 : MTLPixelFormatDepth32Float_Stencil8;
+
+    return rpD;
+}
+
+void QMetalSwapChain::chooseFormats()
+{
+    QRHI_RES_RHI(QRhiMetal);
+    samples = rhiD->effectiveSampleCount(m_sampleCount);
+    // pick a format that is allowed for CAMetalLayer.pixelFormat
+    d->colorFormat = m_flags.testFlag(sRGB) ? MTLPixelFormatBGRA8Unorm_sRGB : MTLPixelFormatBGRA8Unorm;
+    d->rhiColorFormat = QRhiTexture::BGRA8;
+}
+
+bool QMetalSwapChain::buildOrResize()
+{
+    Q_ASSERT(m_window);
+
+    const bool needsRegistration = !window || window != m_window;
+
+    if (window && window != m_window)
+        release();
+    // else no release(), this is intentional
+
+    QRHI_RES_RHI(QRhiMetal);
+    if (needsRegistration)
+        rhiD->swapchains.insert(this);
+
+    window = m_window;
+
+    if (window->surfaceType() != QSurface::MetalSurface) {
+        qWarning("QMetalSwapChain only supports MetalSurface windows");
+        return false;
+    }
+
+    NSView *view = reinterpret_cast<NSView *>(window->winId());
+    Q_ASSERT(view);
+    d->layer = static_cast<CAMetalLayer *>(view.layer);
+    Q_ASSERT(d->layer);
+
+    chooseFormats();
+    if (d->colorFormat != d->layer.pixelFormat)
+        d->layer.pixelFormat = d->colorFormat;
+
+    if (m_flags.testFlag(UsedAsTransferSource))
+        d->layer.framebufferOnly = NO;
+
+#ifdef Q_OS_MACOS
+    if (m_flags.testFlag(NoVSync)) {
+        if (@available(macOS 10.13, *))
+            d->layer.displaySyncEnabled = NO;
+    }
+#endif
+
+    if (m_flags.testFlag(SurfaceHasPreMulAlpha)) {
+        d->layer.opaque = NO;
+    } else if (m_flags.testFlag(SurfaceHasNonPreMulAlpha)) {
+        // The CoreAnimation compositor is said to expect premultiplied alpha,
+        // so this is then wrong when it comes to the blending operations but
+        // there's nothing we can do. Fortunately Qt Quick always outputs
+        // premultiplied alpha so it is not a problem there.
+        d->layer.opaque = NO;
+    } else {
+        d->layer.opaque = YES;
+    }
+
+    // Now set the layer's drawableSize which will stay set to the same value
+    // until the next buildOrResize(), thus ensuring atomicity with regards to
+    // the drawable size in frames.
+    CGSize layerSize = d->layer.bounds.size;
+    layerSize.width *= d->layer.contentsScale;
+    layerSize.height *= d->layer.contentsScale;
+    d->layer.drawableSize = layerSize;
+
+    m_currentPixelSize = QSizeF::fromCGSize(layerSize).toSize();
+    pixelSize = m_currentPixelSize;
+
+    [d->layer setDevice: rhiD->d->dev];
+
+    d->curDrawable = nil;
+
+    for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+        if (!d->sem[i])
+            d->sem[i] = dispatch_semaphore_create(QMTL_FRAMES_IN_FLIGHT - 1);
+    }
+
+    currentFrameSlot = 0;
+    frameCount = 0;
+
+    ds = m_depthStencil ? QRHI_RES(QMetalRenderBuffer, m_depthStencil) : nullptr;
+    if (m_depthStencil && m_depthStencil->sampleCount() != m_sampleCount) {
+        qWarning("Depth-stencil buffer's sampleCount (%d) does not match color buffers' sample count (%d). Expect problems.",
+                 m_depthStencil->sampleCount(), m_sampleCount);
+    }
+    if (m_depthStencil && m_depthStencil->pixelSize() != pixelSize) {
+        if (m_depthStencil->flags().testFlag(QRhiRenderBuffer::UsedWithSwapChainOnly)) {
+            m_depthStencil->setPixelSize(pixelSize);
+            if (!m_depthStencil->build())
+                qWarning("Failed to rebuild swapchain's associated depth-stencil buffer for size %dx%d",
+                         pixelSize.width(), pixelSize.height());
+        } else {
+            qWarning("Depth-stencil buffer's size (%dx%d) does not match the layer size (%dx%d). Expect problems.",
+                     m_depthStencil->pixelSize().width(), m_depthStencil->pixelSize().height(),
+                     pixelSize.width(), pixelSize.height());
+        }
+    }
+
+    rtWrapper.d->pixelSize = pixelSize;
+    rtWrapper.d->dpr = float(window->devicePixelRatio());
+    rtWrapper.d->sampleCount = samples;
+    rtWrapper.d->colorAttCount = 1;
+    rtWrapper.d->dsAttCount = ds ? 1 : 0;
+
+    qCDebug(QRHI_LOG_INFO, "got CAMetalLayer, size %dx%d", pixelSize.width(), pixelSize.height());
+
+    if (samples > 1) {
+        MTLTextureDescriptor *desc = [[MTLTextureDescriptor alloc] init];
+        desc.textureType = MTLTextureType2DMultisample;
+        desc.pixelFormat = d->colorFormat;
+        desc.width = NSUInteger(pixelSize.width());
+        desc.height = NSUInteger(pixelSize.height());
+        desc.sampleCount = NSUInteger(samples);
+        desc.resourceOptions = MTLResourceStorageModePrivate;
+        desc.storageMode = MTLStorageModePrivate;
+        desc.usage = MTLTextureUsageRenderTarget;
+        for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
+            [d->msaaTex[i] release];
+            d->msaaTex[i] = [rhiD->d->dev newTextureWithDescriptor: desc];
+        }
+        [desc release];
+    }
+
+    QRHI_PROF;
+    QRHI_PROF_F(resizeSwapChain(this, QMTL_FRAMES_IN_FLIGHT, samples > 1 ? QMTL_FRAMES_IN_FLIGHT : 0, samples));
+
+    if (needsRegistration)
+        rhiD->registerResource(this);
+
+    return true;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qrhimetal_p.h b/src/gui/rhi/qrhimetal_p.h
new file mode 100644
index 0000000000..094801c58c
--- /dev/null
+++ b/src/gui/rhi/qrhimetal_p.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIMETAL_H
+#define QRHIMETAL_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qrhi_p.h>
+
+// no Metal includes here, the user code may be plain C++
+
+QT_BEGIN_NAMESPACE
+
+struct Q_GUI_EXPORT QRhiMetalInitParams : public QRhiInitParams
+{
+};
+
+struct Q_GUI_EXPORT QRhiMetalNativeHandles : public QRhiNativeHandles
+{
+    void *dev = nullptr; // id<MTLDevice>
+    void *cmdQueue = nullptr; // id<MTLCommandQueue>
+};
+
+struct Q_GUI_EXPORT QRhiMetalTextureNativeHandles : public QRhiNativeHandles
+{
+    void *texture = nullptr; // id<MTLTexture>
+};
+
+struct Q_GUI_EXPORT QRhiMetalCommandBufferNativeHandles : public QRhiNativeHandles
+{
+    void *commandBuffer = nullptr; // id<MTLCommandBuffer>
+    void *encoder = nullptr; // id<MTLRenderCommandEncoder>
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhimetal_p_p.h b/src/gui/rhi/qrhimetal_p_p.h
new file mode 100644
index 0000000000..688fec8147
--- /dev/null
+++ b/src/gui/rhi/qrhimetal_p_p.h
@@ -0,0 +1,457 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIMETAL_P_H
+#define QRHIMETAL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrhimetal_p.h"
+#include "qrhi_p_p.h"
+#include <QWindow>
+
+QT_BEGIN_NAMESPACE
+
+static const int QMTL_FRAMES_IN_FLIGHT = 2;
+
+// have to hide the ObjC stuff, this header cannot contain MTL* at all
+struct QMetalBufferData;
+
+struct QMetalBuffer : public QRhiBuffer
+{
+    QMetalBuffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size);
+    ~QMetalBuffer();
+    void release() override;
+    bool build() override;
+
+    QMetalBufferData *d;
+    uint generation = 0;
+    int lastActiveFrameSlot = -1;
+    friend class QRhiMetal;
+    friend struct QMetalShaderResourceBindings;
+};
+
+struct QMetalRenderBufferData;
+
+struct QMetalRenderBuffer : public QRhiRenderBuffer
+{
+    QMetalRenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                       int sampleCount, QRhiRenderBuffer::Flags flags);
+    ~QMetalRenderBuffer();
+    void release() override;
+    bool build() override;
+    QRhiTexture::Format backingFormat() const override;
+
+    QMetalRenderBufferData *d;
+    int samples = 1;
+    uint generation = 0;
+    int lastActiveFrameSlot = -1;
+    friend class QRhiMetal;
+};
+
+struct QMetalTextureData;
+
+struct QMetalTexture : public QRhiTexture
+{
+    QMetalTexture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                  int sampleCount, Flags flags);
+    ~QMetalTexture();
+    void release() override;
+    bool build() override;
+    bool buildFrom(const QRhiNativeHandles *src) override;
+    const QRhiNativeHandles *nativeHandles() override;
+
+    bool prepareBuild(QSize *adjustedSize = nullptr);
+
+    QMetalTextureData *d;
+    QRhiMetalTextureNativeHandles nativeHandlesStruct;
+    int mipLevelCount = 0;
+    int samples = 1;
+    uint generation = 0;
+    int lastActiveFrameSlot = -1;
+    friend class QRhiMetal;
+    friend struct QMetalShaderResourceBindings;
+    friend struct QMetalTextureData;
+};
+
+struct QMetalSamplerData;
+
+struct QMetalSampler : public QRhiSampler
+{
+    QMetalSampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                  AddressMode u, AddressMode v);
+    ~QMetalSampler();
+    void release() override;
+    bool build() override;
+
+    QMetalSamplerData *d;
+    uint generation = 0;
+    int lastActiveFrameSlot = -1;
+    friend class QRhiMetal;
+    friend struct QMetalShaderResourceBindings;
+};
+
+struct QMetalRenderPassDescriptor : public QRhiRenderPassDescriptor
+{
+    QMetalRenderPassDescriptor(QRhiImplementation *rhi);
+    ~QMetalRenderPassDescriptor();
+    void release() override;
+
+    // there is no MTLRenderPassDescriptor here as one will be created for each pass in beginPass()
+
+    // but the things needed for the render pipeline descriptor have to be provided
+    static const int MAX_COLOR_ATTACHMENTS = 8;
+    int colorAttachmentCount = 0;
+    bool hasDepthStencil = false;
+    int colorFormat[MAX_COLOR_ATTACHMENTS];
+    int dsFormat;
+};
+
+struct QMetalRenderTargetData;
+
+struct QMetalReferenceRenderTarget : public QRhiRenderTarget
+{
+    QMetalReferenceRenderTarget(QRhiImplementation *rhi);
+    ~QMetalReferenceRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QMetalRenderTargetData *d;
+};
+
+struct QMetalTextureRenderTarget : public QRhiTextureRenderTarget
+{
+    QMetalTextureRenderTarget(QRhiImplementation *rhi, const QRhiTextureRenderTargetDescription &desc, Flags flags);
+    ~QMetalTextureRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool build() override;
+
+    QMetalRenderTargetData *d;
+    friend class QRhiMetal;
+};
+
+struct QMetalShaderResourceBindings : public QRhiShaderResourceBindings
+{
+    QMetalShaderResourceBindings(QRhiImplementation *rhi);
+    ~QMetalShaderResourceBindings();
+    void release() override;
+    bool build() override;
+
+    QVarLengthArray<QRhiShaderResourceBinding, 8> sortedBindings;
+    int maxBinding = -1;
+
+    struct BoundUniformBufferData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundSampledTextureData {
+        quint64 texId;
+        uint texGeneration;
+        quint64 samplerId;
+        uint samplerGeneration;
+    };
+    struct BoundStorageImageData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundStorageBufferData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundResourceData {
+        union {
+            BoundUniformBufferData ubuf;
+            BoundSampledTextureData stex;
+            BoundStorageImageData simage;
+            BoundStorageBufferData sbuf;
+        };
+    };
+    QVarLengthArray<BoundResourceData, 8> boundResourceData;
+
+    uint generation = 0;
+    friend class QRhiMetal;
+};
+
+struct QMetalGraphicsPipelineData;
+
+struct QMetalGraphicsPipeline : public QRhiGraphicsPipeline
+{
+    QMetalGraphicsPipeline(QRhiImplementation *rhi);
+    ~QMetalGraphicsPipeline();
+    void release() override;
+    bool build() override;
+
+    QMetalGraphicsPipelineData *d;
+    uint generation = 0;
+    int lastActiveFrameSlot = -1;
+    friend class QRhiMetal;
+};
+
+struct QMetalComputePipelineData;
+
+struct QMetalComputePipeline : public QRhiComputePipeline
+{
+    QMetalComputePipeline(QRhiImplementation *rhi);
+    ~QMetalComputePipeline();
+    void release() override;
+    bool build() override;
+
+    QMetalComputePipelineData *d;
+    uint generation = 0;
+    int lastActiveFrameSlot = -1;
+    friend class QRhiMetal;
+};
+
+struct QMetalCommandBufferData;
+struct QMetalSwapChain;
+
+struct QMetalCommandBuffer : public QRhiCommandBuffer
+{
+    QMetalCommandBuffer(QRhiImplementation *rhi);
+    ~QMetalCommandBuffer();
+    void release() override;
+
+    QMetalCommandBufferData *d = nullptr;
+    QRhiMetalCommandBufferNativeHandles nativeHandlesStruct;
+
+    enum PassType {
+        NoPass,
+        RenderPass,
+        ComputePass
+    };
+
+    // per-pass (render or compute command encoder) persistent state
+    PassType recordingPass;
+    QRhiRenderTarget *currentTarget;
+
+    // per-pass (render or compute command encoder) volatile (cached) state
+    QRhiGraphicsPipeline *currentGraphicsPipeline;
+    QRhiComputePipeline *currentComputePipeline;
+    uint currentPipelineGeneration;
+    QRhiShaderResourceBindings *currentGraphicsSrb;
+    QRhiShaderResourceBindings *currentComputeSrb;
+    uint currentSrbGeneration;
+    int currentResSlot;
+    QRhiBuffer *currentIndexBuffer;
+    quint32 currentIndexOffset;
+    QRhiCommandBuffer::IndexFormat currentIndexFormat;
+    int currentCullMode;
+    int currentFrontFaceWinding;
+
+    const QRhiNativeHandles *nativeHandles();
+    void resetState();
+    void resetPerPassState();
+    void resetPerPassCachedState();
+};
+
+struct QMetalSwapChainData;
+
+struct QMetalSwapChain : public QRhiSwapChain
+{
+    QMetalSwapChain(QRhiImplementation *rhi);
+    ~QMetalSwapChain();
+    void release() override;
+
+    QRhiCommandBuffer *currentFrameCommandBuffer() override;
+    QRhiRenderTarget *currentFrameRenderTarget() override;
+    QSize surfacePixelSize() override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+
+    bool buildOrResize() override;
+
+    void chooseFormats();
+
+    QWindow *window = nullptr;
+    QSize pixelSize;
+    int currentFrameSlot = 0; // 0..QMTL_FRAMES_IN_FLIGHT-1
+    int frameCount = 0;
+    int samples = 1;
+    QMetalReferenceRenderTarget rtWrapper;
+    QMetalCommandBuffer cbWrapper;
+    QMetalRenderBuffer *ds = nullptr;
+    QMetalSwapChainData *d = nullptr;
+};
+
+struct QRhiMetalData;
+
+class QRhiMetal : public QRhiImplementation
+{
+public:
+    QRhiMetal(QRhiMetalInitParams *params, QRhiMetalNativeHandles *importDevice = nullptr);
+    ~QRhiMetal();
+
+    bool create(QRhi::Flags flags) override;
+    void destroy() override;
+
+    QRhiGraphicsPipeline *createGraphicsPipeline() override;
+    QRhiComputePipeline *createComputePipeline() override;
+    QRhiShaderResourceBindings *createShaderResourceBindings() override;
+    QRhiBuffer *createBuffer(QRhiBuffer::Type type,
+                             QRhiBuffer::UsageFlags usage,
+                             int size) override;
+    QRhiRenderBuffer *createRenderBuffer(QRhiRenderBuffer::Type type,
+                                         const QSize &pixelSize,
+                                         int sampleCount,
+                                         QRhiRenderBuffer::Flags flags) override;
+    QRhiTexture *createTexture(QRhiTexture::Format format,
+                               const QSize &pixelSize,
+                               int sampleCount,
+                               QRhiTexture::Flags flags) override;
+    QRhiSampler *createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                               QRhiSampler::Filter mipmapMode,
+                               QRhiSampler:: AddressMode u, QRhiSampler::AddressMode v) override;
+
+    QRhiTextureRenderTarget *createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                       QRhiTextureRenderTarget::Flags flags) override;
+
+    QRhiSwapChain *createSwapChain() override;
+    QRhi::FrameOpResult beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endOffscreenFrame(QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult finish() override;
+
+    void resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void beginPass(QRhiCommandBuffer *cb,
+                   QRhiRenderTarget *rt,
+                   const QColor &colorClearValue,
+                   const QRhiDepthStencilClearValue &depthStencilClearValue,
+                   QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void setGraphicsPipeline(QRhiCommandBuffer *cb,
+                             QRhiGraphicsPipeline *ps) override;
+
+    void setShaderResources(QRhiCommandBuffer *cb,
+                            QRhiShaderResourceBindings *srb,
+                            int dynamicOffsetCount,
+                            const QRhiCommandBuffer::DynamicOffset *dynamicOffsets) override;
+
+    void setVertexInput(QRhiCommandBuffer *cb,
+                        int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                        QRhiBuffer *indexBuf, quint32 indexOffset,
+                        QRhiCommandBuffer::IndexFormat indexFormat) override;
+
+    void setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport) override;
+    void setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor) override;
+    void setBlendConstants(QRhiCommandBuffer *cb, const QColor &c) override;
+    void setStencilRef(QRhiCommandBuffer *cb, quint32 refValue) override;
+
+    void draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+              quint32 instanceCount, quint32 firstVertex, quint32 firstInstance) override;
+
+    void drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                     quint32 instanceCount, quint32 firstIndex,
+                     qint32 vertexOffset, quint32 firstInstance) override;
+
+    void debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name) override;
+    void debugMarkEnd(QRhiCommandBuffer *cb) override;
+    void debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg) override;
+
+    void beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps) override;
+    void dispatch(QRhiCommandBuffer *cb, int x, int y, int z) override;
+
+    const QRhiNativeHandles *nativeHandles(QRhiCommandBuffer *cb) override;
+    void beginExternal(QRhiCommandBuffer *cb) override;
+    void endExternal(QRhiCommandBuffer *cb) override;
+
+    QVector<int> supportedSampleCounts() const override;
+    int ubufAlignment() const override;
+    bool isYUpInFramebuffer() const override;
+    bool isYUpInNDC() const override;
+    bool isClipDepthZeroToOne() const override;
+    QMatrix4x4 clipSpaceCorrMatrix() const override;
+    bool isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const override;
+    bool isFeatureSupported(QRhi::Feature feature) const override;
+    int resourceLimit(QRhi::ResourceLimit limit) const override;
+    const QRhiNativeHandles *nativeHandles() override;
+    void sendVMemStatsToProfiler() override;
+    bool makeThreadLocalNativeContextCurrent() override;
+    void releaseCachedResources() override;
+    bool isDeviceLost() const override;
+
+    void executeDeferredReleases(bool forced = false);
+    void finishActiveReadbacks(bool forced = false);
+    qsizetype subresUploadByteSize(const QRhiTextureSubresourceUploadDescription &subresDesc) const;
+    void enqueueSubresUpload(QMetalTexture *texD, void *mp, void *blitEncPtr,
+                             int layer, int level, const QRhiTextureSubresourceUploadDescription &subresDesc,
+                             qsizetype *curOfs);
+    void enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates);
+    void executeBufferHostWritesForCurrentFrame(QMetalBuffer *bufD);
+    void enqueueShaderResourceBindings(QMetalShaderResourceBindings *srbD, QMetalCommandBuffer *cbD,
+                                       int dynamicOffsetCount,
+                                       const QRhiCommandBuffer::DynamicOffset *dynamicOffsets,
+                                       bool offsetOnlyChange);
+    int effectiveSampleCount(int sampleCount) const;
+
+    bool importedDevice = false;
+    bool importedCmdQueue = false;
+    QMetalSwapChain *currentSwapChain = nullptr;
+    QSet<QMetalSwapChain *> swapchains;
+    QRhiMetalNativeHandles nativeHandlesStruct;
+
+    struct {
+        int maxTextureSize = 4096;
+    } caps;
+
+    QRhiMetalData *d = nullptr;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhinull.cpp b/src/gui/rhi/qrhinull.cpp
new file mode 100644
index 0000000000..fe606f971f
--- /dev/null
+++ b/src/gui/rhi/qrhinull.cpp
@@ -0,0 +1,900 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qrhinull_p_p.h"
+#include <qmath.h>
+#include <QPainter>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QRhiNullInitParams
+    \internal
+    \inmodule QtGui
+    \brief Null backend specific initialization parameters.
+
+    A Null QRhi needs no special parameters for initialization.
+
+    \badcode
+        QRhiNullInitParams params;
+        rhi = QRhi::create(QRhi::Null, &params);
+    \endcode
+
+    The Null backend does not issue any graphics calls and creates no
+    resources. All QRhi operations will succeed as normal so applications can
+    still be run, albeit potentially at an unthrottled speed, depending on
+    their frame rendering strategy. The backend reports resources to
+    QRhiProfiler as usual.
+ */
+
+/*!
+    \class QRhiNullNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Empty.
+ */
+
+/*!
+    \class QRhiNullTextureNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Empty.
+ */
+
+QRhiNull::QRhiNull(QRhiNullInitParams *params)
+    : offscreenCommandBuffer(this)
+{
+    Q_UNUSED(params);
+}
+
+bool QRhiNull::create(QRhi::Flags flags)
+{
+    Q_UNUSED(flags);
+    return true;
+}
+
+void QRhiNull::destroy()
+{
+}
+
+QVector<int> QRhiNull::supportedSampleCounts() const
+{
+    return { 1 };
+}
+
+QRhiSwapChain *QRhiNull::createSwapChain()
+{
+    return new QNullSwapChain(this);
+}
+
+QRhiBuffer *QRhiNull::createBuffer(QRhiBuffer::Type type, QRhiBuffer::UsageFlags usage, int size)
+{
+    return new QNullBuffer(this, type, usage, size);
+}
+
+int QRhiNull::ubufAlignment() const
+{
+    return 256;
+}
+
+bool QRhiNull::isYUpInFramebuffer() const
+{
+    return false;
+}
+
+bool QRhiNull::isYUpInNDC() const
+{
+    return true;
+}
+
+bool QRhiNull::isClipDepthZeroToOne() const
+{
+    return true;
+}
+
+QMatrix4x4 QRhiNull::clipSpaceCorrMatrix() const
+{
+    return QMatrix4x4(); // identity
+}
+
+bool QRhiNull::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const
+{
+    Q_UNUSED(format);
+    Q_UNUSED(flags);
+    return true;
+}
+
+bool QRhiNull::isFeatureSupported(QRhi::Feature feature) const
+{
+    Q_UNUSED(feature);
+    return true;
+}
+
+int QRhiNull::resourceLimit(QRhi::ResourceLimit limit) const
+{
+    switch (limit) {
+    case QRhi::TextureSizeMin:
+        return 1;
+    case QRhi::TextureSizeMax:
+        return 16384;
+    case QRhi::MaxColorAttachments:
+        return 8;
+    case QRhi::FramesInFlight:
+        return 2; // dummy
+    default:
+        Q_UNREACHABLE();
+        return 0;
+    }
+}
+
+const QRhiNativeHandles *QRhiNull::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+void QRhiNull::sendVMemStatsToProfiler()
+{
+    // nothing to do here
+}
+
+bool QRhiNull::makeThreadLocalNativeContextCurrent()
+{
+    // not applicable
+    return false;
+}
+
+void QRhiNull::releaseCachedResources()
+{
+    // nothing to do here
+}
+
+bool QRhiNull::isDeviceLost() const
+{
+    return false;
+}
+
+QRhiRenderBuffer *QRhiNull::createRenderBuffer(QRhiRenderBuffer::Type type, const QSize &pixelSize,
+                                               int sampleCount, QRhiRenderBuffer::Flags flags)
+{
+    return new QNullRenderBuffer(this, type, pixelSize, sampleCount, flags);
+}
+
+QRhiTexture *QRhiNull::createTexture(QRhiTexture::Format format, const QSize &pixelSize,
+                                     int sampleCount, QRhiTexture::Flags flags)
+{
+    return new QNullTexture(this, format, pixelSize, sampleCount, flags);
+}
+
+QRhiSampler *QRhiNull::createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                                     QRhiSampler::Filter mipmapMode,
+                                     QRhiSampler::AddressMode u, QRhiSampler::AddressMode v)
+{
+    return new QNullSampler(this, magFilter, minFilter, mipmapMode, u, v);
+}
+
+QRhiTextureRenderTarget *QRhiNull::createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                             QRhiTextureRenderTarget::Flags flags)
+{
+    return new QNullTextureRenderTarget(this, desc, flags);
+}
+
+QRhiGraphicsPipeline *QRhiNull::createGraphicsPipeline()
+{
+    return new QNullGraphicsPipeline(this);
+}
+
+QRhiComputePipeline *QRhiNull::createComputePipeline()
+{
+    return new QNullComputePipeline(this);
+}
+
+QRhiShaderResourceBindings *QRhiNull::createShaderResourceBindings()
+{
+    return new QNullShaderResourceBindings(this);
+}
+
+void QRhiNull::setGraphicsPipeline(QRhiCommandBuffer *cb, QRhiGraphicsPipeline *ps)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(ps);
+}
+
+void QRhiNull::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBindings *srb,
+                                  int dynamicOffsetCount,
+                                  const QRhiCommandBuffer::DynamicOffset *dynamicOffsets)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(srb);
+    Q_UNUSED(dynamicOffsetCount);
+    Q_UNUSED(dynamicOffsets);
+}
+
+void QRhiNull::setVertexInput(QRhiCommandBuffer *cb,
+                              int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                              QRhiBuffer *indexBuf, quint32 indexOffset, QRhiCommandBuffer::IndexFormat indexFormat)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(startBinding);
+    Q_UNUSED(bindingCount);
+    Q_UNUSED(bindings);
+    Q_UNUSED(indexBuf);
+    Q_UNUSED(indexOffset);
+    Q_UNUSED(indexFormat);
+}
+
+void QRhiNull::setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(viewport);
+}
+
+void QRhiNull::setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(scissor);
+}
+
+void QRhiNull::setBlendConstants(QRhiCommandBuffer *cb, const QColor &c)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(c);
+}
+
+void QRhiNull::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(refValue);
+}
+
+void QRhiNull::draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+                    quint32 instanceCount, quint32 firstVertex, quint32 firstInstance)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(vertexCount);
+    Q_UNUSED(instanceCount);
+    Q_UNUSED(firstVertex);
+    Q_UNUSED(firstInstance);
+}
+
+void QRhiNull::drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                           quint32 instanceCount, quint32 firstIndex, qint32 vertexOffset, quint32 firstInstance)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(indexCount);
+    Q_UNUSED(instanceCount);
+    Q_UNUSED(firstIndex);
+    Q_UNUSED(vertexOffset);
+    Q_UNUSED(firstInstance);
+}
+
+void QRhiNull::debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(name);
+}
+
+void QRhiNull::debugMarkEnd(QRhiCommandBuffer *cb)
+{
+    Q_UNUSED(cb);
+}
+
+void QRhiNull::debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(msg);
+}
+
+void QRhiNull::setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(ps);
+}
+
+void QRhiNull::dispatch(QRhiCommandBuffer *cb, int x, int y, int z)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(x);
+    Q_UNUSED(y);
+    Q_UNUSED(z);
+}
+
+const QRhiNativeHandles *QRhiNull::nativeHandles(QRhiCommandBuffer *cb)
+{
+    Q_UNUSED(cb);
+    return nullptr;
+}
+
+void QRhiNull::beginExternal(QRhiCommandBuffer *cb)
+{
+    Q_UNUSED(cb);
+}
+
+void QRhiNull::endExternal(QRhiCommandBuffer *cb)
+{
+    Q_UNUSED(cb);
+}
+
+QRhi::FrameOpResult QRhiNull::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    currentSwapChain = swapChain;
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    QRHI_PROF_F(beginSwapChainFrame(swapChain));
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiNull::endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    QNullSwapChain *swapChainD = QRHI_RES(QNullSwapChain, swapChain);
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    QRHI_PROF_F(endSwapChainFrame(swapChain, swapChainD->frameCount + 1));
+    QRHI_PROF_F(swapChainFrameGpuTime(swapChain, 0.000666f));
+    swapChainD->frameCount += 1;
+    currentSwapChain = nullptr;
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiNull::beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    *cb = &offscreenCommandBuffer;
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiNull::endOffscreenFrame(QRhi::EndFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiNull::finish()
+{
+    return QRhi::FrameOpSuccess;
+}
+
+void QRhiNull::simulateTextureUpload(const QRhiResourceUpdateBatchPrivate::TextureOp &u)
+{
+    QNullTexture *texD = QRHI_RES(QNullTexture, u.dst);
+    for (int layer = 0; layer < QRhi::MAX_LAYERS; ++layer) {
+        for (int level = 0; level < QRhi::MAX_LEVELS; ++level) {
+            for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level])) {
+                if (!subresDesc.image().isNull()) {
+                    const QImage src = subresDesc.image();
+                    QPainter painter(&texD->image[layer][level]);
+                    const QSize srcSize = subresDesc.sourceSize().isEmpty()
+                            ? src.size() : subresDesc.sourceSize();
+                    painter.setCompositionMode(QPainter::CompositionMode_Source);
+                    painter.drawImage(subresDesc.destinationTopLeft(), src,
+                                      QRect(subresDesc.sourceTopLeft(), srcSize));
+                } else if (!subresDesc.data().isEmpty()) {
+                    const QSize subresSize = q->sizeForMipLevel(level, texD->pixelSize());
+                    int w = subresSize.width();
+                    int h = subresSize.height();
+                    if (!subresDesc.sourceSize().isEmpty()) {
+                        w = subresDesc.sourceSize().width();
+                        h = subresDesc.sourceSize().height();
+                    }
+                    // sourceTopLeft is not supported on this path as per QRhi docs
+                    const char *src = subresDesc.data().constData();
+                    const int srcBpl = w * 4;
+                    const QPoint dstOffset = subresDesc.destinationTopLeft();
+                    uchar *dst = texD->image[layer][level].bits();
+                    const int dstBpl = texD->image[layer][level].bytesPerLine();
+                    for (int y = 0; y < h; ++y) {
+                        memcpy(dst + dstOffset.x() * 4 + (y + dstOffset.y()) * dstBpl,
+                               src + y * srcBpl,
+                               size_t(srcBpl));
+                    }
+                }
+            }
+        }
+    }
+}
+
+void QRhiNull::simulateTextureCopy(const QRhiResourceUpdateBatchPrivate::TextureOp &u)
+{
+    QNullTexture *srcD = QRHI_RES(QNullTexture, u.src);
+    QNullTexture *dstD = QRHI_RES(QNullTexture, u.dst);
+    const QImage &srcImage(srcD->image[u.desc.sourceLayer()][u.desc.sourceLevel()]);
+    QImage &dstImage(dstD->image[u.desc.destinationLayer()][u.desc.destinationLevel()]);
+    const QPoint dstPos = u.desc.destinationTopLeft();
+    const QSize size = u.desc.pixelSize().isEmpty() ? srcD->pixelSize() : u.desc.pixelSize();
+    const QPoint srcPos = u.desc.sourceTopLeft();
+
+    QPainter painter(&dstImage);
+    painter.setCompositionMode(QPainter::CompositionMode_Source);
+    painter.drawImage(QRect(dstPos, size), srcImage, QRect(srcPos, size));
+}
+
+void QRhiNull::simulateTextureGenMips(const QRhiResourceUpdateBatchPrivate::TextureOp &u)
+{
+    QNullTexture *texD = QRHI_RES(QNullTexture, u.dst);
+    const QSize baseSize = texD->pixelSize();
+    const int levelCount = q->mipLevelsForSize(baseSize);
+    for (int level = 1; level < levelCount; ++level)
+        texD->image[0][level] = texD->image[0][0].scaled(q->sizeForMipLevel(level, baseSize));
+}
+
+void QRhiNull::resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    Q_UNUSED(cb);
+    QRhiResourceUpdateBatchPrivate *ud = QRhiResourceUpdateBatchPrivate::get(resourceUpdates);
+    for (const QRhiResourceUpdateBatchPrivate::BufferOp &u : ud->bufferOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::DynamicUpdate
+                || u.type == QRhiResourceUpdateBatchPrivate::BufferOp::StaticUpload)
+        {
+            QNullBuffer *bufD = QRHI_RES(QNullBuffer, u.buf);
+            memcpy(bufD->data.data() + u.offset, u.data.constData(), size_t(u.data.size()));
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::Read) {
+            QRhiBufferReadbackResult *result = u.result;
+            result->data.resize(u.readSize);
+            QNullBuffer *bufD = QRHI_RES(QNullBuffer, u.buf);
+            memcpy(result->data.data(), bufD->data.constData() + u.offset, size_t(u.readSize));
+            if (result->completed)
+                result->completed();
+        }
+    }
+    for (const QRhiResourceUpdateBatchPrivate::TextureOp &u : ud->textureOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Upload) {
+            if (u.dst->format() == QRhiTexture::RGBA8)
+                simulateTextureUpload(u);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Copy) {
+            if (u.src->format() == QRhiTexture::RGBA8 && u.dst->format() == QRhiTexture::RGBA8)
+                simulateTextureCopy(u);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Read) {
+            QRhiReadbackResult *result = u.result;
+            QNullTexture *texD = QRHI_RES(QNullTexture, u.rb.texture());
+            if (texD) {
+                result->format = texD->format();
+                result->pixelSize = q->sizeForMipLevel(u.rb.level(), texD->pixelSize());
+            } else {
+                Q_ASSERT(currentSwapChain);
+                result->format = QRhiTexture::RGBA8;
+                result->pixelSize = currentSwapChain->currentPixelSize();
+            }
+            quint32 bytesPerLine = 0;
+            quint32 byteSize = 0;
+            textureFormatInfo(result->format, result->pixelSize, &bytesPerLine, &byteSize);
+            if (texD && texD->format() == QRhiTexture::RGBA8) {
+                result->data.resize(int(byteSize));
+                const QImage &src(texD->image[u.rb.layer()][u.rb.level()]);
+                char *dst = result->data.data();
+                for (int y = 0, h = src.height(); y < h; ++y) {
+                    memcpy(dst, src.constScanLine(y), bytesPerLine);
+                    dst += bytesPerLine;
+                }
+            } else {
+                result->data.fill(0, int(byteSize));
+            }
+            if (result->completed)
+                result->completed();
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::GenMips) {
+            if (u.dst->format() == QRhiTexture::RGBA8)
+                simulateTextureGenMips(u);
+        }
+    }
+    ud->free();
+}
+
+void QRhiNull::beginPass(QRhiCommandBuffer *cb,
+                         QRhiRenderTarget *rt,
+                         const QColor &colorClearValue,
+                         const QRhiDepthStencilClearValue &depthStencilClearValue,
+                         QRhiResourceUpdateBatch *resourceUpdates)
+{
+    Q_UNUSED(rt);
+    Q_UNUSED(colorClearValue);
+    Q_UNUSED(depthStencilClearValue);
+    if (resourceUpdates)
+        resourceUpdate(cb, resourceUpdates);
+}
+
+void QRhiNull::endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    if (resourceUpdates)
+        resourceUpdate(cb, resourceUpdates);
+}
+
+void QRhiNull::beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    if (resourceUpdates)
+        resourceUpdate(cb, resourceUpdates);
+}
+
+void QRhiNull::endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    if (resourceUpdates)
+        resourceUpdate(cb, resourceUpdates);
+}
+
+QNullBuffer::QNullBuffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size)
+    : QRhiBuffer(rhi, type, usage, size)
+{
+}
+
+QNullBuffer::~QNullBuffer()
+{
+    release();
+}
+
+void QNullBuffer::release()
+{
+    data.clear();
+
+    QRHI_PROF;
+    QRHI_PROF_F(releaseBuffer(this));
+}
+
+bool QNullBuffer::build()
+{
+    data.fill('\0', m_size);
+
+    QRHI_PROF;
+    QRHI_PROF_F(newBuffer(this, uint(m_size), 1, 0));
+    return true;
+}
+
+QNullRenderBuffer::QNullRenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                                     int sampleCount, QRhiRenderBuffer::Flags flags)
+    : QRhiRenderBuffer(rhi, type, pixelSize, sampleCount, flags)
+{
+}
+
+QNullRenderBuffer::~QNullRenderBuffer()
+{
+    release();
+}
+
+void QNullRenderBuffer::release()
+{
+    QRHI_PROF;
+    QRHI_PROF_F(releaseRenderBuffer(this));
+}
+
+bool QNullRenderBuffer::build()
+{
+    QRHI_PROF;
+    QRHI_PROF_F(newRenderBuffer(this, false, false, 1));
+    return true;
+}
+
+QRhiTexture::Format QNullRenderBuffer::backingFormat() const
+{
+    return m_type == Color ? QRhiTexture::RGBA8 : QRhiTexture::UnknownFormat;
+}
+
+QNullTexture::QNullTexture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                           int sampleCount, Flags flags)
+    : QRhiTexture(rhi, format, pixelSize, sampleCount, flags)
+{
+}
+
+QNullTexture::~QNullTexture()
+{
+    release();
+}
+
+void QNullTexture::release()
+{
+    QRHI_PROF;
+    QRHI_PROF_F(releaseTexture(this));
+}
+
+bool QNullTexture::build()
+{
+    QRHI_RES_RHI(QRhiNull);
+    const bool isCube = m_flags.testFlag(CubeMap);
+    const bool hasMipMaps = m_flags.testFlag(MipMapped);
+    QSize size = m_pixelSize.isEmpty() ? QSize(1, 1) : m_pixelSize;
+    const int mipLevelCount = hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1;
+    const int layerCount = isCube ? 6 : 1;
+
+    if (m_format == RGBA8) {
+        for (int layer = 0; layer < layerCount; ++layer) {
+            for (int level = 0; level < mipLevelCount; ++level) {
+                image[layer][level] = QImage(rhiD->q->sizeForMipLevel(level, size),
+                                             QImage::Format_RGBA8888_Premultiplied);
+                image[layer][level].fill(Qt::yellow);
+            }
+        }
+    }
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, true, mipLevelCount, layerCount, 1));
+    return true;
+}
+
+bool QNullTexture::buildFrom(const QRhiNativeHandles *src)
+{
+    Q_UNUSED(src);
+    QRHI_RES_RHI(QRhiNull);
+    const bool isCube = m_flags.testFlag(CubeMap);
+    const bool hasMipMaps = m_flags.testFlag(MipMapped);
+    QSize size = m_pixelSize.isEmpty() ? QSize(1, 1) : m_pixelSize;
+    const int mipLevelCount = hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1;
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, false, mipLevelCount, isCube ? 6 : 1, 1));
+    return true;
+}
+
+const QRhiNativeHandles *QNullTexture::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+QNullSampler::QNullSampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                           AddressMode u, AddressMode v)
+    : QRhiSampler(rhi, magFilter, minFilter, mipmapMode, u, v)
+{
+}
+
+QNullSampler::~QNullSampler()
+{
+    release();
+}
+
+void QNullSampler::release()
+{
+}
+
+bool QNullSampler::build()
+{
+    return true;
+}
+
+QNullRenderPassDescriptor::QNullRenderPassDescriptor(QRhiImplementation *rhi)
+    : QRhiRenderPassDescriptor(rhi)
+{
+}
+
+QNullRenderPassDescriptor::~QNullRenderPassDescriptor()
+{
+    release();
+}
+
+void QNullRenderPassDescriptor::release()
+{
+}
+
+QNullReferenceRenderTarget::QNullReferenceRenderTarget(QRhiImplementation *rhi)
+    : QRhiRenderTarget(rhi),
+      d(rhi)
+{
+}
+
+QNullReferenceRenderTarget::~QNullReferenceRenderTarget()
+{
+    release();
+}
+
+void QNullReferenceRenderTarget::release()
+{
+}
+
+QSize QNullReferenceRenderTarget::pixelSize() const
+{
+    return d.pixelSize;
+}
+
+float QNullReferenceRenderTarget::devicePixelRatio() const
+{
+    return d.dpr;
+}
+
+int QNullReferenceRenderTarget::sampleCount() const
+{
+    return 1;
+}
+
+QNullTextureRenderTarget::QNullTextureRenderTarget(QRhiImplementation *rhi,
+                                                   const QRhiTextureRenderTargetDescription &desc,
+                                                   Flags flags)
+    : QRhiTextureRenderTarget(rhi, desc, flags),
+      d(rhi)
+{
+}
+
+QNullTextureRenderTarget::~QNullTextureRenderTarget()
+{
+    release();
+}
+
+void QNullTextureRenderTarget::release()
+{
+}
+
+QRhiRenderPassDescriptor *QNullTextureRenderTarget::newCompatibleRenderPassDescriptor()
+{
+    return new QNullRenderPassDescriptor(m_rhi);
+}
+
+bool QNullTextureRenderTarget::build()
+{
+    d.rp = QRHI_RES(QNullRenderPassDescriptor, m_renderPassDesc);
+    if (m_desc.cbeginColorAttachments() != m_desc.cendColorAttachments()) {
+        QRhiTexture *tex = m_desc.cbeginColorAttachments()->texture();
+        QRhiRenderBuffer *rb = m_desc.cbeginColorAttachments()->renderBuffer();
+        d.pixelSize = tex ? tex->pixelSize() : rb->pixelSize();
+    } else if (m_desc.depthStencilBuffer()) {
+        d.pixelSize = m_desc.depthStencilBuffer()->pixelSize();
+    } else if (m_desc.depthTexture()) {
+        d.pixelSize = m_desc.depthTexture()->pixelSize();
+    }
+    return true;
+}
+
+QSize QNullTextureRenderTarget::pixelSize() const
+{
+    return d.pixelSize;
+}
+
+float QNullTextureRenderTarget::devicePixelRatio() const
+{
+    return d.dpr;
+}
+
+int QNullTextureRenderTarget::sampleCount() const
+{
+    return 1;
+}
+
+QNullShaderResourceBindings::QNullShaderResourceBindings(QRhiImplementation *rhi)
+    : QRhiShaderResourceBindings(rhi)
+{
+}
+
+QNullShaderResourceBindings::~QNullShaderResourceBindings()
+{
+    release();
+}
+
+void QNullShaderResourceBindings::release()
+{
+}
+
+bool QNullShaderResourceBindings::build()
+{
+    return true;
+}
+
+QNullGraphicsPipeline::QNullGraphicsPipeline(QRhiImplementation *rhi)
+    : QRhiGraphicsPipeline(rhi)
+{
+}
+
+QNullGraphicsPipeline::~QNullGraphicsPipeline()
+{
+    release();
+}
+
+void QNullGraphicsPipeline::release()
+{
+}
+
+bool QNullGraphicsPipeline::build()
+{
+    QRHI_RES_RHI(QRhiNull);
+    if (!rhiD->sanityCheckGraphicsPipeline(this))
+        return false;
+
+    return true;
+}
+
+QNullComputePipeline::QNullComputePipeline(QRhiImplementation *rhi)
+    : QRhiComputePipeline(rhi)
+{
+}
+
+QNullComputePipeline::~QNullComputePipeline()
+{
+    release();
+}
+
+void QNullComputePipeline::release()
+{
+}
+
+bool QNullComputePipeline::build()
+{
+    return true;
+}
+
+QNullCommandBuffer::QNullCommandBuffer(QRhiImplementation *rhi)
+    : QRhiCommandBuffer(rhi)
+{
+}
+
+QNullCommandBuffer::~QNullCommandBuffer()
+{
+    release();
+}
+
+void QNullCommandBuffer::release()
+{
+    // nothing to do here
+}
+
+QNullSwapChain::QNullSwapChain(QRhiImplementation *rhi)
+    : QRhiSwapChain(rhi),
+      rt(rhi),
+      cb(rhi)
+{
+}
+
+QNullSwapChain::~QNullSwapChain()
+{
+    release();
+}
+
+void QNullSwapChain::release()
+{
+    QRHI_PROF;
+    QRHI_PROF_F(releaseSwapChain(this));
+}
+
+QRhiCommandBuffer *QNullSwapChain::currentFrameCommandBuffer()
+{
+    return &cb;
+}
+
+QRhiRenderTarget *QNullSwapChain::currentFrameRenderTarget()
+{
+    return &rt;
+}
+
+QSize QNullSwapChain::surfacePixelSize()
+{
+    return QSize(1280, 720);
+}
+
+QRhiRenderPassDescriptor *QNullSwapChain::newCompatibleRenderPassDescriptor()
+{
+    return new QNullRenderPassDescriptor(m_rhi);
+}
+
+bool QNullSwapChain::buildOrResize()
+{
+    m_currentPixelSize = surfacePixelSize();
+    rt.d.rp = QRHI_RES(QNullRenderPassDescriptor, m_renderPassDesc);
+    rt.d.pixelSize = m_currentPixelSize;
+    frameCount = 0;
+    QRHI_PROF;
+    QRHI_PROF_F(resizeSwapChain(this, 1, 0, 1));
+    return true;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qrhinull_p.h b/src/gui/rhi/qrhinull_p.h
new file mode 100644
index 0000000000..7d3ce5dbf1
--- /dev/null
+++ b/src/gui/rhi/qrhinull_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHINULL_H
+#define QRHINULL_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qrhi_p.h>
+
+QT_BEGIN_NAMESPACE
+
+struct Q_GUI_EXPORT QRhiNullInitParams : public QRhiInitParams
+{
+};
+
+struct Q_GUI_EXPORT QRhiNullNativeHandles : public QRhiNativeHandles
+{
+};
+
+struct Q_GUI_EXPORT QRhiNullTextureNativeHandles : public QRhiNativeHandles
+{
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhinull_p_p.h b/src/gui/rhi/qrhinull_p_p.h
new file mode 100644
index 0000000000..ce517bfa63
--- /dev/null
+++ b/src/gui/rhi/qrhinull_p_p.h
@@ -0,0 +1,303 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHINULL_P_H
+#define QRHINULL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrhinull_p.h"
+#include "qrhi_p_p.h"
+
+QT_BEGIN_NAMESPACE
+
+struct QNullBuffer : public QRhiBuffer
+{
+    QNullBuffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size);
+    ~QNullBuffer();
+    void release() override;
+    bool build() override;
+
+    QByteArray data;
+};
+
+struct QNullRenderBuffer : public QRhiRenderBuffer
+{
+    QNullRenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                       int sampleCount, QRhiRenderBuffer::Flags flags);
+    ~QNullRenderBuffer();
+    void release() override;
+    bool build() override;
+    QRhiTexture::Format backingFormat() const override;
+};
+
+struct QNullTexture : public QRhiTexture
+{
+    QNullTexture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                  int sampleCount, Flags flags);
+    ~QNullTexture();
+    void release() override;
+    bool build() override;
+    bool buildFrom(const QRhiNativeHandles *src) override;
+    const QRhiNativeHandles *nativeHandles() override;
+
+    QRhiNullTextureNativeHandles nativeHandlesStruct;
+    QImage image[QRhi::MAX_LAYERS][QRhi::MAX_LEVELS];
+};
+
+struct QNullSampler : public QRhiSampler
+{
+    QNullSampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                 AddressMode u, AddressMode v);
+    ~QNullSampler();
+    void release() override;
+    bool build() override;
+};
+
+struct QNullRenderPassDescriptor : public QRhiRenderPassDescriptor
+{
+    QNullRenderPassDescriptor(QRhiImplementation *rhi);
+    ~QNullRenderPassDescriptor();
+    void release() override;
+};
+
+struct QNullRenderTargetData
+{
+    QNullRenderTargetData(QRhiImplementation *) { }
+
+    QNullRenderPassDescriptor *rp = nullptr;
+    QSize pixelSize;
+    float dpr = 1;
+};
+
+struct QNullReferenceRenderTarget : public QRhiRenderTarget
+{
+    QNullReferenceRenderTarget(QRhiImplementation *rhi);
+    ~QNullReferenceRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QNullRenderTargetData d;
+};
+
+struct QNullTextureRenderTarget : public QRhiTextureRenderTarget
+{
+    QNullTextureRenderTarget(QRhiImplementation *rhi, const QRhiTextureRenderTargetDescription &desc, Flags flags);
+    ~QNullTextureRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool build() override;
+
+    QNullRenderTargetData d;
+};
+
+struct QNullShaderResourceBindings : public QRhiShaderResourceBindings
+{
+    QNullShaderResourceBindings(QRhiImplementation *rhi);
+    ~QNullShaderResourceBindings();
+    void release() override;
+    bool build() override;
+};
+
+struct QNullGraphicsPipeline : public QRhiGraphicsPipeline
+{
+    QNullGraphicsPipeline(QRhiImplementation *rhi);
+    ~QNullGraphicsPipeline();
+    void release() override;
+    bool build() override;
+};
+
+struct QNullComputePipeline : public QRhiComputePipeline
+{
+    QNullComputePipeline(QRhiImplementation *rhi);
+    ~QNullComputePipeline();
+    void release() override;
+    bool build() override;
+};
+
+struct QNullCommandBuffer : public QRhiCommandBuffer
+{
+    QNullCommandBuffer(QRhiImplementation *rhi);
+    ~QNullCommandBuffer();
+    void release() override;
+};
+
+struct QNullSwapChain : public QRhiSwapChain
+{
+    QNullSwapChain(QRhiImplementation *rhi);
+    ~QNullSwapChain();
+    void release() override;
+
+    QRhiCommandBuffer *currentFrameCommandBuffer() override;
+    QRhiRenderTarget *currentFrameRenderTarget() override;
+
+    QSize surfacePixelSize() override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool buildOrResize() override;
+
+    QNullReferenceRenderTarget rt;
+    QNullCommandBuffer cb;
+    int frameCount = 0;
+};
+
+class QRhiNull : public QRhiImplementation
+{
+public:
+    QRhiNull(QRhiNullInitParams *params);
+
+    bool create(QRhi::Flags flags) override;
+    void destroy() override;
+
+    QRhiGraphicsPipeline *createGraphicsPipeline() override;
+    QRhiComputePipeline *createComputePipeline() override;
+    QRhiShaderResourceBindings *createShaderResourceBindings() override;
+    QRhiBuffer *createBuffer(QRhiBuffer::Type type,
+                             QRhiBuffer::UsageFlags usage,
+                             int size) override;
+    QRhiRenderBuffer *createRenderBuffer(QRhiRenderBuffer::Type type,
+                                         const QSize &pixelSize,
+                                         int sampleCount,
+                                         QRhiRenderBuffer::Flags flags) override;
+    QRhiTexture *createTexture(QRhiTexture::Format format,
+                               const QSize &pixelSize,
+                               int sampleCount,
+                               QRhiTexture::Flags flags) override;
+    QRhiSampler *createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                               QRhiSampler::Filter mipmapMode,
+                               QRhiSampler:: AddressMode u, QRhiSampler::AddressMode v) override;
+
+    QRhiTextureRenderTarget *createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                       QRhiTextureRenderTarget::Flags flags) override;
+
+    QRhiSwapChain *createSwapChain() override;
+    QRhi::FrameOpResult beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endOffscreenFrame(QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult finish() override;
+
+    void resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void beginPass(QRhiCommandBuffer *cb,
+                   QRhiRenderTarget *rt,
+                   const QColor &colorClearValue,
+                   const QRhiDepthStencilClearValue &depthStencilClearValue,
+                   QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void setGraphicsPipeline(QRhiCommandBuffer *cb,
+                             QRhiGraphicsPipeline *ps) override;
+
+    void setShaderResources(QRhiCommandBuffer *cb,
+                            QRhiShaderResourceBindings *srb,
+                            int dynamicOffsetCount,
+                            const QRhiCommandBuffer::DynamicOffset *dynamicOffsets) override;
+
+    void setVertexInput(QRhiCommandBuffer *cb,
+                        int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                        QRhiBuffer *indexBuf, quint32 indexOffset,
+                        QRhiCommandBuffer::IndexFormat indexFormat) override;
+
+    void setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport) override;
+    void setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor) override;
+    void setBlendConstants(QRhiCommandBuffer *cb, const QColor &c) override;
+    void setStencilRef(QRhiCommandBuffer *cb, quint32 refValue) override;
+
+    void draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+              quint32 instanceCount, quint32 firstVertex, quint32 firstInstance) override;
+
+    void drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                     quint32 instanceCount, quint32 firstIndex,
+                     qint32 vertexOffset, quint32 firstInstance) override;
+
+    void debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name) override;
+    void debugMarkEnd(QRhiCommandBuffer *cb) override;
+    void debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg) override;
+
+    void beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps) override;
+    void dispatch(QRhiCommandBuffer *cb, int x, int y, int z) override;
+
+    const QRhiNativeHandles *nativeHandles(QRhiCommandBuffer *cb) override;
+    void beginExternal(QRhiCommandBuffer *cb) override;
+    void endExternal(QRhiCommandBuffer *cb) override;
+
+    QVector<int> supportedSampleCounts() const override;
+    int ubufAlignment() const override;
+    bool isYUpInFramebuffer() const override;
+    bool isYUpInNDC() const override;
+    bool isClipDepthZeroToOne() const override;
+    QMatrix4x4 clipSpaceCorrMatrix() const override;
+    bool isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const override;
+    bool isFeatureSupported(QRhi::Feature feature) const override;
+    int resourceLimit(QRhi::ResourceLimit limit) const override;
+    const QRhiNativeHandles *nativeHandles() override;
+    void sendVMemStatsToProfiler() override;
+    bool makeThreadLocalNativeContextCurrent() override;
+    void releaseCachedResources() override;
+    bool isDeviceLost() const override;
+
+    void simulateTextureUpload(const QRhiResourceUpdateBatchPrivate::TextureOp &u);
+    void simulateTextureCopy(const QRhiResourceUpdateBatchPrivate::TextureOp &u);
+    void simulateTextureGenMips(const QRhiResourceUpdateBatchPrivate::TextureOp &u);
+
+    QRhiNullNativeHandles nativeHandlesStruct;
+    QRhiSwapChain *currentSwapChain = nullptr;
+    QNullCommandBuffer offscreenCommandBuffer;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhiprofiler.cpp b/src/gui/rhi/qrhiprofiler.cpp
new file mode 100644
index 0000000000..1521c0f36e
--- /dev/null
+++ b/src/gui/rhi/qrhiprofiler.cpp
@@ -0,0 +1,606 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qrhiprofiler_p_p.h"
+#include "qrhi_p_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QRhiProfiler
+    \internal
+    \inmodule QtGui
+
+    \brief Collects resource and timing information from an active QRhi.
+
+    A QRhiProfiler is present for each QRhi. Query it via QRhi::profiler(). The
+    profiler is active only when the QRhi was created with
+    QRhi::EnableProfiling. No data is collected otherwise.
+
+    \note GPU timings are only available when QRhi indicates that
+    QRhi::Timestamps is supported.
+
+    Besides collecting data from the QRhi implementations, some additional
+    values are calculated. For example, for textures and similar resources the
+    profiler gives an estimate of the complete amount of memory the resource
+    needs.
+
+    \section2 Output Format
+
+    The output is comma-separated text. Each line has a number of
+    comma-separated entries and each line ends with a comma.
+
+    For example:
+
+    \badcode
+        1,0,140446057946208,Triangle vbuf,type,0,usage,1,logical_size,84,effective_size,84,backing_gpu_buf_count,1,backing_cpu_buf_count,0,
+        1,0,140446057947376,Triangle ubuf,type,2,usage,4,logical_size,68,effective_size,256,backing_gpu_buf_count,2,backing_cpu_buf_count,0,
+        1,1,140446057950416,,type,0,usage,1,logical_size,112,effective_size,112,backing_gpu_buf_count,1,backing_cpu_buf_count,0,
+        1,1,140446057950544,,type,0,usage,2,logical_size,12,effective_size,12,backing_gpu_buf_count,1,backing_cpu_buf_count,0,
+        1,1,140446057947440,,type,2,usage,4,logical_size,68,effective_size,256,backing_gpu_buf_count,2,backing_cpu_buf_count,0,
+        1,1,140446057984784,Cube vbuf (textured),type,0,usage,1,logical_size,720,effective_size,720,backing_gpu_buf_count,1,backing_cpu_buf_count,0,
+        1,1,140446057982528,Cube ubuf (textured),type,2,usage,4,logical_size,68,effective_size,256,backing_gpu_buf_count,2,backing_cpu_buf_count,0,
+        7,8,140446058913648,Qt texture,width,256,height,256,format,1,owns_native_resource,1,mip_count,9,layer_count,1,effective_sample_count,1,approx_byte_size,349524,
+        1,8,140446058795856,Cube vbuf (textured with offscreen),type,0,usage,1,logical_size,720,effective_size,720,backing_gpu_buf_count,1,backing_cpu_buf_count,0,
+        1,8,140446058947920,Cube ubuf (textured with offscreen),type,2,usage,4,logical_size,68,effective_size,256,backing_gpu_buf_count,2,backing_cpu_buf_count,0,
+        7,8,140446058794928,Texture for offscreen content,width,512,height,512,format,1,owns_native_resource,1,mip_count,1,layer_count,1,effective_sample_count,1,approx_byte_size,1048576,
+        1,8,140446058963904,Triangle vbuf,type,0,usage,1,logical_size,84,effective_size,84,backing_gpu_buf_count,1,backing_cpu_buf_count,0,
+        1,8,140446058964560,Triangle ubuf,type,2,usage,4,logical_size,68,effective_size,256,backing_gpu_buf_count,2,backing_cpu_buf_count,0,
+        5,9,140446057945392,,type,0,width,1280,height,720,effective_sample_count,1,transient_backing,0,winsys_backing,0,approx_byte_size,3686400,
+        11,9,140446057944592,,width,1280,height,720,buffer_count,2,msaa_buffer_count,0,effective_sample_count,1,approx_total_byte_size,7372800,
+        9,9,140446058913648,Qt texture,slot,0,size,262144,
+        10,9,140446058913648,Qt texture,slot,0,
+        17,2019,140446057944592,,frames_since_resize,121,min_ms_frame_delta,9,max_ms_frame_delta,33,Favg_ms_frame_delta,16.1167,
+        18,2019,140446057944592,,frames_since_resize,121,min_ms_frame_build,0,max_ms_frame_build,1,Favg_ms_frame_build,0.00833333,
+        17,4019,140446057944592,,frames_since_resize,241,min_ms_frame_delta,15,max_ms_frame_delta,17,Favg_ms_frame_delta,16.0583,
+        18,4019,140446057944592,,frames_since_resize,241,min_ms_frame_build,0,max_ms_frame_build,0,Favg_ms_frame_build,0,
+        12,5070,140446057944592,,
+        2,5079,140446057947376,Triangle ubuf,
+        2,5079,140446057946208,Triangle vbuf,
+        2,5079,140446057947440,,
+        2,5079,140446057950544,,
+        2,5079,140446057950416,,
+        8,5079,140446058913648,Qt texture,
+        2,5079,140446057982528,Cube ubuf (textured),
+        2,5079,140446057984784,Cube vbuf (textured),
+        2,5079,140446058964560,Triangle ubuf,
+        2,5079,140446058963904,Triangle vbuf,
+        8,5079,140446058794928,Texture for offscreen content,
+        2,5079,140446058947920,Cube ubuf (textured with offscreen),
+        2,5079,140446058795856,Cube vbuf (textured with offscreen),
+        6,5079,140446057945392,,
+    \endcode
+
+    Each line starts with \c op, \c timestamp, \c res, \c name where op is a
+    value from StreamOp, timestamp is a recording timestamp in milliseconds
+    (qint64), res is a number (quint64) referring to the QRhiResource the entry
+    refers to, or 0 if not applicable. \c name is the value of
+    QRhiResource::name() and may be empty as well. The \c name will never
+    contain a comma.
+
+    This is followed by any number of \c{key, value} pairs where \c key is an
+    unspecified string and \c value is a number. If \c key starts with \c F, it
+    indicates the value is a float. Otherwise assume that the value is a
+    qint64.
+ */
+
+/*!
+    \enum QRhiProfiler::StreamOp
+    Describes an entry in the profiler's output stream.
+
+    \value NewBuffer A buffer is created
+    \value ReleaseBuffer A buffer is destroyed
+    \value NewBufferStagingArea A staging buffer for buffer upload is created
+    \value ReleaseBufferStagingArea A staging buffer for buffer upload is destroyed
+    \value NewRenderBuffer A renderbuffer is created
+    \value ReleaseRenderBuffer A renderbuffer is destroyed
+    \value NewTexture A texture is created
+    \value ReleaseTexture A texture is destroyed
+    \value NewTextureStagingArea A staging buffer for texture upload is created
+    \value ReleaseTextureStagingArea A staging buffer for texture upload is destroyed
+    \value ResizeSwapChain A swapchain is created or resized
+    \value ReleaseSwapChain A swapchain is destroyed
+    \value NewReadbackBuffer A staging buffer for readback is created
+    \value ReleaseReadbackBuffer A staging buffer for readback is destroyed
+    \value GpuMemAllocStats GPU memory allocator statistics
+    \value GpuFrameTime GPU frame times
+    \value FrameToFrameTime CPU frame-to-frame times
+    \value FrameBuildTime CPU beginFrame-endFrame times
+ */
+
+/*!
+    \class QRhiProfiler::CpuTime
+    \internal
+    \inmodule QtGui
+    \brief Contains CPU-side frame timings.
+
+    Once sufficient number of frames have been rendered, the minimum, maximum,
+    and average values (in milliseconds) from various measurements are made
+    available in this struct queriable from QRhiProfiler::frameToFrameTimes()
+    and QRhiProfiler::frameBuildTimes().
+
+    \sa QRhiProfiler::setFrameTimingWriteInterval()
+ */
+
+/*!
+    \class QRhiProfiler::GpuTime
+    \internal
+    \inmodule QtGui
+    \brief Contains GPU-side frame timings.
+
+    Once sufficient number of frames have been rendered, the minimum, maximum,
+    and average values (in milliseconds) calculated from GPU command buffer
+    timestamps are made available in this struct queriable from
+    QRhiProfiler::gpuFrameTimes().
+
+    \sa QRhiProfiler::setFrameTimingWriteInterval()
+ */
+
+/*!
+    \internal
+ */
+QRhiProfiler::QRhiProfiler()
+    : d(new QRhiProfilerPrivate)
+{
+    d->ts.start();
+}
+
+/*!
+    Destructor.
+ */
+QRhiProfiler::~QRhiProfiler()
+{
+    // Flush because there is a high chance we have writes that were made since
+    // the event loop last ran. (esp. relevant for network devices like QTcpSocket)
+    if (d->outputDevice)
+        d->outputDevice->waitForBytesWritten(1000);
+
+    delete d;
+}
+
+/*!
+    Sets the output \a device.
+
+    \note No output will be generated when QRhi::EnableProfiling was not set.
+ */
+void QRhiProfiler::setDevice(QIODevice *device)
+{
+    d->outputDevice = device;
+}
+
+/*!
+    Requests writing a GpuMemAllocStats entry into the output, when applicable.
+    Backends that do not support this will ignore the request. This is an
+    explicit request since getting the allocator status and statistics may be
+    an expensive operation.
+ */
+void QRhiProfiler::addVMemAllocatorStats()
+{
+    if (d->rhiDWhenEnabled)
+        d->rhiDWhenEnabled->sendVMemStatsToProfiler();
+}
+
+/*!
+    \return the currently set frame timing writeout interval.
+ */
+int QRhiProfiler::frameTimingWriteInterval() const
+{
+    return d->frameTimingWriteInterval;
+}
+
+/*!
+    Sets the number of frames that need to be rendered before the collected CPU
+    and GPU timings are processed (min, max, average are calculated) to \a
+    frameCount.
+
+    The default value is 120.
+ */
+void QRhiProfiler::setFrameTimingWriteInterval(int frameCount)
+{
+    if (frameCount > 0)
+        d->frameTimingWriteInterval = frameCount;
+}
+
+/*!
+   \return min, max, and avg in milliseconds for the time that elapsed between two
+   QRhi::endFrame() calls.
+
+   \note The values are all 0 until at least frameTimingWriteInterval() frames
+   have been rendered.
+ */
+QRhiProfiler::CpuTime QRhiProfiler::frameToFrameTimes(QRhiSwapChain *sc) const
+{
+    auto it = d->swapchains.constFind(sc);
+    if (it != d->swapchains.constEnd())
+        return it->frameToFrameTime;
+
+    return QRhiProfiler::CpuTime();
+}
+
+/*!
+   \return min, max, and avg in milliseconds for the time that elapsed between
+   a QRhi::beginFrame() and QRhi::endFrame().
+
+   \note The values are all 0 until at least frameTimingWriteInterval() frames
+   have been rendered.
+ */
+QRhiProfiler::CpuTime QRhiProfiler::frameBuildTimes(QRhiSwapChain *sc) const
+{
+    auto it = d->swapchains.constFind(sc);
+    if (it != d->swapchains.constEnd())
+        return it->beginToEndFrameTime;
+
+    return QRhiProfiler::CpuTime();
+}
+
+/*!
+   \return min, max, and avg in milliseconds for the GPU time that is spent on
+   one frame.
+
+   \note The values are all 0 until at least frameTimingWriteInterval() frames
+   have been rendered.
+
+   The GPU times should only be compared between runs on the same GPU of the
+   same system with the same backend. Comparing times for different graphics
+   cards or for different backends can give misleading results. The numbers are
+   not meant to be comparable that way.
+
+   \note Some backends have no support for this, and even for those that have,
+   it is not guaranteed that the driver will support it at run time. Support
+   can be checked via QRhi::Timestamps.
+ */
+QRhiProfiler::GpuTime QRhiProfiler::gpuFrameTimes(QRhiSwapChain *sc) const
+{
+    auto it = d->swapchains.constFind(sc);
+    if (it != d->swapchains.constEnd())
+        return it->gpuFrameTime;
+
+    return QRhiProfiler::GpuTime();
+}
+
+void QRhiProfilerPrivate::startEntry(QRhiProfiler::StreamOp op, qint64 timestamp, QRhiResource *res)
+{
+    buf.clear();
+    buf.append(QByteArray::number(op));
+    buf.append(',');
+    buf.append(QByteArray::number(timestamp));
+    buf.append(',');
+    buf.append(QByteArray::number(quint64(quintptr(res))));
+    buf.append(',');
+    if (res)
+        buf.append(res->name());
+    buf.append(',');
+}
+
+void QRhiProfilerPrivate::writeInt(const char *key, qint64 v)
+{
+    Q_ASSERT(key[0] != 'F');
+    buf.append(key);
+    buf.append(',');
+    buf.append(QByteArray::number(v));
+    buf.append(',');
+}
+
+void QRhiProfilerPrivate::writeFloat(const char *key, float f)
+{
+    Q_ASSERT(key[0] == 'F');
+    buf.append(key);
+    buf.append(',');
+    buf.append(QByteArray::number(double(f)));
+    buf.append(',');
+}
+
+void QRhiProfilerPrivate::endEntry()
+{
+    buf.append('\n');
+    outputDevice->write(buf);
+}
+
+void QRhiProfilerPrivate::newBuffer(QRhiBuffer *buf, quint32 realSize, int backingGpuBufCount, int backingCpuBufCount)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::NewBuffer, ts.elapsed(), buf);
+    writeInt("type", buf->type());
+    writeInt("usage", buf->usage());
+    writeInt("logical_size", buf->size());
+    writeInt("effective_size", realSize);
+    writeInt("backing_gpu_buf_count", backingGpuBufCount);
+    writeInt("backing_cpu_buf_count", backingCpuBufCount);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::releaseBuffer(QRhiBuffer *buf)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::ReleaseBuffer, ts.elapsed(), buf);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::newBufferStagingArea(QRhiBuffer *buf, int slot, quint32 size)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::NewBufferStagingArea, ts.elapsed(), buf);
+    writeInt("slot", slot);
+    writeInt("size", size);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::releaseBufferStagingArea(QRhiBuffer *buf, int slot)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::ReleaseBufferStagingArea, ts.elapsed(), buf);
+    writeInt("slot", slot);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::newRenderBuffer(QRhiRenderBuffer *rb, bool transientBacking, bool winSysBacking, int sampleCount)
+{
+    if (!outputDevice)
+        return;
+
+    const QRhiRenderBuffer::Type type = rb->type();
+    const QSize sz = rb->pixelSize();
+    // just make up something, ds is likely D24S8 while color is RGBA8 or similar
+    const QRhiTexture::Format assumedFormat = type == QRhiRenderBuffer::DepthStencil ? QRhiTexture::D32F : QRhiTexture::RGBA8;
+    quint32 byteSize = rhiDWhenEnabled->approxByteSizeForTexture(assumedFormat, sz, 1, 1);
+    if (sampleCount > 1)
+        byteSize *= uint(sampleCount);
+
+    startEntry(QRhiProfiler::NewRenderBuffer, ts.elapsed(), rb);
+    writeInt("type", type);
+    writeInt("width", sz.width());
+    writeInt("height", sz.height());
+    writeInt("effective_sample_count", sampleCount);
+    writeInt("transient_backing", transientBacking);
+    writeInt("winsys_backing", winSysBacking);
+    writeInt("approx_byte_size", byteSize);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::releaseRenderBuffer(QRhiRenderBuffer *rb)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::ReleaseRenderBuffer, ts.elapsed(), rb);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::newTexture(QRhiTexture *tex, bool owns, int mipCount, int layerCount, int sampleCount)
+{
+    if (!outputDevice)
+        return;
+
+    const QRhiTexture::Format format = tex->format();
+    const QSize sz = tex->pixelSize();
+    quint32 byteSize = rhiDWhenEnabled->approxByteSizeForTexture(format, sz, mipCount, layerCount);
+    if (sampleCount > 1)
+        byteSize *= uint(sampleCount);
+
+    startEntry(QRhiProfiler::NewTexture, ts.elapsed(), tex);
+    writeInt("width", sz.width());
+    writeInt("height", sz.height());
+    writeInt("format", format);
+    writeInt("owns_native_resource", owns);
+    writeInt("mip_count", mipCount);
+    writeInt("layer_count", layerCount);
+    writeInt("effective_sample_count", sampleCount);
+    writeInt("approx_byte_size", byteSize);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::releaseTexture(QRhiTexture *tex)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::ReleaseTexture, ts.elapsed(), tex);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::newTextureStagingArea(QRhiTexture *tex, int slot, quint32 size)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::NewTextureStagingArea, ts.elapsed(), tex);
+    writeInt("slot", slot);
+    writeInt("size", size);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::releaseTextureStagingArea(QRhiTexture *tex, int slot)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::ReleaseTextureStagingArea, ts.elapsed(), tex);
+    writeInt("slot", slot);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::resizeSwapChain(QRhiSwapChain *sc, int bufferCount, int msaaBufferCount, int sampleCount)
+{
+    if (!outputDevice)
+        return;
+
+    const QSize sz = sc->currentPixelSize();
+    quint32 byteSize = rhiDWhenEnabled->approxByteSizeForTexture(QRhiTexture::BGRA8, sz, 1, 1);
+    byteSize = byteSize * uint(bufferCount) + byteSize * uint(msaaBufferCount) * uint(sampleCount);
+
+    startEntry(QRhiProfiler::ResizeSwapChain, ts.elapsed(), sc);
+    writeInt("width", sz.width());
+    writeInt("height", sz.height());
+    writeInt("buffer_count", bufferCount);
+    writeInt("msaa_buffer_count", msaaBufferCount);
+    writeInt("effective_sample_count", sampleCount);
+    writeInt("approx_total_byte_size", byteSize);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::releaseSwapChain(QRhiSwapChain *sc)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::ReleaseSwapChain, ts.elapsed(), sc);
+    endEntry();
+}
+
+template<typename T>
+void calcTiming(QVector<T> *vec, T *minDelta, T *maxDelta, float *avgDelta)
+{
+    if (vec->isEmpty())
+        return;
+
+    *minDelta = *maxDelta = 0;
+    float totalDelta = 0;
+    for (T delta : qAsConst(*vec)) {
+        totalDelta += float(delta);
+        if (*minDelta == 0 || delta < *minDelta)
+            *minDelta = delta;
+        if (*maxDelta == 0 || delta > *maxDelta)
+            *maxDelta = delta;
+    }
+    *avgDelta = totalDelta / vec->count();
+
+    vec->clear();
+}
+
+void QRhiProfilerPrivate::beginSwapChainFrame(QRhiSwapChain *sc)
+{
+    Sc &scd(swapchains[sc]);
+    scd.beginToEndTimer.start();
+}
+
+void QRhiProfilerPrivate::endSwapChainFrame(QRhiSwapChain *sc, int frameCount)
+{
+    Sc &scd(swapchains[sc]);
+    if (!scd.frameToFrameRunning) {
+        scd.frameToFrameTimer.start();
+        scd.frameToFrameRunning = true;
+        return;
+    }
+
+    scd.frameToFrameSamples.append(scd.frameToFrameTimer.restart());
+    if (scd.frameToFrameSamples.count() >= frameTimingWriteInterval) {
+        calcTiming(&scd.frameToFrameSamples,
+                   &scd.frameToFrameTime.minTime, &scd.frameToFrameTime.maxTime, &scd.frameToFrameTime.avgTime);
+        if (outputDevice) {
+            startEntry(QRhiProfiler::FrameToFrameTime, ts.elapsed(), sc);
+            writeInt("frames_since_resize", frameCount);
+            writeInt("min_ms_frame_delta", scd.frameToFrameTime.minTime);
+            writeInt("max_ms_frame_delta", scd.frameToFrameTime.maxTime);
+            writeFloat("Favg_ms_frame_delta", scd.frameToFrameTime.avgTime);
+            endEntry();
+        }
+    }
+
+    scd.beginToEndSamples.append(scd.beginToEndTimer.elapsed());
+    if (scd.beginToEndSamples.count() >= frameTimingWriteInterval) {
+        calcTiming(&scd.beginToEndSamples,
+                   &scd.beginToEndFrameTime.minTime, &scd.beginToEndFrameTime.maxTime, &scd.beginToEndFrameTime.avgTime);
+        if (outputDevice) {
+            startEntry(QRhiProfiler::FrameBuildTime, ts.elapsed(), sc);
+            writeInt("frames_since_resize", frameCount);
+            writeInt("min_ms_frame_build", scd.beginToEndFrameTime.minTime);
+            writeInt("max_ms_frame_build", scd.beginToEndFrameTime.maxTime);
+            writeFloat("Favg_ms_frame_build", scd.beginToEndFrameTime.avgTime);
+            endEntry();
+        }
+    }
+}
+
+void QRhiProfilerPrivate::swapChainFrameGpuTime(QRhiSwapChain *sc, float gpuTime)
+{
+    Sc &scd(swapchains[sc]);
+    scd.gpuFrameSamples.append(gpuTime);
+    if (scd.gpuFrameSamples.count() >= frameTimingWriteInterval) {
+        calcTiming(&scd.gpuFrameSamples,
+                   &scd.gpuFrameTime.minTime, &scd.gpuFrameTime.maxTime, &scd.gpuFrameTime.avgTime);
+        if (outputDevice) {
+            startEntry(QRhiProfiler::GpuFrameTime, ts.elapsed(), sc);
+            writeFloat("Fmin_ms_gpu_frame_time", scd.gpuFrameTime.minTime);
+            writeFloat("Fmax_ms_gpu_frame_time", scd.gpuFrameTime.maxTime);
+            writeFloat("Favg_ms_gpu_frame_time", scd.gpuFrameTime.avgTime);
+            endEntry();
+        }
+    }
+}
+
+void QRhiProfilerPrivate::newReadbackBuffer(qint64 id, QRhiResource *src, quint32 size)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::NewReadbackBuffer, ts.elapsed(), src);
+    writeInt("id", id);
+    writeInt("size", size);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::releaseReadbackBuffer(qint64 id)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::ReleaseReadbackBuffer, ts.elapsed(), nullptr);
+    writeInt("id", id);
+    endEntry();
+}
+
+void QRhiProfilerPrivate::vmemStat(uint realAllocCount, uint subAllocCount, quint32 totalSize, quint32 unusedSize)
+{
+    if (!outputDevice)
+        return;
+
+    startEntry(QRhiProfiler::GpuMemAllocStats, ts.elapsed(), nullptr);
+    writeInt("real_alloc_count", realAllocCount);
+    writeInt("sub_alloc_count", subAllocCount);
+    writeInt("total_size", totalSize);
+    writeInt("unused_size", unusedSize);
+    endEntry();
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qrhiprofiler_p.h b/src/gui/rhi/qrhiprofiler_p.h
new file mode 100644
index 0000000000..89fd0a8798
--- /dev/null
+++ b/src/gui/rhi/qrhiprofiler_p.h
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIPROFILER_H
+#define QRHIPROFILER_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qrhi_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QRhiProfilerPrivate;
+class QIODevice;
+
+class Q_GUI_EXPORT QRhiProfiler
+{
+public:
+    enum StreamOp {
+        NewBuffer = 1,
+        ReleaseBuffer,
+        NewBufferStagingArea,
+        ReleaseBufferStagingArea,
+        NewRenderBuffer,
+        ReleaseRenderBuffer,
+        NewTexture,
+        ReleaseTexture,
+        NewTextureStagingArea,
+        ReleaseTextureStagingArea,
+        ResizeSwapChain,
+        ReleaseSwapChain,
+        NewReadbackBuffer,
+        ReleaseReadbackBuffer,
+        GpuMemAllocStats,
+        GpuFrameTime,
+        FrameToFrameTime,
+        FrameBuildTime
+    };
+
+    ~QRhiProfiler();
+
+    void setDevice(QIODevice *device);
+
+    void addVMemAllocatorStats();
+
+    int frameTimingWriteInterval() const;
+    void setFrameTimingWriteInterval(int frameCount);
+
+    struct CpuTime {
+        qint64 minTime = 0;
+        qint64 maxTime = 0;
+        float avgTime = 0;
+    };
+
+    struct GpuTime {
+        float minTime = 0;
+        float maxTime = 0;
+        float avgTime = 0;
+    };
+
+    CpuTime frameToFrameTimes(QRhiSwapChain *sc) const;
+    CpuTime frameBuildTimes(QRhiSwapChain *sc) const; // beginFrame - endFrame
+    GpuTime gpuFrameTimes(QRhiSwapChain *sc) const;
+
+private:
+    Q_DISABLE_COPY(QRhiProfiler)
+    QRhiProfiler();
+    QRhiProfilerPrivate *d;
+    friend class QRhiImplementation;
+    friend class QRhiProfilerPrivate;
+};
+
+Q_DECLARE_TYPEINFO(QRhiProfiler::CpuTime, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiProfiler::GpuTime, Q_MOVABLE_TYPE);
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhiprofiler_p_p.h b/src/gui/rhi/qrhiprofiler_p_p.h
new file mode 100644
index 0000000000..7d0f183fb1
--- /dev/null
+++ b/src/gui/rhi/qrhiprofiler_p_p.h
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIPROFILER_P_H
+#define QRHIPROFILER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrhiprofiler_p.h"
+#include <QElapsedTimer>
+#include <QHash>
+
+QT_BEGIN_NAMESPACE
+
+class QRhiProfilerPrivate
+{
+public:
+    static QRhiProfilerPrivate *get(QRhiProfiler *p) { return p->d; }
+
+    void newBuffer(QRhiBuffer *buf, quint32 realSize, int backingGpuBufCount, int backingCpuBufCount);
+    void releaseBuffer(QRhiBuffer *buf);
+    void newBufferStagingArea(QRhiBuffer *buf, int slot, quint32 size);
+    void releaseBufferStagingArea(QRhiBuffer *buf, int slot);
+
+    void newRenderBuffer(QRhiRenderBuffer *rb, bool transientBacking, bool winSysBacking, int sampleCount);
+    void releaseRenderBuffer(QRhiRenderBuffer *rb);
+
+    void newTexture(QRhiTexture *tex, bool owns, int mipCount, int layerCount, int sampleCount);
+    void releaseTexture(QRhiTexture *tex);
+    void newTextureStagingArea(QRhiTexture *tex, int slot, quint32 size);
+    void releaseTextureStagingArea(QRhiTexture *tex, int slot);
+
+    void resizeSwapChain(QRhiSwapChain *sc, int bufferCount, int msaaBufferCount, int sampleCount);
+    void releaseSwapChain(QRhiSwapChain *sc);
+
+    void beginSwapChainFrame(QRhiSwapChain *sc);
+    void endSwapChainFrame(QRhiSwapChain *sc, int frameCount);
+    void swapChainFrameGpuTime(QRhiSwapChain *sc, float gpuTimeMs);
+
+    void newReadbackBuffer(qint64 id, QRhiResource *src, quint32 size);
+    void releaseReadbackBuffer(qint64 id);
+
+    void vmemStat(uint realAllocCount, uint subAllocCount, quint32 totalSize, quint32 unusedSize);
+
+    void startEntry(QRhiProfiler::StreamOp op, qint64 timestamp, QRhiResource *res);
+    void writeInt(const char *key, qint64 v);
+    void writeFloat(const char *key, float f);
+    void endEntry();
+
+    QRhiImplementation *rhiDWhenEnabled = nullptr;
+    QIODevice *outputDevice = nullptr;
+    QElapsedTimer ts;
+    QByteArray buf;
+    static const int DEFAULT_FRAME_TIMING_WRITE_INTERVAL = 120; // frames
+    int frameTimingWriteInterval = DEFAULT_FRAME_TIMING_WRITE_INTERVAL;
+    struct Sc {
+        Sc() {
+            frameToFrameSamples.reserve(DEFAULT_FRAME_TIMING_WRITE_INTERVAL);
+            beginToEndSamples.reserve(DEFAULT_FRAME_TIMING_WRITE_INTERVAL);
+            gpuFrameSamples.reserve(DEFAULT_FRAME_TIMING_WRITE_INTERVAL);
+        }
+        QElapsedTimer frameToFrameTimer;
+        bool frameToFrameRunning = false;
+        QElapsedTimer beginToEndTimer;
+        QVector<qint64> frameToFrameSamples;
+        QVector<qint64> beginToEndSamples;
+        QVector<float> gpuFrameSamples;
+        QRhiProfiler::CpuTime frameToFrameTime;
+        QRhiProfiler::CpuTime beginToEndFrameTime;
+        QRhiProfiler::GpuTime gpuFrameTime;
+    };
+    QHash<QRhiSwapChain *, Sc> swapchains;
+};
+
+Q_DECLARE_TYPEINFO(QRhiProfilerPrivate::Sc, Q_MOVABLE_TYPE);
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp
new file mode 100644
index 0000000000..103fea627a
--- /dev/null
+++ b/src/gui/rhi/qrhivulkan.cpp
@@ -0,0 +1,6492 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qrhivulkan_p_p.h"
+#include "qrhivulkanext_p.h"
+
+#define VMA_IMPLEMENTATION
+#define VMA_STATIC_VULKAN_FUNCTIONS 0
+#define VMA_RECORDING_ENABLED 0
+#define VMA_DEDICATED_ALLOCATION 0
+#ifdef QT_DEBUG
+#define VMA_DEBUG_INITIALIZE_ALLOCATIONS 1
+#endif
+#include "vk_mem_alloc.h"
+
+#include <qmath.h>
+#include <QVulkanFunctions>
+#include <QVulkanWindow>
+
+QT_BEGIN_NAMESPACE
+
+/*
+  Vulkan 1.0 backend. Provides a double-buffered swapchain that throttles the
+  rendering thread to vsync. Textures and "static" buffers are device local,
+  and a separate, host visible staging buffer is used to upload data to them.
+  "Dynamic" buffers are in host visible memory and are duplicated (since there
+  can be 2 frames in flight). This is handled transparently to the application.
+
+  Barriers are generated automatically for each render or compute pass, based
+  on the resources that are used in that pass (in QRhiShaderResourceBindings,
+  vertex inputs, etc.). This implies deferring the recording of the command
+  buffer since the barriers have to be placed at the right place (before the
+  pass), and that can only be done once we know all the things the pass does.
+
+  This in turn has implications for integrating external commands
+  (beginExternal() - direct Vulkan calls - endExternal()) because that is
+  incompatible with this approach by nature. Therefore we support another mode
+  of operation, where each render or compute pass uses one or more secondary
+  command buffers (recorded right away), with each beginExternal() leading to
+  closing the current secondary cb, creating a new secondary cb for the
+  external content, and then starting yet another one in endExternal() for
+  whatever comes afterwards in the pass. This way the primary command buffer
+  only has vkCmdExecuteCommand(s) within a renderpass instance
+  (Begin-EndRenderPass). (i.e. our only subpass is then
+  VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS instead of
+  VK_SUBPASS_CONTENTS_INLINE)
+
+  The command buffer management mode is decided on a per frame basis,
+  controlled by the ExternalContentsInPass flag of beginFrame().
+*/
+
+/*!
+    \class QRhiVulkanInitParams
+    \internal
+    \inmodule QtGui
+    \brief Vulkan specific initialization parameters.
+
+    A Vulkan-based QRhi needs at minimum a valid QVulkanInstance. It is up to
+    the user to ensure this is available and initialized. This is typically
+    done in main() similarly to the following:
+
+    \badcode
+    int main(int argc, char **argv)
+    {
+        ...
+
+        QVulkanInstance inst;
+    #ifndef Q_OS_ANDROID
+        inst.setLayers(QByteArrayList() << "VK_LAYER_LUNARG_standard_validation");
+    #else
+        inst.setLayers(QByteArrayList()
+                       << "VK_LAYER_GOOGLE_threading"
+                       << "VK_LAYER_LUNARG_parameter_validation"
+                       << "VK_LAYER_LUNARG_object_tracker"
+                       << "VK_LAYER_LUNARG_core_validation"
+                       << "VK_LAYER_LUNARG_image"
+                       << "VK_LAYER_LUNARG_swapchain"
+                       << "VK_LAYER_GOOGLE_unique_objects");
+    #endif
+        inst.setExtensions(QByteArrayList()
+                           << "VK_KHR_get_physical_device_properties2");
+        if (!inst.create())
+            qFatal("Vulkan not available");
+
+        ...
+    }
+    \endcode
+
+    The example here has two optional aspects: it enables the
+    \l{https://github.com/KhronosGroup/Vulkan-ValidationLayers}{Vulkan
+    validation layers}, when they are available, and also enables the
+    VK_KHR_get_physical_device_properties2 extension (part of Vulkan 1.1), when
+    available. The former is useful during the development phase (remember that
+    QVulkanInstance conveniently redirects messages and warnings to qDebug).
+    Avoid enabling it in production builds, however. The latter is important in
+    order to make QRhi::CustomInstanceStepRate available with Vulkan since
+    VK_EXT_vertex_attribute_divisor (part of Vulkan 1.1) depends on it. It can
+    be omitted when instanced drawing with a non-one step rate is not used.
+
+    Once this is done, a Vulkan-based QRhi can be created by passing the
+    instance and a QWindow with its surface type set to
+    QSurface::VulkanSurface:
+
+    \badcode
+        QRhiVulkanInitParams params;
+        params.inst = vulkanInstance;
+        params.window = window;
+        rhi = QRhi::create(QRhi::Vulkan, &params);
+    \endcode
+
+    The window is optional and can be omitted. This is not recommended however
+    because there is then no way to ensure presenting is supported while
+    choosing a graphics queue.
+
+    \note Even when a window is specified, QRhiSwapChain objects can be created
+    for other windows as well, as long as they all have their
+    QWindow::surfaceType() set to QSurface::VulkanSurface.
+
+    \section2 Working with existing Vulkan devices
+
+    When interoperating with another graphics engine, it may be necessary to
+    get a QRhi instance that uses the same Vulkan device. This can be achieved
+    by passing a pointer to a QRhiVulkanNativeHandles to QRhi::create().
+
+    The physical device and device object must then be set to a non-null value.
+    In addition, either the graphics queue family index or the graphics queue
+    object itself is required. Prefer the former, whenever possible since
+    deducing the index is not possible afterwards. Optionally, an existing
+    command pool object can be specified as well, and, also optionally,
+    vmemAllocator can be used to share the same
+    \l{https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator}{Vulkan
+    memory allocator} between two QRhi instances.
+
+    The QRhi does not take ownership of any of the external objects.
+ */
+
+/*!
+    \class QRhiVulkanNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Collects device, queue, and other Vulkan objects that are used by the QRhi.
+
+    \note Ownership of the Vulkan objects is never transferred.
+ */
+
+/*!
+    \class QRhiVulkanTextureNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Holds the Vulkan image object that is backing a QRhiTexture.
+
+    Importing and exporting Vulkan image objects that back a QRhiTexture when
+    running with the Vulkan backend is supported via this class. Ownership of
+    the Vulkan object is never transferred.
+
+    \note Memory allocation details are not exposed. This is intentional since
+    memory is typically suballocated from a bigger chunk of VkDeviceMemory, and
+    exposing the allocator details is not desirable for now.
+ */
+
+/*!
+    \class QRhiVulkanCommandBufferNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Holds the Vulkan command buffer object that is backing a QRhiCommandBuffer.
+
+    \note The Vulkan command buffer object is only guaranteed to be valid, and
+    in recording state, while recording a frame. That is, between a
+    \l{QRhi::beginFrame()}{beginFrame()} - \l{QRhi::endFrame()}{endFrame()} or
+    \l{QRhi::beginOffscreenFrame()}{beginOffscreenFrame()} -
+    \l{QRhi::endOffsrceenFrame()}{endOffscreenFrame()} pair.
+ */
+
+/*!
+    \class QRhiVulkanRenderPassNativeHandles
+    \internal
+    \inmodule QtGui
+    \brief Holds the Vulkan render pass object backing a QRhiRenderPassDescriptor.
+ */
+
+template <class Int>
+inline Int aligned(Int v, Int byteAlign)
+{
+    return (v + byteAlign - 1) & ~(byteAlign - 1);
+}
+
+static QVulkanInstance *globalVulkanInstance;
+
+static void VKAPI_PTR wrap_vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties)
+{
+    globalVulkanInstance->functions()->vkGetPhysicalDeviceProperties(physicalDevice, pProperties);
+}
+
+static void VKAPI_PTR wrap_vkGetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties)
+{
+    globalVulkanInstance->functions()->vkGetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties);
+}
+
+static VkResult VKAPI_PTR wrap_vkAllocateMemory(VkDevice device, const VkMemoryAllocateInfo* pAllocateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory)
+{
+    return globalVulkanInstance->deviceFunctions(device)->vkAllocateMemory(device, pAllocateInfo, pAllocator, pMemory);
+}
+
+void VKAPI_PTR wrap_vkFreeMemory(VkDevice device, VkDeviceMemory memory, const VkAllocationCallbacks* pAllocator)
+{
+    globalVulkanInstance->deviceFunctions(device)->vkFreeMemory(device, memory, pAllocator);
+}
+
+VkResult VKAPI_PTR wrap_vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData)
+{
+    return globalVulkanInstance->deviceFunctions(device)->vkMapMemory(device, memory, offset, size, flags, ppData);
+}
+
+void VKAPI_PTR wrap_vkUnmapMemory(VkDevice device, VkDeviceMemory memory)
+{
+    globalVulkanInstance->deviceFunctions(device)->vkUnmapMemory(device, memory);
+}
+
+VkResult VKAPI_PTR wrap_vkFlushMappedMemoryRanges(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges)
+{
+    return globalVulkanInstance->deviceFunctions(device)->vkFlushMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges);
+}
+
+VkResult VKAPI_PTR wrap_vkInvalidateMappedMemoryRanges(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges)
+{
+    return globalVulkanInstance->deviceFunctions(device)->vkInvalidateMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges);
+}
+
+VkResult VKAPI_PTR wrap_vkBindBufferMemory(VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset)
+{
+    return globalVulkanInstance->deviceFunctions(device)->vkBindBufferMemory(device, buffer, memory, memoryOffset);
+}
+
+VkResult VKAPI_PTR wrap_vkBindImageMemory(VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset)
+{
+    return globalVulkanInstance->deviceFunctions(device)->vkBindImageMemory(device, image, memory, memoryOffset);
+}
+
+void VKAPI_PTR wrap_vkGetBufferMemoryRequirements(VkDevice device, VkBuffer buffer, VkMemoryRequirements* pMemoryRequirements)
+{
+    globalVulkanInstance->deviceFunctions(device)->vkGetBufferMemoryRequirements(device, buffer, pMemoryRequirements);
+}
+
+void VKAPI_PTR wrap_vkGetImageMemoryRequirements(VkDevice device, VkImage image, VkMemoryRequirements* pMemoryRequirements)
+{
+    globalVulkanInstance->deviceFunctions(device)->vkGetImageMemoryRequirements(device, image, pMemoryRequirements);
+}
+
+VkResult VKAPI_PTR wrap_vkCreateBuffer(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer)
+{
+    return globalVulkanInstance->deviceFunctions(device)->vkCreateBuffer(device, pCreateInfo, pAllocator, pBuffer);
+}
+
+void VKAPI_PTR wrap_vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator)
+{
+    globalVulkanInstance->deviceFunctions(device)->vkDestroyBuffer(device, buffer, pAllocator);
+}
+
+VkResult VKAPI_PTR wrap_vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImage* pImage)
+{
+    return globalVulkanInstance->deviceFunctions(device)->vkCreateImage(device, pCreateInfo, pAllocator, pImage);
+}
+
+void VKAPI_PTR wrap_vkDestroyImage(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator)
+{
+    globalVulkanInstance->deviceFunctions(device)->vkDestroyImage(device, image, pAllocator);
+}
+
+static inline VmaAllocation toVmaAllocation(QVkAlloc a)
+{
+    return reinterpret_cast<VmaAllocation>(a);
+}
+
+static inline VmaAllocator toVmaAllocator(QVkAllocator a)
+{
+    return reinterpret_cast<VmaAllocator>(a);
+}
+
+QRhiVulkan::QRhiVulkan(QRhiVulkanInitParams *params, QRhiVulkanNativeHandles *importDevice)
+    : ofr(this)
+{
+    inst = params->inst;
+    maybeWindow = params->window; // may be null
+
+    importedDevice = importDevice != nullptr;
+    if (importedDevice) {
+        physDev = importDevice->physDev;
+        dev = importDevice->dev;
+        if (physDev && dev) {
+            gfxQueueFamilyIdx = importDevice->gfxQueueFamilyIdx;
+            gfxQueue = importDevice->gfxQueue;
+            if (importDevice->cmdPool) {
+                importedCmdPool = true;
+                cmdPool = importDevice->cmdPool;
+            }
+            if (importDevice->vmemAllocator) {
+                importedAllocator = true;
+                allocator = importDevice->vmemAllocator;
+            }
+        } else {
+            qWarning("No (physical) Vulkan device is given, cannot import");
+            importedDevice = false;
+        }
+    }
+}
+
+static bool qvk_debug_filter(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object,
+                             size_t location, int32_t messageCode, const char *pLayerPrefix, const char *pMessage)
+{
+    Q_UNUSED(flags);
+    Q_UNUSED(objectType);
+    Q_UNUSED(object);
+    Q_UNUSED(location);
+    Q_UNUSED(messageCode);
+    Q_UNUSED(pLayerPrefix);
+
+    // Filter out certain misleading validation layer messages, as per
+    // VulkanMemoryAllocator documentation.
+    if (strstr(pMessage, "Mapping an image with layout")
+        && strstr(pMessage, "can result in undefined behavior if this memory is used by the device"))
+    {
+        return true;
+    }
+
+    return false;
+}
+
+bool QRhiVulkan::create(QRhi::Flags flags)
+{
+    Q_UNUSED(flags);
+    Q_ASSERT(inst);
+
+    if (!inst->isValid()) {
+        qWarning("Vulkan instance is not valid");
+        return false;
+    }
+
+    globalVulkanInstance = inst; // assume this will not change during the lifetime of the entire application
+
+    f = inst->functions();
+
+    QVector<VkQueueFamilyProperties> queueFamilyProps;
+    auto queryQueueFamilyProps = [this, &queueFamilyProps] {
+        uint32_t queueCount = 0;
+        f->vkGetPhysicalDeviceQueueFamilyProperties(physDev, &queueCount, nullptr);
+        queueFamilyProps.resize(int(queueCount));
+        f->vkGetPhysicalDeviceQueueFamilyProperties(physDev, &queueCount, queueFamilyProps.data());
+    };
+
+    if (!importedDevice) {
+        uint32_t physDevCount = 0;
+        f->vkEnumeratePhysicalDevices(inst->vkInstance(), &physDevCount, nullptr);
+        if (!physDevCount) {
+            qWarning("No physical devices");
+            return false;
+        }
+        QVarLengthArray<VkPhysicalDevice, 4> physDevs(physDevCount);
+        VkResult err = f->vkEnumeratePhysicalDevices(inst->vkInstance(), &physDevCount, physDevs.data());
+        if (err != VK_SUCCESS || !physDevCount) {
+            qWarning("Failed to enumerate physical devices: %d", err);
+            return false;
+        }
+
+        int physDevIndex = -1;
+        int requestedPhysDevIndex = -1;
+        if (qEnvironmentVariableIsSet("QT_VK_PHYSICAL_DEVICE_INDEX"))
+            requestedPhysDevIndex = qEnvironmentVariableIntValue("QT_VK_PHYSICAL_DEVICE_INDEX");
+
+        if (requestedPhysDevIndex < 0 && flags.testFlag(QRhi::PreferSoftwareRenderer)) {
+            for (int i = 0; i < int(physDevCount); ++i) {
+                f->vkGetPhysicalDeviceProperties(physDevs[i], &physDevProperties);
+                if (physDevProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_CPU) {
+                    requestedPhysDevIndex = i;
+                    break;
+                }
+            }
+        }
+
+        for (int i = 0; i < int(physDevCount); ++i) {
+            f->vkGetPhysicalDeviceProperties(physDevs[i], &physDevProperties);
+            qCDebug(QRHI_LOG_INFO, "Physical device %d: '%s' %d.%d.%d (api %d.%d.%d vendor 0x%X device 0x%X type %d)",
+                    i,
+                    physDevProperties.deviceName,
+                    VK_VERSION_MAJOR(physDevProperties.driverVersion),
+                    VK_VERSION_MINOR(physDevProperties.driverVersion),
+                    VK_VERSION_PATCH(physDevProperties.driverVersion),
+                    VK_VERSION_MAJOR(physDevProperties.apiVersion),
+                    VK_VERSION_MINOR(physDevProperties.apiVersion),
+                    VK_VERSION_PATCH(physDevProperties.apiVersion),
+                    physDevProperties.vendorID,
+                    physDevProperties.deviceID,
+                    physDevProperties.deviceType);
+            if (physDevIndex < 0 && (requestedPhysDevIndex < 0 || requestedPhysDevIndex == int(i))) {
+                physDevIndex = i;
+                qCDebug(QRHI_LOG_INFO, "    using this physical device");
+            }
+        }
+
+        if (physDevIndex < 0) {
+            qWarning("No matching physical device");
+            return false;
+        }
+        physDev = physDevs[physDevIndex];
+
+        queryQueueFamilyProps();
+
+        gfxQueue = VK_NULL_HANDLE;
+
+        // We only support combined graphics+present queues. When it comes to
+        // compute, only combined graphics+compute queue is used, compute gets
+        // disabled otherwise.
+        gfxQueueFamilyIdx = -1;
+        int computelessGfxQueueCandidateIdx = -1;
+        for (int i = 0; i < queueFamilyProps.count(); ++i) {
+            qCDebug(QRHI_LOG_INFO, "queue family %d: flags=0x%x count=%d",
+                    i, queueFamilyProps[i].queueFlags, queueFamilyProps[i].queueCount);
+            if (gfxQueueFamilyIdx == -1
+                    && (queueFamilyProps[i].queueFlags & VK_QUEUE_GRAPHICS_BIT)
+                    && (!maybeWindow || inst->supportsPresent(physDev, uint32_t(i), maybeWindow)))
+            {
+                if (queueFamilyProps[i].queueFlags & VK_QUEUE_COMPUTE_BIT)
+                    gfxQueueFamilyIdx = i;
+                else if (computelessGfxQueueCandidateIdx == -1)
+                    computelessGfxQueueCandidateIdx = i;
+            }
+        }
+        if (gfxQueueFamilyIdx == -1) {
+            if (computelessGfxQueueCandidateIdx != -1) {
+                gfxQueueFamilyIdx = computelessGfxQueueCandidateIdx;
+            } else {
+                qWarning("No graphics (or no graphics+present) queue family found");
+                return false;
+            }
+        }
+
+        VkDeviceQueueCreateInfo queueInfo[2];
+        const float prio[] = { 0 };
+        memset(queueInfo, 0, sizeof(queueInfo));
+        queueInfo[0].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
+        queueInfo[0].queueFamilyIndex = uint32_t(gfxQueueFamilyIdx);
+        queueInfo[0].queueCount = 1;
+        queueInfo[0].pQueuePriorities = prio;
+
+        QVector<const char *> devLayers;
+        if (inst->layers().contains("VK_LAYER_LUNARG_standard_validation"))
+            devLayers.append("VK_LAYER_LUNARG_standard_validation");
+
+        uint32_t devExtCount = 0;
+        f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &devExtCount, nullptr);
+        QVector<VkExtensionProperties> devExts(devExtCount);
+        f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &devExtCount, devExts.data());
+        qCDebug(QRHI_LOG_INFO, "%d device extensions available", devExts.count());
+
+        QVector<const char *> requestedDevExts;
+        requestedDevExts.append("VK_KHR_swapchain");
+
+        debugMarkersAvailable = false;
+        vertexAttribDivisorAvailable = false;
+        for (const VkExtensionProperties &ext : devExts) {
+            if (!strcmp(ext.extensionName, VK_EXT_DEBUG_MARKER_EXTENSION_NAME)) {
+                requestedDevExts.append(VK_EXT_DEBUG_MARKER_EXTENSION_NAME);
+                debugMarkersAvailable = true;
+            } else if (!strcmp(ext.extensionName, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME)) {
+                if (inst->extensions().contains(QByteArrayLiteral("VK_KHR_get_physical_device_properties2"))) {
+                    requestedDevExts.append(VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME);
+                    vertexAttribDivisorAvailable = true;
+                }
+            }
+        }
+
+        VkDeviceCreateInfo devInfo;
+        memset(&devInfo, 0, sizeof(devInfo));
+        devInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
+        devInfo.queueCreateInfoCount = 1;
+        devInfo.pQueueCreateInfos = queueInfo;
+        devInfo.enabledLayerCount = uint32_t(devLayers.count());
+        devInfo.ppEnabledLayerNames = devLayers.constData();
+        devInfo.enabledExtensionCount = uint32_t(requestedDevExts.count());
+        devInfo.ppEnabledExtensionNames = requestedDevExts.constData();
+
+        err = f->vkCreateDevice(physDev, &devInfo, nullptr, &dev);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create device: %d", err);
+            return false;
+        }
+    }
+
+    df = inst->deviceFunctions(dev);
+
+    if (!importedCmdPool) {
+        VkCommandPoolCreateInfo poolInfo;
+        memset(&poolInfo, 0, sizeof(poolInfo));
+        poolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
+        poolInfo.queueFamilyIndex = uint32_t(gfxQueueFamilyIdx);
+        VkResult err = df->vkCreateCommandPool(dev, &poolInfo, nullptr, &cmdPool);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create command pool: %d", err);
+            return false;
+        }
+    }
+
+    if (gfxQueueFamilyIdx != -1) {
+        if (!gfxQueue)
+            df->vkGetDeviceQueue(dev, uint32_t(gfxQueueFamilyIdx), 0, &gfxQueue);
+
+        if (queueFamilyProps.isEmpty())
+            queryQueueFamilyProps();
+
+        hasCompute = (queueFamilyProps[gfxQueueFamilyIdx].queueFlags & VK_QUEUE_COMPUTE_BIT) != 0;
+        timestampValidBits = queueFamilyProps[gfxQueueFamilyIdx].timestampValidBits;
+    }
+
+    f->vkGetPhysicalDeviceProperties(physDev, &physDevProperties);
+    ubufAlign = physDevProperties.limits.minUniformBufferOffsetAlignment;
+    // helps little with an optimal offset of 1 (on some drivers) when the spec
+    // elsewhere states that the minimum bufferOffset is 4...
+    texbufAlign = qMax<VkDeviceSize>(4, physDevProperties.limits.optimalBufferCopyOffsetAlignment);
+
+    f->vkGetPhysicalDeviceFeatures(physDev, &physDevFeatures);
+    hasWideLines = physDevFeatures.wideLines;
+
+    if (!importedAllocator) {
+        VmaVulkanFunctions afuncs;
+        afuncs.vkGetPhysicalDeviceProperties = wrap_vkGetPhysicalDeviceProperties;
+        afuncs.vkGetPhysicalDeviceMemoryProperties = wrap_vkGetPhysicalDeviceMemoryProperties;
+        afuncs.vkAllocateMemory = wrap_vkAllocateMemory;
+        afuncs.vkFreeMemory = wrap_vkFreeMemory;
+        afuncs.vkMapMemory = wrap_vkMapMemory;
+        afuncs.vkUnmapMemory = wrap_vkUnmapMemory;
+        afuncs.vkFlushMappedMemoryRanges = wrap_vkFlushMappedMemoryRanges;
+        afuncs.vkInvalidateMappedMemoryRanges = wrap_vkInvalidateMappedMemoryRanges;
+        afuncs.vkBindBufferMemory = wrap_vkBindBufferMemory;
+        afuncs.vkBindImageMemory = wrap_vkBindImageMemory;
+        afuncs.vkGetBufferMemoryRequirements = wrap_vkGetBufferMemoryRequirements;
+        afuncs.vkGetImageMemoryRequirements = wrap_vkGetImageMemoryRequirements;
+        afuncs.vkCreateBuffer = wrap_vkCreateBuffer;
+        afuncs.vkDestroyBuffer = wrap_vkDestroyBuffer;
+        afuncs.vkCreateImage = wrap_vkCreateImage;
+        afuncs.vkDestroyImage = wrap_vkDestroyImage;
+
+        VmaAllocatorCreateInfo allocatorInfo;
+        memset(&allocatorInfo, 0, sizeof(allocatorInfo));
+        // A QRhi is supposed to be used from one single thread only. Disable
+        // the allocator's own mutexes. This gives a performance boost.
+        allocatorInfo.flags = VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT;
+        allocatorInfo.physicalDevice = physDev;
+        allocatorInfo.device = dev;
+        allocatorInfo.pVulkanFunctions = &afuncs;
+        VmaAllocator vmaallocator;
+        VkResult err = vmaCreateAllocator(&allocatorInfo, &vmaallocator);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create allocator: %d", err);
+            return false;
+        }
+        allocator = vmaallocator;
+    }
+
+    inst->installDebugOutputFilter(qvk_debug_filter);
+
+    VkDescriptorPool pool;
+    VkResult err = createDescriptorPool(&pool);
+    if (err == VK_SUCCESS)
+        descriptorPools.append(pool);
+    else
+        qWarning("Failed to create initial descriptor pool: %d", err);
+
+    VkQueryPoolCreateInfo timestampQueryPoolInfo;
+    memset(&timestampQueryPoolInfo, 0, sizeof(timestampQueryPoolInfo));
+    timestampQueryPoolInfo.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
+    timestampQueryPoolInfo.queryType = VK_QUERY_TYPE_TIMESTAMP;
+    timestampQueryPoolInfo.queryCount = QVK_MAX_ACTIVE_TIMESTAMP_PAIRS * 2;
+    err = df->vkCreateQueryPool(dev, &timestampQueryPoolInfo, nullptr, &timestampQueryPool);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create timestamp query pool: %d", err);
+        return false;
+    }
+    timestampQueryPoolMap.resize(QVK_MAX_ACTIVE_TIMESTAMP_PAIRS); // 1 bit per pair
+    timestampQueryPoolMap.fill(false);
+
+    if (debugMarkersAvailable) {
+        vkCmdDebugMarkerBegin = reinterpret_cast<PFN_vkCmdDebugMarkerBeginEXT>(f->vkGetDeviceProcAddr(dev, "vkCmdDebugMarkerBeginEXT"));
+        vkCmdDebugMarkerEnd = reinterpret_cast<PFN_vkCmdDebugMarkerEndEXT>(f->vkGetDeviceProcAddr(dev, "vkCmdDebugMarkerEndEXT"));
+        vkCmdDebugMarkerInsert = reinterpret_cast<PFN_vkCmdDebugMarkerInsertEXT>(f->vkGetDeviceProcAddr(dev, "vkCmdDebugMarkerInsertEXT"));
+        vkDebugMarkerSetObjectName = reinterpret_cast<PFN_vkDebugMarkerSetObjectNameEXT>(f->vkGetDeviceProcAddr(dev, "vkDebugMarkerSetObjectNameEXT"));
+    }
+
+    deviceLost = false;
+
+    nativeHandlesStruct.physDev = physDev;
+    nativeHandlesStruct.dev = dev;
+    nativeHandlesStruct.gfxQueueFamilyIdx = gfxQueueFamilyIdx;
+    nativeHandlesStruct.gfxQueue = gfxQueue;
+    nativeHandlesStruct.cmdPool = cmdPool;
+    nativeHandlesStruct.vmemAllocator = allocator;
+
+    return true;
+}
+
+void QRhiVulkan::destroy()
+{
+    if (!df)
+        return;
+
+    if (!deviceLost)
+        df->vkDeviceWaitIdle(dev);
+
+    executeDeferredReleases(true);
+    finishActiveReadbacks(true);
+
+    if (ofr.cmdFence) {
+        df->vkDestroyFence(dev, ofr.cmdFence, nullptr);
+        ofr.cmdFence = VK_NULL_HANDLE;
+    }
+
+    if (ofr.cbWrapper.cb) {
+        df->vkFreeCommandBuffers(dev, cmdPool, 1, &ofr.cbWrapper.cb);
+        ofr.cbWrapper.cb = VK_NULL_HANDLE;
+    }
+
+    if (pipelineCache) {
+        df->vkDestroyPipelineCache(dev, pipelineCache, nullptr);
+        pipelineCache = VK_NULL_HANDLE;
+    }
+
+    for (const DescriptorPoolData &pool : descriptorPools)
+        df->vkDestroyDescriptorPool(dev, pool.pool, nullptr);
+
+    descriptorPools.clear();
+
+    if (timestampQueryPool) {
+        df->vkDestroyQueryPool(dev, timestampQueryPool, nullptr);
+        timestampQueryPool = VK_NULL_HANDLE;
+    }
+
+    if (!importedAllocator && allocator) {
+        vmaDestroyAllocator(toVmaAllocator(allocator));
+        allocator = nullptr;
+    }
+
+    if (!importedCmdPool && cmdPool) {
+        df->vkDestroyCommandPool(dev, cmdPool, nullptr);
+        cmdPool = VK_NULL_HANDLE;
+    }
+
+    if (!importedDevice && dev) {
+        df->vkDestroyDevice(dev, nullptr);
+        inst->resetDeviceFunctions(dev);
+        dev = VK_NULL_HANDLE;
+    }
+
+    f = nullptr;
+    df = nullptr;
+}
+
+VkResult QRhiVulkan::createDescriptorPool(VkDescriptorPool *pool)
+{
+    VkDescriptorPoolSize descPoolSizes[] = {
+        { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, QVK_UNIFORM_BUFFERS_PER_POOL },
+        { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, QVK_UNIFORM_BUFFERS_PER_POOL },
+        { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, QVK_COMBINED_IMAGE_SAMPLERS_PER_POOL },
+        { VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, QVK_STORAGE_BUFFERS_PER_POOL },
+        { VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, QVK_STORAGE_IMAGES_PER_POOL }
+    };
+    VkDescriptorPoolCreateInfo descPoolInfo;
+    memset(&descPoolInfo, 0, sizeof(descPoolInfo));
+    descPoolInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
+    // Do not enable vkFreeDescriptorSets - sets are never freed on their own
+    // (good so no trouble with fragmentation), they just deref their pool
+    // which is then reset at some point (or not).
+    descPoolInfo.flags = 0;
+    descPoolInfo.maxSets = QVK_DESC_SETS_PER_POOL;
+    descPoolInfo.poolSizeCount = sizeof(descPoolSizes) / sizeof(descPoolSizes[0]);
+    descPoolInfo.pPoolSizes = descPoolSizes;
+    return df->vkCreateDescriptorPool(dev, &descPoolInfo, nullptr, pool);
+}
+
+bool QRhiVulkan::allocateDescriptorSet(VkDescriptorSetAllocateInfo *allocInfo, VkDescriptorSet *result, int *resultPoolIndex)
+{
+    auto tryAllocate = [this, allocInfo, result](int poolIndex) {
+        allocInfo->descriptorPool = descriptorPools[poolIndex].pool;
+        VkResult r = df->vkAllocateDescriptorSets(dev, allocInfo, result);
+        if (r == VK_SUCCESS)
+            descriptorPools[poolIndex].refCount += 1;
+        return r;
+    };
+
+    int lastPoolIdx = descriptorPools.count() - 1;
+    for (int i = lastPoolIdx; i >= 0; --i) {
+        if (descriptorPools[i].refCount == 0) {
+            df->vkResetDescriptorPool(dev, descriptorPools[i].pool, 0);
+            descriptorPools[i].allocedDescSets = 0;
+        }
+        if (descriptorPools[i].allocedDescSets + int(allocInfo->descriptorSetCount) <= QVK_DESC_SETS_PER_POOL) {
+            VkResult err = tryAllocate(i);
+            if (err == VK_SUCCESS) {
+                descriptorPools[i].allocedDescSets += allocInfo->descriptorSetCount;
+                *resultPoolIndex = i;
+                return true;
+            }
+        }
+    }
+
+    VkDescriptorPool newPool;
+    VkResult poolErr = createDescriptorPool(&newPool);
+    if (poolErr == VK_SUCCESS) {
+        descriptorPools.append(newPool);
+        lastPoolIdx = descriptorPools.count() - 1;
+        VkResult err = tryAllocate(lastPoolIdx);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to allocate descriptor set from new pool too, giving up: %d", err);
+            return false;
+        }
+        descriptorPools[lastPoolIdx].allocedDescSets += allocInfo->descriptorSetCount;
+        *resultPoolIndex = lastPoolIdx;
+        return true;
+    } else {
+        qWarning("Failed to allocate new descriptor pool: %d", poolErr);
+        return false;
+    }
+}
+
+static inline VkFormat toVkTextureFormat(QRhiTexture::Format format, QRhiTexture::Flags flags)
+{
+    const bool srgb = flags.testFlag(QRhiTexture::sRGB);
+    switch (format) {
+    case QRhiTexture::RGBA8:
+        return srgb ? VK_FORMAT_R8G8B8A8_SRGB : VK_FORMAT_R8G8B8A8_UNORM;
+    case QRhiTexture::BGRA8:
+        return srgb ? VK_FORMAT_B8G8R8A8_SRGB : VK_FORMAT_B8G8R8A8_UNORM;
+    case QRhiTexture::R8:
+        return srgb ? VK_FORMAT_R8_SRGB : VK_FORMAT_R8_UNORM;
+    case QRhiTexture::R16:
+        return VK_FORMAT_R16_UNORM;
+    case QRhiTexture::RED_OR_ALPHA8:
+        return VK_FORMAT_R8_UNORM;
+
+    case QRhiTexture::RGBA16F:
+        return VK_FORMAT_R16G16B16A16_SFLOAT;
+    case QRhiTexture::RGBA32F:
+        return VK_FORMAT_R32G32B32A32_SFLOAT;
+
+    case QRhiTexture::D16:
+        return VK_FORMAT_D16_UNORM;
+    case QRhiTexture::D32F:
+        return VK_FORMAT_D32_SFLOAT;
+
+    case QRhiTexture::BC1:
+        return srgb ? VK_FORMAT_BC1_RGB_SRGB_BLOCK : VK_FORMAT_BC1_RGB_UNORM_BLOCK;
+    case QRhiTexture::BC2:
+        return srgb ? VK_FORMAT_BC2_SRGB_BLOCK : VK_FORMAT_BC2_UNORM_BLOCK;
+    case QRhiTexture::BC3:
+        return srgb ? VK_FORMAT_BC3_SRGB_BLOCK : VK_FORMAT_BC3_UNORM_BLOCK;
+    case QRhiTexture::BC4:
+        return VK_FORMAT_BC4_UNORM_BLOCK;
+    case QRhiTexture::BC5:
+        return VK_FORMAT_BC5_UNORM_BLOCK;
+    case QRhiTexture::BC6H:
+        return VK_FORMAT_BC6H_UFLOAT_BLOCK;
+    case QRhiTexture::BC7:
+        return srgb ? VK_FORMAT_BC7_SRGB_BLOCK : VK_FORMAT_BC7_UNORM_BLOCK;
+
+    case QRhiTexture::ETC2_RGB8:
+        return srgb ? VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK : VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
+    case QRhiTexture::ETC2_RGB8A1:
+        return srgb ? VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK : VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
+    case QRhiTexture::ETC2_RGBA8:
+        return srgb ? VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK : VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
+
+    case QRhiTexture::ASTC_4x4:
+        return srgb ? VK_FORMAT_ASTC_4x4_SRGB_BLOCK : VK_FORMAT_ASTC_4x4_UNORM_BLOCK;
+    case QRhiTexture::ASTC_5x4:
+        return srgb ? VK_FORMAT_ASTC_5x4_SRGB_BLOCK : VK_FORMAT_ASTC_5x4_UNORM_BLOCK;
+    case QRhiTexture::ASTC_5x5:
+        return srgb ? VK_FORMAT_ASTC_5x5_SRGB_BLOCK : VK_FORMAT_ASTC_5x5_UNORM_BLOCK;
+    case QRhiTexture::ASTC_6x5:
+        return srgb ? VK_FORMAT_ASTC_6x5_SRGB_BLOCK : VK_FORMAT_ASTC_6x5_UNORM_BLOCK;
+    case QRhiTexture::ASTC_6x6:
+        return srgb ? VK_FORMAT_ASTC_6x6_SRGB_BLOCK : VK_FORMAT_ASTC_6x6_UNORM_BLOCK;
+    case QRhiTexture::ASTC_8x5:
+        return srgb ? VK_FORMAT_ASTC_8x5_SRGB_BLOCK : VK_FORMAT_ASTC_8x5_UNORM_BLOCK;
+    case QRhiTexture::ASTC_8x6:
+        return srgb ? VK_FORMAT_ASTC_8x6_SRGB_BLOCK : VK_FORMAT_ASTC_8x6_UNORM_BLOCK;
+    case QRhiTexture::ASTC_8x8:
+        return srgb ? VK_FORMAT_ASTC_8x8_SRGB_BLOCK : VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
+    case QRhiTexture::ASTC_10x5:
+        return srgb ? VK_FORMAT_ASTC_10x5_SRGB_BLOCK : VK_FORMAT_ASTC_10x5_UNORM_BLOCK;
+    case QRhiTexture::ASTC_10x6:
+        return srgb ? VK_FORMAT_ASTC_10x6_SRGB_BLOCK : VK_FORMAT_ASTC_10x6_UNORM_BLOCK;
+    case QRhiTexture::ASTC_10x8:
+        return srgb ? VK_FORMAT_ASTC_10x8_SRGB_BLOCK : VK_FORMAT_ASTC_10x8_UNORM_BLOCK;
+    case QRhiTexture::ASTC_10x10:
+        return srgb ? VK_FORMAT_ASTC_10x10_SRGB_BLOCK : VK_FORMAT_ASTC_10x10_UNORM_BLOCK;
+    case QRhiTexture::ASTC_12x10:
+        return srgb ? VK_FORMAT_ASTC_12x10_SRGB_BLOCK : VK_FORMAT_ASTC_12x10_UNORM_BLOCK;
+    case QRhiTexture::ASTC_12x12:
+        return srgb ? VK_FORMAT_ASTC_12x12_SRGB_BLOCK : VK_FORMAT_ASTC_12x12_UNORM_BLOCK;
+
+    default:
+        Q_UNREACHABLE();
+        return VK_FORMAT_R8G8B8A8_UNORM;
+    }
+}
+
+static inline QRhiTexture::Format colorTextureFormatFromVkFormat(VkFormat format, QRhiTexture::Flags *flags)
+{
+    switch (format) {
+    case VK_FORMAT_R8G8B8A8_UNORM:
+        return QRhiTexture::RGBA8;
+    case VK_FORMAT_R8G8B8A8_SRGB:
+        if (flags)
+            (*flags) |= QRhiTexture::sRGB;
+        return QRhiTexture::RGBA8;
+    case VK_FORMAT_B8G8R8A8_UNORM:
+        return QRhiTexture::BGRA8;
+    case VK_FORMAT_B8G8R8A8_SRGB:
+        if (flags)
+            (*flags) |= QRhiTexture::sRGB;
+        return QRhiTexture::BGRA8;
+    case VK_FORMAT_R8_UNORM:
+        return QRhiTexture::R8;
+    case VK_FORMAT_R8_SRGB:
+        if (flags)
+            (*flags) |= QRhiTexture::sRGB;
+        return QRhiTexture::R8;
+    case VK_FORMAT_R16_UNORM:
+        return QRhiTexture::R16;
+    default: // this cannot assert, must warn and return unknown
+        qWarning("VkFormat %d is not a recognized uncompressed color format", format);
+        break;
+    }
+    return QRhiTexture::UnknownFormat;
+}
+
+static inline bool isDepthTextureFormat(QRhiTexture::Format format)
+{
+    switch (format) {
+    case QRhiTexture::Format::D16:
+        Q_FALLTHROUGH();
+    case QRhiTexture::Format::D32F:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
+// Transient images ("render buffers") backed by lazily allocated memory are
+// managed manually without going through vk_mem_alloc since it does not offer
+// any support for such images. This should be ok since in practice there
+// should be very few of such images.
+
+uint32_t QRhiVulkan::chooseTransientImageMemType(VkImage img, uint32_t startIndex)
+{
+    VkPhysicalDeviceMemoryProperties physDevMemProps;
+    f->vkGetPhysicalDeviceMemoryProperties(physDev, &physDevMemProps);
+
+    VkMemoryRequirements memReq;
+    df->vkGetImageMemoryRequirements(dev, img, &memReq);
+    uint32_t memTypeIndex = uint32_t(-1);
+
+    if (memReq.memoryTypeBits) {
+        // Find a device local + lazily allocated, or at least device local memtype.
+        const VkMemoryType *memType = physDevMemProps.memoryTypes;
+        bool foundDevLocal = false;
+        for (uint32_t i = startIndex; i < physDevMemProps.memoryTypeCount; ++i) {
+            if (memReq.memoryTypeBits & (1 << i)) {
+                if (memType[i].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) {
+                    if (!foundDevLocal) {
+                        foundDevLocal = true;
+                        memTypeIndex = i;
+                    }
+                    if (memType[i].propertyFlags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) {
+                        memTypeIndex = i;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    return memTypeIndex;
+}
+
+bool QRhiVulkan::createTransientImage(VkFormat format,
+                                      const QSize &pixelSize,
+                                      VkImageUsageFlags usage,
+                                      VkImageAspectFlags aspectMask,
+                                      VkSampleCountFlagBits samples,
+                                      VkDeviceMemory *mem,
+                                      VkImage *images,
+                                      VkImageView *views,
+                                      int count)
+{
+    VkMemoryRequirements memReq;
+    VkResult err;
+
+    for (int i = 0; i < count; ++i) {
+        VkImageCreateInfo imgInfo;
+        memset(&imgInfo, 0, sizeof(imgInfo));
+        imgInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
+        imgInfo.imageType = VK_IMAGE_TYPE_2D;
+        imgInfo.format = format;
+        imgInfo.extent.width = uint32_t(pixelSize.width());
+        imgInfo.extent.height = uint32_t(pixelSize.height());
+        imgInfo.extent.depth = 1;
+        imgInfo.mipLevels = imgInfo.arrayLayers = 1;
+        imgInfo.samples = samples;
+        imgInfo.tiling = VK_IMAGE_TILING_OPTIMAL;
+        imgInfo.usage = usage | VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT;
+        imgInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+
+        err = df->vkCreateImage(dev, &imgInfo, nullptr, images + i);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create image: %d", err);
+            return false;
+        }
+
+        // Assume the reqs are the same since the images are same in every way.
+        // Still, call GetImageMemReq for every image, in order to prevent the
+        // validation layer from complaining.
+        df->vkGetImageMemoryRequirements(dev, images[i], &memReq);
+    }
+
+    VkMemoryAllocateInfo memInfo;
+    memset(&memInfo, 0, sizeof(memInfo));
+    memInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+    memInfo.allocationSize = aligned(memReq.size, memReq.alignment) * VkDeviceSize(count);
+
+    uint32_t startIndex = 0;
+    do {
+        memInfo.memoryTypeIndex = chooseTransientImageMemType(images[0], startIndex);
+        if (memInfo.memoryTypeIndex == uint32_t(-1)) {
+            qWarning("No suitable memory type found");
+            return false;
+        }
+        startIndex = memInfo.memoryTypeIndex + 1;
+        err = df->vkAllocateMemory(dev, &memInfo, nullptr, mem);
+        if (err != VK_SUCCESS && err != VK_ERROR_OUT_OF_DEVICE_MEMORY) {
+            qWarning("Failed to allocate image memory: %d", err);
+            return false;
+        }
+    } while (err != VK_SUCCESS);
+
+    VkDeviceSize ofs = 0;
+    for (int i = 0; i < count; ++i) {
+        err = df->vkBindImageMemory(dev, images[i], *mem, ofs);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to bind image memory: %d", err);
+            return false;
+        }
+        ofs += aligned(memReq.size, memReq.alignment);
+
+        VkImageViewCreateInfo imgViewInfo;
+        memset(&imgViewInfo, 0, sizeof(imgViewInfo));
+        imgViewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+        imgViewInfo.image = images[i];
+        imgViewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
+        imgViewInfo.format = format;
+        imgViewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+        imgViewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+        imgViewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+        imgViewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
+        imgViewInfo.subresourceRange.aspectMask = aspectMask;
+        imgViewInfo.subresourceRange.levelCount = imgViewInfo.subresourceRange.layerCount = 1;
+
+        err = df->vkCreateImageView(dev, &imgViewInfo, nullptr, views + i);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create image view: %d", err);
+            return false;
+        }
+    }
+
+    return true;
+}
+
+VkFormat QRhiVulkan::optimalDepthStencilFormat()
+{
+    if (optimalDsFormat != VK_FORMAT_UNDEFINED)
+        return optimalDsFormat;
+
+    const VkFormat dsFormatCandidates[] = {
+        VK_FORMAT_D24_UNORM_S8_UINT,
+        VK_FORMAT_D32_SFLOAT_S8_UINT,
+        VK_FORMAT_D16_UNORM_S8_UINT
+    };
+    const int dsFormatCandidateCount = sizeof(dsFormatCandidates) / sizeof(VkFormat);
+    int dsFormatIdx = 0;
+    while (dsFormatIdx < dsFormatCandidateCount) {
+        optimalDsFormat = dsFormatCandidates[dsFormatIdx];
+        VkFormatProperties fmtProp;
+        f->vkGetPhysicalDeviceFormatProperties(physDev, optimalDsFormat, &fmtProp);
+        if (fmtProp.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)
+            break;
+        ++dsFormatIdx;
+    }
+    if (dsFormatIdx == dsFormatCandidateCount)
+        qWarning("Failed to find an optimal depth-stencil format");
+
+    return optimalDsFormat;
+}
+
+bool QRhiVulkan::createDefaultRenderPass(VkRenderPass *rp, bool hasDepthStencil, VkSampleCountFlagBits samples, VkFormat colorFormat)
+{
+    VkAttachmentDescription attDesc[3];
+    memset(attDesc, 0, sizeof(attDesc));
+
+    // attachment list layout is color (1), ds (0-1), resolve (0-1)
+
+    attDesc[0].format = colorFormat;
+    attDesc[0].samples = samples;
+    attDesc[0].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+    attDesc[0].storeOp = samples > VK_SAMPLE_COUNT_1_BIT ? VK_ATTACHMENT_STORE_OP_DONT_CARE : VK_ATTACHMENT_STORE_OP_STORE;
+    attDesc[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+    attDesc[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+    attDesc[0].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+    attDesc[0].finalLayout = samples > VK_SAMPLE_COUNT_1_BIT ? VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL : VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+
+    // clear on load + no store + lazy alloc + transient image should play
+    // nicely with tiled GPUs (no physical backing necessary for ds buffer)
+    attDesc[1].format = optimalDepthStencilFormat();
+    attDesc[1].samples = samples;
+    attDesc[1].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+    attDesc[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+    attDesc[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+    attDesc[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+    attDesc[1].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+    attDesc[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+
+    if (samples > VK_SAMPLE_COUNT_1_BIT) {
+        attDesc[2].format = colorFormat;
+        attDesc[2].samples = VK_SAMPLE_COUNT_1_BIT;
+        attDesc[2].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+        attDesc[2].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+        attDesc[2].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+        attDesc[2].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+        attDesc[2].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+        attDesc[2].finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+    }
+
+    VkAttachmentReference colorRef = { 0, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
+    VkAttachmentReference dsRef = { 1, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL };
+    VkAttachmentReference resolveRef = { 2, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
+
+    VkSubpassDescription subpassDesc;
+    memset(&subpassDesc, 0, sizeof(subpassDesc));
+    subpassDesc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+    subpassDesc.colorAttachmentCount = 1;
+    subpassDesc.pColorAttachments = &colorRef;
+    subpassDesc.pDepthStencilAttachment = hasDepthStencil ? &dsRef : nullptr;
+
+    // Replace the first implicit dep (TOP_OF_PIPE / ALL_COMMANDS) with our own.
+    VkSubpassDependency subpassDep;
+    memset(&subpassDep, 0, sizeof(subpassDep));
+    subpassDep.srcSubpass = VK_SUBPASS_EXTERNAL;
+    subpassDep.dstSubpass = 0;
+    subpassDep.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+    subpassDep.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+    subpassDep.srcAccessMask = 0;
+    subpassDep.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+
+    VkRenderPassCreateInfo rpInfo;
+    memset(&rpInfo, 0, sizeof(rpInfo));
+    rpInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
+    rpInfo.attachmentCount = 1;
+    rpInfo.pAttachments = attDesc;
+    rpInfo.subpassCount = 1;
+    rpInfo.pSubpasses = &subpassDesc;
+    rpInfo.dependencyCount = 1;
+    rpInfo.pDependencies = &subpassDep;
+
+    if (hasDepthStencil)
+        rpInfo.attachmentCount += 1;
+
+    if (samples > VK_SAMPLE_COUNT_1_BIT) {
+        rpInfo.attachmentCount += 1;
+        subpassDesc.pResolveAttachments = &resolveRef;
+    }
+
+    VkResult err = df->vkCreateRenderPass(dev, &rpInfo, nullptr, rp);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create renderpass: %d", err);
+        return false;
+    }
+
+    return true;
+}
+
+bool QRhiVulkan::createOffscreenRenderPass(VkRenderPass *rp,
+                                           const QRhiColorAttachment *firstColorAttachment,
+                                           const QRhiColorAttachment *lastColorAttachment,
+                                           bool preserveColor,
+                                           bool preserveDs,
+                                           QRhiRenderBuffer *depthStencilBuffer,
+                                           QRhiTexture *depthTexture)
+{
+    QVarLengthArray<VkAttachmentDescription, 8> attDescs;
+    QVarLengthArray<VkAttachmentReference, 8> colorRefs;
+    QVarLengthArray<VkAttachmentReference, 8> resolveRefs;
+
+    // attachment list layout is color (0-8), ds (0-1), resolve (0-8)
+
+    for (auto it = firstColorAttachment; it != lastColorAttachment; ++it) {
+        QVkTexture *texD = QRHI_RES(QVkTexture, it->texture());
+        QVkRenderBuffer *rbD = QRHI_RES(QVkRenderBuffer, it->renderBuffer());
+        Q_ASSERT(texD || rbD);
+        const VkFormat vkformat = texD ? texD->vkformat : rbD->vkformat;
+        const VkSampleCountFlagBits samples = texD ? texD->samples : rbD->samples;
+
+        VkAttachmentDescription attDesc;
+        memset(&attDesc, 0, sizeof(attDesc));
+        attDesc.format = vkformat;
+        attDesc.samples = samples;
+        attDesc.loadOp = preserveColor ? VK_ATTACHMENT_LOAD_OP_LOAD : VK_ATTACHMENT_LOAD_OP_CLEAR;
+        attDesc.storeOp = it->resolveTexture() ? VK_ATTACHMENT_STORE_OP_DONT_CARE : VK_ATTACHMENT_STORE_OP_STORE;
+        attDesc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+        attDesc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+        // this has to interact correctly with activateTextureRenderTarget(), hence leaving in COLOR_ATT
+        attDesc.initialLayout = preserveColor ? VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL : VK_IMAGE_LAYOUT_UNDEFINED;
+        attDesc.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+        attDescs.append(attDesc);
+
+        const VkAttachmentReference ref = { uint32_t(attDescs.count() - 1), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
+        colorRefs.append(ref);
+    }
+
+    const bool hasDepthStencil = depthStencilBuffer || depthTexture;
+    if (hasDepthStencil) {
+        const VkFormat dsFormat = depthTexture ? QRHI_RES(QVkTexture, depthTexture)->vkformat
+                                               : QRHI_RES(QVkRenderBuffer, depthStencilBuffer)->vkformat;
+        const VkSampleCountFlagBits samples = depthTexture ? QRHI_RES(QVkTexture, depthTexture)->samples
+                                                           : QRHI_RES(QVkRenderBuffer, depthStencilBuffer)->samples;
+        const VkAttachmentLoadOp loadOp = preserveDs ? VK_ATTACHMENT_LOAD_OP_LOAD : VK_ATTACHMENT_LOAD_OP_CLEAR;
+        const VkAttachmentStoreOp storeOp = depthTexture ? VK_ATTACHMENT_STORE_OP_STORE : VK_ATTACHMENT_STORE_OP_DONT_CARE;
+        VkAttachmentDescription attDesc;
+        memset(&attDesc, 0, sizeof(attDesc));
+        attDesc.format = dsFormat;
+        attDesc.samples = samples;
+        attDesc.loadOp = loadOp;
+        attDesc.storeOp = storeOp;
+        attDesc.stencilLoadOp = loadOp;
+        attDesc.stencilStoreOp = storeOp;
+        attDesc.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+        attDesc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+        attDescs.append(attDesc);
+    }
+    VkAttachmentReference dsRef = { uint32_t(attDescs.count() - 1), VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL };
+
+    for (auto it = firstColorAttachment; it != lastColorAttachment; ++it) {
+        if (it->resolveTexture()) {
+            QVkTexture *rtexD = QRHI_RES(QVkTexture, it->resolveTexture());
+            if (rtexD->samples > VK_SAMPLE_COUNT_1_BIT)
+                qWarning("Resolving into a multisample texture is not supported");
+
+            VkAttachmentDescription attDesc;
+            memset(&attDesc, 0, sizeof(attDesc));
+            attDesc.format = rtexD->vkformat;
+            attDesc.samples = VK_SAMPLE_COUNT_1_BIT;
+            attDesc.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; // ignored
+            attDesc.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+            attDesc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+            attDesc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+            attDesc.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+            attDesc.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+            attDescs.append(attDesc);
+
+            const VkAttachmentReference ref = { uint32_t(attDescs.count() - 1), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
+            resolveRefs.append(ref);
+        } else {
+            const VkAttachmentReference ref = { VK_ATTACHMENT_UNUSED, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
+            resolveRefs.append(ref);
+        }
+    }
+
+    VkSubpassDescription subpassDesc;
+    memset(&subpassDesc, 0, sizeof(subpassDesc));
+    subpassDesc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+    subpassDesc.colorAttachmentCount = uint32_t(colorRefs.count());
+    Q_ASSERT(colorRefs.count() == resolveRefs.count());
+    subpassDesc.pColorAttachments = !colorRefs.isEmpty() ? colorRefs.constData() : nullptr;
+    subpassDesc.pDepthStencilAttachment = hasDepthStencil ? &dsRef : nullptr;
+    subpassDesc.pResolveAttachments = !resolveRefs.isEmpty() ? resolveRefs.constData() : nullptr;
+
+    VkRenderPassCreateInfo rpInfo;
+    memset(&rpInfo, 0, sizeof(rpInfo));
+    rpInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
+    rpInfo.attachmentCount = uint32_t(attDescs.count());
+    rpInfo.pAttachments = attDescs.constData();
+    rpInfo.subpassCount = 1;
+    rpInfo.pSubpasses = &subpassDesc;
+    // don't yet know the correct initial/final access and stage stuff for the
+    // implicit deps at this point, so leave it to the resource tracking to
+    // generate barriers
+
+    VkResult err = df->vkCreateRenderPass(dev, &rpInfo, nullptr, rp);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create renderpass: %d", err);
+        return false;
+    }
+
+    return true;
+}
+
+bool QRhiVulkan::recreateSwapChain(QRhiSwapChain *swapChain)
+{
+    QVkSwapChain *swapChainD = QRHI_RES(QVkSwapChain, swapChain);
+    if (swapChainD->pixelSize.isEmpty()) {
+        qWarning("Surface size is 0, cannot create swapchain");
+        return false;
+    }
+
+    df->vkDeviceWaitIdle(dev);
+
+    if (!vkCreateSwapchainKHR) {
+        vkCreateSwapchainKHR = reinterpret_cast<PFN_vkCreateSwapchainKHR>(f->vkGetDeviceProcAddr(dev, "vkCreateSwapchainKHR"));
+        vkDestroySwapchainKHR = reinterpret_cast<PFN_vkDestroySwapchainKHR>(f->vkGetDeviceProcAddr(dev, "vkDestroySwapchainKHR"));
+        vkGetSwapchainImagesKHR = reinterpret_cast<PFN_vkGetSwapchainImagesKHR>(f->vkGetDeviceProcAddr(dev, "vkGetSwapchainImagesKHR"));
+        vkAcquireNextImageKHR = reinterpret_cast<PFN_vkAcquireNextImageKHR>(f->vkGetDeviceProcAddr(dev, "vkAcquireNextImageKHR"));
+        vkQueuePresentKHR = reinterpret_cast<PFN_vkQueuePresentKHR>(f->vkGetDeviceProcAddr(dev, "vkQueuePresentKHR"));
+        if (!vkCreateSwapchainKHR || !vkDestroySwapchainKHR || !vkGetSwapchainImagesKHR || !vkAcquireNextImageKHR || !vkQueuePresentKHR) {
+            qWarning("Swapchain functions not available");
+            return false;
+        }
+    }
+
+    VkSurfaceCapabilitiesKHR surfaceCaps;
+    vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physDev, swapChainD->surface, &surfaceCaps);
+    quint32 reqBufferCount;
+    if (swapChainD->m_flags.testFlag(QRhiSwapChain::MinimalBufferCount)) {
+        reqBufferCount = qMax<quint32>(2, surfaceCaps.minImageCount);
+    } else {
+        const quint32 maxBuffers = QVkSwapChain::MAX_BUFFER_COUNT;
+        if (surfaceCaps.maxImageCount)
+            reqBufferCount = qMax(qMin(surfaceCaps.maxImageCount, maxBuffers), surfaceCaps.minImageCount);
+        else
+            reqBufferCount = qMax<quint32>(2, surfaceCaps.minImageCount);
+    }
+
+    VkSurfaceTransformFlagBitsKHR preTransform =
+        (surfaceCaps.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
+        ? VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR
+        : surfaceCaps.currentTransform;
+
+    VkCompositeAlphaFlagBitsKHR compositeAlpha =
+        (surfaceCaps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR)
+        ? VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR
+        : VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
+
+    if (swapChainD->m_flags.testFlag(QRhiSwapChain::SurfaceHasPreMulAlpha)
+            && (surfaceCaps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR))
+    {
+        compositeAlpha = VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR;
+    }
+
+    if (swapChainD->m_flags.testFlag(QRhiSwapChain::SurfaceHasNonPreMulAlpha)
+            && (surfaceCaps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_POST_MULTIPLIED_BIT_KHR))
+    {
+        compositeAlpha = VK_COMPOSITE_ALPHA_POST_MULTIPLIED_BIT_KHR;
+    }
+
+    VkImageUsageFlags usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+    swapChainD->supportsReadback = (surfaceCaps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT);
+    if (swapChainD->supportsReadback && swapChainD->m_flags.testFlag(QRhiSwapChain::UsedAsTransferSource))
+        usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+
+    VkPresentModeKHR presentMode = VK_PRESENT_MODE_FIFO_KHR;
+    if (swapChainD->m_flags.testFlag(QRhiSwapChain::NoVSync)) {
+        if (swapChainD->supportedPresentationModes.contains(VK_PRESENT_MODE_MAILBOX_KHR))
+            presentMode = VK_PRESENT_MODE_MAILBOX_KHR;
+        else if (swapChainD->supportedPresentationModes.contains(VK_PRESENT_MODE_IMMEDIATE_KHR))
+            presentMode = VK_PRESENT_MODE_IMMEDIATE_KHR;
+    }
+
+    // If the surface is different than before, then passing in the old
+    // swapchain associated with the old surface can fail the swapchain
+    // creation. (for example, Android loses the surface when backgrounding and
+    // restoring applications, and it also enforces failing swapchain creation
+    // with VK_ERROR_NATIVE_WINDOW_IN_USE_KHR if the old swapchain is provided)
+    const bool reuseExisting = swapChainD->sc && swapChainD->lastConnectedSurface == swapChainD->surface;
+
+    qCDebug(QRHI_LOG_INFO, "Creating %s swapchain of %u buffers, size %dx%d, presentation mode %d",
+            reuseExisting ? "recycled" : "new",
+            reqBufferCount, swapChainD->pixelSize.width(), swapChainD->pixelSize.height(), presentMode);
+
+    VkSwapchainCreateInfoKHR swapChainInfo;
+    memset(&swapChainInfo, 0, sizeof(swapChainInfo));
+    swapChainInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
+    swapChainInfo.surface = swapChainD->surface;
+    swapChainInfo.minImageCount = reqBufferCount;
+    swapChainInfo.imageFormat = swapChainD->colorFormat;
+    swapChainInfo.imageColorSpace = swapChainD->colorSpace;
+    swapChainInfo.imageExtent = VkExtent2D { uint32_t(swapChainD->pixelSize.width()), uint32_t(swapChainD->pixelSize.height()) };
+    swapChainInfo.imageArrayLayers = 1;
+    swapChainInfo.imageUsage = usage;
+    swapChainInfo.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    swapChainInfo.preTransform = preTransform;
+    swapChainInfo.compositeAlpha = compositeAlpha;
+    swapChainInfo.presentMode = presentMode;
+    swapChainInfo.clipped = true;
+    swapChainInfo.oldSwapchain = reuseExisting ? swapChainD->sc : VK_NULL_HANDLE;
+
+    VkSwapchainKHR newSwapChain;
+    VkResult err = vkCreateSwapchainKHR(dev, &swapChainInfo, nullptr, &newSwapChain);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create swapchain: %d", err);
+        return false;
+    }
+
+    if (swapChainD->sc)
+        releaseSwapChainResources(swapChain);
+
+    swapChainD->sc = newSwapChain;
+    swapChainD->lastConnectedSurface = swapChainD->surface;
+
+    quint32 actualSwapChainBufferCount = 0;
+    err = vkGetSwapchainImagesKHR(dev, swapChainD->sc, &actualSwapChainBufferCount, nullptr);
+    if (err != VK_SUCCESS || actualSwapChainBufferCount < 2) {
+        qWarning("Failed to get swapchain images: %d (count=%u)", err, actualSwapChainBufferCount);
+        return false;
+    }
+
+    if (actualSwapChainBufferCount > QVkSwapChain::MAX_BUFFER_COUNT) {
+        qWarning("Too many swapchain buffers (%u)", actualSwapChainBufferCount);
+        return false;
+    }
+    if (actualSwapChainBufferCount != reqBufferCount)
+        qCDebug(QRHI_LOG_INFO, "Actual swapchain buffer count is %u", actualSwapChainBufferCount);
+    swapChainD->bufferCount = int(actualSwapChainBufferCount);
+
+    VkImage swapChainImages[QVkSwapChain::MAX_BUFFER_COUNT];
+    err = vkGetSwapchainImagesKHR(dev, swapChainD->sc, &actualSwapChainBufferCount, swapChainImages);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to get swapchain images: %d", err);
+        return false;
+    }
+
+    VkImage msaaImages[QVkSwapChain::MAX_BUFFER_COUNT];
+    VkImageView msaaViews[QVkSwapChain::MAX_BUFFER_COUNT];
+    if (swapChainD->samples > VK_SAMPLE_COUNT_1_BIT) {
+        if (!createTransientImage(swapChainD->colorFormat,
+                                  swapChainD->pixelSize,
+                                  VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
+                                  VK_IMAGE_ASPECT_COLOR_BIT,
+                                  swapChainD->samples,
+                                  &swapChainD->msaaImageMem,
+                                  msaaImages,
+                                  msaaViews,
+                                  swapChainD->bufferCount))
+        {
+            qWarning("Failed to create transient image for MSAA color buffer");
+            return false;
+        }
+    }
+
+    VkFenceCreateInfo fenceInfo;
+    memset(&fenceInfo, 0, sizeof(fenceInfo));
+    fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
+    fenceInfo.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+
+    for (int i = 0; i < swapChainD->bufferCount; ++i) {
+        QVkSwapChain::ImageResources &image(swapChainD->imageRes[i]);
+        image.image = swapChainImages[i];
+        if (swapChainD->samples > VK_SAMPLE_COUNT_1_BIT) {
+            image.msaaImage = msaaImages[i];
+            image.msaaImageView = msaaViews[i];
+        }
+
+        VkImageViewCreateInfo imgViewInfo;
+        memset(&imgViewInfo, 0, sizeof(imgViewInfo));
+        imgViewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+        imgViewInfo.image = swapChainImages[i];
+        imgViewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
+        imgViewInfo.format = swapChainD->colorFormat;
+        imgViewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+        imgViewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+        imgViewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+        imgViewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
+        imgViewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        imgViewInfo.subresourceRange.levelCount = imgViewInfo.subresourceRange.layerCount = 1;
+        err = df->vkCreateImageView(dev, &imgViewInfo, nullptr, &image.imageView);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create swapchain image view %d: %d", i, err);
+            return false;
+        }
+
+        image.lastUse = QVkSwapChain::ImageResources::ScImageUseNone;
+    }
+
+    swapChainD->currentImageIndex = 0;
+
+    VkSemaphoreCreateInfo semInfo;
+    memset(&semInfo, 0, sizeof(semInfo));
+    semInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
+        QVkSwapChain::FrameResources &frame(swapChainD->frameRes[i]);
+
+        frame.imageAcquired = false;
+        frame.imageSemWaitable = false;
+
+        df->vkCreateFence(dev, &fenceInfo, nullptr, &frame.imageFence);
+        frame.imageFenceWaitable = true; // fence was created in signaled state
+
+        df->vkCreateSemaphore(dev, &semInfo, nullptr, &frame.imageSem);
+        df->vkCreateSemaphore(dev, &semInfo, nullptr, &frame.drawSem);
+
+        err = df->vkCreateFence(dev, &fenceInfo, nullptr, &frame.cmdFence);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create command buffer fence: %d", err);
+            return false;
+        }
+        frame.cmdFenceWaitable = true; // fence was created in signaled state
+    }
+
+    swapChainD->currentFrameSlot = 0;
+
+    return true;
+}
+
+void QRhiVulkan::releaseSwapChainResources(QRhiSwapChain *swapChain)
+{
+    QVkSwapChain *swapChainD = QRHI_RES(QVkSwapChain, swapChain);
+
+    if (swapChainD->sc == VK_NULL_HANDLE)
+        return;
+
+    if (!deviceLost)
+        df->vkDeviceWaitIdle(dev);
+
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
+        QVkSwapChain::FrameResources &frame(swapChainD->frameRes[i]);
+        if (frame.cmdFence) {
+            if (frame.cmdFenceWaitable)
+                df->vkWaitForFences(dev, 1, &frame.cmdFence, VK_TRUE, UINT64_MAX);
+            df->vkDestroyFence(dev, frame.cmdFence, nullptr);
+            frame.cmdFence = VK_NULL_HANDLE;
+            frame.cmdFenceWaitable = false;
+        }
+        if (frame.imageFence) {
+            if (frame.imageFenceWaitable)
+                df->vkWaitForFences(dev, 1, &frame.imageFence, VK_TRUE, UINT64_MAX);
+            df->vkDestroyFence(dev, frame.imageFence, nullptr);
+            frame.imageFence = VK_NULL_HANDLE;
+            frame.imageFenceWaitable = false;
+        }
+        if (frame.imageSem) {
+            df->vkDestroySemaphore(dev, frame.imageSem, nullptr);
+            frame.imageSem = VK_NULL_HANDLE;
+        }
+        if (frame.drawSem) {
+            df->vkDestroySemaphore(dev, frame.drawSem, nullptr);
+            frame.drawSem = VK_NULL_HANDLE;
+        }
+        if (frame.cmdBuf) {
+            df->vkFreeCommandBuffers(dev, cmdPool, 1, &frame.cmdBuf);
+            frame.cmdBuf = VK_NULL_HANDLE;
+        }
+    }
+
+    for (int i = 0; i < swapChainD->bufferCount; ++i) {
+        QVkSwapChain::ImageResources &image(swapChainD->imageRes[i]);
+        if (image.fb) {
+            df->vkDestroyFramebuffer(dev, image.fb, nullptr);
+            image.fb = VK_NULL_HANDLE;
+        }
+        if (image.imageView) {
+            df->vkDestroyImageView(dev, image.imageView, nullptr);
+            image.imageView = VK_NULL_HANDLE;
+        }
+        if (image.msaaImageView) {
+            df->vkDestroyImageView(dev, image.msaaImageView, nullptr);
+            image.msaaImageView = VK_NULL_HANDLE;
+        }
+        if (image.msaaImage) {
+            df->vkDestroyImage(dev, image.msaaImage, nullptr);
+            image.msaaImage = VK_NULL_HANDLE;
+        }
+    }
+
+    if (swapChainD->msaaImageMem) {
+        df->vkFreeMemory(dev, swapChainD->msaaImageMem, nullptr);
+        swapChainD->msaaImageMem = VK_NULL_HANDLE;
+    }
+
+    vkDestroySwapchainKHR(dev, swapChainD->sc, nullptr);
+    swapChainD->sc = VK_NULL_HANDLE;
+
+    // NB! surface and similar must remain intact
+}
+
+QRhi::FrameOpResult QRhiVulkan::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags)
+{
+    QVkSwapChain *swapChainD = QRHI_RES(QVkSwapChain, swapChain);
+    QVkSwapChain::FrameResources &frame(swapChainD->frameRes[swapChainD->currentFrameSlot]);
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+
+    if (!frame.imageAcquired) {
+        // Wait if we are too far ahead, i.e. the thread gets throttled based on the presentation rate
+        // (note that we are using FIFO mode -> vsync)
+        if (frame.imageFenceWaitable) {
+            df->vkWaitForFences(dev, 1, &frame.imageFence, VK_TRUE, UINT64_MAX);
+            df->vkResetFences(dev, 1, &frame.imageFence);
+            frame.imageFenceWaitable = false;
+        }
+
+        // move on to next swapchain image
+        VkResult err = vkAcquireNextImageKHR(dev, swapChainD->sc, UINT64_MAX,
+                                             frame.imageSem, frame.imageFence, &frame.imageIndex);
+        if (err == VK_SUCCESS || err == VK_SUBOPTIMAL_KHR) {
+            swapChainD->currentImageIndex = frame.imageIndex;
+            frame.imageSemWaitable = true;
+            frame.imageAcquired = true;
+            frame.imageFenceWaitable = true;
+        } else if (err == VK_ERROR_OUT_OF_DATE_KHR) {
+            return QRhi::FrameOpSwapChainOutOfDate;
+        } else {
+            if (err == VK_ERROR_DEVICE_LOST) {
+                qWarning("Device loss detected in vkAcquireNextImageKHR()");
+                deviceLost = true;
+                return QRhi::FrameOpDeviceLost;
+            }
+            qWarning("Failed to acquire next swapchain image: %d", err);
+            return QRhi::FrameOpError;
+        }
+    }
+
+    // Make sure the previous commands for the same image have finished. (note
+    // that this is based on the fence from the command buffer submit, nothing
+    // to do with the Present)
+    //
+    // Do this also for any other swapchain's commands with the same frame slot
+    // While this reduces concurrency, it keeps resource usage safe: swapchain
+    // A starting its frame 0, followed by swapchain B starting its own frame 0
+    // will make B wait for A's frame 0 commands, so if a resource is written
+    // in B's frame or when B checks for pending resource releases, that won't
+    // mess up A's in-flight commands (as they are not in flight anymore).
+    waitCommandCompletion(int(swapChainD->currentFrameSlot));
+
+    // Now is the time to read the timestamps for the previous frame for this slot.
+    if (frame.timestampQueryIndex >= 0) {
+        quint64 timestamp[2] = { 0, 0 };
+        VkResult err = df->vkGetQueryPoolResults(dev, timestampQueryPool, uint32_t(frame.timestampQueryIndex), 2,
+                                                 2 * sizeof(quint64), timestamp, sizeof(quint64),
+                                                 VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT);
+        timestampQueryPoolMap.clearBit(frame.timestampQueryIndex / 2);
+        frame.timestampQueryIndex = -1;
+        if (err == VK_SUCCESS) {
+            quint64 mask = 0;
+            for (quint64 i = 0; i < timestampValidBits; i += 8)
+                mask |= 0xFFULL << i;
+            const quint64 ts0 = timestamp[0] & mask;
+            const quint64 ts1 = timestamp[1] & mask;
+            const float nsecsPerTick = physDevProperties.limits.timestampPeriod;
+            if (!qFuzzyIsNull(nsecsPerTick)) {
+                const float elapsedMs = float(ts1 - ts0) * nsecsPerTick / 1000000.0f;
+                // now we have the gpu time for the previous frame for this slot, report it
+                // (does not matter that it is not for this frame)
+                QRHI_PROF_F(swapChainFrameGpuTime(swapChain, elapsedMs));
+            }
+        } else {
+            qWarning("Failed to query timestamp: %d", err);
+        }
+    }
+
+    // build new draw command buffer
+    QRhi::FrameOpResult cbres = startPrimaryCommandBuffer(&frame.cmdBuf);
+    if (cbres != QRhi::FrameOpSuccess)
+        return cbres;
+
+    // when profiling is enabled, pick a free query (pair) from the pool
+    int timestampQueryIdx = -1;
+    if (profilerPrivateOrNull()) {
+        for (int i = 0; i < timestampQueryPoolMap.count(); ++i) {
+            if (!timestampQueryPoolMap.testBit(i)) {
+                timestampQueryPoolMap.setBit(i);
+                timestampQueryIdx = i * 2;
+                break;
+            }
+        }
+    }
+    if (timestampQueryIdx >= 0) {
+        df->vkCmdResetQueryPool(frame.cmdBuf, timestampQueryPool, uint32_t(timestampQueryIdx), 2);
+        // record timestamp at the start of the command buffer
+        df->vkCmdWriteTimestamp(frame.cmdBuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+                                timestampQueryPool, uint32_t(timestampQueryIdx));
+        frame.timestampQueryIndex = timestampQueryIdx;
+    }
+
+    swapChainD->cbWrapper.cb = frame.cmdBuf;
+    swapChainD->cbWrapper.useSecondaryCb = flags.testFlag(QRhi::ExternalContentsInPass);
+
+    QVkSwapChain::ImageResources &image(swapChainD->imageRes[swapChainD->currentImageIndex]);
+    swapChainD->rtWrapper.d.fb = image.fb;
+
+    currentFrameSlot = int(swapChainD->currentFrameSlot);
+    currentSwapChain = swapChainD;
+    if (swapChainD->ds)
+        swapChainD->ds->lastActiveFrameSlot = currentFrameSlot;
+
+    QRHI_PROF_F(beginSwapChainFrame(swapChain));
+
+    prepareNewFrame(&swapChainD->cbWrapper);
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiVulkan::endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags)
+{
+    QVkSwapChain *swapChainD = QRHI_RES(QVkSwapChain, swapChain);
+    Q_ASSERT(currentSwapChain == swapChainD);
+
+    recordPrimaryCommandBuffer(&swapChainD->cbWrapper);
+
+    QVkSwapChain::FrameResources &frame(swapChainD->frameRes[swapChainD->currentFrameSlot]);
+    QVkSwapChain::ImageResources &image(swapChainD->imageRes[swapChainD->currentImageIndex]);
+
+    if (image.lastUse != QVkSwapChain::ImageResources::ScImageUseRender) {
+        VkImageMemoryBarrier presTrans;
+        memset(&presTrans, 0, sizeof(presTrans));
+        presTrans.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+        presTrans.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+        presTrans.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+        presTrans.image = image.image;
+        presTrans.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        presTrans.subresourceRange.levelCount = presTrans.subresourceRange.layerCount = 1;
+
+        if (image.lastUse == QVkSwapChain::ImageResources::ScImageUseNone) {
+            // was not used at all (no render pass), just transition from undefined to presentable
+            presTrans.srcAccessMask = 0;
+            presTrans.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+            df->vkCmdPipelineBarrier(frame.cmdBuf,
+                                     VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                                     0, 0, nullptr, 0, nullptr,
+                                     1, &presTrans);
+        } else if (image.lastUse == QVkSwapChain::ImageResources::ScImageUseTransferSource) {
+            // was used in a readback as transfer source, go back to presentable layout
+            presTrans.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+            presTrans.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+            df->vkCmdPipelineBarrier(frame.cmdBuf,
+                                     VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                                     0, 0, nullptr, 0, nullptr,
+                                     1, &presTrans);
+        }
+        image.lastUse = QVkSwapChain::ImageResources::ScImageUseRender;
+    }
+
+    // record another timestamp, when enabled
+    if (frame.timestampQueryIndex >= 0) {
+        df->vkCmdWriteTimestamp(frame.cmdBuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
+                                timestampQueryPool, uint32_t(frame.timestampQueryIndex + 1));
+    }
+
+    // stop recording and submit to the queue
+    Q_ASSERT(!frame.cmdFenceWaitable);
+    const bool needsPresent = !flags.testFlag(QRhi::SkipPresent);
+    QRhi::FrameOpResult submitres = endAndSubmitPrimaryCommandBuffer(frame.cmdBuf,
+                                                                     frame.cmdFence,
+                                                                     frame.imageSemWaitable ? &frame.imageSem : nullptr,
+                                                                     needsPresent ? &frame.drawSem : nullptr);
+    if (submitres != QRhi::FrameOpSuccess)
+        return submitres;
+
+    frame.imageSemWaitable = false;
+    frame.cmdFenceWaitable = true;
+
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    // this must be done before the Present
+    QRHI_PROF_F(endSwapChainFrame(swapChain, swapChainD->frameCount + 1));
+
+    if (needsPresent) {
+        // add the Present to the queue
+        VkPresentInfoKHR presInfo;
+        memset(&presInfo, 0, sizeof(presInfo));
+        presInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
+        presInfo.swapchainCount = 1;
+        presInfo.pSwapchains = &swapChainD->sc;
+        presInfo.pImageIndices = &swapChainD->currentImageIndex;
+        presInfo.waitSemaphoreCount = 1;
+        presInfo.pWaitSemaphores = &frame.drawSem; // gfxQueueFamilyIdx == presQueueFamilyIdx ? &frame.drawSem : &frame.presTransSem;
+
+        VkResult err = vkQueuePresentKHR(gfxQueue, &presInfo);
+        if (err != VK_SUCCESS) {
+            if (err == VK_ERROR_OUT_OF_DATE_KHR) {
+                return QRhi::FrameOpSwapChainOutOfDate;
+            } else if (err != VK_SUBOPTIMAL_KHR) {
+                if (err == VK_ERROR_DEVICE_LOST) {
+                    qWarning("Device loss detected in vkQueuePresentKHR()");
+                    deviceLost = true;
+                    return QRhi::FrameOpDeviceLost;
+                }
+                qWarning("Failed to present: %d", err);
+                return QRhi::FrameOpError;
+            }
+        }
+
+        // Do platform-specific WM notification. F.ex. essential on X11 in
+        // order to prevent glitches on resizing the window.
+        inst->presentQueued(swapChainD->window);
+
+        // mark the current swapchain buffer as unused from our side
+        frame.imageAcquired = false;
+        // and move on to the next buffer
+        swapChainD->currentFrameSlot = (swapChainD->currentFrameSlot + 1) % QVK_FRAMES_IN_FLIGHT;
+    }
+
+    swapChainD->frameCount += 1;
+    currentSwapChain = nullptr;
+    return QRhi::FrameOpSuccess;
+}
+
+void QRhiVulkan::prepareNewFrame(QRhiCommandBuffer *cb)
+{
+    // Now is the time to do things for frame N-F, where N is the current one,
+    // F is QVK_FRAMES_IN_FLIGHT, because only here it is guaranteed that that
+    // frame has completed on the GPU (due to the fence wait in beginFrame). To
+    // decide if something is safe to handle now a simple "lastActiveFrameSlot
+    // == currentFrameSlot" is sufficient (remember that e.g. with F==2
+    // currentFrameSlot goes 0, 1, 0, 1, 0, ...)
+    //
+    // With multiple swapchains on the same QRhi things get more convoluted
+    // (and currentFrameSlot strictly alternating is not true anymore) but
+    // beginNonWrapperFrame() solves that by blocking as necessary so the rest
+    // here is safe regardless.
+
+    executeDeferredReleases();
+
+    QRHI_RES(QVkCommandBuffer, cb)->resetState();
+
+    finishActiveReadbacks(); // last, in case the readback-completed callback issues rhi calls
+}
+
+QRhi::FrameOpResult QRhiVulkan::startPrimaryCommandBuffer(VkCommandBuffer *cb)
+{
+    if (*cb) {
+        df->vkFreeCommandBuffers(dev, cmdPool, 1, cb);
+        *cb = VK_NULL_HANDLE;
+    }
+
+    VkCommandBufferAllocateInfo cmdBufInfo;
+    memset(&cmdBufInfo, 0, sizeof(cmdBufInfo));
+    cmdBufInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+    cmdBufInfo.commandPool = cmdPool;
+    cmdBufInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+    cmdBufInfo.commandBufferCount = 1;
+
+    VkResult err = df->vkAllocateCommandBuffers(dev, &cmdBufInfo, cb);
+    if (err != VK_SUCCESS) {
+        if (err == VK_ERROR_DEVICE_LOST) {
+            qWarning("Device loss detected in vkAllocateCommandBuffers()");
+            deviceLost = true;
+            return QRhi::FrameOpDeviceLost;
+        }
+        qWarning("Failed to allocate frame command buffer: %d", err);
+        return QRhi::FrameOpError;
+    }
+
+    VkCommandBufferBeginInfo cmdBufBeginInfo;
+    memset(&cmdBufBeginInfo, 0, sizeof(cmdBufBeginInfo));
+    cmdBufBeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+
+    err = df->vkBeginCommandBuffer(*cb, &cmdBufBeginInfo);
+    if (err != VK_SUCCESS) {
+        if (err == VK_ERROR_DEVICE_LOST) {
+            qWarning("Device loss detected in vkBeginCommandBuffer()");
+            deviceLost = true;
+            return QRhi::FrameOpDeviceLost;
+        }
+        qWarning("Failed to begin frame command buffer: %d", err);
+        return QRhi::FrameOpError;
+    }
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiVulkan::endAndSubmitPrimaryCommandBuffer(VkCommandBuffer cb, VkFence cmdFence,
+                                                                 VkSemaphore *waitSem, VkSemaphore *signalSem)
+{
+    VkResult err = df->vkEndCommandBuffer(cb);
+    if (err != VK_SUCCESS) {
+        if (err == VK_ERROR_DEVICE_LOST) {
+            qWarning("Device loss detected in vkEndCommandBuffer()");
+            deviceLost = true;
+            return QRhi::FrameOpDeviceLost;
+        }
+        qWarning("Failed to end frame command buffer: %d", err);
+        return QRhi::FrameOpError;
+    }
+
+    VkSubmitInfo submitInfo;
+    memset(&submitInfo, 0, sizeof(submitInfo));
+    submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+    submitInfo.commandBufferCount = 1;
+    submitInfo.pCommandBuffers = &cb;
+    if (waitSem) {
+        submitInfo.waitSemaphoreCount = 1;
+        submitInfo.pWaitSemaphores = waitSem;
+    }
+    if (signalSem) {
+        submitInfo.signalSemaphoreCount = 1;
+        submitInfo.pSignalSemaphores = signalSem;
+    }
+    VkPipelineStageFlags psf = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+    submitInfo.pWaitDstStageMask = &psf;
+
+    err = df->vkQueueSubmit(gfxQueue, 1, &submitInfo, cmdFence);
+    if (err != VK_SUCCESS) {
+        if (err == VK_ERROR_DEVICE_LOST) {
+            qWarning("Device loss detected in vkQueueSubmit()");
+            deviceLost = true;
+            return QRhi::FrameOpDeviceLost;
+        }
+        qWarning("Failed to submit to graphics queue: %d", err);
+        return QRhi::FrameOpError;
+    }
+
+    return QRhi::FrameOpSuccess;
+}
+
+void QRhiVulkan::waitCommandCompletion(int frameSlot)
+{
+    for (QVkSwapChain *sc : qAsConst(swapchains)) {
+        QVkSwapChain::FrameResources &frame(sc->frameRes[frameSlot]);
+        if (frame.cmdFenceWaitable) {
+            df->vkWaitForFences(dev, 1, &frame.cmdFence, VK_TRUE, UINT64_MAX);
+            df->vkResetFences(dev, 1, &frame.cmdFence);
+            frame.cmdFenceWaitable = false;
+        }
+    }
+}
+
+QRhi::FrameOpResult QRhiVulkan::beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags)
+{
+    QRhi::FrameOpResult cbres = startPrimaryCommandBuffer(&ofr.cbWrapper.cb);
+    if (cbres != QRhi::FrameOpSuccess)
+        return cbres;
+
+    // Switch to the next slot manually. Swapchains do not know about this
+    // which is good. So for example a - unusual but possible - onscreen,
+    // onscreen, offscreen, onscreen, onscreen, onscreen sequence of
+    // begin/endFrame leads to 0, 1, 0, 0, 1, 0. This works because the
+    // offscreen frame is synchronous in the sense that we wait for execution
+    // to complete in endFrame, and so no resources used in that frame are busy
+    // anymore in the next frame.
+    currentFrameSlot = (currentFrameSlot + 1) % QVK_FRAMES_IN_FLIGHT;
+    // except that this gets complicated with multiple swapchains so make sure
+    // any pending commands have finished for the frame slot we are going to use
+    if (swapchains.count() > 1)
+        waitCommandCompletion(currentFrameSlot);
+
+    ofr.cbWrapper.useSecondaryCb = flags.testFlag(QRhi::ExternalContentsInPass);
+
+    prepareNewFrame(&ofr.cbWrapper);
+    ofr.active = true;
+
+    *cb = &ofr.cbWrapper;
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiVulkan::endOffscreenFrame(QRhi::EndFrameFlags flags)
+{
+    Q_UNUSED(flags);
+    Q_ASSERT(ofr.active);
+    ofr.active = false;
+
+    recordPrimaryCommandBuffer(&ofr.cbWrapper);
+
+    if (!ofr.cmdFence) {
+        VkFenceCreateInfo fenceInfo;
+        memset(&fenceInfo, 0, sizeof(fenceInfo));
+        fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
+        VkResult err = df->vkCreateFence(dev, &fenceInfo, nullptr, &ofr.cmdFence);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create command buffer fence: %d", err);
+            return QRhi::FrameOpError;
+        }
+    }
+
+    QRhi::FrameOpResult submitres = endAndSubmitPrimaryCommandBuffer(ofr.cbWrapper.cb, ofr.cmdFence, nullptr, nullptr);
+    if (submitres != QRhi::FrameOpSuccess)
+        return submitres;
+
+    // wait for completion
+    df->vkWaitForFences(dev, 1, &ofr.cmdFence, VK_TRUE, UINT64_MAX);
+    df->vkResetFences(dev, 1, &ofr.cmdFence);
+
+    // Here we know that executing the host-side reads for this (or any
+    // previous) frame is safe since we waited for completion above.
+    finishActiveReadbacks(true);
+
+    return QRhi::FrameOpSuccess;
+}
+
+QRhi::FrameOpResult QRhiVulkan::finish()
+{
+    QVkSwapChain *swapChainD = nullptr;
+    if (inFrame) {
+        // There is either a swapchain or an offscreen frame on-going.
+        // End command recording and submit what we have.
+        VkCommandBuffer cb;
+        if (ofr.active) {
+            Q_ASSERT(!currentSwapChain);
+            Q_ASSERT(ofr.cbWrapper.recordingPass == QVkCommandBuffer::NoPass);
+            recordPrimaryCommandBuffer(&ofr.cbWrapper);
+            ofr.cbWrapper.resetCommands();
+            cb = ofr.cbWrapper.cb;
+        } else {
+            Q_ASSERT(currentSwapChain);
+            Q_ASSERT(currentSwapChain->cbWrapper.recordingPass == QVkCommandBuffer::NoPass);
+            swapChainD = currentSwapChain;
+            recordPrimaryCommandBuffer(&swapChainD->cbWrapper);
+            swapChainD->cbWrapper.resetCommands();
+            cb = swapChainD->cbWrapper.cb;
+        }
+        QRhi::FrameOpResult submitres = endAndSubmitPrimaryCommandBuffer(cb, VK_NULL_HANDLE, nullptr, nullptr);
+        if (submitres != QRhi::FrameOpSuccess)
+            return submitres;
+    }
+
+    df->vkQueueWaitIdle(gfxQueue);
+
+    if (inFrame) {
+        // Allocate and begin recording on a new command buffer.
+        if (ofr.active)
+            startPrimaryCommandBuffer(&ofr.cbWrapper.cb);
+        else
+            startPrimaryCommandBuffer(&swapChainD->frameRes[swapChainD->currentFrameSlot].cmdBuf);
+    }
+
+    executeDeferredReleases(true);
+    finishActiveReadbacks(true);
+
+    return QRhi::FrameOpSuccess;
+}
+
+static inline QRhiPassResourceTracker::UsageState toPassTrackerUsageState(const QVkBuffer::UsageState &bufUsage)
+{
+    QRhiPassResourceTracker::UsageState u;
+    u.layout = 0; // unused with buffers
+    u.access = int(bufUsage.access);
+    u.stage = int(bufUsage.stage);
+    return u;
+}
+
+static inline QRhiPassResourceTracker::UsageState toPassTrackerUsageState(const QVkTexture::UsageState &texUsage)
+{
+    QRhiPassResourceTracker::UsageState u;
+    u.layout = texUsage.layout;
+    u.access = int(texUsage.access);
+    u.stage = int(texUsage.stage);
+    return u;
+}
+
+void QRhiVulkan::activateTextureRenderTarget(QVkCommandBuffer *cbD, QVkTextureRenderTarget *rtD)
+{
+    rtD->lastActiveFrameSlot = currentFrameSlot;
+    rtD->d.rp->lastActiveFrameSlot = currentFrameSlot;
+    QRhiPassResourceTracker &passResTracker(cbD->passResTrackers[cbD->currentPassResTrackerIndex]);
+    for (auto it = rtD->m_desc.cbeginColorAttachments(), itEnd = rtD->m_desc.cendColorAttachments(); it != itEnd; ++it) {
+        QVkTexture *texD = QRHI_RES(QVkTexture, it->texture());
+        QVkTexture *resolveTexD = QRHI_RES(QVkTexture, it->resolveTexture());
+        QVkRenderBuffer *rbD = QRHI_RES(QVkRenderBuffer, it->renderBuffer());
+        if (texD) {
+            trackedRegisterTexture(&passResTracker, texD,
+                                   QRhiPassResourceTracker::TexColorOutput,
+                                   QRhiPassResourceTracker::TexColorOutputStage);
+            texD->lastActiveFrameSlot = currentFrameSlot;
+        } else if (rbD) {
+            // Won't register rbD->backingTexture because it cannot be used for
+            // anything in a renderpass, its use makes only sense in
+            // combination with a resolveTexture.
+            rbD->lastActiveFrameSlot = currentFrameSlot;
+        }
+        if (resolveTexD) {
+            trackedRegisterTexture(&passResTracker, resolveTexD,
+                                   QRhiPassResourceTracker::TexColorOutput,
+                                   QRhiPassResourceTracker::TexColorOutputStage);
+            resolveTexD->lastActiveFrameSlot = currentFrameSlot;
+        }
+    }
+    if (rtD->m_desc.depthStencilBuffer())
+        QRHI_RES(QVkRenderBuffer, rtD->m_desc.depthStencilBuffer())->lastActiveFrameSlot = currentFrameSlot;
+    if (rtD->m_desc.depthTexture()) {
+        QVkTexture *depthTexD = QRHI_RES(QVkTexture, rtD->m_desc.depthTexture());
+        trackedRegisterTexture(&passResTracker, depthTexD,
+                               QRhiPassResourceTracker::TexDepthOutput,
+                               QRhiPassResourceTracker::TexDepthOutputStage);
+        depthTexD->lastActiveFrameSlot = currentFrameSlot;
+    }
+}
+
+void QRhiVulkan::resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::NoPass);
+
+    enqueueResourceUpdates(cbD, resourceUpdates);
+}
+
+VkCommandBuffer QRhiVulkan::startSecondaryCommandBuffer(QVkRenderTargetData *rtD)
+{
+    VkCommandBuffer secondaryCb;
+
+    VkCommandBufferAllocateInfo cmdBufInfo;
+    memset(&cmdBufInfo, 0, sizeof(cmdBufInfo));
+    cmdBufInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+    cmdBufInfo.commandPool = cmdPool;
+    cmdBufInfo.level = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
+    cmdBufInfo.commandBufferCount = 1;
+    VkResult err = df->vkAllocateCommandBuffers(dev, &cmdBufInfo, &secondaryCb);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create secondary command buffer: %d", err);
+        return VK_NULL_HANDLE;
+    }
+
+    VkCommandBufferBeginInfo cmdBufBeginInfo;
+    memset(&cmdBufBeginInfo, 0, sizeof(cmdBufBeginInfo));
+    cmdBufBeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+    cmdBufBeginInfo.flags = rtD ? VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT : 0;
+    VkCommandBufferInheritanceInfo cmdBufInheritInfo;
+    memset(&cmdBufInheritInfo, 0, sizeof(cmdBufInheritInfo));
+    cmdBufInheritInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO;
+    cmdBufInheritInfo.subpass = 0;
+    if (rtD) {
+        cmdBufInheritInfo.renderPass = rtD->rp->rp;
+        cmdBufInheritInfo.framebuffer = rtD->fb;
+    }
+    cmdBufBeginInfo.pInheritanceInfo = &cmdBufInheritInfo;
+
+    err = df->vkBeginCommandBuffer(secondaryCb, &cmdBufBeginInfo);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to begin secondary command buffer: %d", err);
+        df->vkFreeCommandBuffers(dev, cmdPool, 1, &secondaryCb);
+        return VK_NULL_HANDLE;
+    }
+
+    return secondaryCb;
+}
+
+void QRhiVulkan::endAndEnqueueSecondaryCommandBuffer(VkCommandBuffer cb, QVkCommandBuffer *cbD)
+{
+    VkResult err = df->vkEndCommandBuffer(cb);
+    if (err != VK_SUCCESS)
+        qWarning("Failed to end secondary command buffer: %d", err);
+
+    QVkCommandBuffer::Command cmd;
+    cmd.cmd = QVkCommandBuffer::Command::ExecuteSecondary;
+    cmd.args.executeSecondary.cb = cb;
+    cbD->commands.append(cmd);
+
+    deferredReleaseSecondaryCommandBuffer(cb);
+}
+
+void QRhiVulkan::deferredReleaseSecondaryCommandBuffer(VkCommandBuffer cb)
+{
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::CommandBuffer;
+    e.lastActiveFrameSlot = currentFrameSlot;
+    e.commandBuffer.cb = cb;
+    releaseQueue.append(e);
+}
+
+void QRhiVulkan::beginPass(QRhiCommandBuffer *cb,
+                           QRhiRenderTarget *rt,
+                           const QColor &colorClearValue,
+                           const QRhiDepthStencilClearValue &depthStencilClearValue,
+                           QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::NoPass);
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cbD, resourceUpdates);
+
+    // Insert a TransitionPassResources into the command stream, pointing to
+    // the tracker this pass is going to use. That's how we generate the
+    // barriers later during recording the real VkCommandBuffer, right before
+    // the vkCmdBeginRenderPass.
+    enqueueTransitionPassResources(cbD);
+
+    QVkRenderTargetData *rtD = nullptr;
+    switch (rt->resourceType()) {
+    case QRhiResource::RenderTarget:
+        rtD = &QRHI_RES(QVkReferenceRenderTarget, rt)->d;
+        rtD->rp->lastActiveFrameSlot = currentFrameSlot;
+        Q_ASSERT(currentSwapChain);
+        currentSwapChain->imageRes[currentSwapChain->currentImageIndex].lastUse =
+                QVkSwapChain::ImageResources::ScImageUseRender;
+        break;
+    case QRhiResource::TextureRenderTarget:
+    {
+        QVkTextureRenderTarget *rtTex = QRHI_RES(QVkTextureRenderTarget, rt);
+        rtD = &rtTex->d;
+        activateTextureRenderTarget(cbD, rtTex);
+    }
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    cbD->recordingPass = QVkCommandBuffer::RenderPass;
+    cbD->currentTarget = rt;
+
+    // No copy operations or image layout transitions allowed after this point
+    // (up until endPass) as we are going to begin the renderpass.
+
+    VkRenderPassBeginInfo rpBeginInfo;
+    memset(&rpBeginInfo, 0, sizeof(rpBeginInfo));
+    rpBeginInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
+    rpBeginInfo.renderPass = rtD->rp->rp;
+    rpBeginInfo.framebuffer = rtD->fb;
+    rpBeginInfo.renderArea.extent.width = uint32_t(rtD->pixelSize.width());
+    rpBeginInfo.renderArea.extent.height = uint32_t(rtD->pixelSize.height());
+
+    QVarLengthArray<VkClearValue, 4> cvs;
+    for (int i = 0; i < rtD->colorAttCount; ++i) {
+        VkClearValue cv;
+        cv.color = { { float(colorClearValue.redF()), float(colorClearValue.greenF()), float(colorClearValue.blueF()),
+                       float(colorClearValue.alphaF()) } };
+        cvs.append(cv);
+    }
+    for (int i = 0; i < rtD->dsAttCount; ++i) {
+        VkClearValue cv;
+        cv.depthStencil = { depthStencilClearValue.depthClearValue(), depthStencilClearValue.stencilClearValue() };
+        cvs.append(cv);
+    }
+    for (int i = 0; i < rtD->resolveAttCount; ++i) {
+        VkClearValue cv;
+        cv.color = { { float(colorClearValue.redF()), float(colorClearValue.greenF()), float(colorClearValue.blueF()),
+                       float(colorClearValue.alphaF()) } };
+        cvs.append(cv);
+    }
+    rpBeginInfo.clearValueCount = uint32_t(cvs.count());
+
+    QVkCommandBuffer::Command cmd;
+    cmd.cmd = QVkCommandBuffer::Command::BeginRenderPass;
+    cmd.args.beginRenderPass.desc = rpBeginInfo;
+    cmd.args.beginRenderPass.clearValueIndex = cbD->pools.clearValue.count();
+    cbD->pools.clearValue.append(cvs.constData(), cvs.count());
+    cbD->commands.append(cmd);
+
+    if (cbD->useSecondaryCb)
+        cbD->secondaryCbs.append(startSecondaryCommandBuffer(rtD));
+}
+
+void QRhiVulkan::endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+
+    if (cbD->useSecondaryCb) {
+        VkCommandBuffer secondaryCb = cbD->secondaryCbs.last();
+        cbD->secondaryCbs.removeLast();
+        endAndEnqueueSecondaryCommandBuffer(secondaryCb, cbD);
+        cbD->resetCachedState();
+    }
+
+    QVkCommandBuffer::Command cmd;
+    cmd.cmd = QVkCommandBuffer::Command::EndRenderPass;
+    cbD->commands.append(cmd);
+
+    cbD->recordingPass = QVkCommandBuffer::NoPass;
+    cbD->currentTarget = nullptr;
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cbD, resourceUpdates);
+}
+
+void QRhiVulkan::beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::NoPass);
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cbD, resourceUpdates);
+
+    enqueueTransitionPassResources(cbD);
+
+    cbD->recordingPass = QVkCommandBuffer::ComputePass;
+
+    if (cbD->useSecondaryCb)
+        cbD->secondaryCbs.append(startSecondaryCommandBuffer());
+}
+
+void QRhiVulkan::endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::ComputePass);
+
+    if (cbD->useSecondaryCb) {
+        VkCommandBuffer secondaryCb = cbD->secondaryCbs.last();
+        cbD->secondaryCbs.removeLast();
+        endAndEnqueueSecondaryCommandBuffer(secondaryCb, cbD);
+        cbD->resetCachedState();
+    }
+
+    cbD->recordingPass = QVkCommandBuffer::NoPass;
+
+    if (resourceUpdates)
+        enqueueResourceUpdates(cbD, resourceUpdates);
+}
+
+void QRhiVulkan::setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps)
+{
+    QVkComputePipeline *psD = QRHI_RES(QVkComputePipeline, ps);
+    Q_ASSERT(psD->pipeline);
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::ComputePass);
+
+    if (cbD->currentComputePipeline != ps || cbD->currentPipelineGeneration != psD->generation) {
+        if (cbD->useSecondaryCb) {
+            df->vkCmdBindPipeline(cbD->secondaryCbs.last(), VK_PIPELINE_BIND_POINT_COMPUTE, psD->pipeline);
+        } else {
+            QVkCommandBuffer::Command cmd;
+            cmd.cmd = QVkCommandBuffer::Command::BindPipeline;
+            cmd.args.bindPipeline.bindPoint = VK_PIPELINE_BIND_POINT_COMPUTE;
+            cmd.args.bindPipeline.pipeline = psD->pipeline;
+            cbD->commands.append(cmd);
+        }
+
+        cbD->currentGraphicsPipeline = nullptr;
+        cbD->currentComputePipeline = ps;
+        cbD->currentPipelineGeneration = psD->generation;
+    }
+
+    psD->lastActiveFrameSlot = currentFrameSlot;
+}
+
+void QRhiVulkan::dispatch(QRhiCommandBuffer *cb, int x, int y, int z)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::ComputePass);
+
+    if (cbD->useSecondaryCb) {
+        df->vkCmdDispatch(cbD->secondaryCbs.last(), uint32_t(x), uint32_t(y), uint32_t(z));
+    } else {
+        QVkCommandBuffer::Command cmd;
+        cmd.cmd = QVkCommandBuffer::Command::Dispatch;
+        cmd.args.dispatch.x = x;
+        cmd.args.dispatch.y = y;
+        cmd.args.dispatch.z = z;
+        cbD->commands.append(cmd);
+    }
+}
+
+VkShaderModule QRhiVulkan::createShader(const QByteArray &spirv)
+{
+    VkShaderModuleCreateInfo shaderInfo;
+    memset(&shaderInfo, 0, sizeof(shaderInfo));
+    shaderInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
+    shaderInfo.codeSize = size_t(spirv.size());
+    shaderInfo.pCode = reinterpret_cast<const quint32 *>(spirv.constData());
+    VkShaderModule shaderModule;
+    VkResult err = df->vkCreateShaderModule(dev, &shaderInfo, nullptr, &shaderModule);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create shader module: %d", err);
+        return VK_NULL_HANDLE;
+    }
+    return shaderModule;
+}
+
+bool QRhiVulkan::ensurePipelineCache()
+{
+    if (pipelineCache)
+        return true;
+
+    VkPipelineCacheCreateInfo pipelineCacheInfo;
+    memset(&pipelineCacheInfo, 0, sizeof(pipelineCacheInfo));
+    pipelineCacheInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
+    VkResult err = df->vkCreatePipelineCache(dev, &pipelineCacheInfo, nullptr, &pipelineCache);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create pipeline cache: %d", err);
+        return false;
+    }
+    return true;
+}
+
+void QRhiVulkan::updateShaderResourceBindings(QRhiShaderResourceBindings *srb, int descSetIdx)
+{
+    QVkShaderResourceBindings *srbD = QRHI_RES(QVkShaderResourceBindings, srb);
+
+    QVarLengthArray<VkDescriptorBufferInfo, 4> bufferInfos;
+    QVarLengthArray<VkDescriptorImageInfo, 4> imageInfos;
+    QVarLengthArray<VkWriteDescriptorSet, 8> writeInfos;
+
+    const bool updateAll = descSetIdx < 0;
+    int frameSlot = updateAll ? 0 : descSetIdx;
+    while (frameSlot < (updateAll ? QVK_FRAMES_IN_FLIGHT : descSetIdx + 1)) {
+        srbD->boundResourceData[frameSlot].resize(srbD->sortedBindings.count());
+        for (int i = 0, ie = srbD->sortedBindings.count(); i != ie; ++i) {
+            const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings.at(i).data();
+            QVkShaderResourceBindings::BoundResourceData &bd(srbD->boundResourceData[frameSlot][i]);
+
+            VkWriteDescriptorSet writeInfo;
+            memset(&writeInfo, 0, sizeof(writeInfo));
+            writeInfo.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+            writeInfo.dstSet = srbD->descSets[frameSlot];
+            writeInfo.dstBinding = uint32_t(b->binding);
+            writeInfo.descriptorCount = 1;
+
+            switch (b->type) {
+            case QRhiShaderResourceBinding::UniformBuffer:
+            {
+                writeInfo.descriptorType = b->u.ubuf.hasDynamicOffset ? VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC
+                                                                      : VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+                QRhiBuffer *buf = b->u.ubuf.buf;
+                QVkBuffer *bufD = QRHI_RES(QVkBuffer, buf);
+                bd.ubuf.id = bufD->m_id;
+                bd.ubuf.generation = bufD->generation;
+                VkDescriptorBufferInfo bufInfo;
+                bufInfo.buffer = bufD->m_type == QRhiBuffer::Dynamic ? bufD->buffers[frameSlot] : bufD->buffers[0];
+                bufInfo.offset = VkDeviceSize(b->u.ubuf.offset);
+                bufInfo.range = VkDeviceSize(b->u.ubuf.maybeSize ? b->u.ubuf.maybeSize : bufD->m_size);
+                // be nice and assert when we know the vulkan device would die a horrible death due to non-aligned reads
+                Q_ASSERT(aligned(bufInfo.offset, ubufAlign) == bufInfo.offset);
+                bufferInfos.append(bufInfo);
+                writeInfo.pBufferInfo = &bufferInfos.last();
+            }
+                break;
+            case QRhiShaderResourceBinding::SampledTexture:
+            {
+                QVkTexture *texD = QRHI_RES(QVkTexture, b->u.stex.tex);
+                QVkSampler *samplerD = QRHI_RES(QVkSampler, b->u.stex.sampler);
+                writeInfo.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+                bd.stex.texId = texD->m_id;
+                bd.stex.texGeneration = texD->generation;
+                bd.stex.samplerId = samplerD->m_id;
+                bd.stex.samplerGeneration = samplerD->generation;
+                VkDescriptorImageInfo imageInfo;
+                imageInfo.sampler = samplerD->sampler;
+                imageInfo.imageView = texD->imageView;
+                imageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+                imageInfos.append(imageInfo);
+                writeInfo.pImageInfo = &imageInfos.last();
+            }
+                break;
+            case QRhiShaderResourceBinding::ImageLoad:
+                Q_FALLTHROUGH();
+            case QRhiShaderResourceBinding::ImageStore:
+                Q_FALLTHROUGH();
+            case QRhiShaderResourceBinding::ImageLoadStore:
+            {
+                QVkTexture *texD = QRHI_RES(QVkTexture, b->u.simage.tex);
+                VkImageView view = texD->imageViewForLevel(b->u.simage.level);
+                if (view) {
+                    writeInfo.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
+                    bd.simage.id = texD->m_id;
+                    bd.simage.generation = texD->generation;
+                    VkDescriptorImageInfo imageInfo;
+                    imageInfo.sampler = VK_NULL_HANDLE;
+                    imageInfo.imageView = view;
+                    imageInfo.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
+                    imageInfos.append(imageInfo);
+                    writeInfo.pImageInfo = &imageInfos.last();
+                }
+            }
+                break;
+            case QRhiShaderResourceBinding::BufferLoad:
+                Q_FALLTHROUGH();
+            case QRhiShaderResourceBinding::BufferStore:
+                Q_FALLTHROUGH();
+            case QRhiShaderResourceBinding::BufferLoadStore:
+            {
+                QVkBuffer *bufD = QRHI_RES(QVkBuffer, b->u.sbuf.buf);
+                writeInfo.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+                bd.sbuf.id = bufD->m_id;
+                bd.sbuf.generation = bufD->generation;
+                VkDescriptorBufferInfo bufInfo;
+                bufInfo.buffer = bufD->m_type == QRhiBuffer::Dynamic ? bufD->buffers[frameSlot] : bufD->buffers[0];
+                bufInfo.offset = VkDeviceSize(b->u.ubuf.offset);
+                bufInfo.range = VkDeviceSize(b->u.ubuf.maybeSize ? b->u.ubuf.maybeSize : bufD->m_size);
+                bufferInfos.append(bufInfo);
+                writeInfo.pBufferInfo = &bufferInfos.last();
+            }
+                break;
+            default:
+                continue;
+            }
+
+            writeInfos.append(writeInfo);
+        }
+        ++frameSlot;
+    }
+
+    df->vkUpdateDescriptorSets(dev, uint32_t(writeInfos.count()), writeInfos.constData(), 0, nullptr);
+}
+
+static inline bool accessIsWrite(VkAccessFlags access)
+{
+    return (access & VK_ACCESS_SHADER_WRITE_BIT) != 0
+            || (access & VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT) != 0
+            || (access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT) != 0
+            || (access & VK_ACCESS_TRANSFER_WRITE_BIT) != 0
+            || (access & VK_ACCESS_HOST_WRITE_BIT) != 0
+            || (access & VK_ACCESS_MEMORY_WRITE_BIT) != 0;
+}
+
+void QRhiVulkan::trackedBufferBarrier(QVkCommandBuffer *cbD, QVkBuffer *bufD, int slot,
+                                      VkAccessFlags access, VkPipelineStageFlags stage)
+{
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::NoPass);
+    Q_ASSERT(access && stage);
+    QVkBuffer::UsageState &s(bufD->usageState[slot]);
+    if (!s.stage) {
+        s.access = access;
+        s.stage = stage;
+        return;
+    }
+
+    if (s.access == access && s.stage == stage) {
+        // No need to flood with unnecessary read-after-read barriers.
+        // Write-after-write is a different matter, however.
+        if (!accessIsWrite(access))
+            return;
+    }
+
+    VkBufferMemoryBarrier bufMemBarrier;
+    memset(&bufMemBarrier, 0, sizeof(bufMemBarrier));
+    bufMemBarrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+    bufMemBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+    bufMemBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+    bufMemBarrier.srcAccessMask = s.access;
+    bufMemBarrier.dstAccessMask = access;
+    bufMemBarrier.buffer = bufD->buffers[slot];
+    bufMemBarrier.size = VK_WHOLE_SIZE;
+
+    QVkCommandBuffer::Command cmd;
+    cmd.cmd = QVkCommandBuffer::Command::BufferBarrier;
+    cmd.args.bufferBarrier.srcStageMask = s.stage;
+    cmd.args.bufferBarrier.dstStageMask = stage;
+    cmd.args.bufferBarrier.desc = bufMemBarrier;
+    cbD->commands.append(cmd);
+
+    s.access = access;
+    s.stage = stage;
+}
+
+void QRhiVulkan::trackedImageBarrier(QVkCommandBuffer *cbD, QVkTexture *texD,
+                                     VkImageLayout layout, VkAccessFlags access, VkPipelineStageFlags stage)
+{
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::NoPass);
+    Q_ASSERT(layout && access && stage);
+    QVkTexture::UsageState &s(texD->usageState);
+    if (s.access == access && s.stage == stage && s.layout == layout) {
+        if (!accessIsWrite(access))
+            return;
+    }
+
+    VkImageMemoryBarrier barrier;
+    memset(&barrier, 0, sizeof(barrier));
+    barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+    barrier.subresourceRange.aspectMask = !isDepthTextureFormat(texD->m_format)
+            ? VK_IMAGE_ASPECT_COLOR_BIT : VK_IMAGE_ASPECT_DEPTH_BIT;
+    barrier.subresourceRange.baseMipLevel = 0;
+    barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+    barrier.subresourceRange.baseArrayLayer = 0;
+    barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+    barrier.oldLayout = s.layout; // new textures have this set to PREINITIALIZED
+    barrier.newLayout = layout;
+    barrier.srcAccessMask = s.access; // may be 0 but that's fine
+    barrier.dstAccessMask = access;
+    barrier.image = texD->image;
+
+    VkPipelineStageFlags srcStage = s.stage;
+    // stage mask cannot be 0
+    if (!srcStage)
+        srcStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+
+    QVkCommandBuffer::Command cmd;
+    cmd.cmd = QVkCommandBuffer::Command::ImageBarrier;
+    cmd.args.imageBarrier.srcStageMask = srcStage;
+    cmd.args.imageBarrier.dstStageMask = stage;
+    cmd.args.imageBarrier.desc = barrier;
+    cbD->commands.append(cmd);
+
+    s.layout = layout;
+    s.access = access;
+    s.stage = stage;
+}
+
+void QRhiVulkan::subresourceBarrier(QVkCommandBuffer *cbD, VkImage image,
+                                    VkImageLayout oldLayout, VkImageLayout newLayout,
+                                    VkAccessFlags srcAccess, VkAccessFlags dstAccess,
+                                    VkPipelineStageFlags srcStage, VkPipelineStageFlags dstStage,
+                                    int startLayer, int layerCount,
+                                    int startLevel, int levelCount)
+{
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::NoPass);
+    VkImageMemoryBarrier barrier;
+    memset(&barrier, 0, sizeof(barrier));
+    barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+    barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    barrier.subresourceRange.baseMipLevel = uint32_t(startLevel);
+    barrier.subresourceRange.levelCount = uint32_t(levelCount);
+    barrier.subresourceRange.baseArrayLayer = uint32_t(startLayer);
+    barrier.subresourceRange.layerCount = uint32_t(layerCount);
+    barrier.oldLayout = oldLayout;
+    barrier.newLayout = newLayout;
+    barrier.srcAccessMask = srcAccess;
+    barrier.dstAccessMask = dstAccess;
+    barrier.image = image;
+
+    QVkCommandBuffer::Command cmd;
+    cmd.cmd = QVkCommandBuffer::Command::ImageBarrier;
+    cmd.args.imageBarrier.srcStageMask = srcStage;
+    cmd.args.imageBarrier.dstStageMask = dstStage;
+    cmd.args.imageBarrier.desc = barrier;
+    cbD->commands.append(cmd);
+}
+
+VkDeviceSize QRhiVulkan::subresUploadByteSize(const QRhiTextureSubresourceUploadDescription &subresDesc) const
+{
+    VkDeviceSize size = 0;
+    const qsizetype imageSizeBytes = subresDesc.image().isNull() ?
+                subresDesc.data().size() : subresDesc.image().sizeInBytes();
+    if (imageSizeBytes > 0)
+        size += aligned(VkDeviceSize(imageSizeBytes), texbufAlign);
+    return size;
+}
+
+void QRhiVulkan::prepareUploadSubres(QVkTexture *texD, int layer, int level,
+                                     const QRhiTextureSubresourceUploadDescription &subresDesc,
+                                     size_t *curOfs, void *mp,
+                                     BufferImageCopyList *copyInfos)
+{
+    qsizetype copySizeBytes = 0;
+    qsizetype imageSizeBytes = 0;
+    const void *src = nullptr;
+
+    VkBufferImageCopy copyInfo;
+    memset(&copyInfo, 0, sizeof(copyInfo));
+    copyInfo.bufferOffset = *curOfs;
+    copyInfo.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    copyInfo.imageSubresource.mipLevel = uint32_t(level);
+    copyInfo.imageSubresource.baseArrayLayer = uint32_t(layer);
+    copyInfo.imageSubresource.layerCount = 1;
+    copyInfo.imageExtent.depth = 1;
+
+    const QByteArray rawData = subresDesc.data();
+    const QPoint dp = subresDesc.destinationTopLeft();
+    QImage image = subresDesc.image();
+    if (!image.isNull()) {
+        copySizeBytes = imageSizeBytes = image.sizeInBytes();
+        QSize size = image.size();
+        src = image.constBits();
+        // Scanlines in QImage are 4 byte aligned so bpl must
+        // be taken into account for bufferRowLength.
+        int bpc = qMax(1, image.depth() / 8);
+        // this is in pixels, not bytes, to make it more complicated...
+        copyInfo.bufferRowLength = uint32_t(image.bytesPerLine() / bpc);
+        if (!subresDesc.sourceSize().isEmpty() || !subresDesc.sourceTopLeft().isNull()) {
+            const int sx = subresDesc.sourceTopLeft().x();
+            const int sy = subresDesc.sourceTopLeft().y();
+            if (!subresDesc.sourceSize().isEmpty())
+                size = subresDesc.sourceSize();
+            if (image.depth() == 32) {
+                // The staging buffer will get the full image
+                // regardless, just adjust the vk
+                // buffer-to-image copy start offset.
+                copyInfo.bufferOffset += VkDeviceSize(sy * image.bytesPerLine() + sx * 4);
+                // bufferRowLength remains set to the original image's width
+            } else {
+                image = image.copy(sx, sy, size.width(), size.height());
+                src = image.constBits();
+                // The staging buffer gets the slice only. The rest of the
+                // space reserved for this mip will be unused.
+                copySizeBytes = image.sizeInBytes();
+                bpc = qMax(1, image.depth() / 8);
+                copyInfo.bufferRowLength = uint32_t(image.bytesPerLine() / bpc);
+            }
+        }
+        copyInfo.imageOffset.x = dp.x();
+        copyInfo.imageOffset.y = dp.y();
+        copyInfo.imageExtent.width = uint32_t(size.width());
+        copyInfo.imageExtent.height = uint32_t(size.height());
+        copyInfos->append(copyInfo);
+    } else if (!rawData.isEmpty() && isCompressedFormat(texD->m_format)) {
+        copySizeBytes = imageSizeBytes = rawData.size();
+        src = rawData.constData();
+        QSize size = q->sizeForMipLevel(level, texD->m_pixelSize);
+        const int subresw = size.width();
+        const int subresh = size.height();
+        if (!subresDesc.sourceSize().isEmpty())
+            size = subresDesc.sourceSize();
+        const int w = size.width();
+        const int h = size.height();
+        QSize blockDim;
+        compressedFormatInfo(texD->m_format, QSize(w, h), nullptr, nullptr, &blockDim);
+        // x and y must be multiples of the block width and height
+        copyInfo.imageOffset.x = aligned(dp.x(), blockDim.width());
+        copyInfo.imageOffset.y = aligned(dp.y(), blockDim.height());
+        // width and height must be multiples of the block width and height
+        // or x + width and y + height must equal the subresource width and height
+        copyInfo.imageExtent.width = uint32_t(dp.x() + w == subresw ? w : aligned(w, blockDim.width()));
+        copyInfo.imageExtent.height = uint32_t(dp.y() + h == subresh ? h : aligned(h, blockDim.height()));
+        copyInfos->append(copyInfo);
+    } else if (!rawData.isEmpty()) {
+        copySizeBytes = imageSizeBytes = rawData.size();
+        src = rawData.constData();
+        QSize size = q->sizeForMipLevel(level, texD->m_pixelSize);
+        if (!subresDesc.sourceSize().isEmpty())
+            size = subresDesc.sourceSize();
+        copyInfo.imageOffset.x = dp.x();
+        copyInfo.imageOffset.y = dp.y();
+        copyInfo.imageExtent.width = uint32_t(size.width());
+        copyInfo.imageExtent.height = uint32_t(size.height());
+        copyInfos->append(copyInfo);
+    } else {
+        qWarning("Invalid texture upload for %p layer=%d mip=%d", texD, layer, level);
+    }
+
+    memcpy(reinterpret_cast<char *>(mp) + *curOfs, src, size_t(copySizeBytes));
+    *curOfs += aligned(VkDeviceSize(imageSizeBytes), texbufAlign);
+}
+
+void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdateBatch *resourceUpdates)
+{
+    QRhiResourceUpdateBatchPrivate *ud = QRhiResourceUpdateBatchPrivate::get(resourceUpdates);
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+
+    for (const QRhiResourceUpdateBatchPrivate::BufferOp &u : ud->bufferOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::DynamicUpdate) {
+            QVkBuffer *bufD = QRHI_RES(QVkBuffer, u.buf);
+            Q_ASSERT(bufD->m_type == QRhiBuffer::Dynamic);
+            for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i)
+                bufD->pendingDynamicUpdates[i].append(u);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::StaticUpload) {
+            QVkBuffer *bufD = QRHI_RES(QVkBuffer, u.buf);
+            Q_ASSERT(bufD->m_type != QRhiBuffer::Dynamic);
+            Q_ASSERT(u.offset + u.data.size() <= bufD->m_size);
+
+            if (!bufD->stagingBuffers[currentFrameSlot]) {
+                VkBufferCreateInfo bufferInfo;
+                memset(&bufferInfo, 0, sizeof(bufferInfo));
+                bufferInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+                // must cover the entire buffer - this way multiple, partial updates per frame
+                // are supported even when the staging buffer is reused (Static)
+                bufferInfo.size = VkDeviceSize(bufD->m_size);
+                bufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
+
+                VmaAllocationCreateInfo allocInfo;
+                memset(&allocInfo, 0, sizeof(allocInfo));
+                allocInfo.usage = VMA_MEMORY_USAGE_CPU_ONLY;
+
+                VmaAllocation allocation;
+                VkResult err = vmaCreateBuffer(toVmaAllocator(allocator), &bufferInfo, &allocInfo,
+                                               &bufD->stagingBuffers[currentFrameSlot], &allocation, nullptr);
+                if (err == VK_SUCCESS) {
+                    bufD->stagingAllocations[currentFrameSlot] = allocation;
+                    QRHI_PROF_F(newBufferStagingArea(bufD, currentFrameSlot, quint32(bufD->m_size)));
+                } else {
+                    qWarning("Failed to create staging buffer of size %d: %d", bufD->m_size, err);
+                    continue;
+                }
+            }
+
+            void *p = nullptr;
+            VmaAllocation a = toVmaAllocation(bufD->stagingAllocations[currentFrameSlot]);
+            VkResult err = vmaMapMemory(toVmaAllocator(allocator), a, &p);
+            if (err != VK_SUCCESS) {
+                qWarning("Failed to map buffer: %d", err);
+                continue;
+            }
+            memcpy(static_cast<uchar *>(p) + u.offset, u.data.constData(), size_t(u.data.size()));
+            vmaUnmapMemory(toVmaAllocator(allocator), a);
+            vmaFlushAllocation(toVmaAllocator(allocator), a, VkDeviceSize(u.offset), VkDeviceSize(u.data.size()));
+
+            trackedBufferBarrier(cbD, bufD, 0,
+                                 VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+
+            VkBufferCopy copyInfo;
+            memset(&copyInfo, 0, sizeof(copyInfo));
+            copyInfo.srcOffset = VkDeviceSize(u.offset);
+            copyInfo.dstOffset = VkDeviceSize(u.offset);
+            copyInfo.size = VkDeviceSize(u.data.size());
+
+            QVkCommandBuffer::Command cmd;
+            cmd.cmd = QVkCommandBuffer::Command::CopyBuffer;
+            cmd.args.copyBuffer.src = bufD->stagingBuffers[currentFrameSlot];
+            cmd.args.copyBuffer.dst = bufD->buffers[0];
+            cmd.args.copyBuffer.desc = copyInfo;
+            cbD->commands.append(cmd);
+
+            // Where's the barrier for read-after-write? (assuming the common case
+            // of binding this buffer as vertex/index, or, less likely, as uniform
+            // buffer, in a renderpass later on) That is handled by the pass
+            // resource tracking: the appropriate pipeline barrier will be
+            // generated and recorded right before the renderpass, that binds this
+            // buffer in one of its commands, gets its BeginRenderPass recorded.
+
+            bufD->lastActiveFrameSlot = currentFrameSlot;
+
+            if (bufD->m_type == QRhiBuffer::Immutable) {
+                QRhiVulkan::DeferredReleaseEntry e;
+                e.type = QRhiVulkan::DeferredReleaseEntry::StagingBuffer;
+                e.lastActiveFrameSlot = currentFrameSlot;
+                e.stagingBuffer.stagingBuffer = bufD->stagingBuffers[currentFrameSlot];
+                e.stagingBuffer.stagingAllocation = bufD->stagingAllocations[currentFrameSlot];
+                bufD->stagingBuffers[currentFrameSlot] = VK_NULL_HANDLE;
+                bufD->stagingAllocations[currentFrameSlot] = nullptr;
+                releaseQueue.append(e);
+                QRHI_PROF_F(releaseBufferStagingArea(bufD, currentFrameSlot));
+            }
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::Read) {
+            QVkBuffer *bufD = QRHI_RES(QVkBuffer, u.buf);
+            if (bufD->m_type == QRhiBuffer::Dynamic) {
+                executeBufferHostWritesForCurrentFrame(bufD);
+                void *p = nullptr;
+                VmaAllocation a = toVmaAllocation(bufD->allocations[currentFrameSlot]);
+                VkResult err = vmaMapMemory(toVmaAllocator(allocator), a, &p);
+                if (err == VK_SUCCESS) {
+                    u.result->data.resize(u.readSize);
+                    memcpy(u.result->data.data(), reinterpret_cast<char *>(p) + u.offset, size_t(u.readSize));
+                    vmaUnmapMemory(toVmaAllocator(allocator), a);
+                }
+                if (u.result->completed)
+                    u.result->completed();
+            } else {
+                // Non-Dynamic buffers may not be host visible, so have to
+                // create a readback buffer, enqueue a copy from
+                // bufD->buffers[0] to this buffer, and then once the command
+                // buffer completes, copy the data out of the host visible
+                // readback buffer. Quite similar to what we do for texture
+                // readbacks.
+                BufferReadback readback;
+                readback.activeFrameSlot = currentFrameSlot;
+                readback.result = u.result;
+                readback.byteSize = u.readSize;
+
+                VkBufferCreateInfo bufferInfo;
+                memset(&bufferInfo, 0, sizeof(bufferInfo));
+                bufferInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+                bufferInfo.size = VkDeviceSize(readback.byteSize);
+                bufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+                VmaAllocationCreateInfo allocInfo;
+                memset(&allocInfo, 0, sizeof(allocInfo));
+                allocInfo.usage = VMA_MEMORY_USAGE_GPU_TO_CPU;
+
+                VmaAllocation allocation;
+                VkResult err = vmaCreateBuffer(toVmaAllocator(allocator), &bufferInfo, &allocInfo, &readback.stagingBuf, &allocation, nullptr);
+                if (err == VK_SUCCESS) {
+                    readback.stagingAlloc = allocation;
+                    QRHI_PROF_F(newReadbackBuffer(qint64(readback.stagingBuf), bufD, uint(readback.byteSize)));
+                } else {
+                    qWarning("Failed to create readback buffer of size %u: %d", readback.byteSize, err);
+                    continue;
+                }
+
+                trackedBufferBarrier(cbD, bufD, 0, VK_ACCESS_TRANSFER_READ_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+
+                VkBufferCopy copyInfo;
+                memset(&copyInfo, 0, sizeof(copyInfo));
+                copyInfo.srcOffset = VkDeviceSize(u.offset);
+                copyInfo.size = VkDeviceSize(u.readSize);
+
+                QVkCommandBuffer::Command cmd;
+                cmd.cmd = QVkCommandBuffer::Command::CopyBuffer;
+                cmd.args.copyBuffer.src = bufD->buffers[0];
+                cmd.args.copyBuffer.dst = readback.stagingBuf;
+                cmd.args.copyBuffer.desc = copyInfo;
+                cbD->commands.append(cmd);
+
+                bufD->lastActiveFrameSlot = currentFrameSlot;
+
+                activeBufferReadbacks.append(readback);
+            }
+        }
+    }
+
+    for (const QRhiResourceUpdateBatchPrivate::TextureOp &u : ud->textureOps) {
+        if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Upload) {
+            QVkTexture *utexD = QRHI_RES(QVkTexture, u.dst);
+            // batch into a single staging buffer and a single CopyBufferToImage with multiple copyInfos
+            VkDeviceSize stagingSize = 0;
+            for (int layer = 0; layer < QRhi::MAX_LAYERS; ++layer) {
+                for (int level = 0; level < QRhi::MAX_LEVELS; ++level) {
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                        stagingSize += subresUploadByteSize(subresDesc);
+                }
+            }
+
+            Q_ASSERT(!utexD->stagingBuffers[currentFrameSlot]);
+            VkBufferCreateInfo bufferInfo;
+            memset(&bufferInfo, 0, sizeof(bufferInfo));
+            bufferInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+            bufferInfo.size = stagingSize;
+            bufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
+
+            VmaAllocationCreateInfo allocInfo;
+            memset(&allocInfo, 0, sizeof(allocInfo));
+            allocInfo.usage = VMA_MEMORY_USAGE_CPU_TO_GPU;
+
+            VmaAllocation allocation;
+            VkResult err = vmaCreateBuffer(toVmaAllocator(allocator), &bufferInfo, &allocInfo,
+                                           &utexD->stagingBuffers[currentFrameSlot], &allocation, nullptr);
+            if (err != VK_SUCCESS) {
+                qWarning("Failed to create image staging buffer of size %d: %d", int(stagingSize), err);
+                continue;
+            }
+            utexD->stagingAllocations[currentFrameSlot] = allocation;
+            QRHI_PROF_F(newTextureStagingArea(utexD, currentFrameSlot, quint32(stagingSize)));
+
+            BufferImageCopyList copyInfos;
+            size_t curOfs = 0;
+            void *mp = nullptr;
+            VmaAllocation a = toVmaAllocation(utexD->stagingAllocations[currentFrameSlot]);
+            err = vmaMapMemory(toVmaAllocator(allocator), a, &mp);
+            if (err != VK_SUCCESS) {
+                qWarning("Failed to map image data: %d", err);
+                continue;
+            }
+
+            for (int layer = 0; layer < QRhi::MAX_LAYERS; ++layer) {
+                for (int level = 0; level < QRhi::MAX_LEVELS; ++level) {
+                    const QVector<QRhiTextureSubresourceUploadDescription> &srd(u.subresDesc[layer][level]);
+                    if (srd.isEmpty())
+                        continue;
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(srd)) {
+                        prepareUploadSubres(utexD, layer, level,
+                                            subresDesc, &curOfs, mp, &copyInfos);
+                    }
+                }
+            }
+            vmaUnmapMemory(toVmaAllocator(allocator), a);
+            vmaFlushAllocation(toVmaAllocator(allocator), a, 0, stagingSize);
+
+            trackedImageBarrier(cbD, utexD, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+                                VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+
+            QVkCommandBuffer::Command cmd;
+            cmd.cmd = QVkCommandBuffer::Command::CopyBufferToImage;
+            cmd.args.copyBufferToImage.src = utexD->stagingBuffers[currentFrameSlot];
+            cmd.args.copyBufferToImage.dst = utexD->image;
+            cmd.args.copyBufferToImage.dstLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+            cmd.args.copyBufferToImage.count = copyInfos.count();
+            cmd.args.copyBufferToImage.bufferImageCopyIndex = cbD->pools.bufferImageCopy.count();
+            cbD->pools.bufferImageCopy.append(copyInfos.constData(), copyInfos.count());
+            cbD->commands.append(cmd);
+
+            // no reuse of staging, this is intentional
+            QRhiVulkan::DeferredReleaseEntry e;
+            e.type = QRhiVulkan::DeferredReleaseEntry::StagingBuffer;
+            e.lastActiveFrameSlot = currentFrameSlot;
+            e.stagingBuffer.stagingBuffer = utexD->stagingBuffers[currentFrameSlot];
+            e.stagingBuffer.stagingAllocation = utexD->stagingAllocations[currentFrameSlot];
+            utexD->stagingBuffers[currentFrameSlot] = VK_NULL_HANDLE;
+            utexD->stagingAllocations[currentFrameSlot] = nullptr;
+            releaseQueue.append(e);
+            QRHI_PROF_F(releaseTextureStagingArea(utexD, currentFrameSlot));
+
+            // Similarly to buffers, transitioning away from DST is done later,
+            // when a renderpass using the texture is encountered.
+
+            utexD->lastActiveFrameSlot = currentFrameSlot;
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Copy) {
+            Q_ASSERT(u.src && u.dst);
+            if (u.src == u.dst) {
+                qWarning("Texture copy with matching source and destination is not supported");
+                continue;
+            }
+            QVkTexture *srcD = QRHI_RES(QVkTexture, u.src);
+            QVkTexture *dstD = QRHI_RES(QVkTexture, u.dst);
+
+            VkImageCopy region;
+            memset(&region, 0, sizeof(region));
+
+            region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+            region.srcSubresource.mipLevel = uint32_t(u.desc.sourceLevel());
+            region.srcSubresource.baseArrayLayer = uint32_t(u.desc.sourceLayer());
+            region.srcSubresource.layerCount = 1;
+
+            region.srcOffset.x = u.desc.sourceTopLeft().x();
+            region.srcOffset.y = u.desc.sourceTopLeft().y();
+
+            region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+            region.dstSubresource.mipLevel = uint32_t(u.desc.destinationLevel());
+            region.dstSubresource.baseArrayLayer = uint32_t(u.desc.destinationLayer());
+            region.dstSubresource.layerCount = 1;
+
+            region.dstOffset.x = u.desc.destinationTopLeft().x();
+            region.dstOffset.y = u.desc.destinationTopLeft().y();
+
+            const QSize mipSize = q->sizeForMipLevel(u.desc.sourceLevel(), srcD->m_pixelSize);
+            const QSize copySize = u.desc.pixelSize().isEmpty() ? mipSize : u.desc.pixelSize();
+            region.extent.width = uint32_t(copySize.width());
+            region.extent.height = uint32_t(copySize.height());
+            region.extent.depth = 1;
+
+            trackedImageBarrier(cbD, srcD, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+                                VK_ACCESS_TRANSFER_READ_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+            trackedImageBarrier(cbD, dstD, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+                                VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+
+            QVkCommandBuffer::Command cmd;
+            cmd.cmd = QVkCommandBuffer::Command::CopyImage;
+            cmd.args.copyImage.src = srcD->image;
+            cmd.args.copyImage.srcLayout = srcD->usageState.layout;
+            cmd.args.copyImage.dst = dstD->image;
+            cmd.args.copyImage.dstLayout = dstD->usageState.layout;
+            cmd.args.copyImage.desc = region;
+            cbD->commands.append(cmd);
+
+            srcD->lastActiveFrameSlot = dstD->lastActiveFrameSlot = currentFrameSlot;
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::Read) {
+            TextureReadback readback;
+            readback.activeFrameSlot = currentFrameSlot;
+            readback.desc = u.rb;
+            readback.result = u.result;
+
+            QVkTexture *texD = QRHI_RES(QVkTexture, u.rb.texture());
+            QVkSwapChain *swapChainD = nullptr;
+            if (texD) {
+                if (texD->samples > VK_SAMPLE_COUNT_1_BIT) {
+                    qWarning("Multisample texture cannot be read back");
+                    continue;
+                }
+                readback.pixelSize = q->sizeForMipLevel(u.rb.level(), texD->m_pixelSize);
+                readback.format = texD->m_format;
+                texD->lastActiveFrameSlot = currentFrameSlot;
+            } else {
+                Q_ASSERT(currentSwapChain);
+                swapChainD = QRHI_RES(QVkSwapChain, currentSwapChain);
+                if (!swapChainD->supportsReadback) {
+                    qWarning("Swapchain does not support readback");
+                    continue;
+                }
+                readback.pixelSize = swapChainD->pixelSize;
+                readback.format = colorTextureFormatFromVkFormat(swapChainD->colorFormat, nullptr);
+                if (readback.format == QRhiTexture::UnknownFormat)
+                    continue;
+
+                // Multisample swapchains need nothing special since resolving
+                // happens when ending a renderpass.
+            }
+            textureFormatInfo(readback.format, readback.pixelSize, nullptr, &readback.byteSize);
+
+            // Create a host visible readback buffer.
+            VkBufferCreateInfo bufferInfo;
+            memset(&bufferInfo, 0, sizeof(bufferInfo));
+            bufferInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+            bufferInfo.size = readback.byteSize;
+            bufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+            VmaAllocationCreateInfo allocInfo;
+            memset(&allocInfo, 0, sizeof(allocInfo));
+            allocInfo.usage = VMA_MEMORY_USAGE_GPU_TO_CPU;
+
+            VmaAllocation allocation;
+            VkResult err = vmaCreateBuffer(toVmaAllocator(allocator), &bufferInfo, &allocInfo, &readback.stagingBuf, &allocation, nullptr);
+            if (err == VK_SUCCESS) {
+                readback.stagingAlloc = allocation;
+                QRHI_PROF_F(newReadbackBuffer(qint64(readback.stagingBuf),
+                                              texD ? static_cast<QRhiResource *>(texD) : static_cast<QRhiResource *>(swapChainD),
+                                              readback.byteSize));
+            } else {
+                qWarning("Failed to create readback buffer of size %u: %d", readback.byteSize, err);
+                continue;
+            }
+
+            // Copy from the (optimal and not host visible) image into the buffer.
+            VkBufferImageCopy copyDesc;
+            memset(&copyDesc, 0, sizeof(copyDesc));
+            copyDesc.bufferOffset = 0;
+            copyDesc.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+            copyDesc.imageSubresource.mipLevel = uint32_t(u.rb.level());
+            copyDesc.imageSubresource.baseArrayLayer = uint32_t(u.rb.layer());
+            copyDesc.imageSubresource.layerCount = 1;
+            copyDesc.imageExtent.width = uint32_t(readback.pixelSize.width());
+            copyDesc.imageExtent.height = uint32_t(readback.pixelSize.height());
+            copyDesc.imageExtent.depth = 1;
+
+            if (texD) {
+                trackedImageBarrier(cbD, texD, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+                                    VK_ACCESS_TRANSFER_READ_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+                QVkCommandBuffer::Command cmd;
+                cmd.cmd = QVkCommandBuffer::Command::CopyImageToBuffer;
+                cmd.args.copyImageToBuffer.src = texD->image;
+                cmd.args.copyImageToBuffer.srcLayout = texD->usageState.layout;
+                cmd.args.copyImageToBuffer.dst = readback.stagingBuf;
+                cmd.args.copyImageToBuffer.desc = copyDesc;
+                cbD->commands.append(cmd);
+            } else {
+                // use the swapchain image
+                QVkSwapChain::ImageResources &imageRes(swapChainD->imageRes[swapChainD->currentImageIndex]);
+                VkImage image = imageRes.image;
+                if (imageRes.lastUse != QVkSwapChain::ImageResources::ScImageUseTransferSource) {
+                    if (imageRes.lastUse != QVkSwapChain::ImageResources::ScImageUseRender) {
+                        qWarning("Attempted to read back undefined swapchain image content, "
+                                 "results are undefined. (do a render pass first)");
+                    }
+                    subresourceBarrier(cbD, image,
+                                       VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+                                       VK_ACCESS_MEMORY_READ_BIT, VK_ACCESS_TRANSFER_READ_BIT,
+                                       VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+                                       0, 1,
+                                       0, 1);
+                    imageRes.lastUse = QVkSwapChain::ImageResources::ScImageUseTransferSource;
+                }
+
+                QVkCommandBuffer::Command cmd;
+                cmd.cmd = QVkCommandBuffer::Command::CopyImageToBuffer;
+                cmd.args.copyImageToBuffer.src = image;
+                cmd.args.copyImageToBuffer.srcLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+                cmd.args.copyImageToBuffer.dst = readback.stagingBuf;
+                cmd.args.copyImageToBuffer.desc = copyDesc;
+                cbD->commands.append(cmd);
+            }
+
+            activeTextureReadbacks.append(readback);
+        } else if (u.type == QRhiResourceUpdateBatchPrivate::TextureOp::GenMips) {
+            QVkTexture *utexD = QRHI_RES(QVkTexture, u.dst);
+            Q_ASSERT(utexD->m_flags.testFlag(QRhiTexture::UsedWithGenerateMips));
+            int w = utexD->m_pixelSize.width();
+            int h = utexD->m_pixelSize.height();
+
+            VkImageLayout origLayout = utexD->usageState.layout;
+            VkAccessFlags origAccess = utexD->usageState.access;
+            VkPipelineStageFlags origStage = utexD->usageState.stage;
+            if (!origStage)
+                origStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+
+            for (int level = 1; level < int(utexD->mipLevelCount); ++level) {
+                if (level == 1) {
+                    subresourceBarrier(cbD, utexD->image,
+                                       origLayout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+                                       origAccess, VK_ACCESS_TRANSFER_READ_BIT,
+                                       origStage, VK_PIPELINE_STAGE_TRANSFER_BIT,
+                                       u.layer, 1,
+                                       level - 1, 1);
+                } else {
+                    subresourceBarrier(cbD, utexD->image,
+                                       VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+                                       VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT,
+                                       VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+                                       u.layer, 1,
+                                       level - 1, 1);
+                }
+
+                subresourceBarrier(cbD, utexD->image,
+                                   origLayout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+                                   origAccess, VK_ACCESS_TRANSFER_WRITE_BIT,
+                                   origStage, VK_PIPELINE_STAGE_TRANSFER_BIT,
+                                   u.layer, 1,
+                                   level, 1);
+
+                VkImageBlit region;
+                memset(&region, 0, sizeof(region));
+
+                region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+                region.srcSubresource.mipLevel = uint32_t(level) - 1;
+                region.srcSubresource.baseArrayLayer = uint32_t(u.layer);
+                region.srcSubresource.layerCount = 1;
+
+                region.srcOffsets[1].x = qMax(1, w);
+                region.srcOffsets[1].y = qMax(1, h);
+                region.srcOffsets[1].z = 1;
+
+                region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+                region.dstSubresource.mipLevel = uint32_t(level);
+                region.dstSubresource.baseArrayLayer = uint32_t(u.layer);
+                region.dstSubresource.layerCount = 1;
+
+                region.dstOffsets[1].x = qMax(1, w >> 1);
+                region.dstOffsets[1].y = qMax(1, h >> 1);
+                region.dstOffsets[1].z = 1;
+
+                QVkCommandBuffer::Command cmd;
+                cmd.cmd = QVkCommandBuffer::Command::BlitImage;
+                cmd.args.blitImage.src = utexD->image;
+                cmd.args.blitImage.srcLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+                cmd.args.blitImage.dst = utexD->image;
+                cmd.args.blitImage.dstLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+                cmd.args.blitImage.filter = VK_FILTER_LINEAR;
+                cmd.args.blitImage.desc = region;
+                cbD->commands.append(cmd);
+
+                w >>= 1;
+                h >>= 1;
+            }
+
+            if (utexD->mipLevelCount > 1) {
+                subresourceBarrier(cbD, utexD->image,
+                                   VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, origLayout,
+                                   VK_ACCESS_TRANSFER_READ_BIT, origAccess,
+                                   VK_PIPELINE_STAGE_TRANSFER_BIT, origStage,
+                                   u.layer, 1,
+                                   0, int(utexD->mipLevelCount) - 1);
+                subresourceBarrier(cbD, utexD->image,
+                                   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, origLayout,
+                                   VK_ACCESS_TRANSFER_WRITE_BIT, origAccess,
+                                   VK_PIPELINE_STAGE_TRANSFER_BIT, origStage,
+                                   u.layer, 1,
+                                   int(utexD->mipLevelCount) - 1, 1);
+            }
+
+            utexD->lastActiveFrameSlot = currentFrameSlot;
+        }
+    }
+
+    ud->free();
+}
+
+void QRhiVulkan::executeBufferHostWritesForCurrentFrame(QVkBuffer *bufD)
+{
+    if (bufD->pendingDynamicUpdates[currentFrameSlot].isEmpty())
+        return;
+
+    Q_ASSERT(bufD->m_type == QRhiBuffer::Dynamic);
+    void *p = nullptr;
+    VmaAllocation a = toVmaAllocation(bufD->allocations[currentFrameSlot]);
+    // The vmaMap/Unmap are basically a no-op when persistently mapped since it
+    // refcounts; this is great because we don't need to care if the allocation
+    // was created as persistently mapped or not.
+    VkResult err = vmaMapMemory(toVmaAllocator(allocator), a, &p);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to map buffer: %d", err);
+        return;
+    }
+    int changeBegin = -1;
+    int changeEnd = -1;
+    for (const QRhiResourceUpdateBatchPrivate::BufferOp &u : qAsConst(bufD->pendingDynamicUpdates[currentFrameSlot])) {
+        Q_ASSERT(bufD == QRHI_RES(QVkBuffer, u.buf));
+        memcpy(static_cast<char *>(p) + u.offset, u.data.constData(), size_t(u.data.size()));
+        if (changeBegin == -1 || u.offset < changeBegin)
+            changeBegin = u.offset;
+        if (changeEnd == -1 || u.offset + u.data.size() > changeEnd)
+            changeEnd = u.offset + u.data.size();
+    }
+    vmaUnmapMemory(toVmaAllocator(allocator), a);
+    if (changeBegin >= 0)
+        vmaFlushAllocation(toVmaAllocator(allocator), a, VkDeviceSize(changeBegin), VkDeviceSize(changeEnd - changeBegin));
+
+    bufD->pendingDynamicUpdates[currentFrameSlot].clear();
+}
+
+static void qrhivk_releaseBuffer(const QRhiVulkan::DeferredReleaseEntry &e, void *allocator)
+{
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
+        vmaDestroyBuffer(toVmaAllocator(allocator), e.buffer.buffers[i], toVmaAllocation(e.buffer.allocations[i]));
+        vmaDestroyBuffer(toVmaAllocator(allocator), e.buffer.stagingBuffers[i], toVmaAllocation(e.buffer.stagingAllocations[i]));
+    }
+}
+
+static void qrhivk_releaseRenderBuffer(const QRhiVulkan::DeferredReleaseEntry &e, VkDevice dev, QVulkanDeviceFunctions *df)
+{
+    df->vkDestroyImageView(dev, e.renderBuffer.imageView, nullptr);
+    df->vkDestroyImage(dev, e.renderBuffer.image, nullptr);
+    df->vkFreeMemory(dev, e.renderBuffer.memory, nullptr);
+}
+
+static void qrhivk_releaseTexture(const QRhiVulkan::DeferredReleaseEntry &e, VkDevice dev, QVulkanDeviceFunctions *df, void *allocator)
+{
+    df->vkDestroyImageView(dev, e.texture.imageView, nullptr);
+    vmaDestroyImage(toVmaAllocator(allocator), e.texture.image, toVmaAllocation(e.texture.allocation));
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i)
+        vmaDestroyBuffer(toVmaAllocator(allocator), e.texture.stagingBuffers[i], toVmaAllocation(e.texture.stagingAllocations[i]));
+    for (int i = 0; i < QRhi::MAX_LEVELS; ++i) {
+        if (e.texture.extraImageViews[i])
+            df->vkDestroyImageView(dev, e.texture.extraImageViews[i], nullptr);
+    }
+}
+
+static void qrhivk_releaseSampler(const QRhiVulkan::DeferredReleaseEntry &e, VkDevice dev, QVulkanDeviceFunctions *df)
+{
+    df->vkDestroySampler(dev, e.sampler.sampler, nullptr);
+}
+
+void QRhiVulkan::executeDeferredReleases(bool forced)
+{
+    for (int i = releaseQueue.count() - 1; i >= 0; --i) {
+        const QRhiVulkan::DeferredReleaseEntry &e(releaseQueue[i]);
+        if (forced || currentFrameSlot == e.lastActiveFrameSlot || e.lastActiveFrameSlot < 0) {
+            switch (e.type) {
+            case QRhiVulkan::DeferredReleaseEntry::Pipeline:
+                df->vkDestroyPipeline(dev, e.pipelineState.pipeline, nullptr);
+                df->vkDestroyPipelineLayout(dev, e.pipelineState.layout, nullptr);
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::ShaderResourceBindings:
+                df->vkDestroyDescriptorSetLayout(dev, e.shaderResourceBindings.layout, nullptr);
+                if (e.shaderResourceBindings.poolIndex >= 0) {
+                    descriptorPools[e.shaderResourceBindings.poolIndex].refCount -= 1;
+                    Q_ASSERT(descriptorPools[e.shaderResourceBindings.poolIndex].refCount >= 0);
+                }
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::Buffer:
+                qrhivk_releaseBuffer(e, allocator);
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::RenderBuffer:
+                qrhivk_releaseRenderBuffer(e, dev, df);
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::Texture:
+                qrhivk_releaseTexture(e, dev, df, allocator);
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::Sampler:
+                qrhivk_releaseSampler(e, dev, df);
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::TextureRenderTarget:
+                df->vkDestroyFramebuffer(dev, e.textureRenderTarget.fb, nullptr);
+                for (int att = 0; att < QVkRenderTargetData::MAX_COLOR_ATTACHMENTS; ++att) {
+                    df->vkDestroyImageView(dev, e.textureRenderTarget.rtv[att], nullptr);
+                    df->vkDestroyImageView(dev, e.textureRenderTarget.resrtv[att], nullptr);
+                }
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::RenderPass:
+                df->vkDestroyRenderPass(dev, e.renderPass.rp, nullptr);
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::StagingBuffer:
+                vmaDestroyBuffer(toVmaAllocator(allocator), e.stagingBuffer.stagingBuffer, toVmaAllocation(e.stagingBuffer.stagingAllocation));
+                break;
+            case QRhiVulkan::DeferredReleaseEntry::CommandBuffer:
+                df->vkFreeCommandBuffers(dev, cmdPool, 1, &e.commandBuffer.cb);
+                break;
+            default:
+                Q_UNREACHABLE();
+                break;
+            }
+            releaseQueue.removeAt(i);
+        }
+    }
+}
+
+void QRhiVulkan::finishActiveReadbacks(bool forced)
+{
+    QVarLengthArray<std::function<void()>, 4> completedCallbacks;
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+
+    for (int i = activeTextureReadbacks.count() - 1; i >= 0; --i) {
+        const QRhiVulkan::TextureReadback &readback(activeTextureReadbacks[i]);
+        if (forced || currentFrameSlot == readback.activeFrameSlot || readback.activeFrameSlot < 0) {
+            readback.result->format = readback.format;
+            readback.result->pixelSize = readback.pixelSize;
+            VmaAllocation a = toVmaAllocation(readback.stagingAlloc);
+            void *p = nullptr;
+            VkResult err = vmaMapMemory(toVmaAllocator(allocator), a, &p);
+            if (err == VK_SUCCESS && p) {
+                readback.result->data.resize(int(readback.byteSize));
+                memcpy(readback.result->data.data(), p, readback.byteSize);
+                vmaUnmapMemory(toVmaAllocator(allocator), a);
+            } else {
+                qWarning("Failed to map texture readback buffer of size %u: %d", readback.byteSize, err);
+            }
+
+            vmaDestroyBuffer(toVmaAllocator(allocator), readback.stagingBuf, a);
+            QRHI_PROF_F(releaseReadbackBuffer(qint64(readback.stagingBuf)));
+
+            if (readback.result->completed)
+                completedCallbacks.append(readback.result->completed);
+
+            activeTextureReadbacks.removeAt(i);
+        }
+    }
+
+    for (int i = activeBufferReadbacks.count() - 1; i >= 0; --i) {
+        const QRhiVulkan::BufferReadback &readback(activeBufferReadbacks[i]);
+        if (forced || currentFrameSlot == readback.activeFrameSlot || readback.activeFrameSlot < 0) {
+            VmaAllocation a = toVmaAllocation(readback.stagingAlloc);
+            void *p = nullptr;
+            VkResult err = vmaMapMemory(toVmaAllocator(allocator), a, &p);
+            if (err == VK_SUCCESS && p) {
+                readback.result->data.resize(readback.byteSize);
+                memcpy(readback.result->data.data(), p, size_t(readback.byteSize));
+                vmaUnmapMemory(toVmaAllocator(allocator), a);
+            } else {
+                qWarning("Failed to map buffer readback buffer of size %d: %d", readback.byteSize, err);
+            }
+
+            vmaDestroyBuffer(toVmaAllocator(allocator), readback.stagingBuf, a);
+            QRHI_PROF_F(releaseReadbackBuffer(qint64(readback.stagingBuf)));
+
+            if (readback.result->completed)
+                completedCallbacks.append(readback.result->completed);
+
+            activeBufferReadbacks.removeAt(i);
+        }
+    }
+
+    for (auto f : completedCallbacks)
+        f();
+}
+
+static struct {
+    VkSampleCountFlagBits mask;
+    int count;
+} qvk_sampleCounts[] = {
+    // keep this sorted by 'count'
+    { VK_SAMPLE_COUNT_1_BIT, 1 },
+    { VK_SAMPLE_COUNT_2_BIT, 2 },
+    { VK_SAMPLE_COUNT_4_BIT, 4 },
+    { VK_SAMPLE_COUNT_8_BIT, 8 },
+    { VK_SAMPLE_COUNT_16_BIT, 16 },
+    { VK_SAMPLE_COUNT_32_BIT, 32 },
+    { VK_SAMPLE_COUNT_64_BIT, 64 }
+};
+
+QVector<int> QRhiVulkan::supportedSampleCounts() const
+{
+    const VkPhysicalDeviceLimits *limits = &physDevProperties.limits;
+    VkSampleCountFlags color = limits->framebufferColorSampleCounts;
+    VkSampleCountFlags depth = limits->framebufferDepthSampleCounts;
+    VkSampleCountFlags stencil = limits->framebufferStencilSampleCounts;
+    QVector<int> result;
+
+    for (const auto &qvk_sampleCount : qvk_sampleCounts) {
+        if ((color & qvk_sampleCount.mask)
+                && (depth & qvk_sampleCount.mask)
+                && (stencil & qvk_sampleCount.mask))
+        {
+            result.append(qvk_sampleCount.count);
+        }
+    }
+
+    return result;
+}
+
+VkSampleCountFlagBits QRhiVulkan::effectiveSampleCount(int sampleCount)
+{
+    // Stay compatible with QSurfaceFormat and friends where samples == 0 means the same as 1.
+    sampleCount = qBound(1, sampleCount, 64);
+
+    if (!supportedSampleCounts().contains(sampleCount)) {
+        qWarning("Attempted to set unsupported sample count %d", sampleCount);
+        return VK_SAMPLE_COUNT_1_BIT;
+    }
+
+    for (const auto &qvk_sampleCount : qvk_sampleCounts) {
+        if (qvk_sampleCount.count == sampleCount)
+            return qvk_sampleCount.mask;
+    }
+
+    Q_UNREACHABLE();
+    return VK_SAMPLE_COUNT_1_BIT;
+}
+
+void QRhiVulkan::enqueueTransitionPassResources(QVkCommandBuffer *cbD)
+{
+    cbD->passResTrackers.append(QRhiPassResourceTracker());
+    cbD->currentPassResTrackerIndex = cbD->passResTrackers.count() - 1;
+
+    QVkCommandBuffer::Command cmd;
+    cmd.cmd = QVkCommandBuffer::Command::TransitionPassResources;
+    cmd.args.transitionResources.trackerIndex = cbD->passResTrackers.count() - 1;
+    cbD->commands.append(cmd);
+}
+
+void QRhiVulkan::recordPrimaryCommandBuffer(QVkCommandBuffer *cbD)
+{
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::NoPass);
+
+    for (QVkCommandBuffer::Command &cmd : cbD->commands) {
+        switch (cmd.cmd) {
+        case QVkCommandBuffer::Command::CopyBuffer:
+            df->vkCmdCopyBuffer(cbD->cb, cmd.args.copyBuffer.src, cmd.args.copyBuffer.dst,
+                                1, &cmd.args.copyBuffer.desc);
+            break;
+        case QVkCommandBuffer::Command::CopyBufferToImage:
+            df->vkCmdCopyBufferToImage(cbD->cb, cmd.args.copyBufferToImage.src, cmd.args.copyBufferToImage.dst,
+                                       cmd.args.copyBufferToImage.dstLayout,
+                                       uint32_t(cmd.args.copyBufferToImage.count),
+                                       cbD->pools.bufferImageCopy.constData() + cmd.args.copyBufferToImage.bufferImageCopyIndex);
+            break;
+        case QVkCommandBuffer::Command::CopyImage:
+            df->vkCmdCopyImage(cbD->cb, cmd.args.copyImage.src, cmd.args.copyImage.srcLayout,
+                               cmd.args.copyImage.dst, cmd.args.copyImage.dstLayout,
+                               1, &cmd.args.copyImage.desc);
+            break;
+        case QVkCommandBuffer::Command::CopyImageToBuffer:
+            df->vkCmdCopyImageToBuffer(cbD->cb, cmd.args.copyImageToBuffer.src, cmd.args.copyImageToBuffer.srcLayout,
+                                       cmd.args.copyImageToBuffer.dst,
+                                       1, &cmd.args.copyImageToBuffer.desc);
+            break;
+        case QVkCommandBuffer::Command::ImageBarrier:
+            df->vkCmdPipelineBarrier(cbD->cb, cmd.args.imageBarrier.srcStageMask, cmd.args.imageBarrier.dstStageMask,
+                                     0, 0, nullptr, 0, nullptr,
+                                     1, &cmd.args.imageBarrier.desc);
+            break;
+        case QVkCommandBuffer::Command::BufferBarrier:
+            df->vkCmdPipelineBarrier(cbD->cb, cmd.args.bufferBarrier.srcStageMask, cmd.args.bufferBarrier.dstStageMask,
+                                     0, 0, nullptr,
+                                     1, &cmd.args.bufferBarrier.desc,
+                                     0, nullptr);
+            break;
+        case QVkCommandBuffer::Command::BlitImage:
+            df->vkCmdBlitImage(cbD->cb, cmd.args.blitImage.src, cmd.args.blitImage.srcLayout,
+                               cmd.args.blitImage.dst, cmd.args.blitImage.dstLayout,
+                               1, &cmd.args.blitImage.desc,
+                               cmd.args.blitImage.filter);
+            break;
+        case QVkCommandBuffer::Command::BeginRenderPass:
+            cmd.args.beginRenderPass.desc.pClearValues = cbD->pools.clearValue.constData() + cmd.args.beginRenderPass.clearValueIndex;
+            df->vkCmdBeginRenderPass(cbD->cb, &cmd.args.beginRenderPass.desc,
+                                     cbD->useSecondaryCb ? VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS : VK_SUBPASS_CONTENTS_INLINE);
+            break;
+        case QVkCommandBuffer::Command::EndRenderPass:
+            df->vkCmdEndRenderPass(cbD->cb);
+            break;
+        case QVkCommandBuffer::Command::BindPipeline:
+            df->vkCmdBindPipeline(cbD->cb, cmd.args.bindPipeline.bindPoint, cmd.args.bindPipeline.pipeline);
+            break;
+        case QVkCommandBuffer::Command::BindDescriptorSet:
+        {
+            const uint32_t *offsets = nullptr;
+            if (cmd.args.bindDescriptorSet.dynamicOffsetCount > 0)
+                offsets = cbD->pools.dynamicOffset.constData() + cmd.args.bindDescriptorSet.dynamicOffsetIndex;
+            df->vkCmdBindDescriptorSets(cbD->cb, cmd.args.bindDescriptorSet.bindPoint,
+                                        cmd.args.bindDescriptorSet.pipelineLayout,
+                                        0, 1, &cmd.args.bindDescriptorSet.descSet,
+                                        uint32_t(cmd.args.bindDescriptorSet.dynamicOffsetCount),
+                                        offsets);
+        }
+            break;
+        case QVkCommandBuffer::Command::BindVertexBuffer:
+            df->vkCmdBindVertexBuffers(cbD->cb, uint32_t(cmd.args.bindVertexBuffer.startBinding),
+                                       uint32_t(cmd.args.bindVertexBuffer.count),
+                                       cbD->pools.vertexBuffer.constData() + cmd.args.bindVertexBuffer.vertexBufferIndex,
+                                       cbD->pools.vertexBufferOffset.constData() + cmd.args.bindVertexBuffer.vertexBufferOffsetIndex);
+            break;
+        case QVkCommandBuffer::Command::BindIndexBuffer:
+            df->vkCmdBindIndexBuffer(cbD->cb, cmd.args.bindIndexBuffer.buf,
+                                     cmd.args.bindIndexBuffer.ofs, cmd.args.bindIndexBuffer.type);
+            break;
+        case QVkCommandBuffer::Command::SetViewport:
+            df->vkCmdSetViewport(cbD->cb, 0, 1, &cmd.args.setViewport.viewport);
+            break;
+        case QVkCommandBuffer::Command::SetScissor:
+            df->vkCmdSetScissor(cbD->cb, 0, 1, &cmd.args.setScissor.scissor);
+            break;
+        case QVkCommandBuffer::Command::SetBlendConstants:
+            df->vkCmdSetBlendConstants(cbD->cb, cmd.args.setBlendConstants.c);
+            break;
+        case QVkCommandBuffer::Command::SetStencilRef:
+            df->vkCmdSetStencilReference(cbD->cb, VK_STENCIL_FRONT_AND_BACK, cmd.args.setStencilRef.ref);
+            break;
+        case QVkCommandBuffer::Command::Draw:
+            df->vkCmdDraw(cbD->cb, cmd.args.draw.vertexCount, cmd.args.draw.instanceCount,
+                          cmd.args.draw.firstVertex, cmd.args.draw.firstInstance);
+            break;
+        case QVkCommandBuffer::Command::DrawIndexed:
+            df->vkCmdDrawIndexed(cbD->cb, cmd.args.drawIndexed.indexCount, cmd.args.drawIndexed.instanceCount,
+                                 cmd.args.drawIndexed.firstIndex, cmd.args.drawIndexed.vertexOffset,
+                                 cmd.args.drawIndexed.firstInstance);
+            break;
+        case QVkCommandBuffer::Command::DebugMarkerBegin:
+            cmd.args.debugMarkerBegin.marker.pMarkerName =
+                    cbD->pools.debugMarkerData[cmd.args.debugMarkerBegin.markerNameIndex].constData();
+            vkCmdDebugMarkerBegin(cbD->cb, &cmd.args.debugMarkerBegin.marker);
+            break;
+        case QVkCommandBuffer::Command::DebugMarkerEnd:
+            vkCmdDebugMarkerEnd(cbD->cb);
+            break;
+        case QVkCommandBuffer::Command::DebugMarkerInsert:
+            cmd.args.debugMarkerInsert.marker.pMarkerName =
+                    cbD->pools.debugMarkerData[cmd.args.debugMarkerInsert.markerNameIndex].constData();
+            vkCmdDebugMarkerInsert(cbD->cb, &cmd.args.debugMarkerInsert.marker);
+            break;
+        case QVkCommandBuffer::Command::TransitionPassResources:
+            recordTransitionPassResources(cbD, cbD->passResTrackers[cmd.args.transitionResources.trackerIndex]);
+            break;
+        case QVkCommandBuffer::Command::Dispatch:
+            df->vkCmdDispatch(cbD->cb, uint32_t(cmd.args.dispatch.x), uint32_t(cmd.args.dispatch.y), uint32_t(cmd.args.dispatch.z));
+            break;
+        case QVkCommandBuffer::Command::ExecuteSecondary:
+            df->vkCmdExecuteCommands(cbD->cb, 1, &cmd.args.executeSecondary.cb);
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+static inline VkAccessFlags toVkAccess(QRhiPassResourceTracker::BufferAccess access)
+{
+    switch (access) {
+    case QRhiPassResourceTracker::BufVertexInput:
+        return VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
+    case QRhiPassResourceTracker::BufIndexRead:
+        return VK_ACCESS_INDEX_READ_BIT;
+    case QRhiPassResourceTracker::BufUniformRead:
+        return VK_ACCESS_UNIFORM_READ_BIT;
+    case QRhiPassResourceTracker::BufStorageLoad:
+        return VK_ACCESS_SHADER_READ_BIT;
+    case QRhiPassResourceTracker::BufStorageStore:
+        return VK_ACCESS_SHADER_WRITE_BIT;
+    case QRhiPassResourceTracker::BufStorageLoadStore:
+        return VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    return 0;
+}
+
+static inline VkPipelineStageFlags toVkPipelineStage(QRhiPassResourceTracker::BufferStage stage)
+{
+    switch (stage) {
+    case QRhiPassResourceTracker::BufVertexInputStage:
+        return VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
+    case QRhiPassResourceTracker::BufVertexStage:
+        return VK_PIPELINE_STAGE_VERTEX_SHADER_BIT;
+    case QRhiPassResourceTracker::BufFragmentStage:
+        return VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+    case QRhiPassResourceTracker::BufComputeStage:
+        return VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    return 0;
+}
+
+static inline QVkBuffer::UsageState toVkBufferUsageState(QRhiPassResourceTracker::UsageState usage)
+{
+    QVkBuffer::UsageState u;
+    u.access = VkAccessFlags(usage.access);
+    u.stage = VkPipelineStageFlags(usage.stage);
+    return u;
+}
+
+static inline VkImageLayout toVkLayout(QRhiPassResourceTracker::TextureAccess access)
+{
+    switch (access) {
+    case QRhiPassResourceTracker::TexSample:
+        return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    case QRhiPassResourceTracker::TexColorOutput:
+        return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+    case QRhiPassResourceTracker::TexDepthOutput:
+        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+    case QRhiPassResourceTracker::TexStorageLoad:
+        Q_FALLTHROUGH();
+    case QRhiPassResourceTracker::TexStorageStore:
+        Q_FALLTHROUGH();
+    case QRhiPassResourceTracker::TexStorageLoadStore:
+        return VK_IMAGE_LAYOUT_GENERAL;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    return VK_IMAGE_LAYOUT_GENERAL;
+}
+
+static inline VkAccessFlags toVkAccess(QRhiPassResourceTracker::TextureAccess access)
+{
+    switch (access) {
+    case QRhiPassResourceTracker::TexSample:
+        return VK_ACCESS_SHADER_READ_BIT;
+    case QRhiPassResourceTracker::TexColorOutput:
+        return VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+    case QRhiPassResourceTracker::TexDepthOutput:
+        return VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+    case QRhiPassResourceTracker::TexStorageLoad:
+        return VK_ACCESS_SHADER_READ_BIT;
+    case QRhiPassResourceTracker::TexStorageStore:
+        return VK_ACCESS_SHADER_WRITE_BIT;
+    case QRhiPassResourceTracker::TexStorageLoadStore:
+        return VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    return 0;
+}
+
+static inline VkPipelineStageFlags toVkPipelineStage(QRhiPassResourceTracker::TextureStage stage)
+{
+    switch (stage) {
+    case QRhiPassResourceTracker::TexVertexStage:
+        return VK_PIPELINE_STAGE_VERTEX_SHADER_BIT;
+    case QRhiPassResourceTracker::TexFragmentStage:
+        return VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+    case QRhiPassResourceTracker::TexColorOutputStage:
+        return VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+    case QRhiPassResourceTracker::TexDepthOutputStage:
+        return VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+    case QRhiPassResourceTracker::TexComputeStage:
+        return VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    return 0;
+}
+
+static inline QVkTexture::UsageState toVkTextureUsageState(QRhiPassResourceTracker::UsageState usage)
+{
+    QVkTexture::UsageState u;
+    u.layout = VkImageLayout(usage.layout);
+    u.access = VkAccessFlags(usage.access);
+    u.stage = VkPipelineStageFlags(usage.stage);
+    return u;
+}
+
+void QRhiVulkan::trackedRegisterBuffer(QRhiPassResourceTracker *passResTracker,
+                                       QVkBuffer *bufD,
+                                       int slot,
+                                       QRhiPassResourceTracker::BufferAccess access,
+                                       QRhiPassResourceTracker::BufferStage stage)
+{
+    QVkBuffer::UsageState &u(bufD->usageState[slot]);
+    passResTracker->registerBuffer(bufD, slot, &access, &stage, toPassTrackerUsageState(u));
+    u.access = toVkAccess(access);
+    u.stage = toVkPipelineStage(stage);
+}
+
+void QRhiVulkan::trackedRegisterTexture(QRhiPassResourceTracker *passResTracker,
+                                        QVkTexture *texD,
+                                        QRhiPassResourceTracker::TextureAccess access,
+                                        QRhiPassResourceTracker::TextureStage stage)
+{
+    QVkTexture::UsageState &u(texD->usageState);
+    passResTracker->registerTexture(texD, &access, &stage, toPassTrackerUsageState(u));
+    u.layout = toVkLayout(access);
+    u.access = toVkAccess(access);
+    u.stage = toVkPipelineStage(stage);
+}
+
+void QRhiVulkan::recordTransitionPassResources(QVkCommandBuffer *cbD, const QRhiPassResourceTracker &tracker)
+{
+    if (tracker.isEmpty())
+        return;
+
+    for (auto it = tracker.cbeginBuffers(), itEnd = tracker.cendBuffers(); it != itEnd; ++it) {
+        QVkBuffer *bufD = QRHI_RES(QVkBuffer, it.key());
+        VkAccessFlags access = toVkAccess(it->access);
+        VkPipelineStageFlags stage = toVkPipelineStage(it->stage);
+        QVkBuffer::UsageState s = toVkBufferUsageState(it->stateAtPassBegin);
+        if (!s.stage)
+            continue;
+        if (s.access == access && s.stage == stage) {
+            if (!accessIsWrite(access))
+                continue;
+        }
+        VkBufferMemoryBarrier bufMemBarrier;
+        memset(&bufMemBarrier, 0, sizeof(bufMemBarrier));
+        bufMemBarrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+        bufMemBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+        bufMemBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+        bufMemBarrier.srcAccessMask = s.access;
+        bufMemBarrier.dstAccessMask = access;
+        bufMemBarrier.buffer = bufD->buffers[it->slot];
+        bufMemBarrier.size = VK_WHOLE_SIZE;
+        df->vkCmdPipelineBarrier(cbD->cb, s.stage, stage, 0,
+                                 0, nullptr,
+                                 1, &bufMemBarrier,
+                                 0, nullptr);
+    }
+
+    for (auto it = tracker.cbeginTextures(), itEnd = tracker.cendTextures(); it != itEnd; ++it) {
+        QVkTexture *texD = QRHI_RES(QVkTexture, it.key());
+        VkImageLayout layout = toVkLayout(it->access);
+        VkAccessFlags access = toVkAccess(it->access);
+        VkPipelineStageFlags stage = toVkPipelineStage(it->stage);
+        QVkTexture::UsageState s = toVkTextureUsageState(it->stateAtPassBegin);
+        if (s.access == access && s.stage == stage && s.layout == layout) {
+            if (!accessIsWrite(access))
+                continue;
+        }
+        VkImageMemoryBarrier barrier;
+        memset(&barrier, 0, sizeof(barrier));
+        barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+        barrier.subresourceRange.aspectMask = !isDepthTextureFormat(texD->m_format)
+                ? VK_IMAGE_ASPECT_COLOR_BIT : VK_IMAGE_ASPECT_DEPTH_BIT;
+        barrier.subresourceRange.baseMipLevel = 0;
+        barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+        barrier.subresourceRange.baseArrayLayer = 0;
+        barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+        barrier.oldLayout = s.layout; // new textures have this set to PREINITIALIZED
+        barrier.newLayout = layout;
+        barrier.srcAccessMask = s.access; // may be 0 but that's fine
+        barrier.dstAccessMask = access;
+        barrier.image = texD->image;
+        VkPipelineStageFlags srcStage = s.stage;
+        // stage mask cannot be 0
+        if (!srcStage)
+            srcStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+        df->vkCmdPipelineBarrier(cbD->cb, srcStage, stage, 0,
+                                 0, nullptr,
+                                 0, nullptr,
+                                 1, &barrier);
+    }
+}
+
+QRhiSwapChain *QRhiVulkan::createSwapChain()
+{
+    return new QVkSwapChain(this);
+}
+
+QRhiBuffer *QRhiVulkan::createBuffer(QRhiBuffer::Type type, QRhiBuffer::UsageFlags usage, int size)
+{
+    return new QVkBuffer(this, type, usage, size);
+}
+
+int QRhiVulkan::ubufAlignment() const
+{
+    return int(ubufAlign); // typically 256 (bytes)
+}
+
+bool QRhiVulkan::isYUpInFramebuffer() const
+{
+    return false;
+}
+
+bool QRhiVulkan::isYUpInNDC() const
+{
+    return false;
+}
+
+bool QRhiVulkan::isClipDepthZeroToOne() const
+{
+    return true;
+}
+
+QMatrix4x4 QRhiVulkan::clipSpaceCorrMatrix() const
+{
+    // See https://matthewwellings.com/blog/the-new-vulkan-coordinate-system/
+
+    static QMatrix4x4 m;
+    if (m.isIdentity()) {
+        // NB the ctor takes row-major
+        m = QMatrix4x4(1.0f, 0.0f, 0.0f, 0.0f,
+                       0.0f, -1.0f, 0.0f, 0.0f,
+                       0.0f, 0.0f, 0.5f, 0.5f,
+                       0.0f, 0.0f, 0.0f, 1.0f);
+    }
+    return m;
+}
+
+bool QRhiVulkan::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const
+{
+    // Note that with some SDKs the validation layer gives an odd warning about
+    // BC not being supported, even when our check here succeeds. Not much we
+    // can do about that.
+    if (format >= QRhiTexture::BC1 && format <= QRhiTexture::BC7) {
+        if (!physDevFeatures.textureCompressionBC)
+            return false;
+    }
+
+    if (format >= QRhiTexture::ETC2_RGB8 && format <= QRhiTexture::ETC2_RGBA8) {
+        if (!physDevFeatures.textureCompressionETC2)
+            return false;
+    }
+
+    if (format >= QRhiTexture::ASTC_4x4 && format <= QRhiTexture::ASTC_12x12) {
+        if (!physDevFeatures.textureCompressionASTC_LDR)
+            return false;
+    }
+
+    VkFormat vkformat = toVkTextureFormat(format, flags);
+    VkFormatProperties props;
+    f->vkGetPhysicalDeviceFormatProperties(physDev, vkformat, &props);
+    return (props.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) != 0;
+}
+
+bool QRhiVulkan::isFeatureSupported(QRhi::Feature feature) const
+{
+    switch (feature) {
+    case QRhi::MultisampleTexture:
+        return true;
+    case QRhi::MultisampleRenderBuffer:
+        return true;
+    case QRhi::DebugMarkers:
+        return debugMarkersAvailable;
+    case QRhi::Timestamps:
+        return timestampValidBits != 0;
+    case QRhi::Instancing:
+        return true;
+    case QRhi::CustomInstanceStepRate:
+        return vertexAttribDivisorAvailable;
+    case QRhi::PrimitiveRestart:
+        return true;
+    case QRhi::NonDynamicUniformBuffers:
+        return true;
+    case QRhi::NonFourAlignedEffectiveIndexBufferOffset:
+        return true;
+    case QRhi::NPOTTextureRepeat:
+        return true;
+    case QRhi::RedOrAlpha8IsRed:
+        return true;
+    case QRhi::ElementIndexUint:
+        return true;
+    case QRhi::Compute:
+        return hasCompute;
+    case QRhi::WideLines:
+        return hasWideLines;
+    case QRhi::VertexShaderPointSize:
+        return true;
+    case QRhi::BaseVertex:
+        return true;
+    case QRhi::BaseInstance:
+        return true;
+    case QRhi::TriangleFanTopology:
+        return true;
+    case QRhi::ReadBackNonUniformBuffer:
+        return true;
+    case QRhi::ReadBackNonBaseMipLevel:
+        return true;
+    default:
+        Q_UNREACHABLE();
+        return false;
+    }
+}
+
+int QRhiVulkan::resourceLimit(QRhi::ResourceLimit limit) const
+{
+    switch (limit) {
+    case QRhi::TextureSizeMin:
+        return 1;
+    case QRhi::TextureSizeMax:
+        return int(physDevProperties.limits.maxImageDimension2D);
+    case QRhi::MaxColorAttachments:
+        return int(physDevProperties.limits.maxColorAttachments);
+    case QRhi::FramesInFlight:
+        return QVK_FRAMES_IN_FLIGHT;
+    default:
+        Q_UNREACHABLE();
+        return 0;
+    }
+}
+
+const QRhiNativeHandles *QRhiVulkan::nativeHandles()
+{
+    return &nativeHandlesStruct;
+}
+
+void QRhiVulkan::sendVMemStatsToProfiler()
+{
+    QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
+    if (!rhiP)
+        return;
+
+    VmaStats stats;
+    vmaCalculateStats(toVmaAllocator(allocator), &stats);
+    QRHI_PROF_F(vmemStat(stats.total.blockCount, stats.total.allocationCount,
+                         quint32(stats.total.usedBytes), quint32(stats.total.unusedBytes)));
+}
+
+bool QRhiVulkan::makeThreadLocalNativeContextCurrent()
+{
+    // not applicable
+    return false;
+}
+
+void QRhiVulkan::releaseCachedResources()
+{
+    // nothing to do here
+}
+
+bool QRhiVulkan::isDeviceLost() const
+{
+    return deviceLost;
+}
+
+QRhiRenderBuffer *QRhiVulkan::createRenderBuffer(QRhiRenderBuffer::Type type, const QSize &pixelSize,
+                                                 int sampleCount, QRhiRenderBuffer::Flags flags)
+{
+    return new QVkRenderBuffer(this, type, pixelSize, sampleCount, flags);
+}
+
+QRhiTexture *QRhiVulkan::createTexture(QRhiTexture::Format format, const QSize &pixelSize,
+                                       int sampleCount, QRhiTexture::Flags flags)
+{
+    return new QVkTexture(this, format, pixelSize, sampleCount, flags);
+}
+
+QRhiSampler *QRhiVulkan::createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                                       QRhiSampler::Filter mipmapMode,
+                                       QRhiSampler::AddressMode u, QRhiSampler::AddressMode v)
+{
+    return new QVkSampler(this, magFilter, minFilter, mipmapMode, u, v);
+}
+
+QRhiTextureRenderTarget *QRhiVulkan::createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                               QRhiTextureRenderTarget::Flags flags)
+{
+    return new QVkTextureRenderTarget(this, desc, flags);
+}
+
+QRhiGraphicsPipeline *QRhiVulkan::createGraphicsPipeline()
+{
+    return new QVkGraphicsPipeline(this);
+}
+
+QRhiComputePipeline *QRhiVulkan::createComputePipeline()
+{
+    return new QVkComputePipeline(this);
+}
+
+QRhiShaderResourceBindings *QRhiVulkan::createShaderResourceBindings()
+{
+    return new QVkShaderResourceBindings(this);
+}
+
+void QRhiVulkan::setGraphicsPipeline(QRhiCommandBuffer *cb, QRhiGraphicsPipeline *ps)
+{
+    QVkGraphicsPipeline *psD = QRHI_RES(QVkGraphicsPipeline, ps);
+    Q_ASSERT(psD->pipeline);
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+
+    if (cbD->currentGraphicsPipeline != ps || cbD->currentPipelineGeneration != psD->generation) {
+        if (cbD->useSecondaryCb) {
+            df->vkCmdBindPipeline(cbD->secondaryCbs.last(), VK_PIPELINE_BIND_POINT_GRAPHICS, psD->pipeline);
+        } else {
+            QVkCommandBuffer::Command cmd;
+            cmd.cmd = QVkCommandBuffer::Command::BindPipeline;
+            cmd.args.bindPipeline.bindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+            cmd.args.bindPipeline.pipeline = psD->pipeline;
+            cbD->commands.append(cmd);
+        }
+
+        cbD->currentGraphicsPipeline = ps;
+        cbD->currentComputePipeline = nullptr;
+        cbD->currentPipelineGeneration = psD->generation;
+    }
+
+    psD->lastActiveFrameSlot = currentFrameSlot;
+}
+
+void QRhiVulkan::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBindings *srb,
+                                    int dynamicOffsetCount,
+                                    const QRhiCommandBuffer::DynamicOffset *dynamicOffsets)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass != QVkCommandBuffer::NoPass);
+    QVkGraphicsPipeline *gfxPsD = QRHI_RES(QVkGraphicsPipeline, cbD->currentGraphicsPipeline);
+    QVkComputePipeline *compPsD = QRHI_RES(QVkComputePipeline, cbD->currentComputePipeline);
+
+    if (!srb) {
+        if (gfxPsD)
+            srb = gfxPsD->m_shaderResourceBindings;
+        else
+            srb = compPsD->m_shaderResourceBindings;
+    }
+
+    QVkShaderResourceBindings *srbD = QRHI_RES(QVkShaderResourceBindings, srb);
+    bool hasSlottedResourceInSrb = false;
+    bool hasDynamicOffsetInSrb = false;
+
+    for (const QRhiShaderResourceBinding &binding : qAsConst(srbD->sortedBindings)) {
+        const QRhiShaderResourceBinding::Data *b = binding.data();
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+            if (QRHI_RES(QVkBuffer, b->u.ubuf.buf)->m_type == QRhiBuffer::Dynamic)
+                hasSlottedResourceInSrb = true;
+            if (b->u.ubuf.hasDynamicOffset)
+                hasDynamicOffsetInSrb = true;
+            break;
+        default:
+            break;
+        }
+    }
+
+    const int descSetIdx = hasSlottedResourceInSrb ? currentFrameSlot : 0;
+    bool rewriteDescSet = false;
+
+    // Do host writes and mark referenced shader resources as in-use.
+    // Also prepare to ensure the descriptor set we are going to bind refers to up-to-date Vk objects.
+    for (int i = 0, ie = srbD->sortedBindings.count(); i != ie; ++i) {
+        const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings.at(i).data();
+        QVkShaderResourceBindings::BoundResourceData &bd(srbD->boundResourceData[descSetIdx][i]);
+        QRhiPassResourceTracker &passResTracker(cbD->passResTrackers[cbD->currentPassResTrackerIndex]);
+        switch (b->type) {
+        case QRhiShaderResourceBinding::UniformBuffer:
+        {
+            QVkBuffer *bufD = QRHI_RES(QVkBuffer, b->u.ubuf.buf);
+            Q_ASSERT(bufD->m_usage.testFlag(QRhiBuffer::UniformBuffer));
+
+            if (bufD->m_type == QRhiBuffer::Dynamic)
+                executeBufferHostWritesForCurrentFrame(bufD);
+
+            bufD->lastActiveFrameSlot = currentFrameSlot;
+            trackedRegisterBuffer(&passResTracker, bufD, bufD->m_type == QRhiBuffer::Dynamic ? currentFrameSlot : 0,
+                                  QRhiPassResourceTracker::BufUniformRead,
+                                  QRhiPassResourceTracker::toPassTrackerBufferStage(b->stage));
+
+            // Check both the "local" id (the generation counter) and the
+            // global id. The latter is relevant when a newly allocated
+            // QRhiResource ends up with the same pointer as a previous one.
+            // (and that previous one could have been in an srb...)
+            if (bufD->generation != bd.ubuf.generation || bufD->m_id != bd.ubuf.id) {
+                rewriteDescSet = true;
+                bd.ubuf.id = bufD->m_id;
+                bd.ubuf.generation = bufD->generation;
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::SampledTexture:
+        {
+            QVkTexture *texD = QRHI_RES(QVkTexture, b->u.stex.tex);
+            QVkSampler *samplerD = QRHI_RES(QVkSampler, b->u.stex.sampler);
+            texD->lastActiveFrameSlot = currentFrameSlot;
+            samplerD->lastActiveFrameSlot = currentFrameSlot;
+            trackedRegisterTexture(&passResTracker, texD,
+                                   QRhiPassResourceTracker::TexSample,
+                                   QRhiPassResourceTracker::toPassTrackerTextureStage(b->stage));
+
+            if (texD->generation != bd.stex.texGeneration
+                    || texD->m_id != bd.stex.texId
+                    || samplerD->generation != bd.stex.samplerGeneration
+                    || samplerD->m_id != bd.stex.samplerId)
+            {
+                rewriteDescSet = true;
+                bd.stex.texId = texD->m_id;
+                bd.stex.texGeneration = texD->generation;
+                bd.stex.samplerId = samplerD->m_id;
+                bd.stex.samplerGeneration = samplerD->generation;
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::ImageLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::ImageLoadStore:
+        {
+            QVkTexture *texD = QRHI_RES(QVkTexture, b->u.simage.tex);
+            Q_ASSERT(texD->m_flags.testFlag(QRhiTexture::UsedWithLoadStore));
+            texD->lastActiveFrameSlot = currentFrameSlot;
+            QRhiPassResourceTracker::TextureAccess access;
+            if (b->type == QRhiShaderResourceBinding::ImageLoad)
+                access = QRhiPassResourceTracker::TexStorageLoad;
+            else if (b->type == QRhiShaderResourceBinding::ImageStore)
+                access = QRhiPassResourceTracker::TexStorageStore;
+            else
+                access = QRhiPassResourceTracker::TexStorageLoadStore;
+            trackedRegisterTexture(&passResTracker, texD,
+                                   access,
+                                   QRhiPassResourceTracker::toPassTrackerTextureStage(b->stage));
+
+            if (texD->generation != bd.simage.generation || texD->m_id != bd.simage.id) {
+                rewriteDescSet = true;
+                bd.simage.id = texD->m_id;
+                bd.simage.generation = texD->generation;
+            }
+        }
+            break;
+        case QRhiShaderResourceBinding::BufferLoad:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferStore:
+            Q_FALLTHROUGH();
+        case QRhiShaderResourceBinding::BufferLoadStore:
+        {
+            QVkBuffer *bufD = QRHI_RES(QVkBuffer, b->u.sbuf.buf);
+            Q_ASSERT(bufD->m_usage.testFlag(QRhiBuffer::StorageBuffer));
+
+            if (bufD->m_type == QRhiBuffer::Dynamic)
+                executeBufferHostWritesForCurrentFrame(bufD);
+
+            bufD->lastActiveFrameSlot = currentFrameSlot;
+            QRhiPassResourceTracker::BufferAccess access;
+            if (b->type == QRhiShaderResourceBinding::BufferLoad)
+                access = QRhiPassResourceTracker::BufStorageLoad;
+            else if (b->type == QRhiShaderResourceBinding::BufferStore)
+                access = QRhiPassResourceTracker::BufStorageStore;
+            else
+                access = QRhiPassResourceTracker::BufStorageLoadStore;
+            trackedRegisterBuffer(&passResTracker, bufD, bufD->m_type == QRhiBuffer::Dynamic ? currentFrameSlot : 0,
+                                  access,
+                                  QRhiPassResourceTracker::toPassTrackerBufferStage(b->stage));
+
+            if (bufD->generation != bd.sbuf.generation || bufD->m_id != bd.sbuf.id) {
+                rewriteDescSet = true;
+                bd.sbuf.id = bufD->m_id;
+                bd.sbuf.generation = bufD->generation;
+            }
+        }
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    // write descriptor sets, if needed
+    if (rewriteDescSet)
+        updateShaderResourceBindings(srb, descSetIdx);
+
+    // make sure the descriptors for the correct slot will get bound.
+    // also, dynamic offsets always need a bind.
+    const bool forceRebind = (hasSlottedResourceInSrb && cbD->currentDescSetSlot != descSetIdx) || hasDynamicOffsetInSrb;
+
+    const bool srbChanged = gfxPsD ? (cbD->currentGraphicsSrb != srb) : (cbD->currentComputeSrb != srb);
+
+    if (forceRebind || rewriteDescSet || srbChanged || cbD->currentSrbGeneration != srbD->generation) {
+        QVarLengthArray<uint32_t, 4> dynOfs;
+        if (hasDynamicOffsetInSrb) {
+            // Filling out dynOfs based on the sorted bindings is important
+            // because dynOfs has to be ordered based on the binding numbers,
+            // and neither srb nor dynamicOffsets has any such ordering
+            // requirement.
+            for (const QRhiShaderResourceBinding &binding : qAsConst(srbD->sortedBindings)) {
+                const QRhiShaderResourceBinding::Data *b = binding.data();
+                if (b->type == QRhiShaderResourceBinding::UniformBuffer && b->u.ubuf.hasDynamicOffset) {
+                    uint32_t offset = 0;
+                    for (int i = 0; i < dynamicOffsetCount; ++i) {
+                        const QRhiCommandBuffer::DynamicOffset &dynOfs(dynamicOffsets[i]);
+                        if (dynOfs.first == b->binding) {
+                            offset = dynOfs.second;
+                            break;
+                        }
+                    }
+                    dynOfs.append(offset); // use 0 if dynamicOffsets did not contain this binding
+                }
+            }
+        }
+
+        if (cbD->useSecondaryCb) {
+            df->vkCmdBindDescriptorSets(cbD->secondaryCbs.last(),
+                                        gfxPsD ? VK_PIPELINE_BIND_POINT_GRAPHICS : VK_PIPELINE_BIND_POINT_COMPUTE,
+                                        gfxPsD ? gfxPsD->layout : compPsD->layout,
+                                        0, 1, &srbD->descSets[descSetIdx],
+                                        uint32_t(dynOfs.count()),
+                                        dynOfs.count() ? dynOfs.constData() : nullptr);
+        } else {
+            QVkCommandBuffer::Command cmd;
+            cmd.cmd = QVkCommandBuffer::Command::BindDescriptorSet;
+            cmd.args.bindDescriptorSet.bindPoint = gfxPsD ? VK_PIPELINE_BIND_POINT_GRAPHICS
+                                                          : VK_PIPELINE_BIND_POINT_COMPUTE;
+            cmd.args.bindDescriptorSet.pipelineLayout = gfxPsD ? gfxPsD->layout : compPsD->layout;
+            cmd.args.bindDescriptorSet.descSet = srbD->descSets[descSetIdx];
+            cmd.args.bindDescriptorSet.dynamicOffsetCount = dynOfs.count();
+            cmd.args.bindDescriptorSet.dynamicOffsetIndex = cbD->pools.dynamicOffset.count();
+            cbD->pools.dynamicOffset.append(dynOfs.constData(), dynOfs.count());
+            cbD->commands.append(cmd);
+        }
+
+        if (gfxPsD) {
+            cbD->currentGraphicsSrb = srb;
+            cbD->currentComputeSrb = nullptr;
+        } else {
+            cbD->currentGraphicsSrb = nullptr;
+            cbD->currentComputeSrb = srb;
+        }
+        cbD->currentSrbGeneration = srbD->generation;
+        cbD->currentDescSetSlot = descSetIdx;
+    }
+
+    srbD->lastActiveFrameSlot = currentFrameSlot;
+}
+
+void QRhiVulkan::setVertexInput(QRhiCommandBuffer *cb,
+                                int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                                QRhiBuffer *indexBuf, quint32 indexOffset, QRhiCommandBuffer::IndexFormat indexFormat)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+    QRhiPassResourceTracker &passResTracker(cbD->passResTrackers[cbD->currentPassResTrackerIndex]);
+
+    bool needsBindVBuf = false;
+    for (int i = 0; i < bindingCount; ++i) {
+        const int inputSlot = startBinding + i;
+        QVkBuffer *bufD = QRHI_RES(QVkBuffer, bindings[i].first);
+        Q_ASSERT(bufD->m_usage.testFlag(QRhiBuffer::VertexBuffer));
+        bufD->lastActiveFrameSlot = currentFrameSlot;
+        if (bufD->m_type == QRhiBuffer::Dynamic)
+            executeBufferHostWritesForCurrentFrame(bufD);
+
+        const VkBuffer vkvertexbuf = bufD->buffers[bufD->m_type == QRhiBuffer::Dynamic ? currentFrameSlot : 0];
+        if (cbD->currentVertexBuffers[inputSlot] != vkvertexbuf
+                || cbD->currentVertexOffsets[inputSlot] != bindings[i].second)
+        {
+            needsBindVBuf = true;
+            cbD->currentVertexBuffers[inputSlot] = vkvertexbuf;
+            cbD->currentVertexOffsets[inputSlot] = bindings[i].second;
+        }
+    }
+
+    if (needsBindVBuf) {
+        QVarLengthArray<VkBuffer, 4> bufs;
+        QVarLengthArray<VkDeviceSize, 4> ofs;
+        for (int i = 0; i < bindingCount; ++i) {
+            QVkBuffer *bufD = QRHI_RES(QVkBuffer, bindings[i].first);
+            const int slot = bufD->m_type == QRhiBuffer::Dynamic ? currentFrameSlot : 0;
+            bufs.append(bufD->buffers[slot]);
+            ofs.append(bindings[i].second);
+            trackedRegisterBuffer(&passResTracker, bufD, slot,
+                                  QRhiPassResourceTracker::BufVertexInput,
+                                  QRhiPassResourceTracker::BufVertexInputStage);
+        }
+
+        if (cbD->useSecondaryCb) {
+            df->vkCmdBindVertexBuffers(cbD->secondaryCbs.last(), uint32_t(startBinding),
+                                       uint32_t(bufs.count()), bufs.constData(), ofs.constData());
+        } else {
+            QVkCommandBuffer::Command cmd;
+            cmd.cmd = QVkCommandBuffer::Command::BindVertexBuffer;
+            cmd.args.bindVertexBuffer.startBinding = startBinding;
+            cmd.args.bindVertexBuffer.count = bufs.count();
+            cmd.args.bindVertexBuffer.vertexBufferIndex = cbD->pools.vertexBuffer.count();
+            cbD->pools.vertexBuffer.append(bufs.constData(), bufs.count());
+            cmd.args.bindVertexBuffer.vertexBufferOffsetIndex = cbD->pools.vertexBufferOffset.count();
+            cbD->pools.vertexBufferOffset.append(ofs.constData(), ofs.count());
+            cbD->commands.append(cmd);
+        }
+    }
+
+    if (indexBuf) {
+        QVkBuffer *ibufD = QRHI_RES(QVkBuffer, indexBuf);
+        Q_ASSERT(ibufD->m_usage.testFlag(QRhiBuffer::IndexBuffer));
+        ibufD->lastActiveFrameSlot = currentFrameSlot;
+        if (ibufD->m_type == QRhiBuffer::Dynamic)
+            executeBufferHostWritesForCurrentFrame(ibufD);
+
+        const int slot = ibufD->m_type == QRhiBuffer::Dynamic ? currentFrameSlot : 0;
+        const VkBuffer vkindexbuf = ibufD->buffers[slot];
+        const VkIndexType type = indexFormat == QRhiCommandBuffer::IndexUInt16 ? VK_INDEX_TYPE_UINT16
+                                                                               : VK_INDEX_TYPE_UINT32;
+
+        if (cbD->currentIndexBuffer != vkindexbuf
+                || cbD->currentIndexOffset != indexOffset
+                || cbD->currentIndexFormat != type)
+        {
+            cbD->currentIndexBuffer = vkindexbuf;
+            cbD->currentIndexOffset = indexOffset;
+            cbD->currentIndexFormat = type;
+
+            if (cbD->useSecondaryCb) {
+                df->vkCmdBindIndexBuffer(cbD->secondaryCbs.last(), vkindexbuf, indexOffset, type);
+            } else {
+                QVkCommandBuffer::Command cmd;
+                cmd.cmd = QVkCommandBuffer::Command::BindIndexBuffer;
+                cmd.args.bindIndexBuffer.buf = vkindexbuf;
+                cmd.args.bindIndexBuffer.ofs = indexOffset;
+                cmd.args.bindIndexBuffer.type = type;
+                cbD->commands.append(cmd);
+            }
+
+            trackedRegisterBuffer(&passResTracker, ibufD, slot,
+                                  QRhiPassResourceTracker::BufIndexRead,
+                                  QRhiPassResourceTracker::BufVertexInputStage);
+        }
+    }
+}
+
+void QRhiVulkan::setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+    const QSize outputSize = cbD->currentTarget->pixelSize();
+
+    // x,y is top-left in VkViewport but bottom-left in QRhiViewport
+    float x, y, w, h;
+    if (!qrhi_toTopLeftRenderTargetRect(outputSize, viewport.viewport(), &x, &y, &w, &h))
+        return;
+
+    QVkCommandBuffer::Command cmd;
+    VkViewport *vp = &cmd.args.setViewport.viewport;
+    vp->x = x;
+    vp->y = y;
+    vp->width = w;
+    vp->height = h;
+    vp->minDepth = viewport.minDepth();
+    vp->maxDepth = viewport.maxDepth();
+
+    if (cbD->useSecondaryCb) {
+        df->vkCmdSetViewport(cbD->secondaryCbs.last(), 0, 1, vp);
+    } else {
+        cmd.cmd = QVkCommandBuffer::Command::SetViewport;
+        cbD->commands.append(cmd);
+    }
+
+    if (!QRHI_RES(QVkGraphicsPipeline, cbD->currentGraphicsPipeline)->m_flags.testFlag(QRhiGraphicsPipeline::UsesScissor)) {
+        VkRect2D *s = &cmd.args.setScissor.scissor;
+        s->offset.x = int32_t(x);
+        s->offset.y = int32_t(y);
+        s->extent.width = uint32_t(w);
+        s->extent.height = uint32_t(h);
+        if (cbD->useSecondaryCb) {
+            df->vkCmdSetScissor(cbD->secondaryCbs.last(), 0, 1, s);
+        } else {
+            cmd.cmd = QVkCommandBuffer::Command::SetScissor;
+            cbD->commands.append(cmd);
+        }
+    }
+}
+
+void QRhiVulkan::setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+    Q_ASSERT(QRHI_RES(QVkGraphicsPipeline, cbD->currentGraphicsPipeline)->m_flags.testFlag(QRhiGraphicsPipeline::UsesScissor));
+    const QSize outputSize = cbD->currentTarget->pixelSize();
+
+    // x,y is top-left in VkRect2D but bottom-left in QRhiScissor
+    int x, y, w, h;
+    if (!qrhi_toTopLeftRenderTargetRect(outputSize, scissor.scissor(), &x, &y, &w, &h))
+        return;
+
+    QVkCommandBuffer::Command cmd;
+    VkRect2D *s = &cmd.args.setScissor.scissor;
+    s->offset.x = x;
+    s->offset.y = y;
+    s->extent.width = uint32_t(w);
+    s->extent.height = uint32_t(h);
+
+    if (cbD->useSecondaryCb) {
+        df->vkCmdSetScissor(cbD->secondaryCbs.last(), 0, 1, s);
+    } else {
+        cmd.cmd = QVkCommandBuffer::Command::SetScissor;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiVulkan::setBlendConstants(QRhiCommandBuffer *cb, const QColor &c)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+
+    if (cbD->useSecondaryCb) {
+        float constants[] = { float(c.redF()), float(c.greenF()), float(c.blueF()), float(c.alphaF()) };
+        df->vkCmdSetBlendConstants(cbD->secondaryCbs.last(), constants);
+    } else {
+        QVkCommandBuffer::Command cmd;
+        cmd.cmd = QVkCommandBuffer::Command::SetBlendConstants;
+        cmd.args.setBlendConstants.c[0] = float(c.redF());
+        cmd.args.setBlendConstants.c[1] = float(c.greenF());
+        cmd.args.setBlendConstants.c[2] = float(c.blueF());
+        cmd.args.setBlendConstants.c[3] = float(c.alphaF());
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiVulkan::setStencilRef(QRhiCommandBuffer *cb, quint32 refValue)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+
+    if (cbD->useSecondaryCb) {
+        df->vkCmdSetStencilReference(cbD->secondaryCbs.last(), VK_STENCIL_FRONT_AND_BACK, refValue);
+    } else {
+        QVkCommandBuffer::Command cmd;
+        cmd.cmd = QVkCommandBuffer::Command::SetStencilRef;
+        cmd.args.setStencilRef.ref = refValue;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiVulkan::draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+                      quint32 instanceCount, quint32 firstVertex, quint32 firstInstance)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+
+    if (cbD->useSecondaryCb) {
+        df->vkCmdDraw(cbD->secondaryCbs.last(), vertexCount, instanceCount, firstVertex, firstInstance);
+    } else {
+        QVkCommandBuffer::Command cmd;
+        cmd.cmd = QVkCommandBuffer::Command::Draw;
+        cmd.args.draw.vertexCount = vertexCount;
+        cmd.args.draw.instanceCount = instanceCount;
+        cmd.args.draw.firstVertex = firstVertex;
+        cmd.args.draw.firstInstance = firstInstance;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiVulkan::drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                             quint32 instanceCount, quint32 firstIndex, qint32 vertexOffset, quint32 firstInstance)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    Q_ASSERT(cbD->recordingPass == QVkCommandBuffer::RenderPass);
+
+    if (cbD->useSecondaryCb) {
+        df->vkCmdDrawIndexed(cbD->secondaryCbs.last(), indexCount, instanceCount,
+                             firstIndex, vertexOffset, firstInstance);
+    } else {
+        QVkCommandBuffer::Command cmd;
+        cmd.cmd = QVkCommandBuffer::Command::DrawIndexed;
+        cmd.args.drawIndexed.indexCount = indexCount;
+        cmd.args.drawIndexed.instanceCount = instanceCount;
+        cmd.args.drawIndexed.firstIndex = firstIndex;
+        cmd.args.drawIndexed.vertexOffset = vertexOffset;
+        cmd.args.drawIndexed.firstInstance = firstInstance;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiVulkan::debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name)
+{
+    if (!debugMarkers || !debugMarkersAvailable)
+        return;
+
+    VkDebugMarkerMarkerInfoEXT marker;
+    memset(&marker, 0, sizeof(marker));
+    marker.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT;
+
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    if (cbD->recordingPass != QVkCommandBuffer::NoPass && cbD->useSecondaryCb) {
+        marker.pMarkerName = name.constData();
+        vkCmdDebugMarkerBegin(cbD->secondaryCbs.last(), &marker);
+    } else {
+        QVkCommandBuffer::Command cmd;
+        cmd.cmd = QVkCommandBuffer::Command::DebugMarkerBegin;
+        cmd.args.debugMarkerBegin.marker = marker;
+        cmd.args.debugMarkerBegin.markerNameIndex = cbD->pools.debugMarkerData.count();
+        cbD->pools.debugMarkerData.append(name);
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiVulkan::debugMarkEnd(QRhiCommandBuffer *cb)
+{
+    if (!debugMarkers || !debugMarkersAvailable)
+        return;
+
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    if (cbD->recordingPass != QVkCommandBuffer::NoPass && cbD->useSecondaryCb) {
+        vkCmdDebugMarkerEnd(cbD->secondaryCbs.last());
+    } else {
+        QVkCommandBuffer::Command cmd;
+        cmd.cmd = QVkCommandBuffer::Command::DebugMarkerEnd;
+        cbD->commands.append(cmd);
+    }
+}
+
+void QRhiVulkan::debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg)
+{
+    if (!debugMarkers || !debugMarkersAvailable)
+        return;
+
+    VkDebugMarkerMarkerInfoEXT marker;
+    memset(&marker, 0, sizeof(marker));
+    marker.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT;
+
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+    if (cbD->recordingPass != QVkCommandBuffer::NoPass && cbD->useSecondaryCb) {
+        marker.pMarkerName = msg.constData();
+        vkCmdDebugMarkerInsert(cbD->secondaryCbs.last(), &marker);
+    } else {
+        QVkCommandBuffer::Command cmd;
+        cmd.cmd = QVkCommandBuffer::Command::DebugMarkerInsert;
+        cmd.args.debugMarkerInsert.marker = marker;
+        cmd.args.debugMarkerInsert.markerNameIndex = cbD->pools.debugMarkerData.count();
+        cbD->pools.debugMarkerData.append(msg);
+        cbD->commands.append(cmd);
+    }
+}
+
+const QRhiNativeHandles *QRhiVulkan::nativeHandles(QRhiCommandBuffer *cb)
+{
+    return QRHI_RES(QVkCommandBuffer, cb)->nativeHandles();
+}
+
+static inline QVkRenderTargetData *maybeRenderTargetData(QVkCommandBuffer *cbD)
+{
+    Q_ASSERT(cbD->currentTarget);
+    QVkRenderTargetData *rtD = nullptr;
+    if (cbD->recordingPass == QVkCommandBuffer::RenderPass) {
+        switch (cbD->currentTarget->resourceType()) {
+        case QRhiResource::RenderTarget:
+            rtD = &QRHI_RES(QVkReferenceRenderTarget, cbD->currentTarget)->d;
+            break;
+        case QRhiResource::TextureRenderTarget:
+            rtD = &QRHI_RES(QVkTextureRenderTarget, cbD->currentTarget)->d;
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+    return rtD;
+}
+
+void QRhiVulkan::beginExternal(QRhiCommandBuffer *cb)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+
+    // When not in a pass, it is simple: record what we have (but do not
+    // submit), the cb can then be used to record more external commands.
+    if (cbD->recordingPass == QVkCommandBuffer::NoPass) {
+        recordPrimaryCommandBuffer(cbD);
+        cbD->resetCommands();
+        return;
+    }
+
+    // Otherwise, inside a pass, have a secondary command buffer (with
+    // RENDER_PASS_CONTINUE). Using the main one is not acceptable since we
+    // cannot just record at this stage, that would mess up the resource
+    // tracking and commands like TransitionPassResources.
+
+    if (cbD->inExternal)
+        return;
+
+    if (!cbD->useSecondaryCb) {
+        qWarning("beginExternal() within a pass is only supported with secondary command buffers. "
+                 "This can be enabled by passing QRhi::ExternalContentsInPass to beginFrame().");
+        return;
+    }
+
+    VkCommandBuffer secondaryCb = cbD->secondaryCbs.last();
+    cbD->secondaryCbs.removeLast();
+    endAndEnqueueSecondaryCommandBuffer(secondaryCb, cbD);
+
+    VkCommandBuffer extCb = startSecondaryCommandBuffer(maybeRenderTargetData(cbD));
+    if (extCb) {
+        cbD->secondaryCbs.append(extCb);
+        cbD->inExternal = true;
+    }
+}
+
+void QRhiVulkan::endExternal(QRhiCommandBuffer *cb)
+{
+    QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
+
+    if (cbD->recordingPass == QVkCommandBuffer::NoPass) {
+        Q_ASSERT(cbD->commands.isEmpty() && cbD->currentPassResTrackerIndex == -1);
+    } else if (cbD->inExternal) {
+        VkCommandBuffer extCb = cbD->secondaryCbs.last();
+        cbD->secondaryCbs.removeLast();
+        endAndEnqueueSecondaryCommandBuffer(extCb, cbD);
+        cbD->secondaryCbs.append(startSecondaryCommandBuffer(maybeRenderTargetData(cbD)));
+    }
+
+    cbD->resetCachedState();
+}
+
+void QRhiVulkan::setObjectName(uint64_t object, VkDebugReportObjectTypeEXT type, const QByteArray &name, int slot)
+{
+    if (!debugMarkers || !debugMarkersAvailable || name.isEmpty())
+        return;
+
+    VkDebugMarkerObjectNameInfoEXT nameInfo;
+    memset(&nameInfo, 0, sizeof(nameInfo));
+    nameInfo.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT;
+    nameInfo.objectType = type;
+    nameInfo.object = object;
+    QByteArray decoratedName = name;
+    if (slot >= 0) {
+        decoratedName += '/';
+        decoratedName += QByteArray::number(slot);
+    }
+    nameInfo.pObjectName = decoratedName.constData();
+    vkDebugMarkerSetObjectName(dev, &nameInfo);
+}
+
+static inline VkBufferUsageFlagBits toVkBufferUsage(QRhiBuffer::UsageFlags usage)
+{
+    int u = 0;
+    if (usage.testFlag(QRhiBuffer::VertexBuffer))
+        u |= VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
+    if (usage.testFlag(QRhiBuffer::IndexBuffer))
+        u |= VK_BUFFER_USAGE_INDEX_BUFFER_BIT;
+    if (usage.testFlag(QRhiBuffer::UniformBuffer))
+        u |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
+    if (usage.testFlag(QRhiBuffer::StorageBuffer))
+        u |= VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
+    return VkBufferUsageFlagBits(u);
+}
+
+static inline VkFilter toVkFilter(QRhiSampler::Filter f)
+{
+    switch (f) {
+    case QRhiSampler::Nearest:
+        return VK_FILTER_NEAREST;
+    case QRhiSampler::Linear:
+        return VK_FILTER_LINEAR;
+    default:
+        Q_UNREACHABLE();
+        return VK_FILTER_NEAREST;
+    }
+}
+
+static inline VkSamplerMipmapMode toVkMipmapMode(QRhiSampler::Filter f)
+{
+    switch (f) {
+    case QRhiSampler::None:
+        return VK_SAMPLER_MIPMAP_MODE_NEAREST;
+    case QRhiSampler::Nearest:
+        return VK_SAMPLER_MIPMAP_MODE_NEAREST;
+    case QRhiSampler::Linear:
+        return VK_SAMPLER_MIPMAP_MODE_LINEAR;
+    default:
+        Q_UNREACHABLE();
+        return VK_SAMPLER_MIPMAP_MODE_NEAREST;
+    }
+}
+
+static inline VkSamplerAddressMode toVkAddressMode(QRhiSampler::AddressMode m)
+{
+    switch (m) {
+    case QRhiSampler::Repeat:
+        return VK_SAMPLER_ADDRESS_MODE_REPEAT;
+    case QRhiSampler::ClampToEdge:
+        return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+    case QRhiSampler::Border:
+        return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER;
+    case QRhiSampler::Mirror:
+        return VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT;
+    case QRhiSampler::MirrorOnce:
+        return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE;
+    default:
+        Q_UNREACHABLE();
+        return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+    }
+}
+
+static inline VkShaderStageFlagBits toVkShaderStage(QRhiShaderStage::Type type)
+{
+    switch (type) {
+    case QRhiShaderStage::Vertex:
+        return VK_SHADER_STAGE_VERTEX_BIT;
+    case QRhiShaderStage::Fragment:
+        return VK_SHADER_STAGE_FRAGMENT_BIT;
+    case QRhiShaderStage::Compute:
+        return VK_SHADER_STAGE_COMPUTE_BIT;
+    default:
+        Q_UNREACHABLE();
+        return VK_SHADER_STAGE_VERTEX_BIT;
+    }
+}
+
+static inline VkFormat toVkAttributeFormat(QRhiVertexInputAttribute::Format format)
+{
+    switch (format) {
+    case QRhiVertexInputAttribute::Float4:
+        return VK_FORMAT_R32G32B32A32_SFLOAT;
+    case QRhiVertexInputAttribute::Float3:
+        return VK_FORMAT_R32G32B32_SFLOAT;
+    case QRhiVertexInputAttribute::Float2:
+        return VK_FORMAT_R32G32_SFLOAT;
+    case QRhiVertexInputAttribute::Float:
+        return VK_FORMAT_R32_SFLOAT;
+    case QRhiVertexInputAttribute::UNormByte4:
+        return VK_FORMAT_R8G8B8A8_UNORM;
+    case QRhiVertexInputAttribute::UNormByte2:
+        return VK_FORMAT_R8G8_UNORM;
+    case QRhiVertexInputAttribute::UNormByte:
+        return VK_FORMAT_R8_UNORM;
+    default:
+        Q_UNREACHABLE();
+        return VK_FORMAT_R32G32B32A32_SFLOAT;
+    }
+}
+
+static inline VkPrimitiveTopology toVkTopology(QRhiGraphicsPipeline::Topology t)
+{
+    switch (t) {
+    case QRhiGraphicsPipeline::Triangles:
+        return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+    case QRhiGraphicsPipeline::TriangleStrip:
+        return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
+    case QRhiGraphicsPipeline::TriangleFan:
+        return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN;
+    case QRhiGraphicsPipeline::Lines:
+        return VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
+    case QRhiGraphicsPipeline::LineStrip:
+        return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
+    case QRhiGraphicsPipeline::Points:
+        return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
+    default:
+        Q_UNREACHABLE();
+        return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+    }
+}
+
+static inline VkCullModeFlags toVkCullMode(QRhiGraphicsPipeline::CullMode c)
+{
+    switch (c) {
+    case QRhiGraphicsPipeline::None:
+        return VK_CULL_MODE_NONE;
+    case QRhiGraphicsPipeline::Front:
+        return VK_CULL_MODE_FRONT_BIT;
+    case QRhiGraphicsPipeline::Back:
+        return VK_CULL_MODE_BACK_BIT;
+    default:
+        Q_UNREACHABLE();
+        return VK_CULL_MODE_NONE;
+    }
+}
+
+static inline VkFrontFace toVkFrontFace(QRhiGraphicsPipeline::FrontFace f)
+{
+    switch (f) {
+    case QRhiGraphicsPipeline::CCW:
+        return VK_FRONT_FACE_COUNTER_CLOCKWISE;
+    case QRhiGraphicsPipeline::CW:
+        return VK_FRONT_FACE_CLOCKWISE;
+    default:
+        Q_UNREACHABLE();
+        return VK_FRONT_FACE_COUNTER_CLOCKWISE;
+    }
+}
+
+static inline VkColorComponentFlags toVkColorComponents(QRhiGraphicsPipeline::ColorMask c)
+{
+    int f = 0;
+    if (c.testFlag(QRhiGraphicsPipeline::R))
+        f |= VK_COLOR_COMPONENT_R_BIT;
+    if (c.testFlag(QRhiGraphicsPipeline::G))
+        f |= VK_COLOR_COMPONENT_G_BIT;
+    if (c.testFlag(QRhiGraphicsPipeline::B))
+        f |= VK_COLOR_COMPONENT_B_BIT;
+    if (c.testFlag(QRhiGraphicsPipeline::A))
+        f |= VK_COLOR_COMPONENT_A_BIT;
+    return VkColorComponentFlags(f);
+}
+
+static inline VkBlendFactor toVkBlendFactor(QRhiGraphicsPipeline::BlendFactor f)
+{
+    switch (f) {
+    case QRhiGraphicsPipeline::Zero:
+        return VK_BLEND_FACTOR_ZERO;
+    case QRhiGraphicsPipeline::One:
+        return VK_BLEND_FACTOR_ONE;
+    case QRhiGraphicsPipeline::SrcColor:
+        return VK_BLEND_FACTOR_SRC_COLOR;
+    case QRhiGraphicsPipeline::OneMinusSrcColor:
+        return VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR;
+    case QRhiGraphicsPipeline::DstColor:
+        return VK_BLEND_FACTOR_DST_COLOR;
+    case QRhiGraphicsPipeline::OneMinusDstColor:
+        return VK_BLEND_FACTOR_ONE_MINUS_DST_COLOR;
+    case QRhiGraphicsPipeline::SrcAlpha:
+        return VK_BLEND_FACTOR_SRC_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusSrcAlpha:
+        return VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
+    case QRhiGraphicsPipeline::DstAlpha:
+        return VK_BLEND_FACTOR_DST_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusDstAlpha:
+        return VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA;
+    case QRhiGraphicsPipeline::ConstantColor:
+        return VK_BLEND_FACTOR_CONSTANT_COLOR;
+    case QRhiGraphicsPipeline::OneMinusConstantColor:
+        return VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR;
+    case QRhiGraphicsPipeline::ConstantAlpha:
+        return VK_BLEND_FACTOR_CONSTANT_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusConstantAlpha:
+        return VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA;
+    case QRhiGraphicsPipeline::SrcAlphaSaturate:
+        return VK_BLEND_FACTOR_SRC_ALPHA_SATURATE;
+    case QRhiGraphicsPipeline::Src1Color:
+        return VK_BLEND_FACTOR_SRC1_COLOR;
+    case QRhiGraphicsPipeline::OneMinusSrc1Color:
+        return VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR;
+    case QRhiGraphicsPipeline::Src1Alpha:
+        return VK_BLEND_FACTOR_SRC1_ALPHA;
+    case QRhiGraphicsPipeline::OneMinusSrc1Alpha:
+        return VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA;
+    default:
+        Q_UNREACHABLE();
+        return VK_BLEND_FACTOR_ZERO;
+    }
+}
+
+static inline VkBlendOp toVkBlendOp(QRhiGraphicsPipeline::BlendOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::Add:
+        return VK_BLEND_OP_ADD;
+    case QRhiGraphicsPipeline::Subtract:
+        return VK_BLEND_OP_SUBTRACT;
+    case QRhiGraphicsPipeline::ReverseSubtract:
+        return VK_BLEND_OP_REVERSE_SUBTRACT;
+    case QRhiGraphicsPipeline::Min:
+        return VK_BLEND_OP_MIN;
+    case QRhiGraphicsPipeline::Max:
+        return VK_BLEND_OP_MAX;
+    default:
+        Q_UNREACHABLE();
+        return VK_BLEND_OP_ADD;
+    }
+}
+
+static inline VkCompareOp toVkCompareOp(QRhiGraphicsPipeline::CompareOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::Never:
+        return VK_COMPARE_OP_NEVER;
+    case QRhiGraphicsPipeline::Less:
+        return VK_COMPARE_OP_LESS;
+    case QRhiGraphicsPipeline::Equal:
+        return VK_COMPARE_OP_EQUAL;
+    case QRhiGraphicsPipeline::LessOrEqual:
+        return VK_COMPARE_OP_LESS_OR_EQUAL;
+    case QRhiGraphicsPipeline::Greater:
+        return VK_COMPARE_OP_GREATER;
+    case QRhiGraphicsPipeline::NotEqual:
+        return VK_COMPARE_OP_NOT_EQUAL;
+    case QRhiGraphicsPipeline::GreaterOrEqual:
+        return VK_COMPARE_OP_GREATER_OR_EQUAL;
+    case QRhiGraphicsPipeline::Always:
+        return VK_COMPARE_OP_ALWAYS;
+    default:
+        Q_UNREACHABLE();
+        return VK_COMPARE_OP_ALWAYS;
+    }
+}
+
+static inline VkStencilOp toVkStencilOp(QRhiGraphicsPipeline::StencilOp op)
+{
+    switch (op) {
+    case QRhiGraphicsPipeline::StencilZero:
+        return VK_STENCIL_OP_ZERO;
+    case QRhiGraphicsPipeline::Keep:
+        return VK_STENCIL_OP_KEEP;
+    case QRhiGraphicsPipeline::Replace:
+        return VK_STENCIL_OP_REPLACE;
+    case QRhiGraphicsPipeline::IncrementAndClamp:
+        return VK_STENCIL_OP_INCREMENT_AND_CLAMP;
+    case QRhiGraphicsPipeline::DecrementAndClamp:
+        return VK_STENCIL_OP_DECREMENT_AND_CLAMP;
+    case QRhiGraphicsPipeline::Invert:
+        return VK_STENCIL_OP_INVERT;
+    case QRhiGraphicsPipeline::IncrementAndWrap:
+        return VK_STENCIL_OP_INCREMENT_AND_WRAP;
+    case QRhiGraphicsPipeline::DecrementAndWrap:
+        return VK_STENCIL_OP_DECREMENT_AND_WRAP;
+    default:
+        Q_UNREACHABLE();
+        return VK_STENCIL_OP_KEEP;
+    }
+}
+
+static inline void fillVkStencilOpState(VkStencilOpState *dst, const QRhiGraphicsPipeline::StencilOpState &src)
+{
+    dst->failOp = toVkStencilOp(src.failOp);
+    dst->passOp = toVkStencilOp(src.passOp);
+    dst->depthFailOp = toVkStencilOp(src.depthFailOp);
+    dst->compareOp = toVkCompareOp(src.compareOp);
+}
+
+static inline VkDescriptorType toVkDescriptorType(const QRhiShaderResourceBinding::Data *b)
+{
+    switch (b->type) {
+    case QRhiShaderResourceBinding::UniformBuffer:
+        return b->u.ubuf.hasDynamicOffset ? VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC
+                                          : VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+
+    case QRhiShaderResourceBinding::SampledTexture:
+        return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+
+    case QRhiShaderResourceBinding::ImageLoad:
+        Q_FALLTHROUGH();
+    case QRhiShaderResourceBinding::ImageStore:
+        Q_FALLTHROUGH();
+    case QRhiShaderResourceBinding::ImageLoadStore:
+        return VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
+
+    case QRhiShaderResourceBinding::BufferLoad:
+        Q_FALLTHROUGH();
+    case QRhiShaderResourceBinding::BufferStore:
+        Q_FALLTHROUGH();
+    case QRhiShaderResourceBinding::BufferLoadStore:
+        return VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+
+    default:
+        Q_UNREACHABLE();
+        return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+    }
+}
+
+static inline VkShaderStageFlags toVkShaderStageFlags(QRhiShaderResourceBinding::StageFlags stage)
+{
+    int s = 0;
+    if (stage.testFlag(QRhiShaderResourceBinding::VertexStage))
+        s |= VK_SHADER_STAGE_VERTEX_BIT;
+    if (stage.testFlag(QRhiShaderResourceBinding::FragmentStage))
+        s |= VK_SHADER_STAGE_FRAGMENT_BIT;
+    if (stage.testFlag(QRhiShaderResourceBinding::ComputeStage))
+        s |= VK_SHADER_STAGE_COMPUTE_BIT;
+    return VkShaderStageFlags(s);
+}
+
+static inline VkCompareOp toVkTextureCompareOp(QRhiSampler::CompareOp op)
+{
+    switch (op) {
+    case QRhiSampler::Never:
+        return VK_COMPARE_OP_NEVER;
+    case QRhiSampler::Less:
+        return VK_COMPARE_OP_LESS;
+    case QRhiSampler::Equal:
+        return VK_COMPARE_OP_EQUAL;
+    case QRhiSampler::LessOrEqual:
+        return VK_COMPARE_OP_LESS_OR_EQUAL;
+    case QRhiSampler::Greater:
+        return VK_COMPARE_OP_GREATER;
+    case QRhiSampler::NotEqual:
+        return VK_COMPARE_OP_NOT_EQUAL;
+    case QRhiSampler::GreaterOrEqual:
+        return VK_COMPARE_OP_GREATER_OR_EQUAL;
+    case QRhiSampler::Always:
+        return VK_COMPARE_OP_ALWAYS;
+    default:
+        Q_UNREACHABLE();
+        return VK_COMPARE_OP_NEVER;
+    }
+}
+
+QVkBuffer::QVkBuffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size)
+    : QRhiBuffer(rhi, type, usage, size)
+{
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
+        buffers[i] = stagingBuffers[i] = VK_NULL_HANDLE;
+        allocations[i] = stagingAllocations[i] = nullptr;
+    }
+}
+
+QVkBuffer::~QVkBuffer()
+{
+    release();
+}
+
+void QVkBuffer::release()
+{
+    if (!buffers[0])
+        return;
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::Buffer;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
+        e.buffer.buffers[i] = buffers[i];
+        e.buffer.allocations[i] = allocations[i];
+        e.buffer.stagingBuffers[i] = stagingBuffers[i];
+        e.buffer.stagingAllocations[i] = stagingAllocations[i];
+
+        buffers[i] = VK_NULL_HANDLE;
+        allocations[i] = nullptr;
+        stagingBuffers[i] = VK_NULL_HANDLE;
+        stagingAllocations[i] = nullptr;
+        pendingDynamicUpdates[i].clear();
+    }
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+
+    QRHI_PROF;
+    QRHI_PROF_F(releaseBuffer(this));
+
+    rhiD->unregisterResource(this);
+}
+
+bool QVkBuffer::build()
+{
+    if (buffers[0])
+        release();
+
+    if (m_usage.testFlag(QRhiBuffer::StorageBuffer) && m_type == Dynamic) {
+        qWarning("StorageBuffer cannot be combined with Dynamic");
+        return false;
+    }
+
+    const int nonZeroSize = m_size <= 0 ? 256 : m_size;
+
+    VkBufferCreateInfo bufferInfo;
+    memset(&bufferInfo, 0, sizeof(bufferInfo));
+    bufferInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+    bufferInfo.size = uint32_t(nonZeroSize);
+    bufferInfo.usage = toVkBufferUsage(m_usage);
+
+    VmaAllocationCreateInfo allocInfo;
+    memset(&allocInfo, 0, sizeof(allocInfo));
+
+    if (m_type == Dynamic) {
+#ifndef Q_OS_DARWIN // not for MoltenVK
+        // Keep mapped all the time. Essential f.ex. with some mobile GPUs,
+        // where mapping and unmapping an entire allocation every time updating
+        // a suballocated buffer presents a significant perf. hit.
+        allocInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
+#endif
+        // host visible, frequent changes
+        allocInfo.usage = VMA_MEMORY_USAGE_CPU_TO_GPU;
+    } else {
+        allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+        bufferInfo.usage |= VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+    }
+
+    QRHI_RES_RHI(QRhiVulkan);
+    VkResult err = VK_SUCCESS;
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
+        buffers[i] = VK_NULL_HANDLE;
+        allocations[i] = nullptr;
+        usageState[i].access = usageState[i].stage = 0;
+        if (i == 0 || m_type == Dynamic) {
+            VmaAllocation allocation;
+            err = vmaCreateBuffer(toVmaAllocator(rhiD->allocator), &bufferInfo, &allocInfo, &buffers[i], &allocation, nullptr);
+            if (err != VK_SUCCESS)
+                break;
+            allocations[i] = allocation;
+            rhiD->setObjectName(uint64_t(buffers[i]), VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, m_objectName,
+                                m_type == Dynamic ? i : -1);
+        }
+    }
+
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create buffer: %d", err);
+        return false;
+    }
+
+    QRHI_PROF;
+    QRHI_PROF_F(newBuffer(this, uint(nonZeroSize), m_type != Dynamic ? 1 : QVK_FRAMES_IN_FLIGHT, 0));
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QVkRenderBuffer::QVkRenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                                 int sampleCount, Flags flags)
+    : QRhiRenderBuffer(rhi, type, pixelSize, sampleCount, flags)
+{
+}
+
+QVkRenderBuffer::~QVkRenderBuffer()
+{
+    release();
+    delete backingTexture;
+}
+
+void QVkRenderBuffer::release()
+{
+    if (!memory && !backingTexture)
+        return;
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::RenderBuffer;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.renderBuffer.memory = memory;
+    e.renderBuffer.image = image;
+    e.renderBuffer.imageView = imageView;
+
+    memory = VK_NULL_HANDLE;
+    image = VK_NULL_HANDLE;
+    imageView = VK_NULL_HANDLE;
+
+    if (backingTexture) {
+        Q_ASSERT(backingTexture->lastActiveFrameSlot == -1);
+        backingTexture->lastActiveFrameSlot = e.lastActiveFrameSlot;
+        backingTexture->release();
+    }
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+
+    QRHI_PROF;
+    QRHI_PROF_F(releaseRenderBuffer(this));
+
+    rhiD->unregisterResource(this);
+}
+
+bool QVkRenderBuffer::build()
+{
+    if (memory || backingTexture)
+        release();
+
+    if (m_pixelSize.isEmpty())
+        return false;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    QRHI_PROF;
+    samples = rhiD->effectiveSampleCount(m_sampleCount);
+
+    switch (m_type) {
+    case QRhiRenderBuffer::Color:
+    {
+        if (!backingTexture) {
+            backingTexture = QRHI_RES(QVkTexture, rhiD->createTexture(QRhiTexture::RGBA8,
+                                                                      m_pixelSize,
+                                                                      m_sampleCount,
+                                                                      QRhiTexture::RenderTarget | QRhiTexture::UsedAsTransferSource));
+        } else {
+            backingTexture->setPixelSize(m_pixelSize);
+            backingTexture->setSampleCount(m_sampleCount);
+        }
+        backingTexture->setName(m_objectName);
+        if (!backingTexture->build())
+            return false;
+        vkformat = backingTexture->vkformat;
+        QRHI_PROF_F(newRenderBuffer(this, false, false, samples));
+    }
+        break;
+    case QRhiRenderBuffer::DepthStencil:
+        vkformat = rhiD->optimalDepthStencilFormat();
+        if (!rhiD->createTransientImage(vkformat,
+                                        m_pixelSize,
+                                        VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
+                                        VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT,
+                                        samples,
+                                        &memory,
+                                        &image,
+                                        &imageView,
+                                        1))
+        {
+            return false;
+        }
+        rhiD->setObjectName(uint64_t(image), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, m_objectName);
+        QRHI_PROF_F(newRenderBuffer(this, true, false, samples));
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    lastActiveFrameSlot = -1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QRhiTexture::Format QVkRenderBuffer::backingFormat() const
+{
+    return m_type == Color ? QRhiTexture::RGBA8 : QRhiTexture::UnknownFormat;
+}
+
+QVkTexture::QVkTexture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+                       int sampleCount, Flags flags)
+    : QRhiTexture(rhi, format, pixelSize, sampleCount, flags)
+{
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
+        stagingBuffers[i] = VK_NULL_HANDLE;
+        stagingAllocations[i] = nullptr;
+    }
+    for (int i = 0; i < QRhi::MAX_LEVELS; ++i)
+        perLevelImageViews[i] = VK_NULL_HANDLE;
+}
+
+QVkTexture::~QVkTexture()
+{
+    release();
+}
+
+void QVkTexture::release()
+{
+    if (!image)
+        return;
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::Texture;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.texture.image = owns ? image : VK_NULL_HANDLE;
+    e.texture.imageView = imageView;
+    e.texture.allocation = owns ? imageAlloc : nullptr;
+
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
+        e.texture.stagingBuffers[i] = stagingBuffers[i];
+        e.texture.stagingAllocations[i] = stagingAllocations[i];
+
+        stagingBuffers[i] = VK_NULL_HANDLE;
+        stagingAllocations[i] = nullptr;
+    }
+
+    for (int i = 0; i < QRhi::MAX_LEVELS; ++i) {
+        e.texture.extraImageViews[i] = perLevelImageViews[i];
+        perLevelImageViews[i] = VK_NULL_HANDLE;
+    }
+
+    image = VK_NULL_HANDLE;
+    imageView = VK_NULL_HANDLE;
+    imageAlloc = nullptr;
+    nativeHandlesStruct.image = VK_NULL_HANDLE;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+
+    QRHI_PROF;
+    QRHI_PROF_F(releaseTexture(this));
+
+    rhiD->unregisterResource(this);
+}
+
+bool QVkTexture::prepareBuild(QSize *adjustedSize)
+{
+    if (image)
+        release();
+
+    QRHI_RES_RHI(QRhiVulkan);
+    vkformat = toVkTextureFormat(m_format, m_flags);
+    VkFormatProperties props;
+    rhiD->f->vkGetPhysicalDeviceFormatProperties(rhiD->physDev, vkformat, &props);
+    const bool canSampleOptimal = (props.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT);
+    if (!canSampleOptimal) {
+        qWarning("Texture sampling with optimal tiling for format %d not supported", vkformat);
+        return false;
+    }
+
+    const QSize size = m_pixelSize.isEmpty() ? QSize(1, 1) : m_pixelSize;
+    const bool isCube = m_flags.testFlag(CubeMap);
+    const bool hasMipMaps = m_flags.testFlag(MipMapped);
+
+    mipLevelCount = uint(hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1);
+    const int maxLevels = QRhi::MAX_LEVELS;
+    if (mipLevelCount > maxLevels) {
+        qWarning("Too many mip levels (%d, max is %d), truncating mip chain", mipLevelCount, maxLevels);
+        mipLevelCount = maxLevels;
+    }
+    samples = rhiD->effectiveSampleCount(m_sampleCount);
+    if (samples > VK_SAMPLE_COUNT_1_BIT) {
+        if (isCube) {
+            qWarning("Cubemap texture cannot be multisample");
+            return false;
+        }
+        if (hasMipMaps) {
+            qWarning("Multisample texture cannot have mipmaps");
+            return false;
+        }
+    }
+
+    usageState.layout = VK_IMAGE_LAYOUT_PREINITIALIZED;
+    usageState.access = 0;
+    usageState.stage = 0;
+
+    if (adjustedSize)
+        *adjustedSize = size;
+
+    return true;
+}
+
+bool QVkTexture::finishBuild()
+{
+    QRHI_RES_RHI(QRhiVulkan);
+
+    const bool isDepth = isDepthTextureFormat(m_format);
+    const bool isCube = m_flags.testFlag(CubeMap);
+
+    VkImageViewCreateInfo viewInfo;
+    memset(&viewInfo, 0, sizeof(viewInfo));
+    viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+    viewInfo.image = image;
+    viewInfo.viewType = isCube ? VK_IMAGE_VIEW_TYPE_CUBE : VK_IMAGE_VIEW_TYPE_2D;
+    viewInfo.format = vkformat;
+    viewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+    viewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+    viewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+    viewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
+    viewInfo.subresourceRange.aspectMask = isDepth ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_COLOR_BIT;
+    viewInfo.subresourceRange.levelCount = mipLevelCount;
+    viewInfo.subresourceRange.layerCount = isCube ? 6 : 1;
+
+    VkResult err = rhiD->df->vkCreateImageView(rhiD->dev, &viewInfo, nullptr, &imageView);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create image view: %d", err);
+        return false;
+    }
+
+    nativeHandlesStruct.image = image;
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+
+    return true;
+}
+
+bool QVkTexture::build()
+{
+    QSize size;
+    if (!prepareBuild(&size))
+        return false;
+
+    const bool isRenderTarget = m_flags.testFlag(QRhiTexture::RenderTarget);
+    const bool isDepth = isDepthTextureFormat(m_format);
+    const bool isCube = m_flags.testFlag(CubeMap);
+
+    VkImageCreateInfo imageInfo;
+    memset(&imageInfo, 0, sizeof(imageInfo));
+    imageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
+    imageInfo.flags = isCube ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0;
+    imageInfo.imageType = VK_IMAGE_TYPE_2D;
+    imageInfo.format = vkformat;
+    imageInfo.extent.width = uint32_t(size.width());
+    imageInfo.extent.height = uint32_t(size.height());
+    imageInfo.extent.depth = 1;
+    imageInfo.mipLevels = mipLevelCount;
+    imageInfo.arrayLayers = isCube ? 6 : 1;
+    imageInfo.samples = samples;
+    imageInfo.tiling = VK_IMAGE_TILING_OPTIMAL;
+    imageInfo.initialLayout = VK_IMAGE_LAYOUT_PREINITIALIZED;
+
+    imageInfo.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+    if (isRenderTarget) {
+        if (isDepth)
+            imageInfo.usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
+        else
+            imageInfo.usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+    }
+    if (m_flags.testFlag(QRhiTexture::UsedAsTransferSource))
+        imageInfo.usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+    if (m_flags.testFlag(QRhiTexture::UsedWithGenerateMips))
+        imageInfo.usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+    if (m_flags.testFlag(QRhiTexture::UsedWithLoadStore))
+        imageInfo.usage |= VK_IMAGE_USAGE_STORAGE_BIT;
+
+    VmaAllocationCreateInfo allocInfo;
+    memset(&allocInfo, 0, sizeof(allocInfo));
+    allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    VmaAllocation allocation;
+    VkResult err = vmaCreateImage(toVmaAllocator(rhiD->allocator), &imageInfo, &allocInfo, &image, &allocation, nullptr);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create image: %d", err);
+        return false;
+    }
+    imageAlloc = allocation;
+
+    if (!finishBuild())
+        return false;
+
+    rhiD->setObjectName(uint64_t(image), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, m_objectName);
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, true, int(mipLevelCount), isCube ? 6 : 1, samples));
+
+    owns = true;
+    rhiD->registerResource(this);
+    return true;
+}
+
+bool QVkTexture::buildFrom(const QRhiNativeHandles *src)
+{
+    const QRhiVulkanTextureNativeHandles *h = static_cast<const QRhiVulkanTextureNativeHandles *>(src);
+    if (!h || !h->image)
+        return false;
+
+    if (!prepareBuild())
+        return false;
+
+    image = h->image;
+
+    if (!finishBuild())
+        return false;
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, false, int(mipLevelCount), m_flags.testFlag(CubeMap) ? 6 : 1, samples));
+
+    usageState.layout = h->layout;
+
+    owns = false;
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->registerResource(this);
+    return true;
+}
+
+const QRhiNativeHandles *QVkTexture::nativeHandles()
+{
+    nativeHandlesStruct.layout = usageState.layout;
+    return &nativeHandlesStruct;
+}
+
+VkImageView QVkTexture::imageViewForLevel(int level)
+{
+    Q_ASSERT(level >= 0 && level < int(mipLevelCount));
+    if (perLevelImageViews[level] != VK_NULL_HANDLE)
+        return perLevelImageViews[level];
+
+    const bool isDepth = isDepthTextureFormat(m_format);
+    const bool isCube = m_flags.testFlag(CubeMap);
+
+    VkImageViewCreateInfo viewInfo;
+    memset(&viewInfo, 0, sizeof(viewInfo));
+    viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+    viewInfo.image = image;
+    viewInfo.viewType = isCube ? VK_IMAGE_VIEW_TYPE_CUBE : VK_IMAGE_VIEW_TYPE_2D;
+    viewInfo.format = vkformat;
+    viewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+    viewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+    viewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+    viewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
+    viewInfo.subresourceRange.aspectMask = isDepth ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_COLOR_BIT;
+    viewInfo.subresourceRange.baseMipLevel = uint32_t(level);
+    viewInfo.subresourceRange.levelCount = 1;
+    viewInfo.subresourceRange.baseArrayLayer = 0;
+    viewInfo.subresourceRange.layerCount = isCube ? 6 : 1;
+
+    VkImageView v = VK_NULL_HANDLE;
+    QRHI_RES_RHI(QRhiVulkan);
+    VkResult err = rhiD->df->vkCreateImageView(rhiD->dev, &viewInfo, nullptr, &v);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create image view: %d", err);
+        return VK_NULL_HANDLE;
+    }
+
+    perLevelImageViews[level] = v;
+    return v;
+}
+
+QVkSampler::QVkSampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+                       AddressMode u, AddressMode v)
+    : QRhiSampler(rhi, magFilter, minFilter, mipmapMode, u, v)
+{
+}
+
+QVkSampler::~QVkSampler()
+{
+    release();
+}
+
+void QVkSampler::release()
+{
+    if (!sampler)
+        return;
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::Sampler;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.sampler.sampler = sampler;
+    sampler = VK_NULL_HANDLE;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+    rhiD->unregisterResource(this);
+}
+
+bool QVkSampler::build()
+{
+    if (sampler)
+        release();
+
+    VkSamplerCreateInfo samplerInfo;
+    memset(&samplerInfo, 0, sizeof(samplerInfo));
+    samplerInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
+    samplerInfo.magFilter = toVkFilter(m_magFilter);
+    samplerInfo.minFilter = toVkFilter(m_minFilter);
+    samplerInfo.mipmapMode = toVkMipmapMode(m_mipmapMode);
+    samplerInfo.addressModeU = toVkAddressMode(m_addressU);
+    samplerInfo.addressModeV = toVkAddressMode(m_addressV);
+    samplerInfo.addressModeW = toVkAddressMode(m_addressW);
+    samplerInfo.maxAnisotropy = 1.0f;
+    samplerInfo.compareEnable = m_compareOp != Never;
+    samplerInfo.compareOp = toVkTextureCompareOp(m_compareOp);
+    samplerInfo.maxLod = m_mipmapMode == None ? 0.25f : 1000.0f;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    VkResult err = rhiD->df->vkCreateSampler(rhiD->dev, &samplerInfo, nullptr, &sampler);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create sampler: %d", err);
+        return false;
+    }
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QVkRenderPassDescriptor::QVkRenderPassDescriptor(QRhiImplementation *rhi)
+    : QRhiRenderPassDescriptor(rhi)
+{
+}
+
+QVkRenderPassDescriptor::~QVkRenderPassDescriptor()
+{
+    release();
+}
+
+void QVkRenderPassDescriptor::release()
+{
+    if (!rp)
+        return;
+
+    if (!ownsRp) {
+        rp = VK_NULL_HANDLE;
+        return;
+    }
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::RenderPass;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.renderPass.rp = rp;
+
+    rp = VK_NULL_HANDLE;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+
+    rhiD->unregisterResource(this);
+}
+
+const QRhiNativeHandles *QVkRenderPassDescriptor::nativeHandles()
+{
+    nativeHandlesStruct.renderPass = rp;
+    return &nativeHandlesStruct;
+}
+
+QVkReferenceRenderTarget::QVkReferenceRenderTarget(QRhiImplementation *rhi)
+    : QRhiRenderTarget(rhi)
+{
+}
+
+QVkReferenceRenderTarget::~QVkReferenceRenderTarget()
+{
+    release();
+}
+
+void QVkReferenceRenderTarget::release()
+{
+    // nothing to do here
+}
+
+QSize QVkReferenceRenderTarget::pixelSize() const
+{
+    return d.pixelSize;
+}
+
+float QVkReferenceRenderTarget::devicePixelRatio() const
+{
+    return d.dpr;
+}
+
+int QVkReferenceRenderTarget::sampleCount() const
+{
+    return d.sampleCount;
+}
+
+QVkTextureRenderTarget::QVkTextureRenderTarget(QRhiImplementation *rhi,
+                                               const QRhiTextureRenderTargetDescription &desc,
+                                               Flags flags)
+    : QRhiTextureRenderTarget(rhi, desc, flags)
+{
+    for (int att = 0; att < QVkRenderTargetData::MAX_COLOR_ATTACHMENTS; ++att) {
+        rtv[att] = VK_NULL_HANDLE;
+        resrtv[att] = VK_NULL_HANDLE;
+    }
+}
+
+QVkTextureRenderTarget::~QVkTextureRenderTarget()
+{
+    release();
+}
+
+void QVkTextureRenderTarget::release()
+{
+    if (!d.fb)
+        return;
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::TextureRenderTarget;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.textureRenderTarget.fb = d.fb;
+    d.fb = VK_NULL_HANDLE;
+
+    for (int att = 0; att < QVkRenderTargetData::MAX_COLOR_ATTACHMENTS; ++att) {
+        e.textureRenderTarget.rtv[att] = rtv[att];
+        e.textureRenderTarget.resrtv[att] = resrtv[att];
+        rtv[att] = VK_NULL_HANDLE;
+        resrtv[att] = VK_NULL_HANDLE;
+    }
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+
+    rhiD->unregisterResource(this);
+}
+
+QRhiRenderPassDescriptor *QVkTextureRenderTarget::newCompatibleRenderPassDescriptor()
+{
+    // not yet built so cannot rely on data computed in build()
+
+    QRHI_RES_RHI(QRhiVulkan);
+    QVkRenderPassDescriptor *rp = new QVkRenderPassDescriptor(m_rhi);
+    if (!rhiD->createOffscreenRenderPass(&rp->rp,
+                                         m_desc.cbeginColorAttachments(),
+                                         m_desc.cendColorAttachments(),
+                                         m_flags.testFlag(QRhiTextureRenderTarget::PreserveColorContents),
+                                         m_flags.testFlag(QRhiTextureRenderTarget::PreserveDepthStencilContents),
+                                         m_desc.depthStencilBuffer(),
+                                         m_desc.depthTexture()))
+    {
+        delete rp;
+        return nullptr;
+    }
+
+    rp->ownsRp = true;
+    rhiD->registerResource(rp);
+    return rp;
+}
+
+bool QVkTextureRenderTarget::build()
+{
+    if (d.fb)
+        release();
+
+    const bool hasColorAttachments = m_desc.cbeginColorAttachments() != m_desc.cendColorAttachments();
+    Q_ASSERT(hasColorAttachments || m_desc.depthTexture());
+    Q_ASSERT(!m_desc.depthStencilBuffer() || !m_desc.depthTexture());
+    const bool hasDepthStencil = m_desc.depthStencilBuffer() || m_desc.depthTexture();
+
+    QRHI_RES_RHI(QRhiVulkan);
+    QVarLengthArray<VkImageView, 8> views;
+
+    d.colorAttCount = 0;
+    int attIndex = 0;
+    for (auto it = m_desc.cbeginColorAttachments(), itEnd = m_desc.cendColorAttachments(); it != itEnd; ++it, ++attIndex) {
+        d.colorAttCount += 1;
+        QVkTexture *texD = QRHI_RES(QVkTexture, it->texture());
+        QVkRenderBuffer *rbD = QRHI_RES(QVkRenderBuffer, it->renderBuffer());
+        Q_ASSERT(texD || rbD);
+        if (texD) {
+            Q_ASSERT(texD->flags().testFlag(QRhiTexture::RenderTarget));
+            VkImageViewCreateInfo viewInfo;
+            memset(&viewInfo, 0, sizeof(viewInfo));
+            viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+            viewInfo.image = texD->image;
+            viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
+            viewInfo.format = texD->vkformat;
+            viewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+            viewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+            viewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+            viewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
+            viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+            viewInfo.subresourceRange.baseMipLevel = uint32_t(it->level());
+            viewInfo.subresourceRange.levelCount = 1;
+            viewInfo.subresourceRange.baseArrayLayer = uint32_t(it->layer());
+            viewInfo.subresourceRange.layerCount = 1;
+            VkResult err = rhiD->df->vkCreateImageView(rhiD->dev, &viewInfo, nullptr, &rtv[attIndex]);
+            if (err != VK_SUCCESS) {
+                qWarning("Failed to create render target image view: %d", err);
+                return false;
+            }
+            views.append(rtv[attIndex]);
+            if (attIndex == 0) {
+                d.pixelSize = texD->pixelSize();
+                d.sampleCount = texD->samples;
+            }
+        } else if (rbD) {
+            Q_ASSERT(rbD->backingTexture);
+            views.append(rbD->backingTexture->imageView);
+            if (attIndex == 0) {
+                d.pixelSize = rbD->pixelSize();
+                d.sampleCount = rbD->samples;
+            }
+        }
+    }
+    d.dpr = 1;
+
+    if (hasDepthStencil) {
+        if (m_desc.depthTexture()) {
+            QVkTexture *depthTexD = QRHI_RES(QVkTexture, m_desc.depthTexture());
+            views.append(depthTexD->imageView);
+            if (d.colorAttCount == 0) {
+                d.pixelSize = depthTexD->pixelSize();
+                d.sampleCount = depthTexD->samples;
+            }
+        } else {
+            QVkRenderBuffer *depthRbD = QRHI_RES(QVkRenderBuffer, m_desc.depthStencilBuffer());
+            views.append(depthRbD->imageView);
+            if (d.colorAttCount == 0) {
+                d.pixelSize = depthRbD->pixelSize();
+                d.sampleCount = depthRbD->samples;
+            }
+        }
+        d.dsAttCount = 1;
+    } else {
+        d.dsAttCount = 0;
+    }
+
+    d.resolveAttCount = 0;
+    attIndex = 0;
+    for (auto it = m_desc.cbeginColorAttachments(), itEnd = m_desc.cendColorAttachments(); it != itEnd; ++it, ++attIndex) {
+        if (it->resolveTexture()) {
+            QVkTexture *resTexD = QRHI_RES(QVkTexture, it->resolveTexture());
+            Q_ASSERT(resTexD->flags().testFlag(QRhiTexture::RenderTarget));
+            d.resolveAttCount += 1;
+
+            VkImageViewCreateInfo viewInfo;
+            memset(&viewInfo, 0, sizeof(viewInfo));
+            viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+            viewInfo.image = resTexD->image;
+            viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
+            viewInfo.format = resTexD->vkformat;
+            viewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+            viewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+            viewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+            viewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
+            viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+            viewInfo.subresourceRange.baseMipLevel = uint32_t(it->resolveLevel());
+            viewInfo.subresourceRange.levelCount = 1;
+            viewInfo.subresourceRange.baseArrayLayer = uint32_t(it->resolveLayer());
+            viewInfo.subresourceRange.layerCount = 1;
+            VkResult err = rhiD->df->vkCreateImageView(rhiD->dev, &viewInfo, nullptr, &resrtv[attIndex]);
+            if (err != VK_SUCCESS) {
+                qWarning("Failed to create render target resolve image view: %d", err);
+                return false;
+            }
+            views.append(resrtv[attIndex]);
+        }
+    }
+
+    if (!m_renderPassDesc)
+        qWarning("QVkTextureRenderTarget: No renderpass descriptor set. See newCompatibleRenderPassDescriptor() and setRenderPassDescriptor().");
+
+    d.rp = QRHI_RES(QVkRenderPassDescriptor, m_renderPassDesc);
+    Q_ASSERT(d.rp && d.rp->rp);
+
+    VkFramebufferCreateInfo fbInfo;
+    memset(&fbInfo, 0, sizeof(fbInfo));
+    fbInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
+    fbInfo.renderPass = d.rp->rp;
+    fbInfo.attachmentCount = uint32_t(d.colorAttCount + d.dsAttCount + d.resolveAttCount);
+    fbInfo.pAttachments = views.constData();
+    fbInfo.width = uint32_t(d.pixelSize.width());
+    fbInfo.height = uint32_t(d.pixelSize.height());
+    fbInfo.layers = 1;
+
+    VkResult err = rhiD->df->vkCreateFramebuffer(rhiD->dev, &fbInfo, nullptr, &d.fb);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create framebuffer: %d", err);
+        return false;
+    }
+
+    lastActiveFrameSlot = -1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QSize QVkTextureRenderTarget::pixelSize() const
+{
+    return d.pixelSize;
+}
+
+float QVkTextureRenderTarget::devicePixelRatio() const
+{
+    return d.dpr;
+}
+
+int QVkTextureRenderTarget::sampleCount() const
+{
+    return d.sampleCount;
+}
+
+QVkShaderResourceBindings::QVkShaderResourceBindings(QRhiImplementation *rhi)
+    : QRhiShaderResourceBindings(rhi)
+{
+}
+
+QVkShaderResourceBindings::~QVkShaderResourceBindings()
+{
+    release();
+}
+
+void QVkShaderResourceBindings::release()
+{
+    if (!layout)
+        return;
+
+    sortedBindings.clear();
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::ShaderResourceBindings;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.shaderResourceBindings.poolIndex = poolIndex;
+    e.shaderResourceBindings.layout = layout;
+
+    poolIndex = -1;
+    layout = VK_NULL_HANDLE;
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i)
+        descSets[i] = VK_NULL_HANDLE;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+
+    rhiD->unregisterResource(this);
+}
+
+bool QVkShaderResourceBindings::build()
+{
+    if (layout)
+        release();
+
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i)
+        descSets[i] = VK_NULL_HANDLE;
+
+    sortedBindings.clear();
+    std::copy(m_bindings.cbegin(), m_bindings.cend(), std::back_inserter(sortedBindings));
+    std::sort(sortedBindings.begin(), sortedBindings.end(),
+              [](const QRhiShaderResourceBinding &a, const QRhiShaderResourceBinding &b)
+    {
+        return a.data()->binding < b.data()->binding;
+    });
+
+    QVarLengthArray<VkDescriptorSetLayoutBinding, 4> vkbindings;
+    for (const QRhiShaderResourceBinding &binding : qAsConst(sortedBindings)) {
+        const QRhiShaderResourceBinding::Data *b = binding.data();
+        VkDescriptorSetLayoutBinding vkbinding;
+        memset(&vkbinding, 0, sizeof(vkbinding));
+        vkbinding.binding = uint32_t(b->binding);
+        vkbinding.descriptorType = toVkDescriptorType(b);
+        vkbinding.descriptorCount = 1; // no array support yet
+        vkbinding.stageFlags = toVkShaderStageFlags(b->stage);
+        vkbindings.append(vkbinding);
+    }
+
+    VkDescriptorSetLayoutCreateInfo layoutInfo;
+    memset(&layoutInfo, 0, sizeof(layoutInfo));
+    layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+    layoutInfo.bindingCount = uint32_t(vkbindings.count());
+    layoutInfo.pBindings = vkbindings.constData();
+
+    QRHI_RES_RHI(QRhiVulkan);
+    VkResult err = rhiD->df->vkCreateDescriptorSetLayout(rhiD->dev, &layoutInfo, nullptr, &layout);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create descriptor set layout: %d", err);
+        return false;
+    }
+
+    VkDescriptorSetAllocateInfo allocInfo;
+    memset(&allocInfo, 0, sizeof(allocInfo));
+    allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+    allocInfo.descriptorSetCount = QVK_FRAMES_IN_FLIGHT;
+    VkDescriptorSetLayout layouts[QVK_FRAMES_IN_FLIGHT];
+    for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i)
+        layouts[i] = layout;
+    allocInfo.pSetLayouts = layouts;
+    if (!rhiD->allocateDescriptorSet(&allocInfo, descSets, &poolIndex))
+        return false;
+
+    rhiD->updateShaderResourceBindings(this);
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QVkGraphicsPipeline::QVkGraphicsPipeline(QRhiImplementation *rhi)
+    : QRhiGraphicsPipeline(rhi)
+{
+}
+
+QVkGraphicsPipeline::~QVkGraphicsPipeline()
+{
+    release();
+}
+
+void QVkGraphicsPipeline::release()
+{
+    if (!pipeline && !layout)
+        return;
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::Pipeline;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.pipelineState.pipeline = pipeline;
+    e.pipelineState.layout = layout;
+
+    pipeline = VK_NULL_HANDLE;
+    layout = VK_NULL_HANDLE;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+
+    rhiD->unregisterResource(this);
+}
+
+bool QVkGraphicsPipeline::build()
+{
+    if (pipeline)
+        release();
+
+    QRHI_RES_RHI(QRhiVulkan);
+    if (!rhiD->sanityCheckGraphicsPipeline(this))
+        return false;
+
+    if (!rhiD->ensurePipelineCache())
+        return false;
+
+    VkPipelineLayoutCreateInfo pipelineLayoutInfo;
+    memset(&pipelineLayoutInfo, 0, sizeof(pipelineLayoutInfo));
+    pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+    pipelineLayoutInfo.setLayoutCount = 1;
+    QVkShaderResourceBindings *srbD = QRHI_RES(QVkShaderResourceBindings, m_shaderResourceBindings);
+    Q_ASSERT(m_shaderResourceBindings && srbD->layout);
+    pipelineLayoutInfo.pSetLayouts = &srbD->layout;
+    VkResult err = rhiD->df->vkCreatePipelineLayout(rhiD->dev, &pipelineLayoutInfo, nullptr, &layout);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create pipeline layout: %d", err);
+        return false;
+    }
+
+    VkGraphicsPipelineCreateInfo pipelineInfo;
+    memset(&pipelineInfo, 0, sizeof(pipelineInfo));
+    pipelineInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
+
+    QVarLengthArray<VkShaderModule, 4> shaders;
+    QVarLengthArray<VkPipelineShaderStageCreateInfo, 4> shaderStageCreateInfos;
+    for (const QRhiShaderStage &shaderStage : m_shaderStages) {
+        const QShader bakedShader = shaderStage.shader();
+        const QShaderCode spirv = bakedShader.shader({ QShader::SpirvShader, 100, shaderStage.shaderVariant() });
+        if (spirv.shader().isEmpty()) {
+            qWarning() << "No SPIR-V 1.0 shader code found in baked shader" << bakedShader;
+            return false;
+        }
+        VkShaderModule shader = rhiD->createShader(spirv.shader());
+        if (shader) {
+            shaders.append(shader);
+            VkPipelineShaderStageCreateInfo shaderInfo;
+            memset(&shaderInfo, 0, sizeof(shaderInfo));
+            shaderInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
+            shaderInfo.stage = toVkShaderStage(shaderStage.type());
+            shaderInfo.module = shader;
+            shaderInfo.pName = spirv.entryPoint().constData();
+            shaderStageCreateInfos.append(shaderInfo);
+        }
+    }
+    pipelineInfo.stageCount = uint32_t(shaderStageCreateInfos.count());
+    pipelineInfo.pStages = shaderStageCreateInfos.constData();
+
+    QVarLengthArray<VkVertexInputBindingDescription, 4> vertexBindings;
+    QVarLengthArray<VkVertexInputBindingDivisorDescriptionEXT> nonOneStepRates;
+    int bindingIndex = 0;
+    for (auto it = m_vertexInputLayout.cbeginBindings(), itEnd = m_vertexInputLayout.cendBindings();
+         it != itEnd; ++it, ++bindingIndex)
+    {
+        VkVertexInputBindingDescription bindingInfo = {
+            uint32_t(bindingIndex),
+            it->stride(),
+            it->classification() == QRhiVertexInputBinding::PerVertex
+                ? VK_VERTEX_INPUT_RATE_VERTEX : VK_VERTEX_INPUT_RATE_INSTANCE
+        };
+        if (it->classification() == QRhiVertexInputBinding::PerInstance && it->instanceStepRate() != 1) {
+            if (rhiD->vertexAttribDivisorAvailable) {
+                nonOneStepRates.append({ uint32_t(bindingIndex), uint32_t(it->instanceStepRate()) });
+            } else {
+                qWarning("QRhiVulkan: Instance step rates other than 1 not supported without "
+                         "VK_EXT_vertex_attribute_divisor on the device and "
+                         "VK_KHR_get_physical_device_properties2 on the instance");
+            }
+        }
+        vertexBindings.append(bindingInfo);
+    }
+    QVarLengthArray<VkVertexInputAttributeDescription, 4> vertexAttributes;
+    for (auto it = m_vertexInputLayout.cbeginAttributes(), itEnd = m_vertexInputLayout.cendAttributes();
+         it != itEnd; ++it)
+    {
+        VkVertexInputAttributeDescription attributeInfo = {
+            uint32_t(it->location()),
+            uint32_t(it->binding()),
+            toVkAttributeFormat(it->format()),
+            it->offset()
+        };
+        vertexAttributes.append(attributeInfo);
+    }
+    VkPipelineVertexInputStateCreateInfo vertexInputInfo;
+    memset(&vertexInputInfo, 0, sizeof(vertexInputInfo));
+    vertexInputInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
+    vertexInputInfo.vertexBindingDescriptionCount = uint32_t(vertexBindings.count());
+    vertexInputInfo.pVertexBindingDescriptions = vertexBindings.constData();
+    vertexInputInfo.vertexAttributeDescriptionCount = uint32_t(vertexAttributes.count());
+    vertexInputInfo.pVertexAttributeDescriptions = vertexAttributes.constData();
+    VkPipelineVertexInputDivisorStateCreateInfoEXT divisorInfo;
+    if (!nonOneStepRates.isEmpty()) {
+        memset(&divisorInfo, 0, sizeof(divisorInfo));
+        divisorInfo.sType = VkStructureType(1000190001); // VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT
+        divisorInfo.vertexBindingDivisorCount = uint32_t(nonOneStepRates.count());
+        divisorInfo.pVertexBindingDivisors = nonOneStepRates.constData();
+        vertexInputInfo.pNext = &divisorInfo;
+    }
+    pipelineInfo.pVertexInputState = &vertexInputInfo;
+
+    QVarLengthArray<VkDynamicState, 8> dynEnable;
+    dynEnable << VK_DYNAMIC_STATE_VIEWPORT;
+    dynEnable << VK_DYNAMIC_STATE_SCISSOR; // ignore UsesScissor - Vulkan requires a scissor for the viewport always
+    if (m_flags.testFlag(QRhiGraphicsPipeline::UsesBlendConstants))
+        dynEnable << VK_DYNAMIC_STATE_BLEND_CONSTANTS;
+    if (m_flags.testFlag(QRhiGraphicsPipeline::UsesStencilRef))
+        dynEnable << VK_DYNAMIC_STATE_STENCIL_REFERENCE;
+
+    VkPipelineDynamicStateCreateInfo dynamicInfo;
+    memset(&dynamicInfo, 0, sizeof(dynamicInfo));
+    dynamicInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
+    dynamicInfo.dynamicStateCount = uint32_t(dynEnable.count());
+    dynamicInfo.pDynamicStates = dynEnable.constData();
+    pipelineInfo.pDynamicState = &dynamicInfo;
+
+    VkPipelineViewportStateCreateInfo viewportInfo;
+    memset(&viewportInfo, 0, sizeof(viewportInfo));
+    viewportInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
+    viewportInfo.viewportCount = viewportInfo.scissorCount = 1;
+    pipelineInfo.pViewportState = &viewportInfo;
+
+    VkPipelineInputAssemblyStateCreateInfo inputAsmInfo;
+    memset(&inputAsmInfo, 0, sizeof(inputAsmInfo));
+    inputAsmInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
+    inputAsmInfo.topology = toVkTopology(m_topology);
+    inputAsmInfo.primitiveRestartEnable = (m_topology == TriangleStrip || m_topology == LineStrip);
+    pipelineInfo.pInputAssemblyState = &inputAsmInfo;
+
+    VkPipelineRasterizationStateCreateInfo rastInfo;
+    memset(&rastInfo, 0, sizeof(rastInfo));
+    rastInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
+    rastInfo.cullMode = toVkCullMode(m_cullMode);
+    rastInfo.frontFace = toVkFrontFace(m_frontFace);
+    rastInfo.lineWidth = rhiD->hasWideLines ? m_lineWidth : 1.0f;
+    pipelineInfo.pRasterizationState = &rastInfo;
+
+    VkPipelineMultisampleStateCreateInfo msInfo;
+    memset(&msInfo, 0, sizeof(msInfo));
+    msInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
+    msInfo.rasterizationSamples = rhiD->effectiveSampleCount(m_sampleCount);
+    pipelineInfo.pMultisampleState = &msInfo;
+
+    VkPipelineDepthStencilStateCreateInfo dsInfo;
+    memset(&dsInfo, 0, sizeof(dsInfo));
+    dsInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
+    dsInfo.depthTestEnable = m_depthTest;
+    dsInfo.depthWriteEnable = m_depthWrite;
+    dsInfo.depthCompareOp = toVkCompareOp(m_depthOp);
+    dsInfo.stencilTestEnable = m_stencilTest;
+    if (m_stencilTest) {
+        fillVkStencilOpState(&dsInfo.front, m_stencilFront);
+        dsInfo.front.compareMask = m_stencilReadMask;
+        dsInfo.front.writeMask = m_stencilWriteMask;
+        fillVkStencilOpState(&dsInfo.back, m_stencilBack);
+        dsInfo.back.compareMask = m_stencilReadMask;
+        dsInfo.back.writeMask = m_stencilWriteMask;
+    }
+    pipelineInfo.pDepthStencilState = &dsInfo;
+
+    VkPipelineColorBlendStateCreateInfo blendInfo;
+    memset(&blendInfo, 0, sizeof(blendInfo));
+    blendInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
+    QVarLengthArray<VkPipelineColorBlendAttachmentState, 4> vktargetBlends;
+    for (const QRhiGraphicsPipeline::TargetBlend &b : qAsConst(m_targetBlends)) {
+        VkPipelineColorBlendAttachmentState blend;
+        memset(&blend, 0, sizeof(blend));
+        blend.blendEnable = b.enable;
+        blend.srcColorBlendFactor = toVkBlendFactor(b.srcColor);
+        blend.dstColorBlendFactor = toVkBlendFactor(b.dstColor);
+        blend.colorBlendOp = toVkBlendOp(b.opColor);
+        blend.srcAlphaBlendFactor = toVkBlendFactor(b.srcAlpha);
+        blend.dstAlphaBlendFactor = toVkBlendFactor(b.dstAlpha);
+        blend.alphaBlendOp = toVkBlendOp(b.opAlpha);
+        blend.colorWriteMask = toVkColorComponents(b.colorWrite);
+        vktargetBlends.append(blend);
+    }
+    if (vktargetBlends.isEmpty()) {
+        VkPipelineColorBlendAttachmentState blend;
+        memset(&blend, 0, sizeof(blend));
+        blend.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT
+                | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
+        vktargetBlends.append(blend);
+    }
+    blendInfo.attachmentCount = uint32_t(vktargetBlends.count());
+    blendInfo.pAttachments = vktargetBlends.constData();
+    pipelineInfo.pColorBlendState = &blendInfo;
+
+    pipelineInfo.layout = layout;
+
+    Q_ASSERT(m_renderPassDesc && QRHI_RES(const QVkRenderPassDescriptor, m_renderPassDesc)->rp);
+    pipelineInfo.renderPass = QRHI_RES(const QVkRenderPassDescriptor, m_renderPassDesc)->rp;
+
+    err = rhiD->df->vkCreateGraphicsPipelines(rhiD->dev, rhiD->pipelineCache, 1, &pipelineInfo, nullptr, &pipeline);
+
+    for (VkShaderModule shader : shaders)
+        rhiD->df->vkDestroyShaderModule(rhiD->dev, shader, nullptr);
+
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create graphics pipeline: %d", err);
+        return false;
+    }
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QVkComputePipeline::QVkComputePipeline(QRhiImplementation *rhi)
+    : QRhiComputePipeline(rhi)
+{
+}
+
+QVkComputePipeline::~QVkComputePipeline()
+{
+    release();
+}
+
+void QVkComputePipeline::release()
+{
+    if (!pipeline && !layout)
+        return;
+
+    QRhiVulkan::DeferredReleaseEntry e;
+    e.type = QRhiVulkan::DeferredReleaseEntry::Pipeline;
+    e.lastActiveFrameSlot = lastActiveFrameSlot;
+
+    e.pipelineState.pipeline = pipeline;
+    e.pipelineState.layout = layout;
+
+    pipeline = VK_NULL_HANDLE;
+    layout = VK_NULL_HANDLE;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->releaseQueue.append(e);
+
+    rhiD->unregisterResource(this);
+}
+
+bool QVkComputePipeline::build()
+{
+    if (pipeline)
+        release();
+
+    QRHI_RES_RHI(QRhiVulkan);
+    if (!rhiD->ensurePipelineCache())
+        return false;
+
+    VkPipelineLayoutCreateInfo pipelineLayoutInfo;
+    memset(&pipelineLayoutInfo, 0, sizeof(pipelineLayoutInfo));
+    pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+    pipelineLayoutInfo.setLayoutCount = 1;
+    QVkShaderResourceBindings *srbD = QRHI_RES(QVkShaderResourceBindings, m_shaderResourceBindings);
+    Q_ASSERT(m_shaderResourceBindings && srbD->layout);
+    pipelineLayoutInfo.pSetLayouts = &srbD->layout;
+    VkResult err = rhiD->df->vkCreatePipelineLayout(rhiD->dev, &pipelineLayoutInfo, nullptr, &layout);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create pipeline layout: %d", err);
+        return false;
+    }
+
+    VkComputePipelineCreateInfo pipelineInfo;
+    memset(&pipelineInfo, 0, sizeof(pipelineInfo));
+    pipelineInfo.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
+    pipelineInfo.layout = layout;
+
+    if (m_shaderStage.type() != QRhiShaderStage::Compute) {
+        qWarning("Compute pipeline requires a compute shader stage");
+        return false;
+    }
+    const QShader bakedShader = m_shaderStage.shader();
+    const QShaderCode spirv = bakedShader.shader({ QShader::SpirvShader, 100, m_shaderStage.shaderVariant() });
+    if (spirv.shader().isEmpty()) {
+        qWarning() << "No SPIR-V 1.0 shader code found in baked shader" << bakedShader;
+        return false;
+    }
+    if (bakedShader.stage() != QShader::ComputeStage) {
+        qWarning() << bakedShader << "is not a compute shader";
+        return false;
+    }
+    VkShaderModule shader = rhiD->createShader(spirv.shader());
+    VkPipelineShaderStageCreateInfo shaderInfo;
+    memset(&shaderInfo, 0, sizeof(shaderInfo));
+    shaderInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
+    shaderInfo.stage = VK_SHADER_STAGE_COMPUTE_BIT;
+    shaderInfo.module = shader;
+    shaderInfo.pName = spirv.entryPoint().constData();
+    pipelineInfo.stage = shaderInfo;
+
+    err = rhiD->df->vkCreateComputePipelines(rhiD->dev, rhiD->pipelineCache, 1, &pipelineInfo, nullptr, &pipeline);
+    rhiD->df->vkDestroyShaderModule(rhiD->dev, shader, nullptr);
+    if (err != VK_SUCCESS) {
+        qWarning("Failed to create graphics pipeline: %d", err);
+        return false;
+    }
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
+QVkCommandBuffer::QVkCommandBuffer(QRhiImplementation *rhi)
+    : QRhiCommandBuffer(rhi)
+{
+    resetState();
+}
+
+QVkCommandBuffer::~QVkCommandBuffer()
+{
+    release();
+}
+
+void QVkCommandBuffer::release()
+{
+    // nothing to do here, cb is not owned by us
+}
+
+const QRhiNativeHandles *QVkCommandBuffer::nativeHandles()
+{
+    // Ok this is messy but no other way has been devised yet. Outside
+    // begin(Compute)Pass - end(Compute)Pass it is simple - just return the
+    // primary VkCommandBuffer. Inside, however, we need to provide the current
+    // secondary command buffer (typically the one started by beginExternal(),
+    // in case we are between beginExternal - endExternal inside a pass).
+
+    if (useSecondaryCb && !secondaryCbs.isEmpty())
+        nativeHandlesStruct.commandBuffer = secondaryCbs.last();
+    else
+        nativeHandlesStruct.commandBuffer = cb;
+
+    return &nativeHandlesStruct;
+}
+
+QVkSwapChain::QVkSwapChain(QRhiImplementation *rhi)
+    : QRhiSwapChain(rhi),
+      rtWrapper(rhi),
+      cbWrapper(rhi)
+{
+}
+
+QVkSwapChain::~QVkSwapChain()
+{
+    release();
+}
+
+void QVkSwapChain::release()
+{
+    if (sc == VK_NULL_HANDLE)
+        return;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->swapchains.remove(this);
+    rhiD->releaseSwapChainResources(this);
+    surface = lastConnectedSurface = VK_NULL_HANDLE;
+
+    QRHI_PROF;
+    QRHI_PROF_F(releaseSwapChain(this));
+
+    rhiD->unregisterResource(this);
+}
+
+QRhiCommandBuffer *QVkSwapChain::currentFrameCommandBuffer()
+{
+    return &cbWrapper;
+}
+
+QRhiRenderTarget *QVkSwapChain::currentFrameRenderTarget()
+{
+    return &rtWrapper;
+}
+
+QSize QVkSwapChain::surfacePixelSize()
+{
+    if (!ensureSurface())
+        return QSize();
+
+    // The size from the QWindow may not exactly match the surface... so if a
+    // size is reported from the surface, use that.
+    VkSurfaceCapabilitiesKHR surfaceCaps;
+    memset(&surfaceCaps, 0, sizeof(surfaceCaps));
+    QRHI_RES_RHI(QRhiVulkan);
+    rhiD->vkGetPhysicalDeviceSurfaceCapabilitiesKHR(rhiD->physDev, surface, &surfaceCaps);
+    VkExtent2D bufferSize = surfaceCaps.currentExtent;
+    if (bufferSize.width == uint32_t(-1)) {
+        Q_ASSERT(bufferSize.height == uint32_t(-1));
+        return m_window->size() * m_window->devicePixelRatio();
+    }
+    return QSize(int(bufferSize.width), int(bufferSize.height));
+}
+
+QRhiRenderPassDescriptor *QVkSwapChain::newCompatibleRenderPassDescriptor()
+{
+    // not yet built so cannot rely on data computed in buildOrResize()
+
+    if (!ensureSurface()) // make sure sampleCount and colorFormat reflect what was requested
+        return nullptr;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    QVkRenderPassDescriptor *rp = new QVkRenderPassDescriptor(m_rhi);
+    if (!rhiD->createDefaultRenderPass(&rp->rp,
+                                       m_depthStencil != nullptr,
+                                       samples,
+                                       colorFormat))
+    {
+        delete rp;
+        return nullptr;
+    }
+
+    rp->ownsRp = true;
+    rhiD->registerResource(rp);
+    return rp;
+}
+
+static inline bool isSrgbFormat(VkFormat format)
+{
+    switch (format) {
+    case VK_FORMAT_R8_SRGB:
+        Q_FALLTHROUGH();
+    case VK_FORMAT_R8G8_SRGB:
+        Q_FALLTHROUGH();
+    case VK_FORMAT_R8G8B8_SRGB:
+        Q_FALLTHROUGH();
+    case VK_FORMAT_B8G8R8_SRGB:
+        Q_FALLTHROUGH();
+    case VK_FORMAT_R8G8B8A8_SRGB:
+        Q_FALLTHROUGH();
+    case VK_FORMAT_B8G8R8A8_SRGB:
+        Q_FALLTHROUGH();
+    case VK_FORMAT_A8B8G8R8_SRGB_PACK32:
+        return true;
+    default:
+        return false;
+    }
+}
+
+bool QVkSwapChain::ensureSurface()
+{
+    // Do nothing when already done, however window may change so check the
+    // surface is still the same. Some of the queries below are very expensive
+    // with some implementations so it is important to do the rest only once
+    // per surface.
+
+    Q_ASSERT(m_window);
+    VkSurfaceKHR surf = QVulkanInstance::surfaceForWindow(m_window);
+    if (!surf) {
+        qWarning("Failed to get surface for window");
+        return false;
+    }
+    if (surface == surf)
+        return true;
+
+    surface = surf;
+
+    QRHI_RES_RHI(QRhiVulkan);
+    if (rhiD->gfxQueueFamilyIdx != -1) {
+        if (!rhiD->inst->supportsPresent(rhiD->physDev, uint32_t(rhiD->gfxQueueFamilyIdx), m_window)) {
+            qWarning("Presenting not supported on this window");
+            return false;
+        }
+    }
+
+    if (!rhiD->vkGetPhysicalDeviceSurfaceCapabilitiesKHR) {
+        rhiD->vkGetPhysicalDeviceSurfaceCapabilitiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR>(
+                    rhiD->inst->getInstanceProcAddr("vkGetPhysicalDeviceSurfaceCapabilitiesKHR"));
+        rhiD->vkGetPhysicalDeviceSurfaceFormatsKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceSurfaceFormatsKHR>(
+                    rhiD->inst->getInstanceProcAddr("vkGetPhysicalDeviceSurfaceFormatsKHR"));
+        rhiD->vkGetPhysicalDeviceSurfacePresentModesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceSurfacePresentModesKHR>(
+                    rhiD->inst->getInstanceProcAddr("vkGetPhysicalDeviceSurfacePresentModesKHR"));
+        if (!rhiD->vkGetPhysicalDeviceSurfaceCapabilitiesKHR
+                || !rhiD->vkGetPhysicalDeviceSurfaceFormatsKHR
+                || !rhiD->vkGetPhysicalDeviceSurfacePresentModesKHR)
+        {
+            qWarning("Physical device surface queries not available");
+            return false;
+        }
+    }
+
+    quint32 formatCount = 0;
+    rhiD->vkGetPhysicalDeviceSurfaceFormatsKHR(rhiD->physDev, surface, &formatCount, nullptr);
+    QVector<VkSurfaceFormatKHR> formats(formatCount);
+    if (formatCount)
+        rhiD->vkGetPhysicalDeviceSurfaceFormatsKHR(rhiD->physDev, surface, &formatCount, formats.data());
+
+    const bool srgbRequested = m_flags.testFlag(sRGB);
+    for (int i = 0; i < int(formatCount); ++i) {
+        if (formats[i].format != VK_FORMAT_UNDEFINED && srgbRequested == isSrgbFormat(formats[i].format)) {
+            colorFormat = formats[i].format;
+            colorSpace = formats[i].colorSpace;
+            break;
+        }
+    }
+
+    samples = rhiD->effectiveSampleCount(m_sampleCount);
+
+    quint32 presModeCount = 0;
+    rhiD->vkGetPhysicalDeviceSurfacePresentModesKHR(rhiD->physDev, surface, &presModeCount, nullptr);
+    QVector<VkPresentModeKHR> presModes(presModeCount);
+    rhiD->vkGetPhysicalDeviceSurfacePresentModesKHR(rhiD->physDev, surface, &presModeCount, presModes.data());
+    supportedPresentationModes = presModes;
+
+    return true;
+}
+
+bool QVkSwapChain::buildOrResize()
+{
+    QRHI_RES_RHI(QRhiVulkan);
+    const bool needsRegistration = !window || window != m_window;
+
+    // Can be called multiple times due to window resizes - that is not the
+    // same as a simple release+build (as with other resources). Thus no
+    // release() here. See recreateSwapChain().
+
+    // except if the window actually changes
+    if (window && window != m_window)
+        release();
+
+    window = m_window;
+    m_currentPixelSize = surfacePixelSize();
+    pixelSize = m_currentPixelSize;
+
+    if (!rhiD->recreateSwapChain(this)) {
+        qWarning("Failed to create new swapchain");
+        return false;
+    }
+
+    if (needsRegistration)
+        rhiD->swapchains.insert(this);
+
+    if (m_depthStencil && m_depthStencil->sampleCount() != m_sampleCount) {
+        qWarning("Depth-stencil buffer's sampleCount (%d) does not match color buffers' sample count (%d). Expect problems.",
+                 m_depthStencil->sampleCount(), m_sampleCount);
+    }
+    if (m_depthStencil && m_depthStencil->pixelSize() != pixelSize) {
+        if (m_depthStencil->flags().testFlag(QRhiRenderBuffer::UsedWithSwapChainOnly)) {
+            m_depthStencil->setPixelSize(pixelSize);
+            if (!m_depthStencil->build())
+                qWarning("Failed to rebuild swapchain's associated depth-stencil buffer for size %dx%d",
+                         pixelSize.width(), pixelSize.height());
+        } else {
+            qWarning("Depth-stencil buffer's size (%dx%d) does not match the surface size (%dx%d). Expect problems.",
+                     m_depthStencil->pixelSize().width(), m_depthStencil->pixelSize().height(),
+                     pixelSize.width(), pixelSize.height());
+        }
+    }
+
+    if (!m_renderPassDesc)
+        qWarning("QVkSwapChain: No renderpass descriptor set. See newCompatibleRenderPassDescriptor() and setRenderPassDescriptor().");
+
+    rtWrapper.d.rp = QRHI_RES(QVkRenderPassDescriptor, m_renderPassDesc);
+    Q_ASSERT(rtWrapper.d.rp && rtWrapper.d.rp->rp);
+
+    rtWrapper.d.pixelSize = pixelSize;
+    rtWrapper.d.dpr = float(window->devicePixelRatio());
+    rtWrapper.d.sampleCount = samples;
+    rtWrapper.d.colorAttCount = 1;
+    if (m_depthStencil) {
+        rtWrapper.d.dsAttCount = 1;
+        ds = QRHI_RES(QVkRenderBuffer, m_depthStencil);
+    } else {
+        rtWrapper.d.dsAttCount = 0;
+        ds = nullptr;
+    }
+    if (samples > VK_SAMPLE_COUNT_1_BIT)
+        rtWrapper.d.resolveAttCount = 1;
+    else
+        rtWrapper.d.resolveAttCount = 0;
+
+    for (int i = 0; i < bufferCount; ++i) {
+        QVkSwapChain::ImageResources &image(imageRes[i]);
+        VkImageView views[3] = { // color, ds, resolve
+            samples > VK_SAMPLE_COUNT_1_BIT ? image.msaaImageView : image.imageView,
+            ds ? ds->imageView : VK_NULL_HANDLE,
+            samples > VK_SAMPLE_COUNT_1_BIT ? image.imageView : VK_NULL_HANDLE
+        };
+
+        VkFramebufferCreateInfo fbInfo;
+        memset(&fbInfo, 0, sizeof(fbInfo));
+        fbInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
+        fbInfo.renderPass = rtWrapper.d.rp->rp;
+        fbInfo.attachmentCount = uint32_t(rtWrapper.d.colorAttCount + rtWrapper.d.dsAttCount + rtWrapper.d.resolveAttCount);
+        fbInfo.pAttachments = views;
+        fbInfo.width = uint32_t(pixelSize.width());
+        fbInfo.height = uint32_t(pixelSize.height());
+        fbInfo.layers = 1;
+
+        VkResult err = rhiD->df->vkCreateFramebuffer(rhiD->dev, &fbInfo, nullptr, &image.fb);
+        if (err != VK_SUCCESS) {
+            qWarning("Failed to create framebuffer: %d", err);
+            return false;
+        }
+    }
+
+    frameCount = 0;
+
+    QRHI_PROF;
+    QRHI_PROF_F(resizeSwapChain(this, QVK_FRAMES_IN_FLIGHT, samples > VK_SAMPLE_COUNT_1_BIT ? QVK_FRAMES_IN_FLIGHT : 0, samples));
+
+    if (needsRegistration)
+        rhiD->registerResource(this);
+
+    return true;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qrhivulkan_p.h b/src/gui/rhi/qrhivulkan_p.h
new file mode 100644
index 0000000000..ff19c7a54e
--- /dev/null
+++ b/src/gui/rhi/qrhivulkan_p.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIVULKAN_H
+#define QRHIVULKAN_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qrhi_p.h>
+#include <QtGui/qvulkaninstance.h> // this is where vulkan.h gets pulled in
+
+QT_BEGIN_NAMESPACE
+
+struct Q_GUI_EXPORT QRhiVulkanInitParams : public QRhiInitParams
+{
+    QVulkanInstance *inst = nullptr;
+    QWindow *window = nullptr;
+};
+
+struct Q_GUI_EXPORT QRhiVulkanNativeHandles : public QRhiNativeHandles
+{
+    VkPhysicalDevice physDev = VK_NULL_HANDLE;
+    VkDevice dev = VK_NULL_HANDLE;
+    int gfxQueueFamilyIdx = -1;
+    VkQueue gfxQueue = VK_NULL_HANDLE;
+    VkCommandPool cmdPool = VK_NULL_HANDLE;
+    void *vmemAllocator = nullptr;
+};
+
+struct Q_GUI_EXPORT QRhiVulkanTextureNativeHandles : public QRhiNativeHandles
+{
+    VkImage image = VK_NULL_HANDLE;
+    VkImageLayout layout = VK_IMAGE_LAYOUT_GENERAL;
+};
+
+struct Q_GUI_EXPORT QRhiVulkanCommandBufferNativeHandles : public QRhiNativeHandles
+{
+    VkCommandBuffer commandBuffer = VK_NULL_HANDLE;
+};
+
+struct Q_GUI_EXPORT QRhiVulkanRenderPassNativeHandles : public QRhiNativeHandles
+{
+    VkRenderPass renderPass = VK_NULL_HANDLE;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhivulkan_p_p.h b/src/gui/rhi/qrhivulkan_p_p.h
new file mode 100644
index 0000000000..d0e1e6758b
--- /dev/null
+++ b/src/gui/rhi/qrhivulkan_p_p.h
@@ -0,0 +1,949 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIVULKAN_P_H
+#define QRHIVULKAN_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrhivulkan_p.h"
+#include "qrhi_p_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QVulkanFunctions;
+class QVulkanDeviceFunctions;
+
+static const int QVK_FRAMES_IN_FLIGHT = 2;
+
+static const int QVK_DESC_SETS_PER_POOL = 128;
+static const int QVK_UNIFORM_BUFFERS_PER_POOL = 256;
+static const int QVK_COMBINED_IMAGE_SAMPLERS_PER_POOL = 256;
+static const int QVK_STORAGE_BUFFERS_PER_POOL = 128;
+static const int QVK_STORAGE_IMAGES_PER_POOL = 128;
+
+static const int QVK_MAX_ACTIVE_TIMESTAMP_PAIRS = 16;
+
+// no vk_mem_alloc.h available here, void* is good enough
+typedef void * QVkAlloc;
+typedef void * QVkAllocator;
+
+struct QVkBuffer : public QRhiBuffer
+{
+    QVkBuffer(QRhiImplementation *rhi, Type type, UsageFlags usage, int size);
+    ~QVkBuffer();
+    void release() override;
+    bool build() override;
+
+    VkBuffer buffers[QVK_FRAMES_IN_FLIGHT];
+    QVkAlloc allocations[QVK_FRAMES_IN_FLIGHT];
+    QVarLengthArray<QRhiResourceUpdateBatchPrivate::BufferOp, 16> pendingDynamicUpdates[QVK_FRAMES_IN_FLIGHT];
+    VkBuffer stagingBuffers[QVK_FRAMES_IN_FLIGHT];
+    QVkAlloc stagingAllocations[QVK_FRAMES_IN_FLIGHT];
+    struct UsageState {
+        VkAccessFlags access = 0;
+        VkPipelineStageFlags stage = 0;
+    };
+    UsageState usageState[QVK_FRAMES_IN_FLIGHT];
+    int lastActiveFrameSlot = -1;
+    uint generation = 0;
+    friend class QRhiVulkan;
+};
+
+struct QVkTexture;
+
+struct QVkRenderBuffer : public QRhiRenderBuffer
+{
+    QVkRenderBuffer(QRhiImplementation *rhi, Type type, const QSize &pixelSize,
+                    int sampleCount, Flags flags);
+    ~QVkRenderBuffer();
+    void release() override;
+    bool build() override;
+    QRhiTexture::Format backingFormat() const override;
+
+    VkDeviceMemory memory = VK_NULL_HANDLE;
+    VkImage image = VK_NULL_HANDLE;
+    VkImageView imageView = VK_NULL_HANDLE;
+    VkSampleCountFlagBits samples;
+    QVkTexture *backingTexture = nullptr;
+    VkFormat vkformat;
+    int lastActiveFrameSlot = -1;
+    friend class QRhiVulkan;
+};
+
+struct QVkTexture : public QRhiTexture
+{
+    QVkTexture(QRhiImplementation *rhi, Format format, const QSize &pixelSize,
+               int sampleCount, Flags flags);
+    ~QVkTexture();
+    void release() override;
+    bool build() override;
+    bool buildFrom(const QRhiNativeHandles *src) override;
+    const QRhiNativeHandles *nativeHandles() override;
+
+    bool prepareBuild(QSize *adjustedSize = nullptr);
+    bool finishBuild();
+    VkImageView imageViewForLevel(int level);
+
+    VkImage image = VK_NULL_HANDLE;
+    VkImageView imageView = VK_NULL_HANDLE;
+    QVkAlloc imageAlloc = nullptr;
+    VkBuffer stagingBuffers[QVK_FRAMES_IN_FLIGHT];
+    QVkAlloc stagingAllocations[QVK_FRAMES_IN_FLIGHT];
+    VkImageView perLevelImageViews[QRhi::MAX_LEVELS];
+    bool owns = true;
+    QRhiVulkanTextureNativeHandles nativeHandlesStruct;
+    struct UsageState {
+        // no tracking of subresource layouts (some operations can keep
+        // subresources in different layouts for some time, but that does not
+        // need to be kept track of)
+        VkImageLayout layout;
+        VkAccessFlags access;
+        VkPipelineStageFlags stage;
+    };
+    UsageState usageState;
+    VkFormat vkformat;
+    uint mipLevelCount = 0;
+    VkSampleCountFlagBits samples;
+    int lastActiveFrameSlot = -1;
+    uint generation = 0;
+    friend class QRhiVulkan;
+};
+
+struct QVkSampler : public QRhiSampler
+{
+    QVkSampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
+               AddressMode u, AddressMode v);
+    ~QVkSampler();
+    void release() override;
+    bool build() override;
+
+    VkSampler sampler = VK_NULL_HANDLE;
+    int lastActiveFrameSlot = -1;
+    uint generation = 0;
+    friend class QRhiVulkan;
+};
+
+struct QVkRenderPassDescriptor : public QRhiRenderPassDescriptor
+{
+    QVkRenderPassDescriptor(QRhiImplementation *rhi);
+    ~QVkRenderPassDescriptor();
+    void release() override;
+    const QRhiNativeHandles *nativeHandles() override;
+
+    VkRenderPass rp = VK_NULL_HANDLE;
+    bool ownsRp = false;
+    QRhiVulkanRenderPassNativeHandles nativeHandlesStruct;
+    int lastActiveFrameSlot = -1;
+};
+
+struct QVkRenderTargetData
+{
+    VkFramebuffer fb = VK_NULL_HANDLE;
+    QVkRenderPassDescriptor *rp = nullptr;
+    QSize pixelSize;
+    float dpr = 1;
+    int sampleCount = 1;
+    int colorAttCount = 0;
+    int dsAttCount = 0;
+    int resolveAttCount = 0;
+    static const int MAX_COLOR_ATTACHMENTS = 8;
+};
+
+struct QVkReferenceRenderTarget : public QRhiRenderTarget
+{
+    QVkReferenceRenderTarget(QRhiImplementation *rhi);
+    ~QVkReferenceRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QVkRenderTargetData d;
+};
+
+struct QVkTextureRenderTarget : public QRhiTextureRenderTarget
+{
+    QVkTextureRenderTarget(QRhiImplementation *rhi, const QRhiTextureRenderTargetDescription &desc, Flags flags);
+    ~QVkTextureRenderTarget();
+    void release() override;
+
+    QSize pixelSize() const override;
+    float devicePixelRatio() const override;
+    int sampleCount() const override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool build() override;
+
+    QVkRenderTargetData d;
+    VkImageView rtv[QVkRenderTargetData::MAX_COLOR_ATTACHMENTS];
+    VkImageView resrtv[QVkRenderTargetData::MAX_COLOR_ATTACHMENTS];
+    int lastActiveFrameSlot = -1;
+    friend class QRhiVulkan;
+};
+
+struct QVkShaderResourceBindings : public QRhiShaderResourceBindings
+{
+    QVkShaderResourceBindings(QRhiImplementation *rhi);
+    ~QVkShaderResourceBindings();
+    void release() override;
+    bool build() override;
+
+    QVarLengthArray<QRhiShaderResourceBinding, 8> sortedBindings;
+    int poolIndex = -1;
+    VkDescriptorSetLayout layout = VK_NULL_HANDLE;
+    VkDescriptorSet descSets[QVK_FRAMES_IN_FLIGHT]; // multiple sets to support dynamic buffers
+    int lastActiveFrameSlot = -1;
+    uint generation = 0;
+
+    // Keep track of the generation number of each referenced QRhi* to be able
+    // to detect that the underlying descriptor set became out of date and they
+    // need to be written again with the up-to-date VkBuffer etc. objects.
+    struct BoundUniformBufferData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundSampledTextureData {
+        quint64 texId;
+        uint texGeneration;
+        quint64 samplerId;
+        uint samplerGeneration;
+    };
+    struct BoundStorageImageData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundStorageBufferData {
+        quint64 id;
+        uint generation;
+    };
+    struct BoundResourceData {
+        union {
+            BoundUniformBufferData ubuf;
+            BoundSampledTextureData stex;
+            BoundStorageImageData simage;
+            BoundStorageBufferData sbuf;
+        };
+    };
+    QVarLengthArray<BoundResourceData, 8> boundResourceData[QVK_FRAMES_IN_FLIGHT];
+
+    friend class QRhiVulkan;
+};
+
+Q_DECLARE_TYPEINFO(QVkShaderResourceBindings::BoundResourceData, Q_MOVABLE_TYPE);
+
+struct QVkGraphicsPipeline : public QRhiGraphicsPipeline
+{
+    QVkGraphicsPipeline(QRhiImplementation *rhi);
+    ~QVkGraphicsPipeline();
+    void release() override;
+    bool build() override;
+
+    VkPipelineLayout layout = VK_NULL_HANDLE;
+    VkPipeline pipeline = VK_NULL_HANDLE;
+    int lastActiveFrameSlot = -1;
+    uint generation = 0;
+    friend class QRhiVulkan;
+};
+
+struct QVkComputePipeline : public QRhiComputePipeline
+{
+    QVkComputePipeline(QRhiImplementation *rhi);
+    ~QVkComputePipeline();
+    void release() override;
+    bool build() override;
+
+    VkPipelineLayout layout = VK_NULL_HANDLE;
+    VkPipeline pipeline = VK_NULL_HANDLE;
+    int lastActiveFrameSlot = -1;
+    uint generation = 0;
+    friend class QRhiVulkan;
+};
+
+struct QVkCommandBuffer : public QRhiCommandBuffer
+{
+    QVkCommandBuffer(QRhiImplementation *rhi);
+    ~QVkCommandBuffer();
+    void release() override;
+
+    const QRhiNativeHandles *nativeHandles();
+
+    VkCommandBuffer cb = VK_NULL_HANDLE; // primary
+    bool useSecondaryCb = false;
+    QRhiVulkanCommandBufferNativeHandles nativeHandlesStruct;
+
+    enum PassType {
+        NoPass,
+        RenderPass,
+        ComputePass
+    };
+
+    void resetState() {
+        recordingPass = NoPass;
+        currentTarget = nullptr;
+
+        secondaryCbs.clear();
+
+        resetCommands();
+        resetCachedState();
+    }
+
+    void resetCachedState() {
+        currentGraphicsPipeline = nullptr;
+        currentComputePipeline = nullptr;
+        currentPipelineGeneration = 0;
+        currentGraphicsSrb = nullptr;
+        currentComputeSrb = nullptr;
+        currentSrbGeneration = 0;
+        currentDescSetSlot = -1;
+        currentIndexBuffer = VK_NULL_HANDLE;
+        currentIndexOffset = 0;
+        currentIndexFormat = VK_INDEX_TYPE_UINT16;
+        memset(currentVertexBuffers, 0, sizeof(currentVertexBuffers));
+        memset(currentVertexOffsets, 0, sizeof(currentVertexOffsets));
+        inExternal = false;
+    }
+
+    PassType recordingPass;
+    QRhiRenderTarget *currentTarget;
+    QRhiGraphicsPipeline *currentGraphicsPipeline;
+    QRhiComputePipeline *currentComputePipeline;
+    uint currentPipelineGeneration;
+    QRhiShaderResourceBindings *currentGraphicsSrb;
+    QRhiShaderResourceBindings *currentComputeSrb;
+    uint currentSrbGeneration;
+    int currentDescSetSlot;
+    VkBuffer currentIndexBuffer;
+    quint32 currentIndexOffset;
+    VkIndexType currentIndexFormat;
+    static const int VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32;
+    VkBuffer currentVertexBuffers[VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+    quint32 currentVertexOffsets[VERTEX_INPUT_RESOURCE_SLOT_COUNT];
+    QVarLengthArray<VkCommandBuffer, 4> secondaryCbs;
+    bool inExternal;
+
+    struct Command {
+        enum Cmd {
+            CopyBuffer,
+            CopyBufferToImage,
+            CopyImage,
+            CopyImageToBuffer,
+            ImageBarrier,
+            BufferBarrier,
+            BlitImage,
+            BeginRenderPass,
+            EndRenderPass,
+            BindPipeline,
+            BindDescriptorSet,
+            BindVertexBuffer,
+            BindIndexBuffer,
+            SetViewport,
+            SetScissor,
+            SetBlendConstants,
+            SetStencilRef,
+            Draw,
+            DrawIndexed,
+            DebugMarkerBegin,
+            DebugMarkerEnd,
+            DebugMarkerInsert,
+            TransitionPassResources,
+            Dispatch,
+            ExecuteSecondary
+        };
+        Cmd cmd;
+
+        union Args {
+            struct {
+                VkBuffer src;
+                VkBuffer dst;
+                VkBufferCopy desc;
+            } copyBuffer;
+            struct {
+                VkBuffer src;
+                VkImage dst;
+                VkImageLayout dstLayout;
+                int count;
+                int bufferImageCopyIndex;
+            } copyBufferToImage;
+            struct {
+                VkImage src;
+                VkImageLayout srcLayout;
+                VkImage dst;
+                VkImageLayout dstLayout;
+                VkImageCopy desc;
+            } copyImage;
+            struct {
+                VkImage src;
+                VkImageLayout srcLayout;
+                VkBuffer dst;
+                VkBufferImageCopy desc;
+            } copyImageToBuffer;
+            struct {
+                VkPipelineStageFlags srcStageMask;
+                VkPipelineStageFlags dstStageMask;
+                VkImageMemoryBarrier desc;
+            } imageBarrier;
+            struct {
+                VkPipelineStageFlags srcStageMask;
+                VkPipelineStageFlags dstStageMask;
+                VkBufferMemoryBarrier desc;
+            } bufferBarrier;
+            struct {
+                VkImage src;
+                VkImageLayout srcLayout;
+                VkImage dst;
+                VkImageLayout dstLayout;
+                VkFilter filter;
+                VkImageBlit desc;
+            } blitImage;
+            struct {
+                VkRenderPassBeginInfo desc;
+                int clearValueIndex;
+            } beginRenderPass;
+            struct {
+            } endRenderPass;
+            struct {
+                VkPipelineBindPoint bindPoint;
+                VkPipeline pipeline;
+            } bindPipeline;
+            struct {
+                VkPipelineBindPoint bindPoint;
+                VkPipelineLayout pipelineLayout;
+                VkDescriptorSet descSet;
+                int dynamicOffsetCount;
+                int dynamicOffsetIndex;
+            } bindDescriptorSet;
+            struct {
+                int startBinding;
+                int count;
+                int vertexBufferIndex;
+                int vertexBufferOffsetIndex;
+            } bindVertexBuffer;
+            struct {
+                VkBuffer buf;
+                VkDeviceSize ofs;
+                VkIndexType type;
+            } bindIndexBuffer;
+            struct {
+                VkViewport viewport;
+            } setViewport;
+            struct {
+                VkRect2D scissor;
+            } setScissor;
+            struct {
+                float c[4];
+            } setBlendConstants;
+            struct {
+                uint32_t ref;
+            } setStencilRef;
+            struct {
+                uint32_t vertexCount;
+                uint32_t instanceCount;
+                uint32_t firstVertex;
+                uint32_t firstInstance;
+            } draw;
+            struct {
+                uint32_t indexCount;
+                uint32_t instanceCount;
+                uint32_t firstIndex;
+                int32_t vertexOffset;
+                uint32_t firstInstance;
+            } drawIndexed;
+            struct {
+                VkDebugMarkerMarkerInfoEXT marker;
+                int markerNameIndex;
+            } debugMarkerBegin;
+            struct {
+            } debugMarkerEnd;
+            struct {
+                VkDebugMarkerMarkerInfoEXT marker;
+                int markerNameIndex;
+            } debugMarkerInsert;
+            struct {
+                int trackerIndex;
+            } transitionResources;
+            struct {
+                int x, y, z;
+            } dispatch;
+            struct {
+                VkCommandBuffer cb;
+            } executeSecondary;
+        } args;
+    };
+    QVector<Command> commands;
+    QVarLengthArray<QRhiPassResourceTracker, 8> passResTrackers;
+    int currentPassResTrackerIndex;
+
+    void resetCommands() {
+        commands.clear();
+        resetPools();
+
+        passResTrackers.clear();
+        currentPassResTrackerIndex = -1;
+    }
+
+    void resetPools() {
+        pools.clearValue.clear();
+        pools.bufferImageCopy.clear();
+        pools.dynamicOffset.clear();
+        pools.vertexBuffer.clear();
+        pools.vertexBufferOffset.clear();
+        pools.debugMarkerData.clear();
+    }
+
+    struct {
+        QVarLengthArray<VkClearValue, 4> clearValue;
+        QVarLengthArray<VkBufferImageCopy, 16> bufferImageCopy;
+        QVarLengthArray<uint32_t, 4> dynamicOffset;
+        QVarLengthArray<VkBuffer, 4> vertexBuffer;
+        QVarLengthArray<VkDeviceSize, 4> vertexBufferOffset;
+        QVarLengthArray<QByteArray, 4> debugMarkerData;
+    } pools;
+
+    friend class QRhiVulkan;
+};
+
+Q_DECLARE_TYPEINFO(QVkCommandBuffer::Command, Q_MOVABLE_TYPE);
+
+struct QVkSwapChain : public QRhiSwapChain
+{
+    QVkSwapChain(QRhiImplementation *rhi);
+    ~QVkSwapChain();
+    void release() override;
+
+    QRhiCommandBuffer *currentFrameCommandBuffer() override;
+    QRhiRenderTarget *currentFrameRenderTarget() override;
+
+    QSize surfacePixelSize() override;
+
+    QRhiRenderPassDescriptor *newCompatibleRenderPassDescriptor() override;
+    bool buildOrResize() override;
+
+    bool ensureSurface();
+
+    static const quint32 MAX_BUFFER_COUNT = 3;
+
+    QWindow *window = nullptr;
+    QSize pixelSize;
+    bool supportsReadback = false;
+    VkSwapchainKHR sc = VK_NULL_HANDLE;
+    int bufferCount = 0;
+    VkSurfaceKHR surface = VK_NULL_HANDLE;
+    VkSurfaceKHR lastConnectedSurface = VK_NULL_HANDLE;
+    VkFormat colorFormat = VK_FORMAT_B8G8R8A8_UNORM;
+    VkColorSpaceKHR colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
+    QVkRenderBuffer *ds = nullptr;
+    VkSampleCountFlagBits samples = VK_SAMPLE_COUNT_1_BIT;
+    QVector<VkPresentModeKHR> supportedPresentationModes;
+    VkDeviceMemory msaaImageMem = VK_NULL_HANDLE;
+    QVkReferenceRenderTarget rtWrapper;
+    QVkCommandBuffer cbWrapper;
+
+    struct ImageResources {
+        VkImage image = VK_NULL_HANDLE;
+        VkImageView imageView = VK_NULL_HANDLE;
+        VkFramebuffer fb = VK_NULL_HANDLE;
+        VkImage msaaImage = VK_NULL_HANDLE;
+        VkImageView msaaImageView = VK_NULL_HANDLE;
+        enum LastUse {
+            ScImageUseNone,
+            ScImageUseRender,
+            ScImageUseTransferSource
+        };
+        LastUse lastUse = ScImageUseNone;
+    } imageRes[MAX_BUFFER_COUNT];
+
+    struct FrameResources {
+        VkFence imageFence = VK_NULL_HANDLE;
+        bool imageFenceWaitable = false;
+        VkSemaphore imageSem = VK_NULL_HANDLE;
+        VkSemaphore drawSem = VK_NULL_HANDLE;
+        bool imageAcquired = false;
+        bool imageSemWaitable = false;
+        quint32 imageIndex = 0;
+        VkCommandBuffer cmdBuf = VK_NULL_HANDLE; // primary
+        VkFence cmdFence = VK_NULL_HANDLE;
+        bool cmdFenceWaitable = false;
+        int timestampQueryIndex = -1;
+    } frameRes[QVK_FRAMES_IN_FLIGHT];
+
+    quint32 currentImageIndex = 0; // index in imageRes
+    quint32 currentFrameSlot = 0; // index in frameRes
+    int frameCount = 0;
+
+    friend class QRhiVulkan;
+};
+
+class QRhiVulkan : public QRhiImplementation
+{
+public:
+    QRhiVulkan(QRhiVulkanInitParams *params, QRhiVulkanNativeHandles *importDevice = nullptr);
+
+    bool create(QRhi::Flags flags) override;
+    void destroy() override;
+
+    QRhiGraphicsPipeline *createGraphicsPipeline() override;
+    QRhiComputePipeline *createComputePipeline() override;
+    QRhiShaderResourceBindings *createShaderResourceBindings() override;
+    QRhiBuffer *createBuffer(QRhiBuffer::Type type,
+                             QRhiBuffer::UsageFlags usage,
+                             int size) override;
+    QRhiRenderBuffer *createRenderBuffer(QRhiRenderBuffer::Type type,
+                                         const QSize &pixelSize,
+                                         int sampleCount,
+                                         QRhiRenderBuffer::Flags flags) override;
+    QRhiTexture *createTexture(QRhiTexture::Format format,
+                               const QSize &pixelSize,
+                               int sampleCount,
+                               QRhiTexture::Flags flags) override;
+    QRhiSampler *createSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+                               QRhiSampler::Filter mipmapMode,
+                               QRhiSampler:: AddressMode u, QRhiSampler::AddressMode v) override;
+
+    QRhiTextureRenderTarget *createTextureRenderTarget(const QRhiTextureRenderTargetDescription &desc,
+                                                       QRhiTextureRenderTarget::Flags flags) override;
+
+    QRhiSwapChain *createSwapChain() override;
+    QRhi::FrameOpResult beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endFrame(QRhiSwapChain *swapChain, QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi::BeginFrameFlags flags) override;
+    QRhi::FrameOpResult endOffscreenFrame(QRhi::EndFrameFlags flags) override;
+    QRhi::FrameOpResult finish() override;
+
+    void resourceUpdate(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void beginPass(QRhiCommandBuffer *cb,
+                   QRhiRenderTarget *rt,
+                   const QColor &colorClearValue,
+                   const QRhiDepthStencilClearValue &depthStencilClearValue,
+                   QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endPass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+
+    void setGraphicsPipeline(QRhiCommandBuffer *cb,
+                             QRhiGraphicsPipeline *ps) override;
+
+    void setShaderResources(QRhiCommandBuffer *cb,
+                            QRhiShaderResourceBindings *srb,
+                            int dynamicOffsetCount,
+                            const QRhiCommandBuffer::DynamicOffset *dynamicOffsets) override;
+
+    void setVertexInput(QRhiCommandBuffer *cb,
+                        int startBinding, int bindingCount, const QRhiCommandBuffer::VertexInput *bindings,
+                        QRhiBuffer *indexBuf, quint32 indexOffset,
+                        QRhiCommandBuffer::IndexFormat indexFormat) override;
+
+    void setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport) override;
+    void setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor) override;
+    void setBlendConstants(QRhiCommandBuffer *cb, const QColor &c) override;
+    void setStencilRef(QRhiCommandBuffer *cb, quint32 refValue) override;
+
+    void draw(QRhiCommandBuffer *cb, quint32 vertexCount,
+              quint32 instanceCount, quint32 firstVertex, quint32 firstInstance) override;
+
+    void drawIndexed(QRhiCommandBuffer *cb, quint32 indexCount,
+                     quint32 instanceCount, quint32 firstIndex,
+                     qint32 vertexOffset, quint32 firstInstance) override;
+
+    void debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name) override;
+    void debugMarkEnd(QRhiCommandBuffer *cb) override;
+    void debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg) override;
+
+    void beginComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void endComputePass(QRhiCommandBuffer *cb, QRhiResourceUpdateBatch *resourceUpdates) override;
+    void setComputePipeline(QRhiCommandBuffer *cb, QRhiComputePipeline *ps) override;
+    void dispatch(QRhiCommandBuffer *cb, int x, int y, int z) override;
+
+    const QRhiNativeHandles *nativeHandles(QRhiCommandBuffer *cb) override;
+    void beginExternal(QRhiCommandBuffer *cb) override;
+    void endExternal(QRhiCommandBuffer *cb) override;
+
+    QVector<int> supportedSampleCounts() const override;
+    int ubufAlignment() const override;
+    bool isYUpInFramebuffer() const override;
+    bool isYUpInNDC() const override;
+    bool isClipDepthZeroToOne() const override;
+    QMatrix4x4 clipSpaceCorrMatrix() const override;
+    bool isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture::Flags flags) const override;
+    bool isFeatureSupported(QRhi::Feature feature) const override;
+    int resourceLimit(QRhi::ResourceLimit limit) const override;
+    const QRhiNativeHandles *nativeHandles() override;
+    void sendVMemStatsToProfiler() override;
+    bool makeThreadLocalNativeContextCurrent() override;
+    void releaseCachedResources() override;
+    bool isDeviceLost() const override;
+
+    VkResult createDescriptorPool(VkDescriptorPool *pool);
+    bool allocateDescriptorSet(VkDescriptorSetAllocateInfo *allocInfo, VkDescriptorSet *result, int *resultPoolIndex);
+    uint32_t chooseTransientImageMemType(VkImage img, uint32_t startIndex);
+    bool createTransientImage(VkFormat format, const QSize &pixelSize, VkImageUsageFlags usage,
+                              VkImageAspectFlags aspectMask, VkSampleCountFlagBits samples,
+                              VkDeviceMemory *mem, VkImage *images, VkImageView *views, int count);
+
+    bool recreateSwapChain(QRhiSwapChain *swapChain);
+    void releaseSwapChainResources(QRhiSwapChain *swapChain);
+
+    VkFormat optimalDepthStencilFormat();
+    VkSampleCountFlagBits effectiveSampleCount(int sampleCount);
+    bool createDefaultRenderPass(VkRenderPass *rp,
+                                 bool hasDepthStencil,
+                                 VkSampleCountFlagBits samples,
+                                 VkFormat colorFormat);
+    bool createOffscreenRenderPass(VkRenderPass *rp,
+                                   const QRhiColorAttachment *firstColorAttachment,
+                                   const QRhiColorAttachment *lastColorAttachment,
+                                   bool preserveColor,
+                                   bool preserveDs,
+                                   QRhiRenderBuffer *depthStencilBuffer,
+                                   QRhiTexture *depthTexture);
+    bool ensurePipelineCache();
+    VkShaderModule createShader(const QByteArray &spirv);
+
+    void prepareNewFrame(QRhiCommandBuffer *cb);
+    VkCommandBuffer startSecondaryCommandBuffer(QVkRenderTargetData *rtD = nullptr);
+    void endAndEnqueueSecondaryCommandBuffer(VkCommandBuffer cb, QVkCommandBuffer *cbD);
+    void deferredReleaseSecondaryCommandBuffer(VkCommandBuffer cb);
+    QRhi::FrameOpResult startPrimaryCommandBuffer(VkCommandBuffer *cb);
+    QRhi::FrameOpResult endAndSubmitPrimaryCommandBuffer(VkCommandBuffer cb, VkFence cmdFence,
+                                                         VkSemaphore *waitSem, VkSemaphore *signalSem);
+    void waitCommandCompletion(int frameSlot);
+    VkDeviceSize subresUploadByteSize(const QRhiTextureSubresourceUploadDescription &subresDesc) const;
+    using BufferImageCopyList = QVarLengthArray<VkBufferImageCopy, 16>;
+    void prepareUploadSubres(QVkTexture *texD, int layer, int level,
+                             const QRhiTextureSubresourceUploadDescription &subresDesc,
+                             size_t *curOfs, void *mp,
+                             BufferImageCopyList *copyInfos);
+    void enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdateBatch *resourceUpdates);
+    void executeBufferHostWritesForCurrentFrame(QVkBuffer *bufD);
+    void enqueueTransitionPassResources(QVkCommandBuffer *cbD);
+    void recordPrimaryCommandBuffer(QVkCommandBuffer *cbD);
+    void trackedRegisterBuffer(QRhiPassResourceTracker *passResTracker,
+                               QVkBuffer *bufD,
+                               int slot,
+                               QRhiPassResourceTracker::BufferAccess access,
+                               QRhiPassResourceTracker::BufferStage stage);
+    void trackedRegisterTexture(QRhiPassResourceTracker *passResTracker,
+                                QVkTexture *texD,
+                                QRhiPassResourceTracker::TextureAccess access,
+                                QRhiPassResourceTracker::TextureStage stage);
+    void recordTransitionPassResources(QVkCommandBuffer *cbD, const QRhiPassResourceTracker &tracker);
+    void activateTextureRenderTarget(QVkCommandBuffer *cbD, QVkTextureRenderTarget *rtD);
+    void executeDeferredReleases(bool forced = false);
+    void finishActiveReadbacks(bool forced = false);
+
+    void setObjectName(uint64_t object, VkDebugReportObjectTypeEXT type, const QByteArray &name, int slot = -1);
+    void trackedBufferBarrier(QVkCommandBuffer *cbD, QVkBuffer *bufD, int slot,
+                              VkAccessFlags access, VkPipelineStageFlags stage);
+    void trackedImageBarrier(QVkCommandBuffer *cbD, QVkTexture *texD,
+                             VkImageLayout layout, VkAccessFlags access, VkPipelineStageFlags stage);
+    void subresourceBarrier(QVkCommandBuffer *cbD, VkImage image,
+                            VkImageLayout oldLayout, VkImageLayout newLayout,
+                            VkAccessFlags srcAccess, VkAccessFlags dstAccess,
+                            VkPipelineStageFlags srcStage, VkPipelineStageFlags dstStage,
+                            int startLayer, int layerCount,
+                            int startLevel, int levelCount);
+    void updateShaderResourceBindings(QRhiShaderResourceBindings *srb, int descSetIdx = -1);
+
+    QVulkanInstance *inst = nullptr;
+    QWindow *maybeWindow = nullptr;
+    bool importedDevice = false;
+    VkPhysicalDevice physDev = VK_NULL_HANDLE;
+    VkDevice dev = VK_NULL_HANDLE;
+    bool importedCmdPool = false;
+    VkCommandPool cmdPool = VK_NULL_HANDLE;
+    int gfxQueueFamilyIdx = -1;
+    VkQueue gfxQueue = VK_NULL_HANDLE;
+    bool hasCompute = false;
+    quint32 timestampValidBits = 0;
+    bool importedAllocator = false;
+    QVkAllocator allocator = nullptr;
+    QVulkanFunctions *f = nullptr;
+    QVulkanDeviceFunctions *df = nullptr;
+    VkPhysicalDeviceFeatures physDevFeatures;
+    VkPhysicalDeviceProperties physDevProperties;
+    VkDeviceSize ubufAlign;
+    VkDeviceSize texbufAlign;
+    bool hasWideLines = false;
+    bool deviceLost = false;
+
+    bool debugMarkersAvailable = false;
+    bool vertexAttribDivisorAvailable = false;
+    PFN_vkCmdDebugMarkerBeginEXT vkCmdDebugMarkerBegin = nullptr;
+    PFN_vkCmdDebugMarkerEndEXT vkCmdDebugMarkerEnd = nullptr;
+    PFN_vkCmdDebugMarkerInsertEXT vkCmdDebugMarkerInsert = nullptr;
+    PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectName = nullptr;
+
+    PFN_vkCreateSwapchainKHR vkCreateSwapchainKHR = nullptr;
+    PFN_vkDestroySwapchainKHR vkDestroySwapchainKHR;
+    PFN_vkGetSwapchainImagesKHR vkGetSwapchainImagesKHR;
+    PFN_vkAcquireNextImageKHR vkAcquireNextImageKHR;
+    PFN_vkQueuePresentKHR vkQueuePresentKHR;
+    PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR = nullptr;
+    PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vkGetPhysicalDeviceSurfaceFormatsKHR;
+    PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR;
+
+    VkPipelineCache pipelineCache = VK_NULL_HANDLE;
+    struct DescriptorPoolData {
+        DescriptorPoolData() { }
+        DescriptorPoolData(VkDescriptorPool pool_)
+            : pool(pool_)
+        { }
+        VkDescriptorPool pool = VK_NULL_HANDLE;
+        int refCount = 0;
+        int allocedDescSets = 0;
+    };
+    QVector<DescriptorPoolData> descriptorPools;
+
+    VkQueryPool timestampQueryPool = VK_NULL_HANDLE;
+    QBitArray timestampQueryPoolMap;
+
+    VkFormat optimalDsFormat = VK_FORMAT_UNDEFINED;
+    QMatrix4x4 clipCorrectMatrix;
+
+    QVkSwapChain *currentSwapChain = nullptr;
+    QSet<QVkSwapChain *> swapchains;
+    QRhiVulkanNativeHandles nativeHandlesStruct;
+
+    struct OffscreenFrame {
+        OffscreenFrame(QRhiImplementation *rhi) : cbWrapper(rhi) { }
+        bool active = false;
+        QVkCommandBuffer cbWrapper;
+        VkFence cmdFence = VK_NULL_HANDLE;
+    } ofr;
+
+    struct TextureReadback {
+        int activeFrameSlot = -1;
+        QRhiReadbackDescription desc;
+        QRhiReadbackResult *result;
+        VkBuffer stagingBuf;
+        QVkAlloc stagingAlloc;
+        quint32 byteSize;
+        QSize pixelSize;
+        QRhiTexture::Format format;
+    };
+    QVector<TextureReadback> activeTextureReadbacks;
+    struct BufferReadback {
+        int activeFrameSlot = -1;
+        QRhiBufferReadbackResult *result;
+        int byteSize;
+        VkBuffer stagingBuf;
+        QVkAlloc stagingAlloc;
+    };
+    QVector<BufferReadback> activeBufferReadbacks;
+
+    struct DeferredReleaseEntry {
+        enum Type {
+            Pipeline,
+            ShaderResourceBindings,
+            Buffer,
+            RenderBuffer,
+            Texture,
+            Sampler,
+            TextureRenderTarget,
+            RenderPass,
+            StagingBuffer,
+            CommandBuffer
+        };
+        Type type;
+        int lastActiveFrameSlot; // -1 if not used otherwise 0..FRAMES_IN_FLIGHT-1
+        union {
+            struct {
+                VkPipeline pipeline;
+                VkPipelineLayout layout;
+            } pipelineState;
+            struct {
+                int poolIndex;
+                VkDescriptorSetLayout layout;
+            } shaderResourceBindings;
+            struct {
+                VkBuffer buffers[QVK_FRAMES_IN_FLIGHT];
+                QVkAlloc allocations[QVK_FRAMES_IN_FLIGHT];
+                VkBuffer stagingBuffers[QVK_FRAMES_IN_FLIGHT];
+                QVkAlloc stagingAllocations[QVK_FRAMES_IN_FLIGHT];
+            } buffer;
+            struct {
+                VkDeviceMemory memory;
+                VkImage image;
+                VkImageView imageView;
+            } renderBuffer;
+            struct {
+                VkImage image;
+                VkImageView imageView;
+                QVkAlloc allocation;
+                VkBuffer stagingBuffers[QVK_FRAMES_IN_FLIGHT];
+                QVkAlloc stagingAllocations[QVK_FRAMES_IN_FLIGHT];
+                VkImageView extraImageViews[QRhi::MAX_LEVELS];
+            } texture;
+            struct {
+                VkSampler sampler;
+            } sampler;
+            struct {
+                VkFramebuffer fb;
+                VkImageView rtv[QVkRenderTargetData::MAX_COLOR_ATTACHMENTS];
+                VkImageView resrtv[QVkRenderTargetData::MAX_COLOR_ATTACHMENTS];
+            } textureRenderTarget;
+            struct {
+                VkRenderPass rp;
+            } renderPass;
+            struct {
+                VkBuffer stagingBuffer;
+                QVkAlloc stagingAllocation;
+            } stagingBuffer;
+            struct {
+                VkCommandBuffer cb;
+            } commandBuffer;
+        };
+    };
+    QVector<DeferredReleaseEntry> releaseQueue;
+};
+
+Q_DECLARE_TYPEINFO(QRhiVulkan::DescriptorPoolData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVulkan::DeferredReleaseEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVulkan::TextureReadback, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QRhiVulkan::BufferReadback, Q_MOVABLE_TYPE);
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qrhivulkanext_p.h b/src/gui/rhi/qrhivulkanext_p.h
new file mode 100644
index 0000000000..67a63e07e0
--- /dev/null
+++ b/src/gui/rhi/qrhivulkanext_p.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt RHI module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QRHIVULKANEXT_P_H
+#define QRHIVULKANEXT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qrhivulkan_p.h"
+
+QT_BEGIN_NAMESPACE
+
+#ifndef VK_EXT_vertex_attribute_divisor
+#define VK_EXT_vertex_attribute_divisor 1
+#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 2
+#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor"
+
+typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           maxVertexAttribDivisor;
+} VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT;
+
+typedef struct VkVertexInputBindingDivisorDescriptionEXT {
+    uint32_t    binding;
+    uint32_t    divisor;
+} VkVertexInputBindingDivisorDescriptionEXT;
+
+typedef struct VkPipelineVertexInputDivisorStateCreateInfoEXT {
+    VkStructureType                                     sType;
+    const void*                                         pNext;
+    uint32_t                                            vertexBindingDivisorCount;
+    const VkVertexInputBindingDivisorDescriptionEXT*    pVertexBindingDivisors;
+} VkPipelineVertexInputDivisorStateCreateInfoEXT;
+#endif // VK_EXT_vertex_attribute_divisor
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp
new file mode 100644
index 0000000000..6a2c596557
--- /dev/null
+++ b/src/gui/rhi/qshader.cpp
@@ -0,0 +1,589 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qshader_p_p.h"
+#include <QDataStream>
+#include <QBuffer>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QShader
+    \internal
+    \inmodule QtGui
+
+    \brief Contains multiple versions of a shader translated to multiple shading languages,
+    together with reflection metadata.
+
+    QShader is the entry point to shader code in the graphics API agnostic
+    Qt world. Instead of using GLSL shader sources, as was the custom with Qt
+    5.x, new graphics systems with backends for multiple graphics APIs, such
+    as, Vulkan, Metal, Direct3D, and OpenGL, take QShader as their input
+    whenever a shader needs to be specified.
+
+    A QShader instance is empty and thus invalid by default. To get a useful
+    instance, the two typical methods are:
+
+    \list
+
+    \li Generate the contents offline, during build time or earlier, using the
+    \c qsb command line tool. The result is a binary file that is shipped with
+    the application, read via QIODevice::readAll(), and then deserialized via
+    fromSerialized(). For more information, see QShaderBaker.
+
+    \li Generate at run time via QShaderBaker. This is an expensive operation,
+    but allows applications to use user-provided or dynamically generated
+    shader source strings.
+
+    \endlist
+
+    When used together with the Qt Rendering Hardware Interface and its
+    classes, like QRhiGraphicsPipeline, no further action is needed from the
+    application's side as these classes are prepared to consume a QShader
+    whenever a shader needs to be specified for a given stage of the graphics
+    pipeline.
+
+    Alternatively, applications can access
+
+    \list
+
+    \li the source or byte code for any of the shading language versions that
+    are included in the QShader,
+
+    \li the name of the entry point for the shader,
+
+    \li the reflection metadata containing a description of the shader's
+    inputs, outputs and resources like uniform blocks. This is essential when
+    an application or framework needs to discover the inputs of a shader at
+    runtime due to not having advance knowledge of the vertex attributes or the
+    layout of the uniform buffers used by the shader.
+
+    \endlist
+
+    QShader makes no assumption about the shading language that was used
+    as the source for generating the various versions and variants that are
+    included in it.
+
+    QShader uses implicit sharing similarly to many core Qt types, and so
+    can be returned or passed by value. Detach happens implicitly when calling
+    a setter.
+
+    For reference, QRhi expects that a QShader suitable for all its
+    backends contains at least the following:
+
+    \list
+
+    \li SPIR-V 1.0 bytecode suitable for Vulkan 1.0 or newer
+
+    \li GLSL/ES 100 source code suitable for OpenGL ES 2.0 or newer
+
+    \li GLSL 120 source code suitable for OpenGL 2.1
+
+    \li HLSL Shader Model 5.0 source code or the corresponding DXBC bytecode suitable for Direct3D 11
+
+    \li Metal Shading Language 1.2 source code or the corresponding bytecode suitable for Metal
+
+    \endlist
+
+    \sa QShaderBaker
+ */
+
+/*!
+    \enum QShader::Stage
+    Describes the stage of the graphics pipeline the shader is suitable for.
+
+    \value VertexStage Vertex shader
+    \value TessellationControlStage Tessellation control (hull) shader
+    \value TessellationEvaluationStage Tessellation evaluation (domain) shader
+    \value GeometryStage Geometry shader
+    \value FragmentStage Fragment (pixel) shader
+    \value ComputeStage Compute shader
+ */
+
+/*!
+    \class QShaderVersion
+    \internal
+    \inmodule QtGui
+
+    \brief Specifies the shading language version.
+
+    While languages like SPIR-V or the Metal Shading Language use traditional
+    version numbers, shaders for other APIs can use slightly different
+    versioning schemes. All those are mapped to a single version number in
+    here, however. For HLSL, the version refers to the Shader Model version,
+    like 5.0, 5.1, or 6.0. For GLSL an additional flag is needed to choose
+    between GLSL and GLSL/ES.
+
+    Below is a list with the most common examples of shader versions for
+    different graphics APIs:
+
+    \list
+
+    \li Vulkan (SPIR-V): 100
+    \li OpenGL: 120, 330, 440, etc.
+    \li OpenGL ES: 100 with GlslEs, 300 with GlslEs, etc.
+    \li Direct3D: 50, 51, 60
+    \li Metal: 12, 20
+    \endlist
+
+    A default constructed QShaderVersion contains a version of 100 and no
+    flags set.
+ */
+
+/*!
+    \enum QShaderVersion::Flag
+
+    Describes the flags that can be set.
+
+    \value GlslEs Indicates that GLSL/ES is meant in combination with GlslShader
+ */
+
+/*!
+    \class QShaderKey
+    \internal
+    \inmodule QtGui
+
+    \brief Specifies the shading language, the version with flags, and the variant.
+
+    A default constructed QShaderKey has source set to SpirvShader and
+    sourceVersion set to 100. sourceVariant defaults to StandardShader.
+ */
+
+/*!
+    \enum QShader::Source
+    Describes what kind of shader code an entry contains.
+
+    \value SpirvShader SPIR-V
+    \value GlslShader GLSL
+    \value HlslShader HLSL
+    \value DxbcShader Direct3D bytecode (HLSL compiled by \c fxc)
+    \value MslShader Metal Shading Language
+    \value DxilShader Direct3D bytecode (HLSL compiled by \c dxc)
+    \value MetalLibShader Pre-compiled Metal bytecode
+ */
+
+/*!
+    \enum QShader::Variant
+    Describes what kind of shader code an entry contains.
+
+    \value StandardShader The normal, unmodified version of the shader code.
+    \value BatchableVertexShader Vertex shader rewritten to be suitable for Qt Quick scenegraph batching.
+ */
+
+/*!
+    \class QShaderCode
+    \internal
+    \inmodule QtGui
+
+    \brief Contains source or binary code for a shader and additional metadata.
+
+    When shader() is empty after retrieving a QShaderCode instance from
+    QShader, it indicates no shader code was found for the requested key.
+ */
+
+static const int QSB_VERSION = 1;
+
+/*!
+    Constructs a new, empty (and thus invalid) QShader instance.
+ */
+QShader::QShader()
+    : d(new QShaderPrivate)
+{
+}
+
+/*!
+    \internal
+ */
+void QShader::detach()
+{
+    qAtomicDetach(d);
+}
+
+/*!
+    \internal
+ */
+QShader::QShader(const QShader &other)
+    : d(other.d)
+{
+    d->ref.ref();
+}
+
+/*!
+    \internal
+ */
+QShader &QShader::operator=(const QShader &other)
+{
+    qAtomicAssign(d, other.d);
+    return *this;
+}
+
+/*!
+    Destructor.
+ */
+QShader::~QShader()
+{
+    if (!d->ref.deref())
+        delete d;
+}
+
+/*!
+    \return true if the QShader contains at least one shader version.
+ */
+bool QShader::isValid() const
+{
+    return !d->shaders.isEmpty();
+}
+
+/*!
+    \return the pipeline stage the shader is meant for.
+ */
+QShader::Stage QShader::stage() const
+{
+    return d->stage;
+}
+
+/*!
+    Sets the pipeline \a stage.
+ */
+void QShader::setStage(Stage stage)
+{
+    if (stage != d->stage) {
+        detach();
+        d->stage = stage;
+    }
+}
+
+/*!
+    \return the reflection metadata for the shader.
+ */
+QShaderDescription QShader::description() const
+{
+    return d->desc;
+}
+
+/*!
+    Sets the reflection metadata to \a desc.
+ */
+void QShader::setDescription(const QShaderDescription &desc)
+{
+    detach();
+    d->desc = desc;
+}
+
+/*!
+    \return the list of available shader versions
+ */
+QVector<QShaderKey> QShader::availableShaders() const
+{
+    return d->shaders.keys().toVector();
+}
+
+/*!
+    \return the source or binary code for a given shader version specified by \a key.
+ */
+QShaderCode QShader::shader(const QShaderKey &key) const
+{
+    return d->shaders.value(key);
+}
+
+/*!
+    Stores the source or binary \a shader code for a given shader version specified by \a key.
+ */
+void QShader::setShader(const QShaderKey &key, const QShaderCode &shader)
+{
+    if (d->shaders.value(key) == shader)
+        return;
+
+    detach();
+    d->shaders[key] = shader;
+}
+
+/*!
+    Removes the source or binary shader code for a given \a key.
+    Does nothing when not found.
+ */
+void QShader::removeShader(const QShaderKey &key)
+{
+    auto it = d->shaders.find(key);
+    if (it == d->shaders.end())
+        return;
+
+    detach();
+    d->shaders.erase(it);
+}
+
+/*!
+    \return a serialized binary version of all the data held by the
+    QShader, suitable for writing to files or other I/O devices.
+
+    \sa fromSerialized()
+ */
+QByteArray QShader::serialized() const
+{
+    QBuffer buf;
+    QDataStream ds(&buf);
+    ds.setVersion(QDataStream::Qt_5_10);
+    if (!buf.open(QIODevice::WriteOnly))
+        return QByteArray();
+
+    ds << QSB_VERSION;
+    ds << d->stage;
+    ds << d->desc.toBinaryJson();
+    ds << d->shaders.count();
+    for (auto it = d->shaders.cbegin(), itEnd = d->shaders.cend(); it != itEnd; ++it) {
+        const QShaderKey &k(it.key());
+        ds << k.source();
+        ds << k.sourceVersion().version();
+        ds << k.sourceVersion().flags();
+        ds << k.sourceVariant();
+        const QShaderCode &shader(d->shaders.value(k));
+        ds << shader.shader();
+        ds << shader.entryPoint();
+    }
+
+    return qCompress(buf.buffer());
+}
+
+/*!
+    Creates a new QShader instance from the given \a data.
+
+    \sa serialized()
+  */
+QShader QShader::fromSerialized(const QByteArray &data)
+{
+    QByteArray udata = qUncompress(data);
+    QBuffer buf(&udata);
+    QDataStream ds(&buf);
+    ds.setVersion(QDataStream::Qt_5_10);
+    if (!buf.open(QIODevice::ReadOnly))
+        return QShader();
+
+    QShader bs;
+    QShaderPrivate *d = QShaderPrivate::get(&bs);
+    Q_ASSERT(d->ref.loadRelaxed() == 1); // must be detached
+    int intVal;
+    ds >> intVal;
+    if (intVal != QSB_VERSION)
+        return QShader();
+
+    ds >> intVal;
+    d->stage = Stage(intVal);
+    QByteArray descBin;
+    ds >> descBin;
+    d->desc = QShaderDescription::fromBinaryJson(descBin);
+    int count;
+    ds >> count;
+    for (int i = 0; i < count; ++i) {
+        QShaderKey k;
+        ds >> intVal;
+        k.setSource(Source(intVal));
+        QShaderVersion ver;
+        ds >> intVal;
+        ver.setVersion(intVal);
+        ds >> intVal;
+        ver.setFlags(QShaderVersion::Flags(intVal));
+        k.setSourceVersion(ver);
+        ds >> intVal;
+        k.setSourceVariant(Variant(intVal));
+        QShaderCode shader;
+        QByteArray s;
+        ds >> s;
+        shader.setShader(s);
+        ds >> s;
+        shader.setEntryPoint(s);
+        d->shaders[k] = shader;
+    }
+
+    return bs;
+}
+
+QShaderVersion::QShaderVersion(int v, Flags f)
+    : m_version(v), m_flags(f)
+{
+}
+
+QShaderCode::QShaderCode(const QByteArray &code, const QByteArray &entry)
+    : m_shader(code), m_entryPoint(entry)
+{
+}
+
+QShaderKey::QShaderKey(QShader::Source s,
+                       const QShaderVersion &sver,
+                       QShader::Variant svar)
+    : m_source(s),
+      m_sourceVersion(sver),
+      m_sourceVariant(svar)
+{
+}
+
+/*!
+    Returns \c true if the two QShader objects \a lhs and \a rhs are equal,
+    meaning they are for the same stage with matching sets of shader source or
+    binary code.
+
+    \relates QShader
+ */
+bool operator==(const QShader &lhs, const QShader &rhs) Q_DECL_NOTHROW
+{
+    return lhs.d->stage == rhs.d->stage
+            && lhs.d->shaders == rhs.d->shaders;
+    // do not bother with desc, if the shader code is the same, the description must match too
+}
+
+/*!
+    \fn bool operator!=(const QShader &lhs, const QShader &rhs)
+
+    Returns \c false if the values in the two QShader objects \a a and \a b
+    are equal; otherwise returns \c true.
+
+    \relates QShader
+ */
+
+/*!
+    Returns the hash value for \a s, using \a seed to seed the calculation.
+
+    \relates QShader
+ */
+uint qHash(const QShader &s, uint seed) Q_DECL_NOTHROW
+{
+    uint h = s.stage();
+    for (auto it = s.d->shaders.constBegin(), itEnd = s.d->shaders.constEnd(); it != itEnd; ++it)
+        h += qHash(it.key(), seed) + qHash(it.value().shader(), seed);
+    return h;
+}
+
+/*!
+    Returns \c true if the two QShaderVersion objects \a lhs and \a rhs are
+    equal.
+
+    \relates QShaderVersion
+ */
+bool operator==(const QShaderVersion &lhs, const QShaderVersion &rhs) Q_DECL_NOTHROW
+{
+    return lhs.version() == rhs.version() && lhs.flags() == rhs.flags();
+}
+
+/*!
+    \fn bool operator!=(const QShaderVersion &lhs, const QShaderVersion &rhs)
+
+    Returns \c false if the values in the two QShaderVersion objects \a a
+    and \a b are equal; otherwise returns \c true.
+
+    \relates QShaderVersion
+ */
+
+/*!
+    Returns \c true if the two QShaderKey objects \a lhs and \a rhs are equal.
+
+    \relates QShaderKey
+ */
+bool operator==(const QShaderKey &lhs, const QShaderKey &rhs) Q_DECL_NOTHROW
+{
+    return lhs.source() == rhs.source() && lhs.sourceVersion() == rhs.sourceVersion()
+            && lhs.sourceVariant() == rhs.sourceVariant();
+}
+
+/*!
+    \fn bool operator!=(const QShaderKey &lhs, const QShaderKey &rhs)
+
+    Returns \c false if the values in the two QShaderKey objects \a a
+    and \a b are equal; otherwise returns \c true.
+
+    \relates QShaderKey
+ */
+
+/*!
+    Returns the hash value for \a k, using \a seed to seed the calculation.
+
+    \relates QShaderKey
+ */
+uint qHash(const QShaderKey &k, uint seed) Q_DECL_NOTHROW
+{
+    return seed + 10 * k.source() + k.sourceVersion().version() + k.sourceVersion().flags() + k.sourceVariant();
+}
+
+/*!
+    Returns \c true if the two QShaderCode objects \a lhs and \a rhs are equal.
+
+    \relates QShaderCode
+ */
+bool operator==(const QShaderCode &lhs, const QShaderCode &rhs) Q_DECL_NOTHROW
+{
+    return lhs.shader() == rhs.shader() && lhs.entryPoint() == rhs.entryPoint();
+}
+
+/*!
+    \fn bool operator!=(const QShaderCode &lhs, const QShaderCode &rhs)
+
+    Returns \c false if the values in the two QShaderCode objects \a a
+    and \a b are equal; otherwise returns \c true.
+
+    \relates QShaderCode
+ */
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QShader &bs)
+{
+    const QShaderPrivate *d = bs.d;
+    QDebugStateSaver saver(dbg);
+
+    dbg.nospace() << "QShader("
+                  << "stage=" << d->stage
+                  << " shaders=" << d->shaders.keys()
+                  << " desc.isValid=" << d->desc.isValid()
+                  << ')';
+
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, const QShaderKey &k)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "ShaderKey(" << k.source()
+                  << " " << k.sourceVersion()
+                  << " " << k.sourceVariant() << ")";
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, const QShaderVersion &v)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "Version(" << v.version() << " " << v.flags() << ")";
+    return dbg;
+}
+#endif // QT_NO_DEBUG_STREAM
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h
new file mode 100644
index 0000000000..243842a95a
--- /dev/null
+++ b/src/gui/rhi/qshader_p.h
@@ -0,0 +1,224 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSHADER_P_H
+#define QSHADER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of a number of Qt sources files.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/qtguiglobal.h>
+#include <private/qshaderdescription_p.h>
+
+QT_BEGIN_NAMESPACE
+
+struct QShaderPrivate;
+class QShaderKey;
+
+class Q_GUI_EXPORT QShaderVersion
+{
+public:
+    enum Flag {
+        GlslEs = 0x01
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    QShaderVersion() = default;
+    QShaderVersion(int v, Flags f = Flags());
+
+    int version() const { return m_version; }
+    void setVersion(int v) { m_version = v; }
+
+    Flags flags() const { return m_flags; }
+    void setFlags(Flags f) { m_flags = f; }
+
+private:
+    int m_version = 100;
+    Flags m_flags;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QShaderVersion::Flags)
+Q_DECLARE_TYPEINFO(QShaderVersion, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QShaderCode
+{
+public:
+    QShaderCode() = default;
+    QShaderCode(const QByteArray &code, const QByteArray &entry = QByteArray());
+
+    QByteArray shader() const { return m_shader; }
+    void setShader(const QByteArray &code) { m_shader = code; }
+
+    QByteArray entryPoint() const { return m_entryPoint; }
+    void setEntryPoint(const QByteArray &entry) { m_entryPoint = entry; }
+
+private:
+    QByteArray m_shader;
+    QByteArray m_entryPoint;
+};
+
+Q_DECLARE_TYPEINFO(QShaderCode, Q_MOVABLE_TYPE);
+
+class Q_GUI_EXPORT QShader
+{
+public:
+    enum Stage {
+        VertexStage = 0,
+        TessellationControlStage,
+        TessellationEvaluationStage,
+        GeometryStage,
+        FragmentStage,
+        ComputeStage
+    };
+
+    enum Source {
+        SpirvShader = 0,
+        GlslShader,
+        HlslShader,
+        DxbcShader, // fxc
+        MslShader,
+        DxilShader, // dxc
+        MetalLibShader // xcrun metal + xcrun metallib
+    };
+
+    enum Variant {
+        StandardShader = 0,
+        BatchableVertexShader
+    };
+
+    QShader();
+    QShader(const QShader &other);
+    QShader &operator=(const QShader &other);
+    ~QShader();
+    void detach();
+
+    bool isValid() const;
+
+    Stage stage() const;
+    void setStage(Stage stage);
+
+    QShaderDescription description() const;
+    void setDescription(const QShaderDescription &desc);
+
+    QVector<QShaderKey> availableShaders() const;
+    QShaderCode shader(const QShaderKey &key) const;
+    void setShader(const QShaderKey &key, const QShaderCode &shader);
+    void removeShader(const QShaderKey &key);
+
+    QByteArray serialized() const;
+    static QShader fromSerialized(const QByteArray &data);
+
+private:
+    QShaderPrivate *d;
+    friend struct QShaderPrivate;
+    friend Q_GUI_EXPORT bool operator==(const QShader &, const QShader &) Q_DECL_NOTHROW;
+    friend Q_GUI_EXPORT uint qHash(const QShader &, uint) Q_DECL_NOTHROW;
+#ifndef QT_NO_DEBUG_STREAM
+    friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QShader &);
+#endif
+};
+
+class Q_GUI_EXPORT QShaderKey
+{
+public:
+    QShaderKey() = default;
+    QShaderKey(QShader::Source s,
+               const QShaderVersion &sver,
+               QShader::Variant svar = QShader::StandardShader);
+
+    QShader::Source source() const { return m_source; }
+    void setSource(QShader::Source s) { m_source = s; }
+
+    QShaderVersion sourceVersion() const { return m_sourceVersion; }
+    void setSourceVersion(const QShaderVersion &sver) { m_sourceVersion = sver; }
+
+    QShader::Variant sourceVariant() const { return m_sourceVariant; }
+    void setSourceVariant(QShader::Variant svar) { m_sourceVariant = svar; }
+
+private:
+    QShader::Source m_source = QShader::SpirvShader;
+    QShaderVersion m_sourceVersion;
+    QShader::Variant m_sourceVariant = QShader::StandardShader;
+};
+
+Q_DECLARE_TYPEINFO(QShaderKey, Q_MOVABLE_TYPE);
+
+Q_GUI_EXPORT bool operator==(const QShader &lhs, const QShader &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QShader &s, uint seed = 0) Q_DECL_NOTHROW;
+
+inline bool operator!=(const QShader &lhs, const QShader &rhs) Q_DECL_NOTHROW
+{
+    return !(lhs == rhs);
+}
+
+Q_GUI_EXPORT bool operator==(const QShaderVersion &lhs, const QShaderVersion &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderKey &lhs, const QShaderKey &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderCode &lhs, const QShaderCode &rhs) Q_DECL_NOTHROW;
+
+inline bool operator!=(const QShaderVersion &lhs, const QShaderVersion &rhs) Q_DECL_NOTHROW
+{
+    return !(lhs == rhs);
+}
+
+inline bool operator!=(const QShaderKey &lhs, const QShaderKey &rhs) Q_DECL_NOTHROW
+{
+    return !(lhs == rhs);
+}
+
+inline bool operator!=(const QShaderCode &lhs, const QShaderCode &rhs) Q_DECL_NOTHROW
+{
+    return !(lhs == rhs);
+}
+
+Q_GUI_EXPORT uint qHash(const QShaderKey &k, uint seed = 0) Q_DECL_NOTHROW;
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QShader &);
+Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QShaderKey &k);
+Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QShaderVersion &v);
+#endif
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qshader_p_p.h b/src/gui/rhi/qshader_p_p.h
new file mode 100644
index 0000000000..6473590e95
--- /dev/null
+++ b/src/gui/rhi/qshader_p_p.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSHADER_P_P_H
+#define QSHADER_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of a number of Qt sources files.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qshader_p.h"
+#include <QtCore/QAtomicInt>
+#include <QtCore/QHash>
+#include <QtCore/QDebug>
+
+QT_BEGIN_NAMESPACE
+
+struct Q_GUI_EXPORT QShaderPrivate
+{
+    QShaderPrivate()
+        : ref(1)
+    {
+    }
+
+    QShaderPrivate(const QShaderPrivate *other)
+        : ref(1),
+          stage(other->stage),
+          desc(other->desc),
+          shaders(other->shaders)
+    {
+    }
+
+    static QShaderPrivate *get(QShader *s) { return s->d; }
+    static const QShaderPrivate *get(const QShader *s) { return s->d; }
+
+    QAtomicInt ref;
+    QShader::Stage stage = QShader::VertexStage;
+    QShaderDescription desc;
+    QHash<QShaderKey, QShaderCode> shaders;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp
new file mode 100644
index 0000000000..179d5f3a07
--- /dev/null
+++ b/src/gui/rhi/qshaderdescription.cpp
@@ -0,0 +1,1122 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qshaderdescription_p_p.h"
+#include <QDebug>
+#include <QJsonObject>
+#include <QJsonArray>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QShaderDescription
+    \internal
+    \inmodule QtGui
+
+    \brief Describes the interface of a shader.
+
+    A shader typically has a set of inputs and outputs. A vertex shader for
+    example has a number of input variables and may use one or more uniform
+    buffers to access data (e.g. a modelview matrix) provided by the
+    application. The shader for the fragment stage receives data from the
+    vertex stage (in a simple setup) and may also rely on data from uniform
+    buffers, images, and samplers.
+
+    When it comes to vertex inputs and the layout of the uniform buffers (what
+    are the names of the members? what is there size, offset, and so on),
+    applications and frameworks may need to discover this dynamically at run
+    time. This is typical when the shader is not built-in but provided by an
+    external entity, like the user.
+
+    Modern and lean graphics APIs may no longer provide a way to query shader
+    reflection information at run time. Therefore, such data is now
+    automatically generated by QShaderBaker and is provided as a
+    QShaderDescription object for each and every QShader.
+
+    \section2 Example
+
+    Take the following vertex shader:
+
+    \badcode
+        #version 440
+
+        layout(location = 0) in vec4 position;
+        layout(location = 1) in vec3 color;
+        layout(location = 0) out vec3 v_color;
+
+        layout(std140, binding = 0) uniform buf {
+            mat4 mvp;
+            float opacity;
+        } ubuf;
+
+        out gl_PerVertex { vec4 gl_Position; };
+
+        void main()
+        {
+            v_color = color;
+            gl_Position = ubuf.mvp * position;
+        }
+    \endcode
+
+    This shader has two inputs: \c position at location 0 with a type of \c
+    vec4, and \c color at location 1 with a type of \c vec3. It has one output:
+    \c v_color, although this is typically not interesting for applications.
+    What is more important, there is a uniform block at binding 0 with a size
+    of 68 bytes and two members, a 4x4 matrix named \c mvp at offset 0, and a
+    float \c opacity at offset 64.
+
+    All this is described by a QShaderDescription object. QShaderDescription
+    can also be serialized to JSON and binary JSON, and can be deserialized
+    from binary JSON. In practice this is rarely needed since QShader
+    takes care of the associated QShaderDescription automatically, but if the
+    QShaderDescription of the above shader would be written out as JSON, it
+    would look like the following:
+
+    \badcode
+        {
+            "inputs": [
+                {
+                    "location": 1,
+                    "name": "color",
+                    "type": "vec3"
+                },
+                {
+                    "location": 0,
+                    "name": "position",
+                    "type": "vec4"
+                }
+            ],
+            "outputs": [
+                {
+                    "location": 0,
+                    "name": "v_color",
+                    "type": "vec3"
+                }
+            ],
+            "uniformBlocks": [
+                {
+                    "binding": 0,
+                    "blockName": "buf",
+                    "members": [
+                        {
+                            "matrixStride": 16,
+                            "name": "mvp",
+                            "offset": 0,
+                            "size": 64,
+                            "type": "mat4"
+                        },
+                        {
+                            "name": "opacity",
+                            "offset": 64,
+                            "size": 4,
+                            "type": "float"
+                        }
+                    ],
+                    "set": 0,
+                    "size": 68,
+                    "structName": "ubuf"
+                }
+            ]
+        }
+    \endcode
+
+    The C++ API allows accessing a data structure like the above. For
+    simplicity the inner structs only contain public data members, also
+    considering that their layout is unlikely to change in the future.
+
+    \sa QShaderBaker, QShader
+ */
+
+/*!
+    \enum QShaderDescription::VariableType
+    Represents the type of a variable or block member.
+
+    \value Unknown
+    \value Float
+    \value Vec2
+    \value Vec3
+    \value Vec4
+    \value Mat2
+    \value Mat2x3
+    \value Mat2x4
+    \value Mat3
+    \value Mat3x2
+    \value Mat3x4
+    \value Mat4
+    \value Mat4x2
+    \value Mat4x3
+    \value Int
+    \value Int2
+    \value Int3
+    \value Int4
+    \value Uint
+    \value Uint2
+    \value Uint3
+    \value Uint4
+    \value Bool
+    \value Bool2
+    \value Bool3
+    \value Bool4
+    \value Double
+    \value Double2
+    \value Double3
+    \value Double4
+    \value DMat2
+    \value DMat2x3
+    \value DMat2x4
+    \value DMat3
+    \value DMat3x2
+    \value DMat3x4
+    \value DMat4
+    \value DMat4x2
+    \value DMat4x3
+    \value Sampler1D
+    \value Sampler2D
+    \value Sampler2DMS
+    \value Sampler3D
+    \value SamplerCube
+    \value Sampler1DArray
+    \value Sampler2DArray
+    \value Sampler2DMSArray
+    \value Sampler3DArray
+    \value SamplerCubeArray
+    \value SamplerRect
+    \value SamplerBuffer
+    \value Image1D
+    \value Image2D
+    \value Image2DMS
+    \value Image3D
+    \value ImageCube
+    \value Image1DArray
+    \value Image2DArray
+    \value Image2DMSArray
+    \value Image3DArray
+    \value ImageCubeArray
+    \value ImageRect
+    \value ImageBuffer
+    \value Struct
+ */
+
+/*!
+    \class QShaderDescription::InOutVariable
+    \internal
+    \inmodule QtGui
+
+    \brief Describes an input or output variable in the shader.
+ */
+
+/*!
+    \class QShaderDescription::BlockVariable
+    \internal
+    \inmodule QtGui
+
+    \brief Describes a member of a uniform or push constant block.
+ */
+
+/*!
+    \class QShaderDescription::UniformBlock
+    \internal
+    \inmodule QtGui
+
+    \brief Describes a uniform block.
+
+    \note When translating to shading languages without uniform block support
+    (like GLSL 120 or GLSL/ES 100), uniform blocks are replaced with ordinary
+    uniforms in a struct. The name of the struct, and so the prefix for the
+    uniforms generated from the block members, is given by structName.
+ */
+
+/*!
+    \class QShaderDescription::PushConstantBlock
+    \internal
+    \inmodule QtGui
+
+    \brief Describes a push constant block.
+ */
+
+/*!
+    \class QShaderDescription::StorageBlock
+    \internal
+    \inmodule QtGui
+
+    \brief Describes a shader storage block.
+ */
+
+/*!
+    Constructs a new, empty QShaderDescription.
+
+    \note Being empty implies that isValid() returns \c false for the
+    newly constructed instance.
+ */
+QShaderDescription::QShaderDescription()
+    : d(new QShaderDescriptionPrivate)
+{
+}
+
+/*!
+    \internal
+ */
+void QShaderDescription::detach()
+{
+    qAtomicDetach(d);
+}
+
+/*!
+    \internal
+ */
+QShaderDescription::QShaderDescription(const QShaderDescription &other)
+    : d(other.d)
+{
+    d->ref.ref();
+}
+
+/*!
+    \internal
+ */
+QShaderDescription &QShaderDescription::operator=(const QShaderDescription &other)
+{
+    qAtomicAssign(d, other.d);
+    return *this;
+}
+
+/*!
+    Destructor.
+ */
+QShaderDescription::~QShaderDescription()
+{
+    if (!d->ref.deref())
+        delete d;
+}
+
+/*!
+   \return true if the QShaderDescription contains at least one entry in one of
+   the variable and block lists.
+ */
+bool QShaderDescription::isValid() const
+{
+    return !d->inVars.isEmpty() || !d->outVars.isEmpty()
+        || !d->uniformBlocks.isEmpty() || !d->pushConstantBlocks.isEmpty() || !d->storageBlocks.isEmpty()
+        || !d->combinedImageSamplers.isEmpty() || !d->storageImages.isEmpty();
+}
+
+/*!
+    \return a serialized binary version of the data.
+
+    \sa toJson()
+ */
+QByteArray QShaderDescription::toBinaryJson() const
+{
+    return d->makeDoc().toBinaryData();
+}
+
+/*!
+    \return a serialized JSON text version of the data.
+
+    \note There is no deserialization method provided for JSON text.
+
+    \sa toBinaryJson()
+ */
+QByteArray QShaderDescription::toJson() const
+{
+    return d->makeDoc().toJson();
+}
+
+/*!
+    Deserializes the given binary JSON \a data and returns a new
+    QShaderDescription.
+ */
+QShaderDescription QShaderDescription::fromBinaryJson(const QByteArray &data)
+{
+    QShaderDescription desc;
+    QShaderDescriptionPrivate::get(&desc)->loadDoc(QJsonDocument::fromBinaryData(data));
+    return desc;
+}
+
+/*!
+    \return the list of input variables. This includes vertex inputs (sometimes
+    called attributes) for the vertex stage, and inputs for other stages
+    (sometimes called varyings).
+ */
+QVector<QShaderDescription::InOutVariable> QShaderDescription::inputVariables() const
+{
+    return d->inVars;
+}
+
+/*!
+    \return the list of output variables.
+ */
+QVector<QShaderDescription::InOutVariable> QShaderDescription::outputVariables() const
+{
+    return d->outVars;
+}
+
+/*!
+    \return the list of uniform blocks.
+ */
+QVector<QShaderDescription::UniformBlock> QShaderDescription::uniformBlocks() const
+{
+    return d->uniformBlocks;
+}
+
+/*!
+    \return the list of push constant blocks.
+
+    \note Avoid relying on push constant blocks for shaders that are to be used
+    in combination with the Qt Rendering Hardware Interface since that
+    currently has no support for them.
+ */
+QVector<QShaderDescription::PushConstantBlock> QShaderDescription::pushConstantBlocks() const
+{
+    return d->pushConstantBlocks;
+}
+
+/*!
+    \return the list of shader storage blocks.
+
+    For example, with GLSL/Vulkan shaders as source, the declaration
+
+    \badcode
+        struct Stuff {
+            vec2 a;
+            vec2 b;
+        };
+        layout(std140, binding = 0) buffer StuffSsbo {
+            vec4 whatever;
+            Stuff stuff[];
+        } buf;
+    \endcode
+
+    generates the following: (shown as textual JSON here)
+
+    \badcode
+        "storageBlocks": [ {
+            "binding": 0,
+            "blockName": "StuffSsbo",
+            "instanceName": "buf",
+            "knownSize": 16,
+            "members": [
+                {
+                    "name": "whatever",
+                    "offset": 0,
+                    "size": 16,
+                    "type": "vec4"
+                },
+                {
+                    "arrayDims": [
+                        0
+                    ],
+                    "name": "stuff",
+                    "offset": 16,
+                    "size": 0,
+                    "structMembers": [
+                        {
+                            "name": "a",
+                            "offset": 0,
+                            "size": 8,
+                            "type": "vec2"
+                        },
+                        {
+                            "name": "b",
+                            "offset": 8,
+                            "size": 8,
+                            "type": "vec2"
+                        }
+                    ],
+                    "type": "struct"
+                }
+            ],
+            "set": 0
+        } ]
+    \endcode
+
+    \note The size of the last member in the storage block is undefined. This shows
+    up as \c size 0 and an array dimension of \c{[0]}. The storage block's \c knownSize
+    excludes the size of the last member since that will only be known at run time.
+
+    \note SSBOs are not available with some graphics APIs, such as, OpenGL 2.x or
+    OpenGL ES older than 3.1.
+ */
+QVector<QShaderDescription::StorageBlock> QShaderDescription::storageBlocks() const
+{
+    return d->storageBlocks;
+}
+
+/*!
+    \return the list of combined image samplers
+
+    With GLSL/Vulkan shaders as source a \c{layout(binding = 1) uniform sampler2D tex;}
+    uniform generates the following: (shown as textual JSON here)
+
+    \badcode
+       "combinedImageSamplers": [
+            {
+                "binding": 1,
+                "name": "tex",
+                "set": 0,
+                "type": "sampler2D"
+            }
+        ]
+    \endcode
+
+    This does not mean that other language versions of the shader must also use
+    a combined image sampler, especially considering that the concept may not
+    exist everywhere. For instance, a HLSL version will likely just use a
+    Texture2D and SamplerState object with registers t1 and s1, respectively.
+  */
+QVector<QShaderDescription::InOutVariable> QShaderDescription::combinedImageSamplers() const
+{
+    return d->combinedImageSamplers;
+}
+
+/*!
+    \return the list of image variables.
+
+    These will likely occur in compute shaders. For example,
+    \c{layout (binding = 0, rgba8) uniform readonly image2D inputImage;}
+    generates the following: (shown as textual JSON here)
+
+    \badcode
+       "storageImages": [
+            {
+                "binding": 0,
+                "imageFormat": "rgba8",
+                "name": "inputImage",
+                "set": 0,
+                "type": "image2D"
+            }
+        ]
+    \endcode
+
+    \note Separate image objects are not compatible with some graphics APIs,
+    such as, OpenGL 2.x or OpenGL ES older than 3.1.
+  */
+QVector<QShaderDescription::InOutVariable> QShaderDescription::storageImages() const
+{
+    return d->storageImages;
+}
+
+/*!
+    Returns the local size of a compute shader.
+
+    For example, for a compute shader with the following declaration the
+    function returns { 256, 16, 1}.
+
+    \badcode
+        layout(local_size_x = 256, local_size_y = 16, local_size_z = 1) in;
+    \endcode
+ */
+std::array<uint, 3> QShaderDescription::computeShaderLocalSize() const
+{
+    return d->localSize;
+}
+
+static struct TypeTab {
+    QString k;
+    QShaderDescription::VariableType v;
+} typeTab[] = {
+    { QLatin1String("float"), QShaderDescription::Float },
+    { QLatin1String("vec2"), QShaderDescription::Vec2 },
+    { QLatin1String("vec3"), QShaderDescription::Vec3 },
+    { QLatin1String("vec4"), QShaderDescription::Vec4 },
+    { QLatin1String("mat2"), QShaderDescription::Mat2 },
+    { QLatin1String("mat3"), QShaderDescription::Mat3 },
+    { QLatin1String("mat4"), QShaderDescription::Mat4 },
+
+    { QLatin1String("struct"), QShaderDescription::Struct },
+
+    { QLatin1String("sampler1D"), QShaderDescription::Sampler1D },
+    { QLatin1String("sampler2D"), QShaderDescription::Sampler2D },
+    { QLatin1String("sampler2DMS"), QShaderDescription::Sampler2DMS },
+    { QLatin1String("sampler3D"), QShaderDescription::Sampler3D },
+    { QLatin1String("samplerCube"), QShaderDescription::SamplerCube },
+    { QLatin1String("sampler1DArray"), QShaderDescription::Sampler1DArray },
+    { QLatin1String("sampler2DArray"), QShaderDescription::Sampler2DArray },
+    { QLatin1String("sampler2DMSArray"), QShaderDescription::Sampler2DMSArray },
+    { QLatin1String("sampler3DArray"), QShaderDescription::Sampler3DArray },
+    { QLatin1String("samplerCubeArray"), QShaderDescription::SamplerCubeArray },
+    { QLatin1String("samplerRect"), QShaderDescription::SamplerRect },
+    { QLatin1String("samplerBuffer"), QShaderDescription::SamplerBuffer },
+
+    { QLatin1String("mat2x3"), QShaderDescription::Mat2x3 },
+    { QLatin1String("mat2x4"), QShaderDescription::Mat2x4 },
+    { QLatin1String("mat3x2"), QShaderDescription::Mat3x2 },
+    { QLatin1String("mat3x4"), QShaderDescription::Mat3x4 },
+    { QLatin1String("mat4x2"), QShaderDescription::Mat4x2 },
+    { QLatin1String("mat4x3"), QShaderDescription::Mat4x3 },
+
+    { QLatin1String("int"), QShaderDescription::Int },
+    { QLatin1String("ivec2"), QShaderDescription::Int2 },
+    { QLatin1String("ivec3"), QShaderDescription::Int3 },
+    { QLatin1String("ivec4"), QShaderDescription::Int4 },
+
+    { QLatin1String("uint"), QShaderDescription::Uint },
+    { QLatin1String("uvec2"), QShaderDescription::Uint2 },
+    { QLatin1String("uvec3"), QShaderDescription::Uint3 },
+    { QLatin1String("uvec4"), QShaderDescription::Uint4 },
+
+    { QLatin1String("bool"), QShaderDescription::Bool },
+    { QLatin1String("bvec2"), QShaderDescription::Bool2 },
+    { QLatin1String("bvec3"), QShaderDescription::Bool3 },
+    { QLatin1String("bvec4"), QShaderDescription::Bool4 },
+
+    { QLatin1String("double"), QShaderDescription::Double },
+    { QLatin1String("dvec2"), QShaderDescription::Double2 },
+    { QLatin1String("dvec3"), QShaderDescription::Double3 },
+    { QLatin1String("dvec4"), QShaderDescription::Double4 },
+    { QLatin1String("dmat2"), QShaderDescription::DMat2 },
+    { QLatin1String("dmat3"), QShaderDescription::DMat3 },
+    { QLatin1String("dmat4"), QShaderDescription::DMat4 },
+    { QLatin1String("dmat2x3"), QShaderDescription::DMat2x3 },
+    { QLatin1String("dmat2x4"), QShaderDescription::DMat2x4 },
+    { QLatin1String("dmat3x2"), QShaderDescription::DMat3x2 },
+    { QLatin1String("dmat3x4"), QShaderDescription::DMat3x4 },
+    { QLatin1String("dmat4x2"), QShaderDescription::DMat4x2 },
+    { QLatin1String("dmat4x3"), QShaderDescription::DMat4x3 },
+
+    { QLatin1String("image1D"), QShaderDescription::Image1D },
+    { QLatin1String("image2D"), QShaderDescription::Image2D },
+    { QLatin1String("image2DMS"), QShaderDescription::Image2DMS },
+    { QLatin1String("image3D"), QShaderDescription::Image3D },
+    { QLatin1String("imageCube"), QShaderDescription::ImageCube },
+    { QLatin1String("image1DArray"), QShaderDescription::Image1DArray },
+    { QLatin1String("image2DArray"), QShaderDescription::Image2DArray },
+    { QLatin1String("image2DMSArray"), QShaderDescription::Image2DMSArray },
+    { QLatin1String("image3DArray"), QShaderDescription::Image3DArray },
+    { QLatin1String("imageCubeArray"), QShaderDescription::ImageCubeArray },
+    { QLatin1String("imageRect"), QShaderDescription::ImageRect },
+    { QLatin1String("imageBuffer"), QShaderDescription::ImageBuffer }
+};
+
+static QString typeStr(const QShaderDescription::VariableType &t)
+{
+    for (size_t i = 0; i < sizeof(typeTab) / sizeof(TypeTab); ++i) {
+        if (typeTab[i].v == t)
+            return typeTab[i].k;
+    }
+    return QString();
+}
+
+static QShaderDescription::VariableType mapType(const QString &t)
+{
+    for (size_t i = 0; i < sizeof(typeTab) / sizeof(TypeTab); ++i) {
+        if (typeTab[i].k == t)
+            return typeTab[i].v;
+    }
+    return QShaderDescription::Unknown;
+}
+
+static struct ImageFormatTab {
+    QString k;
+    QShaderDescription::ImageFormat v;
+} imageFormatTab[] {
+    { QLatin1String("unknown"), QShaderDescription::ImageFormatUnknown },
+    { QLatin1String("rgba32f"), QShaderDescription::ImageFormatRgba32f },
+    { QLatin1String("rgba16"), QShaderDescription::ImageFormatRgba16f },
+    { QLatin1String("r32f"), QShaderDescription::ImageFormatR32f },
+    { QLatin1String("rgba8"), QShaderDescription::ImageFormatRgba8 },
+    { QLatin1String("rgba8_snorm"), QShaderDescription::ImageFormatRgba8Snorm },
+    { QLatin1String("rg32f"), QShaderDescription::ImageFormatRg32f },
+    { QLatin1String("rg16f"), QShaderDescription::ImageFormatRg16f },
+    { QLatin1String("r11f_g11f_b10f"), QShaderDescription::ImageFormatR11fG11fB10f },
+    { QLatin1String("r16f"), QShaderDescription::ImageFormatR16f },
+    { QLatin1String("rgba16"), QShaderDescription::ImageFormatRgba16 },
+    { QLatin1String("rgb10_a2"), QShaderDescription::ImageFormatRgb10A2 },
+    { QLatin1String("rg16"), QShaderDescription::ImageFormatRg16 },
+    { QLatin1String("rg8"), QShaderDescription::ImageFormatRg8 },
+    { QLatin1String("r16"), QShaderDescription::ImageFormatR16 },
+    { QLatin1String("r8"), QShaderDescription::ImageFormatR8 },
+    { QLatin1String("rgba16_snorm"), QShaderDescription::ImageFormatRgba16Snorm },
+    { QLatin1String("rg16_snorm"), QShaderDescription::ImageFormatRg16Snorm },
+    { QLatin1String("rg8_snorm"), QShaderDescription::ImageFormatRg8Snorm },
+    { QLatin1String("r16_snorm"), QShaderDescription::ImageFormatR16Snorm },
+    { QLatin1String("r8_snorm"), QShaderDescription::ImageFormatR8Snorm },
+    { QLatin1String("rgba32i"), QShaderDescription::ImageFormatRgba32i },
+    { QLatin1String("rgba16i"), QShaderDescription::ImageFormatRgba16i },
+    { QLatin1String("rgba8i"), QShaderDescription::ImageFormatRgba8i },
+    { QLatin1String("r32i"), QShaderDescription::ImageFormatR32i },
+    { QLatin1String("rg32i"), QShaderDescription::ImageFormatRg32i },
+    { QLatin1String("rg16i"), QShaderDescription::ImageFormatRg16i },
+    { QLatin1String("rg8i"), QShaderDescription::ImageFormatRg8i },
+    { QLatin1String("r16i"), QShaderDescription::ImageFormatR16i },
+    { QLatin1String("r8i"), QShaderDescription::ImageFormatR8i },
+    { QLatin1String("rgba32ui"), QShaderDescription::ImageFormatRgba32ui },
+    { QLatin1String("rgba16ui"), QShaderDescription::ImageFormatRgba16ui },
+    { QLatin1String("rgba8ui"), QShaderDescription::ImageFormatRgba8ui },
+    { QLatin1String("r32ui"), QShaderDescription::ImageFormatR32ui },
+    { QLatin1String("rgb10_a2ui"), QShaderDescription::ImageFormatRgb10a2ui },
+    { QLatin1String("rg32ui"), QShaderDescription::ImageFormatRg32ui },
+    { QLatin1String("rg16ui"), QShaderDescription::ImageFormatRg16ui },
+    { QLatin1String("rg8ui"), QShaderDescription::ImageFormatRg8ui },
+    { QLatin1String("r16ui"), QShaderDescription::ImageFormatR16ui },
+    { QLatin1String("r8ui"), QShaderDescription::ImageFormatR8ui }
+};
+
+static QString imageFormatStr(const QShaderDescription::ImageFormat &f)
+{
+    for (size_t i = 0; i < sizeof(imageFormatTab) / sizeof(ImageFormatTab); ++i) {
+        if (imageFormatTab[i].v == f)
+            return imageFormatTab[i].k;
+    }
+    return QString();
+}
+
+static QShaderDescription::ImageFormat mapImageFormat(const QString &f)
+{
+    for (size_t i = 0; i < sizeof(imageFormatTab) / sizeof(ImageFormatTab); ++i) {
+        if (imageFormatTab[i].k == f)
+            return imageFormatTab[i].v;
+    }
+    return QShaderDescription::ImageFormatUnknown;
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QShaderDescription &sd)
+{
+    const QShaderDescriptionPrivate *d = sd.d;
+    QDebugStateSaver saver(dbg);
+
+    if (sd.isValid()) {
+        dbg.nospace() << "QShaderDescription("
+                      << "inVars " << d->inVars
+                      << " outVars " << d->outVars
+                      << " uniformBlocks " << d->uniformBlocks
+                      << " pcBlocks " << d->pushConstantBlocks
+                      << " storageBlocks " << d->storageBlocks
+                      << " combinedSamplers " << d->combinedImageSamplers
+                      << " images " << d->storageImages
+                      << ')';
+    } else {
+        dbg.nospace() << "QShaderDescription(null)";
+    }
+
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, const QShaderDescription::InOutVariable &var)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "InOutVariable(" << typeStr(var.type) << ' ' << var.name;
+    if (var.location >= 0)
+        dbg.nospace() << " location=" << var.location;
+    if (var.binding >= 0)
+        dbg.nospace() << " binding=" << var.binding;
+    if (var.descriptorSet >= 0)
+        dbg.nospace() << " set=" << var.descriptorSet;
+    if (var.imageFormat != QShaderDescription::ImageFormatUnknown)
+        dbg.nospace() << " imageFormat=" << imageFormatStr(var.imageFormat);
+    if (var.imageFlags)
+        dbg.nospace() << " imageFlags=" << var.imageFlags;
+    dbg.nospace() << ')';
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, const QShaderDescription::BlockVariable &var)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "BlockVariable(" << typeStr(var.type) << ' ' << var.name
+                  << " offset=" << var.offset << " size=" << var.size;
+    if (!var.arrayDims.isEmpty())
+        dbg.nospace() << " array=" << var.arrayDims;
+    if (var.arrayStride)
+        dbg.nospace() << " arrayStride=" << var.arrayStride;
+    if (var.matrixStride)
+        dbg.nospace() << " matrixStride=" << var.matrixStride;
+    if (var.matrixIsRowMajor)
+        dbg.nospace() << " [rowmaj]";
+    if (!var.structMembers.isEmpty())
+        dbg.nospace() << " structMembers=" << var.structMembers;
+    dbg.nospace() << ')';
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, const QShaderDescription::UniformBlock &blk)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "UniformBlock(" << blk.blockName << ' ' << blk.structName << " size=" << blk.size;
+    if (blk.binding >= 0)
+        dbg.nospace() << " binding=" << blk.binding;
+    if (blk.descriptorSet >= 0)
+        dbg.nospace() << " set=" << blk.descriptorSet;
+    dbg.nospace() << ' ' << blk.members << ')';
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, const QShaderDescription::PushConstantBlock &blk)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "PushConstantBlock(" << blk.name << " size=" << blk.size << ' ' << blk.members << ')';
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, const QShaderDescription::StorageBlock &blk)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "StorageBlock(" << blk.blockName << ' ' << blk.instanceName << " knownSize=" << blk.knownSize;
+    if (blk.binding >= 0)
+        dbg.nospace() << " binding=" << blk.binding;
+    if (blk.descriptorSet >= 0)
+        dbg.nospace() << " set=" << blk.descriptorSet;
+    dbg.nospace() << ' ' << blk.members << ')';
+    return dbg;
+}
+#endif
+
+static const QString nameKey = QLatin1String("name");
+static const QString typeKey = QLatin1String("type");
+static const QString locationKey = QLatin1String("location");
+static const QString bindingKey = QLatin1String("binding");
+static const QString setKey = QLatin1String("set");
+static const QString imageFormatKey = QLatin1String("imageFormat");
+static const QString imageFlagsKey = QLatin1String("imageFlags");
+static const QString offsetKey = QLatin1String("offset");
+static const QString arrayDimsKey = QLatin1String("arrayDims");
+static const QString arrayStrideKey = QLatin1String("arrayStride");
+static const QString matrixStrideKey = QLatin1String("matrixStride");
+static const QString matrixRowMajorKey = QLatin1String("matrixRowMajor");
+static const QString structMembersKey = QLatin1String("structMembers");
+static const QString membersKey = QLatin1String("members");
+static const QString inputsKey = QLatin1String("inputs");
+static const QString outputsKey = QLatin1String("outputs");
+static const QString uniformBlocksKey = QLatin1String("uniformBlocks");
+static const QString blockNameKey = QLatin1String("blockName");
+static const QString structNameKey = QLatin1String("structName");
+static const QString instanceNameKey = QLatin1String("instanceName");
+static const QString sizeKey = QLatin1String("size");
+static const QString knownSizeKey = QLatin1String("knownSize");
+static const QString pushConstantBlocksKey = QLatin1String("pushConstantBlocks");
+static const QString storageBlocksKey = QLatin1String("storageBlocks");
+static const QString combinedImageSamplersKey = QLatin1String("combinedImageSamplers");
+static const QString storageImagesKey = QLatin1String("storageImages");
+static const QString localSizeKey = QLatin1String("localSize");
+
+static void addDeco(QJsonObject *obj, const QShaderDescription::InOutVariable &v)
+{
+    if (v.location >= 0)
+        (*obj)[locationKey] = v.location;
+    if (v.binding >= 0)
+        (*obj)[bindingKey] = v.binding;
+    if (v.descriptorSet >= 0)
+        (*obj)[setKey] = v.descriptorSet;
+    if (v.imageFormat != QShaderDescription::ImageFormatUnknown)
+        (*obj)[imageFormatKey] = imageFormatStr(v.imageFormat);
+    if (v.imageFlags)
+        (*obj)[imageFlagsKey] = int(v.imageFlags);
+}
+
+static QJsonObject inOutObject(const QShaderDescription::InOutVariable &v)
+{
+    QJsonObject obj;
+    obj[nameKey] = v.name;
+    obj[typeKey] = typeStr(v.type);
+    addDeco(&obj, v);
+    return obj;
+}
+
+static QJsonObject blockMemberObject(const QShaderDescription::BlockVariable &v)
+{
+    QJsonObject obj;
+    obj[nameKey] = v.name;
+    obj[typeKey] = typeStr(v.type);
+    obj[offsetKey] = v.offset;
+    obj[sizeKey] = v.size;
+    if (!v.arrayDims.isEmpty()) {
+        QJsonArray dimArr;
+        for (int dim : v.arrayDims)
+            dimArr.append(dim);
+        obj[arrayDimsKey] = dimArr;
+    }
+    if (v.arrayStride)
+        obj[arrayStrideKey] = v.arrayStride;
+    if (v.matrixStride)
+        obj[matrixStrideKey] = v.matrixStride;
+    if (v.matrixIsRowMajor)
+        obj[matrixRowMajorKey] = true;
+    if (!v.structMembers.isEmpty()) {
+        QJsonArray arr;
+        for (const QShaderDescription::BlockVariable &sv : v.structMembers)
+            arr.append(blockMemberObject(sv));
+        obj[structMembersKey] = arr;
+    }
+    return obj;
+}
+
+QJsonDocument QShaderDescriptionPrivate::makeDoc()
+{
+    QJsonObject root;
+
+    QJsonArray jinputs;
+    for (const QShaderDescription::InOutVariable &v : qAsConst(inVars))
+        jinputs.append(inOutObject(v));
+    if (!jinputs.isEmpty())
+        root[inputsKey] = jinputs;
+
+    QJsonArray joutputs;
+    for (const QShaderDescription::InOutVariable &v : qAsConst(outVars))
+        joutputs.append(inOutObject(v));
+    if (!joutputs.isEmpty())
+        root[outputsKey] = joutputs;
+
+    QJsonArray juniformBlocks;
+    for (const QShaderDescription::UniformBlock &b : uniformBlocks) {
+        QJsonObject juniformBlock;
+        juniformBlock[blockNameKey] = b.blockName;
+        juniformBlock[structNameKey] = b.structName;
+        juniformBlock[sizeKey] = b.size;
+        if (b.binding >= 0)
+            juniformBlock[bindingKey] = b.binding;
+        if (b.descriptorSet >= 0)
+            juniformBlock[setKey] = b.descriptorSet;
+        QJsonArray members;
+        for (const QShaderDescription::BlockVariable &v : b.members)
+            members.append(blockMemberObject(v));
+        juniformBlock[membersKey] = members;
+        juniformBlocks.append(juniformBlock);
+    }
+    if (!juniformBlocks.isEmpty())
+        root[uniformBlocksKey] = juniformBlocks;
+
+    QJsonArray jpushConstantBlocks;
+    for (const QShaderDescription::PushConstantBlock &b : pushConstantBlocks) {
+        QJsonObject jpushConstantBlock;
+        jpushConstantBlock[nameKey] = b.name;
+        jpushConstantBlock[sizeKey] = b.size;
+        QJsonArray members;
+        for (const QShaderDescription::BlockVariable &v : b.members)
+            members.append(blockMemberObject(v));
+        jpushConstantBlock[membersKey] = members;
+        jpushConstantBlocks.append(jpushConstantBlock);
+    }
+    if (!jpushConstantBlocks.isEmpty())
+        root[pushConstantBlocksKey] = jpushConstantBlocks;
+
+    QJsonArray jstorageBlocks;
+    for (const QShaderDescription::StorageBlock &b : storageBlocks) {
+        QJsonObject jstorageBlock;
+        jstorageBlock[blockNameKey] = b.blockName;
+        jstorageBlock[instanceNameKey] = b.instanceName;
+        jstorageBlock[knownSizeKey] = b.knownSize;
+        if (b.binding >= 0)
+            jstorageBlock[bindingKey] = b.binding;
+        if (b.descriptorSet >= 0)
+            jstorageBlock[setKey] = b.descriptorSet;
+        QJsonArray members;
+        for (const QShaderDescription::BlockVariable &v : b.members)
+            members.append(blockMemberObject(v));
+        jstorageBlock[membersKey] = members;
+        jstorageBlocks.append(jstorageBlock);
+    }
+    if (!jstorageBlocks.isEmpty())
+        root[storageBlocksKey] = jstorageBlocks;
+
+    QJsonArray jcombinedSamplers;
+    for (const QShaderDescription::InOutVariable &v : qAsConst(combinedImageSamplers)) {
+        QJsonObject sampler;
+        sampler[nameKey] = v.name;
+        sampler[typeKey] = typeStr(v.type);
+        addDeco(&sampler, v);
+        jcombinedSamplers.append(sampler);
+    }
+    if (!jcombinedSamplers.isEmpty())
+        root[combinedImageSamplersKey] = jcombinedSamplers;
+
+    QJsonArray jstorageImages;
+    for (const QShaderDescription::InOutVariable &v : qAsConst(storageImages)) {
+        QJsonObject image;
+        image[nameKey] = v.name;
+        image[typeKey] = typeStr(v.type);
+        addDeco(&image, v);
+        jstorageImages.append(image);
+    }
+    if (!jstorageImages.isEmpty())
+        root[storageImagesKey] = jstorageImages;
+
+    QJsonArray jlocalSize;
+    for (int i = 0; i < 3; ++i)
+        jlocalSize.append(QJsonValue(int(localSize[i])));
+    root[localSizeKey] = jlocalSize;
+
+    return QJsonDocument(root);
+}
+
+static QShaderDescription::InOutVariable inOutVar(const QJsonObject &obj)
+{
+    QShaderDescription::InOutVariable var;
+    var.name = obj[nameKey].toString();
+    var.type = mapType(obj[typeKey].toString());
+    if (obj.contains(locationKey))
+        var.location = obj[locationKey].toInt();
+    if (obj.contains(bindingKey))
+        var.binding = obj[bindingKey].toInt();
+    if (obj.contains(setKey))
+        var.descriptorSet = obj[setKey].toInt();
+    if (obj.contains(imageFormatKey))
+        var.imageFormat = mapImageFormat(obj[imageFormatKey].toString());
+    if (obj.contains(imageFlagsKey))
+        var.imageFlags = QShaderDescription::ImageFlags(obj[imageFlagsKey].toInt());
+    return var;
+}
+
+static QShaderDescription::BlockVariable blockVar(const QJsonObject &obj)
+{
+    QShaderDescription::BlockVariable var;
+    var.name = obj[nameKey].toString();
+    var.type = mapType(obj[typeKey].toString());
+    var.offset = obj[offsetKey].toInt();
+    var.size = obj[sizeKey].toInt();
+    if (obj.contains(arrayDimsKey)) {
+        QJsonArray dimArr = obj[arrayDimsKey].toArray();
+        for (int i = 0; i < dimArr.count(); ++i)
+            var.arrayDims.append(dimArr.at(i).toInt());
+    }
+    if (obj.contains(arrayStrideKey))
+        var.arrayStride = obj[arrayStrideKey].toInt();
+    if (obj.contains(matrixStrideKey))
+        var.matrixStride = obj[matrixStrideKey].toInt();
+    if (obj.contains(matrixRowMajorKey))
+        var.matrixIsRowMajor = obj[matrixRowMajorKey].toBool();
+    if (obj.contains(structMembersKey)) {
+        QJsonArray arr = obj[structMembersKey].toArray();
+        for (int i = 0; i < arr.count(); ++i)
+            var.structMembers.append(blockVar(arr.at(i).toObject()));
+    }
+    return var;
+}
+
+void QShaderDescriptionPrivate::loadDoc(const QJsonDocument &doc)
+{
+    if (doc.isNull()) {
+        qWarning("QShaderDescription: JSON document is empty");
+        return;
+    }
+
+    Q_ASSERT(ref.loadRelaxed() == 1); // must be detached
+
+    inVars.clear();
+    outVars.clear();
+    uniformBlocks.clear();
+    pushConstantBlocks.clear();
+    storageBlocks.clear();
+    combinedImageSamplers.clear();
+    storageImages.clear();
+
+    QJsonObject root = doc.object();
+
+    if (root.contains(inputsKey)) {
+        QJsonArray inputs = root[inputsKey].toArray();
+        for (int i = 0; i < inputs.count(); ++i)
+            inVars.append(inOutVar(inputs[i].toObject()));
+    }
+
+    if (root.contains(outputsKey)) {
+        QJsonArray outputs = root[outputsKey].toArray();
+        for (int i = 0; i < outputs.count(); ++i)
+            outVars.append(inOutVar(outputs[i].toObject()));
+    }
+
+    if (root.contains(uniformBlocksKey)) {
+        QJsonArray ubs = root[uniformBlocksKey].toArray();
+        for (int i = 0; i < ubs.count(); ++i) {
+            QJsonObject ubObj = ubs[i].toObject();
+            QShaderDescription::UniformBlock ub;
+            ub.blockName = ubObj[blockNameKey].toString();
+            ub.structName = ubObj[structNameKey].toString();
+            ub.size = ubObj[sizeKey].toInt();
+            if (ubObj.contains(bindingKey))
+                ub.binding = ubObj[bindingKey].toInt();
+            if (ubObj.contains(setKey))
+                ub.descriptorSet = ubObj[setKey].toInt();
+            QJsonArray members = ubObj[membersKey].toArray();
+            for (const QJsonValue &member : members)
+                ub.members.append(blockVar(member.toObject()));
+            uniformBlocks.append(ub);
+        }
+    }
+
+    if (root.contains(pushConstantBlocksKey)) {
+        QJsonArray pcs = root[pushConstantBlocksKey].toArray();
+        for (int i = 0; i < pcs.count(); ++i) {
+            QJsonObject pcObj = pcs[i].toObject();
+            QShaderDescription::PushConstantBlock pc;
+            pc.name = pcObj[nameKey].toString();
+            pc.size = pcObj[sizeKey].toInt();
+            QJsonArray members = pcObj[membersKey].toArray();
+            for (const QJsonValue &member : members)
+                pc.members.append(blockVar(member.toObject()));
+            pushConstantBlocks.append(pc);
+        }
+    }
+
+    if (root.contains(storageBlocksKey)) {
+        QJsonArray ubs = root[storageBlocksKey].toArray();
+        for (int i = 0; i < ubs.count(); ++i) {
+            QJsonObject sbObj = ubs[i].toObject();
+            QShaderDescription::StorageBlock sb;
+            sb.blockName = sbObj[blockNameKey].toString();
+            sb.instanceName = sbObj[instanceNameKey].toString();
+            sb.knownSize = sbObj[knownSizeKey].toInt();
+            if (sbObj.contains(bindingKey))
+                sb.binding = sbObj[bindingKey].toInt();
+            if (sbObj.contains(setKey))
+                sb.descriptorSet = sbObj[setKey].toInt();
+            QJsonArray members = sbObj[membersKey].toArray();
+            for (const QJsonValue &member : members)
+                sb.members.append(blockVar(member.toObject()));
+            storageBlocks.append(sb);
+        }
+    }
+
+    if (root.contains(combinedImageSamplersKey)) {
+        QJsonArray samplers = root[combinedImageSamplersKey].toArray();
+        for (int i = 0; i < samplers.count(); ++i)
+            combinedImageSamplers.append(inOutVar(samplers[i].toObject()));
+    }
+
+    if (root.contains(storageImagesKey)) {
+        QJsonArray images = root[storageImagesKey].toArray();
+        for (int i = 0; i < images.count(); ++i)
+            storageImages.append(inOutVar(images[i].toObject()));
+    }
+
+    if (root.contains(localSizeKey)) {
+        QJsonArray localSizeArr = root[localSizeKey].toArray();
+        if (localSizeArr.count() == 3) {
+            for (int i = 0; i < 3; ++i)
+                localSize[i] = localSizeArr[i].toInt();
+        }
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/rhi/qshaderdescription_p.h b/src/gui/rhi/qshaderdescription_p.h
new file mode 100644
index 0000000000..5a63b998cd
--- /dev/null
+++ b/src/gui/rhi/qshaderdescription_p.h
@@ -0,0 +1,281 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSHADERDESCRIPTION_H
+#define QSHADERDESCRIPTION_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of a number of Qt sources files.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/qtguiglobal.h>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+#include <array>
+
+QT_BEGIN_NAMESPACE
+
+struct QShaderDescriptionPrivate;
+
+class Q_GUI_EXPORT QShaderDescription
+{
+public:
+    QShaderDescription();
+    QShaderDescription(const QShaderDescription &other);
+    QShaderDescription &operator=(const QShaderDescription &other);
+    ~QShaderDescription();
+    void detach();
+
+    bool isValid() const;
+
+    QByteArray toBinaryJson() const;
+    QByteArray toJson() const;
+
+    static QShaderDescription fromBinaryJson(const QByteArray &data);
+
+    enum VariableType {
+        Unknown = 0,
+
+        // do not reorder
+        Float,
+        Vec2,
+        Vec3,
+        Vec4,
+        Mat2,
+        Mat2x3,
+        Mat2x4,
+        Mat3,
+        Mat3x2,
+        Mat3x4,
+        Mat4,
+        Mat4x2,
+        Mat4x3,
+
+        Int,
+        Int2,
+        Int3,
+        Int4,
+
+        Uint,
+        Uint2,
+        Uint3,
+        Uint4,
+
+        Bool,
+        Bool2,
+        Bool3,
+        Bool4,
+
+        Double,
+        Double2,
+        Double3,
+        Double4,
+        DMat2,
+        DMat2x3,
+        DMat2x4,
+        DMat3,
+        DMat3x2,
+        DMat3x4,
+        DMat4,
+        DMat4x2,
+        DMat4x3,
+
+        Sampler1D,
+        Sampler2D,
+        Sampler2DMS,
+        Sampler3D,
+        SamplerCube,
+        Sampler1DArray,
+        Sampler2DArray,
+        Sampler2DMSArray,
+        Sampler3DArray,
+        SamplerCubeArray,
+        SamplerRect,
+        SamplerBuffer,
+
+        Image1D,
+        Image2D,
+        Image2DMS,
+        Image3D,
+        ImageCube,
+        Image1DArray,
+        Image2DArray,
+        Image2DMSArray,
+        Image3DArray,
+        ImageCubeArray,
+        ImageRect,
+        ImageBuffer,
+
+        Struct
+    };
+
+    enum ImageFormat {
+        // must match SPIR-V's ImageFormat
+        ImageFormatUnknown = 0,
+        ImageFormatRgba32f = 1,
+        ImageFormatRgba16f = 2,
+        ImageFormatR32f = 3,
+        ImageFormatRgba8 = 4,
+        ImageFormatRgba8Snorm = 5,
+        ImageFormatRg32f = 6,
+        ImageFormatRg16f = 7,
+        ImageFormatR11fG11fB10f = 8,
+        ImageFormatR16f = 9,
+        ImageFormatRgba16 = 10,
+        ImageFormatRgb10A2 = 11,
+        ImageFormatRg16 = 12,
+        ImageFormatRg8 = 13,
+        ImageFormatR16 = 14,
+        ImageFormatR8 = 15,
+        ImageFormatRgba16Snorm = 16,
+        ImageFormatRg16Snorm = 17,
+        ImageFormatRg8Snorm = 18,
+        ImageFormatR16Snorm = 19,
+        ImageFormatR8Snorm = 20,
+        ImageFormatRgba32i = 21,
+        ImageFormatRgba16i = 22,
+        ImageFormatRgba8i = 23,
+        ImageFormatR32i = 24,
+        ImageFormatRg32i = 25,
+        ImageFormatRg16i = 26,
+        ImageFormatRg8i = 27,
+        ImageFormatR16i = 28,
+        ImageFormatR8i = 29,
+        ImageFormatRgba32ui = 30,
+        ImageFormatRgba16ui = 31,
+        ImageFormatRgba8ui = 32,
+        ImageFormatR32ui = 33,
+        ImageFormatRgb10a2ui = 34,
+        ImageFormatRg32ui = 35,
+        ImageFormatRg16ui = 36,
+        ImageFormatRg8ui = 37,
+        ImageFormatR16ui = 38,
+        ImageFormatR8ui = 39
+    };
+
+    enum ImageFlag {
+        ReadOnlyImage = 1 << 0,
+        WriteOnlyImage = 1 << 1
+    };
+    Q_DECLARE_FLAGS(ImageFlags, ImageFlag)
+
+    // Optional data (like decorations) usually default to an otherwise invalid value (-1 or 0). This is intentional.
+
+    struct InOutVariable {
+        QString name;
+        VariableType type = Unknown;
+        int location = -1;
+        int binding = -1;
+        int descriptorSet = -1;
+        ImageFormat imageFormat = ImageFormatUnknown;
+        ImageFlags imageFlags;
+    };
+
+    struct BlockVariable {
+        QString name;
+        VariableType type = Unknown;
+        int offset = 0;
+        int size = 0;
+        QVector<int> arrayDims;
+        int arrayStride = 0;
+        int matrixStride = 0;
+        bool matrixIsRowMajor = false;
+        QVector<BlockVariable> structMembers;
+    };
+
+    struct UniformBlock {
+        QString blockName;
+        QString structName; // instanceName
+        int size = 0;
+        int binding = -1;
+        int descriptorSet = -1;
+        QVector<BlockVariable> members;
+    };
+
+    struct PushConstantBlock {
+        QString name;
+        int size = 0;
+        QVector<BlockVariable> members;
+    };
+
+    struct StorageBlock {
+        QString blockName;
+        QString instanceName;
+        int knownSize = 0;
+        int binding = -1;
+        int descriptorSet = -1;
+        QVector<BlockVariable> members;
+    };
+
+    QVector<InOutVariable> inputVariables() const;
+    QVector<InOutVariable> outputVariables() const;
+    QVector<UniformBlock> uniformBlocks() const;
+    QVector<PushConstantBlock> pushConstantBlocks() const;
+    QVector<StorageBlock> storageBlocks() const;
+    QVector<InOutVariable> combinedImageSamplers() const;
+    QVector<InOutVariable> storageImages() const;
+
+    std::array<uint, 3> computeShaderLocalSize() const;
+
+private:
+    QShaderDescriptionPrivate *d;
+    friend struct QShaderDescriptionPrivate;
+#ifndef QT_NO_DEBUG_STREAM
+    friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QShaderDescription &);
+#endif
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QShaderDescription::ImageFlags)
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QShaderDescription &);
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QShaderDescription::InOutVariable &);
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QShaderDescription::BlockVariable &);
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QShaderDescription::UniformBlock &);
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QShaderDescription::PushConstantBlock &);
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QShaderDescription::StorageBlock &);
+#endif
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/qshaderdescription_p_p.h b/src/gui/rhi/qshaderdescription_p_p.h
new file mode 100644
index 0000000000..1caee24984
--- /dev/null
+++ b/src/gui/rhi/qshaderdescription_p_p.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Gui module
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSHADERDESCRIPTION_P_H
+#define QSHADERDESCRIPTION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of a number of Qt sources files.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qshaderdescription_p.h"
+#include <QtCore/QVector>
+#include <QtCore/QAtomicInt>
+#include <QtCore/QJsonDocument>
+
+QT_BEGIN_NAMESPACE
+
+struct Q_GUI_EXPORT QShaderDescriptionPrivate
+{
+    QShaderDescriptionPrivate()
+        : ref(1)
+    {
+        localSize[0] = localSize[1] = localSize[2] = 0;
+    }
+
+    QShaderDescriptionPrivate(const QShaderDescriptionPrivate *other)
+        : ref(1),
+          inVars(other->inVars),
+          outVars(other->outVars),
+          uniformBlocks(other->uniformBlocks),
+          pushConstantBlocks(other->pushConstantBlocks),
+          storageBlocks(other->storageBlocks),
+          combinedImageSamplers(other->combinedImageSamplers),
+          storageImages(other->storageImages),
+          localSize(other->localSize)
+    {
+    }
+
+    static QShaderDescriptionPrivate *get(QShaderDescription *desc) { return desc->d; }
+    static const QShaderDescriptionPrivate *get(const QShaderDescription *desc) { return desc->d; }
+
+    QJsonDocument makeDoc();
+    void loadDoc(const QJsonDocument &doc);
+
+    QAtomicInt ref;
+    QVector<QShaderDescription::InOutVariable> inVars;
+    QVector<QShaderDescription::InOutVariable> outVars;
+    QVector<QShaderDescription::UniformBlock> uniformBlocks;
+    QVector<QShaderDescription::PushConstantBlock> pushConstantBlocks;
+    QVector<QShaderDescription::StorageBlock> storageBlocks;
+    QVector<QShaderDescription::InOutVariable> combinedImageSamplers;
+    QVector<QShaderDescription::InOutVariable> storageImages;
+    std::array<uint, 3> localSize;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri
new file mode 100644
index 0000000000..4297a5602b
--- /dev/null
+++ b/src/gui/rhi/rhi.pri
@@ -0,0 +1,57 @@
+HEADERS += \
+    rhi/qrhi_p.h \
+    rhi/qrhi_p_p.h \
+    rhi/qrhiprofiler_p.h \
+    rhi/qrhiprofiler_p_p.h \
+    rhi/qrhinull_p.h \
+    rhi/qrhinull_p_p.h \
+    rhi/qshader_p.h \
+    rhi/qshader_p_p.h \
+    rhi/qshaderdescription_p.h \
+    rhi/qshaderdescription_p_p.h
+
+SOURCES += \
+    rhi/qrhi.cpp \
+    rhi/qrhiprofiler.cpp \
+    rhi/qrhinull.cpp \
+    rhi/qshaderdescription.cpp \
+    rhi/qshader.cpp
+
+qtConfig(opengl) {
+    HEADERS += \
+        rhi/qrhigles2_p.h \
+        rhi/qrhigles2_p_p.h
+    SOURCES += \
+        rhi/qrhigles2.cpp
+}
+
+qtConfig(vulkan) {
+    HEADERS += \
+        rhi/qrhivulkan_p.h \
+        rhi/qrhivulkan_p_p.h
+    SOURCES += \
+        rhi/qrhivulkan.cpp
+}
+
+win32 {
+    HEADERS += \
+        rhi/qrhid3d11_p.h \
+        rhi/qrhid3d11_p_p.h
+    SOURCES += \
+        rhi/qrhid3d11.cpp
+
+    LIBS += -ld3d11 -ldxgi -ldxguid
+}
+
+# darwin {
+macos {
+    HEADERS += \
+        rhi/qrhimetal_p.h \
+        rhi/qrhimetal_p_p.h
+    SOURCES += \
+        rhi/qrhimetal.mm
+
+    LIBS += -framework AppKit -framework Metal
+}
+
+include($$PWD/../../3rdparty/VulkanMemoryAllocator.pri)
diff --git a/src/gui/rhi/tdr.hlsl b/src/gui/rhi/tdr.hlsl
new file mode 100644
index 0000000000..f79de91c4a
--- /dev/null
+++ b/src/gui/rhi/tdr.hlsl
@@ -0,0 +1,9 @@
+RWBuffer<uint> uav;
+cbuffer ConstantBuffer { uint zero; }
+
+[numthreads(256, 1, 1)]
+void killDeviceByTimingOut(uint3 id: SV_DispatchThreadID)
+{
+    while (zero == 0)
+        uav[id.x] = zero;
+}
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 2278378613..8b8f3e28ac 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -41,6 +41,7 @@
 #include <qtextformat.h>
 #include "qtextdocument_p.h"
 #include "qtextengine_p.h"
+#include "qtextlist.h"
 
 #include "qabstracttextdocumentlayout_p.h"
 
@@ -650,6 +651,36 @@ QTextFormat QAbstractTextDocumentLayout::formatAt(const QPointF &pos) const
 }
 
 /*!
+    \since 5.14
+
+    Returns the block (probably a list item) whose \l{QTextBlockFormat::marker()}{marker}
+    is found at the given position \a pos.
+*/
+QTextBlock QAbstractTextDocumentLayout::blockWithMarkerAt(const QPointF &pos) const
+{
+    QTextBlock block = document()->firstBlock();
+    while (block.isValid()) {
+        if (block.blockFormat().marker() != QTextBlockFormat::MarkerType::NoMarker) {
+            QRectF blockBr = blockBoundingRect(block);
+            QTextBlockFormat blockFmt = block.blockFormat();
+            QFontMetrics fm(block.charFormat().font());
+            qreal totalIndent = blockFmt.indent() + blockFmt.leftMargin() + blockFmt.textIndent();
+            if (block.textList())
+                totalIndent += block.textList()->format().indent() * 40;
+            QRectF adjustedBr = blockBr.adjusted(totalIndent - fm.height(), 0, totalIndent - blockBr.width(), fm.height() - blockBr.height());
+            if (adjustedBr.contains(pos)) {
+                //qDebug() << "hit block" << block.text() << blockBr << adjustedBr << "marker" << block.blockFormat().marker()
+                //         << "font" << block.charFormat().font() << "adj" << lineHeight << totalIndent;
+                if (block.blockFormat().hasProperty(QTextFormat::BlockMarker))
+                    return block;
+            }
+        }
+        block = block.next();
+    }
+    return QTextBlock();
+}
+
+/*!
     \fn QRectF QAbstractTextDocumentLayout::frameBoundingRect(QTextFrame *frame) const
 
     Returns the bounding rectangle of \a frame.
diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h
index 3371401420..397dcd37d4 100644
--- a/src/gui/text/qabstracttextdocumentlayout.h
+++ b/src/gui/text/qabstracttextdocumentlayout.h
@@ -87,6 +87,7 @@ public:
     QString anchorAt(const QPointF& pos) const;
     QString imageAt(const QPointF &pos) const;
     QTextFormat formatAt(const QPointF &pos) const;
+    QTextBlock blockWithMarkerAt(const QPointF &pos) const;
 
     virtual int pageCount() const = 0;
     virtual QSizeF documentSize() const = 0;
diff --git a/src/gui/text/qabstracttextdocumentlayout_p.h b/src/gui/text/qabstracttextdocumentlayout_p.h
index 191c463dc6..d631ce3197 100644
--- a/src/gui/text/qabstracttextdocumentlayout_p.h
+++ b/src/gui/text/qabstracttextdocumentlayout_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 struct QTextObjectHandler
 {
-    QTextObjectHandler() : iface(0) {}
+    QTextObjectHandler() : iface(nullptr) {}
     QTextObjectInterface *iface;
     QPointer<QObject> component;
 };
@@ -71,12 +71,12 @@ public:
     Q_DECLARE_PUBLIC(QAbstractTextDocumentLayout)
 
     inline QAbstractTextDocumentLayoutPrivate()
-        : paintDevice(0) {}
+        : paintDevice(nullptr) {}
     ~QAbstractTextDocumentLayoutPrivate();
 
     inline void setDocument(QTextDocument *doc) {
         document = doc;
-        docPrivate = 0;
+        docPrivate = nullptr;
         if (doc)
             docPrivate = doc->docHandle();
     }
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index dc7e128bcd..ce7c7610c1 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -67,6 +67,7 @@ struct QCssKnownValue
 static const QCssKnownValue properties[NumProperties - 1] = {
     { "-qt-background-role", QtBackgroundRole },
     { "-qt-block-indent", QtBlockIndent },
+    { "-qt-fg-texture-cachekey", QtForegroundTextureCacheKey },
     { "-qt-line-height-type", QtLineHeightType },
     { "-qt-list-indent", QtListIndent },
     { "-qt-list-number-prefix", QtListNumberPrefix },
@@ -91,6 +92,7 @@ static const QCssKnownValue properties[NumProperties - 1] = {
     { "border-bottom-right-radius", BorderBottomRightRadius },
     { "border-bottom-style", BorderBottomStyle },
     { "border-bottom-width", BorderBottomWidth },
+    { "border-collapse", BorderCollapse },
     { "border-color", BorderColor },
     { "border-image", BorderImage },
     { "border-left", BorderLeft },
@@ -221,6 +223,7 @@ static const QCssKnownValue values[NumKnownValues - 1] = {
     { "outset", Value_Outset },
     { "overline", Value_Overline },
     { "pre", Value_Pre },
+    { "pre-line", Value_PreLine },
     { "pre-wrap", Value_PreWrap },
     { "ridge", Value_Ridge },
     { "right", Value_Right },
@@ -247,10 +250,10 @@ static const QCssKnownValue values[NumKnownValues - 1] = {
 };
 
 //Map id to strings as they appears in the 'values' array above
-static const short indexOfId[NumKnownValues] = { 0, 41, 48, 42, 49, 54, 35, 26, 70, 71, 25, 43, 5, 63, 47,
-    29, 58, 59, 27, 51, 61, 6, 10, 39, 56, 19, 13, 17, 18, 20, 21, 50, 24, 46, 67, 37, 3, 2, 40, 62, 16,
-    11, 57, 14, 32, 64, 33, 65, 55, 66, 34, 69, 8, 28, 38, 12, 36, 60, 7, 9, 4, 68, 53, 22, 23, 30, 31,
-    1, 15, 0, 52, 45, 44 };
+static const short indexOfId[NumKnownValues] = { 0, 41, 48, 42, 49, 50, 55, 35, 26, 71, 72, 25, 43, 5, 64, 48,
+    29, 59, 60, 27, 52, 62, 6, 10, 39, 56, 19, 13, 17, 18, 20, 21, 51, 24, 46, 68, 37, 3, 2, 40, 63, 16,
+    11, 58, 14, 32, 65, 33, 66, 56, 67, 34, 70, 8, 28, 38, 12, 36, 61, 7, 9, 4, 69, 54, 22, 23, 30, 31,
+    1, 15, 0, 53, 45, 44 };
 
 QString Value::toString() const
 {
@@ -609,11 +612,7 @@ bool ValueExtractor::extractBorder(int *borders, QBrush *colors, BorderStyle *st
         case BorderRightStyle: styles[RightEdge] = decl.styleValue(); break;
         case BorderStyles:  decl.styleValues(styles); break;
 
-#ifndef QT_OS_ANDROID_GCC_48_WORKAROUND
         case BorderTopLeftRadius: radii[0] = sizeValue(decl); break;
-#else
-        case BorderTopLeftRadius: new(radii)QSize(sizeValue(decl)); break;
-#endif
         case BorderTopRightRadius: radii[1] = sizeValue(decl); break;
         case BorderBottomLeftRadius: radii[2] = sizeValue(decl); break;
         case BorderBottomRightRadius: radii[3] = sizeValue(decl); break;
@@ -1730,6 +1729,14 @@ void Declaration::borderImageValue(QString *image, int *cuts,
         *h = *v;
 }
 
+bool Declaration::borderCollapseValue() const
+{
+    if (d->values.count() != 1)
+        return false;
+    else
+        return d->values.at(0).toString() == QLatin1String("collapse");
+}
+
 QIcon Declaration::iconValue() const
 {
     if (d->parsed.isValid())
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 860bbe382a..ab85e76cf3 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -122,6 +122,7 @@ enum Property {
     BorderRight,
     BorderTop,
     BorderBottom,
+    BorderCollapse,
     Padding,
     PaddingLeft,
     PaddingRight,
@@ -196,6 +197,7 @@ enum Property {
     LineHeight,
     QtLineHeightType,
     FontKerning,
+    QtForegroundTextureCacheKey,
     NumProperties
 };
 
@@ -204,6 +206,7 @@ enum KnownValue {
     Value_Normal,
     Value_Pre,
     Value_NoWrap,
+    Value_PreLine,
     Value_PreWrap,
     Value_Small,
     Value_Medium,
@@ -467,8 +470,8 @@ struct Q_GUI_EXPORT Declaration
     Attachment attachmentValue() const;
     int  styleFeaturesValue() const;
 
-    bool intValue(int *i, const char *unit = 0) const;
-    bool realValue(qreal *r, const char *unit = 0) const;
+    bool intValue(int *i, const char *unit = nullptr) const;
+    bool realValue(qreal *r, const char *unit = nullptr) const;
 
     QSize sizeValue() const;
     QRect rectValue() const;
@@ -476,6 +479,7 @@ struct Q_GUI_EXPORT Declaration
     QIcon iconValue() const;
 
     void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const;
+    bool borderCollapseValue() const;
 };
 QT_CSS_DECLARE_TYPEINFO(Declaration, Q_MOVABLE_TYPE)
 
@@ -584,7 +588,7 @@ struct Q_GUI_EXPORT Selector
 {
     QVector<BasicSelector> basicSelectors;
     int specificity() const;
-    quint64 pseudoClass(quint64 *negated = 0) const;
+    quint64 pseudoClass(quint64 *negated = nullptr) const;
     QString pseudoElement() const;
 };
 QT_CSS_DECLARE_TYPEINFO(Selector, Q_MOVABLE_TYPE)
@@ -656,7 +660,7 @@ public:
     };
 
     QVector<StyleRule> styleRulesForNode(NodePtr node);
-    QVector<Declaration> declarationsForNode(NodePtr node, const char *extraPseudo = 0);
+    QVector<Declaration> declarationsForNode(NodePtr node, const char *extraPseudo = nullptr);
 
     virtual bool nodeNameEquals(NodePtr node, const QString& nodeName) const;
     virtual QString attribute(NodePtr node, const QString &name) const = 0;
@@ -744,7 +748,7 @@ QT_CSS_DECLARE_TYPEINFO(Symbol, Q_MOVABLE_TYPE)
 class Q_GUI_EXPORT Scanner
 {
 public:
-    static QString preprocess(const QString &input, bool *hasEscapeSequences = 0);
+    static QString preprocess(const QString &input, bool *hasEscapeSequences = nullptr);
     static void scan(const QString &preprocessedInput, QVector<Symbol> *symbols);
 };
 
@@ -845,7 +849,7 @@ struct Q_GUI_EXPORT ValueExtractor
     bool extractGeometry(int *w, int *h, int *minw, int *minh, int *maxw, int *maxh);
     bool extractPosition(int *l, int *t, int *r, int *b, QCss::Origin *, Qt::Alignment *,
                          QCss::PositionMode *, Qt::Alignment *);
-    bool extractBox(int *margins, int *paddings, int *spacing = 0);
+    bool extractBox(int *margins, int *paddings, int *spacing = nullptr);
     bool extractBorder(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii);
     bool extractOutline(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii, int *offsets);
     bool extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg);
diff --git a/src/gui/text/qdistancefield.cpp b/src/gui/text/qdistancefield.cpp
index 75e2e4e745..d8a971c7b7 100644
--- a/src/gui/text/qdistancefield.cpp
+++ b/src/gui/text/qdistancefield.cpp
@@ -782,7 +782,7 @@ bool qt_fontHasNarrowOutlines(QFontEngine *fontEngine)
     if (glyph != 0)
         im = fe->alphaMapForGlyph(glyph, QFixed(), QTransform());
 
-    Q_ASSERT(fe->ref.load() == 0);
+    Q_ASSERT(fe->ref.loadRelaxed() == 0);
     delete fe;
 
     return imageHasNarrowOutlines(im);
diff --git a/src/gui/text/qdistancefield_p.h b/src/gui/text/qdistancefield_p.h
index c0873cedab..823bfaf1c6 100644
--- a/src/gui/text/qdistancefield_p.h
+++ b/src/gui/text/qdistancefield_p.h
@@ -72,7 +72,7 @@ int Q_GUI_EXPORT QT_DISTANCEFIELD_HIGHGLYPHCOUNT();
 class Q_GUI_EXPORT QDistanceFieldData : public QSharedData
 {
 public:
-    QDistanceFieldData() : glyph(0), width(0), height(0), nbytes(0), data(0) {}
+    QDistanceFieldData() : glyph(0), width(0), height(0), nbytes(0), data(nullptr) {}
     QDistanceFieldData(const QDistanceFieldData &other);
     ~QDistanceFieldData();
 
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 84c5be60b1..76fde5388c 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -180,14 +180,14 @@ Q_GUI_EXPORT int qt_defaultDpi()
 }
 
 QFontPrivate::QFontPrivate()
-    : engineData(0), dpi(qt_defaultDpi()), screen(0),
+    : engineData(0), dpi(qt_defaultDpi()),
       underline(false), overline(false), strikeOut(false), kerning(true),
       capital(0), letterSpacingIsAbsolute(false), scFont(0)
 {
 }
 
 QFontPrivate::QFontPrivate(const QFontPrivate &other)
-    : request(other.request), engineData(0), dpi(other.dpi), screen(other.screen),
+    : request(other.request), engineData(0), dpi(other.dpi),
       underline(other.underline), overline(other.overline),
       strikeOut(other.strikeOut), kerning(other.kerning),
       capital(other.capital), letterSpacingIsAbsolute(other.letterSpacingIsAbsolute),
@@ -208,7 +208,7 @@ QFontPrivate::~QFontPrivate()
     scFont = 0;
 }
 
-extern QMutex *qt_fontdatabase_mutex();
+extern QRecursiveMutex *qt_fontdatabase_mutex();
 
 #define QT_FONT_ENGINE_FROM_DATA(data, script) data->engines[script]
 
@@ -336,7 +336,7 @@ QFontEngineData::QFontEngineData()
 
 QFontEngineData::~QFontEngineData()
 {
-    Q_ASSERT(ref.load() == 0);
+    Q_ASSERT(ref.loadRelaxed() == 0);
     for (int i = 0; i < QChar::ScriptCount; ++i) {
         if (engines[i]) {
             if (!engines[i]->ref.deref())
@@ -581,11 +581,9 @@ QFont::QFont(const QFont &font, const QPaintDevice *pd)
 {
     Q_ASSERT(pd);
     const int dpi = pd->logicalDpiY();
-    const int screen = 0;
-    if (font.d->dpi != dpi || font.d->screen != screen ) {
+    if (font.d->dpi != dpi) {
         d = new QFontPrivate(*font.d);
         d->dpi = dpi;
-        d->screen = screen;
     } else {
         d = font.d;
     }
@@ -604,7 +602,7 @@ QFont::QFont(QFontPrivate *data)
 */
 void QFont::detach()
 {
-    if (d->ref.load() == 1) {
+    if (d->ref.loadRelaxed() == 1) {
         if (d->engineData && !d->engineData->ref.deref())
             delete d->engineData;
         d->engineData = 0;
@@ -625,7 +623,7 @@ void QFont::detach()
 */
 void QFontPrivate::detachButKeepEngineData(QFont *font)
 {
-    if (font->d->ref.load() == 1)
+    if (font->d->ref.loadRelaxed() == 1)
         return;
 
     QFontEngineData *engineData = font->d->engineData;
@@ -2083,7 +2081,7 @@ QString QFont::toString() const
     \relates QFont
     \since 5.3
 */
-uint qHash(const QFont &font, uint seed) Q_DECL_NOTHROW
+uint qHash(const QFont &font, uint seed) noexcept
 {
     return qHash(QFontPrivate::get(font)->request, seed);
 }
@@ -2800,12 +2798,12 @@ void QFontCache::cleanup()
         cache->setLocalData(0);
 }
 
-QBasicAtomicInt font_cache_id = Q_BASIC_ATOMIC_INITIALIZER(1);
+static QBasicAtomicInt font_cache_id = Q_BASIC_ATOMIC_INITIALIZER(0);
 
 QFontCache::QFontCache()
     : QObject(), total_cost(0), max_cost(min_cost),
       current_timestamp(0), fast(false), timer_id(-1),
-      m_id(font_cache_id.fetchAndAddRelaxed(1))
+      m_id(font_cache_id.fetchAndAddRelaxed(1) + 1)
 {
 }
 
@@ -2834,7 +2832,7 @@ void QFontCache::clear()
                 delete data;
             } else {
                 FC_DEBUG("QFontCache::clear: engineData %p still has refcount %d",
-                         data, data->ref.load());
+                         data, data->ref.loadRelaxed());
             }
             ++it;
         }
@@ -2858,7 +2856,7 @@ void QFontCache::clear()
                     delete engine;
                 } else if (cacheCount == 0) {
                     FC_DEBUG("QFontCache::clear: engine %p still has refcount %d",
-                             engine, engine->ref.load());
+                             engine, engine->ref.loadRelaxed());
                 }
                 it.value().data = 0;
             }
@@ -2928,7 +2926,7 @@ void QFontCache::updateHitCountAndTimeStamp(Engine &value)
     FC_DEBUG("QFontCache: found font engine\n"
              "  %p: timestamp %4u hits %3u ref %2d/%2d, type %d",
              value.data, value.timestamp, value.hits,
-             value.data->ref.load(), engineCacheCount.value(value.data),
+             value.data->ref.loadRelaxed(), engineCacheCount.value(value.data),
              value.data->type());
 }
 
@@ -2938,7 +2936,7 @@ void QFontCache::insertEngine(const Key &key, QFontEngine *engine, bool insertMu
     Q_ASSERT(key.multi == (engine->type() == QFontEngine::Multi));
 
 #ifdef QFONTCACHE_DEBUG
-    FC_DEBUG("QFontCache: inserting new engine %p, refcount %d", engine, engine->ref.load());
+    FC_DEBUG("QFontCache: inserting new engine %p, refcount %d", engine, engine->ref.loadRelaxed());
     if (!insertMulti && engineCache.contains(key)) {
         FC_DEBUG("   QFontCache already contains engine %p for key=(%g %g %d %d %d)",
                  engineCache.value(key).data, key.def.pointSize,
@@ -3027,9 +3025,9 @@ void QFontCache::decreaseCache()
         EngineDataCache::ConstIterator it = engineDataCache.constBegin(),
                                       end = engineDataCache.constEnd();
         for (; it != end; ++it) {
-            FC_DEBUG("    %p: ref %2d", it.value(), int(it.value()->ref.load()));
+            FC_DEBUG("    %p: ref %2d", it.value(), int(it.value()->ref.loadRelaxed()));
 
-            if (it.value()->ref.load() != 1)
+            if (it.value()->ref.loadRelaxed() != 1)
                 in_use_cost += engine_data_cost;
         }
     }
@@ -3042,10 +3040,10 @@ void QFontCache::decreaseCache()
         for (; it != end; ++it) {
             FC_DEBUG("    %p: timestamp %4u hits %2u ref %2d/%2d, cost %u bytes",
                      it.value().data, it.value().timestamp, it.value().hits,
-                     it.value().data->ref.load(), engineCacheCount.value(it.value().data),
+                     it.value().data->ref.loadRelaxed(), engineCacheCount.value(it.value().data),
                      it.value().data->cache_cost);
 
-            if (it.value().data->ref.load() > engineCacheCount.value(it.value().data))
+            if (it.value().data->ref.loadRelaxed() > engineCacheCount.value(it.value().data))
                 in_use_cost += it.value().data->cache_cost / engineCacheCount.value(it.value().data);
         }
 
@@ -3094,7 +3092,7 @@ void QFontCache::decreaseCache()
         // clean out all unused engine data
         EngineDataCache::Iterator it = engineDataCache.begin();
         while (it != engineDataCache.end()) {
-            if (it.value()->ref.load() == 1) {
+            if (it.value()->ref.loadRelaxed() == 1) {
                 FC_DEBUG("    %p", it.value());
                 decreaseCost(sizeof(QFontEngineData));
                 it.value()->ref.deref();
@@ -3122,7 +3120,7 @@ void QFontCache::decreaseCache()
         EngineCache::Iterator jt = end;
 
         for ( ; it != end; ++it) {
-            if (it.value().data->ref.load() != engineCacheCount.value(it.value().data))
+            if (it.value().data->ref.loadRelaxed() != engineCacheCount.value(it.value().data))
                 continue;
 
             if (it.value().timestamp < oldest && it.value().hits <= least_popular) {
@@ -3136,7 +3134,7 @@ void QFontCache::decreaseCache()
         if (it != end) {
             FC_DEBUG("    %p: timestamp %4u hits %2u ref %2d/%2d, type %d",
                      it.value().data, it.value().timestamp, it.value().hits,
-                     it.value().data->ref.load(), engineCacheCount.value(it.value().data),
+                     it.value().data->ref.loadRelaxed(), engineCacheCount.value(it.value().data),
                      it.value().data->type());
 
             QFontEngine *fontEngine = it.value().data;
@@ -3151,7 +3149,7 @@ void QFontCache::decreaseCache()
                 }
             }
             // and delete the last occurrence
-            Q_ASSERT(fontEngine->ref.load() == 0);
+            Q_ASSERT(fontEngine->ref.loadRelaxed() == 0);
             decreaseCost(fontEngine->cache_cost);
             delete fontEngine;
             engineCacheCount.remove(fontEngine);
@@ -3165,7 +3163,103 @@ void QFontCache::decreaseCache()
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug stream, const QFont &font)
 {
-    return stream << "QFont(" << font.toString() << ')';
+    QDebugStateSaver saver(stream);
+    stream.nospace().noquote();
+    stream << "QFont(";
+
+    if (stream.verbosity() == QDebug::DefaultVerbosity) {
+        stream << font.toString() << ")";
+        return stream;
+    }
+
+    QString fontDescription;
+    QDebug debug(&fontDescription);
+    debug.nospace();
+
+    const QFont defaultFont(new QFontPrivate);
+
+    for (int property = QFont::FamilyResolved; property < QFont::AllPropertiesResolved; property <<= 1) {
+        const bool resolved = (font.resolve_mask & property) != 0;
+        if (!resolved && stream.verbosity() == QDebug::MinimumVerbosity)
+            continue;
+
+        #define QFONT_DEBUG_SKIP_DEFAULT(prop) \
+            if ((font.prop() == defaultFont.prop()) && stream.verbosity() == 1) \
+                continue;
+
+        QDebugStateSaver saver(debug);
+
+        switch (property) {
+        case QFont::FamilyResolved:
+            debug << font.family(); break;
+        case QFont::SizeResolved:
+            if (font.pointSizeF() >= 0)
+                debug << font.pointSizeF() << "pt";
+            else if (font.pixelSize() >= 0)
+                debug << font.pixelSize() << "px";
+            else
+                Q_UNREACHABLE();
+            break;
+        case QFont::StyleHintResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(styleHint);
+            debug.verbosity(1) << font.styleHint(); break;
+        case QFont::StyleStrategyResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(styleStrategy);
+            debug.verbosity(1) << font.styleStrategy(); break;
+        case QFont::WeightResolved:
+            debug.verbosity(1) << QFont::Weight(font.weight()); break;
+        case QFont::StyleResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(style);
+            debug.verbosity(0) << font.style(); break;
+        case QFont::UnderlineResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(underline);
+            debug << "underline=" << font.underline(); break;
+        case QFont::OverlineResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(overline);
+            debug << "overline=" << font.overline(); break;
+        case QFont::StrikeOutResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(strikeOut);
+            debug << "strikeOut=" << font.strikeOut(); break;
+        case QFont::FixedPitchResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(fixedPitch);
+            debug << "fixedPitch=" << font.fixedPitch(); break;
+        case QFont::StretchResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(stretch);
+            debug.verbosity(0) << QFont::Stretch(font.stretch()); break;
+        case QFont::KerningResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(kerning);
+            debug << "kerning=" << font.kerning(); break;
+        case QFont::CapitalizationResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(capitalization);
+            debug.verbosity(0) << font.capitalization(); break;
+        case QFont::LetterSpacingResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(letterSpacing);
+            debug << "letterSpacing=" << font.letterSpacing();
+            debug.verbosity(0) << " (" << font.letterSpacingType() << ")";
+            break;
+        case QFont::HintingPreferenceResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(hintingPreference);
+            debug.verbosity(0) << font.hintingPreference(); break;
+        case QFont::StyleNameResolved:
+            QFONT_DEBUG_SKIP_DEFAULT(styleName);
+            debug << "styleName=" << font.styleName(); break;
+        default:
+            continue;
+        };
+
+        #undef QFONT_DEBUG_SKIP_DEFAULT
+
+        debug << ", ";
+    }
+
+    if (stream.verbosity() > QDebug::MinimumVerbosity)
+        debug.verbosity(0) << "resolveMask=" << QFlags<QFont::ResolveProperties>(font.resolve_mask);
+    else
+        fontDescription.chop(2); // Last ', '
+
+    stream << fontDescription << ')';
+
+    return stream;
 }
 #endif
 
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index e86f06353a..683aa3bf65 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -147,6 +147,7 @@ public:
     Q_ENUM(SpacingType)
 
     enum ResolveProperties {
+        NoPropertiesResolved        = 0x0000,
         FamilyResolved              = 0x0001,
         SizeResolved                = 0x0002,
         StyleHintResolved           = 0x0004,
@@ -167,6 +168,7 @@ public:
         FamiliesResolved            = 0x20000,
         AllPropertiesResolved       = 0x3ffff
     };
+    Q_ENUM(ResolveProperties)
 
     QFont();
     QFont(const QString &family, int pointSize = -1, int weight = -1, bool italic = false);
@@ -259,10 +261,8 @@ public:
     bool operator<(const QFont &) const;
     operator QVariant() const;
     bool isCopyOf(const QFont &) const;
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QFont &operator=(QFont &&other) Q_DECL_NOEXCEPT
+    inline QFont &operator=(QFont &&other) noexcept
     { qSwap(d, other.d); qSwap(resolve_mask, other.resolve_mask);  return *this; }
-#endif
 
 #if QT_DEPRECATED_SINCE(5, 3)
     // needed for X11
@@ -335,13 +335,17 @@ private:
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QFont &);
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+    friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QFont &);
+#endif
+
     QExplicitlySharedDataPointer<QFontPrivate> d;
     uint resolve_mask;
 };
 
 Q_DECLARE_SHARED(QFont)
 
-Q_GUI_EXPORT uint qHash(const QFont &font, uint seed = 0) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QFont &font, uint seed = 0) noexcept;
 
 inline bool QFont::bold() const
 { return weight() > Medium; }
diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h
index e86ec31e47..adbb7a0121 100644
--- a/src/gui/text/qfont_p.h
+++ b/src/gui/text/qfont_p.h
@@ -136,21 +136,22 @@ struct QFontDef
     }
 };
 
-inline uint qHash(const QFontDef &fd, uint seed = 0) Q_DECL_NOTHROW
+inline uint qHash(const QFontDef &fd, uint seed = 0) noexcept
 {
-    return qHash(qRound64(fd.pixelSize*10000)) // use only 4 fractional digits
-        ^  qHash(fd.weight)
-        ^  qHash(fd.style)
-        ^  qHash(fd.stretch)
-        ^  qHash(fd.styleHint)
-        ^  qHash(fd.styleStrategy)
-        ^  qHash(fd.ignorePitch)
-        ^  qHash(fd.fixedPitch)
-        ^  qHash(fd.family, seed)
-        ^  qHash(fd.families, seed)
-        ^  qHash(fd.styleName)
-        ^  qHash(fd.hintingPreference)
-        ;
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, qRound64(fd.pixelSize*10000)); // use only 4 fractional digits
+    seed = hash(seed, fd.weight);
+    seed = hash(seed, fd.style);
+    seed = hash(seed, fd.stretch);
+    seed = hash(seed, fd.styleHint);
+    seed = hash(seed, fd.styleStrategy);
+    seed = hash(seed, fd.ignorePitch);
+    seed = hash(seed, fd.fixedPitch);
+    seed = hash(seed, fd.family);
+    seed = hash(seed, fd.families);
+    seed = hash(seed, fd.styleName);
+    seed = hash(seed, fd.hintingPreference);
+    return seed;
 }
 
 class QFontEngineData
@@ -184,7 +185,6 @@ public:
     QFontDef request;
     mutable QFontEngineData *engineData;
     int dpi;
-    int screen;
 
     uint underline  :  1;
     uint overline   :  1;
@@ -229,19 +229,17 @@ public:
     void clear();
 
     struct Key {
-        Key() : script(0), multi(0), screen(0) { }
-        Key(const QFontDef &d, uchar c, bool m = 0, uchar s = 0)
-            : def(d), script(c), multi(m), screen(s) { }
+        Key() : script(0), multi(0) { }
+        Key(const QFontDef &d, uchar c, bool m = 0)
+            : def(d), script(c), multi(m) { }
 
         QFontDef def;
         uchar script;
         uchar multi: 1;
-        uchar screen: 7;
 
         inline bool operator<(const Key &other) const
         {
             if (script != other.script) return script < other.script;
-            if (screen != other.screen) return screen < other.screen;
             if (multi != other.multi) return multi < other.multi;
             if (multi && def.fallBackFamilies.size() != other.def.fallBackFamilies.size())
                 return def.fallBackFamilies.size() < other.def.fallBackFamilies.size();
@@ -250,7 +248,6 @@ public:
         inline bool operator==(const Key &other) const
         {
             return script == other.script
-                    && screen == other.screen
                     && multi == other.multi
                     && (!multi || def.fallBackFamilies == other.def.fallBackFamilies)
                     && def == other.def;
@@ -266,7 +263,7 @@ public:
 
     // QFontEngine cache
     struct Engine {
-        Engine() : data(0), timestamp(0), hits(0) { }
+        Engine() : data(nullptr), timestamp(0), hits(0) { }
         Engine(QFontEngine *d) : data(d), timestamp(0), hits(0) { }
 
         QFontEngine *data;
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index fe7dd80e44..261e1d831b 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -422,7 +422,7 @@ struct FallbacksCacheKey {
     QChar::Script script;
 };
 
-inline bool operator==(const FallbacksCacheKey &lhs, const FallbacksCacheKey &rhs) Q_DECL_NOTHROW
+inline bool operator==(const FallbacksCacheKey &lhs, const FallbacksCacheKey &rhs) noexcept
 {
     return lhs.script == rhs.script &&
             lhs.styleHint == rhs.styleHint &&
@@ -430,12 +430,12 @@ inline bool operator==(const FallbacksCacheKey &lhs, const FallbacksCacheKey &rh
             lhs.family == rhs.family;
 }
 
-inline bool operator!=(const FallbacksCacheKey &lhs, const FallbacksCacheKey &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const FallbacksCacheKey &lhs, const FallbacksCacheKey &rhs) noexcept
 {
     return !operator==(lhs, rhs);
 }
 
-inline uint qHash(const FallbacksCacheKey &key, uint seed = 0) Q_DECL_NOTHROW
+inline uint qHash(const FallbacksCacheKey &key, uint seed = 0) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.family);
@@ -451,8 +451,7 @@ class QFontDatabasePrivate
 public:
     QFontDatabasePrivate()
         : count(0), families(0),
-          fallbacksCache(64),
-          reregisterAppFonts(false)
+          fallbacksCache(64)
     { }
 
     ~QFontDatabasePrivate() {
@@ -488,7 +487,6 @@ public:
     };
     QVector<ApplicationFont> applicationFonts;
     int addAppFont(const QByteArray &fontData, const QString &fileName);
-    bool reregisterAppFonts;
     bool isApplicationFont(const QString &fileName);
 
     void invalidate();
@@ -707,7 +705,7 @@ static QStringList familyList(const QFontDef &req)
 }
 
 Q_GLOBAL_STATIC(QFontDatabasePrivate, privateDb)
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, fontDatabaseMutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, fontDatabaseMutex)
 
 // used in qguiapplication.cpp
 void qt_cleanupFontDatabase()
@@ -719,8 +717,8 @@ void qt_cleanupFontDatabase()
     }
 }
 
-// used in qfontengine_x11.cpp
-QMutex *qt_fontdatabase_mutex()
+// used in qfont.cpp
+QRecursiveMutex *qt_fontdatabase_mutex()
 {
     return fontDatabaseMutex();
 }
@@ -793,7 +791,7 @@ QString qt_resolveFontFamilyAlias(const QString &alias)
     return alias;
 }
 
-Q_GUI_EXPORT bool qt_isFontFamilyPopulated(const QString &familyName)
+bool qt_isFontFamilyPopulated(const QString &familyName)
 {
     QFontDatabasePrivate *d = privateDb();
     QtFontFamily *f = d->family(familyName, QFontDatabasePrivate::RequestFamily);
@@ -897,15 +895,12 @@ static void initializeDb()
     QFontDatabasePrivate *db = privateDb();
 
     // init by asking for the platformfontdb for the first time or after invalidation
-    if (!db->count)
+    if (!db->count) {
         QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase();
-
-    if (db->reregisterAppFonts) {
         for (int i = 0; i < db->applicationFonts.count(); i++) {
             if (!db->applicationFonts.at(i).families.isEmpty())
                 registerFont(&db->applicationFonts[i]);
         }
-        db->reregisterAppFonts = false;
     }
 }
 
@@ -978,7 +973,7 @@ QFontEngine *loadSingleEngine(int script,
             if (!engine->supportsScript(QChar::Script(script))) {
                 qWarning("  OpenType support missing for \"%s\", script %d",
 +                        qPrintable(def.family), script);
-                if (engine->ref.load() == 0)
+                if (engine->ref.loadRelaxed() == 0)
                     delete engine;
                 return 0;
             }
@@ -1033,11 +1028,7 @@ QFontEngine *loadEngine(int script, const QFontDef &request,
 
 static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
 {
-    QFontDatabasePrivate *db = privateDb();
-
     fnt->families = QGuiApplicationPrivate::platformIntegration()->fontDatabase()->addApplicationFont(fnt->data,fnt->fileName);
-
-    db->reregisterAppFonts = true;
 }
 
 static QtFontStyle *bestStyle(QtFontFoundry *foundry, const QtFontStyle::Key &styleKey,
@@ -2451,13 +2442,18 @@ int QFontDatabasePrivate::addAppFont(const QByteArray &fontData, const QString &
     if (font.fileName.isEmpty() && !fontData.isEmpty())
         font.fileName = QLatin1String(":qmemoryfonts/") + QString::number(i);
 
+    bool wasEmpty = privateDb()->count == 0;
     registerFont(&font);
     if (font.families.isEmpty())
         return -1;
 
     applicationFonts[i] = font;
 
-    invalidate();
+    // If the cache has not yet been populated, we need to reload the application font later
+    if (wasEmpty)
+        invalidate();
+    else
+        emit qApp->fontDatabaseChanged();
     return i;
 }
 
@@ -2598,7 +2594,6 @@ bool QFontDatabase::removeApplicationFont(int handle)
 
     db->applicationFonts[handle] = QFontDatabasePrivate::ApplicationFont();
 
-    db->reregisterAppFonts = true;
     db->invalidate();
     return true;
 }
@@ -2689,7 +2684,7 @@ QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script)
     QtFontDesc desc;
     QList<int> blackListed;
     int index = match(multi ? QChar::Script_Common : script, request, family_name, foundry_name, &desc, blackListed);
-    if (index < 0 && QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFamilyAliases()) {
+    if (index < 0 && QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFamilyAliases(family_name)) {
         // We populated familiy aliases (e.g. localized families), so try again
         index = match(multi ? QChar::Script_Common : script, request, family_name, foundry_name, &desc, blackListed);
     }
@@ -2827,7 +2822,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
         fe = QFontDatabase::findFont(req, script);
         if (fe) {
             if (fe->type() == QFontEngine::Box && !req.families.at(0).isEmpty()) {
-                if (fe->ref.load() == 0)
+                if (fe->ref.loadRelaxed() == 0)
                     delete fe;
                 fe = 0;
             } else {
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index e59d425cb6..403a0510fa 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1040,15 +1040,15 @@ void QFontEngine::setGlyphCache(const void *context, QFontEngineGlyphCache *cach
     Q_ASSERT(cache);
 
     GlyphCaches &caches = m_glyphCaches[context];
-    for (GlyphCaches::const_iterator it = caches.constBegin(), end = caches.constEnd(); it != end; ++it) {
-        if (cache == it->cache.data())
+    for (auto & e : caches) {
+        if (cache == e.cache.data())
             return;
     }
 
     // Limit the glyph caches to 4 per context. This covers all 90 degree rotations,
     // and limits memory use when there is continuous or random rotation
     if (caches.size() == 4)
-        caches.removeLast();
+        caches.pop_back();
 
     GlyphCacheEntry entry;
     entry.cache = cache;
@@ -1065,8 +1065,8 @@ QFontEngineGlyphCache *QFontEngine::glyphCache(const void *context,
     if (caches == m_glyphCaches.cend())
         return nullptr;
 
-    for (GlyphCaches::const_iterator it = caches->begin(), end = caches->end(); it != end; ++it) {
-        QFontEngineGlyphCache *cache = it->cache.data();
+    for (auto &e : *caches) {
+        QFontEngineGlyphCache *cache = e.cache.data();
         if (format == cache->glyphFormat()
                 && (format != Format_ARGB || color == cache->color())
                 && qtransform_equals_no_translate(cache->m_transform, transform)) {
@@ -1200,7 +1200,7 @@ void QFontEngine::loadKerningPairs(QFixed scalingFactor)
 end:
     std::sort(kerning_pairs.begin(), kerning_pairs.end());
 //    for (int i = 0; i < kerning_pairs.count(); ++i)
-//        qDebug() << 'i' << i << "left_right" << hex << kerning_pairs.at(i).left_right;
+//        qDebug() << 'i' << i << "left_right" << Qt::hex << kerning_pairs.at(i).left_right;
 }
 
 
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 48dcdbeff7..a5c78d5372 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -54,7 +54,6 @@
 #include <QtGui/private/qtguiglobal_p.h>
 #include "QtCore/qatomic.h"
 #include <QtCore/qvarlengtharray.h>
-#include <QtCore/QLinkedList>
 #include <QtCore/qhashfunctions.h>
 #include "private/qtextengine_p.h"
 #include "private/qfont_p.h"
@@ -236,7 +235,7 @@ public:
     virtual qreal minLeftBearing() const;
     virtual qreal minRightBearing() const;
 
-    virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0);
+    virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = nullptr, qreal *rightBearing = nullptr);
 
     inline bool canRender(uint ucs4) const { return glyphIndex(ucs4) != 0; }
     virtual bool canRender(const QChar *str, int len) const;
@@ -246,7 +245,7 @@ public:
     virtual int glyphCount() const;
     virtual int glyphMargin(GlyphFormat format) { return format == Format_A32 ? 2 : 0; }
 
-    virtual QFontEngine *cloneWithSize(qreal /*pixelSize*/) const { return 0; }
+    virtual QFontEngine *cloneWithSize(qreal /*pixelSize*/) const { return nullptr; }
 
     virtual Qt::HANDLE handle() const;
 
@@ -304,33 +303,33 @@ public:
         Holder() : ptr(nullptr), destroy_func(nullptr) {}
         explicit Holder(void *p, qt_destroy_func_t d) : ptr(p), destroy_func(d) {}
         ~Holder() { if (ptr && destroy_func) destroy_func(ptr); }
-        Holder(Holder &&other) Q_DECL_NOTHROW
+        Holder(Holder &&other) noexcept
             : ptr(other.ptr),
               destroy_func(other.destroy_func)
         {
             other.ptr = nullptr;
             other.destroy_func = nullptr;
         }
-        Holder &operator=(Holder &&other) Q_DECL_NOTHROW
+        Holder &operator=(Holder &&other) noexcept
         { swap(other); return *this; }
 
-        void swap(Holder &other) Q_DECL_NOTHROW
+        void swap(Holder &other) noexcept
         {
             qSwap(ptr, other.ptr);
             qSwap(destroy_func, other.destroy_func);
         }
 
-        void *get() const Q_DECL_NOTHROW { return ptr; }
-        void *release() Q_DECL_NOTHROW {
+        void *get() const noexcept { return ptr; }
+        void *release() noexcept {
             void *result = ptr;
             ptr = nullptr;
             destroy_func = nullptr;
             return result;
         }
-        void reset() Q_DECL_NOTHROW { Holder().swap(*this); }
-        qt_destroy_func_t get_deleter() const Q_DECL_NOTHROW { return destroy_func; }
+        void reset() noexcept { Holder().swap(*this); }
+        qt_destroy_func_t get_deleter() const noexcept { return destroy_func; }
 
-        bool operator!() const Q_DECL_NOTHROW { return !ptr; }
+        bool operator!() const noexcept { return !ptr; }
     };
 
     mutable Holder font_; // \ NOTE: Declared before m_glyphCaches, so font_, face_
@@ -381,7 +380,7 @@ private:
         QExplicitlySharedDataPointer<QFontEngineGlyphCache> cache;
         bool operator==(const GlyphCacheEntry &other) const { return cache == other.cache; }
     };
-    typedef QLinkedList<GlyphCacheEntry> GlyphCaches;
+    typedef std::list<GlyphCacheEntry> GlyphCaches;
     mutable QHash<const void *, GlyphCaches> m_glyphCaches;
 
 private:
@@ -401,7 +400,7 @@ inline bool operator ==(const QFontEngine::FaceId &f1, const QFontEngine::FaceId
 }
 
 inline uint qHash(const QFontEngine::FaceId &f, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(f.filename)))
+    noexcept(noexcept(qHash(f.filename)))
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, f.filename);
@@ -469,7 +468,7 @@ public:
     virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const override;
     virtual void doKerning(QGlyphLayout *, ShaperFlags) const override;
     virtual void addOutlineToPath(qreal, qreal, const QGlyphLayout &, QPainterPath *, QTextItem::RenderFlags flags) override;
-    virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) override;
+    virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = nullptr, qreal *rightBearing = nullptr) override;
 
     virtual QFixed ascent() const override;
     virtual QFixed capHeight() const override;
diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp
index 110d512d39..409176d41b 100644
--- a/src/gui/text/qfontengine_qpf2.cpp
+++ b/src/gui/text/qfontengine_qpf2.cpp
@@ -140,9 +140,9 @@ static inline const uchar *verifyTag(const uchar *tagPtr, const uchar *endPtr)
         }
 #if defined(DEBUG_HEADER)
         if (length == 1)
-            qDebug() << "tag data" << hex << *tagPtr;
+            qDebug() << "tag data" << Qt::hex << *tagPtr;
         else if (length == 4)
-            qDebug() << "tag data" << hex << tagPtr[0] << tagPtr[1] << tagPtr[2] << tagPtr[3];
+            qDebug() << "tag data" << Qt::hex << tagPtr[0] << tagPtr[1] << tagPtr[2] << tagPtr[3];
 #endif
     }
     return tagPtr + length;
@@ -367,7 +367,7 @@ bool QFontEngineQPF2::stringToCMap(const QChar *str, int len, QGlyphLayout *glyp
 #if 0 && defined(DEBUG_FONTENGINE)
             QChar c(uc);
             if (!findGlyph(glyphs[glyph_pos].glyph) && !seenGlyphs.contains(c))
-                qDebug() << "glyph for character" << c << '/' << hex << uc << "is" << dec << glyphs[glyph_pos].glyph;
+                qDebug() << "glyph for character" << c << '/' << Qt::hex << uc << "is" << Qt::dec << glyphs[glyph_pos].glyph;
 
             seenGlyphs.insert(c);
 #endif
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index c8dc8d676e..d3e4f11e8c 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -185,11 +185,9 @@ QFontMetrics::QFontMetrics(const QFont &font, const QPaintDevice *paintdevice)
 #endif
 {
     const int dpi = paintdevice ? paintdevice->logicalDpiY() : qt_defaultDpi();
-    const int screen = 0;
-    if (font.d->dpi != dpi || font.d->screen != screen ) {
+    if (font.d->dpi != dpi) {
         d = new QFontPrivate(*font.d);
         d->dpi = dpi;
-        d->screen = screen;
     } else {
         d = font.d;
     }
@@ -1036,8 +1034,15 @@ int QFontMetrics::lineWidth() const
     return qRound(engine->lineThickness());
 }
 
+/*!
+    \since 5.14
 
-
+    Returns the font DPI.
+*/
+qreal QFontMetrics::fontDpi() const
+{
+    return d->dpi;
+}
 
 /*****************************************************************************
   QFontMetricsF member functions
@@ -1171,11 +1176,9 @@ QFontMetricsF::QFontMetricsF(const QFont &font, const QPaintDevice *paintdevice)
 #endif
 {
     int dpi = paintdevice ? paintdevice->logicalDpiY() : qt_defaultDpi();
-    const int screen = 0;
-    if (font.d->dpi != dpi || font.d->screen != screen ) {
+    if (font.d->dpi != dpi) {
         d = new QFontPrivate(*font.d);
         d->dpi = dpi;
-        d->screen = screen;
     } else {
         d = font.d;
     }
@@ -1913,4 +1916,14 @@ qreal QFontMetricsF::lineWidth() const
     return engine->lineThickness().toReal();
 }
 
+/*!
+    \since 5.14
+
+    Returns the font DPI.
+*/
+qreal QFontMetricsF::fontDpi() const
+{
+    return d->dpi;
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 61931fa9bc..e92a1514a1 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -76,12 +76,10 @@ public:
     ~QFontMetrics();
 
     QFontMetrics &operator=(const QFontMetrics &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QFontMetrics &operator=(QFontMetrics &&other) Q_DECL_NOEXCEPT
+    inline QFontMetrics &operator=(QFontMetrics &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
 
-    void swap(QFontMetrics &other) Q_DECL_NOEXCEPT
+    void swap(QFontMetrics &other) noexcept
     { qSwap(d, other.d); }
 
     int ascent() const;
@@ -137,6 +135,8 @@ public:
     int strikeOutPos() const;
     int lineWidth() const;
 
+    qreal fontDpi() const;
+
     bool operator==(const QFontMetrics &other) const;
     inline bool operator !=(const QFontMetrics &other) const { return !operator==(other); }
 
@@ -172,12 +172,10 @@ public:
 
     QFontMetricsF &operator=(const QFontMetricsF &);
     QFontMetricsF &operator=(const QFontMetrics &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QFontMetricsF &operator=(QFontMetricsF &&other)
+    inline QFontMetricsF &operator=(QFontMetricsF &&other) noexcept
     { qSwap(d, other.d); return *this; }
-#endif
 
-    void swap(QFontMetricsF &other) { qSwap(d, other.d); }
+    void swap(QFontMetricsF &other) noexcept { qSwap(d, other.d); }
 
     qreal ascent() const;
     qreal capHeight() const;
@@ -220,6 +218,8 @@ public:
     qreal strikeOutPos() const;
     qreal lineWidth() const;
 
+    qreal fontDpi() const;
+
     bool operator==(const QFontMetricsF &other) const;
     inline bool operator !=(const QFontMetricsF &other) const { return !operator==(other); }
 
diff --git a/src/gui/text/qfragmentmap_p.h b/src/gui/text/qfragmentmap_p.h
index 35f60ac961..1d781352f8 100644
--- a/src/gui/text/qfragmentmap_p.h
+++ b/src/gui/text/qfragmentmap_p.h
@@ -216,7 +216,7 @@ private:
 
 template <class Fragment>
 QFragmentMapData<Fragment>::QFragmentMapData()
-    : fragments(0)
+    : fragments(nullptr)
 {
     init();
 }
diff --git a/src/gui/text/qglyphrun.cpp b/src/gui/text/qglyphrun.cpp
index bd44e11dce..3c16c3bf62 100644
--- a/src/gui/text/qglyphrun.cpp
+++ b/src/gui/text/qglyphrun.cpp
@@ -137,7 +137,7 @@ QGlyphRun::~QGlyphRun()
 */
 void QGlyphRun::detach()
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         d.detach();
 }
 
diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h
index 6182c4f749..15e315bea2 100644
--- a/src/gui/text/qglyphrun.h
+++ b/src/gui/text/qglyphrun.h
@@ -66,13 +66,11 @@ public:
 
     QGlyphRun();
     QGlyphRun(const QGlyphRun &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QGlyphRun &operator=(QGlyphRun &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QGlyphRun &operator=(QGlyphRun &&other) noexcept { swap(other); return *this; }
     QGlyphRun &operator=(const QGlyphRun &other);
     ~QGlyphRun();
 
-    void swap(QGlyphRun &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QGlyphRun &other) noexcept { qSwap(d, other.d); }
 
     QRawFont rawFont() const;
     void setRawFont(const QRawFont &rawFont);
diff --git a/src/gui/text/qglyphrun_p.h b/src/gui/text/qglyphrun_p.h
index 5b6bdad648..465c3c7000 100644
--- a/src/gui/text/qglyphrun_p.h
+++ b/src/gui/text/qglyphrun_p.h
@@ -65,7 +65,7 @@ class QGlyphRunPrivate: public QSharedData
 {
 public:
     QGlyphRunPrivate()
-        : flags(0)
+        : flags(nullptr)
         , glyphIndexData(glyphIndexes.constData())
         , glyphIndexDataSize(0)
         , glyphPositionData(glyphPositions.constData())
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp
index a911014a19..90322b24da 100644
--- a/src/gui/text/qplatformfontdatabase.cpp
+++ b/src/gui/text/qplatformfontdatabase.cpp
@@ -60,6 +60,7 @@ void qt_registerFont(const QString &familyname, const QString &stylename,
 
 void qt_registerFontFamily(const QString &familyName);
 void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
+bool qt_isFontFamilyPopulated(const QString &familyName);
 
 /*!
     Registers the pre-rendered QPF2 font contained in the given \a dataArray.
@@ -234,7 +235,7 @@ QSupportedWritingSystems::~QSupportedWritingSystems()
 */
 void QSupportedWritingSystems::detach()
 {
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         QWritingSystemsPrivate *newd = new QWritingSystemsPrivate(d);
         if (!d->ref.deref())
             delete d;
@@ -666,6 +667,16 @@ void QPlatformFontDatabase::registerAliasToFontFamily(const QString &familyName,
 }
 
 /*!
+    Helper function that returns true if the font family has already been registered and populated.
+
+    \since 5.14
+*/
+bool QPlatformFontDatabase::isFamilyPopulated(const QString &familyName)
+{
+    return qt_isFontFamilyPopulated(familyName);
+}
+
+/*!
     \class QPlatformFontDatabase
     \since 5.0
     \internal
diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h
index f4558129a7..f79c5db625 100644
--- a/src/gui/text/qplatformfontdatabase.h
+++ b/src/gui/text/qplatformfontdatabase.h
@@ -104,7 +104,7 @@ class Q_GUI_EXPORT QPlatformFontDatabase
 public:
     virtual ~QPlatformFontDatabase();
     virtual void populateFontDatabase();
-    virtual bool populateFamilyAliases() { return false; }
+    virtual bool populateFamilyAliases(const QString &missingFamily) { Q_UNUSED(missingFamily); return false; }
     virtual void populateFamily(const QString &familyName);
     virtual void invalidate();
 
@@ -139,6 +139,8 @@ public:
 
     static void registerFontFamily(const QString &familyName);
     static void registerAliasToFontFamily(const QString &familyName, const QString &alias);
+
+    static bool isFamilyPopulated(const QString &familyName);
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index b2d8bf01af..a060448924 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -322,7 +322,7 @@ bool QRawFont::operator==(const QRawFont &other) const
     \relates QRawFont
     \since 5.8
 */
-uint qHash(const QRawFont &font, uint seed) Q_DECL_NOTHROW
+uint qHash(const QRawFont &font, uint seed) noexcept
 {
     return qHash(QRawFontPrivate::get(font)->fontEngine, seed);
 }
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index 470f2694e4..c6289d6c93 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -79,13 +79,11 @@ public:
              qreal pixelSize,
              QFont::HintingPreference hintingPreference = QFont::PreferDefaultHinting);
     QRawFont(const QRawFont &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QRawFont &operator=(QRawFont &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QRawFont &operator=(QRawFont &&other) noexcept { swap(other); return *this; }
     QRawFont &operator=(const QRawFont &other);
     ~QRawFont();
 
-    void swap(QRawFont &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QRawFont &other) noexcept { qSwap(d, other.d); }
 
     bool isValid() const;
 
@@ -158,7 +156,7 @@ Q_DECLARE_SHARED(QRawFont)
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QRawFont::LayoutFlags)
 
-Q_GUI_EXPORT uint qHash(const QRawFont &font, uint seed = 0) Q_DECL_NOTHROW;
+Q_GUI_EXPORT uint qHash(const QRawFont &font, uint seed = 0) noexcept;
 
 inline QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes, QRawFont::LayoutFlags layoutFlags) const
 {
diff --git a/src/gui/text/qrawfont_p.h b/src/gui/text/qrawfont_p.h
index 0fc8739bfb..03259a94ed 100644
--- a/src/gui/text/qrawfont_p.h
+++ b/src/gui/text/qrawfont_p.h
@@ -67,9 +67,9 @@ class Q_GUI_EXPORT QRawFontPrivate
 {
 public:
     QRawFontPrivate()
-        : fontEngine(0)
+        : fontEngine(nullptr)
         , hintingPreference(QFont::PreferDefaultHinting)
-        , thread(0)
+        , thread(nullptr)
     {}
 
     QRawFontPrivate(const QRawFontPrivate &other)
@@ -78,53 +78,53 @@ public:
         , thread(other.thread)
     {
 #ifndef QT_NO_DEBUG
-        Q_ASSERT(fontEngine == 0 || thread == QThread::currentThread());
+        Q_ASSERT(fontEngine == nullptr || thread == QThread::currentThread());
 #endif
-        if (fontEngine != 0)
+        if (fontEngine != nullptr)
             fontEngine->ref.ref();
     }
 
     ~QRawFontPrivate()
     {
 #ifndef QT_NO_DEBUG
-        Q_ASSERT(ref.load() == 0);
+        Q_ASSERT(ref.loadRelaxed() == 0);
 #endif
         cleanUp();
     }
 
     inline void cleanUp()
     {
-        setFontEngine(0);
+        setFontEngine(nullptr);
         hintingPreference = QFont::PreferDefaultHinting;
     }
 
     inline bool isValid() const
     {
 #ifndef QT_NO_DEBUG
-        Q_ASSERT(fontEngine == 0 || thread == QThread::currentThread());
+        Q_ASSERT(fontEngine == nullptr || thread == QThread::currentThread());
 #endif
-        return fontEngine != 0;
+        return fontEngine != nullptr;
     }
 
     inline void setFontEngine(QFontEngine *engine)
     {
 #ifndef QT_NO_DEBUG
-        Q_ASSERT(fontEngine == 0 || thread == QThread::currentThread());
+        Q_ASSERT(fontEngine == nullptr || thread == QThread::currentThread());
 #endif
         if (fontEngine == engine)
             return;
 
-        if (fontEngine != 0) {
+        if (fontEngine != nullptr) {
             if (!fontEngine->ref.deref())
                 delete fontEngine;
 #ifndef QT_NO_DEBUG
-            thread = 0;
+            thread = nullptr;
 #endif
         }
 
         fontEngine = engine;
 
-        if (fontEngine != 0) {
+        if (fontEngine != nullptr) {
             fontEngine->ref.ref();
 #ifndef QT_NO_DEBUG
             thread = QThread::currentThread();
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index dd894f4d32..490e0b6b8f 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -181,7 +181,7 @@ QStaticText::QStaticText(const QStaticText &other)
 */
 QStaticText::~QStaticText()
 {
-    Q_ASSERT(!data || data->ref.load() >= 1);
+    Q_ASSERT(!data || data->ref.loadRelaxed() >= 1);
 }
 
 /*!
@@ -189,7 +189,7 @@ QStaticText::~QStaticText()
 */
 void QStaticText::detach()
 {
-    if (data->ref.load() != 1)
+    if (data->ref.loadRelaxed() != 1)
         data.detach();
 }
 
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
index ada0456b8f..e8c94a6add 100644
--- a/src/gui/text/qstatictext.h
+++ b/src/gui/text/qstatictext.h
@@ -64,13 +64,11 @@ public:
     QStaticText();
     explicit QStaticText(const QString &text);
     QStaticText(const QStaticText &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QStaticText &operator=(QStaticText &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QStaticText &operator=(QStaticText &&other) noexcept { swap(other); return *this; }
     QStaticText &operator=(const QStaticText &);
     ~QStaticText();
 
-    void swap(QStaticText &other) Q_DECL_NOTHROW { qSwap(data, other.data); }
+    void swap(QStaticText &other) noexcept { qSwap(data, other.data); }
 
     void setText(const QString &text);
     QString text() const;
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index 4ec09297c5..8d6792216d 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -80,7 +80,7 @@ class Q_GUI_EXPORT QStaticTextItem
 public:
     QStaticTextItem() : useBackendOptimizations(false),
                         userDataNeedsUpdate(0), usesRawFont(0),
-                        m_fontEngine(0), m_userData(0) {}
+                        m_fontEngine(nullptr), m_userData(nullptr) {}
 
     void setUserData(QStaticTextUserData *newUserData)
     {
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index 102a776ed3..cf584f6980 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -45,6 +45,7 @@
 #include <private/qtextdocument_p.h>
 #include <qtextlayout.h>
 #include <qpointer.h>
+#include <qscopedvaluerollback.h>
 #include <qtextobject.h>
 #include <qtextcursor.h>
 #include <qdebug.h>
@@ -68,14 +69,14 @@ public:
     void reformatBlocks(int from, int charsRemoved, int charsAdded);
     void reformatBlock(const QTextBlock &block);
 
-    inline void rehighlight(QTextCursor &cursor, QTextCursor::MoveOperation operation) {
-        inReformatBlocks = true;
+    inline void rehighlight(QTextCursor &cursor, QTextCursor::MoveOperation operation)
+    {
+        QScopedValueRollback<bool> bg(inReformatBlocks, true);
         cursor.beginEditBlock();
         int from = cursor.position();
         cursor.movePosition(operation);
         reformatBlocks(from, 0, cursor.position() - from);
         cursor.endEditBlock();
-        inReformatBlocks = false;
     }
 
     inline void _q_delayedRehighlight() {
diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h
index 1a00b753ad..7cad3cc5e8 100644
--- a/src/gui/text/qtextcursor.h
+++ b/src/gui/text/qtextcursor.h
@@ -73,13 +73,11 @@ public:
     explicit QTextCursor(QTextFrame *frame);
     explicit QTextCursor(const QTextBlock &block);
     QTextCursor(const QTextCursor &cursor);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QTextCursor &operator=(QTextCursor &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QTextCursor &operator=(QTextCursor &&other) noexcept { swap(other); return *this; }
     QTextCursor &operator=(const QTextCursor &other);
     ~QTextCursor();
 
-    void swap(QTextCursor &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QTextCursor &other) noexcept { qSwap(d, other.d); }
 
     bool isNull() const;
 
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 2c677dffe0..22c249d604 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -70,6 +70,12 @@
 #include <private/qabstracttextdocumentlayout_p.h>
 #include "qpagedpaintdevice.h"
 #include "private/qpagedpaintdevice_p.h"
+#if QT_CONFIG(textmarkdownreader)
+#include <private/qtextmarkdownimporter_p.h>
+#endif
+#if QT_CONFIG(textmarkdownwriter)
+#include <private/qtextmarkdownwriter_p.h>
+#endif
 
 #include <limits.h>
 
@@ -1964,9 +1970,12 @@ void QTextDocument::print(QPagedPaintDevice *printer) const
     QRectF body = QRectF(QPointF(0, 0), d->pageSize);
     QPointF pageNumberPos;
 
+    qreal sourceDpiX = qt_defaultDpiX();
+    qreal sourceDpiY = qt_defaultDpiY();
+    const qreal dpiScaleX = qreal(printer->logicalDpiX()) / sourceDpiX;
+    const qreal dpiScaleY = qreal(printer->logicalDpiY()) / sourceDpiY;
+
     if (documentPaginated) {
-        qreal sourceDpiX = qt_defaultDpi();
-        qreal sourceDpiY = sourceDpiX;
 
         QPaintDevice *dev = doc->documentLayout()->paintDevice();
         if (dev) {
@@ -1974,9 +1983,6 @@ void QTextDocument::print(QPagedPaintDevice *printer) const
             sourceDpiY = dev->logicalDpiY();
         }
 
-        const qreal dpiScaleX = qreal(printer->logicalDpiX()) / sourceDpiX;
-        const qreal dpiScaleY = qreal(printer->logicalDpiY()) / sourceDpiY;
-
         // scale to dpi
         p.scale(dpiScaleX, dpiScaleY);
 
@@ -2005,15 +2011,21 @@ void QTextDocument::print(QPagedPaintDevice *printer) const
         // copy the custom object handlers
         layout->d_func()->handlers = documentLayout()->d_func()->handlers;
 
-        int dpiy = p.device()->logicalDpiY();
-        int margin = (int) ((2/2.54)*dpiy); // 2 cm margins
+        // 2 cm margins, scaled to device in QTextDocumentLayoutPrivate::layoutFrame
+        const int horizontalMargin = int((2/2.54)*sourceDpiX);
+        const int verticalMargin = int((2/2.54)*sourceDpiY);
         QTextFrameFormat fmt = doc->rootFrame()->frameFormat();
-        fmt.setMargin(margin);
+        fmt.setLeftMargin(horizontalMargin);
+        fmt.setRightMargin(horizontalMargin);
+        fmt.setTopMargin(verticalMargin);
+        fmt.setBottomMargin(verticalMargin);
         doc->rootFrame()->setFrameFormat(fmt);
 
+        // pageNumberPos must be in device coordinates, so scale to device here
+        const int dpiy = p.device()->logicalDpiY();
         body = QRectF(0, 0, printer->width(), printer->height());
-        pageNumberPos = QPointF(body.width() - margin,
-                                body.height() - margin
+        pageNumberPos = QPointF(body.width() - horizontalMargin * dpiScaleX,
+                                body.height() - verticalMargin * dpiScaleY
                                 + QFontMetrics(doc->defaultFont(), p.device()).ascent()
                                 + 5 * dpiy / 72.0);
         clonedDoc->setPageSize(body.size());
@@ -2061,8 +2073,9 @@ void QTextDocument::print(QPagedPaintDevice *printer) const
     \enum QTextDocument::ResourceType
 
     This enum describes the types of resources that can be loaded by
-    QTextDocument's loadResource() function.
+    QTextDocument's loadResource() function or by QTextBrowser::setSource().
 
+    \value UnknownResource No resource is loaded, or the resource type is not known.
     \value HtmlResource  The resource contains HTML.
     \value ImageResource The resource contains image data.
                          Currently supported data types are QVariant::Pixmap and
@@ -2072,10 +2085,11 @@ void QTextDocument::print(QPagedPaintDevice *printer) const
                          The icon needs to be converted to one of the supported types first,
                          for example using QIcon::pixmap.
     \value StyleSheetResource The resource contains CSS.
+    \value MarkdownResource The resource contains Markdown.
     \value UserResource  The first available value for user defined
                          resource types.
 
-    \sa loadResource()
+    \sa loadResource(), QTextBrowser::sourceType()
 */
 
 /*!
@@ -2471,9 +2485,19 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format)
 
     if (format.foreground() != defaultCharFormat.foreground()
         && format.foreground().style() != Qt::NoBrush) {
-        html += QLatin1String(" color:");
-        html += colorValue(format.foreground().color());
-        html += QLatin1Char(';');
+        QBrush brush = format.foreground();
+        if (brush.style() == Qt::TexturePattern) {
+            const bool isPixmap = qHasPixmapTexture(brush);
+            const qint64 cacheKey = isPixmap ? brush.texture().cacheKey() : brush.textureImage().cacheKey();
+
+            html += QLatin1String(" -qt-fg-texture-cachekey:");
+            html += QString::number(cacheKey);
+            html += QLatin1String(";");
+        } else {
+            html += QLatin1String(" color:");
+            html += colorValue(brush.color());
+            html += QLatin1Char(';');
+        }
         attributesEmitted = true;
     }
 
@@ -2576,51 +2600,43 @@ void QTextHtmlExporter::emitFloatStyle(QTextFrameFormat::Position pos, StyleMode
         html += QLatin1Char('\"');
 }
 
-void QTextHtmlExporter::emitBorderStyle(QTextFrameFormat::BorderStyle style)
+static QLatin1String richtextBorderStyleToHtmlBorderStyle(QTextFrameFormat::BorderStyle style)
 {
-    Q_ASSERT(style <= QTextFrameFormat::BorderStyle_Outset);
-
-    html += QLatin1String(" border-style:");
-
     switch (style) {
     case QTextFrameFormat::BorderStyle_None:
-        html += QLatin1String("none");
-        break;
+        return QLatin1String("none");
     case QTextFrameFormat::BorderStyle_Dotted:
-        html += QLatin1String("dotted");
-        break;
+        return QLatin1String("dotted");
     case QTextFrameFormat::BorderStyle_Dashed:
-        html += QLatin1String("dashed");
-        break;
+        return QLatin1String("dashed");
     case QTextFrameFormat::BorderStyle_Solid:
-        html += QLatin1String("solid");
-        break;
+        return QLatin1String("solid");
     case QTextFrameFormat::BorderStyle_Double:
-        html += QLatin1String("double");
-        break;
+        return QLatin1String("double");
     case QTextFrameFormat::BorderStyle_DotDash:
-        html += QLatin1String("dot-dash");
-        break;
+        return QLatin1String("dot-dash");
     case QTextFrameFormat::BorderStyle_DotDotDash:
-        html += QLatin1String("dot-dot-dash");
-        break;
+        return QLatin1String("dot-dot-dash");
     case QTextFrameFormat::BorderStyle_Groove:
-        html += QLatin1String("groove");
-        break;
+        return QLatin1String("groove");
     case QTextFrameFormat::BorderStyle_Ridge:
-        html += QLatin1String("ridge");
-        break;
+        return QLatin1String("ridge");
     case QTextFrameFormat::BorderStyle_Inset:
-        html += QLatin1String("inset");
-        break;
+        return QLatin1String("inset");
     case QTextFrameFormat::BorderStyle_Outset:
-        html += QLatin1String("outset");
-        break;
+        return QLatin1String("outset");
     default:
-        Q_ASSERT(false);
-        break;
+        Q_UNREACHABLE();
     };
+    return QLatin1String("");
+}
 
+void QTextHtmlExporter::emitBorderStyle(QTextFrameFormat::BorderStyle style)
+{
+    Q_ASSERT(style <= QTextFrameFormat::BorderStyle_Outset);
+
+    html += QLatin1String(" border-style:");
+    html += richtextBorderStyleToHtmlBorderStyle(style);
     html += QLatin1Char(';');
 }
 
@@ -2733,6 +2749,12 @@ void QTextHtmlExporter::emitFragment(const QTextFragment &fragment)
             if (imgFmt.hasProperty(QTextFormat::ImageName))
                 emitAttribute("src", imgFmt.name());
 
+            if (imgFmt.hasProperty(QTextFormat::ImageAltText))
+                emitAttribute("alt", imgFmt.stringProperty(QTextFormat::ImageAltText));
+
+            if (imgFmt.hasProperty(QTextFormat::ImageTitle))
+                emitAttribute("title", imgFmt.stringProperty(QTextFormat::ImageTitle));
+
             if (imgFmt.hasProperty(QTextFormat::ImageWidth))
                 emitAttribute("width", QString::number(imgFmt.width()));
 
@@ -3181,6 +3203,33 @@ void QTextHtmlExporter::emitTable(const QTextTable *table)
             if (cellFormat.hasProperty(QTextFormat::TableCellBottomPadding))
                 styleString += QLatin1String(" padding-bottom:") + QString::number(cellFormat.bottomPadding()) + QLatin1Char(';');
 
+            if (cellFormat.hasProperty(QTextFormat::TableCellTopBorder))
+                styleString += QLatin1String(" border-top:") + QString::number(cellFormat.topBorder()) + QLatin1String("px;");
+            if (cellFormat.hasProperty(QTextFormat::TableCellRightBorder))
+                styleString += QLatin1String(" border-right:") + QString::number(cellFormat.rightBorder()) + QLatin1String("px;");
+            if (cellFormat.hasProperty(QTextFormat::TableCellBottomBorder))
+                styleString += QLatin1String(" border-bottom:") + QString::number(cellFormat.bottomBorder()) + QLatin1String("px;");
+            if (cellFormat.hasProperty(QTextFormat::TableCellLeftBorder))
+                styleString += QLatin1String(" border-left:") + QString::number(cellFormat.leftBorder()) + QLatin1String("px;");
+
+            if (cellFormat.hasProperty(QTextFormat::TableCellTopBorderBrush))
+                styleString += QLatin1String(" border-top-color:") + cellFormat.topBorderBrush().color().name() + QLatin1Char(';');
+            if (cellFormat.hasProperty(QTextFormat::TableCellRightBorderBrush))
+                styleString += QLatin1String(" border-right-color:") + cellFormat.rightBorderBrush().color().name() + QLatin1Char(';');
+            if (cellFormat.hasProperty(QTextFormat::TableCellBottomBorderBrush))
+                styleString += QLatin1String(" border-bottom-color:") + cellFormat.bottomBorderBrush().color().name() + QLatin1Char(';');
+            if (cellFormat.hasProperty(QTextFormat::TableCellLeftBorderBrush))
+                styleString += QLatin1String(" border-left-color:") + cellFormat.leftBorderBrush().color().name() + QLatin1Char(';');
+
+            if (cellFormat.hasProperty(QTextFormat::TableCellTopBorderStyle))
+                styleString += QLatin1String(" border-top-style:") + richtextBorderStyleToHtmlBorderStyle(cellFormat.topBorderStyle()) + QLatin1Char(';');
+            if (cellFormat.hasProperty(QTextFormat::TableCellRightBorderStyle))
+                styleString += QLatin1String(" border-right-style:") + richtextBorderStyleToHtmlBorderStyle(cellFormat.rightBorderStyle()) + QLatin1Char(';');
+            if (cellFormat.hasProperty(QTextFormat::TableCellBottomBorderStyle))
+                styleString += QLatin1String(" border-bottom-style:") + richtextBorderStyleToHtmlBorderStyle(cellFormat.bottomBorderStyle()) + QLatin1Char(';');
+            if (cellFormat.hasProperty(QTextFormat::TableCellLeftBorderStyle))
+                styleString += QLatin1String(" border-left-style:") + richtextBorderStyleToHtmlBorderStyle(cellFormat.leftBorderStyle()) + QLatin1Char(';');
+
             if (!styleString.isEmpty())
                 html += QLatin1String(" style=\"") + styleString + QLatin1Char('\"');
 
@@ -3287,6 +3336,9 @@ void QTextHtmlExporter::emitFrameStyle(const QTextFrameFormat &format, FrameType
                     QString::number(format.leftMargin()),
                     QString::number(format.rightMargin()));
 
+    if (format.property(QTextFormat::TableBorderCollapse).toBool())
+        html += QLatin1String(" border-collapse:collapse;");
+
     if (html.length() == originalHtmlLength) // nothing emitted?
         html.chop(styleAttribute.size());
     else
@@ -3317,6 +3369,62 @@ QString QTextDocument::toHtml(const QByteArray &encoding) const
 #endif // QT_NO_TEXTHTMLPARSER
 
 /*!
+    \since 5.14
+    Returns a string containing a Markdown representation of the document with
+    the given \a features, or an empty string if writing fails for any reason.
+
+    \sa setMarkdown
+*/
+#if QT_CONFIG(textmarkdownwriter)
+QString QTextDocument::toMarkdown(QTextDocument::MarkdownFeatures features) const
+{
+    QString ret;
+    QTextStream s(&ret);
+    QTextMarkdownWriter w(s, features);
+    if (w.writeAll(this))
+        return ret;
+    return QString();
+}
+#endif
+
+/*!
+    \since 5.14
+    Replaces the entire contents of the document with the given
+    Markdown-formatted text in the \a markdown string, with the given
+    \a features supported.  By default, all supported GitHub-style
+    Markdown features are included; pass \c MarkdownDialectCommonMark
+    for a more basic parse.
+
+    The Markdown formatting is respected as much as possible; for example,
+    "*bold* text" will produce text where the first word has a font weight that
+    gives it an emphasized appearance.
+
+    Parsing of HTML included in the \a markdown string is handled in the same
+    way as in \l setHtml; however, Markdown formatting inside HTML blocks is
+    not supported.
+
+    Some features of the parser can be enabled or disabled via the \a features
+    argument:
+
+    \value MarkdownNoHTML
+           Any HTML tags in the Markdown text will be discarded
+    \value MarkdownDialectCommonMark
+           The parser supports only the features standardized by CommonMark
+    \value MarkdownDialectGitHub
+           The parser supports the GitHub dialect
+
+    The default is \c MarkdownDialectGitHub.
+
+    The undo/redo history is reset when this function is called.
+*/
+#if QT_CONFIG(textmarkdownreader)
+void QTextDocument::setMarkdown(const QString &markdown, QTextDocument::MarkdownFeatures features)
+{
+    QTextMarkdownImporter(static_cast<QTextMarkdownImporter::Features>(int(features))).import(this, markdown);
+}
+#endif
+
+/*!
     Returns a vector of text formats for all the formats used in the document.
 */
 QVector<QTextFormat> QTextDocument::allFormats() const
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index c9b22e053b..2fadc40cd2 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -151,6 +151,25 @@ public:
     void setHtml(const QString &html);
 #endif
 
+#if QT_CONFIG(textmarkdownwriter) || QT_CONFIG(textmarkdownreader)
+    // Must be in sync with QTextMarkdownImporter::Features, should be in sync with #define MD_FLAG_* in md4c
+    enum MarkdownFeature {
+        MarkdownNoHTML = 0x0020 | 0x0040,
+        MarkdownDialectCommonMark = 0,
+        MarkdownDialectGitHub = 0x0004 | 0x0008 | 0x0400 | 0x0100 | 0x0200 | 0x0800
+    };
+    Q_DECLARE_FLAGS(MarkdownFeatures, MarkdownFeature)
+    Q_FLAG(MarkdownFeatures)
+#endif
+
+#if QT_CONFIG(textmarkdownwriter)
+    QString toMarkdown(MarkdownFeatures features = MarkdownDialectGitHub) const;
+#endif
+
+#if QT_CONFIG(textmarkdownreader)
+    void setMarkdown(const QString &markdown, MarkdownFeatures features = MarkdownDialectGitHub);
+#endif
+
     QString toRawText() const;
     QString toPlainText() const;
     void setPlainText(const QString &text);
@@ -206,12 +225,15 @@ public:
     void print(QPagedPaintDevice *printer) const;
 
     enum ResourceType {
+        UnknownResource = 0,
         HtmlResource  = 1,
         ImageResource = 2,
         StyleSheetResource = 3,
+        MarkdownResource = 4,
 
         UserResource  = 100
     };
+    Q_ENUM(ResourceType)
 
     QVariant resource(int type, const QUrl &name) const;
     void addResource(int type, const QUrl &name, const QVariant &resource);
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 6e535c12b3..a1b1c2e92b 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -40,6 +40,7 @@
 #include <private/qtools_p.h>
 #include <qdebug.h>
 
+#include <qscopedvaluerollback.h>
 #include "qtextdocument_p.h"
 #include "qtextdocument.h"
 #include <qtextformat.h>
@@ -274,9 +275,10 @@ void QTextDocumentPrivate::clear()
         rtFrame = 0;
         init();
         cursors = oldCursors;
-        inContentsChange = true;
-        emit q->contentsChange(0, len, 0);
-        inContentsChange = false;
+        {
+            QScopedValueRollback<bool> bg(inContentsChange, true);
+            emit q->contentsChange(0, len, 0);
+        }
         if (lout)
             lout->documentChanged(0, len, 0);
     } QT_CATCH(...) {
@@ -309,9 +311,10 @@ void QTextDocumentPrivate::setLayout(QAbstractTextDocumentLayout *layout)
             it->free();
 
     emit q->documentLayoutChanged();
-    inContentsChange = true;
-    emit q->contentsChange(0, 0, length());
-    inContentsChange = false;
+    {
+        QScopedValueRollback<bool> bg(inContentsChange, true);
+        emit q->contentsChange(0, 0, length());
+    }
     if (lout)
         lout->documentChanged(0, 0, length());
 }
@@ -1212,9 +1215,8 @@ void QTextDocumentPrivate::finishEdit()
 
     if (lout && docChangeFrom >= 0) {
         if (!inContentsChange) {
-            inContentsChange = true;
+            QScopedValueRollback<bool> bg(inContentsChange, true);
             emit q->contentsChange(docChangeFrom, docChangeOldLength, docChangeLength);
-            inContentsChange = false;
         }
         lout->documentChanged(docChangeFrom, docChangeOldLength, docChangeLength);
     }
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h
index d668066091..f4e7a25f22 100644
--- a/src/gui/text/qtextdocument_p.h
+++ b/src/gui/text/qtextdocument_p.h
@@ -101,10 +101,10 @@ class QTextBlockData : public QFragment<3>
 {
 public:
     inline void initialize()
-        { layout = 0; userData = 0; userState = -1; revision = 0; hidden = 0; }
+        { layout = nullptr; userData = nullptr; userState = -1; revision = 0; hidden = 0; }
     void invalidate() const;
     inline void free()
-    { delete layout; layout = 0; delete userData; userData = 0; }
+    { delete layout; layout = nullptr; delete userData; userData = nullptr; }
 
     mutable int format;
     // ##### probably store a QTextEngine * here!
@@ -339,6 +339,7 @@ private:
     int lastBlockCount;
 
 public:
+    bool inContentsChange;
     QTextOption defaultTextOption;
     Qt::CursorMoveStyle defaultCursorMoveStyle;
 #ifndef QT_NO_CSSPARSER
@@ -346,7 +347,6 @@ public:
 #endif
     int maximumBlockCount;
     uint needsEnsureMaximumBlockCount : 1;
-    uint inContentsChange : 1;
     uint blockCursorAdjustment : 1;
     QSizeF pageSize;
     QString title;
@@ -357,6 +357,7 @@ public:
 
     void mergeCachedResources(const QTextDocumentPrivate *priv);
 
+    friend struct QTextHtmlParserNode;
     friend class QTextHtmlExporter;
     friend class QTextCursor;
 };
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp
index aef4ea1522..742c56382d 100644
--- a/src/gui/text/qtextdocumentfragment.cpp
+++ b/src/gui/text/qtextdocumentfragment.cpp
@@ -576,6 +576,9 @@ bool QTextHtmlImporter::appendNodeText()
             && ch != QChar::Nbsp
             && ch != QChar::ParagraphSeparator) {
 
+            if (wsm == QTextHtmlParserNode::WhiteSpacePreLine && (ch == QLatin1Char('\n') || ch == QLatin1Char('\r')))
+                compressNextWhitespace = PreserveWhiteSpace;
+
             if (compressNextWhitespace == CollapseWhiteSpace)
                 compressNextWhitespace = RemoveWhiteSpace; // allow this one, and remove the ones coming next.
             else if(compressNextWhitespace == RemoveWhiteSpace)
@@ -592,7 +595,9 @@ bool QTextHtmlImporter::appendNodeText()
                 }
             } else if (wsm != QTextHtmlParserNode::WhiteSpacePreWrap) {
                 compressNextWhitespace = RemoveWhiteSpace;
-                if (wsm == QTextHtmlParserNode::WhiteSpaceNoWrap)
+                if (wsm == QTextHtmlParserNode::WhiteSpacePreLine && (ch == QLatin1Char('\n') || ch == QLatin1Char('\r')))
+                { }
+                else if (wsm == QTextHtmlParserNode::WhiteSpaceNoWrap)
                     ch = QChar::Nbsp;
                 else
                     ch = QLatin1Char(' ');
@@ -605,6 +610,8 @@ bool QTextHtmlImporter::appendNodeText()
             || ch == QChar::ParagraphSeparator) {
 
             if (!textToInsert.isEmpty()) {
+                if (wsm == QTextHtmlParserNode::WhiteSpacePreLine && textToInsert.at(textToInsert.length() - 1) == QLatin1Char(' '))
+                    textToInsert = textToInsert.chopped(1);
                 cursor.insertText(textToInsert, format);
                 textToInsert.clear();
             }
@@ -715,6 +722,10 @@ QTextHtmlImporter::ProcessNodeResult QTextHtmlImporter::processSpecialNodes()
         case Html_img: {
             QTextImageFormat fmt;
             fmt.setName(currentNode->imageName);
+            if (!currentNode->text.isEmpty())
+                fmt.setProperty(QTextFormat::ImageTitle, currentNode->text);
+            if (!currentNode->imageAlt.isEmpty())
+                fmt.setProperty(QTextFormat::ImageAltText, currentNode->imageAlt);
 
             fmt.merge(currentNode->charFormat);
 
@@ -975,6 +986,7 @@ QTextHtmlImporter::Table QTextHtmlImporter::scanTable(int tableNodeIdx)
         tableFmt.setColumns(table.columns);
         tableFmt.setColumnWidthConstraints(columnWidths);
         tableFmt.setHeaderRowCount(tableHeaderRowCount);
+        tableFmt.setBorderCollapse(node.borderCollapse);
         fmt = tableFmt;
     }
 
@@ -1050,6 +1062,33 @@ QTextHtmlImporter::ProcessNodeResult QTextHtmlImporter::processBlockNode()
                     fmt.setLeftPadding(leftPadding(currentNodeIdx));
                 if (rightPadding(currentNodeIdx) >= 0)
                     fmt.setRightPadding(rightPadding(currentNodeIdx));
+#ifndef QT_NO_CSSPARSER
+                if (tableCellBorder(currentNodeIdx, QCss::TopEdge) > 0)
+                    fmt.setTopBorder(tableCellBorder(currentNodeIdx, QCss::TopEdge));
+                if (tableCellBorder(currentNodeIdx, QCss::RightEdge) > 0)
+                    fmt.setRightBorder(tableCellBorder(currentNodeIdx, QCss::RightEdge));
+                if (tableCellBorder(currentNodeIdx, QCss::BottomEdge) > 0)
+                    fmt.setBottomBorder(tableCellBorder(currentNodeIdx, QCss::BottomEdge));
+                if (tableCellBorder(currentNodeIdx, QCss::LeftEdge) > 0)
+                    fmt.setLeftBorder(tableCellBorder(currentNodeIdx, QCss::LeftEdge));
+                if (tableCellBorderStyle(currentNodeIdx, QCss::TopEdge) != QTextFrameFormat::BorderStyle_None)
+                    fmt.setTopBorderStyle(tableCellBorderStyle(currentNodeIdx, QCss::TopEdge));
+                if (tableCellBorderStyle(currentNodeIdx, QCss::RightEdge) != QTextFrameFormat::BorderStyle_None)
+                    fmt.setRightBorderStyle(tableCellBorderStyle(currentNodeIdx, QCss::RightEdge));
+                if (tableCellBorderStyle(currentNodeIdx, QCss::BottomEdge) != QTextFrameFormat::BorderStyle_None)
+                    fmt.setBottomBorderStyle(tableCellBorderStyle(currentNodeIdx, QCss::BottomEdge));
+                if (tableCellBorderStyle(currentNodeIdx, QCss::LeftEdge) != QTextFrameFormat::BorderStyle_None)
+                    fmt.setLeftBorderStyle(tableCellBorderStyle(currentNodeIdx, QCss::LeftEdge));
+                if (tableCellBorderBrush(currentNodeIdx, QCss::TopEdge) != Qt::NoBrush)
+                    fmt.setTopBorderBrush(tableCellBorderBrush(currentNodeIdx, QCss::TopEdge));
+                if (tableCellBorderBrush(currentNodeIdx, QCss::RightEdge) != Qt::NoBrush)
+                    fmt.setRightBorderBrush(tableCellBorderBrush(currentNodeIdx, QCss::RightEdge));
+                if (tableCellBorderBrush(currentNodeIdx, QCss::BottomEdge) != Qt::NoBrush)
+                    fmt.setBottomBorderBrush(tableCellBorderBrush(currentNodeIdx, QCss::BottomEdge));
+                if (tableCellBorderBrush(currentNodeIdx, QCss::LeftEdge) != Qt::NoBrush)
+                    fmt.setLeftBorderBrush(tableCellBorderBrush(currentNodeIdx, QCss::LeftEdge));
+#endif
+
                 cell.setFormat(fmt);
 
                 cursor.setPosition(cell.firstPosition());
diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h
index de01a02fbb..67b0c2c600 100644
--- a/src/gui/text/qtextdocumentfragment_p.h
+++ b/src/gui/text/qtextdocumentfragment_p.h
@@ -125,7 +125,7 @@ public:
 
     QTextHtmlImporter(QTextDocument *_doc, const QString &html,
                       ImportMode mode,
-                      const QTextDocument *resourceProvider = 0);
+                      const QTextDocument *resourceProvider = nullptr);
 
     void import();
 
@@ -163,7 +163,7 @@ private:
 #endif
     struct TableCellIterator
     {
-        inline TableCellIterator(QTextTable *t = 0) : table(t), row(0), column(0) {}
+        inline TableCellIterator(QTextTable *t = nullptr) : table(t), row(0), column(0) {}
 
         inline TableCellIterator &operator++() {
             if (atEnd())
@@ -182,7 +182,7 @@ private:
             return *this;
         }
 
-        inline bool atEnd() const { return table == 0 || row >= table->rows(); }
+        inline bool atEnd() const { return table == nullptr || row >= table->rows(); }
 
         QTextTableCell cell() const { return table->cellAt(row, column); }
 
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index 65cafc7bc2..ed23a4d8d9 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -155,6 +155,50 @@ struct QTextLayoutStruct {
     { if (pageHeight == QFIXED_MAX) return; pageBottom += pageHeight; y = qMax(y, pageBottom - pageHeight + pageBottomMargin + pageTopMargin - frameY); }
 };
 
+#ifndef QT_NO_CSSPARSER
+// helper struct to collect edge data and priorize edges for border-collapse mode
+struct EdgeData {
+
+    enum EdgeClass {
+        // don't change order, used for comparison
+        ClassInvalid,     // queried (adjacent) cell does not exist
+        ClassNone,        // no explicit border, no grid, no table border
+        ClassGrid,        // 1px grid if drawGrid is true
+        ClassTableBorder, // an outermost edge
+        ClassExplicit     // set in cell's format
+    };
+
+    EdgeData(qreal width, const QTextTableCell &cell, QCss::Edge edge, EdgeClass edgeClass) :
+        width(width), cell(cell), edge(edge), edgeClass(edgeClass) {}
+    EdgeData() :
+        width(0), edge(QCss::NumEdges), edgeClass(ClassInvalid) {}
+
+    // used for priorization with qMax
+    bool operator< (const EdgeData &other) const {
+        if (width < other.width) return true;
+        if (width > other.width) return false;
+        if (edgeClass < other.edgeClass) return true;
+        if (edgeClass > other.edgeClass) return false;
+        if (edge == QCss::TopEdge && other.edge == QCss::BottomEdge) return true;
+        if (edge == QCss::BottomEdge && other.edge == QCss::TopEdge) return false;
+        if (edge == QCss::LeftEdge && other.edge == QCss::RightEdge) return true;
+        return false;
+    }
+    bool operator> (const EdgeData &other) const {
+        return other < *this;
+    }
+
+    qreal width;
+    QTextTableCell cell;
+    QCss::Edge edge;
+    EdgeClass edgeClass;
+};
+
+// axisEdgeData is referenced by QTextTableData's inline methods, so predeclare
+class QTextTableData;
+static inline EdgeData axisEdgeData(QTextTable *table, const QTextTableData *td, const QTextTableCell &cell, QCss::Edge edge);
+#endif
+
 class QTextTableData : public QTextFrameData
 {
 public:
@@ -169,8 +213,19 @@ public:
 
     QVector<QFixed> cellVerticalOffsets;
 
+    // without borderCollapse, those equal QTextFrameData::border;
+    // otherwise the widest outermost cell edge will be used
+    QFixed effectiveLeftBorder;
+    QFixed effectiveTopBorder;
+    QFixed effectiveRightBorder;
+    QFixed effectiveBottomBorder;
+
     QFixed headerHeight;
 
+    QFixed borderCell; // 0 if borderCollapse is enabled, QTextFrameData::border otherwise
+    bool borderCollapse;
+    bool drawGrid;
+
     // maps from cell index (row + col * rowCount) to child frames belonging to
     // the specific cell
     QMultiHash<int, QTextFrame *> childFrameMap;
@@ -182,7 +237,7 @@ public:
     inline void calcRowPosition(int row)
     {
         if (row > 0)
-            rowPositions[row] = rowPositions.at(row - 1) + heights.at(row - 1) + border + cellSpacing + border;
+            rowPositions[row] = rowPositions.at(row - 1) + heights.at(row - 1) + borderCell + cellSpacing + borderCell;
     }
 
     QRectF cellRect(const QTextTableCell &cell) const;
@@ -198,30 +253,67 @@ public:
         }
     }
 
-    inline QFixed topPadding(const QTextFormat &format) const
+#ifndef QT_NO_CSSPARSER
+    inline QFixed cellBorderWidth(QTextTable *table, const QTextTableCell &cell, QCss::Edge edge) const
+    {
+        qreal rv = axisEdgeData(table, this, cell, edge).width;
+        if (borderCollapse)
+            rv /= 2; // each cell has to add half of the border's width to its own padding
+        return QFixed::fromReal(rv * deviceScale);
+    }
+#endif
+
+    inline QFixed topPadding(QTextTable *table, const QTextTableCell &cell) const
     {
-        return paddingProperty(format, QTextFormat::TableCellTopPadding);
+#ifdef QT_NO_CSSPARSER
+        Q_UNUSED(table);
+#endif
+        return paddingProperty(cell.format(), QTextFormat::TableCellTopPadding)
+#ifndef QT_NO_CSSPARSER
+                + cellBorderWidth(table, cell, QCss::TopEdge)
+#endif
+        ;
     }
 
-    inline QFixed bottomPadding(const QTextFormat &format) const
+    inline QFixed bottomPadding(QTextTable *table, const QTextTableCell &cell) const
     {
-        return paddingProperty(format, QTextFormat::TableCellBottomPadding);
+#ifdef QT_NO_CSSPARSER
+        Q_UNUSED(table);
+#endif
+        return paddingProperty(cell.format(), QTextFormat::TableCellBottomPadding)
+#ifndef QT_NO_CSSPARSER
+                + cellBorderWidth(table, cell, QCss::BottomEdge)
+#endif
+                ;
     }
 
-    inline QFixed leftPadding(const QTextFormat &format) const
+    inline QFixed leftPadding(QTextTable *table, const QTextTableCell &cell) const
     {
-        return paddingProperty(format, QTextFormat::TableCellLeftPadding);
+#ifdef QT_NO_CSSPARSER
+        Q_UNUSED(table);
+#endif
+        return paddingProperty(cell.format(), QTextFormat::TableCellLeftPadding)
+#ifndef QT_NO_CSSPARSER
+                + cellBorderWidth(table, cell, QCss::LeftEdge)
+#endif
+        ;
     }
 
-    inline QFixed rightPadding(const QTextFormat &format) const
+    inline QFixed rightPadding(QTextTable *table, const QTextTableCell &cell) const
     {
-        return paddingProperty(format, QTextFormat::TableCellRightPadding);
+#ifdef QT_NO_CSSPARSER
+        Q_UNUSED(table);
+#endif
+        return paddingProperty(cell.format(), QTextFormat::TableCellRightPadding)
+#ifndef QT_NO_CSSPARSER
+                + cellBorderWidth(table, cell, QCss::RightEdge)
+#endif
+        ;
     }
 
-    inline QFixedPoint cellPosition(const QTextTableCell &cell) const
+    inline QFixedPoint cellPosition(QTextTable *table, const QTextTableCell &cell) const
     {
-        const QTextFormat fmt = cell.format();
-        return cellPosition(cell.row(), cell.column()) + QFixedPoint(leftPadding(fmt), topPadding(fmt));
+        return cellPosition(cell.row(), cell.column()) + QFixedPoint(leftPadding(table, cell), topPadding(table, cell));
     }
 
     void updateTableSize();
@@ -257,10 +349,10 @@ static bool isFrameFromInlineObject(QTextFrame *f)
 
 void QTextTableData::updateTableSize()
 {
-    const QFixed effectiveTopMargin = this->topMargin + border + padding;
-    const QFixed effectiveBottomMargin = this->bottomMargin + border + padding;
-    const QFixed effectiveLeftMargin = this->leftMargin + border + padding;
-    const QFixed effectiveRightMargin = this->rightMargin + border + padding;
+    const QFixed effectiveTopMargin = this->topMargin + effectiveTopBorder + padding;
+    const QFixed effectiveBottomMargin = this->bottomMargin + effectiveBottomBorder + padding;
+    const QFixed effectiveLeftMargin = this->leftMargin + effectiveLeftBorder + padding;
+    const QFixed effectiveRightMargin = this->rightMargin + effectiveRightBorder + padding;
     size.height = contentsHeight == -1
                    ? rowPositions.constLast() + heights.constLast() + padding + border + cellSpacing + effectiveBottomMargin
                    : effectiveTopMargin + contentsHeight + effectiveBottomMargin;
@@ -453,6 +545,7 @@ public:
                    const QTextBlock &bl, bool inRootFrame) const;
     void drawListItem(const QPointF &offset, QPainter *painter, const QAbstractTextDocumentLayout::PaintContext &context,
                       const QTextBlock &bl, const QTextCharFormat *selectionFormat) const;
+    void drawTableCellBorder(const QRectF &cellRect, QPainter *painter, QTextTable *table, QTextTableData *td, const QTextTableCell &cell) const;
     void drawTableCell(const QRectF &cellRect, QPainter *painter, const QAbstractTextDocumentLayout::PaintContext &cell_context,
                        QTextTable *table, QTextTableData *td, int r, int c,
                        QTextBlock *cursorBlockNeedingRepaint, QPointF *cursorBlockOffset) const;
@@ -719,7 +812,7 @@ QTextDocumentLayoutPrivate::hitTest(QTextTable *table, const QFixedPoint &point,
 
     *position = cell.firstPosition();
 
-    HitPoint hp = hitTest(cell.begin(), PointInside, point - td->cellPosition(cell), position, l, accuracy);
+    HitPoint hp = hitTest(cell.begin(), PointInside, point - td->cellPosition(table, cell), position, l, accuracy);
 
     if (hp == PointExact)
         return hp;
@@ -798,12 +891,45 @@ QFixed QTextDocumentLayoutPrivate::blockIndent(const QTextBlockFormat &blockForm
     return QFixed::fromReal(indent * scale * document->indentWidth());
 }
 
+struct BorderPaginator
+{
+    BorderPaginator(QTextDocument *document, const QRectF &rect, qreal topMarginAfterPageBreak, qreal bottomMargin, qreal border) :
+        pageHeight(document->pageSize().height()),
+        topPage(pageHeight > 0 ? static_cast<int>(rect.top() / pageHeight) : 0),
+        bottomPage(pageHeight > 0 ? static_cast<int>((rect.bottom() + border) / pageHeight) : 0),
+        rect(rect),
+        topMarginAfterPageBreak(topMarginAfterPageBreak),
+        bottomMargin(bottomMargin), border(border)
+    {}
+
+    QRectF clipRect(int page) const
+    {
+        QRectF clipped = rect.toRect();
+
+        if (topPage != bottomPage) {
+            clipped.setTop(qMax(clipped.top(), page * pageHeight + topMarginAfterPageBreak - border));
+            clipped.setBottom(qMin(clipped.bottom(), (page + 1) * pageHeight - bottomMargin));
+
+            if (clipped.bottom() <= clipped.top())
+                return QRectF();
+        }
+
+        return clipped;
+    }
+
+    qreal pageHeight;
+    int topPage;
+    int bottomPage;
+    QRectF rect;
+    qreal topMarginAfterPageBreak;
+    qreal bottomMargin;
+    qreal border;
+};
+
 void QTextDocumentLayoutPrivate::drawBorder(QPainter *painter, const QRectF &rect, qreal topMargin, qreal bottomMargin,
                                             qreal border, const QBrush &brush, QTextFrameFormat::BorderStyle style) const
 {
-    const qreal pageHeight = document->pageSize().height();
-    const int topPage = pageHeight > 0 ? static_cast<int>(rect.top() / pageHeight) : 0;
-    const int bottomPage = pageHeight > 0 ? static_cast<int>((rect.bottom() + border) / pageHeight) : 0;
+    BorderPaginator paginator(document, rect, topMargin, bottomMargin, border);
 
 #ifndef QT_NO_CSSPARSER
     QCss::BorderStyle cssStyle = static_cast<QCss::BorderStyle>(style + 1);
@@ -814,16 +940,11 @@ void QTextDocumentLayoutPrivate::drawBorder(QPainter *painter, const QRectF &rec
     bool turn_off_antialiasing = !(painter->renderHints() & QPainter::Antialiasing);
     painter->setRenderHint(QPainter::Antialiasing);
 
-    for (int i = topPage; i <= bottomPage; ++i) {
-        QRectF clipped = rect.toRect();
-
-        if (topPage != bottomPage) {
-            clipped.setTop(qMax(clipped.top(), i * pageHeight + topMargin - border));
-            clipped.setBottom(qMin(clipped.bottom(), (i + 1) * pageHeight - bottomMargin));
+    for (int i = paginator.topPage; i <= paginator.bottomPage; ++i) {
+        QRectF clipped = paginator.clipRect(i);
+        if (!clipped.isValid())
+            continue;
 
-            if (clipped.bottom() <= clipped.top())
-                continue;
-        }
 #ifndef QT_NO_CSSPARSER
         qDrawEdge(painter, clipped.left(), clipped.top(), clipped.left() + border, clipped.bottom() + border, 0, 0, QCss::LeftEdge, cssStyle, brush);
         qDrawEdge(painter, clipped.left() + border, clipped.top(), clipped.right() + border, clipped.top() + border, 0, 0, QCss::TopEdge, cssStyle, brush);
@@ -920,6 +1041,38 @@ static void adjustContextSelectionsForCell(QAbstractTextDocumentLayout::PaintCon
     }
 }
 
+static bool cellClipTest(QTextTable *table, QTextTableData *td,
+                         const QAbstractTextDocumentLayout::PaintContext &cell_context,
+                         const QTextTableCell &cell,
+                         QRectF cellRect)
+{
+#ifdef QT_NO_CSSPARSER
+    Q_UNUSED(table);
+    Q_UNUSED(cell);
+#endif
+
+    if (!cell_context.clip.isValid())
+        return false;
+
+    if (td->borderCollapse) {
+        // we need to account for the cell borders in the clipping test
+#ifndef QT_NO_CSSPARSER
+        cellRect.adjust(-axisEdgeData(table, td, cell, QCss::LeftEdge).width / 2,
+                        -axisEdgeData(table, td, cell, QCss::TopEdge).width / 2,
+                        axisEdgeData(table, td, cell, QCss::RightEdge).width / 2,
+                        axisEdgeData(table, td, cell, QCss::BottomEdge).width / 2);
+#endif
+    } else {
+        qreal border = td->border.toReal();
+        cellRect.adjust(-border, -border, border, border);
+    }
+
+    if (!cellRect.intersects(cell_context.clip))
+        return true;
+
+    return false;
+}
+
 void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *painter,
                                            const QAbstractTextDocumentLayout::PaintContext &context,
                                            QTextFrame *frame) const
@@ -931,7 +1084,10 @@ void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *pain
     Q_ASSERT(!fd->sizeDirty);
     Q_ASSERT(!fd->layoutDirty);
 
-    const QPointF off = offset + fd->position.toPointF();
+    // floor the offset to avoid painting artefacts when drawing adjacent borders
+    // we later also round table cell heights and widths
+    const QPointF off = QPointF(QPointF(offset + fd->position.toPointF()).toPoint());
+
     if (context.clip.isValid()
         && (off.y() > context.clip.bottom() || off.y() + fd->size.height.toReal() < context.clip.top()
             || off.x() > context.clip.right() || off.x() + fd->size.width.toReal() < context.clip.left()))
@@ -979,10 +1135,12 @@ void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *pain
         const int tableStartPage = (absYPos / pageHeight).truncate();
         const int tableEndPage = ((absYPos + td->size.height) / pageHeight).truncate();
 
-        qreal border = td->border.toReal();
-        drawFrameDecoration(painter, frame, fd, context.clip, frameRect);
+        // for borderCollapse draw frame decoration by drawing the outermost
+        // cell edges with width = td->border
+        if (!td->borderCollapse)
+            drawFrameDecoration(painter, frame, fd, context.clip, frameRect);
 
-        // draw the table headers
+        // draw the repeated table headers for table continuation after page breaks
         const int headerRowCount = qMin(table->format().headerRowCount(), rows - 1);
         int page = tableStartPage + 1;
         while (page <= tableEndPage) {
@@ -996,9 +1154,7 @@ void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *pain
                     QRectF cellRect = td->cellRect(cell);
 
                     cellRect.translate(off.x(), headerOffset);
-                    // we need to account for the cell border in the clipping test
-                    int leftAdjust = qMin(qreal(0), 1 - border);
-                    if (cell_context.clip.isValid() && !cellRect.adjusted(leftAdjust, leftAdjust, border, border).intersects(cell_context.clip))
+                    if (cellClipTest(table, td, cell_context, cell, cellRect))
                         continue;
 
                     drawTableCell(cellRect, painter, cell_context, table, td, r, c, &cursorBlockNeedingRepaint,
@@ -1038,9 +1194,7 @@ void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *pain
                 QRectF cellRect = td->cellRect(cell);
 
                 cellRect.translate(off);
-                // we need to account for the cell border in the clipping test
-                int leftAdjust = qMin(qreal(0), 1 - border);
-                if (cell_context.clip.isValid() && !cellRect.adjusted(leftAdjust, leftAdjust, border, border).intersects(cell_context.clip))
+                if (cellClipTest(table, td, cell_context, cell, cellRect))
                     continue;
 
                 drawTableCell(cellRect, painter, cell_context, table, td, r, c, &cursorBlockNeedingRepaint,
@@ -1077,6 +1231,602 @@ void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *pain
     return;
 }
 
+#ifndef QT_NO_CSSPARSER
+
+static inline QTextFormat::Property borderPropertyForEdge(QCss::Edge edge)
+{
+    switch (edge) {
+    case QCss::TopEdge:
+        return QTextFormat::TableCellTopBorder;
+    case QCss::BottomEdge:
+        return QTextFormat::TableCellBottomBorder;
+    case QCss::LeftEdge:
+        return QTextFormat::TableCellLeftBorder;
+    case QCss::RightEdge:
+        return QTextFormat::TableCellRightBorder;
+    default:
+        Q_UNREACHABLE();
+        return QTextFormat::UserProperty;
+    }
+}
+
+static inline QTextFormat::Property borderStylePropertyForEdge(QCss::Edge edge)
+{
+    switch (edge) {
+    case QCss::TopEdge:
+        return QTextFormat::TableCellTopBorderStyle;
+    case QCss::BottomEdge:
+        return QTextFormat::TableCellBottomBorderStyle;
+    case QCss::LeftEdge:
+        return QTextFormat::TableCellLeftBorderStyle;
+    case QCss::RightEdge:
+        return QTextFormat::TableCellRightBorderStyle;
+    default:
+        Q_UNREACHABLE();
+        return QTextFormat::UserProperty;
+    }
+}
+
+static inline QCss::Edge adjacentEdge(QCss::Edge edge)
+{
+    switch (edge) {
+    case QCss::TopEdge:
+        return QCss::BottomEdge;
+    case QCss::RightEdge:
+        return QCss::LeftEdge;
+    case QCss::BottomEdge:
+        return QCss::TopEdge;
+    case QCss::LeftEdge:
+        return QCss::RightEdge;
+    default:
+        Q_UNREACHABLE();
+        return QCss::NumEdges;
+    }
+}
+
+static inline bool isSameAxis(QCss::Edge e1, QCss::Edge e2)
+{
+    return e1 == e2 || e1 == adjacentEdge(e2);
+}
+
+static inline bool isVerticalAxis(QCss::Edge e)
+{
+    return e % 2 > 0;
+}
+
+static inline QTextTableCell adjacentCell(QTextTable *table, const QTextTableCell &cell,
+                                          QCss::Edge edge)
+{
+    int dc = 0;
+    int dr = 0;
+
+    switch (edge) {
+    case QCss::LeftEdge:
+        dc = -1;
+        break;
+    case QCss::RightEdge:
+        dc = cell.columnSpan();
+        break;
+    case QCss::TopEdge:
+        dr = -1;
+        break;
+    case QCss::BottomEdge:
+        dr = cell.rowSpan();
+        break;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+
+    // get sibling cell
+    int col = cell.column() + dc;
+    int row = cell.row() + dr;
+
+    if (col < 0 || row < 0 || col >= table->columns() || row >= table->rows())
+        return QTextTableCell();
+    else
+        return table->cellAt(cell.row() + dr, cell.column() + dc);
+}
+
+// returns true if the specified edges of both cells
+// are "one the same line" aka axis.
+//
+// | C0
+// |-----|-----|----|-----  < "axis"
+// | C1  | C2  | C3 | C4
+//
+// cell    edge    competingCell competingEdge  result
+// C0      Left    C1            Left           true
+// C0      Left    C2            Left           false
+// C0      Bottom  C2            Top            true
+// C0      Bottom  C4            Left           INVALID
+static inline bool sharesAxis(const QTextTableCell &cell, QCss::Edge edge,
+                              const QTextTableCell &competingCell, QCss::Edge competingCellEdge)
+{
+    Q_ASSERT(isVerticalAxis(edge) == isVerticalAxis(competingCellEdge));
+
+    switch (edge) {
+    case QCss::TopEdge:
+        return cell.row() ==
+                competingCell.row() + (competingCellEdge == QCss::BottomEdge ? competingCell.rowSpan() : 0);
+    case QCss::BottomEdge:
+        return cell.row() + cell.rowSpan() ==
+                competingCell.row() + (competingCellEdge == QCss::TopEdge ? 0 : competingCell.rowSpan());
+    case QCss::LeftEdge:
+        return cell.column() ==
+                competingCell.column() + (competingCellEdge == QCss::RightEdge ? competingCell.columnSpan() : 0);
+    case QCss::RightEdge:
+        return cell.column() + cell.columnSpan() ==
+                competingCell.column() + (competingCellEdge == QCss::LeftEdge ? 0 : competingCell.columnSpan());
+    default:
+        Q_UNREACHABLE();
+        return false;
+    }
+}
+
+// returns the applicable EdgeData for the given cell and edge.
+// this is either set explicitly by the cell's format, an activated grid
+// or the general table border width for outermost edges.
+static inline EdgeData cellEdgeData(QTextTable *table, const QTextTableData *td,
+                                    const QTextTableCell &cell, QCss::Edge edge)
+{
+    if (!cell.isValid()) {
+        // e.g. non-existing adjacent cell
+        return EdgeData();
+    }
+
+    QTextTableCellFormat f = cell.format().toTableCellFormat();
+    if (f.hasProperty(borderStylePropertyForEdge(edge))) {
+        // border style is set
+        double width = 3; // default to 3 like browsers do
+        if (f.hasProperty(borderPropertyForEdge(edge)))
+            width = f.property(borderPropertyForEdge(edge)).toDouble();
+        return EdgeData(width, cell, edge, EdgeData::ClassExplicit);
+    } else if (td->drawGrid) {
+        const bool outermost =
+                (edge == QCss::LeftEdge && cell.column() == 0) ||
+                (edge == QCss::TopEdge && cell.row() == 0) ||
+                (edge == QCss::RightEdge && cell.column() + cell.columnSpan() >= table->columns()) ||
+                (edge == QCss::BottomEdge && cell.row() + cell.rowSpan() >= table->rows());
+
+        if (outermost) {
+            qreal border = table->format().border();
+            if (border > 1.0) {
+                // table border
+                return EdgeData(border, cell, edge, EdgeData::ClassTableBorder);
+            }
+        }
+        // 1px clean grid
+        return EdgeData(1.0, cell, edge, EdgeData::ClassGrid);
+    }
+    else {
+        return EdgeData(0, cell, edge, EdgeData::ClassNone);
+    }
+}
+
+// returns the EdgeData with the larger width of either the cell's edge its adjacent cell's edge
+static inline EdgeData axisEdgeData(QTextTable *table, const QTextTableData *td,
+                                    const QTextTableCell &cell, QCss::Edge edge)
+{
+    Q_ASSERT(cell.isValid());
+
+    EdgeData result = cellEdgeData(table, td, cell, edge);
+    if (!td->borderCollapse)
+        return result;
+
+    QTextTableCell ac = adjacentCell(table, cell, edge);
+    result = qMax(result, cellEdgeData(table, td, ac, adjacentEdge(edge)));
+
+    bool mustCheckThirdCell = false;
+    if (ac.isValid()) {
+        /* if C0 and C3 don't share the left/top axis, we must
+         * also check C1.
+         *
+         * C0 and C4 don't share the left axis so we have
+         * to take the top edge of C1 (T1) into account
+         * because this might be wider than C0's bottom
+         * edge (B0). For the sake of simplicity we skip
+         * checking T2 and T3.
+         *
+         * | C0
+         * |-----|-----|----|-----
+         * | C1  | C2  | C3 | C4
+         *
+         * width(T4) = max(T4, B0, T1) (T2 and T3 won't be checked)
+         */
+        switch (edge) {
+        case QCss::TopEdge:
+        case QCss::BottomEdge:
+            mustCheckThirdCell = !sharesAxis(cell, QCss::LeftEdge, ac, QCss::LeftEdge);
+            break;
+        case QCss::LeftEdge:
+        case QCss::RightEdge:
+            mustCheckThirdCell = !sharesAxis(cell, QCss::TopEdge, ac, QCss::TopEdge);
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    if (mustCheckThirdCell)
+        result = qMax(result, cellEdgeData(table, td, adjacentCell(table, ac, adjacentEdge(edge)), edge));
+
+    return result;
+}
+
+// checks an edge's joined competing edge according to priority rules and
+// adjusts maxCompetingEdgeData and maxOrthogonalEdgeData
+static inline void checkJoinedEdge(QTextTable *table, const QTextTableData *td, const QTextTableCell &cell,
+                                   QCss::Edge competingEdge,
+                                   const EdgeData &edgeData,
+                                   bool couldHaveContinuation,
+                                   EdgeData *maxCompetingEdgeData,
+                                   EdgeData *maxOrthogonalEdgeData)
+{
+    EdgeData competingEdgeData = axisEdgeData(table, td, cell, competingEdge);
+
+    if (competingEdgeData > edgeData) {
+        *maxCompetingEdgeData = competingEdgeData;
+    } else if (competingEdgeData.width == edgeData.width) {
+        if ((isSameAxis(edgeData.edge, competingEdge) && couldHaveContinuation)
+                || (!isVerticalAxis(edgeData.edge) && isVerticalAxis(competingEdge)) /* both widths are equal, vertical edge has priority */ ) {
+            *maxCompetingEdgeData = competingEdgeData;
+        }
+    }
+
+    if (maxOrthogonalEdgeData && competingEdgeData.width > maxOrthogonalEdgeData->width)
+        *maxOrthogonalEdgeData = competingEdgeData;
+}
+
+// the offset to make adjacent edges overlap in border collapse mode
+static inline qreal collapseOffset(const QTextDocumentLayoutPrivate *p, const EdgeData &w)
+{
+    return p->scaleToDevice(w.width) / 2.0;
+}
+
+// returns the offset that must be applied to the edge's
+// anchor (start point or end point) to avoid overlapping edges.
+//
+// Example 1:
+//       2
+//       2
+// 11111144444444      4 = top edge of cell, 4 pixels width
+//       3             3 = right edge of cell, 3 pixels width
+//       3 cell 4
+//
+// cell 4's top border is the widest border and will be
+// drawn with horiz. offset = -3/2 whereas its left border
+// of width 3 will be drawn with vert. offset = +4/2.
+//
+// Example 2:
+//       2
+//       2
+// 11111143333333
+//       4
+//       4 cell 4
+//
+// cell 4's left border is the widest and will be drawn
+// with vert. offset = -3/2 whereas its top border
+// of of width 3 will be drawn with hor. offset = +4/2.
+//
+// couldHaveContinuation: true for "end" anchor of an edge:
+//      C
+// AAAAABBBBBB
+//      D
+// width(A) == width(B) we consider B to be a continuation of A, so that B wins
+// and will be painted. A would only be painted including the right anchor if
+// there was no edge B (due to a rowspan or the axis C-D being the table's right
+// border).
+//
+// ignoreEdgesAbove: true if an egde (left, right or top) for the first row
+// after a table page break should be painted. In this case the edges of the
+// row above must be ignored.
+static inline double prioritizedEdgeAnchorOffset(const QTextDocumentLayoutPrivate *p,
+                                                 QTextTable *table, const QTextTableData *td,
+                                                 const QTextTableCell &cell,
+                                                 const EdgeData &edgeData,
+                                                 QCss::Edge orthogonalEdge,
+                                                 bool couldHaveContinuation,
+                                                 bool ignoreEdgesAbove)
+{
+    EdgeData maxCompetingEdgeData;
+    EdgeData maxOrthogonalEdgeData;
+    QTextTableCell competingCell;
+
+    // reference scenario for the inline comments:
+    // - edgeData being the top "T0" edge of C0
+    // - right anchor is '+', orthogonal edge is "R0"
+    //   B C3 R|L C2 B
+    //   ------+------
+    //   T C0 R|L C1 T
+
+    // C0: T0/B3
+    // this is "edgeData"
+
+    // C0: R0/L1
+    checkJoinedEdge(table, td, cell, orthogonalEdge, edgeData, false,
+                    &maxCompetingEdgeData, &maxOrthogonalEdgeData);
+
+    if (td->borderCollapse) {
+        // C1: T1/B2
+        if (!isVerticalAxis(edgeData.edge) || !ignoreEdgesAbove) {
+            competingCell = adjacentCell(table, cell, orthogonalEdge);
+            if (competingCell.isValid()) {
+                checkJoinedEdge(table, td, competingCell, edgeData.edge, edgeData, couldHaveContinuation,
+                                &maxCompetingEdgeData, 0);
+            }
+        }
+
+        // C3: R3/L2
+        if (edgeData.edge != QCss::TopEdge || !ignoreEdgesAbove) {
+            competingCell = adjacentCell(table, cell, edgeData.edge);
+            if (competingCell.isValid() && sharesAxis(cell, orthogonalEdge, competingCell, orthogonalEdge)) {
+                checkJoinedEdge(table, td, competingCell, orthogonalEdge, edgeData, false,
+                                &maxCompetingEdgeData, &maxOrthogonalEdgeData);
+            }
+        }
+    }
+
+    // wider edge has priority
+    bool hasPriority = edgeData > maxCompetingEdgeData;
+
+    if (td->borderCollapse) {
+        qreal offset = collapseOffset(p, maxOrthogonalEdgeData);
+        return hasPriority ? -offset : offset;
+    }
+    else
+        return hasPriority ? 0 : p->scaleToDevice(maxOrthogonalEdgeData.width);
+}
+
+// draw one edge of the given cell
+//
+// these options are for pagination / pagebreak handling:
+//
+// forceHeaderRow: true for all rows directly below a (repeated) header row.
+//  if the table has headers the first row after a page break must check against
+//  the last table header's row, not its actual predecessor.
+//
+// adjustTopAnchor: false for rows that are a continuation of a row after a page break
+//   only evaluated for left/right edges
+//
+// adjustBottomAnchor: false for rows that will continue after a page break
+//   only evaluated for left/right edges
+//
+// ignoreEdgesAbove: true if a row starts on top of the page and the
+//   bottom edges of the prior row can therefore be ignored.
+static inline
+void drawCellBorder(const QTextDocumentLayoutPrivate *p, QPainter *painter,
+                    QTextTable *table, const QTextTableData *td, const QTextTableCell &cell,
+                    const QRectF &borderRect, QCss::Edge edge,
+                    int forceHeaderRow, bool adjustTopAnchor, bool adjustBottomAnchor,
+                    bool ignoreEdgesAbove)
+{
+    QPointF p1, p2;
+    qreal wh = 0;
+    qreal wv = 0;
+    EdgeData edgeData = axisEdgeData(table, td, cell, edge);
+
+    if (edgeData.width == 0)
+        return;
+
+    QTextTableCellFormat fmt = edgeData.cell.format().toTableCellFormat();
+    QTextFrameFormat::BorderStyle borderStyle = QTextFrameFormat::BorderStyle_None;
+    QBrush brush;
+
+    if (edgeData.edgeClass != EdgeData::ClassExplicit && td->drawGrid) {
+        borderStyle = QTextFrameFormat::BorderStyle_Solid;
+        brush = table->format().borderBrush();
+    }
+    else {
+        switch (edgeData.edge) {
+        case QCss::TopEdge:
+            brush = fmt.topBorderBrush();
+            borderStyle = fmt.topBorderStyle();
+            break;
+        case QCss::BottomEdge:
+            brush = fmt.bottomBorderBrush();
+            borderStyle = fmt.bottomBorderStyle();
+            break;
+        case QCss::LeftEdge:
+            brush = fmt.leftBorderBrush();
+            borderStyle = fmt.leftBorderStyle();
+            break;
+        case QCss::RightEdge:
+            brush = fmt.rightBorderBrush();
+            borderStyle = fmt.rightBorderStyle();
+            break;
+        default:
+            Q_UNREACHABLE();
+            break;
+        }
+    }
+
+    if (borderStyle == QTextFrameFormat::BorderStyle_None)
+        return;
+
+    // assume black if not explicit brush is set
+    if (brush.style() == Qt::NoBrush)
+        brush = Qt::black;
+
+    QTextTableCell cellOrHeader = cell;
+    if (forceHeaderRow != -1)
+        cellOrHeader = table->cellAt(forceHeaderRow, cell.column());
+
+    // adjust start and end anchors (e.g. left/right for top) according to priority rules
+    switch (edge) {
+    case QCss::TopEdge:
+        wv = p->scaleToDevice(edgeData.width);
+        p1 = borderRect.topLeft()
+                + QPointF(qFloor(prioritizedEdgeAnchorOffset(p, table, td, cell, edgeData, QCss::LeftEdge, false, ignoreEdgesAbove)), 0);
+        p2 = borderRect.topRight()
+                + QPointF(-qCeil(prioritizedEdgeAnchorOffset(p, table, td, cell, edgeData, QCss::RightEdge, true, ignoreEdgesAbove)), 0);
+        break;
+    case QCss::BottomEdge:
+        wv = p->scaleToDevice(edgeData.width);
+        p1 = borderRect.bottomLeft()
+                + QPointF(qFloor(prioritizedEdgeAnchorOffset(p, table, td, cell, edgeData, QCss::LeftEdge, false, false)), -wv);
+        p2 = borderRect.bottomRight()
+                + QPointF(-qCeil(prioritizedEdgeAnchorOffset(p, table, td, cell, edgeData, QCss::RightEdge, true, false)), -wv);
+        break;
+    case QCss::LeftEdge:
+        wh = p->scaleToDevice(edgeData.width);
+        p1 = borderRect.topLeft()
+                + QPointF(0, adjustTopAnchor ? qFloor(prioritizedEdgeAnchorOffset(p, table, td, cellOrHeader, edgeData,
+                                                                                  forceHeaderRow != -1 ? QCss::BottomEdge : QCss::TopEdge,
+                                                                                  false, ignoreEdgesAbove))
+                                             : 0);
+        p2 = borderRect.bottomLeft()
+                + QPointF(0, adjustBottomAnchor ? -qCeil(prioritizedEdgeAnchorOffset(p, table, td, cell, edgeData, QCss::BottomEdge, true, false))
+                                                : 0);
+        break;
+    case QCss::RightEdge:
+        wh = p->scaleToDevice(edgeData.width);
+        p1 = borderRect.topRight()
+                + QPointF(-wh, adjustTopAnchor ? qFloor(prioritizedEdgeAnchorOffset(p, table, td, cellOrHeader, edgeData,
+                                                                                    forceHeaderRow != -1 ? QCss::BottomEdge : QCss::TopEdge,
+                                                                                    false, ignoreEdgesAbove))
+                                               : 0);
+        p2 = borderRect.bottomRight()
+                + QPointF(-wh, adjustBottomAnchor ? -qCeil(prioritizedEdgeAnchorOffset(p, table, td, cell, edgeData, QCss::BottomEdge, true, false))
+                                                  : 0);
+        break;
+    default: break;
+    }
+
+    // for borderCollapse move edge width/2 pixel out of the borderRect
+    // so that it shares space with the adjacent cell's edge.
+    // to avoid fractional offsets, qCeil/qFloor is used
+    if (td->borderCollapse) {
+        QPointF offset;
+        switch (edge) {
+        case QCss::TopEdge:
+            offset = QPointF(0, -qCeil(collapseOffset(p, edgeData)));
+            break;
+        case QCss::BottomEdge:
+            offset = QPointF(0, qFloor(collapseOffset(p, edgeData)));
+            break;
+        case QCss::LeftEdge:
+            offset = QPointF(-qCeil(collapseOffset(p, edgeData)), 0);
+            break;
+        case QCss::RightEdge:
+            offset = QPointF(qFloor(collapseOffset(p, edgeData)), 0);
+            break;
+        default: break;
+        }
+        p1 += offset;
+        p2 += offset;
+    }
+
+    QCss::BorderStyle cssStyle = static_cast<QCss::BorderStyle>(borderStyle + 1);
+
+// this reveals errors in the drawing logic
+#ifdef COLLAPSE_DEBUG
+    QColor c = brush.color();
+    c.setAlpha(150);
+    brush.setColor(c);
+#endif
+
+    qDrawEdge(painter, p1.x(), p1.y(), p2.x() + wh, p2.y() + wv, 0, 0, edge, cssStyle, brush);
+}
+#endif
+
+void QTextDocumentLayoutPrivate::drawTableCellBorder(const QRectF &cellRect, QPainter *painter,
+                                                     QTextTable *table, QTextTableData *td,
+                                                     const QTextTableCell &cell) const
+{
+#ifndef QT_NO_CSSPARSER
+    qreal topMarginAfterPageBreak = (td->effectiveTopMargin + td->cellSpacing + td->border).toReal();
+    qreal bottomMargin = (td->effectiveBottomMargin + td->cellSpacing + td->border).toReal();
+
+    const int headerRowCount = qMin(table->format().headerRowCount(), table->rows() - 1);
+    if (headerRowCount > 0 && cell.row() >= headerRowCount)
+        topMarginAfterPageBreak += td->headerHeight.toReal();
+
+    BorderPaginator paginator(document, cellRect, topMarginAfterPageBreak, bottomMargin, 0);
+
+    bool turn_off_antialiasing = !(painter->renderHints() & QPainter::Antialiasing);
+    painter->setRenderHint(QPainter::Antialiasing);
+
+    // paint cell borders for every page the cell appears on
+    for (int page = paginator.topPage; page <= paginator.bottomPage; ++page) {
+        const QRectF clipped = paginator.clipRect(page);
+        if (!clipped.isValid())
+            continue;
+
+        const qreal offset = cellRect.top() - td->rowPositions.at(cell.row()).toReal();
+        const int lastHeaderRow = table->format().headerRowCount() - 1;
+        const bool tableHasHeader = table->format().headerRowCount() > 0;
+        const bool isHeaderRow = cell.row() < table->format().headerRowCount();
+        const bool isFirstRow = cell.row() == lastHeaderRow + 1;
+        const bool isLastRow = cell.row() + cell.rowSpan() >= table->rows();
+        const bool previousRowOnPreviousPage = !isFirstRow
+                && !isHeaderRow
+                && BorderPaginator(document,
+                                   td->cellRect(adjacentCell(table, cell, QCss::TopEdge)).translated(0, offset),
+                                   topMarginAfterPageBreak,
+                                   bottomMargin,
+                                   0).bottomPage < page;
+        const bool nextRowOnNextPage = !isLastRow
+                && BorderPaginator(document,
+                                   td->cellRect(adjacentCell(table, cell, QCss::BottomEdge)).translated(0, offset),
+                                   topMarginAfterPageBreak,
+                                   bottomMargin,
+                                   0).topPage > page;
+        const bool rowStartsOnPage = page == paginator.topPage;
+        const bool rowEndsOnPage = page == paginator.bottomPage;
+        const bool rowStartsOnPageTop = !tableHasHeader
+                && rowStartsOnPage
+                && previousRowOnPreviousPage;
+        const bool rowStartsOnPageBelowHeader = tableHasHeader
+                && rowStartsOnPage
+                && previousRowOnPreviousPage;
+
+        const bool suppressTopBorder = td->borderCollapse
+                ? !isHeaderRow && (!rowStartsOnPage || rowStartsOnPageBelowHeader)
+                : !rowStartsOnPage;
+        const bool suppressBottomBorder = td->borderCollapse
+                ? !isHeaderRow && (!rowEndsOnPage || nextRowOnNextPage)
+                : !rowEndsOnPage;
+        const bool doNotAdjustTopAnchor = td->borderCollapse
+                ? !tableHasHeader && !rowStartsOnPage
+                : !rowStartsOnPage;
+        const bool doNotAdjustBottomAnchor = suppressBottomBorder;
+
+        if (!suppressTopBorder) {
+            drawCellBorder(this, painter, table, td, cell, clipped, QCss::TopEdge,
+                           -1, true, true, rowStartsOnPageTop);
+        }
+
+        drawCellBorder(this, painter, table, td, cell, clipped, QCss::LeftEdge,
+                       suppressTopBorder ? lastHeaderRow : -1,
+                       !doNotAdjustTopAnchor,
+                       !doNotAdjustBottomAnchor,
+                       rowStartsOnPageTop);
+        drawCellBorder(this, painter, table, td, cell, clipped, QCss::RightEdge,
+                       suppressTopBorder ? lastHeaderRow : -1,
+                       !doNotAdjustTopAnchor,
+                       !doNotAdjustBottomAnchor,
+                       rowStartsOnPageTop);
+
+        if (!suppressBottomBorder) {
+            drawCellBorder(this, painter, table, td, cell, clipped, QCss::BottomEdge,
+                           -1, true, true, false);
+        }
+    }
+
+    if (turn_off_antialiasing)
+        painter->setRenderHint(QPainter::Antialiasing, false);
+#else
+    Q_UNUSED(cell);
+    Q_UNUSED(cellRect);
+    Q_UNUSED(painter);
+    Q_UNUSED(table);
+    Q_UNUSED(td);
+    Q_UNUSED(cell);
+#endif
+}
+
 void QTextDocumentLayoutPrivate::drawTableCell(const QRectF &cellRect, QPainter *painter, const QAbstractTextDocumentLayout::PaintContext &cell_context,
                                                QTextTable *table, QTextTableData *td, int r, int c,
                                                QTextBlock *cursorBlockNeedingRepaint, QPointF *cursorBlockOffset) const
@@ -1095,9 +1845,8 @@ void QTextDocumentLayoutPrivate::drawTableCell(const QRectF &cellRect, QPainter
             return;
     }
 
-    QTextFormat fmt = cell.format();
-    const QFixed leftPadding = td->leftPadding(fmt);
-    const QFixed topPadding = td->topPadding(fmt);
+    const QFixed leftPadding = td->leftPadding(table, cell);
+    const QFixed topPadding = td->topPadding(table, cell);
 
     qreal topMargin = (td->effectiveTopMargin + td->cellSpacing + td->border).toReal();
     qreal bottomMargin = (td->effectiveBottomMargin + td->cellSpacing + td->border).toReal();
@@ -1106,7 +1855,7 @@ void QTextDocumentLayoutPrivate::drawTableCell(const QRectF &cellRect, QPainter
     if (r >= headerRowCount)
         topMargin += td->headerHeight.toReal();
 
-    if (td->border != 0) {
+    if (!td->borderCollapse && td->border != 0) {
         const QBrush oldBrush = painter->brush();
         const QPen oldPen = painter->pen();
 
@@ -1172,6 +1921,9 @@ void QTextDocumentLayoutPrivate::drawTableCell(const QRectF &cellRect, QPainter
             painter->setBrushOrigin(cellRect.topLeft());
     }
 
+    // paint over the background - otherwise we would have to adjust the background paint cellRect for the border values
+    drawTableCellBorder(cellRect, painter, table, td, cell);
+
     const QFixed verticalOffset = td->cellVerticalOffsets.at(c + r * table->columns());
 
     const QPointF cellPos = QPointF(cellRect.left() + leftPadding.toReal(),
@@ -1446,6 +2198,21 @@ void QTextDocumentLayoutPrivate::drawListItem(const QPointF &offset, QPainter *p
 
     QBrush brush = context.palette.brush(QPalette::Text);
 
+    bool marker = bl.blockFormat().marker() != QTextBlockFormat::MarkerType::NoMarker;
+    if (marker) {
+        int adj = fontMetrics.lineSpacing() / 6;
+        r.adjust(-adj, 0, -adj, 0);
+        if (bl.blockFormat().marker() == QTextBlockFormat::MarkerType::Checked) {
+            // ### Qt6: render with QStyle / PE_IndicatorCheckBox. We don't currently
+            // have access to that here, because it would be a widget dependency.
+            painter->setPen(QPen(painter->pen().color(), 2));
+            painter->drawLine(r.topLeft(), r.bottomRight());
+            painter->drawLine(r.topRight(), r.bottomLeft());
+            painter->setPen(QPen(painter->pen().color(), 0));
+        }
+        painter->drawRect(r.adjusted(-adj, -adj, adj, adj));
+    }
+
     switch (style) {
     case QTextListFormat::ListDecimal:
     case QTextListFormat::ListLowerAlpha:
@@ -1466,16 +2233,21 @@ void QTextDocumentLayoutPrivate::drawListItem(const QPointF &offset, QPainter *p
         break;
     }
     case QTextListFormat::ListSquare:
-        painter->fillRect(r, brush);
+        if (!marker)
+            painter->fillRect(r, brush);
         break;
     case QTextListFormat::ListCircle:
-        painter->setPen(QPen(brush, 0));
-        painter->drawEllipse(r.translated(0.5, 0.5)); // pixel align for sharper rendering
+        if (!marker) {
+            painter->setPen(QPen(brush, 0));
+            painter->drawEllipse(r.translated(0.5, 0.5)); // pixel align for sharper rendering
+        }
         break;
     case QTextListFormat::ListDisc:
-        painter->setBrush(brush);
-        painter->setPen(Qt::NoPen);
-        painter->drawEllipse(r);
+        if (!marker) {
+            painter->setBrush(brush);
+            painter->setPen(Qt::NoPen);
+            painter->drawEllipse(r);
+        }
         break;
     case QTextListFormat::ListStyleUndefined:
         break;
@@ -1519,8 +2291,7 @@ QTextLayoutStruct QTextDocumentLayoutPrivate::layoutCell(QTextTable *t, const QT
     layoutStruct.maximumWidth = QFIXED_MAX;
     layoutStruct.y = 0;
 
-    const QTextFormat fmt = cell.format();
-    const QFixed topPadding = td->topPadding(fmt);
+    const QFixed topPadding = td->topPadding(t, cell);
     if (withPageBreaks) {
         layoutStruct.frameY = absoluteTableY + td->rowPositions.at(cell.row()) + topPadding;
     }
@@ -1538,8 +2309,22 @@ QTextLayoutStruct QTextDocumentLayoutPrivate::layoutCell(QTextTable *t, const QT
     if (layoutStruct.pageHeight < 0 || !withPageBreaks)
         layoutStruct.pageHeight = QFIXED_MAX;
     const int currentPage = layoutStruct.currentPage();
-    layoutStruct.pageTopMargin = td->effectiveTopMargin + td->cellSpacing + td->border + topPadding;
-    layoutStruct.pageBottomMargin = td->effectiveBottomMargin + td->cellSpacing + td->border + td->bottomPadding(fmt);
+
+    layoutStruct.pageTopMargin = td->effectiveTopMargin
+            + td->cellSpacing
+            + td->border
+            + td->paddingProperty(cell.format(), QTextFormat::TableCellTopPadding); // top cell-border is not repeated
+
+#ifndef QT_NO_CSSPARSER
+    const int headerRowCount = t->format().headerRowCount();
+    if (td->borderCollapse && headerRowCount > 0) {
+        // consider the header row's bottom edge width
+        qreal headerRowBottomBorderWidth = axisEdgeData(t, td, t->cellAt(headerRowCount - 1, cell.column()), QCss::BottomEdge).width;
+        layoutStruct.pageTopMargin += QFixed::fromReal(scaleToDevice(headerRowBottomBorderWidth) / 2);
+    }
+#endif
+
+    layoutStruct.pageBottomMargin = td->effectiveBottomMargin + td->cellSpacing + td->effectiveBottomBorder + td->bottomPadding(t, cell);
     layoutStruct.pageBottom = (currentPage + 1) * layoutStruct.pageHeight - layoutStruct.pageBottomMargin;
 
     layoutStruct.fullLayout = true;
@@ -1585,6 +2370,17 @@ QTextLayoutStruct QTextDocumentLayoutPrivate::layoutCell(QTextTable *t, const QT
     return layoutStruct;
 }
 
+#ifndef QT_NO_CSSPARSER
+static inline void findWidestOutermostBorder(QTextTable *table, QTextTableData *td,
+                                             const QTextTableCell &cell, QCss::Edge edge,
+                                             qreal *outerBorders)
+{
+    EdgeData w = cellEdgeData(table, td, cell, edge);
+    if (w.width > outerBorders[edge])
+        outerBorders[edge] = w.width;
+}
+#endif
+
 QRectF QTextDocumentLayoutPrivate::layoutTable(QTextTable *table, int layoutFrom, int layoutTo, QFixed parentY)
 {
     qCDebug(lcTable) << "layoutTable from" << layoutFrom << "to" << layoutTo << "parentY" << parentY;
@@ -1601,7 +2397,7 @@ QRectF QTextDocumentLayoutPrivate::layoutTable(QTextTable *table, int layoutFrom
         for (int i = 0; i < children.count(); ++i) {
             QTextFrame *frame = children.at(i);
             QTextTableCell cell = table->cellAt(frame->firstPosition());
-            td->childFrameMap.insertMulti(cell.row() + cell.column() * rows, frame);
+            td->childFrameMap.insert(cell.row() + cell.column() * rows, frame);
         }
     }
 
@@ -1610,12 +2406,49 @@ QRectF QTextDocumentLayoutPrivate::layoutTable(QTextTable *table, int layoutFrom
         columnWidthConstraints.resize(columns);
     Q_ASSERT(columnWidthConstraints.count() == columns);
 
-    const QFixed cellSpacing = td->cellSpacing = QFixed::fromReal(scaleToDevice(fmt.cellSpacing()));
+    // borderCollapse will disable drawing the html4 style table cell borders
+    // and draw a 1px grid instead. This also sets a fixed cellspacing
+    // of 1px if border > 0 (for the grid) and ignore any explicitly set
+    // cellspacing.
+    td->borderCollapse = fmt.borderCollapse();
+    td->borderCell = td->borderCollapse ? 0 : td->border;
+    const QFixed cellSpacing = td->cellSpacing = QFixed::fromReal(scaleToDevice(td->borderCollapse ? 0 : fmt.cellSpacing())).round();
+
+    td->drawGrid = (td->borderCollapse && fmt.border() >= 1);
+
+    td->effectiveTopBorder = td->effectiveBottomBorder = td->effectiveLeftBorder = td->effectiveRightBorder = td->border;
+
+#ifndef QT_NO_CSSPARSER
+    if (td->borderCollapse) {
+        // find the widest borders of the outermost cells
+        qreal outerBorders[QCss::NumEdges];
+        for (int i = 0; i < QCss::NumEdges; ++i)
+            outerBorders[i] = 0;
+
+        for (int r = 0; r < rows; ++r) {
+            if (r == 0) {
+                for (int c = 0; c < columns; ++c)
+                    findWidestOutermostBorder(table, td, table->cellAt(r, c), QCss::TopEdge, outerBorders);
+            }
+            if (r == rows - 1) {
+                for (int c = 0; c < columns; ++c)
+                    findWidestOutermostBorder(table, td, table->cellAt(r, c), QCss::BottomEdge, outerBorders);
+            }
+            findWidestOutermostBorder(table, td, table->cellAt(r, 0), QCss::LeftEdge, outerBorders);
+            findWidestOutermostBorder(table, td, table->cellAt(r, columns - 1), QCss::RightEdge, outerBorders);
+        }
+        td->effectiveTopBorder = QFixed::fromReal(scaleToDevice(outerBorders[QCss::TopEdge] / 2)).round();
+        td->effectiveBottomBorder = QFixed::fromReal(scaleToDevice(outerBorders[QCss::BottomEdge] / 2)).round();
+        td->effectiveLeftBorder = QFixed::fromReal(scaleToDevice(outerBorders[QCss::LeftEdge] / 2)).round();
+        td->effectiveRightBorder = QFixed::fromReal(scaleToDevice(outerBorders[QCss::RightEdge] / 2)).round();
+    }
+#endif
+
     td->deviceScale = scaleToDevice(qreal(1));
     td->cellPadding = QFixed::fromReal(scaleToDevice(fmt.cellPadding()));
-    const QFixed leftMargin = td->leftMargin + td->border + td->padding;
-    const QFixed rightMargin = td->rightMargin + td->border + td->padding;
-    const QFixed topMargin = td->topMargin + td->border + td->padding;
+    const QFixed leftMargin = td->leftMargin + td->padding + td->effectiveLeftBorder;
+    const QFixed rightMargin = td->rightMargin + td->padding + td->effectiveRightBorder;
+    const QFixed topMargin = td->topMargin + td->padding + td->effectiveTopBorder;
 
     const QFixed absoluteTableY = parentY + td->position.y;
 
@@ -1625,11 +2458,17 @@ recalc_minmax_widths:
 
     QFixed remainingWidth = td->contentsWidth;
     // two (vertical) borders per cell per column
-    remainingWidth -= columns * 2 * td->border;
+    remainingWidth -= columns * 2 * td->borderCell;
     // inter-cell spacing
     remainingWidth -= (columns - 1) * cellSpacing;
     // cell spacing at the left and right hand side
     remainingWidth -= 2 * cellSpacing;
+
+    if (td->borderCollapse) {
+        remainingWidth -= td->effectiveLeftBorder;
+        remainingWidth -= td->effectiveRightBorder;
+    }
+
     // remember the width used to distribute to percentaged columns
     const QFixed initialTotalWidth = remainingWidth;
 
@@ -1654,9 +2493,8 @@ recalc_minmax_widths:
             if (cspan > 1 && i != cell.column())
                 continue;
 
-            const QTextFormat fmt = cell.format();
-            const QFixed leftPadding = td->leftPadding(fmt);
-            const QFixed rightPadding = td->rightPadding(fmt);
+            const QFixed leftPadding = td->leftPadding(table, cell);
+            const QFixed rightPadding = td->rightPadding(table, cell);
             const QFixed widthPadding = leftPadding + rightPadding;
 
             // to figure out the min and the max width lay out the cell at
@@ -1671,7 +2509,8 @@ recalc_minmax_widths:
             for (int n = 0; n < cspan; ++n) {
                 const int col = i + n;
                 QFixed w = widthToDistribute / (cspan - n);
-                td->minWidths[col] = qMax(td->minWidths.at(col), w);
+                // ceil to avoid going below minWidth when rounding all column widths later
+                td->minWidths[col] = qMax(td->minWidths.at(col), w).ceil();
                 widthToDistribute -= td->minWidths.at(col);
                 if (widthToDistribute <= 0)
                     break;
@@ -1687,6 +2526,12 @@ recalc_minmax_widths:
             if (maxW == QFIXED_MAX)
                 continue;
 
+            // for variable columns the maxWidth will later be considered as the
+            // column width (column width = content width). We must avoid that the
+            // pixel-alignment rounding step floors this value and thus the text
+            // rendering later erroneously wraps the content.
+            maxW = maxW.ceil();
+
             widthToDistribute = maxW;
             for (int n = 0; n < cspan; ++n) {
                 const int col = i + n;
@@ -1777,11 +2622,23 @@ recalc_minmax_widths:
         }
     }
 
+    // in order to get a correct border rendering we must ensure that the distance between
+    // two cells is exactly 2 * td->cellBorder pixel. we do this by rounding the calculated width
+    // values here.
+    // to minimize the total rounding error we propagate the rounding error for each width
+    // to its successor.
+    QFixed error = 0;
+    for (int i = 0; i < columns; ++i) {
+        QFixed orig = td->widths[i];
+        td->widths[i] = (td->widths[i] - error).round();
+        error = td->widths[i] - orig;
+    }
+
     td->columnPositions.resize(columns);
     td->columnPositions[0] = leftMargin /*includes table border*/ + cellSpacing + td->border;
 
     for (int i = 1; i < columns; ++i)
-        td->columnPositions[i] = td->columnPositions.at(i-1) + td->widths.at(i-1) + 2 * td->border + cellSpacing;
+        td->columnPositions[i] = td->columnPositions.at(i-1) + td->widths.at(i-1) + 2 * td->borderCell + cellSpacing;
 
     // - margin to compensate the + margin in columnPositions[0]
     const QFixed contentsWidth = td->columnPositions.constLast() + td->widths.constLast() + td->padding + td->border + cellSpacing - leftMargin;
@@ -1877,17 +2734,15 @@ relayout:
                 if (cellRow != r) {
                     // the last row gets all the remaining space
                     if (cellRow + rspan - 1 == r)
-                        td->heights[r] = qMax(td->heights.at(r), heightToDistribute.at(c) - dropDistance);
+                        td->heights[r] = qMax(td->heights.at(r), heightToDistribute.at(c) - dropDistance).round();
                     continue;
                 }
             }
 
-            const QTextFormat fmt = cell.format();
-
-            const QFixed topPadding = td->topPadding(fmt);
-            const QFixed bottomPadding = td->bottomPadding(fmt);
-            const QFixed leftPadding = td->leftPadding(fmt);
-            const QFixed rightPadding = td->rightPadding(fmt);
+            const QFixed topPadding = td->topPadding(table, cell);
+            const QFixed bottomPadding = td->bottomPadding(table, cell);
+            const QFixed leftPadding = td->leftPadding(table, cell);
+            const QFixed rightPadding = td->rightPadding(table, cell);
             const QFixed widthPadding = leftPadding + rightPadding;
 
             ++rowCellCount;
@@ -1898,7 +2753,7 @@ relayout:
                                                        td, absoluteTableY,
                                                        /*withPageBreaks =*/true);
 
-            const QFixed height = layoutStruct.y + bottomPadding + topPadding;
+            const QFixed height = (layoutStruct.y + bottomPadding + topPadding).round();
 
             if (rspan > 1)
                 heightToDistribute[c] = height + dropDistance;
@@ -1924,13 +2779,13 @@ relayout:
         }
 
         if (haveRowSpannedCells) {
-            const QFixed effectiveHeight = td->heights.at(r) + td->border + cellSpacing + td->border;
+            const QFixed effectiveHeight = td->heights.at(r) + td->borderCell + cellSpacing + td->borderCell;
             for (int c = 0; c < columns; ++c)
                 heightToDistribute[c] = qMax(heightToDistribute.at(c) - effectiveHeight - dropDistance, QFixed(0));
         }
 
         if (r == headerRowCount - 1) {
-            td->headerHeight = td->rowPositions.at(r) + td->heights.at(r) - td->rowPositions.at(0) + td->cellSpacing + 2 * td->border;
+            td->headerHeight = td->rowPositions.at(r) + td->heights.at(r) - td->rowPositions.at(0) + td->cellSpacing + 2 * td->borderCell;
             td->headerHeight -= td->headerHeight * (td->headerHeight / pageHeight).truncate();
             td->effectiveTopMargin += td->headerHeight;
         }
@@ -1952,7 +2807,7 @@ relayout:
             const QFixed availableHeight = td->rowPositions.at(r + rowSpan - 1) + td->heights.at(r + rowSpan - 1) - td->rowPositions.at(r);
 
             const QTextCharFormat cellFormat = cell.format();
-            const QFixed cellHeight = cellHeights.at(cellIndex++) + td->topPadding(cellFormat) + td->bottomPadding(cellFormat);
+            const QFixed cellHeight = cellHeights.at(cellIndex++) + td->topPadding(table, cell) + td->bottomPadding(table, cell);
 
             QFixed offset = 0;
             switch (cellFormat.verticalAlignment()) {
@@ -1977,14 +2832,14 @@ relayout:
 
     td->minimumWidth = td->columnPositions.at(0);
     for (int i = 0; i < columns; ++i) {
-        td->minimumWidth += td->minWidths.at(i) + 2 * td->border + cellSpacing;
+        td->minimumWidth += td->minWidths.at(i) + 2 * td->borderCell + cellSpacing;
     }
     td->minimumWidth += rightMargin - td->border;
 
     td->maximumWidth = td->columnPositions.at(0);
     for (int i = 0; i < columns; ++i) {
         if (td->maxWidths.at(i) != QFIXED_MAX)
-            td->maximumWidth += td->maxWidths.at(i) + 2 * td->border + cellSpacing;
+            td->maximumWidth += td->maxWidths.at(i) + 2 * td->borderCell + cellSpacing;
         qCDebug(lcTable) << "column" << i << "has final width" << td->widths.at(i).toReal()
                          << "min" << td->minWidths.at(i).toReal() << "max" << td->maxWidths.at(i).toReal();
     }
@@ -2092,24 +2947,24 @@ QRectF QTextDocumentLayoutPrivate::layoutFrame(QTextFrame *f, int layoutFrom, in
     {
         QTextFrameFormat fformat = f->frameFormat();
         // set sizes of this frame from the format
-        QFixed tm = QFixed::fromReal(fformat.topMargin());
+        QFixed tm = QFixed::fromReal(scaleToDevice(fformat.topMargin())).round();
         if (tm != fd->topMargin) {
             fd->topMargin = tm;
             fullLayout = true;
         }
-        QFixed bm = QFixed::fromReal(fformat.bottomMargin());
+        QFixed bm = QFixed::fromReal(scaleToDevice(fformat.bottomMargin())).round();
         if (bm != fd->bottomMargin) {
             fd->bottomMargin = bm;
             fullLayout = true;
         }
-        fd->leftMargin = QFixed::fromReal(fformat.leftMargin());
-        fd->rightMargin = QFixed::fromReal(fformat.rightMargin());
-        QFixed b = QFixed::fromReal(fformat.border());
+        fd->leftMargin = QFixed::fromReal(scaleToDevice(fformat.leftMargin())).round();
+        fd->rightMargin = QFixed::fromReal(scaleToDevice(fformat.rightMargin())).round();
+        QFixed b = QFixed::fromReal(scaleToDevice(fformat.border())).round();
         if (b != fd->border) {
             fd->border = b;
             fullLayout = true;
         }
-        QFixed p = QFixed::fromReal(fformat.padding());
+        QFixed p = QFixed::fromReal(scaleToDevice(fformat.padding())).round();
         if (p != fd->padding) {
             fd->padding = p;
             fullLayout = true;
@@ -3218,7 +4073,7 @@ QRectF QTextDocumentLayout::tableBoundingRect(QTextTable *table) const
             if (QTextTable *table = qobject_cast<QTextTable *>(f)) {
                 QTextTableCell cell = table->cellAt(framePos);
                 if (cell.isValid())
-                    pos += static_cast<QTextTableData *>(fd)->cellPosition(cell).toPointF();
+                    pos += static_cast<QTextTableData *>(fd)->cellPosition(table, cell).toPointF();
             }
         }
 
@@ -3248,7 +4103,7 @@ QRectF QTextDocumentLayoutPrivate::frameBoundingRectInternal(QTextFrame *frame)
         if (QTextTable *table = qobject_cast<QTextTable *>(f)) {
             QTextTableCell cell = table->cellAt(framePos);
             if (cell.isValid())
-                pos += static_cast<QTextTableData *>(fd)->cellPosition(cell).toPointF();
+                pos += static_cast<QTextTableData *>(fd)->cellPosition(table, cell).toPointF();
         }
 
         f = f->parentFrame();
@@ -3273,7 +4128,7 @@ QRectF QTextDocumentLayout::blockBoundingRect(const QTextBlock &block) const
         if (QTextTable *table = qobject_cast<QTextTable *>(frame)) {
             QTextTableCell cell = table->cellAt(blockPos);
             if (cell.isValid())
-                offset += static_cast<QTextTableData *>(fd)->cellPosition(cell).toPointF();
+                offset += static_cast<QTextTableData *>(fd)->cellPosition(table, cell).toPointF();
         }
 
         frame = frame->parentFrame();
diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp
index 42e623153a..193d2c0dd3 100644
--- a/src/gui/text/qtextdocumentwriter.cpp
+++ b/src/gui/text/qtextdocumentwriter.cpp
@@ -51,6 +51,9 @@
 
 #include "qtextdocumentfragment_p.h"
 #include "qtextodfwriter_p.h"
+#if QT_CONFIG(textmarkdownwriter)
+#include "qtextmarkdownwriter_p.h"
+#endif
 
 #include <algorithm>
 
@@ -267,6 +270,18 @@ bool QTextDocumentWriter::write(const QTextDocument *document)
     }
 #endif // QT_NO_TEXTODFWRITER
 
+#if QT_CONFIG(textmarkdownwriter)
+    if (format == "md" || format == "mkd" || format == "markdown") {
+        if (!d->device->isWritable() && !d->device->open(QIODevice::WriteOnly)) {
+            qWarning("QTextDocumentWriter::write: the device can not be opened for writing");
+            return false;
+        }
+        QTextStream s(d->device);
+        QTextMarkdownWriter writer(s, QTextDocument::MarkdownDialectGitHub);
+        return writer.writeAll(document);
+    }
+#endif // textmarkdownwriter
+
 #ifndef QT_NO_TEXTHTMLPARSER
     if (format == "html" || format == "htm") {
         if (!d->device->isWritable() && ! d->device->open(QIODevice::WriteOnly)) {
@@ -348,6 +363,7 @@ QTextCodec *QTextDocumentWriter::codec() const
     \header \li Format    \li Description
     \row    \li plaintext \li Plain text
     \row    \li HTML      \li HyperText Markup Language
+    \row    \li markdown  \li Markdown (CommonMark or GitHub dialects)
     \row    \li ODF       \li OpenDocument Format
     \endtable
 
@@ -364,6 +380,9 @@ QList<QByteArray> QTextDocumentWriter::supportedDocumentFormats()
 #ifndef QT_NO_TEXTODFWRITER
     answer << "ODF";
 #endif // QT_NO_TEXTODFWRITER
+#if QT_CONFIG(textmarkdownwriter)
+    answer << "markdown";
+#endif
 
     std::sort(answer.begin(), answer.end());
     return answer;
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index a7834587b1..209433dac5 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -989,7 +989,7 @@ struct QBidiAlgorithm {
             BIDI_DEBUG() << "before implicit level processing:";
             IsolatedRunSequenceIterator it(runs, i);
             while (!it.atEnd()) {
-                BIDI_DEBUG() << "    " << *it << hex << text[*it].unicode() << analysis[*it].bidiDirection;
+                BIDI_DEBUG() << "    " << *it << Qt::hex << text[*it].unicode() << analysis[*it].bidiDirection;
                 ++it;
             }
         }
@@ -1002,7 +1002,7 @@ struct QBidiAlgorithm {
             BIDI_DEBUG() << "after W4/W5";
             IsolatedRunSequenceIterator it(runs, i);
             while (!it.atEnd()) {
-                BIDI_DEBUG() << "    " << *it << hex << text[*it].unicode() << analysis[*it].bidiDirection;
+                BIDI_DEBUG() << "    " << *it << Qt::hex << text[*it].unicode() << analysis[*it].bidiDirection;
                 ++it;
             }
         }
@@ -1088,7 +1088,7 @@ struct QBidiAlgorithm {
         if (BidiDebugEnabled) {
             BIDI_DEBUG() << ">>>> start bidi, text length" << length;
             for (int i = 0; i < length; ++i)
-                BIDI_DEBUG() << hex << "    (" << i << ")" << text[i].unicode() << text[i].direction();
+                BIDI_DEBUG() << Qt::hex << "    (" << i << ")" << text[i].unicode() << text[i].direction();
         }
 
         {
@@ -1157,7 +1157,7 @@ struct QBidiAlgorithm {
         if (BidiDebugEnabled) {
             BIDI_DEBUG() << "final resolved levels:";
             for (int i = 0; i < length; ++i)
-                BIDI_DEBUG() << "    " << i << hex << text[i].unicode() << dec << (int)analysis[i].bidiLevel;
+                BIDI_DEBUG() << "    " << i << Qt::hex << text[i].unicode() << Qt::dec << (int)analysis[i].bidiLevel;
         }
 
         return true;
@@ -1968,7 +1968,9 @@ const QCharAttributes *QTextEngine::attributes() const
     QUnicodeTools::initCharAttributes(reinterpret_cast<const ushort *>(layoutData->string.constData()),
                                       layoutData->string.length(),
                                       scriptItems.data(), scriptItems.size(),
-                                      (QCharAttributes *)layoutData->memory);
+                                      (QCharAttributes *)layoutData->memory,
+                                      QUnicodeTools::CharAttributeOptions(QUnicodeTools::DefaultOptionsCompat
+                                                                          | QUnicodeTools::HangulLineBreakTailoring));
 
 
     layoutData->haveCharAttributes = true;
@@ -2123,22 +2125,7 @@ void QTextEngine::itemize() const
     }
 #if QT_CONFIG(harfbuzz)
     analysis = scriptAnalysis.data();
-    if (qt_useHarfbuzzNG()) {
-        // ### pretend HB-old behavior for now
-        for (int i = 0; i < length; ++i) {
-            switch (analysis[i].script) {
-            case QChar::Script_Latin:
-            case QChar::Script_Hiragana:
-            case QChar::Script_Katakana:
-            case QChar::Script_Bopomofo:
-            case QChar::Script_Han:
-                analysis[i].script = QChar::Script_Common;
-                break;
-            default:
-                break;
-            }
-        }
-    } else {
+    if (!qt_useHarfbuzzNG()) {
         for (int i = 0; i < length; ++i)
             analysis[i].script = hbscript_to_script(script_to_hbscript(analysis[i].script));
     }
@@ -3617,7 +3604,12 @@ int QTextEngine::positionInLigature(const QScriptItem *si, int end,
     int clusterLength = 0;
 
     if (si->analysis.script != QChar::Script_Common &&
-        si->analysis.script != QChar::Script_Greek) {
+        si->analysis.script != QChar::Script_Greek &&
+        si->analysis.script != QChar::Script_Latin &&
+        si->analysis.script != QChar::Script_Hiragana &&
+        si->analysis.script != QChar::Script_Katakana &&
+        si->analysis.script != QChar::Script_Bopomofo &&
+        si->analysis.script != QChar::Script_Han) {
         if (glyph_pos == -1)
             return si->position + end;
         else {
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index e9187ea605..fddda7f2f8 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -304,8 +304,8 @@ class QTextItemInt : public QTextItem
 {
 public:
     inline QTextItemInt()
-        : justified(false), underlineStyle(QTextCharFormat::NoUnderline), num_chars(0), chars(0),
-          logClusters(0), f(0), fontEngine(0)
+        : justified(false), underlineStyle(QTextCharFormat::NoUnderline), num_chars(0), chars(nullptr),
+          logClusters(nullptr), f(nullptr), fontEngine(nullptr)
     {}
     QTextItemInt(const QScriptItem &si, QFont *font, const QTextCharFormat &format = QTextCharFormat());
     QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars, int numChars, QFontEngine *fe,
@@ -335,7 +335,7 @@ public:
 
 struct QScriptItem
 {
-    Q_DECL_CONSTEXPR QScriptItem(int p, QScriptAnalysis a) Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QScriptItem(int p, QScriptAnalysis a) noexcept
         : position(p), analysis(a),
           num_glyphs(0), descent(-1), ascent(-1), leading(-1), width(-1),
           glyph_data_offset(0) {}
@@ -348,7 +348,7 @@ struct QScriptItem
     QFixed leading;
     QFixed width;
     int glyph_data_offset;
-    Q_DECL_CONSTEXPR QFixed height() const Q_DECL_NOTHROW { return ascent + descent; }
+    Q_DECL_CONSTEXPR QFixed height() const noexcept { return ascent + descent; }
 private:
     friend class QVector<QScriptItem>;
     QScriptItem() {}; // for QVector, don't use
@@ -484,7 +484,7 @@ public:
         return end - si->position;
     }
 
-    QFontEngine *fontEngine(const QScriptItem &si, QFixed *ascent = 0, QFixed *descent = 0, QFixed *leading = 0) const;
+    QFontEngine *fontEngine(const QScriptItem &si, QFixed *ascent = nullptr, QFixed *descent = nullptr, QFixed *leading = nullptr) const;
     QFont font(const QScriptItem &si) const;
     inline QFont font() const { return fnt; }
 
@@ -530,7 +530,7 @@ public:
     inline QTextFormatCollection *formatCollection() const {
         if (block.docHandle())
             return block.docHandle()->formatCollection();
-        return specialData ? specialData->formatCollection.data() : 0;
+        return specialData ? specialData->formatCollection.data() : nullptr;
     }
     QTextCharFormat format(const QScriptItem *si) const;
     inline QAbstractTextDocumentLayout *docLayout() const {
@@ -553,8 +553,8 @@ private:
         mutable int prevPosition;
         mutable int prevLength;
         inline void reset() {
-            prevFontEngine = 0;
-            prevScaledFontEngine = 0;
+            prevFontEngine = nullptr;
+            prevScaledFontEngine = nullptr;
             prevScript = -1;
             prevPosition = -1;
             prevLength = -1;
@@ -684,7 +684,7 @@ Q_DECLARE_TYPEINFO(QTextEngine::ItemDecoration, Q_MOVABLE_TYPE);
 struct QTextLineItemIterator
 {
     QTextLineItemIterator(QTextEngine *eng, int lineNum, const QPointF &pos = QPointF(),
-                          const QTextLayout::FormatRange *_selection = 0);
+                          const QTextLayout::FormatRange *_selection = nullptr);
 
     inline bool atEnd() const { return logicalItem >= nItems - 1; }
     inline bool atBeginning() const { return logicalItem <= 0; }
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 4a2985f74c..e3bd49a15e 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -564,6 +564,18 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
     \value BlockTrailingHorizontalRulerWidth The width of a horizontal ruler element.
     \value HeadingLevel     The level of a heading, for example 1 corresponds to an HTML H1 tag; otherwise 0.
                             This enum value has been added in Qt 5.12.
+    \value BlockCodeFence   The character that was used in the "fences" around a Markdown code block.
+                            If the code block was indented rather than fenced, the block should not have this property.
+                            This enum value has been added in Qt 5.14.
+
+    \value BlockQuoteLevel  The depth of nested quoting on this block: 1 means the block is a top-level block quote.
+                            Blocks that are not block quotes should not have this property.
+                            This enum value has been added in Qt 5.14.
+    \value BlockCodeLanguage The programming language in a preformatted or code block.
+                            Blocks that do not contain code should not have this property.
+                            This enum value has been added in Qt 5.14.
+    \value BlockMarker      The \l{QTextBlockFormat::MarkerType}{type of adornment} to be shown alongside the block.
+                            This enum value has been added in Qt 5.14.
 
     Character properties
 
@@ -638,6 +650,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
     \value TableColumns
     \value TableColumnWidthConstraints
     \value TableHeaderRowCount
+    \value TableBorderCollapse Specifies the \l QTextTableFormat::borderCollapse property.
 
     Table cell properties
 
@@ -648,9 +661,32 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
     \value TableCellTopPadding
     \value TableCellBottomPadding
 
+    Table cell properties intended for use with \l QTextTableFormat::borderCollapse enabled
+
+    \value TableCellTopBorder
+    \value TableCellBottomBorder
+    \value TableCellLeftBorder
+    \value TableCellRightBorder
+
+    \value TableCellTopBorderStyle
+    \value TableCellBottomBorderStyle
+    \value TableCellLeftBorderStyle
+    \value TableCellRightBorderStyle
+
+    \value TableCellTopBorderBrush
+    \value TableCellBottomBorderBrush
+    \value TableCellLeftBorderBrush
+    \value TableCellRightBorderBrush
+
     Image properties
 
-    \value ImageName
+    \value ImageName        The filename or source of the image.
+    \value ImageTitle       The title attribute of an HTML image tag, or
+                            the quoted string that comes after the URL in a Markdown image link.
+                            This enum value has been added in Qt 5.14.
+    \value ImageAltText     The alt attribute of an HTML image tag, or
+                            the image description in a Markdown image link.
+                            This enum value has been added in Qt 5.14.
     \value ImageWidth
     \value ImageHeight
     \value ImageQuality
@@ -2329,6 +2365,50 @@ QList<QTextOption::Tab> QTextBlockFormat::tabPositions() const
 
 
 /*!
+    \fn void QTextBlockFormat::setMarker(MarkerType marker)
+    \since 5.14
+
+    Sets the type of adornment that should be rendered alongside the paragraph to \a marker.
+    For example, a list item can be adorned with a checkbox, either checked
+    or unchecked, as a replacement for its bullet. The default is \c NoMarker.
+
+    \sa marker()
+*/
+
+
+/*!
+    \fn MarkerType QTextBlockFormat::marker() const
+    \since 5.14
+
+    Returns the paragraph's marker if one has been set, or \c NoMarker if not.
+
+    \sa setMarker()
+*/
+
+
+/*!
+    \since 5.14
+    \enum QTextBlockFormat::MarkerType
+
+    This enum describes the types of markers a list item can have.
+    If a list item (a paragraph for which \l QTextBlock::textList() returns the list)
+    has a marker, it is rendered instead of the normal bullet.
+    In this way, checkable list items can be mixed with plain list items in the
+    same list, overriding the type of bullet specified by the
+    \l QTextListFormat::style() for the entire list.
+
+    \value NoMarker This is the default: the list item's bullet will be shown.
+    \value Unchecked Instead of the list item's bullet, an unchecked checkbox will be shown.
+    \value Checked Instead of the list item's bullet, a checked checkbox will be shown.
+
+    In the future, this may be extended to specify other types of paragraph
+    decorations.
+
+    \sa QTextListFormat::style()
+*/
+
+
+/*!
     \fn void QTextBlockFormat::setLineHeight(qreal height, int heightType)
     \since 4.8
 
@@ -3038,6 +3118,8 @@ QTextTableFormat::QTextTableFormat(const QTextFormat &fmt)
 
     Sets the cell \a spacing for the table. This determines the distance
     between adjacent cells.
+
+    This property will be ignored if \l borderCollapse is enabled.
 */
 
 /*!
@@ -3089,6 +3171,44 @@ QTextTableFormat::QTextTableFormat(const QTextFormat &fmt)
 */
 
 /*!
+    \fn void QTextTableFormat::setBorderCollapse(bool borderCollapse)
+    \since 5.14
+
+    Enabling \a borderCollapse will have the following implications:
+    \list
+    \li The borders and grid of the table will be rendered following the
+        CSS table \c border-collapse: \c collapse rules
+    \li Setting the \c border property to a minimum value of \c 1 will render a
+        one pixel solid inner table grid using the \l borderBrush property and an
+        outer border as specified
+    \li The various border style properties of \l QTextTableCellFormat can be used to
+        customize the grid and have precedence over the border and grid of the table
+    \li The \l cellSpacing property will be ignored
+    \li For print pagination:
+        \list
+        \li Columns continued on a page will not have their top cell border rendered
+        \li Repeated header rows will always have their bottom cell border rendered
+        \endlist
+    \endlist
+
+    With borderCollapse disabled, cell borders can still be styled
+    using QTextTableCellFormat but styling will be applied only within
+    the cell's frame, which is probably not very useful in practice.
+
+    \sa setBorder(), setBorderBrush(), setBorderStyle()
+    \sa QTextTableCellFormat
+*/
+
+/*!
+    \fn bool QTextTableFormat::borderCollapse() const
+    \since 5.14
+
+    Returns true if borderCollapse is enabled.
+
+    \sa setBorderCollapse()
+*/
+
+/*!
     \fn void QTextFormat::setBackground(const QBrush &brush)
 
     Sets the brush use to paint the document's background to the
@@ -3427,6 +3547,228 @@ QTextImageFormat::QTextImageFormat(const QTextFormat &fmt)
 */
 
 /*!
+   \fn void QTextTableCellFormat::setTopBorder(qreal width)
+   \since 5.14
+
+   Sets the top border \a width of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn qreal QTextTableCellFormat::topBorder() const
+   \since 5.14
+
+   Returns the top border width of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setBottomBorder(qreal width)
+   \since 5.14
+
+   Sets the bottom border \a width of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn qreal QTextTableCellFormat::bottomBorder() const
+   \since 5.14
+
+   Returns the bottom border width of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setLeftBorder(qreal width)
+   \since 5.14
+
+   Sets the left border \a width of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn qreal QTextTableCellFormat::leftBorder() const
+   \since 5.14
+
+   Returns the left border width of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setRightBorder(qreal width)
+   \since 5.14
+
+   Sets the right border \a width of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn qreal QTextTableCellFormat::rightBorder() const
+   \since 5.14
+
+   Returns the right border width of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setBorder(qreal width)
+   \since 5.14
+
+   Sets the left, right, top, and bottom border \a width of the table cell.
+
+   \sa setLeftBorder(), setRightBorder(), setTopBorder(), setBottomBorder()
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setTopBorderStyle(QTextFrameFormat::BorderStyle style)
+   \since 5.14
+
+   Sets the top border \a style of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn QTextFrameFormat::BorderStyle QTextTableCellFormat::topBorderStyle() const
+   \since 5.14
+
+   Returns the top border style of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setBottomBorderStyle(QTextFrameFormat::BorderStyle style)
+   \since 5.14
+
+   Sets the bottom border \a style of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn QTextFrameFormat::BorderStyle QTextTableCellFormat::bottomBorderStyle() const
+   \since 5.14
+
+   Returns the bottom border style of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setLeftBorderStyle(QTextFrameFormat::BorderStyle style)
+   \since 5.14
+
+   Sets the left border \a style of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn QTextFrameFormat::BorderStyle QTextTableCellFormat::leftBorderStyle() const
+   \since 5.14
+
+   Returns the left border style of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setRightBorderStyle(QTextFrameFormat::BorderStyle style)
+   \since 5.14
+
+   Sets the right border \a style of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn QTextFrameFormat::BorderStyle QTextTableCellFormat::rightBorderStyle() const
+   \since 5.14
+
+   Returns the right border style of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setBorderStyle(QTextFrameFormat::BorderStyle style)
+   \since 5.14
+
+   Sets the left, right, top, and bottom border \a style of the table cell.
+
+   \sa setLeftBorderStyle(), setRightBorderStyle(), setTopBorderStyle(), setBottomBorderStyle()
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setTopBorderBrush(const QBrush &brush)
+   \since 5.14
+
+   Sets the top border \a brush of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn QBrush QTextTableCellFormat::topBorderBrush() const
+   \since 5.14
+
+   Returns the top border brush of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setBottomBorderBrush(const QBrush &brush)
+   \since 5.14
+
+   Sets the bottom border \a brush of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn QBrush QTextTableCellFormat::bottomBorderBrush() const
+   \since 5.14
+
+   Returns the bottom border brush of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setLeftBorderBrush(const QBrush &brush)
+   \since 5.14
+
+   Sets the left border \a brush of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn QBrush QTextTableCellFormat::leftBorderBrush() const
+   \since 5.14
+
+   Returns the left border brush of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setRightBorderBrush(const QBrush &brush)
+   \since 5.14
+
+   Sets the right border \a brush of the table cell.
+
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
+   \fn QBrush QTextTableCellFormat::rightBorderBrush() const
+   \since 5.14
+
+   Returns the right border brush of the table cell.
+*/
+
+/*!
+   \fn void QTextTableCellFormat::setBorderBrush(const QBrush &brush)
+   \since 5.14
+
+   Sets the left, right, top, and bottom border \a brush of the table cell.
+
+   \sa setLeftBorderBrush(), setRightBorderBrush(), setTopBorderBrush(), setBottomBorderBrush()
+   \sa QTextTableFormat::setBorderCollapse
+*/
+
+/*!
     \fn bool QTextTableCellFormat::isValid() const
     \since 4.4
 
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h
index 80d8e82694..28da0fe344 100644
--- a/src/gui/text/qtextformat.h
+++ b/src/gui/text/qtextformat.h
@@ -176,6 +176,10 @@ public:
         BlockNonBreakableLines = 0x1050,
         BlockTrailingHorizontalRulerWidth = 0x1060,
         HeadingLevel = 0x1070,
+        BlockQuoteLevel = 0x1080,
+        BlockCodeLanguage = 0x1090,
+        BlockCodeFence = 0x1091,
+        BlockMarker = 0x10A0,
 
         // character properties
         FirstFontProperty = 0x1FE0,
@@ -238,6 +242,7 @@ public:
         TableCellSpacing = 0x4102,
         TableCellPadding = 0x4103,
         TableHeaderRowCount = 0x4104,
+        TableBorderCollapse = 0x4105,
 
         // table cell properties
         TableCellRowSpan = 0x4810,
@@ -248,8 +253,25 @@ public:
         TableCellLeftPadding = 0x4814,
         TableCellRightPadding = 0x4815,
 
+        TableCellTopBorder = 0x4816,
+        TableCellBottomBorder = 0x4817,
+        TableCellLeftBorder = 0x4818,
+        TableCellRightBorder = 0x4819,
+
+        TableCellTopBorderStyle = 0x481a,
+        TableCellBottomBorderStyle = 0x481b,
+        TableCellLeftBorderStyle = 0x481c,
+        TableCellRightBorderStyle = 0x481d,
+
+        TableCellTopBorderBrush = 0x481e,
+        TableCellBottomBorderBrush = 0x481f,
+        TableCellLeftBorderBrush = 0x4820,
+        TableCellRightBorderBrush = 0x4821,
+
         // image properties
         ImageName = 0x5000,
+        ImageTitle = 0x5001,
+        ImageAltText = 0x5002,
         ImageWidth = 0x5010,
         ImageHeight = 0x5011,
         ImageQuality = 0x5014,
@@ -605,6 +627,12 @@ public:
         LineDistanceHeight = 4
     };
 
+    enum class MarkerType {
+        NoMarker = 0,
+        Unchecked = 1,
+        Checked = 2
+    };
+
     QTextBlockFormat();
 
     bool isValid() const { return isBlockFormat(); }
@@ -668,6 +696,11 @@ public:
     void setTabPositions(const QList<QTextOption::Tab> &tabs);
     QList<QTextOption::Tab> tabPositions() const;
 
+    inline void setMarker(MarkerType marker)
+    { setProperty(BlockMarker, int(marker)); }
+    inline MarkerType marker() const
+    { return MarkerType(intProperty(BlockMarker)); }
+
 protected:
     explicit QTextBlockFormat(const QTextFormat &fmt);
     friend class QTextFormat;
@@ -949,6 +982,11 @@ public:
     inline int headerRowCount() const
     { return intProperty(TableHeaderRowCount); }
 
+    inline void setBorderCollapse(bool borderCollapse)
+    { setProperty(TableBorderCollapse, borderCollapse); }
+    inline bool borderCollapse() const
+    { return boolProperty(TableBorderCollapse); }
+
 protected:
     explicit QTextTableFormat(const QTextFormat &fmt);
     friend class QTextFormat;
@@ -990,6 +1028,72 @@ public:
 
     inline void setPadding(qreal padding);
 
+    inline void setTopBorder(qreal width)
+    { setProperty(TableCellTopBorder, width); }
+    inline qreal topBorder() const
+    { return doubleProperty(TableCellTopBorder); }
+
+    inline void setBottomBorder(qreal width)
+    { setProperty(TableCellBottomBorder, width); }
+    inline qreal bottomBorder() const
+    { return doubleProperty(TableCellBottomBorder); }
+
+    inline void setLeftBorder(qreal width)
+    { setProperty(TableCellLeftBorder, width); }
+    inline qreal leftBorder() const
+    { return doubleProperty(TableCellLeftBorder); }
+
+    inline void setRightBorder(qreal width)
+    { setProperty(TableCellRightBorder, width); }
+    inline qreal rightBorder() const
+    { return doubleProperty(TableCellRightBorder); }
+
+    inline void setBorder(qreal width);
+
+    inline void setTopBorderStyle(QTextFrameFormat::BorderStyle style)
+    { setProperty(TableCellTopBorderStyle, style); }
+    inline QTextFrameFormat::BorderStyle topBorderStyle() const
+    { return static_cast<QTextFrameFormat::BorderStyle>(intProperty(TableCellTopBorderStyle)); }
+
+    inline void setBottomBorderStyle(QTextFrameFormat::BorderStyle style)
+    { setProperty(TableCellBottomBorderStyle, style); }
+    inline QTextFrameFormat::BorderStyle bottomBorderStyle() const
+    { return static_cast<QTextFrameFormat::BorderStyle>(intProperty(TableCellBottomBorderStyle)); }
+
+    inline void setLeftBorderStyle(QTextFrameFormat::BorderStyle style)
+    { setProperty(TableCellLeftBorderStyle, style); }
+    inline QTextFrameFormat::BorderStyle leftBorderStyle() const
+    { return static_cast<QTextFrameFormat::BorderStyle>(intProperty(TableCellLeftBorderStyle)); }
+
+    inline void setRightBorderStyle(QTextFrameFormat::BorderStyle style)
+    { setProperty(TableCellRightBorderStyle, style); }
+    inline QTextFrameFormat::BorderStyle rightBorderStyle() const
+    { return static_cast<QTextFrameFormat::BorderStyle>(intProperty(TableCellRightBorderStyle)); }
+
+    inline void setBorderStyle(QTextFrameFormat::BorderStyle style);
+
+    inline void setTopBorderBrush(const QBrush &brush)
+    { setProperty(TableCellTopBorderBrush, brush); }
+    inline QBrush topBorderBrush() const
+    { return brushProperty(TableCellTopBorderBrush); }
+
+    inline void setBottomBorderBrush(const QBrush &brush)
+    { setProperty(TableCellBottomBorderBrush, brush); }
+    inline QBrush bottomBorderBrush() const
+    { return brushProperty(TableCellBottomBorderBrush); }
+
+    inline void setLeftBorderBrush(const QBrush &brush)
+    { setProperty(TableCellLeftBorderBrush, brush); }
+    inline QBrush leftBorderBrush() const
+    { return brushProperty(TableCellLeftBorderBrush); }
+
+    inline void setRightBorderBrush(const QBrush &brush)
+    { setProperty(TableCellRightBorderBrush, brush); }
+    inline QBrush rightBorderBrush() const
+    { return brushProperty(TableCellRightBorderBrush); }
+
+    inline void setBorderBrush(const QBrush &brush);
+
 protected:
     explicit QTextTableCellFormat(const QTextFormat &fmt);
     friend class QTextFormat;
@@ -1045,6 +1149,29 @@ inline void QTextTableCellFormat::setPadding(qreal padding)
     setRightPadding(padding);
 }
 
+inline void QTextTableCellFormat::setBorder(qreal width)
+{
+    setTopBorder(width);
+    setBottomBorder(width);
+    setLeftBorder(width);
+    setRightBorder(width);
+}
+
+inline void QTextTableCellFormat::setBorderStyle(QTextFrameFormat::BorderStyle style)
+{
+    setTopBorderStyle(style);
+    setBottomBorderStyle(style);
+    setLeftBorderStyle(style);
+    setRightBorderStyle(style);
+}
+
+inline void QTextTableCellFormat::setBorderBrush(const QBrush &brush)
+{
+    setTopBorderBrush(brush);
+    setBottomBorderBrush(brush);
+    setLeftBorderBrush(brush);
+    setRightBorderBrush(brush);
+}
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 929db40e5d..5d37982a8b 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -491,12 +491,19 @@ QTextHtmlParserNode::QTextHtmlParserNode()
       listStyle(QTextListFormat::ListStyleUndefined), imageWidth(-1), imageHeight(-1), tableBorder(0),
       tableCellRowSpan(1), tableCellColSpan(1), tableCellSpacing(2), tableCellPadding(0),
       borderBrush(Qt::darkGray), borderStyle(QTextFrameFormat::BorderStyle_Outset),
+      borderCollapse(false),
       userState(-1), cssListIndent(0), wsm(WhiteSpaceModeUndefined)
 {
     margin[QTextHtmlParser::MarginLeft] = 0;
     margin[QTextHtmlParser::MarginRight] = 0;
     margin[QTextHtmlParser::MarginTop] = 0;
     margin[QTextHtmlParser::MarginBottom] = 0;
+
+    for (int i = 0; i < 4; ++i) {
+        tableCellBorderStyle[i] = QTextFrameFormat::BorderStyle_None;
+        tableCellBorder[i] = 0;
+        tableCellBorderBrush[i] = Qt::NoBrush;
+    }
 }
 
 void QTextHtmlParser::dumpHtml()
@@ -649,7 +656,7 @@ void QTextHtmlParser::parseTag()
         parseExclamationTag();
         if (nodes.last().wsm != QTextHtmlParserNode::WhiteSpacePre
             && nodes.last().wsm != QTextHtmlParserNode::WhiteSpacePreWrap
-            && !textEditMode)
+                && !textEditMode)
             eatSpace();
         return;
     }
@@ -717,7 +724,8 @@ void QTextHtmlParser::parseTag()
     // in a white-space preserving environment strip off a initial newline
     // since the element itself already generates a newline
     if ((node->wsm == QTextHtmlParserNode::WhiteSpacePre
-         || node->wsm == QTextHtmlParserNode::WhiteSpacePreWrap)
+         || node->wsm == QTextHtmlParserNode::WhiteSpacePreWrap
+         || node->wsm == QTextHtmlParserNode::WhiteSpacePreLine)
         && node->isBlock()) {
         if (pos < len - 1 && txt.at(pos) == QLatin1Char('\n'))
             ++pos;
@@ -761,7 +769,8 @@ void QTextHtmlParser::parseCloseTag()
     // in a new block for elements following the <pre>
     // ...foo\n</pre><p>blah -> foo</pre><p>blah
     if ((at(p).wsm == QTextHtmlParserNode::WhiteSpacePre
-         || at(p).wsm == QTextHtmlParserNode::WhiteSpacePreWrap)
+         || at(p).wsm == QTextHtmlParserNode::WhiteSpacePreWrap
+         || at(p).wsm == QTextHtmlParserNode::WhiteSpacePreLine)
         && at(p).isBlock()) {
         if (at(last()).text.endsWith(QLatin1Char('\n')))
             nodes[last()].text.chop(1);
@@ -1125,6 +1134,7 @@ void QTextHtmlParserNode::initializeProperties(const QTextHtmlParserNode *parent
             margin[QTextHtmlParser::MarginBottom] = 12;
             margin[QTextHtmlParser::MarginLeft] = 40;
             margin[QTextHtmlParser::MarginRight] = 40;
+            blockFormat.setProperty(QTextFormat::BlockQuoteLevel, 1);
             break;
         case Html_dl:
             margin[QTextHtmlParser::MarginTop] = 8;
@@ -1166,6 +1176,25 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
     QCss::ValueExtractor extractor(declarations);
     extractor.extractBox(margin, padding);
 
+    if (id == Html_td || id == Html_th) {
+        QCss::BorderStyle cssStyles[4];
+        int cssBorder[4];
+        QSize cssRadii[4]; // unused
+        for (int i = 0; i < 4; ++i) {
+            cssStyles[i] = QCss::BorderStyle_None;
+            cssBorder[i] = 0;
+        }
+        // this will parse (and cache) "border-width" as a list so the
+        // QCss::BorderWidth parsing below which expects a single value
+        // will not work as expected - which in this case does not matter
+        // because tableBorder is not relevant for cells.
+        extractor.extractBorder(cssBorder, tableCellBorderBrush, cssStyles, cssRadii);
+        for (int i = 0; i < 4; ++i) {
+            tableCellBorderStyle[i] = static_cast<QTextFrameFormat::BorderStyle>(cssStyles[i] - 1);
+            tableCellBorder[i] = static_cast<qreal>(cssBorder[i]);
+        }
+    }
+
     for (int i = 0; i < declarations.count(); ++i) {
         const QCss::Declaration &decl = declarations.at(i);
         if (decl.d->values.isEmpty()) continue;
@@ -1183,6 +1212,9 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
         case QCss::BorderWidth:
             tableBorder = extractor.lengthValue(decl);
             break;
+        case QCss::BorderCollapse:
+            borderCollapse = decl.borderCollapseValue();
+            break;
         case QCss::Color: charFormat.setForeground(decl.colorValue()); break;
         case QCss::Float:
             cssFloat = QTextFrameFormat::InFlow;
@@ -1277,6 +1309,7 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
             case QCss::Value_Pre: wsm = QTextHtmlParserNode::WhiteSpacePre; break;
             case QCss::Value_NoWrap: wsm = QTextHtmlParserNode::WhiteSpaceNoWrap; break;
             case QCss::Value_PreWrap: wsm = QTextHtmlParserNode::WhiteSpacePreWrap; break;
+            case QCss::Value_PreLine: wsm = QTextHtmlParserNode::WhiteSpacePreLine; break;
             default: break;
             }
             break;
@@ -1334,6 +1367,17 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
             default: break;
             }
             break;
+
+        case QCss::QtForegroundTextureCacheKey:
+        {
+            if (resourceProvider != nullptr && resourceProvider->docHandle() != nullptr) {
+                bool ok;
+                qint64 searchKey = decl.d->values.first().variant.toLongLong(&ok);
+                if (ok)
+                    applyForegroundImage(searchKey, resourceProvider);
+            }
+            break;
+        }
         default: break;
         }
     }
@@ -1366,6 +1410,37 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
 
 #endif // QT_NO_CSSPARSER
 
+void QTextHtmlParserNode::applyForegroundImage(qint64 searchKey, const QTextDocument *resourceProvider)
+{
+    QTextDocumentPrivate *priv = resourceProvider->docHandle();
+    for (int i = 0; i < priv->formats.numFormats(); ++i) {
+        QTextCharFormat format = priv->formats.charFormat(i);
+        if (format.isValid()) {
+            QBrush brush = format.foreground();
+            if (brush.style() == Qt::TexturePattern) {
+                const bool isPixmap = qHasPixmapTexture(brush);
+
+                if (isPixmap && QCoreApplication::instance()->thread() != QThread::currentThread()) {
+                    qWarning("Can't apply QPixmap outside of GUI thread");
+                    return;
+                }
+
+                const qint64 cacheKey = isPixmap ? brush.texture().cacheKey() : brush.textureImage().cacheKey();
+                if (cacheKey == searchKey) {
+                    QBrush b;
+                    if (isPixmap)
+                        b.setTexture(brush.texture());
+                    else
+                        b.setTextureImage(brush.textureImage());
+                    b.setStyle(Qt::TexturePattern);
+                    charFormat.setForeground(b);
+                }
+            }
+        }
+    }
+
+}
+
 void QTextHtmlParserNode::applyBackgroundImage(const QString &url, const QTextDocument *resourceProvider)
 {
     if (!url.isEmpty() && resourceProvider) {
@@ -1564,6 +1639,10 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes)
                 } else if (key == QLatin1String("height")) {
                     node->imageHeight = -2; // register that there is a value for it.
                     setFloatAttribute(&node->imageHeight, value);
+                } else if (key == QLatin1String("alt")) {
+                    node->imageAlt = value;
+                } else if (key == QLatin1String("title")) {
+                    node->text = value;
                 }
                 break;
             case Html_tr:
@@ -1604,6 +1683,11 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes)
                     if (!c.isValid())
                         qWarning("QTextHtmlParser::applyAttributes: Unknown color name '%s'",value.toLatin1().constData());
                     node->charFormat.setBackground(c);
+                } else if (key == QLatin1String("bordercolor")) {
+                    QColor c; c.setNamedColor(value);
+                    if (!c.isValid())
+                        qWarning("QTextHtmlParser::applyAttributes: Unknown color name '%s'",value.toLatin1().constData());
+                    node->borderBrush = c;
                 } else if (key == QLatin1String("background")) {
                     node->applyBackgroundImage(value, resourceProvider);
                 } else if (key == QLatin1String("cellspacing")) {
@@ -1639,6 +1723,10 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes)
                 else if (key == QLatin1String("type"))
                     linkType = value;
                 break;
+            case Html_pre:
+                if (key == QLatin1String("class") && value.startsWith(QLatin1String("language-")))
+                    node->blockFormat.setProperty(QTextFormat::BlockCodeLanguage, value.mid(9));
+                break;
             default:
                 break;
         }
diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
index 73dac38b82..31f558709f 100644
--- a/src/gui/text/qtexthtmlparser_p.h
+++ b/src/gui/text/qtexthtmlparser_p.h
@@ -158,6 +158,7 @@ struct QTextHtmlParserNode {
         WhiteSpacePre,
         WhiteSpaceNoWrap,
         WhiteSpacePreWrap,
+        WhiteSpacePreLine,
         WhiteSpaceModeUndefined = -1
     };
 
@@ -184,6 +185,7 @@ struct QTextHtmlParserNode {
     QString textListNumberPrefix;
     QString textListNumberSuffix;
     QString imageName;
+    QString imageAlt;
     qreal imageWidth;
     qreal imageHeight;
     QTextLength width;
@@ -193,8 +195,12 @@ struct QTextHtmlParserNode {
     int tableCellColSpan;
     qreal tableCellSpacing;
     qreal tableCellPadding;
+    qreal tableCellBorder[4];
+    QBrush tableCellBorderBrush[4];
+    QTextFrameFormat::BorderStyle tableCellBorderStyle[4];
     QBrush borderBrush;
     QTextFrameFormat::BorderStyle borderStyle;
+    bool borderCollapse;
     int userState;
 
     int cssListIndent;
@@ -250,6 +256,7 @@ struct QTextHtmlParserNode {
     void setListStyle(const QVector<QCss::Value> &cssValues);
 #endif
 
+    void applyForegroundImage(qint64 cacheKey, const QTextDocument *resourceProvider);
     void applyBackgroundImage(const QString &url, const QTextDocument *resourceProvider);
 
     bool hasOnlyWhitespace() const;
@@ -287,6 +294,10 @@ public:
     inline int leftPadding(int i) const { return at(i).padding[MarginLeft]; }
     inline int rightPadding(int i) const { return at(i).padding[MarginRight]; }
 
+    inline qreal tableCellBorder(int i, int edge) const { return at(i).tableCellBorder[edge]; }
+    inline QTextFrameFormat::BorderStyle tableCellBorderStyle(int i, int edge) const { return at(i).tableCellBorderStyle[edge]; }
+    inline QBrush tableCellBorderBrush(int i, int edge) const { return at(i).tableCellBorderBrush[edge]; }
+
     void dumpHtml();
 
     void parse(const QString &text, const QTextDocument *resourceProvider);
diff --git a/src/gui/text/qtextimagehandler_p.h b/src/gui/text/qtextimagehandler_p.h
index 339ef0af4f..fafd394ad3 100644
--- a/src/gui/text/qtextimagehandler_p.h
+++ b/src/gui/text/qtextimagehandler_p.h
@@ -65,7 +65,7 @@ class Q_GUI_EXPORT QTextImageHandler : public QObject,
     Q_OBJECT
     Q_INTERFACES(QTextObjectInterface)
 public:
-    explicit QTextImageHandler(QObject *parent = 0);
+    explicit QTextImageHandler(QObject *parent = nullptr);
 
     virtual QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) override;
     virtual void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) override;
diff --git a/src/gui/text/qtextmarkdownimporter.cpp b/src/gui/text/qtextmarkdownimporter.cpp
new file mode 100644
index 0000000000..fe7e422923
--- /dev/null
+++ b/src/gui/text/qtextmarkdownimporter.cpp
@@ -0,0 +1,568 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtextmarkdownimporter_p.h"
+#include "qtextdocumentfragment_p.h"
+#include <QLoggingCategory>
+#if QT_CONFIG(regularexpression)
+#include <QRegularExpression>
+#endif
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextDocumentFragment>
+#include <QTextList>
+#include <QTextTable>
+#include "../../3rdparty/md4c/md4c.h"
+
+QT_BEGIN_NAMESPACE
+
+Q_LOGGING_CATEGORY(lcMD, "qt.text.markdown")
+
+static const QChar Newline = QLatin1Char('\n');
+static const QChar Space = QLatin1Char(' ');
+
+// TODO maybe eliminate the margins after all views recognize BlockQuoteLevel, CSS can format it, etc.
+static const int BlockQuoteIndent = 40; // pixels, same as in QTextHtmlParserNode::initializeProperties
+
+// --------------------------------------------------------
+// MD4C callback function wrappers
+
+static int CbEnterBlock(MD_BLOCKTYPE type, void *detail, void *userdata)
+{
+    QTextMarkdownImporter *mdi = static_cast<QTextMarkdownImporter *>(userdata);
+    return mdi->cbEnterBlock(int(type), detail);
+}
+
+static int CbLeaveBlock(MD_BLOCKTYPE type, void *detail, void *userdata)
+{
+    QTextMarkdownImporter *mdi = static_cast<QTextMarkdownImporter *>(userdata);
+    return mdi->cbLeaveBlock(int(type), detail);
+}
+
+static int CbEnterSpan(MD_SPANTYPE type, void *detail, void *userdata)
+{
+    QTextMarkdownImporter *mdi = static_cast<QTextMarkdownImporter *>(userdata);
+    return mdi->cbEnterSpan(int(type), detail);
+}
+
+static int CbLeaveSpan(MD_SPANTYPE type, void *detail, void *userdata)
+{
+    QTextMarkdownImporter *mdi = static_cast<QTextMarkdownImporter *>(userdata);
+    return mdi->cbLeaveSpan(int(type), detail);
+}
+
+static int CbText(MD_TEXTTYPE type, const MD_CHAR *text, MD_SIZE size, void *userdata)
+{
+    QTextMarkdownImporter *mdi = static_cast<QTextMarkdownImporter *>(userdata);
+    return mdi->cbText(int(type), text, size);
+}
+
+static void CbDebugLog(const char *msg, void *userdata)
+{
+    Q_UNUSED(userdata)
+    qCDebug(lcMD) << msg;
+}
+
+// MD4C callback function wrappers
+// --------------------------------------------------------
+
+static Qt::Alignment MdAlignment(MD_ALIGN a, Qt::Alignment defaultAlignment = Qt::AlignLeft | Qt::AlignVCenter)
+{
+    switch (a) {
+    case MD_ALIGN_LEFT:
+        return Qt::AlignLeft | Qt::AlignVCenter;
+    case MD_ALIGN_CENTER:
+        return Qt::AlignHCenter | Qt::AlignVCenter;
+    case MD_ALIGN_RIGHT:
+        return Qt::AlignRight | Qt::AlignVCenter;
+    default: // including MD_ALIGN_DEFAULT
+        return defaultAlignment;
+    }
+}
+
+QTextMarkdownImporter::QTextMarkdownImporter(QTextMarkdownImporter::Features features)
+  : m_monoFont(QFontDatabase::systemFont(QFontDatabase::FixedFont))
+  , m_features(features)
+{
+}
+
+void QTextMarkdownImporter::import(QTextDocument *doc, const QString &markdown)
+{
+    MD_PARSER callbacks = {
+        0, // abi_version
+        unsigned(m_features),
+        &CbEnterBlock,
+        &CbLeaveBlock,
+        &CbEnterSpan,
+        &CbLeaveSpan,
+        &CbText,
+        &CbDebugLog,
+        nullptr // syntax
+    };
+    m_doc = doc;
+    m_paragraphMargin = m_doc->defaultFont().pointSize() * 2 / 3;
+    m_cursor = new QTextCursor(doc);
+    doc->clear();
+    qCDebug(lcMD) << "default font" << doc->defaultFont() << "mono font" << m_monoFont;
+    QByteArray md = markdown.toUtf8();
+    md_parse(md.constData(), MD_SIZE(md.size()), &callbacks, this);
+    delete m_cursor;
+    m_cursor = nullptr;
+}
+
+int QTextMarkdownImporter::cbEnterBlock(int blockType, void *det)
+{
+    m_blockType = blockType;
+    switch (blockType) {
+    case MD_BLOCK_P:
+        if (!m_listStack.isEmpty())
+            qCDebug(lcMD, m_listItem ? "P of LI at level %d"  : "P continuation inside LI at level %d", m_listStack.count());
+        else
+            qCDebug(lcMD, "P");
+        m_needsInsertBlock = true;
+        break;
+    case MD_BLOCK_QUOTE:
+        ++m_blockQuoteDepth;
+        qCDebug(lcMD, "QUOTE level %d", m_blockQuoteDepth);
+        break;
+    case MD_BLOCK_CODE: {
+        MD_BLOCK_CODE_DETAIL *detail = static_cast<MD_BLOCK_CODE_DETAIL *>(det);
+        m_codeBlock = true;
+        m_blockCodeLanguage = QLatin1String(detail->lang.text, int(detail->lang.size));
+        m_blockCodeFence = detail->fence_char;
+        QString info = QLatin1String(detail->info.text, int(detail->info.size));
+        m_needsInsertBlock = true;
+        if (m_blockQuoteDepth)
+            qCDebug(lcMD, "CODE lang '%s' info '%s' fenced with '%c' inside QUOTE %d", qPrintable(m_blockCodeLanguage), qPrintable(info), m_blockCodeFence, m_blockQuoteDepth);
+        else
+            qCDebug(lcMD, "CODE lang '%s' info '%s' fenced with '%c'", qPrintable(m_blockCodeLanguage), qPrintable(info), m_blockCodeFence);
+    } break;
+    case MD_BLOCK_H: {
+        MD_BLOCK_H_DETAIL *detail = static_cast<MD_BLOCK_H_DETAIL *>(det);
+        QTextBlockFormat blockFmt;
+        QTextCharFormat charFmt;
+        int sizeAdjustment = 4 - int(detail->level); // H1 to H6: +3 to -2
+        charFmt.setProperty(QTextFormat::FontSizeAdjustment, sizeAdjustment);
+        charFmt.setFontWeight(QFont::Bold);
+        blockFmt.setHeadingLevel(int(detail->level));
+        m_needsInsertBlock = false;
+        m_cursor->insertBlock(blockFmt, charFmt);
+        qCDebug(lcMD, "H%d", detail->level);
+    } break;
+    case MD_BLOCK_LI: {
+        m_needsInsertBlock = true;
+        m_listItem = true;
+        MD_BLOCK_LI_DETAIL *detail = static_cast<MD_BLOCK_LI_DETAIL *>(det);
+        m_markerType = detail->is_task ?
+                    (detail->task_mark == ' ' ? QTextBlockFormat::MarkerType::Unchecked : QTextBlockFormat::MarkerType::Checked) :
+                    QTextBlockFormat::MarkerType::NoMarker;
+        qCDebug(lcMD) << "LI";
+    } break;
+    case MD_BLOCK_UL: {
+        MD_BLOCK_UL_DETAIL *detail = static_cast<MD_BLOCK_UL_DETAIL *>(det);
+        m_listFormat = QTextListFormat();
+        m_listFormat.setIndent(m_listStack.count() + 1);
+        switch (detail->mark) {
+        case '*':
+            m_listFormat.setStyle(QTextListFormat::ListCircle);
+            break;
+        case '+':
+            m_listFormat.setStyle(QTextListFormat::ListSquare);
+            break;
+        default: // including '-'
+            m_listFormat.setStyle(QTextListFormat::ListDisc);
+            break;
+        }
+        qCDebug(lcMD, "UL %c level %d", detail->mark, m_listStack.count());
+        m_needsInsertList = true;
+    } break;
+    case MD_BLOCK_OL: {
+        MD_BLOCK_OL_DETAIL *detail = static_cast<MD_BLOCK_OL_DETAIL *>(det);
+        m_listFormat = QTextListFormat();
+        m_listFormat.setIndent(m_listStack.count() + 1);
+        m_listFormat.setNumberSuffix(QChar::fromLatin1(detail->mark_delimiter));
+        m_listFormat.setStyle(QTextListFormat::ListDecimal);
+        qCDebug(lcMD, "OL xx%d level %d", detail->mark_delimiter, m_listStack.count());
+        m_needsInsertList = true;
+    } break;
+    case MD_BLOCK_TD: {
+        MD_BLOCK_TD_DETAIL *detail = static_cast<MD_BLOCK_TD_DETAIL *>(det);
+        ++m_tableCol;
+        // absolute movement (and storage of m_tableCol) shouldn't be necessary, but
+        // movePosition(QTextCursor::NextCell) doesn't work
+        QTextTableCell cell = m_currentTable->cellAt(m_tableRowCount - 1, m_tableCol);
+        if (!cell.isValid()) {
+            qWarning("malformed table in Markdown input");
+            return 1;
+        }
+        *m_cursor = cell.firstCursorPosition();
+        QTextBlockFormat blockFmt = m_cursor->blockFormat();
+        blockFmt.setAlignment(MdAlignment(detail->align));
+        m_cursor->setBlockFormat(blockFmt);
+        qCDebug(lcMD) << "TD; align" << detail->align << MdAlignment(detail->align) << "col" << m_tableCol;
+    } break;
+    case MD_BLOCK_TH: {
+        ++m_tableColumnCount;
+        ++m_tableCol;
+        if (m_currentTable->columns() < m_tableColumnCount)
+            m_currentTable->appendColumns(1);
+        auto cell = m_currentTable->cellAt(m_tableRowCount - 1, m_tableCol);
+        if (!cell.isValid()) {
+            qWarning("malformed table in Markdown input");
+            return 1;
+        }
+        auto fmt = cell.format();
+        fmt.setFontWeight(QFont::Bold);
+        cell.setFormat(fmt);
+    } break;
+    case MD_BLOCK_TR: {
+        ++m_tableRowCount;
+        m_nonEmptyTableCells.clear();
+        if (m_currentTable->rows() < m_tableRowCount)
+            m_currentTable->appendRows(1);
+        m_tableCol = -1;
+        qCDebug(lcMD) << "TR" << m_currentTable->rows();
+    } break;
+    case MD_BLOCK_TABLE:
+        m_tableColumnCount = 0;
+        m_tableRowCount = 0;
+        m_currentTable = m_cursor->insertTable(1, 1); // we don't know the dimensions yet
+        break;
+    case MD_BLOCK_HR: {
+        qCDebug(lcMD, "HR");
+        QTextBlockFormat blockFmt;
+        blockFmt.setProperty(QTextFormat::BlockTrailingHorizontalRulerWidth, 1);
+        m_cursor->insertBlock(blockFmt, QTextCharFormat());
+    } break;
+    default:
+        break; // nothing to do for now
+    }
+    return 0; // no error
+}
+
+int QTextMarkdownImporter::cbLeaveBlock(int blockType, void *detail)
+{
+    Q_UNUSED(detail)
+    switch (blockType) {
+    case MD_BLOCK_P:
+        m_listItem = false;
+        break;
+    case MD_BLOCK_UL:
+    case MD_BLOCK_OL:
+        qCDebug(lcMD, "list at level %d ended", m_listStack.count());
+        m_listStack.pop();
+        break;
+    case MD_BLOCK_TR: {
+        // https://github.com/mity/md4c/issues/29
+        // MD4C doesn't tell us explicitly which cells are merged, so merge empty cells
+        // with previous non-empty ones
+        int mergeEnd = -1;
+        int mergeBegin = -1;
+        for (int col = m_tableCol; col >= 0; --col) {
+            if (m_nonEmptyTableCells.contains(col)) {
+                if (mergeEnd >= 0 && mergeBegin >= 0) {
+                    qCDebug(lcMD) << "merging cells" << mergeBegin << "to" << mergeEnd << "inclusive, on row" << m_currentTable->rows() - 1;
+                    m_currentTable->mergeCells(m_currentTable->rows() - 1, mergeBegin - 1, 1, mergeEnd - mergeBegin + 2);
+                }
+                mergeEnd = -1;
+                mergeBegin = -1;
+            } else {
+                if (mergeEnd < 0)
+                    mergeEnd = col;
+                else
+                    mergeBegin = col;
+            }
+        }
+    } break;
+    case MD_BLOCK_QUOTE: {
+        qCDebug(lcMD, "QUOTE level %d ended", m_blockQuoteDepth);
+        --m_blockQuoteDepth;
+        m_needsInsertBlock = true;
+    } break;
+    case MD_BLOCK_TABLE:
+        qCDebug(lcMD) << "table ended with" << m_currentTable->columns() << "cols and" << m_currentTable->rows() << "rows";
+        m_currentTable = nullptr;
+        m_cursor->movePosition(QTextCursor::End);
+        break;
+    case MD_BLOCK_LI:
+        qCDebug(lcMD, "LI at level %d ended", m_listStack.count());
+        m_listItem = false;
+        break;
+    case MD_BLOCK_CODE: {
+        m_codeBlock = false;
+        m_blockCodeLanguage.clear();
+        m_blockCodeFence = 0;
+        if (m_blockQuoteDepth)
+            qCDebug(lcMD, "CODE ended inside QUOTE %d", m_blockQuoteDepth);
+        else
+            qCDebug(lcMD, "CODE ended");
+        m_needsInsertBlock = true;
+    } break;
+    case MD_BLOCK_H:
+        m_cursor->setCharFormat(QTextCharFormat());
+        break;
+    default:
+        break;
+    }
+    return 0; // no error
+}
+
+int QTextMarkdownImporter::cbEnterSpan(int spanType, void *det)
+{
+    QTextCharFormat charFmt;
+    switch (spanType) {
+    case MD_SPAN_EM:
+        charFmt.setFontItalic(true);
+        break;
+    case MD_SPAN_STRONG:
+        charFmt.setFontWeight(QFont::Bold);
+        break;
+    case MD_SPAN_A: {
+        MD_SPAN_A_DETAIL *detail = static_cast<MD_SPAN_A_DETAIL *>(det);
+        QString url = QString::fromLatin1(detail->href.text, int(detail->href.size));
+        QString title = QString::fromLatin1(detail->title.text, int(detail->title.size));
+        charFmt.setAnchorHref(url);
+        charFmt.setAnchorNames(QStringList(title));
+        charFmt.setForeground(m_palette.link());
+        qCDebug(lcMD) << "anchor" << url << title;
+        } break;
+    case MD_SPAN_IMG: {
+        m_imageSpan = true;
+        m_imageFormat = QTextImageFormat();
+        MD_SPAN_IMG_DETAIL *detail = static_cast<MD_SPAN_IMG_DETAIL *>(det);
+        m_imageFormat.setName(QString::fromUtf8(detail->src.text, int(detail->src.size)));
+        m_imageFormat.setProperty(QTextFormat::ImageTitle, QString::fromUtf8(detail->title.text, int(detail->title.size)));
+        break;
+    }
+    case MD_SPAN_CODE:
+        charFmt.setFont(m_monoFont);
+        break;
+    case MD_SPAN_DEL:
+        charFmt.setFontStrikeOut(true);
+        break;
+    }
+    m_spanFormatStack.push(charFmt);
+    qCDebug(lcMD) << spanType << "setCharFormat" << charFmt.font().family() << charFmt.fontWeight()
+                  << (charFmt.fontItalic() ? "italic" : "") << charFmt.foreground().color().name();
+    m_cursor->setCharFormat(charFmt);
+    return 0; // no error
+}
+
+int QTextMarkdownImporter::cbLeaveSpan(int spanType, void *detail)
+{
+    Q_UNUSED(detail)
+    QTextCharFormat charFmt;
+    if (!m_spanFormatStack.isEmpty()) {
+        m_spanFormatStack.pop();
+        if (!m_spanFormatStack.isEmpty())
+            charFmt = m_spanFormatStack.top();
+    }
+    m_cursor->setCharFormat(charFmt);
+    qCDebug(lcMD) << spanType << "setCharFormat" << charFmt.font().family() << charFmt.fontWeight()
+                  << (charFmt.fontItalic() ? "italic" : "") << charFmt.foreground().color().name();
+    if (spanType == int(MD_SPAN_IMG))
+        m_imageSpan = false;
+    return 0; // no error
+}
+
+int QTextMarkdownImporter::cbText(int textType, const char *text, unsigned size)
+{
+    if (m_needsInsertBlock)
+        insertBlock();
+#if QT_CONFIG(regularexpression)
+    static const QRegularExpression openingBracket(QStringLiteral("<[a-zA-Z]"));
+    static const QRegularExpression closingBracket(QStringLiteral("(/>|</)"));
+#endif
+    QString s = QString::fromUtf8(text, int(size));
+
+    switch (textType) {
+    case MD_TEXT_NORMAL:
+#if QT_CONFIG(regularexpression)
+        if (m_htmlTagDepth) {
+            m_htmlAccumulator += s;
+            s = QString();
+        }
+#endif
+        break;
+    case MD_TEXT_NULLCHAR:
+        s = QString(QChar(0xFFFD)); // CommonMark-required replacement for null
+        break;
+    case MD_TEXT_BR:
+        s = QString(Newline);
+        break;
+    case MD_TEXT_SOFTBR:
+        s = QString(Space);
+        break;
+    case MD_TEXT_CODE:
+        // We'll see MD_SPAN_CODE too, which will set the char format, and that's enough.
+        break;
+#if QT_CONFIG(texthtmlparser)
+    case MD_TEXT_ENTITY:
+        m_cursor->insertHtml(s);
+        s = QString();
+        break;
+#endif
+    case MD_TEXT_HTML:
+        // count how many tags are opened and how many are closed
+#if QT_CONFIG(regularexpression) && QT_CONFIG(texthtmlparser)
+        {
+            int startIdx = 0;
+            while ((startIdx = s.indexOf(openingBracket, startIdx)) >= 0) {
+                ++m_htmlTagDepth;
+                startIdx += 2;
+            }
+            startIdx = 0;
+            while ((startIdx = s.indexOf(closingBracket, startIdx)) >= 0) {
+                --m_htmlTagDepth;
+                startIdx += 2;
+            }
+        }
+        m_htmlAccumulator += s;
+        if (!m_htmlTagDepth) { // all open tags are now closed
+            qCDebug(lcMD) << "HTML" << m_htmlAccumulator;
+            m_cursor->insertHtml(m_htmlAccumulator);
+            if (m_spanFormatStack.isEmpty())
+                m_cursor->setCharFormat(QTextCharFormat());
+            else
+                m_cursor->setCharFormat(m_spanFormatStack.top());
+            m_htmlAccumulator = QString();
+        }
+#endif
+        s = QString();
+        break;
+    }
+
+    switch (m_blockType) {
+    case MD_BLOCK_TD:
+        m_nonEmptyTableCells.append(m_tableCol);
+        break;
+    default:
+        break;
+    }
+
+    if (m_imageSpan) {
+        // TODO we don't yet support alt text with formatting, because of the cases where m_cursor
+        // already inserted the text above.  Rather need to accumulate it in case we need it here.
+        m_imageFormat.setProperty(QTextFormat::ImageAltText, s);
+        qCDebug(lcMD) << "image" << m_imageFormat.name()
+                      << "title" << m_imageFormat.stringProperty(QTextFormat::ImageTitle)
+                      << "alt" << s << "relative to" << m_doc->baseUrl();
+        m_cursor->insertImage(m_imageFormat);
+        return 0; // no error
+    }
+
+    if (!s.isEmpty())
+        m_cursor->insertText(s);
+    if (m_cursor->currentList()) {
+        // The list item will indent the list item's text, so we don't need indentation on the block.
+        QTextBlockFormat bfmt = m_cursor->blockFormat();
+        bfmt.setIndent(0);
+        m_cursor->setBlockFormat(bfmt);
+    }
+    if (lcMD().isEnabled(QtDebugMsg)) {
+        QTextBlockFormat bfmt = m_cursor->blockFormat();
+        QString debugInfo;
+        if (m_cursor->currentList())
+            debugInfo = QLatin1String("in list at depth ") + QString::number(m_cursor->currentList()->format().indent());
+        if (bfmt.hasProperty(QTextFormat::BlockQuoteLevel))
+            debugInfo += QLatin1String("in blockquote at depth ") +
+                    QString::number(bfmt.intProperty(QTextFormat::BlockQuoteLevel));
+        if (bfmt.hasProperty(QTextFormat::BlockCodeLanguage))
+            debugInfo += QLatin1String("in a code block");
+        qCDebug(lcMD) << textType << "in block" << m_blockType << s << qPrintable(debugInfo)
+                      << "bindent" << bfmt.indent() << "tindent" << bfmt.textIndent()
+                      << "margins" << bfmt.leftMargin() << bfmt.topMargin() << bfmt.bottomMargin() << bfmt.rightMargin();
+    }
+    qCDebug(lcMD) << textType << "in block" << m_blockType << s << "in list?" << m_cursor->currentList()
+                  << "indent" << m_cursor->blockFormat().indent();
+    return 0; // no error
+}
+
+/*!
+    Insert a new block based on stored state.
+
+    m_cursor cannot store the state for the _next_ block ahead of time, because
+    m_cursor->setBlockFormat() controls the format of the block that the cursor
+    is already in; so cbLeaveBlock() cannot call setBlockFormat() without
+    altering the block that was just added. Therefore cbLeaveBlock() and the
+    following cbEnterBlock() set variables to remember what formatting should
+    come next, and insertBlock() is called just before the actual text
+    insertion, to create a new block with the right formatting.
+*/
+void QTextMarkdownImporter::insertBlock()
+{
+    QTextCharFormat charFormat;
+    if (!m_spanFormatStack.isEmpty())
+        charFormat = m_spanFormatStack.top();
+    QTextBlockFormat blockFormat;
+    if (!m_listStack.isEmpty() && !m_needsInsertList && m_listItem) {
+        QTextList *list = m_listStack.top();
+        blockFormat = list->item(list->count() - 1).blockFormat();
+    }
+    if (m_blockQuoteDepth) {
+        blockFormat.setProperty(QTextFormat::BlockQuoteLevel, m_blockQuoteDepth);
+        blockFormat.setLeftMargin(BlockQuoteIndent * m_blockQuoteDepth);
+        blockFormat.setRightMargin(BlockQuoteIndent);
+    }
+    if (m_codeBlock) {
+        blockFormat.setProperty(QTextFormat::BlockCodeLanguage, m_blockCodeLanguage);
+        if (m_blockCodeFence)
+            blockFormat.setProperty(QTextFormat::BlockCodeFence, QString(QLatin1Char(m_blockCodeFence)));
+        charFormat.setFont(m_monoFont);
+    } else {
+        blockFormat.setTopMargin(m_paragraphMargin);
+        blockFormat.setBottomMargin(m_paragraphMargin);
+    }
+    if (m_markerType == QTextBlockFormat::MarkerType::NoMarker)
+        blockFormat.clearProperty(QTextFormat::BlockMarker);
+    else
+        blockFormat.setMarker(m_markerType);
+    if (!m_listStack.isEmpty())
+        blockFormat.setIndent(m_listStack.count());
+    m_cursor->insertBlock(blockFormat, charFormat);
+    if (m_needsInsertList) {
+        m_listStack.push(m_cursor->createList(m_listFormat));
+    } else if (!m_listStack.isEmpty() && m_listItem) {
+        m_listStack.top()->add(m_cursor->block());
+    }
+    m_needsInsertList = false;
+    m_needsInsertBlock = false;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/text/qtextmarkdownimporter_p.h b/src/gui/text/qtextmarkdownimporter_p.h
new file mode 100644
index 0000000000..35655aff8a
--- /dev/null
+++ b/src/gui/text/qtextmarkdownimporter_p.h
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTEXTMARKDOWNIMPORTER_H
+#define QTEXTMARKDOWNIMPORTER_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/qfont.h>
+#include <QtGui/qtguiglobal.h>
+#include <QtGui/qpalette.h>
+#include <QtGui/qtextlist.h>
+#include <QtCore/qstack.h>
+
+QT_BEGIN_NAMESPACE
+
+class QTextCursor;
+class QTextDocument;
+class QTextTable;
+
+class Q_GUI_EXPORT QTextMarkdownImporter
+{
+public:
+    enum Feature {
+        // Must be kept in sync with MD_FLAG_* in md4c.h
+        FeatureCollapseWhitespace =       0x0001, // MD_FLAG_COLLAPSEWHITESPACE
+        FeaturePermissiveATXHeaders =     0x0002, // MD_FLAG_PERMISSIVEATXHEADERS
+        FeaturePermissiveURLAutoLinks =   0x0004, // MD_FLAG_PERMISSIVEURLAUTOLINKS
+        FeaturePermissiveMailAutoLinks =  0x0008, // MD_FLAG_PERMISSIVEEMAILAUTOLINKS
+        FeatureNoIndentedCodeBlocks =     0x0010, // MD_FLAG_NOINDENTEDCODEBLOCKS
+        FeatureNoHTMLBlocks =             0x0020, // MD_FLAG_NOHTMLBLOCKS
+        FeatureNoHTMLSpans =              0x0040, // MD_FLAG_NOHTMLSPANS
+        FeatureTables =                   0x0100, // MD_FLAG_TABLES
+        FeatureStrikeThrough =            0x0200, // MD_FLAG_STRIKETHROUGH
+        FeaturePermissiveWWWAutoLinks =   0x0400, // MD_FLAG_PERMISSIVEWWWAUTOLINKS
+        FeatureTasklists =                0x0800, // MD_FLAG_TASKLISTS
+        // composite flags
+        FeaturePermissiveAutoLinks =  FeaturePermissiveMailAutoLinks | FeaturePermissiveURLAutoLinks | FeaturePermissiveWWWAutoLinks, // MD_FLAG_PERMISSIVEAUTOLINKS
+        FeatureNoHTML = FeatureNoHTMLBlocks | FeatureNoHTMLSpans, // MD_FLAG_NOHTML
+        DialectCommonMark = 0,                   // MD_DIALECT_COMMONMARK
+        DialectGitHub = FeaturePermissiveAutoLinks | FeatureTables | FeatureStrikeThrough | FeatureTasklists // MD_DIALECT_GITHUB
+    };
+    Q_DECLARE_FLAGS(Features, Feature)
+
+    QTextMarkdownImporter(Features features);
+
+    void import(QTextDocument *doc, const QString &markdown);
+
+public:
+    // MD4C callbacks
+    int cbEnterBlock(int blockType, void* detail);
+    int cbLeaveBlock(int blockType, void* detail);
+    int cbEnterSpan(int spanType, void* detail);
+    int cbLeaveSpan(int spanType, void* detail);
+    int cbText(int textType, const char* text, unsigned size);
+
+private:
+    void insertBlock();
+
+private:
+    QTextDocument *m_doc = nullptr;
+    QTextCursor *m_cursor = nullptr;
+    QTextTable *m_currentTable = nullptr; // because m_cursor->currentTable() doesn't work
+#if QT_CONFIG(regularexpression)
+    QString m_htmlAccumulator;
+#endif
+    QString m_blockCodeLanguage;
+    QVector<int> m_nonEmptyTableCells; // in the current row
+    QStack<QTextList *> m_listStack;
+    QStack<QTextCharFormat> m_spanFormatStack;
+    QFont m_monoFont;
+    QPalette m_palette;
+#if QT_CONFIG(regularexpression)
+    int m_htmlTagDepth = 0;
+#endif
+    int m_blockQuoteDepth = 0;
+    int m_tableColumnCount = 0;
+    int m_tableRowCount = 0;
+    int m_tableCol = -1; // because relative cell movements (e.g. m_cursor->movePosition(QTextCursor::NextCell)) don't work
+    int m_paragraphMargin = 0;
+    int m_blockType = 0;
+    char m_blockCodeFence = 0;
+    Features m_features;
+    QTextImageFormat m_imageFormat;
+    QTextListFormat m_listFormat;
+    QTextBlockFormat::MarkerType m_markerType = QTextBlockFormat::MarkerType::NoMarker;
+    bool m_needsInsertBlock = false;
+    bool m_needsInsertList = false;
+    bool m_listItem = false; // true from the beginning of LI to the end of the first P
+    bool m_codeBlock = false;
+    bool m_imageSpan = false;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QTextMarkdownImporter::Features)
+
+QT_END_NAMESPACE
+
+#endif // QTEXTMARKDOWNIMPORTER_H
diff --git a/src/gui/text/qtextmarkdownwriter.cpp b/src/gui/text/qtextmarkdownwriter.cpp
new file mode 100644
index 0000000000..764c64aead
--- /dev/null
+++ b/src/gui/text/qtextmarkdownwriter.cpp
@@ -0,0 +1,564 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtextmarkdownwriter_p.h"
+#include "qtextdocumentlayout_p.h"
+#include "qfontinfo.h"
+#include "qfontmetrics.h"
+#include "qtextdocument_p.h"
+#include "qtextlist.h"
+#include "qtexttable.h"
+#include "qtextcursor.h"
+#include "qtextimagehandler_p.h"
+#include "qloggingcategory.h"
+#if QT_CONFIG(itemmodel)
+#include "qabstractitemmodel.h"
+#endif
+
+QT_BEGIN_NAMESPACE
+
+Q_LOGGING_CATEGORY(lcMDW, "qt.text.markdown.writer")
+
+static const QChar Space = QLatin1Char(' ');
+static const QChar Newline = QLatin1Char('\n');
+static const QChar LineBreak = QChar(0x2028);
+static const QChar DoubleQuote = QLatin1Char('"');
+static const QChar Backtick = QLatin1Char('`');
+static const QChar Period = QLatin1Char('.');
+
+QTextMarkdownWriter::QTextMarkdownWriter(QTextStream &stream, QTextDocument::MarkdownFeatures features)
+  : m_stream(stream), m_features(features)
+{
+}
+
+bool QTextMarkdownWriter::writeAll(const QTextDocument *document)
+{
+    writeFrame(document->rootFrame());
+    return true;
+}
+
+#if QT_CONFIG(itemmodel)
+void QTextMarkdownWriter::writeTable(const QAbstractItemModel *table)
+{
+    QVector<int> tableColumnWidths(table->columnCount());
+    for (int col = 0; col < table->columnCount(); ++col) {
+        tableColumnWidths[col] = table->headerData(col, Qt::Horizontal).toString().length();
+        for (int row = 0; row < table->rowCount(); ++row) {
+            tableColumnWidths[col] = qMax(tableColumnWidths[col],
+                table->data(table->index(row, col)).toString().length());
+        }
+    }
+
+    // write the header and separator
+    for (int col = 0; col < table->columnCount(); ++col) {
+        QString s = table->headerData(col, Qt::Horizontal).toString();
+        m_stream << "|" << s << QString(tableColumnWidths[col] - s.length(), Space);
+    }
+    m_stream << "|" << Qt::endl;
+    for (int col = 0; col < tableColumnWidths.length(); ++col)
+        m_stream << '|' << QString(tableColumnWidths[col], QLatin1Char('-'));
+    m_stream << '|'<< Qt::endl;
+
+    // write the body
+    for (int row = 0; row < table->rowCount(); ++row) {
+        for (int col = 0; col < table->columnCount(); ++col) {
+            QString s = table->data(table->index(row, col)).toString();
+            m_stream << "|" << s << QString(tableColumnWidths[col] - s.length(), Space);
+        }
+        m_stream << '|'<< Qt::endl;
+    }
+    m_listInfo.clear();
+}
+#endif
+
+void QTextMarkdownWriter::writeFrame(const QTextFrame *frame)
+{
+    Q_ASSERT(frame);
+    const QTextTable *table = qobject_cast<const QTextTable*> (frame);
+    QTextFrame::iterator iterator = frame->begin();
+    QTextFrame *child = nullptr;
+    int tableRow = -1;
+    bool lastWasList = false;
+    QVector<int> tableColumnWidths;
+    if (table) {
+        tableColumnWidths.resize(table->columns());
+        for (int col = 0; col < table->columns(); ++col) {
+            for (int row = 0; row < table->rows(); ++ row) {
+                QTextTableCell cell = table->cellAt(row, col);
+                int cellTextLen = 0;
+                auto it = cell.begin();
+                while (it != cell.end()) {
+                    QTextBlock block = it.currentBlock();
+                    if (block.isValid())
+                        cellTextLen += block.text().length();
+                    ++it;
+                }
+                if (cell.columnSpan() == 1 && tableColumnWidths[col] < cellTextLen)
+                    tableColumnWidths[col] = cellTextLen;
+            }
+        }
+    }
+    while (!iterator.atEnd()) {
+        if (iterator.currentFrame() && child != iterator.currentFrame())
+            writeFrame(iterator.currentFrame());
+        else { // no frame, it's a block
+            QTextBlock block = iterator.currentBlock();
+            // Look ahead and detect some cases when we should
+            // suppress needless blank lines, when there will be a big change in block format
+            bool nextIsDifferent = false;
+            bool ending = false;
+            {
+                QTextFrame::iterator next = iterator;
+                ++next;
+                if (next.atEnd()) {
+                    nextIsDifferent = true;
+                    ending = true;
+                } else {
+                    QTextBlockFormat format = iterator.currentBlock().blockFormat();
+                    QTextBlockFormat nextFormat = next.currentBlock().blockFormat();
+                    if (nextFormat.indent() != format.indent() ||
+                            nextFormat.property(QTextFormat::BlockCodeLanguage) != format.property(QTextFormat::BlockCodeLanguage))
+                        nextIsDifferent = true;
+                }
+            }
+            if (table) {
+                QTextTableCell cell = table->cellAt(block.position());
+                if (tableRow < cell.row()) {
+                    if (tableRow == 0) {
+                        m_stream << Newline;
+                        for (int col = 0; col < tableColumnWidths.length(); ++col)
+                            m_stream << '|' << QString(tableColumnWidths[col], QLatin1Char('-'));
+                        m_stream << '|';
+                    }
+                    m_stream << Newline << "|";
+                    tableRow = cell.row();
+                }
+            } else if (!block.textList()) {
+                if (lastWasList)
+                    m_stream << Newline;
+            }
+            int endingCol = writeBlock(block, !table, table && tableRow == 0, nextIsDifferent);
+            m_doubleNewlineWritten = false;
+            if (table) {
+                QTextTableCell cell = table->cellAt(block.position());
+                int paddingLen = -endingCol;
+                int spanEndCol = cell.column() + cell.columnSpan();
+                for (int col = cell.column(); col < spanEndCol; ++col)
+                    paddingLen += tableColumnWidths[col];
+                if (paddingLen > 0)
+                    m_stream << QString(paddingLen, Space);
+                for (int col = cell.column(); col < spanEndCol; ++col)
+                    m_stream << "|";
+            } else if (m_fencedCodeBlock && ending) {
+                m_stream << m_linePrefix << QString(m_wrappedLineIndent, Space)
+                         << m_codeBlockFence << Newline << Newline;
+                m_codeBlockFence.clear();
+            } else if (m_indentedCodeBlock && nextIsDifferent) {
+                m_stream << Newline;
+            } else if (endingCol > 0) {
+                if (block.textList() || block.blockFormat().hasProperty(QTextFormat::BlockCodeLanguage)) {
+                    m_stream << Newline;
+                } else {
+                    m_stream << Newline << Newline;
+                    m_doubleNewlineWritten = true;
+                }
+            }
+            lastWasList = block.textList();
+        }
+        child = iterator.currentFrame();
+        ++iterator;
+    }
+    if (table) {
+        m_stream << Newline << Newline;
+        m_doubleNewlineWritten = true;
+    }
+    m_listInfo.clear();
+}
+
+QTextMarkdownWriter::ListInfo QTextMarkdownWriter::listInfo(QTextList *list)
+{
+    if (!m_listInfo.contains(list)) {
+        // decide whether this list is loose or tight
+        ListInfo info;
+        info.loose = false;
+        if (list->count() > 1) {
+            QTextBlock first = list->item(0);
+            QTextBlock last = list->item(list->count() - 1);
+            QTextBlock next = first.next();
+            while (next.isValid()) {
+                if (next == last)
+                    break;
+                qCDebug(lcMDW) << "next block in list" << list << next.text() << "part of list?" << next.textList();
+                if (!next.textList()) {
+                    // If we find a continuation paragraph, this list is "loose"
+                    // because it will need a blank line to separate that paragraph.
+                    qCDebug(lcMDW) << "decided list beginning with" << first.text() << "is loose after" << next.text();
+                    info.loose = true;
+                    break;
+                }
+                next = next.next();
+            }
+        }
+        m_listInfo.insert(list, info);
+        return info;
+    }
+    return m_listInfo.value(list);
+}
+
+static int nearestWordWrapIndex(const QString &s, int before)
+{
+    before = qMin(before, s.length());
+    int fragBegin = qMax(before - 15, 0);
+    if (lcMDW().isDebugEnabled()) {
+        QString frag = s.mid(fragBegin, 30);
+        qCDebug(lcMDW) << frag << before;
+        qCDebug(lcMDW) << QString(before - fragBegin, Period) + QLatin1Char('<');
+    }
+    for (int i = before - 1; i >= 0; --i) {
+        if (s.at(i).isSpace()) {
+            qCDebug(lcMDW) << QString(i - fragBegin, Period) + QLatin1Char('^') << i;
+            return i;
+        }
+    }
+    qCDebug(lcMDW, "not possible");
+    return -1;
+}
+
+static int adjacentBackticksCount(const QString &s)
+{
+    int start = -1, len = s.length();
+    int ret = 0;
+    for (int i = 0; i < len; ++i) {
+        if (s.at(i) == Backtick) {
+            if (start < 0)
+                start = i;
+        } else if (start >= 0) {
+            ret = qMax(ret, i - start);
+            start = -1;
+        }
+    }
+    if (s.at(len - 1) == Backtick)
+        ret = qMax(ret, len - start);
+    return ret;
+}
+
+static void maybeEscapeFirstChar(QString &s)
+{
+    QString sTrimmed = s.trimmed();
+    if (sTrimmed.isEmpty())
+        return;
+    char firstChar = sTrimmed.at(0).toLatin1();
+    if (firstChar == '*' || firstChar == '+' || firstChar == '-') {
+        int i = s.indexOf(QLatin1Char(firstChar));
+        s.insert(i, QLatin1Char('\\'));
+    }
+}
+
+int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ignoreFormat, bool ignoreEmpty)
+{
+    if (block.text().isEmpty() && ignoreEmpty)
+        return 0;
+    const int ColumnLimit = 80;
+    QTextBlockFormat blockFmt = block.blockFormat();
+    bool missedBlankCodeBlockLine = false;
+    if (block.textList()) { // it's a list-item
+        auto fmt = block.textList()->format();
+        const int listLevel = fmt.indent();
+        const int number = block.textList()->itemNumber(block) + 1;
+        QByteArray bullet = " ";
+        bool numeric = false;
+        switch (fmt.style()) {
+        case QTextListFormat::ListDisc:
+            bullet = "-";
+            m_wrappedLineIndent = 2;
+            break;
+        case QTextListFormat::ListCircle:
+            bullet = "*";
+            m_wrappedLineIndent = 2;
+            break;
+        case QTextListFormat::ListSquare:
+            bullet = "+";
+            m_wrappedLineIndent = 2;
+            break;
+        case QTextListFormat::ListStyleUndefined: break;
+        case QTextListFormat::ListDecimal:
+        case QTextListFormat::ListLowerAlpha:
+        case QTextListFormat::ListUpperAlpha:
+        case QTextListFormat::ListLowerRoman:
+        case QTextListFormat::ListUpperRoman:
+            numeric = true;
+            m_wrappedLineIndent = 4;
+            break;
+        }
+        switch (blockFmt.marker()) {
+        case QTextBlockFormat::MarkerType::Checked:
+            bullet += " [x]";
+            break;
+        case QTextBlockFormat::MarkerType::Unchecked:
+            bullet += " [ ]";
+            break;
+        default:
+            break;
+        }
+        int indentFirstLine = (listLevel - 1) * (numeric ? 4 : 2);
+        m_wrappedLineIndent += indentFirstLine;
+        if (m_lastListIndent != listLevel && !m_doubleNewlineWritten && listInfo(block.textList()).loose)
+            m_stream << Newline;
+        m_lastListIndent = listLevel;
+        QString prefix(indentFirstLine, Space);
+        if (numeric) {
+            QString suffix = fmt.numberSuffix();
+            if (suffix.isEmpty())
+                suffix = QString(Period);
+            QString numberStr = QString::number(number) + suffix + Space;
+            if (numberStr.length() == 3)
+                numberStr += Space;
+            prefix += numberStr;
+        } else {
+            prefix += QLatin1String(bullet) + Space;
+        }
+        m_stream << prefix;
+    } else if (blockFmt.hasProperty(QTextFormat::BlockTrailingHorizontalRulerWidth)) {
+        m_stream << "- - -\n"; // unambiguous horizontal rule, not an underline under a heading
+        return 0;
+    } else if (blockFmt.hasProperty(QTextFormat::BlockCodeFence) || blockFmt.stringProperty(QTextFormat::BlockCodeLanguage).length() > 0) {
+        // It's important to preserve blank lines in code blocks.  But blank lines in code blocks
+        // inside block quotes are getting preserved anyway (along with the "> " prefix).
+        if (!blockFmt.hasProperty(QTextFormat::BlockQuoteLevel))
+            missedBlankCodeBlockLine = true; // only if we don't get any fragments below
+        if (!m_fencedCodeBlock) {
+            QString fenceChar = blockFmt.stringProperty(QTextFormat::BlockCodeFence);
+            if (fenceChar.isEmpty())
+                fenceChar = QLatin1String("`");
+            m_codeBlockFence = QString(3, fenceChar.at(0));
+            // A block quote can contain an indented code block, but not vice-versa.
+            m_stream << m_linePrefix << QString(m_wrappedLineIndent, Space) << m_codeBlockFence
+                     << Space << blockFmt.stringProperty(QTextFormat::BlockCodeLanguage) << Newline;
+            m_fencedCodeBlock = true;
+        }
+    } else if (!blockFmt.indent()) {
+        if (m_fencedCodeBlock) {
+            m_stream << m_linePrefix << QString(m_wrappedLineIndent, Space)
+                     << m_codeBlockFence << Newline;
+            m_fencedCodeBlock = false;
+            m_codeBlockFence.clear();
+        }
+        m_wrappedLineIndent = 0;
+        m_linePrefix.clear();
+        if (blockFmt.hasProperty(QTextFormat::BlockQuoteLevel)) {
+            int level = blockFmt.intProperty(QTextFormat::BlockQuoteLevel);
+            QString quoteMarker = QStringLiteral("> ");
+            m_linePrefix.reserve(level * 2);
+            for (int i = 0; i < level; ++i)
+                m_linePrefix += quoteMarker;
+        }
+        if (blockFmt.hasProperty(QTextFormat::BlockCodeLanguage)) {
+            // A block quote can contain an indented code block, but not vice-versa.
+            m_linePrefix += QString(4, Space);
+            m_indentedCodeBlock = true;
+        }
+    }
+    if (blockFmt.headingLevel())
+        m_stream << QByteArray(blockFmt.headingLevel(), '#') << ' ';
+    else
+        m_stream << m_linePrefix;
+
+    QString wrapIndentString = m_linePrefix + QString(m_wrappedLineIndent, Space);
+    // It would be convenient if QTextStream had a lineCharPos() accessor,
+    // to keep track of how many characters (not bytes) have been written on the current line,
+    // but it doesn't.  So we have to keep track with this col variable.
+    int col = wrapIndentString.length();
+    bool mono = false;
+    bool startsOrEndsWithBacktick = false;
+    bool bold = false;
+    bool italic = false;
+    bool underline = false;
+    bool strikeOut = false;
+    QString backticks(Backtick);
+    for (QTextBlock::Iterator frag = block.begin(); !frag.atEnd(); ++frag) {
+        missedBlankCodeBlockLine = false;
+        QString fragmentText = frag.fragment().text();
+        while (fragmentText.endsWith(Newline))
+            fragmentText.chop(1);
+        if (block.textList()) { // <li>first line</br>continuation</li>
+            QString newlineIndent = QString(Newline) + QString(m_wrappedLineIndent, Space);
+            fragmentText.replace(QString(LineBreak), newlineIndent);
+        } else if (blockFmt.indent() > 0) { // <li>first line<p>continuation</p></li>
+            m_stream << QString(m_wrappedLineIndent, Space);
+        } else {
+            fragmentText.replace(LineBreak, Newline);
+        }
+        startsOrEndsWithBacktick |= fragmentText.startsWith(Backtick) || fragmentText.endsWith(Backtick);
+        QTextCharFormat fmt = frag.fragment().charFormat();
+        if (fmt.isImageFormat()) {
+            QTextImageFormat ifmt = fmt.toImageFormat();
+            QString desc = ifmt.stringProperty(QTextFormat::ImageAltText);
+            if (desc.isEmpty())
+                desc = QLatin1String("image");
+            QString s = QLatin1String("![") + desc + QLatin1String("](") + ifmt.name();
+            QString title = ifmt.stringProperty(QTextFormat::ImageTitle);
+            if (!title.isEmpty())
+                s += Space + DoubleQuote + title + DoubleQuote;
+            s += QLatin1Char(')');
+            if (wrap && col + s.length() > ColumnLimit) {
+                m_stream << Newline << wrapIndentString;
+                col = m_wrappedLineIndent;
+            }
+            m_stream << s;
+            col += s.length();
+        } else if (fmt.hasProperty(QTextFormat::AnchorHref)) {
+            QString s = QLatin1Char('[') + fragmentText + QLatin1String("](") +
+                    fmt.property(QTextFormat::AnchorHref).toString() + QLatin1Char(')');
+            if (wrap && col + s.length() > ColumnLimit) {
+                m_stream << Newline << wrapIndentString;
+                col = m_wrappedLineIndent;
+            }
+            m_stream << s;
+            col += s.length();
+        } else {
+            QFontInfo fontInfo(fmt.font());
+            bool monoFrag = fontInfo.fixedPitch();
+            QString markers;
+            if (!ignoreFormat) {
+                if (monoFrag != mono && !m_indentedCodeBlock && !m_fencedCodeBlock) {
+                    if (monoFrag)
+                        backticks = QString(adjacentBackticksCount(fragmentText) + 1, Backtick);
+                    markers += backticks;
+                    if (startsOrEndsWithBacktick)
+                        markers += Space;
+                    mono = monoFrag;
+                }
+                if (!blockFmt.headingLevel() && !mono) {
+                    if (fontInfo.bold() != bold) {
+                        markers += QLatin1String("**");
+                        bold = fontInfo.bold();
+                    }
+                    if (fontInfo.italic() != italic) {
+                        markers += QLatin1Char('*');
+                        italic = fontInfo.italic();
+                    }
+                    if (fontInfo.strikeOut() != strikeOut) {
+                        markers += QLatin1String("~~");
+                        strikeOut = fontInfo.strikeOut();
+                    }
+                    if (fontInfo.underline() != underline) {
+                        // Markdown doesn't support underline, but the parser will treat a single underline
+                        // the same as a single asterisk, and the marked fragment will be rendered in italics.
+                        // That will have to do.
+                        markers += QLatin1Char('_');
+                        underline = fontInfo.underline();
+                    }
+                }
+            }
+            if (wrap && col + markers.length() * 2 + fragmentText.length() > ColumnLimit) {
+                int i = 0;
+                int fragLen = fragmentText.length();
+                bool breakingLine = false;
+                while (i < fragLen) {
+                    if (col >= ColumnLimit) {
+                        m_stream << Newline << wrapIndentString;
+                        col = m_wrappedLineIndent;
+                        while (fragmentText[i].isSpace())
+                            ++i;
+                    }
+                    int j = i + ColumnLimit - col;
+                    if (j < fragLen) {
+                        int wi = nearestWordWrapIndex(fragmentText, j);
+                        if (wi < 0) {
+                            j = fragLen;
+                        } else if (wi >= i) {
+                            j = wi;
+                            breakingLine = true;
+                        }
+                    } else {
+                        j = fragLen;
+                        breakingLine = false;
+                    }
+                    QString subfrag = fragmentText.mid(i, j - i);
+                    if (!i) {
+                        m_stream << markers;
+                        col += markers.length();
+                    }
+                    if (col == m_wrappedLineIndent)
+                        maybeEscapeFirstChar(subfrag);
+                    m_stream << subfrag;
+                    if (breakingLine) {
+                        m_stream << Newline << wrapIndentString;
+                        col = m_wrappedLineIndent;
+                    } else {
+                        col += subfrag.length();
+                    }
+                    i = j + 1;
+                }
+            } else {
+                m_stream << markers << fragmentText;
+                col += markers.length() + fragmentText.length();
+            }
+        }
+    }
+    if (mono) {
+        if (startsOrEndsWithBacktick) {
+            m_stream << Space;
+            col += 1;
+        }
+        m_stream << backticks;
+        col += backticks.size();
+    }
+    if (bold) {
+        m_stream << "**";
+        col += 2;
+    }
+    if (italic) {
+        m_stream << "*";
+        col += 1;
+    }
+    if (underline) {
+        m_stream << "_";
+        col += 1;
+    }
+    if (strikeOut) {
+        m_stream << "~~";
+        col += 2;
+    }
+    if (missedBlankCodeBlockLine)
+        m_stream << Newline;
+    return col;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/text/qtextmarkdownwriter_p.h b/src/gui/text/qtextmarkdownwriter_p.h
new file mode 100644
index 0000000000..c3076155d0
--- /dev/null
+++ b/src/gui/text/qtextmarkdownwriter_p.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTEXTMARKDOWNWRITER_P_H
+#define QTEXTMARKDOWNWRITER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qtguiglobal_p.h>
+#include <QtCore/QTextStream>
+
+#include "qtextdocument_p.h"
+#include "qtextdocumentwriter.h"
+
+QT_BEGIN_NAMESPACE
+
+class QAbstractItemModel;
+
+class Q_GUI_EXPORT QTextMarkdownWriter
+{
+public:
+    QTextMarkdownWriter(QTextStream &stream, QTextDocument::MarkdownFeatures features);
+    bool writeAll(const QTextDocument *document);
+#if QT_CONFIG(itemmodel)
+    void writeTable(const QAbstractItemModel *table);
+#endif
+
+    int writeBlock(const QTextBlock &block, bool table, bool ignoreFormat, bool ignoreEmpty);
+    void writeFrame(const QTextFrame *frame);
+
+private:
+    struct ListInfo {
+        bool loose;
+    };
+
+    ListInfo listInfo(QTextList *list);
+
+private:
+    QTextStream &m_stream;
+    QTextDocument::MarkdownFeatures m_features;
+    QMap<QTextList *, ListInfo> m_listInfo;
+    QString m_linePrefix;
+    QString m_codeBlockFence;
+    int m_wrappedLineIndent = 0;
+    int m_lastListIndent = 1;
+    bool m_doubleNewlineWritten = false;
+    bool m_indentedCodeBlock = false;
+    bool m_fencedCodeBlock = false;
+};
+
+QT_END_NAMESPACE
+
+#endif // QTEXTMARKDOWNWRITER_P_H
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index 40960c910e..b845889c3d 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -678,7 +678,7 @@ QTextFrame::iterator::iterator(QTextFrame *frame, int block, int begin, int end)
 /*!
     Copy constructor. Constructs a copy of the \a other iterator.
 */
-QTextFrame::iterator::iterator(const iterator &other) Q_DECL_NOTHROW
+QTextFrame::iterator::iterator(const iterator &other) noexcept
 {
     f = other.f;
     b = other.b;
@@ -691,7 +691,7 @@ QTextFrame::iterator::iterator(const iterator &other) Q_DECL_NOTHROW
     Assigns \a other to this iterator and returns a reference to
     this iterator.
 */
-QTextFrame::iterator &QTextFrame::iterator::operator=(const iterator &other) Q_DECL_NOTHROW
+QTextFrame::iterator &QTextFrame::iterator::operator=(const iterator &other) noexcept
 {
     f = other.f;
     b = other.b;
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
index 694eb729d5..215a76fb4d 100644
--- a/src/gui/text/qtextobject.h
+++ b/src/gui/text/qtextobject.h
@@ -151,11 +151,11 @@ public:
     public:
         iterator(); // ### Qt 6: inline
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-        iterator(const iterator &o) Q_DECL_NOTHROW; // = default
-        iterator &operator=(const iterator &o) Q_DECL_NOTHROW; // = default
-        iterator(iterator &&other) Q_DECL_NOTHROW // = default
+        iterator(const iterator &o) noexcept; // = default
+        iterator &operator=(const iterator &o) noexcept; // = default
+        iterator(iterator &&other) noexcept // = default
         { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(iterator)); }
-        iterator &operator=(iterator &&other) Q_DECL_NOTHROW // = default
+        iterator &operator=(iterator &&other) noexcept // = default
         { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(iterator)); return *this; }
 #endif
 
diff --git a/src/gui/text/qtextobject_p.h b/src/gui/text/qtextobject_p.h
index 81ab023cc3..87c83868da 100644
--- a/src/gui/text/qtextobject_p.h
+++ b/src/gui/text/qtextobject_p.h
@@ -93,7 +93,7 @@ class QTextFramePrivate : public QTextObjectPrivate
     Q_DECLARE_PUBLIC(QTextFrame)
 public:
     QTextFramePrivate(QTextDocument *doc)
-        : QTextObjectPrivate(doc), fragment_start(0), fragment_end(0), parentFrame(0), layoutData(0)
+        : QTextObjectPrivate(doc), fragment_start(0), fragment_end(0), parentFrame(nullptr), layoutData(nullptr)
     {
     }
     virtual void fragmentAdded(QChar type, uint fragment);
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 6d23866392..0e8666565f 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -523,9 +523,7 @@ void QTextOdfWriter::writeFormats(QXmlStreamWriter &writer, const QSet<int> &for
 {
     writer.writeStartElement(officeNS, QString::fromLatin1("automatic-styles"));
     QVector<QTextFormat> allStyles = m_document->allFormats();
-    QSetIterator<int> formatId(formats);
-    while(formatId.hasNext()) {
-        int formatIndex = formatId.next();
+    for (int formatIndex : formats) {
         QTextFormat textFormat = allStyles.at(formatIndex);
         switch (textFormat.type()) {
         case QTextFormat::CharFormat:
@@ -1057,7 +1055,7 @@ bool QTextOdfWriter::writeAll()
 
     // add objects for lists, frames and tables
     const QVector<QTextFormat> allFormats = m_document->allFormats();
-    const QList<int> copy = formats.toList();
+    const QList<int> copy = formats.values();
     for (auto index : copy) {
         QTextObject *object = m_document->objectForFormat(allFormats[index]);
         if (object) {
diff --git a/src/gui/text/qtexttable_p.h b/src/gui/text/qtexttable_p.h
index c969e1d5bc..5c05611009 100644
--- a/src/gui/text/qtexttable_p.h
+++ b/src/gui/text/qtexttable_p.h
@@ -61,7 +61,7 @@ class QTextTablePrivate : public QTextFramePrivate
 {
     Q_DECLARE_PUBLIC(QTextTable)
 public:
-    QTextTablePrivate(QTextDocument *document) : QTextFramePrivate(document), grid(0), nRows(0), nCols(0), dirty(true), blockFragmentUpdates(false) {}
+    QTextTablePrivate(QTextDocument *document) : QTextFramePrivate(document), grid(nullptr), nRows(0), nCols(0), dirty(true), blockFragmentUpdates(false) {}
     ~QTextTablePrivate();
 
     static QTextTable *createTable(QTextDocumentPrivate *, int pos, int rows, int cols, const QTextTableFormat &tableFormat);
diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h
index 378072b366..6fec8d7719 100644
--- a/src/gui/text/qzipreader_p.h
+++ b/src/gui/text/qzipreader_p.h
@@ -79,11 +79,11 @@ public:
 
     struct FileInfo
     {
-        FileInfo() Q_DECL_NOTHROW
+        FileInfo() noexcept
             : isDir(false), isFile(false), isSymLink(false), crc(0), size(0)
         {}
 
-        bool isValid() const Q_DECL_NOTHROW { return isDir || isFile || isSymLink; }
+        bool isValid() const noexcept { return isDir || isFile || isSymLink; }
 
         QString filePath;
         uint isDir : 1;
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index abe20abe02..5e97b312f1 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -97,6 +97,25 @@ qtConfig(textodfwriter) {
         text/qzip.cpp
 }
 
+qtConfig(textmarkdownreader) {
+    qtConfig(system-textmarkdownreader) {
+        QMAKE_USE += libmd4c
+    } else {
+        include($$PWD/../../3rdparty/md4c.pri)
+    }
+    HEADERS += \
+        text/qtextmarkdownimporter_p.h
+    SOURCES += \
+        text/qtextmarkdownimporter.cpp
+}
+
+qtConfig(textmarkdownwriter) {
+    HEADERS += \
+        text/qtextmarkdownwriter_p.h
+    SOURCES += \
+        text/qtextmarkdownwriter.cpp
+}
+
 qtConfig(cssparser) {
     HEADERS += \
         text/qcssparser_p.h
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 8c7cf8682c..99214c4960 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -60,9 +60,9 @@ class QOpenUrlHandlerRegistry : public QObject
 {
     Q_OBJECT
 public:
-    inline QOpenUrlHandlerRegistry() : mutex(QMutex::Recursive) {}
+    QOpenUrlHandlerRegistry() = default;
 
-    QMutex mutex;
+    QRecursiveMutex mutex;
 
     struct Handler
     {
@@ -290,6 +290,7 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme)
     setUrlHandler(scheme, 0, 0);
 }
 
+#if QT_DEPRECATED_SINCE(5, 0)
 /*!
     \enum QDesktopServices::StandardLocation
     \since 4.4
@@ -344,6 +345,7 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme)
     \obsolete
     Use QStandardPaths::displayName()
 */
+#endif
 
 extern Q_CORE_EXPORT QString qt_applicationName_noFallback();
 
diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
index 5f0cc5da73..5f0e84edb1 100644
--- a/src/gui/util/qgridlayoutengine_p.h
+++ b/src/gui/util/qgridlayoutengine_p.h
@@ -180,7 +180,7 @@ public:
             t = &q_minimumAscent;
             break;
         default:
-            t = 0;
+            t = nullptr;
             break;
         }
         return *t;
@@ -205,7 +205,7 @@ public:
             t = &q_minimumAscent;
             break;
         default:
-            t = 0;
+            t = nullptr;
             break;
         }
         return *t;
@@ -276,7 +276,7 @@ class Q_GUI_EXPORT QGridLayoutItem
 {
 public:
     QGridLayoutItem(int row, int column, int rowSpan = 1, int columnSpan = 1,
-                    Qt::Alignment alignment = 0);
+                    Qt::Alignment alignment = nullptr);
     virtual ~QGridLayoutItem() {}
 
     inline int firstRow() const { return q_firstRows[Ver]; }
@@ -339,7 +339,7 @@ private:
 class Q_GUI_EXPORT QGridLayoutEngine
 {
 public:
-    QGridLayoutEngine(Qt::Alignment defaultAlignment = Qt::Alignment(0), bool snapToPixelGrid = false);
+    QGridLayoutEngine(Qt::Alignment defaultAlignment = Qt::Alignment(nullptr), bool snapToPixelGrid = false);
     inline ~QGridLayoutEngine() { qDeleteAll(q_items); }
 
     int rowCount(Qt::Orientation orientation) const;
diff --git a/src/gui/util/qshaderformat.cpp b/src/gui/util/qshaderformat.cpp
index e4e3718199..ea86dd6ca5 100644
--- a/src/gui/util/qshaderformat.cpp
+++ b/src/gui/util/qshaderformat.cpp
@@ -41,59 +41,59 @@
 
 QT_BEGIN_NAMESPACE
 
-QShaderFormat::QShaderFormat() Q_DECL_NOTHROW
+QShaderFormat::QShaderFormat() noexcept
     : m_api(NoApi)
     , m_shaderType(Fragment)
 {
 }
 
-QShaderFormat::Api QShaderFormat::api() const Q_DECL_NOTHROW
+QShaderFormat::Api QShaderFormat::api() const noexcept
 {
     return m_api;
 }
 
-void QShaderFormat::setApi(QShaderFormat::Api api) Q_DECL_NOTHROW
+void QShaderFormat::setApi(QShaderFormat::Api api) noexcept
 {
     m_api = api;
 }
 
-QVersionNumber QShaderFormat::version() const Q_DECL_NOTHROW
+QVersionNumber QShaderFormat::version() const noexcept
 {
     return m_version;
 }
 
-void QShaderFormat::setVersion(const QVersionNumber &version) Q_DECL_NOTHROW
+void QShaderFormat::setVersion(const QVersionNumber &version) noexcept
 {
     m_version = version;
 }
 
-QStringList QShaderFormat::extensions() const Q_DECL_NOTHROW
+QStringList QShaderFormat::extensions() const noexcept
 {
     return m_extensions;
 }
 
-void QShaderFormat::setExtensions(const QStringList &extensions) Q_DECL_NOTHROW
+void QShaderFormat::setExtensions(const QStringList &extensions) noexcept
 {
     m_extensions = extensions;
     m_extensions.sort();
 }
 
-QString QShaderFormat::vendor() const Q_DECL_NOTHROW
+QString QShaderFormat::vendor() const noexcept
 {
     return m_vendor;
 }
 
-void QShaderFormat::setVendor(const QString &vendor) Q_DECL_NOTHROW
+void QShaderFormat::setVendor(const QString &vendor) noexcept
 {
     m_vendor = vendor;
 }
 
-bool QShaderFormat::isValid() const Q_DECL_NOTHROW
+bool QShaderFormat::isValid() const noexcept
 {
     return m_api != NoApi && m_version.majorVersion() > 0;
 }
 
-bool QShaderFormat::supports(const QShaderFormat &other) const Q_DECL_NOTHROW
+bool QShaderFormat::supports(const QShaderFormat &other) const noexcept
 {
     if (!isValid() || !other.isValid())
         return false;
@@ -133,7 +133,7 @@ void QShaderFormat::setShaderType(QShaderFormat::ShaderType shaderType) Q_DECL_N
     m_shaderType = shaderType;
 }
 
-bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) noexcept
 {
     return lhs.api() == rhs.api()
         && lhs.version() == rhs.version()
diff --git a/src/gui/util/qshaderformat_p.h b/src/gui/util/qshaderformat_p.h
index 8d5e83bd22..c50d7d5729 100644
--- a/src/gui/util/qshaderformat_p.h
+++ b/src/gui/util/qshaderformat_p.h
@@ -78,22 +78,22 @@ public:
         Compute
     };
 
-    Q_GUI_EXPORT QShaderFormat() Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QShaderFormat() noexcept;
 
-    Q_GUI_EXPORT Api api() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setApi(Api api) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT Api api() const noexcept;
+    Q_GUI_EXPORT void setApi(Api api) noexcept;
 
-    Q_GUI_EXPORT QVersionNumber version() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setVersion(const QVersionNumber &version) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QVersionNumber version() const noexcept;
+    Q_GUI_EXPORT void setVersion(const QVersionNumber &version) noexcept;
 
-    Q_GUI_EXPORT QStringList extensions() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setExtensions(const QStringList &extensions) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QStringList extensions() const noexcept;
+    Q_GUI_EXPORT void setExtensions(const QStringList &extensions) noexcept;
 
-    Q_GUI_EXPORT QString vendor() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setVendor(const QString &vendor) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QString vendor() const noexcept;
+    Q_GUI_EXPORT void setVendor(const QString &vendor) noexcept;
 
-    Q_GUI_EXPORT bool isValid() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT bool supports(const QShaderFormat &other) const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT bool isValid() const noexcept;
+    Q_GUI_EXPORT bool supports(const QShaderFormat &other) const noexcept;
 
     Q_GUI_EXPORT ShaderType shaderType() const Q_DECL_NOTHROW;
     Q_GUI_EXPORT void setShaderType(ShaderType shaderType) Q_DECL_NOTHROW;
@@ -106,9 +106,9 @@ private:
     ShaderType m_shaderType;
 };
 
-Q_GUI_EXPORT bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) noexcept;
 
-inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/gui/util/qshadergraph.cpp b/src/gui/util/qshadergraph.cpp
index 40b85ac469..b05b710713 100644
--- a/src/gui/util/qshadergraph.cpp
+++ b/src/gui/util/qshadergraph.cpp
@@ -118,12 +118,12 @@ namespace
     }
 }
 
-QUuid QShaderGraph::Statement::uuid() const Q_DECL_NOTHROW
+QUuid QShaderGraph::Statement::uuid() const noexcept
 {
     return node.uuid();
 }
 
-int QShaderGraph::Statement::portIndex(QShaderNodePort::Direction direction, const QString &portName) const Q_DECL_NOTHROW
+int QShaderGraph::Statement::portIndex(QShaderNodePort::Direction direction, const QString &portName) const noexcept
 {
     const QVector<QShaderNodePort> ports = node.ports();
     int index = 0;
@@ -150,7 +150,7 @@ void QShaderGraph::removeNode(const QShaderNode &node)
         m_nodes.erase(it);
 }
 
-QVector<QShaderNode> QShaderGraph::nodes() const Q_DECL_NOTHROW
+QVector<QShaderNode> QShaderGraph::nodes() const noexcept
 {
     return m_nodes;
 }
@@ -167,7 +167,7 @@ void QShaderGraph::removeEdge(const QShaderGraph::Edge &edge)
     m_edges.removeAll(edge);
 }
 
-QVector<QShaderGraph::Edge> QShaderGraph::edges() const Q_DECL_NOTHROW
+QVector<QShaderGraph::Edge> QShaderGraph::edges() const noexcept
 {
     return m_edges;
 }
@@ -244,7 +244,7 @@ QVector<QShaderGraph::Statement> QShaderGraph::createStatements(const QStringLis
     return result;
 }
 
-bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) noexcept
 {
     return lhs.sourceNodeUuid == rhs.sourceNodeUuid
         && lhs.sourcePortName == rhs.sourcePortName
@@ -252,7 +252,7 @@ bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) Q_
         && lhs.targetPortName == rhs.targetPortName;
 }
 
-bool operator==(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) noexcept
 {
     return lhs.inputs == rhs.inputs
         && lhs.outputs == rhs.outputs
diff --git a/src/gui/util/qshadergraph_p.h b/src/gui/util/qshadergraph_p.h
index 756e1b2da2..9367a3783c 100644
--- a/src/gui/util/qshadergraph_p.h
+++ b/src/gui/util/qshadergraph_p.h
@@ -73,8 +73,8 @@ public:
     class Statement
     {
     public:
-        Q_GUI_EXPORT QUuid uuid() const Q_DECL_NOTHROW;
-        Q_GUI_EXPORT int portIndex(QShaderNodePort::Direction direction, const QString &portName) const Q_DECL_NOTHROW;
+        Q_GUI_EXPORT QUuid uuid() const noexcept;
+        Q_GUI_EXPORT int portIndex(QShaderNodePort::Direction direction, const QString &portName) const noexcept;
 
         QShaderNode node;
         QVector<int> inputs;
@@ -83,11 +83,11 @@ public:
 
     Q_GUI_EXPORT void addNode(const QShaderNode &node);
     Q_GUI_EXPORT void removeNode(const QShaderNode &node);
-    Q_GUI_EXPORT QVector<QShaderNode> nodes() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QVector<QShaderNode> nodes() const noexcept;
 
     Q_GUI_EXPORT void addEdge(const Edge &edge);
     Q_GUI_EXPORT void removeEdge(const Edge &edge);
-    Q_GUI_EXPORT QVector<Edge> edges() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QVector<Edge> edges() const noexcept;
 
     Q_GUI_EXPORT QVector<Statement> createStatements(const QStringList &enabledLayers = QStringList()) const;
 
@@ -96,16 +96,16 @@ private:
     QVector<Edge> m_edges;
 };
 
-Q_GUI_EXPORT bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) noexcept;
 
-inline bool operator!=(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) noexcept
 {
     return !(lhs == rhs);
 }
 
-Q_GUI_EXPORT bool operator==(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) noexcept;
 
-inline bool operator!=(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/gui/util/qshadergraphloader.cpp b/src/gui/util/qshadergraphloader.cpp
index b9d8318655..a393e876e0 100644
--- a/src/gui/util/qshadergraphloader.cpp
+++ b/src/gui/util/qshadergraphloader.cpp
@@ -52,29 +52,29 @@ QT_BEGIN_NAMESPACE
 
 void qt_register_ShaderLanguage_enums();
 
-QShaderGraphLoader::QShaderGraphLoader() Q_DECL_NOTHROW
+QShaderGraphLoader::QShaderGraphLoader() noexcept
     : m_status(Null),
       m_device(nullptr)
 {
     qt_register_ShaderLanguage_enums();
 }
 
-QShaderGraphLoader::Status QShaderGraphLoader::status() const Q_DECL_NOTHROW
+QShaderGraphLoader::Status QShaderGraphLoader::status() const noexcept
 {
     return m_status;
 }
 
-QShaderGraph QShaderGraphLoader::graph() const Q_DECL_NOTHROW
+QShaderGraph QShaderGraphLoader::graph() const noexcept
 {
     return m_graph;
 }
 
-QIODevice *QShaderGraphLoader::device() const Q_DECL_NOTHROW
+QIODevice *QShaderGraphLoader::device() const noexcept
 {
     return m_device;
 }
 
-void QShaderGraphLoader::setDevice(QIODevice *device) Q_DECL_NOTHROW
+void QShaderGraphLoader::setDevice(QIODevice *device) noexcept
 {
     m_device = device;
     m_graph = QShaderGraph();
@@ -83,12 +83,12 @@ void QShaderGraphLoader::setDevice(QIODevice *device) Q_DECL_NOTHROW
              : Error;
 }
 
-QHash<QString, QShaderNode> QShaderGraphLoader::prototypes() const Q_DECL_NOTHROW
+QHash<QString, QShaderNode> QShaderGraphLoader::prototypes() const noexcept
 {
     return m_prototypes;
 }
 
-void QShaderGraphLoader::setPrototypes(const QHash<QString, QShaderNode> &prototypes) Q_DECL_NOTHROW
+void QShaderGraphLoader::setPrototypes(const QHash<QString, QShaderNode> &prototypes) noexcept
 {
     m_prototypes = prototypes;
 }
diff --git a/src/gui/util/qshadergraphloader_p.h b/src/gui/util/qshadergraphloader_p.h
index 97cbd8d18c..e7aa19fa2d 100644
--- a/src/gui/util/qshadergraphloader_p.h
+++ b/src/gui/util/qshadergraphloader_p.h
@@ -69,16 +69,16 @@ public:
         Error
     };
 
-    Q_GUI_EXPORT QShaderGraphLoader() Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QShaderGraphLoader() noexcept;
 
-    Q_GUI_EXPORT Status status() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT QShaderGraph graph() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT Status status() const noexcept;
+    Q_GUI_EXPORT QShaderGraph graph() const noexcept;
 
-    Q_GUI_EXPORT QIODevice *device() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setDevice(QIODevice *device) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QIODevice *device() const noexcept;
+    Q_GUI_EXPORT void setDevice(QIODevice *device) noexcept;
 
-    Q_GUI_EXPORT QHash<QString, QShaderNode> prototypes() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setPrototypes(const QHash<QString, QShaderNode> &prototypes) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QHash<QString, QShaderNode> prototypes() const noexcept;
+    Q_GUI_EXPORT void setPrototypes(const QHash<QString, QShaderNode> &prototypes) noexcept;
 
     Q_GUI_EXPORT void load();
 
diff --git a/src/gui/util/qshaderlanguage_p.h b/src/gui/util/qshaderlanguage_p.h
index 3af967b8c6..193f797cc3 100644
--- a/src/gui/util/qshaderlanguage_p.h
+++ b/src/gui/util/qshaderlanguage_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QShaderLanguage
 {
-    Q_GUI_EXPORT Q_NAMESPACE
+    Q_NAMESPACE_EXPORT(Q_GUI_EXPORT)
 
     enum StorageQualifier : char {
         Const = 1,
diff --git a/src/gui/util/qshadernode.cpp b/src/gui/util/qshadernode.cpp
index e570880d1d..547e5c51a8 100644
--- a/src/gui/util/qshadernode.cpp
+++ b/src/gui/util/qshadernode.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QShaderNode::Type QShaderNode::type() const Q_DECL_NOTHROW
+QShaderNode::Type QShaderNode::type() const noexcept
 {
     int inputCount = 0;
     int outputCount = 0;
@@ -62,27 +62,27 @@ QShaderNode::Type QShaderNode::type() const Q_DECL_NOTHROW
          : Function;
 }
 
-QUuid QShaderNode::uuid() const Q_DECL_NOTHROW
+QUuid QShaderNode::uuid() const noexcept
 {
     return m_uuid;
 }
 
-void QShaderNode::setUuid(const QUuid &uuid) Q_DECL_NOTHROW
+void QShaderNode::setUuid(const QUuid &uuid) noexcept
 {
     m_uuid = uuid;
 }
 
-QStringList QShaderNode::layers() const Q_DECL_NOTHROW
+QStringList QShaderNode::layers() const noexcept
 {
     return m_layers;
 }
 
-void QShaderNode::setLayers(const QStringList &layers) Q_DECL_NOTHROW
+void QShaderNode::setLayers(const QStringList &layers) noexcept
 {
     m_layers = layers;
 }
 
-QVector<QShaderNodePort> QShaderNode::ports() const Q_DECL_NOTHROW
+QVector<QShaderNodePort> QShaderNode::ports() const noexcept
 {
     return m_ports;
 }
@@ -157,13 +157,13 @@ QShaderNode::Rule QShaderNode::rule(const QShaderFormat &format) const
     return it != m_rules.crend() ? it->second : Rule();
 }
 
-QShaderNode::Rule::Rule(const QByteArray &subs, const QByteArrayList &snippets) Q_DECL_NOTHROW
+QShaderNode::Rule::Rule(const QByteArray &subs, const QByteArrayList &snippets) noexcept
     : substitution(subs),
       headerSnippets(snippets)
 {
 }
 
-bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) noexcept
 {
     return lhs.substitution == rhs.substitution
         && lhs.headerSnippets == rhs.headerSnippets;
diff --git a/src/gui/util/qshadernode_p.h b/src/gui/util/qshadernode_p.h
index 12ff9b2a2c..c3d149d8a5 100644
--- a/src/gui/util/qshadernode_p.h
+++ b/src/gui/util/qshadernode_p.h
@@ -73,21 +73,21 @@ public:
     class Rule
     {
     public:
-        Q_GUI_EXPORT Rule(const QByteArray &substitution = QByteArray(), const QByteArrayList &headerSnippets = QByteArrayList()) Q_DECL_NOTHROW;
+        Q_GUI_EXPORT Rule(const QByteArray &substitution = QByteArray(), const QByteArrayList &headerSnippets = QByteArrayList()) noexcept;
 
         QByteArray substitution;
         QByteArrayList headerSnippets;
     };
 
-    Q_GUI_EXPORT Type type() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT Type type() const noexcept;
 
-    Q_GUI_EXPORT QUuid uuid() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setUuid(const QUuid &uuid) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QUuid uuid() const noexcept;
+    Q_GUI_EXPORT void setUuid(const QUuid &uuid) noexcept;
 
-    Q_GUI_EXPORT QStringList layers() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setLayers(const QStringList &layers) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QStringList layers() const noexcept;
+    Q_GUI_EXPORT void setLayers(const QStringList &layers) noexcept;
 
-    Q_GUI_EXPORT QVector<QShaderNodePort> ports() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QVector<QShaderNodePort> ports() const noexcept;
     Q_GUI_EXPORT void addPort(const QShaderNodePort &port);
     Q_GUI_EXPORT void removePort(const QShaderNodePort &port);
 
@@ -110,9 +110,9 @@ private:
     QVector<QPair<QShaderFormat, QShaderNode::Rule>> m_rules;
 };
 
-Q_GUI_EXPORT bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) noexcept;
 
-inline bool operator!=(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/gui/util/qshadernodeport.cpp b/src/gui/util/qshadernodeport.cpp
index 03646a9467..15dbc4160e 100644
--- a/src/gui/util/qshadernodeport.cpp
+++ b/src/gui/util/qshadernodeport.cpp
@@ -41,12 +41,12 @@
 
 QT_BEGIN_NAMESPACE
 
-QShaderNodePort::QShaderNodePort() Q_DECL_NOTHROW
+QShaderNodePort::QShaderNodePort() noexcept
     : direction(Output)
 {
 }
 
-bool operator==(const QShaderNodePort &lhs, const QShaderNodePort &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderNodePort &lhs, const QShaderNodePort &rhs) noexcept
 {
     return lhs.direction == rhs.direction
         && lhs.name == rhs.name;
diff --git a/src/gui/util/qshadernodeport_p.h b/src/gui/util/qshadernodeport_p.h
index cfdaf05017..c69ba23a3f 100644
--- a/src/gui/util/qshadernodeport_p.h
+++ b/src/gui/util/qshadernodeport_p.h
@@ -66,15 +66,15 @@ public:
         Output
     };
 
-    Q_GUI_EXPORT QShaderNodePort() Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QShaderNodePort() noexcept;
 
     QShaderNodePort::Direction direction;
     QString name;
 };
 
-Q_GUI_EXPORT bool operator==(const QShaderNodePort &lhs, const QShaderNodePort &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderNodePort &lhs, const QShaderNodePort &rhs) noexcept;
 
-inline bool operator!=(const QShaderNodePort &lhs, const QShaderNodePort &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderNodePort &lhs, const QShaderNodePort &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/gui/util/qshadernodesloader.cpp b/src/gui/util/qshadernodesloader.cpp
index 5369e8bd4c..922479332c 100644
--- a/src/gui/util/qshadernodesloader.cpp
+++ b/src/gui/util/qshadernodesloader.cpp
@@ -48,28 +48,28 @@
 
 QT_BEGIN_NAMESPACE
 
-QShaderNodesLoader::QShaderNodesLoader() Q_DECL_NOTHROW
+QShaderNodesLoader::QShaderNodesLoader() noexcept
     : m_status(Null),
       m_device(nullptr)
 {
 }
 
-QShaderNodesLoader::Status QShaderNodesLoader::status() const Q_DECL_NOTHROW
+QShaderNodesLoader::Status QShaderNodesLoader::status() const noexcept
 {
     return m_status;
 }
 
-QHash<QString, QShaderNode> QShaderNodesLoader::nodes() const Q_DECL_NOTHROW
+QHash<QString, QShaderNode> QShaderNodesLoader::nodes() const noexcept
 {
     return m_nodes;
 }
 
-QIODevice *QShaderNodesLoader::device() const Q_DECL_NOTHROW
+QIODevice *QShaderNodesLoader::device() const noexcept
 {
     return m_device;
 }
 
-void QShaderNodesLoader::setDevice(QIODevice *device) Q_DECL_NOTHROW
+void QShaderNodesLoader::setDevice(QIODevice *device) noexcept
 {
     m_device = device;
     m_nodes.clear();
diff --git a/src/gui/util/qshadernodesloader_p.h b/src/gui/util/qshadernodesloader_p.h
index 0bec871857..432d7d4494 100644
--- a/src/gui/util/qshadernodesloader_p.h
+++ b/src/gui/util/qshadernodesloader_p.h
@@ -69,13 +69,13 @@ public:
         Error
     };
 
-    Q_GUI_EXPORT QShaderNodesLoader() Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QShaderNodesLoader() noexcept;
 
-    Q_GUI_EXPORT Status status() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT QHash<QString, QShaderNode> nodes() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT Status status() const noexcept;
+    Q_GUI_EXPORT QHash<QString, QShaderNode> nodes() const noexcept;
 
-    Q_GUI_EXPORT QIODevice *device() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setDevice(QIODevice *device) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QIODevice *device() const noexcept;
+    Q_GUI_EXPORT void setDevice(QIODevice *device) noexcept;
 
     Q_GUI_EXPORT void load();
     Q_GUI_EXPORT void load(const QJsonObject &prototypesObject);
diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h
index cc7cbcb559..f0e72e3814 100644
--- a/src/gui/util/qvalidator.h
+++ b/src/gui/util/qvalidator.h
@@ -69,6 +69,7 @@ public:
         Intermediate,
         Acceptable
     };
+    Q_ENUM(State)
 
     void setLocale(const QLocale &locale);
     QLocale locale() const;
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
index e5e711b1a0..d3402133d6 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -8,7 +8,6 @@ HEADERS += \
         util/qabstractlayoutstyleinfo_p.h \
         util/qlayoutpolicy_p.h \
         util/qshaderformat_p.h \
-        util/qshadergenerator_p.h \
         util/qshadergraph_p.h \
         util/qshadergraphloader_p.h \
         util/qshaderlanguage_p.h \
@@ -29,7 +28,6 @@ SOURCES += \
         util/qabstractlayoutstyleinfo.cpp \
         util/qlayoutpolicy.cpp \
         util/qshaderformat.cpp \
-        util/qshadergenerator.cpp \
         util/qshadergraph.cpp \
         util/qshadergraphloader.cpp \
         util/qshaderlanguage.cpp \
@@ -41,3 +39,10 @@ SOURCES += \
         util/qpkmhandler.cpp \
         util/qktxhandler.cpp \
         util/qastchandler.cpp
+
+qtConfig(regularexpression) {
+    HEADERS += \
+        util/qshadergenerator_p.h
+    SOURCES += \
+        util/qshadergenerator.cpp
+}
diff --git a/src/gui/vulkan/qplatformvulkaninstance.cpp b/src/gui/vulkan/qplatformvulkaninstance.cpp
index 6201d3ec11..9d044bfd58 100644
--- a/src/gui/vulkan/qplatformvulkaninstance.cpp
+++ b/src/gui/vulkan/qplatformvulkaninstance.cpp
@@ -85,4 +85,9 @@ void QPlatformVulkanInstance::presentQueued(QWindow *window)
     Q_UNUSED(window);
 }
 
+void QPlatformVulkanInstance::setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters)
+{
+    Q_UNUSED(filters);
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/vulkan/qplatformvulkaninstance.h b/src/gui/vulkan/qplatformvulkaninstance.h
index 9f34803f7b..d47c59b5db 100644
--- a/src/gui/vulkan/qplatformvulkaninstance.h
+++ b/src/gui/vulkan/qplatformvulkaninstance.h
@@ -78,6 +78,7 @@ public:
     virtual PFN_vkVoidFunction getInstanceProcAddr(const char *name) = 0;
     virtual bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) = 0;
     virtual void presentQueued(QWindow *window);
+    virtual void setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters);
 
 private:
     QScopedPointer<QPlatformVulkanInstancePrivate> d_ptr;
diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp
index 2941bfd01f..0605d88cca 100644
--- a/src/gui/vulkan/qvulkaninstance.cpp
+++ b/src/gui/vulkan/qvulkaninstance.cpp
@@ -269,6 +269,7 @@ public:
     VkResult errorCode;
     QScopedPointer<QVulkanFunctions> funcs;
     QHash<VkDevice, QVulkanDeviceFunctions *> deviceFuncs;
+    QVector<QVulkanInstance::DebugFilter> debugFilters;
 };
 
 bool QVulkanInstancePrivate::ensureVulkan()
@@ -570,6 +571,7 @@ bool QVulkanInstance::create()
         d_ptr->extensions = d_ptr->platformInst->enabledExtensions();
         d_ptr->errorCode = VK_SUCCESS;
         d_ptr->funcs.reset(new QVulkanFunctions(this));
+        d_ptr->platformInst->setDebugFilters(d_ptr->debugFilters);
         return true;
     }
 
@@ -785,6 +787,50 @@ void QVulkanInstance::presentQueued(QWindow *window)
     d_ptr->platformInst->presentQueued(window);
 }
 
+/*!
+    \typedef QVulkanInstance::DebugFilter
+
+    Typedef for debug filtering callback functions.
+
+    \sa installDebugOutputFilter(), removeDebugOutputFilter()
+ */
+
+/*!
+    Installs a \a filter function that is called for every Vulkan debug
+    message. When the callback returns \c true, the message is stopped (filtered
+    out) and will not appear on the debug output.
+
+    \note Filtering is only effective when NoDebugOutputRedirect is not
+    \l{setFlags()}{set}. Installing filters has no effect otherwise.
+
+    \note This function can be called before create().
+
+    \sa removeDebugOutputFilter()
+ */
+void QVulkanInstance::installDebugOutputFilter(DebugFilter filter)
+{
+    if (!d_ptr->debugFilters.contains(filter)) {
+        d_ptr->debugFilters.append(filter);
+        if (d_ptr->platformInst)
+            d_ptr->platformInst->setDebugFilters(d_ptr->debugFilters);
+    }
+}
+
+/*!
+    Removes a \a filter function previously installed by
+    installDebugOutputFilter().
+
+    \note This function can be called before create().
+
+    \sa installDebugOutputFilter()
+ */
+void QVulkanInstance::removeDebugOutputFilter(DebugFilter filter)
+{
+    d_ptr->debugFilters.removeOne(filter);
+    if (d_ptr->platformInst)
+        d_ptr->platformInst->setDebugFilters(d_ptr->debugFilters);
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QVulkanLayer &layer)
 {
diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h
index 57459e458c..70f2fd5102 100644
--- a/src/gui/vulkan/qvulkaninstance.h
+++ b/src/gui/vulkan/qvulkaninstance.h
@@ -84,14 +84,14 @@ struct QVulkanLayer
 };
 Q_DECLARE_TYPEINFO(QVulkanLayer, Q_MOVABLE_TYPE);
 
-inline bool operator==(const QVulkanLayer &lhs, const QVulkanLayer &rhs) Q_DECL_NOTHROW
+inline bool operator==(const QVulkanLayer &lhs, const QVulkanLayer &rhs) noexcept
 {
     return lhs.name == rhs.name && lhs.version == rhs.version && lhs.specVersion == rhs.specVersion;
 }
-inline bool operator!=(const QVulkanLayer &lhs, const QVulkanLayer &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QVulkanLayer &lhs, const QVulkanLayer &rhs) noexcept
 { return !(lhs == rhs); }
 
-inline uint qHash(const QVulkanLayer &key, uint seed = 0) Q_DECL_NOTHROW
+inline uint qHash(const QVulkanLayer &key, uint seed = 0) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.name);
@@ -107,14 +107,14 @@ struct QVulkanExtension
 };
 Q_DECLARE_TYPEINFO(QVulkanExtension, Q_MOVABLE_TYPE);
 
-inline bool operator==(const QVulkanExtension &lhs, const QVulkanExtension &rhs) Q_DECL_NOTHROW
+inline bool operator==(const QVulkanExtension &lhs, const QVulkanExtension &rhs) noexcept
 {
     return lhs.name == rhs.name && lhs.version == rhs.version;
 }
-inline bool operator!=(const QVulkanExtension &lhs, const QVulkanExtension &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QVulkanExtension &lhs, const QVulkanExtension &rhs) noexcept
 { return !(lhs == rhs); }
 
-inline uint qHash(const QVulkanExtension &key, uint seed = 0) Q_DECL_NOTHROW
+inline uint qHash(const QVulkanExtension &key, uint seed = 0) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.name);
@@ -188,6 +188,11 @@ public:
 
     void presentQueued(QWindow *window);
 
+    typedef bool (*DebugFilter)(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object,
+                                size_t location, int32_t messageCode, const char *pLayerPrefix, const char *pMessage);
+    void installDebugOutputFilter(DebugFilter filter);
+    void removeDebugOutputFilter(DebugFilter filter);
+
 private:
     QScopedPointer<QVulkanInstancePrivate> d_ptr;
     Q_DISABLE_COPY(QVulkanInstance)
diff --git a/src/gui/vulkan/qvulkanwindow.cpp b/src/gui/vulkan/qvulkanwindow.cpp
index 6d12377a60..4b5c2b56ee 100644
--- a/src/gui/vulkan/qvulkanwindow.cpp
+++ b/src/gui/vulkan/qvulkanwindow.cpp
@@ -498,12 +498,12 @@ QVector<int> QVulkanWindow::supportedSampleCounts()
     VkSampleCountFlags depth = limits->framebufferDepthSampleCounts;
     VkSampleCountFlags stencil = limits->framebufferStencilSampleCounts;
 
-    for (size_t i = 0; i < sizeof(qvk_sampleCounts) / sizeof(qvk_sampleCounts[0]); ++i) {
-        if ((color & qvk_sampleCounts[i].mask)
-                && (depth & qvk_sampleCounts[i].mask)
-                && (stencil & qvk_sampleCounts[i].mask))
+    for (const auto &qvk_sampleCount : qvk_sampleCounts) {
+        if ((color & qvk_sampleCount.mask)
+                && (depth & qvk_sampleCount.mask)
+                && (stencil & qvk_sampleCount.mask))
         {
-            result.append(qvk_sampleCounts[i].count);
+            result.append(qvk_sampleCount.count);
         }
     }
 
@@ -547,9 +547,9 @@ void QVulkanWindow::setSampleCount(int sampleCount)
         return;
     }
 
-    for (size_t i = 0; i < sizeof(qvk_sampleCounts) / sizeof(qvk_sampleCounts[0]); ++i) {
-        if (qvk_sampleCounts[i].count == sampleCount) {
-            d->sampleCount = qvk_sampleCounts[i].mask;
+    for (const auto &qvk_sampleCount : qvk_sampleCounts) {
+        if (qvk_sampleCount.count == sampleCount) {
+            d->sampleCount = qvk_sampleCount.mask;
             return;
         }
     }
diff --git a/src/gui/vulkan/qvulkanwindow_p.h b/src/gui/vulkan/qvulkanwindow_p.h
index c6a772bc31..fb374a5564 100644
--- a/src/gui/vulkan/qvulkanwindow_p.h
+++ b/src/gui/vulkan/qvulkanwindow_p.h
@@ -97,7 +97,7 @@ public:
     int physDevIndex = 0;
     QVector<VkPhysicalDevice> physDevs;
     QVector<VkPhysicalDeviceProperties> physDevProps;
-    QVulkanWindow::Flags flags = 0;
+    QVulkanWindow::Flags flags = nullptr;
     QByteArrayList requestedDevExtensions;
     QHash<VkPhysicalDevice, QVulkanInfoVector<QVulkanExtension> > supportedDevExtensions;
     QVector<VkFormat> requestedColorFormats;
diff --git a/src/gui/vulkan/vulkan.pri b/src/gui/vulkan/vulkan.pri
index 9bd7391235..5c902e8b82 100644
--- a/src/gui/vulkan/vulkan.pri
+++ b/src/gui/vulkan/vulkan.pri
@@ -17,39 +17,45 @@ qtConfig(vulkan) {
     QMAKE_USE += vulkan/nolink
 }
 
-# Generate qvulkanfunctions.h, qvulkanfunctions_p.h, qvulkanfunctions_p.cpp
-QMAKE_QVKGEN_INPUT = vulkan/vk.xml
-QMAKE_QVKGEN_LICENSE_HEADER = $$QT_SOURCE_TREE/header.LGPL
-qtPrepareTool(QMAKE_QVKGEN, qvkgen)
-
-qvkgen_h.commands = $$QMAKE_QVKGEN ${QMAKE_FILE_IN} $$shell_quote($$QMAKE_QVKGEN_LICENSE_HEADER) ${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}
-qvkgen_h.output = $$OUT_PWD/vulkan/qvulkanfunctions.h
-qvkgen_h.input = QMAKE_QVKGEN_INPUT
-qtConfig(vulkan): \
-    qvkgen_h.variable_out = HEADERS
-else: \
-    qvkgen_h.CONFIG += target_predeps no_link
-QMAKE_EXTRA_COMPILERS += qvkgen_h
-
-qvkgen_ph.commands = $$escape_expand(\\n)
-qvkgen_ph.output = $$OUT_PWD/vulkan/qvulkanfunctions_p.h
-qvkgen_ph.input = QMAKE_QVKGEN_INPUT
-qvkgen_ph.depends += $$OUT_PWD/vulkan/qvulkanfunctions.h
-qtConfig(vulkan): \
-    qvkgen_ph.variable_out = HEADERS
-else: \
-    qvkgen_ph.CONFIG += target_predeps no_link
-QMAKE_EXTRA_COMPILERS += qvkgen_ph
-
-qvkgen_pimpl.commands = $$escape_expand(\\n)
-qvkgen_pimpl.output = $$OUT_PWD/vulkan/qvulkanfunctions_p.cpp
-qvkgen_pimpl.input = QMAKE_QVKGEN_INPUT
-qvkgen_pimpl.depends += $$OUT_PWD/vulkan/qvulkanfunctions_p.h
-qtConfig(vulkan): \
-    qvkgen_pimpl.variable_out = SOURCES
-else: \
-    qvkgen_pimpl.CONFIG += target_predeps no_link
-QMAKE_EXTRA_COMPILERS += qvkgen_pimpl
+qtConfig(vkgen) {
+    # Generate qvulkanfunctions.h, qvulkanfunctions_p.h, qvulkanfunctions_p.cpp
+    QMAKE_QVKGEN_INPUT = vulkan/vk.xml
+    QMAKE_QVKGEN_LICENSE_HEADER = $$QT_SOURCE_TREE/header.LGPL
+    qtPrepareTool(QMAKE_QVKGEN, qvkgen)
+
+    qvkgen_h.commands = $$QMAKE_QVKGEN ${QMAKE_FILE_IN} $$shell_quote($$QMAKE_QVKGEN_LICENSE_HEADER) ${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}
+    qvkgen_h.output = $$OUT_PWD/vulkan/qvulkanfunctions.h
+    qvkgen_h.input = QMAKE_QVKGEN_INPUT
+    qtConfig(vulkan): \
+        qvkgen_h.variable_out = HEADERS
+    else: \
+        qvkgen_h.CONFIG += target_predeps no_link
+    QMAKE_EXTRA_COMPILERS += qvkgen_h
+
+    qvkgen_ph.commands = $$escape_expand(\\n)
+    qvkgen_ph.output = $$OUT_PWD/vulkan/qvulkanfunctions_p.h
+    qvkgen_ph.input = QMAKE_QVKGEN_INPUT
+    qvkgen_ph.depends += $$OUT_PWD/vulkan/qvulkanfunctions.h
+    qtConfig(vulkan): \
+        qvkgen_ph.variable_out = HEADERS
+    else: \
+        qvkgen_ph.CONFIG += target_predeps no_link
+    QMAKE_EXTRA_COMPILERS += qvkgen_ph
+
+    qvkgen_pimpl.commands = $$escape_expand(\\n)
+    qvkgen_pimpl.output = $$OUT_PWD/vulkan/qvulkanfunctions_p.cpp
+    qvkgen_pimpl.input = QMAKE_QVKGEN_INPUT
+    qvkgen_pimpl.depends += $$OUT_PWD/vulkan/qvulkanfunctions_p.h
+    qtConfig(vulkan): \
+        qvkgen_pimpl.variable_out = SOURCES
+    else: \
+        qvkgen_pimpl.CONFIG += target_predeps no_link
+    QMAKE_EXTRA_COMPILERS += qvkgen_pimpl
+} else {
+    # generate dummy files to make qmake happy
+    write_file($$OUT_PWD/vulkan/qvulkanfunctions.h)
+    write_file($$OUT_PWD/vulkan/qvulkanfunctions_p.h)
+}
 
 # Ensure qvulkanfunctions.h gets installed correctly
 targ_headers.CONFIG += no_check_exist
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index 8a92308f12..cfb20dcd71 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -97,7 +97,8 @@ qtConfig(http) {
         access/qhttpnetworkrequest.cpp \
         access/qhttpprotocolhandler.cpp \
         access/qhttpthreaddelegate.cpp \
-        access/qnetworkreplyhttpimpl.cpp
+        access/qnetworkreplyhttpimpl.cpp \
+        access/qhttp2configuration.cpp
 
     HEADERS += \
         access/qabstractprotocolhandler_p.h \
@@ -111,7 +112,8 @@ qtConfig(http) {
         access/qhttpnetworkrequest_p.h \
         access/qhttpprotocolhandler_p.h \
         access/qhttpthreaddelegate_p.h \
-        access/qnetworkreplyhttpimpl_p.h
+        access/qnetworkreplyhttpimpl_p.h \
+        access/qhttp2configuration.h
 
     qtConfig(ssl) {
         SOURCES += \
diff --git a/src/network/access/http2/hpack.cpp b/src/network/access/http2/hpack.cpp
index 2d324d5092..b40cc29e1a 100644
--- a/src/network/access/http2/hpack.cpp
+++ b/src/network/access/http2/hpack.cpp
@@ -208,6 +208,11 @@ void Encoder::setMaxDynamicTableSize(quint32 size)
     lookupTable.setMaxDynamicTableSize(size);
 }
 
+void Encoder::setCompressStrings(bool compress)
+{
+    compressStrings = compress;
+}
+
 bool Encoder::encodeRequestPseudoHeaders(BitOStream &outputStream,
                                          const HttpHeader &header)
 {
diff --git a/src/network/access/http2/hpack_p.h b/src/network/access/http2/hpack_p.h
index 6a1d30d87b..8c2701e7af 100644
--- a/src/network/access/http2/hpack_p.h
+++ b/src/network/access/http2/hpack_p.h
@@ -83,6 +83,7 @@ public:
                           quint32 newSize);
 
     void setMaxDynamicTableSize(quint32 size);
+    void setCompressStrings(bool compress);
 
 private:
     bool encodeRequestPseudoHeaders(BitOStream &outputStream,
diff --git a/src/network/access/http2/http2frames.cpp b/src/network/access/http2/http2frames.cpp
index e695b4dd9e..ce33505683 100644
--- a/src/network/access/http2/http2frames.cpp
+++ b/src/network/access/http2/http2frames.cpp
@@ -305,7 +305,7 @@ FrameStatus FrameReader::read(QAbstractSocket &socket)
             return status;
         }
 
-        if (Http2PredefinedParameters::maxFrameSize < frame.payloadSize())
+        if (Http2PredefinedParameters::maxPayloadSize < frame.payloadSize())
             return FrameStatus::sizeError;
 
         frame.buffer.resize(frame.payloadSize() + frameHeaderSize);
@@ -388,7 +388,7 @@ void FrameWriter::setPayloadSize(quint32 size)
     auto &buffer = frame.buffer;
 
     Q_ASSERT(buffer.size() >= frameHeaderSize);
-    Q_ASSERT(size < maxPayloadSize);
+    Q_ASSERT(size <= maxPayloadSize);
 
     buffer[0] = size >> 16;
     buffer[1] = size >> 8;
diff --git a/src/network/access/http2/http2protocol.cpp b/src/network/access/http2/http2protocol.cpp
index 0be72042c6..31da6fd616 100644
--- a/src/network/access/http2/http2protocol.cpp
+++ b/src/network/access/http2/http2protocol.cpp
@@ -43,6 +43,8 @@
 #include "private/qhttpnetworkrequest_p.h"
 #include "private/qhttpnetworkreply_p.h"
 
+#include <access/qhttp2configuration.h>
+
 #include <QtCore/qbytearray.h>
 #include <QtCore/qstring.h>
 
@@ -62,88 +64,29 @@ const char Http2clientPreface[clientPrefaceLength] =
      0x2e, 0x30, 0x0d, 0x0a, 0x0d, 0x0a,
      0x53, 0x4d, 0x0d, 0x0a, 0x0d, 0x0a};
 
-// TODO: (in 5.11) - remove it!
-const char *http2ParametersPropertyName = "QT_HTTP2_PARAMETERS_PROPERTY";
-
-ProtocolParameters::ProtocolParameters()
-{
-    settingsFrameData[Settings::INITIAL_WINDOW_SIZE_ID] = qtDefaultStreamReceiveWindowSize;
-    settingsFrameData[Settings::ENABLE_PUSH_ID] = 0;
-}
-
-bool ProtocolParameters::validate() const
+Frame configurationToSettingsFrame(const QHttp2Configuration &config)
 {
-    // 0. Huffman/indexing: any values are valid and allowed.
-
-    // 1. Session receive window size (client side): HTTP/2 starts from the
-    // default value of 64Kb, if a client code tries to set lesser value,
-    // the delta would become negative, but this is not allowed.
-    if (maxSessionReceiveWindowSize < qint32(defaultSessionWindowSize)) {
-        qCWarning(QT_HTTP2, "Session receive window must be at least 65535 bytes");
-        return false;
-    }
-
-    // 2. HEADER_TABLE_SIZE: we do not validate HEADER_TABLE_SIZE, considering
-    // all values as valid. RFC 7540 and 7541 do not provide any lower/upper
-    // limits. If it's 0 - we do not index anything, if it's too huge - a user
-    // who provided such a value can potentially have a huge memory footprint,
-    // up to them to decide.
-
-    // 3. SETTINGS_ENABLE_PUSH: RFC 7540, 6.5.2, a value other than 0 or 1 will
-    // be treated by our peer as a PROTOCOL_ERROR.
-    if (settingsFrameData.contains(Settings::ENABLE_PUSH_ID)
-        && settingsFrameData[Settings::ENABLE_PUSH_ID] > 1) {
-        qCWarning(QT_HTTP2, "SETTINGS_ENABLE_PUSH can be only 0 or 1");
-        return false;
-    }
-
-    // 4. SETTINGS_MAX_CONCURRENT_STREAMS : RFC 7540 recommends 100 as the lower
-    // limit, says nothing about the upper limit. The RFC allows 0, but this makes
-    // no sense to us at all: there is no way a user can change this later and
-    // we'll not be able to get any responses on such a connection.
-    if (settingsFrameData.contains(Settings::MAX_CONCURRENT_STREAMS_ID)
-        && !settingsFrameData[Settings::MAX_CONCURRENT_STREAMS_ID]) {
-        qCWarning(QT_HTTP2, "MAX_CONCURRENT_STREAMS must be a positive number");
-        return false;
-    }
-
-    // 5. SETTINGS_INITIAL_WINDOW_SIZE.
-    if (settingsFrameData.contains(Settings::INITIAL_WINDOW_SIZE_ID)) {
-        const quint32 value = settingsFrameData[Settings::INITIAL_WINDOW_SIZE_ID];
-        // RFC 7540, 6.5.2 (the upper limit). The lower limit is our own - we send
-        // SETTINGS frame only once and will not be able to change this 0, thus
-        // we'll suspend all streams.
-        if (!value || value > quint32(maxSessionReceiveWindowSize)) {
-            qCWarning(QT_HTTP2, "INITIAL_WINDOW_SIZE must be in the range "
-                                "(0, 2^31-1]");
-            return false;
-        }
-    }
-
-    // 6. SETTINGS_MAX_FRAME_SIZE: RFC 7540, 6.5.2, a value outside of the range
-    // [2^14-1, 2^24-1] will be treated by our peer as a PROTOCOL_ERROR.
-    if (settingsFrameData.contains(Settings::MAX_FRAME_SIZE_ID)) {
-        const quint32 value = settingsFrameData[Settings::INITIAL_WINDOW_SIZE_ID];
-        if (value < maxFrameSize || value > maxPayloadSize) {
-            qCWarning(QT_HTTP2, "MAX_FRAME_SIZE must be in the range [2^14, 2^24-1]");
-            return false;
-        }
+    // 6.5 SETTINGS
+    FrameWriter builder(FrameType::SETTINGS, FrameFlag::EMPTY, connectionStreamID);
+    // Server push:
+    builder.append(Settings::ENABLE_PUSH_ID);
+    builder.append(int(config.serverPushEnabled()));
+    // Stream receive window size:
+    builder.append(Settings::INITIAL_WINDOW_SIZE_ID);
+    builder.append(config.streamReceiveWindowSize());
+
+    if (config.maxFrameSize() != minPayloadLimit) {
+        builder.append(Settings::MAX_FRAME_SIZE_ID);
+        builder.append(config.maxFrameSize());
     }
-
-    // For SETTINGS_MAX_HEADER_LIST_SIZE RFC 7540 does not provide any specific
-    // numbers. It's clear, if a value is too small, no header can ever be sent
-    // by our peer at all. The default value is unlimited and we normally do not
-    // change this.
-    //
-    // Note: the size is calculated as the length of uncompressed (no HPACK)
-    // name + value + 32 bytes.
-
-    return true;
+    // TODO: In future, if the need is proven, we can
+    // also send decoding table size and header list size.
+    // For now, defaults suffice.
+    return builder.outboundFrame();
 }
 
-QByteArray ProtocolParameters::settingsFrameToBase64() const
+QByteArray settingsFrameToBase64(const Frame &frame)
 {
-    Frame frame(settingsFrame());
     // SETTINGS frame's payload consists of pairs:
     // 2-byte-identifier | 4-byte-value == multiple of 6.
     Q_ASSERT(frame.payloadSize() && !(frame.payloadSize() % 6));
@@ -157,20 +100,7 @@ QByteArray ProtocolParameters::settingsFrameToBase64() const
     return wrapper.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
 }
 
-Frame ProtocolParameters::settingsFrame() const
-{
-    // 6.5 SETTINGS
-    FrameWriter builder(FrameType::SETTINGS, FrameFlag::EMPTY, connectionStreamID);
-    for (auto it = settingsFrameData.cbegin(), end = settingsFrameData.cend();
-         it != end; ++it) {
-        builder.append(it.key());
-        builder.append(it.value());
-    }
-
-    return builder.outboundFrame();
-}
-
-void ProtocolParameters::addProtocolUpgradeHeaders(QHttpNetworkRequest *request) const
+void appendProtocolUpgradeHeaders(const QHttp2Configuration &config, QHttpNetworkRequest *request)
 {
     Q_ASSERT(request);
     // RFC 2616, 14.10
@@ -184,8 +114,10 @@ void ProtocolParameters::addProtocolUpgradeHeaders(QHttpNetworkRequest *request)
     request->setHeaderField("Connection", value);
     // This we just (re)write.
     request->setHeaderField("Upgrade", "h2c");
+
+    const Frame frame(configurationToSettingsFrame(config));
     // This we just (re)write.
-    request->setHeaderField("HTTP2-Settings", settingsFrameToBase64());
+    request->setHeaderField("HTTP2-Settings", settingsFrameToBase64(frame));
 }
 
 void qt_error(quint32 errorCode, QNetworkReply::NetworkError &error,
diff --git a/src/network/access/http2/http2protocol_p.h b/src/network/access/http2/http2protocol_p.h
index 7142d6f1fa..b0af5aa919 100644
--- a/src/network/access/http2/http2protocol_p.h
+++ b/src/network/access/http2/http2protocol_p.h
@@ -55,12 +55,14 @@
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qglobal.h>
+#include <QtCore/qmap.h>
 
 // Different HTTP/2 constants/values as defined by RFC 7540.
 
 QT_BEGIN_NAMESPACE
 
 class QHttpNetworkRequest;
+class QHttp2Configuration;
 class QHttpNetworkReply;
 class QByteArray;
 class QString;
@@ -118,13 +120,19 @@ enum Http2PredefinedParameters
     connectionStreamID = 0, // HTTP/2, 5.1.1
     frameHeaderSize = 9, // HTTP/2, 4.1
 
-    // It's our max frame size we send in SETTINGS frame,
-    // it's also the default one and we also use it to later
-    // validate incoming frames:
-    maxFrameSize = 16384, // HTTP/2 6.5.2
+    // The initial allowed payload size. We would use it as an
+    // upper limit for a frame payload we send, until our peer
+    // updates us with a larger SETTINGS_MAX_FRAME_SIZE.
 
-    defaultSessionWindowSize = 65535, // HTTP/2 6.5.2
+    // The initial maximum payload size that an HTTP/2 frame
+    // can contain is 16384. It's also the minimal size that
+    // can be advertised  via 'SETTINGS' frames. A real frame
+    // can have a payload smaller than 16384.
+    minPayloadLimit = 16384, // HTTP/2 6.5.2
+    // The maximum allowed payload size.
     maxPayloadSize = (1 << 24) - 1, // HTTP/2 6.5.2
+
+    defaultSessionWindowSize = 65535, // HTTP/2 6.5.2
     // Using 1000 (rather arbitrarily), just to
     // impose *some* upper limit:
     maxPeerConcurrentStreams  = 1000,
@@ -145,48 +153,9 @@ const quint32 lastValidStreamID((quint32(1) << 31) - 1); // HTTP/2, 5.1.1
 const qint32 maxSessionReceiveWindowSize((quint32(1) << 31) - 1);
 const qint32 qtDefaultStreamReceiveWindowSize = maxSessionReceiveWindowSize / maxConcurrentStreams;
 
-// The class ProtocolParameters allows client code to customize HTTP/2 protocol
-// handler, if needed. Normally, we use our own default parameters (see below).
-// In 5.10 we can also use setProperty/property on a QNAM object to pass the
-// non-default values to the protocol handler. In 5.11 this will probably become
-// a public API.
-
-using RawSettings = QMap<Settings, quint32>;
-
-struct Q_AUTOTEST_EXPORT ProtocolParameters
-{
-    ProtocolParameters();
-
-    bool validate() const;
-    QByteArray settingsFrameToBase64() const;
-    struct Frame settingsFrame() const;
-    void addProtocolUpgradeHeaders(QHttpNetworkRequest *request) const;
-
-    // HPACK:
-    // TODO: for now we ignore them (fix it for 5.11, would require changes in HPACK)
-    bool useHuffman = true;
-    bool indexStrings = true;
-
-    // This parameter is not negotiated via SETTINGS frames, so we have it
-    // as a member and will convey it to our peer as a WINDOW_UPDATE frame.
-    // Note, some servers do not accept our WINDOW_UPDATE from the default
-    // 64 KB to the possible maximum. Let's use a half of it:
-    qint32 maxSessionReceiveWindowSize = Http2::maxSessionReceiveWindowSize / 2;
-
-    // This is our default SETTINGS frame:
-    //
-    // SETTINGS_INITIAL_WINDOW_SIZE: (2^31 - 1) / 100
-    // SETTINGS_ENABLE_PUSH: 0.
-    //
-    // Note, whenever we skip some value in our SETTINGS frame, our peer
-    // will assume the defaults recommended by RFC 7540, which in general
-    // are good enough, although we (and most browsers) prefer to work
-    // with larger window sizes.
-    RawSettings settingsFrameData;
-};
-
-// TODO: remove in 5.11
-extern const Q_AUTOTEST_EXPORT char *http2ParametersPropertyName;
+struct Frame configurationToSettingsFrame(const QHttp2Configuration &configuration);
+QByteArray settingsFrameToBase64(const Frame &settingsFrame);
+void appendProtocolUpgradeHeaders(const QHttp2Configuration &configuration, QHttpNetworkRequest *request);
 
 extern const Q_AUTOTEST_EXPORT char Http2clientPreface[clientPrefaceLength];
 
@@ -235,6 +204,5 @@ Q_DECLARE_LOGGING_CATEGORY(QT_HTTP2)
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Http2::Settings)
-Q_DECLARE_METATYPE(Http2::ProtocolParameters)
 
 #endif
diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h
index 678bae2d6e..e357dfe58f 100644
--- a/src/network/access/qabstractnetworkcache.h
+++ b/src/network/access/qabstractnetworkcache.h
@@ -67,12 +67,10 @@ public:
     QNetworkCacheMetaData(const QNetworkCacheMetaData &other);
     ~QNetworkCacheMetaData();
 
-#ifdef Q_COMPILER_RVALUE_REFS
-    QNetworkCacheMetaData &operator=(QNetworkCacheMetaData &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QNetworkCacheMetaData &operator=(QNetworkCacheMetaData &&other) noexcept { swap(other); return *this; }
     QNetworkCacheMetaData &operator=(const QNetworkCacheMetaData &other);
 
-    void swap(QNetworkCacheMetaData &other) Q_DECL_NOTHROW
+    void swap(QNetworkCacheMetaData &other) noexcept
     { qSwap(d, other.d); }
 
     bool operator==(const QNetworkCacheMetaData &other) const;
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index 4e399f018f..cc230a5411 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -955,11 +955,9 @@ void QFtpPI::readyRead()
                 }
             }
         }
-        QString endOfMultiLine;
-        endOfMultiLine[0] = '0' + replyCode[0];
-        endOfMultiLine[1] = '0' + replyCode[1];
-        endOfMultiLine[2] = '0' + replyCode[2];
-        endOfMultiLine[3] = QLatin1Char(' ');
+        const char count[4] = { char('0' + replyCode[0]), char('0' + replyCode[1]),
+                                char('0' + replyCode[2]), char(' ') };
+        QString endOfMultiLine(QLatin1String(count, 4));
         QString lineCont(endOfMultiLine);
         lineCont[3] = QLatin1Char('-');
         QStringRef lineLeft4 = line.leftRef(4);
@@ -2124,6 +2122,17 @@ void QFtp::abort()
 
 /*!
     \internal
+    Clears the last error.
+
+    \sa currentCommand()
+*/
+void QFtp::clearError()
+{
+    d_func()->error = NoError;
+}
+
+/*!
+    \internal
     Returns the identifier of the FTP command that is being executed
     or 0 if there is no command being executed.
 
diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h
index 0516c3d1f9..a55429933b 100644
--- a/src/network/access/qftp_p.h
+++ b/src/network/access/qftp_p.h
@@ -67,7 +67,7 @@ class Q_AUTOTEST_EXPORT QFtp : public QObject
     Q_OBJECT
 
 public:
-    explicit QFtp(QObject *parent = 0);
+    explicit QFtp(QObject *parent = nullptr);
     virtual ~QFtp();
 
     enum State {
@@ -118,7 +118,7 @@ public:
     int setTransferMode(TransferMode mode);
     int list(const QString &dir = QString());
     int cd(const QString &dir);
-    int get(const QString &file, QIODevice *dev=0, TransferType type = Binary);
+    int get(const QString &file, QIODevice *dev=nullptr, TransferType type = Binary);
     int put(const QByteArray &data, const QString &file, TransferType type = Binary);
     int put(QIODevice *dev, const QString &file, TransferType type = Binary);
     int remove(const QString &file);
@@ -157,6 +157,9 @@ Q_SIGNALS:
     void commandFinished(int, bool);
     void done(bool);
 
+protected:
+    void clearError();
+
 private:
     Q_DISABLE_COPY_MOVE(QFtp)
     Q_DECLARE_PRIVATE(QFtp)
diff --git a/src/network/access/qhsts.cpp b/src/network/access/qhsts.cpp
index ce70b6af90..0cef0ad3dc 100644
--- a/src/network/access/qhsts.cpp
+++ b/src/network/access/qhsts.cpp
@@ -145,7 +145,7 @@ void QHstsCache::updateKnownHost(const QString &host, const QDateTime &expires,
             return;
         }
 
-        knownHosts.insert(pos, {hostName, newPolicy});
+        knownHosts.insert({hostName, newPolicy});
 #if QT_CONFIG(settings)
         if (hstsStore)
             hstsStore->addToObserved(newPolicy);
@@ -156,7 +156,7 @@ void QHstsCache::updateKnownHost(const QString &host, const QDateTime &expires,
     if (newPolicy.isExpired())
         knownHosts.erase(pos);
     else  if (pos->second != newPolicy)
-        pos->second = std::move(newPolicy);
+        pos->second = newPolicy;
     else
         return;
 
diff --git a/src/network/access/qhstspolicy.h b/src/network/access/qhstspolicy.h
index 176a8fa635..f1b2ee99e5 100644
--- a/src/network/access/qhstspolicy.h
+++ b/src/network/access/qhstspolicy.h
@@ -65,10 +65,10 @@ public:
                 QUrl::ParsingMode mode = QUrl::DecodedMode);
     QHstsPolicy(const QHstsPolicy &rhs);
     QHstsPolicy &operator=(const QHstsPolicy &rhs);
-    QHstsPolicy &operator=(QHstsPolicy &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+    QHstsPolicy &operator=(QHstsPolicy &&other) noexcept { swap(other); return *this; }
     ~QHstsPolicy();
 
-    void swap(QHstsPolicy &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QHstsPolicy &other) noexcept { qSwap(d, other.d); }
 
     void setHost(const QString &host, QUrl::ParsingMode mode = QUrl::DecodedMode);
     QString host(QUrl::ComponentFormattingOptions options = QUrl::FullyDecoded) const;
diff --git a/src/network/access/qhttp2configuration.cpp b/src/network/access/qhttp2configuration.cpp
new file mode 100644
index 0000000000..bd4318d4e9
--- /dev/null
+++ b/src/network/access/qhttp2configuration.cpp
@@ -0,0 +1,312 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qhttp2configuration.h"
+
+#include "private/http2protocol_p.h"
+#include "private/hpack_p.h"
+
+#include "qdebug.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QHttp2Configuration
+    \brief The QHttp2Configuration class controls HTTP/2 parameters and settings.
+    \since 5.14
+
+    \reentrant
+    \inmodule QtNetwork
+    \ingroup network
+    \ingroup shared
+
+    QHttp2Configuration controls HTTP/2 parameters and settings that
+    QNetworkAccessManager will use to send requests and process responses
+    when the HTTP/2 protocol is enabled.
+
+    The HTTP/2 parameters that QHttp2Configuration currently supports include:
+
+    \list
+      \li The session window size for connection-level flow control.
+         Will be sent to a remote peer when needed as 'WINDOW_UPDATE'
+         frames on the stream with an identifier 0.
+      \li The stream receiving window size for stream-level flow control.
+         Sent as 'SETTINGS_INITIAL_WINDOW_SIZE' parameter in the initial
+         SETTINGS frame and, when needed, 'WINDOW_UPDATE' frames will be
+         sent on streams that QNetworkAccessManager opens.
+      \li The maximum frame size. This parameter limits the maximum payload
+         a frame coming from the remote peer can have. Sent by QNetworkAccessManager
+         as 'SETTINGS_MAX_FRAME_SIZE' parameter in the initial 'SETTINGS'
+         frame.
+      \li The server push. Allows to enable or disable server push. Sent
+         as 'SETTINGS_ENABLE_PUSH' parameter in the initial 'SETTINGS'
+         frame.
+    \endlist
+
+    The QHttp2Configuration class also controls if the header compression
+    algorithm (HPACK) is additionally using Huffman coding for string
+    compression.
+
+    \note The configuration must be set before the first request
+    was sent to a given host (and thus an HTTP/2 session established).
+
+    \note Details about flow control, server push and 'SETTINGS'
+    can be found in \l {https://httpwg.org/specs/rfc7540.html}{RFC 7540}.
+    Different modes and parameters of the HPACK compression algorithm
+    are described in \l {https://httpwg.org/specs/rfc7541.html}{RFC 7541}.
+
+    \sa QNetworkRequest::setHttp2Configuration(), QNetworkRequest::http2Configuration(), QNetworkAccessManager
+*/
+
+class QHttp2ConfigurationPrivate : public QSharedData
+{
+public:
+    unsigned sessionWindowSize = Http2::defaultSessionWindowSize;
+    // The size below is quite a limiting default value, QNetworkRequest
+    // by default sets a larger number, an application can change this using
+    // QNetworkRequest::setHttp2Configuration.
+    unsigned streamWindowSize = Http2::defaultSessionWindowSize;
+
+    unsigned maxFrameSize = Http2::minPayloadLimit; // Initial (default) value of 16Kb.
+
+    bool pushEnabled = false;
+    // TODO: for now those two below are noop.
+    bool huffmanCompressionEnabled = true;
+};
+
+/*!
+    Default constructs a QHttp2Configuration object.
+
+    Such a configuration has the following values:
+    \list
+        \li Server push is disabled
+        \li Huffman string compression is enabled
+        \li Window size for connection-level flow control is 65535 octets
+        \li Window size for stream-level flow control is 65535 octets
+        \li Frame size is 16384 octets
+    \endlist
+*/
+QHttp2Configuration::QHttp2Configuration()
+    : d(new QHttp2ConfigurationPrivate)
+{
+}
+
+/*!
+    Copy-constructs this QHttp2Configuration.
+*/
+QHttp2Configuration::QHttp2Configuration(const QHttp2Configuration &) = default;
+
+/*!
+    Move-constructs this QHttp2Configuration from \a other
+*/
+QHttp2Configuration::QHttp2Configuration(QHttp2Configuration &&other) noexcept
+{
+    swap(other);
+}
+
+/*!
+    Copy-assigns to this QHttp2Configuration.
+*/
+QHttp2Configuration &QHttp2Configuration::operator=(const QHttp2Configuration &) = default;
+
+/*!
+    Move-assigns to this QHttp2Configuration.
+*/
+QHttp2Configuration &QHttp2Configuration::operator=(QHttp2Configuration &&) noexcept = default;
+
+/*!
+    Destructor.
+*/
+QHttp2Configuration::~QHttp2Configuration()
+{
+}
+
+/*!
+    If \a enable is \c true, a remote server can potentially
+    use server push to send reponses in advance.
+
+    \sa serverPushEnabled
+*/
+void QHttp2Configuration::setServerPushEnabled(bool enable)
+{
+    d->pushEnabled = enable;
+}
+
+/*!
+    Returns true if server push was enabled.
+
+    \note By default, QNetworkAccessManager disables server
+    push via the 'SETTINGS' frame.
+
+    \sa setServerPushEnabled
+*/
+bool QHttp2Configuration::serverPushEnabled() const
+{
+    return d->pushEnabled;
+}
+
+/*!
+    If \a enable is \c true, HPACK compression will additionally
+    compress string using the Huffman coding. Enabled by default.
+
+    \note This parameter only affects 'HEADERS' frames that
+    QNetworkAccessManager is sending.
+
+    \sa huffmanCompressionEnabled
+*/
+void QHttp2Configuration::setHuffmanCompressionEnabled(bool enable)
+{
+    d->huffmanCompressionEnabled = enable;
+}
+
+/*!
+    Returns \c true if the Huffman coding in HPACK is enabled.
+
+    \sa setHuffmanCompressionEnabled
+*/
+bool QHttp2Configuration::huffmanCompressionEnabled() const
+{
+    return d->huffmanCompressionEnabled;
+}
+
+/*!
+    Sets the window size for connection-level flow control.
+    \a size cannot be 0 and must not exceed 2147483647 octets.
+
+    \sa sessionReceiveWindowSize
+*/
+bool QHttp2Configuration::setSessionReceiveWindowSize(unsigned size)
+{
+    if (!size || size > Http2::maxSessionReceiveWindowSize) { // RFC-7540, 6.9
+        qCWarning(QT_HTTP2) << "Invalid session window size";
+        return false;
+    }
+
+    d->sessionWindowSize = size;
+    return true;
+}
+
+/*!
+    Returns the window size for connection-level flow control.
+    The default value QNetworkAccessManager will be using is
+    2147483647 octets.
+*/
+unsigned QHttp2Configuration::sessionReceiveWindowSize() const
+{
+    return d->sessionWindowSize;
+}
+
+/*!
+    Sets the window size for stream-level flow control.
+    \a size cannot be 0 and must not exceed 2147483647 octets.
+
+    \sa streamReceiveWindowSize
+ */
+bool QHttp2Configuration::setStreamReceiveWindowSize(unsigned size)
+{
+    if (!size || size > Http2::maxSessionReceiveWindowSize) { // RFC-7540, 6.9
+        qCWarning(QT_HTTP2) << "Invalid stream window size";
+        return false;
+    }
+
+    d->streamWindowSize = size;
+    return true;
+}
+
+/*!
+    Returns the window size for stream-level flow control.
+    The default value QNetworkAccessManager will be using is
+    21474836 octets.
+*/
+unsigned QHttp2Configuration::streamReceiveWindowSize() const
+{
+    return d->streamWindowSize;
+}
+
+/*!
+    Sets the maximum frame size that QNetworkAccessManager
+    will advertise to the server when sending its initial SETTINGS frame.
+    \note While this \a size is required to be within a range between
+    16384 and 16777215 inclusive, the actual payload size in frames
+    that carry payload maybe be less than 16384.
+*/
+bool QHttp2Configuration::setMaxFrameSize(unsigned size)
+{
+    if (size < Http2::minPayloadLimit || size > Http2::maxPayloadSize) {
+        qCWarning(QT_HTTP2) << "Maximum frame size to advertise is invalid";
+        return false;
+    }
+
+    d->maxFrameSize = size;
+    return true;
+}
+
+/*!
+    The maximum payload size that HTTP/2 frames can
+    have. The default (initial) value is 16384 octets.
+*/
+unsigned QHttp2Configuration::maxFrameSize() const
+{
+    return d->maxFrameSize;
+}
+
+/*!
+    Swaps this configuration with the \a other configuration.
+*/
+void QHttp2Configuration::swap(QHttp2Configuration &other) noexcept
+{
+    d.swap(other.d);
+}
+
+/*!
+    Returns \c true if \a lhs and \a rhs have the same set of HTTP/2
+    parameters.
+*/
+bool operator==(const QHttp2Configuration &lhs, const QHttp2Configuration &rhs)
+{
+    if (lhs.d == rhs.d)
+        return true;
+
+    return lhs.d->pushEnabled == rhs.d->pushEnabled
+           && lhs.d->huffmanCompressionEnabled == rhs.d->huffmanCompressionEnabled
+           && lhs.d->sessionWindowSize == rhs.d->sessionWindowSize
+           && lhs.d->streamWindowSize == rhs.d->streamWindowSize;
+}
+
+QT_END_NAMESPACE
diff --git a/src/network/access/qhttp2configuration.h b/src/network/access/qhttp2configuration.h
new file mode 100644
index 0000000000..e5c235e2be
--- /dev/null
+++ b/src/network/access/qhttp2configuration.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QHTTP2CONFIGURATION_H
+#define QHTTP2CONFIGURATION_H
+
+#include <QtNetwork/qtnetworkglobal.h>
+
+#include <QtCore/qshareddata.h>
+
+#ifndef Q_CLANG_QDOC
+QT_REQUIRE_CONFIG(http);
+#endif
+
+QT_BEGIN_NAMESPACE
+
+class QHttp2ConfigurationPrivate;
+class Q_NETWORK_EXPORT QHttp2Configuration
+{
+    friend Q_NETWORK_EXPORT bool operator==(const QHttp2Configuration &lhs, const QHttp2Configuration &rhs);
+
+public:
+    QHttp2Configuration();
+    QHttp2Configuration(const QHttp2Configuration &other);
+    QHttp2Configuration(QHttp2Configuration &&other) noexcept;
+    QHttp2Configuration &operator = (const QHttp2Configuration &other);
+    QHttp2Configuration &operator = (QHttp2Configuration &&other) noexcept;
+
+    ~QHttp2Configuration();
+
+    void setServerPushEnabled(bool enable);
+    bool serverPushEnabled() const;
+
+    void setHuffmanCompressionEnabled(bool enable);
+    bool huffmanCompressionEnabled() const;
+
+    bool setSessionReceiveWindowSize(unsigned size);
+    unsigned sessionReceiveWindowSize() const;
+
+    bool setStreamReceiveWindowSize(unsigned size);
+    unsigned streamReceiveWindowSize() const;
+
+    bool setMaxFrameSize(unsigned size);
+    unsigned maxFrameSize() const;
+
+    void swap(QHttp2Configuration &other) noexcept;
+
+private:
+
+    QSharedDataPointer<QHttp2ConfigurationPrivate> d;
+};
+
+Q_DECLARE_SHARED(QHttp2Configuration)
+
+Q_NETWORK_EXPORT bool operator==(const QHttp2Configuration &lhs, const QHttp2Configuration &rhs);
+
+inline bool operator!=(const QHttp2Configuration &lhs, const QHttp2Configuration &rhs)
+{
+    return !(lhs == rhs);
+}
+
+QT_END_NAMESPACE
+
+#endif // QHTTP2CONFIGURATION_H
diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
index 6609aa0594..dce51d4fd5 100644
--- a/src/network/access/qhttp2protocolhandler.cpp
+++ b/src/network/access/qhttp2protocolhandler.cpp
@@ -40,6 +40,7 @@
 #include "qhttpnetworkconnection_p.h"
 #include "qhttp2protocolhandler_p.h"
 
+#include "http2/http2frames_p.h"
 #include "http2/bitstreams_p.h"
 
 #include <private/qnoncontiguousbytedevice_p.h>
@@ -51,6 +52,8 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qurl.h>
 
+#include <qhttp2configuration.h>
+
 #ifndef QT_NO_NETWORKPROXY
 #include <QtNetwork/qnetworkproxy.h>
 #endif
@@ -174,30 +177,11 @@ QHttp2ProtocolHandler::QHttp2ProtocolHandler(QHttpNetworkConnectionChannel *chan
     Q_ASSERT(channel && m_connection);
     continuedFrames.reserve(20);
 
-    const ProtocolParameters params(m_connection->http2Parameters());
-    Q_ASSERT(params.validate());
-
-    maxSessionReceiveWindowSize = params.maxSessionReceiveWindowSize;
-
-    const RawSettings &data = params.settingsFrameData;
-    for (auto param = data.cbegin(), end = data.cend(); param != end; ++param) {
-        switch (param.key()) {
-        case Settings::INITIAL_WINDOW_SIZE_ID:
-            streamInitialReceiveWindowSize = param.value();
-            break;
-        case Settings::ENABLE_PUSH_ID:
-            pushPromiseEnabled = param.value();
-            break;
-        case Settings::HEADER_TABLE_SIZE_ID:
-        case Settings::MAX_CONCURRENT_STREAMS_ID:
-        case Settings::MAX_FRAME_SIZE_ID:
-        case Settings::MAX_HEADER_LIST_SIZE_ID:
-            // These other settings are just recommendations to our peer. We
-            // only check they are not crazy in ProtocolParameters::validate().
-        default:
-            break;
-        }
-    }
+    const auto h2Config = m_connection->http2Parameters();
+    maxSessionReceiveWindowSize = h2Config.sessionReceiveWindowSize();
+    pushPromiseEnabled = h2Config.serverPushEnabled();
+    streamInitialReceiveWindowSize = h2Config.streamReceiveWindowSize();
+    encoder.setCompressStrings(h2Config.huffmanCompressionEnabled());
 
     if (!channel->ssl && m_connection->connectionType() != QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
         // We upgraded from HTTP/1.1 to HTTP/2. channel->request was already sent
@@ -243,7 +227,8 @@ void QHttp2ProtocolHandler::_q_uploadDataReadyRead()
 
     auto data = qobject_cast<QNonContiguousByteDevice *>(sender());
     Q_ASSERT(data);
-    const qint32 streamID = data->property("HTTP2StreamID").toInt();
+    const qint32 streamID = streamIDs.value(data);
+    Q_ASSERT(streamID != 0);
     Q_ASSERT(activeStreams.contains(streamID));
     auto &stream = activeStreams[streamID];
 
@@ -258,7 +243,7 @@ void QHttp2ProtocolHandler::_q_uploadDataReadyRead()
 
 void QHttp2ProtocolHandler::_q_replyDestroyed(QObject *reply)
 {
-    const quint32 streamID = reply->property("HTTP2StreamID").toInt();
+    const quint32 streamID = streamIDs.take(reply);
     if (activeStreams.contains(streamID)) {
         sendRST_STREAM(streamID, CANCEL);
         markAsReset(streamID);
@@ -266,6 +251,11 @@ void QHttp2ProtocolHandler::_q_replyDestroyed(QObject *reply)
     }
 }
 
+void QHttp2ProtocolHandler::_q_uploadDataDestroyed(QObject *uploadData)
+{
+    streamIDs.remove(uploadData);
+}
+
 void QHttp2ProtocolHandler::_q_readyRead()
 {
     _q_receiveReply();
@@ -441,20 +431,17 @@ bool QHttp2ProtocolHandler::sendClientPreface()
         return false;
 
     // 6.5 SETTINGS
-    const ProtocolParameters params(m_connection->http2Parameters());
-    Q_ASSERT(params.validate());
-    frameWriter.setOutboundFrame(params.settingsFrame());
+    frameWriter.setOutboundFrame(Http2::configurationToSettingsFrame(m_connection->http2Parameters()));
     Q_ASSERT(frameWriter.outboundFrame().payloadSize());
 
     if (!frameWriter.write(*m_socket))
         return false;
 
     sessionReceiveWindowSize = maxSessionReceiveWindowSize;
-    // ProtocolParameters::validate does not allow maxSessionReceiveWindowSize
-    // to be smaller than defaultSessionWindowSize, so everything is OK here with
-    // 'delta':
+    // We only send WINDOW_UPDATE for the connection if the size differs from the
+    // default 64 KB:
     const auto delta = maxSessionReceiveWindowSize - Http2::defaultSessionWindowSize;
-    if (!sendWINDOW_UPDATE(Http2::connectionStreamID, delta))
+    if (delta && !sendWINDOW_UPDATE(Http2::connectionStreamID, delta))
         return false;
 
     prefaceSent = true;
@@ -1088,7 +1075,7 @@ bool QHttp2ProtocolHandler::acceptSetting(Http2::Settings identifier, quint32 ne
     }
 
     if (identifier == Settings::MAX_FRAME_SIZE_ID) {
-        if (newValue < Http2::maxFrameSize || newValue > Http2::maxPayloadSize) {
+        if (newValue < Http2::minPayloadLimit || newValue > Http2::maxPayloadSize) {
             connectionError(PROTOCOL_ERROR, "SETTGINGS max frame size is out of range");
             return false;
         }
@@ -1295,7 +1282,7 @@ quint32 QHttp2ProtocolHandler::createNewStream(const HttpMessagePair &message, b
     replyPrivate->connection = m_connection;
     replyPrivate->connectionChannel = m_channel;
     reply->setSpdyWasUsed(true);
-    reply->setProperty("HTTP2StreamID", newStreamID);
+    streamIDs.insert(reply, newStreamID);
     connect(reply, SIGNAL(destroyed(QObject*)),
             this, SLOT(_q_replyDestroyed(QObject*)));
 
@@ -1307,7 +1294,9 @@ quint32 QHttp2ProtocolHandler::createNewStream(const HttpMessagePair &message, b
         if (auto src = newStream.data()) {
             connect(src, SIGNAL(readyRead()), this,
                     SLOT(_q_uploadDataReadyRead()), Qt::QueuedConnection);
-            src->setProperty("HTTP2StreamID", newStreamID);
+            connect(src, &QHttp2ProtocolHandler::destroyed,
+                    this, &QHttp2ProtocolHandler::_q_uploadDataDestroyed);
+            streamIDs.insert(src, newStreamID);
         }
     }
 
@@ -1350,14 +1339,13 @@ void QHttp2ProtocolHandler::markAsReset(quint32 streamID)
 quint32 QHttp2ProtocolHandler::popStreamToResume()
 {
     quint32 streamID = connectionStreamID;
-    const int nQ = sizeof suspendedStreams / sizeof suspendedStreams[0];
     using QNR = QHttpNetworkRequest;
-    const QNR::Priority ranks[nQ] = {QNR::HighPriority,
-                                     QNR::NormalPriority,
-                                     QNR::LowPriority};
+    const QNR::Priority ranks[] = {QNR::HighPriority,
+                                   QNR::NormalPriority,
+                                   QNR::LowPriority};
 
-    for (int i = 0; i < nQ; ++i) {
-        auto &queue = suspendedStreams[ranks[i]];
+    for (const QNR::Priority rank : ranks) {
+        auto &queue = suspendedStreams[rank];
         auto it = queue.begin();
         for (; it != queue.end(); ++it) {
             if (!activeStreams.contains(*it))
@@ -1378,9 +1366,7 @@ quint32 QHttp2ProtocolHandler::popStreamToResume()
 
 void QHttp2ProtocolHandler::removeFromSuspended(quint32 streamID)
 {
-    const int nQ = sizeof suspendedStreams / sizeof suspendedStreams[0];
-    for (int i = 0; i < nQ; ++i) {
-        auto &q = suspendedStreams[i];
+    for (auto &q : suspendedStreams) {
         q.erase(std::remove(q.begin(), q.end(), streamID), q.end());
     }
 }
@@ -1389,10 +1375,14 @@ void QHttp2ProtocolHandler::deleteActiveStream(quint32 streamID)
 {
     if (activeStreams.contains(streamID)) {
         auto &stream = activeStreams[streamID];
-        if (stream.reply())
+        if (stream.reply()) {
             stream.reply()->disconnect(this);
-        if (stream.data())
+            streamIDs.remove(stream.reply());
+        }
+        if (stream.data()) {
             stream.data()->disconnect(this);
+            streamIDs.remove(stream.data());
+        }
         activeStreams.remove(streamID);
     }
 
diff --git a/src/network/access/qhttp2protocolhandler_p.h b/src/network/access/qhttp2protocolhandler_p.h
index d91853f613..43fdb136cd 100644
--- a/src/network/access/qhttp2protocolhandler_p.h
+++ b/src/network/access/qhttp2protocolhandler_p.h
@@ -55,6 +55,8 @@
 #include <private/qabstractprotocolhandler_p.h>
 #include <private/qhttpnetworkrequest_p.h>
 
+#include <access/qhttp2configuration.h>
+
 #include <private/http2protocol_p.h>
 #include <private/http2streams_p.h>
 #include <private/http2frames_p.h>
@@ -95,6 +97,7 @@ public:
 private slots:
     void _q_uploadDataReadyRead();
     void _q_replyDestroyed(QObject* reply);
+    void _q_uploadDataDestroyed(QObject* uploadData);
 
 private:
     using Stream = Http2::Stream;
@@ -158,13 +161,15 @@ private:
     HPack::Decoder decoder;
     HPack::Encoder encoder;
 
+    QHash<QObject *, int> streamIDs;
     QHash<quint32, Stream> activeStreams;
     std::deque<quint32> suspendedStreams[3]; // 3 for priorities: High, Normal, Low.
     static const std::deque<quint32>::size_type maxRecycledStreams;
     std::deque<quint32> recycledStreams;
 
-    // Peer's max frame size.
-    quint32 maxFrameSize = Http2::maxFrameSize;
+    // Peer's max frame size (this min is the default value
+    // we start with, that can be updated by SETTINGS frame):
+    quint32 maxFrameSize = Http2::minPayloadLimit;
 
     Http2::FrameReader frameReader;
     Http2::Frame inboundFrame;
@@ -176,28 +181,28 @@ private:
 
     // Control flow:
 
-    // This is how many concurrent streams our peer expects from us:
-    // 100 is the default value, can be updated by the server's SETTINGS
-    // frame(s):
+    // This is how many concurrent streams our peer allows us, 100 is the
+    // initial value, can be updated by the server's SETTINGS frame(s):
     quint32 maxConcurrentStreams = Http2::maxConcurrentStreams;
     // While we allow sending SETTTINGS_MAX_CONCURRENT_STREAMS to limit our peer,
     // it's just a hint and we do not actually enforce it (and we can continue
     // sending requests and creating streams while maxConcurrentStreams allows).
 
-    // This is the max value, we set it in a ctor from Http2::ProtocolParameters,
-    // it does not change after that.
+    // This is our (client-side) maximum possible receive window size, we set
+    // it in a ctor from QHttp2Configuration, it does not change after that.
+    // The default is 64Kb:
     qint32 maxSessionReceiveWindowSize = Http2::defaultSessionWindowSize;
 
-    // Our session receive window size, default is 64Kb. We'll update it from QNAM's
-    // Http2::ProtocolParameters. Signed integer since it can become negative
+    // Our session current receive window size, updated in a ctor from
+    // QHttp2Configuration. Signed integer since it can become negative
     // (it's still a valid window size).
     qint32 sessionReceiveWindowSize = Http2::defaultSessionWindowSize;
     // Our per-stream receive window size, default is 64 Kb, will be updated
-    // from QNAM's Http2::ProtocolParameters. Again, signed - can become negative.
+    // from QHttp2Configuration. Again, signed - can become negative.
     qint32 streamInitialReceiveWindowSize = Http2::defaultSessionWindowSize;
 
     // These are our peer's receive window sizes, they will be updated by the
-    // peer's SETTINGS and WINDOW_UPDATE frames.
+    // peer's SETTINGS and WINDOW_UPDATE frames, defaults presumed to be 64Kb.
     qint32 sessionSendWindowSize = Http2::defaultSessionWindowSize;
     qint32 streamInitialSendWindowSize = Http2::defaultSessionWindowSize;
 
diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h
index 78585a704d..56db83779a 100644
--- a/src/network/access/qhttpmultipart.h
+++ b/src/network/access/qhttpmultipart.h
@@ -60,12 +60,10 @@ public:
     QHttpPart();
     QHttpPart(const QHttpPart &other);
     ~QHttpPart();
-#ifdef Q_COMPILER_RVALUE_REFS
-    QHttpPart &operator=(QHttpPart &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QHttpPart &operator=(QHttpPart &&other) noexcept { swap(other); return *this; }
     QHttpPart &operator=(const QHttpPart &other);
 
-    void swap(QHttpPart &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QHttpPart &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QHttpPart &other) const;
     inline bool operator!=(const QHttpPart &other) const
diff --git a/src/network/access/qhttpmultipart_p.h b/src/network/access/qhttpmultipart_p.h
index 363e0b346c..ead1eadf3b 100644
--- a/src/network/access/qhttpmultipart_p.h
+++ b/src/network/access/qhttpmultipart_p.h
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 class QHttpPartPrivate: public QSharedData, public QNetworkHeadersPrivate
 {
 public:
-    inline QHttpPartPrivate() : bodyDevice(0), headerCreated(false), readPointer(0)
+    inline QHttpPartPrivate() : bodyDevice(nullptr), headerCreated(false), readPointer(0)
     {
     }
     ~QHttpPartPrivate()
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 294273d751..21c6359807 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -398,11 +398,12 @@ void QHttpNetworkConnectionPrivate::copyCredentials(int fromChannel, QAuthentica
 {
     Q_ASSERT(auth);
 
-    // NTLM is a multi phase authentication. Copying credentials between authenticators would mess things up.
+    // NTLM and Negotiate do multi-phase authentication.
+    // Copying credentialsbetween authenticators would mess things up.
     if (fromChannel >= 0) {
-        if (!isProxy && channels[fromChannel].authMethod == QAuthenticatorPrivate::Ntlm)
-            return;
-        if (isProxy && channels[fromChannel].proxyAuthMethod == QAuthenticatorPrivate::Ntlm)
+        const QHttpNetworkConnectionChannel &channel = channels[fromChannel];
+        const QAuthenticatorPrivate::Method method = isProxy ? channel.proxyAuthMethod : channel.authMethod;
+        if (method == QAuthenticatorPrivate::Ntlm || method == QAuthenticatorPrivate::Negotiate)
             return;
     }
 
@@ -592,24 +593,26 @@ void QHttpNetworkConnectionPrivate::createAuthorization(QAbstractSocket *socket,
         if ((channels[i].authMethod != QAuthenticatorPrivate::Ntlm && request.headerField("Authorization").isEmpty()) || channels[i].lastStatus == 401) {
             QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(channels[i].authenticator);
             if (priv && priv->method != QAuthenticatorPrivate::None) {
-                QByteArray response = priv->calculateResponse(request.methodName(), request.uri(false));
+                QByteArray response = priv->calculateResponse(request.methodName(), request.uri(false), request.url().host());
                 request.setHeaderField("Authorization", response);
                 channels[i].authenticationCredentialsSent = true;
             }
         }
     }
 
+#if QT_CONFIG(networkproxy)
     // Send "Proxy-Authorization" header, but not if it's NTLM and the socket is already authenticated.
     if (channels[i].proxyAuthMethod != QAuthenticatorPrivate::None) {
         if (!(channels[i].proxyAuthMethod == QAuthenticatorPrivate::Ntlm && channels[i].lastStatus != 407)) {
             QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(channels[i].proxyAuthenticator);
             if (priv && priv->method != QAuthenticatorPrivate::None) {
-                QByteArray response = priv->calculateResponse(request.methodName(), request.uri(false));
+                QByteArray response = priv->calculateResponse(request.methodName(), request.uri(false), networkProxy.hostName());
                 request.setHeaderField("Proxy-Authorization", response);
                 channels[i].proxyCredentialsSent = true;
             }
         }
     }
+#endif // QT_CONFIG(networkproxy)
 }
 
 QHttpNetworkReply* QHttpNetworkConnectionPrivate::queueRequest(const QHttpNetworkRequest &request)
@@ -1318,8 +1321,12 @@ QHttpNetworkConnection::QHttpNetworkConnection(const QString &hostName, quint16
     : QObject(*(new QHttpNetworkConnectionPrivate(hostName, port, encrypt, connectionType)), parent)
 {
     Q_D(QHttpNetworkConnection);
-    d->networkSession = qMove(networkSession);
+    d->networkSession = std::move(networkSession);
     d->init();
+    if (QNetworkStatusMonitor::isEnabled()) {
+        connect(&d->connectionMonitor, &QNetworkConnectionMonitor::reachabilityChanged,
+                this, &QHttpNetworkConnection::onlineStateChanged, Qt::QueuedConnection);
+    }
 }
 
 QHttpNetworkConnection::QHttpNetworkConnection(quint16 connectionCount, const QString &hostName,
@@ -1330,8 +1337,12 @@ QHttpNetworkConnection::QHttpNetworkConnection(quint16 connectionCount, const QS
                                                    connectionType)), parent)
 {
     Q_D(QHttpNetworkConnection);
-    d->networkSession = qMove(networkSession);
+    d->networkSession = std::move(networkSession);
     d->init();
+    if (QNetworkStatusMonitor::isEnabled()) {
+        connect(&d->connectionMonitor, &QNetworkConnectionMonitor::reachabilityChanged,
+                this, &QHttpNetworkConnection::onlineStateChanged, Qt::QueuedConnection);
+    }
 }
 #else
 QHttpNetworkConnection::QHttpNetworkConnection(const QString &hostName, quint16 port, bool encrypt,
@@ -1340,6 +1351,10 @@ QHttpNetworkConnection::QHttpNetworkConnection(const QString &hostName, quint16
 {
     Q_D(QHttpNetworkConnection);
     d->init();
+    if (QNetworkStatusMonitor::isEnabled()) {
+        connect(&d->connectionMonitor, &QNetworkConnectionMonitor::reachabilityChanged,
+                this, &QHttpNetworkConnection::onlineStateChanged, Qt::QueuedConnection);
+    }
 }
 
 QHttpNetworkConnection::QHttpNetworkConnection(quint16 connectionCount, const QString &hostName,
@@ -1350,8 +1365,12 @@ QHttpNetworkConnection::QHttpNetworkConnection(quint16 connectionCount, const QS
 {
     Q_D(QHttpNetworkConnection);
     d->init();
+    if (QNetworkStatusMonitor::isEnabled()) {
+        connect(&d->connectionMonitor, &QNetworkConnectionMonitor::reachabilityChanged,
+                this, &QHttpNetworkConnection::onlineStateChanged, Qt::QueuedConnection);
+    }
 }
-#endif
+#endif // QT_NO_BEARERMANAGEMENT
 
 QHttpNetworkConnection::~QHttpNetworkConnection()
 {
@@ -1438,21 +1457,16 @@ void QHttpNetworkConnection::setConnectionType(ConnectionType type)
     d->connectionType = type;
 }
 
-Http2::ProtocolParameters QHttpNetworkConnection::http2Parameters() const
+QHttp2Configuration QHttpNetworkConnection::http2Parameters() const
 {
     Q_D(const QHttpNetworkConnection);
     return d->http2Parameters;
 }
 
-void QHttpNetworkConnection::setHttp2Parameters(const Http2::ProtocolParameters &params)
+void QHttpNetworkConnection::setHttp2Parameters(const QHttp2Configuration &params)
 {
     Q_D(QHttpNetworkConnection);
-    if (params.validate()) {
-        d->http2Parameters = params;
-    } else {
-        qCWarning(QT_HTTP2)
-            << "invalid HTTP/2 parameters, falling back to defaults instead";
-    }
+    d->http2Parameters = params;
 }
 
 // SSL support below
@@ -1477,7 +1491,7 @@ QSharedPointer<QSslContext> QHttpNetworkConnection::sslContext()
 void QHttpNetworkConnection::setSslContext(QSharedPointer<QSslContext> context)
 {
     Q_D(QHttpNetworkConnection);
-    d->sslContext = qMove(context);
+    d->sslContext = std::move(context);
 }
 
 void QHttpNetworkConnection::ignoreSslErrors(int channel)
@@ -1531,6 +1545,26 @@ void QHttpNetworkConnection::setPeerVerifyName(const QString &peerName)
     d->peerVerifyName = peerName;
 }
 
+void QHttpNetworkConnection::onlineStateChanged(bool isOnline)
+{
+    Q_D(QHttpNetworkConnection);
+
+    if (isOnline) {
+        // If we did not have any 'isOffline' previously - well, good
+        // to know, we are 'online' apparently.
+        return;
+    }
+
+    for (int i = 0; i < d->activeChannelCount; i++) {
+        auto &channel = d->channels[i];
+        channel.emitFinishedWithError(QNetworkReply::TemporaryNetworkFailureError, "Temporary network failure.");
+        channel.close();
+    }
+
+    // We don't care, this connection is broken from our POV.
+    d->connectionMonitor.stopMonitoring();
+}
+
 #ifndef QT_NO_NETWORKPROXY
 // only called from QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired, not
 // from QHttpNetworkConnectionChannel::handleAuthenticationChallenge
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 2bd727e0af..6808a0c0ac 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -57,6 +57,8 @@
 #include <QtNetwork/qabstractsocket.h>
 #include <QtNetwork/qnetworksession.h>
 
+#include <qhttp2configuration.h>
+
 #include <private/qobject_p.h>
 #include <qauthenticator.h>
 #include <qnetworkproxy.h>
@@ -67,6 +69,7 @@
 #include <private/qhttpnetworkheader_p.h>
 #include <private/qhttpnetworkrequest_p.h>
 #include <private/qhttpnetworkreply_p.h>
+#include <private/qnetconmonitor_p.h>
 #include <private/http2protocol_p.h>
 
 #include <private/qhttpnetworkconnectionchannel_p.h>
@@ -101,10 +104,10 @@ public:
 #ifndef QT_NO_BEARERMANAGEMENT
     explicit QHttpNetworkConnection(const QString &hostName, quint16 port = 80, bool encrypt = false,
                                     ConnectionType connectionType = ConnectionTypeHTTP,
-                                    QObject *parent = 0, QSharedPointer<QNetworkSession> networkSession
+                                    QObject *parent = nullptr, QSharedPointer<QNetworkSession> networkSession
                                     = QSharedPointer<QNetworkSession>());
     QHttpNetworkConnection(quint16 channelCount, const QString &hostName, quint16 port = 80,
-                           bool encrypt = false, QObject *parent = 0,
+                           bool encrypt = false, QObject *parent = nullptr,
                            QSharedPointer<QNetworkSession> networkSession = QSharedPointer<QNetworkSession>(),
                            ConnectionType connectionType = ConnectionTypeHTTP);
 #else
@@ -141,8 +144,8 @@ public:
     ConnectionType connectionType();
     void setConnectionType(ConnectionType type);
 
-    Http2::ProtocolParameters http2Parameters() const;
-    void setHttp2Parameters(const Http2::ProtocolParameters &params);
+    QHttp2Configuration http2Parameters() const;
+    void setHttp2Parameters(const QHttp2Configuration &params);
 
 #ifndef QT_NO_SSL
     void setSslConfiguration(const QSslConfiguration &config);
@@ -156,6 +159,10 @@ public:
 
     QString peerVerifyName() const;
     void setPeerVerifyName(const QString &peerName);
+
+public slots:
+    void onlineStateChanged(bool isOnline);
+
 private:
     Q_DECLARE_PRIVATE(QHttpNetworkConnection)
     Q_DISABLE_COPY_MOVE(QHttpNetworkConnection)
@@ -289,9 +296,17 @@ public:
     QSharedPointer<QNetworkSession> networkSession;
 #endif
 
-    Http2::ProtocolParameters http2Parameters;
+    QHttp2Configuration http2Parameters;
 
     QString peerVerifyName;
+    // If network status monitoring is enabled, we activate connectionMonitor
+    // as soons as one of channels managed to connect to host (and we
+    // have a pair of addresses (us,peer).
+    // NETMONTODO: consider activating a monitor on a change from
+    // HostLookUp state to ConnectingState (means we have both
+    // local/remote addresses known and can start monitoring this
+    // early).
+    QNetworkConnectionMonitor connectionMonitor;
 
     friend class QHttpNetworkConnectionChannel;
 };
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 8f94cef32b..39f392a79b 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -40,6 +40,7 @@
 
 #include "qhttpnetworkconnectionchannel_p.h"
 #include "qhttpnetworkconnection_p.h"
+#include "qhttp2configuration.h"
 #include "private/qnoncontiguousbytedevice_p.h"
 
 #include <qpair.h>
@@ -48,6 +49,7 @@
 #include <private/qhttp2protocolhandler_p.h>
 #include <private/qhttpprotocolhandler_p.h>
 #include <private/qspdyprotocolhandler_p.h>
+#include <private/http2protocol_p.h>
 
 #ifndef QT_NO_SSL
 #    include <private/qsslsocket_p.h>
@@ -59,6 +61,8 @@
 #include "private/qnetworksession_p.h"
 #endif
 
+#include "private/qnetconmonitor_p.h"
+
 QT_BEGIN_NAMESPACE
 
 namespace
@@ -902,6 +906,16 @@ void QHttpNetworkConnectionChannel::_q_connected()
 
     pipeliningSupported = QHttpNetworkConnectionChannel::PipeliningSupportUnknown;
 
+    if (QNetworkStatusMonitor::isEnabled()) {
+        auto connectionPrivate = connection->d_func();
+        if (!connectionPrivate->connectionMonitor.isMonitoring()) {
+            // Now that we have a pair of addresses, we can start monitoring the
+            // connection status to handle its loss properly.
+            if (connectionPrivate->connectionMonitor.setTargets(socket->localAddress(), socket->peerAddress()))
+                connectionPrivate->connectionMonitor.startMonitoring();
+        }
+    }
+
     // ### FIXME: if the server closes the connection unexpectedly, we shouldn't send the same broken request again!
     //channels[i].reconnectAttempts = 2;
     if (ssl || pendingEncrypt) { // FIXME: Didn't work properly with pendingEncrypt only, we should refactor this into an EncrypingState
@@ -938,9 +952,7 @@ void QHttpNetworkConnectionChannel::_q_connected()
             if (tryProtocolUpgrade) {
                 // Let's augment our request with some magic headers and try to
                 // switch to HTTP/2.
-                const Http2::ProtocolParameters params(connection->http2Parameters());
-                Q_ASSERT(params.validate());
-                params.addProtocolUpgradeHeaders(&request);
+                Http2::appendProtocolUpgradeHeaders(connection->http2Parameters(), &request);
             }
             sendRequest();
         }
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index c9c3172304..a8b635c45a 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -444,6 +444,9 @@ QAuthenticatorPrivate::Method QHttpNetworkReplyPrivate::authenticationMethod(boo
         } else if (method < QAuthenticatorPrivate::DigestMd5
             && line.startsWith("digest")) {
             method = QAuthenticatorPrivate::DigestMd5;
+        } else if (method < QAuthenticatorPrivate::Negotiate
+            && line.startsWith("negotiate")) {
+            method = QAuthenticatorPrivate::Negotiate;
         }
     }
     return method;
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 863e21ea3e..12cfe359aa 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -89,7 +89,7 @@ class Q_AUTOTEST_EXPORT QHttpNetworkReply : public QObject, public QHttpNetworkH
     Q_OBJECT
 public:
 
-    explicit QHttpNetworkReply(const QUrl &url = QUrl(), QObject *parent = 0);
+    explicit QHttpNetworkReply(const QUrl &url = QUrl(), QObject *parent = nullptr);
     virtual ~QHttpNetworkReply();
 
     QUrl url() const override;
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index 46a6615f4d..63a3c4f204 100644
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -190,7 +190,7 @@ public:
                                        QHttpNetworkConnection::ConnectionType connectionType,
                                        QSharedPointer<QNetworkSession> networkSession)
         : QHttpNetworkConnection(hostName, port, encrypt, connectionType, /*parent=*/0,
-                                 qMove(networkSession))
+                                 std::move(networkSession))
 #endif
     {
         setExpires(true);
@@ -354,9 +354,9 @@ void QHttpThreadDelegate::startRequest()
                                                                 networkSession);
 #endif // QT_NO_BEARERMANAGEMENT
         if (connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2
-            && http2Parameters.validate()) {
+            || connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
             httpConnection->setHttp2Parameters(http2Parameters);
-        } // else we ignore invalid parameters and use our own defaults.
+        }
 #ifndef QT_NO_SSL
         // Set the QSslConfiguration from this QNetworkRequest.
         if (ssl)
diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
index 019a8b8b74..355d1afc30 100644
--- a/src/network/access/qhttpthreaddelegate_p.h
+++ b/src/network/access/qhttpthreaddelegate_p.h
@@ -62,6 +62,7 @@
 #include <QNetworkReply>
 #include "qhttpnetworkrequest_p.h"
 #include "qhttpnetworkconnection_p.h"
+#include "qhttp2configuration.h"
 #include <QSharedPointer>
 #include <QScopedPointer>
 #include "private/qnoncontiguousbytedevice_p.h"
@@ -82,7 +83,7 @@ class QHttpThreadDelegate : public QObject
 {
     Q_OBJECT
 public:
-    explicit QHttpThreadDelegate(QObject *parent = 0);
+    explicit QHttpThreadDelegate(QObject *parent = nullptr);
 
     ~QHttpThreadDelegate();
 
@@ -116,7 +117,7 @@ public:
     qint64 removedContentLength;
     QNetworkReply::NetworkError incomingErrorCode;
     QString incomingErrorDetail;
-    Http2::ProtocolParameters http2Parameters;
+    QHttp2Configuration http2Parameters;
 #ifndef QT_NO_BEARERMANAGEMENT
     QSharedPointer<QNetworkSession> networkSession;
 #endif
@@ -207,7 +208,7 @@ public:
         : QNonContiguousByteDevice(),
           wantDataPending(false),
           m_amount(0),
-          m_data(0),
+          m_data(nullptr),
           m_atEnd(aE),
           m_size(s),
           m_pos(0)
@@ -240,12 +241,12 @@ public:
             // Do nothing, we already sent a wantData signal and wait for results
             len = 0;
         }
-        return 0;
+        return nullptr;
     }
 
     bool advanceReadPointer(qint64 a) override
     {
-        if (m_data == 0)
+        if (m_data == nullptr)
             return false;
 
         m_amount -= a;
@@ -269,7 +270,7 @@ public:
     bool reset() override
     {
         m_amount = 0;
-        m_data = 0;
+        m_data = nullptr;
         m_dataArray.clear();
 
         if (wantDataPending) {
diff --git a/src/network/access/qnetworkaccessauthenticationmanager_p.h b/src/network/access/qnetworkaccessauthenticationmanager_p.h
index 548675728f..31111ca2a5 100644
--- a/src/network/access/qnetworkaccessauthenticationmanager_p.h
+++ b/src/network/access/qnetworkaccessauthenticationmanager_p.h
@@ -90,12 +90,12 @@ public:
 
     void cacheCredentials(const QUrl &url, const QAuthenticator *auth);
     QNetworkAuthenticationCredential fetchCachedCredentials(const QUrl &url,
-                                                             const QAuthenticator *auth = 0);
+                                                             const QAuthenticator *auth = nullptr);
 
 #ifndef QT_NO_NETWORKPROXY
     void cacheProxyCredentials(const QNetworkProxy &proxy, const QAuthenticator *auth);
     QNetworkAuthenticationCredential fetchCachedProxyCredentials(const QNetworkProxy &proxy,
-                                                             const QAuthenticator *auth = 0);
+                                                             const QAuthenticator *auth = nullptr);
 #endif
 
     void clearCache();
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index 272dd22097..566e410051 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QNetworkAccessBackendFactoryData: public QList<QNetworkAccessBackendFactory *>
 {
 public:
-    QNetworkAccessBackendFactoryData() : mutex(QMutex::Recursive)
+    QNetworkAccessBackendFactoryData()
     {
         valid.ref();
     }
@@ -68,7 +68,7 @@ public:
         valid.deref();
     }
 
-    QMutex mutex;
+    QRecursiveMutex mutex;
     //this is used to avoid (re)constructing factory data from destructors of other global classes
     static QBasicAtomicInt valid;
 };
@@ -83,7 +83,7 @@ QNetworkAccessBackendFactory::QNetworkAccessBackendFactory()
 
 QNetworkAccessBackendFactory::~QNetworkAccessBackendFactory()
 {
-    if (QNetworkAccessBackendFactoryData::valid.load()) {
+    if (QNetworkAccessBackendFactoryData::valid.loadRelaxed()) {
         QMutexLocker locker(&factoryData()->mutex);
         factoryData()->removeAll(this);
     }
@@ -92,7 +92,7 @@ QNetworkAccessBackendFactory::~QNetworkAccessBackendFactory()
 QNetworkAccessBackend *QNetworkAccessManagerPrivate::findBackend(QNetworkAccessManager::Operation op,
                                                                  const QNetworkRequest &request)
 {
-    if (QNetworkAccessBackendFactoryData::valid.load()) {
+    if (QNetworkAccessBackendFactoryData::valid.loadRelaxed()) {
         QMutexLocker locker(&factoryData()->mutex);
         QNetworkAccessBackendFactoryData::ConstIterator it = factoryData()->constBegin(),
                                                            end = factoryData()->constEnd();
@@ -110,7 +110,7 @@ QNetworkAccessBackend *QNetworkAccessManagerPrivate::findBackend(QNetworkAccessM
 
 QStringList QNetworkAccessManagerPrivate::backendSupportedSchemes() const
 {
-    if (QNetworkAccessBackendFactoryData::valid.load()) {
+    if (QNetworkAccessBackendFactoryData::valid.loadRelaxed()) {
         QMutexLocker locker(&factoryData()->mutex);
         QNetworkAccessBackendFactoryData::ConstIterator it = factoryData()->constBegin();
         QNetworkAccessBackendFactoryData::ConstIterator end = factoryData()->constEnd();
diff --git a/src/network/access/qnetworkaccesscache.cpp b/src/network/access/qnetworkaccesscache.cpp
index 00bb18cb82..b694a2c999 100644
--- a/src/network/access/qnetworkaccesscache.cpp
+++ b/src/network/access/qnetworkaccesscache.cpp
@@ -40,11 +40,12 @@
 #include "qnetworkaccesscache_p.h"
 #include "QtCore/qpointer.h"
 #include "QtCore/qdatetime.h"
-#include "QtCore/qqueue.h"
 #include "qnetworkaccessmanager_p.h"
 #include "qnetworkreply_p.h"
 #include "qnetworkrequest.h"
 
+#include <vector>
+
 QT_BEGIN_NAMESPACE
 
 enum ExpiryTimeEnum {
@@ -63,7 +64,7 @@ namespace {
 struct QNetworkAccessCache::Node
 {
     QDateTime timestamp;
-    QQueue<Receiver> receiverQueue;
+    std::vector<Receiver> receiverQueue;
     QByteArray key;
 
     Node *older, *newer;
@@ -277,10 +278,7 @@ bool QNetworkAccessCache::requestEntry(const QByteArray &key, QObject *target, c
         // object is not shareable and is in use
         // queue for later use
         Q_ASSERT(node->older == 0 && node->newer == 0);
-        Receiver receiver;
-        receiver.object = target;
-        receiver.member = member;
-        node->receiverQueue.enqueue(receiver);
+        node->receiverQueue.push_back({target, member});
 
         // request queued
         return true;
@@ -331,17 +329,19 @@ void QNetworkAccessCache::releaseEntry(const QByteArray &key)
     Q_ASSERT(node->useCount > 0);
 
     // are there other objects waiting?
-    if (!node->receiverQueue.isEmpty()) {
+    const auto objectStillExists = [](const Receiver &r) { return !r.object.isNull(); };
+
+    auto &queue = node->receiverQueue;
+    auto qit = std::find_if(queue.begin(), queue.end(), objectStillExists);
+
+    const Receiver receiver = qit == queue.end() ? Receiver{} : std::move(*qit++) ;
+
+    queue.erase(queue.begin(), qit);
+
+    if (receiver.object) {
         // queue another activation
-        Receiver receiver;
-        do {
-            receiver = node->receiverQueue.dequeue();
-        } while (receiver.object.isNull() && !node->receiverQueue.isEmpty());
-
-        if (!receiver.object.isNull()) {
-            emitEntryReady(node, receiver.object, receiver.member);
-            return;
-        }
+        emitEntryReady(node, receiver.object, receiver.member);
+        return;
     }
 
     if (!--node->useCount) {
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index 5ad820eba0..51ed2f5a55 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -99,6 +99,8 @@ public:
         connect(this, SIGNAL(done(bool)), this, SLOT(deleteLater()));
         close();
     }
+
+    using QFtp::clearError;
 };
 
 QNetworkAccessFtpBackend::QNetworkAccessFtpBackend()
@@ -282,7 +284,10 @@ void QNetworkAccessFtpBackend::ftpDone()
     }
 
     // check for errors:
-    if (ftp->error() != QFtp::NoError) {
+    if (state == CheckingFeatures && ftp->error() == QFtp::UnknownError) {
+        qWarning("QNetworkAccessFtpBackend: HELP command failed, ignoring it");
+        ftp->clearError();
+    } else if (ftp->error() != QFtp::NoError) {
         QString msg;
         if (operation() == QNetworkAccessManager::GetOperation)
             msg = tr("Error while downloading %1: %2");
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index b9c8116421..76b95b5823 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -70,6 +70,7 @@
 #include "QtNetwork/private/qauthenticator_p.h"
 #include "QtNetwork/qsslconfiguration.h"
 #include "QtNetwork/qnetworkconfigmanager.h"
+#include "QtNetwork/private/http2protocol_p.h"
 
 #if QT_CONFIG(http)
 #include "qhttpmultipart.h"
@@ -90,6 +91,8 @@
 #include "qnetworkreplywasmimpl_p.h"
 #endif
 
+#include "qnetconmonitor_p.h"
+
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QNetworkAccessFileBackendFactory, fileBackend)
@@ -486,18 +489,26 @@ QNetworkAccessManager::QNetworkAccessManager(QObject *parent)
     qRegisterMetaType<QNetworkReply::NetworkError>();
     qRegisterMetaType<QSharedPointer<char> >();
 
-#ifndef QT_NO_BEARERMANAGEMENT
     Q_D(QNetworkAccessManager);
-    // if a session is required, we track online state through
-    // the QNetworkSession's signals if a request is already made.
-    // we need to track current accessibility state by default
-    //
-    connect(&d->networkConfigurationManager, SIGNAL(onlineStateChanged(bool)),
-            SLOT(_q_onlineStateChanged(bool)));
-    connect(&d->networkConfigurationManager, SIGNAL(configurationChanged(QNetworkConfiguration)),
-            SLOT(_q_configurationChanged(QNetworkConfiguration)));
 
-#endif
+    if (QNetworkStatusMonitor::isEnabled()) {
+        connect(&d->statusMonitor, SIGNAL(onlineStateChanged(bool)),
+                SLOT(_q_onlineStateChanged(bool)));
+#ifdef QT_NO_BEARERMANAGEMENT
+        d->networkAccessible = d->statusMonitor.isNetworkAccessible();
+#else
+        d->networkAccessible = d->statusMonitor.isNetworkAccessible() ? Accessible : NotAccessible;
+    } else {
+        // if a session is required, we track online state through
+        // the QNetworkSession's signals if a request is already made.
+        // we need to track current accessibility state by default
+        //
+        connect(&d->networkConfigurationManager, SIGNAL(onlineStateChanged(bool)),
+                SLOT(_q_onlineStateChanged(bool)));
+        connect(&d->networkConfigurationManager, SIGNAL(configurationChanged(QNetworkConfiguration)),
+                SLOT(_q_configurationChanged(QNetworkConfiguration)));
+#endif // QT_NO_BEARERMANAGEMENT
+    }
 }
 
 /*!
@@ -1030,6 +1041,7 @@ QNetworkReply *QNetworkAccessManager::deleteResource(const QNetworkRequest &requ
 void QNetworkAccessManager::setConfiguration(const QNetworkConfiguration &config)
 {
     Q_D(QNetworkAccessManager);
+
     d->networkConfiguration = config;
     d->customNetworkConfiguration = true;
     d->createSession(config);
@@ -1048,7 +1060,7 @@ QNetworkConfiguration QNetworkAccessManager::configuration() const
     Q_D(const QNetworkAccessManager);
 
     QSharedPointer<QNetworkSession> session(d->getNetworkSession());
-    if (session) {
+    if (session && !d->statusMonitor.isEnabled()) {
         return session->configuration();
     } else {
         return d->networkConfigurationManager.defaultConfiguration();
@@ -1075,7 +1087,7 @@ QNetworkConfiguration QNetworkAccessManager::activeConfiguration() const
     Q_D(const QNetworkAccessManager);
 
     QSharedPointer<QNetworkSession> networkSession(d->getNetworkSession());
-    if (networkSession) {
+    if (networkSession && !d->statusMonitor.isEnabled()) {
         return d->networkConfigurationManager.configurationFromIdentifier(
             networkSession->sessionProperty(QLatin1String("ActiveConfiguration")).toString());
     } else {
@@ -1114,6 +1126,12 @@ QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccess
 {
     Q_D(const QNetworkAccessManager);
 
+    if (d->statusMonitor.isEnabled()) {
+        if (!d->statusMonitor.isMonitoring())
+            d->statusMonitor.start();
+        return d->networkAccessible;
+    }
+
     if (d->customNetworkConfiguration && d->networkConfiguration.state().testFlag(QNetworkConfiguration::Undefined))
         return UnknownAccessibility;
 
@@ -1162,7 +1180,6 @@ QSharedPointer<QNetworkSession> QNetworkAccessManagerPrivate::getNetworkSession(
 
 #endif // QT_NO_BEARERMANAGEMENT
 
-
 #ifndef QT_NO_SSL
 /*!
     \since 5.2
@@ -1387,6 +1404,11 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
         req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, redirectPolicy());
     }
 
+    if (autoDeleteReplies()
+        && req.attribute(QNetworkRequest::AutoDeleteReplyOnFinishAttribute).isNull()) {
+        req.setAttribute(QNetworkRequest::AutoDeleteReplyOnFinishAttribute, true);
+    }
+
     bool isLocalFile = req.url().isLocalFile();
     QString scheme = req.url().scheme();
 
@@ -1435,35 +1457,57 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
         }
     }
 
-#ifndef QT_NO_BEARERMANAGEMENT
+    if (d->statusMonitor.isEnabled()) {
+        // See the code in ctor - QNetworkStatusMonitor allows us to
+        // immediately set 'networkAccessible' even before we start
+        // the monitor.
+#ifdef QT_NO_BEARERMANAGEMENT
+        if (d->networkAccessible
+#else
+        if (d->networkAccessible == NotAccessible
+#endif // QT_NO_BEARERMANAGEMENT
+            && !isLocalFile) {
+            QHostAddress dest;
+            QString host = req.url().host().toLower();
+            if (!(dest.setAddress(host) && dest.isLoopback())
+                 && host != QLatin1String("localhost")
+                 && host != QHostInfo::localHostName().toLower()) {
+                return new QDisabledNetworkReply(this, req, op);
+            }
+        }
 
-    // Return a disabled network reply if network access is disabled.
-    // Except if the scheme is empty or file:// or if the host resolves to a loopback address.
-    if (d->networkAccessible == NotAccessible && !isLocalFile) {
-        QHostAddress dest;
-        QString host = req.url().host().toLower();
-        if (!(dest.setAddress(host) && dest.isLoopback()) && host != QLatin1String("localhost")
+        if (!d->statusMonitor.isMonitoring() && !d->statusMonitor.start())
+            qWarning(lcNetMon, "failed to start network status monitoring");
+    } else {
+#ifndef QT_NO_BEARERMANAGEMENT
+        // Return a disabled network reply if network access is disabled.
+        // Except if the scheme is empty or file:// or if the host resolves to a loopback address.
+        if (d->networkAccessible == NotAccessible && !isLocalFile) {
+            QHostAddress dest;
+            QString host = req.url().host().toLower();
+            if (!(dest.setAddress(host) && dest.isLoopback()) && host != QLatin1String("localhost")
                 && host != QHostInfo::localHostName().toLower()) {
-            return new QDisabledNetworkReply(this, req, op);
+                return new QDisabledNetworkReply(this, req, op);
+            }
         }
-    }
 
-    if (!d->networkSessionStrongRef && (d->initializeSession || !d->networkConfiguration.identifier().isEmpty())) {
-        if (!d->networkConfiguration.identifier().isEmpty()) {
-            if ((d->networkConfiguration.state() & QNetworkConfiguration::Defined)
-                    && d->networkConfiguration != d->networkConfigurationManager.defaultConfiguration())
-                d->createSession(d->networkConfigurationManager.defaultConfiguration());
-            else
-                d->createSession(d->networkConfiguration);
+        if (!d->networkSessionStrongRef && (d->initializeSession || !d->networkConfiguration.identifier().isEmpty())) {
+            if (!d->networkConfiguration.identifier().isEmpty()) {
+                if ((d->networkConfiguration.state() & QNetworkConfiguration::Defined)
+                        && d->networkConfiguration != d->networkConfigurationManager.defaultConfiguration())
+                    d->createSession(d->networkConfigurationManager.defaultConfiguration());
+                else
+                    d->createSession(d->networkConfiguration);
 
-        } else {
-            if (d->networkSessionRequired)
-                d->createSession(d->networkConfigurationManager.defaultConfiguration());
-            else
-                d->initializeSession = false;
+            } else {
+                if (d->networkSessionRequired)
+                    d->createSession(d->networkConfigurationManager.defaultConfiguration());
+                else
+                    d->initializeSession = false;
+            }
         }
-    }
 #endif
+    }
 
     QNetworkRequest request = req;
     if (!request.header(QNetworkRequest::ContentLengthHeader).isValid() &&
@@ -1510,8 +1554,10 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
 #endif
         QNetworkReplyHttpImpl *reply = new QNetworkReplyHttpImpl(this, request, op, outgoingData);
 #ifndef QT_NO_BEARERMANAGEMENT
-        connect(this, SIGNAL(networkSessionConnected()),
-                reply, SLOT(_q_networkSessionConnected()));
+        if (!d->statusMonitor.isEnabled()) {
+            connect(this, SIGNAL(networkSessionConnected()),
+                    reply, SLOT(_q_networkSessionConnected()));
+        }
 #endif
         return reply;
     }
@@ -1520,7 +1566,9 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
     // first step: create the reply
     QNetworkReplyImpl *reply = new QNetworkReplyImpl(this);
 #ifndef QT_NO_BEARERMANAGEMENT
-    if (!isLocalFile) {
+    // NETMONTODO: network reply impl must be augmented to use the same monitoring
+    // capabilities as http network reply impl does. Once it does: uncomment the condition below
+    if (!isLocalFile /*&& !d->statusMonitor.isEnabled()*/) {
         connect(this, SIGNAL(networkSessionConnected()),
                 reply, SLOT(_q_networkSessionConnected()));
     }
@@ -1631,13 +1679,50 @@ void QNetworkAccessManager::clearConnectionCache()
     QNetworkAccessManagerPrivate::clearConnectionCache(this);
 }
 
+
+/*!
+    \since 5.14
+
+    Returns the true if QNetworkAccessManager is currently configured
+    to automatically delete QNetworkReplies, false otherwise.
+
+    \sa setAutoDeleteReplies,
+    QNetworkRequest::AutoDeleteReplyOnFinishAttribute
+*/
+bool QNetworkAccessManager::autoDeleteReplies() const
+{
+    return d_func()->autoDeleteReplies;
+}
+
+/*!
+    \since 5.14
+
+    Enables or disables automatic deletion of \l {QNetworkReply} {QNetworkReplies}.
+
+    Setting \a shouldAutoDelete to true is the same as setting the
+    QNetworkRequest::AutoDeleteReplyOnFinishAttribute attribute to
+    true on all \e{future} \l {QNetworkRequest} {QNetworkRequests}
+    passed to this instance of QNetworkAccessManager unless the
+    attribute was already explicitly set on the QNetworkRequest.
+
+    \sa autoDeleteReplies,
+    QNetworkRequest::AutoDeleteReplyOnFinishAttribute
+*/
+void QNetworkAccessManager::setAutoDeleteReplies(bool shouldAutoDelete)
+{
+    d_func()->autoDeleteReplies = shouldAutoDelete;
+}
+
 void QNetworkAccessManagerPrivate::_q_replyFinished()
 {
     Q_Q(QNetworkAccessManager);
 
     QNetworkReply *reply = qobject_cast<QNetworkReply *>(q->sender());
-    if (reply)
+    if (reply) {
         emit q->finished(reply);
+        if (reply->request().attribute(QNetworkRequest::AutoDeleteReplyOnFinishAttribute, false).toBool())
+            QMetaObject::invokeMethod(reply, [reply] { reply->deleteLater(); }, Qt::QueuedConnection);
+    }
 
 #ifndef QT_NO_BEARERMANAGEMENT
     // If there are no active requests, release our reference to the network session.
@@ -1989,7 +2074,13 @@ void QNetworkAccessManagerPrivate::_q_networkSessionStateChanged(QNetworkSession
 
 void QNetworkAccessManagerPrivate::_q_onlineStateChanged(bool isOnline)
 {
-   Q_Q(QNetworkAccessManager);
+    Q_Q(QNetworkAccessManager);
+
+    if (statusMonitor.isEnabled()) {
+        networkAccessible = isOnline ? QNetworkAccessManager::Accessible : QNetworkAccessManager::NotAccessible;
+        return;
+    }
+
 
    // if the user set a config, we only care whether this one is active.
     // Otherwise, this QNAM is online if there is an online config.
@@ -2019,6 +2110,9 @@ void QNetworkAccessManagerPrivate::_q_onlineStateChanged(bool isOnline)
 
 void QNetworkAccessManagerPrivate::_q_configurationChanged(const QNetworkConfiguration &configuration)
 {
+    if (statusMonitor.isEnabled())
+        return;
+
     const QString id = configuration.identifier();
     if (configuration.state().testFlag(QNetworkConfiguration::Active)) {
         if (!onlineConfigurations.contains(id)) {
@@ -2051,6 +2145,9 @@ void QNetworkAccessManagerPrivate::_q_configurationChanged(const QNetworkConfigu
 
 void QNetworkAccessManagerPrivate::_q_networkSessionFailed(QNetworkSession::SessionError)
 {
+    if (statusMonitor.isEnabled())
+        return;
+
     const auto cfgs = networkConfigurationManager.allConfigurations();
     for (const QNetworkConfiguration &cfg : cfgs) {
         if (cfg.state().testFlag(QNetworkConfiguration::Active)) {
@@ -2062,6 +2159,13 @@ void QNetworkAccessManagerPrivate::_q_networkSessionFailed(QNetworkSession::Sess
     }
 }
 
+#else
+
+void QNetworkAccessManagerPrivate::_q_onlineStateChanged(bool isOnline)
+{
+    networkAccessible = isOnline;
+}
+
 #endif // QT_NO_BEARERMANAGEMENT
 
 #if QT_CONFIG(http)
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 7e2f7683d0..98498d07d2 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -167,6 +167,9 @@ public:
     void setRedirectPolicy(QNetworkRequest::RedirectPolicy policy);
     QNetworkRequest::RedirectPolicy redirectPolicy() const;
 
+    bool autoDeleteReplies() const;
+    void setAutoDeleteReplies(bool autoDelete);
+
 Q_SIGNALS:
 #ifndef QT_NO_NETWORKPROXY
     void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator);
@@ -209,10 +212,10 @@ private:
 #ifndef QT_NO_BEARERMANAGEMENT
     Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed())
     Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State))
-    Q_PRIVATE_SLOT(d_func(), void _q_onlineStateChanged(bool))
     Q_PRIVATE_SLOT(d_func(), void _q_configurationChanged(const QNetworkConfiguration &))
     Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed(QNetworkSession::SessionError))
 #endif
+    Q_PRIVATE_SLOT(d_func(), void _q_onlineStateChanged(bool))
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
index 5cab4928e4..67ea2094b3 100644
--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
@@ -55,6 +55,7 @@
 #include "qnetworkaccessmanager.h"
 #include "qnetworkaccesscache_p.h"
 #include "qnetworkaccessbackend_p.h"
+#include "private/qnetconmonitor_p.h"
 #include "qnetworkrequest.h"
 #include "qhsts_p.h"
 #include "private/qobject_p.h"
@@ -151,6 +152,7 @@ public:
     QNetworkAccessBackend *findBackend(QNetworkAccessManager::Operation op, const QNetworkRequest &request);
     QStringList backendSupportedSchemes() const;
 
+    void _q_onlineStateChanged(bool isOnline);
 #ifndef QT_NO_BEARERMANAGEMENT
     void createSession(const QNetworkConfiguration &config);
     QSharedPointer<QNetworkSession> getNetworkSession() const;
@@ -160,12 +162,11 @@ public:
     void _q_networkSessionPreferredConfigurationChanged(const QNetworkConfiguration &config,
                                                         bool isSeamless);
     void _q_networkSessionStateChanged(QNetworkSession::State state);
-    void _q_onlineStateChanged(bool isOnline);
+
     void _q_configurationChanged(const QNetworkConfiguration &configuration);
     void _q_networkSessionFailed(QNetworkSession::SessionError error);
 
     QSet<QString> onlineConfigurations;
-
 #endif
 
 #if QT_CONFIG(http)
@@ -199,6 +200,8 @@ public:
     int activeReplyCount;
     bool online;
     bool initializeSession;
+#else
+    bool networkAccessible = true;
 #endif
 
     bool cookieJarCreated;
@@ -222,6 +225,9 @@ public:
     QScopedPointer<QHstsStore> stsStore;
 #endif // QT_CONFIG(settings)
     bool stsEnabled = false;
+    mutable QNetworkStatusMonitor statusMonitor;
+
+    bool autoDeleteReplies = false;
 
 #ifndef QT_NO_BEARERMANAGEMENT
     Q_AUTOTEST_EXPORT static const QWeakPointer<const QNetworkSession> getNetworkSession(const QNetworkAccessManager *manager);
diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index b7cf989477..903de322ff 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -46,6 +46,7 @@
 #include "QtCore/qdebug.h"
 #include "QtCore/qlist.h"
 #include "QtCore/qlocale.h"
+#include <QtCore/qregexp.h>
 #include "QtCore/qstring.h"
 #include "QtCore/qstringlist.h"
 #include "QtCore/qurl.h"
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index e462b98555..b712b63849 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -66,12 +66,10 @@ public:
     explicit QNetworkCookie(const QByteArray &name = QByteArray(), const QByteArray &value = QByteArray());
     QNetworkCookie(const QNetworkCookie &other);
     ~QNetworkCookie();
-#ifdef Q_COMPILER_RVALUE_REFS
-    QNetworkCookie &operator=(QNetworkCookie &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QNetworkCookie &operator=(QNetworkCookie &&other) noexcept { swap(other); return *this; }
     QNetworkCookie &operator=(const QNetworkCookie &other);
 
-    void swap(QNetworkCookie &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QNetworkCookie &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QNetworkCookie &other) const;
     inline bool operator!=(const QNetworkCookie &other) const
diff --git a/src/network/access/qnetworkdiskcache_p.h b/src/network/access/qnetworkdiskcache_p.h
index f7988e7dda..c797e63830 100644
--- a/src/network/access/qnetworkdiskcache_p.h
+++ b/src/network/access/qnetworkdiskcache_p.h
@@ -67,7 +67,7 @@ class QFile;
 class QCacheItem
 {
 public:
-    QCacheItem() : file(0)
+    QCacheItem() : file(nullptr)
     {
     }
     ~QCacheItem()
@@ -85,7 +85,7 @@ public:
         metaData = QNetworkCacheMetaData();
         data.close();
         delete file;
-        file = 0;
+        file = nullptr;
     }
     void writeHeader(QFile *device) const;
     void writeCompressedData(QFile *device) const;
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 489c489e5c..8ac81d1780 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -59,6 +59,7 @@
 #include <QtCore/private/qthread_p.h>
 
 #include "qnetworkcookiejar.h"
+#include "qnetconmonitor_p.h"
 
 #include <string.h>             // for strchr
 
@@ -166,6 +167,11 @@ static QHash<QByteArray, QByteArray> parseHttpOptionHeader(const QByteArray &hea
 #if QT_CONFIG(bearermanagement)
 static bool isSessionNeeded(const QUrl &url)
 {
+    if (QNetworkStatusMonitor::isEnabled()) {
+        // In case QNetworkStatus/QNetConManager are in business,
+        // no session, no bearer manager are involved.
+        return false;
+    }
     // Connections to the local machine does not require a session
     QString host = url.host().toLower();
     return !QHostAddress(host).isLoopback() && host != QLatin1String("localhost")
@@ -792,12 +798,11 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
 
     // Create the HTTP thread delegate
     QHttpThreadDelegate *delegate = new QHttpThreadDelegate;
-    // Propagate Http/2 settings if any
-    const QVariant blob(manager->property(Http2::http2ParametersPropertyName));
-    if (blob.isValid() && blob.canConvert<Http2::ProtocolParameters>())
-        delegate->http2Parameters = blob.value<Http2::ProtocolParameters>();
+    // Propagate Http/2 settings:
+    delegate->http2Parameters = request.http2Configuration();
 #ifndef QT_NO_BEARERMANAGEMENT
-    delegate->networkSession = managerPrivate->getNetworkSession();
+    if (!QNetworkStatusMonitor::isEnabled())
+        delegate->networkSession = managerPrivate->getNetworkSession();
 #endif
 
     // For the synchronous HTTP, this is the normal way the delegate gets deleted
@@ -1048,59 +1053,39 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
     if (!q->isOpen())
         return;
 
-    int pendingSignals = (int)pendingDownloadDataEmissions->fetchAndAddAcquire(-1) - 1;
+    if (cacheEnabled && isCachingAllowed() && !cacheSaveDevice)
+        initCacheSaveDevice();
+
+    // This is going to look a little strange. When downloading data while a
+    // HTTP redirect is happening (and enabled), we write the redirect
+    // response to the cache. However, we do not append it to our internal
+    // buffer as that will contain the response data only for the final
+    // response
+    if (cacheSaveDevice)
+        cacheSaveDevice->write(d);
 
+    if (!isHttpRedirectResponse()) {
+        buffer.append(d);
+        bytesDownloaded += d.size();
+    }
+    bytesBuffered += d.size();
+
+    int pendingSignals = pendingDownloadDataEmissions->fetchAndSubAcquire(1) - 1;
     if (pendingSignals > 0) {
         // Some more signal emissions to this slot are pending.
         // Instead of writing the downstream data, we wait
         // and do it in the next call we get
         // (signal comppression)
-        pendingDownloadData.append(d);
         return;
     }
 
-    pendingDownloadData.append(d);
-    d.clear();
-    // We need to usa a copy for calling writeDownstreamData as we could
-    // possibly recurse into this this function when we call
-    // appendDownstreamDataSignalEmissions because the user might call
-    // processEvents() or spin an event loop when this occur.
-    QByteDataBuffer pendingDownloadDataCopy = pendingDownloadData;
-    pendingDownloadData.clear();
-
-    if (cacheEnabled && isCachingAllowed() && !cacheSaveDevice) {
-        initCacheSaveDevice();
-    }
-
-    qint64 bytesWritten = 0;
-    for (int i = 0; i < pendingDownloadDataCopy.bufferCount(); i++) {
-        QByteArray const &item = pendingDownloadDataCopy[i];
-
-        // This is going to look a little strange. When downloading data while a
-        // HTTP redirect is happening (and enabled), we write the redirect
-        // response to the cache. However, we do not append it to our internal
-        // buffer as that will contain the response data only for the final
-        // response
-        if (cacheSaveDevice)
-            cacheSaveDevice->write(item.constData(), item.size());
-
-        if (!isHttpRedirectResponse())
-            buffer.append(item);
-
-        bytesWritten += item.size();
-    }
-    bytesBuffered += bytesWritten;
-    pendingDownloadDataCopy.clear();
+    if (isHttpRedirectResponse())
+        return;
 
     QVariant totalSize = cookedHeaders.value(QNetworkRequest::ContentLengthHeader);
     if (preMigrationDownloaded != Q_INT64_C(-1))
         totalSize = totalSize.toLongLong() + preMigrationDownloaded;
 
-    if (isHttpRedirectResponse())
-        return;
-
-    bytesDownloaded += bytesWritten;
-
     emit q->readyRead();
     // emit readyRead before downloadProgress incase this will cause events to be
     // processed and we get into a recursive call (as in QProgressDialog).
@@ -1808,7 +1793,7 @@ bool QNetworkReplyHttpImplPrivate::start(const QNetworkRequest &newHttpRequest)
 {
 #ifndef QT_NO_BEARERMANAGEMENT
     QSharedPointer<QNetworkSession> networkSession(managerPrivate->getNetworkSession());
-    if (!networkSession) {
+    if (!networkSession || QNetworkStatusMonitor::isEnabled()) {
 #endif
         postRequest(newHttpRequest);
         return true;
@@ -1896,7 +1881,7 @@ void QNetworkReplyHttpImplPrivate::_q_startOperation()
         // state changes.
         if (!startWaitForSession(session))
             return;
-    } else if (session) {
+    } else if (session && !QNetworkStatusMonitor::isEnabled()) {
         QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
                          q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)),
                          Qt::QueuedConnection);
@@ -2185,7 +2170,7 @@ void QNetworkReplyHttpImplPrivate::finished()
 #ifndef QT_NO_BEARERMANAGEMENT
     Q_ASSERT(managerPrivate);
     QSharedPointer<QNetworkSession> session = managerPrivate->getNetworkSession();
-    if (session && session->state() == QNetworkSession::Roaming &&
+    if (!QNetworkStatusMonitor::isEnabled() && session && session->state() == QNetworkSession::Roaming &&
         state == Working && errorCode != QNetworkReply::OperationCanceledError) {
         // only content with a known size will fail with a temporary network failure error
         if (!totalSize.isNull()) {
diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h
index f5f01d0811..ef69ce0653 100644
--- a/src/network/access/qnetworkreplyhttpimpl_p.h
+++ b/src/network/access/qnetworkreplyhttpimpl_p.h
@@ -63,7 +63,6 @@
 
 #include <QtNetwork/QNetworkCacheMetaData>
 #include <private/qhttpnetworkrequest_p.h>
-#include <private/qbytedata_p.h>
 #include <private/qnetworkreply_p.h>
 #include <QtNetwork/QNetworkProxy>
 #include <QtNetwork/QNetworkSession>
@@ -248,7 +247,6 @@ public:
     quint64 resumeOffset;
     qint64 preMigrationDownloaded;
 
-    QByteDataBuffer pendingDownloadData; // For signal compression
     qint64 bytesDownloaded;
     qint64 bytesBuffered;
 
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index a794b492e7..6eab500e8c 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -158,7 +158,7 @@ void QNetworkReplyImplPrivate::_q_startOperation()
     } else {
         if (state != Finished) {
             if (operation == QNetworkAccessManager::GetOperation)
-                pendingNotifications.append(NotifyDownstreamReadyWrite);
+                pendingNotifications.push_back(NotifyDownstreamReadyWrite);
 
             handleNotifications();
         }
@@ -368,6 +368,7 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
 
     outgoingData = data;
     request = req;
+    originalRequest = req;
     url = request.url();
     operation = op;
 
@@ -432,8 +433,9 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
 void QNetworkReplyImplPrivate::backendNotify(InternalNotifications notification)
 {
     Q_Q(QNetworkReplyImpl);
-    if (!pendingNotifications.contains(notification))
-        pendingNotifications.enqueue(notification);
+    const auto it = std::find(pendingNotifications.cbegin(), pendingNotifications.cend(), notification);
+    if (it == pendingNotifications.cend())
+        pendingNotifications.push_back(notification);
 
     if (pendingNotifications.size() == 1)
         QCoreApplication::postEvent(q, new QEvent(QEvent::NetworkReplyUpdated));
@@ -444,14 +446,9 @@ void QNetworkReplyImplPrivate::handleNotifications()
     if (notificationHandlingPaused)
         return;
 
-    NotificationQueue current = pendingNotifications;
-    pendingNotifications.clear();
-
-    if (state != Working)
-        return;
-
-    while (state == Working && !current.isEmpty()) {
-        InternalNotifications notification = current.dequeue();
+     for (InternalNotifications notification : qExchange(pendingNotifications, {})) {
+        if (state != Working)
+            return;
         switch (notification) {
         case NotifyDownstreamReadyWrite:
             if (copyDevice)
@@ -465,8 +462,7 @@ void QNetworkReplyImplPrivate::handleNotifications()
             break;
 
         case NotifyCopyFinished: {
-            QIODevice *dev = copyDevice;
-            copyDevice = 0;
+            QIODevice *dev = qExchange(copyDevice, nullptr);
             backend->copyFinished(dev);
             break;
         }
@@ -1116,7 +1112,6 @@ bool QNetworkReplyImplPrivate::migrateBackend()
     return true;
 }
 
-#ifndef QT_NO_BEARERMANAGEMENT
 QDisabledNetworkReply::QDisabledNetworkReply(QObject *parent,
                                              const QNetworkRequest &req,
                                              QNetworkAccessManager::Operation op)
@@ -1141,7 +1136,6 @@ QDisabledNetworkReply::QDisabledNetworkReply(QObject *parent,
 QDisabledNetworkReply::~QDisabledNetworkReply()
 {
 }
-#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index f4e8284ab6..8cec79541a 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -74,7 +74,7 @@ class QNetworkReplyImpl: public QNetworkReply
 {
     Q_OBJECT
 public:
-    QNetworkReplyImpl(QObject *parent = 0);
+    QNetworkReplyImpl(QObject *parent = nullptr);
     ~QNetworkReplyImpl();
     virtual void abort() override;
 
@@ -117,8 +117,6 @@ public:
         NotifyCopyFinished
     };
 
-    typedef QQueue<InternalNotifications> NotificationQueue;
-
     QNetworkReplyImplPrivate();
 
     void _q_startOperation();
@@ -178,7 +176,7 @@ public:
     bool cacheEnabled;
     QIODevice *cacheSaveDevice;
 
-    NotificationQueue pendingNotifications;
+    std::vector<InternalNotifications> pendingNotifications;
     bool notificationHandlingPaused;
 
     QUrl urlForLastAuthentication;
@@ -209,7 +207,6 @@ public:
 };
 Q_DECLARE_TYPEINFO(QNetworkReplyImplPrivate::InternalNotifications, Q_PRIMITIVE_TYPE);
 
-#ifndef QT_NO_BEARERMANAGEMENT
 class QDisabledNetworkReply : public QNetworkReply
 {
     Q_OBJECT
@@ -223,7 +220,6 @@ public:
 protected:
     qint64 readData(char *, qint64) override { return -1; }
 };
-#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index f15c43cdd8..118fb6b1fb 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -42,6 +42,10 @@
 #include "qplatformdefs.h"
 #include "qnetworkcookie.h"
 #include "qsslconfiguration.h"
+#if QT_CONFIG(http) || defined(Q_CLANG_QDOC)
+#include "qhttp2configuration.h"
+#include "private/http2protocol_p.h"
+#endif
 #include "QtCore/qshareddata.h"
 #include "QtCore/qlocale.h"
 #include "QtCore/qdatetime.h"
@@ -331,6 +335,12 @@ QT_BEGIN_NAMESPACE
 
     \omitvalue ResourceTypeAttribute
 
+    \value AutoDeleteReplyOnFinishAttribute
+        Requests only, type: QMetaType::Bool (default: false)
+        If set, this attribute will make QNetworkAccessManager delete
+        the QNetworkReply after having emitted "finished".
+        (This value was introduced in 5.14.)
+
     \value User
         Special type. Additional information can be passed in
         QVariants with types ranging from User to UserMax. The default
@@ -439,6 +449,9 @@ public:
             sslConfiguration = new QSslConfiguration(*other.sslConfiguration);
 #endif
         peerVerifyName = other.peerVerifyName;
+#if QT_CONFIG(http)
+        h2Configuration = other.h2Configuration;
+#endif
     }
 
     inline bool operator==(const QNetworkRequestPrivate &other) const
@@ -448,7 +461,11 @@ public:
             rawHeaders == other.rawHeaders &&
             attributes == other.attributes &&
             maxRedirectsAllowed == other.maxRedirectsAllowed &&
-            peerVerifyName == other.peerVerifyName;
+            peerVerifyName == other.peerVerifyName
+#if QT_CONFIG(http)
+            && h2Configuration == other.h2Configuration
+#endif
+            ;
         // don't compare cookedHeaders
     }
 
@@ -459,16 +476,39 @@ public:
 #endif
     int maxRedirectsAllowed;
     QString peerVerifyName;
+#if QT_CONFIG(http)
+    QHttp2Configuration h2Configuration;
+#endif
 };
 
 /*!
+    Constructs a QNetworkRequest object with no URL to be requested.
+    Use setUrl() to set one.
+
+    \sa url(), setUrl()
+*/
+QNetworkRequest::QNetworkRequest()
+    : d(new QNetworkRequestPrivate)
+{
+#if QT_CONFIG(http)
+    // Initial values proposed by RFC 7540 are quite draconian,
+    // so unless an application will set its own parameters, we
+    // make stream window size larger and increase (via WINDOW_UPDATE)
+    // the session window size. These are our 'defaults':
+    d->h2Configuration.setStreamReceiveWindowSize(Http2::qtDefaultStreamReceiveWindowSize);
+    d->h2Configuration.setSessionReceiveWindowSize(Http2::maxSessionReceiveWindowSize);
+    d->h2Configuration.setServerPushEnabled(false);
+#endif // QT_CONFIG(http)
+}
+
+/*!
     Constructs a QNetworkRequest object with \a url as the URL to be
     requested.
 
     \sa url(), setUrl()
 */
 QNetworkRequest::QNetworkRequest(const QUrl &url)
-    : d(new QNetworkRequestPrivate)
+    : QNetworkRequest()
 {
     d->url = url;
 }
@@ -818,6 +858,52 @@ void QNetworkRequest::setPeerVerifyName(const QString &peerName)
     d->peerVerifyName = peerName;
 }
 
+#if QT_CONFIG(http) || defined(Q_CLANG_QDOC)
+/*!
+    \since 5.14
+
+    Returns the current parameters that QNetworkAccessManager is
+    using for this request and its underlying HTTP/2 connection.
+    This is either a configuration previously set by an application
+    or a default configuration.
+
+    The default values that QNetworkAccessManager is using are:
+
+    \list
+      \li Window size for connection-level flowcontrol is 2147483647 octets
+      \li Window size for stream-level flowcontrol is 21474836 octets
+      \li Max frame size is 16384
+    \endlist
+
+    By default, server push is disabled, Huffman compression and
+    string indexing are enabled.
+
+    \sa setHttp2Configuration
+*/
+QHttp2Configuration QNetworkRequest::http2Configuration() const
+{
+    return d->h2Configuration;
+}
+
+/*!
+    \since 5.14
+
+    Sets request's HTTP/2 parameters from \a configuration.
+
+    \note The configuration must be set prior to making a request.
+    \note HTTP/2 multiplexes several streams in a single HTTP/2
+    connection. This implies that QNetworkAccessManager will use
+    the configuration found in the first request from  a series
+    of requests sent to the same host.
+
+    \sa http2Configuration, QNetworkAccessManager, QHttp2Configuration
+*/
+void QNetworkRequest::setHttp2Configuration(const QHttp2Configuration &configuration)
+{
+    d->h2Configuration = configuration;
+}
+#endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC)
+
 static QByteArray headerName(QNetworkRequest::KnownHeaders header)
 {
     switch (header) {
@@ -1338,7 +1424,7 @@ QDateTime QNetworkHeadersPrivate::fromHttpDate(const QByteArray &value)
 
 QByteArray QNetworkHeadersPrivate::toHttpDate(const QDateTime &dt)
 {
-    return QLocale::c().toString(dt, QLatin1String("ddd, dd MMM yyyy hh:mm:ss 'GMT'"))
+    return QLocale::c().toString(dt, u"ddd, dd MMM yyyy hh:mm:ss 'GMT'")
         .toLatin1();
 }
 
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index efb9cbecba..e09ff8aaae 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -49,6 +49,7 @@
 QT_BEGIN_NAMESPACE
 
 class QSslConfiguration;
+class QHttp2Configuration;
 
 class QNetworkRequestPrivate;
 class Q_NETWORK_EXPORT QNetworkRequest
@@ -98,6 +99,7 @@ public:
         RedirectPolicyAttribute,
         Http2DirectAttribute,
         ResourceTypeAttribute, // internal
+        AutoDeleteReplyOnFinishAttribute,
 
         User = 1000,
         UserMax = 32767
@@ -127,15 +129,14 @@ public:
     };
 
 
-    explicit QNetworkRequest(const QUrl &url = QUrl());
+    QNetworkRequest();
+    explicit QNetworkRequest(const QUrl &url);
     QNetworkRequest(const QNetworkRequest &other);
     ~QNetworkRequest();
-#ifdef Q_COMPILER_RVALUE_REFS
-    QNetworkRequest &operator=(QNetworkRequest &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QNetworkRequest &operator=(QNetworkRequest &&other) noexcept { swap(other); return *this; }
     QNetworkRequest &operator=(const QNetworkRequest &other);
 
-    void swap(QNetworkRequest &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QNetworkRequest &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QNetworkRequest &other) const;
     inline bool operator!=(const QNetworkRequest &other) const
@@ -175,6 +176,10 @@ public:
 
     QString peerVerifyName() const;
     void setPeerVerifyName(const QString &peerName);
+#if QT_CONFIG(http) || defined(Q_CLANG_QDOC)
+    QHttp2Configuration http2Configuration() const;
+    void setHttp2Configuration(const QHttp2Configuration &configuration);
+#endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC)
 private:
     QSharedDataPointer<QNetworkRequestPrivate> d;
     friend class QNetworkRequestPrivate;
diff --git a/src/network/access/qspdyprotocolhandler.cpp b/src/network/access/qspdyprotocolhandler.cpp
index 403c01e974..f845235bf7 100644
--- a/src/network/access/qspdyprotocolhandler.cpp
+++ b/src/network/access/qspdyprotocolhandler.cpp
@@ -305,7 +305,7 @@ bool QSpdyProtocolHandler::sendRequest()
 
         currentReply->setSpdyWasUsed(true);
         qint32 streamID = generateNextStreamID();
-        currentReply->setProperty("SPDYStreamID", streamID);
+        m_streamIDs.insert(currentReply, streamID);
 
         currentReply->setRequest(currentRequest);
         currentReply->d_func()->connection = m_connection;
@@ -322,7 +322,7 @@ bool QSpdyProtocolHandler::sendRequest()
 
 void QSpdyProtocolHandler::_q_replyDestroyed(QObject* reply)
 {
-    qint32 streamID = reply->property("SPDYStreamID").toInt();
+    qint32 streamID = m_streamIDs.take(reply);
     if (m_inFlightStreams.remove(streamID))
         sendRST_STREAM(streamID, RST_STREAM_CANCEL);
 }
@@ -624,10 +624,12 @@ void QSpdyProtocolHandler::sendSYN_STREAM(const HttpMessagePair &messagePair,
 
         // hack: set the stream ID on the device directly, so when we get
         // the signal for uploading we know which stream we are sending on
-        request.uploadByteDevice()->setProperty("SPDYStreamID", streamID);
+        m_streamIDs.insert(request.uploadByteDevice(), streamID);
 
         QObject::connect(request.uploadByteDevice(), SIGNAL(readyRead()), this,
                          SLOT(_q_uploadDataReadyRead()), Qt::QueuedConnection);
+        QObject::connect(request.uploadByteDevice(), SIGNAL(destroyed(QObject*)), this,
+                         SLOT(_q_uploadDataDestroyed(QObject *)));
     }
 
     QByteArray namesAndValues = composeHeader(request);
@@ -663,6 +665,11 @@ void QSpdyProtocolHandler::sendSYN_STREAM(const HttpMessagePair &messagePair,
         uploadData(streamID);
 }
 
+void QSpdyProtocolHandler::_q_uploadDataDestroyed(QObject *uploadData)
+{
+    m_streamIDs.remove(uploadData);
+}
+
 void QSpdyProtocolHandler::sendRST_STREAM(qint32 streamID, RST_STREAM_STATUS_CODE statusCode)
 {
     char wireData[8];
@@ -756,7 +763,7 @@ void QSpdyProtocolHandler::_q_uploadDataReadyRead()
 {
     QNonContiguousByteDevice *device = qobject_cast<QNonContiguousByteDevice *>(sender());
     Q_ASSERT(device);
-    qint32 streamID = device->property("SPDYStreamID").toInt();
+    qint32 streamID = m_streamIDs.value(device);
     Q_ASSERT(streamID > 0);
     uploadData(streamID);
 }
diff --git a/src/network/access/qspdyprotocolhandler_p.h b/src/network/access/qspdyprotocolhandler_p.h
index dd93a9aba2..14e2ff388a 100644
--- a/src/network/access/qspdyprotocolhandler_p.h
+++ b/src/network/access/qspdyprotocolhandler_p.h
@@ -110,6 +110,7 @@ public:
 private slots:
     void _q_uploadDataReadyRead();
     void _q_replyDestroyed(QObject*);
+    void _q_uploadDataDestroyed(QObject *);
 
 private:
 
@@ -216,6 +217,7 @@ private:
     bool m_waitingForCompleteStream;
     z_stream m_deflateStream;
     z_stream m_inflateStream;
+    QHash<QObject *, qint32> m_streamIDs;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSpdyProtocolHandler::DataFrameFlags)
diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp
index 677da08cb6..06bf449611 100644
--- a/src/network/bearer/qbearerengine.cpp
+++ b/src/network/bearer/qbearerengine.cpp
@@ -38,6 +38,8 @@
 ****************************************************************************/
 
 #include "qbearerengine_p.h"
+#include <QtCore/private/qlocking_p.h>
+
 #include <algorithm>
 
 #ifndef QT_NO_BEARERMANAGEMENT
@@ -46,24 +48,23 @@ QT_BEGIN_NAMESPACE
 
 static void cleanUpConfigurations(QHash<QString, QNetworkConfigurationPrivatePointer> &configurations)
 {
-    for (const auto &ptr : qAsConst(configurations)) {
+    for (auto &ptr : qExchange(configurations, {})) {
         ptr->isValid = false;
         ptr->id.clear();
     }
-    configurations.clear();
 }
 
 static bool hasUsedConfiguration(const QHash<QString, QNetworkConfigurationPrivatePointer> &configurations)
 {
     auto isUsed = [](const QNetworkConfigurationPrivatePointer &ptr) {
-        return ptr->ref.load() > 1;
+        return ptr->ref.loadRelaxed() > 1;
     };
     const auto end = configurations.end();
     return std::find_if(configurations.begin(), end, isUsed) != end;
 }
 
 QBearerEngine::QBearerEngine(QObject *parent)
-    : QObject(parent), mutex(QMutex::Recursive)
+    : QObject(parent)
 {
 }
 
@@ -87,7 +88,7 @@ bool QBearerEngine::requiresPolling() const
 */
 bool QBearerEngine::configurationsInUse() const
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     return hasUsedConfiguration(accessPointConfigurations)
         || hasUsedConfiguration(snapConfigurations)
         || hasUsedConfiguration(userChoiceConfigurations);
diff --git a/src/network/bearer/qbearerengine_p.h b/src/network/bearer/qbearerengine_p.h
index 5fc2578a78..c69f478b26 100644
--- a/src/network/bearer/qbearerengine_p.h
+++ b/src/network/bearer/qbearerengine_p.h
@@ -77,7 +77,7 @@ class Q_NETWORK_EXPORT QBearerEngine : public QObject
     friend class QNetworkConfigurationManagerPrivate;
 
 public:
-    explicit QBearerEngine(QObject *parent = 0);
+    explicit QBearerEngine(QObject *parent = nullptr);
     virtual ~QBearerEngine();
 
     virtual bool hasIdentifier(const QString &id) = 0;
@@ -105,7 +105,7 @@ protected:
     QHash<QString, QNetworkConfigurationPrivatePointer> snapConfigurations;
     QHash<QString, QNetworkConfigurationPrivatePointer> userChoiceConfigurations;
 
-    mutable QMutex mutex;
+    mutable QRecursiveMutex mutex;
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/bearer/qbearerplugin_p.h b/src/network/bearer/qbearerplugin_p.h
index 0cdde3c06c..ac787d0541 100644
--- a/src/network/bearer/qbearerplugin_p.h
+++ b/src/network/bearer/qbearerplugin_p.h
@@ -68,7 +68,7 @@ class Q_NETWORK_EXPORT QBearerEnginePlugin : public QObject
 {
     Q_OBJECT
 public:
-    explicit QBearerEnginePlugin(QObject *parent = 0);
+    explicit QBearerEnginePlugin(QObject *parent = nullptr);
     virtual ~QBearerEnginePlugin();
 
     virtual QBearerEngine *create(const QString &key) const = 0;
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index a903ecda5f..b432444669 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -45,6 +45,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qthread.h>
 #include <QtCore/private/qcoreapplication_p.h>
+#include <QtCore/private/qlocking_p.h>
 #include <QtCore/private/qthread_p.h>
 
 #include <QtCore/qbytearray.h>
@@ -58,7 +59,7 @@
 QT_BEGIN_NAMESPACE
 
 QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate()
-    : QObject(), pollTimer(0), mutex(QMutex::Recursive),
+    : QObject(), pollTimer(0),
       loader(QBearerEngineFactoryInterface_iid, QLatin1String("/bearer")),
       forcedPolling(0), firstUpdate(true)
 {
@@ -115,10 +116,10 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(
     QNetworkConfigurationPrivatePointer defaultConfiguration;
 
     for (QBearerEngine *engine : sessionEngines) {
-        QMutexLocker locker(&engine->mutex);
+        const auto locker = qt_scoped_lock(engine->mutex);
 
         for (const auto &ptr : qAsConst(engine->snapConfigurations)) {
-            QMutexLocker configLocker(&ptr->mutex);
+            const auto locker = qt_scoped_lock(ptr->mutex);
 
             if ((ptr->state & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
                 QNetworkConfiguration config;
@@ -211,11 +212,11 @@ QList<QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurati
 
     for (QBearerEngine *engine : sessionEngines) {
 
-        QMutexLocker locker(&engine->mutex);
+        const auto locker = qt_scoped_lock(engine->mutex);
 
         //find all InternetAccessPoints
         for (const auto &ptr : qAsConst(engine->accessPointConfigurations)) {
-            QMutexLocker configLocker(&ptr->mutex);
+            const auto locker = qt_scoped_lock(ptr->mutex);
 
             if ((ptr->state & filter) == filter) {
                 QNetworkConfiguration pt;
@@ -226,7 +227,7 @@ QList<QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurati
 
         //find all service networks
         for (const auto &ptr : qAsConst(engine->snapConfigurations)) {
-            QMutexLocker configLocker(&ptr->mutex);
+            const auto locker = qt_scoped_lock(ptr->mutex);
 
             if ((ptr->state & filter) == filter) {
                 QNetworkConfiguration pt;
@@ -243,10 +244,10 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIden
 {
     QNetworkConfiguration item;
 
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     for (QBearerEngine *engine : sessionEngines) {
-        QMutexLocker locker(&engine->mutex);
+        const auto locker = qt_scoped_lock(engine->mutex);
         if (auto ptr = engine->accessPointConfigurations.value(identifier)) {
             item.d = std::move(ptr);
             break;
@@ -266,7 +267,7 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIden
 
 bool QNetworkConfigurationManagerPrivate::isOnline() const
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     // We need allConfigurations since onlineConfigurations is filled with queued connections
     // and thus is not always (more importantly just after creation) up to date
@@ -275,7 +276,7 @@ bool QNetworkConfigurationManagerPrivate::isOnline() const
 
 QNetworkConfigurationManager::Capabilities QNetworkConfigurationManagerPrivate::capabilities() const
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     QNetworkConfigurationManager::Capabilities capFlags;
 
@@ -287,7 +288,7 @@ QNetworkConfigurationManager::Capabilities QNetworkConfigurationManagerPrivate::
 
 void QNetworkConfigurationManagerPrivate::configurationAdded(QNetworkConfigurationPrivatePointer ptr)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     if (!firstUpdate) {
         QNetworkConfiguration item;
@@ -295,24 +296,24 @@ void QNetworkConfigurationManagerPrivate::configurationAdded(QNetworkConfigurati
         emit configurationAdded(item);
     }
 
-    ptr->mutex.lock();
+    auto ptrLocker = qt_unique_lock(ptr->mutex);
     if (ptr->state == QNetworkConfiguration::Active) {
-        ptr->mutex.unlock();
-        onlineConfigurations.insert(ptr->id);
+        const auto id = ptr->id;
+        ptrLocker.unlock();
+        onlineConfigurations.insert(id);
         if (!firstUpdate && onlineConfigurations.count() == 1)
             emit onlineStateChanged(true);
-    } else {
-        ptr->mutex.unlock();
     }
 }
 
 void QNetworkConfigurationManagerPrivate::configurationRemoved(QNetworkConfigurationPrivatePointer ptr)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
-    ptr->mutex.lock();
-    ptr->isValid = false;
-    ptr->mutex.unlock();
+    {
+        const auto locker = qt_scoped_lock(ptr->mutex);
+        ptr->isValid = false;
+    }
 
     if (!firstUpdate) {
         QNetworkConfiguration item;
@@ -327,7 +328,7 @@ void QNetworkConfigurationManagerPrivate::configurationRemoved(QNetworkConfigura
 
 void QNetworkConfigurationManagerPrivate::configurationChanged(QNetworkConfigurationPrivatePointer ptr)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     if (!firstUpdate) {
         QNetworkConfiguration item;
@@ -337,12 +338,13 @@ void QNetworkConfigurationManagerPrivate::configurationChanged(QNetworkConfigura
 
     bool previous = !onlineConfigurations.isEmpty();
 
-    ptr->mutex.lock();
-    if (ptr->state == QNetworkConfiguration::Active)
-        onlineConfigurations.insert(ptr->id);
-    else
-        onlineConfigurations.remove(ptr->id);
-    ptr->mutex.unlock();
+    {
+        const auto locker = qt_scoped_lock(ptr->mutex);
+        if (ptr->state == QNetworkConfiguration::Active)
+            onlineConfigurations.insert(ptr->id);
+        else
+            onlineConfigurations.remove(ptr->id);
+    }
 
     bool online = !onlineConfigurations.isEmpty();
 
@@ -354,7 +356,8 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations()
 {
     typedef QMultiMap<int, QString> PluginKeyMap;
     typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
-    QMutexLocker locker(&mutex);
+
+    auto locker = qt_unique_lock(mutex);
 
     if (firstUpdate) {
         if (qobject_cast<QBearerEngine *>(sender()))
@@ -432,7 +435,7 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations()
 
 void QNetworkConfigurationManagerPrivate::performAsyncConfigurationUpdate()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     if (sessionEngines.isEmpty()) {
         emit configurationUpdateComplete();
@@ -449,14 +452,14 @@ void QNetworkConfigurationManagerPrivate::performAsyncConfigurationUpdate()
 
 QList<QBearerEngine *> QNetworkConfigurationManagerPrivate::engines() const
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     return sessionEngines;
 }
 
 void QNetworkConfigurationManagerPrivate::startPolling()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     if (!pollTimer) {
         pollTimer = new QTimer(this);
         bool ok;
@@ -482,7 +485,7 @@ void QNetworkConfigurationManagerPrivate::startPolling()
 
 void QNetworkConfigurationManagerPrivate::pollEngines()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     for (QBearerEngine *engine : qAsConst(sessionEngines)) {
         if (engine->requiresPolling() && (forcedPolling || engine->configurationsInUse())) {
@@ -494,7 +497,7 @@ void QNetworkConfigurationManagerPrivate::pollEngines()
 
 void QNetworkConfigurationManagerPrivate::enablePolling()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     ++forcedPolling;
 
@@ -504,7 +507,7 @@ void QNetworkConfigurationManagerPrivate::enablePolling()
 
 void QNetworkConfigurationManagerPrivate::disablePolling()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     --forcedPolling;
 }
diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h
index 380e25c22f..4819c2027c 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_p.h
@@ -117,7 +117,7 @@ private:
     QThread *bearerThread;
 
 private:
-    mutable QMutex mutex;
+    mutable QRecursiveMutex mutex;
 
     QFactoryLoader loader;
     QList<QBearerEngine *> sessionEngines;
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index f5ced0693a..19bc44e02a 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -414,34 +414,7 @@ bool QNetworkConfiguration::isRoamingAvailable() const
 */
 QList<QNetworkConfiguration> QNetworkConfiguration::children() const
 {
-    QList<QNetworkConfiguration> results;
-
-    if (!d)
-        return results;
-
-    QMutexLocker locker(&d->mutex);
-
-    if (d->type != QNetworkConfiguration::ServiceNetwork || !d->isValid)
-        return results;
-
-    for (auto it = d->serviceNetworkMembers.begin(), end = d->serviceNetworkMembers.end(); it != end;) {
-        QNetworkConfigurationPrivatePointer p = it.value();
-        //if we have an invalid member get rid of it -> was deleted earlier on
-        {
-            QMutexLocker childLocker(&p->mutex);
-
-            if (!p->isValid) {
-                it = d->serviceNetworkMembers.erase(it);
-                continue;
-            }
-        }
-        QNetworkConfiguration item;
-        item.d = p;
-        results << item;
-        ++it;
-    }
-
-    return results;
+    return {};
 }
 
 /*!
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index e7b74034fc..048abc2fc8 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -55,13 +55,11 @@ class Q_NETWORK_EXPORT QNetworkConfiguration
 public:
     QNetworkConfiguration();
     QNetworkConfiguration(const QNetworkConfiguration& other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QNetworkConfiguration &operator=(QNetworkConfiguration &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QNetworkConfiguration &operator=(QNetworkConfiguration &&other) noexcept { swap(other); return *this; }
     QNetworkConfiguration &operator=(const QNetworkConfiguration &other);
     ~QNetworkConfiguration();
 
-    void swap(QNetworkConfiguration &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QNetworkConfiguration &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QNetworkConfiguration &other) const;
     inline bool operator!=(const QNetworkConfiguration &other) const
diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h
index 1b1ece39b7..96854fe831 100644
--- a/src/network/bearer/qnetworkconfiguration_p.h
+++ b/src/network/bearer/qnetworkconfiguration_p.h
@@ -65,22 +65,14 @@ class QNetworkConfigurationPrivate : public QSharedData
 {
 public:
     QNetworkConfigurationPrivate() :
-        mutex(QMutex::Recursive),
         type(QNetworkConfiguration::Invalid),
         purpose(QNetworkConfiguration::UnknownPurpose),
         bearerType(QNetworkConfiguration::BearerUnknown),
         isValid(false), roamingSupported(false),
         timeout(DefaultTimeout)
     {}
-    virtual ~QNetworkConfigurationPrivate()
-    {
-        //release pointers to member configurations
-        serviceNetworkMembers.clear();
-    }
 
-    QMap<unsigned int, QNetworkConfigurationPrivatePointer> serviceNetworkMembers;
-
-    mutable QMutex mutex;
+    mutable QRecursiveMutex mutex;
 
     QString name;
     QString id;
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index 661587603c..7c1ff63b68 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -68,7 +68,7 @@ class Q_NETWORK_EXPORT QNetworkSessionPrivate : public QObject
 
 public:
     QNetworkSessionPrivate() : QObject(),
-        state(QNetworkSession::Invalid), isOpen(false), mutex(QMutex::Recursive)
+        state(QNetworkSession::Invalid), isOpen(false)
     {}
     virtual ~QNetworkSessionPrivate()
     {}
@@ -147,7 +147,7 @@ protected:
     QNetworkSession::State state;
     bool isOpen;
 
-    QMutex mutex;
+    QRecursiveMutex mutex;
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/bearer/qsharednetworksession.cpp b/src/network/bearer/qsharednetworksession.cpp
index fc01acb8b4..b3e9892f4b 100644
--- a/src/network/bearer/qsharednetworksession.cpp
+++ b/src/network/bearer/qsharednetworksession.cpp
@@ -57,36 +57,44 @@ inline QSharedNetworkSessionManager* sharedNetworkSessionManager()
     return rv;
 }
 
-static void doDeleteLater(QObject* obj)
+struct DeleteLater {
+    void operator()(QObject* obj) const
+    {
+        obj->deleteLater();
+    }
+};
+
+template <typename Container>
+static void maybe_prune_expired(Container &c)
 {
-    obj->deleteLater();
+    if (c.size() > 16) {
+        for (auto it = c.cbegin(), end = c.cend(); it != end; /*erasing*/) {
+            if (!it->second.lock())
+                it = c.erase(it);
+            else
+                ++it;
+        }
+    }
 }
 
 QSharedPointer<QNetworkSession> QSharedNetworkSessionManager::getSession(const QNetworkConfiguration &config)
 {
-    QSharedNetworkSessionManager *m(sharedNetworkSessionManager());
-    const auto it = m->sessions.constFind(config);
+    QSharedNetworkSessionManager *m = sharedNetworkSessionManager();
+    maybe_prune_expired(m->sessions);
+    auto &entry = m->sessions[config];
     //if already have a session, return it
-    if (it != m->sessions.cend()) {
-        QSharedPointer<QNetworkSession> p = it.value().toStrongRef();
-        if (!p.isNull())
-            return p;
-    }
+    if (auto p = entry.toStrongRef())
+        return p;
     //otherwise make one
-    QSharedPointer<QNetworkSession> session(new QNetworkSession(config), doDeleteLater);
-    m->sessions[config] = session;
+    QSharedPointer<QNetworkSession> session(new QNetworkSession(config), DeleteLater{});
+    entry = session;
     return session;
 }
 
 void QSharedNetworkSessionManager::setSession(const QNetworkConfiguration &config, QSharedPointer<QNetworkSession> session)
 {
-    QSharedNetworkSessionManager *m(sharedNetworkSessionManager());
-    m->sessions[config] = session;
-}
-
-uint qHash(const QNetworkConfiguration& config)
-{
-    return ((uint)config.type()) | (((uint)config.bearerType()) << 8) | (((uint)config.purpose()) << 16);
+    QSharedNetworkSessionManager *m = sharedNetworkSessionManager();
+    m->sessions[config] = std::move(session);
 }
 
 QT_END_NAMESPACE
diff --git a/src/network/bearer/qsharednetworksession_p.h b/src/network/bearer/qsharednetworksession_p.h
index 001b8af02a..f22f9eeacb 100644
--- a/src/network/bearer/qsharednetworksession_p.h
+++ b/src/network/bearer/qsharednetworksession_p.h
@@ -54,16 +54,26 @@
 #include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworksession.h"
 #include "qnetworkconfiguration.h"
-#include <QHash>
 #include <QSharedPointer>
 #include <QWeakPointer>
 #include <QMutex>
 
+#include <unordered_map>
+
 #ifndef QT_NO_BEARERMANAGEMENT
 
 QT_BEGIN_NAMESPACE
 
-uint qHash(const QNetworkConfiguration& config);
+namespace QtPrivate {
+struct NetworkConfigurationHash {
+    using result_type = size_t;
+    using argument_type = QNetworkConfiguration;
+    size_t operator()(const QNetworkConfiguration &config) const noexcept
+    {
+        return std::hash<size_t>{}(size_t(config.type()) | (size_t(config.bearerType()) << 8) | (size_t(config.purpose()) << 16));
+    }
+};
+}
 
 class QSharedNetworkSessionManager
 {
@@ -71,7 +81,7 @@ public:
     static QSharedPointer<QNetworkSession> getSession(const QNetworkConfiguration &config);
     static void setSession(const QNetworkConfiguration &config, QSharedPointer<QNetworkSession> session);
 private:
-    QHash<QNetworkConfiguration, QWeakPointer<QNetworkSession> > sessions;
+    std::unordered_map<QNetworkConfiguration, QWeakPointer<QNetworkSession>, QtPrivate::NetworkConfigurationHash> sessions;
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/configure.json b/src/network/configure.json
index f74c481f38..f501465c91 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -98,6 +98,30 @@
                     "condition": "!config.msvc"
                 }
             ]
+        },
+        "gssapi": {
+            "label": "KRB5 GSSAPI Support",
+            "test": {
+                "head": [
+                    "#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))",
+                    "#  include <TargetConditionals.h>",
+                    "#  if defined(TARGET_OS_MAC) && TARGET_OS_MAC",
+                    "#    include <GSS/GSS.h>",
+                    "#  endif",
+                    "#else",
+                    "#  include <gssapi/gssapi.h>",
+                    "#endif"
+                ],
+                "main": [
+                  "gss_ctx_id_t ctx;",
+                  "gss_context_time(nullptr, ctx, nullptr);"
+                ]
+            },
+            "sources": [
+                { "libs": "-framework GSS", "condition": "config.darwin" },
+                { "type": "pkgConfig", "args": "krb5-gssapi" },
+                "-lgssapi_krb5"
+            ]
         }
     },
 
@@ -199,6 +223,22 @@
                 ]
             },
             "use": "openssl"
+        },
+        "netlistmgr": {
+            "label": "Network List Manager",
+            "type": "compile",
+            "test": {
+                "include": [ "netlistmgr.h", "wrl/client.h" ],
+                "main": [
+                    "using namespace Microsoft::WRL;",
+                    "ComPtr<INetworkListManager> networkListManager;",
+                    "ComPtr<IConnectionPoint> connectionPoint;",
+                    "ComPtr<IConnectionPointContainer> connectionPointContainer;",
+                    "networkListManager.As(&connectionPointContainer);",
+                    "connectionPointContainer->FindConnectionPoint(IID_INetworkConnectionEvents, &connectionPoint);"
+                ],
+                "qmake": "LIBS += -lOle32"
+            }
         }
     },
 
@@ -261,7 +301,7 @@
             "disable": "input.securetransport == 'no' || input.ssl == 'no'",
             "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')",
             "output": [
-                "privateFeature",
+                "publicFeature",
                 { "type": "define", "name": "QT_SECURETRANSPORT" }
             ]
         },
@@ -283,7 +323,7 @@
             "label": "DTLS",
             "purpose": "Provides a DTLS implementation",
             "section": "Networking",
-            "condition": "features.openssl && tests.dtls",
+            "condition": "features.openssl && features.udpsocket && tests.dtls",
             "output": [ "publicFeature" ]
         },
         "ocsp": {
@@ -378,6 +418,27 @@
             "purpose": "Provides API for DNS lookups.",
             "section": "Networking",
             "output": [ "publicFeature" ]
+        },
+        "gssapi": {
+            "label": "GSSAPI",
+            "purpose": "Enable SPNEGO authentication through GSSAPI",
+            "section": "Networking",
+            "condition": "!config.win32 && libs.gssapi",
+            "output": [ "publicFeature", "feature" ]
+        },
+        "sspi": {
+            "label": "SSPI",
+            "purpose": "Enable NTLM/SPNEGO authentication through SSPI",
+            "section": "Networking",
+            "condition": "config.win32 && !config.winrt",
+            "output": [ "publicFeature", "feature" ]
+        },
+        "netlistmgr": {
+            "label": "Network List Manager",
+            "purpose": "Use Network List Manager to keep track of network connectivity",
+            "section": "Networking",
+            "condition": "config.win32 && tests.netlistmgr",
+            "output": [ "privateFeature" ]
         }
     },
 
@@ -437,7 +498,8 @@ For example:
                 "dtls",
                 "ocsp",
                 "sctp",
-                "system-proxies"
+                "system-proxies",
+                "gssapi"
             ]
         }
     ]
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index 7074fcd5eb..110d9f56bf 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -16,7 +16,8 @@ HEADERS += kernel/qtnetworkglobal.h \
            kernel/qnetworkinterface.h \
            kernel/qnetworkinterface_p.h \
            kernel/qnetworkinterface_unix_p.h \
-           kernel/qnetworkproxy.h
+           kernel/qnetworkproxy.h \
+           kernel/qnetconmonitor_p.h
 
 SOURCES += kernel/qauthenticator.cpp \
            kernel/qhostaddress.cpp \
@@ -71,6 +72,19 @@ mac {
     !uikit: LIBS_PRIVATE += -framework CoreServices -framework SystemConfiguration
 }
 
+macos | ios {
+    OBJECTIVE_SOURCES += \
+        kernel/qnetconmonitor_darwin.mm
+
+    LIBS_PRIVATE += -framework SystemConfiguration
+} else:qtConfig(netlistmgr) {
+    SOURCES += kernel/qnetconmonitor_win.cpp
+} else {
+    SOURCES += kernel/qnetconmonitor_stub.cpp
+}
+
+qtConfig(gssapi): QMAKE_USE_PRIVATE += gssapi
+
 uikit:HEADERS += kernel/qnetworkinterface_uikit_p.h
 osx:SOURCES += kernel/qnetworkproxy_mac.cpp
 else:win32:!winrt: SOURCES += kernel/qnetworkproxy_win.cpp
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index 47ce9ab0c6..33a30eb1cd 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -52,22 +52,34 @@
 
 #ifdef Q_OS_WIN
 #include <qmutex.h>
-#include <private/qmutexpool_p.h>
 #include <rpc.h>
-#ifndef Q_OS_WINRT
+#endif
+
+#if QT_CONFIG(sspi) // SSPI
 #define SECURITY_WIN32 1
 #include <security.h>
-#endif
-#endif
+#elif QT_CONFIG(gssapi) // GSSAPI
+#if defined(Q_OS_DARWIN)
+#include <GSS/GSS.h>
+#else
+#include <gssapi/gssapi.h>
+#endif // Q_OS_DARWIN
+#endif // Q_CONFIG(sspi)
 
 QT_BEGIN_NAMESPACE
 
 static QByteArray qNtlmPhase1();
 static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phase2data);
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-static QByteArray qNtlmPhase1_SSPI(QAuthenticatorPrivate *ctx);
-static QByteArray qNtlmPhase3_SSPI(QAuthenticatorPrivate *ctx, const QByteArray& phase2data);
-#endif
+#if QT_CONFIG(sspi) // SSPI
+static QByteArray qSspiStartup(QAuthenticatorPrivate *ctx, QAuthenticatorPrivate::Method method,
+                               const QString& host);
+static QByteArray qSspiContinue(QAuthenticatorPrivate *ctx, QAuthenticatorPrivate::Method method,
+                                const QString& host, const QByteArray& challenge = QByteArray());
+#elif QT_CONFIG(gssapi) // GSSAPI
+static QByteArray qGssapiStartup(QAuthenticatorPrivate *ctx, const QString& host);
+static QByteArray qGssapiContinue(QAuthenticatorPrivate *ctx,
+                                  const QByteArray& challenge = QByteArray());
+#endif // gssapi
 
 /*!
   \class QAuthenticator
@@ -90,6 +102,7 @@ static QByteArray qNtlmPhase3_SSPI(QAuthenticatorPrivate *ctx, const QByteArray&
     \li Basic
     \li NTLM version 2
     \li Digest-MD5
+    \li SPNEGO/Negotiate
   \endlist
 
   \target qauthenticator-options
@@ -133,6 +146,10 @@ static QByteArray qNtlmPhase3_SSPI(QAuthenticatorPrivate *ctx, const QByteArray&
 
   The Digest-MD5 authentication mechanism supports no outgoing options.
 
+  \section2 SPNEGO/Negotiate
+
+  This authentication mechanism currently supports no incoming or outgoing options.
+
   \sa QSslSocket
 */
 
@@ -187,7 +204,7 @@ QAuthenticator &QAuthenticator::operator=(const QAuthenticator &other)
         d->options = other.d->options;
     } else if (d->phase == QAuthenticatorPrivate::Start) {
         delete d;
-        d = 0;
+        d = nullptr;
     }
     return *this;
 }
@@ -339,21 +356,25 @@ bool QAuthenticator::isNull() const
     return !d;
 }
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-class QNtlmWindowsHandles
+#if QT_CONFIG(sspi) // SSPI
+class QSSPIWindowsHandles
 {
 public:
     CredHandle credHandle;
     CtxtHandle ctxHandle;
 };
-#endif
+#elif QT_CONFIG(gssapi) // GSSAPI
+class QGssApiHandles
+{
+public:
+    gss_ctx_id_t gssCtx = nullptr;
+    gss_name_t targetName;
+};
+#endif // gssapi
 
 
 QAuthenticatorPrivate::QAuthenticatorPrivate()
     : method(None)
-    #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-    , ntlmWindowsHandles(0)
-    #endif
     , hasFailed(false)
     , phase(Start)
     , nonceCount(0)
@@ -363,13 +384,7 @@ QAuthenticatorPrivate::QAuthenticatorPrivate()
     nonceCount = 0;
 }
 
-QAuthenticatorPrivate::~QAuthenticatorPrivate()
-{
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-    if (ntlmWindowsHandles)
-        delete ntlmWindowsHandles;
-#endif
-}
+QAuthenticatorPrivate::~QAuthenticatorPrivate() = default;
 
 void QAuthenticatorPrivate::updateCredentials()
 {
@@ -424,6 +439,9 @@ void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByt
         } else if (method < DigestMd5 && str.startsWith("digest")) {
             method = DigestMd5;
             headerVal = current.second.mid(7);
+        } else if (method < Negotiate && str.startsWith("negotiate")) {
+            method = Negotiate;
+            headerVal = current.second.mid(10);
         }
     }
 
@@ -439,6 +457,7 @@ void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByt
             phase = Done;
         break;
     case Ntlm:
+    case Negotiate:
         // work is done in calculateResponse()
         break;
     case DigestMd5: {
@@ -456,33 +475,36 @@ void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByt
     }
 }
 
-QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMethod, const QByteArray &path)
+QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMethod, const QByteArray &path, const QString& host)
 {
+#if !QT_CONFIG(sspi) && !QT_CONFIG(gssapi)
+    Q_UNUSED(host);
+#endif
     QByteArray response;
-    const char *methodString = 0;
+    const char* methodString = nullptr;
     switch(method) {
     case QAuthenticatorPrivate::None:
         methodString = "";
         phase = Done;
         break;
     case QAuthenticatorPrivate::Basic:
-        methodString = "Basic ";
+        methodString = "Basic";
         response = user.toLatin1() + ':' + password.toLatin1();
         response = response.toBase64();
         phase = Done;
         break;
     case QAuthenticatorPrivate::DigestMd5:
-        methodString = "Digest ";
+        methodString = "Digest";
         response = digestMd5Response(challenge, requestMethod, path);
         phase = Done;
         break;
     case QAuthenticatorPrivate::Ntlm:
-        methodString = "NTLM ";
+        methodString = "NTLM";
         if (challenge.isEmpty()) {
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+#if QT_CONFIG(sspi) // SSPI
             QByteArray phase1Token;
             if (user.isEmpty()) // Only pull from system if no user was specified in authenticator
-                phase1Token = qNtlmPhase1_SSPI(this);
+                phase1Token = qSspiStartup(this, method, host);
             if (!phase1Token.isEmpty()) {
                 response = phase1Token.toBase64();
                 phase = Phase2;
@@ -496,10 +518,10 @@ QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMet
                     phase = Phase2;
             }
         } else {
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+#if QT_CONFIG(sspi) // SSPI
             QByteArray phase3Token;
-            if (ntlmWindowsHandles)
-                phase3Token = qNtlmPhase3_SSPI(this, QByteArray::fromBase64(challenge));
+            if (sspiWindowsHandles)
+                phase3Token = qSspiContinue(this, method, host, QByteArray::fromBase64(challenge));
             if (!phase3Token.isEmpty()) {
                 response = phase3Token.toBase64();
                 phase = Done;
@@ -512,8 +534,39 @@ QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMet
         }
 
         break;
+    case QAuthenticatorPrivate::Negotiate:
+        methodString = "Negotiate";
+        if (challenge.isEmpty()) {
+            QByteArray phase1Token;
+#if QT_CONFIG(sspi) // SSPI
+            phase1Token = qSspiStartup(this, method, host);
+#elif QT_CONFIG(gssapi) // GSSAPI
+            phase1Token = qGssapiStartup(this, host);
+#endif
+
+            if (!phase1Token.isEmpty()) {
+                response = phase1Token.toBase64();
+                phase = Phase2;
+            } else {
+                phase = Done;
+            }
+        } else {
+            QByteArray phase3Token;
+#if QT_CONFIG(sspi) // SSPI
+            phase3Token = qSspiContinue(this, method, host, QByteArray::fromBase64(challenge));
+#elif QT_CONFIG(gssapi) // GSSAPI
+            phase3Token = qGssapiContinue(this, QByteArray::fromBase64(challenge));
+#endif
+            if (!phase3Token.isEmpty()) {
+                response = phase3Token.toBase64();
+                phase = Done;
+            }
+        }
+
+        break;
     }
-    return QByteArray(methodString) + response;
+
+    return QByteArray::fromRawData(methodString, qstrlen(methodString)) + ' ' + response;
 }
 
 
@@ -699,9 +752,10 @@ QByteArray QAuthenticatorPrivate::digestMd5Response(const QByteArray &challenge,
     return credentials;
 }
 
-// ---------------------------- Digest Md5 code ----------------------------------------
+// ---------------------------- End of Digest Md5 code ---------------------------------
 
 
+// ---------------------------- NTLM code ----------------------------------------------
 
 /*
  * NTLM message flags.
@@ -1419,156 +1473,237 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
     return rc;
 }
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+// ---------------------------- End of NTLM code ---------------------------------------
+
+#if QT_CONFIG(sspi) // SSPI
+// ---------------------------- SSPI code ----------------------------------------------
 // See http://davenport.sourceforge.net/ntlm.html
 // and libcurl http_ntlm.c
 
 // Handle of secur32.dll
-static HMODULE securityDLLHandle = NULL;
+static HMODULE securityDLLHandle = nullptr;
 // Pointer to SSPI dispatch table
-static PSecurityFunctionTable pSecurityFunctionTable = NULL;
-
+static PSecurityFunctionTable pSecurityFunctionTable = nullptr;
 
-static bool q_NTLM_SSPI_library_load()
+static bool q_SSPI_library_load()
 {
     static QBasicMutex mutex;
     QMutexLocker l(&mutex);
 
     // Initialize security interface
-    if (pSecurityFunctionTable == NULL) {
+    if (pSecurityFunctionTable == nullptr) {
         securityDLLHandle = LoadLibrary(L"secur32.dll");
-        if (securityDLLHandle != NULL) {
+        if (securityDLLHandle != nullptr) {
             INIT_SECURITY_INTERFACE pInitSecurityInterface =
                 reinterpret_cast<INIT_SECURITY_INTERFACE>(
                     reinterpret_cast<QFunctionPointer>(GetProcAddress(securityDLLHandle, "InitSecurityInterfaceW")));
-            if (pInitSecurityInterface != NULL)
+            if (pInitSecurityInterface != nullptr)
                 pSecurityFunctionTable = pInitSecurityInterface();
         }
     }
 
-    if (pSecurityFunctionTable == NULL)
+    if (pSecurityFunctionTable == nullptr)
         return false;
 
     return true;
 }
 
-// Phase 1:
-static QByteArray qNtlmPhase1_SSPI(QAuthenticatorPrivate *ctx)
+static QByteArray qSspiStartup(QAuthenticatorPrivate *ctx, QAuthenticatorPrivate::Method method,
+                               const QString& host)
 {
-    QByteArray result;
+    if (!q_SSPI_library_load())
+        return QByteArray();
+
+    TimeStamp expiry; // For Windows 9x compatibility of SSPI calls
 
-    if (!q_NTLM_SSPI_library_load())
-        return result;
+    if (!ctx->sspiWindowsHandles)
+        ctx->sspiWindowsHandles.reset(new QSSPIWindowsHandles);
+    memset(&ctx->sspiWindowsHandles->credHandle, 0, sizeof(CredHandle));
 
-    // 1. The client obtains a representation of the credential set
-    // for the user via the SSPI AcquireCredentialsHandle function.
-    if (!ctx->ntlmWindowsHandles)
-        ctx->ntlmWindowsHandles = new QNtlmWindowsHandles;
-    memset(&ctx->ntlmWindowsHandles->credHandle, 0, sizeof(CredHandle));
-    TimeStamp tsDummy;
+    // Acquire our credentials handle
     SECURITY_STATUS secStatus = pSecurityFunctionTable->AcquireCredentialsHandle(
-        NULL, (SEC_WCHAR*)L"NTLM", SECPKG_CRED_OUTBOUND, NULL, NULL,
-        NULL, NULL, &ctx->ntlmWindowsHandles->credHandle, &tsDummy);
+                nullptr,
+                (SEC_WCHAR*)(method == QAuthenticatorPrivate::Negotiate ? L"Negotiate" : L"NTLM"),
+                SECPKG_CRED_OUTBOUND, nullptr, nullptr, nullptr, nullptr,
+                &ctx->sspiWindowsHandles->credHandle, &expiry
+    );
     if (secStatus != SEC_E_OK) {
-        delete ctx->ntlmWindowsHandles;
-        ctx->ntlmWindowsHandles = 0;
-        return result;
+        ctx->sspiWindowsHandles.reset(nullptr);
+        return QByteArray();
     }
 
-    // 2. The client calls the SSPI InitializeSecurityContext function
-    // to obtain an authentication request token (in our case, a Type 1 message).
-    // The client sends this token to the server.
-    SecBufferDesc desc;
-    SecBuffer buf;
-    desc.ulVersion = SECBUFFER_VERSION;
-    desc.cBuffers  = 1;
-    desc.pBuffers  = &buf;
-    buf.cbBuffer   = 0;
-    buf.BufferType = SECBUFFER_TOKEN;
-    buf.pvBuffer   = NULL;
-    ULONG attrs;
-
-    secStatus = pSecurityFunctionTable->InitializeSecurityContext(&ctx->ntlmWindowsHandles->credHandle, NULL,
-        const_cast<SEC_WCHAR*>(L"") /* host */,
-        ISC_REQ_ALLOCATE_MEMORY,
-        0, SECURITY_NETWORK_DREP,
-        NULL, 0,
-        &ctx->ntlmWindowsHandles->ctxHandle, &desc,
-        &attrs, &tsDummy);
-    if (secStatus == SEC_I_COMPLETE_AND_CONTINUE ||
-        secStatus == SEC_I_CONTINUE_NEEDED) {
-            pSecurityFunctionTable->CompleteAuthToken(&ctx->ntlmWindowsHandles->ctxHandle, &desc);
-    } else if (secStatus != SEC_E_OK) {
-        if ((const char*)buf.pvBuffer)
-            pSecurityFunctionTable->FreeContextBuffer(buf.pvBuffer);
-        pSecurityFunctionTable->FreeCredentialsHandle(&ctx->ntlmWindowsHandles->credHandle);
-        delete ctx->ntlmWindowsHandles;
-        ctx->ntlmWindowsHandles = 0;
-        return result;
+    return qSspiContinue(ctx, method, host);
+}
+
+static QByteArray qSspiContinue(QAuthenticatorPrivate *ctx, QAuthenticatorPrivate::Method method,
+                                  const QString &host, const QByteArray &challenge)
+{
+    QByteArray result;
+    SecBuffer challengeBuf;
+    SecBuffer responseBuf;
+    SecBufferDesc challengeDesc;
+    SecBufferDesc responseDesc;
+    unsigned long attrs;
+    TimeStamp expiry; // For Windows 9x compatibility of SSPI calls
+
+    if (!challenge.isEmpty())
+    {
+        // Setup the challenge "input" security buffer
+        challengeDesc.ulVersion = SECBUFFER_VERSION;
+        challengeDesc.cBuffers  = 1;
+        challengeDesc.pBuffers  = &challengeBuf;
+        challengeBuf.BufferType = SECBUFFER_TOKEN;
+        challengeBuf.pvBuffer   = (PVOID)(challenge.data());
+        challengeBuf.cbBuffer   = challenge.length();
     }
 
-    result = QByteArray((const char*)buf.pvBuffer, buf.cbBuffer);
-    pSecurityFunctionTable->FreeContextBuffer(buf.pvBuffer);
+    // Setup the response "output" security buffer
+    responseDesc.ulVersion = SECBUFFER_VERSION;
+    responseDesc.cBuffers  = 1;
+    responseDesc.pBuffers  = &responseBuf;
+    responseBuf.BufferType = SECBUFFER_TOKEN;
+    responseBuf.pvBuffer   = nullptr;
+    responseBuf.cbBuffer   = 0;
+
+    // Calculate target (SPN for Negotiate, empty for NTLM)
+    std::wstring targetNameW = (method == QAuthenticatorPrivate::Negotiate
+                                ? QLatin1String("HTTP/") + host : QString()).toStdWString();
+
+    // Generate our challenge-response message
+    SECURITY_STATUS secStatus = pSecurityFunctionTable->InitializeSecurityContext(
+                &ctx->sspiWindowsHandles->credHandle,
+                !challenge.isEmpty() ? &ctx->sspiWindowsHandles->ctxHandle : nullptr,
+                const_cast<wchar_t*>(targetNameW.data()),
+                ISC_REQ_ALLOCATE_MEMORY,
+                0, SECURITY_NATIVE_DREP,
+                !challenge.isEmpty() ? &challengeDesc : nullptr,
+                0, &ctx->sspiWindowsHandles->ctxHandle,
+                &responseDesc, &attrs,
+                &expiry
+    );
+
+    if (secStatus == SEC_I_COMPLETE_NEEDED || secStatus == SEC_I_COMPLETE_AND_CONTINUE) {
+        secStatus = pSecurityFunctionTable->CompleteAuthToken(&ctx->sspiWindowsHandles->ctxHandle,
+                                                              &responseDesc);
+    }
+
+    if (secStatus != SEC_I_COMPLETE_AND_CONTINUE && secStatus != SEC_I_CONTINUE_NEEDED) {
+        pSecurityFunctionTable->FreeCredentialsHandle(&ctx->sspiWindowsHandles->credHandle);
+        pSecurityFunctionTable->DeleteSecurityContext(&ctx->sspiWindowsHandles->ctxHandle);
+        ctx->sspiWindowsHandles.reset(nullptr);
+    }
+
+    result = QByteArray((const char*)responseBuf.pvBuffer, responseBuf.cbBuffer);
+    pSecurityFunctionTable->FreeContextBuffer(responseBuf.pvBuffer);
+
     return result;
 }
 
-// Phase 2:
-// 3. The server receives the token from the client, and uses it as input to the
-// AcceptSecurityContext SSPI function. This creates a local security context on
-// the server to represent the client, and yields an authentication response token
-// (the Type 2 message), which is sent to the client.
+// ---------------------------- End of SSPI code ---------------------------------------
+
+#elif QT_CONFIG(gssapi) // GSSAPI
+
+// ---------------------------- GSSAPI code ----------------------------------------------
+// See postgres src/interfaces/libpq/fe-auth.c
+
+// Fetch all errors of a specific type
+static void q_GSSAPI_error_int(const char *message, OM_uint32 stat, int type)
+{
+    OM_uint32 minStat, msgCtx = 0;
+    gss_buffer_desc msg;
+
+    do {
+        gss_display_status(&minStat, stat, type, GSS_C_NO_OID, &msgCtx, &msg);
+        qDebug() << message << ": " << reinterpret_cast<const char*>(msg.value);
+        gss_release_buffer(&minStat, &msg);
+    } while (msgCtx);
+}
 
-// Phase 3:
-static QByteArray qNtlmPhase3_SSPI(QAuthenticatorPrivate *ctx, const QByteArray& phase2data)
+// GSSAPI errors contain two parts; extract both
+static void q_GSSAPI_error(const char *message, OM_uint32 majStat, OM_uint32 minStat)
 {
-    // 4. The client receives the response token from the server and calls
-    // InitializeSecurityContext again, passing the server's token as input.
-    // This provides us with another authentication request token (the Type 3 message).
-    // The return value indicates that the security context was successfully initialized;
-    // the token is sent to the server.
+    // Fetch major error codes
+    q_GSSAPI_error_int(message, majStat, GSS_C_GSS_CODE);
 
+    // Add the minor codes as well
+    q_GSSAPI_error_int(message, minStat, GSS_C_MECH_CODE);
+}
+
+// Send initial GSS authentication token
+static QByteArray qGssapiStartup(QAuthenticatorPrivate *ctx, const QString &host)
+{
+    OM_uint32 majStat, minStat;
+
+    if (!ctx->gssApiHandles)
+        ctx->gssApiHandles.reset(new QGssApiHandles);
+
+    // Convert target name to internal form
+    QByteArray serviceName = QStringLiteral("HTTPS@%1").arg(host).toLocal8Bit();
+    gss_buffer_desc nameDesc = {static_cast<std::size_t>(serviceName.size()), serviceName.data()};
+
+    majStat = gss_import_name(&minStat, &nameDesc,
+                              GSS_C_NT_HOSTBASED_SERVICE, &ctx->gssApiHandles->targetName);
+
+    if (majStat != GSS_S_COMPLETE) {
+        q_GSSAPI_error("gss_import_name error", majStat, minStat);
+        ctx->gssApiHandles.reset(nullptr);
+        return QByteArray();
+    }
+
+    // Call qGssapiContinue with GSS_C_NO_CONTEXT to get initial packet
+    ctx->gssApiHandles->gssCtx = GSS_C_NO_CONTEXT;
+    return qGssapiContinue(ctx);
+}
+
+// Continue GSS authentication with next token as needed
+static QByteArray qGssapiContinue(QAuthenticatorPrivate *ctx, const QByteArray& challenge)
+{
+    OM_uint32 majStat, minStat, ignored;
     QByteArray result;
+    gss_buffer_desc inBuf = {0, nullptr}; // GSS input token
+    gss_buffer_desc outBuf; // GSS output token
 
-    if (pSecurityFunctionTable == NULL)
-        return result;
-
-    SecBuffer type_2, type_3;
-    SecBufferDesc type_2_desc, type_3_desc;
-    ULONG attrs;
-    TimeStamp tsDummy; // For Windows 9x compatibility of SPPI calls
-
-    type_2_desc.ulVersion  = type_3_desc.ulVersion  = SECBUFFER_VERSION;
-    type_2_desc.cBuffers   = type_3_desc.cBuffers   = 1;
-    type_2_desc.pBuffers   = &type_2;
-    type_3_desc.pBuffers   = &type_3;
-
-    type_2.BufferType = SECBUFFER_TOKEN;
-    type_2.pvBuffer   = (PVOID)phase2data.data();
-    type_2.cbBuffer   = phase2data.length();
-    type_3.BufferType = SECBUFFER_TOKEN;
-    type_3.pvBuffer   = 0;
-    type_3.cbBuffer   = 0;
-
-    SECURITY_STATUS secStatus = pSecurityFunctionTable->InitializeSecurityContext(&ctx->ntlmWindowsHandles->credHandle,
-        &ctx->ntlmWindowsHandles->ctxHandle,
-        const_cast<SEC_WCHAR*>(L"") /* host */,
-        ISC_REQ_ALLOCATE_MEMORY,
-        0, SECURITY_NETWORK_DREP, &type_2_desc,
-        0, &ctx->ntlmWindowsHandles->ctxHandle, &type_3_desc,
-        &attrs, &tsDummy);
-
-    if (secStatus == SEC_E_OK && ((const char*)type_3.pvBuffer)) {
-        result = QByteArray((const char*)type_3.pvBuffer, type_3.cbBuffer);
-        pSecurityFunctionTable->FreeContextBuffer(type_3.pvBuffer);
+    if (!challenge.isEmpty()) {
+        inBuf.value = const_cast<char*>(challenge.data());
+        inBuf.length = challenge.length();
     }
 
-    pSecurityFunctionTable->FreeCredentialsHandle(&ctx->ntlmWindowsHandles->credHandle);
-    pSecurityFunctionTable->DeleteSecurityContext(&ctx->ntlmWindowsHandles->ctxHandle);
-    delete ctx->ntlmWindowsHandles;
-    ctx->ntlmWindowsHandles = 0;
+    majStat = gss_init_sec_context(&minStat,
+                                   GSS_C_NO_CREDENTIAL,
+                                   &ctx->gssApiHandles->gssCtx,
+                                   ctx->gssApiHandles->targetName,
+                                   GSS_C_NO_OID,
+                                   GSS_C_MUTUAL_FLAG,
+                                   0,
+                                   GSS_C_NO_CHANNEL_BINDINGS,
+                                   challenge.isEmpty() ? GSS_C_NO_BUFFER : &inBuf,
+                                   nullptr,
+                                   &outBuf,
+                                   nullptr,
+                                   nullptr);
+
+    if (outBuf.length != 0)
+        result = QByteArray(reinterpret_cast<const char*>(outBuf.value), outBuf.length);
+    gss_release_buffer(&ignored, &outBuf);
+
+    if (majStat != GSS_S_COMPLETE && majStat != GSS_S_CONTINUE_NEEDED) {
+        q_GSSAPI_error("gss_init_sec_context error", majStat, minStat);
+        gss_release_name(&ignored, &ctx->gssApiHandles->targetName);
+        if (ctx->gssApiHandles->gssCtx)
+            gss_delete_sec_context(&ignored, &ctx->gssApiHandles->gssCtx, GSS_C_NO_BUFFER);
+        ctx->gssApiHandles.reset(nullptr);
+    }
+
+    if (majStat == GSS_S_COMPLETE) {
+        gss_release_name(&ignored, &ctx->gssApiHandles->targetName);
+        ctx->gssApiHandles.reset(nullptr);
+    }
 
     return result;
 }
-#endif // Q_OS_WIN && !Q_OS_WINRT
+
+// ---------------------------- End of GSSAPI code ----------------------------------------------
+
+#endif // gssapi
 
 QT_END_NAMESPACE
diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h
index 265cb7afe2..e201d22650 100644
--- a/src/network/kernel/qauthenticator_p.h
+++ b/src/network/kernel/qauthenticator_p.h
@@ -54,6 +54,7 @@
 #include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <qhash.h>
 #include <qbytearray.h>
+#include <qscopedpointer.h>
 #include <qstring.h>
 #include <qauthenticator.h>
 #include <qvariant.h>
@@ -61,14 +62,16 @@
 QT_BEGIN_NAMESPACE
 
 class QHttpResponseHeader;
-#ifdef Q_OS_WIN
-class QNtlmWindowsHandles;
+#if QT_CONFIG(sspi) // SSPI
+class QSSPIWindowsHandles;
+#elif QT_CONFIG(gssapi) // GSSAPI
+class QGssApiHandles;
 #endif
 
 class Q_AUTOTEST_EXPORT QAuthenticatorPrivate
 {
 public:
-    enum Method { None, Basic, Ntlm, DigestMd5 };
+    enum Method { None, Basic, Ntlm, DigestMd5, Negotiate };
     QAuthenticatorPrivate();
     ~QAuthenticatorPrivate();
 
@@ -79,8 +82,10 @@ public:
     Method method;
     QString realm;
     QByteArray challenge;
-#ifdef Q_OS_WIN
-    QNtlmWindowsHandles *ntlmWindowsHandles;
+#if QT_CONFIG(sspi) // SSPI
+    QScopedPointer<QSSPIWindowsHandles> sspiWindowsHandles;
+#elif QT_CONFIG(gssapi) // GSSAPI
+    QScopedPointer<QGssApiHandles> gssApiHandles;
 #endif
     bool hasFailed; //credentials have been tried but rejected by server.
 
@@ -100,7 +105,7 @@ public:
     QString workstation;
     QString userDomain;
 
-    QByteArray calculateResponse(const QByteArray &method, const QByteArray &path);
+    QByteArray calculateResponse(const QByteArray &method, const QByteArray &path, const QString& host);
 
     inline static QAuthenticatorPrivate *getPrivate(QAuthenticator &auth) { return auth.d; }
     inline static const QAuthenticatorPrivate *getPrivate(const QAuthenticator &auth) { return auth.d; }
diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h
index eebd0abe66..110a74da44 100644
--- a/src/network/kernel/qdnslookup.h
+++ b/src/network/kernel/qdnslookup.h
@@ -64,13 +64,11 @@ class Q_NETWORK_EXPORT QDnsDomainNameRecord
 public:
     QDnsDomainNameRecord();
     QDnsDomainNameRecord(const QDnsDomainNameRecord &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDnsDomainNameRecord &operator=(QDnsDomainNameRecord &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDnsDomainNameRecord &operator=(QDnsDomainNameRecord &&other) noexcept { swap(other); return *this; }
     QDnsDomainNameRecord &operator=(const QDnsDomainNameRecord &other);
     ~QDnsDomainNameRecord();
 
-    void swap(QDnsDomainNameRecord &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QDnsDomainNameRecord &other) noexcept { qSwap(d, other.d); }
 
     QString name() const;
     quint32 timeToLive() const;
@@ -88,13 +86,11 @@ class Q_NETWORK_EXPORT QDnsHostAddressRecord
 public:
     QDnsHostAddressRecord();
     QDnsHostAddressRecord(const QDnsHostAddressRecord &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDnsHostAddressRecord &operator=(QDnsHostAddressRecord &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDnsHostAddressRecord &operator=(QDnsHostAddressRecord &&other) noexcept { swap(other); return *this; }
     QDnsHostAddressRecord &operator=(const QDnsHostAddressRecord &other);
     ~QDnsHostAddressRecord();
 
-    void swap(QDnsHostAddressRecord &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QDnsHostAddressRecord &other) noexcept { qSwap(d, other.d); }
 
     QString name() const;
     quint32 timeToLive() const;
@@ -112,13 +108,11 @@ class Q_NETWORK_EXPORT QDnsMailExchangeRecord
 public:
     QDnsMailExchangeRecord();
     QDnsMailExchangeRecord(const QDnsMailExchangeRecord &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDnsMailExchangeRecord &operator=(QDnsMailExchangeRecord &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDnsMailExchangeRecord &operator=(QDnsMailExchangeRecord &&other) noexcept { swap(other); return *this; }
     QDnsMailExchangeRecord &operator=(const QDnsMailExchangeRecord &other);
     ~QDnsMailExchangeRecord();
 
-    void swap(QDnsMailExchangeRecord &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QDnsMailExchangeRecord &other) noexcept { qSwap(d, other.d); }
 
     QString exchange() const;
     QString name() const;
@@ -137,13 +131,11 @@ class Q_NETWORK_EXPORT QDnsServiceRecord
 public:
     QDnsServiceRecord();
     QDnsServiceRecord(const QDnsServiceRecord &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDnsServiceRecord &operator=(QDnsServiceRecord &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDnsServiceRecord &operator=(QDnsServiceRecord &&other) noexcept { swap(other); return *this; }
     QDnsServiceRecord &operator=(const QDnsServiceRecord &other);
     ~QDnsServiceRecord();
 
-    void swap(QDnsServiceRecord &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QDnsServiceRecord &other) noexcept { qSwap(d, other.d); }
 
     QString name() const;
     quint16 port() const;
@@ -164,13 +156,11 @@ class Q_NETWORK_EXPORT QDnsTextRecord
 public:
     QDnsTextRecord();
     QDnsTextRecord(const QDnsTextRecord &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QDnsTextRecord &operator=(QDnsTextRecord &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QDnsTextRecord &operator=(QDnsTextRecord &&other) noexcept { swap(other); return *this; }
     QDnsTextRecord &operator=(const QDnsTextRecord &other);
     ~QDnsTextRecord();
 
-    void swap(QDnsTextRecord &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QDnsTextRecord &other) noexcept { qSwap(d, other.d); }
 
     QString name() const;
     quint32 timeToLive() const;
diff --git a/src/network/kernel/qdnslookup_p.h b/src/network/kernel/qdnslookup_p.h
index 2dc98e527a..8c3c2ed3e1 100644
--- a/src/network/kernel/qdnslookup_p.h
+++ b/src/network/kernel/qdnslookup_p.h
@@ -95,7 +95,7 @@ public:
     QDnsLookupPrivate()
         : isFinished(false)
         , type(QDnsLookup::A)
-        , runnable(0)
+        , runnable(nullptr)
     { }
 
     void _q_lookupFinished(const QDnsLookupReply &reply);
diff --git a/src/network/kernel/qdnslookup_win.cpp b/src/network/kernel/qdnslookup_win.cpp
index cfdb9ca633..262893179c 100644
--- a/src/network/kernel/qdnslookup_win.cpp
+++ b/src/network/kernel/qdnslookup_win.cpp
@@ -41,7 +41,6 @@
 #include "qdnslookup_p.h"
 
 #include <qurl.h>
-#include <private/qmutexpool_p.h>
 #include <private/qsystemerror_p.h>
 
 #include <qt_windows.h>
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 5d0ef150f3..b54fb349fb 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -1333,7 +1333,7 @@ QDebug operator<<(QDebug d, const QHostAddress &address)
     \relates QHostAddress
     Returns a hash of the host address \a key, using \a seed to seed the calculation.
 */
-uint qHash(const QHostAddress &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QHostAddress &key, uint seed) noexcept
 {
     return qHashBits(key.d->a6.c, 16, seed);
 }
diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h
index 00555f3d8e..799247695e 100644
--- a/src/network/kernel/qhostaddress.h
+++ b/src/network/kernel/qhostaddress.h
@@ -66,7 +66,7 @@ typedef QIPv6Address Q_IPV6ADDR;
 
 class QHostAddress;
 // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4)
-Q_NETWORK_EXPORT uint qHash(const QHostAddress &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_NETWORK_EXPORT uint qHash(const QHostAddress &key, uint seed = 0) noexcept;
 
 class Q_NETWORK_EXPORT QHostAddress
 {
@@ -102,11 +102,8 @@ public:
     QHostAddress(SpecialAddress address);
     ~QHostAddress();
 
-#ifdef Q_COMPILER_RVALUE_REFS
-    QHostAddress &operator=(QHostAddress &&other) Q_DECL_NOTHROW
+    QHostAddress &operator=(QHostAddress &&other) noexcept
     { swap(other); return *this; }
-#endif
-
     QHostAddress &operator=(const QHostAddress &other);
 #if QT_DEPRECATED_SINCE(5, 8)
     QT_DEPRECATED_X("use = QHostAddress(string) instead")
@@ -114,7 +111,7 @@ public:
 #endif
     QHostAddress &operator=(SpecialAddress address);
 
-    void swap(QHostAddress &other) Q_DECL_NOTHROW { d.swap(other.d); }
+    void swap(QHostAddress &other) noexcept { d.swap(other.d); }
 
     void setAddress(quint32 ip4Addr);
     void setAddress(quint8 *ip6Addr);   // ### Qt 6: remove me
@@ -157,7 +154,7 @@ public:
 
     static QPair<QHostAddress, int> parseSubnet(const QString &subnet);
 
-    friend Q_NETWORK_EXPORT uint qHash(const QHostAddress &key, uint seed) Q_DECL_NOTHROW;
+    friend Q_NETWORK_EXPORT uint qHash(const QHostAddress &key, uint seed) noexcept;
 protected:
     friend class QHostAddressPrivate;
     QExplicitlySharedDataPointer<QHostAddressPrivate> d;
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index f4348b690e..f9335c3bb9 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -37,13 +37,17 @@
 **
 ****************************************************************************/
 
+//#define QHOSTINFO_DEBUG
+
 #include "qhostinfo.h"
 #include "qhostinfo_p.h"
+#include <qplatformdefs.h>
 
 #include "QtCore/qscopedpointer.h"
 #include <qabstracteventdispatcher.h>
 #include <qcoreapplication.h>
 #include <qmetaobject.h>
+#include <qscopeguard.h>
 #include <qstringlist.h>
 #include <qthread.h>
 #include <qurl.h>
@@ -53,6 +57,15 @@
 
 #ifdef Q_OS_UNIX
 #  include <unistd.h>
+#  include <netdb.h>
+#  include <netinet/in.h>
+#  if defined(AI_ADDRCONFIG)
+#    define Q_ADDRCONFIG          AI_ADDRCONFIG
+#  endif
+#elif defined Q_OS_WIN
+#  include <ws2tcpip.h>
+
+#  define QT_SOCKLEN_T int
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -64,8 +77,8 @@ Q_GLOBAL_STATIC(QHostInfoLookupManager, theHostInfoLookupManager)
 namespace {
 struct ToBeLookedUpEquals {
     typedef bool result_type;
-    explicit ToBeLookedUpEquals(const QString &toBeLookedUp) Q_DECL_NOTHROW : m_toBeLookedUp(toBeLookedUp) {}
-    result_type operator()(QHostInfoRunnable* lookup) const Q_DECL_NOTHROW
+    explicit ToBeLookedUpEquals(const QString &toBeLookedUp) noexcept : m_toBeLookedUp(toBeLookedUp) {}
+    result_type operator()(QHostInfoRunnable* lookup) const noexcept
     {
         return m_toBeLookedUp == lookup->toBeLookedUp;
     }
@@ -73,13 +86,6 @@ private:
     QString m_toBeLookedUp;
 };
 
-// ### C++11: remove once we can use std::any_of()
-template<class InputIt, class UnaryPredicate>
-bool any_of(InputIt first, InputIt last, UnaryPredicate p)
-{
-    return std::find_if(first, last, p) != last;
-}
-
 template <typename InputIt, typename OutputIt1, typename OutputIt2, typename UnaryPredicate>
 std::pair<OutputIt1, OutputIt2> separate_if(InputIt first, InputIt last, OutputIt1 dest1, OutputIt2 dest2, UnaryPredicate p)
 {
@@ -96,16 +102,6 @@ std::pair<OutputIt1, OutputIt2> separate_if(InputIt first, InputIt last, OutputI
     return std::make_pair(dest1, dest2);
 }
 
-int get_signal_index()
-{
-    static auto senderMetaObject = &QHostInfoResult::staticMetaObject;
-    static auto signal = &QHostInfoResult::resultsReady;
-    int signal_index = -1;
-    void *args[] = { &signal_index, &signal };
-    senderMetaObject->static_metacall(QMetaObject::IndexOfMethod, 0, args);
-    return signal_index + QMetaObjectPrivate::signalOffset(senderMetaObject);
-}
-
 }
 
 /*
@@ -123,38 +119,59 @@ void QHostInfoResult::postResultsReady(const QHostInfo &info)
 {
     // queued connection will take care of dispatching to right thread
     if (!slotObj) {
-        emitResultsReady(info);
+        emit resultsReady(info);
         return;
     }
-    static const int signal_index = get_signal_index();
-
     // we used to have a context object, but it's already destroyed
     if (withContextObject && !receiver)
         return;
 
-    /* QHostInfoResult c'tor moves the result object to the thread of receiver.
-       If we don't have a receiver, then the result object will not live in a
-       thread that runs an event loop - so move it to this' thread, which is the thread
-       that initiated the lookup, and required to have a running event loop. */
-    auto result = new QHostInfoResult(receiver, slotObj);
-    if (!receiver)
-        result->moveToThread(thread());
+    static const int signal_index = []() -> int {
+        auto senderMetaObject = &QHostInfoResult::staticMetaObject;
+        auto signal = &QHostInfoResult::resultsReady;
+        int signal_index = -1;
+        void *args[] = { &signal_index, &signal };
+        senderMetaObject->static_metacall(QMetaObject::IndexOfMethod, 0, args);
+        return signal_index + QMetaObjectPrivate::signalOffset(senderMetaObject);
+    }();
+
+    // a long-living version of this
+    auto result = new QHostInfoResult(this);
     Q_CHECK_PTR(result);
+
     const int nargs = 2;
-    auto types = reinterpret_cast<int *>(malloc(nargs * sizeof(int)));
-    Q_CHECK_PTR(types);
+    auto metaCallEvent = new QMetaCallEvent(slotObj, nullptr, signal_index, nargs);
+    Q_CHECK_PTR(metaCallEvent);
+    void **args = metaCallEvent->args();
+    int *types = metaCallEvent->types();
     types[0] = QMetaType::type("void");
     types[1] = QMetaType::type("QHostInfo");
-    auto args = reinterpret_cast<void **>(malloc(nargs * sizeof(void *)));
-    Q_CHECK_PTR(args);
-    args[0] = 0;
+    args[0] = nullptr;
     args[1] = QMetaType::create(types[1], &info);
     Q_CHECK_PTR(args[1]);
-    auto metaCallEvent = new QMetaCallEvent(slotObj, nullptr, signal_index, nargs, types, args);
-    Q_CHECK_PTR(metaCallEvent);
     qApp->postEvent(result, metaCallEvent);
 }
 
+/*
+    Receives the event posted by postResultsReady, and calls the functor.
+*/
+bool QHostInfoResult::event(QEvent *event)
+{
+    if (event->type() == QEvent::MetaCall) {
+        Q_ASSERT(slotObj);
+        auto metaCallEvent = static_cast<QMetaCallEvent *>(event);
+        auto args = metaCallEvent->args();
+        // we didn't have a context object, or it's still alive
+        if (!withContextObject || receiver)
+            slotObj->call(const_cast<QObject*>(receiver.data()), args);
+        slotObj->destroyIfLastRef();
+
+        deleteLater();
+        return true;
+    }
+    return QObject::event(event);
+}
+
 /*!
     \class QHostInfo
     \brief The QHostInfo class provides static functions for host name lookups.
@@ -249,64 +266,9 @@ static int nextId()
 
     \sa abortHostLookup(), addresses(), error(), fromName()
 */
-int QHostInfo::lookupHost(const QString &name, QObject *receiver,
-                          const char *member)
+int QHostInfo::lookupHost(const QString &name, QObject *receiver, const char *member)
 {
-#if defined QHOSTINFO_DEBUG
-    qDebug("QHostInfo::lookupHost(\"%s\", %p, %s)",
-           name.toLatin1().constData(), receiver, member ? member + 1 : 0);
-#endif
-
-    if (!QAbstractEventDispatcher::instance(QThread::currentThread())) {
-        qWarning("QHostInfo::lookupHost() called with no event dispatcher");
-        return -1;
-    }
-
-    qRegisterMetaType<QHostInfo>();
-
-    int id = nextId(); // generate unique ID
-
-    if (name.isEmpty()) {
-        if (!receiver)
-            return -1;
-
-        QHostInfo hostInfo(id);
-        hostInfo.setError(QHostInfo::HostNotFound);
-        hostInfo.setErrorString(QCoreApplication::translate("QHostInfo", "No host name given"));
-        QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
-        QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
-                         receiver, member, Qt::QueuedConnection);
-        result.data()->emitResultsReady(hostInfo);
-        return id;
-    }
-
-    QHostInfoLookupManager *manager = theHostInfoLookupManager();
-
-    if (manager) {
-        // the application is still alive
-        if (manager->cache.isEnabled()) {
-            // check cache first
-            bool valid = false;
-            QHostInfo info = manager->cache.get(name, &valid);
-            if (valid) {
-                if (!receiver)
-                    return -1;
-
-                info.setLookupId(id);
-                QHostInfoResult result;
-                QObject::connect(&result, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection);
-                result.emitResultsReady(info);
-                return id;
-            }
-        }
-
-        // cache is not enabled or it was not in the cache, do normal lookup
-        QHostInfoRunnable* runnable = new QHostInfoRunnable(name, id);
-        if (receiver)
-            QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection);
-        manager->scheduleLookup(runnable);
-    }
-    return id;
+    return QHostInfoPrivate::lookupHostImpl(name, receiver, nullptr, member);
 }
 
 /*!
@@ -416,7 +378,7 @@ QHostInfo QHostInfo::fromName(const QString &name)
 #endif
 
     QHostInfo hostInfo = QHostInfoAgent::fromName(name);
-    QAbstractHostInfoLookupManager* manager = theHostInfoLookupManager();
+    QHostInfoLookupManager* manager = theHostInfoLookupManager();
     manager->cache.put(name, hostInfo);
     return hostInfo;
 }
@@ -429,7 +391,7 @@ QHostInfo QHostInfoPrivate::fromName(const QString &name, QSharedPointer<QNetwor
 #endif
 
     QHostInfo hostInfo = QHostInfoAgent::fromName(name, session);
-    QAbstractHostInfoLookupManager* manager = theHostInfoLookupManager();
+    QHostInfoLookupManager* manager = theHostInfoLookupManager();
     manager->cache.put(name, hostInfo);
     return hostInfo;
 }
@@ -442,6 +404,162 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetw
 }
 #endif
 
+QHostInfo QHostInfoAgent::reverseLookup(const QHostAddress &address)
+{
+    QHostInfo results;
+    // Reverse lookup
+    sockaddr_in sa4;
+    sockaddr_in6 sa6;
+    sockaddr *sa = 0;
+    QT_SOCKLEN_T saSize;
+    if (address.protocol() == QAbstractSocket::IPv4Protocol) {
+        sa = reinterpret_cast<sockaddr *>(&sa4);
+        saSize = sizeof(sa4);
+        memset(&sa4, 0, sizeof(sa4));
+        sa4.sin_family = AF_INET;
+        sa4.sin_addr.s_addr = htonl(address.toIPv4Address());
+    } else {
+        sa = reinterpret_cast<sockaddr *>(&sa6);
+        saSize = sizeof(sa6);
+        memset(&sa6, 0, sizeof(sa6));
+        sa6.sin6_family = AF_INET6;
+        memcpy(&sa6.sin6_addr, address.toIPv6Address().c, sizeof(sa6.sin6_addr));
+    }
+
+    char hbuf[NI_MAXHOST];
+    if (sa && getnameinfo(sa, saSize, hbuf, sizeof(hbuf), nullptr, 0, 0) == 0)
+        results.setHostName(QString::fromLatin1(hbuf));
+
+    if (results.hostName().isEmpty())
+        results.setHostName(address.toString());
+    results.setAddresses(QList<QHostAddress>() << address);
+
+    return results;
+}
+
+/*
+    Call getaddrinfo, and returns the results as QHostInfo::addresses
+*/
+QHostInfo QHostInfoAgent::lookup(const QString &hostName)
+{
+    QHostInfo results;
+
+    // IDN support
+    QByteArray aceHostname = QUrl::toAce(hostName);
+    results.setHostName(hostName);
+    if (aceHostname.isEmpty()) {
+        results.setError(QHostInfo::HostNotFound);
+        results.setErrorString(hostName.isEmpty() ?
+                               QCoreApplication::translate("QHostInfoAgent", "No host name given") :
+                               QCoreApplication::translate("QHostInfoAgent", "Invalid hostname"));
+        return results;
+    }
+
+    addrinfo *res = 0;
+    struct addrinfo hints;
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = PF_UNSPEC;
+#ifdef Q_ADDRCONFIG
+    hints.ai_flags = Q_ADDRCONFIG;
+#endif
+
+    int result = getaddrinfo(aceHostname.constData(), nullptr, &hints, &res);
+# ifdef Q_ADDRCONFIG
+    if (result == EAI_BADFLAGS) {
+        // if the lookup failed with AI_ADDRCONFIG set, try again without it
+        hints.ai_flags = 0;
+        result = getaddrinfo(aceHostname.constData(), nullptr, &hints, &res);
+    }
+# endif
+
+    if (result == 0) {
+        addrinfo *node = res;
+        QList<QHostAddress> addresses;
+        while (node) {
+#ifdef QHOSTINFO_DEBUG
+            qDebug() << "getaddrinfo node: flags:" << node->ai_flags << "family:" << node->ai_family
+                     << "ai_socktype:" << node->ai_socktype << "ai_protocol:" << node->ai_protocol
+                     << "ai_addrlen:" << node->ai_addrlen;
+#endif
+            switch (node->ai_family) {
+            case AF_INET: {
+                QHostAddress addr;
+                addr.setAddress(ntohl(((sockaddr_in *) node->ai_addr)->sin_addr.s_addr));
+                if (!addresses.contains(addr))
+                    addresses.append(addr);
+                break;
+            }
+            case AF_INET6: {
+                QHostAddress addr;
+                sockaddr_in6 *sa6 = (sockaddr_in6 *) node->ai_addr;
+                addr.setAddress(sa6->sin6_addr.s6_addr);
+                if (sa6->sin6_scope_id)
+                    addr.setScopeId(QString::number(sa6->sin6_scope_id));
+                if (!addresses.contains(addr))
+                    addresses.append(addr);
+                break;
+            }
+            default:
+                results.setError(QHostInfo::UnknownError);
+                results.setErrorString(QCoreApplication::translate("QHostInfoAgent", "Unknown address type"));
+            }
+            node = node->ai_next;
+        }
+        if (addresses.isEmpty()) {
+            // Reached the end of the list, but no addresses were found; this
+            // means the list contains one or more unknown address types.
+            results.setError(QHostInfo::UnknownError);
+            results.setErrorString(QCoreApplication::translate("QHostInfoAgent", "Unknown address type"));
+        }
+
+        results.setAddresses(addresses);
+        freeaddrinfo(res);
+    } else {
+        switch (result) {
+#ifdef Q_OS_WIN
+        case WSAHOST_NOT_FOUND: //authoritative not found
+        case WSATRY_AGAIN: //non authoritative not found
+        case WSANO_DATA: //valid name, no associated address
+#else
+        case EAI_NONAME:
+        case EAI_FAIL:
+#  ifdef EAI_NODATA // EAI_NODATA is deprecated in RFC 3493
+        case EAI_NODATA:
+#  endif
+#endif
+            results.setError(QHostInfo::HostNotFound);
+            results.setErrorString(QCoreApplication::translate("QHostInfoAgent", "Host not found"));
+            break;
+        default:
+            results.setError(QHostInfo::UnknownError);
+#ifdef Q_OS_WIN
+            results.setErrorString(QString::fromWCharArray(gai_strerror(result)));
+#else
+            results.setErrorString(QString::fromLocal8Bit(gai_strerror(result)));
+#endif
+            break;
+        }
+    }
+
+#if defined(QHOSTINFO_DEBUG)
+    if (results.error() != QHostInfo::NoError) {
+        qDebug("QHostInfoAgent::fromName(): error #%d %s",
+               h_errno, results.errorString().toLatin1().constData());
+    } else {
+        QString tmp;
+        QList<QHostAddress> addresses = results.addresses();
+        for (int i = 0; i < addresses.count(); ++i) {
+            if (i != 0) tmp += QLatin1String(", ");
+            tmp += addresses.at(i).toString();
+        }
+        qDebug("QHostInfoAgent::fromName(): found %i entries for \"%s\": {%s}",
+               addresses.count(), aceHostname.constData(),
+               tmp.toLatin1().constData());
+    }
+#endif
+
+    return results;
+}
 
 /*!
     \enum QHostInfo::HostInfoError
@@ -462,8 +580,9 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetw
     \sa lookupId()
 */
 QHostInfo::QHostInfo(int id)
-    : d(new QHostInfoPrivate)
+    : d_ptr(new QHostInfoPrivate)
 {
+    Q_D(QHostInfo);
     d->lookupId = id;
 }
 
@@ -471,17 +590,32 @@ QHostInfo::QHostInfo(int id)
     Constructs a copy of \a other.
 */
 QHostInfo::QHostInfo(const QHostInfo &other)
-    : d(new QHostInfoPrivate(*other.d.data()))
+    : d_ptr(new QHostInfoPrivate(*other.d_ptr))
 {
 }
 
 /*!
+    \fn QHostInfo(QHostInfo &&other)
+
+    Move-constructs a new QHostInfo from \a other.
+
+    \note The moved-from object \a other is placed in a
+    partially-formed state, in which the only valid operations are
+    destruction and assignment of a new value.
+
+    \since 5.14
+*/
+
+/*!
     Assigns the data of the \a other object to this host info object,
     and returns a reference to it.
 */
 QHostInfo &QHostInfo::operator=(const QHostInfo &other)
 {
-    *d.data() = *other.d.data();
+    if (d_ptr)
+        *d_ptr = *other.d_ptr;
+    else
+        d_ptr = new QHostInfoPrivate(*other.d_ptr);
     return *this;
 }
 
@@ -490,6 +624,7 @@ QHostInfo &QHostInfo::operator=(const QHostInfo &other)
 */
 QHostInfo::~QHostInfo()
 {
+    delete d_ptr;
 }
 
 /*!
@@ -504,6 +639,7 @@ QHostInfo::~QHostInfo()
 */
 QList<QHostAddress> QHostInfo::addresses() const
 {
+    Q_D(const QHostInfo);
     return d->addrs;
 }
 
@@ -514,6 +650,7 @@ QList<QHostAddress> QHostInfo::addresses() const
 */
 void QHostInfo::setAddresses(const QList<QHostAddress> &addresses)
 {
+    Q_D(QHostInfo);
     d->addrs = addresses;
 }
 
@@ -524,6 +661,7 @@ void QHostInfo::setAddresses(const QList<QHostAddress> &addresses)
 */
 QString QHostInfo::hostName() const
 {
+    Q_D(const QHostInfo);
     return d->hostName;
 }
 
@@ -534,6 +672,7 @@ QString QHostInfo::hostName() const
 */
 void QHostInfo::setHostName(const QString &hostName)
 {
+    Q_D(QHostInfo);
     d->hostName = hostName;
 }
 
@@ -545,6 +684,7 @@ void QHostInfo::setHostName(const QString &hostName)
 */
 QHostInfo::HostInfoError QHostInfo::error() const
 {
+    Q_D(const QHostInfo);
     return d->err;
 }
 
@@ -555,6 +695,7 @@ QHostInfo::HostInfoError QHostInfo::error() const
 */
 void QHostInfo::setError(HostInfoError error)
 {
+    Q_D(QHostInfo);
     d->err = error;
 }
 
@@ -565,6 +706,7 @@ void QHostInfo::setError(HostInfoError error)
 */
 int QHostInfo::lookupId() const
 {
+    Q_D(const QHostInfo);
     return d->lookupId;
 }
 
@@ -575,6 +717,7 @@ int QHostInfo::lookupId() const
 */
 void QHostInfo::setLookupId(int id)
 {
+    Q_D(QHostInfo);
     d->lookupId = id;
 }
 
@@ -586,6 +729,7 @@ void QHostInfo::setLookupId(int id)
 */
 QString QHostInfo::errorString() const
 {
+    Q_D(const QHostInfo);
     return d->errorStr;
 }
 
@@ -597,6 +741,7 @@ QString QHostInfo::errorString() const
 */
 void QHostInfo::setErrorString(const QString &str)
 {
+    Q_D(QHostInfo);
     d->errorStr = str;
 }
 
@@ -631,14 +776,32 @@ QString QHostInfo::localHostName()
     \sa hostName()
 */
 
+// ### Qt 6 merge with function below
 int QHostInfo::lookupHostImpl(const QString &name,
                               const QObject *receiver,
                               QtPrivate::QSlotObjectBase *slotObj)
 {
+    return QHostInfoPrivate::lookupHostImpl(name, receiver, slotObj, nullptr);
+}
+/*
+    Called by the various lookupHost overloads to perform the lookup.
+
+    Signals either the functor encapuslated in the \a slotObj in the context
+    of \a receiver, or the \a member slot of the \a receiver.
+
+    \a receiver might be the nullptr, but only if a \a slotObj is provided.
+*/
+int QHostInfoPrivate::lookupHostImpl(const QString &name,
+                                     const QObject *receiver,
+                                     QtPrivate::QSlotObjectBase *slotObj,
+                                     const char *member)
+{
 #if defined QHOSTINFO_DEBUG
-    qDebug("QHostInfo::lookupHost(\"%s\", %p, %p)",
-           name.toLatin1().constData(), receiver, slotObj);
+    qDebug("QHostInfoPrivate::lookupHostImpl(\"%s\", %p, %p, %s)",
+           name.toLatin1().constData(), receiver, slotObj, member ? member + 1 : 0);
 #endif
+    Q_ASSERT(!member != !slotObj); // one of these must be set, but not both
+    Q_ASSERT(receiver || slotObj);
 
     if (!QAbstractEventDispatcher::instance(QThread::currentThread())) {
         qWarning("QHostInfo::lookupHost() called with no event dispatcher");
@@ -653,8 +816,13 @@ int QHostInfo::lookupHostImpl(const QString &name,
         QHostInfo hostInfo(id);
         hostInfo.setError(QHostInfo::HostNotFound);
         hostInfo.setErrorString(QCoreApplication::translate("QHostInfo", "No host name given"));
+
         QHostInfoResult result(receiver, slotObj);
+        if (receiver && member)
+            QObject::connect(&result, SIGNAL(resultsReady(QHostInfo)),
+                            receiver, member, Qt::QueuedConnection);
         result.postResultsReady(hostInfo);
+
         return id;
     }
 
@@ -669,23 +837,24 @@ int QHostInfo::lookupHostImpl(const QString &name,
             if (valid) {
                 info.setLookupId(id);
                 QHostInfoResult result(receiver, slotObj);
+                if (receiver && member)
+                    QObject::connect(&result, SIGNAL(resultsReady(QHostInfo)),
+                                    receiver, member, Qt::QueuedConnection);
                 result.postResultsReady(info);
                 return id;
             }
         }
 
         // cache is not enabled or it was not in the cache, do normal lookup
-        QHostInfoRunnable* runnable = new QHostInfoRunnable(name, id, receiver, slotObj);
+        QHostInfoRunnable *runnable = new QHostInfoRunnable(name, id, receiver, slotObj);
+        if (receiver && member)
+            QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)),
+                                receiver, member, Qt::QueuedConnection);
         manager->scheduleLookup(runnable);
     }
     return id;
 }
 
-QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i) : toBeLookedUp(hn), id(i)
-{
-    setAutoDelete(true);
-}
-
 QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i, const QObject *receiver,
                                      QtPrivate::QSlotObjectBase *slotObj) :
     toBeLookedUp(hn), id(i), resultEmitter(receiver, slotObj)
@@ -697,11 +866,10 @@ QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i, const QObject *re
 void QHostInfoRunnable::run()
 {
     QHostInfoLookupManager *manager = theHostInfoLookupManager();
+    const auto sg = qScopeGuard([&] { manager->lookupFinished(this); });
     // check aborted
-    if (manager->wasAborted(id)) {
-        manager->lookupFinished(this);
+    if (manager->wasAborted(id))
         return;
-    }
 
     QHostInfo hostInfo;
 
@@ -723,10 +891,8 @@ void QHostInfoRunnable::run()
     }
 
     // check aborted again
-    if (manager->wasAborted(id)) {
-        manager->lookupFinished(this);
+    if (manager->wasAborted(id))
         return;
-    }
 
     // signal emission
     hostInfo.setLookupId(id);
@@ -750,16 +916,15 @@ void QHostInfoRunnable::run()
     }
 
 #endif
-    manager->lookupFinished(this);
-
     // thread goes back to QThreadPool
 }
 
-QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), wasDeleted(false)
+QHostInfoLookupManager::QHostInfoLookupManager() : wasDeleted(false)
 {
-    moveToThread(QCoreApplicationPrivate::mainThread());
 #if QT_CONFIG(thread)
-    connect(QCoreApplication::instance(), SIGNAL(destroyed()), SLOT(waitForThreadPoolDone()), Qt::DirectConnection);
+    QObject::connect(QCoreApplication::instance(), &QObject::destroyed,
+                     &threadPool, [&](QObject *) { threadPool.waitForDone(); },
+                     Qt::DirectConnection);
     threadPool.setMaxThreadCount(20); // do up to 20 DNS lookups in parallel
 #endif
 }
@@ -794,10 +959,9 @@ void QHostInfoLookupManager::clear()
     cache.clear();
 }
 
-void QHostInfoLookupManager::work()
+// assumes mutex is locked by caller
+void QHostInfoLookupManager::rescheduleWithMutexHeld()
 {
-    QMutexLocker locker(&mutex);
-
     if (wasDeleted)
         return;
 
@@ -816,7 +980,7 @@ void QHostInfoLookupManager::work()
 
 #if QT_CONFIG(thread)
     auto isAlreadyRunning = [this](QHostInfoRunnable *lookup) {
-        return any_of(currentLookups.cbegin(), currentLookups.cend(), ToBeLookedUpEquals(lookup->toBeLookedUp));
+        return std::any_of(currentLookups.cbegin(), currentLookups.cend(), ToBeLookedUpEquals(lookup->toBeLookedUp));
     };
 
     // Transfer any postponed lookups that aren't currently running to the scheduled list, keeping already-running lookups:
@@ -862,7 +1026,7 @@ void QHostInfoLookupManager::scheduleLookup(QHostInfoRunnable *r)
         return;
 
     scheduledLookups.enqueue(r);
-    work();
+    rescheduleWithMutexHeld();
 }
 
 // called by QHostInfo
@@ -918,7 +1082,7 @@ void QHostInfoLookupManager::lookupFinished(QHostInfoRunnable *r)
     currentLookups.removeOne(r);
 #endif
     finishedLookups.append(r);
-    work();
+    rescheduleWithMutexHeld();
 }
 
 // This function returns immediately when we had a result in the cache, else it will later emit a signal
@@ -928,7 +1092,7 @@ QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char
     *id = -1;
 
     // check cache
-    QAbstractHostInfoLookupManager* manager = theHostInfoLookupManager();
+    QHostInfoLookupManager* manager = theHostInfoLookupManager();
     if (manager && manager->cache.isEnabled()) {
         QHostInfo info = manager->cache.get(name, valid);
         if (*valid) {
@@ -937,7 +1101,7 @@ QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char
     }
 
     // was not in cache, trigger lookup
-    *id = QHostInfo::lookupHost(name, receiver, member);
+    *id = QHostInfoPrivate::lookupHostImpl(name, receiver, nullptr, member);
 
     // return empty response, valid==false
     return QHostInfo();
@@ -945,7 +1109,7 @@ QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char
 
 void qt_qhostinfo_clear_cache()
 {
-    QAbstractHostInfoLookupManager* manager = theHostInfoLookupManager();
+    QHostInfoLookupManager* manager = theHostInfoLookupManager();
     if (manager) {
         manager->clear();
     }
@@ -954,7 +1118,7 @@ void qt_qhostinfo_clear_cache()
 #ifdef QT_BUILD_INTERNAL
 void Q_AUTOTEST_EXPORT qt_qhostinfo_enable_cache(bool e)
 {
-    QAbstractHostInfoLookupManager* manager = theHostInfoLookupManager();
+    QHostInfoLookupManager* manager = theHostInfoLookupManager();
     if (manager) {
         manager->cache.setEnabled(e);
     }
@@ -962,7 +1126,7 @@ void Q_AUTOTEST_EXPORT qt_qhostinfo_enable_cache(bool e)
 
 void qt_qhostinfo_cache_inject(const QString &hostname, const QHostInfo &resolution)
 {
-    QAbstractHostInfoLookupManager* manager = theHostInfoLookupManager();
+    QHostInfoLookupManager* manager = theHostInfoLookupManager();
     if (!manager || !manager->cache.isEnabled())
         return;
 
@@ -1018,9 +1182,4 @@ void QHostInfoCache::clear()
     cache.clear();
 }
 
-QAbstractHostInfoLookupManager* QAbstractHostInfoLookupManager::globalInstance()
-{
-    return theHostInfoLookupManager();
-}
-
 QT_END_NAMESPACE
diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h
index 49871ad470..cda286b423 100644
--- a/src/network/kernel/qhostinfo.h
+++ b/src/network/kernel/qhostinfo.h
@@ -62,11 +62,12 @@ public:
 
     explicit QHostInfo(int lookupId = -1);
     QHostInfo(const QHostInfo &d);
+    QHostInfo(QHostInfo &&other) noexcept : d_ptr(qExchange(other.d_ptr, nullptr)) {}
     QHostInfo &operator=(const QHostInfo &d);
-    QHostInfo &operator=(QHostInfo &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+    QHostInfo &operator=(QHostInfo &&other) noexcept { swap(other); return *this; }
     ~QHostInfo();
 
-    void swap(QHostInfo &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QHostInfo &other) noexcept { qSwap(d_ptr, other.d_ptr); }
 
     QString hostName() const;
     void setHostName(const QString &name);
@@ -147,7 +148,8 @@ public:
 #endif // Q_QDOC
 
 private:
-    QScopedPointer<QHostInfoPrivate> d;
+    QHostInfoPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(QHostInfo)
 
     static int lookupHostImpl(const QString &name,
                               const QObject *receiver,
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index fa6529bdfd..1798ceab0a 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -81,69 +81,50 @@ QT_BEGIN_NAMESPACE
 class QHostInfoResult : public QObject
 {
     Q_OBJECT
-
-    QPointer<const QObject> receiver = nullptr;
-    QtPrivate::QSlotObjectBase *slotObj = nullptr;
-    const bool withContextObject = false;
-
 public:
-    QHostInfoResult() = default;
-    QHostInfoResult(const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj) :
-        receiver(receiver),
-        slotObj(slotObj),
-        withContextObject(slotObj && receiver)
+    QHostInfoResult(const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj)
+        : receiver(receiver), slotObj(slotObj),
+          withContextObject(slotObj && receiver)
     {
-        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this,
-                &QObject::deleteLater);
-        if (slotObj && receiver)
+        if (receiver)
             moveToThread(receiver->thread());
     }
 
     void postResultsReady(const QHostInfo &info);
 
-public Q_SLOTS:
-    inline void emitResultsReady(const QHostInfo &info)
-    {
-        if (slotObj) {
-            // we either didn't have a context object, or it's still alive
-            if (!withContextObject || receiver) {
-                QHostInfo copy = info;
-                void *args[2] = { 0, reinterpret_cast<void *>(&copy) };
-                slotObj->call(const_cast<QObject*>(receiver.data()), args);
-            }
-            slotObj->destroyIfLastRef();
-        } else {
-            emit resultsReady(info);
-        }
-    }
+Q_SIGNALS:
+    void resultsReady(const QHostInfo &info);
 
 protected:
-    bool event(QEvent *event) override
+    bool event(QEvent *event) override;
+
+private:
+    QHostInfoResult(const QHostInfoResult *other)
+        : receiver(other->receiver), slotObj(other->slotObj),
+          withContextObject(other->withContextObject)
     {
-        if (event->type() == QEvent::MetaCall) {
-            auto metaCallEvent = static_cast<QMetaCallEvent *>(event);
-            auto args = metaCallEvent->args();
-            auto hostInfo = reinterpret_cast<QHostInfo *>(args[1]);
-            emitResultsReady(*hostInfo);
-            deleteLater();
-            return true;
-        }
-        return QObject::event(event);
+        // cleanup if the application terminates before results are delivered
+        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
+                this, &QObject::deleteLater);
+        // maintain thread affinity
+        moveToThread(other->thread());
     }
 
-Q_SIGNALS:
-    void resultsReady(const QHostInfo &info);
+    QPointer<const QObject> receiver = nullptr;
+    QtPrivate::QSlotObjectBase *slotObj = nullptr;
+    const bool withContextObject = false;
 };
 
-// needs to be QObject because fromName calls tr()
-class QHostInfoAgent : public QObject
+class QHostInfoAgent
 {
-    Q_OBJECT
 public:
     static QHostInfo fromName(const QString &hostName);
 #ifndef QT_NO_BEARERMANAGEMENT
     static QHostInfo fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession);
 #endif
+private:
+    static QHostInfo lookup(const QString &hostName);
+    static QHostInfo reverseLookup(const QHostAddress &address);
 };
 
 class QHostInfoPrivate
@@ -159,6 +140,10 @@ public:
     //not a public API yet
     static QHostInfo fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession);
 #endif
+    static int lookupHostImpl(const QString &name,
+                              const QObject *receiver,
+                              QtPrivate::QSlotObjectBase *slotObj,
+                              const char *member);
 
     QHostInfo::HostInfoError err;
     QString errorStr;
@@ -203,7 +188,6 @@ private:
 class QHostInfoRunnable : public QRunnable
 {
 public:
-    QHostInfoRunnable(const QString &hn, int i);
     QHostInfoRunnable(const QString &hn, int i, const QObject *receiver,
                       QtPrivate::QSlotObjectBase *slotObj);
     void run() override;
@@ -214,31 +198,13 @@ public:
 };
 
 
-class QAbstractHostInfoLookupManager : public QObject
+class QHostInfoLookupManager
 {
-    Q_OBJECT
-
-public:
-    ~QAbstractHostInfoLookupManager() {}
-    virtual void clear() = 0;
-
-    QHostInfoCache cache;
-
-protected:
-     QAbstractHostInfoLookupManager() {}
-     static QAbstractHostInfoLookupManager* globalInstance();
-
-};
-
-class QHostInfoLookupManager : public QAbstractHostInfoLookupManager
-{
-    Q_OBJECT
 public:
     QHostInfoLookupManager();
     ~QHostInfoLookupManager();
 
-    void clear() override;
-    void work();
+    void clear();
 
     // called from QHostInfo
     void scheduleLookup(QHostInfoRunnable *r);
@@ -248,6 +214,8 @@ public:
     void lookupFinished(QHostInfoRunnable *r);
     bool wasAborted(int id);
 
+    QHostInfoCache cache;
+
     friend class QHostInfoRunnable;
 protected:
 #if QT_CONFIG(thread)
@@ -265,10 +233,8 @@ protected:
 
     bool wasDeleted;
 
-private slots:
-#if QT_CONFIG(thread)
-    void waitForThreadPoolDone() { threadPool.waitForDone(); }
-#endif
+private:
+    void rescheduleWithMutexHeld();
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index e4810d68ee..78a05f8407 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -72,17 +72,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// Almost always the same. If not, specify in qplatformdefs.h.
-#if !defined(QT_SOCKOPTLEN_T)
-# define QT_SOCKOPTLEN_T QT_SOCKLEN_T
-#endif
-
-// HP-UXi has a bug in getaddrinfo(3) that makes it thread-unsafe
-// with this flag. So disable it in that platform.
-#if defined(AI_ADDRCONFIG) && !defined(Q_OS_HPUX)
-#  define Q_ADDRCONFIG          AI_ADDRCONFIG
-#endif
-
 enum LibResolvFeature {
     NeedResInit,
     NeedResNInit
@@ -197,132 +186,10 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
         local_res_init();
 
     QHostAddress address;
-    if (address.setAddress(hostName)) {
-        // Reverse lookup
-        sockaddr_in sa4;
-        sockaddr_in6 sa6;
-        sockaddr *sa = 0;
-        QT_SOCKLEN_T saSize = 0;
-        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
-            sa = (sockaddr *)&sa4;
-            saSize = sizeof(sa4);
-            memset(&sa4, 0, sizeof(sa4));
-            sa4.sin_family = AF_INET;
-            sa4.sin_addr.s_addr = htonl(address.toIPv4Address());
-        }
-        else {
-            sa = (sockaddr *)&sa6;
-            saSize = sizeof(sa6);
-            memset(&sa6, 0, sizeof(sa6));
-            sa6.sin6_family = AF_INET6;
-            memcpy(sa6.sin6_addr.s6_addr, address.toIPv6Address().c, sizeof(sa6.sin6_addr.s6_addr));
-        }
-
-        char hbuf[NI_MAXHOST];
-        if (sa && getnameinfo(sa, saSize, hbuf, sizeof(hbuf), 0, 0, 0) == 0)
-            results.setHostName(QString::fromLatin1(hbuf));
-
-        if (results.hostName().isEmpty())
-            results.setHostName(address.toString());
-        results.setAddresses(QList<QHostAddress>() << address);
-        return results;
-    }
-
-    // IDN support
-    QByteArray aceHostname = QUrl::toAce(hostName);
-    results.setHostName(hostName);
-    if (aceHostname.isEmpty()) {
-        results.setError(QHostInfo::HostNotFound);
-        results.setErrorString(hostName.isEmpty() ?
-                               QCoreApplication::translate("QHostInfoAgent", "No host name given") :
-                               QCoreApplication::translate("QHostInfoAgent", "Invalid hostname"));
-        return results;
-    }
-
-    // Call getaddrinfo, and place all IPv4 addresses at the start and
-    // the IPv6 addresses at the end of the address list in results.
-    addrinfo *res = 0;
-    struct addrinfo hints;
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = PF_UNSPEC;
-#ifdef Q_ADDRCONFIG
-    hints.ai_flags = Q_ADDRCONFIG;
-#endif
+    if (address.setAddress(hostName))
+        return reverseLookup(address);
 
-    int result = getaddrinfo(aceHostname.constData(), 0, &hints, &res);
-# ifdef Q_ADDRCONFIG
-    if (result == EAI_BADFLAGS) {
-        // if the lookup failed with AI_ADDRCONFIG set, try again without it
-        hints.ai_flags = 0;
-        result = getaddrinfo(aceHostname.constData(), 0, &hints, &res);
-    }
-# endif
-
-    if (result == 0) {
-        addrinfo *node = res;
-        QList<QHostAddress> addresses;
-        while (node) {
-#ifdef QHOSTINFO_DEBUG
-                qDebug() << "getaddrinfo node: flags:" << node->ai_flags << "family:" << node->ai_family << "ai_socktype:" << node->ai_socktype << "ai_protocol:" << node->ai_protocol << "ai_addrlen:" << node->ai_addrlen;
-#endif
-            if (node->ai_family == AF_INET) {
-                QHostAddress addr;
-                addr.setAddress(ntohl(((sockaddr_in *) node->ai_addr)->sin_addr.s_addr));
-                if (!addresses.contains(addr))
-                    addresses.append(addr);
-            }
-            else if (node->ai_family == AF_INET6) {
-                QHostAddress addr;
-                sockaddr_in6 *sa6 = (sockaddr_in6 *) node->ai_addr;
-                addr.setAddress(sa6->sin6_addr.s6_addr);
-                if (sa6->sin6_scope_id)
-                    addr.setScopeId(QString::number(sa6->sin6_scope_id));
-                if (!addresses.contains(addr))
-                    addresses.append(addr);
-            }
-            node = node->ai_next;
-        }
-        if (addresses.isEmpty() && node == 0) {
-            // Reached the end of the list, but no addresses were found; this
-            // means the list contains one or more unknown address types.
-            results.setError(QHostInfo::UnknownError);
-            results.setErrorString(tr("Unknown address type"));
-        }
-
-        results.setAddresses(addresses);
-        freeaddrinfo(res);
-    } else if (result == EAI_NONAME
-               || result ==  EAI_FAIL
-#ifdef EAI_NODATA
-               // EAI_NODATA is deprecated in RFC 3493
-               || result == EAI_NODATA
-#endif
-               ) {
-        results.setError(QHostInfo::HostNotFound);
-        results.setErrorString(tr("Host not found"));
-    } else {
-        results.setError(QHostInfo::UnknownError);
-        results.setErrorString(QString::fromLocal8Bit(gai_strerror(result)));
-    }
-
-
-#if defined(QHOSTINFO_DEBUG)
-    if (results.error() != QHostInfo::NoError) {
-        qDebug("QHostInfoAgent::fromName(): error #%d %s",
-               h_errno, results.errorString().toLatin1().constData());
-    } else {
-        QString tmp;
-        QList<QHostAddress> addresses = results.addresses();
-        for (int i = 0; i < addresses.count(); ++i) {
-            if (i != 0) tmp += ", ";
-            tmp += addresses.at(i).toString();
-        }
-        qDebug("QHostInfoAgent::fromName(): found %i entries for \"%s\": {%s}",
-               addresses.count(), hostName.toLatin1().constData(),
-               tmp.toLatin1().constData());
-    }
-#endif
-    return results;
+    return lookup(hostName);
 }
 
 QString QHostInfo::localDomainName()
diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp
index c51e9968f8..0b5cc98970 100644
--- a/src/network/kernel/qhostinfo_win.cpp
+++ b/src/network/kernel/qhostinfo_win.cpp
@@ -51,27 +51,10 @@ QT_BEGIN_NAMESPACE
 //#define QHOSTINFO_DEBUG
 
 //###
-#define QT_SOCKLEN_T int
 #ifndef NI_MAXHOST // already defined to 1025 in ws2tcpip.h?
 #define NI_MAXHOST 1024
 #endif
 
-static void translateWSAError(int error, QHostInfo *results)
-{
-    switch (error) {
-    case WSAHOST_NOT_FOUND: //authoritative not found
-    case WSATRY_AGAIN: //non authoritative not found
-    case WSANO_DATA: //valid name, no associated address
-        results->setError(QHostInfo::HostNotFound);
-        results->setErrorString(QHostInfoAgent::tr("Host not found"));
-        return;
-    default:
-        results->setError(QHostInfo::UnknownError);
-        results->setErrorString(QHostInfoAgent::tr("Unknown error (%1)").arg(error));
-        return;
-    }
-}
-
 QHostInfo QHostInfoAgent::fromName(const QString &hostName)
 {
     QSysInfo::machineHostName();        // this initializes ws2_32.dll
@@ -79,98 +62,15 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
     QHostInfo results;
 
 #if defined(QHOSTINFO_DEBUG)
-    qDebug("QHostInfoAgent::fromName(): looking up \"%s\" (IPv6 support is %s)",
-           hostName.toLatin1().constData(),
-           (getaddrinfo && freeaddrinfo) ? "enabled" : "disabled");
+    qDebug("QHostInfoAgent::fromName(%s) looking up...",
+           hostName.toLatin1().constData());
 #endif
 
     QHostAddress address;
-    if (address.setAddress(hostName)) {
-        // Reverse lookup
-        sockaddr_in sa4;
-        sockaddr_in6 sa6;
-        sockaddr *sa;
-        QT_SOCKLEN_T saSize;
-        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
-            sa = reinterpret_cast<sockaddr *>(&sa4);
-            saSize = sizeof(sa4);
-            memset(&sa4, 0, sizeof(sa4));
-            sa4.sin_family = AF_INET;
-            sa4.sin_addr.s_addr = htonl(address.toIPv4Address());
-        } else {
-            sa = reinterpret_cast<sockaddr *>(&sa6);
-            saSize = sizeof(sa6);
-            memset(&sa6, 0, sizeof(sa6));
-            sa6.sin6_family = AF_INET6;
-            memcpy(&sa6.sin6_addr, address.toIPv6Address().c, sizeof(sa6.sin6_addr));
-        }
-
-        char hbuf[NI_MAXHOST];
-        if (getnameinfo(sa, saSize, hbuf, sizeof(hbuf), 0, 0, 0) == 0)
-            results.setHostName(QString::fromLatin1(hbuf));
-
-        if (results.hostName().isEmpty())
-            results.setHostName(address.toString());
-        results.setAddresses(QList<QHostAddress>() << address);
-        return results;
-    }
+    if (address.setAddress(hostName))
+        return reverseLookup(address);
 
-    // IDN support
-    QByteArray aceHostname = QUrl::toAce(hostName);
-    results.setHostName(hostName);
-    if (aceHostname.isEmpty()) {
-        results.setError(QHostInfo::HostNotFound);
-        results.setErrorString(hostName.isEmpty() ? tr("No host name given") : tr("Invalid hostname"));
-        return results;
-    }
-
-    addrinfo *res;
-    int err = getaddrinfo(aceHostname.constData(), 0, 0, &res);
-    if (err == 0) {
-        QList<QHostAddress> addresses;
-        for (addrinfo *p = res; p != 0; p = p->ai_next) {
-            switch (p->ai_family) {
-            case AF_INET: {
-                QHostAddress addr;
-                addr.setAddress(ntohl(reinterpret_cast<sockaddr_in *>(p->ai_addr)->sin_addr.s_addr));
-                if (!addresses.contains(addr))
-                    addresses.append(addr);
-            }
-                break;
-            case AF_INET6: {
-                QHostAddress addr;
-                addr.setAddress(reinterpret_cast<const sockaddr_in6 *>(p->ai_addr)->sin6_addr.s6_addr);
-                if (!addresses.contains(addr))
-                    addresses.append(addr);
-            }
-                break;
-            default:
-                results.setError(QHostInfo::UnknownError);
-                results.setErrorString(tr("Unknown address type"));
-            }
-        }
-        results.setAddresses(addresses);
-        freeaddrinfo(res);
-    } else {
-        translateWSAError(WSAGetLastError(), &results);
-    }
-
-#if defined(QHOSTINFO_DEBUG)
-    if (results.error() != QHostInfo::NoError) {
-        qDebug("QHostInfoAgent::run(): error (%s)",
-               results.errorString().toLatin1().constData());
-    } else {
-        QString tmp;
-        QList<QHostAddress> addresses = results.addresses();
-        for (int i = 0; i < addresses.count(); ++i) {
-            if (i != 0) tmp += ", ";
-            tmp += addresses.at(i).toString();
-        }
-        qDebug("QHostInfoAgent::run(): found %i entries: {%s}",
-               addresses.count(), tmp.toLatin1().constData());
-    }
-#endif
-    return results;
+    return lookup(hostName);
 }
 
 // QString QHostInfo::localDomainName() defined in qnetworkinterface_win.cpp
diff --git a/src/network/kernel/qnetconmonitor_darwin.mm b/src/network/kernel/qnetconmonitor_darwin.mm
new file mode 100644
index 0000000000..f6daf9ed50
--- /dev/null
+++ b/src/network/kernel/qnetconmonitor_darwin.mm
@@ -0,0 +1,419 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "private/qnativesocketengine_p.h"
+#include "private/qnetconmonitor_p.h"
+
+#include "private/qobject_p.h"
+
+#include <SystemConfiguration/SystemConfiguration.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+#include <netinet/in.h>
+
+#include <cstring>
+
+QT_BEGIN_NAMESPACE
+
+Q_LOGGING_CATEGORY(lcNetMon, "qt.network.monitor");
+
+namespace {
+
+class ReachabilityDispatchQueue
+{
+public:
+    ReachabilityDispatchQueue()
+    {
+        queue = dispatch_queue_create("qt-network-reachability-queue", nullptr);
+        if (!queue)
+            qCWarning(lcNetMon, "Failed to create a dispatch queue for reachability probes");
+    }
+
+    ~ReachabilityDispatchQueue()
+    {
+        if (queue)
+            dispatch_release(queue);
+    }
+
+    dispatch_queue_t data() const
+    {
+        return queue;
+    }
+
+private:
+    dispatch_queue_t queue = nullptr;
+
+    Q_DISABLE_COPY_MOVE(ReachabilityDispatchQueue)
+};
+
+dispatch_queue_t qt_reachability_queue()
+{
+    static const ReachabilityDispatchQueue reachabilityQueue;
+    return reachabilityQueue.data();
+}
+
+qt_sockaddr qt_hostaddress_to_sockaddr(const QHostAddress &src)
+{
+    if (src.isNull())
+        return {};
+
+    qt_sockaddr dst;
+    if (src.protocol() == QAbstractSocket::IPv4Protocol) {
+        dst.a4 = sockaddr_in{};
+        dst.a4.sin_family = AF_INET;
+        dst.a4.sin_addr.s_addr = htonl(src.toIPv4Address());
+        dst.a4.sin_len = sizeof(sockaddr_in);
+    } else if (src.protocol() == QAbstractSocket::IPv6Protocol) {
+        dst.a6 = sockaddr_in6{};
+        dst.a6.sin6_family = AF_INET6;
+        dst.a6.sin6_len = sizeof(sockaddr_in6);
+        const Q_IPV6ADDR ipv6 = src.toIPv6Address();
+        std::memcpy(&dst.a6.sin6_addr, &ipv6, sizeof ipv6);
+    } else {
+        Q_UNREACHABLE();
+    }
+
+    return dst;
+}
+
+} // unnamed namespace
+
+class QNetworkConnectionMonitorPrivate : public QObjectPrivate
+{
+public:
+    SCNetworkReachabilityRef probe = nullptr;
+    SCNetworkReachabilityFlags state = kSCNetworkReachabilityFlagsIsLocalAddress;
+    bool scheduled = false;
+
+    void updateState(SCNetworkReachabilityFlags newState);
+    void reset();
+    bool isReachable() const;
+
+    static void probeCallback(SCNetworkReachabilityRef probe, SCNetworkReachabilityFlags flags, void *info);
+
+    Q_DECLARE_PUBLIC(QNetworkConnectionMonitor)
+};
+
+void QNetworkConnectionMonitorPrivate::updateState(SCNetworkReachabilityFlags newState)
+{
+    // To be executed only on the reachability queue.
+    Q_Q(QNetworkConnectionMonitor);
+
+    // NETMONTODO: for now, 'online' for us means kSCNetworkReachabilityFlagsReachable
+    // is set. There are more possible flags that require more tests/some special
+    // setup. So in future this part and related can change/be extended.
+    const bool wasReachable = isReachable();
+    state = newState;
+    if (wasReachable != isReachable())
+        emit q->reachabilityChanged(isReachable());
+}
+
+void QNetworkConnectionMonitorPrivate::reset()
+{
+    if (probe) {
+        CFRelease(probe);
+        probe = nullptr;
+    }
+
+    state = kSCNetworkReachabilityFlagsIsLocalAddress;
+    scheduled = false;
+}
+
+bool QNetworkConnectionMonitorPrivate::isReachable() const
+{
+    return !!(state & kSCNetworkReachabilityFlagsReachable);
+}
+
+void QNetworkConnectionMonitorPrivate::probeCallback(SCNetworkReachabilityRef probe, SCNetworkReachabilityFlags flags, void *info)
+{
+    // To be executed only on the reachability queue.
+    Q_UNUSED(probe);
+
+    auto monitorPrivate = static_cast<QNetworkConnectionMonitorPrivate *>(info);
+    Q_ASSERT(monitorPrivate);
+    monitorPrivate->updateState(flags);
+}
+
+QNetworkConnectionMonitor::QNetworkConnectionMonitor()
+    : QObject(*new QNetworkConnectionMonitorPrivate)
+{
+}
+
+QNetworkConnectionMonitor::QNetworkConnectionMonitor(const QHostAddress &local, const QHostAddress &remote)
+    : QObject(*new QNetworkConnectionMonitorPrivate)
+{
+    setTargets(local, remote);
+}
+
+QNetworkConnectionMonitor::~QNetworkConnectionMonitor()
+{
+    Q_D(QNetworkConnectionMonitor);
+
+    stopMonitoring();
+    d->reset();
+}
+
+bool QNetworkConnectionMonitor::setTargets(const QHostAddress &local, const QHostAddress &remote)
+{
+    Q_D(QNetworkConnectionMonitor);
+
+    if (isMonitoring()) {
+        qCWarning(lcNetMon, "Monitor is already active, call stopMonitoring() first");
+        return false;
+    }
+
+    if (local.isNull()) {
+        qCWarning(lcNetMon, "Invalid (null) local address, cannot create a reachability target");
+        return false;
+    }
+
+    // Clear the old target if needed:
+    d->reset();
+
+    qt_sockaddr client = qt_hostaddress_to_sockaddr(local);
+    if (remote.isNull()) {
+        // That's a special case our QNetworkStatusMonitor is using (AnyIpv4/6 address to check an overall status).
+        d->probe = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, reinterpret_cast<sockaddr *>(&client));
+    } else {
+        qt_sockaddr target = qt_hostaddress_to_sockaddr(remote);
+        d->probe = SCNetworkReachabilityCreateWithAddressPair(kCFAllocatorDefault,
+                                                              reinterpret_cast<sockaddr *>(&client),
+                                                              reinterpret_cast<sockaddr *>(&target));
+    }
+
+    if (d->probe) {
+        // Let's read the initial state so that callback coming later can
+        // see a difference. Ignore errors though.
+        SCNetworkReachabilityGetFlags(d->probe, &d->state);
+    }else {
+        qCWarning(lcNetMon, "Failed to create network reachability probe");
+        return false;
+    }
+
+    return true;
+}
+
+bool QNetworkConnectionMonitor::startMonitoring()
+{
+    Q_D(QNetworkConnectionMonitor);
+
+    if (isMonitoring()) {
+        qCWarning(lcNetMon, "Monitor is already active, call stopMonitoring() first");
+        return false;
+    }
+
+    if (!d->probe) {
+        qCWarning(lcNetMon, "Can not start monitoring, set targets first");
+        return false;
+    }
+
+    auto queue = qt_reachability_queue();
+    if (!queue) {
+        qWarning(lcNetMon, "Failed to create a dispatch queue to schedule a probe on");
+        return false;
+    }
+
+    SCNetworkReachabilityContext context = {};
+    context.info = d;
+    if (!SCNetworkReachabilitySetCallback(d->probe, QNetworkConnectionMonitorPrivate::probeCallback, &context)) {
+        qWarning(lcNetMon, "Failed to set a reachability callback");
+        return false;
+    }
+
+
+    if (!SCNetworkReachabilitySetDispatchQueue(d->probe, queue)) {
+        qWarning(lcNetMon, "Failed to schedule a reachability callback on a queue");
+        return false;
+    }
+
+    return d->scheduled = true;
+}
+
+bool QNetworkConnectionMonitor::isMonitoring() const
+{
+    Q_D(const QNetworkConnectionMonitor);
+
+    return d->scheduled;
+}
+
+void QNetworkConnectionMonitor::stopMonitoring()
+{
+    Q_D(QNetworkConnectionMonitor);
+
+    if (d->scheduled) {
+        Q_ASSERT(d->probe);
+        SCNetworkReachabilitySetDispatchQueue(d->probe, nullptr);
+        SCNetworkReachabilitySetCallback(d->probe, nullptr, nullptr);
+        d->scheduled = false;
+    }
+}
+
+bool QNetworkConnectionMonitor::isReachable()
+{
+    Q_D(QNetworkConnectionMonitor);
+
+    if (isMonitoring()) {
+        qCWarning(lcNetMon, "Calling isReachable() is unsafe after the monitoring started");
+        return false;
+    }
+
+    if (!d->probe) {
+        qCWarning(lcNetMon, "Reachability is unknown, set the target first");
+        return false;
+    }
+
+    return d->isReachable();
+}
+
+class QNetworkStatusMonitorPrivate : public QObjectPrivate
+{
+public:
+    QNetworkConnectionMonitor ipv4Probe;
+    bool isOnlineIpv4 = false;
+    QNetworkConnectionMonitor ipv6Probe;
+    bool isOnlineIpv6 = false;
+};
+
+QNetworkStatusMonitor::QNetworkStatusMonitor()
+    : QObject(*new QNetworkStatusMonitorPrivate)
+{
+    Q_D(QNetworkStatusMonitor);
+
+    if (d->ipv4Probe.setTargets(QHostAddress::AnyIPv4, {})) {
+        // We manage to create SCNetworkReachabilityRef for IPv4, let's
+        // read the last known state then!
+        d->isOnlineIpv4 = d->ipv4Probe.isReachable();
+    }
+
+    if (d->ipv6Probe.setTargets(QHostAddress::AnyIPv6, {})) {
+        // We manage to create SCNetworkReachability ref for IPv6, let's
+        // read the last known state then!
+        d->isOnlineIpv6 = d->ipv6Probe.isReachable();
+    }
+
+
+    connect(&d->ipv4Probe, &QNetworkConnectionMonitor::reachabilityChanged, this,
+            &QNetworkStatusMonitor::reachabilityChanged, Qt::QueuedConnection);
+    connect(&d->ipv6Probe, &QNetworkConnectionMonitor::reachabilityChanged, this,
+            &QNetworkStatusMonitor::reachabilityChanged, Qt::QueuedConnection);
+}
+
+QNetworkStatusMonitor::~QNetworkStatusMonitor()
+{
+    Q_D(QNetworkStatusMonitor);
+
+    d->ipv4Probe.disconnect();
+    d->ipv4Probe.stopMonitoring();
+    d->ipv6Probe.disconnect();
+    d->ipv6Probe.stopMonitoring();
+}
+
+bool QNetworkStatusMonitor::start()
+{
+    Q_D(QNetworkStatusMonitor);
+
+    if (isMonitoring()) {
+        qCWarning(lcNetMon, "Network status monitor is already active");
+        return true;
+    }
+
+    d->ipv4Probe.startMonitoring();
+    d->ipv6Probe.startMonitoring();
+
+    return isMonitoring();
+}
+
+void QNetworkStatusMonitor::stop()
+{
+    Q_D(QNetworkStatusMonitor);
+
+    if (d->ipv4Probe.isMonitoring())
+        d->ipv4Probe.stopMonitoring();
+    if (d->ipv6Probe.isMonitoring())
+        d->ipv6Probe.stopMonitoring();
+}
+
+bool QNetworkStatusMonitor::isMonitoring() const
+{
+    Q_D(const QNetworkStatusMonitor);
+
+    return d->ipv4Probe.isMonitoring() || d->ipv6Probe.isMonitoring();
+}
+
+bool QNetworkStatusMonitor::isNetworkAccessible()
+{
+    // This function is to be executed on the thread that created
+    // and uses 'this'.
+    Q_D(QNetworkStatusMonitor);
+
+    return d->isOnlineIpv4 || d->isOnlineIpv6;
+}
+
+bool QNetworkStatusMonitor::isEnabled()
+{
+    return true;
+}
+
+void QNetworkStatusMonitor::reachabilityChanged(bool online)
+{
+    // This function is executed on the thread that created/uses 'this',
+    // not on the reachability queue.
+    Q_D(QNetworkStatusMonitor);
+
+    auto probe = qobject_cast<QNetworkConnectionMonitor *>(sender());
+    if (!probe)
+        return;
+
+    const bool isIpv4 = probe == &d->ipv4Probe;
+    bool &probeOnline = isIpv4 ? d->isOnlineIpv4 : d->isOnlineIpv6;
+    bool otherOnline = isIpv4 ? d->isOnlineIpv6 : d->isOnlineIpv4;
+
+    if (probeOnline == online) {
+        // We knew this already?
+        return;
+    }
+
+    probeOnline = online;
+    if (!otherOnline) {
+        // We either just lost or got a network access.
+        emit onlineStateChanged(probeOnline);
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/network/kernel/qnetconmonitor_p.h b/src/network/kernel/qnetconmonitor_p.h
new file mode 100644
index 0000000000..282bac5081
--- /dev/null
+++ b/src/network/kernel/qnetconmonitor_p.h
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNETCONMONITOR_P_H
+#define QNETCONMONITOR_P_H
+
+#include <private/qtnetworkglobal_p.h>
+
+#include <QtCore/qloggingcategory.h>
+#include <QtNetwork/qhostaddress.h>
+#include <QtCore/qglobal.h>
+#include <QtCore/qobject.h>
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+QT_BEGIN_NAMESPACE
+
+class QNetworkConnectionMonitorPrivate;
+class Q_AUTOTEST_EXPORT QNetworkConnectionMonitor : public QObject
+{
+    Q_OBJECT
+
+public:
+    QNetworkConnectionMonitor();
+    QNetworkConnectionMonitor(const QHostAddress &local, const QHostAddress &remote = {});
+    ~QNetworkConnectionMonitor();
+
+    bool setTargets(const QHostAddress &local, const QHostAddress &remote);
+    bool isReachable();
+
+    // Important: on Darwin you should not call isReachable() after
+    // startMonitoring(), you have to listen to reachabilityChanged()
+    // signal instead.
+    bool startMonitoring();
+    bool isMonitoring() const;
+    void stopMonitoring();
+
+Q_SIGNALS:
+    // Important: connect to this using QueuedConnection. On Darwin
+    // callback is coming on a special dispatch queue.
+    void reachabilityChanged(bool isOnline);
+
+private:
+    Q_DECLARE_PRIVATE(QNetworkConnectionMonitor)
+    Q_DISABLE_COPY_MOVE(QNetworkConnectionMonitor)
+};
+
+class QNetworkStatusMonitorPrivate;
+class Q_AUTOTEST_EXPORT QNetworkStatusMonitor : public QObject
+{
+    Q_OBJECT
+
+public:
+    QNetworkStatusMonitor();
+    ~QNetworkStatusMonitor();
+
+    bool isNetworkAccessible();
+
+    bool start();
+    void stop();
+    bool isMonitoring() const;
+
+    static bool isEnabled();
+
+Q_SIGNALS:
+    // Unlike QNetworkConnectionMonitor, this can be connected to directly.
+    void onlineStateChanged(bool isOnline);
+
+private slots:
+    void reachabilityChanged(bool isOnline);
+
+private:
+    Q_DECLARE_PRIVATE(QNetworkStatusMonitor)
+    Q_DISABLE_COPY_MOVE(QNetworkStatusMonitor)
+};
+
+Q_DECLARE_LOGGING_CATEGORY(lcNetMon)
+
+QT_END_NAMESPACE
+
+#endif // QNETCONMONITOR_P_H
diff --git a/src/network/kernel/qnetconmonitor_stub.cpp b/src/network/kernel/qnetconmonitor_stub.cpp
new file mode 100644
index 0000000000..1ad4e9ba5a
--- /dev/null
+++ b/src/network/kernel/qnetconmonitor_stub.cpp
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qnetconmonitor_p.h"
+
+#include "private/qobject_p.h"
+
+QT_BEGIN_NAMESPACE
+
+Q_LOGGING_CATEGORY(lcNetMon, "qt.network.monitor");
+
+// Note: this 'stub' version is never enabled (see QNetworkStatusMonitor::isEnabled below)
+// and thus should never affect QNAM in any unusuall way. Having this 'stub' version is similar
+// to building Qt with bearer management configured out.
+
+class QNetworkConnectionMonitorPrivate : public QObjectPrivate
+{
+};
+
+QNetworkConnectionMonitor::QNetworkConnectionMonitor()
+    : QObject(*new QNetworkConnectionMonitorPrivate)
+{
+}
+
+QNetworkConnectionMonitor::QNetworkConnectionMonitor(const QHostAddress &local, const QHostAddress &remote)
+    : QObject(*new QNetworkConnectionMonitorPrivate)
+{
+    Q_UNUSED(local)
+    Q_UNUSED(remote)
+}
+
+QNetworkConnectionMonitor::~QNetworkConnectionMonitor()
+{
+}
+
+bool QNetworkConnectionMonitor::setTargets(const QHostAddress &local, const QHostAddress &remote)
+{
+    Q_UNUSED(local)
+    Q_UNUSED(remote)
+
+    return false;
+}
+
+bool QNetworkConnectionMonitor::startMonitoring()
+{
+    return false;
+}
+
+bool QNetworkConnectionMonitor::isMonitoring() const
+{
+    return false;
+}
+
+void QNetworkConnectionMonitor::stopMonitoring()
+{
+}
+
+bool QNetworkConnectionMonitor::isReachable()
+{
+    return false;
+}
+
+class QNetworkStatusMonitorPrivate : public QObjectPrivate
+{
+};
+
+QNetworkStatusMonitor::QNetworkStatusMonitor()
+    : QObject(*new QNetworkStatusMonitorPrivate)
+{
+}
+
+QNetworkStatusMonitor::~QNetworkStatusMonitor()
+{
+}
+
+bool QNetworkStatusMonitor::start()
+{
+    return false;
+}
+
+void QNetworkStatusMonitor::stop()
+{
+}
+
+bool QNetworkStatusMonitor::isMonitoring() const
+{
+    return false;
+}
+
+bool QNetworkStatusMonitor::isNetworkAccessible()
+{
+    return false;
+}
+
+bool QNetworkStatusMonitor::isEnabled()
+{
+    return false;
+}
+
+void QNetworkStatusMonitor::reachabilityChanged(bool online)
+{
+    Q_UNUSED(online)
+}
+
+QT_END_NAMESPACE
diff --git a/src/network/kernel/qnetconmonitor_win.cpp b/src/network/kernel/qnetconmonitor_win.cpp
new file mode 100644
index 0000000000..1566e7f914
--- /dev/null
+++ b/src/network/kernel/qnetconmonitor_win.cpp
@@ -0,0 +1,712 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qnetconmonitor_p.h"
+
+#include "private/qobject_p.h"
+
+#include <QtCore/quuid.h>
+#include <QtCore/qmetaobject.h>
+
+#include <QtNetwork/qnetworkinterface.h>
+
+#include <objbase.h>
+#include <netlistmgr.h>
+#include <wrl/client.h>
+#include <wrl/wrappers/corewrappers.h>
+#include <comdef.h>
+#include <iphlpapi.h>
+
+#include <algorithm>
+
+using namespace Microsoft::WRL;
+
+QT_BEGIN_NAMESPACE
+
+Q_LOGGING_CATEGORY(lcNetMon, "qt.network.monitor");
+
+namespace {
+QString errorStringFromHResult(HRESULT hr)
+{
+    _com_error error(hr);
+    return QString::fromWCharArray(error.ErrorMessage());
+}
+
+template<typename T>
+bool QueryInterfaceImpl(IUnknown *from, REFIID riid, void **ppvObject)
+{
+    if (riid == __uuidof(T)) {
+        *ppvObject = static_cast<T *>(from);
+        from->AddRef();
+        return true;
+    }
+    return false;
+}
+
+QNetworkInterface getInterfaceFromHostAddress(const QHostAddress &local)
+{
+    QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
+    auto it = std::find_if(
+            interfaces.cbegin(), interfaces.cend(), [&local](const QNetworkInterface &iface) {
+                const auto &entries = iface.addressEntries();
+                return std::any_of(entries.cbegin(), entries.cend(),
+                                   [&local](const QNetworkAddressEntry &entry) {
+                                       return entry.ip().isEqual(local,
+                                                                 QHostAddress::TolerantConversion);
+                                   });
+            });
+    if (it == interfaces.cend()) {
+        qCWarning(lcNetMon, "Could not find the interface for the local address.");
+        return {};
+    }
+    return *it;
+}
+} // anonymous namespace
+
+class QNetworkConnectionEvents : public INetworkConnectionEvents
+{
+public:
+    QNetworkConnectionEvents(QNetworkConnectionMonitorPrivate *monitor);
+    virtual ~QNetworkConnectionEvents();
+
+    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) override;
+
+    ULONG STDMETHODCALLTYPE AddRef() override { return ++ref; }
+    ULONG STDMETHODCALLTYPE Release() override
+    {
+        if (--ref == 0) {
+            delete this;
+            return 0;
+        }
+        return ref;
+    }
+
+    HRESULT STDMETHODCALLTYPE
+    NetworkConnectionConnectivityChanged(GUID connectionId, NLM_CONNECTIVITY connectivity) override;
+    HRESULT STDMETHODCALLTYPE NetworkConnectionPropertyChanged(
+            GUID connectionId, NLM_CONNECTION_PROPERTY_CHANGE flags) override;
+
+    Q_REQUIRED_RESULT
+    bool setTarget(const QNetworkInterface &iface);
+    Q_REQUIRED_RESULT
+    bool startMonitoring();
+    Q_REQUIRED_RESULT
+    bool stopMonitoring();
+
+private:
+    ComPtr<INetworkConnection> getNetworkConnectionFromAdapterGuid(QUuid guid);
+
+    QUuid currentConnectionId{};
+
+    ComPtr<INetworkListManager> networkListManager;
+    ComPtr<IConnectionPoint> connectionPoint;
+
+    QNetworkConnectionMonitorPrivate *monitor = nullptr;
+
+    QAtomicInteger<ULONG> ref = 0;
+    DWORD cookie = 0;
+};
+
+class QNetworkConnectionMonitorPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QNetworkConnectionMonitor);
+
+public:
+    QNetworkConnectionMonitorPrivate();
+    ~QNetworkConnectionMonitorPrivate();
+
+    Q_REQUIRED_RESULT
+    bool setTargets(const QHostAddress &local, const QHostAddress &remote);
+    Q_REQUIRED_RESULT
+    bool startMonitoring();
+    void stopMonitoring();
+
+    void setConnectivity(NLM_CONNECTIVITY newConnectivity);
+
+private:
+    ComPtr<QNetworkConnectionEvents> connectionEvents;
+    // We can assume we have access to internet/subnet when this class is created because
+    // connection has already been established to the peer:
+    NLM_CONNECTIVITY connectivity =
+            NLM_CONNECTIVITY(NLM_CONNECTIVITY_IPV4_INTERNET | NLM_CONNECTIVITY_IPV6_INTERNET
+                             | NLM_CONNECTIVITY_IPV4_SUBNET | NLM_CONNECTIVITY_IPV6_SUBNET);
+
+    bool sameSubnet = false;
+    bool monitoring = false;
+    bool comInitFailed = false;
+    bool remoteIsIPv6 = false;
+};
+
+QNetworkConnectionEvents::QNetworkConnectionEvents(QNetworkConnectionMonitorPrivate *monitor)
+    : monitor(monitor)
+{
+    auto hr = CoCreateInstance(CLSID_NetworkListManager, nullptr, CLSCTX_INPROC_SERVER,
+                               IID_INetworkListManager, &networkListManager);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Could not get a NetworkListManager instance:"
+                            << errorStringFromHResult(hr);
+        return;
+    }
+
+    ComPtr<IConnectionPointContainer> connectionPointContainer;
+    hr = networkListManager.As(&connectionPointContainer);
+    if (SUCCEEDED(hr)) {
+        hr = connectionPointContainer->FindConnectionPoint(IID_INetworkConnectionEvents,
+                                                           &connectionPoint);
+    }
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to get connection point for network events:"
+                            << errorStringFromHResult(hr);
+    }
+}
+
+QNetworkConnectionEvents::~QNetworkConnectionEvents()
+{
+    Q_ASSERT(ref == 0);
+}
+
+ComPtr<INetworkConnection> QNetworkConnectionEvents::getNetworkConnectionFromAdapterGuid(QUuid guid)
+{
+    ComPtr<IEnumNetworkConnections> connections;
+    auto hr = networkListManager->GetNetworkConnections(connections.GetAddressOf());
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to enumerate network connections:"
+                            << errorStringFromHResult(hr);
+        return nullptr;
+    }
+    ComPtr<INetworkConnection> connection = nullptr;
+    do {
+        hr = connections->Next(1, connection.GetAddressOf(), nullptr);
+        if (FAILED(hr)) {
+            qCWarning(lcNetMon) << "Failed to get next network connection in enumeration:"
+                                << errorStringFromHResult(hr);
+            break;
+        }
+        if (connection) {
+            GUID adapterId;
+            hr = connection->GetAdapterId(&adapterId);
+            if (FAILED(hr)) {
+                qCWarning(lcNetMon) << "Failed to get adapter ID from network connection:"
+                                    << errorStringFromHResult(hr);
+                continue;
+            }
+            if (guid == adapterId)
+                return connection;
+        }
+    } while (connection);
+    return nullptr;
+}
+
+HRESULT STDMETHODCALLTYPE QNetworkConnectionEvents::QueryInterface(REFIID riid, void **ppvObject)
+{
+    if (!ppvObject)
+        return E_INVALIDARG;
+
+    return QueryInterfaceImpl<IUnknown>(this, riid, ppvObject)
+                    || QueryInterfaceImpl<INetworkConnectionEvents>(this, riid, ppvObject)
+            ? S_OK
+            : E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE QNetworkConnectionEvents::NetworkConnectionConnectivityChanged(
+        GUID connectionId, NLM_CONNECTIVITY newConnectivity)
+{
+    // This function is run on a different thread than 'monitor' is created on, so we need to run
+    // it on that thread
+    QMetaObject::invokeMethod(monitor->q_ptr,
+                              [this, connectionId, newConnectivity, monitor = this->monitor]() {
+                                  if (connectionId == currentConnectionId)
+                                      monitor->setConnectivity(newConnectivity);
+                              },
+                              Qt::QueuedConnection);
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE QNetworkConnectionEvents::NetworkConnectionPropertyChanged(
+        GUID connectionId, NLM_CONNECTION_PROPERTY_CHANGE flags)
+{
+    Q_UNUSED(connectionId);
+    Q_UNUSED(flags);
+    return E_NOTIMPL;
+}
+
+bool QNetworkConnectionEvents::setTarget(const QNetworkInterface &iface)
+{
+    // Unset this in case it's already set to something
+    currentConnectionId = QUuid{};
+
+    NET_LUID luid;
+    if (ConvertInterfaceIndexToLuid(iface.index(), &luid) != NO_ERROR) {
+        qCWarning(lcNetMon, "Could not get the LUID for the interface.");
+        return false;
+    }
+    GUID guid;
+    if (ConvertInterfaceLuidToGuid(&luid, &guid) != NO_ERROR) {
+        qCWarning(lcNetMon, "Could not get the GUID for the interface.");
+        return false;
+    }
+    ComPtr<INetworkConnection> connection = getNetworkConnectionFromAdapterGuid(guid);
+    if (!connection) {
+        qCWarning(lcNetMon, "Could not get the INetworkConnection instance for the adapter GUID.");
+        return false;
+    }
+    auto hr = connection->GetConnectionId(&guid);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to get the connection's GUID:" << errorStringFromHResult(hr);
+        return false;
+    }
+    currentConnectionId = guid;
+
+    return true;
+}
+
+bool QNetworkConnectionEvents::startMonitoring()
+{
+    if (currentConnectionId.isNull()) {
+        qCWarning(lcNetMon, "Can not start monitoring, set targets first");
+        return false;
+    }
+    if (!connectionPoint) {
+        qCWarning(lcNetMon,
+                  "We don't have the connection point, cannot start listening to events!");
+        return false;
+    }
+
+    auto hr = connectionPoint->Advise(this, &cookie);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to subscribe to network connectivity events:"
+                            << errorStringFromHResult(hr);
+        return false;
+    }
+    return true;
+}
+
+bool QNetworkConnectionEvents::stopMonitoring()
+{
+    auto hr = connectionPoint->Unadvise(cookie);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to unsubscribe from network connection events:"
+                            << errorStringFromHResult(hr);
+        return false;
+    }
+    cookie = 0;
+    currentConnectionId = QUuid{};
+    return true;
+}
+
+QNetworkConnectionMonitorPrivate::QNetworkConnectionMonitorPrivate()
+{
+    auto hr = CoInitialize(nullptr);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to initialize COM:" << errorStringFromHResult(hr);
+        comInitFailed = true;
+        return;
+    }
+
+    connectionEvents = new QNetworkConnectionEvents(this);
+}
+
+QNetworkConnectionMonitorPrivate::~QNetworkConnectionMonitorPrivate()
+{
+    if (comInitFailed)
+        return;
+    if (monitoring)
+        stopMonitoring();
+    connectionEvents.Reset();
+    CoUninitialize();
+}
+
+bool QNetworkConnectionMonitorPrivate::setTargets(const QHostAddress &local,
+                                                  const QHostAddress &remote)
+{
+    if (comInitFailed)
+        return false;
+
+    QNetworkInterface iface = getInterfaceFromHostAddress(local);
+    if (!iface.isValid())
+        return false;
+    const auto &addressEntries = iface.addressEntries();
+    auto it = std::find_if(
+            addressEntries.cbegin(), addressEntries.cend(),
+            [&local](const QNetworkAddressEntry &entry) { return entry.ip() == local; });
+    if (Q_UNLIKELY(it == addressEntries.cend())) {
+        qCWarning(lcNetMon, "The address entry we were working with disappeared");
+        return false;
+    }
+    sameSubnet = remote.isInSubnet(local, it->prefixLength());
+    remoteIsIPv6 = remote.protocol() == QAbstractSocket::IPv6Protocol;
+
+    return connectionEvents->setTarget(iface);
+}
+
+void QNetworkConnectionMonitorPrivate::setConnectivity(NLM_CONNECTIVITY newConnectivity)
+{
+    Q_Q(QNetworkConnectionMonitor);
+    const bool reachable = q->isReachable();
+    connectivity = newConnectivity;
+    const bool newReachable = q->isReachable();
+    if (reachable != newReachable)
+        emit q->reachabilityChanged(newReachable);
+}
+
+bool QNetworkConnectionMonitorPrivate::startMonitoring()
+{
+    Q_ASSERT(connectionEvents);
+    Q_ASSERT(!monitoring);
+    if (connectionEvents->startMonitoring())
+        monitoring = true;
+    return monitoring;
+}
+
+void QNetworkConnectionMonitorPrivate::stopMonitoring()
+{
+    Q_ASSERT(connectionEvents);
+    Q_ASSERT(monitoring);
+    if (connectionEvents->stopMonitoring())
+        monitoring = false;
+}
+
+QNetworkConnectionMonitor::QNetworkConnectionMonitor()
+    : QObject(*new QNetworkConnectionMonitorPrivate)
+{
+}
+
+QNetworkConnectionMonitor::QNetworkConnectionMonitor(const QHostAddress &local,
+                                                     const QHostAddress &remote)
+    : QObject(*new QNetworkConnectionMonitorPrivate)
+{
+    setTargets(local, remote);
+}
+
+QNetworkConnectionMonitor::~QNetworkConnectionMonitor() = default;
+
+bool QNetworkConnectionMonitor::setTargets(const QHostAddress &local, const QHostAddress &remote)
+{
+    if (isMonitoring()) {
+        qCWarning(lcNetMon, "Monitor is already active, call stopMonitoring() first");
+        return false;
+    }
+    if (local.isNull()) {
+        qCWarning(lcNetMon, "Invalid (null) local address, cannot create a reachability target");
+        return false;
+    }
+    // Silently return false for loopback addresses instead of printing warnings later
+    if (remote.isLoopback())
+        return false;
+
+    return d_func()->setTargets(local, remote);
+}
+
+bool QNetworkConnectionMonitor::startMonitoring()
+{
+    Q_D(QNetworkConnectionMonitor);
+    if (isMonitoring()) {
+        qCWarning(lcNetMon, "Monitor is already active, call stopMonitoring() first");
+        return false;
+    }
+    return d->startMonitoring();
+}
+
+bool QNetworkConnectionMonitor::isMonitoring() const
+{
+    return d_func()->monitoring;
+}
+
+void QNetworkConnectionMonitor::stopMonitoring()
+{
+    Q_D(QNetworkConnectionMonitor);
+    if (!isMonitoring()) {
+        qCWarning(lcNetMon, "stopMonitoring was called when not monitoring!");
+        return;
+    }
+    d->stopMonitoring();
+}
+
+bool QNetworkConnectionMonitor::isReachable()
+{
+    Q_D(QNetworkConnectionMonitor);
+    NLM_CONNECTIVITY required = d->sameSubnet
+            ? (d->remoteIsIPv6 ? NLM_CONNECTIVITY_IPV6_SUBNET : NLM_CONNECTIVITY_IPV4_SUBNET)
+            : (d->remoteIsIPv6 ? NLM_CONNECTIVITY_IPV6_INTERNET : NLM_CONNECTIVITY_IPV4_INTERNET);
+    return d_func()->connectivity & required;
+}
+
+class QNetworkListManagerEvents : public INetworkListManagerEvents
+{
+public:
+    QNetworkListManagerEvents(QNetworkStatusMonitorPrivate *monitor);
+    virtual ~QNetworkListManagerEvents();
+
+    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) override;
+
+    ULONG STDMETHODCALLTYPE AddRef() override { return ++ref; }
+    ULONG STDMETHODCALLTYPE Release() override
+    {
+        if (--ref == 0) {
+            delete this;
+            return 0;
+        }
+        return ref;
+    }
+
+    HRESULT STDMETHODCALLTYPE ConnectivityChanged(NLM_CONNECTIVITY newConnectivity) override;
+
+    Q_REQUIRED_RESULT
+    bool start();
+    Q_REQUIRED_RESULT
+    bool stop();
+
+private:
+    ComPtr<INetworkListManager> networkListManager = nullptr;
+    ComPtr<IConnectionPoint> connectionPoint = nullptr;
+
+    QNetworkStatusMonitorPrivate *monitor = nullptr;
+
+    QAtomicInteger<ULONG> ref = 0;
+    DWORD cookie = 0;
+};
+
+class QNetworkStatusMonitorPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QNetworkStatusMonitor);
+
+public:
+    QNetworkStatusMonitorPrivate();
+    ~QNetworkStatusMonitorPrivate();
+
+    Q_REQUIRED_RESULT
+    bool start();
+    void stop();
+
+    void setConnectivity(NLM_CONNECTIVITY newConnectivity);
+
+private:
+    friend class QNetworkListManagerEvents;
+
+    ComPtr<QNetworkListManagerEvents> managerEvents;
+    NLM_CONNECTIVITY connectivity = NLM_CONNECTIVITY_DISCONNECTED;
+
+    bool monitoring = false;
+    bool comInitFailed = false;
+};
+
+QNetworkListManagerEvents::QNetworkListManagerEvents(QNetworkStatusMonitorPrivate *monitor)
+    : monitor(monitor)
+{
+    auto hr = CoCreateInstance(CLSID_NetworkListManager, nullptr, CLSCTX_INPROC_SERVER,
+                               IID_INetworkListManager, &networkListManager);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Could not get a NetworkListManager instance:"
+                            << errorStringFromHResult(hr);
+        return;
+    }
+
+    // Set initial connectivity
+    hr = networkListManager->GetConnectivity(&monitor->connectivity);
+    if (FAILED(hr))
+        qCWarning(lcNetMon) << "Could not get connectivity:" << errorStringFromHResult(hr);
+
+    ComPtr<IConnectionPointContainer> connectionPointContainer;
+    hr = networkListManager.As(&connectionPointContainer);
+    if (SUCCEEDED(hr)) {
+        hr = connectionPointContainer->FindConnectionPoint(IID_INetworkListManagerEvents,
+                                                           &connectionPoint);
+    }
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to get connection point for network list manager events:"
+                            << errorStringFromHResult(hr);
+    }
+}
+
+QNetworkListManagerEvents::~QNetworkListManagerEvents()
+{
+    Q_ASSERT(ref == 0);
+}
+
+HRESULT STDMETHODCALLTYPE QNetworkListManagerEvents::QueryInterface(REFIID riid, void **ppvObject)
+{
+    if (!ppvObject)
+        return E_INVALIDARG;
+
+    return QueryInterfaceImpl<IUnknown>(this, riid, ppvObject)
+                    || QueryInterfaceImpl<INetworkListManagerEvents>(this, riid, ppvObject)
+            ? S_OK
+            : E_NOINTERFACE;
+}
+
+HRESULT STDMETHODCALLTYPE
+QNetworkListManagerEvents::ConnectivityChanged(NLM_CONNECTIVITY newConnectivity)
+{
+    // This function is run on a different thread than 'monitor' is created on, so we need to run
+    // it on that thread
+    QMetaObject::invokeMethod(monitor->q_ptr,
+                              [newConnectivity, monitor = this->monitor]() {
+                                  monitor->setConnectivity(newConnectivity);
+                              },
+                              Qt::QueuedConnection);
+    return S_OK;
+}
+
+bool QNetworkListManagerEvents::start()
+{
+    if (!connectionPoint) {
+        qCWarning(lcNetMon, "Initialization failed, can't start!");
+        return false;
+    }
+    auto hr = connectionPoint->Advise(this, &cookie);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to subscribe to network connectivity events:"
+                            << errorStringFromHResult(hr);
+        return false;
+    }
+    return true;
+}
+
+bool QNetworkListManagerEvents::stop()
+{
+    Q_ASSERT(connectionPoint);
+    auto hr = connectionPoint->Unadvise(cookie);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to unsubscribe from network connectivity events:"
+                            << errorStringFromHResult(hr);
+        return false;
+    }
+    cookie = 0;
+    return true;
+}
+
+QNetworkStatusMonitorPrivate::QNetworkStatusMonitorPrivate()
+{
+    auto hr = CoInitialize(nullptr);
+    if (FAILED(hr)) {
+        qCWarning(lcNetMon) << "Failed to initialize COM:" << errorStringFromHResult(hr);
+        comInitFailed = true;
+        return;
+    }
+    managerEvents = new QNetworkListManagerEvents(this);
+}
+
+QNetworkStatusMonitorPrivate::~QNetworkStatusMonitorPrivate()
+{
+    if (comInitFailed)
+        return;
+    if (monitoring)
+        stop();
+    managerEvents.Reset();
+    CoUninitialize();
+}
+
+void QNetworkStatusMonitorPrivate::setConnectivity(NLM_CONNECTIVITY newConnectivity)
+{
+    Q_Q(QNetworkStatusMonitor);
+
+    const bool oldAccessibility = q->isNetworkAccessible();
+    connectivity = newConnectivity;
+    const bool accessibility = q->isNetworkAccessible();
+    if (oldAccessibility != accessibility)
+        emit q->onlineStateChanged(accessibility);
+}
+
+bool QNetworkStatusMonitorPrivate::start()
+{
+    if (comInitFailed)
+        return false;
+    Q_ASSERT(managerEvents);
+    Q_ASSERT(!monitoring);
+    if (managerEvents->start())
+        monitoring = true;
+    return monitoring;
+}
+
+void QNetworkStatusMonitorPrivate::stop()
+{
+    Q_ASSERT(managerEvents);
+    Q_ASSERT(monitoring);
+    if (managerEvents->stop())
+        monitoring = false;
+}
+
+QNetworkStatusMonitor::QNetworkStatusMonitor() : QObject(*new QNetworkStatusMonitorPrivate) {}
+
+QNetworkStatusMonitor::~QNetworkStatusMonitor() {}
+
+bool QNetworkStatusMonitor::start()
+{
+    if (isMonitoring()) {
+        qCWarning(lcNetMon, "Monitor is already active, call stopMonitoring() first");
+        return false;
+    }
+
+    return d_func()->start();
+}
+
+void QNetworkStatusMonitor::stop()
+{
+    if (!isMonitoring()) {
+        qCWarning(lcNetMon, "stopMonitoring was called when not monitoring!");
+        return;
+    }
+
+    d_func()->stop();
+}
+
+bool QNetworkStatusMonitor::isMonitoring() const
+{
+    return d_func()->monitoring;
+}
+
+bool QNetworkStatusMonitor::isNetworkAccessible()
+{
+    return d_func()->connectivity
+            & (NLM_CONNECTIVITY_IPV4_INTERNET | NLM_CONNECTIVITY_IPV6_INTERNET
+               | NLM_CONNECTIVITY_IPV4_SUBNET | NLM_CONNECTIVITY_IPV6_SUBNET);
+}
+
+bool QNetworkStatusMonitor::isEnabled()
+{
+    return true;
+}
+
+void QNetworkStatusMonitor::reachabilityChanged(bool online)
+{
+    Q_UNUSED(online);
+    Q_UNREACHABLE();
+}
+
+QT_END_NAMESPACE
diff --git a/src/network/kernel/qnetworkdatagram.h b/src/network/kernel/qnetworkdatagram.h
index 1acb44a1e0..70958fea42 100644
--- a/src/network/kernel/qnetworkdatagram.h
+++ b/src/network/kernel/qnetworkdatagram.h
@@ -61,13 +61,13 @@ public:
     ~QNetworkDatagram()
     { if (d) destroy(d); }
 
-    QNetworkDatagram(QNetworkDatagram &&other) Q_DECL_NOTHROW
+    QNetworkDatagram(QNetworkDatagram &&other) noexcept
         : d(other.d)
     { other.d = nullptr; }
-    QNetworkDatagram &operator=(QNetworkDatagram &&other) Q_DECL_NOTHROW
+    QNetworkDatagram &operator=(QNetworkDatagram &&other) noexcept
     { swap(other); return *this; }
 
-    void swap(QNetworkDatagram &other) Q_DECL_NOTHROW
+    void swap(QNetworkDatagram &other) noexcept
     { qSwap(d, other.d); }
 
     void clear();
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h
index 148fd5e10d..4caedaa38f 100644
--- a/src/network/kernel/qnetworkinterface.h
+++ b/src/network/kernel/qnetworkinterface.h
@@ -64,13 +64,11 @@ public:
 
     QNetworkAddressEntry();
     QNetworkAddressEntry(const QNetworkAddressEntry &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QNetworkAddressEntry &operator=(QNetworkAddressEntry &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QNetworkAddressEntry &operator=(QNetworkAddressEntry &&other) noexcept { swap(other); return *this; }
     QNetworkAddressEntry &operator=(const QNetworkAddressEntry &other);
     ~QNetworkAddressEntry();
 
-    void swap(QNetworkAddressEntry &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QNetworkAddressEntry &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QNetworkAddressEntry &other) const;
     inline bool operator!=(const QNetworkAddressEntry &other) const
@@ -142,13 +140,11 @@ public:
 
     QNetworkInterface();
     QNetworkInterface(const QNetworkInterface &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QNetworkInterface &operator=(QNetworkInterface &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QNetworkInterface &operator=(QNetworkInterface &&other) noexcept { swap(other); return *this; }
     QNetworkInterface &operator=(const QNetworkInterface &other);
     ~QNetworkInterface();
 
-    void swap(QNetworkInterface &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QNetworkInterface &other) noexcept { qSwap(d, other.d); }
 
     bool isValid() const;
 
diff --git a/src/network/kernel/qnetworkinterface_p.h b/src/network/kernel/qnetworkinterface_p.h
index 87a46b75fa..44e27a7e34 100644
--- a/src/network/kernel/qnetworkinterface_p.h
+++ b/src/network/kernel/qnetworkinterface_p.h
@@ -82,7 +82,7 @@ public:
 class QNetworkInterfacePrivate: public QSharedData
 {
 public:
-    QNetworkInterfacePrivate() : index(0), flags(0)
+    QNetworkInterfacePrivate() : index(0), flags(nullptr)
     { }
     ~QNetworkInterfacePrivate()
     { }
diff --git a/src/network/kernel/qnetworkinterface_unix_p.h b/src/network/kernel/qnetworkinterface_unix_p.h
index c085194e3c..553af5a303 100644
--- a/src/network/kernel/qnetworkinterface_unix_p.h
+++ b/src/network/kernel/qnetworkinterface_unix_p.h
@@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
 
 static QNetworkInterface::InterfaceFlags convertFlags(uint rawFlags)
 {
-    QNetworkInterface::InterfaceFlags flags = 0;
+    QNetworkInterface::InterfaceFlags flags = nullptr;
     flags |= (rawFlags & IFF_UP) ? QNetworkInterface::IsUp : QNetworkInterface::InterfaceFlag(0);
     flags |= (rawFlags & IFF_RUNNING) ? QNetworkInterface::IsRunning : QNetworkInterface::InterfaceFlag(0);
     flags |= (rawFlags & IFF_BROADCAST) ? QNetworkInterface::CanBroadcast : QNetworkInterface::InterfaceFlag(0);
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index febddfd880..a2a89ed94b 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -254,8 +254,7 @@ class QGlobalNetworkProxy
 {
 public:
     QGlobalNetworkProxy()
-        : mutex(QMutex::Recursive)
-        , applicationLevelProxy(0)
+        : applicationLevelProxy(0)
         , applicationLevelProxyFactory(0)
 #if QT_CONFIG(socks5)
         , socks5SocketEngineHandler(0)
@@ -338,7 +337,7 @@ public:
     QList<QNetworkProxy> proxyForQuery(const QNetworkProxyQuery &query);
 
 private:
-    QMutex mutex;
+    QRecursiveMutex mutex;
     QNetworkProxy *applicationLevelProxy;
     QNetworkProxyFactory *applicationLevelProxyFactory;
 #if QT_CONFIG(socks5)
@@ -483,7 +482,7 @@ public:
 
 template<> void QSharedDataPointer<QNetworkProxyPrivate>::detach()
 {
-    if (d && d->ref.load() == 1)
+    if (d && d->ref.loadRelaxed() == 1)
         return;
     QNetworkProxyPrivate *x = (d ? new QNetworkProxyPrivate(*d)
                                : new QNetworkProxyPrivate);
@@ -927,7 +926,7 @@ public:
 
 template<> void QSharedDataPointer<QNetworkProxyQueryPrivate>::detach()
 {
-    if (d && d->ref.load() == 1)
+    if (d && d->ref.loadRelaxed() == 1)
         return;
     QNetworkProxyQueryPrivate *x = (d ? new QNetworkProxyQueryPrivate(*d)
                                     : new QNetworkProxyQueryPrivate);
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h
index 7e3e6906a8..302a2ce6ca 100644
--- a/src/network/kernel/qnetworkproxy.h
+++ b/src/network/kernel/qnetworkproxy.h
@@ -89,13 +89,11 @@ public:
                        QueryType queryType = TcpServer);
 #endif
     QNetworkProxyQuery(const QNetworkProxyQuery &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QNetworkProxyQuery &operator=(QNetworkProxyQuery &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QNetworkProxyQuery &operator=(QNetworkProxyQuery &&other) noexcept { swap(other); return *this; }
     QNetworkProxyQuery &operator=(const QNetworkProxyQuery &other);
     ~QNetworkProxyQuery();
 
-    void swap(QNetworkProxyQuery &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QNetworkProxyQuery &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QNetworkProxyQuery &other) const;
     inline bool operator!=(const QNetworkProxyQuery &other) const
@@ -161,13 +159,11 @@ public:
     QNetworkProxy(ProxyType type, const QString &hostName = QString(), quint16 port = 0,
                   const QString &user = QString(), const QString &password = QString());
     QNetworkProxy(const QNetworkProxy &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QNetworkProxy &operator=(QNetworkProxy &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QNetworkProxy &operator=(QNetworkProxy &&other) noexcept { swap(other); return *this; }
     QNetworkProxy &operator=(const QNetworkProxy &other);
     ~QNetworkProxy();
 
-    void swap(QNetworkProxy &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QNetworkProxy &other) noexcept { qSwap(d, other.d); }
 
     bool operator==(const QNetworkProxy &other) const;
     inline bool operator!=(const QNetworkProxy &other) const
diff --git a/src/network/network.pro b/src/network/network.pro
index 9082439f1c..d8453e879c 100644
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -26,7 +26,7 @@ qtConfig(bearermanagement) {
     ANDROID_BUNDLED_JAR_DEPENDENCIES = \
         jar/QtAndroidBearer.jar
     ANDROID_LIB_DEPENDENCIES = \
-        plugins/bearer/libqandroidbearer.so
+        plugins/bearer/libplugins_bearer_qandroidbearer.so
     MODULE_PLUGIN_TYPES = \
         bearer
     ANDROID_PERMISSIONS += \
diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h
index 8eebb06a4d..112e7032d6 100644
--- a/src/network/socket/qabstractsocketengine_p.h
+++ b/src/network/socket/qabstractsocketengine_p.h
@@ -88,7 +88,7 @@ public:
     static QAbstractSocketEngine *createSocketEngine(QAbstractSocket::SocketType socketType, const QNetworkProxy &, QObject *parent);
     static QAbstractSocketEngine *createSocketEngine(qintptr socketDescriptor, QObject *parent);
 
-    QAbstractSocketEngine(QObject *parent = 0);
+    QAbstractSocketEngine(QObject *parent = nullptr);
 
     enum SocketOption {
         NonBlockingSocketOption,
@@ -155,7 +155,7 @@ public:
     virtual qint64 pendingDatagramSize() const = 0;
 #endif // QT_NO_UDPSOCKET
 
-    virtual qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader *header = 0,
+    virtual qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader *header = nullptr,
                                 PacketHeaderOptions = WantNone) = 0;
     virtual qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &header) = 0;
     virtual qint64 bytesToWrite() const = 0;
@@ -163,11 +163,11 @@ public:
     virtual int option(SocketOption option) const = 0;
     virtual bool setOption(SocketOption option, int value) = 0;
 
-    virtual bool waitForRead(int msecs = 30000, bool *timedOut = 0) = 0;
-    virtual bool waitForWrite(int msecs = 30000, bool *timedOut = 0) = 0;
+    virtual bool waitForRead(int msecs = 30000, bool *timedOut = nullptr) = 0;
+    virtual bool waitForWrite(int msecs = 30000, bool *timedOut = nullptr) = 0;
     virtual bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = 0) = 0;
+                            int msecs = 30000, bool *timedOut = nullptr) = 0;
 
     QAbstractSocket::SocketError error() const;
     QString errorString() const;
@@ -202,7 +202,7 @@ public Q_SLOTS:
 public:
     void setReceiver(QAbstractSocketEngineReceiver *receiver);
 protected:
-    QAbstractSocketEngine(QAbstractSocketEnginePrivate &dd, QObject* parent = 0);
+    QAbstractSocketEngine(QAbstractSocketEnginePrivate &dd, QObject* parent = nullptr);
 
     void setError(QAbstractSocket::SocketError error, const QString &errorString) const;
     void setState(QAbstractSocket::SocketState state);
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index bfde3870c4..c67b273937 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -524,7 +524,7 @@ void QHttpSocketEngine::slotSocketConnected()
     //qDebug() << "slotSocketConnected: priv=" << priv << (priv ? (int)priv->method : -1);
     if (priv && priv->method != QAuthenticatorPrivate::None) {
         d->credentialsSent = true;
-        data += "Proxy-Authorization: " + priv->calculateResponse(method, path);
+        data += "Proxy-Authorization: " + priv->calculateResponse(method, path, d->proxy.hostName());
         data += "\r\n";
     }
     data += "\r\n";
diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h
index bbcc09eee9..0c2c450c81 100644
--- a/src/network/socket/qhttpsocketengine_p.h
+++ b/src/network/socket/qhttpsocketengine_p.h
@@ -79,7 +79,7 @@ public:
         ReadResponseContent,
         ReadResponseHeader
     };
-    QHttpSocketEngine(QObject *parent = 0);
+    QHttpSocketEngine(QObject *parent = nullptr);
     ~QHttpSocketEngine();
 
     bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override;
@@ -126,11 +126,11 @@ public:
     int option(SocketOption option) const override;
     bool setOption(SocketOption option, int value) override;
 
-    bool waitForRead(int msecs = 30000, bool *timedOut = 0) override;
-    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override;
+    bool waitForRead(int msecs = 30000, bool *timedOut = nullptr) override;
+    bool waitForWrite(int msecs = 30000, bool *timedOut = nullptr) override;
     bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = 0) override;
+                            int msecs = 30000, bool *timedOut = nullptr) override;
 
     bool isReadNotificationEnabled() const override;
     void setReadNotificationEnabled(bool enable) override;
diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h
index 2c073908cb..92616e59ce 100644
--- a/src/network/socket/qlocalserver_p.h
+++ b/src/network/socket/qlocalserver_p.h
@@ -78,7 +78,7 @@ class QLocalServerPrivate : public QObjectPrivate
 public:
     QLocalServerPrivate() :
 #if !defined(QT_LOCALSOCKET_TCP) && !defined(Q_OS_WIN)
-            listenSocket(-1), socketNotifier(0),
+            listenSocket(-1), socketNotifier(nullptr),
 #endif
             maxPendingConnections(30), error(QAbstractSocket::UnknownSocketError),
             socketOptions(QLocalServer::NoOptions)
diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h
index 2292566265..e5f0701d14 100644
--- a/src/network/socket/qnativesocketengine_p.h
+++ b/src/network/socket/qnativesocketengine_p.h
@@ -125,7 +125,7 @@ class Q_AUTOTEST_EXPORT QNativeSocketEngine : public QAbstractSocketEngine
 {
     Q_OBJECT
 public:
-    QNativeSocketEngine(QObject *parent = 0);
+    QNativeSocketEngine(QObject *parent = nullptr);
     ~QNativeSocketEngine();
 
     bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override;
@@ -161,7 +161,7 @@ public:
     qint64 pendingDatagramSize() const override;
 #endif // QT_NO_UDPSOCKET
 
-    qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader * = 0,
+    qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader * = nullptr,
                         PacketHeaderOptions = WantNone) override;
     qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) override;
     qint64 bytesToWrite() const override;
@@ -177,11 +177,11 @@ public:
     int option(SocketOption option) const override;
     bool setOption(SocketOption option, int value) override;
 
-    bool waitForRead(int msecs = 30000, bool *timedOut = 0) override;
-    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override;
+    bool waitForRead(int msecs = 30000, bool *timedOut = nullptr) override;
+    bool waitForWrite(int msecs = 30000, bool *timedOut = nullptr) override;
     bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = 0) override;
+                            int msecs = 30000, bool *timedOut = nullptr) override;
 
     bool isReadNotificationEnabled() const override;
     void setReadNotificationEnabled(bool enable) override;
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 24c17124dc..3ca586e247 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -1000,8 +1000,11 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS
 
         // parse the ancillary data
         struct cmsghdr *cmsgptr;
+        QT_WARNING_PUSH
+        QT_WARNING_DISABLE_CLANG("-Wsign-compare")
         for (cmsgptr = CMSG_FIRSTHDR(&msg); cmsgptr != NULL;
              cmsgptr = CMSG_NXTHDR(&msg, cmsgptr)) {
+            QT_WARNING_POP
             if (cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_PKTINFO
                     && cmsgptr->cmsg_len >= CMSG_LEN(sizeof(in6_pktinfo))) {
                 in6_pktinfo *info = reinterpret_cast<in6_pktinfo *>(CMSG_DATA(cmsgptr));
diff --git a/src/network/socket/qsctpserver.cpp b/src/network/socket/qsctpserver.cpp
index 77cb997192..2aa694b3fd 100644
--- a/src/network/socket/qsctpserver.cpp
+++ b/src/network/socket/qsctpserver.cpp
@@ -229,13 +229,12 @@ QSctpSocket *QSctpServer::nextPendingDatagramConnection()
 {
     Q_D(QSctpServer);
 
-    QMutableListIterator<QTcpSocket *> i(d->pendingConnections);
-    while (i.hasNext()) {
-        QSctpSocket *socket = qobject_cast<QSctpSocket *>(i.next());
+    for (auto it = d->pendingConnections.begin(), end = d->pendingConnections.end(); it != end; ++it) {
+        QSctpSocket *socket = qobject_cast<QSctpSocket *>(*it);
         Q_ASSERT(socket);
 
         if (socket->isInDatagramMode()) {
-            i.remove();
+            d->pendingConnections.erase(it);
             Q_ASSERT(d->socketEngine);
             d->socketEngine->setReadNotificationEnabled(true);
             return socket;
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 18b3ce9db2..8a030601dc 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -322,8 +322,8 @@ public:
 protected:
     void timerEvent(QTimerEvent * event) override;
 
-    QMutex mutex;
-    int sweepTimerId;
+    QRecursiveMutex mutex;
+    int sweepTimerId = -1;
     //socket descriptor, data, timestamp
     QHash<int, QSocks5BindData *> store;
 };
@@ -331,8 +331,6 @@ protected:
 Q_GLOBAL_STATIC(QSocks5BindStore, socks5BindStore)
 
 QSocks5BindStore::QSocks5BindStore()
-    : mutex(QMutex::Recursive)
-    , sweepTimerId(-1)
 {
     QCoreApplication *app = QCoreApplication::instance();
     if (app && app->thread() != thread())
@@ -801,9 +799,9 @@ void QSocks5SocketEnginePrivate::sendRequestMethod()
 
     QByteArray buf;
     buf.reserve(270); // big enough for domain name;
-    buf[0] = S5_VERSION_5;
-    buf[1] = command;
-    buf[2] = 0x00;
+    buf.append(char(S5_VERSION_5));
+    buf.append(command);
+    buf.append('\0');
     if (peerName.isEmpty() && !qt_socks5_set_host_address_and_port(address, port, &buf)) {
         QSOCKS5_DEBUG << "error setting address" << address << " : " << port;
         //### set error code ....
diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h
index ef9d771753..c256987e2d 100644
--- a/src/network/socket/qsocks5socketengine_p.h
+++ b/src/network/socket/qsocks5socketengine_p.h
@@ -65,7 +65,7 @@ class Q_AUTOTEST_EXPORT QSocks5SocketEngine : public QAbstractSocketEngine
 {
     Q_OBJECT
 public:
-    QSocks5SocketEngine(QObject *parent = 0);
+    QSocks5SocketEngine(QObject *parent = nullptr);
     ~QSocks5SocketEngine();
 
     bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override;
@@ -104,7 +104,7 @@ public:
     qint64 pendingDatagramSize() const override;
 #endif // QT_NO_UDPSOCKET
 
-    qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader * = 0,
+    qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader * = nullptr,
                         PacketHeaderOptions = WantNone) override;
     qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) override;
     qint64 bytesToWrite() const override;
@@ -112,11 +112,11 @@ public:
     int option(SocketOption option) const override;
     bool setOption(SocketOption option, int value) override;
 
-    bool waitForRead(int msecs = 30000, bool *timedOut = 0) override;
-    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override;
+    bool waitForRead(int msecs = 30000, bool *timedOut = nullptr) override;
+    bool waitForWrite(int msecs = 30000, bool *timedOut = nullptr) override;
     bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = 0) override;
+                            int msecs = 30000, bool *timedOut = nullptr) override;
 
     bool isReadNotificationEnabled() const override;
     void setReadNotificationEnabled(bool enable) override;
diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri
index 44ff5b7b39..c3a98ea31a 100644
--- a/src/network/socket/socket.pri
+++ b/src/network/socket/socket.pri
@@ -58,7 +58,7 @@ unix {
 msvc: QMAKE_MOC_OPTIONS += -D_WINSOCK_DEPRECATED_NO_WARNINGS
 
 win32:!winrt:SOURCES += socket/qnativesocketengine_win.cpp
-win32:!winrt:LIBS_PRIVATE += -ladvapi32
+win32:!winrt: QMAKE_USE_PRIVATE += advapi32
 
 winrt {
     SOURCES += socket/qnativesocketengine_winrt.cpp
diff --git a/src/network/ssl/qasn1element_p.h b/src/network/ssl/qasn1element_p.h
index 22948e3ca5..020b5aa1af 100644
--- a/src/network/ssl/qasn1element_p.h
+++ b/src/network/ssl/qasn1element_p.h
@@ -156,10 +156,10 @@ public:
     static QAsn1Element fromVector(const QVector<QAsn1Element> &items);
     static QAsn1Element fromObjectId(const QByteArray &id);
 
-    bool toBool(bool *ok = 0) const;
+    bool toBool(bool *ok = nullptr) const;
     QDateTime toDateTime() const;
     QMultiMap<QByteArray, QString> toInfo() const;
-    qint64 toInteger(bool *ok = 0) const;
+    qint64 toInteger(bool *ok = nullptr) const;
     QVector<QAsn1Element> toVector() const;
     QByteArray toObjectId() const;
     QByteArray toObjectName() const;
diff --git a/src/network/ssl/qdtls.cpp b/src/network/ssl/qdtls.cpp
index 3185bfa124..a2280a7d10 100644
--- a/src/network/ssl/qdtls.cpp
+++ b/src/network/ssl/qdtls.cpp
@@ -342,7 +342,7 @@ QT_BEGIN_NAMESPACE
 QSslConfiguration QDtlsBasePrivate::configuration() const
 {
     auto copyPrivate = new QSslConfigurationPrivate(dtlsConfiguration);
-    copyPrivate->ref.store(0); // the QSslConfiguration constructor refs up
+    copyPrivate->ref.storeRelaxed(0); // the QSslConfiguration constructor refs up
     QSslConfiguration copy(copyPrivate);
     copyPrivate->sessionCipher = sessionCipher;
     copyPrivate->sessionProtocol = sessionProtocol;
diff --git a/src/network/ssl/qdtls_openssl.cpp b/src/network/ssl/qdtls_openssl.cpp
index 8be53df24f..d9ddcceb40 100644
--- a/src/network/ssl/qdtls_openssl.cpp
+++ b/src/network/ssl/qdtls_openssl.cpp
@@ -729,7 +729,7 @@ bool DtlsState::initCtxAndConnection(QDtlsBasePrivate *dtlsBase)
 
     // Create a deep copy of our configuration
     auto configurationCopy = new QSslConfigurationPrivate(dtlsBase->dtlsConfiguration);
-    configurationCopy->ref.store(0); // the QSslConfiguration constructor refs up
+    configurationCopy->ref.storeRelaxed(0); // the QSslConfiguration constructor refs up
 
     // DTLSTODO: check we do not set something DTLS-incompatible there ...
     TlsContext newContext(QSslContext::sharedFromConfiguration(dtlsBase->mode,
diff --git a/src/network/ssl/qocspresponse.cpp b/src/network/ssl/qocspresponse.cpp
index d564e817ca..bf27bb768b 100644
--- a/src/network/ssl/qocspresponse.cpp
+++ b/src/network/ssl/qocspresponse.cpp
@@ -133,7 +133,7 @@ QOcspResponse::QOcspResponse(const QOcspResponse &) = default;
 
     Move-constructs a QOcspResponse instance.
 */
-QOcspResponse::QOcspResponse(QOcspResponse &&) Q_DECL_NOTHROW = default;
+QOcspResponse::QOcspResponse(QOcspResponse &&) noexcept = default;
 
 /*!
     \since 5.13
@@ -154,7 +154,7 @@ QOcspResponse &QOcspResponse::operator=(const QOcspResponse &) = default;
 
     Move-assigns to this QOcspResponse instance.
 */
-QOcspResponse &QOcspResponse::operator=(QOcspResponse &&) Q_DECL_NOTHROW = default;
+QOcspResponse &QOcspResponse::operator=(QOcspResponse &&) noexcept = default;
 
 /*!
     \fn void QOcspResponse::swap(QOcspResponse &other)
@@ -239,7 +239,7 @@ Q_NETWORK_EXPORT bool operator==(const QOcspResponse &lhs, const QOcspResponse &
     \since 5.13
     \relates QHash
 */
-uint qHash(const QOcspResponse &response, uint seed)
+uint qHash(const QOcspResponse &response, uint seed) noexcept
 {
     const QOcspResponsePrivate *d = response.d.data();
     Q_ASSERT(d);
diff --git a/src/network/ssl/qocspresponse.h b/src/network/ssl/qocspresponse.h
index 552a088ba5..cf6be5a369 100644
--- a/src/network/ssl/qocspresponse.h
+++ b/src/network/ssl/qocspresponse.h
@@ -73,7 +73,7 @@ enum class QOcspRevocationReason
 };
 
 class QOcspResponse;
-Q_NETWORK_EXPORT uint qHash(const QOcspResponse &response, uint seed = 0);
+Q_NETWORK_EXPORT uint qHash(const QOcspResponse &response, uint seed = 0) noexcept;
 
 class QOcspResponsePrivate;
 class Q_NETWORK_EXPORT QOcspResponse
@@ -82,11 +82,11 @@ public:
 
     QOcspResponse();
     QOcspResponse(const QOcspResponse &other);
-    QOcspResponse(QOcspResponse && other)  Q_DECL_NOEXCEPT;
+    QOcspResponse(QOcspResponse && other)  noexcept;
     ~QOcspResponse();
 
     QOcspResponse &operator = (const QOcspResponse &other);
-    QOcspResponse &operator = (QOcspResponse &&other) Q_DECL_NOTHROW;
+    QOcspResponse &operator = (QOcspResponse &&other) noexcept;
 
     QOcspCertificateStatus certificateStatus() const;
     QOcspRevocationReason revocationReason() const;
@@ -94,13 +94,13 @@ public:
     class QSslCertificate responder() const;
     QSslCertificate subject() const;
 
-    void swap(QOcspResponse &other) Q_DECL_NOTHROW { d.swap(other.d); }
+    void swap(QOcspResponse &other) noexcept { d.swap(other.d); }
 
 private:
 
     friend class QSslSocketBackendPrivate;
     friend Q_NETWORK_EXPORT bool operator==(const QOcspResponse &lhs, const QOcspResponse &rhs);
-    friend Q_NETWORK_EXPORT uint qHash(const QOcspResponse &response, uint seed);
+    friend Q_NETWORK_EXPORT uint qHash(const QOcspResponse &response, uint seed) noexcept;
 
     QSharedDataPointer<QOcspResponsePrivate> d;
 };
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 266fcdacb4..69901b526c 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -66,7 +66,7 @@ class QStringList;
 
 class QSslCertificate;
 // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4)
-Q_NETWORK_EXPORT uint qHash(const QSslCertificate &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_NETWORK_EXPORT uint qHash(const QSslCertificate &key, uint seed = 0) noexcept;
 
 class QSslCertificatePrivate;
 class Q_NETWORK_EXPORT QSslCertificate
@@ -88,12 +88,10 @@ public:
     explicit QSslCertificate(const QByteArray &data = QByteArray(), QSsl::EncodingFormat format = QSsl::Pem);
     QSslCertificate(const QSslCertificate &other);
     ~QSslCertificate();
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSslCertificate &operator=(QSslCertificate &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QSslCertificate &operator=(QSslCertificate &&other) noexcept { swap(other); return *this; }
     QSslCertificate &operator=(const QSslCertificate &other);
 
-    void swap(QSslCertificate &other) Q_DECL_NOTHROW
+    void swap(QSslCertificate &other) noexcept
     { qSwap(d, other.d); }
 
     bool operator==(const QSslCertificate &other) const;
@@ -169,7 +167,7 @@ private:
     friend class QSslCertificatePrivate;
     friend class QSslSocketBackendPrivate;
 
-    friend Q_NETWORK_EXPORT uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW;
+    friend Q_NETWORK_EXPORT uint qHash(const QSslCertificate &key, uint seed) noexcept;
 };
 Q_DECLARE_SHARED(QSslCertificate)
 
diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp
index 899c8a0d2d..6f1fb26add 100644
--- a/src/network/ssl/qsslcertificate_openssl.cpp
+++ b/src/network/ssl/qsslcertificate_openssl.cpp
@@ -45,12 +45,19 @@
 #include "qsslcertificateextension_p.h"
 
 #include <QtCore/qendian.h>
+#include <QtCore/qmutex.h>
 
-#if QT_CONFIG(thread)
-#include <QtCore/private/qmutexpool_p.h>
-#endif
 QT_BEGIN_NAMESPACE
 
+Q_CONSTEXPR int MutexPoolSize = 17;
+static QBasicMutex mutexPool[MutexPoolSize];
+namespace QMutexPool {
+    static QBasicMutex *globalInstanceGet(const void *addr)
+    {
+        return mutexPool + (quintptr(addr) % MutexPoolSize);
+    }
+}
+
 // forward declaration
 static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name);
 
@@ -65,7 +72,7 @@ bool QSslCertificate::operator==(const QSslCertificate &other) const
     return false;
 }
 
-uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QSslCertificate &key, uint seed) noexcept
 {
     if (X509 * const x509 = key.d->x509) {
         const EVP_MD *sha1 = q_EVP_sha1();
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
index 4b331d4c4e..234cd45ceb 100644
--- a/src/network/ssl/qsslcertificate_p.h
+++ b/src/network/ssl/qsslcertificate_p.h
@@ -87,7 +87,7 @@ class QSslCertificatePrivate
 {
 public:
     QSslCertificatePrivate()
-        : null(true), x509(0)
+        : null(true), x509(nullptr)
     {
 #ifndef QT_NO_SSL
         QSslSocketPrivate::ensureInitialized();
diff --git a/src/network/ssl/qsslcertificate_qt.cpp b/src/network/ssl/qsslcertificate_qt.cpp
index cce59b5ef3..8b5035ad96 100644
--- a/src/network/ssl/qsslcertificate_qt.cpp
+++ b/src/network/ssl/qsslcertificate_qt.cpp
@@ -64,7 +64,7 @@ bool QSslCertificate::operator==(const QSslCertificate &other) const
     return d->derData == other.d->derData;
 }
 
-uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QSslCertificate &key, uint seed) noexcept
 {
     // DER is the native encoding here, so toDer() is just "return d->derData":
     return qHash(key.toDer(), seed);
diff --git a/src/network/ssl/qsslcertificateextension.h b/src/network/ssl/qsslcertificateextension.h
index c2910e1707..7cc8a888be 100644
--- a/src/network/ssl/qsslcertificateextension.h
+++ b/src/network/ssl/qsslcertificateextension.h
@@ -55,13 +55,11 @@ class Q_NETWORK_EXPORT QSslCertificateExtension
 public:
     QSslCertificateExtension();
     QSslCertificateExtension(const QSslCertificateExtension &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSslCertificateExtension &operator=(QSslCertificateExtension &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QSslCertificateExtension &operator=(QSslCertificateExtension &&other) noexcept { swap(other); return *this; }
     QSslCertificateExtension &operator=(const QSslCertificateExtension &other);
     ~QSslCertificateExtension();
 
-    void swap(QSslCertificateExtension &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QSslCertificateExtension &other) noexcept { qSwap(d, other.d); }
 
     QString oid() const;
     QString name() const;
diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h
index c6328e0169..6994f590ae 100644
--- a/src/network/ssl/qsslcipher.h
+++ b/src/network/ssl/qsslcipher.h
@@ -59,13 +59,11 @@ public:
     explicit QSslCipher(const QString &name);
     QSslCipher(const QString &name, QSsl::SslProtocol protocol);
     QSslCipher(const QSslCipher &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSslCipher &operator=(QSslCipher &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QSslCipher &operator=(QSslCipher &&other) noexcept { swap(other); return *this; }
     QSslCipher &operator=(const QSslCipher &other);
     ~QSslCipher();
 
-    void swap(QSslCipher &other) Q_DECL_NOTHROW
+    void swap(QSslCipher &other) noexcept
     { qSwap(d, other.d); }
 
     bool operator==(const QSslCipher &other) const;
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index 8f53e25a53..c25c2686de 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -85,12 +85,10 @@ public:
     QSslConfiguration();
     QSslConfiguration(const QSslConfiguration &other);
     ~QSslConfiguration();
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSslConfiguration &operator=(QSslConfiguration &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QSslConfiguration &operator=(QSslConfiguration &&other) noexcept { swap(other); return *this; }
     QSslConfiguration &operator=(const QSslConfiguration &other);
 
-    void swap(QSslConfiguration &other) Q_DECL_NOTHROW
+    void swap(QSslConfiguration &other) noexcept
     { qSwap(d, other.d); }
 
     bool operator==(const QSslConfiguration &other) const;
diff --git a/src/network/ssl/qsslcontext_openssl11.cpp b/src/network/ssl/qsslcontext_openssl11.cpp
index 21a5c779f7..db023b7331 100644
--- a/src/network/ssl/qsslcontext_openssl11.cpp
+++ b/src/network/ssl/qsslcontext_openssl11.cpp
@@ -193,7 +193,6 @@ init_context:
         minVersion = TLS1_2_VERSION;
         maxVersion = 0;
         break;
-#if QT_CONFIG(dtls)
     case QSsl::DtlsV1_0:
         minVersion = DTLS1_VERSION;
         maxVersion = DTLS1_VERSION;
@@ -210,7 +209,6 @@ init_context:
         minVersion = DTLS1_2_VERSION;
         maxVersion = DTLS_MAX_VERSION;
         break;
-#endif // dtls
     case QSsl::TlsV1_3OrLater:
 #ifdef TLS1_3_VERSION
         minVersion = TLS1_3_VERSION;
diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h
index 48beebf134..1fa27279c7 100644
--- a/src/network/ssl/qsslcontext_openssl_p.h
+++ b/src/network/ssl/qsslcontext_openssl_p.h
@@ -89,7 +89,7 @@ public:
 #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG)
     // must be public because we want to use it from an OpenSSL callback
     struct NPNContext {
-        NPNContext() : data(0),
+        NPNContext() : data(nullptr),
             len(0),
             status(QSslConfiguration::NextProtocolNegotiationNone)
         { }
diff --git a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp
index 65041d4456..7807afaa30 100644
--- a/src/network/ssl/qssldiffiehellmanparameters.cpp
+++ b/src/network/ssl/qssldiffiehellmanparameters.cpp
@@ -213,7 +213,7 @@ QSslDiffieHellmanParameters &QSslDiffieHellmanParameters::operator=(const QSslDi
     Setting an empty QSslDiffieHellmanParameters instance on a QSslSocket-based
     server will disable Diffie-Hellman key exchange.
 */
-bool QSslDiffieHellmanParameters::isEmpty() const Q_DECL_NOTHROW
+bool QSslDiffieHellmanParameters::isEmpty() const noexcept
 {
     return d->derData.isNull() && d->error == QSslDiffieHellmanParameters::NoError;
 }
@@ -229,7 +229,7 @@ bool QSslDiffieHellmanParameters::isEmpty() const Q_DECL_NOTHROW
 
     \sa error()
 */
-bool QSslDiffieHellmanParameters::isValid() const Q_DECL_NOTHROW
+bool QSslDiffieHellmanParameters::isValid() const noexcept
 {
     return d->error == QSslDiffieHellmanParameters::NoError;
 }
@@ -253,7 +253,7 @@ bool QSslDiffieHellmanParameters::isValid() const Q_DECL_NOTHROW
     Returns the error that caused the QSslDiffieHellmanParameters object
     to be invalid.
 */
-QSslDiffieHellmanParameters::Error QSslDiffieHellmanParameters::error() const Q_DECL_NOTHROW
+QSslDiffieHellmanParameters::Error QSslDiffieHellmanParameters::error() const noexcept
 {
     return d->error;
 }
@@ -262,7 +262,7 @@ QSslDiffieHellmanParameters::Error QSslDiffieHellmanParameters::error() const Q_
     Returns a human-readable description of the error that caused the
     QSslDiffieHellmanParameters object to be invalid.
 */
-QString QSslDiffieHellmanParameters::errorString() const Q_DECL_NOTHROW
+QString QSslDiffieHellmanParameters::errorString() const noexcept
 {
     switch (d->error) {
     case QSslDiffieHellmanParameters::NoError:
@@ -283,7 +283,7 @@ QString QSslDiffieHellmanParameters::errorString() const Q_DECL_NOTHROW
 
     Returns \c true if \a lhs is equal to \a rhs; otherwise returns \c false.
 */
-bool operator==(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanParameters &rhs) Q_DECL_NOTHROW
+bool operator==(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanParameters &rhs) noexcept
 {
     return lhs.d->derData == rhs.d->derData;
 }
@@ -316,7 +316,7 @@ QDebug operator<<(QDebug debug, const QSslDiffieHellmanParameters &dhparam)
     Returns an hash value for \a dhparam, using \a seed to seed
     the calculation.
 */
-uint qHash(const QSslDiffieHellmanParameters &dhparam, uint seed) Q_DECL_NOTHROW
+uint qHash(const QSslDiffieHellmanParameters &dhparam, uint seed) noexcept
 {
     return qHash(dhparam.d->derData, seed);
 }
diff --git a/src/network/ssl/qssldiffiehellmanparameters.h b/src/network/ssl/qssldiffiehellmanparameters.h
index 497d2bebfb..f62a3b8f44 100644
--- a/src/network/ssl/qssldiffiehellmanparameters.h
+++ b/src/network/ssl/qssldiffiehellmanparameters.h
@@ -56,16 +56,16 @@ class QSslDiffieHellmanParametersPrivate;
 
 class QSslDiffieHellmanParameters;
 // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4)
-Q_NETWORK_EXPORT uint qHash(const QSslDiffieHellmanParameters &dhparam, uint seed = 0) Q_DECL_NOTHROW;
+Q_NETWORK_EXPORT uint qHash(const QSslDiffieHellmanParameters &dhparam, uint seed = 0) noexcept;
 
 #ifndef QT_NO_DEBUG_STREAM
 class QDebug;
 Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslDiffieHellmanParameters &dhparams);
 #endif
 
-Q_NETWORK_EXPORT bool operator==(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanParameters &rhs) Q_DECL_NOTHROW;
+Q_NETWORK_EXPORT bool operator==(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanParameters &rhs) noexcept;
 
-inline bool operator!=(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanParameters &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanParameters &rhs) noexcept
 {
     return !operator==(lhs, rhs);
 }
@@ -83,30 +83,30 @@ public:
 
     Q_NETWORK_EXPORT QSslDiffieHellmanParameters();
     Q_NETWORK_EXPORT QSslDiffieHellmanParameters(const QSslDiffieHellmanParameters &other);
-    QSslDiffieHellmanParameters(QSslDiffieHellmanParameters &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; }
+    QSslDiffieHellmanParameters(QSslDiffieHellmanParameters &&other) noexcept : d(other.d) { other.d = nullptr; }
     Q_NETWORK_EXPORT ~QSslDiffieHellmanParameters();
 
     Q_NETWORK_EXPORT QSslDiffieHellmanParameters &operator=(const QSslDiffieHellmanParameters &other);
-    QSslDiffieHellmanParameters &operator=(QSslDiffieHellmanParameters &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+    QSslDiffieHellmanParameters &operator=(QSslDiffieHellmanParameters &&other) noexcept { swap(other); return *this; }
 
-    void swap(QSslDiffieHellmanParameters &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QSslDiffieHellmanParameters &other) noexcept { qSwap(d, other.d); }
 
     Q_NETWORK_EXPORT static QSslDiffieHellmanParameters fromEncoded(const QByteArray &encoded, QSsl::EncodingFormat format = QSsl::Pem);
     Q_NETWORK_EXPORT static QSslDiffieHellmanParameters fromEncoded(QIODevice *device, QSsl::EncodingFormat format = QSsl::Pem);
 
-    Q_NETWORK_EXPORT bool isEmpty() const Q_DECL_NOTHROW;
-    Q_NETWORK_EXPORT bool isValid() const Q_DECL_NOTHROW;
-    Q_NETWORK_EXPORT Error error() const Q_DECL_NOTHROW;
-    Q_NETWORK_EXPORT QString errorString() const Q_DECL_NOTHROW;
+    Q_NETWORK_EXPORT bool isEmpty() const noexcept;
+    Q_NETWORK_EXPORT bool isValid() const noexcept;
+    Q_NETWORK_EXPORT Error error() const noexcept;
+    Q_NETWORK_EXPORT QString errorString() const noexcept;
 
 private:
     QSslDiffieHellmanParametersPrivate *d;
     friend class QSslContext;
-    friend Q_NETWORK_EXPORT bool operator==(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanParameters &rhs) Q_DECL_NOTHROW;
+    friend Q_NETWORK_EXPORT bool operator==(const QSslDiffieHellmanParameters &lhs, const QSslDiffieHellmanParameters &rhs) noexcept;
 #ifndef QT_NO_DEBUG_STREAM
     friend Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslDiffieHellmanParameters &dhparam);
 #endif
-    friend Q_NETWORK_EXPORT uint qHash(const QSslDiffieHellmanParameters &dhparam, uint seed) Q_DECL_NOTHROW;
+    friend Q_NETWORK_EXPORT uint qHash(const QSslDiffieHellmanParameters &dhparam, uint seed) noexcept;
 };
 
 Q_DECLARE_SHARED(QSslDiffieHellmanParameters)
diff --git a/src/network/ssl/qsslellipticcurve.h b/src/network/ssl/qsslellipticcurve.h
index 57dda19bad..28de3a03b4 100644
--- a/src/network/ssl/qsslellipticcurve.h
+++ b/src/network/ssl/qsslellipticcurve.h
@@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE
 
 class QSslEllipticCurve;
 // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4)
-Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed = 0) Q_DECL_NOTHROW;
+Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed = 0) noexcept;
 
 class QSslEllipticCurve {
 public:
-    Q_DECL_CONSTEXPR QSslEllipticCurve() Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR QSslEllipticCurve() noexcept
         : id(0)
     {
     }
@@ -67,18 +67,18 @@ public:
     Q_REQUIRED_RESULT Q_NETWORK_EXPORT QString shortName() const;
     Q_REQUIRED_RESULT Q_NETWORK_EXPORT QString longName() const;
 
-    Q_DECL_CONSTEXPR bool isValid() const Q_DECL_NOTHROW
+    Q_DECL_CONSTEXPR bool isValid() const noexcept
     {
         return id != 0;
     }
 
-    Q_NETWORK_EXPORT bool isTlsNamedCurve() const Q_DECL_NOTHROW;
+    Q_NETWORK_EXPORT bool isTlsNamedCurve() const noexcept;
 
 private:
     int id;
 
-    friend Q_DECL_CONSTEXPR bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) Q_DECL_NOTHROW;
-    friend Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed) Q_DECL_NOTHROW;
+    friend Q_DECL_CONSTEXPR bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) noexcept;
+    friend Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed) noexcept;
 
     friend class QSslContext;
     friend class QSslSocketPrivate;
@@ -87,13 +87,13 @@ private:
 
 Q_DECLARE_TYPEINFO(QSslEllipticCurve, Q_PRIMITIVE_TYPE);
 
-Q_DECL_CONSTEXPR inline uint qHash(QSslEllipticCurve curve, uint seed) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline uint qHash(QSslEllipticCurve curve, uint seed) noexcept
 { return qHash(curve.id, seed); }
 
-Q_DECL_CONSTEXPR inline bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) noexcept
 { return lhs.id == rhs.id; }
 
-Q_DECL_CONSTEXPR inline bool operator!=(QSslEllipticCurve lhs, QSslEllipticCurve rhs) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline bool operator!=(QSslEllipticCurve lhs, QSslEllipticCurve rhs) noexcept
 { return !operator==(lhs, rhs); }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/network/ssl/qsslellipticcurve_dummy.cpp b/src/network/ssl/qsslellipticcurve_dummy.cpp
index 93e081b9e0..1313e06875 100644
--- a/src/network/ssl/qsslellipticcurve_dummy.cpp
+++ b/src/network/ssl/qsslellipticcurve_dummy.cpp
@@ -63,7 +63,7 @@ QSslEllipticCurve QSslEllipticCurve::fromLongName(const QString &name)
     return QSslEllipticCurve();
 }
 
-bool QSslEllipticCurve::isTlsNamedCurve() const Q_DECL_NOTHROW
+bool QSslEllipticCurve::isTlsNamedCurve() const noexcept
 {
     return false;
 }
diff --git a/src/network/ssl/qsslellipticcurve_openssl.cpp b/src/network/ssl/qsslellipticcurve_openssl.cpp
index 8cd14837f0..b5e38ada53 100644
--- a/src/network/ssl/qsslellipticcurve_openssl.cpp
+++ b/src/network/ssl/qsslellipticcurve_openssl.cpp
@@ -170,7 +170,7 @@ static const int tlsNamedCurveNIDs[] = {
 
 static const size_t tlsNamedCurveNIDCount = sizeof(tlsNamedCurveNIDs) / sizeof(tlsNamedCurveNIDs[0]);
 
-bool QSslEllipticCurve::isTlsNamedCurve() const Q_DECL_NOTHROW
+bool QSslEllipticCurve::isTlsNamedCurve() const noexcept
 {
     const int * const tlsNamedCurveNIDsEnd = tlsNamedCurveNIDs + tlsNamedCurveNIDCount;
     return std::find(tlsNamedCurveNIDs, tlsNamedCurveNIDsEnd, id) != tlsNamedCurveNIDsEnd;
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index 02dd16a58d..cdc018a508 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -86,6 +86,7 @@
     \value UnspecifiedError
     \value NoSslSupport
     \value CertificateBlacklisted
+    \value CertificateStatusUnknown
     \value OcspNoResponseFound
     \value OcspMalformedRequest
     \value OcspMalformedResponse
@@ -361,11 +362,11 @@ QSslCertificate QSslError::certificate() const
     \since 5.4
     \relates QHash
 */
-uint qHash(const QSslError &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QSslError &key, uint seed) noexcept
 {
-    // 2x boost::hash_combine inlined:
-    seed ^= qHash(key.error())       + 0x9e3779b9 + (seed << 6) + (seed >> 2);
-    seed ^= qHash(key.certificate()) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+    QtPrivate::QHashCombine hash;
+    seed = hash(seed, key.error());
+    seed = hash(seed, key.certificate());
     return seed;
 }
 
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index 513b8afd7f..28eb1a9ea8 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
 class QSslErrorPrivate;
 class Q_NETWORK_EXPORT QSslError
 {
+    Q_GADGET
 public:
     enum SslError {
         NoError,
@@ -94,6 +95,7 @@ public:
         OcspStatusUnknown,
         UnspecifiedError = -1
     };
+    Q_ENUM(SslError)
 
     // RVCT compiler in debug build does not like about default values in const-
     // So as an workaround we define all constructor overloads here explicitly
@@ -103,13 +105,11 @@ public:
 
     QSslError(const QSslError &other);
 
-    void swap(QSslError &other) Q_DECL_NOTHROW
+    void swap(QSslError &other) noexcept
     { qSwap(d, other.d); }
 
     ~QSslError();
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSslError &operator=(QSslError &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QSslError &operator=(QSslError &&other) noexcept { swap(other); return *this; }
     QSslError &operator=(const QSslError &other);
     bool operator==(const QSslError &other) const;
     inline bool operator!=(const QSslError &other) const
@@ -124,7 +124,7 @@ private:
 };
 Q_DECLARE_SHARED(QSslError)
 
-Q_NETWORK_EXPORT uint qHash(const QSslError &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_NETWORK_EXPORT uint qHash(const QSslError &key, uint seed = 0) noexcept;
 
 #ifndef QT_NO_DEBUG_STREAM
 class QDebug;
diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h
index 6de02b1e44..74be406539 100644
--- a/src/network/ssl/qsslkey.h
+++ b/src/network/ssl/qsslkey.h
@@ -71,13 +71,12 @@ public:
             const QByteArray &passPhrase = QByteArray());
     explicit QSslKey(Qt::HANDLE handle, QSsl::KeyType type = QSsl::PrivateKey);
     QSslKey(const QSslKey &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSslKey &operator=(QSslKey &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QSslKey(QSslKey &&other) noexcept;
+    QSslKey &operator=(QSslKey &&other) noexcept;
     QSslKey &operator=(const QSslKey &other);
     ~QSslKey();
 
-    void swap(QSslKey &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QSslKey &other) noexcept { qSwap(d, other.d); }
 
     bool isNull() const;
     void clear();
diff --git a/src/network/ssl/qsslkey_mac.cpp b/src/network/ssl/qsslkey_mac.cpp
index d460cbfdab..814fe1c4bc 100644
--- a/src/network/ssl/qsslkey_mac.cpp
+++ b/src/network/ssl/qsslkey_mac.cpp
@@ -42,7 +42,9 @@
 
 #include <CommonCrypto/CommonCrypto.h>
 
-QT_USE_NAMESPACE
+#include <cstddef>
+
+QT_BEGIN_NAMESPACE
 
 static QByteArray wrapCCCrypt(CCOperation ccOp,
                               QSslKeyPrivate::Cipher cipher,
@@ -64,17 +66,23 @@ static QByteArray wrapCCCrypt(CCOperation ccOp,
         blockSize = kCCBlockSizeRC2;
         ccAlgorithm = kCCAlgorithmRC2;
         break;
-    };
+    case QSslKeyPrivate::Aes128Cbc:
+    case QSslKeyPrivate::Aes192Cbc:
+    case QSslKeyPrivate::Aes256Cbc:
+        blockSize = kCCBlockSizeAES128;
+        ccAlgorithm = kCCAlgorithmAES;
+        break;
+    }
     size_t plainLength = 0;
     QByteArray plain(data.size() + blockSize, 0);
     CCCryptorStatus status = CCCrypt(
         ccOp, ccAlgorithm, kCCOptionPKCS7Padding,
-        key.constData(), key.size(),
+        key.constData(), std::size_t(key.size()),
         iv.constData(),
-        data.constData(), data.size(),
-        plain.data(), plain.size(), &plainLength);
+        data.constData(), std::size_t(data.size()),
+        plain.data(), std::size_t(plain.size()), &plainLength);
     if (status == kCCSuccess)
-        return plain.left(plainLength);
+        return plain.left(int(plainLength));
     return QByteArray();
 }
 
@@ -87,3 +95,5 @@ QByteArray QSslKeyPrivate::encrypt(Cipher cipher, const QByteArray &data, const
 {
     return wrapCCCrypt(kCCEncrypt, cipher, data, key, iv);
 }
+
+QT_END_NAMESPACE
diff --git a/src/network/ssl/qsslkey_openssl.cpp b/src/network/ssl/qsslkey_openssl.cpp
index 99c1a39c73..888058df22 100644
--- a/src/network/ssl/qsslkey_openssl.cpp
+++ b/src/network/ssl/qsslkey_openssl.cpp
@@ -333,6 +333,15 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
         type = q_EVP_rc2_cbc();
 #endif
         break;
+    case QSslKeyPrivate::Aes128Cbc:
+        type = q_EVP_aes_128_cbc();
+        break;
+    case QSslKeyPrivate::Aes192Cbc:
+        type = q_EVP_aes_192_cbc();
+        break;
+    case QSslKeyPrivate::Aes256Cbc:
+        type = q_EVP_aes_256_cbc();
+        break;
     }
 
     if (type == nullptr)
diff --git a/src/network/ssl/qsslkey_p.cpp b/src/network/ssl/qsslkey_p.cpp
index 5c90719fcd..b0d6c729f9 100644
--- a/src/network/ssl/qsslkey_p.cpp
+++ b/src/network/ssl/qsslkey_p.cpp
@@ -385,6 +385,24 @@ QSslKey::QSslKey(const QSslKey &other) : d(other.d)
 {
 }
 
+QSslKey::QSslKey(QSslKey &&other) noexcept
+    : d(nullptr)
+{
+    qSwap(d, other.d);
+}
+
+QSslKey &QSslKey::operator=(QSslKey &&other) noexcept
+{
+    if (this == &other)
+        return *this;
+
+    // If no one else is referencing the key data we want to make sure
+    // before we swap the d-ptr that it is not left in memory.
+    d.reset();
+    qSwap(d, other.d);
+    return *this;
+}
+
 /*!
     Destroys the QSslKey object.
 */
diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h
index 06403b5479..dd1a31b0e5 100644
--- a/src/network/ssl/qsslkey_p.h
+++ b/src/network/ssl/qsslkey_p.h
@@ -68,7 +68,7 @@ class QSslKeyPrivate
 public:
     inline QSslKeyPrivate()
         : algorithm(QSsl::Opaque)
-        , opaque(0)
+        , opaque(nullptr)
     {
         clear(false);
     }
@@ -105,7 +105,10 @@ public:
     enum Cipher {
         DesCbc,
         DesEde3Cbc,
-        Rc2Cbc
+        Rc2Cbc,
+        Aes128Cbc,
+        Aes192Cbc,
+        Aes256Cbc
     };
 
     Q_AUTOTEST_EXPORT static QByteArray decrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv);
diff --git a/src/network/ssl/qsslkey_qt.cpp b/src/network/ssl/qsslkey_qt.cpp
index 5ebd8ac3bd..43969c3d28 100644
--- a/src/network/ssl/qsslkey_qt.cpp
+++ b/src/network/ssl/qsslkey_qt.cpp
@@ -48,6 +48,8 @@
 
 #include <QtNetwork/qpassworddigestor.h>
 
+#include <cstring>
+
 QT_USE_NAMESPACE
 
 static const quint8 bits_table[256] = {
@@ -124,6 +126,37 @@ static int numberOfBits(const QByteArray &modulus)
     return bits;
 }
 
+static QByteArray deriveAesKey(QSslKeyPrivate::Cipher cipher, const QByteArray &passPhrase, const QByteArray &iv)
+{
+    // This is somewhat simplified and shortened version of what OpenSSL does.
+    // See, for example, EVP_BytesToKey for the "algorithm" itself and elsewhere
+    // in their code for what they pass as arguments to EVP_BytesToKey when
+    // deriving encryption keys (when reading/writing pems files with encrypted
+    // keys).
+
+    Q_ASSERT(iv.size() >= 8);
+
+    QCryptographicHash hash(QCryptographicHash::Md5);
+
+    QByteArray data(passPhrase);
+    data.append(iv.data(), 8); // AKA PKCS5_SALT_LEN in OpenSSL.
+
+    hash.addData(data);
+
+    if (cipher == QSslKeyPrivate::Aes128Cbc)
+        return hash.result();
+
+    QByteArray key(hash.result());
+    hash.reset();
+    hash.addData(key);
+    hash.addData(data);
+
+    if (cipher == QSslKeyPrivate::Aes192Cbc)
+        return key.append(hash.result().constData(), 8);
+
+    return key.append(hash.result());
+}
+
 static QByteArray deriveKey(QSslKeyPrivate::Cipher cipher, const QByteArray &passPhrase, const QByteArray &iv)
 {
     QByteArray key;
@@ -145,14 +178,19 @@ static QByteArray deriveKey(QSslKeyPrivate::Cipher cipher, const QByteArray &pas
     case QSslKeyPrivate::Rc2Cbc:
         key = hash.result();
         break;
+    case QSslKeyPrivate::Aes128Cbc:
+    case QSslKeyPrivate::Aes192Cbc:
+    case QSslKeyPrivate::Aes256Cbc:
+        return deriveAesKey(cipher, passPhrase, iv);
     }
     return key;
 }
 
 void QSslKeyPrivate::clear(bool deep)
 {
-    Q_UNUSED(deep);
     isNull = true;
+    if (deep)
+        std::memset(derData.data(), 0, derData.size());
     derData.clear();
     keyLength = -1;
 }
@@ -378,6 +416,12 @@ void QSslKeyPrivate::decodePem(const QByteArray &pem, const QByteArray &passPhra
             cipher = DesEde3Cbc;
         } else if (dekInfo.first() == "RC2-CBC") {
             cipher = Rc2Cbc;
+        } else if (dekInfo.first() == "AES-128-CBC") {
+            cipher = Aes128Cbc;
+        } else if (dekInfo.first() == "AES-192-CBC") {
+            cipher = Aes192Cbc;
+        } else if (dekInfo.first() == "AES-256-CBC") {
+            cipher = Aes256Cbc;
         } else {
             clear(deepClear);
             return;
@@ -554,6 +598,10 @@ static EncryptionData readPbes2(const QVector<QAsn1Element> &element, const QByt
             return {};
         break;
     } // @todo(?): case (RC5 , AES)
+    case QSslKeyPrivate::Cipher::Aes128Cbc:
+    case QSslKeyPrivate::Cipher::Aes192Cbc:
+    case QSslKeyPrivate::Cipher::Aes256Cbc:
+        Q_UNREACHABLE();
     }
 
     if (Q_LIKELY(keyDerivationAlgorithm == PKCS5_PBKDF2_ENCRYPTION_OID)) {
diff --git a/src/network/ssl/qsslkey_schannel.cpp b/src/network/ssl/qsslkey_schannel.cpp
index 5694068860..1e21d123f4 100644
--- a/src/network/ssl/qsslkey_schannel.cpp
+++ b/src/network/ssl/qsslkey_schannel.cpp
@@ -57,6 +57,10 @@ const wchar_t *getName(QSslKeyPrivate::Cipher cipher)
         return BCRYPT_3DES_ALGORITHM;
     case QSslKeyPrivate::Cipher::Rc2Cbc:
         return BCRYPT_RC2_ALGORITHM;
+    case QSslKeyPrivate::Cipher::Aes128Cbc:
+    case QSslKeyPrivate::Cipher::Aes192Cbc:
+    case QSslKeyPrivate::Cipher::Aes256Cbc:
+        return BCRYPT_AES_ALGORITHM;
     }
     Q_UNREACHABLE();
 }
diff --git a/src/network/ssl/qsslkey_winrt.cpp b/src/network/ssl/qsslkey_winrt.cpp
index f2ed813965..69eaaa387f 100644
--- a/src/network/ssl/qsslkey_winrt.cpp
+++ b/src/network/ssl/qsslkey_winrt.cpp
@@ -83,6 +83,15 @@ struct SslKeyGlobal
         hr = keyProviderFactory->OpenAlgorithm(HString::MakeReference(L"RC2_CBC").Get(),
                                                &keyProviders[QSslKeyPrivate::Rc2Cbc]);
         Q_ASSERT_SUCCEEDED(hr);
+        hr = keyProviderFactory->OpenAlgorithm(HString::MakeReference(L"AES_CBC").Get(),
+                                               &keyProviders[QSslKeyPrivate::Aes128Cbc]);
+        Q_ASSERT_SUCCEEDED(hr);
+        hr = keyProviderFactory->OpenAlgorithm(HString::MakeReference(L"AES_CBC").Get(),
+                                               &keyProviders[QSslKeyPrivate::Aes192Cbc]);
+        Q_ASSERT_SUCCEEDED(hr);
+        hr = keyProviderFactory->OpenAlgorithm(HString::MakeReference(L"AES_CBC").Get(),
+                                               &keyProviders[QSslKeyPrivate::Aes256Cbc]);
+        Q_ASSERT_SUCCEEDED(hr);
 
         hr = GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Security_Cryptography_CryptographicBuffer).Get(),
                                   &bufferFactory);
diff --git a/src/network/ssl/qsslpresharedkeyauthenticator.h b/src/network/ssl/qsslpresharedkeyauthenticator.h
index 423f7731b4..5d714dc34e 100644
--- a/src/network/ssl/qsslpresharedkeyauthenticator.h
+++ b/src/network/ssl/qsslpresharedkeyauthenticator.h
@@ -59,11 +59,9 @@ public:
     Q_NETWORK_EXPORT QSslPreSharedKeyAuthenticator(const QSslPreSharedKeyAuthenticator &authenticator);
     Q_NETWORK_EXPORT QSslPreSharedKeyAuthenticator &operator=(const QSslPreSharedKeyAuthenticator &authenticator);
 
-#ifdef Q_COMPILER_RVALUE_REFS
-    QSslPreSharedKeyAuthenticator &operator=(QSslPreSharedKeyAuthenticator &&other) Q_DECL_NOTHROW { swap(other); return *this; }
-#endif
+    QSslPreSharedKeyAuthenticator &operator=(QSslPreSharedKeyAuthenticator &&other) noexcept { swap(other); return *this; }
 
-    void swap(QSslPreSharedKeyAuthenticator &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QSslPreSharedKeyAuthenticator &other) noexcept { qSwap(d, other.d); }
 
     Q_NETWORK_EXPORT QByteArray identityHint() const;
 
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index e164217e4e..e302aa1761 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -761,8 +761,8 @@ qint64 QSslSocket::bytesAvailable() const
 {
     Q_D(const QSslSocket);
     if (d->mode == UnencryptedMode)
-        return QIODevice::bytesAvailable() + (d->plainSocket ? d->plainSocket->bytesAvailable() : 0);
-    return QIODevice::bytesAvailable();
+        return QAbstractSocket::bytesAvailable() + (d->plainSocket ? d->plainSocket->bytesAvailable() : 0);
+    return QAbstractSocket::bytesAvailable();
 }
 
 /*!
@@ -818,8 +818,8 @@ bool QSslSocket::canReadLine() const
 {
     Q_D(const QSslSocket);
     if (d->mode == UnencryptedMode)
-        return QIODevice::canReadLine() || (d->plainSocket && d->plainSocket->canReadLine());
-    return QIODevice::canReadLine();
+        return QAbstractSocket::canReadLine() || (d->plainSocket && d->plainSocket->canReadLine());
+    return QAbstractSocket::canReadLine();
 }
 
 /*!
@@ -849,8 +849,8 @@ bool QSslSocket::atEnd() const
 {
     Q_D(const QSslSocket);
     if (d->mode == UnencryptedMode)
-        return QIODevice::atEnd() && (!d->plainSocket || d->plainSocket->atEnd());
-    return QIODevice::atEnd();
+        return QAbstractSocket::atEnd() && (!d->plainSocket || d->plainSocket->atEnd());
+    return QAbstractSocket::atEnd();
 }
 
 /*!
@@ -924,7 +924,7 @@ QSslConfiguration QSslSocket::sslConfiguration() const
 
     // create a deep copy of our configuration
     QSslConfigurationPrivate *copy = new QSslConfigurationPrivate(d->configuration);
-    copy->ref.store(0);              // the QSslConfiguration constructor refs up
+    copy->ref.storeRelaxed(0);              // the QSslConfiguration constructor refs up
     copy->sessionCipher = d->sessionCipher();
     copy->sessionProtocol = d->sessionProtocol();
 
@@ -1209,12 +1209,21 @@ void QSslSocket::setPrivateKey(const QSslKey &key)
 void QSslSocket::setPrivateKey(const QString &fileName, QSsl::KeyAlgorithm algorithm,
                                QSsl::EncodingFormat format, const QByteArray &passPhrase)
 {
-    Q_D(QSslSocket);
     QFile file(fileName);
-    if (file.open(QIODevice::ReadOnly)) {
-        d->configuration.privateKey = QSslKey(file.readAll(), algorithm,
-                                              format, QSsl::PrivateKey, passPhrase);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCWarning(lcSsl, "QSslSocket::setPrivateKey: Couldn't open file for reading");
+        return;
+    }
+
+    QSslKey key(file.readAll(), algorithm, format, QSsl::PrivateKey, passPhrase);
+    if (key.isNull()) {
+        qCWarning(lcSsl, "QSslSocket::setPrivateKey: "
+                         "The specified file does not contain a valid key");
+        return;
     }
+
+    Q_D(QSslSocket);
+    d->configuration.privateKey = key;
 }
 
 /*!
@@ -1503,7 +1512,7 @@ bool QSslSocket::addDefaultCaCertificates(const QString &path, QSsl::EncodingFor
     SSL socket's CA certificate database is initialized to the default
     CA certificate database.
 
-    \sa QSslConfiguration::defaultCaCertificates(), addCaCertificates()
+    \sa QSslConfiguration::caCertificates(), addCaCertificates()
 */
 void QSslSocket::addDefaultCaCertificate(const QSslCertificate &certificate)
 {
@@ -2369,7 +2378,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri
     if (!global)
         return;
 
-    ptr->ref.store(1);
+    ptr->ref.storeRelaxed(1);
     ptr->peerCertificate = global->peerCertificate;
     ptr->peerCertificateChain = global->peerCertificateChain;
     ptr->localCertificateChain = global->localCertificateChain;
diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp
index e290ba79dd..e0e065679d 100644
--- a/src/network/ssl/qsslsocket_mac.cpp
+++ b/src/network/ssl/qsslsocket_mac.cpp
@@ -215,7 +215,7 @@ void QSecureTransportContext::reset(SSLContextRef newContext)
     context = newContext;
 }
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_securetransport_mutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, qt_securetransport_mutex)
 
 //#define QSSLSOCKET_DEBUG
 
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index c0035d23a8..d4bad1b1a5 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -523,11 +523,12 @@ bool QSslSocketBackendPrivate::initSslContext()
 {
     Q_Q(QSslSocket);
 
-    // If no external context was set (e.g. bei QHttpNetworkConnection) we will create a default context
+    // If no external context was set (e.g. by QHttpNetworkConnection) we will
+    // create a default context
     if (!sslContextPointer) {
         // create a deep copy of our configuration
         QSslConfigurationPrivate *configurationCopy = new QSslConfigurationPrivate(configuration);
-        configurationCopy->ref.store(0);              // the QSslConfiguration constructor refs up
+        configurationCopy->ref.storeRelaxed(0);              // the QSslConfiguration constructor refs up
         sslContextPointer = QSslContext::sharedFromConfiguration(mode, configurationCopy, allowRootCertOnDemandLoading);
     }
 
diff --git a/src/network/ssl/qsslsocket_openssl11.cpp b/src/network/ssl/qsslsocket_openssl11.cpp
index b60b8be41f..1d935c5217 100644
--- a/src/network/ssl/qsslsocket_openssl11.cpp
+++ b/src/network/ssl/qsslsocket_openssl11.cpp
@@ -68,10 +68,11 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qmutex.h>
 #include <QtCore/qlibrary.h>
+#include <QtCore/qoperatingsystemversion.h>
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_opensslInitMutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, qt_opensslInitMutex)
 
 void QSslSocketPrivate::deinitialize()
 {
@@ -142,13 +143,12 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
     if (!s_loadRootCertsOnDemand)
         setDefaultCaCertificates(systemCaCertificates());
 #ifdef Q_OS_WIN
-    //Enabled for fetching additional root certs from windows update on windows 6+
+    //Enabled for fetching additional root certs from windows update on windows.
     //This flag is set false by setDefaultCaCertificates() indicating the app uses
     //its own cert bundle rather than the system one.
     //Same logic that disables the unix on demand cert loading.
     //Unlike unix, we do preload the certificates from the cert store.
-    if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0)
-        s_loadRootCertsOnDemand = true;
+    s_loadRootCertsOnDemand = true;
 #endif
 }
 
diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
index 150617e3d2..0fe0899d4f 100644
--- a/src/network/ssl/qsslsocket_openssl11_symbols_p.h
+++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
@@ -82,6 +82,7 @@ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
 
 int q_DSA_bits(DSA *a);
 int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
 int q_EVP_PKEY_base_id(EVP_PKEY *a);
 int q_RSA_bits(RSA *a);
 Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 74ac852bcd..1fcfdf9f16 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -63,13 +63,11 @@
 # include <QtCore/qlibrary.h>
 #endif
 #include <QtCore/qmutex.h>
-#if QT_CONFIG(thread)
-#include <private/qmutexpool_p.h>
-#endif
 #include <QtCore/qdatetime.h>
 #if defined(Q_OS_UNIX)
 #include <QtCore/qdir.h>
 #endif
+#include <QtCore/private/qmemory_p.h>
 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
 #include <link.h>
 #endif
@@ -150,6 +148,7 @@ DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return)
 DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return)
 DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
 DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
 DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
 DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
 DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
@@ -363,6 +362,11 @@ DEFINEFUNC(const EVP_CIPHER *, EVP_des_ede3_cbc, DUMMYARG, DUMMYARG, return null
 #ifndef OPENSSL_NO_RC2
 DEFINEFUNC(const EVP_CIPHER *, EVP_rc2_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
 #endif
+#ifndef OPENSSL_NO_AES
+DEFINEFUNC(const EVP_CIPHER *, EVP_aes_128_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+DEFINEFUNC(const EVP_CIPHER *, EVP_aes_192_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+DEFINEFUNC(const EVP_CIPHER *, EVP_aes_256_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+#endif
 DEFINEFUNC(const EVP_MD *, EVP_sha1, DUMMYARG, DUMMYARG, return nullptr, return)
 DEFINEFUNC3(int, EVP_PKEY_assign, EVP_PKEY *a, a, int b, b, char *c, c, return -1, return)
 DEFINEFUNC2(int, EVP_PKEY_set1_RSA, EVP_PKEY *a, a, RSA *b, b, return -1, return)
@@ -371,6 +375,7 @@ DEFINEFUNC2(int, EVP_PKEY_set1_DH, EVP_PKEY *a, a, DH *b, b, return -1, return)
 #ifndef OPENSSL_NO_EC
 DEFINEFUNC2(int, EVP_PKEY_set1_EC_KEY, EVP_PKEY *a, a, EC_KEY *b, b, return -1, return)
 #endif
+DEFINEFUNC2(int, EVP_PKEY_cmp, const EVP_PKEY *a, a, const EVP_PKEY *b, b, return -1, return)
 DEFINEFUNC(void, EVP_PKEY_free, EVP_PKEY *a, a, return, DUMMYARG)
 DEFINEFUNC(DSA *, EVP_PKEY_get1_DSA, EVP_PKEY *a, a, return nullptr, return)
 DEFINEFUNC(RSA *, EVP_PKEY_get1_RSA, EVP_PKEY *a, a, return nullptr, return)
@@ -592,8 +597,8 @@ DEFINEFUNC2(PKCS12 *, d2i_PKCS12_bio, BIO *bio, bio, PKCS12 **pkcs12, pkcs12, re
 DEFINEFUNC(void, PKCS12_free, PKCS12 *pkcs12, pkcs12, return, DUMMYARG)
 
 #define RESOLVEFUNC(func) \
-    if (!(_q_##func = _q_PTR_##func(libs.first->resolve(#func)))     \
-        && !(_q_##func = _q_PTR_##func(libs.second->resolve(#func)))) \
+    if (!(_q_##func = _q_PTR_##func(libs.ssl->resolve(#func)))     \
+        && !(_q_##func = _q_PTR_##func(libs.crypto->resolve(#func)))) \
         qsslSocketCannotResolveSymbolWarning(#func);
 
 #if !defined QT_LINKED_OPENSSL
@@ -692,7 +697,7 @@ static QStringList libraryPathList()
     // discover paths of already loaded libraries
     QSet<QString> loadedPaths;
     dl_iterate_phdr(dlIterateCallback, &loadedPaths);
-    paths.append(loadedPaths.toList());
+    paths.append(loadedPaths.values());
 #endif
 
     return paths;
@@ -729,34 +734,31 @@ static QStringList findAllLibCrypto()
 # endif
 
 #ifdef Q_OS_WIN
-static bool tryToLoadOpenSslWin32Library(QLatin1String ssleay32LibName, QLatin1String libeay32LibName, QPair<QSystemLibrary*, QSystemLibrary*> &pair)
-{
-    pair.first = 0;
-    pair.second = 0;
 
-    QSystemLibrary *ssleay32 = new QSystemLibrary(ssleay32LibName);
+struct LoadedOpenSsl {
+    std::unique_ptr<QSystemLibrary> ssl, crypto;
+};
+
+static bool tryToLoadOpenSslWin32Library(QLatin1String ssleay32LibName, QLatin1String libeay32LibName, LoadedOpenSsl &result)
+{
+    auto ssleay32 = qt_make_unique<QSystemLibrary>(ssleay32LibName);
     if (!ssleay32->load(false)) {
-        delete ssleay32;
         return FALSE;
     }
 
-    QSystemLibrary *libeay32 = new QSystemLibrary(libeay32LibName);
+    auto libeay32 = qt_make_unique<QSystemLibrary>(libeay32LibName);
     if (!libeay32->load(false)) {
-        delete ssleay32;
-        delete libeay32;
         return FALSE;
     }
 
-    pair.first = ssleay32;
-    pair.second = libeay32;
+    result.ssl = std::move(ssleay32);
+    result.crypto = std::move(libeay32);
     return TRUE;
 }
 
-static QPair<QSystemLibrary*, QSystemLibrary*> loadOpenSslWin32()
+static LoadedOpenSsl loadOpenSsl()
 {
-    QPair<QSystemLibrary*,QSystemLibrary*> pair;
-    pair.first = 0;
-    pair.second = 0;
+    LoadedOpenSsl result;
 
 #if QT_CONFIG(opensslv11)
     // With OpenSSL 1.1 the names have changed to libssl-1_1(-x64) and libcrypto-1_1(-x64), for builds using
@@ -769,7 +771,7 @@ static QPair<QSystemLibrary*, QSystemLibrary*> loadOpenSslWin32()
 #endif // !Q_PROCESSOR_x86_64
 
     tryToLoadOpenSslWin32Library(QLatin1String("libssl-1_1" QT_SSL_SUFFIX),
-                                 QLatin1String("libcrypto-1_1" QT_SSL_SUFFIX), pair);
+                                 QLatin1String("libcrypto-1_1" QT_SSL_SUFFIX), result);
 
 #undef QT_SSL_SUFFIX
 
@@ -778,28 +780,30 @@ static QPair<QSystemLibrary*, QSystemLibrary*> loadOpenSslWin32()
     // When OpenSSL is built using MSVC then the libraries are named 'ssleay32.dll' and 'libeay32'dll'.
     // When OpenSSL is built using GCC then different library names are used (depending on the OpenSSL version)
     // The oldest version of a GCC-based OpenSSL which can be detected by the code below is 0.9.8g (released in 2007)
-    if (!tryToLoadOpenSslWin32Library(QLatin1String("ssleay32"), QLatin1String("libeay32"), pair)) {
-        if (!tryToLoadOpenSslWin32Library(QLatin1String("libssl-10"), QLatin1String("libcrypto-10"), pair)) {
-            if (!tryToLoadOpenSslWin32Library(QLatin1String("libssl-8"), QLatin1String("libcrypto-8"), pair)) {
-                tryToLoadOpenSslWin32Library(QLatin1String("libssl-7"), QLatin1String("libcrypto-7"), pair);
+    if (!tryToLoadOpenSslWin32Library(QLatin1String("ssleay32"), QLatin1String("libeay32"), result)) {
+        if (!tryToLoadOpenSslWin32Library(QLatin1String("libssl-10"), QLatin1String("libcrypto-10"), result)) {
+            if (!tryToLoadOpenSslWin32Library(QLatin1String("libssl-8"), QLatin1String("libcrypto-8"), result)) {
+                tryToLoadOpenSslWin32Library(QLatin1String("libssl-7"), QLatin1String("libcrypto-7"), result);
             }
         }
     }
 #endif // !QT_CONFIG(opensslv11)
 
-    return pair;
+    return result;
 }
 #else
 
-static QPair<QLibrary*, QLibrary*> loadOpenSsl()
+struct LoadedOpenSsl {
+    std::unique_ptr<QLibrary> ssl, crypto;
+};
+
+static LoadedOpenSsl loadOpenSsl()
 {
-    QPair<QLibrary*,QLibrary*> pair;
+    LoadedOpenSsl result = {qt_make_unique<QLibrary>(), qt_make_unique<QLibrary>()};
 
 # if defined(Q_OS_UNIX)
-    QLibrary *&libssl = pair.first;
-    QLibrary *&libcrypto = pair.second;
-    libssl = new QLibrary;
-    libcrypto = new QLibrary;
+    QLibrary * const libssl = result.ssl.get();
+    QLibrary * const libcrypto = result.crypto.get();
 
     // Try to find the libssl library on the system.
     //
@@ -843,7 +847,7 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
     libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
     if (libcrypto->load() && libssl->load()) {
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
-        return pair;
+        return result;
     } else {
         libssl->unload();
         libcrypto->unload();
@@ -862,7 +866,7 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
         libssl->setFileNameAndVersion(QLatin1String("ssl"), fallbackSoname);
         libcrypto->setFileNameAndVersion(QLatin1String("crypto"), fallbackSoname);
         if (libcrypto->load() && libssl->load()) {
-            return pair;
+            return result;
         } else {
             libssl->unload();
             libcrypto->unload();
@@ -899,7 +903,7 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
 # endif
     if (libcrypto->load() && libssl->load()) {
         // libssl.so.0 and libcrypto.so.0 found
-        return pair;
+        return result;
     } else {
         libssl->unload();
         libcrypto->unload();
@@ -924,7 +928,7 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
 
                 if (libssl->load()) {
                     // libssl.so.x and libcrypto.so.x found
-                    return pair;
+                    return result;
                 } else {
                     libssl->unload();
                 }
@@ -934,41 +938,33 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
     }
 
     // failed to load anything
-    delete libssl;
-    delete libcrypto;
-    libssl = libcrypto = 0;
-    return pair;
+    result = {};
+    return result;
 
 # else
     // not implemented for this platform yet
-    return pair;
+    return result;
 # endif
 }
 #endif
 
+static QBasicMutex symbolResolveMutex;
+static QBasicAtomicInt symbolsResolved = Q_BASIC_ATOMIC_INITIALIZER(false);
+static bool triedToResolveSymbols = false;
+
 bool q_resolveOpenSslSymbols()
 {
-    static bool symbolsResolved = false;
-    static bool triedToResolveSymbols = false;
-#if QT_CONFIG(thread)
-#if QT_CONFIG(opensslv11)
-    QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl));
-#else
-    QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init));
-#endif
-#endif
-    if (symbolsResolved)
+    if (symbolsResolved.loadAcquire())
+        return true;
+    QMutexLocker locker(&symbolResolveMutex);
+    if (symbolsResolved.loadRelaxed())
         return true;
     if (triedToResolveSymbols)
         return false;
     triedToResolveSymbols = true;
 
-#ifdef Q_OS_WIN
-    QPair<QSystemLibrary *, QSystemLibrary *> libs = loadOpenSslWin32();
-#else
-    QPair<QLibrary *, QLibrary *> libs = loadOpenSsl();
-#endif
-    if (!libs.first || !libs.second)
+    LoadedOpenSsl libs = loadOpenSsl();
+    if (!libs.ssl || !libs.crypto)
         // failed to load them
         return false;
 
@@ -978,6 +974,7 @@ bool q_resolveOpenSslSymbols()
     RESOLVEFUNC(OPENSSL_init_crypto)
     RESOLVEFUNC(ASN1_STRING_get0_data)
     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+    RESOLVEFUNC(EVP_PKEY_up_ref)
     RESOLVEFUNC(EVP_PKEY_base_id)
     RESOLVEFUNC(RSA_bits)
     RESOLVEFUNC(OPENSSL_sk_new_null)
@@ -1016,8 +1013,6 @@ bool q_resolveOpenSslSymbols()
     if (!_q_OpenSSL_version) {
         // Apparently, we were built with OpenSSL 1.1 enabled but are now using
         // a wrong library.
-        delete libs.first;
-        delete libs.second;
         qCWarning(lcSsl, "Incompatible version of OpenSSL");
         return false;
     }
@@ -1139,8 +1134,6 @@ bool q_resolveOpenSslSymbols()
         // OpenSSL 1.1 has deprecated and removed SSLeay. We consider a failure to
         // resolve this symbol as a failure to resolve symbols.
         // The right operand of '||' above is ... a bit of paranoia.
-        delete libs.first;
-        delete libs.second;
         qCWarning(lcSsl, "Incompatible version of OpenSSL");
         return false;
     }
@@ -1204,6 +1197,11 @@ bool q_resolveOpenSslSymbols()
 #ifndef OPENSSL_NO_RC2
     RESOLVEFUNC(EVP_rc2_cbc)
 #endif
+#ifndef OPENSSL_NO_AES
+    RESOLVEFUNC(EVP_aes_128_cbc)
+    RESOLVEFUNC(EVP_aes_192_cbc)
+    RESOLVEFUNC(EVP_aes_256_cbc)
+#endif
     RESOLVEFUNC(EVP_sha1)
     RESOLVEFUNC(EVP_PKEY_assign)
     RESOLVEFUNC(EVP_PKEY_set1_RSA)
@@ -1212,6 +1210,7 @@ bool q_resolveOpenSslSymbols()
 #ifndef OPENSSL_NO_EC
     RESOLVEFUNC(EVP_PKEY_set1_EC_KEY)
 #endif
+    RESOLVEFUNC(EVP_PKEY_cmp)
     RESOLVEFUNC(EVP_PKEY_free)
     RESOLVEFUNC(EVP_PKEY_get1_DSA)
     RESOLVEFUNC(EVP_PKEY_get1_RSA)
@@ -1405,9 +1404,7 @@ bool q_resolveOpenSslSymbols()
     RESOLVEFUNC(d2i_PKCS12_bio)
     RESOLVEFUNC(PKCS12_free)
 
-    symbolsResolved = true;
-    delete libs.first;
-    delete libs.second;
+    symbolsResolved.storeRelease(true);
     return true;
 }
 #endif // QT_CONFIG(library)
diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
index 7b604b2ab8..69b2b90fbd 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -281,14 +281,20 @@ const EVP_CIPHER *q_EVP_des_ede3_cbc();
 #ifndef OPENSSL_NO_RC2
 const EVP_CIPHER *q_EVP_rc2_cbc();
 #endif
+#ifndef OPENSSL_NO_AES
+const EVP_CIPHER *q_EVP_aes_128_cbc();
+const EVP_CIPHER *q_EVP_aes_192_cbc();
+const EVP_CIPHER *q_EVP_aes_256_cbc();
+#endif
 Q_AUTOTEST_EXPORT const EVP_MD *q_EVP_sha1();
 int q_EVP_PKEY_assign(EVP_PKEY *a, int b, char *c);
 Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_RSA(EVP_PKEY *a, RSA *b);
-int q_EVP_PKEY_set1_DSA(EVP_PKEY *a, DSA *b);
-int q_EVP_PKEY_set1_DH(EVP_PKEY *a, DH *b);
+Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_DSA(EVP_PKEY *a, DSA *b);
+Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_DH(EVP_PKEY *a, DH *b);
 #ifndef OPENSSL_NO_EC
-int q_EVP_PKEY_set1_EC_KEY(EVP_PKEY *a, EC_KEY *b);
+Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_EC_KEY(EVP_PKEY *a, EC_KEY *b);
 #endif
+Q_AUTOTEST_EXPORT int q_EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b);
 Q_AUTOTEST_EXPORT void q_EVP_PKEY_free(EVP_PKEY *a);
 RSA *q_EVP_PKEY_get1_RSA(EVP_PKEY *a);
 DSA *q_EVP_PKEY_get1_DSA(EVP_PKEY *a);
diff --git a/src/network/ssl/qsslsocket_opensslpre11.cpp b/src/network/ssl/qsslsocket_opensslpre11.cpp
index f5aab821ea..2af437f0fa 100644
--- a/src/network/ssl/qsslsocket_opensslpre11.cpp
+++ b/src/network/ssl/qsslsocket_opensslpre11.cpp
@@ -67,7 +67,6 @@
 #include <QtCore/qthread.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qmutex.h>
-#include <QtCore/qlibrary.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/ssl/qsslsocket_qt.cpp b/src/network/ssl/qsslsocket_qt.cpp
index b0fb60ea76..9ff9a66c05 100644
--- a/src/network/ssl/qsslsocket_qt.cpp
+++ b/src/network/ssl/qsslsocket_qt.cpp
@@ -72,6 +72,7 @@ static QAsn1Element _q_PKCS7_data(const QByteArray &data)
 
     Some test vectors:
     http://www.drh-consultancy.demon.co.uk/test.txt
+    \internal
 */
 static QByteArray _q_PKCS12_keygen(char id, const QByteArray &salt, const QString &passPhrase, int n, int r)
 {
diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp
index 339ecf4da2..d7fb080b49 100644
--- a/src/network/ssl/qsslsocket_schannel.cpp
+++ b/src/network/ssl/qsslsocket_schannel.cpp
@@ -435,7 +435,7 @@ QByteArray createAlpnString(const QByteArrayList &nextAllowedProtocols)
 
 bool QSslSocketPrivate::s_loadRootCertsOnDemand = true;
 bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_schannel_mutex, (QMutex::Recursive))
+Q_GLOBAL_STATIC(QRecursiveMutex, qt_schannel_mutex)
 
 void QSslSocketPrivate::ensureInitialized()
 {
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp
index d54ac2ad73..39c1ce55e3 100644
--- a/src/network/ssl/qsslsocket_winrt.cpp
+++ b/src/network/ssl/qsslsocket_winrt.cpp
@@ -177,6 +177,7 @@ void QSslSocketPrivate::ensureInitialized()
 
 long QSslSocketPrivate::sslLibraryVersionNumber()
 {
+    // ### Qt 6: Find a proper replacement for the deprecated method below.
     return QSysInfo::windowsVersion();
 }
 
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index ec472da2e8..d23b3ad550 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -372,7 +372,7 @@ private:
 class QGLEngineShaderProg
 {
 public:
-    QGLEngineShaderProg() : program(0) {}
+    QGLEngineShaderProg() : program(nullptr) {}
 
     ~QGLEngineShaderProg() {
         if (program)
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index cc97bed3f7..2546f6dc13 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1391,13 +1391,19 @@ void QGL2PaintEngineEx::renderHintsChanged()
     state()->renderHintsChanged = true;
 
 #if !defined(QT_OPENGL_ES_2)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     if (!d->ctx->contextHandle()->isOpenGLES()) {
         if ((state()->renderHints & QPainter::Antialiasing)
-            || (state()->renderHints & QPainter::HighQualityAntialiasing))
+#if QT_DEPRECATED_SINCE(5, 14)
+            || (state()->renderHints & QPainter::HighQualityAntialiasing)
+#endif
+            )
             d->glEnable(GL_MULTISAMPLE);
         else
             d->glDisable(GL_MULTISAMPLE);
     }
+QT_WARNING_POP
 #endif
 
     d->lastTextureUsed = GLuint(-1);
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index abf5b8ea48..762aac2f65 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -175,9 +175,9 @@ public:
 
     QGL2PaintEngineExPrivate(QGL2PaintEngineEx *q_ptr) :
             q(q_ptr),
-            shaderManager(0),
+            shaderManager(nullptr),
             width(0), height(0),
-            ctx(0),
+            ctx(nullptr),
             useSystemClip(true),
             elementIndicesVBOId(0),
             opacityArray(0),
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
index e76216ef5d..7c12ce8998 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
@@ -139,7 +139,7 @@ public:
 
     inline void setPaintEnginePrivate(QGL2PaintEngineExPrivate *p) { pex = p; }
 
-    inline const QOpenGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : 0; }
+    inline const QOpenGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : nullptr; }
 
     inline int serialNumber() const { return m_serialNumber; }
 
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 799e984a68..2c5a40a992 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -397,7 +397,7 @@ QGLFormat::QGLFormat(QGL::FormatOptions options, int plane)
 */
 void QGLFormat::detach()
 {
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         QGLFormatPrivate *newd = new QGLFormatPrivate(d);
         if (!d->ref.deref())
             delete d;
@@ -1667,11 +1667,6 @@ bool operator!=(const QGLFormat& a, const QGLFormat& b)
 }
 
 struct QGLContextGroupList {
-    QGLContextGroupList()
-        : m_mutex(QMutex::Recursive)
-    {
-    }
-
     void append(QGLContextGroup *group) {
         QMutexLocker locker(&m_mutex);
         m_list.append(group);
@@ -1683,7 +1678,7 @@ struct QGLContextGroupList {
     }
 
     QList<QGLContextGroup *> m_list;
-    QMutex m_mutex;
+    QRecursiveMutex m_mutex;
 };
 
 Q_GLOBAL_STATIC(QGLContextGroupList, qt_context_groups)
@@ -5208,7 +5203,7 @@ void QGLContextGroup::addShare(const QGLContext *context, const QGLContext *shar
         return;
 
     // Make sure 'context' is not already shared with another group of contexts.
-    Q_ASSERT(context->d_ptr->group->m_refs.load() == 1);
+    Q_ASSERT(context->d_ptr->group->m_refs.loadRelaxed() == 1);
 
     // Free 'context' group resources and make it use the same resources as 'share'.
     QGLContextGroup *group = share->d_ptr->group;
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index ed364283cc..4e52c0f5e9 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -203,7 +203,7 @@ const QGLContext *qt_gl_transfer_context(const QGLContext *);
 class QGLTemporaryContextPrivate;
 class QGLTemporaryContext {
 public:
-    explicit QGLTemporaryContext(bool directRendering = true, QWidget *parent = 0);
+    explicit QGLTemporaryContext(bool directRendering = true, QWidget *parent = nullptr);
     ~QGLTemporaryContext();
 
 private:
@@ -302,7 +302,7 @@ class Q_OPENGL_EXPORT QGLShareContextScope
 {
 public:
     QGLShareContextScope(const QGLContext *ctx)
-        : m_oldContext(0)
+        : m_oldContext(nullptr)
     {
         QGLContext *currentContext = const_cast<QGLContext *>(QGLContext::currentContext());
         if (currentContext != ctx && !QGLContext::areSharing(ctx, currentContext)) {
@@ -367,7 +367,7 @@ Q_SIGNALS:
 
 class QGLTexture {
 public:
-    explicit QGLTexture(QGLContext *ctx = 0, GLuint tx_id = 0, GLenum tx_target = GL_TEXTURE_2D,
+    explicit QGLTexture(QGLContext *ctx = nullptr, GLuint tx_id = 0, GLenum tx_target = GL_TEXTURE_2D,
                QGLContext::BindOptions opt = QGLContext::DefaultBindOption)
         : context(ctx),
           id(tx_id),
@@ -378,7 +378,7 @@ public:
     ~QGLTexture() {
         if (options & QGLContext::MemoryManagedBindOption) {
             Q_ASSERT(context);
-            QPlatformPixmap *boundPixmap = 0;
+            QPlatformPixmap *boundPixmap = nullptr;
             context->d_ptr->texture_destroyer->emitFreeTexture(context, boundPixmap, id);
         }
      }
@@ -392,9 +392,9 @@ public:
     bool canBindCompressedTexture
         (const char *buf, int len, const char *format, bool *hasAlpha);
     QSize bindCompressedTexture
-        (const QString& fileName, const char *format = 0);
+        (const QString& fileName, const char *format = nullptr);
     QSize bindCompressedTexture
-        (const char *buf, int len, const char *format = 0);
+        (const char *buf, int len, const char *format = nullptr);
     QSize bindCompressedTextureDDS(const char *buf, int len);
     QSize bindCompressedTexturePVR(const char *buf, int len);
 };
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index d607363ac0..f314a9715d 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -153,7 +153,7 @@ QGLColormap & QGLColormap::operator=(const QGLColormap &map)
 void QGLColormap::detach_helper()
 {
     QGLColormapData *x = new QGLColormapData;
-    x->ref.store(1);
+    x->ref.storeRelaxed(1);
     x->cmapHandle = 0;
     x->cells = 0;
     if (d->cells) {
diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h
index 772e327e34..b59b56e040 100644
--- a/src/opengl/qglcolormap.h
+++ b/src/opengl/qglcolormap.h
@@ -90,7 +90,7 @@ private:
 
 inline void QGLColormap::detach()
 {
-    if (d->ref.load() != 1)
+    if (d->ref.loadRelaxed() != 1)
         detach_helper();
 }
 
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index b2158ebfaa..d0f82a85fa 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -145,7 +145,7 @@ extern QImage qt_gl_read_frame_buffer(const QSize&, bool, bool);
 */
 void QGLFramebufferObjectFormat::detach()
 {
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         QGLFramebufferObjectFormatPrivate *newd
             = new QGLFramebufferObjectFormatPrivate(d);
         if (!d->ref.deref())
diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h
index bf5e21cf0b..9d536527c3 100644
--- a/src/opengl/qglframebufferobject_p.h
+++ b/src/opengl/qglframebufferobject_p.h
@@ -124,9 +124,9 @@ private:
 class QGLFramebufferObjectPrivate
 {
 public:
-    QGLFramebufferObjectPrivate() : fbo_guard(0), texture_guard(0), depth_buffer_guard(0)
-                                  , stencil_buffer_guard(0), color_buffer_guard(0)
-                                  , valid(false), engine(0) {}
+    QGLFramebufferObjectPrivate() : fbo_guard(nullptr), texture_guard(nullptr), depth_buffer_guard(nullptr)
+                                  , stencil_buffer_guard(nullptr), color_buffer_guard(nullptr)
+                                  , valid(false), engine(nullptr) {}
     ~QGLFramebufferObjectPrivate() {}
 
     void init(QGLFramebufferObject *q, const QSize& sz,
diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h
index 9125fcfb4b..2729ade2b6 100644
--- a/src/opengl/qglpixelbuffer_p.h
+++ b/src/opengl/qglpixelbuffer_p.h
@@ -77,7 +77,7 @@ private:
 class QGLPixelBufferPrivate {
     Q_DECLARE_PUBLIC(QGLPixelBuffer)
 public:
-    QGLPixelBufferPrivate(QGLPixelBuffer *q) : q_ptr(q), invalid(true), qctx(0), widget(0), fbo(0), blit_fbo(0), pbuf(0), ctx(0)
+    QGLPixelBufferPrivate(QGLPixelBuffer *q) : q_ptr(q), invalid(true), qctx(nullptr), widget(nullptr), fbo(nullptr), blit_fbo(nullptr), pbuf(nullptr), ctx(nullptr)
     {
     }
     bool init(const QSize &size, const QGLFormat &f, QGLWidget *shareWidget);
diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h
index 1a32f24d70..218caa2936 100644
--- a/src/opengl/qgraphicsshadereffect_p.h
+++ b/src/opengl/qgraphicsshadereffect_p.h
@@ -67,7 +67,7 @@ class Q_OPENGL_EXPORT QGraphicsShaderEffect : public QGraphicsEffect
 {
     Q_OBJECT
 public:
-    QGraphicsShaderEffect(QObject *parent = 0);
+    QGraphicsShaderEffect(QObject *parent = nullptr);
     virtual ~QGraphicsShaderEffect();
 
     QByteArray pixelShaderFragment() const;
diff --git a/src/platformheaders/nativecontexts/qeglnativecontext.h b/src/platformheaders/nativecontexts/qeglnativecontext.h
index d4a0e998da..5af2b304fe 100644
--- a/src/platformheaders/nativecontexts/qeglnativecontext.h
+++ b/src/platformheaders/nativecontexts/qeglnativecontext.h
@@ -54,8 +54,8 @@ typedef int EGLDisplay;
 struct QEGLNativeContext
 {
     QEGLNativeContext()
-        : m_context(0),
-          m_display(0)
+        : m_context(nullptr),
+          m_display(nullptr)
     { }
 
     QEGLNativeContext(EGLContext ctx, EGLDisplay dpy)
diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_p.h
index b1ce14b5c3..f1f50e9708 100644
--- a/src/platformsupport/devicediscovery/qdevicediscovery_p.h
+++ b/src/platformsupport/devicediscovery/qdevicediscovery_p.h
@@ -86,7 +86,7 @@ public:
     Q_ENUM(QDeviceType)
     Q_DECLARE_FLAGS(QDeviceTypes, QDeviceType)
 
-    static QDeviceDiscovery *create(QDeviceTypes type, QObject *parent = 0);
+    static QDeviceDiscovery *create(QDeviceTypes type, QObject *parent = nullptr);
 
     virtual QStringList scanConnectedDevices() = 0;
 
diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h
index 28618d0b21..82b475776d 100644
--- a/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h
+++ b/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h
@@ -61,7 +61,7 @@ class QDeviceDiscoveryUDev : public QDeviceDiscovery
     Q_OBJECT
 
 public:
-    QDeviceDiscoveryUDev(QDeviceTypes types, struct udev *udev, QObject *parent = 0);
+    QDeviceDiscoveryUDev(QDeviceTypes types, struct udev *udev, QObject *parent = nullptr);
     ~QDeviceDiscoveryUDev();
     QStringList scanConnectedDevices() override;
 
diff --git a/src/platformsupport/edid/qedidparser.cpp b/src/platformsupport/edid/qedidparser.cpp
index 06c8852825..6bf1f1db96 100644
--- a/src/platformsupport/edid/qedidparser.cpp
+++ b/src/platformsupport/edid/qedidparser.cpp
@@ -42,8 +42,6 @@
 #include "qedidparser_p.h"
 #include "qedidvendortable_p.h"
 
-#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
-
 #define EDID_DESCRIPTOR_ALPHANUMERIC_STRING 0xfe
 #define EDID_DESCRIPTOR_PRODUCT_NAME 0xfc
 #define EDID_DESCRIPTOR_SERIAL_NUMBER 0xff
@@ -139,9 +137,9 @@ bool QEdidParser::parse(const QByteArray &blob)
     manufacturer = m_vendorCache.value(pnpIdString);
     if (manufacturer.isEmpty()) {
         // Find the manufacturer from the vendor lookup table
-        for (size_t i = 0; i < ARRAY_LENGTH(q_edidVendorTable); i++) {
-            if (strncmp(q_edidVendorTable[i].id, pnpId, 3) == 0) {
-                manufacturer = QString::fromUtf8(q_edidVendorTable[i].name);
+        for (const auto &vendor : q_edidVendorTable) {
+            if (strncmp(vendor.id, pnpId, 3) == 0) {
+                manufacturer = QString::fromUtf8(vendor.name);
                 break;
             }
         }
diff --git a/src/platformsupport/eglconvenience/qeglpbuffer_p.h b/src/platformsupport/eglconvenience/qeglpbuffer_p.h
index 0285e067a6..8ad2eb7248 100644
--- a/src/platformsupport/eglconvenience/qeglpbuffer_p.h
+++ b/src/platformsupport/eglconvenience/qeglpbuffer_p.h
@@ -60,7 +60,7 @@ class QEGLPbuffer : public QPlatformOffscreenSurface
 {
 public:
     QEGLPbuffer(EGLDisplay display, const QSurfaceFormat &format, QOffscreenSurface *offscreenSurface,
-                QEGLPlatformContext::Flags flags = 0);
+                QEGLPlatformContext::Flags flags = nullptr);
     ~QEGLPbuffer();
 
     QSurfaceFormat format() const override { return m_format; }
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
index d6cbbe4131..ed77c57df5 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
@@ -68,8 +68,8 @@ public:
     Q_DECLARE_FLAGS(Flags, Flag)
 
     QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display,
-                        EGLConfig *config = 0, const QVariant &nativeHandle = QVariant(),
-                        Flags flags = 0);
+                        EGLConfig *config = nullptr, const QVariant &nativeHandle = QVariant(),
+                        Flags flags = nullptr);
     ~QEGLPlatformContext();
 
     void initialize() override;
diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h b/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h
index 085a1c52f3..b9254d3071 100644
--- a/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h
+++ b/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h
@@ -64,7 +64,7 @@ class QPAEventDispatcherGlib : public QEventDispatcherGlib
     Q_DECLARE_PRIVATE(QPAEventDispatcherGlib)
 
 public:
-    explicit QPAEventDispatcherGlib(QObject *parent = 0);
+    explicit QPAEventDispatcherGlib(QObject *parent = nullptr);
     ~QPAEventDispatcherGlib();
 
     bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
@@ -77,7 +77,7 @@ class QPAEventDispatcherGlibPrivate : public QEventDispatcherGlibPrivate
 {
     Q_DECLARE_PUBLIC(QPAEventDispatcherGlib)
 public:
-    QPAEventDispatcherGlibPrivate(GMainContext *context = 0);
+    QPAEventDispatcherGlibPrivate(GMainContext *context = nullptr);
     GUserEventSource *userEventSource;
 };
 
diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
index 7f775b73ee..8157b8793d 100644
--- a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
+++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
@@ -61,7 +61,7 @@ class QUnixEventDispatcherQPA : public QEventDispatcherUNIX
     Q_OBJECT
 
 public:
-    explicit QUnixEventDispatcherQPA(QObject *parent = 0);
+    explicit QUnixEventDispatcherQPA(QObject *parent = nullptr);
     ~QUnixEventDispatcherQPA();
 
     bool processEvents(QEventLoop::ProcessEventsFlags flags);
diff --git a/src/platformsupport/fbconvenience/qfbvthandler_p.h b/src/platformsupport/fbconvenience/qfbvthandler_p.h
index 17d07317b2..d565ec3632 100644
--- a/src/platformsupport/fbconvenience/qfbvthandler_p.h
+++ b/src/platformsupport/fbconvenience/qfbvthandler_p.h
@@ -63,7 +63,7 @@ class QFbVtHandler : public QObject
     Q_OBJECT
 
 public:
-    QFbVtHandler(QObject *parent = 0);
+    QFbVtHandler(QObject *parent = nullptr);
     ~QFbVtHandler();
 
 signals:
diff --git a/src/platformsupport/fbconvenience/qfbwindow.cpp b/src/platformsupport/fbconvenience/qfbwindow.cpp
index 36f92b8cea..9f5f87d9d6 100644
--- a/src/platformsupport/fbconvenience/qfbwindow.cpp
+++ b/src/platformsupport/fbconvenience/qfbwindow.cpp
@@ -45,11 +45,12 @@
 
 QT_BEGIN_NAMESPACE
 
+static QBasicAtomicInt winIdGenerator = Q_BASIC_ATOMIC_INITIALIZER(0);
+
 QFbWindow::QFbWindow(QWindow *window)
     : QPlatformWindow(window), mBackingStore(0), mWindowState(Qt::WindowNoState)
 {
-    static QAtomicInt winIdGenerator(1);
-    mWindowId = winIdGenerator.fetchAndAddRelaxed(1);
+    mWindowId = winIdGenerator.fetchAndAddRelaxed(1) + 1;
 }
 
 QFbWindow::~QFbWindow()
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index e545d54ec2..7abf295782 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -721,7 +721,7 @@ QStringList QFontconfigDatabase::fallbacksForFamily(const QString &family, QFont
 
     FcValue value;
     value.type = FcTypeString;
-    QByteArray cs = family.toUtf8();
+    const QByteArray cs = family.toUtf8();
     value.u.s = (const FcChar8 *)cs.data();
     FcPatternAdd(pattern,FC_FAMILY,value,true);
 
@@ -863,7 +863,7 @@ QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const
         return family;
 
     if (!family.isEmpty()) {
-        QByteArray cs = family.toUtf8();
+        const QByteArray cs = family.toUtf8();
         FcPatternAddString(pattern, FC_FAMILY, (const FcChar8 *) cs.constData());
     }
     FcConfigSubstitute(0, pattern, FcMatchPattern);
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
index 08e652b2a0..8c6cc8fbc1 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
@@ -121,13 +121,12 @@ class QtFreetypeData
 {
 public:
     QtFreetypeData()
-        : library(0), hasPatentFreeLcdRendering(false)
+        : library(0)
     { }
     ~QtFreetypeData();
 
     FT_Library library;
     QHash<QFontEngine::FaceId, QFreetypeFace *> faces;
-    bool hasPatentFreeLcdRendering;
 };
 
 QtFreetypeData::~QtFreetypeData()
@@ -153,11 +152,6 @@ QtFreetypeData *qt_getFreetypeData()
         FT_Bool no_darkening = false;
         FT_Property_Set(freetypeData->library, "cff", "no-stem-darkening", &no_darkening);
 #endif
-        // FreeType has since 2.8.1 a patent free alternative to LCD-filtering.
-        FT_Int amajor, aminor = 0, apatch = 0;
-        FT_Library_Version(freetypeData->library, &amajor, &aminor, &apatch);
-        if (QT_VERSION_CHECK(amajor, aminor, apatch) >= QT_VERSION_CHECK(2, 8, 1))
-            freetypeData->hasPatentFreeLcdRendering = true;
     }
     return freetypeData;
 }
@@ -260,7 +254,7 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id,
         }
         newFreetype->face = face;
 
-        newFreetype->ref.store(1);
+        newFreetype->ref.storeRelaxed(1);
         newFreetype->xsize = 0;
         newFreetype->ysize = 0;
         newFreetype->matrix.xx = 0x10000;
@@ -556,26 +550,7 @@ void QFreetypeFace::addBitmapToPath(FT_GlyphSlot slot, const QFixedPoint &point,
                        slot->bitmap.buffer, slot->bitmap.pitch, slot->bitmap.width, slot->bitmap.rows, path);
 }
 
-struct LcdFilterDummy
-{
-    static inline void filterPixel(uchar &, uchar &, uchar &)
-    {}
-};
-
-struct LcdFilterLegacy
-{
-    static inline void filterPixel(uchar &red, uchar &green, uchar &blue)
-    {
-        uint r = red, g = green, b = blue;
-        // intra-pixel filter used by the legacy filter (adopted from _ft_lcd_filter_legacy)
-        red   = (r * uint(65538 * 9/13) + g * uint(65538 * 1/6) + b * uint(65538 * 1/13)) / 65536;
-        green = (r * uint(65538 * 3/13) + g * uint(65538 * 4/6) + b * uint(65538 * 3/13)) / 65536;
-        blue  = (r * uint(65538 * 1/13) + g * uint(65538 * 1/6) + b * uint(65538 * 9/13)) / 65536;
-    }
-};
-
-template <typename LcdFilter>
-static void convertRGBToARGB_helper(const uchar *src, uint *dst, int width, int height, int src_pitch, bool bgr)
+static inline void convertRGBToARGB(const uchar *src, uint *dst, int width, int height, int src_pitch, bool bgr)
 {
     const int offs = bgr ? -1 : 1;
     const int w = width * 3;
@@ -585,7 +560,6 @@ static void convertRGBToARGB_helper(const uchar *src, uint *dst, int width, int
             uchar red = src[x + 1 - offs];
             uchar green = src[x + 1];
             uchar blue = src[x + 1 + offs];
-            LcdFilter::filterPixel(red, green, blue);
             *dd++ = (0xFFU << 24) | (red << 16) | (green << 8) | blue;
         }
         dst += width;
@@ -593,16 +567,7 @@ static void convertRGBToARGB_helper(const uchar *src, uint *dst, int width, int
     }
 }
 
-static inline void convertRGBToARGB(const uchar *src, uint *dst, int width, int height, int src_pitch, bool bgr, bool legacyFilter)
-{
-    if (!legacyFilter)
-        convertRGBToARGB_helper<LcdFilterDummy>(src, dst, width, height, src_pitch, bgr);
-    else
-        convertRGBToARGB_helper<LcdFilterLegacy>(src, dst, width, height, src_pitch, bgr);
-}
-
-template <typename LcdFilter>
-static void convertRGBToARGB_V_helper(const uchar *src, uint *dst, int width, int height, int src_pitch, bool bgr)
+static inline void convertRGBToARGB_V(const uchar *src, uint *dst, int width, int height, int src_pitch, bool bgr)
 {
     const int offs = bgr ? -src_pitch : src_pitch;
     while (height--) {
@@ -610,54 +575,12 @@ static void convertRGBToARGB_V_helper(const uchar *src, uint *dst, int width, in
             uchar red = src[x + src_pitch - offs];
             uchar green = src[x + src_pitch];
             uchar blue = src[x + src_pitch + offs];
-            LcdFilter::filterPixel(red, green, blue);
             *dst++ = (0XFFU << 24) | (red << 16) | (green << 8) | blue;
         }
         src += 3*src_pitch;
     }
 }
 
-static inline void convertRGBToARGB_V(const uchar *src, uint *dst, int width, int height, int src_pitch, bool bgr, bool legacyFilter)
-{
-    if (!legacyFilter)
-        convertRGBToARGB_V_helper<LcdFilterDummy>(src, dst, width, height, src_pitch, bgr);
-    else
-        convertRGBToARGB_V_helper<LcdFilterLegacy>(src, dst, width, height, src_pitch, bgr);
-}
-
-static inline void convertGRAYToARGB(const uchar *src, uint *dst, int width, int height, int src_pitch)
-{
-    while (height--) {
-        const uchar *p = src;
-        const uchar * const e = p + width;
-        while (p < e) {
-            uchar gray = *p++;
-            *dst++ = (0xFFU << 24) | (gray << 16) | (gray << 8) | gray;
-        }
-        src += src_pitch;
-    }
-}
-
-static void convoluteBitmap(const uchar *src, uchar *dst, int width, int height, int pitch)
-{
-    // convolute the bitmap with a triangle filter to get rid of color fringes
-    // If we take account for a gamma value of 2, we end up with
-    // weights of 1, 4, 9, 4, 1. We use an approximation of 1, 3, 8, 3, 1 here,
-    // as this nicely sums up to 16 :)
-    int h = height;
-    while (h--) {
-        dst[0] = dst[1] = 0;
-        //
-        for (int x = 2; x < width - 2; ++x) {
-            uint sum = src[x-2] + 3*src[x-1] + 8*src[x] + 3*src[x+1] + src[x+2];
-            dst[x] = (uchar) (sum >> 4);
-        }
-        dst[width - 2] = dst[width - 1] = 0;
-        src += pitch;
-        dst += pitch;
-    }
-}
-
 static QFontEngine::SubpixelAntialiasingType subpixelAntialiasingTypeHint()
 {
     static int type = -1;
@@ -1148,126 +1071,49 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
 
     int glyph_buffer_size = 0;
     QScopedArrayPointer<uchar> glyph_buffer;
-    bool useFreetypeRenderGlyph = false;
-    if (slot->format == FT_GLYPH_FORMAT_OUTLINE && (hsubpixel || vfactor != 1)) {
-        err = FT_Library_SetLcdFilter(slot->library, (FT_LcdFilter)lcdFilterType);
-        // We use FT_Render_Glyph if freetype has support for lcd-filtering
-        // or is version 2.8.1 or higher and can do without.
-        if (err == FT_Err_Ok || qt_getFreetypeData()->hasPatentFreeLcdRendering)
-            useFreetypeRenderGlyph = true;
+    FT_Render_Mode renderMode = (default_hint_style == HintLight) ? FT_RENDER_MODE_LIGHT : FT_RENDER_MODE_NORMAL;
+    switch (format) {
+    case Format_Mono:
+        renderMode = FT_RENDER_MODE_MONO;
+        break;
+    case Format_A32:
+        Q_ASSERT(hsubpixel || vfactor != 1);
+        renderMode = hsubpixel ? FT_RENDER_MODE_LCD : FT_RENDER_MODE_LCD_V;
+        break;
+    case Format_A8:
+    case Format_ARGB:
+        break;
+    default:
+        Q_UNREACHABLE();
     }
-    if (useFreetypeRenderGlyph) {
-        err = FT_Render_Glyph(slot, hsubpixel ? FT_RENDER_MODE_LCD : FT_RENDER_MODE_LCD_V);
-
-        if (err != FT_Err_Ok)
-            qWarning("render glyph failed err=%x face=%p, glyph=%d", err, face, glyph);
-
-        FT_Library_SetLcdFilter(slot->library, FT_LCD_FILTER_NONE);
+    FT_Library_SetLcdFilter(slot->library, (FT_LcdFilter)lcdFilterType);
 
-        info.height = slot->bitmap.rows / vfactor;
-        info.width = hsubpixel ? slot->bitmap.width / 3 : slot->bitmap.width;
-        info.x = slot->bitmap_left;
-        info.y = slot->bitmap_top;
+    err = FT_Render_Glyph(slot, renderMode);
+    if (err != FT_Err_Ok)
+        qWarning("render glyph failed err=%x face=%p, glyph=%d", err, face, glyph);
 
-        glyph_buffer_size = info.width * info.height * 4;
-        glyph_buffer.reset(new uchar[glyph_buffer_size]);
+    FT_Library_SetLcdFilter(slot->library, FT_LCD_FILTER_NONE);
 
-        if (hsubpixel)
-            convertRGBToARGB(slot->bitmap.buffer, (uint *)glyph_buffer.data(), info.width, info.height, slot->bitmap.pitch, subpixelType != Subpixel_RGB, false);
-        else if (vfactor != 1)
-            convertRGBToARGB_V(slot->bitmap.buffer, (uint *)glyph_buffer.data(), info.width, info.height, slot->bitmap.pitch, subpixelType != Subpixel_VRGB, false);
-    } else {
-    int left  = slot->metrics.horiBearingX;
-    int right = slot->metrics.horiBearingX + slot->metrics.width;
-    int top    = slot->metrics.horiBearingY;
-    int bottom = slot->metrics.horiBearingY - slot->metrics.height;
-    if (transform && slot->format != FT_GLYPH_FORMAT_BITMAP)
-        transformBoundingBox(&left, &top, &right, &bottom, &matrix);
-    left = FLOOR(left);
-    right = CEIL(right);
-    bottom = FLOOR(bottom);
-    top = CEIL(top);
-
-    int hpixels = TRUNC(right - left);
-    // subpixel position requires one more pixel
-    if (subPixelPosition > 0 && format != Format_Mono)
-        hpixels++;
-
-    if (hsubpixel)
-        hpixels = hpixels*3 + 8;
-    info.width = hpixels;
-    info.height = TRUNC(top - bottom);
-    info.x = TRUNC(left);
-    info.y = TRUNC(top);
-    if (hsubpixel) {
-        info.width /= 3;
-        info.x -= 1;
-    }
-
-    // If any of the metrics are too large to fit, don't cache them
-    if (areMetricsTooLarge(info))
-        return 0;
+    info.height = slot->bitmap.rows;
+    info.width = slot->bitmap.width;
+    info.x = slot->bitmap_left;
+    info.y = slot->bitmap_top;
+    if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_LCD)
+        info.width = info.width / 3;
+    if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V)
+        info.height = info.height / vfactor;
 
     int pitch = (format == Format_Mono ? ((info.width + 31) & ~31) >> 3 :
                  (format == Format_A8 ? (info.width + 3) & ~3 : info.width * 4));
-    if (glyph_buffer_size < pitch * info.height) {
-        glyph_buffer_size = pitch * info.height;
-        glyph_buffer.reset(new uchar[glyph_buffer_size]);
-        memset(glyph_buffer.data(), 0, glyph_buffer_size);
-    }
 
-    if (slot->format == FT_GLYPH_FORMAT_OUTLINE) {
-        FT_Bitmap bitmap;
-        bitmap.rows = info.height*vfactor;
-        bitmap.width = hpixels;
-        bitmap.pitch = format == Format_Mono ? (((info.width + 31) & ~31) >> 3) : ((bitmap.width + 3) & ~3);
-        int bitmap_buffer_size = bitmap.rows * bitmap.pitch;
-        if (!hsubpixel && vfactor == 1 && format != Format_A32) {
-            Q_ASSERT(glyph_buffer_size <= bitmap_buffer_size);
-            bitmap.buffer = glyph_buffer.data();
-        } else {
-            bitmap.buffer = new uchar[bitmap_buffer_size];
-            memset(bitmap.buffer, 0, bitmap_buffer_size);
-        }
-        bitmap.pixel_mode = format == Format_Mono ? FT_PIXEL_MODE_MONO : FT_PIXEL_MODE_GRAY;
-        FT_Matrix matrix;
-        matrix.xx = (hsubpixel ? 3 : 1) << 16;
-        matrix.yy = vfactor << 16;
-        matrix.yx = matrix.xy = 0;
-
-        FT_Outline_Transform(&slot->outline, &matrix);
-        FT_Outline_Translate (&slot->outline, (hsubpixel ? -3*left +(4<<6) : -left), -bottom*vfactor);
-        FT_Outline_Get_Bitmap(slot->library, &slot->outline, &bitmap);
-        if (hsubpixel) {
-            Q_ASSERT (bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
-            Q_ASSERT(antialias);
-            uchar *convoluted = new uchar[bitmap_buffer_size];
-            bool useLegacyLcdFilter = false;
-            useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
-            uchar *buffer = bitmap.buffer;
-            if (!useLegacyLcdFilter) {
-                convoluteBitmap(bitmap.buffer, convoluted, bitmap.width, info.height, bitmap.pitch);
-                buffer = convoluted;
-            }
-            convertRGBToARGB(buffer + 1, (uint *)glyph_buffer.data(), info.width, info.height, bitmap.pitch, subpixelType != Subpixel_RGB, useLegacyLcdFilter);
-            delete [] convoluted;
-        } else if (vfactor != 1) {
-            convertRGBToARGB_V(bitmap.buffer, (uint *)glyph_buffer.data(), info.width, info.height, bitmap.pitch, subpixelType != Subpixel_VRGB, true);
-        } else if (format == Format_A32 && bitmap.pixel_mode == FT_PIXEL_MODE_GRAY) {
-            convertGRAYToARGB(bitmap.buffer, (uint *)glyph_buffer.data(), info.width, info.height, bitmap.pitch);
-        }
+    glyph_buffer_size = info.height * pitch;
+    glyph_buffer.reset(new uchar[glyph_buffer_size]);
 
-        if (bitmap.buffer != glyph_buffer.data())
-            delete [] bitmap.buffer;
-    } else if (slot->format == FT_GLYPH_FORMAT_BITMAP) {
-#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100) >= 20500)
-        Q_ASSERT(slot->bitmap.pixel_mode == FT_PIXEL_MODE_MONO || slot->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA);
-#else
-        Q_ASSERT(slot->bitmap.pixel_mode == FT_PIXEL_MODE_MONO);
-#endif
+    if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
         uchar *src = slot->bitmap.buffer;
         uchar *dst = glyph_buffer.data();
         int h = slot->bitmap.rows;
+        // Some fonts return bitmaps even when we requested something else:
         if (format == Format_Mono) {
             int bytes = ((info.width + 7) & ~7) >> 3;
             while (h--) {
@@ -1275,69 +1121,63 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
                 dst += pitch;
                 src += slot->bitmap.pitch;
             }
-        } else if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
-            if (hsubpixel) {
-                while (h--) {
-                    uint *dd = (uint *)dst;
-                    *dd++ = 0;
-                    for (int x = 0; x < static_cast<int>(slot->bitmap.width); x++) {
-                        uint a = ((src[x >> 3] & (0x80 >> (x & 7))) ? 0xffffff : 0x000000);
-                        *dd++ = a;
-                    }
-                    *dd++ = 0;
-                    dst += pitch;
-                    src += slot->bitmap.pitch;
-                }
-            } else if (vfactor != 1) {
-                while (h--) {
-                    uint *dd = (uint *)dst;
-                    for (int x = 0; x < static_cast<int>(slot->bitmap.width); x++) {
-                        uint a = ((src[x >> 3] & (0x80 >> (x & 7))) ? 0xffffff : 0x000000);
-                        *dd++ = a;
-                    }
-                    dst += pitch;
-                    src += slot->bitmap.pitch;
-                }
-            } else {
-                while (h--) {
-                    for (int x = 0; x < static_cast<int>(slot->bitmap.width); x++) {
-                        unsigned char a = ((src[x >> 3] & (0x80 >> (x & 7))) ? 0xff : 0x00);
-                        dst[x] = a;
-                    }
-                    dst += pitch;
-                    src += slot->bitmap.pitch;
-                }
+        } else if (format == Format_A8) {
+            while (h--) {
+                for (int x = 0; x < int{info.width}; x++)
+                    dst[x] = ((src[x >> 3] & (0x80 >> (x & 7))) ? 0xff : 0x00);
+                dst += pitch;
+                src += slot->bitmap.pitch;
             }
-        }
-#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100) >= 20500)
-        else if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA)
-        {
+        } else {
             while (h--) {
-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-                const quint32 *srcPixel = (const quint32 *)src;
-                quint32 *dstPixel = (quint32 *)dst;
-                for (int x = 0; x < static_cast<int>(slot->bitmap.width); x++, srcPixel++, dstPixel++) {
-                    const quint32 pixel = *srcPixel;
-                    *dstPixel = qbswap(pixel);
-                }
-#else
-                memcpy(dst, src, slot->bitmap.width * 4);
-#endif
-                dst += slot->bitmap.pitch;
+                uint *dd = reinterpret_cast<uint *>(dst);
+                for (int x = 0; x < int{info.width}; x++)
+                    dd[x] = ((src[x >> 3] & (0x80 >> (x & 7))) ? 0xffffffff : 0x00000000);
+                dst += pitch;
                 src += slot->bitmap.pitch;
             }
-            info.width = info.linearAdvance = info.xOff = slot->bitmap.width;
-            info.height = slot->bitmap.rows;
-            info.x = slot->bitmap_left;
-            info.y = slot->bitmap_top;
         }
+    } else if (slot->bitmap.pixel_mode == 7 /*FT_PIXEL_MODE_BGRA*/) {
+        Q_ASSERT(format == Format_ARGB);
+        uchar *src = slot->bitmap.buffer;
+        uchar *dst = glyph_buffer.data();
+        int h = slot->bitmap.rows;
+        while (h--) {
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+            const quint32 *srcPixel = (const quint32 *)src;
+            quint32 *dstPixel = (quint32 *)dst;
+            for (int x = 0; x < static_cast<int>(slot->bitmap.width); x++, srcPixel++, dstPixel++) {
+                const quint32 pixel = *srcPixel;
+                *dstPixel = qbswap(pixel);
+            }
+#else
+            memcpy(dst, src, slot->bitmap.width * 4);
 #endif
+            dst += slot->bitmap.pitch;
+            src += slot->bitmap.pitch;
+        }
+        info.linearAdvance = info.xOff = slot->bitmap.width;
+    } else if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY) {
+        Q_ASSERT(format == Format_A8);
+        uchar *src = slot->bitmap.buffer;
+        uchar *dst = glyph_buffer.data();
+        int h = slot->bitmap.rows;
+        int bytes = info.width;
+        while (h--) {
+            memcpy (dst, src, bytes);
+            dst += pitch;
+            src += slot->bitmap.pitch;
+        }
+    } else if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_LCD) {
+        Q_ASSERT(format == Format_A32);
+        convertRGBToARGB(slot->bitmap.buffer, (uint *)glyph_buffer.data(), info.width, info.height, slot->bitmap.pitch, subpixelType != Subpixel_RGB);
+    } else if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V) {
+        Q_ASSERT(format == Format_A32);
+        convertRGBToARGB_V(slot->bitmap.buffer, (uint *)glyph_buffer.data(), info.width, info.height, slot->bitmap.pitch, subpixelType != Subpixel_VRGB);
     } else {
-        qWarning("QFontEngine: Glyph neither outline nor bitmap format=%d", slot->format);
+        qWarning("QFontEngine: Glyph rendered in unknown pixel_mode=%d", slot->bitmap.pixel_mode);
         return 0;
     }
-    }
-
 
     if (!g) {
         g = new Glyph;
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
index 2863d206d2..2e3aef6979 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
@@ -116,11 +116,11 @@ private:
     friend class QFontEngineFT;
     friend class QtFreetypeData;
     friend struct QScopedPointerDeleter<QFreetypeFace>;
-    QFreetypeFace() : _lock(QMutex::Recursive) {}
+    QFreetypeFace() = default;
     ~QFreetypeFace() {}
     void cleanup();
     QAtomicInt ref;
-    QMutex _lock;
+    QRecursiveMutex _lock;
     QByteArray fontData;
 
     QFontEngine::Holder hbFace;
@@ -252,7 +252,7 @@ private:
     inline bool isScalableBitmap() const { return freetype->isScalableBitmap(); }
 
     inline Glyph *loadGlyph(uint glyph, QFixed subPixelPosition, GlyphFormat format = Format_None, bool fetchMetricsOnly = false, bool disableOutlineDrawing = false) const
-    { return loadGlyph(cacheEnabled ? &defaultGlyphSet : 0, glyph, subPixelPosition, format, fetchMetricsOnly, disableOutlineDrawing); }
+    { return loadGlyph(cacheEnabled ? &defaultGlyphSet : nullptr, glyph, subPixelPosition, format, fetchMetricsOnly, disableOutlineDrawing); }
     Glyph *loadGlyph(QGlyphSet *set, uint glyph, QFixed subPixelPosition, GlyphFormat = Format_None, bool fetchMetricsOnly = false, bool disableOutlineDrawing = false) const;
     Glyph *loadGlyphFor(glyph_t g, QFixed subPixelPosition, GlyphFormat format, const QTransform &t, bool fetchBoundingBox = false, bool disableOutlineDrawing = false);
 
diff --git a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
index adc2f6c1fe..25c10fbd3c 100644
--- a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
@@ -127,7 +127,7 @@ QStringList QFreeTypeFontDatabase::addTTFile(const QByteArray &fontData, const Q
             error = FT_New_Face(library, file.constData(), index, &face);
         }
         if (error != FT_Err_Ok) {
-            qDebug() << "FT_New_Face failed with index" << index << ':' << hex << error;
+            qDebug() << "FT_New_Face failed with index" << index << ':' << Qt::hex << error;
             break;
         }
         numFaces = face->num_faces;
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index e8ea194897..daa3dc94ea 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -48,6 +48,8 @@
 #import <UIKit/UIFont.h>
 #endif
 
+#include <QtCore/qelapsedtimer.h>
+
 #include "qcoretextfontdatabase_p.h"
 #include "qfontengine_coretext_p.h"
 #if QT_CONFIG(settings)
@@ -100,20 +102,6 @@ static const char *languageForWritingSystem[] = {
 };
 enum { LanguageCount = sizeof(languageForWritingSystem) / sizeof(const char *) };
 
-#ifdef Q_OS_OSX
-static NSInteger languageMapSort(id obj1, id obj2, void *context)
-{
-    NSArray<NSString *> *map1 = reinterpret_cast<NSArray<NSString *> *>(obj1);
-    NSArray<NSString *> *map2 = reinterpret_cast<NSArray<NSString *> *>(obj2);
-    NSArray<NSString *> *languages = reinterpret_cast<NSArray<NSString *> *>(context);
-
-    NSString *lang1 = [map1 objectAtIndex:0];
-    NSString *lang2 = [map2 objectAtIndex:0];
-
-    return [languages indexOfObject:lang1] - [languages indexOfObject:lang2];
-}
-#endif
-
 QCoreTextFontDatabase::QCoreTextFontDatabase()
     : m_hasPopulatedAliases(false)
 {
@@ -127,39 +115,77 @@ QCoreTextFontDatabase::~QCoreTextFontDatabase()
 
 void QCoreTextFontDatabase::populateFontDatabase()
 {
+    qCDebug(lcQpaFonts) << "Populating font database...";
+    QElapsedTimer elapsed;
+    if (lcQpaFonts().isDebugEnabled())
+        elapsed.start();
+
     QCFType<CFArrayRef> familyNames = CTFontManagerCopyAvailableFontFamilyNames();
     for (NSString *familyName in familyNames.as<const NSArray *>())
         QPlatformFontDatabase::registerFontFamily(QString::fromNSString(familyName));
 
+    qCDebug(lcQpaFonts) << "Populating available families took" << elapsed.restart() << "ms";
+
     // Force creating the theme fonts to get the descriptors in m_systemFontDescriptors
     if (m_themeFonts.isEmpty())
         (void)themeFonts();
 
+    qCDebug(lcQpaFonts) << "Resolving theme fonts took" << elapsed.restart() << "ms";
+
     Q_FOREACH (CTFontDescriptorRef fontDesc, m_systemFontDescriptors)
         populateFromDescriptor(fontDesc);
 
+    qCDebug(lcQpaFonts) << "Populating system descriptors took" << elapsed.restart() << "ms";
+
     Q_ASSERT(!m_hasPopulatedAliases);
 }
 
-bool QCoreTextFontDatabase::populateFamilyAliases()
+bool QCoreTextFontDatabase::populateFamilyAliases(const QString &missingFamily)
 {
 #if defined(Q_OS_MACOS)
     if (m_hasPopulatedAliases)
         return false;
 
+    // There's no API to go from a localized family name to its non-localized
+    // name, so we have to resort to enumerating all the available fonts and
+    // doing a reverse lookup.
+
+    qCDebug(lcQpaFonts) << "Populating family aliases...";
+    QElapsedTimer elapsed;
+    elapsed.start();
+
+    QString nonLocalizedMatch;
     QCFType<CFArrayRef> familyNames = CTFontManagerCopyAvailableFontFamilyNames();
+    NSFontManager *fontManager = NSFontManager.sharedFontManager;
     for (NSString *familyName in familyNames.as<const NSArray *>()) {
-        NSFontManager *fontManager = [NSFontManager sharedFontManager];
         NSString *localizedFamilyName = [fontManager localizedNameForFamily:familyName face:nil];
         if (![localizedFamilyName isEqual:familyName]) {
-            QPlatformFontDatabase::registerAliasToFontFamily(
-                QString::fromNSString(familyName),
-                QString::fromNSString(localizedFamilyName));
+            QString nonLocalizedFamily = QString::fromNSString(familyName);
+            QString localizedFamily = QString::fromNSString(localizedFamilyName);
+            QPlatformFontDatabase::registerAliasToFontFamily(nonLocalizedFamily, localizedFamily);
+            if (localizedFamily == missingFamily)
+                nonLocalizedMatch = nonLocalizedFamily;
         }
     }
     m_hasPopulatedAliases = true;
+
+    if (lcQpaFonts().isWarningEnabled()) {
+        QString warningMessage;
+        QDebug msg(&warningMessage);
+
+        msg << "Populating font family aliases took" << elapsed.restart() << "ms.";
+        if (!nonLocalizedMatch.isNull())
+            msg << "Replace uses of" << missingFamily << "with its non-localized name" << nonLocalizedMatch;
+        else
+            msg << "Replace uses of missing font family" << missingFamily << "with one that exists";
+        msg << "to avoid this cost.";
+
+        qCWarning(lcQpaFonts) << qPrintable(warningMessage);
+    }
+
     return true;
 #else
+    Q_UNUSED(missingFamily);
     return false;
 #endif
 }
@@ -173,7 +199,7 @@ void QCoreTextFontDatabase::populateFamily(const QString &familyName)
     // A single family might match several different fonts with different styles eg.
     QCFType<CFArrayRef> matchingFonts = (CFArrayRef) CTFontDescriptorCreateMatchingFontDescriptors(nameOnlyDescriptor, 0);
     if (!matchingFonts) {
-        qWarning() << "QCoreTextFontDatabase: Found no matching fonts for family" << familyName;
+        qCWarning(lcQpaFonts) << "QCoreTextFontDatabase: Found no matching fonts for family" << familyName;
         return;
     }
 
@@ -406,163 +432,163 @@ template class QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>;
 template class QCoreTextFontDatabaseEngineFactory<QFontEngineFT>;
 #endif
 
-QFont::StyleHint styleHintFromNSString(NSString *style)
+CTFontDescriptorRef descriptorForFamily(const QString &familyName)
+{
+    return CTFontDescriptorCreateWithAttributes(CFDictionaryRef(@{
+        (id)kCTFontFamilyNameAttribute: familyName.toNSString()
+    }));
+}
+
+CTFontDescriptorRef descriptorForFamily(const char *familyName)
 {
-    if ([style isEqual: @"sans-serif"])
-        return QFont::SansSerif;
-    else if ([style isEqual: @"monospace"])
-        return QFont::Monospace;
-    else if ([style isEqual: @"cursive"])
-        return QFont::Cursive;
-    else if ([style isEqual: @"serif"])
-        return QFont::Serif;
-    else if ([style isEqual: @"fantasy"])
-        return QFont::Fantasy;
-    else // if ([style isEqual: @"default"])
-        return QFont::AnyStyle;
+    return descriptorForFamily(QString::fromLatin1(familyName));
 }
 
-#ifdef Q_OS_OSX
-static QString familyNameFromPostScriptName(NSString *psName)
+CFArrayRef fallbacksForDescriptor(CTFontDescriptorRef descriptor)
 {
-    QCFType<CTFontDescriptorRef> fontDescriptor = (CTFontDescriptorRef) CTFontDescriptorCreateWithNameAndSize((CFStringRef)psName, 12.0);
-    QCFString familyName = (CFStringRef) CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontFamilyNameAttribute);
-    QString name = QString::fromCFString(familyName);
-    if (name.isEmpty())
-        qWarning() << "QCoreTextFontDatabase: Failed to resolve family name for PostScript name " << QString::fromCFString((CFStringRef)psName);
+    QCFType<CTFontRef> font = CTFontCreateWithFontDescriptor(descriptor, 0.0, nullptr);
+    if (!font) {
+        qCWarning(lcQpaFonts) << "Failed to create fallback font for" << descriptor;
+        return nullptr;
+    }
+
+    CFArrayRef cascadeList = CFArrayRef(CTFontCopyDefaultCascadeListForLanguages(font,
+        (CFArrayRef)[NSUserDefaults.standardUserDefaults stringArrayForKey:@"AppleLanguages"]));
+
+    if (!cascadeList) {
+        qCWarning(lcQpaFonts) << "Failed to create fallback cascade list for" << descriptor;
+        return nullptr;
+    }
 
-    return name;
+    return cascadeList;
 }
-#endif
 
-static void addExtraFallbacks(QStringList *fallbackList)
+CFArrayRef QCoreTextFontDatabase::fallbacksForFamily(const QString &family)
 {
-#if defined(Q_OS_MACOS)
-    // Since we are only returning a list of default fonts for the current language, we do not
-    // cover all unicode completely. This was especially an issue for some of the common script
-    // symbols such as mathematical symbols, currency or geometric shapes. To minimize the risk
-    // of missing glyphs, we add Arial Unicode MS as a final fail safe, since this covers most
-    // of Unicode 2.1.
-    if (!fallbackList->contains(QStringLiteral("Arial Unicode MS")))
-        fallbackList->append(QStringLiteral("Arial Unicode MS"));
-    // Since some symbols (specifically Braille) are not in Arial Unicode MS, we
-    // add Apple Symbols to cover those too.
-    if (!fallbackList->contains(QStringLiteral("Apple Symbols")))
-        fallbackList->append(QStringLiteral("Apple Symbols"));
-#else
-    Q_UNUSED(fallbackList)
-#endif
+    if (family.isEmpty())
+        return nullptr;
+
+    QCFType<CTFontDescriptorRef> fontDescriptor = descriptorForFamily(family);
+    if (!fontDescriptor) {
+        qCWarning(lcQpaFonts) << "Failed to create fallback font descriptor for" << family;
+        return nullptr;
+    }
+
+    // If the font is not available we want to fall back to the style hint.
+    // By creating a matching font descriptor we can verify whether the font
+    // is available or not, and avoid CTFontCreateWithFontDescriptor picking
+    // a default font for us based on incomplete information.
+    fontDescriptor = CTFontDescriptorCreateMatchingFontDescriptor(fontDescriptor, 0);
+    if (!fontDescriptor)
+        return nullptr;
+
+    return fallbacksForDescriptor(fontDescriptor);
 }
 
-// ### Replace this with QPlatformFontDatabase::isFamilyPopulated() in Qt 5.14
-Q_GUI_EXPORT extern bool qt_isFontFamilyPopulated(const QString &familyName);
+CTFontDescriptorRef descriptorForFontType(CTFontUIFontType uiType)
+{
+    static const CGFloat kDefaultSizeForRequestedUIType = 0.0;
+    QCFType<CTFontRef> ctFont = CTFontCreateUIFontForLanguage(
+        uiType, kDefaultSizeForRequestedUIType, nullptr);
+    return CTFontCopyFontDescriptor(ctFont);
+}
+
+CTFontDescriptorRef descriptorForStyle(QFont::StyleHint styleHint)
+{
+    switch (styleHint) {
+        case QFont::SansSerif: return descriptorForFamily("Helvetica");
+        case QFont::Serif: return descriptorForFamily("Times New Roman");
+        case QFont::Monospace: return descriptorForFamily("Menlo");
+#ifdef Q_OS_MACOS
+        case QFont::Cursive: return descriptorForFamily("Apple Chancery");
+#endif
+        case QFont::Fantasy: return descriptorForFamily("Zapfino");
+        case QFont::TypeWriter: return descriptorForFamily("American Typewriter");
+        case QFont::AnyStyle: Q_FALLTHROUGH();
+        case QFont::System: return descriptorForFontType(kCTFontUIFontSystem);
+        default: return nullptr; // No matching font on this platform
+    }
+}
 
 QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const
 {
     Q_UNUSED(style);
-    Q_UNUSED(script);
+
+    qCDebug(lcQpaFonts).nospace() << "Resolving fallbacks families for"
+        << (!family.isEmpty() ? qPrintable(QLatin1String(" family '%1' with").arg(family)) : "")
+        << " style hint " << styleHint;
 
     QMacAutoReleasePool pool;
 
-    static QHash<QString, QStringList> fallbackLists;
-
-    if (!family.isEmpty()) {
-        QCFType<CFMutableDictionaryRef> attributes = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-        CFDictionaryAddValue(attributes, kCTFontFamilyNameAttribute, QCFString(family));
-        if (QCFType<CTFontDescriptorRef> fontDescriptor = CTFontDescriptorCreateWithAttributes(attributes)) {
-            if (QCFType<CTFontRef> font = CTFontCreateWithFontDescriptor(fontDescriptor, 12.0, 0)) {
-                NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-                NSArray *languages = [defaults stringArrayForKey: @"AppleLanguages"];
-
-                QCFType<CFArrayRef> cascadeList = (CFArrayRef) CTFontCopyDefaultCascadeListForLanguages(font, (CFArrayRef) languages);
-                if (cascadeList) {
-                    QStringList fallbackList;
-                    const int numCascades = CFArrayGetCount(cascadeList);
-                    for (int i = 0; i < numCascades; ++i) {
-                        CTFontDescriptorRef fontFallback = (CTFontDescriptorRef) CFArrayGetValueAtIndex(cascadeList, i);
-                        QCFString fallbackFamilyName = (CFStringRef) CTFontDescriptorCopyAttribute(fontFallback, kCTFontFamilyNameAttribute);
-                        fallbackList.append(QString::fromCFString(fallbackFamilyName));
-                    }
-
-                    // .Apple Symbols Fallback will be at the beginning of the list and we will
-                    // detect that this has glyphs for Arabic and other writing systems.
-                    // Since it is a symbol font, it should be the last resort, so that
-                    // the proper fonts for these writing systems are preferred.
-                    int symbolIndex = fallbackList.indexOf(QLatin1String(".Apple Symbols Fallback"));
-                    if (symbolIndex >= 0)
-                        fallbackList.move(symbolIndex, fallbackList.size() - 1);
-
-                    addExtraFallbacks(&fallbackList);
-
-                    // Since iOS 13, the cascade list may contain meta-fonts which have not been
-                    // populated to the database, such as ".AppleJapaneseFont". It is important that we
-                    // include this in the fallback list, in order to get fallback support for all
-                    // languages
-                    for (const QString &fallback : fallbackList) {
-                        if (!qt_isFontFamilyPopulated(fallback))
-                            const_cast<QCoreTextFontDatabase *>(this)->populateFamily(fallback);
-                    }
-
-                    extern QStringList qt_sort_families_by_writing_system(QChar::Script, const QStringList &);
-                    fallbackList = qt_sort_families_by_writing_system(script, fallbackList);
-
-                    return fallbackList;
-                }
-            }
+    QStringList fallbackList;
+
+    QCFType<CFArrayRef> fallbackFonts = fallbacksForFamily(family);
+    if (!fallbackFonts || !CFArrayGetCount(fallbackFonts)) {
+        // We were not able to find a fallback for the specific family,
+        // or the family was empty, so we fall back to the style hint.
+        if (!family.isEmpty())
+            qCDebug(lcQpaFonts) << "No fallbacks found. Using style hint instead";
+
+        if (QCFType<CTFontDescriptorRef> styleDescriptor = descriptorForStyle(styleHint)) {
+            CFMutableArrayRef tmp = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
+            CFArrayAppendValue(tmp, styleDescriptor);
+            QCFType<CFArrayRef> styleFallbacks = fallbacksForDescriptor(styleDescriptor);
+            CFArrayAppendArray(tmp, styleFallbacks, CFRangeMake(0, CFArrayGetCount(styleFallbacks)));
+            fallbackFonts = tmp;
         }
     }
 
-    // We were not able to find a fallback for the specific family,
-    // so we fall back to the stylehint.
-
-    static const QString styleLookupKey = QString::fromLatin1(".QFontStyleHint_%1");
-
-    static bool didPopulateStyleFallbacks = false;
-    if (!didPopulateStyleFallbacks) {
-#if defined(Q_OS_MACX)
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        NSArray<NSString *> *languages = [defaults stringArrayForKey:@"AppleLanguages"];
-
-        NSDictionary<NSString *, id> *fallbackDict = [NSDictionary<NSString *, id> dictionaryWithContentsOfFile:@"/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreText.framework/Resources/DefaultFontFallbacks.plist"];
-
-        for (NSString *style in [fallbackDict allKeys]) {
-            NSArray *list = [fallbackDict valueForKey:style];
-            QFont::StyleHint fallbackStyleHint = styleHintFromNSString(style);
-            QStringList fallbackList;
-            for (id item in list) {
-                // sort the array based on system language preferences
-                if ([item isKindOfClass:[NSArray class]]) {
-                    NSArray *langs = [reinterpret_cast<NSArray *>(item)
-                        sortedArrayUsingFunction:languageMapSort context:languages];
-                    for (NSArray<NSString *> *map in langs)
-                        fallbackList.append(familyNameFromPostScriptName([map objectAtIndex:1]));
-                }
-                else if ([item isKindOfClass: [NSString class]])
-                    fallbackList.append(familyNameFromPostScriptName(item));
-            }
+    if (!fallbackFonts)
+        return fallbackList;
+
+    const int numberOfFallbacks = CFArrayGetCount(fallbackFonts);
+    for (int i = 0; i < numberOfFallbacks; ++i) {
+        auto fallbackDescriptor = CTFontDescriptorRef(CFArrayGetValueAtIndex(fallbackFonts, i));
+        auto fallbackFamilyName = QCFString(CTFontDescriptorCopyAttribute(fallbackDescriptor, kCTFontFamilyNameAttribute));
+
+        if (!isFamilyPopulated(fallbackFamilyName)) {
+            // We need to populate, or at least register the fallback fonts,
+            // otherwise the Qt font database may not know they exist.
+            if (isPrivateFontFamily(fallbackFamilyName))
+                const_cast<QCoreTextFontDatabase *>(this)->populateFromDescriptor(fallbackDescriptor);
+            else
+                registerFontFamily(fallbackFamilyName);
+        }
 
-            fallbackList.append(QLatin1String("Apple Color Emoji"));
+        fallbackList.append(fallbackFamilyName);
+    }
 
-            addExtraFallbacks(&fallbackList);
-            fallbackLists[styleLookupKey.arg(fallbackStyleHint)] = fallbackList;
-        }
-#else
-        QStringList staticFallbackList;
-        staticFallbackList << QString::fromLatin1("Helvetica,Apple Color Emoji,Geeza Pro,Arial Hebrew,Thonburi,Kailasa"
-            "Hiragino Kaku Gothic ProN,.Heiti J,Apple SD Gothic Neo,.Heiti K,Heiti SC,Heiti TC"
-            "Bangla Sangam MN,Devanagari Sangam MN,Gujarati Sangam MN,Gurmukhi MN,Kannada Sangam MN"
-            "Malayalam Sangam MN,Oriya Sangam MN,Sinhala Sangam MN,Tamil Sangam MN,Telugu Sangam MN"
-            "Euphemia UCAS,.PhoneFallback").split(QLatin1String(","));
-
-        for (int i = QFont::Helvetica; i <= QFont::Fantasy; ++i)
-            fallbackLists[styleLookupKey.arg(i)] = staticFallbackList;
+    // Some fallback fonts will have have an order in the list returned
+    // by Core Text that would indicate they should be preferred for e.g.
+    // Arabic, or Emoji, while in reality only supporting a tiny subset
+    // of the required glyphs, or representing them by question marks.
+    // Move these to the end, so that the proper fonts are preferred.
+    for (const char *family : { ".Apple Symbols Fallback", ".Noto Sans Universal" }) {
+        int index = fallbackList.indexOf(QLatin1String(family));
+        if (index >= 0)
+            fallbackList.move(index, fallbackList.size() - 1);
+    }
+
+#if defined(Q_OS_MACOS)
+    // Since we are only returning a list of default fonts for the current language, we do not
+    // cover all Unicode completely. This was especially an issue for some of the common script
+    // symbols such as mathematical symbols, currency or geometric shapes. To minimize the risk
+    // of missing glyphs, we add Arial Unicode MS as a final fail safe, since this covers most
+    // of Unicode 2.1.
+    if (!fallbackList.contains(QStringLiteral("Arial Unicode MS")))
+        fallbackList.append(QStringLiteral("Arial Unicode MS"));
+    // Since some symbols (specifically Braille) are not in Arial Unicode MS, we
+    // add Apple Symbols to cover those too.
+    if (!fallbackList.contains(QStringLiteral("Apple Symbols")))
+        fallbackList.append(QStringLiteral("Apple Symbols"));
 #endif
 
-        didPopulateStyleFallbacks = true;
-    }
+    extern QStringList qt_sort_families_by_writing_system(QChar::Script, const QStringList &);
+    fallbackList = qt_sort_families_by_writing_system(script, fallbackList);
 
-    Q_ASSERT(!fallbackLists.isEmpty());
-    return fallbackLists[styleLookupKey.arg(styleHint)];
+    qCDebug(lcQpaFonts).nospace() << "Fallback families ordered by script " << script << ": " << fallbackList;
+
+    return fallbackList;
 }
 
 QStringList QCoreTextFontDatabase::addApplicationFont(const QByteArray &fontData, const QString &fileName)
@@ -721,10 +747,8 @@ static CTFontDescriptorRef fontDescriptorFromTheme(QPlatformTheme::Font f)
     }
 #endif // Q_OS_IOS, Q_OS_TVOS, Q_OS_WATCHOS
 
-    // OSX default case and iOS fallback case
-    CTFontUIFontType fontType = fontTypeFromTheme(f);
-    QCFType<CTFontRef> ctFont = CTFontCreateUIFontForLanguage(fontType, 0.0, NULL);
-    return CTFontCopyFontDescriptor(ctFont);
+    // macOS default case and iOS fallback case
+    return descriptorForFontType(fontTypeFromTheme(f));
 }
 
 const QHash<QPlatformTheme::Font, QFont *> &QCoreTextFontDatabase::themeFonts() const
@@ -757,8 +781,8 @@ QFont *QCoreTextFontDatabase::themeFont(QPlatformTheme::Font f) const
 QFont QCoreTextFontDatabase::defaultFont() const
 {
     if (defaultFontName.isEmpty()) {
-        QCFType<CTFontRef> font = CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, 12.0, NULL);
-        defaultFontName = (QString) QCFString(CTFontCopyFullName(font));
+        QCFType<CTFontDescriptorRef> systemFont = descriptorForFontType(kCTFontUIFontSystem);
+        defaultFontName = QCFString(CTFontDescriptorCopyAttribute(systemFont, kCTFontFamilyNameAttribute));
     }
 
     return QFont(defaultFontName);
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
index 05f6ed641c..eebb3eb964 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
@@ -71,7 +71,7 @@ public:
     QCoreTextFontDatabase();
     ~QCoreTextFontDatabase();
     void populateFontDatabase() override;
-    bool populateFamilyAliases() override;
+    bool populateFamilyAliases(const QString &missingFamily) override;
     void populateFamily(const QString &familyName) override;
     void invalidate() override;
 
@@ -92,6 +92,7 @@ protected:
 
 private:
     void populateFromDescriptor(CTFontDescriptorRef font, const QString &familyName = QString());
+    static CFArrayRef fallbacksForFamily(const QString &family);
 
     mutable QString defaultFontName;
 
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index c523e799e6..011476cf13 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -53,6 +53,7 @@
 #include <QtCore/QtEndian>
 #include <QtCore/QThreadStorage>
 #include <QtCore/private/qsystemlibrary_p.h>
+#include <QtCore/private/qwinregistry_p.h>
 
 #include <wchar.h>
 
@@ -1007,12 +1008,27 @@ static QChar *createFontFile(const QString &faceName)
     return faceNamePtr;
 }
 
+namespace {
+    struct StoreFontPayload {
+        StoreFontPayload(const QString &family,
+                         QWindowsFontDatabase *fontDatabase)
+            : populatedFontFamily(family)
+            , windowsFontDatabase(fontDatabase)
+        {}
+
+        QString populatedFontFamily;
+        QSet<QPair<QString,QString> > foundFontAndStyles;
+        QWindowsFontDatabase *windowsFontDatabase;
+    };
+}
+
 static bool addFontToDatabase(QString familyName,
                               QString styleName,
                               const LOGFONT &logFont,
                               const TEXTMETRIC *textmetric,
                               const FONTSIGNATURE *signature,
-                              int type)
+                              int type,
+                              StoreFontPayload *sfp)
 {
     // the "@family" fonts are just the same as "family". Ignore them.
     if (familyName.isEmpty() || familyName.at(0) == QLatin1Char('@') || familyName.startsWith(QLatin1String("WST_")))
@@ -1092,6 +1108,16 @@ static bool addFontToDatabase(QString familyName,
             writingSystems.setSupported(ws);
     }
 
+    // We came here from populating a different font family, so we have
+    // to ensure the entire typographic family is populated before we
+    // mark it as such inside registerFont()
+    if (!subFamilyName.isEmpty()
+            && familyName != subFamilyName
+            && sfp->populatedFontFamily != familyName
+            && !QPlatformFontDatabase::isFamilyPopulated(familyName)) {
+        sfp->windowsFontDatabase->populateFamily(familyName);
+    }
+
     QPlatformFontDatabase::registerFont(familyName, styleName, foundryName, weight,
                                         style, stretch, antialias, scalable, size, fixed, writingSystems, createFontFile(faceName));
 
@@ -1128,17 +1154,18 @@ static int QT_WIN_CALLBACK storeFont(const LOGFONT *logFont, const TEXTMETRIC *t
     // to the documentation is identical to a TEXTMETRIC except for the last four
     // members, which we don't use anyway
     const FONTSIGNATURE *signature = nullptr;
+    StoreFontPayload *sfp = reinterpret_cast<StoreFontPayload *>(lparam);
+    Q_ASSERT(sfp != nullptr);
     if (type & TRUETYPE_FONTTYPE) {
         signature = &reinterpret_cast<const NEWTEXTMETRICEX *>(textmetric)->ntmFontSig;
         // We get a callback for each script-type supported, but we register them all
         // at once using the signature, so we only need one call to addFontToDatabase().
-        QSet<QPair<QString,QString>> *foundFontAndStyles = reinterpret_cast<QSet<QPair<QString,QString>> *>(lparam);
         QPair<QString,QString> fontAndStyle(familyName, styleName);
-        if (foundFontAndStyles->contains(fontAndStyle))
+        if (sfp->foundFontAndStyles.contains(fontAndStyle))
             return 1;
-        foundFontAndStyles->insert(fontAndStyle);
+        sfp->foundFontAndStyles.insert(fontAndStyle);
     }
-    addFontToDatabase(familyName, styleName, *logFont, textmetric, signature, type);
+    addFontToDatabase(familyName, styleName, *logFont, textmetric, signature, type, sfp);
 
     // keep on enumerating
     return 1;
@@ -1157,8 +1184,8 @@ void QWindowsFontDatabase::populateFamily(const QString &familyName)
     familyName.toWCharArray(lf.lfFaceName);
     lf.lfFaceName[familyName.size()] = 0;
     lf.lfPitchAndFamily = 0;
-    QSet<QPair<QString,QString>> foundFontAndStyles;
-    EnumFontFamiliesEx(dummy, &lf, storeFont, reinterpret_cast<intptr_t>(&foundFontAndStyles), 0);
+    StoreFontPayload sfp(familyName, this);
+    EnumFontFamiliesEx(dummy, &lf, storeFont, reinterpret_cast<intptr_t>(&sfp), 0);
     ReleaseDC(0, dummy);
 }
 
@@ -1184,33 +1211,8 @@ static int QT_WIN_CALLBACK populateFontFamilies(const LOGFONT *logFont, const TE
 
 void QWindowsFontDatabase::addDefaultEUDCFont()
 {
-    QString path;
-    {
-        HKEY key;
-        if (RegOpenKeyEx(HKEY_CURRENT_USER,
-                         L"EUDC\\1252",
-                         0,
-                         KEY_READ,
-                         &key) != ERROR_SUCCESS) {
-            return;
-        }
-
-        WCHAR value[MAX_PATH];
-        DWORD bufferSize = sizeof(value);
-        ZeroMemory(value, bufferSize);
-
-        if (RegQueryValueEx(key,
-                            L"SystemDefaultEUDCFont",
-                            nullptr,
-                            nullptr,
-                            reinterpret_cast<LPBYTE>(value),
-                            &bufferSize) == ERROR_SUCCESS) {
-            path = QString::fromWCharArray(value);
-        }
-
-        RegCloseKey(key);
-    }
-
+    const QString path = QWinRegistryKey(HKEY_CURRENT_USER, LR"(EUDC\1252)")
+                         .stringValue(L"SystemDefaultEUDCFont");
     if (!path.isEmpty()) {
         QFile file(path);
         if (!file.open(QIODevice::ReadOnly)) {
@@ -1338,11 +1340,11 @@ QT_WARNING_POP
                 if (request.family != fontEngine->fontDef.family) {
                     qWarning("%s: Failed to load font. Got fallback instead: %s",
                              __FUNCTION__, qPrintable(fontEngine->fontDef.family));
-                    if (fontEngine->ref.load() == 0)
+                    if (fontEngine->ref.loadRelaxed() == 0)
                         delete fontEngine;
                     fontEngine = 0;
                 } else {
-                    Q_ASSERT(fontEngine->ref.load() == 0);
+                    Q_ASSERT(fontEngine->ref.loadRelaxed() == 0);
 
                     // Override the generated font name
                     switch (fontEngine->type()) {
@@ -1514,7 +1516,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
         if (names.name.isEmpty())
             continue;
 
-        families->append(qMove(names));
+        families->append(std::move(names));
 
         if (values || signatures)
             getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
@@ -1598,8 +1600,9 @@ QStringList QWindowsFontDatabase::addApplicationFont(const QByteArray &fontData,
             TEXTMETRIC textMetrics;
             GetTextMetrics(hdc, &textMetrics);
 
+            StoreFontPayload sfp(familyName, this);
             addFontToDatabase(familyName, styleName, lf, &textMetrics, &signatures.at(j),
-                              TRUETYPE_FONTTYPE);
+                              TRUETYPE_FONTTYPE, &sfp);
 
             SelectObject(hdc, oldobj);
             DeleteObject(hfont);
@@ -2078,28 +2081,6 @@ int QWindowsFontDatabase::defaultVerticalDPI()
     return vDPI;
 }
 
-QString QWindowsFontDatabase::readRegistryString(HKEY parentHandle, const wchar_t *keyPath, const wchar_t *keyName)
-{
-    QString result;
-    HKEY handle = 0;
-    if (RegOpenKeyEx(parentHandle, keyPath, 0, KEY_READ, &handle) == ERROR_SUCCESS) {
-        // get the size and type of the value
-        DWORD dataType;
-        DWORD dataSize;
-        if (RegQueryValueEx(handle, keyName, 0, &dataType, 0, &dataSize) == ERROR_SUCCESS) {
-            if (dataType == REG_SZ || dataType == REG_EXPAND_SZ) {
-                dataSize += 2; // '\0' missing?
-                QVarLengthArray<unsigned char> data(dataSize);
-                data[dataSize - 2] = data[dataSize - 1] = '\0';
-                if (RegQueryValueEx(handle, keyName, 0, 0, data.data(), &dataSize) == ERROR_SUCCESS)
-                    result = QString::fromWCharArray(reinterpret_cast<const wchar_t *>(data.data()));
-            }
-        }
-        RegCloseKey(handle);
-    }
-    return result;
-}
-
 bool QWindowsFontDatabase::isPrivateFontFamily(const QString &family) const
 {
     return m_eudcFonts.contains(family) || QPlatformFontDatabase::isPrivateFontFamily(family);
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
index fdef0f5ff1..a6b7fcf31e 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
@@ -48,7 +48,11 @@
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>
 #include <QtCore/QSettings>
+#if QT_CONFIG(regularexpression)
 #include <QtCore/QRegularExpression>
+#else
+#include <QtCore/QRegExp>
+#endif
 #include <QtGui/QGuiApplication>
 #include <QtGui/QFontDatabase>
 
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index b85a2dceee..f132e69d4d 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -96,6 +96,8 @@ public:
     QWindowsFontDatabase();
     ~QWindowsFontDatabase() override;
 
+    void ensureFamilyPopulated(const QString &familyName);
+
     void populateFontDatabase() override;
     void populateFamily(const QString &familyName) override;
     QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
@@ -131,8 +133,6 @@ public:
     static void setFontOptions(unsigned options);
     static unsigned fontOptions();
 
-    static QString readRegistryString(HKEY parentHandle, const wchar_t *keyPath, const wchar_t *keyName);
-
 private:
     void removeApplicationFonts();
     void addDefaultEUDCFont();
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
index a4490a6664..e796c18e79 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
@@ -47,6 +47,7 @@
 #include <QtCore/QFile>
 #include <private/qstringiterator_p.h>
 #include <QtCore/private/qsystemlibrary_p.h>
+#include <QtCore/private/qwinregistry_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 #include <QtGui/private/qhighdpiscaling_p.h>
@@ -945,10 +946,10 @@ void QWindowsFontEngineDirectWrite::initFontInfo(const QFontDef &request,
 
 QString QWindowsFontEngineDirectWrite::fontNameSubstitute(const QString &familyName)
 {
-    const wchar_t key[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes";
     const QString substitute =
-        QWindowsFontDatabase::readRegistryString(HKEY_LOCAL_MACHINE, key,
-                                                 reinterpret_cast<const wchar_t *>(familyName.utf16()));
+        QWinRegistryKey(HKEY_LOCAL_MACHINE,
+                        LR"(Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes)")
+        .stringValue(familyName);
     return substitute.isEmpty() ? familyName : substitute;
 }
 
diff --git a/src/platformsupport/fontdatabases/windows/windows.pri b/src/platformsupport/fontdatabases/windows/windows.pri
index 9c529f55ea..7ddfb2c281 100644
--- a/src/platformsupport/fontdatabases/windows/windows.pri
+++ b/src/platformsupport/fontdatabases/windows/windows.pri
@@ -30,5 +30,5 @@ qtConfig(directwrite):qtConfig(direct2d) {
     DEFINES *= QT_NO_DIRECTWRITE
 }
 
-LIBS += -lole32 -lgdi32 -luser32 -ladvapi32
-mingw: LIBS += -luuid
+QMAKE_USE_PRIVATE += advapi32 ole32 user32 gdi32
+mingw: QMAKE_USE_PRIVATE += uuid
diff --git a/src/platformsupport/fontdatabases/winrt/winrt.pri b/src/platformsupport/fontdatabases/winrt/winrt.pri
index 7617df2e7a..1cd417c1fd 100644
--- a/src/platformsupport/fontdatabases/winrt/winrt.pri
+++ b/src/platformsupport/fontdatabases/winrt/winrt.pri
@@ -8,6 +8,4 @@ HEADERS += \
 
 DEFINES += __WRL_NO_DEFAULT_LIB__
 
-LIBS += -lws2_32
-
-QMAKE_USE_PRIVATE += dwrite_1
+QMAKE_USE_PRIVATE += dwrite_1 ws2_32
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp
index 5f16d00dad..81bccb1c25 100644
--- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
+++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
@@ -317,7 +317,7 @@ void qglx_surfaceFormatFromGLXFBConfig(QSurfaceFormat *format, Display *display,
     glXGetFBConfigAttrib(display, config, GLX_ALPHA_SIZE,   &alphaSize);
     glXGetFBConfigAttrib(display, config, GLX_DEPTH_SIZE,   &depthSize);
     glXGetFBConfigAttrib(display, config, GLX_STENCIL_SIZE, &stencilSize);
-    glXGetFBConfigAttrib(display, config, GLX_SAMPLES_ARB,  &sampleBuffers);
+    glXGetFBConfigAttrib(display, config, GLX_SAMPLE_BUFFERS_ARB, &sampleBuffers);
     glXGetFBConfigAttrib(display, config, GLX_STEREO,       &stereo);
     if (flags & QGLX_SUPPORTS_SRGB)
         glXGetFBConfigAttrib(display, config, GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, &srgbCapable);
@@ -356,7 +356,7 @@ void qglx_surfaceFormatFromVisualInfo(QSurfaceFormat *format, Display *display,
     glXGetConfig(display, visualInfo, GLX_ALPHA_SIZE,   &alphaSize);
     glXGetConfig(display, visualInfo, GLX_DEPTH_SIZE,   &depthSize);
     glXGetConfig(display, visualInfo, GLX_STENCIL_SIZE, &stencilSize);
-    glXGetConfig(display, visualInfo, GLX_SAMPLES_ARB,  &sampleBuffers);
+    glXGetConfig(display, visualInfo, GLX_SAMPLE_BUFFERS_ARB, &sampleBuffers);
     glXGetConfig(display, visualInfo, GLX_STEREO,       &stereo);
     if (flags & QGLX_SUPPORTS_SRGB)
         glXGetConfig(display, visualInfo, GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, &srgbCapable);
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
index 666613f09d..3555763b89 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
@@ -66,7 +66,7 @@ Q_LOGGING_CATEGORY(qLcEvdevKeyMap, "qt.qpa.input.keymap")
 // simple builtin US keymap
 #include "qevdevkeyboard_defaultmap_p.h"
 
-void QFdContainer::reset() Q_DECL_NOTHROW
+void QFdContainer::reset() noexcept
 {
     if (m_fd >= 0)
         qt_safe_close(m_fd);
@@ -98,11 +98,12 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler()
     unloadKeymap();
 }
 
-QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device,
+std::unique_ptr<QEvdevKeyboardHandler> QEvdevKeyboardHandler::create(const QString &device,
                                                      const QString &specification,
                                                      const QString &defaultKeymapFile)
 {
-    qCDebug(qLcEvdevKey) << "Try to create keyboard handler for" << device << specification;
+    qCDebug(qLcEvdevKey, "Try to create keyboard handler for \"%ls\" \"%ls\"",
+            qUtf16Printable(device), qUtf16Printable(specification));
 
     QString keymapFile = defaultKeymapFile;
     int repeatDelay = 400;
@@ -127,7 +128,7 @@ QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device,
             grab = arg.mid(5).toInt();
     }
 
-    qCDebug(qLcEvdevKey) << "Opening keyboard at" << device;
+    qCDebug(qLcEvdevKey, "Opening keyboard at %ls", qUtf16Printable(device));
 
     QFdContainer fd(qt_safe_open(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0));
     if (fd.get() >= 0) {
@@ -137,16 +138,16 @@ QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device,
             ::ioctl(fd.get(), EVIOCSREP, kbdrep);
         }
 
-        return new QEvdevKeyboardHandler(device, fd, disableZap, enableCompose, keymapFile);
+        return std::unique_ptr<QEvdevKeyboardHandler>(new QEvdevKeyboardHandler(device, fd, disableZap, enableCompose, keymapFile));
     } else {
-        qWarning("Cannot open keyboard input device '%s': %s", qPrintable(device), strerror(errno));
-        return 0;
+        qErrnoWarning("Cannot open keyboard input device '%ls'", qUtf16Printable(device));
+        return nullptr;
     }
 }
 
 void QEvdevKeyboardHandler::switchLed(int led, bool state)
 {
-    qCDebug(qLcEvdevKey) << "switchLed" << led << state;
+    qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
 
     struct ::input_event led_ie;
     ::gettimeofday(&led_ie.time, 0);
@@ -170,7 +171,7 @@ void QEvdevKeyboardHandler::readKeycode()
             return;
         } else if (result < 0) {
             if (errno != EINTR && errno != EAGAIN) {
-                qErrnoWarning(errno, "evdevkeyboard: Could not read from input device");
+                qErrnoWarning("evdevkeyboard: Could not read from input device");
                 // If the device got disconnected, stop reading, otherwise we get flooded
                 // by the above error over and over again.
                 if (errno == ENODEV) {
@@ -230,7 +231,7 @@ void QEvdevKeyboardHandler::processKeyEvent(int nativecode, int unicode, int qtc
 
     QWindowSystemInterface::handleExtendedKeyEvent(0, (isPress ? QEvent::KeyPress : QEvent::KeyRelease),
                                                    qtcode, modifiers, nativecode + 8, 0, int(modifiers),
-                                                   (unicode != 0xffff ) ? QString(unicode) : QString(), autoRepeat);
+                                                   (unicode != 0xffff ) ? QString(QChar(unicode)) : QString(), autoRepeat);
 }
 
 QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint16 keycode, bool pressed, bool autorepeat)
@@ -473,7 +474,7 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
 
 void QEvdevKeyboardHandler::unloadKeymap()
 {
-    qCDebug(qLcEvdevKey) << "Unload current keymap and restore built-in";
+    qCDebug(qLcEvdevKey, "Unload current keymap and restore built-in");
 
     if (m_keymap && m_keymap != s_keymap_default)
         delete [] m_keymap;
@@ -517,12 +518,12 @@ void QEvdevKeyboardHandler::unloadKeymap()
 
 bool QEvdevKeyboardHandler::loadKeymap(const QString &file)
 {
-    qCDebug(qLcEvdevKey) << "Loading keymap" << file;
+    qCDebug(qLcEvdevKey, "Loading keymap %ls", qUtf16Printable(file));
 
     QFile f(file);
 
     if (!f.open(QIODevice::ReadOnly)) {
-        qWarning("Could not open keymap file '%s'", qPrintable(file));
+        qWarning("Could not open keymap file '%ls'", qUtf16Printable(file));
         return false;
     }
 
@@ -541,7 +542,7 @@ bool QEvdevKeyboardHandler::loadKeymap(const QString &file)
     ds >> qmap_magic >> qmap_version >> qmap_keymap_size >> qmap_keycompose_size;
 
     if (ds.status() != QDataStream::Ok || qmap_magic != QEvdevKeyboardMap::FileMagic || qmap_version != 1 || qmap_keymap_size == 0) {
-        qWarning("'%s' is not a valid .qmap keymap file", qPrintable(file));
+        qWarning("'%ls' is not a valid .qmap keymap file", qUtf16Printable(file));
         return false;
     }
 
@@ -557,7 +558,7 @@ bool QEvdevKeyboardHandler::loadKeymap(const QString &file)
         delete [] qmap_keymap;
         delete [] qmap_keycompose;
 
-        qWarning("Keymap file '%s' cannot be loaded.", qPrintable(file));
+        qWarning("Keymap file '%ls' cannot be loaded.", qUtf16Printable(file));
         return false;
     }
 
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
index 21e6d055a0..f92a2bf704 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -55,6 +55,8 @@
 #include <QTimer>
 #include <QDataStream>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
@@ -134,13 +136,13 @@ class QFdContainer
     int m_fd;
     Q_DISABLE_COPY_MOVE(QFdContainer);
 public:
-    explicit QFdContainer(int fd = -1) Q_DECL_NOTHROW : m_fd(fd) {}
+    explicit QFdContainer(int fd = -1) noexcept : m_fd(fd) {}
     ~QFdContainer() { reset(); }
 
-    int get() const Q_DECL_NOTHROW { return m_fd; }
+    int get() const noexcept { return m_fd; }
 
-    int release() Q_DECL_NOTHROW { int result = m_fd; m_fd = -1; return result; }
-    void reset() Q_DECL_NOTHROW;
+    int release() noexcept { int result = m_fd; m_fd = -1; return result; }
+    void reset() noexcept;
 };
 
 class QEvdevKeyboardHandler : public QObject
@@ -168,7 +170,7 @@ public:
         SwitchConsoleMask  = 0x0000007f
     };
 
-    static QEvdevKeyboardHandler *create(const QString &device,
+    static std::unique_ptr<QEvdevKeyboardHandler> create(const QString &device,
                                          const QString &specification,
                                          const QString &defaultKeymapFile = QString());
 
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
index e1659bc0d9..52d9c34b1c 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
@@ -39,6 +39,8 @@
 
 #include "qevdevkeyboardmanager_p.h"
 
+#include <QtInputSupport/private/qevdevutil_p.h>
+
 #include <QStringList>
 #include <QCoreApplication>
 #include <QLoggingCategory>
@@ -61,36 +63,24 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString &
     if (spec.isEmpty())
         spec = specification;
 
-    QStringList args = spec.split(QLatin1Char(':'));
-    QStringList devices;
-
-    foreach (const QString &arg, args) {
-        if (arg.startsWith(QLatin1String("/dev/"))) {
-            // if device is specified try to use it
-            devices.append(arg);
-            args.removeAll(arg);
-        }
-    }
-
-    // build new specification without /dev/ elements
-    m_spec = args.join(QLatin1Char(':'));
+    auto parsed = QEvdevUtil::parseSpecification(spec);
+    m_spec = std::move(parsed.spec);
 
     // add all keyboards for devices specified in the argument list
-    foreach (const QString &device, devices)
+    for (const QString &device : qAsConst(parsed.devices))
         addKeyboard(device);
 
-    if (devices.isEmpty()) {
-        qCDebug(qLcEvdevKey) << "evdevkeyboard: Using device discovery";
-        m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Keyboard, this);
-        if (m_deviceDiscovery) {
+    if (parsed.devices.isEmpty()) {
+        qCDebug(qLcEvdevKey, "evdevkeyboard: Using device discovery");
+        if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Keyboard, this)) {
             // scan and add already connected keyboards
-            const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
+            const QStringList devices = deviceDiscovery->scanConnectedDevices();
             for (const QString &device : devices)
                 addKeyboard(device);
 
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
                     this, &QEvdevKeyboardManager::addKeyboard);
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
                     this, &QEvdevKeyboardManager::removeKeyboard);
         }
     }
@@ -98,36 +88,34 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString &
 
 QEvdevKeyboardManager::~QEvdevKeyboardManager()
 {
-    qDeleteAll(m_keyboards);
-    m_keyboards.clear();
 }
 
 void QEvdevKeyboardManager::addKeyboard(const QString &deviceNode)
 {
-    qCDebug(qLcEvdevKey) << "Adding keyboard at" << deviceNode;
-    QEvdevKeyboardHandler *keyboard;
-    keyboard = QEvdevKeyboardHandler::create(deviceNode, m_spec, m_defaultKeymapFile);
+    qCDebug(qLcEvdevKey, "Adding keyboard at %ls", qUtf16Printable(deviceNode));
+    auto keyboard = QEvdevKeyboardHandler::create(deviceNode, m_spec, m_defaultKeymapFile);
     if (keyboard) {
-        m_keyboards.insert(deviceNode, keyboard);
-        QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
-            QInputDeviceManager::DeviceTypeKeyboard, m_keyboards.count());
+        m_keyboards.add(deviceNode, std::move(keyboard));
+        updateDeviceCount();
     } else {
-        qWarning("Failed to open keyboard device %s", qPrintable(deviceNode));
+        qWarning("Failed to open keyboard device %ls", qUtf16Printable(deviceNode));
     }
 }
 
 void QEvdevKeyboardManager::removeKeyboard(const QString &deviceNode)
 {
-    if (m_keyboards.contains(deviceNode)) {
-        qCDebug(qLcEvdevKey) << "Removing keyboard at" << deviceNode;
-        QEvdevKeyboardHandler *keyboard = m_keyboards.value(deviceNode);
-        m_keyboards.remove(deviceNode);
-        QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
-            QInputDeviceManager::DeviceTypeKeyboard, m_keyboards.count());
-        delete keyboard;
+    if (m_keyboards.remove(deviceNode)) {
+        qCDebug(qLcEvdevKey, "Removing keyboard at %ls", qUtf16Printable(deviceNode));
+        updateDeviceCount();
     }
 }
 
+void QEvdevKeyboardManager::updateDeviceCount()
+{
+    QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
+        QInputDeviceManager::DeviceTypeKeyboard, m_keyboards.count());
+}
+
 void QEvdevKeyboardManager::loadKeymap(const QString &file)
 {
     m_defaultKeymapFile = file;
@@ -141,22 +129,22 @@ void QEvdevKeyboardManager::loadKeymap(const QString &file)
             if (arg.startsWith(QLatin1String("keymap=")))
                 keymapFromSpec = arg.mid(7).toString();
         }
-        foreach (QEvdevKeyboardHandler *handler, m_keyboards) {
+        for (const auto &keyboard : m_keyboards) {
             if (keymapFromSpec.isEmpty())
-                handler->unloadKeymap();
+                keyboard.handler->unloadKeymap();
             else
-                handler->loadKeymap(keymapFromSpec);
+                keyboard.handler->loadKeymap(keymapFromSpec);
         }
     } else {
-        foreach (QEvdevKeyboardHandler *handler, m_keyboards)
-            handler->loadKeymap(file);
+        for (const auto &keyboard : m_keyboards)
+            keyboard.handler->loadKeymap(file);
     }
 }
 
 void QEvdevKeyboardManager::switchLang()
 {
-    foreach (QEvdevKeyboardHandler *handler, m_keyboards)
-        handler->switchLang();
+    for (const auto &keyboard : m_keyboards)
+        keyboard.handler->switchLang();
 }
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
index 326e438a7c..d91da330c3 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
@@ -53,6 +53,7 @@
 
 #include "qevdevkeyboardhandler_p.h"
 
+#include <QtInputSupport/private/devicehandlerlist_p.h>
 #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 
 #include <QObject>
@@ -64,7 +65,7 @@ QT_BEGIN_NAMESPACE
 class QEvdevKeyboardManager : public QObject
 {
 public:
-    QEvdevKeyboardManager(const QString &key, const QString &specification, QObject *parent = 0);
+    QEvdevKeyboardManager(const QString &key, const QString &specification, QObject *parent = nullptr);
     ~QEvdevKeyboardManager();
 
     void loadKeymap(const QString &file);
@@ -74,9 +75,10 @@ public:
     void removeKeyboard(const QString &deviceNode);
 
 private:
+    void updateDeviceCount();
+
     QString m_spec;
-    QHash<QString,QEvdevKeyboardHandler*> m_keyboards;
-    QDeviceDiscovery *m_deviceDiscovery;
+    QtInputSupport::DeviceHandlerList<QEvdevKeyboardHandler> m_keyboards;
     QString m_defaultKeymapFile;
 };
 
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
index 86a4cd0076..6a53ad2088 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(qLcEvdevMouse, "qt.qpa.input")
 
-QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QString &specification)
+std::unique_ptr<QEvdevMouseHandler> QEvdevMouseHandler::create(const QString &device, const QString &specification)
 {
     qCDebug(qLcEvdevMouse) << "create mouse handler for" << device << specification;
 
@@ -91,10 +91,10 @@ QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QStr
     fd = qt_safe_open(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0);
     if (fd >= 0) {
         ::ioctl(fd, EVIOCGRAB, grab);
-        return new QEvdevMouseHandler(device, fd, abs, compression, jitterLimit);
+        return std::unique_ptr<QEvdevMouseHandler>(new QEvdevMouseHandler(device, fd, abs, compression, jitterLimit));
     } else {
         qErrnoWarning(errno, "Cannot open mouse input device %s", qPrintable(device));
-        return 0;
+        return nullptr;
     }
 }
 
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
index c7f2b04eb2..727f1a02f9 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
@@ -56,6 +56,8 @@
 #include <QPoint>
 #include <QEvent>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
@@ -64,7 +66,7 @@ class QEvdevMouseHandler : public QObject
 {
     Q_OBJECT
 public:
-    static QEvdevMouseHandler *create(const QString &device, const QString &specification);
+    static std::unique_ptr<QEvdevMouseHandler> create(const QString &device, const QString &specification);
     ~QEvdevMouseHandler();
 
     void readMouseData();
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
index 06025c016e..daa52d690e 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
@@ -39,6 +39,8 @@
 
 #include "qevdevmousemanager_p.h"
 
+#include <QtInputSupport/private/qevdevutil_p.h>
+
 #include <QStringList>
 #include <QGuiApplication>
 #include <QScreen>
@@ -63,40 +65,32 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
     if (spec.isEmpty())
         spec = specification;
 
-    QStringList args = spec.split(QLatin1Char(':'));
-    QStringList devices;
+    auto parsed = QEvdevUtil::parseSpecification(spec);
+    m_spec = std::move(parsed.spec);
 
-    foreach (const QString &arg, args) {
-        if (arg.startsWith(QLatin1String("/dev/"))) {
-            // if device is specified try to use it
-            devices.append(arg);
-            args.removeAll(arg);
-        } else if (arg.startsWith(QLatin1String("xoffset="))) {
+    for (const QStringRef &arg : qAsConst(parsed.args)) {
+        if (arg.startsWith(QLatin1String("xoffset="))) {
             m_xoffset = arg.mid(8).toInt();
         } else if (arg.startsWith(QLatin1String("yoffset="))) {
             m_yoffset = arg.mid(8).toInt();
         }
     }
 
-    // build new specification without /dev/ elements
-    m_spec = args.join(QLatin1Char(':'));
-
     // add all mice for devices specified in the argument list
-    foreach (const QString &device, devices)
+    for (const QString &device : qAsConst(parsed.devices))
         addMouse(device);
 
-    if (devices.isEmpty()) {
-        qCDebug(qLcEvdevMouse) << "evdevmouse: Using device discovery";
-        m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Mouse | QDeviceDiscovery::Device_Touchpad, this);
-        if (m_deviceDiscovery) {
+    if (parsed.devices.isEmpty()) {
+        qCDebug(qLcEvdevMouse, "evdevmouse: Using device discovery");
+        if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Mouse | QDeviceDiscovery::Device_Touchpad, this)) {
             // scan and add already connected keyboards
-            const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
+            const QStringList devices = deviceDiscovery->scanConnectedDevices();
             for (const QString &device : devices)
                 addMouse(device);
 
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
                     this, &QEvdevMouseManager::addMouse);
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
                     this, &QEvdevMouseManager::removeMouse);
         }
     }
@@ -111,8 +105,6 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
 
 QEvdevMouseManager::~QEvdevMouseManager()
 {
-    qDeleteAll(m_mice);
-    m_mice.clear();
 }
 
 void QEvdevMouseManager::clampPosition()
@@ -159,31 +151,32 @@ void QEvdevMouseManager::handleWheelEvent(QPoint delta)
 
 void QEvdevMouseManager::addMouse(const QString &deviceNode)
 {
-    qCDebug(qLcEvdevMouse) << "Adding mouse at" << deviceNode;
-    QEvdevMouseHandler *handler = QEvdevMouseHandler::create(deviceNode, m_spec);
+    qCDebug(qLcEvdevMouse, "Adding mouse at %ls", qUtf16Printable(deviceNode));
+    auto handler = QEvdevMouseHandler::create(deviceNode, m_spec);
     if (handler) {
-        connect(handler, &QEvdevMouseHandler::handleMouseEvent,
+        connect(handler.get(), &QEvdevMouseHandler::handleMouseEvent,
                 this, &QEvdevMouseManager::handleMouseEvent);
-        connect(handler, &QEvdevMouseHandler::handleWheelEvent,
+        connect(handler.get(), &QEvdevMouseHandler::handleWheelEvent,
                 this, &QEvdevMouseManager::handleWheelEvent);
-        m_mice.insert(deviceNode, handler);
-        QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
-            QInputDeviceManager::DeviceTypePointer, m_mice.count());
+        m_mice.add(deviceNode, std::move(handler));
+        updateDeviceCount();
     } else {
-        qWarning("evdevmouse: Failed to open mouse device %s", qPrintable(deviceNode));
+        qWarning("evdevmouse: Failed to open mouse device %ls", qUtf16Printable(deviceNode));
     }
 }
 
 void QEvdevMouseManager::removeMouse(const QString &deviceNode)
 {
-    if (m_mice.contains(deviceNode)) {
-        qCDebug(qLcEvdevMouse) << "Removing mouse at" << deviceNode;
-        QEvdevMouseHandler *handler = m_mice.value(deviceNode);
-        m_mice.remove(deviceNode);
-        QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
-            QInputDeviceManager::DeviceTypePointer, m_mice.count());
-        delete handler;
+    if (m_mice.remove(deviceNode)) {
+        qCDebug(qLcEvdevMouse, "Removing mouse at %ls", qUtf16Printable(deviceNode));
+        updateDeviceCount();
     }
 }
 
+void QEvdevMouseManager::updateDeviceCount()
+{
+    QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
+        QInputDeviceManager::DeviceTypePointer, m_mice.count());
+}
+
 QT_END_NAMESPACE
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
index 13a8e3dec5..f5c32ed8b5 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
@@ -53,6 +53,8 @@
 
 #include "qevdevmousehandler_p.h"
 
+#include <QtInputSupport/private/devicehandlerlist_p.h>
+
 #include <QObject>
 #include <QHash>
 #include <QSocketNotifier>
@@ -65,7 +67,7 @@ class QDeviceDiscovery;
 class QEvdevMouseManager : public QObject
 {
 public:
-    QEvdevMouseManager(const QString &key, const QString &specification, QObject *parent = 0);
+    QEvdevMouseManager(const QString &key, const QString &specification, QObject *parent = nullptr);
     ~QEvdevMouseManager();
 
     void handleMouseEvent(int x, int y, bool abs, Qt::MouseButtons buttons,
@@ -77,10 +79,10 @@ public:
 
 private:
     void clampPosition();
+    void updateDeviceCount();
 
     QString m_spec;
-    QHash<QString,QEvdevMouseHandler*> m_mice;
-    QDeviceDiscovery *m_deviceDiscovery;
+    QtInputSupport::DeviceHandlerList<QEvdevMouseHandler> m_mice;
     int m_x;
     int m_y;
     int m_xoffset;
diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
index b6051aaf3c..c86840b76c 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
@@ -172,11 +172,11 @@ QEvdevTabletHandler::QEvdevTabletHandler(const QString &device, const QString &s
 
     setObjectName(QLatin1String("Evdev Tablet Handler"));
 
-    qCDebug(qLcEvdevTablet, "evdevtablet: using %s", qPrintable(device));
+    qCDebug(qLcEvdevTablet, "evdevtablet: using %ls", qUtf16Printable(device));
 
     m_fd = QT_OPEN(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0);
     if (m_fd < 0) {
-        qErrnoWarning(errno, "evdevtablet: Cannot open input device %s", qPrintable(device));
+        qErrnoWarning("evdevtablet: Cannot open input device %ls", qUtf16Printable(device));
         return;
     }
 
@@ -184,11 +184,11 @@ QEvdevTabletHandler::QEvdevTabletHandler(const QString &device, const QString &s
     if (grabSuccess)
         ioctl(m_fd, EVIOCGRAB, (void *) 0);
     else
-        qWarning("evdevtablet: %s: The device is grabbed by another process. No events will be read.", qPrintable(device));
+        qWarning("evdevtablet: %ls: The device is grabbed by another process. No events will be read.", qUtf16Printable(device));
 
     d = new QEvdevTabletData(this);
     if (!queryLimits())
-        qWarning("evdevtablet: %s: Unset or invalid ABS limits. Behavior will be unspecified.", qPrintable(device));
+        qWarning("evdevtablet: %ls: Unset or invalid ABS limits. Behavior will be unspecified.", qUtf16Printable(device));
 
     m_notifier = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
     connect(m_notifier, &QSocketNotifier::activated, this, &QEvdevTabletHandler::readData);
@@ -216,32 +216,32 @@ bool QEvdevTabletHandler::queryLimits()
     if (ok) {
         d->minValues.x = absInfo.minimum;
         d->maxValues.x = absInfo.maximum;
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: min X: %d max X: %d", qPrintable(m_device),
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: min X: %d max X: %d", qUtf16Printable(m_device),
                 d->minValues.x, d->maxValues.x);
     }
     ok &= ioctl(m_fd, EVIOCGABS(ABS_Y), &absInfo) >= 0;
     if (ok) {
         d->minValues.y = absInfo.minimum;
         d->maxValues.y = absInfo.maximum;
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: min Y: %d max Y: %d", qPrintable(m_device),
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: min Y: %d max Y: %d", qUtf16Printable(m_device),
                 d->minValues.y, d->maxValues.y);
     }
     if (ioctl(m_fd, EVIOCGABS(ABS_PRESSURE), &absInfo) >= 0) {
         d->minValues.p = absInfo.minimum;
         d->maxValues.p = absInfo.maximum;
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: min pressure: %d max pressure: %d", qPrintable(m_device),
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: min pressure: %d max pressure: %d", qUtf16Printable(m_device),
                 d->minValues.p, d->maxValues.p);
     }
     if (ioctl(m_fd, EVIOCGABS(ABS_DISTANCE), &absInfo) >= 0) {
         d->minValues.d = absInfo.minimum;
         d->maxValues.d = absInfo.maximum;
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: min distance: %d max distance: %d", qPrintable(m_device),
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: min distance: %d max distance: %d", qUtf16Printable(m_device),
                 d->minValues.d, d->maxValues.d);
     }
     char name[128];
     if (ioctl(m_fd, EVIOCGNAME(sizeof(name) - 1), name) >= 0) {
         d->devName = QString::fromLocal8Bit(name);
-        qCDebug(qLcEvdevTablet, "evdevtablet: %s: device name: %s", qPrintable(m_device), name);
+        qCDebug(qLcEvdevTablet, "evdevtablet: %ls: device name: %s", qUtf16Printable(m_device), name);
     }
     return ok;
 }
@@ -253,11 +253,11 @@ void QEvdevTabletHandler::readData()
     for (; ;) {
         int result = QT_READ(m_fd, reinterpret_cast<char*>(buffer) + n, sizeof(buffer) - n);
         if (!result) {
-            qWarning("evdevtablet: %s: Got EOF from input device", qPrintable(m_device));
+            qWarning("evdevtablet: %ls: Got EOF from input device", qUtf16Printable(m_device));
             return;
         } else if (result < 0) {
             if (errno != EINTR && errno != EAGAIN) {
-                qErrnoWarning(errno, "evdevtablet: %s: Could not read from input device", qPrintable(m_device));
+                qErrnoWarning("evdevtablet: %ls: Could not read from input device", qUtf16Printable(m_device));
                 if (errno == ENODEV) { // device got disconnected -> stop reading
                     delete m_notifier;
                     m_notifier = 0;
diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
index 66e821117a..b83bb21258 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
+++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
@@ -64,7 +64,7 @@ class QEvdevTabletData;
 class QEvdevTabletHandler : public QObject
 {
 public:
-    explicit QEvdevTabletHandler(const QString &device, const QString &spec = QString(), QObject *parent = 0);
+    explicit QEvdevTabletHandler(const QString &device, const QString &spec = QString(), QObject *parent = nullptr);
     ~QEvdevTabletHandler();
 
     qint64 deviceId() const;
@@ -83,7 +83,7 @@ private:
 class QEvdevTabletHandlerThread : public QDaemonThread
 {
 public:
-    explicit QEvdevTabletHandlerThread(const QString &device, const QString &spec, QObject *parent = 0);
+    explicit QEvdevTabletHandlerThread(const QString &device, const QString &spec, QObject *parent = nullptr);
     ~QEvdevTabletHandlerThread();
     void run() override;
     QEvdevTabletHandler *handler() { return m_handler; }
diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
index 90949408ac..d9888c5b97 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
@@ -40,12 +40,15 @@
 #include "qevdevtabletmanager_p.h"
 #include "qevdevtablethandler_p.h"
 
+#include <QtInputSupport/private/qevdevutil_p.h>
+
 #include <QStringList>
 #include <QGuiApplication>
 #include <QLoggingCategory>
 #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qinputdevicemanager_p_p.h>
+#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,34 +67,23 @@ QEvdevTabletManager::QEvdevTabletManager(const QString &key, const QString &spec
     if (spec.isEmpty())
         spec = specification;
 
-    QStringList args = spec.split(QLatin1Char(':'));
-    QStringList devices;
-
-    foreach (const QString &arg, args) {
-        if (arg.startsWith(QLatin1String("/dev/"))) {
-            devices.append(arg);
-            args.removeAll(arg);
-        }
-    }
-
-    // build new specification without /dev/ elements
-    m_spec = args.join(QLatin1Char(':'));
+    auto parsed = QEvdevUtil::parseSpecification(spec);
+    m_spec = std::move(parsed.spec);
 
-    foreach (const QString &device, devices)
+    for (const QString &device : qAsConst(parsed.devices))
         addDevice(device);
 
     // when no devices specified, use device discovery to scan and monitor
-    if (devices.isEmpty()) {
-        qCDebug(qLcEvdevTablet) << "evdevtablet: Using device discovery";
-        m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Tablet, this);
-        if (m_deviceDiscovery) {
-            const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
+    if (parsed.devices.isEmpty()) {
+        qCDebug(qLcEvdevTablet, "evdevtablet: Using device discovery");
+        if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Tablet, this)) {
+            const QStringList devices = deviceDiscovery->scanConnectedDevices();
             for (const QString &device : devices)
                 addDevice(device);
 
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
                     this, &QEvdevTabletManager::addDevice);
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
                     this, &QEvdevTabletManager::removeDevice);
         }
     }
@@ -99,33 +91,32 @@ QEvdevTabletManager::QEvdevTabletManager(const QString &key, const QString &spec
 
 QEvdevTabletManager::~QEvdevTabletManager()
 {
-    qDeleteAll(m_activeDevices);
 }
 
 void QEvdevTabletManager::addDevice(const QString &deviceNode)
 {
-    qCDebug(qLcEvdevTablet) << "Adding device at" << deviceNode;
-    QEvdevTabletHandlerThread *handler;
-    handler = new QEvdevTabletHandlerThread(deviceNode, m_spec);
+    qCDebug(qLcEvdevTablet, "Adding device at %ls", qUtf16Printable(deviceNode));
+    auto handler = qt_make_unique<QEvdevTabletHandlerThread>(deviceNode, m_spec);
     if (handler) {
-        m_activeDevices.insert(deviceNode, handler);
-        QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
-            QInputDeviceManager::DeviceTypeTablet, m_activeDevices.count());
+        m_activeDevices.add(deviceNode, std::move(handler));
+        updateDeviceCount();
     } else {
-        qWarning("evdevtablet: Failed to open tablet device %s", qPrintable(deviceNode));
+        qWarning("evdevtablet: Failed to open tablet device %ls", qUtf16Printable(deviceNode));
     }
 }
 
 void QEvdevTabletManager::removeDevice(const QString &deviceNode)
 {
-    if (m_activeDevices.contains(deviceNode)) {
-        qCDebug(qLcEvdevTablet) << "Removing device at" << deviceNode;
-        QEvdevTabletHandlerThread *handler = m_activeDevices.value(deviceNode);
-        m_activeDevices.remove(deviceNode);
-        QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
-            QInputDeviceManager::DeviceTypeTablet, m_activeDevices.count());
-        delete handler;
+    if (m_activeDevices.remove(deviceNode)) {
+        qCDebug(qLcEvdevTablet, "Removing device at %ls", qUtf16Printable(deviceNode));
+        updateDeviceCount();
     }
 }
 
+void QEvdevTabletManager::updateDeviceCount()
+{
+    QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
+        QInputDeviceManager::DeviceTypeTablet, m_activeDevices.count());
+}
+
 QT_END_NAMESPACE
diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h b/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
index cde91c55aa..bb18ffba04 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
@@ -51,6 +51,8 @@
 // We mean it.
 //
 
+#include <QtInputSupport/private/devicehandlerlist_p.h>
+
 #include <QObject>
 #include <QHash>
 #include <QSocketNotifier>
@@ -63,16 +65,17 @@ class QEvdevTabletHandlerThread;
 class QEvdevTabletManager : public QObject
 {
 public:
-    QEvdevTabletManager(const QString &key, const QString &spec, QObject *parent = 0);
+    QEvdevTabletManager(const QString &key, const QString &spec, QObject *parent = nullptr);
     ~QEvdevTabletManager();
 
     void addDevice(const QString &deviceNode);
     void removeDevice(const QString &deviceNode);
 
 private:
+    void updateDeviceCount();
+
     QString m_spec;
-    QDeviceDiscovery *m_deviceDiscovery;
-    QHash<QString, QEvdevTabletHandlerThread *> m_activeDevices;
+    QtInputSupport::DeviceHandlerList<QEvdevTabletHandlerThread> m_activeDevices;
 };
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
index f86f80785e..c51db59e1f 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
@@ -49,6 +49,9 @@
 #include <QtCore/private/qcore_unix_p.h>
 #include <QtGui/private/qhighdpiscaling_p.h>
 #include <QtGui/private/qguiapplication_p.h>
+
+#include <mutex>
+
 #ifdef Q_OS_FREEBSD
 #include <dev/evdev/input.h>
 #else
@@ -66,6 +69,7 @@ extern "C" {
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(qLcEvdevTouch, "qt.qpa.input")
+Q_LOGGING_CATEGORY(qLcEvents, "qt.qpa.input.events")
 
 /* android (and perhaps some other linux-derived stuff) don't define everything
  * in linux/input.h, so we'll need to do that ourselves.
@@ -228,7 +232,7 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &device, const
         }
     }
 
-    qCDebug(qLcEvdevTouch, "evdevtouch: Using device %s", qPrintable(device));
+    qCDebug(qLcEvdevTouch, "evdevtouch: Using device %ls", qUtf16Printable(device));
 
     m_fd = QT_OPEN(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0);
 
@@ -236,7 +240,7 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &device, const
         m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
         connect(m_notify, &QSocketNotifier::activated, this, &QEvdevTouchScreenHandler::readData);
     } else {
-        qErrnoWarning(errno, "evdevtouch: Cannot open input device %s", qPrintable(device));
+        qErrnoWarning("evdevtouch: Cannot open input device %ls", qUtf16Printable(device));
         return;
     }
 
@@ -266,8 +270,8 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &device, const
 
     d->deviceNode = device;
     qCDebug(qLcEvdevTouch,
-            "evdevtouch: %s: Protocol type %c %s (%s), filtered=%s",
-            qPrintable(d->deviceNode),
+            "evdevtouch: %ls: Protocol type %c %s (%s), filtered=%s",
+            qUtf16Printable(d->deviceNode),
             d->m_typeB ? 'B' : 'A', mtdevStr,
             d->m_singleTouch ? "single" : "multi",
             d->m_filtered ? "yes" : "no");
@@ -279,7 +283,7 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &device, const
     bool has_x_range = false, has_y_range = false;
 
     if (ioctl(m_fd, EVIOCGABS((d->m_singleTouch ? ABS_X : ABS_MT_POSITION_X)), &absInfo) >= 0) {
-        qCDebug(qLcEvdevTouch, "evdevtouch: %s: min X: %d max X: %d", qPrintable(device),
+        qCDebug(qLcEvdevTouch, "evdevtouch: %ls: min X: %d max X: %d", qUtf16Printable(device),
                 absInfo.minimum, absInfo.maximum);
         d->hw_range_x_min = absInfo.minimum;
         d->hw_range_x_max = absInfo.maximum;
@@ -287,7 +291,7 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &device, const
     }
 
     if (ioctl(m_fd, EVIOCGABS((d->m_singleTouch ? ABS_Y : ABS_MT_POSITION_Y)), &absInfo) >= 0) {
-        qCDebug(qLcEvdevTouch, "evdevtouch: %s: min Y: %d max Y: %d", qPrintable(device),
+        qCDebug(qLcEvdevTouch, "evdevtouch: %ls: min Y: %d max Y: %d", qUtf16Printable(device),
                 absInfo.minimum, absInfo.maximum);
         d->hw_range_y_min = absInfo.minimum;
         d->hw_range_y_max = absInfo.maximum;
@@ -295,10 +299,10 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &device, const
     }
 
     if (!has_x_range || !has_y_range)
-        qWarning("evdevtouch: %s: Invalid ABS limits, behavior unspecified", qPrintable(device));
+        qWarning("evdevtouch: %ls: Invalid ABS limits, behavior unspecified", qUtf16Printable(device));
 
     if (ioctl(m_fd, EVIOCGABS(ABS_PRESSURE), &absInfo) >= 0) {
-        qCDebug(qLcEvdevTouch, "evdevtouch: %s: min pressure: %d max pressure: %d", qPrintable(device),
+        qCDebug(qLcEvdevTouch, "evdevtouch: %ls: min pressure: %d max pressure: %d", qUtf16Printable(device),
                 absInfo.minimum, absInfo.maximum);
         if (absInfo.maximum > absInfo.minimum) {
             d->hw_pressure_min = absInfo.minimum;
@@ -309,7 +313,7 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &device, const
     char name[1024];
     if (ioctl(m_fd, EVIOCGNAME(sizeof(name) - 1), name) >= 0) {
         d->hw_name = QString::fromLocal8Bit(name);
-        qCDebug(qLcEvdevTouch, "evdevtouch: %s: device name: %s", qPrintable(device), name);
+        qCDebug(qLcEvdevTouch, "evdevtouch: %ls: device name: %s", qUtf16Printable(device), name);
     }
 
     // Fix up the coordinate ranges for am335x in case the kernel driver does not have them fixed.
@@ -345,8 +349,8 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &device, const
     if (mapping.load()) {
         d->m_screenName = mapping.screenNameForDeviceNode(d->deviceNode);
         if (!d->m_screenName.isEmpty())
-            qCDebug(qLcEvdevTouch, "evdevtouch: Mapping device %s to screen %s",
-                    qPrintable(d->deviceNode), qPrintable(d->m_screenName));
+            qCDebug(qLcEvdevTouch, "evdevtouch: Mapping device %ls to screen %ls",
+                    qUtf16Printable(d->deviceNode), qUtf16Printable(d->m_screenName));
     }
 
     registerTouchDevice();
@@ -427,7 +431,7 @@ err:
         return;
     } else if (events < 0) {
         if (errno != EINTR && errno != EAGAIN) {
-            qErrnoWarning(errno, "evdevtouch: Could not read from input device");
+            qErrnoWarning("evdevtouch: Could not read from input device");
             if (errno == ENODEV) { // device got disconnected -> stop reading
                 delete m_notify;
                 m_notify = nullptr;
@@ -536,6 +540,9 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
             if (m_typeB)
                 m_contacts[m_currentSlot].maj = m_currentData.maj;
         } else if (data->code == ABS_PRESSURE || data->code == ABS_MT_PRESSURE) {
+            if (Q_UNLIKELY(qLcEvents().isDebugEnabled()))
+                qCDebug(qLcEvents, "EV_ABS code 0x%x: pressure %d; bounding to [%d,%d]",
+                        data->code, data->value, hw_pressure_min, hw_pressure_max);
             m_currentData.pressure = qBound(hw_pressure_min, data->value, hw_pressure_max);
             if (m_typeB || m_singleTouch)
                 m_contacts[m_currentSlot].pressure = m_currentData.pressure;
@@ -563,8 +570,9 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
         if (!m_contacts.isEmpty() && m_contacts.constBegin().value().trackingId == -1)
             assignIds();
 
+        std::unique_lock<QMutex> locker;
         if (m_filtered)
-            m_mutex.lock();
+            locker = std::unique_lock<QMutex>{m_mutex};
 
         // update timestamps
         m_lastTimeStamp = m_timeStamp;
@@ -573,10 +581,11 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
         m_lastTouchPoints = m_touchPoints;
         m_touchPoints.clear();
         Qt::TouchPointStates combinedStates;
+        bool hasPressure = false;
+
+        for (auto i = m_contacts.begin(), end = m_contacts.end(); i != end; /*erasing*/) {
+            auto it = i++;
 
-        QMutableHashIterator<int, Contact> it(m_contacts);
-        while (it.hasNext()) {
-            it.next();
             Contact &contact(it.value());
 
             if (!contact.state)
@@ -599,17 +608,18 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
             // Avoid reporting a contact in released state more than once.
             if (!m_typeB && contact.state == Qt::TouchPointReleased
                     && !m_lastContacts.contains(key)) {
-                it.remove();
+                m_contacts.erase(it);
                 continue;
             }
 
+            if (contact.pressure)
+                hasPressure = true;
+
             addTouchPoint(contact, &combinedStates);
         }
 
         // Now look for contacts that have disappeared since the last sync.
-        it = m_lastContacts;
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = m_lastContacts.begin(), end = m_lastContacts.end(); it != end; ++it) {
             Contact &contact(it.value());
             int key = m_typeB ? it.key() : contact.trackingId;
             if (m_typeB) {
@@ -626,9 +636,9 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
         }
 
         // Remove contacts that have just been reported as released.
-        it = m_contacts;
-        while (it.hasNext()) {
-            it.next();
+        for (auto i = m_contacts.begin(), end = m_contacts.end(); i != end; /*erasing*/) {
+            auto it = i++;
+
             Contact &contact(it.value());
 
             if (!contact.state)
@@ -638,7 +648,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
                 if (m_typeB)
                     contact.state = static_cast<Qt::TouchPointState>(0);
                 else
-                    it.remove();
+                    m_contacts.erase(it);
             } else {
                 contact.state = Qt::TouchPointStationary;
             }
@@ -649,11 +659,8 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
             m_contacts.clear();
 
 
-        if (!m_touchPoints.isEmpty() && combinedStates != Qt::TouchPointStationary)
+        if (!m_touchPoints.isEmpty() && (hasPressure || combinedStates != Qt::TouchPointStationary))
             reportPoints();
-
-        if (m_filtered)
-            m_mutex.unlock();
     }
 
     m_lastEventType = data->type;
@@ -778,6 +785,9 @@ void QEvdevTouchScreenData::reportPoints()
             tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
         else
             tp.pressure = (tp.pressure - hw_pressure_min) / qreal(hw_pressure_max - hw_pressure_min);
+
+        if (Q_UNLIKELY(qLcEvents().isDebugEnabled()))
+            qCDebug(qLcEvents) << "reporting" << tp;
     }
 
     // Let qguiapp pick the target window.
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
index 4cacbf03e5..bf2df93d11 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
@@ -40,12 +40,15 @@
 #include "qevdevtouchmanager_p.h"
 #include "qevdevtouchhandler_p.h"
 
+#include <QtInputSupport/private/qevdevutil_p.h>
+
 #include <QStringList>
 #include <QGuiApplication>
 #include <QLoggingCategory>
 #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qinputdevicemanager_p_p.h>
+#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,34 +67,23 @@ QEvdevTouchManager::QEvdevTouchManager(const QString &key, const QString &specif
     if (spec.isEmpty())
         spec = specification;
 
-    QStringList args = spec.split(QLatin1Char(':'));
-    QStringList devices;
-
-    foreach (const QString &arg, args) {
-        if (arg.startsWith(QLatin1String("/dev/"))) {
-            devices.append(arg);
-            args.removeAll(arg);
-        }
-    }
-
-    // build new specification without /dev/ elements
-    m_spec = args.join(QLatin1Char(':'));
+    auto parsed = QEvdevUtil::parseSpecification(spec);
+    m_spec = std::move(parsed.spec);
 
-    foreach (const QString &device, devices)
+    for (const QString &device : qAsConst(parsed.devices))
         addDevice(device);
 
     // when no devices specified, use device discovery to scan and monitor
-    if (devices.isEmpty()) {
-        qCDebug(qLcEvdevTouch) << "evdevtouch: Using device discovery";
-        m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Touchpad | QDeviceDiscovery::Device_Touchscreen, this);
-        if (m_deviceDiscovery) {
-            const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
+    if (parsed.devices.isEmpty()) {
+        qCDebug(qLcEvdevTouch, "evdevtouch: Using device discovery");
+        if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Touchpad | QDeviceDiscovery::Device_Touchscreen, this)) {
+            const QStringList devices = deviceDiscovery->scanConnectedDevices();
             for (const QString &device : devices)
                 addDevice(device);
 
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
                     this, &QEvdevTouchManager::addDevice);
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
                     this, &QEvdevTouchManager::removeDevice);
         }
     }
@@ -99,30 +91,24 @@ QEvdevTouchManager::QEvdevTouchManager(const QString &key, const QString &specif
 
 QEvdevTouchManager::~QEvdevTouchManager()
 {
-    qDeleteAll(m_activeDevices);
 }
 
 void QEvdevTouchManager::addDevice(const QString &deviceNode)
 {
-    qCDebug(qLcEvdevTouch) << "evdevtouch: Adding device at" << deviceNode;
-    QEvdevTouchScreenHandlerThread *handler;
-    handler = new QEvdevTouchScreenHandlerThread(deviceNode, m_spec);
+    qCDebug(qLcEvdevTouch, "evdevtouch: Adding device at %ls", qUtf16Printable(deviceNode));
+    auto handler = qt_make_unique<QEvdevTouchScreenHandlerThread>(deviceNode, m_spec);
     if (handler) {
-        m_activeDevices.insert(deviceNode, handler);
-        connect(handler, &QEvdevTouchScreenHandlerThread::touchDeviceRegistered, this, &QEvdevTouchManager::updateInputDeviceCount);
+        connect(handler.get(), &QEvdevTouchScreenHandlerThread::touchDeviceRegistered, this, &QEvdevTouchManager::updateInputDeviceCount);
+        m_activeDevices.add(deviceNode, std::move(handler));
     } else {
-        qWarning("evdevtouch: Failed to open touch device %s", qPrintable(deviceNode));
+        qWarning("evdevtouch: Failed to open touch device %ls", qUtf16Printable(deviceNode));
     }
 }
 
 void QEvdevTouchManager::removeDevice(const QString &deviceNode)
 {
-    if (m_activeDevices.contains(deviceNode)) {
-        qCDebug(qLcEvdevTouch) << "evdevtouch: Removing device at" << deviceNode;
-        QEvdevTouchScreenHandlerThread *handler = m_activeDevices.value(deviceNode);
-        m_activeDevices.remove(deviceNode);
-        delete handler;
-
+    if (m_activeDevices.remove(deviceNode)) {
+        qCDebug(qLcEvdevTouch, "evdevtouch: Removing device at %ls", qUtf16Printable(deviceNode));
         updateInputDeviceCount();
     }
 }
@@ -130,13 +116,13 @@ void QEvdevTouchManager::removeDevice(const QString &deviceNode)
 void QEvdevTouchManager::updateInputDeviceCount()
 {
     int registeredTouchDevices = 0;
-    Q_FOREACH (QEvdevTouchScreenHandlerThread *handler, m_activeDevices) {
-        if (handler->isTouchDeviceRegistered())
+    for (const auto &device : m_activeDevices) {
+        if (device.handler->isTouchDeviceRegistered())
             ++registeredTouchDevices;
     }
 
-    qCDebug(qLcEvdevTouch) << "evdevtouch: Updating QInputDeviceManager device count:" << registeredTouchDevices << " touch devices,"
-                           << m_activeDevices.count() - registeredTouchDevices << "pending handler(s)" ;
+    qCDebug(qLcEvdevTouch, "evdevtouch: Updating QInputDeviceManager device count: %d touch devices, %d pending handler(s)",
+            registeredTouchDevices, m_activeDevices.count() - registeredTouchDevices);
 
     QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
         QInputDeviceManager::DeviceTypeTouch, registeredTouchDevices);
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchmanager_p.h b/src/platformsupport/input/evdevtouch/qevdevtouchmanager_p.h
index e524c516f1..94ee05d900 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchmanager_p.h
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchmanager_p.h
@@ -51,6 +51,8 @@
 // We mean it.
 //
 
+#include <QtInputSupport/private/devicehandlerlist_p.h>
+
 #include <QObject>
 #include <QHash>
 #include <QSocketNotifier>
@@ -63,7 +65,7 @@ class QEvdevTouchScreenHandlerThread;
 class QEvdevTouchManager : public QObject
 {
 public:
-    QEvdevTouchManager(const QString &key, const QString &spec, QObject *parent = 0);
+    QEvdevTouchManager(const QString &key, const QString &spec, QObject *parent = nullptr);
     ~QEvdevTouchManager();
 
     void addDevice(const QString &deviceNode);
@@ -73,8 +75,7 @@ public:
 
 private:
     QString m_spec;
-    QDeviceDiscovery *m_deviceDiscovery;
-    QHash<QString, QEvdevTouchScreenHandlerThread *> m_activeDevices;
+    QtInputSupport::DeviceHandlerList<QEvdevTouchScreenHandlerThread> m_activeDevices;
 };
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/input/libinput/qlibinputhandler.cpp b/src/platformsupport/input/libinput/qlibinputhandler.cpp
index e5dc182bec..95dfb46d16 100644
--- a/src/platformsupport/input/libinput/qlibinputhandler.cpp
+++ b/src/platformsupport/input/libinput/qlibinputhandler.cpp
@@ -205,6 +205,9 @@ void QLibInputHandler::processEvent(libinput_event *ev)
     case LIBINPUT_EVENT_POINTER_MOTION:
         m_pointer->processMotion(libinput_event_get_pointer_event(ev));
         break;
+    case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
+        m_pointer->processAbsMotion(libinput_event_get_pointer_event(ev));
+        break;
     case LIBINPUT_EVENT_POINTER_AXIS:
         m_pointer->processAxis(libinput_event_get_pointer_event(ev));
         break;
diff --git a/src/platformsupport/input/libinput/qlibinputpointer.cpp b/src/platformsupport/input/libinput/qlibinputpointer.cpp
index c54b61fc66..db9e81b5df 100644
--- a/src/platformsupport/input/libinput/qlibinputpointer.cpp
+++ b/src/platformsupport/input/libinput/qlibinputpointer.cpp
@@ -103,6 +103,24 @@ void QLibInputPointer::processMotion(libinput_event_pointer *e)
                                              Qt::NoButton, QEvent::MouseMove, mods);
 }
 
+void QLibInputPointer::processAbsMotion(libinput_event_pointer *e)
+{
+    QScreen * const primaryScreen = QGuiApplication::primaryScreen();
+    const QRect g = QHighDpi::toNativePixels(primaryScreen->virtualGeometry(), primaryScreen);
+
+    const double x = libinput_event_pointer_get_absolute_x_transformed(e, g.width());
+    const double y = libinput_event_pointer_get_absolute_y_transformed(e, g.height());
+
+    m_pos.setX(qBound(g.left(), qRound(g.left() + x), g.right()));
+    m_pos.setY(qBound(g.top(), qRound(g.top() + y), g.bottom()));
+
+    Qt::KeyboardModifiers mods = QGuiApplicationPrivate::inputDeviceManager()->keyboardModifiers();
+
+    QWindowSystemInterface::handleMouseEvent(nullptr, m_pos, m_pos, m_buttons,
+                                             Qt::NoButton, QEvent::MouseMove, mods);
+
+}
+
 void QLibInputPointer::processAxis(libinput_event_pointer *e)
 {
     double value; // default axis value is 15 degrees per wheel click
diff --git a/src/platformsupport/input/libinput/qlibinputpointer_p.h b/src/platformsupport/input/libinput/qlibinputpointer_p.h
index a7a66337f1..55d4a5f919 100644
--- a/src/platformsupport/input/libinput/qlibinputpointer_p.h
+++ b/src/platformsupport/input/libinput/qlibinputpointer_p.h
@@ -64,6 +64,7 @@ public:
 
     void processButton(libinput_event_pointer *e);
     void processMotion(libinput_event_pointer *e);
+    void processAbsMotion(libinput_event_pointer *e);
     void processAxis(libinput_event_pointer *e);
 
     void setPos(const QPoint &pos);
diff --git a/src/platformsupport/input/libinput/qlibinputtouch_p.h b/src/platformsupport/input/libinput/qlibinputtouch_p.h
index 6f88001d19..51304e6a21 100644
--- a/src/platformsupport/input/libinput/qlibinputtouch_p.h
+++ b/src/platformsupport/input/libinput/qlibinputtouch_p.h
@@ -73,7 +73,7 @@ public:
 
 private:
     struct DeviceState {
-        DeviceState() : m_touchDevice(0) { }
+        DeviceState() : m_touchDevice(nullptr) { }
         QWindowSystemInterface::TouchPoint *point(int32_t slot);
         QList<QWindowSystemInterface::TouchPoint> m_points;
         QTouchDevice *m_touchDevice;
diff --git a/src/platformsupport/input/shared/devicehandlerlist_p.h b/src/platformsupport/input/shared/devicehandlerlist_p.h
new file mode 100644
index 0000000000..97794d4d7d
--- /dev/null
+++ b/src/platformsupport/input/shared/devicehandlerlist_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTINPUTSUPPORT_DEVICEHANDLERLIST_P_H
+#define QTINPUTSUPPORT_DEVICEHANDLERLIST_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QString>
+
+#include <vector>
+#include <memory>
+
+namespace QtInputSupport {
+
+template <typename Handler>
+class DeviceHandlerList {
+public:
+    struct Device {
+        QString deviceNode;
+        std::unique_ptr<Handler> handler;
+    };
+
+    void add(const QString &deviceNode, std::unique_ptr<Handler> handler)
+    {
+        v.push_back({deviceNode, std::move(handler)});
+    }
+
+    bool remove(const QString &deviceNode)
+    {
+        const auto deviceNodeMatches = [&] (const Device &d) { return d.deviceNode == deviceNode; };
+        const auto it = std::find_if(v.cbegin(), v.cend(), deviceNodeMatches);
+        if (it == v.cend())
+            return false;
+        v.erase(it);
+        return true;
+    }
+
+    int count() const noexcept { return static_cast<int>(v.size()); }
+
+    typename std::vector<Device>::const_iterator begin() const noexcept { return v.begin(); }
+    typename std::vector<Device>::const_iterator end() const  noexcept { return v.end(); }
+
+private:
+    std::vector<Device> v;
+};
+
+} // QtInputSupport
+
+#endif // QTINPUTSUPPORT_DEVICEHANDLERLIST_P_H
diff --git a/src/widgets/util/qscroller_mac.mm b/src/platformsupport/input/shared/qevdevutil.cpp
index 6dbb483089..74f8bcdc2b 100644
--- a/src/widgets/util/qscroller_mac.mm
+++ b/src/platformsupport/input/shared/qevdevutil.cpp
@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com>
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtWidgets module of the Qt Toolkit.
+** This file is part of the plugins module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,36 +37,34 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qglobal.h>
-
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-
-#import <AppKit/AppKit.h>
-
-#include "qscroller_p.h"
+#include "qevdevutil_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QPointF QScrollerPrivate::realDpi(int screen) const
-{
-    QMacAutoReleasePool pool;
-    NSArray *nsscreens = [NSScreen screens];
+namespace QEvdevUtil {
 
-    if (screen < 0 || screen >= int([nsscreens count]))
-        screen = 0;
+ParsedSpecification parseSpecification(const QString &specification)
+{
+    ParsedSpecification result;
 
-    NSScreen *nsscreen = [nsscreens objectAtIndex:screen];
-    CGDirectDisplayID display = [[[nsscreen deviceDescription] objectForKey:@"NSScreenNumber"] intValue];
+    result.args = specification.splitRef(QLatin1Char(':'));
 
-    CGSize mmsize = CGDisplayScreenSize(display);
-    if (mmsize.width > 0 && mmsize.height > 0) {
-        return QPointF(CGDisplayPixelsWide(display) / mmsize.width,
-                       CGDisplayPixelsHigh(display) / mmsize.height) * qreal(25.4);
-    } else {
-        return QPointF();
+    for (const QStringRef &arg : qAsConst(result.args)) {
+        if (arg.startsWith(QLatin1String("/dev/"))) {
+            // if device is specified try to use it
+            result.devices.append(arg.toString());
+        } else {
+            // build new specification without /dev/ elements
+            result.spec += arg + QLatin1Char(':');
+        }
     }
+
+    if (!result.spec.isEmpty())
+        result.spec.chop(1); // remove trailing ':'
+
+    return result;
 }
 
-QT_END_NAMESPACE
+} // namespace QEvdevUtil
 
-#endif
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/mirclient/qmirclientglcontext.h b/src/platformsupport/input/shared/qevdevutil_p.h
index 92331a6fb1..7d0a5af130 100644
--- a/src/plugins/platforms/mirclient/qmirclientglcontext.h
+++ b/src/platformsupport/input/shared/qevdevutil_p.h
@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Canonical, Ltd.
+** Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com>
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the plugins module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,27 +37,40 @@
 **
 ****************************************************************************/
 
+#ifndef QEVDEVUTIL_P_H
+#define QEVDEVUTIL_P_H
 
-#ifndef QMIRCLIENTGLCONTEXT_H
-#define QMIRCLIENTGLCONTEXT_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
-#include <qpa/qplatformopenglcontext.h>
-#include <QtEglSupport/private/qeglplatformcontext_p.h>
+#include <QString>
+#include <QStringList>
+#include <QVector>
+#include <QStringRef>
 
-#include <EGL/egl.h>
+QT_BEGIN_NAMESPACE
 
-class QMirClientOpenGLContext : public QEGLPlatformContext
+namespace QEvdevUtil {
+
+struct ParsedSpecification
 {
-public:
-    QMirClientOpenGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share,
-                        EGLDisplay display);
+    QString spec;
+    QStringList devices;
+    QVector<QStringRef> args;
+};
 
-    // QEGLPlatformContext methods.
-    void swapBuffers(QPlatformSurface *surface) final;
-    bool makeCurrent(QPlatformSurface *surface) final;
+ParsedSpecification parseSpecification(const QString &specification);
 
-protected:
-    EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) final;
-};
+}
+
+QT_END_NAMESPACE
 
-#endif // QMIRCLIENTGLCONTEXT_H
+#endif // QEVDEVUTIL_P_H
diff --git a/src/platformsupport/input/shared/shared.pri b/src/platformsupport/input/shared/shared.pri
index 1443235244..c29d11e7d6 100644
--- a/src/platformsupport/input/shared/shared.pri
+++ b/src/platformsupport/input/shared/shared.pri
@@ -1,5 +1,8 @@
 HEADERS += \
+    $$PWD/devicehandlerlist_p.h \
+    $$PWD/qevdevutil_p.h \
     $$PWD/qtouchoutputmapping_p.h
 
 SOURCES += \
+    $$PWD/qevdevutil.cpp \
     $$PWD/qtouchoutputmapping.cpp
diff --git a/src/platformsupport/input/tslib/qtslib.cpp b/src/platformsupport/input/tslib/qtslib.cpp
index 7609416fea..e105f5ea98 100644
--- a/src/platformsupport/input/tslib/qtslib.cpp
+++ b/src/platformsupport/input/tslib/qtslib.cpp
@@ -57,38 +57,22 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
                                        const QString &specification,
                                        QObject *parent)
     : QObject(parent),
-    m_notify(0), m_x(0), m_y(0), m_pressed(0), m_rawMode(false)
+    m_rawMode(!key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive))
 {
     qCDebug(qLcTsLib) << "Initializing tslib plugin" << key << specification;
     setObjectName(QLatin1String("TSLib Mouse Handler"));
 
-    QByteArray device = qgetenv("TSLIB_TSDEVICE");
-
-    if (specification.startsWith(QLatin1String("/dev/")))
-        device = specification.toLocal8Bit();
-
-    if (device.isEmpty())
-        device = QByteArrayLiteral("/dev/input/event1");
-
-    m_dev = ts_open(device.constData(), 1);
+    m_dev = ts_setup(nullptr, 1);
     if (!m_dev) {
-        qErrnoWarning(errno, "ts_open() failed");
+        qErrnoWarning(errno, "ts_setup() failed");
         return;
     }
 
-    if (ts_config(m_dev))
-        qErrnoWarning(errno, "ts_config() failed");
-
-    m_rawMode = !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive);
-
-    int fd = ts_fd(m_dev);
-    if (fd >= 0) {
-        qCDebug(qLcTsLib) << "tslib device is" << device;
-        m_notify = new QSocketNotifier(fd, QSocketNotifier::Read, this);
-        connect(m_notify, &QSocketNotifier::activated, this, &QTsLibMouseHandler::readMouseData);
-    } else {
-        qErrnoWarning(errno, "tslib: Cannot open input device %s", device.constData());
-    }
+#ifdef TSLIB_VERSION_EVENTPATH /* also introduced in 1.15 */
+    qCDebug(qLcTsLib) << "tslib device is" << ts_get_eventpath(m_dev);
+#endif
+    m_notify = new QSocketNotifier(ts_fd(m_dev), QSocketNotifier::Read, this);
+    connect(m_notify, &QSocketNotifier::activated, this, &QTsLibMouseHandler::readMouseData);
 }
 
 QTsLibMouseHandler::~QTsLibMouseHandler()
diff --git a/src/platformsupport/input/tslib/qtslib_p.h b/src/platformsupport/input/tslib/qtslib_p.h
index 0c08fb6a3d..ffd60cd0e3 100644
--- a/src/platformsupport/input/tslib/qtslib_p.h
+++ b/src/platformsupport/input/tslib/qtslib_p.h
@@ -71,11 +71,12 @@ private slots:
     void readMouseData();
 
 private:
-    QSocketNotifier * m_notify;
+    QSocketNotifier * m_notify = nullptr;
     tsdev *m_dev;
-    int m_x, m_y;
-    bool m_pressed;
-    bool m_rawMode;
+    int m_x = 0;
+    int m_y = 0;
+    bool m_pressed = false;
+    const bool m_rawMode;
 };
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
index fec59cfc7b..6121faf362 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp
+++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
@@ -66,6 +66,8 @@ enum OutputConfiguration {
 
 int QKmsDevice::crtcForConnector(drmModeResPtr resources, drmModeConnectorPtr connector)
 {
+    int candidate = -1;
+
     for (int i = 0; i < connector->count_encoders; i++) {
         drmModeEncoderPtr encoder = drmModeGetEncoder(m_dri_fd, connector->encoders[i]);
         if (!encoder) {
@@ -73,19 +75,30 @@ int QKmsDevice::crtcForConnector(drmModeResPtr resources, drmModeConnectorPtr co
             continue;
         }
 
+        quint32 encoderId = encoder->encoder_id;
+        quint32 crtcId = encoder->crtc_id;
         quint32 possibleCrtcs = encoder->possible_crtcs;
         drmModeFreeEncoder(encoder);
 
         for (int j = 0; j < resources->count_crtcs; j++) {
             bool isPossible = possibleCrtcs & (1 << j);
             bool isAvailable = !(m_crtc_allocator & (1 << j));
-
-            if (isPossible && isAvailable)
+            // Preserve the existing CRTC -> encoder -> connector routing if
+            // any. It makes the initialization faster, and may be better
+            // since we have a very dumb picking algorithm.
+            bool isBestChoice = (!connector->encoder_id ||
+                                 (connector->encoder_id == encoderId &&
+                                  resources->crtcs[j] == crtcId));
+
+            if (isPossible && isAvailable && isBestChoice) {
                 return j;
+            } else if (isPossible && isAvailable) {
+                candidate = j;
+            }
         }
     }
 
-    return -1;
+    return candidate;
 }
 
 static const char * const connector_type_names[] = { // must match DRM_MODE_CONNECTOR_*
@@ -381,23 +394,26 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
     if (!cloneSource.isEmpty())
         qCDebug(qLcKmsDebug) << "Output" << connectorName << " clones output " << cloneSource;
 
-    const QByteArray fbsize = userConnectorConfig.value(QStringLiteral("size")).toByteArray().toLower();
     QSize framebufferSize;
-    framebufferSize.setWidth(modes[selected_mode].hdisplay);
-    framebufferSize.setHeight(modes[selected_mode].vdisplay);
-
+    bool framebufferSizeSet = false;
+    const QByteArray fbsize = userConnectorConfig.value(QStringLiteral("size")).toByteArray().toLower();
+    if (!fbsize.isEmpty()) {
+        if (sscanf(fbsize.constData(), "%dx%d", &framebufferSize.rwidth(), &framebufferSize.rheight()) == 2) {
 #if QT_CONFIG(drm_atomic)
-    if (hasAtomicSupport()) {
-        if (sscanf(fbsize.constData(), "%dx%d", &framebufferSize.rwidth(), &framebufferSize.rheight()) != 2) {
-            qWarning("Framebuffer size format is invalid.");
+            if (hasAtomicSupport())
+                framebufferSizeSet = true;
+#endif
+            if (!framebufferSizeSet)
+                qWarning("Setting framebuffer size is only available with DRM atomic API");
+        } else {
+            qWarning("Invalid framebuffer size '%s'", fbsize.constData());
         }
-    } else {
-        qWarning("Setting framebuffer size is only available with DRM atomic API");
     }
-#else
-    if (fbsize.size())
-        qWarning("Setting framebuffer size is only available with DRM atomic API");
-#endif
+    if (!framebufferSizeSet) {
+        framebufferSize.setWidth(modes[selected_mode].hdisplay);
+        framebufferSize.setHeight(modes[selected_mode].vdisplay);
+    }
+
     qCDebug(qLcKmsDebug) << "Output" << connectorName << "framebuffer size is " << framebufferSize;
 
     QKmsOutput output;
@@ -799,9 +815,7 @@ void QKmsDevice::discoverPlanes()
         for (int i = 0; i < countFormats; ++i) {
             uint32_t f = drmplane->formats[i];
             plane.supportedFormats.append(f);
-            QString s;
-            s.sprintf("%c%c%c%c ", f, f >> 8, f >> 16, f >> 24);
-            formatStr += s;
+            formatStr += QString::asprintf("%c%c%c%c ", f, f >> 8, f >> 16, f >> 24);
         }
 
         qCDebug(qLcKmsDebug, "plane %d: id = %u countFormats = %d possibleCrtcs = 0x%x supported formats = %s",
@@ -848,6 +862,8 @@ void QKmsDevice::discoverPlanes()
                 plane.crtcYPropertyId = prop->prop_id;
             } else if (!strcasecmp(prop->name, "zpos")) {
                 plane.zposPropertyId = prop->prop_id;
+            } else if (!strcasecmp(prop->name, "blend_op")) {
+                plane.blendOpPropertyId = prop->prop_id;
             }
         });
 
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice_p.h b/src/platformsupport/kmsconvenience/qkmsdevice_p.h
index 14da6bb947..b1150e2875 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice_p.h
+++ b/src/platformsupport/kmsconvenience/qkmsdevice_p.h
@@ -178,6 +178,7 @@ struct QKmsPlane
     uint32_t crtcwidthPropertyId = 0;
     uint32_t crtcheightPropertyId = 0;
     uint32_t zposPropertyId = 0;
+    uint32_t blendOpPropertyId = 0;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QKmsPlane::Rotations)
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 580cf0e31d..8a825f8284 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -2050,8 +2050,8 @@ QVariantList AtSpiAdaptor::getAttributes(QAccessibleInterface *interface, int of
     int endOffset;
 
     QString joined = interface->textInterface()->attributes(offset, &startOffset, &endOffset);
-    QStringList attributes = joined.split (QLatin1Char(';'), QString::SkipEmptyParts, Qt::CaseSensitive);
-    foreach (const QString &attr, attributes) {
+    const QStringList attributes = joined.split (QLatin1Char(';'), QString::SkipEmptyParts, Qt::CaseSensitive);
+    for (const QString &attr : attributes) {
         QStringList items;
         items = attr.split(QLatin1Char(':'), QString::SkipEmptyParts, Qt::CaseSensitive);
         AtSpiAttribute attribute = atspiTextAttribute(items[0], items[1]);
@@ -2069,14 +2069,13 @@ QVariantList AtSpiAdaptor::getAttributeValue(QAccessibleInterface *interface, in
 {
     QString mapped;
     QString joined;
-    QStringList attributes;
     QSpiAttributeSet map;
     int startOffset;
     int endOffset;
 
     joined = interface->textInterface()->attributes(offset, &startOffset, &endOffset);
-    attributes = joined.split (QLatin1Char(';'), QString::SkipEmptyParts, Qt::CaseSensitive);
-    foreach (const QString& attr, attributes) {
+    const QStringList attributes = joined.split (QLatin1Char(';'), QString::SkipEmptyParts, Qt::CaseSensitive);
+    for (const QString& attr : attributes) {
         QStringList items;
         items = attr.split(QLatin1Char(':'), QString::SkipEmptyParts, Qt::CaseSensitive);
         AtSpiAttribute attribute = atspiTextAttribute(items[0], items[1]);
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
index b5704f53ad..0b624389a3 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
@@ -76,7 +76,7 @@ class AtSpiAdaptor :public QDBusVirtualObject
     Q_OBJECT
 
 public:
-    explicit AtSpiAdaptor(DBusConnection *connection, QObject *parent = 0);
+    explicit AtSpiAdaptor(DBusConnection *connection, QObject *parent = nullptr);
     ~AtSpiAdaptor();
 
     void registerApplication();
diff --git a/src/platformsupport/linuxaccessibility/cache_p.h b/src/platformsupport/linuxaccessibility/cache_p.h
index e8529b779b..cc55acc6f8 100644
--- a/src/platformsupport/linuxaccessibility/cache_p.h
+++ b/src/platformsupport/linuxaccessibility/cache_p.h
@@ -65,7 +65,7 @@ class QSpiDBusCache : public QObject
     Q_OBJECT
 
 public:
-    explicit QSpiDBusCache(QDBusConnection c, QObject* parent = 0);
+    explicit QSpiDBusCache(QDBusConnection c, QObject* parent = nullptr);
     void emitAddAccessible(const QSpiAccessibleCacheItem& item);
     void emitRemoveAccessible(const QSpiObjectReference& item);
 
diff --git a/src/platformsupport/linuxaccessibility/dbusconnection_p.h b/src/platformsupport/linuxaccessibility/dbusconnection_p.h
index 4030fabc22..860c18ca05 100644
--- a/src/platformsupport/linuxaccessibility/dbusconnection_p.h
+++ b/src/platformsupport/linuxaccessibility/dbusconnection_p.h
@@ -65,7 +65,7 @@ class DBusConnection : public QObject
     Q_OBJECT
 
 public:
-    DBusConnection(QObject *parent = 0);
+    DBusConnection(QObject *parent = nullptr);
     QDBusConnection connection() const;
     bool isEnabled() const { return m_enabled; }
 
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h
index 7959f0c28a..f484795fbb 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h
@@ -69,7 +69,7 @@ class QDBusMenuConnection : public QObject
     Q_OBJECT
 
 public:
-    QDBusMenuConnection(QObject *parent = 0, const QString &serviceName = QString());
+    QDBusMenuConnection(QObject *parent = nullptr, const QString &serviceName = QString());
     QDBusConnection connection() const { return m_connection; }
     QDBusServiceWatcher *dbusWatcher() const { return m_dbusWatcher; }
     bool isStatusNotifierHostRegistered() const { return m_statusNotifierHostRegistered; }
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
index c92de0a140..cffc080f87 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
@@ -92,15 +92,11 @@ public:
 public Q_SLOTS: // METHODS
     QDBusPendingReply<QString, QDBusObjectPath> GetMenuForWindow(uint windowId)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(windowId);
-        return asyncCallWithArgumentList(QStringLiteral("GetMenuForWindow"), argumentList);
+        return asyncCall(QStringLiteral("GetMenuForWindow"), windowId);
     }
     QDBusReply<QString> GetMenuForWindow(uint windowId, QDBusObjectPath &menuObjectPath)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(windowId);
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("GetMenuForWindow"), argumentList);
+        QDBusMessage reply = call(QDBus::Block, QStringLiteral("GetMenuForWindow"), windowId);
         QList<QVariant> arguments = reply.arguments();
         if (reply.type() == QDBusMessage::ReplyMessage && arguments.count() == 2)
             menuObjectPath = qdbus_cast<QDBusObjectPath>(arguments.at(1));
@@ -109,16 +105,12 @@ public Q_SLOTS: // METHODS
 
     QDBusPendingReply<> RegisterWindow(uint windowId, const QDBusObjectPath &menuObjectPath)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(windowId) << QVariant::fromValue(menuObjectPath);
-        return asyncCallWithArgumentList(QStringLiteral("RegisterWindow"), argumentList);
+        return asyncCall(QStringLiteral("RegisterWindow"), windowId, menuObjectPath);
     }
 
     QDBusPendingReply<> UnregisterWindow(uint windowId)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(windowId);
-        return asyncCallWithArgumentList(QStringLiteral("UnregisterWindow"), argumentList);
+        return asyncCall(QStringLiteral("UnregisterWindow"), windowId);
     }
 };
 
diff --git a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h
index 352b4aa5d6..2194a787eb 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h
@@ -88,33 +88,28 @@ public:
 
 public:
     QXdgNotificationInterface(const QString &service, const QString &path,
-                              const QDBusConnection &connection, QObject *parent = 0);
+                              const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~QXdgNotificationInterface();
 
 public Q_SLOTS: // METHODS
     inline QDBusPendingReply<> closeNotification(uint id)
     {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(id);
-        return asyncCallWithArgumentList(QStringLiteral("CloseNotification"), argumentList);
+        return asyncCall(QStringLiteral("CloseNotification"), id);
     }
 
     inline QDBusPendingReply<QStringList> getCapabilities()
     {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetCapabilities"), argumentList);
+        return asyncCall(QStringLiteral("GetCapabilities"));
     }
 
     inline QDBusPendingReply<QString, QString, QString, QString> getServerInformation()
     {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetServerInformation"), argumentList);
+        return asyncCall(QStringLiteral("GetServerInformation"));
     }
     inline QDBusReply<QString> getServerInformation(QString &vendor, QString &version, QString &specVersion)
     {
-        QList<QVariant> argumentList;
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("GetServerInformation"), argumentList);
+        QDBusMessage reply = call(QDBus::Block, QStringLiteral("GetServerInformation"));
         if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 4) {
             vendor = qdbus_cast<QString>(reply.arguments().at(1));
             version = qdbus_cast<QString>(reply.arguments().at(2));
@@ -129,12 +124,7 @@ public Q_SLOTS: // METHODS
                                           const QVariantMap &hints, int timeout)
     {
         qCDebug(qLcTray) << appName << replacesId << appIcon << summary << body << actions << hints << timeout;
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(appName) << QVariant::fromValue(replacesId) <<
-                        QVariant::fromValue(appIcon) << QVariant::fromValue(summary) <<
-                        QVariant::fromValue(body) << QVariant::fromValue(actions) <<
-                        QVariant::fromValue(hints) << QVariant::fromValue(timeout);
-        return asyncCallWithArgumentList(QStringLiteral("Notify"), argumentList);
+        return asyncCall(QStringLiteral("Notify"), appName, replacesId, appIcon, summary, body, actions, hints, timeout);
     }
 
 Q_SIGNALS:
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
index 6db25a90da..70d5616075 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
@@ -175,15 +175,9 @@ QStringList QGenericUnixTheme::xdgIconThemePaths()
     if (homeIconDir.isDir())
         paths.prepend(homeIconDir.absoluteFilePath());
 
-    QString xdgDirString = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
-    if (xdgDirString.isEmpty())
-        xdgDirString = QLatin1String("/usr/local/share/:/usr/share/");
-    const auto xdgDirs = xdgDirString.splitRef(QLatin1Char(':'));
-    for (const QStringRef &xdgDir : xdgDirs) {
-        const QFileInfo xdgIconsDir(xdgDir + QLatin1String("/icons"));
-        if (xdgIconsDir.isDir())
-            paths.append(xdgIconsDir.absoluteFilePath());
-    }
+    paths.append(QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+                                           QStringLiteral("icons"),
+                                           QStandardPaths::LocateDirectory));
 
     return paths;
 }
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
index a5963b79ea..c0da9d8370 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
@@ -109,7 +109,7 @@ public:
     QVariant themeHint(ThemeHint hint) const override;
 
     QIcon fileIcon(const QFileInfo &fileInfo,
-                   QPlatformTheme::IconOptions iconOptions = 0) const override;
+                   QPlatformTheme::IconOptions iconOptions = nullptr) const override;
 
     const QPalette *palette(Palette type = SystemPalette) const override;
 
@@ -134,7 +134,7 @@ public:
     QGnomeTheme();
     QVariant themeHint(ThemeHint hint) const override;
     QIcon fileIcon(const QFileInfo &fileInfo,
-                   QPlatformTheme::IconOptions = 0) const override;
+                   QPlatformTheme::IconOptions = nullptr) const override;
     const QFont *font(Font type) const override;
     QString standardButtonText(int button) const override;
 
diff --git a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
index b9c5669b3f..68340a3173 100644
--- a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
+++ b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
@@ -330,6 +330,11 @@ bool QBasicPlatformVulkanInstance::supportsPresent(VkPhysicalDevice physicalDevi
     return supported;
 }
 
+void QBasicPlatformVulkanInstance::setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters)
+{
+    m_debugFilters = filters;
+}
+
 void QBasicPlatformVulkanInstance::destroySurface(VkSurfaceKHR surface) const
 {
     if (m_destroySurface && surface)
@@ -345,11 +350,11 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL defaultDebugCallbackFunc(VkDebugReportFlag
                                                                const char *pMessage,
                                                                void *pUserData)
 {
-    Q_UNUSED(flags);
-    Q_UNUSED(objectType);
-    Q_UNUSED(object);
-    Q_UNUSED(location);
-    Q_UNUSED(pUserData);
+    QBasicPlatformVulkanInstance *self = static_cast<QBasicPlatformVulkanInstance *>(pUserData);
+    for (QVulkanInstance::DebugFilter filter : *self->debugFilters()) {
+        if (filter(flags, objectType, object, location, messageCode, pLayerPrefix, pMessage))
+            return VK_FALSE;
+    }
 
     // not categorized, just route to plain old qDebug
     qDebug("vkDebug: %s: %d: %s", pLayerPrefix, messageCode, pMessage);
@@ -374,6 +379,7 @@ void QBasicPlatformVulkanInstance::setupDebugOutput()
             | VK_DEBUG_REPORT_WARNING_BIT_EXT
             | VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT;
     dbgCallbackInfo.pfnCallback = defaultDebugCallbackFunc;
+    dbgCallbackInfo.pUserData = this;
 
     VkResult err = createDebugReportCallback(m_vkInst, &dbgCallbackInfo, nullptr, &m_debugCallback);
     if (err != VK_SUCCESS)
diff --git a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
index 566140b032..e59d9219fb 100644
--- a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
+++ b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
@@ -73,7 +73,10 @@ public:
     QByteArrayList enabledExtensions() const override;
     PFN_vkVoidFunction getInstanceProcAddr(const char *name) override;
     bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) override;
+    void setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters) override;
+
     void destroySurface(VkSurfaceKHR surface) const;
+    const QVector<QVulkanInstance::DebugFilter> *debugFilters() const { return &m_debugFilters; }
 
 protected:
     void loadVulkanLibrary(const QString &defaultLibraryName);
@@ -105,6 +108,7 @@ private:
 
     VkDebugReportCallbackEXT m_debugCallback;
     PFN_vkDestroyDebugReportCallbackEXT m_vkDestroyDebugReportCallbackEXT;
+    QVector<QVulkanInstance::DebugFilter> m_debugFilters;
 };
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/vkconvenience/qvkconvenience.cpp b/src/platformsupport/vkconvenience/qvkconvenience.cpp
index 462cdc9e0d..acde1d1bda 100644
--- a/src/platformsupport/vkconvenience/qvkconvenience.cpp
+++ b/src/platformsupport/vkconvenience/qvkconvenience.cpp
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qpa
  */
 
+#if QT_CONFIG(opengl)
 VkFormat QVkConvenience::vkFormatFromGlFormat(uint glFormat)
 {
     using GlFormat = QOpenGLTexture::TextureFormat;
@@ -211,5 +212,6 @@ VkFormat QVkConvenience::vkFormatFromGlFormat(uint glFormat)
     default: return VK_FORMAT_UNDEFINED;
     }
 }
+#endif
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/vkconvenience/qvkconvenience_p.h b/src/platformsupport/vkconvenience/qvkconvenience_p.h
index 1dd1dfc4a7..580271b593 100644
--- a/src/platformsupport/vkconvenience/qvkconvenience_p.h
+++ b/src/platformsupport/vkconvenience/qvkconvenience_p.h
@@ -59,7 +59,9 @@ QT_BEGIN_NAMESPACE
 class QVkConvenience
 {
 public:
+#if QT_CONFIG(opengl)
     static VkFormat vkFormatFromGlFormat(uint glFormat);
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/bearer/android/jar/jar.pro b/src/plugins/bearer/android/jar/jar.pro
index f988019dac..8277a8abc1 100644
--- a/src/plugins/bearer/android/jar/jar.pro
+++ b/src/plugins/bearer/android/jar/jar.pro
@@ -1,3 +1,5 @@
+CONFIG += single_arch
+
 TARGET = QtAndroidBearer
 
 load(qt_build_paths)
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index eabae5a07b..8b2076bd18 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -46,6 +46,7 @@
 #include <QtNetwork/qnetworksession.h>
 
 #include <QtCore/qdebug.h>
+#include <QtCore/private/qlocking_p.h>
 
 #include <QtDBus/QtDBus>
 #include <QtDBus/QDBusConnection>
@@ -74,13 +75,13 @@ QConnmanEngine::~QConnmanEngine()
 
 bool QConnmanEngine::connmanAvailable() const
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     return connmanManager->isValid();
 }
 
 void QConnmanEngine::initialize()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     connect(ofonoManager,SIGNAL(modemChanged()),this,SLOT(changedModem()));
 
     ofonoNetwork = new QOfonoNetworkRegistrationInterface(ofonoManager->currentModem(),this);
@@ -101,7 +102,7 @@ void QConnmanEngine::initialize()
 
 void QConnmanEngine::changedModem()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     if (ofonoNetwork)
         delete ofonoNetwork;
 
@@ -114,7 +115,7 @@ void QConnmanEngine::changedModem()
 
 void QConnmanEngine::servicesReady(const QStringList &list)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     for (const QString &servPath : list)
         addServiceConfiguration(servPath);
 
@@ -123,7 +124,7 @@ void QConnmanEngine::servicesReady(const QStringList &list)
 
 QList<QNetworkConfigurationPrivate *> QConnmanEngine::getConfigurations()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     QList<QNetworkConfigurationPrivate *> fetchedConfigurations;
     QNetworkConfigurationPrivate* cpPriv = 0;
     const int numFoundConfigurations = foundConfigurations.count();
@@ -150,19 +151,19 @@ QList<QNetworkConfigurationPrivate *> QConnmanEngine::getConfigurations()
 
 QString QConnmanEngine::getInterfaceFromId(const QString &id)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     return configInterfaces.value(id);
 }
 
 bool QConnmanEngine::hasIdentifier(const QString &id)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     return accessPointConfigurations.contains(id);
 }
 
 void QConnmanEngine::connectToId(const QString &id)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id);
 
@@ -184,7 +185,7 @@ void QConnmanEngine::connectToId(const QString &id)
 
 void QConnmanEngine::disconnectFromId(const QString &id)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id);
 
     if (!serv || !serv->isValid()) {
@@ -196,7 +197,7 @@ void QConnmanEngine::disconnectFromId(const QString &id)
 
 void QConnmanEngine::requestUpdate()
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     QTimer::singleShot(0, this, SLOT(doRequestUpdate()));
 }
 
@@ -215,7 +216,7 @@ void QConnmanEngine::finishedScan(bool error)
 
 void QConnmanEngine::updateServices(const ConnmanMapList &changed, const QList<QDBusObjectPath> &removed)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     foreach (const QDBusObjectPath &objectPath, removed) {
         removeConfiguration(objectPath.path());
@@ -234,7 +235,7 @@ void QConnmanEngine::updateServices(const ConnmanMapList &changed, const QList<Q
 
 QNetworkSession::State QConnmanEngine::sessionStateForId(const QString &id)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
 
     QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
 
@@ -275,7 +276,7 @@ QNetworkSession::State QConnmanEngine::sessionStateForId(const QString &id)
 
 quint64 QConnmanEngine::bytesWritten(const QString &id)
 {//TODO use connman counter API
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     quint64 result = 0;
     QString devFile = getInterfaceFromId(id);
     QFile tx("/sys/class/net/"+devFile+"/statistics/tx_bytes");
@@ -290,7 +291,7 @@ quint64 QConnmanEngine::bytesWritten(const QString &id)
 
 quint64 QConnmanEngine::bytesReceived(const QString &id)
 {//TODO use connman counter API
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     quint64 result = 0;
     QString devFile = getInterfaceFromId(id);
     QFile rx("/sys/class/net/"+devFile+"/statistics/rx_bytes");
@@ -305,7 +306,7 @@ quint64 QConnmanEngine::bytesReceived(const QString &id)
 quint64 QConnmanEngine::startTime(const QString &/*id*/)
 {
     // TODO
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     if (activeTime.isNull()) {
         return 0;
     }
@@ -327,7 +328,7 @@ QNetworkSessionPrivate *QConnmanEngine::createSessionBackend()
 
 QNetworkConfigurationPrivatePointer QConnmanEngine::defaultConfiguration()
 {
-    const QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     const auto servPaths = connmanManager->getServices();
     for (const QString &servPath : servPaths) {
         if (connmanServiceInterfaces.contains(servPath)) {
@@ -352,7 +353,7 @@ void QConnmanEngine::configurationChange(QConnmanServiceInterface *serv)
 {
     if (!serv)
         return;
-    QMutexLocker locker(&mutex);
+    auto locker = qt_unique_lock(mutex);
     QString id = serv->path();
 
     if (accessPointConfigurations.contains(id)) {
@@ -381,7 +382,7 @@ void QConnmanEngine::configurationChange(QConnmanServiceInterface *serv)
         if (changed) {
             locker.unlock();
             emit configurationChanged(ptr);
-            locker.relock();
+            locker.lock();
         }
     }
 
@@ -391,7 +392,7 @@ void QConnmanEngine::configurationChange(QConnmanServiceInterface *serv)
 
 QNetworkConfiguration::StateFlags QConnmanEngine::getStateForService(const QString &service)
 {
-    QMutexLocker locker(&mutex);
+    const auto locker = qt_scoped_lock(mutex);
     QConnmanServiceInterface *serv = connmanServiceInterfaces.value(service);
     if (!serv)
         return QNetworkConfiguration::Undefined;
@@ -472,7 +473,7 @@ bool QConnmanEngine::isRoamingAllowed(const QString &context)
 
 void QConnmanEngine::removeConfiguration(const QString &id)
 {
-    QMutexLocker locker(&mutex);
+    auto locker = qt_unique_lock(mutex);
 
     if (accessPointConfigurations.contains(id)) {
 
@@ -485,13 +486,12 @@ void QConnmanEngine::removeConfiguration(const QString &id)
         foundConfigurations.removeOne(ptr.data());
         locker.unlock();
         emit configurationRemoved(ptr);
-        locker.relock();
     }
 }
 
 void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
 {
-    QMutexLocker locker(&mutex);
+    auto locker = qt_unique_lock(mutex);
     if (!connmanServiceInterfaces.contains(servicePath)) {
         QConnmanServiceInterface *serv = new QConnmanServiceInterface(servicePath, this);
         connmanServiceInterfaces.insert(serv->path(),serv);
@@ -547,7 +547,6 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
 
         locker.unlock();
         Q_EMIT configurationAdded(ptr);
-        locker.relock();
     }
 }
 
diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h
index c9ff17f801..ef80d38fa2 100644
--- a/src/plugins/bearer/connman/qconnmanengine.h
+++ b/src/plugins/bearer/connman/qconnmanengine.h
@@ -68,7 +68,7 @@ class QConnmanEngine : public QBearerEngineImpl
     Q_OBJECT
 
 public:
-    QConnmanEngine(QObject *parent = 0);
+    QConnmanEngine(QObject *parent = nullptr);
     ~QConnmanEngine();
 
     bool connmanAvailable() const;
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 3659eb7740..35d9c40680 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -80,8 +80,7 @@ QConnmanManagerInterface::QConnmanManagerInterface( QObject *parent)
     qDBusRegisterMetaType<ConnmanMap>();
     qDBusRegisterMetaType<ConnmanMapList>();
 
-    QList<QVariant> argumentList;
-    QDBusPendingReply<QVariantMap> props_reply = asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
+    QDBusPendingReply<QVariantMap> props_reply = asyncCall(QLatin1String("GetProperties"));
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(props_reply, this);
 
     QObject::connect(watcher,SIGNAL(finished(QDBusPendingCallWatcher*)),
@@ -106,8 +105,7 @@ QConnmanManagerInterface::QConnmanManagerInterface( QObject *parent)
                            QLatin1String("TechnologyRemoved"),
                            this,SLOT(technologyRemoved(QDBusObjectPath)));
 
-    QList<QVariant> argumentList2;
-    QDBusPendingReply<ConnmanMapList> serv_reply = asyncCallWithArgumentList(QLatin1String("GetServices"), argumentList2);
+    QDBusPendingReply<ConnmanMapList> serv_reply = asyncCall(QLatin1String("GetServices"));
     QDBusPendingCallWatcher *watcher2 = new QDBusPendingCallWatcher(serv_reply, this);
 
     QObject::connect(watcher2,SIGNAL(finished(QDBusPendingCallWatcher*)),
@@ -289,8 +287,7 @@ QConnmanServiceInterface::QConnmanServiceInterface(const QString &dbusPathName,Q
                              CONNMAN_SERVICE_INTERFACE,
                              QDBusConnection::systemBus(), parent)
 {
-    QList<QVariant> argumentList;
-    QDBusPendingReply<QVariantMap> props_reply = asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
+    QDBusPendingReply<QVariantMap> props_reply = asyncCall(QLatin1String("GetProperties"));
 
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(props_reply, this);
 
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
index d2804ebca6..790325f9a1 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h
+++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
@@ -105,7 +105,7 @@ class QConnmanManagerInterface : public  QDBusAbstractInterface
 
 public:
 
-    QConnmanManagerInterface( QObject *parent = 0);
+    QConnmanManagerInterface( QObject *parent = nullptr);
     ~QConnmanManagerInterface();
 
     QDBusObjectPath path() const;
@@ -155,7 +155,7 @@ class QConnmanServiceInterface : public QDBusAbstractInterface
 
 public:
 
-    explicit QConnmanServiceInterface(const QString &dbusPathName,QObject *parent = 0);
+    explicit QConnmanServiceInterface(const QString &dbusPathName,QObject *parent = nullptr);
     ~QConnmanServiceInterface();
 
     QVariantMap getProperties();
@@ -202,7 +202,7 @@ class QConnmanTechnologyInterface : public QDBusAbstractInterface
 
 public:
 
-    explicit QConnmanTechnologyInterface(const QString &dbusPathName,QObject *parent = 0);
+    explicit QConnmanTechnologyInterface(const QString &dbusPathName,QObject *parent = nullptr);
     ~QConnmanTechnologyInterface();
 
     QString type();
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.h b/src/plugins/bearer/corewlan/qcorewlanengine.h
index 4a431b886e..6dddee66a4 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.h
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.h
@@ -122,9 +122,9 @@ public:
     QString interfaceName;
     QMap<QString, QString> configurationInterface;
     void getUserConfigurations();
-    QString getNetworkNameFromSsid(const QString &ssid);
-    QString getSsidFromNetworkName(const QString &name);
-    bool isKnownSsid(const QString &ssid);
+    QString getNetworkNameFromSsid(const QString &ssid) const;
+    QString getSsidFromNetworkName(const QString &name) const;
+    bool isKnownSsid(const QString &ssid) const;
     QMap<QString, QMap<QString,QString> > userProfiles;
 
 signals:
@@ -135,7 +135,7 @@ protected:
 
 private:
     QList<QNetworkConfigurationPrivate *> fetchedConfigurations;
-    QMutex mutex;
+    mutable QMutex mutex;
     QStringList foundNetwork(const QString &id, const QString &ssid, const QNetworkConfiguration::StateFlags state, const QString &interfaceName, const QNetworkConfiguration::Purpose purpose);
 
 };
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index c3dd49ff3e..66f2ed017b 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -62,12 +62,11 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time
 #include <ifaddrs.h>
 
 @interface QT_MANGLE_NAMESPACE(QNSListener) : NSObject <CWEventDelegate>
-
 @property (assign) QCoreWlanEngine* engine;
-
 @end
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSListener);
 
-@implementation QT_MANGLE_NAMESPACE(QNSListener) {
+@implementation QNSListener {
     NSNotificationCenter *notificationCenter;
     CWWiFiClient *client;
     QCoreWlanEngine *engine;
@@ -88,7 +87,7 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time
     return self;
 }
 
-static QT_MANGLE_NAMESPACE(QNSListener) *listener = 0;
+static QNSListener *listener = 0;
 
 -(void)dealloc
 {
@@ -203,9 +202,7 @@ void QScanThread::run()
         }
     }
     // add known configurations that are not around.
-    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = userProfiles.cbegin(), end = userProfiles.cend(); i != end; ++i) {
 
         QString networkName = i.key();
         const QString id = QString::number(qHash(QLatin1String("corewlan:") + networkName));
@@ -215,11 +212,8 @@ void QScanThread::run()
             const QString ssidId = QString::number(qHash(QLatin1String("corewlan:") + networkSsid));
             QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Undefined;
             QString interfaceName;
-            QMapIterator<QString, QString> ij(i.value());
-            while (ij.hasNext()) {
-                ij.next();
-                interfaceName = ij.value();
-            }
+            if (!i.value().isEmpty())
+                interfaceName = i.value().last();
 
             if (currentInterfaceServiceActive) {
                 if (networkSsid == QString::fromNSString([currentInterface ssid])) {
@@ -269,11 +263,7 @@ QStringList QScanThread::foundNetwork(const QString &id, const QString &name, co
 QList<QNetworkConfigurationPrivate *> QScanThread::getConfigurations()
 {
     QMutexLocker locker(&mutex);
-
-    QList<QNetworkConfigurationPrivate *> foundConfigurations = fetchedConfigurations;
-    fetchedConfigurations.clear();
-
-    return foundConfigurations;
+    return qExchange(fetchedConfigurations, {});
 }
 
 void QScanThread::getUserConfigurations()
@@ -363,17 +353,12 @@ void QScanThread::getUserConfigurations()
     }
 }
 
-QString QScanThread::getSsidFromNetworkName(const QString &name)
+QString QScanThread::getSsidFromNetworkName(const QString &name) const
 {
     QMutexLocker locker(&mutex);
 
-    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
-    while (i.hasNext()) {
-        i.next();
-        QMap<QString,QString> map = i.value();
-        QMapIterator<QString, QString> ij(i.value());
-         while (ij.hasNext()) {
-             ij.next();
+    for (auto i = userProfiles.cbegin(), end = userProfiles.cend(); i != end; ++i) {
+        for (auto ij = i.value().cbegin(), end = i.value().cend(); ij != end; ++ij) {
              const QString networkNameHash = QString::number(qHash(QLatin1String("corewlan:") +i.key()));
              if(name == i.key() || name == networkNameHash) {
                  return ij.key();
@@ -383,36 +368,24 @@ QString QScanThread::getSsidFromNetworkName(const QString &name)
     return QString();
 }
 
-QString QScanThread::getNetworkNameFromSsid(const QString &ssid)
+QString QScanThread::getNetworkNameFromSsid(const QString &ssid) const
 {
     QMutexLocker locker(&mutex);
 
-    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
-    while (i.hasNext()) {
-        i.next();
-        QMap<QString,QString> map = i.value();
-        QMapIterator<QString, QString> ij(i.value());
-         while (ij.hasNext()) {
-             ij.next();
-             if(ij.key() == ssid) {
-                 return i.key();
-             }
-         }
+    for (auto i = userProfiles.cbegin(), end = userProfiles.cend(); i != end; ++i) {
+        if (i.value().contains(ssid))
+            return i.key();
     }
     return QString();
 }
 
-bool QScanThread::isKnownSsid(const QString &ssid)
+bool QScanThread::isKnownSsid(const QString &ssid) const
 {
     QMutexLocker locker(&mutex);
 
-    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
-    while (i.hasNext()) {
-        i.next();
-        QMap<QString,QString> map = i.value();
-        if(map.keys().contains(ssid)) {
+    for (auto i = userProfiles.cbegin(), end = userProfiles.cend(); i != end; ++i) {
+        if (i.value().contains(ssid))
             return true;
-        }
     }
     return false;
 }
@@ -430,8 +403,7 @@ QCoreWlanEngine::~QCoreWlanEngine()
 {
     scanThread->wait();
 
-    while (!foundConfigurations.isEmpty())
-        delete foundConfigurations.takeFirst();
+    qDeleteAll(qExchange(foundConfigurations, {}));
     [listener remove];
     [listener release];
 }
@@ -442,7 +414,7 @@ void QCoreWlanEngine::initialize()
     QMacAutoReleasePool pool;
 
     if ([[CWWiFiClient interfaceNames] count] > 0 && !listener) {
-        listener = [[QT_MANGLE_NAMESPACE(QNSListener) alloc] init];
+        listener = [QNSListener alloc] init];
         listener.engine = this;
         hasWifi = true;
     } else {
@@ -486,9 +458,7 @@ void QCoreWlanEngine::connectToId(const QString &id)
         const QString idHash2 = QString::number(qHash(QLatin1String("corewlan:") + scanThread->getNetworkNameFromSsid(ptr->name)));
 
         QString wantedNetwork;
-        QMapIterator<QString, QMap<QString, QString> > i(scanThread->userProfiles);
-        while (i.hasNext()) {
-            i.next();
+        for (auto i = scanThread->userProfiles.cbegin(), end = scanThread->userProfiles.cend(); i != end; ++i) {
             wantedNetwork = i.key();
             const QString networkNameHash = QString::number(qHash(QLatin1String("corewlan:") + wantedNetwork));
             if (id == networkNameHash) {
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h
index 08960d66f6..79c71ca7a3 100644
--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@@ -55,7 +55,7 @@ class QGenericEngine : public QBearerEngineImpl
     Q_OBJECT
 
 public:
-    QGenericEngine(QObject *parent = 0);
+    QGenericEngine(QObject *parent = nullptr);
     ~QGenericEngine();
 
     QString getInterfaceFromId(const QString &id) override;
diff --git a/src/plugins/bearer/linux_common/qofonoservice_linux.cpp b/src/plugins/bearer/linux_common/qofonoservice_linux.cpp
index 5d72731bc4..05f9b3ca17 100644
--- a/src/plugins/bearer/linux_common/qofonoservice_linux.cpp
+++ b/src/plugins/bearer/linux_common/qofonoservice_linux.cpp
@@ -99,8 +99,7 @@ QOfonoManagerInterface::~QOfonoManagerInterface()
 QStringList QOfonoManagerInterface::getModems()
 {
     if (modemList.isEmpty()) {
-        QList<QVariant> argumentList;
-        QDBusPendingReply<PathPropertiesList> reply = callWithArgumentList(QDBus::Block, QLatin1String("GetModems"), argumentList);
+        QDBusPendingReply<PathPropertiesList> reply = call(QDBus::Block, QLatin1String("GetModems"));
         reply.waitForFinished();
         if (!reply.isError()) {
             const auto modems = reply.value();
@@ -184,8 +183,7 @@ QStringList QOfonoModemInterface::interfaces()
 QVariantMap QOfonoModemInterface::getProperties()
 {
     if (propertiesMap.isEmpty()) {
-        QList<QVariant> argumentList;
-        QDBusPendingReply<QVariantMap> reply = callWithArgumentList(QDBus::Block, QLatin1String("GetProperties"), argumentList);
+        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
         if (!reply.isError()) {
             propertiesMap = reply.value();
         }
@@ -233,8 +231,7 @@ QVariant QOfonoNetworkRegistrationInterface::getProperty(const QString &property
 QVariantMap QOfonoNetworkRegistrationInterface::getProperties()
 {
     if (propertiesMap.isEmpty()) {
-        QList<QVariant> argumentList;
-        QDBusPendingReply<QVariantMap> reply = callWithArgumentList(QDBus::Block, QLatin1String("GetProperties"), argumentList);
+        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
         reply.waitForFinished();
         if (!reply.isError()) {
             propertiesMap = reply.value();
@@ -306,8 +303,7 @@ QVariant QOfonoDataConnectionManagerInterface::getProperty(const QString &proper
 QVariantMap &QOfonoDataConnectionManagerInterface::getProperties()
 {
     if (propertiesMap.isEmpty()) {
-        QList<QVariant> argumentList;
-        QDBusPendingReply<QVariantMap> reply = callWithArgumentList(QDBus::Block, QLatin1String("GetProperties"), argumentList);
+        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
         if (!reply.isError()) {
             propertiesMap = reply.value();
         }
@@ -343,8 +339,7 @@ QOfonoConnectionContextInterface::~QOfonoConnectionContextInterface()
 QVariantMap QOfonoConnectionContextInterface::getProperties()
 {
     if (propertiesMap.isEmpty()) {
-        QList<QVariant> argumentList;
-        QDBusPendingReply<QVariantMap> reply = callWithArgumentList(QDBus::Block, QLatin1String("GetProperties"), argumentList);
+        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
         if (!reply.isError()) {
             propertiesMap = reply.value();
         }
diff --git a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h b/src/plugins/bearer/linux_common/qofonoservice_linux_p.h
index 35614a20f2..62df5d4fa7 100644
--- a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h
+++ b/src/plugins/bearer/linux_common/qofonoservice_linux_p.h
@@ -100,7 +100,7 @@ class QOfonoManagerInterface : public  QDBusAbstractInterface
 
 public:
 
-    QOfonoManagerInterface( QObject *parent = 0);
+    QOfonoManagerInterface( QObject *parent = nullptr);
     ~QOfonoManagerInterface();
 
     QStringList getModems();
@@ -120,7 +120,7 @@ class QOfonoModemInterface : public QDBusAbstractInterface
 
 public:
 
-    explicit QOfonoModemInterface(const QString &dbusModemPathName, QObject *parent = 0);
+    explicit QOfonoModemInterface(const QString &dbusModemPathName, QObject *parent = nullptr);
     ~QOfonoModemInterface();
 
     bool isPowered();
@@ -140,7 +140,7 @@ class QOfonoNetworkRegistrationInterface : public QDBusAbstractInterface
 
 public:
 
-    explicit QOfonoNetworkRegistrationInterface(const QString &dbusModemPathName, QObject *parent = 0);
+    explicit QOfonoNetworkRegistrationInterface(const QString &dbusModemPathName, QObject *parent = nullptr);
     ~QOfonoNetworkRegistrationInterface();
 
     QString getTechnology();
@@ -159,7 +159,7 @@ class QOfonoDataConnectionManagerInterface : public QDBusAbstractInterface
 
 public:
 
-    explicit QOfonoDataConnectionManagerInterface(const QString &dbusPathName, QObject *parent = 0);
+    explicit QOfonoDataConnectionManagerInterface(const QString &dbusPathName, QObject *parent = nullptr);
     ~QOfonoDataConnectionManagerInterface();
 
     QStringList contexts();
@@ -184,7 +184,7 @@ class QOfonoConnectionContextInterface : public QDBusAbstractInterface
 
 public:
 
-    explicit QOfonoConnectionContextInterface(const QString &dbusPathName, QObject *parent = 0);
+    explicit QOfonoConnectionContextInterface(const QString &dbusPathName, QObject *parent = nullptr);
     ~QOfonoConnectionContextInterface();
 
     QVariant getProperty(const QString &);
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
index bb43072aba..777b4eea59 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
@@ -45,6 +45,7 @@
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qcoreapplication.h>
+#include <QtCore/qoperatingsystemversion.h>
 
 #include <QtCore/qdebug.h>
 
@@ -612,7 +613,8 @@ bool QNativeWifiEngine::requiresPolling() const
 {
     // On Windows XP SP2 and SP3 only connection and disconnection notifications are available.
     // We need to poll for changes in available wireless networks.
-    return QSysInfo::WindowsVersion <= QSysInfo::WV_2003;
+    return QOperatingSystemVersion::current()
+            <= QOperatingSystemVersion(QOperatingSystemVersion::Windows, 5, 2);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
index 74fe24b5ab..a95c68abdf 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
@@ -69,7 +69,7 @@ class QNetworkManagerEngine : public QBearerEngineImpl
     Q_OBJECT
 
 public:
-    QNetworkManagerEngine(QObject *parent = 0);
+    QNetworkManagerEngine(QObject *parent = nullptr);
     ~QNetworkManagerEngine();
 
     bool networkManagerAvailable() const;
@@ -99,7 +99,7 @@ private Q_SLOTS:
     void interfacePropertiesChanged(const QMap<QString, QVariant> &properties);
     void activeConnectionPropertiesChanged(const QMap<QString, QVariant> &properties);
 
-    void newConnection(const QDBusObjectPath &path, QNetworkManagerSettings *settings = 0);
+    void newConnection(const QDBusObjectPath &path, QNetworkManagerSettings *settings = nullptr);
     void removeConnection(const QString &path);
     void updateConnection();
     void activationFinished(QDBusPendingCallWatcher *watcher);
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
index 3e77580015..35199eb7a2 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
@@ -72,11 +72,9 @@ QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent)
                                                   QLatin1String(NM_DBUS_PATH),
                                                   DBUS_PROPERTIES_INTERFACE,
                                                   QDBusConnection::systemBus());
-    QList<QVariant> argumentList;
-    argumentList << QLatin1String(NM_DBUS_INTERFACE);
     QDBusPendingReply<QVariantMap> propsReply
-            = managerPropertiesInterface.callWithArgumentList(QDBus::Block,QLatin1String("GetAll"),
-                                                                       argumentList);
+            = managerPropertiesInterface.call(QDBus::Block, QLatin1String("GetAll"), QLatin1String(NM_DBUS_INTERFACE));
+
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
     } else {
@@ -344,11 +342,8 @@ QNetworkManagerInterfaceDevice::QNetworkManagerInterfaceDevice(const QString &de
                                                   DBUS_PROPERTIES_INTERFACE,
                                                   QDBusConnection::systemBus(),parent);
 
-    QList<QVariant> argumentList;
-    argumentList << QLatin1String(NM_DBUS_INTERFACE_DEVICE);
     QDBusPendingReply<QVariantMap> propsReply
-            = devicePropertiesInterface.callWithArgumentList(QDBus::Block,QLatin1String("GetAll"),
-                                                                       argumentList);
+            = devicePropertiesInterface.call(QDBus::Block, QLatin1String("GetAll"), QLatin1String(NM_DBUS_INTERFACE_DEVICE));
 
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
@@ -446,11 +441,8 @@ QNetworkManagerInterfaceDeviceWired::QNetworkManagerInterfaceDeviceWired(const Q
                                                            DBUS_PROPERTIES_INTERFACE,
                                                            QDBusConnection::systemBus(),parent);
 
-    QList<QVariant> argumentList;
-    argumentList << QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED);
     QDBusPendingReply<QVariantMap> propsReply
-            = deviceWiredPropertiesInterface.callWithArgumentList(QDBus::Block,QLatin1String("GetAll"),
-                                                                       argumentList);
+            = deviceWiredPropertiesInterface.call(QDBus::Block, QLatin1String("GetAll"), QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED));
 
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
@@ -543,11 +535,9 @@ QNetworkManagerInterfaceDeviceWireless::QNetworkManagerInterfaceDeviceWireless(c
                                                   DBUS_PROPERTIES_INTERFACE,
                                                   QDBusConnection::systemBus(),parent);
 
-    QList<QVariant> argumentList;
-    argumentList << QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS);
     QDBusPendingReply<QVariantMap> propsReply
-            = deviceWirelessPropertiesInterface.callWithArgumentList(QDBus::Block,QLatin1String("GetAll"),
-                                                                       argumentList);
+            = deviceWirelessPropertiesInterface.call(QDBus::Block, QLatin1String("GetAll"), QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS));
+
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
     }
@@ -647,11 +637,9 @@ QNetworkManagerInterfaceDeviceModem::QNetworkManagerInterfaceDeviceModem(const Q
                                                   QLatin1String("org.freedesktop.DBus.Properties"),
                                                   QDBusConnection::systemBus(),parent);
 
-    QList<QVariant> argumentList;
-    argumentList << QLatin1String(NM_DBUS_INTERFACE_DEVICE_MODEM);
     QDBusPendingReply<QVariantMap> propsReply
-            = deviceModemPropertiesInterface.callWithArgumentList(QDBus::Block,QLatin1String("GetAll"),
-                                                                       argumentList);
+            = deviceModemPropertiesInterface.call(QDBus::Block, QLatin1String("GetAll"), QLatin1String(NM_DBUS_INTERFACE_DEVICE_MODEM));
+
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
     }
@@ -746,9 +734,7 @@ QList <QDBusObjectPath> QNetworkManagerSettings::listConnections()
 
 QString QNetworkManagerSettings::getConnectionByUuid(const QString &uuid)
 {
-    QList<QVariant> argumentList;
-    argumentList << QVariant::fromValue(uuid);
-    QDBusReply<QDBusObjectPath > reply = callWithArgumentList(QDBus::Block,QLatin1String("GetConnectionByUuid"), argumentList);
+    QDBusReply<QDBusObjectPath > reply = call(QDBus::Block, QLatin1String("GetConnectionByUuid"), uuid);
     return reply.value().path();
 }
 
@@ -917,11 +903,8 @@ QNetworkManagerConnectionActive::QNetworkManagerConnectionActive(const QString &
                                                   QDBusConnection::systemBus());
 
 
-    QList<QVariant> argumentList;
-    argumentList << QLatin1String(NM_DBUS_INTERFACE_ACTIVE_CONNECTION);
     QDBusPendingReply<QVariantMap> propsReply
-            = connectionActivePropertiesInterface.callWithArgumentList(QDBus::Block,QLatin1String("GetAll"),
-                                                                       argumentList);
+            = connectionActivePropertiesInterface.call(QDBus::Block, QLatin1String("GetAll"), QLatin1String(NM_DBUS_INTERFACE_ACTIVE_CONNECTION));
 
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
index c879083faf..bff7a71097 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
@@ -152,7 +152,7 @@ public:
         NM_STATE_CONNECTED_GLOBAL = 70
     } NMState;
 
-    QNetworkManagerInterface(QObject *parent = 0);
+    QNetworkManagerInterface(QObject *parent = nullptr);
     ~QNetworkManagerInterface();
 
     QList <QDBusObjectPath> getDevices();
@@ -228,7 +228,7 @@ public:
 
     Q_DECLARE_FLAGS(ApSecurityFlags, ApSecurityFlag)
 
-    explicit QNetworkManagerInterfaceAccessPoint(const QString &dbusPathName, QObject *parent = 0);
+    explicit QNetworkManagerInterfaceAccessPoint(const QString &dbusPathName, QObject *parent = nullptr);
     ~QNetworkManagerInterfaceAccessPoint();
 
     quint32 flags() const;
@@ -259,7 +259,7 @@ class QNetworkManagerInterfaceDevice : public QDBusAbstractInterface
 
 public:
 
-    explicit QNetworkManagerInterfaceDevice(const QString &deviceObjectPath, QObject *parent = 0);
+    explicit QNetworkManagerInterfaceDevice(const QString &deviceObjectPath, QObject *parent = nullptr);
     ~QNetworkManagerInterfaceDevice();
 
     QString udi() const;
@@ -288,7 +288,7 @@ class QNetworkManagerInterfaceDeviceWired : public QDBusAbstractInterface
 public:
 
     explicit QNetworkManagerInterfaceDeviceWired(const QString &ifaceDevicePath,
-                                                 QObject *parent = 0);
+                                                 QObject *parent = nullptr);
     ~QNetworkManagerInterfaceDeviceWired();
 
     QString hwAddress() const;
@@ -325,7 +325,7 @@ public:
        };
 
     explicit QNetworkManagerInterfaceDeviceWireless(const QString &ifaceDevicePath,
-                                                    QObject *parent = 0);
+                                                    QObject *parent = nullptr);
     ~QNetworkManagerInterfaceDeviceWireless();
 
     QList <QDBusObjectPath> getAccessPoints();
@@ -367,7 +367,7 @@ public:
     Q_DECLARE_FLAGS(ModemCapabilities, ModemCapability)
 
     explicit QNetworkManagerInterfaceDeviceModem(const QString &ifaceDevicePath,
-                                                    QObject *parent = 0);
+                                                    QObject *parent = nullptr);
     ~QNetworkManagerInterfaceDeviceModem();
 
     ModemCapabilities modemCapabilities() const;
@@ -392,7 +392,7 @@ class QNetworkManagerSettings : public QDBusAbstractInterface
 
 public:
 
-    explicit QNetworkManagerSettings(const QString &settingsService, QObject *parent = 0);
+    explicit QNetworkManagerSettings(const QString &settingsService, QObject *parent = nullptr);
     ~QNetworkManagerSettings();
 
     QList <QDBusObjectPath> listConnections();
@@ -413,7 +413,7 @@ class QNetworkManagerSettingsConnection : public QDBusAbstractInterface
 
 public:
 
-    QNetworkManagerSettingsConnection(const QString &settingsService, const QString &connectionObjectPath, QObject *parent = 0);
+    QNetworkManagerSettingsConnection(const QString &settingsService, const QString &connectionObjectPath, QObject *parent = nullptr);
     ~QNetworkManagerSettingsConnection();
 
     QNmSettingsMap getSettings();
@@ -451,7 +451,7 @@ public:
         Activated = 2
        };
 
-    explicit QNetworkManagerConnectionActive(const QString &dbusPathName, QObject *parent = 0);
+    explicit QNetworkManagerConnectionActive(const QString &dbusPathName, QObject *parent = nullptr);
     ~ QNetworkManagerConnectionActive();
 
     QDBusObjectPath connection() const;
@@ -478,7 +478,7 @@ class QNetworkManagerIp4Config : public QDBusAbstractInterface
     Q_OBJECT
 
 public:
-    explicit QNetworkManagerIp4Config(const QString &dbusPathName, QObject *parent = 0);
+    explicit QNetworkManagerIp4Config(const QString &dbusPathName, QObject *parent = nullptr);
     ~QNetworkManagerIp4Config();
 
     QStringList domains() const;
@@ -489,7 +489,7 @@ class PropertiesDBusInterface : public QDBusAbstractInterface
 public:
     PropertiesDBusInterface(const QString &service, const QString &path,
                             const QString &interface, const QDBusConnection &connection,
-                            QObject *parent = 0)
+                            QObject *parent = nullptr)
         : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
     {}
 };
diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index 113d0667d2..76f3279d25 100644
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -2,7 +2,7 @@ TARGET = qnlabearer
 
 QT = core core-private network network-private
 
-LIBS += -lws2_32
+QMAKE_USE_PRIVATE += ws2_32
 
 HEADERS += qnlaengine.h \
            ../platformdefs_win.h \
diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp
index 726e1efb92..e1e60389f1 100644
--- a/src/plugins/bearer/nla/qnlaengine.cpp
+++ b/src/plugins/bearer/nla/qnlaengine.cpp
@@ -75,38 +75,38 @@ QWindowsSockInit2::~QWindowsSockInit2()
 #ifdef BEARER_MANAGEMENT_DEBUG
 static void printBlob(NLA_BLOB *blob)
 {
-    qDebug() << "==== BEGIN NLA_BLOB ====" << endl
+    qDebug() << "==== BEGIN NLA_BLOB ====" << Qt::endl
 
-             << "type:" << blob->header.type << endl
-             << "size:" << blob->header.dwSize << endl
+             << "type:" << blob->header.type << Qt::endl
+             << "size:" << blob->header.dwSize << Qt::endl
              << "next offset:" << blob->header.nextOffset;
 
     switch (blob->header.type) {
     case NLA_RAW_DATA:
-        qDebug() << "Raw Data" << endl
+        qDebug() << "Raw Data" << Qt::endl
                  << '\t' << blob->data.rawData;
         break;
     case NLA_INTERFACE:
-        qDebug() << "Interface" << endl
-                 << "\ttype:" << blob->data.interfaceData.dwType << endl
-                 << "\tspeed:" << blob->data.interfaceData.dwSpeed  << endl
+        qDebug() << "Interface" << Qt::endl
+                 << "\ttype:" << blob->data.interfaceData.dwType << Qt::endl
+                 << "\tspeed:" << blob->data.interfaceData.dwSpeed  << Qt::endl
                  << "\tadapter:" << blob->data.interfaceData.adapterName;
         break;
     case NLA_802_1X_LOCATION:
-        qDebug() << "802.1x Location" << endl
+        qDebug() << "802.1x Location" << Qt::endl
                  << '\t' << blob->data.locationData.information;
         break;
     case NLA_CONNECTIVITY:
-        qDebug() << "Connectivity" << endl
-                 << "\ttype:" << blob->data.connectivity.type << endl
+        qDebug() << "Connectivity" << Qt::endl
+                 << "\ttype:" << blob->data.connectivity.type << Qt::endl
                  << "\tinternet:" << blob->data.connectivity.internet;
         break;
     case NLA_ICS:
-        qDebug() << "ICS" << endl
-                 << "\tspeed:" << blob->data.ICS.remote.speed << endl
-                 << "\ttype:" << blob->data.ICS.remote.type << endl
-                 << "\tstate:" << blob->data.ICS.remote.state << endl
-                 << "\tmachine name:" << blob->data.ICS.remote.machineName << endl
+        qDebug() << "ICS" << Qt::endl
+                 << "\tspeed:" << blob->data.ICS.remote.speed << Qt::endl
+                 << "\ttype:" << blob->data.ICS.remote.type << Qt::endl
+                 << "\tstate:" << blob->data.ICS.remote.state << Qt::endl
+                 << "\tmachine name:" << blob->data.ICS.remote.machineName << Qt::endl
                  << "\tshared adapter name:" << blob->data.ICS.remote.sharedAdapterName;
         break;
     default:
@@ -119,9 +119,6 @@ static void printBlob(NLA_BLOB *blob)
 
 static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interface)
 {
-#ifdef Q_OS_WINCE
-    Q_UNUSED(interface)
-#else
     unsigned long oid;
     DWORD bytesWritten;
 
@@ -177,8 +174,6 @@ static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interf
     qDebug() << medium << physicalMedium;
 #endif
 
-#endif
-
     return QNetworkConfiguration::BearerUnknown;
 }
 
@@ -307,16 +302,12 @@ void QNlaThread::run()
                 break;
         }
 
-#ifndef Q_OS_WINCE
         // Not interested in unrelated IO completion events
         // although we also don't want to block them
         while (WaitForSingleObjectEx(changeEvent, WSA_INFINITE, true) != WAIT_IO_COMPLETION &&
                handle)
         {
         }
-#else
-        WaitForSingleObject(changeEvent, WSA_INFINITE);
-#endif
 
         mutex.lock();
         if (handle) {
diff --git a/src/plugins/bearer/qbearerengine_impl.h b/src/plugins/bearer/qbearerengine_impl.h
index 3f8a4d821d..5c003aaaf6 100644
--- a/src/plugins/bearer/qbearerengine_impl.h
+++ b/src/plugins/bearer/qbearerengine_impl.h
@@ -56,7 +56,7 @@ public:
         DisconnectionError,
     };
 
-    QBearerEngineImpl(QObject *parent = 0) : QBearerEngine(parent) {}
+    QBearerEngineImpl(QObject *parent = nullptr) : QBearerEngine(parent) {}
     ~QBearerEngineImpl() {}
 
     virtual void connectToId(const QString &id) = 0;
diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h
index d9aa6ca8fb..0f8e014900 100644
--- a/src/plugins/bearer/qnetworksession_impl.h
+++ b/src/plugins/bearer/qnetworksession_impl.h
@@ -66,7 +66,7 @@ class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate
 
 public:
     QNetworkSessionPrivateImpl()
-        : engine(0), startTime(0), lastError(QNetworkSession::UnknownSessionError), sessionTimeout(-1), currentPolicies(QNetworkSession::NoPolicy), opened(false)
+        : engine(nullptr), startTime(0), lastError(QNetworkSession::UnknownSessionError), sessionTimeout(-1), currentPolicies(QNetworkSession::NoPolicy), opened(false)
     {}
     ~QNetworkSessionPrivateImpl()
     {}
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
index aed2900356..1f1675e490 100644
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
@@ -40,10 +40,14 @@
 #include "qjpeghandler_p.h"
 
 #include <qimage.h>
+#include <qcolorspace.h>
+#include <qcolortransform.h>
+#include <qdebug.h>
 #include <qvariant.h>
 #include <qvector.h>
 #include <qbuffer.h>
 #include <qmath.h>
+#include <private/qicc_p.h>
 #include <private/qsimd_p.h>
 #include <private/qimage_p.h>   // for qt_getImageText
 
@@ -488,6 +492,8 @@ inline my_jpeg_destination_mgr::my_jpeg_destination_mgr(QIODevice *device)
     free_in_buffer = max_buf;
 }
 
+static constexpr int maxMarkerSize = 65533;
+
 static inline void set_text(const QImage &image, j_compress_ptr cinfo, const QString &description)
 {
     const QMap<QString, QString> text = qt_getImageText(image, description);
@@ -496,12 +502,33 @@ static inline void set_text(const QImage &image, j_compress_ptr cinfo, const QSt
         if (!comment.isEmpty())
             comment += ": ";
         comment += it.value().toUtf8();
-        if (comment.length() > 65530)
-            comment.truncate(65530);
+        if (comment.length() > maxMarkerSize)
+            comment.truncate(maxMarkerSize);
         jpeg_write_marker(cinfo, JPEG_COM, (const JOCTET *)comment.constData(), comment.size());
     }
 }
 
+static inline void write_icc_profile(const QImage &image, j_compress_ptr cinfo)
+{
+    const QByteArray iccProfile = image.colorSpace().iccProfile();
+    if (iccProfile.isEmpty())
+        return;
+
+    const QByteArray iccSignature("ICC_PROFILE", 12);
+    constexpr int maxIccMarkerSize = maxMarkerSize - (12 + 2);
+    int index = 0;
+    const int markers = (iccProfile.size() + (maxIccMarkerSize - 1)) / maxIccMarkerSize;
+    Q_ASSERT(markers < 256);
+    for (int marker = 1; marker <= markers; ++marker) {
+        const int len = std::min(iccProfile.size() - index, maxIccMarkerSize);
+        const QByteArray block = iccSignature
+                               + QByteArray(1, char(marker)) + QByteArray(1, char(markers))
+                               + iccProfile.mid(index, len);
+        jpeg_write_marker(cinfo, JPEG_APP0 + 2, reinterpret_cast<const JOCTET *>(block.constData()), block.size());
+        index += len;
+    }
+}
+
 static bool write_jpeg_image(const QImage &image, QIODevice *device, volatile int sourceQuality, const QString &description, bool optimize, bool progressive)
 {
     bool success = false;
@@ -582,6 +609,8 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, volatile in
         jpeg_start_compress(&cinfo, TRUE);
 
         set_text(image, &cinfo, description);
+        if (cinfo.in_color_space == JCS_RGB)
+            write_icc_profile(image, &cinfo);
 
         row_pointer[0] = new uchar[cinfo.image_width*cinfo.input_components];
         int w = cinfo.image_width;
@@ -725,6 +754,7 @@ public:
     QRect clipRect;
     QString description;
     QStringList readTexts;
+    QByteArray iccProfile;
 
     struct jpeg_decompress_struct info;
     struct my_jpeg_source_mgr * iod_src;
@@ -887,6 +917,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
         if (!setjmp(err.setjmp_buffer)) {
             jpeg_save_markers(&info, JPEG_COM, 0xFFFF);
             jpeg_save_markers(&info, JPEG_APP0 + 1, 0xFFFF); // Exif uses APP1 marker
+            jpeg_save_markers(&info, JPEG_APP0 + 2, 0xFFFF); // ICC uses APP2 marker
 
             (void) jpeg_read_header(&info, TRUE);
 
@@ -919,6 +950,10 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
                     readTexts.append(value);
                 } else if (marker->marker == JPEG_APP0 + 1) {
                     exifData.append((const char*)marker->data, marker->data_length);
+                } else if (marker->marker == JPEG_APP0 + 2) {
+                    if (marker->data_length > 128 + 4 + 14 && strcmp((const char *)marker->data, "ICC_PROFILE") == 0) {
+                        iccProfile.append((const char*)marker->data + 14, marker->data_length - 14);
+                    }
                 }
             }
 
@@ -954,6 +989,9 @@ bool QJpegHandlerPrivate::read(QImage *image)
             for (int i = 0; i < readTexts.size()-1; i+=2)
                 image->setText(readTexts.at(i), readTexts.at(i+1));
 
+            if (!iccProfile.isEmpty())
+                image->setColorSpace(QColorSpace::fromIccProfile(iccProfile));
+
             state = ReadingEnd;
             return true;
         }
@@ -962,7 +1000,6 @@ bool QJpegHandlerPrivate::read(QImage *image)
     }
 
     return false;
-
 }
 
 Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_neon(quint32 *dst, const uchar *src, int len);
diff --git a/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h b/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h
index 47a40ab8c2..396a213aaa 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h
@@ -31,7 +31,7 @@ public:
     { return "org.freedesktop.IBus.InputContext"; }
 
 public:
-    QIBusInputContextProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    QIBusInputContextProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~QIBusInputContextProxy();
 
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
index d4daea2eb3..8e7b8df120 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
@@ -59,9 +59,9 @@ class QIBusFilterEventWatcher: public QDBusPendingCallWatcher
 {
 public:
     explicit QIBusFilterEventWatcher(const QDBusPendingCall &call,
-                                     QObject *parent = 0,
-                                     QWindow *window = 0,
-                                     const Qt::KeyboardModifiers modifiers = 0,
+                                     QObject *parent = nullptr,
+                                     QWindow *window = nullptr,
+                                     const Qt::KeyboardModifiers modifiers = nullptr,
                                      const QVariantList arguments = QVariantList())
     : QDBusPendingCallWatcher(call, parent)
     , m_window(window)
diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxy.h b/src/plugins/platforminputcontexts/ibus/qibusproxy.h
index 839e972c34..c9876deebf 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusproxy.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusproxy.h
@@ -35,7 +35,7 @@ public:
     { return QStringLiteral("org.freedesktop.DBus.Properties"); }
 
 public:
-    QIBusProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    QIBusProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~QIBusProxy();
 
diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro
index 78632a9bea..730247cd7f 100644
--- a/src/plugins/platforms/android/android.pro
+++ b/src/plugins/platforms/android/android.pro
@@ -1,9 +1,5 @@
 TARGET = qtforandroid
 
-# STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in androidjnimain.cpp
-# Yes, the plugin imports itself statically
-DEFINES += QT_STATICPLUGIN
-
 LIBS += -ljnigraphics -landroid
 
 QT += \
@@ -19,7 +15,8 @@ INCLUDEPATH += \
     $$PWD \
     $$QT_SOURCE_TREE/src/3rdparty/android
 
-SOURCES += $$PWD/androidplatformplugin.cpp \
+SOURCES += $$PWD/main.cpp \
+           $$PWD/androidplatformplugin.cpp \
            $$PWD/androidcontentfileengine.cpp \
            $$PWD/androiddeadlockprotector.cpp \
            $$PWD/androidjnimain.cpp \
@@ -92,8 +89,5 @@ qtConfig(vulkan) {
 }
 
 PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QAndroidIntegrationPlugin
 load(qt_plugin)
-
-#Non-standard install directory, QTBUG-29859
-DESTDIR = $$DESTDIR/android
-target.path = $${target.path}/android
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index 6ae429b24e..fd2644717e 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -60,6 +60,7 @@
 #include "qandroideventdispatcher.h"
 #include <android/api-level.h>
 
+#include <QtCore/qresource.h>
 #include <QtCore/qthread.h>
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtCore/private/qjni_p.h>
@@ -68,8 +69,6 @@
 
 #include <qpa/qwindowsysteminterface.h>
 
-Q_IMPORT_PLUGIN(QAndroidPlatformIntegrationPlugin)
-
 QT_BEGIN_NAMESPACE
 
 static JavaVM *m_javaVM = nullptr;
@@ -77,6 +76,7 @@ static jclass m_applicationClass  = nullptr;
 static jobject m_classLoaderObject = nullptr;
 static jmethodID m_loadClassMethodID = nullptr;
 static AAssetManager *m_assetManager = nullptr;
+static jobject m_assets = nullptr;
 static jobject m_resourcesObj = nullptr;
 static jobject m_activityObject = nullptr;
 static jmethodID m_createSurfaceMethodID = nullptr;
@@ -441,6 +441,11 @@ namespace QtAndroid
         return block;
     }
 
+    jobject assets()
+    {
+        return m_assets;
+    }
+
 } // namespace QtAndroid
 
 static jboolean startQtAndroidPlugin(JNIEnv *env, jobject /*object*/, jstring paramsString, jstring environmentString)
@@ -454,9 +459,9 @@ static jboolean startQtAndroidPlugin(JNIEnv *env, jobject /*object*/, jstring pa
         const QList<QByteArray> envVars = QByteArray(nativeString).split('\t');
         env->ReleaseStringUTFChars(environmentString, nativeString);
         for (const QByteArray &envVar : envVars) {
-            const QList<QByteArray> envVarPair = envVar.split('=');
-            if (envVarPair.size() == 2 && ::setenv(envVarPair[0], envVarPair[1], 1) != 0)
-                qWarning() << "Can't set environment" << envVarPair;
+            int pos = envVar.indexOf('=');
+            if (pos != -1 && ::setenv(envVar.left(pos), envVar.mid(pos + 1), 1) != 0)
+                qWarning() << "Can't set environment" << envVar;
         }
     }
 
@@ -485,7 +490,7 @@ static jboolean startQtAndroidPlugin(JNIEnv *env, jobject /*object*/, jstring pa
     }
 
     if (Q_UNLIKELY(!m_main)) {
-        qCritical() << "dlsym failed:" << dlerror() << endl
+        qCritical() << "dlsym failed:" << dlerror() << Qt::endl
                     << "Could not find main method";
         return false;
     }
@@ -521,6 +526,10 @@ static jboolean startQtApplication(JNIEnv */*env*/, jclass /*clazz*/)
             vm->AttachCurrentThread(&env, &args);
     }
 
+    // Register resources if they are available
+    if (QFile{QStringLiteral("assets:/android_rcc_bundle.rcc")}.exists())
+        QResource::registerResource(QStringLiteral("assets:/android_rcc_bundle.rcc"));
+
     QVarLengthArray<const char *> params(m_applicationParams.size());
     for (int i = 0; i < m_applicationParams.size(); i++)
         params[i] = static_cast<const char *>(m_applicationParams[i].constData());
@@ -590,6 +599,8 @@ static void terminateQt(JNIEnv *env, jclass /*clazz*/)
         env->DeleteGlobalRef(m_RGB_565_BitmapConfigValue);
     if (m_bitmapDrawableClass)
         env->DeleteGlobalRef(m_bitmapDrawableClass);
+    if (m_assets)
+        env->DeleteGlobalRef(m_assets);
     m_androidPlatformIntegration = nullptr;
     delete m_androidAssetsFileEngineHandler;
     m_androidAssetsFileEngineHandler = nullptr;
@@ -842,7 +853,8 @@ static int registerNatives(JNIEnv *env)
     if (object) {
         FIND_AND_CHECK_CLASS("android/content/ContextWrapper");
         GET_AND_CHECK_METHOD(methodID, clazz, "getAssets", "()Landroid/content/res/AssetManager;");
-        m_assetManager = AAssetManager_fromJava(env, env->CallObjectMethod(object, methodID));
+        m_assets = env->NewGlobalRef(env->CallObjectMethod(object, methodID));
+        m_assetManager = AAssetManager_fromJava(env, m_assets);
 
         GET_AND_CHECK_METHOD(methodID, clazz, "getResources", "()Landroid/content/res/Resources;");
         m_resourcesObj = env->NewGlobalRef(env->CallObjectMethod(object, methodID));
diff --git a/src/plugins/platforms/android/androidjnimain.h b/src/plugins/platforms/android/androidjnimain.h
index 08f1d50fe3..17ae30a1be 100644
--- a/src/plugins/platforms/android/androidjnimain.h
+++ b/src/plugins/platforms/android/androidjnimain.h
@@ -82,6 +82,7 @@ namespace QtAndroid
     double scaledDensity();
     double pixelDensity();
     JavaVM *javaVM();
+    jobject assets();
     AAssetManager *assetManager();
     jclass applicationClass();
     jobject activity();
diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp
index e9359def0f..de2fdaa0e2 100644
--- a/src/plugins/platforms/android/androidjnimenu.cpp
+++ b/src/plugins/platforms/android/androidjnimenu.cpp
@@ -60,12 +60,12 @@ namespace QtAndroidMenu
 {
     static QList<QAndroidPlatformMenu *> pendingContextMenus;
     static QAndroidPlatformMenu *visibleMenu = 0;
-    static QMutex visibleMenuMutex(QMutex::Recursive);
+    static QRecursiveMutex visibleMenuMutex;
 
     static QSet<QAndroidPlatformMenuBar *> menuBars;
     static QAndroidPlatformMenuBar *visibleMenuBar = 0;
     static QWindow *activeTopLevelWindow = 0;
-    static QMutex menuBarMutex(QMutex::Recursive);
+    static QRecursiveMutex menuBarMutex;
 
     static jmethodID openContextMenuMethodID = 0;
 
diff --git a/src/plugins/platforms/mirclient/qmirclientplugin.h b/src/plugins/platforms/android/main.cpp
index 207d97b5af..c304fc8d69 100644
--- a/src/plugins/platforms/mirclient/qmirclientplugin.h
+++ b/src/plugins/platforms/android/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Canonical, Ltd.
+** Copyright (C) 2019 BogDan Vatra <bogdan@kde.org>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -38,19 +38,26 @@
 ****************************************************************************/
 
 
-#ifndef QMIRCLIENTPLUGIN_H
-#define QMIRCLIENTPLUGIN_H
-
 #include <qpa/qplatformintegrationplugin.h>
+#include "qandroidplatformintegration.h"
+
+QT_BEGIN_NAMESPACE
 
-class QMirClientIntegrationPlugin : public QPlatformIntegrationPlugin
+class QAndroidIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "mirclient.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "android.json")
 
 public:
-    QPlatformIntegration *create(const QString &system, const QStringList &paramList,
-                                 int &argc, char **argv) override;
+    QPlatformIntegration *create(const QString& system, const QStringList& paramList) override;
 };
 
-#endif // QMIRCLIENTPLUGIN_H
+QPlatformIntegration *QAndroidIntegrationPlugin::create(const QString& system, const QStringList& paramList)
+{
+    if (!system.compare(QLatin1String("android"), Qt::CaseInsensitive))
+        return new QAndroidPlatformIntegration(paramList);
+
+    return nullptr;
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
index e1dcebfa4c..26e72a480f 100644
--- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
+++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
@@ -39,40 +39,139 @@
 
 #include "qandroidassetsfileenginehandler.h"
 #include "androidjnimain.h"
+#include <optional>
 
 #include <QCoreApplication>
 #include <QVector>
+#include <QtCore/private/qjni_p.h>
 
 QT_BEGIN_NAMESPACE
 
-typedef QVector<QString> FilesList;
+static const QLatin1String assetsPrefix("assets:");
+const static int prefixSize = 7;
 
-struct AndroidAssetDir
+static inline QString cleanedAssetPath(QString file)
 {
-    AndroidAssetDir(AAssetDir* ad)
+    if (file.startsWith(assetsPrefix))
+        file.remove(0, prefixSize);
+    file.replace(QLatin1String("//"), QLatin1String("/"));
+    if (file.startsWith(QLatin1Char('/')))
+        file.remove(0, 1);
+    if (file.endsWith(QLatin1Char('/')))
+        file.chop(1);
+    return file;
+}
+
+static inline QString prefixedPath(QString path)
+{
+    path = assetsPrefix + QLatin1Char('/') + path;
+    path.replace(QLatin1String("//"), QLatin1String("/"));
+    return path;
+}
+
+struct AssetItem {
+    enum class Type {
+        File,
+        Folder
+    };
+
+    AssetItem (const QString &rawName)
+        : name(rawName)
+    {
+        if (name.endsWith(QLatin1Char('/'))) {
+            type = Type::Folder;
+            name.chop(1);
+        }
+    }
+    Type type = Type::File;
+    QString name;
+};
+
+using AssetItemList = QVector<AssetItem>;
+
+class FolderIterator : public AssetItemList
+{
+public:
+    static QSharedPointer<FolderIterator> fromCache(const QString &path)
     {
-        if (ad) {
-            const char *fileName;
-            while ((fileName = AAssetDir_getNextFileName(ad)))
-                m_items.push_back(QString::fromUtf8(fileName));
-            AAssetDir_close(ad);
+        QMutexLocker lock(&m_assetsCacheMutex);
+        QSharedPointer<FolderIterator> *folder = m_assetsCache.object(path);
+        if (!folder) {
+            folder = new QSharedPointer<FolderIterator>{new FolderIterator{path}};
+            if (!m_assetsCache.insert(path, folder)) {
+                QSharedPointer<FolderIterator> res = *folder;
+                delete folder;
+                return res;
+            }
         }
+        return *folder;
+    }
+
+    FolderIterator(const QString &path)
+        : m_path(path)
+    {
+        QJNIObjectPrivate files = QJNIObjectPrivate::callStaticObjectMethod(QtAndroid::applicationClass(),
+                                                                            "listAssetContent",
+                                                                            "(Landroid/content/res/AssetManager;Ljava/lang/String;)[Ljava/lang/String;",
+                                                                            QtAndroid::assets(), QJNIObjectPrivate::fromString(path).object());
+        if (files.isValid()) {
+            QJNIEnvironmentPrivate env;
+            jobjectArray jFiles = static_cast<jobjectArray>(files.object());
+            const jint nFiles = env->GetArrayLength(jFiles);
+            for (int i = 0; i < nFiles; ++i)
+                push_back({QJNIObjectPrivate(env->GetObjectArrayElement(jFiles, i)).toString()});
+        }
+        m_path = assetsPrefix + QLatin1Char('/') + m_path + QLatin1Char('/');
+        m_path.replace(QLatin1String("//"), QLatin1String("/"));
+    }
+
+    QString currentFileName() const
+    {
+        if (m_index < 0 || m_index >= size())
+            return {};
+        return at(m_index).name;
+    }
+    QString currentFilePath() const
+    {
+        if (m_index < 0 || m_index >= size())
+            return {};
+        return m_path + at(m_index).name;
+    }
+
+    bool hasNext() const
+    {
+        return !empty() && m_index + 1 < size();
+    }
+
+    std::optional<std::pair<QString, AssetItem>> next()
+    {
+        if (!hasNext())
+            return {};
+        ++m_index;
+        return std::pair<QString, AssetItem>(currentFileName(), at(m_index));
     }
-    FilesList m_items;
+
+private:
+    int m_index = -1;
+    QString m_path;
+    static QCache<QString, QSharedPointer<FolderIterator>> m_assetsCache;
+    static QMutex m_assetsCacheMutex;
 };
 
+QCache<QString, QSharedPointer<FolderIterator>> FolderIterator::m_assetsCache(std::max(50, qEnvironmentVariableIntValue("QT_ANDROID_MAX_ASSETS_CACHE_SIZE")));
+QMutex FolderIterator::m_assetsCacheMutex;
+
 class AndroidAbstractFileEngineIterator: public QAbstractFileEngineIterator
 {
 public:
     AndroidAbstractFileEngineIterator(QDir::Filters filters,
                                       const QStringList &nameFilters,
-                                      QSharedPointer<AndroidAssetDir> asset,
                                       const QString &path)
         : QAbstractFileEngineIterator(filters, nameFilters)
     {
-        m_items = asset->m_items;
-        m_index = -1;
-        m_path = path;
+        m_stack.push_back(FolderIterator::fromCache(cleanedAssetPath(path)));
+        if (m_stack.last()->empty())
+            m_stack.pop_back();
     }
 
     QFileInfo currentFileInfo() const override
@@ -82,54 +181,59 @@ public:
 
     QString currentFileName() const override
     {
-        if (m_index < 0 || m_index >= m_items.size())
-            return QString();
-        QString fileName = m_items[m_index];
-        if (fileName.endsWith(QLatin1Char('/')))
-            fileName.chop(1);
-        return fileName;
+        if (!m_currentIterator)
+            return {};
+        return m_currentIterator->currentFileName();
     }
 
     virtual QString currentFilePath() const
     {
-        return m_path + currentFileName();
+        if (!m_currentIterator)
+            return {};
+        return m_currentIterator->currentFilePath();
     }
 
     bool hasNext() const override
     {
-        return m_items.size() && (m_index < m_items.size() - 1);
+        if (m_stack.empty())
+            return false;
+        if (!m_stack.last()->hasNext()) {
+            m_stack.pop_back();
+            return hasNext();
+        }
+        return true;
     }
 
     QString next() override
     {
-        if (!hasNext())
-            return QString();
-        m_index++;
-        return currentFileName();
+        if (m_stack.empty()) {
+            m_currentIterator.reset();
+            return {};
+        }
+        m_currentIterator = m_stack.last();
+        auto res = m_currentIterator->next();
+        if (!res)
+            return {};
+        if (res->second.type == AssetItem::Type::Folder) {
+            m_stack.push_back(FolderIterator::fromCache(cleanedAssetPath(currentFilePath())));
+            if (m_stack.last()->empty())
+                m_stack.pop_back();
+        }
+        return res->first;
     }
 
 private:
-    QString     m_path;
-    FilesList   m_items;
-    int         m_index;
+    mutable QSharedPointer<FolderIterator> m_currentIterator;
+    mutable QVector<QSharedPointer<FolderIterator>> m_stack;
 };
 
 class AndroidAbstractFileEngine: public QAbstractFileEngine
 {
 public:
-    explicit AndroidAbstractFileEngine(AAsset *asset, const QString &fileName)
-    {
-        m_assetFile = asset;
-        m_fileName = fileName;
-    }
-
-    explicit AndroidAbstractFileEngine(QSharedPointer<AndroidAssetDir> asset, const QString &fileName)
+    explicit AndroidAbstractFileEngine(AAssetManager *assetManager, const QString &fileName)
+        : m_assetManager(assetManager)
     {
-        m_assetFile = 0;
-        m_assetDir = asset;
-        m_fileName =  fileName;
-        if (!m_fileName.endsWith(QLatin1Char('/')))
-            m_fileName += QLatin1Char('/');
+        setFileName(fileName);
     }
 
     ~AndroidAbstractFileEngine()
@@ -139,7 +243,11 @@ public:
 
     bool open(QIODevice::OpenMode openMode) override
     {
-        return m_assetFile != 0 && (openMode & QIODevice::WriteOnly) == 0;
+        if (m_isFolder || (openMode & QIODevice::WriteOnly))
+            return false;
+        close();
+        m_assetFile = AAssetManager_open(m_assetManager, m_fileName.toUtf8(), AASSET_MODE_BUFFER);
+        return m_assetFile;
     }
 
     bool close() override
@@ -200,7 +308,7 @@ public:
         FileFlags flags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag);
         if (m_assetFile)
             flags |= FileType;
-        if (!m_assetDir.isNull())
+        else if (m_isFolder)
             flags |= DirectoryType;
 
         return type & flags;
@@ -213,19 +321,19 @@ public:
         case DefaultName:
         case AbsoluteName:
         case CanonicalName:
-                return m_fileName;
+                return prefixedPath(m_fileName);
         case BaseName:
             if ((pos = m_fileName.lastIndexOf(QChar(QLatin1Char('/')))) != -1)
-                return m_fileName.mid(pos);
+                return prefixedPath(m_fileName.mid(pos));
             else
-                return m_fileName;
+                return prefixedPath(m_fileName);
         case PathName:
         case AbsolutePathName:
         case CanonicalPathName:
             if ((pos = m_fileName.lastIndexOf(QChar(QLatin1Char('/')))) != -1)
-                return m_fileName.left(pos);
+                return prefixedPath(m_fileName.left(pos));
             else
-                return m_fileName;
+                return prefixedPath(m_fileName);
         default:
             return QString();
         }
@@ -233,164 +341,46 @@ public:
 
     void setFileName(const QString &file) override
     {
-        if (file == m_fileName)
-            return;
-
-        m_fileName = file;
-        if (!m_fileName.endsWith(QLatin1Char('/')))
-            m_fileName += QLatin1Char('/');
-
         close();
+        m_fileName = cleanedAssetPath(file);
+        m_isFolder = !open(QIODevice::ReadOnly) && !FolderIterator::fromCache(m_fileName)->empty();
     }
 
     Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
     {
-        if (!m_assetDir.isNull())
-            return new AndroidAbstractFileEngineIterator(filters, filterNames, m_assetDir, m_fileName);
-        return 0;
+        if (m_isFolder)
+            return new AndroidAbstractFileEngineIterator(filters, filterNames, m_fileName);
+        return nullptr;
     }
 
 private:
-    AAsset *m_assetFile;
-    QSharedPointer<AndroidAssetDir> m_assetDir;
+    AAsset *m_assetFile = nullptr;
+    AAssetManager *m_assetManager;
     QString m_fileName;
+    bool m_isFolder;
 };
 
 
 AndroidAssetsFileEngineHandler::AndroidAssetsFileEngineHandler()
-    : m_assetsCache(std::max(5, qEnvironmentVariableIntValue("QT_ANDROID_MAX_ASSETS_CACHE_SIZE")))
-    , m_hasPrepopulatedCache(false)
-    , m_hasTriedPrepopulatingCache(false)
 {
     m_assetManager = QtAndroid::assetManager();
 }
 
-AndroidAssetsFileEngineHandler::~AndroidAssetsFileEngineHandler()
-{
-}
-
-void AndroidAssetsFileEngineHandler::prepopulateCache() const
-{
-    Q_ASSERT(!m_hasTriedPrepopulatingCache);
-    m_hasTriedPrepopulatingCache = true;
-
-    Q_ASSERT(m_assetsCache.isEmpty());
-
-    // Failsafe: Don't read cache files that are larger than 1MB
-    static qint64 maxPrepopulatedCacheSize = qMax(1024LL * 1024LL,
-                                                  qgetenv("QT_ANDROID_MAX_PREPOPULATED_ASSETS_CACHE_SIZE").toLongLong());
-
-    const char *fileName = "--Added-by-androiddeployqt--/qt_cache_pregenerated_file_list";
-    AAsset *asset = AAssetManager_open(m_assetManager, fileName, AASSET_MODE_BUFFER);
-    if (asset) {
-        m_hasPrepopulatedCache = true;
-        AndroidAbstractFileEngine fileEngine(asset, QString::fromLatin1(fileName));
-        if (fileEngine.open(QIODevice::ReadOnly)) {
-            qint64 size = fileEngine.size();
-
-            if (size <= maxPrepopulatedCacheSize) {
-                QByteArray bytes(size, Qt::Uninitialized);
-                qint64 read = fileEngine.read(bytes.data(), size);
-                if (read != size) {
-                    qWarning("Failed to read prepopulated cache");
-                    return;
-                }
-
-                QDataStream stream(&bytes, QIODevice::ReadOnly);
-                stream.setVersion(QDataStream::Qt_5_3);
-                if (stream.status() != QDataStream::Ok) {
-                    qWarning("Failed to read prepopulated cache");
-                    return;
-                }
-
-                while (!stream.atEnd()) {
-                    QString directoryName;
-                    stream >> directoryName;
-
-                    int fileCount;
-                    stream >> fileCount;
-
-                    QVector<QString> fileList;
-                    fileList.reserve(fileCount);
-                    while (fileCount--) {
-                        QString fileName;
-                        stream >> fileName;
-                        fileList.append(fileName);
-                    }
-
-                    QSharedPointer<AndroidAssetDir> *aad = new QSharedPointer<AndroidAssetDir>(new AndroidAssetDir(0));
-                    (*aad)->m_items = fileList;
-
-                    // Cost = 0, because we should always cache everything if there's a prepopulated cache
-                    QByteArray key = directoryName != QLatin1String("/")
-                            ? QByteArray("assets:/") + directoryName.toUtf8()
-                            : QByteArray("assets:");
-
-                    bool ok = m_assetsCache.insert(key, aad, 0);
-                    if (!ok)
-                        qWarning("Failed to insert in cache: %s", qPrintable(directoryName));
-                }
-            } else {
-                qWarning("Prepopulated cache is too large to read.\n"
-                         "Use environment variable QT_ANDROID_MAX_PREPOPULATED_ASSETS_CACHE_SIZE to adjust size.");
-            }
-        }
-    }
-}
-
 QAbstractFileEngine * AndroidAssetsFileEngineHandler::create(const QString &fileName) const
 {
     if (fileName.isEmpty())
-        return 0;
+        return nullptr;
 
-    static QLatin1String assetsPrefix("assets:");
     if (!fileName.startsWith(assetsPrefix))
-        return 0;
-
-    static int prefixSize = assetsPrefix.size() + 1;
-
-    QByteArray path;
-    if (!fileName.endsWith(QLatin1Char('/'))) {
-        path = fileName.toUtf8();
-        if (path.size() > prefixSize) {
-            AAsset *asset = AAssetManager_open(m_assetManager,
-                                               path.constData() + prefixSize,
-                                               AASSET_MODE_BUFFER);
-            if (asset)
-                return new AndroidAbstractFileEngine(asset, fileName);
-        }
-    }
-
-    if (!path.size())
-         path = fileName.left(fileName.length() - 1).toUtf8();
-
-
-    m_assetsCacheMutext.lock();
-    if (!m_hasTriedPrepopulatingCache)
-        prepopulateCache();
-
-    QSharedPointer<AndroidAssetDir> *aad = m_assetsCache.object(path);
-    m_assetsCacheMutext.unlock();
-    if (!aad) {
-        if (!m_hasPrepopulatedCache && path.size() > prefixSize) {
-            AAssetDir *assetDir = AAssetManager_openDir(m_assetManager, path.constData() + prefixSize);
-            if (assetDir) {
-                if (AAssetDir_getNextFileName(assetDir)) {
-                    AAssetDir_rewind(assetDir);
-                    aad = new QSharedPointer<AndroidAssetDir>(new AndroidAssetDir(assetDir));
-                    m_assetsCacheMutext.lock();
-                    m_assetsCache.insert(path, aad);
-                    m_assetsCacheMutext.unlock();
-                    return new AndroidAbstractFileEngine(*aad, fileName);
-                } else {
-                    AAssetDir_close(assetDir);
-                }
-            }
-        }
-    } else {
-        return new AndroidAbstractFileEngine(*aad, fileName);
-    }
-    return 0;
+        return nullptr;
+
+    QString path = fileName.mid(prefixSize);
+    path.replace(QLatin1String("//"), QLatin1String("/"));
+    if (path.startsWith(QLatin1Char('/')))
+        path.remove(0, 1);
+    if (path.endsWith(QLatin1Char('/')))
+        path.chop(1);
+    return new AndroidAbstractFileEngine(m_assetManager, path);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.h b/src/plugins/platforms/android/qandroidassetsfileenginehandler.h
index f99dc9a11a..51cc5b07a8 100644
--- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.h
+++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.h
@@ -49,22 +49,14 @@
 
 QT_BEGIN_NAMESPACE
 
-struct AndroidAssetDir;
 class AndroidAssetsFileEngineHandler: public QAbstractFileEngineHandler
 {
 public:
     AndroidAssetsFileEngineHandler();
-    virtual ~AndroidAssetsFileEngineHandler();
     QAbstractFileEngine *create(const QString &fileName) const override;
 
 private:
-    void prepopulateCache() const;
-
     AAssetManager *m_assetManager;
-    mutable QCache<QByteArray, QSharedPointer<AndroidAssetDir>> m_assetsCache;
-    mutable QMutex m_assetsCacheMutext;
-    mutable bool m_hasPrepopulatedCache;
-    mutable bool m_hasTriedPrepopulatingCache;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/android/qandroideventdispatcher.cpp b/src/plugins/platforms/android/qandroideventdispatcher.cpp
index e12551283f..3a1fb7a6de 100644
--- a/src/plugins/platforms/android/qandroideventdispatcher.cpp
+++ b/src/plugins/platforms/android/qandroideventdispatcher.cpp
@@ -78,14 +78,14 @@ void QAndroidEventDispatcher::stop()
 
 void QAndroidEventDispatcher::goingToStop(bool stop)
 {
-    m_goingToStop.store(stop ? 1 : 0);
+    m_goingToStop.storeRelaxed(stop ? 1 : 0);
     if (!stop)
         wakeUp();
 }
 
 bool QAndroidEventDispatcher::processEvents(QEventLoop::ProcessEventsFlags flags)
 {
-    if (m_goingToStop.load())
+    if (m_goingToStop.loadRelaxed())
         flags |= QEventLoop::ExcludeSocketNotifiers | QEventLoop::X11ExcludeTimers;
 
     {
diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h
index e6f903bced..4fdd7af7a5 100644
--- a/src/plugins/platforms/android/qandroideventdispatcher.h
+++ b/src/plugins/platforms/android/qandroideventdispatcher.h
@@ -68,7 +68,7 @@ class QAndroidEventDispatcherStopper
 {
 public:
     static QAndroidEventDispatcherStopper *instance();
-    static bool stopped() {return !instance()->m_started.load(); }
+    static bool stopped() {return !instance()->m_started.loadRelaxed(); }
     void startAll();
     void stopAll();
     void addEventDispatcher(QAndroidEventDispatcher *dispatcher);
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp
index 7dc8bb8080..80757c2135 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.cpp
+++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp
@@ -401,15 +401,17 @@ void QAndroidPlatformScreen::doRedraw()
         m_dirtyRect = QRect();
 }
 
+static const int androidLogicalDpi = 72;
+
 QDpi QAndroidPlatformScreen::logicalDpi() const
 {
-    qreal lDpi = QtAndroid::scaledDensity() * 72;
+    qreal lDpi = QtAndroid::scaledDensity() * androidLogicalDpi;
     return QDpi(lDpi, lDpi);
 }
 
-qreal QAndroidPlatformScreen::pixelDensity() const
+QDpi QAndroidPlatformScreen::logicalBaseDpi() const
 {
-    return QtAndroid::pixelDensity();
+    return QDpi(androidLogicalDpi, androidLogicalDpi);
 }
 
 Qt::ScreenOrientation QAndroidPlatformScreen::orientation() const
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.h b/src/plugins/platforms/android/qandroidplatformscreen.h
index f15aeae3fd..5dc158e351 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.h
+++ b/src/plugins/platforms/android/qandroidplatformscreen.h
@@ -103,7 +103,7 @@ protected:
 
 private:
     QDpi logicalDpi() const override;
-    qreal pixelDensity()  const override;
+    QDpi logicalBaseDpi() const override;
     Qt::ScreenOrientation orientation() const override;
     Qt::ScreenOrientation nativeOrientation() const override;
     void surfaceChanged(JNIEnv *env, jobject surface, int w, int h) override;
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp
index c095f51fa3..4f691ce112 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp
@@ -49,13 +49,14 @@
 
 QT_BEGIN_NAMESPACE
 
+static QBasicAtomicInt winIdGenerator = Q_BASIC_ATOMIC_INITIALIZER(0);
+
 QAndroidPlatformWindow::QAndroidPlatformWindow(QWindow *window)
     : QPlatformWindow(window)
 {
     m_windowFlags = Qt::Widget;
     m_windowState = Qt::WindowNoState;
-    static QAtomicInt winIdGenerator(1);
-    m_windowId = winIdGenerator.fetchAndAddRelaxed(1);
+    m_windowId = winIdGenerator.fetchAndAddRelaxed(1) + 1;
     setWindowState(window->windowStates());
 }
 
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h
index f2e51bd3df..d8eb6b7b7f 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.h
+++ b/src/plugins/platforms/android/qandroidplatformwindow.h
@@ -65,6 +65,9 @@ public:
     void setParent(const QPlatformWindow *window) override;
     WId winId() const override { return m_windowId; }
 
+    bool setMouseGrabEnabled(bool grab) override { Q_UNUSED(grab); return false; }
+    bool setKeyboardGrabEnabled(bool grab) override { Q_UNUSED(grab); return false; }
+
     QAndroidPlatformScreen *platformScreen() const;
 
     void propagateSizeHints() override;
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.h b/src/plugins/platforms/cocoa/qcocoaaccessibility.h
index 457c158ddc..539d876094 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.h
@@ -44,9 +44,9 @@
 #include <QtGui>
 #include <qpa/qplatformaccessibility.h>
 
-#ifndef QT_NO_ACCESSIBILITY
+#include "qcocoaaccessibilityelement.h"
 
-@class QT_MANGLE_NAMESPACE(QMacAccessibilityElement);
+#ifndef QT_NO_ACCESSIBILITY
 
 QT_BEGIN_NAMESPACE
 
@@ -84,7 +84,7 @@ namespace QCocoaAccessible {
 NSString *macRole(QAccessibleInterface *interface);
 NSString *macSubrole(QAccessibleInterface *interface);
 bool shouldBeIgnored(QAccessibleInterface *interface);
-NSArray<QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *> *unignoredChildren(QAccessibleInterface *interface);
+NSArray<QMacAccessibilityElement *> *unignoredChildren(QAccessibleInterface *interface);
 NSString *getTranslatedAction(const QString &qtAction);
 QString translateAction(NSString *nsAction, QAccessibleInterface *interface);
 bool hasValueAttribute(QAccessibleInterface *interface);
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
index 368cf56c80..db4ec251ae 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
@@ -177,7 +177,7 @@ NSString *macRole(QAccessibleInterface *interface)
     if (roleMap.isEmpty())
         populateRoleMap();
 
-    // MAC_ACCESSIBILTY_DEBUG() << "role for" << interface.object() << "interface role" << hex << qtRole;
+    // MAC_ACCESSIBILTY_DEBUG() << "role for" << interface.object() << "interface role" << Qt::hex << qtRole;
 
     if (roleMap.contains(qtRole)) {
        // MAC_ACCESSIBILTY_DEBUG() << "return" <<  roleMap[qtRole];
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
index 914aaa2b1b..141ce6bf1a 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
@@ -50,9 +50,7 @@
 
 #import <qaccessible.h>
 
-@class QT_MANGLE_NAMESPACE(QMacAccessibilityElement);
-
-@interface QT_MANGLE_NAMESPACE(QMacAccessibilityElement) : NSObject
+@interface QT_MANGLE_NAMESPACE(QMacAccessibilityElement) : NSObject <NSAccessibilityElement>
 
 - (instancetype)initWithId:(QAccessible::Id)anId;
 + (instancetype)elementWithId:(QAccessible::Id)anId;
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index f0ef70e3a3..3560c9d9b5 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -174,6 +174,17 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
 // accessibility protocol
 //
 
+- (BOOL)isAccessibilityFocused
+{
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid()) {
+        return false;
+    }
+    // Just check if the app thinks we're focused.
+    id focusedElement = NSApp.accessibilityApplicationFocusedUIElement;
+    return [focusedElement isEqual:self];
+}
+
 // attributes
 
 + (id) lineNumberForIndex: (int)index forText:(const QString &)text
@@ -187,54 +198,58 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
     return YES;
 }
 
-- (NSArray<NSString *> *)accessibilityAttributeNames {
-    static NSArray<NSString *> *defaultAttributes = [@[
-        NSAccessibilityRoleAttribute,
-        NSAccessibilityRoleDescriptionAttribute,
-        NSAccessibilitySubroleAttribute,
-        NSAccessibilityChildrenAttribute,
-        NSAccessibilityFocusedAttribute,
-        NSAccessibilityParentAttribute,
-        NSAccessibilityWindowAttribute,
-        NSAccessibilityTopLevelUIElementAttribute,
-        NSAccessibilityPositionAttribute,
-        NSAccessibilitySizeAttribute,
-        NSAccessibilityTitleAttribute,
-        NSAccessibilityDescriptionAttribute,
-        NSAccessibilityEnabledAttribute
-    ] retain];
+- (NSString *) accessibilityRole {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return NSAccessibilityUnknownRole;
+    return QCocoaAccessible::macRole(iface);
+}
 
+- (NSString *) accessibilitySubRole {
     QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
     if (!iface || !iface->isValid())
-        return defaultAttributes;
+        return NSAccessibilityUnknownRole;
+    return QCocoaAccessible::macSubrole(iface);
+}
 
-    NSMutableArray<NSString *> *attributes = [[NSMutableArray<NSString *> alloc] initWithCapacity:defaultAttributes.count];
-    [attributes addObjectsFromArray:defaultAttributes];
+- (NSString *) accessibilityRoleDescription {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return NSAccessibilityUnknownRole;
+    return NSAccessibilityRoleDescription(self.accessibilityRole, self.accessibilitySubRole);
+}
 
-    if (QCocoaAccessible::hasValueAttribute(iface)) {
-        [attributes addObject:NSAccessibilityValueAttribute];
-    }
+- (NSArray *) accessibilityChildren {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return nil;
+    return QCocoaAccessible::unignoredChildren(iface);
+}
 
-    if (iface->textInterface()) {
-        [attributes addObjectsFromArray:@[
-            NSAccessibilityNumberOfCharactersAttribute,
-            NSAccessibilitySelectedTextAttribute,
-            NSAccessibilitySelectedTextRangeAttribute,
-            NSAccessibilityVisibleCharacterRangeAttribute,
-            NSAccessibilityInsertionPointLineNumberAttribute
-        ]];
-
-// TODO: multi-selection: NSAccessibilitySelectedTextRangesAttribute,
-    }
+- (id) accessibilityWindow {
+    // We're in the same window as our parent.
+    return [self.accessibilityParent accessibilityWindow];
+}
 
-    if (iface->valueInterface()) {
-        [attributes addObjectsFromArray:@[
-            NSAccessibilityMinValueAttribute,
-            NSAccessibilityMaxValueAttribute
-        ]];
-    }
+- (id) accessibilityTopLevelUIElementAttribute {
+    // We're in the same top level element as our parent.
+    return [self.accessibilityParent accessibilityTopLevelUIElementAttribute];
+}
 
-    return [attributes autorelease];
+- (NSString *) accessibilityTitle {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return nil;
+    if (iface->role() == QAccessible::StaticText)
+        return nil;
+    return iface->text(QAccessible::Name).toNSString();
+}
+
+- (BOOL) accessibilityEnabledAttribute {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return false;
+    return !iface->state().disabled;
 }
 
 - (id)accessibilityParent {
@@ -271,112 +286,117 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
     return QCocoaScreen::mapToNative(iface->rect());
 }
 
-- (id) minValueAttribute:(QAccessibleInterface*)iface {
+- (NSString*)accessibilityLabel {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid()) {
+        qWarning() << "Called accessibilityLabel on invalid object: " << axid;
+        return nil;
+    }
+    return iface->text(QAccessible::Description).toNSString();
+}
+
+- (void)setAccessibilityLabel:(NSString*)label{
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return;
+    iface->setText(QAccessible::Description, QString::fromNSString(label));
+}
+
+- (id) accessibilityMinValue:(QAccessibleInterface*)iface {
     if (QAccessibleValueInterface *val = iface->valueInterface())
         return @(val->minimumValue().toDouble());
     return nil;
 }
 
-- (id) maxValueAttribute:(QAccessibleInterface*)iface {
+- (id) accessibilityMaxValue:(QAccessibleInterface*)iface {
     if (QAccessibleValueInterface *val = iface->valueInterface())
         return @(val->maximumValue().toDouble());
     return nil;
 }
 
-- (id)accessibilityAttributeValue:(NSString *)attribute {
+- (id) accessibilityValue {
     QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
-    if (!iface || !iface->isValid()) {
-        qWarning() << "Called attribute on invalid object: " << axid;
+    if (!iface || !iface->isValid())
         return nil;
-    }
 
-    if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) {
-        return QCocoaAccessible::macRole(iface);
-    } else if ([attribute isEqualToString:NSAccessibilitySubroleAttribute]) {
-        return QCocoaAccessible::macSubrole(iface);
-    } else if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute]) {
-        return NSAccessibilityRoleDescription(QCocoaAccessible::macRole(iface),
-            [self accessibilityAttributeValue:NSAccessibilitySubroleAttribute]);
-    } else if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
-        return QCocoaAccessible::unignoredChildren(iface);
-    } else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
-        // Just check if the app thinks we're focused.
-        id focusedElement = [NSApp accessibilityAttributeValue:NSAccessibilityFocusedUIElementAttribute];
-        return @([focusedElement isEqual:self]);
-    } else if ([attribute isEqualToString:NSAccessibilityParentAttribute]) {
-        return self.accessibilityParent;
-    } else if ([attribute isEqualToString:NSAccessibilityWindowAttribute]) {
-        // We're in the same window as our parent.
-        return [[self accessibilityParent] accessibilityAttributeValue:NSAccessibilityWindowAttribute];
-    } else if ([attribute isEqualToString:NSAccessibilityTopLevelUIElementAttribute]) {
-        // We're in the same top level element as our parent.
-        return [[self accessibilityParent] accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute];
-    } else if ([attribute isEqualToString:NSAccessibilityPositionAttribute]) {
-        // The position in points of the element's lower-left corner in screen-relative coordinates
-        QPointF qtPosition = QRectF(iface->rect()).bottomLeft();
-        return [NSValue valueWithPoint:QCocoaScreen::mapToNative(qtPosition)];
-    } else if ([attribute isEqualToString:NSAccessibilitySizeAttribute]) {
-        QSize qtSize = iface->rect().size();
-        return [NSValue valueWithSize: NSMakeSize(qtSize.width(), qtSize.height())];
-    } else if ([attribute isEqualToString:NSAccessibilityTitleAttribute]) {
-        if (iface->role() == QAccessible::StaticText)
-            return nil;
-        return iface->text(QAccessible::Name).toNSString();
-    } else if ([attribute isEqualToString:NSAccessibilityDescriptionAttribute]) {
-        return iface->text(QAccessible::Description).toNSString();
-    } else if ([attribute isEqualToString:NSAccessibilityEnabledAttribute]) {
-        return @(!iface->state().disabled);
-    } else if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
-        // VoiceOver asks for the value attribute for all elements. Return nil
-        // if we don't want the element to have a value attribute.
-        if (!QCocoaAccessible::hasValueAttribute(iface))
-            return nil;
+    // VoiceOver asks for the value attribute for all elements. Return nil
+    // if we don't want the element to have a value attribute.
+    if (!QCocoaAccessible::hasValueAttribute(iface))
+        return nil;
+
+    return QCocoaAccessible::getValueAttribute(iface);
+}
 
-        return QCocoaAccessible::getValueAttribute(iface);
+- (NSInteger) accessibilityNumberOfCharacters {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return 0;
+    if (QAccessibleTextInterface *text = iface->textInterface())
+        return text->characterCount();
+    return 0;
+}
 
-    } else if ([attribute isEqualToString:NSAccessibilityNumberOfCharactersAttribute]) {
-        if (QAccessibleTextInterface *text = iface->textInterface())
-            return @(text->characterCount());
+- (NSString *) accessibilitySelectedText {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
         return nil;
-    } else if ([attribute isEqualToString:NSAccessibilitySelectedTextAttribute]) {
-        if (QAccessibleTextInterface *text = iface->textInterface()) {
-            int start = 0;
-            int end = 0;
+    if (QAccessibleTextInterface *text = iface->textInterface()) {
+        int start = 0;
+        int end = 0;
+        text->selection(0, &start, &end);
+        return text->text(start, end).toNSString();
+    }
+    return nil;
+}
+
+- (NSRange) accessibilitySelectedTextRange {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return NSRange();
+    if (QAccessibleTextInterface *text = iface->textInterface()) {
+        int start = 0;
+        int end = 0;
+        if (text->selectionCount() > 0) {
             text->selection(0, &start, &end);
-            return text->text(start, end).toNSString();
-        }
-        return nil;
-    } else if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
-        if (QAccessibleTextInterface *text = iface->textInterface()) {
-            int start = 0;
-            int end = 0;
-            if (text->selectionCount() > 0) {
-                text->selection(0, &start, &end);
-            } else {
-                start = text->cursorPosition();
-                end = start;
-            }
-            return [NSValue valueWithRange:NSMakeRange(quint32(start), quint32(end - start))];
-        }
-        return [NSValue valueWithRange: NSMakeRange(0, 0)];
-    } else if ([attribute isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute]) {
-        // FIXME This is not correct and may impact performance for big texts
-        if (QAccessibleTextInterface *text = iface->textInterface())
-            return [NSValue valueWithRange: NSMakeRange(0, text->characterCount())];
-        return [NSValue valueWithRange: NSMakeRange(0, iface->text(QAccessible::Name).length())];
-    } else if ([attribute isEqualToString:NSAccessibilityInsertionPointLineNumberAttribute]) {
-        if (QAccessibleTextInterface *text = iface->textInterface()) {
-            int position = text->cursorPosition();
-            return [self accessibilityAttributeValue:NSAccessibilityLineForIndexParameterizedAttribute forParameter:@(position)];
+        } else {
+            start = text->cursorPosition();
+            end = start;
         }
-        return nil;
-    } else if ([attribute isEqualToString:NSAccessibilityMinValueAttribute]) {
-        return [self minValueAttribute:iface];
-    } else if ([attribute isEqualToString:NSAccessibilityMaxValueAttribute]) {
-        return [self maxValueAttribute:iface];
+        return NSMakeRange(quint32(start), quint32(end - start));
     }
+    return NSMakeRange(0, 0);
+}
 
-    return nil;
+- (NSInteger)accessibilityLineForIndex:(NSInteger)index {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return 0;
+    if (QAccessibleTextInterface *text = iface->textInterface()) {
+        QString textToPos = text->text(0, index);
+        return textToPos.count('\n');
+    }
+    return 0;
+}
+
+- (NSRange)accessibilityVisibleCharacterRange {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return NSRange();
+    // FIXME This is not correct and may impact performance for big texts
+    if (QAccessibleTextInterface *text = iface->textInterface())
+        return NSMakeRange(0, static_cast<uint>(text->characterCount()));
+    return NSMakeRange(0, static_cast<uint>(iface->text(QAccessible::Name).length()));
+}
+
+- (NSInteger) accessibilityInsertionPointLineNumber {
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+    if (!iface || !iface->isValid())
+        return 0;
+    if (QAccessibleTextInterface *text = iface->textInterface()) {
+        int position = text->cursorPosition();
+        return [self accessibilityLineForIndex:position];
+    }
+    return 0;
 }
 
 - (NSArray *)accessibilityParameterizedAttributeNames {
diff --git a/src/plugins/platforms/cocoa/qcocoaapplication.mm b/src/plugins/platforms/cocoa/qcocoaapplication.mm
index 340191622a..c6029bcf03 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplication.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplication.mm
@@ -144,7 +144,7 @@ static void qt_maybeSendKeyEquivalentUpEvent(NSEvent *event)
     }
 }
 
-@implementation QT_MANGLE_NAMESPACE(QNSApplication)
+@implementation QNSApplication
 
 - (void)QT_MANGLE_NAMESPACE(qt_sendEvent_original):(NSEvent *)event
 {
@@ -188,7 +188,7 @@ void qt_redirectNSApplicationSendEvent()
         // can be unloaded.
         return;
 
-    if ([NSApp isMemberOfClass:[QT_MANGLE_NAMESPACE(QNSApplication) class]]) {
+    if ([NSApp isMemberOfClass:[QNSApplication class]]) {
         // No need to change implementation since Qt
         // already controls a subclass of NSApplication
         return;
@@ -201,7 +201,7 @@ void qt_redirectNSApplicationSendEvent()
     qt_cocoa_change_implementation(
             [NSApplication class],
             @selector(sendEvent:),
-            [QT_MANGLE_NAMESPACE(QNSApplication) class],
+            [QNSApplication class],
             @selector(QT_MANGLE_NAMESPACE(qt_sendEvent_replacement):),
             @selector(QT_MANGLE_NAMESPACE(qt_sendEvent_original):));
  }
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
index 0816730c54..8ec9d6fbe0 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
@@ -89,8 +89,7 @@
 
 #include <qglobal.h>
 #include <private/qcore_mac_p.h>
-
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaNSMenuItem));
+#include "qcocoansmenu.h"
 
 @interface QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) : NSObject <NSApplicationDelegate>
 @property (nonatomic, retain) NSMenu *dockMenu;
@@ -100,8 +99,9 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaNSMenuItem));
 - (bool)inLaunch;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) (MenuAPI)
-- (void)qt_itemFired:(QT_MANGLE_NAMESPACE(QCocoaNSMenuItem) *)item;
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaApplicationDelegate);
+
+@interface QCocoaApplicationDelegate (MenuAPI)
+- (void)qt_itemFired:(QCocoaNSMenuItem *)item;
 @end
 
-QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaApplicationDelegate);
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
index 2cf6672da9..9b0a6b1b86 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
@@ -88,10 +88,13 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <qwindowdefs.h>
 
+QT_BEGIN_NAMESPACE
+Q_LOGGING_CATEGORY(lcQpaApplication, "qt.qpa.application");
+QT_END_NAMESPACE
+
 QT_USE_NAMESPACE
 
 @implementation QCocoaApplicationDelegate {
-    bool startedQuit;
     NSObject <NSApplicationDelegate> *reflectionDelegate;
     bool inLaunch;
 }
@@ -140,71 +143,30 @@ QT_USE_NAMESPACE
     return [[self.dockMenu retain] autorelease];
 }
 
-- (BOOL)canQuit
-{
-    [[NSApp mainMenu] cancelTracking];
-
-    bool handle_quit = true;
-    NSMenuItem *quitMenuItem = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) sharedMenuLoader] quitMenuItem];
-    if (!QGuiApplicationPrivate::instance()->modalWindowList.isEmpty()
-        && [quitMenuItem isEnabled]) {
-        int visible = 0;
-        const QWindowList tlws = QGuiApplication::topLevelWindows();
-        for (int i = 0; i < tlws.size(); ++i) {
-            if (tlws.at(i)->isVisible())
-                ++visible;
-        }
-        handle_quit = (visible <= 1);
-    }
-
-    if (handle_quit) {
-        QCloseEvent ev;
-        QGuiApplication::sendEvent(qGuiApp, &ev);
-        if (ev.isAccepted()) {
-            return YES;
-        }
-    }
-
-    return NO;
-}
-
 // This function will only be called when NSApp is actually running.
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
-    // The reflection delegate gets precedence
-    if (reflectionDelegate) {
-        if ([reflectionDelegate respondsToSelector:@selector(applicationShouldTerminate:)])
-            return [reflectionDelegate applicationShouldTerminate:sender];
-        return NSTerminateNow;
-    }
-
-    if ([self canQuit]) {
-        if (!startedQuit) {
-            startedQuit = true;
-            // Close open windows. This is done in order to deliver de-expose
-            // events while the event loop is still running.
-            const QWindowList topLevels = QGuiApplication::topLevelWindows();
-            for (int i = 0; i < topLevels.size(); ++i) {
-                QWindow *topLevelWindow = topLevels.at(i);
-                // Already closed windows will not have a platform window, skip those
-                if (topLevelWindow->handle())
-                    QWindowSystemInterface::handleCloseEvent(topLevelWindow);
-            }
-            QWindowSystemInterface::flushWindowSystemEvents();
-
-            QGuiApplication::exit(0);
-            startedQuit = false;
-        }
-    }
+    if ([reflectionDelegate respondsToSelector:_cmd])
+        return [reflectionDelegate applicationShouldTerminate:sender];
 
     if (QGuiApplicationPrivate::instance()->threadData->eventLoops.isEmpty()) {
-        // INVARIANT: No event loop is executing. This probably
-        // means that Qt is used as a plugin, or as a part of a native
-        // Cocoa application. In any case it should be fine to
-        // terminate now:
+        // No event loop is executing. This probably means that Qt is used as a plugin,
+        // or as a part of a native Cocoa application. In any case it should be fine to
+        // terminate now.
+        qCDebug(lcQpaApplication) << "No running event loops, terminating now";
         return NSTerminateNow;
     }
 
+    if (!QWindowSystemInterface::handleApplicationTermination<QWindowSystemInterface::SynchronousDelivery>()) {
+        qCDebug(lcQpaApplication) << "Application termination canceled";
+        return NSTerminateCancel;
+    }
+
+    // Even if the application termination was accepted by the application we can't
+    // return NSTerminateNow, as that would trigger AppKit to ultimately call exit().
+    // We need to ensure that the runloop continues spinning so that we can return
+    // from our own event loop back to main(), and exit from there.
+    qCDebug(lcQpaApplication) << "Termination accepted, but returning to runloop for exit through main()";
     return NSTerminateCancel;
 }
 
@@ -228,10 +190,6 @@ QT_USE_NAMESPACE
      */
     NSAppleEventManager *eventManager = [NSAppleEventManager sharedAppleEventManager];
     [eventManager setEventHandler:self
-                      andSelector:@selector(appleEventQuit:withReplyEvent:)
-                    forEventClass:kCoreEventClass
-                       andEventID:kAEQuitApplication];
-    [eventManager setEventHandler:self
                       andSelector:@selector(getUrl:withReplyEvent:)
                     forEventClass:kInternetEventClass
                        andEventID:kAEGetURL];
@@ -241,7 +199,6 @@ QT_USE_NAMESPACE
 - (void)removeAppleEventHandlers
 {
     NSAppleEventManager *eventManager = [NSAppleEventManager sharedAppleEventManager];
-    [eventManager removeEventHandlerForEventClass:kCoreEventClass andEventID:kAEQuitApplication];
     [eventManager removeEventHandlerForEventClass:kInternetEventClass andEventID:kAEGetURL];
 }
 
@@ -282,26 +239,22 @@ QT_USE_NAMESPACE
         QWindowSystemInterface::handleFileOpenEvent(qtFileName);
     }
 
-    if (reflectionDelegate &&
-        [reflectionDelegate respondsToSelector:@selector(application:openFiles:)])
+    if ([reflectionDelegate respondsToSelector:_cmd])
         [reflectionDelegate application:sender openFiles:filenames];
 
 }
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 {
-    // If we have a reflection delegate, that will get to call the shots.
-    if (reflectionDelegate
-        && [reflectionDelegate respondsToSelector:
-                            @selector(applicationShouldTerminateAfterLastWindowClosed:)])
+    if ([reflectionDelegate respondsToSelector:_cmd])
         return [reflectionDelegate applicationShouldTerminateAfterLastWindowClosed:sender];
+
     return NO; // Someday qApp->quitOnLastWindowClosed(); when QApp and NSApp work closer together.
 }
 
 - (void)applicationDidBecomeActive:(NSNotification *)notification
 {
-    if (reflectionDelegate
-        && [reflectionDelegate respondsToSelector:@selector(applicationDidBecomeActive:)])
+    if ([reflectionDelegate respondsToSelector:_cmd])
         [reflectionDelegate applicationDidBecomeActive:notification];
 
     QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
@@ -309,8 +262,7 @@ QT_USE_NAMESPACE
 
 - (void)applicationDidResignActive:(NSNotification *)notification
 {
-    if (reflectionDelegate
-        && [reflectionDelegate respondsToSelector:@selector(applicationDidResignActive:)])
+    if ([reflectionDelegate respondsToSelector:_cmd])
         [reflectionDelegate applicationDidResignActive:notification];
 
     QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
@@ -318,10 +270,7 @@ QT_USE_NAMESPACE
 
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag
 {
-    Q_UNUSED(theApplication);
-    Q_UNUSED(flag);
-    if (reflectionDelegate
-        && [reflectionDelegate respondsToSelector:@selector(applicationShouldHandleReopen:hasVisibleWindows:)])
+    if ([reflectionDelegate respondsToSelector:_cmd])
         return [reflectionDelegate applicationShouldHandleReopen:theApplication hasVisibleWindows:flag];
 
     /*
@@ -354,16 +303,13 @@ QT_USE_NAMESPACE
 
 - (BOOL)respondsToSelector:(SEL)aSelector
 {
-    BOOL result = [super respondsToSelector:aSelector];
-    if (!result && reflectionDelegate)
-        result = [reflectionDelegate respondsToSelector:aSelector];
-    return result;
+    return [super respondsToSelector:aSelector] || [reflectionDelegate respondsToSelector:aSelector];
 }
 
 - (void)forwardInvocation:(NSInvocation *)invocation
 {
     SEL invocationSelector = [invocation selector];
-    if (reflectionDelegate && [reflectionDelegate respondsToSelector:invocationSelector])
+    if ([reflectionDelegate respondsToSelector:invocationSelector])
         [invocation invokeWithTarget:reflectionDelegate];
     else
         [self doesNotRecognizeSelector:invocationSelector];
@@ -375,14 +321,6 @@ QT_USE_NAMESPACE
     NSString *urlString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
     QWindowSystemInterface::handleFileOpenEvent(QUrl(QString::fromNSString(urlString)));
 }
-
-- (void)appleEventQuit:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
-{
-    Q_UNUSED(event);
-    Q_UNUSED(replyEvent);
-    [NSApp terminate:self];
-}
-
 @end
 
 @implementation QCocoaApplicationDelegate (Menus)
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index 5550f0586b..b17302a640 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -195,7 +195,7 @@ void QNSWindowBackingStore::flush(QWindow *window, const QRegion &region, const
     // context is set up correctly (coordinate system, clipping, etc). Outside
     // of the normal display cycle there is no focused view, as explained above,
     // so we have to handle it manually. There's also a corner case inside the
-    // normal display cycle due to way QWidgetBackingStore composits native child
+    // normal display cycle due to way QWidgetRepaintManager composits native child
     // widgets, where we'll get a flush of a native child during the drawRect of
     // its parent/ancestor, and the parent/ancestor being the one locked by AppKit.
     // In this case we also need to lock and unlock focus manually.
@@ -560,17 +560,26 @@ void QCALayerBackingStore::flush(QWindow *flushedWindow, const QRegion &region,
         flushedView.layer.contents = nil;
     }
 
-    qCInfo(lcQpaBackingStore) << "Flushing" << backBufferSurface
-         << "to" << flushedView.layer << "of" << flushedView;
-
-    flushedView.layer.contents = backBufferSurface;
+    if (flushedView == backingStoreView) {
+        qCInfo(lcQpaBackingStore) << "Flushing" << backBufferSurface
+            << "to" << flushedView.layer << "of" << flushedView;
+        flushedView.layer.contents = backBufferSurface;
+    } else {
+        auto subviewRect = [flushedView convertRect:flushedView.bounds toView:backingStoreView];
+        auto scale = flushedView.layer.contentsScale;
+        subviewRect = CGRectApplyAffineTransform(subviewRect, CGAffineTransformMakeScale(scale, scale));
+
+        // We make a copy of the image data up front, which means we don't
+        // need to mark the IOSurface as being in use. FIXME: Investigate
+        // if there's a cheaper way to get sub-image data to a layer.
+        m_buffers.back()->lock(QPlatformGraphicsBuffer::SWReadAccess);
+        QImage subImage = m_buffers.back()->asImage()->copy(QRectF::fromCGRect(subviewRect).toRect());
+        m_buffers.back()->unlock();
 
-    if (flushedView != backingStoreView) {
-        const CGSize backingStoreSize = backingStoreView.bounds.size;
-        flushedView.layer.contentsRect = CGRectApplyAffineTransform(
-            [flushedView convertRect:flushedView.bounds toView:backingStoreView],
-            // The contentsRect is in unit coordinate system
-            CGAffineTransformMakeScale(1.0 / backingStoreSize.width, 1.0 / backingStoreSize.height));
+        qCInfo(lcQpaBackingStore) << "Flushing" << subImage
+            << "to" << flushedView.layer << "of subview" << flushedView;
+        QCFType<CGImageRef> cgImage = subImage.toCGImage();
+        flushedView.layer.contents = (__bridge id)static_cast<CGImageRef>(cgImage);
     }
 
     // Since we may receive multiple flushes before a new frame is started, we do not
diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
index d7850b1481..c9fa035d87 100644
--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
@@ -293,7 +293,7 @@ class QCocoaColorPanel
 public:
     QCocoaColorPanel()
     {
-        mDelegate = [[QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) alloc] init];
+        mDelegate = [[QNSColorPanelDelegate alloc] init];
     }
 
     ~QCocoaColorPanel()
@@ -366,7 +366,7 @@ public:
     }
 
 private:
-    QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *mDelegate;
+    QNSColorPanelDelegate *mDelegate;
 };
 
 Q_GLOBAL_STATIC(QCocoaColorPanel, sharedColorPanel)
diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
index d3bb0711f0..e87fc39c42 100644
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@@ -881,7 +881,7 @@ void QCocoaEventDispatcherPrivate::processPostedEvents()
         return;
     }
 
-    int serial = serialNumber.load();
+    int serial = serialNumber.loadRelaxed();
     if (!threadData->canWait || (serial != lastSerial)) {
         lastSerial = serial;
         QCoreApplication::sendPostedEvents();
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
index 2ddda14289..dd0afbefe6 100644
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
@@ -43,10 +43,16 @@
 #include <QObject>
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <qpa/qplatformdialoghelper.h>
+#include <QtCore/private/qcore_mac_p.h>
+
+#import <AppKit/NSSavePanel.h>
 
 QT_REQUIRE_CONFIG(filedialog);
 
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate));
+@interface QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) : NSObject<NSOpenSavePanelDelegate>
+@end
+
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);
 
 QT_BEGIN_NAMESPACE
 
@@ -84,7 +90,7 @@ public:
     void QNSOpenSavePanelDelegate_filterSelected(int menuIndex);
 
 private:
-    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *mDelegate;
+    QNSOpenSavePanelDelegate *mDelegate;
     QUrl mDir;
 };
 
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
index d1695ea860..6aa21d78d1 100644
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
@@ -51,7 +51,6 @@
 #include "qt_mac_p.h"
 #include "qcocoahelpers.h"
 #include "qcocoaeventdispatcher.h"
-#include <qregexp.h>
 #include <qbuffer.h>
 #include <qdebug.h>
 #include <qstringlist.h>
@@ -77,27 +76,6 @@ QT_USE_NAMESPACE
 
 typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;
 
-@interface QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate)
-    : NSObject<NSOpenSavePanelDelegate>
-
-- (NSString *)strip:(const QString &)label;
-- (BOOL)panel:(id)sender shouldEnableURL:(NSURL *)url;
-- (void)filterChanged:(id)sender;
-- (void)showModelessPanel;
-- (BOOL)runApplicationModalPanel;
-- (void)showWindowModalSheet:(QWindow *)docWidget;
-- (void)updateProperties;
-- (QStringList)acceptableExtensionsForSave;
-- (QString)removeExtensions:(const QString &)filter;
-- (void)createTextField;
-- (void)createPopUpButton:(const QString &)selectedFilter hideDetails:(BOOL)hideDetails;
-- (QStringList)findStrippedFilterWithVisualFilterName:(QString)name;
-- (void)createAccessory;
-
-@end
-
-QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);
-
 @implementation QNSOpenSavePanelDelegate {
     @public
     NSOpenPanel *mOpenPanel;
@@ -215,7 +193,7 @@ static QString strippedText(QString s)
         NSString *filepath = info.filePath().toNSString();
         NSURL *url = [NSURL fileURLWithPath:filepath isDirectory:info.isDir()];
         bool selectable = (mOptions->acceptMode() == QFileDialogOptions::AcceptSave)
-            || [self panel:nil shouldEnableURL:url];
+            || [self panel:mOpenPanel shouldEnableURL:url];
 
         [self updateProperties];
         [mSavePanel setNameFieldStringValue:selectable ? info.fileName().toNSString() : @""];
@@ -234,7 +212,7 @@ static QString strippedText(QString s)
     NSString *filepath = info.filePath().toNSString();
     NSURL *url = [NSURL fileURLWithPath:filepath isDirectory:info.isDir()];
     bool selectable = (mOptions->acceptMode() == QFileDialogOptions::AcceptSave)
-        || [self panel:nil shouldEnableURL:url];
+        || [self panel:mSavePanel shouldEnableURL:url];
 
     [mSavePanel setDirectoryURL: [NSURL fileURLWithPath:mCurrentDir]];
     [mSavePanel setNameFieldStringValue:selectable ? info.fileName().toNSString() : @""];
@@ -264,7 +242,7 @@ static QString strippedText(QString s)
     NSString *filepath = info.filePath().toNSString();
     NSURL *url = [NSURL fileURLWithPath:filepath isDirectory:info.isDir()];
     bool selectable = (mOptions->acceptMode() == QFileDialogOptions::AcceptSave)
-        || [self panel:nil shouldEnableURL:url];
+        || [self panel:mSavePanel shouldEnableURL:url];
 
     [self updateProperties];
     [mSavePanel setDirectoryURL: [NSURL fileURLWithPath:mCurrentDir]];
diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
index 8c0af97a68..7748c304e3 100644
--- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
@@ -283,7 +283,7 @@ class QCocoaFontPanel
 public:
     QCocoaFontPanel()
     {
-        mDelegate = [[QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) alloc] init];
+        mDelegate = [[QNSFontPanelDelegate alloc] init];
     }
 
     ~QCocoaFontPanel()
@@ -356,7 +356,7 @@ public:
     }
 
 private:
-    QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) *mDelegate;
+    QNSFontPanelDelegate *mDelegate;
 };
 
 Q_GLOBAL_STATIC(QCocoaFontPanel, sharedFontPanel)
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h
index a957710a88..1dccf0621c 100644
--- a/src/plugins/platforms/cocoa/qcocoamenu.h
+++ b/src/plugins/platforms/cocoa/qcocoamenu.h
@@ -44,8 +44,7 @@
 #include <QtCore/QList>
 #include <qpa/qplatformmenu.h>
 #include "qcocoamenuitem.h"
-
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaNSMenu));
+#include "qcocoansmenu.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -107,7 +106,7 @@ private:
     void scheduleUpdate();
 
     QList<QCocoaMenuItem *> m_menuItems;
-    QT_MANGLE_NAMESPACE(QCocoaNSMenu) *m_nativeMenu;
+    QCocoaNSMenu *m_nativeMenu;
     NSMenuItem *m_attachedItem;
     int m_updateTimer;
     bool m_enabled:1;
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm
index 30bff78a36..363defdd28 100644
--- a/src/plugins/platforms/cocoa/qcocoamenubar.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm
@@ -278,12 +278,11 @@ void QCocoaMenuBar::updateMenuBarImmediately()
         // we still have to update the menubar.
         if ((win->flags() & Qt::WindowType_Mask) != Qt::Tool)
             return;
-        typedef QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) AppDelegate;
         NSApplication *app = [NSApplication sharedApplication];
-        if (![app.delegate isKindOfClass:[AppDelegate class]])
+        if (![app.delegate isKindOfClass:[QCocoaApplicationDelegate class]])
             return;
         // We apply this logic _only_ during the startup.
-        AppDelegate *appDelegate = app.delegate;
+        QCocoaApplicationDelegate *appDelegate = app.delegate;
         if (!appDelegate.inLaunch)
             return;
     }
@@ -403,3 +402,4 @@ QCocoaWindow *QCocoaMenuBar::cocoaWindow() const
 
 QT_END_NAMESPACE
 
+#include "moc_qcocoamenubar.cpp"
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
index ef9b2659d2..c35cf6d799 100644
--- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
@@ -53,6 +53,7 @@
 #include <QtGui/private/qcoregraphics_p.h>
 
 #include <QtCore/QDebug>
+#include <QtCore/QRegExp>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoansmenu.h b/src/plugins/platforms/cocoa/qcocoansmenu.h
index 6cbb6e4a01..0c77e2f1aa 100644
--- a/src/plugins/platforms/cocoa/qcocoansmenu.h
+++ b/src/plugins/platforms/cocoa/qcocoansmenu.h
@@ -59,31 +59,20 @@ QT_FORWARD_DECLARE_CLASS(QCocoaMenu);
 QT_FORWARD_DECLARE_CLASS(QCocoaMenuItem);
 
 @interface QT_MANGLE_NAMESPACE(QCocoaNSMenuDelegate) : NSObject <NSMenuDelegate>
-
 + (instancetype)sharedMenuDelegate;
-
-- (NSMenuItem *)findItemInMenu:(NSMenu *)menu
-                        forKey:(NSString *)key
-                     modifiers:(NSUInteger)modifiers;
-
+- (NSMenuItem *)findItemInMenu:(NSMenu *)menu forKey:(NSString *)key modifiers:(NSUInteger)modifiers;
 @end
 
 @interface QT_MANGLE_NAMESPACE(QCocoaNSMenu) : NSMenu
-
 @property (readonly, nonatomic) QCocoaMenu *platformMenu;
-
 - (instancetype)initWithPlatformMenu:(QCocoaMenu *)menu;
-
 @end
 
 @interface QT_MANGLE_NAMESPACE(QCocoaNSMenuItem) : NSMenuItem
-
 @property (nonatomic) QCocoaMenuItem *platformMenuItem;
-
 + (instancetype)separatorItemWithPlatformMenuItem:(QCocoaMenuItem *)menuItem;
 - (instancetype)initWithPlatformMenuItem:(QCocoaMenuItem *)menuItem;
 - (instancetype)init;
-
 @end
 
 QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaNSMenu);
diff --git a/src/plugins/platforms/cocoa/qcocoascreen.h b/src/plugins/platforms/cocoa/qcocoascreen.h
index 491af2fe9c..60243b79be 100644
--- a/src/plugins/platforms/cocoa/qcocoascreen.h
+++ b/src/plugins/platforms/cocoa/qcocoascreen.h
@@ -68,6 +68,7 @@ public:
     qreal devicePixelRatio() const override { return m_devicePixelRatio; }
     QSizeF physicalSize() const override { return m_physicalSize; }
     QDpi logicalDpi() const override { return m_logicalDpi; }
+    QDpi logicalBaseDpi() const override { return m_logicalDpi; }
     qreal refreshRate() const override { return m_refreshRate; }
     QString name() const override { return m_name; }
     QPlatformCursor *cursor() const override { return m_cursor; }
diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
index 9b6dc94d33..cb25bd7d81 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -52,6 +52,8 @@
 @property (class, strong, readonly) NSColor *unemphasizedSelectedTextColor NS_AVAILABLE_MAC(10_14);
 @property (class, strong, readonly) NSColor *unemphasizedSelectedContentBackgroundColor NS_AVAILABLE_MAC(10_14);
 @property (class, strong, readonly) NSArray<NSColor *> *alternatingContentBackgroundColors NS_AVAILABLE_MAC(10_14);
+// Missing from non-Mojave SDKs, even if introduced in 10.10
+@property (class, strong, readonly) NSColor *linkColor NS_AVAILABLE_MAC(10_10);
 @end
 #endif
 
@@ -111,6 +113,8 @@ QPalette * qt_mac_createSystemPalette()
 
     palette->setBrush(QPalette::ToolTipBase, qt_mac_toQBrush([NSColor controlColor]));
 
+    palette->setColor(QPalette::Normal, QPalette::Link, qt_mac_toQColor([NSColor linkColor]));
+
     return palette;
 }
 
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
index db64702b8d..a5b42ac4e3 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
@@ -80,6 +80,8 @@
 #include <qimagewriter.h>
 #include <qdebug.h>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include "qcocoamenu.h"
 
 #include "qt_mac_p.h"
@@ -92,8 +94,6 @@
 
 QT_USE_NAMESPACE
 
-@class QT_MANGLE_NAMESPACE(QNSImageView);
-
 @interface QT_MANGLE_NAMESPACE(QNSStatusItem) : NSObject <NSUserNotificationCenterDelegate>
 @property (nonatomic, assign) QCocoaMenu *menu;
 @property (nonatomic, assign) QIcon icon;
@@ -104,12 +104,13 @@ QT_USE_NAMESPACE
 - (void)doubleClickSelector:(id)sender;
 @end
 
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSStatusItem);
+
 @interface QT_MANGLE_NAMESPACE(QNSImageView) : NSImageView
 @property (nonatomic, assign) BOOL down;
-@property (nonatomic, assign) QT_MANGLE_NAMESPACE(QNSStatusItem) *parent;
+@property (nonatomic, assign) QNSStatusItem *parent;
 @end
 
-QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSStatusItem);
 QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSImageView);
 
 QT_BEGIN_NAMESPACE
@@ -360,7 +361,7 @@ QT_END_NAMESPACE
 @implementation QNSStatusItem {
     QCocoaSystemTrayIcon *systray;
     NSStatusItem *item;
-    QT_MANGLE_NAMESPACE(QNSImageView) *imageCell;
+    QNSImageView *imageCell;
 }
 
 @synthesize menu = menu;
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.h b/src/plugins/platforms/cocoa/qcocoatheme.h
index 788b616e78..a00cbdfea3 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.h
+++ b/src/plugins/platforms/cocoa/qcocoatheme.h
@@ -43,8 +43,6 @@
 #include <QtCore/QHash>
 #include <qpa/qplatformtheme.h>
 
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaThemeAppAppearanceObserver));
-
 #include <QtCore/private/qcore_mac_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index c6ce6e6819..fef72bc496 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -161,7 +161,6 @@ public:
     Q_NOTIFICATION_HANDLER(NSWindowDidOrderOffScreenNotification) void windowDidOrderOffScreen();
     Q_NOTIFICATION_HANDLER(NSWindowDidChangeOcclusionStateNotification) void windowDidChangeOcclusionState();
     Q_NOTIFICATION_HANDLER(NSWindowDidChangeScreenNotification) void windowDidChangeScreen();
-    Q_NOTIFICATION_HANDLER(NSWindowDidChangeBackingPropertiesNotification) void windowDidChangeBackingProperties();
     Q_NOTIFICATION_HANDLER(NSWindowWillCloseNotification) void windowWillClose();
 
     bool windowShouldClose();
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index db4bc12210..a744a86695 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -1262,17 +1262,6 @@ void QCocoaWindow::windowDidChangeScreen()
         currentScreen->requestUpdate();
     }
 }
-/*
-    The window's backing scale factor or color space has changed.
-*/
-void QCocoaWindow::windowDidChangeBackingProperties()
-{
-    // Ideally we would plumb this thought QPA in a way that lets clients
-    // invalidate their own caches, and recreate QBackingStore. For now we
-    // trigger an expose, and let QCocoaBackingStore deal with its own
-    // buffer invalidation.
-    [m_view setNeedsDisplay:YES];
-}
 
 void QCocoaWindow::windowWillClose()
 {
@@ -1286,14 +1275,11 @@ void QCocoaWindow::windowWillClose()
 bool QCocoaWindow::windowShouldClose()
 {
     qCDebug(lcQpaWindow) << "QCocoaWindow::windowShouldClose" << window();
-   // This callback should technically only determine if the window
-   // should (be allowed to) close, but since our QPA API to determine
-   // that also involves actually closing the window we do both at the
-   // same time, instead of doing the latter in windowWillClose.
-    bool accepted = false;
-    QWindowSystemInterface::handleCloseEvent(window(), &accepted);
-    QWindowSystemInterface::flushWindowSystemEvents();
-    return accepted;
+    // This callback should technically only determine if the window
+    // should (be allowed to) close, but since our QPA API to determine
+    // that also involves actually closing the window we do both at the
+    // same time, instead of doing the latter in windowWillClose.
+    return QWindowSystemInterface::handleCloseEvent<QWindowSystemInterface::SynchronousDelivery>(window());
 }
 
 // ----------------------------- QPA forwarding -----------------------------
diff --git a/src/plugins/platforms/cocoa/qnsview.h b/src/plugins/platforms/cocoa/qnsview.h
index b40dfe0d14..74d0735b4c 100644
--- a/src/plugins/platforms/cocoa/qnsview.h
+++ b/src/plugins/platforms/cocoa/qnsview.h
@@ -51,37 +51,30 @@ class QCocoaGLContext;
 class QPointF;
 QT_END_NAMESPACE
 
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper));
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaNSMenuItem));
-
 @interface QT_MANGLE_NAMESPACE(QNSView) : NSView
-
 @property (nonatomic, retain) NSCursor *cursor;
-
 - (instancetype)initWithCocoaWindow:(QCocoaWindow *)platformWindow;
-
 - (void)convertFromScreen:(NSPoint)mouseLocation toWindowPoint:(QPointF *)qtWindowPoint andScreenPoint:(QPointF *)qtScreenPoint;
-
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (MouseAPI)
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView);
+
+@interface QNSView (MouseAPI)
 - (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent;
 - (void)resetMouseButtons;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (KeysAPI)
+@interface QNSView (KeysAPI)
 + (Qt::KeyboardModifiers)convertKeyModifiers:(ulong)modifierFlags;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (ComplexTextAPI)
+@interface QNSView (ComplexTextAPI)
 - (void)unmarkText;
 - (void)cancelComposingText;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (QtExtras)
+@interface QNSView (QtExtras)
 @property (nonatomic, readonly) QCocoaWindow *platformWindow;
 @end
 
-QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView);
-
 #endif //QNSVIEW_H
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 5309449dce..a6e5ca5f7b 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -66,13 +66,13 @@
 #include "qcocoaintegration.h"
 
 // Private interface
-@interface QT_MANGLE_NAMESPACE(QNSView) ()
+@interface QNSView ()
 - (BOOL)isTransparentForUserInput;
 @property (assign) NSView* previousSuperview;
 @property (assign) NSWindow* previousWindow;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (Drawing) <CALayerDelegate>
+@interface QNSView (Drawing) <CALayerDelegate>
 - (void)initDrawing;
 @end
 
@@ -84,7 +84,9 @@
 - (void)cursorUpdate:(NSEvent *)theEvent;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (Mouse)
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
+
+@interface QNSView (Mouse)
 - (void)initMouse;
 - (NSPoint)screenMousePoint:(NSEvent *)theEvent;
 - (void)mouseMovedImpl:(NSEvent *)theEvent;
@@ -92,28 +94,28 @@
 - (void)mouseExitedImpl:(NSEvent *)theEvent;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (Touch)
+@interface QNSView (Touch)
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (Tablet)
+@interface QNSView (Tablet)
 - (bool)handleTabletEvent:(NSEvent *)theEvent;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (Gestures)
+@interface QNSView (Gestures)
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (Dragging)
+@interface QNSView (Dragging)
 -(void)registerDragTypes;
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (Keys)
+@interface QNSView (Keys)
 @end
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (ComplexText) <NSTextInputClient>
+@interface QNSView (ComplexText) <NSTextInputClient>
 - (void)textInputContextKeyboardSelectionDidChangeNotification:(NSNotification *)textInputContextKeyboardSelectionDidChangeNotification;
 @end
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) {
+@implementation QNSView {
     QPointer<QCocoaWindow> m_platformWindow;
     Qt::MouseButtons m_buttons;
     Qt::MouseButtons m_acceptedMouseDowns;
@@ -125,7 +127,7 @@
     bool m_sendUpAsRightButton;
     Qt::KeyboardModifiers m_currentWheelModifiers;
     NSString *m_inputSource;
-    QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) *m_mouseMoveHelper;
+    QNSViewMouseMoveHelper *m_mouseMoveHelper;
     bool m_resendKeyEvent;
     bool m_scrolling;
     bool m_updatingDrag;
@@ -379,7 +381,7 @@
 
 // -----------------------------------------------------
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (QtExtras)
+@implementation QNSView (QtExtras)
 
 - (QCocoaWindow*)platformWindow
 {
diff --git a/src/plugins/platforms/cocoa/qnsview_accessibility.mm b/src/plugins/platforms/cocoa/qnsview_accessibility.mm
index 32ec0b74d4..7041e14da7 100644
--- a/src/plugins/platforms/cocoa/qnsview_accessibility.mm
+++ b/src/plugins/platforms/cocoa/qnsview_accessibility.mm
@@ -47,7 +47,7 @@
 
 #import <AppKit/NSAccessibility.h>
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Accessibility)
+@implementation QNSView (Accessibility)
 
 - (id)childAccessibleElement
 {
diff --git a/src/plugins/platforms/cocoa/qnsview_complextext.mm b/src/plugins/platforms/cocoa/qnsview_complextext.mm
index 6ff9b26ca4..5926840cf3 100644
--- a/src/plugins/platforms/cocoa/qnsview_complextext.mm
+++ b/src/plugins/platforms/cocoa/qnsview_complextext.mm
@@ -39,7 +39,7 @@
 
 // This file is included from qnsview.mm, and only used to organize the code
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (ComplexTextAPI)
+@implementation QNSView (ComplexTextAPI)
 
 - (void)cancelComposingText
 {
@@ -80,7 +80,7 @@
 
 @end
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (ComplexText)
+@implementation QNSView (ComplexText)
 
 - (void)insertNewline:(id)sender
 {
diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm
index 41b96b2df6..650612e7ff 100644
--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
@@ -39,7 +39,7 @@
 
 // This file is included from qnsview.mm, and only used to organize the code
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Dragging)
+@implementation QNSView (Dragging)
 
 -(void)registerDragTypes
 {
diff --git a/src/plugins/platforms/cocoa/qnsview_drawing.mm b/src/plugins/platforms/cocoa/qnsview_drawing.mm
index d2e6f848a0..eb9286519d 100644
--- a/src/plugins/platforms/cocoa/qnsview_drawing.mm
+++ b/src/plugins/platforms/cocoa/qnsview_drawing.mm
@@ -39,13 +39,11 @@
 
 // This file is included from qnsview.mm, and only used to organize the code
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Drawing)
+@implementation QNSView (Drawing)
 
 - (void)initDrawing
 {
-    self.wantsLayer = [self layerExplicitlyRequested]
-        || [self shouldUseMetalLayer]
-        || [self layerEnabledByMacOS];
+    [self updateLayerBacking];
 
     // Enable high-DPI OpenGL for retina displays. Enabling has the side
     // effect that Cocoa will start calling glViewport(0, 0, width, height),
@@ -71,22 +69,13 @@
     return YES;
 }
 
-- (void)drawRect:(NSRect)dirtyRect
-{
-    Q_UNUSED(dirtyRect);
+// ----------------------- Layer setup -----------------------
 
-    if (!m_platformWindow)
-        return;
-
-    QRegion exposedRegion;
-    const NSRect *dirtyRects;
-    NSInteger numDirtyRects;
-    [self getRectsBeingDrawn:&dirtyRects count:&numDirtyRects];
-    for (int i = 0; i < numDirtyRects; ++i)
-        exposedRegion += QRectF::fromCGRect(dirtyRects[i]).toRect();
-
-    qCDebug(lcQpaDrawing) << "[QNSView drawRect:]" << m_platformWindow->window() << exposedRegion;
-    m_platformWindow->handleExposeEvent(exposedRegion);
+- (void)updateLayerBacking
+{
+    self.wantsLayer = [self layerEnabledByMacOS]
+        || [self layerExplicitlyRequested]
+        || [self shouldUseMetalLayer];
 }
 
 - (BOOL)layerEnabledByMacOS
@@ -123,40 +112,81 @@
     return surfaceType == QWindow::MetalSurface || surfaceType == QWindow::VulkanSurface;
 }
 
+/*
+    This method is called by AppKit when layer-backing is requested by
+    setting wantsLayer too YES (via -[NSView _updateLayerBackedness]),
+    or in cases where AppKit itself decides that a view should be
+    layer-backed.
+
+    Note however that some code paths in AppKit will not go via this
+    method for creating the backing layer, and will instead create the
+    layer manually, and just call setLayer. An example of this is when
+    an NSOpenGLContext is attached to a view, in which case AppKit will
+    create a new layer in NSOpenGLContextSetLayerOnViewIfNecessary.
+
+    For this reason we leave the implementation of this override as
+    minimal as possible, only focusing on creating the appropriate
+    layer type, and then leave it up to setLayer to do the work of
+    making sure the layer is set up correctly.
+*/
 - (CALayer *)makeBackingLayer
 {
     if ([self shouldUseMetalLayer]) {
         // Check if Metal is supported. If it isn't then it's most likely
         // too late at this point and the QWindow will be non-functional,
         // but we can at least print a warning.
-        if (![MTLCreateSystemDefaultDevice() autorelease]) {
-            qWarning() << "QWindow initialization error: Metal is not supported";
-            return [super makeBackingLayer];
+        if ([MTLCreateSystemDefaultDevice() autorelease]) {
+            return [CAMetalLayer layer];
+        } else {
+            qCWarning(lcQpaDrawing) << "Failed to create QWindow::MetalSurface."
+                << "Metal is not supported by any of the GPUs in this system.";
         }
-
-        CAMetalLayer *layer = [CAMetalLayer layer];
-
-        // Set the contentsScale for the layer. This is normally done in
-        // viewDidChangeBackingProperties, however on startup that function
-        // is called before the layer is created here. The layer's drawableSize
-        // is updated from layoutSublayersOfLayer as usual.
-        layer.contentsScale = self.window.backingScaleFactor;
-
-        return layer;
     }
 
     return [super makeBackingLayer];
 }
 
+/*
+    This method is called by AppKit whenever the view is asked to change
+    its layer, which can happen both as a result of enabling layer-backing,
+    or when a layer is set explicitly. The latter can happen both when a
+    view is layer-hosting, or when AppKit internals are switching out the
+    layer-backed view, as described above for makeBackingLayer.
+*/
 - (void)setLayer:(CALayer *)layer
 {
-    qCDebug(lcQpaDrawing) << "Making" << self << "layer-backed with" << layer
-        << "due to being" << ([self layerExplicitlyRequested] ? "explicitly requested"
+    qCDebug(lcQpaDrawing) << "Making" << self
+        << (self.wantsLayer ? "layer-backed" : "layer-hosted")
+        << "with" << layer << "due to being" << ([self layerExplicitlyRequested] ? "explicitly requested"
             : [self shouldUseMetalLayer] ? "needed by surface type" : "enabled by macOS");
+
+    if (layer.delegate && layer.delegate != self) {
+        qCWarning(lcQpaDrawing) << "Layer already has delegate" << layer.delegate
+            << "This delegate is responsible for all view updates for" << self;
+    } else {
+        layer.delegate = self;
+    }
+
     [super setLayer:layer];
-    layer.delegate = self;
+
+    // When adding a view to a view hierarchy the backing properties will change
+    // which results in updating the contents scale, but in case of switching the
+    // layer on a view that's already in a view hierarchy we need to manually ensure
+    // the scale is up to date.
+    if (self.superview)
+        [self updateLayerContentsScale];
+
+    if (self.opaque && lcQpaDrawing().isDebugEnabled()) {
+        // If the view claims to be opaque we expect it to fill the entire
+        // layer with content, in which case we want to detect any areas
+        // where it doesn't.
+        layer.backgroundColor = NSColor.magentaColor.CGColor;
+    }
+
 }
 
+// ----------------------- Layer updates -----------------------
+
 - (NSViewLayerContentsRedrawPolicy)layerContentsRedrawPolicy
 {
     // We need to set this explicitly since the super implementation
@@ -164,64 +194,106 @@
     return NSViewLayerContentsRedrawDuringViewResize;
 }
 
-#if 0 // Disabled until we enable lazy backingstore resizing
 - (NSViewLayerContentsPlacement)layerContentsPlacement
 {
-    // Always place the layer at top left without any automatic scaling,
-    // so that we can re-use larger layers when resizing a window down.
+    // Always place the layer at top left without any automatic scaling.
+    // This will highlight situations where we're missing content for the
+    // layer by not responding to the displayLayer: request synchronously.
+    // It also allows us to re-use larger layers when resizing a window down.
     return NSViewLayerContentsPlacementTopLeft;
 }
-#endif
 
-- (void)updateMetalLayerDrawableSize:(CAMetalLayer *)layer
+- (void)viewDidChangeBackingProperties
 {
-    CGSize drawableSize = layer.bounds.size;
-    drawableSize.width *= layer.contentsScale;
-    drawableSize.height *= layer.contentsScale;
-    layer.drawableSize = drawableSize;
+    qCDebug(lcQpaDrawing) << "Backing properties changed for" << self;
+
+    if (self.layer)
+        [self updateLayerContentsScale];
+
+    // Ideally we would plumb this situation through QPA in a way that lets
+    // clients invalidate their own caches, recreate QBackingStore, etc.
+    // For now we trigger an expose, and let QCocoaBackingStore deal with
+    // buffer invalidation internally.
+    [self setNeedsDisplay:YES];
 }
 
-- (void)layoutSublayersOfLayer:(CALayer *)layer
+- (void)updateLayerContentsScale
 {
-    if ([layer isKindOfClass:CAMetalLayer.class])
-        [self updateMetalLayerDrawableSize:static_cast<CAMetalLayer* >(layer)];
+    // We expect clients to fill the layer with retina aware content,
+    // based on the devicePixelRatio of the QWindow, so we set the
+    // layer's content scale to match that. By going via devicePixelRatio
+    // instead of applying the NSWindow's backingScaleFactor, we also take
+    // into account OpenGL views with wantsBestResolutionOpenGLSurface set
+    // to NO. In this case the window will have a backingScaleFactor of 2,
+    // but the QWindow will have a devicePixelRatio of 1.
+    auto devicePixelRatio = m_platformWindow->devicePixelRatio();
+    qCDebug(lcQpaDrawing) << "Updating" << self.layer << "content scale to" << devicePixelRatio;
+    self.layer.contentsScale = devicePixelRatio;
 }
 
-- (void)displayLayer:(CALayer *)layer
+/*
+    This method is called by AppKit to determine whether it should update
+    the contentScale of the layer to match the window backing scale.
+
+    We always return NO since we're updating the contents scale manually.
+*/
+- (BOOL)layer:(CALayer *)layer shouldInheritContentsScale:(CGFloat)scale fromWindow:(NSWindow *)window
 {
-    if (!NSThread.isMainThread) {
-        // Qt is calling AppKit APIs such as -[NSOpenGLContext setView:] on secondary threads,
-        // which we shouldn't do. This may result in AppKit (wrongly) triggering a display on
-        // the thread where we made the call, so block it here and defer to the main thread.
-        qCWarning(lcQpaDrawing) << "Display non non-main thread! Deferring to main thread";
-        dispatch_async(dispatch_get_main_queue(), ^{ self.needsDisplay = YES; });
-        return;
-    }
+    Q_UNUSED(layer); Q_UNUSED(scale); Q_UNUSED(window);
+    return NO;
+}
 
-    Q_ASSERT(layer == self.layer);
+// ----------------------- Draw callbacks -----------------------
+
+/*
+    This method is called by AppKit for the non-layer case, where we are
+    drawing into the NSWindow's surface.
+*/
+- (void)drawRect:(NSRect)dirtyBoundingRect
+{
+    Q_ASSERT_X(!self.layer, "QNSView",
+        "The drawRect code path should not be hit when we are layer backed");
 
     if (!m_platformWindow)
         return;
 
-    qCDebug(lcQpaDrawing) << "[QNSView displayLayer]" << m_platformWindow->window();
+    QRegion exposedRegion;
+    const NSRect *dirtyRects;
+    NSInteger numDirtyRects;
+    [self getRectsBeingDrawn:&dirtyRects count:&numDirtyRects];
+    for (int i = 0; i < numDirtyRects; ++i)
+        exposedRegion += QRectF::fromCGRect(dirtyRects[i]).toRect();
 
-    // FIXME: Find out if there's a way to resolve the dirty rect like in drawRect:
-    m_platformWindow->handleExposeEvent(QRectF::fromCGRect(self.bounds).toRect());
+    if (exposedRegion.isEmpty())
+        exposedRegion = QRectF::fromCGRect(dirtyBoundingRect).toRect();
+
+    qCDebug(lcQpaDrawing) << "[QNSView drawRect:]" << m_platformWindow->window() << exposedRegion;
+    m_platformWindow->handleExposeEvent(exposedRegion);
 }
 
-- (void)viewDidChangeBackingProperties
+/*
+    This method is called by AppKit when we are layer-backed, where
+    we are drawing into the layer.
+*/
+- (void)displayLayer:(CALayer *)layer
 {
-    CALayer *layer = self.layer;
-    if (!layer)
-        return;
+    Q_ASSERT_X(self.layer && layer == self.layer, "QNSView",
+        "The displayLayer code path should only be hit for our own layer");
 
-    layer.contentsScale = self.window.backingScaleFactor;
+    if (!m_platformWindow)
+        return;
 
-    // Metal layers must be manually updated on e.g. screen change
-    if ([layer isKindOfClass:CAMetalLayer.class]) {
-        [self updateMetalLayerDrawableSize:static_cast<CAMetalLayer* >(layer)];
-        [self setNeedsDisplay:YES];
+    if (!NSThread.isMainThread) {
+        // Qt is calling AppKit APIs such as -[NSOpenGLContext setView:] on secondary threads,
+        // which we shouldn't do. This may result in AppKit (wrongly) triggering a display on
+        // the thread where we made the call, so block it here and defer to the main thread.
+        qCWarning(lcQpaDrawing) << "Display non non-main thread! Deferring to main thread";
+        dispatch_async(dispatch_get_main_queue(), ^{ self.needsDisplay = YES; });
+        return;
     }
+
+    qCDebug(lcQpaDrawing) << "[QNSView displayLayer]" << m_platformWindow->window();
+    m_platformWindow->handleExposeEvent(QRectF::fromCGRect(self.bounds).toRect());
 }
 
 @end
diff --git a/src/plugins/platforms/cocoa/qnsview_gestures.mm b/src/plugins/platforms/cocoa/qnsview_gestures.mm
index 61d551ee0e..a80261fd6a 100644
--- a/src/plugins/platforms/cocoa/qnsview_gestures.mm
+++ b/src/plugins/platforms/cocoa/qnsview_gestures.mm
@@ -43,7 +43,7 @@
 
 Q_LOGGING_CATEGORY(lcQpaGestures, "qt.qpa.input.gestures")
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Gestures)
+@implementation QNSView (Gestures)
 
 - (bool)handleGestureAsBeginEnd:(NSEvent *)event
 {
@@ -70,7 +70,7 @@ Q_LOGGING_CATEGORY(lcQpaGestures, "qt.qpa.input.gestures")
     if ([self handleGestureAsBeginEnd:event])
         return;
 
-    qCDebug(lcQpaGestures) << "magnifyWithEvent" << [event magnification] << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaGestures) << "magnifyWithEvent" << [event magnification] << "from device" << Qt::hex << [event deviceID];
     const NSTimeInterval timestamp = [event timestamp];
     QPointF windowPoint;
     QPointF screenPoint;
@@ -85,7 +85,7 @@ Q_LOGGING_CATEGORY(lcQpaGestures, "qt.qpa.input.gestures")
         return;
 
     static bool zoomIn = true;
-    qCDebug(lcQpaGestures) << "smartMagnifyWithEvent" << zoomIn << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaGestures) << "smartMagnifyWithEvent" << zoomIn << "from device" << Qt::hex << [event deviceID];
     const NSTimeInterval timestamp = [event timestamp];
     QPointF windowPoint;
     QPointF screenPoint;
@@ -116,7 +116,7 @@ Q_LOGGING_CATEGORY(lcQpaGestures, "qt.qpa.input.gestures")
     if (!m_platformWindow)
         return;
 
-    qCDebug(lcQpaGestures) << "swipeWithEvent" << [event deltaX] << [event deltaY] << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaGestures) << "swipeWithEvent" << [event deltaX] << [event deltaY] << "from device" << Qt::hex << [event deviceID];
     const NSTimeInterval timestamp = [event timestamp];
     QPointF windowPoint;
     QPointF screenPoint;
@@ -145,7 +145,7 @@ Q_LOGGING_CATEGORY(lcQpaGestures, "qt.qpa.input.gestures")
     QPointF windowPoint;
     QPointF screenPoint;
     [self convertFromScreen:[self screenMousePoint:event] toWindowPoint:&windowPoint andScreenPoint:&screenPoint];
-    qCDebug(lcQpaGestures) << "beginGestureWithEvent @" << windowPoint << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaGestures) << "beginGestureWithEvent @" << windowPoint << "from device" << Qt::hex << [event deviceID];
     QWindowSystemInterface::handleGestureEvent(m_platformWindow->window(), QCocoaTouch::getTouchDevice(QTouchDevice::TouchPad, [event deviceID]),  timestamp, Qt::BeginNativeGesture,
                                                windowPoint, screenPoint);
 }
@@ -155,7 +155,7 @@ Q_LOGGING_CATEGORY(lcQpaGestures, "qt.qpa.input.gestures")
     if (!m_platformWindow)
         return;
 
-    qCDebug(lcQpaGestures) << "endGestureWithEvent" << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaGestures) << "endGestureWithEvent" << "from device" << Qt::hex << [event deviceID];
     const NSTimeInterval timestamp = [event timestamp];
     QPointF windowPoint;
     QPointF screenPoint;
diff --git a/src/plugins/platforms/cocoa/qnsview_keys.mm b/src/plugins/platforms/cocoa/qnsview_keys.mm
index ad751279bb..847adca207 100644
--- a/src/plugins/platforms/cocoa/qnsview_keys.mm
+++ b/src/plugins/platforms/cocoa/qnsview_keys.mm
@@ -39,7 +39,7 @@
 
 // This file is included from qnsview.mm, and only used to organize the code
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (KeysAPI)
+@implementation QNSView (KeysAPI)
 
 + (Qt::KeyboardModifiers)convertKeyModifiers:(ulong)modifierFlags
 {
@@ -60,7 +60,7 @@
 
 @end
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Keys)
+@implementation QNSView (Keys)
 
 - (int)convertKeyCode:(QChar)keyChar
 {
diff --git a/src/plugins/platforms/cocoa/qnsview_menus.mm b/src/plugins/platforms/cocoa/qnsview_menus.mm
index f0489552aa..a55fd97eb7 100644
--- a/src/plugins/platforms/cocoa/qnsview_menus.mm
+++ b/src/plugins/platforms/cocoa/qnsview_menus.mm
@@ -53,11 +53,11 @@ static bool selectorIsCutCopyPaste(SEL selector)
             || selector == @selector(selectAll:));
 }
 
-@interface QT_MANGLE_NAMESPACE(QNSView) (Menus)
+@interface QNSView (Menus)
 - (void)qt_itemFired:(QCocoaNSMenuItem *)item;
 @end
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Menus)
+@implementation QNSView (Menus)
 
 - (BOOL)validateMenuItem:(NSMenuItem*)item
 {
diff --git a/src/plugins/platforms/cocoa/qnsview_mouse.mm b/src/plugins/platforms/cocoa/qnsview_mouse.mm
index 3a5a074264..9e2761f850 100644
--- a/src/plugins/platforms/cocoa/qnsview_mouse.mm
+++ b/src/plugins/platforms/cocoa/qnsview_mouse.mm
@@ -55,7 +55,7 @@
     interact with the responder chain by e.g. calling super if Qt does not
     accept the mouse event
 */
-@implementation QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) {
+@implementation QNSViewMouseMoveHelper {
     QNSView *view;
 }
 
@@ -89,7 +89,7 @@
 
 @end
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (MouseAPI)
+@implementation QNSView (MouseAPI)
 
 - (void)resetMouseButtons
 {
@@ -178,7 +178,7 @@
 }
 @end
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Mouse)
+@implementation QNSView (Mouse)
 
 - (void)initMouse
 {
@@ -193,7 +193,7 @@
     m_dontOverrideCtrlLMB = qt_mac_resolveOption(false, m_platformWindow->window(),
             "_q_platform_MacDontOverrideCtrlLMB", "QT_MAC_DONT_OVERRIDE_CTRL_LMB");
 
-    m_mouseMoveHelper = [[QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) alloc] initWithView:self];
+    m_mouseMoveHelper = [[QNSViewMouseMoveHelper alloc] initWithView:self];
 
     NSUInteger trackingOptions = NSTrackingActiveInActiveApp
         | NSTrackingMouseEnteredAndExited | NSTrackingCursorUpdate;
@@ -222,6 +222,11 @@
         return NO;
     if ([self isTransparentForUserInput])
         return NO;
+    QPointF windowPoint;
+    QPointF screenPoint;
+    [self convertFromScreen:[NSEvent mouseLocation] toWindowPoint: &windowPoint andScreenPoint: &screenPoint];
+    if (!qt_window_private(m_platformWindow->window())->allowClickThrough(screenPoint.toPoint()))
+        return NO;
     return YES;
 }
 
diff --git a/src/plugins/platforms/cocoa/qnsview_tablet.mm b/src/plugins/platforms/cocoa/qnsview_tablet.mm
index 43b0aa0960..ba1fa55892 100644
--- a/src/plugins/platforms/cocoa/qnsview_tablet.mm
+++ b/src/plugins/platforms/cocoa/qnsview_tablet.mm
@@ -54,7 +54,7 @@ struct QCocoaTabletDeviceData
 typedef QHash<uint, QCocoaTabletDeviceData> QCocoaTabletDeviceDataHash;
 Q_GLOBAL_STATIC(QCocoaTabletDeviceDataHash, tabletDeviceDataHash)
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Tablet)
+@implementation QNSView (Tablet)
 
 - (bool)handleTabletEvent:(NSEvent *)theEvent
 {
diff --git a/src/plugins/platforms/cocoa/qnsview_touch.mm b/src/plugins/platforms/cocoa/qnsview_touch.mm
index e789213f70..8dfae27c63 100644
--- a/src/plugins/platforms/cocoa/qnsview_touch.mm
+++ b/src/plugins/platforms/cocoa/qnsview_touch.mm
@@ -41,7 +41,7 @@
 
 Q_LOGGING_CATEGORY(lcQpaTouch, "qt.qpa.input.touch")
 
-@implementation QT_MANGLE_NAMESPACE(QNSView) (Touch)
+@implementation QNSView (Touch)
 
 - (bool)shouldSendSingleTouch
 {
@@ -60,7 +60,7 @@ Q_LOGGING_CATEGORY(lcQpaTouch, "qt.qpa.input.touch")
 
     const NSTimeInterval timestamp = [event timestamp];
     const QList<QWindowSystemInterface::TouchPoint> points = QCocoaTouch::getCurrentTouchPointList(event, [self shouldSendSingleTouch]);
-    qCDebug(lcQpaTouch) << "touchesBeganWithEvent" << points << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaTouch) << "touchesBeganWithEvent" << points << "from device" << Qt::hex << [event deviceID];
     QWindowSystemInterface::handleTouchEvent(m_platformWindow->window(), timestamp * 1000, QCocoaTouch::getTouchDevice(QTouchDevice::TouchPad, [event deviceID]), points);
 }
 
@@ -71,7 +71,7 @@ Q_LOGGING_CATEGORY(lcQpaTouch, "qt.qpa.input.touch")
 
     const NSTimeInterval timestamp = [event timestamp];
     const QList<QWindowSystemInterface::TouchPoint> points = QCocoaTouch::getCurrentTouchPointList(event, [self shouldSendSingleTouch]);
-    qCDebug(lcQpaTouch) << "touchesMovedWithEvent" << points << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaTouch) << "touchesMovedWithEvent" << points << "from device" << Qt::hex << [event deviceID];
     QWindowSystemInterface::handleTouchEvent(m_platformWindow->window(), timestamp * 1000, QCocoaTouch::getTouchDevice(QTouchDevice::TouchPad, [event deviceID]), points);
 }
 
@@ -82,7 +82,7 @@ Q_LOGGING_CATEGORY(lcQpaTouch, "qt.qpa.input.touch")
 
     const NSTimeInterval timestamp = [event timestamp];
     const QList<QWindowSystemInterface::TouchPoint> points = QCocoaTouch::getCurrentTouchPointList(event, [self shouldSendSingleTouch]);
-    qCDebug(lcQpaTouch) << "touchesEndedWithEvent" << points << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaTouch) << "touchesEndedWithEvent" << points << "from device" << Qt::hex << [event deviceID];
     QWindowSystemInterface::handleTouchEvent(m_platformWindow->window(), timestamp * 1000, QCocoaTouch::getTouchDevice(QTouchDevice::TouchPad, [event deviceID]), points);
 }
 
@@ -93,7 +93,7 @@ Q_LOGGING_CATEGORY(lcQpaTouch, "qt.qpa.input.touch")
 
     const NSTimeInterval timestamp = [event timestamp];
     const QList<QWindowSystemInterface::TouchPoint> points = QCocoaTouch::getCurrentTouchPointList(event, [self shouldSendSingleTouch]);
-    qCDebug(lcQpaTouch) << "touchesCancelledWithEvent" << points << "from device" << hex << [event deviceID];
+    qCDebug(lcQpaTouch) << "touchesCancelledWithEvent" << points << "from device" << Qt::hex << [event deviceID];
     QWindowSystemInterface::handleTouchEvent(m_platformWindow->window(), timestamp * 1000, QCocoaTouch::getTouchDevice(QTouchDevice::TouchPad, [event deviceID]), points);
 }
 
diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm
index 68cb270457..6b4e110af2 100644
--- a/src/plugins/platforms/cocoa/qnswindow.mm
+++ b/src/plugins/platforms/cocoa/qnswindow.mm
@@ -255,8 +255,8 @@ static bool isMouseEvent(NSEvent *ev)
 
 - (NSColor *)backgroundColor
 {
-    return self.styleMask & NSWindowStyleMaskTexturedBackground ?
-                [super backgroundColor] : [NSColor clearColor];
+    return self.styleMask == NSWindowStyleMaskBorderless ?
+        [NSColor clearColor] : [super backgroundColor];
 }
 
 - (void)sendEvent:(NSEvent*)theEvent
diff --git a/src/plugins/platforms/cocoa/qprintengine_mac_p.h b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
index 3d94227ae4..6a1ed2e263 100644
--- a/src/plugins/platforms/cocoa/qprintengine_mac_p.h
+++ b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
@@ -64,11 +64,7 @@
 
 #include "qpaintengine_mac_p.h"
 
-#ifdef __OBJC__
-@class NSPrintInfo;
-#else
-typedef void NSPrintInfo;
-#endif
+Q_FORWARD_DECLARE_OBJC_CLASS(NSPrintInfo);
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro
index 9764272632..6e73bd14f9 100644
--- a/src/plugins/platforms/direct2d/direct2d.pro
+++ b/src/plugins/platforms/direct2d/direct2d.pro
@@ -8,8 +8,8 @@ QT += \
 qtConfig(accessibility): QT += accessibility_support-private
 qtConfig(vulkan): QT += vulkan_support-private
 
-LIBS += -ldwmapi -lversion -lgdi32
-QMAKE_USE_PRIVATE += dwrite_1 d2d1_1 d3d11_1 dxgi1_2
+LIBS += -ldwmapi -lversion
+QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1 d3d11_1 dxgi1_2
 
 include(../windows/windows.pri)
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
index f72ea2b038..6d4d47e3da 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
@@ -48,7 +48,7 @@ class QWindowsDirect2DWindow;
 
 class QWindowsDirect2DBackingStore : public QPlatformBackingStore
 {
-    Q_DISABLE_COPY(QWindowsDirect2DBackingStore)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DBackingStore)
 
 public:
     QWindowsDirect2DBackingStore(QWindow *window);
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
index d8a8a49aec..8fd683106d 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
@@ -59,7 +59,7 @@ class QColor;
 class QWindowsDirect2DBitmap
 {
     Q_DECLARE_PRIVATE(QWindowsDirect2DBitmap)
-    Q_DISABLE_COPY(QWindowsDirect2DBitmap)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DBitmap)
 public:
     QWindowsDirect2DBitmap();
     QWindowsDirect2DBitmap(ID2D1Bitmap1 *bitmap, ID2D1DeviceContext *dc);
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
index aee0eb867d..a28c674671 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
@@ -91,7 +91,7 @@ private:
 };
 
 class QWindowsDirect2DDeviceContextSuspender {
-    Q_DISABLE_COPY(QWindowsDirect2DDeviceContextSuspender)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DDeviceContextSuspender)
 
     QWindowsDirect2DDeviceContext *m_dc;
 public:
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
index 86c863ec50..e074f87eb4 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
@@ -51,22 +51,11 @@
 #include <QtCore/qversionnumber.h>
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtGui/qpa/qwindowsysteminterface.h>
-#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
 
 #include <QVarLengthArray>
 
 QT_BEGIN_NAMESPACE
 
-class QWindowsDirect2DEventDispatcher : public QWindowsGuiEventDispatcher
-{
-public:
-    QWindowsDirect2DEventDispatcher(QObject *parent = nullptr)
-        : QWindowsGuiEventDispatcher(parent)
-    {
-        uninstallMessageHook(); // ### Workaround for QTBUG-42428
-    }
-};
-
 class QWindowsDirect2DIntegrationPrivate
 {
 public:
@@ -91,7 +80,7 @@ static QVersionNumber systemD2DVersion()
 
                     if (VerQueryValue(info.constData(), __TEXT("\\"),
                                       reinterpret_cast<void **>(&fi), &size) && size) {
-                        const VS_FIXEDFILEINFO *verInfo = reinterpret_cast<const VS_FIXEDFILEINFO *>(fi);
+                        const auto *verInfo = reinterpret_cast<const VS_FIXEDFILEINFO *>(fi);
                         return QVersionNumber{HIWORD(verInfo->dwFileVersionMS), LOWORD(verInfo->dwFileVersionMS),
                                               HIWORD(verInfo->dwFileVersionLS), LOWORD(verInfo->dwFileVersionLS)};
                     }
@@ -140,7 +129,7 @@ QWindowsDirect2DIntegration *QWindowsDirect2DIntegration::create(const QStringLi
         return nullptr;
     }
 
-    QWindowsDirect2DIntegration *integration = new QWindowsDirect2DIntegration(paramList);
+    auto *integration = new QWindowsDirect2DIntegration(paramList);
 
     if (!integration->init()) {
         delete integration;
@@ -188,11 +177,6 @@ QPlatformBackingStore *QWindowsDirect2DIntegration::createPlatformBackingStore(Q
     return new QWindowsDirect2DBackingStore(window);
 }
 
-QAbstractEventDispatcher *QWindowsDirect2DIntegration::createEventDispatcher() const
-{
-    return new QWindowsDirect2DEventDispatcher;
-}
-
 QWindowsDirect2DContext *QWindowsDirect2DIntegration::direct2DContext() const
 {
     return &d->m_d2dContext;
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.h b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.h
index 19c7521eb7..5ea36e04bc 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.h
@@ -61,7 +61,6 @@ public:
     QPlatformNativeInterface *nativeInterface() const override;
     QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const override;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
-    QAbstractEventDispatcher *createEventDispatcher() const override;
 
     QWindowsDirect2DContext *direct2DContext() const;
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
index fa201c784e..03be44e095 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
@@ -253,7 +253,7 @@ struct D2DVectorPathCache {
 
     static void cleanup_func(QPaintEngineEx *engine, void *data) {
         Q_UNUSED(engine);
-        D2DVectorPathCache *e = static_cast<D2DVectorPathCache *>(data);
+        auto *e = static_cast<D2DVectorPathCache *>(data);
         delete e;
     }
 };
@@ -689,7 +689,7 @@ public:
                 *needsEmulation = true;
             } else {
                 ComPtr<ID2D1LinearGradientBrush> linear;
-                const QLinearGradient *qlinear = static_cast<const QLinearGradient *>(newBrush.gradient());
+                const auto *qlinear = static_cast<const QLinearGradient *>(newBrush.gradient());
 
                 D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES linearGradientBrushProperties;
                 ComPtr<ID2D1GradientStopCollection> gradientStopCollection;
@@ -727,7 +727,7 @@ public:
                 *needsEmulation = true;
             } else {
                 ComPtr<ID2D1RadialGradientBrush> radial;
-                const QRadialGradient *qradial = static_cast<const QRadialGradient *>(newBrush.gradient());
+                const auto *qradial = static_cast<const QRadialGradient *>(newBrush.gradient());
 
                 D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES radialGradientBrushProperties;
                 ComPtr<ID2D1GradientStopCollection> gradientStopCollection;
@@ -807,7 +807,7 @@ public:
                                                                  : nullptr;
 
         if (cacheEntry) {
-            D2DVectorPathCache *e = static_cast<D2DVectorPathCache *>(cacheEntry->data);
+            auto *e = static_cast<D2DVectorPathCache *>(cacheEntry->data);
             if (alias && e->aliased)
                 return e->aliased;
             else if (!alias && e->antiAliased)
@@ -885,7 +885,7 @@ public:
             if (!cacheEntry)
                 cacheEntry = path.addCacheData(q, new D2DVectorPathCache, D2DVectorPathCache::cleanup_func);
 
-            D2DVectorPathCache *e = static_cast<D2DVectorPathCache *>(cacheEntry->data);
+            auto *e = static_cast<D2DVectorPathCache *>(cacheEntry->data);
             if (alias)
                 e->aliased = geometry;
             else
@@ -941,9 +941,16 @@ public:
     {
         Q_Q(QWindowsDirect2DPaintEngine);
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         // Default path (no optimization)
         if (!(path.shape() == QVectorPath::LinesHint || path.shape() == QVectorPath::PolygonHint)
-                || !pen.dashBrush || q->state()->renderHints.testFlag(QPainter::HighQualityAntialiasing)) {
+                || !pen.dashBrush
+#if QT_DEPRECATED_SINCE(5, 14)
+                || q->state()->renderHints.testFlag(QPainter::HighQualityAntialiasing)
+#endif
+                || q->state()->renderHints.testFlag(QPainter::Antialiasing)) {
+QT_WARNING_POP
             ComPtr<ID2D1Geometry> geometry = vectorPathToID2D1PathGeometry(path);
             if (!geometry) {
                 qWarning("%s: Could not convert path to d2d geometry", __FUNCTION__);
@@ -1481,7 +1488,7 @@ void QWindowsDirect2DPaintEngine::drawPixmap(const QRectF &r,
         return;
     }
 
-    QWindowsDirect2DPlatformPixmap *pp = static_cast<QWindowsDirect2DPlatformPixmap *>(pm.handle());
+    auto *pp = static_cast<QWindowsDirect2DPlatformPixmap *>(pm.handle());
     QWindowsDirect2DBitmap *bitmap = pp->bitmap();
 
     ensurePen();
@@ -1593,7 +1600,7 @@ void QWindowsDirect2DPaintEngine::drawTextItem(const QPointF &p, const QTextItem
     Q_D(QWindowsDirect2DPaintEngine);
     D2D_TAG(D2DDebugDrawTextItemTag);
 
-    const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
+    const auto &ti = static_cast<const QTextItemInt &>(textItem);
     if (ti.glyphs.numGlyphs == 0)
         return;
 
@@ -1686,7 +1693,7 @@ void QWindowsDirect2DPaintEngine::rasterFill(const QVectorPath &path, const QBru
         p.setBrush(state()->brush);
         p.setPen(state()->pen);
 
-        QPaintEngineEx *extended = static_cast<QPaintEngineEx *>(engine);
+        auto *extended = static_cast<QPaintEngineEx *>(engine);
         for (const QPainterClipInfo &info : qAsConst(state()->clipInfo)) {
             extended->state()->matrix = info.matrix;
             extended->transformChanged();
@@ -1800,7 +1807,7 @@ void QWindowsDirect2DPaintEngine::resume()
 
 class QWindowsDirect2DPaintEngineSuspenderImpl
 {
-    Q_DISABLE_COPY(QWindowsDirect2DPaintEngineSuspenderImpl)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DPaintEngineSuspenderImpl)
     QWindowsDirect2DPaintEngine *m_engine;
     bool m_active;
 public:
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
index 6404c60b13..f61e908bce 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
@@ -128,7 +128,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QWindowsDirect2DPaintEngine::Flags)
 class QWindowsDirect2DPaintEngineSuspenderPrivate;
 class QWindowsDirect2DPaintEngineSuspender
 {
-    Q_DISABLE_COPY(QWindowsDirect2DPaintEngineSuspender)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DPaintEngineSuspender)
     Q_DECLARE_PRIVATE(QWindowsDirect2DPaintEngineSuspender)
     QScopedPointer<QWindowsDirect2DPaintEngineSuspenderPrivate> d_ptr;
 public:
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
index 239e5f3087..c417daaeae 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
@@ -310,7 +310,7 @@ void QWindowsDirect2DWindow::setupBitmap()
     QWindowsDirect2DPaintEngine::Flags flags = QWindowsDirect2DPaintEngine::NoFlag;
     if (!m_directRendering)
         flags |= QWindowsDirect2DPaintEngine::TranslucentTopLevelWindow;
-    QWindowsDirect2DPlatformPixmap *pp = new QWindowsDirect2DPlatformPixmap(QPlatformPixmap::PixmapType,
+    auto *pp = new QWindowsDirect2DPlatformPixmap(QPlatformPixmap::PixmapType,
                                                                             flags,
                                                                             m_bitmap.data());
     m_pixmap.reset(new QPixmap(pp));
diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
index 89c2e89f58..8768f9dd8c 100644
--- a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
+++ b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
@@ -59,6 +59,8 @@
 #include <QtGui/QOpenGLShaderProgram>
 #include <QtGui/private/qinputdevicemanager_p.h>
 
+#include <QtCore/qvector.h>
+
 QT_BEGIN_NAMESPACE
 
 class QOpenGLShaderProgram;
@@ -143,7 +145,7 @@ private:
         int cursorsPerRow;
         int width, height; // width and height of the atlas
         int cursorWidth, cursorHeight; // width and height of cursors inside the atlas
-        QList<QPoint> hotSpots;
+        QVector<QPoint> hotSpots;
         QImage image; // valid until it's uploaded
     } m_cursorAtlas;
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
index c96dd585d3..d47b579238 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
@@ -41,7 +41,7 @@
 #define QEGLFSKMSGBMCURSOR_H
 
 #include <qpa/qplatformcursor.h>
-#include <QtCore/QList>
+#include <QtCore/QVector>
 #include <QtGui/QImage>
 #include <QtGui/private/qinputdevicemanager_p.h>
 
@@ -110,7 +110,7 @@ private:
         int cursorsPerRow;
         int width, height; // width and height of the atlas
         int cursorWidth, cursorHeight; // width and height of cursors inside the atlas
-        QList<QPoint> hotSpots;
+        QVector<QPoint> hotSpots;
         QImage image;
     } m_cursorAtlas;
 };
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
index 359b086372..16dbfe1522 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
@@ -161,7 +161,7 @@ gbm_surface *QEglFSKmsGbmScreen::createSurface(EGLConfig eglConfig)
         if (queryFromEgl) {
             EGLint native_format = -1;
             EGLBoolean success = eglGetConfigAttrib(display(), eglConfig, EGL_NATIVE_VISUAL_ID, &native_format);
-            qCDebug(qLcEglfsKmsDebug) << "Got native format" << hex << native_format << dec
+            qCDebug(qLcEglfsKmsDebug) << "Got native format" << Qt::hex << native_format << Qt::dec
                                       << "from eglGetConfigAttrib() with return code" << bool(success);
 
             if (success) {
@@ -344,6 +344,9 @@ void QEglFSKmsGbmScreen::flip()
             static int zpos = qEnvironmentVariableIntValue("QT_QPA_EGLFS_KMS_ZPOS");
             if (zpos)
                 drmModeAtomicAddProperty(request, op.eglfs_plane->id, op.eglfs_plane->zposPropertyId, zpos);
+            static uint blendOp = uint(qEnvironmentVariableIntValue("QT_QPA_EGLFS_KMS_BLEND_OP"));
+            if (blendOp)
+                drmModeAtomicAddProperty(request, op.eglfs_plane->id, op.eglfs_plane->blendOpPropertyId, blendOp);
         }
 #endif
     } else {
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.cpp
index 2e84915c80..07b2de7c58 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.cpp
@@ -66,7 +66,7 @@ QAtomicInt running;
 void EventReader::run()
 {
     xcb_generic_event_t *event = nullptr;
-    while (running.load() && (event = xcb_wait_for_event(m_integration->connection()))) {
+    while (running.loadRelaxed() && (event = xcb_wait_for_event(m_integration->connection()))) {
         uint response_type = event->response_type & ~0x80;
         switch (response_type) {
         case XCB_CLIENT_MESSAGE: {
diff --git a/src/plugins/platforms/haiku/qhaikuapplication.cpp b/src/plugins/platforms/haiku/qhaikuapplication.cpp
index b75810c453..de4acdfd4a 100644
--- a/src/plugins/platforms/haiku/qhaikuapplication.cpp
+++ b/src/plugins/platforms/haiku/qhaikuapplication.cpp
@@ -42,6 +42,8 @@
 #include <QCoreApplication>
 #include <QFileOpenEvent>
 
+#include <qpa/qwindowsysteminterface.h>
+
 #include <Entry.h>
 #include <Path.h>
 
@@ -52,8 +54,7 @@ QHaikuApplication::QHaikuApplication(const char *signature)
 
 bool QHaikuApplication::QuitRequested()
 {
-    QEvent quitEvent(QEvent::Quit);
-    QCoreApplication::sendEvent(QCoreApplication::instance(), &quitEvent);
+    QWindowSystemInterface::handleApplicationTermination<QWindowSystemInterface::SynchronousDelivery>();
     return true;
 }
 
diff --git a/src/plugins/platforms/ios/qioscontext.mm b/src/plugins/platforms/ios/qioscontext.mm
index 535e7d7aa6..c9509ae599 100644
--- a/src/plugins/platforms/ios/qioscontext.mm
+++ b/src/plugins/platforms/ios/qioscontext.mm
@@ -118,7 +118,7 @@ QSurfaceFormat QIOSContext::format() const
     return m_format;
 }
 
-#define QT_IOS_GL_STATUS_CASE(val) case val: return QLatin1Literal(#val)
+#define QT_IOS_GL_STATUS_CASE(val) case val: return QLatin1String(#val)
 
 static QString fboStatusString(GLenum status)
 {
diff --git a/src/plugins/platforms/ios/qioseventdispatcher.mm b/src/plugins/platforms/ios/qioseventdispatcher.mm
index 776343c5aa..c5856051de 100644
--- a/src/plugins/platforms/ios/qioseventdispatcher.mm
+++ b/src/plugins/platforms/ios/qioseventdispatcher.mm
@@ -211,6 +211,8 @@ namespace
     } logActivity;
 }
 
+using namespace QT_PREPEND_NAMESPACE(QtPrivate);
+
 extern "C" int qt_main_wrapper(int argc, char *argv[])
 {
     @autoreleasepool {
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
index dc7ea08dc5..cb8962d4b8 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
@@ -188,7 +188,7 @@ static QImage::Format determineFormat(const fb_var_screeninfo &info, int depth)
         if (memcmp(rgba, rgb888, 3 * sizeof(fb_bitfield)) == 0) {
             format = QImage::Format_RGB888;
         } else if (memcmp(rgba, bgr888, 3 * sizeof(fb_bitfield)) == 0) {
-            format = QImage::Format_RGB888;
+            format = QImage::Format_BGR888;
             // pixeltype = BGRPixel;
         }
         break;
diff --git a/src/plugins/platforms/mirclient/mirclient.json b/src/plugins/platforms/mirclient/mirclient.json
deleted file mode 100644
index c31558a2f1..0000000000
--- a/src/plugins/platforms/mirclient/mirclient.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "mirclient" ]
-}
diff --git a/src/plugins/platforms/mirclient/mirclient.pro b/src/plugins/platforms/mirclient/mirclient.pro
deleted file mode 100644
index d9eb069200..0000000000
--- a/src/plugins/platforms/mirclient/mirclient.pro
+++ /dev/null
@@ -1,61 +0,0 @@
-TARGET = qmirclient
-
-QT += \
-    core-private gui-private dbus \
-    theme_support-private eventdispatcher_support-private \
-    fontdatabase_support-private egl_support-private
-
-qtHaveModule(linuxaccessibility_support-private): \
-    QT += linuxaccessibility_support-private
-
-DEFINES += MESA_EGL_NO_X11_HEADERS
-# CONFIG += c++11 # only enables C++0x
-QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall
-QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined
-
-QMAKE_USE_PRIVATE += mirclient
-
-SOURCES = \
-    qmirclientappstatecontroller.cpp \
-    qmirclientbackingstore.cpp \
-    qmirclientclipboard.cpp \
-    qmirclientcursor.cpp \
-    qmirclientdebugextension.cpp \
-    qmirclientdesktopwindow.cpp \
-    qmirclientglcontext.cpp \
-    qmirclientinput.cpp \
-    qmirclientintegration.cpp \
-    qmirclientnativeinterface.cpp \
-    qmirclientplatformservices.cpp \
-    qmirclientplugin.cpp \
-    qmirclientscreen.cpp \
-    qmirclientscreenobserver.cpp \
-    qmirclienttheme.cpp \
-    qmirclientwindow.cpp
-
-HEADERS = \
-    qmirclientappstatecontroller.h \
-    qmirclientbackingstore.h \
-    qmirclientclipboard.h \
-    qmirclientcursor.h \
-    qmirclientdebugextension.h \
-    qmirclientdesktopwindow.h \
-    qmirclientglcontext.h \
-    qmirclientinput.h \
-    qmirclientintegration.h \
-    qmirclientlogging.h \
-    qmirclientnativeinterface.h \
-    qmirclientorientationchangeevent_p.h \
-    qmirclientplatformservices.h \
-    qmirclientplugin.h \
-    qmirclientscreen.h \
-    qmirclientscreenobserver.h \
-    qmirclienttheme.h \
-    qmirclientwindow.h
-
-QMAKE_USE_PRIVATE += xkbcommon
-
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = MirServerIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
diff --git a/src/plugins/platforms/mirclient/qmirclientappstatecontroller.cpp b/src/plugins/platforms/mirclient/qmirclientappstatecontroller.cpp
deleted file mode 100644
index 69fc9b7aa7..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientappstatecontroller.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientappstatecontroller.h"
-
-#include <qpa/qwindowsysteminterface.h>
-
-/*
- * QMirClientAppStateController - updates Qt's QApplication::applicationState property.
- *
- * Tries to avoid active-inactive-active invocations using a timer. The rapid state
- * change can confuse some applications.
- */
-
-QMirClientAppStateController::QMirClientAppStateController()
-    : m_suspended(false)
-    , m_lastActive(true)
-{
-    m_inactiveTimer.setSingleShot(true);
-    m_inactiveTimer.setInterval(10);
-    QObject::connect(&m_inactiveTimer, &QTimer::timeout, []()
-    {
-        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
-    });
-}
-
-void QMirClientAppStateController::setSuspended()
-{
-    m_inactiveTimer.stop();
-    if (!m_suspended) {
-        m_suspended = true;
-
-        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
-    }
-}
-
-void QMirClientAppStateController::setResumed()
-{
-    m_inactiveTimer.stop();
-    if (m_suspended) {
-        m_suspended = false;
-
-        if (m_lastActive) {
-            QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
-        } else {
-            QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
-        }
-    }
-}
-
-void QMirClientAppStateController::setWindowFocused(bool focused)
-{
-    if (m_suspended) {
-        return;
-    }
-
-    if (focused) {
-        m_inactiveTimer.stop();
-        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
-    } else {
-        m_inactiveTimer.start();
-    }
-
-    m_lastActive = focused;
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientbackingstore.cpp b/src/plugins/platforms/mirclient/qmirclientbackingstore.cpp
deleted file mode 100644
index 51363619d9..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientbackingstore.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientbackingstore.h"
-#include "qmirclientlogging.h"
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLTexture>
-#include <QtGui/QMatrix4x4>
-#include <QtGui/qopengltextureblitter.h>
-#include <QtGui/qopenglfunctions.h>
-
-QMirClientBackingStore::QMirClientBackingStore(QWindow* window)
-    : QPlatformBackingStore(window)
-    , mContext(new QOpenGLContext)
-    , mTexture(new QOpenGLTexture(QOpenGLTexture::Target2D))
-    , mBlitter(new QOpenGLTextureBlitter)
-{
-    mContext->setFormat(window->requestedFormat());
-    mContext->setScreen(window->screen());
-    mContext->create();
-
-    window->setSurfaceType(QSurface::OpenGLSurface);
-}
-
-QMirClientBackingStore::~QMirClientBackingStore()
-{
-    mContext->makeCurrent(window()); // needed as QOpenGLTexture destructor assumes current context
-}
-
-void QMirClientBackingStore::flush(QWindow* window, const QRegion& region, const QPoint& offset)
-{
-    Q_UNUSED(region);
-    Q_UNUSED(offset);
-    mContext->makeCurrent(window);
-    glViewport(0, 0, window->width(), window->height());
-
-    updateTexture();
-
-    if (!mBlitter->isCreated())
-        mBlitter->create();
-
-    mBlitter->bind();
-    mBlitter->blit(mTexture->textureId(), QMatrix4x4(), QOpenGLTextureBlitter::OriginTopLeft);
-    mBlitter->release();
-
-    mContext->swapBuffers(window);
-}
-
-void QMirClientBackingStore::updateTexture()
-{
-    if (mDirty.isNull())
-        return;
-
-    if (!mTexture->isCreated()) {
-        mTexture->setMinificationFilter(QOpenGLTexture::Nearest);
-        mTexture->setMagnificationFilter(QOpenGLTexture::Nearest);
-        mTexture->setWrapMode(QOpenGLTexture::ClampToEdge);
-        mTexture->setData(mImage, QOpenGLTexture::DontGenerateMipMaps);
-        mTexture->create();
-    }
-    mTexture->bind();
-
-    QRegion fixed;
-    QRect imageRect = mImage.rect();
-
-    for (const QRect &rect : mDirty) {
-        // intersect with image rect to be sure
-        QRect r = imageRect & rect;
-
-        // if the rect is wide enough it is cheaper to just extend it instead of doing an image copy
-        if (r.width() >= imageRect.width() / 2) {
-            r.setX(0);
-            r.setWidth(imageRect.width());
-        }
-
-        fixed |= r;
-    }
-
-    for (const QRect &rect : fixed) {
-        // if the sub-rect is full-width we can pass the image data directly to
-        // OpenGL instead of copying, since there is no gap between scanlines
-        if (rect.width() == imageRect.width()) {
-            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, rect.y(), rect.width(), rect.height(), GL_RGBA, GL_UNSIGNED_BYTE,
-                            mImage.constScanLine(rect.y()));
-        } else {
-            glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x(), rect.y(), rect.width(), rect.height(), GL_RGBA, GL_UNSIGNED_BYTE,
-                            mImage.copy(rect).constBits());
-        }
-    }
-    /* End of code taken from QEGLPlatformBackingStore */
-
-    mDirty = QRegion();
-}
-
-
-void QMirClientBackingStore::beginPaint(const QRegion& region)
-{
-    mDirty |= region;
-}
-
-void QMirClientBackingStore::resize(const QSize& size, const QRegion& /*staticContents*/)
-{
-    mImage = QImage(size, QImage::Format_RGBA8888);
-
-    mContext->makeCurrent(window());
-
-    if (mTexture->isCreated())
-        mTexture->destroy();
-}
-
-QPaintDevice* QMirClientBackingStore::paintDevice()
-{
-    return &mImage;
-}
-
-QImage QMirClientBackingStore::toImage() const
-{
-    // used by QPlatformBackingStore::composeAndFlush
-    return mImage;
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientclipboard.cpp b/src/plugins/platforms/mirclient/qmirclientclipboard.cpp
deleted file mode 100644
index b9fc9b3b42..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientclipboard.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientclipboard.h"
-#include "qmirclientlogging.h"
-#include "qmirclientwindow.h"
-
-#include <QDBusPendingCallWatcher>
-#include <QGuiApplication>
-#include <QSignalBlocker>
-#include <QtCore/QMimeData>
-#include <QtCore/QStringList>
-
-// content-hub
-#include <com/ubuntu/content/hub.h>
-
-// get this cumbersome nested namespace out of the way
-using namespace com::ubuntu::content;
-
-QMirClientClipboard::QMirClientClipboard()
-    : mMimeData(new QMimeData)
-    , mContentHub(Hub::Client::instance())
-{
-    connect(mContentHub, &Hub::pasteboardChanged, this, [this]() {
-        if (mClipboardState == QMirClientClipboard::SyncedClipboard) {
-            mClipboardState = QMirClientClipboard::OutdatedClipboard;
-            emitChanged(QClipboard::Clipboard);
-        }
-    });
-
-    connect(qGuiApp, &QGuiApplication::applicationStateChanged,
-        this, &QMirClientClipboard::onApplicationStateChanged);
-
-    requestMimeData();
-}
-
-QMirClientClipboard::~QMirClientClipboard()
-{
-    delete mMimeData;
-}
-
-QMimeData* QMirClientClipboard::mimeData(QClipboard::Mode mode)
-{
-    if (mode != QClipboard::Clipboard)
-        return nullptr;
-
-    // Blocks dataChanged() signal from being emitted. Makes no sense to emit it from
-    // inside the data getter.
-    const QSignalBlocker blocker(this);
-
-    if (mClipboardState == OutdatedClipboard) {
-        updateMimeData();
-    } else if (mClipboardState == SyncingClipboard) {
-        mPasteReply->waitForFinished();
-    }
-
-    return mMimeData;
-}
-
-void QMirClientClipboard::setMimeData(QMimeData* mimeData, QClipboard::Mode mode)
-{
-    QWindow *focusWindow = QGuiApplication::focusWindow();
-    if (focusWindow && mode == QClipboard::Clipboard && mimeData != nullptr) {
-        QString surfaceId = static_cast<QMirClientWindow*>(focusWindow->handle())->persistentSurfaceId();
-
-        QDBusPendingCall reply = mContentHub->createPaste(surfaceId, *mimeData);
-
-        // Don't care whether it succeeded
-        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
-        connect(watcher, &QDBusPendingCallWatcher::finished,
-                watcher, &QObject::deleteLater);
-
-        mMimeData = mimeData;
-        mClipboardState = SyncedClipboard;
-        emitChanged(QClipboard::Clipboard);
-    }
-}
-
-bool QMirClientClipboard::supportsMode(QClipboard::Mode mode) const
-{
-    return mode == QClipboard::Clipboard;
-}
-
-bool QMirClientClipboard::ownsMode(QClipboard::Mode mode) const
-{
-    Q_UNUSED(mode);
-    return false;
-}
-
-void QMirClientClipboard::onApplicationStateChanged(Qt::ApplicationState state)
-{
-    if (state == Qt::ApplicationActive) {
-        // Only focused or active applications might be allowed to paste, so we probably
-        // missed changes in the clipboard while we were hidden, inactive or, more importantly,
-        // suspended.
-        requestMimeData();
-    }
-}
-
-void QMirClientClipboard::updateMimeData()
-{
-    if (qGuiApp->applicationState() != Qt::ApplicationActive) {
-        // Don't even bother asking as content-hub would probably ignore our request (and should).
-        return;
-    }
-
-    delete mMimeData;
-
-    QWindow *focusWindow = QGuiApplication::focusWindow();
-    if (focusWindow) {
-        QString surfaceId = static_cast<QMirClientWindow*>(focusWindow->handle())->persistentSurfaceId();
-        mMimeData = mContentHub->latestPaste(surfaceId);
-        mClipboardState = SyncedClipboard;
-        emitChanged(QClipboard::Clipboard);
-    }
-}
-
-void QMirClientClipboard::requestMimeData()
-{
-    if (qGuiApp->applicationState() != Qt::ApplicationActive) {
-        // Don't even bother asking as content-hub would probably ignore our request (and should).
-        return;
-    }
-
-    QWindow *focusWindow = QGuiApplication::focusWindow();
-    if (!focusWindow) {
-        return;
-    }
-
-    QString surfaceId = static_cast<QMirClientWindow*>(focusWindow->handle())->persistentSurfaceId();
-    QDBusPendingCall reply = mContentHub->requestLatestPaste(surfaceId);
-    mClipboardState = SyncingClipboard;
-
-    mPasteReply = new QDBusPendingCallWatcher(reply, this);
-    connect(mPasteReply, &QDBusPendingCallWatcher::finished,
-            this, [this]() {
-        delete mMimeData;
-        mMimeData = mContentHub->paste(*mPasteReply);
-        mClipboardState = SyncedClipboard;
-        mPasteReply->deleteLater();
-        mPasteReply = nullptr;
-        emitChanged(QClipboard::Clipboard);
-    });
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientclipboard.h b/src/plugins/platforms/mirclient/qmirclientclipboard.h
deleted file mode 100644
index 09e9bcdf38..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientclipboard.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTCLIPBOARD_H
-#define QMIRCLIENTCLIPBOARD_H
-
-#include <qpa/qplatformclipboard.h>
-
-#include <QMimeData>
-#include <QPointer>
-
-namespace com {
-    namespace ubuntu {
-        namespace content {
-            class Hub;
-        }
-    }
-}
-
-class QDBusPendingCallWatcher;
-
-class QMirClientClipboard : public QObject, public QPlatformClipboard
-{
-    Q_OBJECT
-public:
-    QMirClientClipboard();
-    virtual ~QMirClientClipboard();
-
-    // QPlatformClipboard methods.
-    QMimeData* mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
-    void setMimeData(QMimeData* data, QClipboard::Mode mode = QClipboard::Clipboard) override;
-    bool supportsMode(QClipboard::Mode mode) const override;
-    bool ownsMode(QClipboard::Mode mode) const override;
-
-private Q_SLOTS:
-    void onApplicationStateChanged(Qt::ApplicationState state);
-
-private:
-    void updateMimeData();
-    void requestMimeData();
-
-    QMimeData *mMimeData;
-
-    enum {
-        OutdatedClipboard, // Our mimeData is outdated, need to fetch latest from ContentHub
-        SyncingClipboard, // Our mimeData is outdated and we are waiting for ContentHub to reply with the latest paste
-        SyncedClipboard // Our mimeData is in sync with what ContentHub has
-    } mClipboardState{OutdatedClipboard};
-
-    com::ubuntu::content::Hub *mContentHub;
-
-    QDBusPendingCallWatcher *mPasteReply{nullptr};
-};
-
-#endif // QMIRCLIENTCLIPBOARD_H
diff --git a/src/plugins/platforms/mirclient/qmirclientcursor.cpp b/src/plugins/platforms/mirclient/qmirclientcursor.cpp
deleted file mode 100644
index 812cde95c6..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientcursor.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015-2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientcursor.h"
-
-#include "qmirclientlogging.h"
-#include "qmirclientwindow.h"
-
-#include <mir_toolkit/mir_client_library.h>
-
-Q_LOGGING_CATEGORY(mirclientCursor, "qt.qpa.mirclient.cursor", QtWarningMsg)
-
-QMirClientCursor::QMirClientCursor(MirConnection *connection)
-    : mConnection(connection)
-{
-    /*
-     * TODO: Add the missing cursors to Mir (LP: #1388987)
-     *       Those are the ones without a mir_ prefix, which are X11 cursors
-     *       and won't be understood by any shell other than Unity8.
-     */
-    mShapeToCursorName[Qt::ArrowCursor] = mir_arrow_cursor_name;
-    mShapeToCursorName[Qt::UpArrowCursor] = "up_arrow";
-    mShapeToCursorName[Qt::CrossCursor] = mir_crosshair_cursor_name;
-    mShapeToCursorName[Qt::WaitCursor] = mir_busy_cursor_name;
-    mShapeToCursorName[Qt::IBeamCursor] = mir_caret_cursor_name;
-    mShapeToCursorName[Qt::SizeVerCursor] = mir_vertical_resize_cursor_name;
-    mShapeToCursorName[Qt::SizeHorCursor] = mir_horizontal_resize_cursor_name;
-    mShapeToCursorName[Qt::SizeBDiagCursor] = mir_diagonal_resize_bottom_to_top_cursor_name;
-    mShapeToCursorName[Qt::SizeFDiagCursor] = mir_diagonal_resize_top_to_bottom_cursor_name;
-    mShapeToCursorName[Qt::SizeAllCursor] = mir_omnidirectional_resize_cursor_name;
-    mShapeToCursorName[Qt::BlankCursor] = mir_disabled_cursor_name;
-    mShapeToCursorName[Qt::SplitVCursor] = mir_vsplit_resize_cursor_name;
-    mShapeToCursorName[Qt::SplitHCursor] = mir_hsplit_resize_cursor_name;
-    mShapeToCursorName[Qt::PointingHandCursor] = mir_pointing_hand_cursor_name;
-    mShapeToCursorName[Qt::ForbiddenCursor] = "forbidden";
-    mShapeToCursorName[Qt::WhatsThisCursor] = "whats_this";
-    mShapeToCursorName[Qt::BusyCursor] = "left_ptr_watch";
-    mShapeToCursorName[Qt::OpenHandCursor] = mir_open_hand_cursor_name;
-    mShapeToCursorName[Qt::ClosedHandCursor] = mir_closed_hand_cursor_name;
-    mShapeToCursorName[Qt::DragCopyCursor] = "dnd-copy";
-    mShapeToCursorName[Qt::DragMoveCursor] = "dnd-move";
-    mShapeToCursorName[Qt::DragLinkCursor] = "dnd-link";
-}
-
-namespace {
-const char *qtCursorShapeToStr(Qt::CursorShape shape)
-{
-    switch (shape) {
-    case Qt::ArrowCursor:
-        return "Arrow";
-    case Qt::UpArrowCursor:
-        return "UpArrow";
-    case Qt::CrossCursor:
-        return "Cross";
-    case Qt::WaitCursor:
-        return "Wait";
-    case Qt::IBeamCursor:
-        return "IBeam";
-    case Qt::SizeVerCursor:
-        return "SizeVer";
-    case Qt::SizeHorCursor:
-        return "SizeHor";
-    case Qt::SizeBDiagCursor:
-        return "SizeBDiag";
-    case Qt::SizeFDiagCursor:
-        return "SizeFDiag";
-    case Qt::SizeAllCursor:
-        return "SizeAll";
-    case Qt::BlankCursor:
-        return "Blank";
-    case Qt::SplitVCursor:
-        return "SplitV";
-    case Qt::SplitHCursor:
-        return "SplitH";
-    case Qt::PointingHandCursor:
-        return "PointingHand";
-    case Qt::ForbiddenCursor:
-        return "Forbidden";
-    case Qt::WhatsThisCursor:
-        return "WhatsThis";
-    case Qt::BusyCursor:
-        return "Busy";
-    case Qt::OpenHandCursor:
-        return "OpenHand";
-    case Qt::ClosedHandCursor:
-        return "ClosedHand";
-    case Qt::DragCopyCursor:
-        return "DragCopy";
-    case Qt::DragMoveCursor:
-        return "DragMove";
-    case Qt::DragLinkCursor:
-        return "DragLink";
-    case Qt::BitmapCursor:
-        return "Bitmap";
-    default:
-        return "???";
-    }
-}
-} // anonymous namespace
-
-void QMirClientCursor::changeCursor(QCursor *windowCursor, QWindow *window)
-{
-    if (!window) {
-        return;
-    }
-
-    MirSurface *surface = static_cast<QMirClientWindow*>(window->handle())->mirSurface();
-
-    if (!surface) {
-        return;
-    }
-
-
-    if (windowCursor) {
-        qCDebug(mirclientCursor, "changeCursor shape=%s, window=%p", qtCursorShapeToStr(windowCursor->shape()), window);
-        if (!windowCursor->pixmap().isNull()) {
-            configureMirCursorWithPixmapQCursor(surface, *windowCursor);
-        } else if (windowCursor->shape() == Qt::BitmapCursor) {
-            // TODO: Implement bitmap cursor support
-            applyDefaultCursorConfiguration(surface);
-        } else {
-            const auto &cursorName = mShapeToCursorName.value(windowCursor->shape(), QByteArray("left_ptr"));
-            auto cursorConfiguration = mir_cursor_configuration_from_name(cursorName.data());
-            mir_surface_configure_cursor(surface, cursorConfiguration);
-            mir_cursor_configuration_destroy(cursorConfiguration);
-        }
-    } else {
-        applyDefaultCursorConfiguration(surface);
-    }
-
-}
-
-void QMirClientCursor::configureMirCursorWithPixmapQCursor(MirSurface *surface, QCursor &cursor)
-{
-    QImage image = cursor.pixmap().toImage();
-
-    if (image.format() != QImage::Format_ARGB32) {
-        image = image.convertToFormat(QImage::Format_ARGB32);
-    }
-
-    MirBufferStream *bufferStream = mir_connection_create_buffer_stream_sync(mConnection,
-            image.width(), image.height(), mir_pixel_format_argb_8888, mir_buffer_usage_software);
-
-    {
-        MirGraphicsRegion region;
-        mir_buffer_stream_get_graphics_region(bufferStream, &region);
-
-        char *regionLine = region.vaddr;
-        Q_ASSERT(image.bytesPerLine() <= region.stride);
-        for (int i = 0; i < image.height(); ++i) {
-            memcpy(regionLine, image.scanLine(i), image.bytesPerLine());
-            regionLine += region.stride;
-        }
-    }
-
-    mir_buffer_stream_swap_buffers_sync(bufferStream);
-
-    {
-        auto configuration = mir_cursor_configuration_from_buffer_stream(bufferStream, cursor.hotSpot().x(), cursor.hotSpot().y());
-        mir_surface_configure_cursor(surface, configuration);
-        mir_cursor_configuration_destroy(configuration);
-    }
-
-    mir_buffer_stream_release_sync(bufferStream);
-}
-
-void QMirClientCursor::applyDefaultCursorConfiguration(MirSurface *surface)
-{
-    auto cursorConfiguration = mir_cursor_configuration_from_name("left_ptr");
-    mir_surface_configure_cursor(surface, cursorConfiguration);
-    mir_cursor_configuration_destroy(cursorConfiguration);
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientdebugextension.cpp b/src/plugins/platforms/mirclient/qmirclientdebugextension.cpp
deleted file mode 100644
index 9aa934083d..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientdebugextension.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientdebugextension.h"
-
-#include "qmirclientlogging.h"
-
-// mir client debug
-#include <mir_toolkit/debug/surface.h>
-
-Q_LOGGING_CATEGORY(mirclientDebug, "qt.qpa.mirclient.debug")
-
-QMirClientDebugExtension::QMirClientDebugExtension()
-    : m_mirclientDebug(QStringLiteral("mirclient-debug-extension"), 1)
-    , m_mapper(nullptr)
-{
-    qCDebug(mirclientDebug) << "NOTICE: Loading mirclient-debug-extension";
-    m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_debug_surface_coords_to_screen");
-
-    if (!m_mirclientDebug.isLoaded()) {
-        qCWarning(mirclientDebug) << "ERROR: mirclient-debug-extension failed to load:"
-                                  << m_mirclientDebug.errorString();
-    } else if (!m_mapper) {
-        qCWarning(mirclientDebug) << "ERROR: unable to find required symbols in mirclient-debug-extension:"
-                                  << m_mirclientDebug.errorString();
-    }
-}
-
-QPoint QMirClientDebugExtension::mapSurfacePointToScreen(MirSurface *surface, const QPoint &point)
-{
-    if (!m_mapper) {
-        return point;
-    }
-
-    QPoint mappedPoint;
-    bool status = m_mapper(surface, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
-    if (status) {
-        return mappedPoint;
-    } else {
-        return point;
-    }
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientdesktopwindow.cpp b/src/plugins/platforms/mirclient/qmirclientdesktopwindow.cpp
deleted file mode 100644
index 123f805c25..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientdesktopwindow.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientdesktopwindow.h"
-
-// local
-#include "qmirclientlogging.h"
-
-QMirClientDesktopWindow::QMirClientDesktopWindow(QWindow *window)
-    : QPlatformWindow(window)
-{
-    qCDebug(mirclient, "QMirClientDesktopWindow(window=%p)", window);
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientdesktopwindow.h b/src/plugins/platforms/mirclient/qmirclientdesktopwindow.h
deleted file mode 100644
index 3ba54db826..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientdesktopwindow.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTDESKTOPWINDOW_H
-#define QMIRCLIENTDESKTOPWINDOW_H
-
-#include <qpa/qplatformwindow.h>
-
-// TODO Implement it. For now it's just an empty, dummy class.
-class QMirClientDesktopWindow : public QPlatformWindow
-{
-public:
-    QMirClientDesktopWindow(QWindow*);
-};
-
-#endif // QMIRCLIENTDESKTOPWINDOW_H
diff --git a/src/plugins/platforms/mirclient/qmirclientglcontext.cpp b/src/plugins/platforms/mirclient/qmirclientglcontext.cpp
deleted file mode 100644
index fc7d90d5ec..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientglcontext.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientglcontext.h"
-#include "qmirclientlogging.h"
-#include "qmirclientwindow.h"
-
-#include <QOpenGLFramebufferObject>
-#include <QtEglSupport/private/qeglconvenience_p.h>
-#include <QtEglSupport/private/qeglpbuffer_p.h>
-#include <QtGui/private/qopenglcontext_p.h>
-
-Q_LOGGING_CATEGORY(mirclientGraphics, "qt.qpa.mirclient.graphics", QtWarningMsg)
-
-namespace {
-
-void printEglConfig(EGLDisplay display, EGLConfig config)
-{
-    Q_ASSERT(display != EGL_NO_DISPLAY);
-    Q_ASSERT(config != nullptr);
-
-    const char *string = eglQueryString(display, EGL_VENDOR);
-    qCDebug(mirclientGraphics, "EGL vendor: %s", string);
-
-    string = eglQueryString(display, EGL_VERSION);
-    qCDebug(mirclientGraphics, "EGL version: %s", string);
-
-    string = eglQueryString(display, EGL_EXTENSIONS);
-    qCDebug(mirclientGraphics, "EGL extensions: %s", string);
-
-    qCDebug(mirclientGraphics, "EGL configuration attributes:");
-    q_printEglConfig(display, config);
-}
-
-} // anonymous namespace
-
-QMirClientOpenGLContext::QMirClientOpenGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share,
-                                         EGLDisplay display)
-    : QEGLPlatformContext(format, share, display, 0)
-{
-    if (mirclientGraphics().isDebugEnabled()) {
-        printEglConfig(display, eglConfig());
-    }
-}
-
-static bool needsFBOReadBackWorkaround()
-{
-    static bool set = false;
-    static bool needsWorkaround = false;
-
-    if (Q_UNLIKELY(!set)) {
-        const char *rendererString = reinterpret_cast<const char *>(glGetString(GL_RENDERER));
-        needsWorkaround = qstrncmp(rendererString, "Mali-400", 8) == 0
-                          || qstrncmp(rendererString, "Mali-T7", 7) == 0
-                          || qstrncmp(rendererString, "PowerVR Rogue G6200", 19) == 0;
-        set = true;
-    }
-
-    return needsWorkaround;
-}
-
-bool QMirClientOpenGLContext::makeCurrent(QPlatformSurface* surface)
-{
-    const bool ret = QEGLPlatformContext::makeCurrent(surface);
-
-    if (Q_LIKELY(ret)) {
-        QOpenGLContextPrivate *ctx_d = QOpenGLContextPrivate::get(context());
-        if (!ctx_d->workaround_brokenFBOReadBack && needsFBOReadBackWorkaround()) {
-            ctx_d->workaround_brokenFBOReadBack = true;
-        }
-    }
-    return ret;
-}
-
-// Following method used internally in the base class QEGLPlatformContext to access
-// the egl surface of a QPlatformSurface/QMirClientWindow
-EGLSurface QMirClientOpenGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)
-{
-    if (surface->surface()->surfaceClass() == QSurface::Window) {
-        return static_cast<QMirClientWindow *>(surface)->eglSurface();
-    } else {
-        return static_cast<QEGLPbuffer *>(surface)->pbuffer();
-    }
-}
-
-void QMirClientOpenGLContext::swapBuffers(QPlatformSurface* surface)
-{
-    QEGLPlatformContext::swapBuffers(surface);
-
-    if (surface->surface()->surfaceClass() == QSurface::Window) {
-        // notify window on swap completion
-        auto platformWindow = static_cast<QMirClientWindow *>(surface);
-        platformWindow->onSwapBuffersDone();
-    }
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientinput.cpp b/src/plugins/platforms/mirclient/qmirclientinput.cpp
deleted file mode 100644
index e5319b0435..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientinput.cpp
+++ /dev/null
@@ -1,708 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014-2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-// Local
-#include "qmirclientinput.h"
-#include "qmirclientintegration.h"
-#include "qmirclientnativeinterface.h"
-#include "qmirclientscreen.h"
-#include "qmirclientwindow.h"
-#include "qmirclientlogging.h"
-#include "qmirclientorientationchangeevent_p.h"
-
-// Qt
-#include <QtCore/QThread>
-#include <QtCore/qglobal.h>
-#include <QtCore/QCoreApplication>
-#include <QtGui/private/qguiapplication_p.h>
-#include <qpa/qplatforminputcontext.h>
-#include <qpa/qwindowsysteminterface.h>
-#include <QTextCodec>
-
-#include <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-keysyms.h>
-
-#include <mir_toolkit/mir_client_library.h>
-
-Q_LOGGING_CATEGORY(mirclientInput, "qt.qpa.mirclient.input", QtWarningMsg)
-
-namespace
-{
-
-// XKB Keysyms which do not map directly to Qt types (i.e. Unicode points)
-static const uint32_t KeyTable[] = {
-    XKB_KEY_Escape,                  Qt::Key_Escape,
-    XKB_KEY_Tab,                     Qt::Key_Tab,
-    XKB_KEY_ISO_Left_Tab,            Qt::Key_Backtab,
-    XKB_KEY_BackSpace,               Qt::Key_Backspace,
-    XKB_KEY_Return,                  Qt::Key_Return,
-    XKB_KEY_Insert,                  Qt::Key_Insert,
-    XKB_KEY_Delete,                  Qt::Key_Delete,
-    XKB_KEY_Clear,                   Qt::Key_Delete,
-    XKB_KEY_Pause,                   Qt::Key_Pause,
-    XKB_KEY_Print,                   Qt::Key_Print,
-
-    XKB_KEY_Home,                    Qt::Key_Home,
-    XKB_KEY_End,                     Qt::Key_End,
-    XKB_KEY_Left,                    Qt::Key_Left,
-    XKB_KEY_Up,                      Qt::Key_Up,
-    XKB_KEY_Right,                   Qt::Key_Right,
-    XKB_KEY_Down,                    Qt::Key_Down,
-    XKB_KEY_Prior,                   Qt::Key_PageUp,
-    XKB_KEY_Next,                    Qt::Key_PageDown,
-
-    XKB_KEY_Shift_L,                 Qt::Key_Shift,
-    XKB_KEY_Shift_R,                 Qt::Key_Shift,
-    XKB_KEY_Shift_Lock,              Qt::Key_Shift,
-    XKB_KEY_Control_L,               Qt::Key_Control,
-    XKB_KEY_Control_R,               Qt::Key_Control,
-    XKB_KEY_Meta_L,                  Qt::Key_Meta,
-    XKB_KEY_Meta_R,                  Qt::Key_Meta,
-    XKB_KEY_Alt_L,                   Qt::Key_Alt,
-    XKB_KEY_Alt_R,                   Qt::Key_Alt,
-    XKB_KEY_Caps_Lock,               Qt::Key_CapsLock,
-    XKB_KEY_Num_Lock,                Qt::Key_NumLock,
-    XKB_KEY_Scroll_Lock,             Qt::Key_ScrollLock,
-    XKB_KEY_Super_L,                 Qt::Key_Super_L,
-    XKB_KEY_Super_R,                 Qt::Key_Super_R,
-    XKB_KEY_Menu,                    Qt::Key_Menu,
-    XKB_KEY_Hyper_L,                 Qt::Key_Hyper_L,
-    XKB_KEY_Hyper_R,                 Qt::Key_Hyper_R,
-    XKB_KEY_Help,                    Qt::Key_Help,
-
-    XKB_KEY_KP_Space,                Qt::Key_Space,
-    XKB_KEY_KP_Tab,                  Qt::Key_Tab,
-    XKB_KEY_KP_Enter,                Qt::Key_Enter,
-    XKB_KEY_KP_Home,                 Qt::Key_Home,
-    XKB_KEY_KP_Left,                 Qt::Key_Left,
-    XKB_KEY_KP_Up,                   Qt::Key_Up,
-    XKB_KEY_KP_Right,                Qt::Key_Right,
-    XKB_KEY_KP_Down,                 Qt::Key_Down,
-    XKB_KEY_KP_Prior,                Qt::Key_PageUp,
-    XKB_KEY_KP_Next,                 Qt::Key_PageDown,
-    XKB_KEY_KP_End,                  Qt::Key_End,
-    XKB_KEY_KP_Begin,                Qt::Key_Clear,
-    XKB_KEY_KP_Insert,               Qt::Key_Insert,
-    XKB_KEY_KP_Delete,               Qt::Key_Delete,
-    XKB_KEY_KP_Equal,                Qt::Key_Equal,
-    XKB_KEY_KP_Multiply,             Qt::Key_Asterisk,
-    XKB_KEY_KP_Add,                  Qt::Key_Plus,
-    XKB_KEY_KP_Separator,            Qt::Key_Comma,
-    XKB_KEY_KP_Subtract,             Qt::Key_Minus,
-    XKB_KEY_KP_Decimal,              Qt::Key_Period,
-    XKB_KEY_KP_Divide,               Qt::Key_Slash,
-
-    XKB_KEY_ISO_Level3_Shift,        Qt::Key_AltGr,
-    XKB_KEY_Multi_key,               Qt::Key_Multi_key,
-    XKB_KEY_Codeinput,               Qt::Key_Codeinput,
-    XKB_KEY_SingleCandidate,         Qt::Key_SingleCandidate,
-    XKB_KEY_MultipleCandidate,       Qt::Key_MultipleCandidate,
-    XKB_KEY_PreviousCandidate,       Qt::Key_PreviousCandidate,
-
-    // dead keys
-    XKB_KEY_dead_grave,              Qt::Key_Dead_Grave,
-    XKB_KEY_dead_acute,              Qt::Key_Dead_Acute,
-    XKB_KEY_dead_circumflex,         Qt::Key_Dead_Circumflex,
-    XKB_KEY_dead_tilde,              Qt::Key_Dead_Tilde,
-    XKB_KEY_dead_macron,             Qt::Key_Dead_Macron,
-    XKB_KEY_dead_breve,              Qt::Key_Dead_Breve,
-    XKB_KEY_dead_abovedot,           Qt::Key_Dead_Abovedot,
-    XKB_KEY_dead_diaeresis,          Qt::Key_Dead_Diaeresis,
-    XKB_KEY_dead_abovering,          Qt::Key_Dead_Abovering,
-    XKB_KEY_dead_doubleacute,        Qt::Key_Dead_Doubleacute,
-    XKB_KEY_dead_caron,              Qt::Key_Dead_Caron,
-    XKB_KEY_dead_cedilla,            Qt::Key_Dead_Cedilla,
-    XKB_KEY_dead_ogonek,             Qt::Key_Dead_Ogonek,
-    XKB_KEY_dead_iota,               Qt::Key_Dead_Iota,
-    XKB_KEY_dead_voiced_sound,       Qt::Key_Dead_Voiced_Sound,
-    XKB_KEY_dead_semivoiced_sound,   Qt::Key_Dead_Semivoiced_Sound,
-    XKB_KEY_dead_belowdot,           Qt::Key_Dead_Belowdot,
-    XKB_KEY_dead_hook,               Qt::Key_Dead_Hook,
-    XKB_KEY_dead_horn,               Qt::Key_Dead_Horn,
-    XKB_KEY_dead_stroke,             Qt::Key_Dead_Stroke,
-    XKB_KEY_dead_abovecomma,         Qt::Key_Dead_Abovecomma,
-    XKB_KEY_dead_abovereversedcomma, Qt::Key_Dead_Abovereversedcomma,
-    XKB_KEY_dead_doublegrave,        Qt::Key_Dead_Doublegrave,
-    XKB_KEY_dead_belowring,          Qt::Key_Dead_Belowring,
-    XKB_KEY_dead_belowmacron,        Qt::Key_Dead_Belowmacron,
-    XKB_KEY_dead_belowcircumflex,    Qt::Key_Dead_Belowcircumflex,
-    XKB_KEY_dead_belowtilde,         Qt::Key_Dead_Belowtilde,
-    XKB_KEY_dead_belowbreve,         Qt::Key_Dead_Belowbreve,
-    XKB_KEY_dead_belowdiaeresis,     Qt::Key_Dead_Belowdiaeresis,
-    XKB_KEY_dead_invertedbreve,      Qt::Key_Dead_Invertedbreve,
-    XKB_KEY_dead_belowcomma,         Qt::Key_Dead_Belowcomma,
-    XKB_KEY_dead_currency,           Qt::Key_Dead_Currency,
-    XKB_KEY_dead_a,                  Qt::Key_Dead_a,
-    XKB_KEY_dead_A,                  Qt::Key_Dead_A,
-    XKB_KEY_dead_e,                  Qt::Key_Dead_e,
-    XKB_KEY_dead_E,                  Qt::Key_Dead_E,
-    XKB_KEY_dead_i,                  Qt::Key_Dead_i,
-    XKB_KEY_dead_I,                  Qt::Key_Dead_I,
-    XKB_KEY_dead_o,                  Qt::Key_Dead_o,
-    XKB_KEY_dead_O,                  Qt::Key_Dead_O,
-    XKB_KEY_dead_u,                  Qt::Key_Dead_u,
-    XKB_KEY_dead_U,                  Qt::Key_Dead_U,
-    XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa,
-    XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa,
-    XKB_KEY_dead_greek,              Qt::Key_Dead_Greek,
-    XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline,
-    XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline,
-    XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline,
-    XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay,
-
-    XKB_KEY_Mode_switch,             Qt::Key_Mode_switch,
-    XKB_KEY_script_switch,           Qt::Key_Mode_switch,
-    XKB_KEY_XF86AudioRaiseVolume,    Qt::Key_VolumeUp,
-    XKB_KEY_XF86AudioLowerVolume,    Qt::Key_VolumeDown,
-    XKB_KEY_XF86PowerOff,            Qt::Key_PowerOff,
-    XKB_KEY_XF86PowerDown,           Qt::Key_PowerDown,
-
-    0,                          0
-};
-
-Qt::WindowState mirSurfaceStateToWindowState(MirSurfaceState state)
-{
-    switch (state) {
-    case mir_surface_state_fullscreen:
-        return Qt::WindowFullScreen;
-    case mir_surface_state_maximized:
-    case mir_surface_state_vertmaximized:
-    case mir_surface_state_horizmaximized:
-        return Qt::WindowMaximized;
-    case mir_surface_state_minimized:
-        return Qt::WindowMinimized;
-    case mir_surface_state_hidden:
-        // We should be handling this state separately.
-        Q_ASSERT(false);
-    case mir_surface_state_restored:
-    case mir_surface_state_unknown:
-    default:
-        return Qt::WindowNoState;
-    }
-}
-
-} // namespace
-
-class UbuntuEvent : public QEvent
-{
-public:
-    UbuntuEvent(QMirClientWindow* window, const MirEvent *event, QEvent::Type type)
-        : QEvent(type), window(window) {
-        nativeEvent = mir_event_ref(event);
-    }
-    ~UbuntuEvent()
-    {
-        mir_event_unref(nativeEvent);
-    }
-
-    QPointer<QMirClientWindow> window;
-    const MirEvent *nativeEvent;
-};
-
-QMirClientInput::QMirClientInput(QMirClientClientIntegration* integration)
-    : QObject(nullptr)
-    , mIntegration(integration)
-    , mEventFilterType(static_cast<QMirClientNativeInterface*>(
-        integration->nativeInterface())->genericEventFilterType())
-    , mEventType(static_cast<QEvent::Type>(QEvent::registerEventType()))
-    , mLastInputWindow(nullptr)
-{
-    // Initialize touch device.
-    mTouchDevice = new QTouchDevice;
-    mTouchDevice->setType(QTouchDevice::TouchScreen);
-    mTouchDevice->setCapabilities(
-            QTouchDevice::Position | QTouchDevice::Area | QTouchDevice::Pressure |
-            QTouchDevice::NormalizedPosition);
-    QWindowSystemInterface::registerTouchDevice(mTouchDevice);
-}
-
-QMirClientInput::~QMirClientInput()
-{
-  // Qt will take care of deleting mTouchDevice.
-}
-
-static const char* nativeEventTypeToStr(MirEventType t)
-{
-    switch (t)
-    {
-    case mir_event_type_key:
-        return "key";
-    case mir_event_type_motion:
-        return "motion";
-    case mir_event_type_surface:
-        return "surface";
-    case mir_event_type_resize:
-        return "resize";
-    case mir_event_type_prompt_session_state_change:
-        return "prompt_session_state_change";
-    case mir_event_type_orientation:
-        return "orientation";
-    case mir_event_type_close_surface:
-        return "close_surface";
-    case mir_event_type_input:
-        return "input";
-    case mir_event_type_keymap:
-        return "keymap";
-    case mir_event_type_input_configuration:
-        return "input_configuration";
-    case mir_event_type_surface_output:
-        return "surface_output";
-    case mir_event_type_input_device_state:
-        return "input_device_state";
-    default:
-        return "unknown";
-    }
-}
-
-void QMirClientInput::customEvent(QEvent* event)
-{
-    Q_ASSERT(QThread::currentThread() == thread());
-    UbuntuEvent* ubuntuEvent = static_cast<UbuntuEvent*>(event);
-    const MirEvent *nativeEvent = ubuntuEvent->nativeEvent;
-
-    if ((ubuntuEvent->window == nullptr) || (ubuntuEvent->window->window() == nullptr)) {
-        qCWarning(mirclient) << "Attempted to deliver an event to a non-existent window, ignoring.";
-        return;
-    }
-
-    // Event filtering.
-    long result;
-    if (QWindowSystemInterface::handleNativeEvent(
-            ubuntuEvent->window->window(), mEventFilterType,
-            const_cast<void *>(static_cast<const void *>(nativeEvent)), &result) == true) {
-        qCDebug(mirclient, "event filtered out by native interface");
-        return;
-    }
-
-    qCDebug(mirclientInput, "customEvent(type=%s)", nativeEventTypeToStr(mir_event_get_type(nativeEvent)));
-
-    // Event dispatching.
-    switch (mir_event_get_type(nativeEvent))
-    {
-    case mir_event_type_input:
-        dispatchInputEvent(ubuntuEvent->window, mir_event_get_input_event(nativeEvent));
-        break;
-    case mir_event_type_resize:
-    {
-        auto resizeEvent = mir_event_get_resize_event(nativeEvent);
-
-        // Enable workaround for Screen rotation
-        auto const targetWindow = ubuntuEvent->window;
-        if (targetWindow) {
-            auto const screen = static_cast<QMirClientScreen*>(targetWindow->screen());
-            if (screen) {
-                screen->handleWindowSurfaceResize(
-                        mir_resize_event_get_width(resizeEvent),
-                        mir_resize_event_get_height(resizeEvent));
-            }
-
-            targetWindow->handleSurfaceResized(
-                        mir_resize_event_get_width(resizeEvent),
-                        mir_resize_event_get_height(resizeEvent));
-        }
-        break;
-    }
-    case mir_event_type_surface:
-        handleSurfaceEvent(ubuntuEvent->window, mir_event_get_surface_event(nativeEvent));
-        break;
-    case mir_event_type_surface_output:
-        handleSurfaceOutputEvent(ubuntuEvent->window, mir_event_get_surface_output_event(nativeEvent));
-        break;
-    case mir_event_type_orientation:
-        dispatchOrientationEvent(ubuntuEvent->window->window(), mir_event_get_orientation_event(nativeEvent));
-        break;
-    case mir_event_type_close_surface:
-        QWindowSystemInterface::handleCloseEvent(ubuntuEvent->window->window());
-        break;
-    default:
-        qCDebug(mirclient, "unhandled event type: %d", static_cast<int>(mir_event_get_type(nativeEvent)));
-    }
-}
-
-void QMirClientInput::postEvent(QMirClientWindow *platformWindow, const MirEvent *event)
-{
-    QWindow *window = platformWindow->window();
-
-    QCoreApplication::postEvent(this, new UbuntuEvent(
-            platformWindow, event, mEventType));
-
-    if ((window->flags().testFlag(Qt::WindowTransparentForInput)) && window->parent()) {
-        QCoreApplication::postEvent(this, new UbuntuEvent(
-                    static_cast<QMirClientWindow*>(platformWindow->QPlatformWindow::parent()),
-                    event, mEventType));
-    }
-}
-
-void QMirClientInput::dispatchInputEvent(QMirClientWindow *window, const MirInputEvent *ev)
-{
-    switch (mir_input_event_get_type(ev))
-    {
-    case mir_input_event_type_key:
-        dispatchKeyEvent(window, ev);
-        break;
-    case mir_input_event_type_touch:
-        dispatchTouchEvent(window, ev);
-        break;
-    case mir_input_event_type_pointer:
-        dispatchPointerEvent(window, ev);
-        break;
-    default:
-        break;
-    }
-}
-
-void QMirClientInput::dispatchTouchEvent(QMirClientWindow *window, const MirInputEvent *ev)
-{
-    const MirTouchEvent *tev = mir_input_event_get_touch_event(ev);
-
-    // FIXME(loicm) Max pressure is device specific. That one is for the Samsung Galaxy Nexus. That
-    //     needs to be fixed as soon as the compat input lib adds query support.
-    const float kMaxPressure = 1.28;
-    const QRect kWindowGeometry = window->geometry();
-    QList<QWindowSystemInterface::TouchPoint> touchPoints;
-
-
-    // TODO: Is it worth setting the Qt::TouchPointStationary ones? Currently they are left
-    //       as Qt::TouchPointMoved
-    const unsigned int kPointerCount = mir_touch_event_point_count(tev);
-    touchPoints.reserve(int(kPointerCount));
-    for (unsigned int i = 0; i < kPointerCount; ++i) {
-        QWindowSystemInterface::TouchPoint touchPoint;
-
-        const float kX = mir_touch_event_axis_value(tev, i, mir_touch_axis_x) + kWindowGeometry.x();
-        const float kY = mir_touch_event_axis_value(tev, i, mir_touch_axis_y) + kWindowGeometry.y(); // see bug lp:1346633 workaround comments elsewhere
-        const float kW = mir_touch_event_axis_value(tev, i, mir_touch_axis_touch_major);
-        const float kH = mir_touch_event_axis_value(tev, i, mir_touch_axis_touch_minor);
-        const float kP = mir_touch_event_axis_value(tev, i, mir_touch_axis_pressure);
-        touchPoint.id = mir_touch_event_id(tev, i);
-        touchPoint.normalPosition = QPointF(kX / kWindowGeometry.width(), kY / kWindowGeometry.height());
-        touchPoint.area = QRectF(kX - (kW / 2.0), kY - (kH / 2.0), kW, kH);
-        touchPoint.pressure = kP / kMaxPressure;
-
-        MirTouchAction touch_action = mir_touch_event_action(tev, i);
-        switch (touch_action)
-        {
-        case mir_touch_action_down:
-            mLastInputWindow = window;
-            touchPoint.state = Qt::TouchPointPressed;
-            break;
-        case mir_touch_action_up:
-            touchPoint.state = Qt::TouchPointReleased;
-            break;
-        case mir_touch_action_change:
-            touchPoint.state = Qt::TouchPointMoved;
-            break;
-        default:
-            Q_UNREACHABLE();
-        }
-
-        touchPoints.append(touchPoint);
-    }
-
-    ulong timestamp = mir_input_event_get_event_time(ev) / 1000000;
-    QWindowSystemInterface::handleTouchEvent(window->window(), timestamp,
-            mTouchDevice, touchPoints);
-}
-
-static uint32_t translateKeysym(uint32_t sym, const QString &text) {
-    int code = 0;
-
-    QTextCodec *systemCodec = QTextCodec::codecForLocale();
-    if (sym < 128 || (sym < 256 && systemCodec->mibEnum() == 4)) {
-        // upper-case key, if known
-        code = isprint((int)sym) ? toupper((int)sym) : 0;
-    } else if (sym >= XKB_KEY_F1 && sym <= XKB_KEY_F35) {
-        return Qt::Key_F1 + (int(sym) - XKB_KEY_F1);
-    } else if (text.length() == 1 && text.unicode()->unicode() > 0x1f
-               && text.unicode()->unicode() != 0x7f
-               && !(sym >= XKB_KEY_dead_grave && sym <= XKB_KEY_dead_currency)) {
-        code = text.unicode()->toUpper().unicode();
-    } else {
-        for (int i = 0; KeyTable[i]; i += 2)
-            if (sym == KeyTable[i])
-                code = KeyTable[i + 1];
-    }
-
-    return code;
-}
-
-namespace
-{
-Qt::KeyboardModifiers qt_modifiers_from_mir(MirInputEventModifiers modifiers)
-{
-    Qt::KeyboardModifiers q_modifiers = Qt::NoModifier;
-    if (modifiers & mir_input_event_modifier_shift) {
-        q_modifiers |= Qt::ShiftModifier;
-    }
-    if (modifiers & mir_input_event_modifier_ctrl) {
-        q_modifiers |= Qt::ControlModifier;
-    }
-    if (modifiers & mir_input_event_modifier_alt_left) {
-        q_modifiers |= Qt::AltModifier;
-    }
-    if (modifiers & mir_input_event_modifier_meta) {
-        q_modifiers |= Qt::MetaModifier;
-    }
-    if (modifiers & mir_input_event_modifier_alt_right) {
-        q_modifiers |= Qt::GroupSwitchModifier;
-    }
-    return q_modifiers;
-}
-}
-
-void QMirClientInput::dispatchKeyEvent(QMirClientWindow *window, const MirInputEvent *event)
-{
-    const MirKeyboardEvent *key_event = mir_input_event_get_keyboard_event(event);
-
-    ulong timestamp = mir_input_event_get_event_time(event) / 1000000;
-    xkb_keysym_t xk_sym = mir_keyboard_event_key_code(key_event);
-    quint32 scan_code = mir_keyboard_event_scan_code(key_event);
-    quint32 native_modifiers = mir_keyboard_event_modifiers(key_event);
-
-    // Key modifier and unicode index mapping.
-    auto modifiers = qt_modifiers_from_mir(native_modifiers);
-
-    MirKeyboardAction action = mir_keyboard_event_action(key_event);
-    QEvent::Type keyType = action == mir_keyboard_action_up
-        ? QEvent::KeyRelease : QEvent::KeyPress;
-
-    if (action == mir_keyboard_action_down)
-        mLastInputWindow = window;
-
-    QString text;
-    QVarLengthArray<char, 32> chars(32);
-    {
-        int result = xkb_keysym_to_utf8(xk_sym, chars.data(), chars.size());
-
-        if (result > 0) {
-            text = QString::fromUtf8(chars.constData());
-        }
-    }
-    int sym = translateKeysym(xk_sym, text);
-
-    bool is_auto_rep = action == mir_keyboard_action_repeat;
-
-    QPlatformInputContext *context = QGuiApplicationPrivate::platformIntegration()->inputContext();
-    if (context) {
-        QKeyEvent qKeyEvent(keyType, sym, modifiers, scan_code, xk_sym, native_modifiers, text, is_auto_rep);
-        qKeyEvent.setTimestamp(timestamp);
-        if (context->filterEvent(&qKeyEvent)) {
-            qCDebug(mirclient, "key event filtered out by input context");
-            return;
-        }
-    }
-
-    QWindowSystemInterface::handleExtendedKeyEvent(window->window(), timestamp, keyType, sym, modifiers, scan_code, xk_sym, native_modifiers, text, is_auto_rep);
-}
-
-namespace
-{
-Qt::MouseButtons extract_buttons(const MirPointerEvent *pev)
-{
-    Qt::MouseButtons buttons = Qt::NoButton;
-    if (mir_pointer_event_button_state(pev, mir_pointer_button_primary))
-        buttons |= Qt::LeftButton;
-    if (mir_pointer_event_button_state(pev, mir_pointer_button_secondary))
-        buttons |= Qt::RightButton;
-    if (mir_pointer_event_button_state(pev, mir_pointer_button_tertiary))
-        buttons |= Qt::MiddleButton;
-    if (mir_pointer_event_button_state(pev, mir_pointer_button_back))
-        buttons |= Qt::BackButton;
-    if (mir_pointer_event_button_state(pev, mir_pointer_button_forward))
-        buttons |= Qt::ForwardButton;
-
-    return buttons;
-}
-}
-
-void QMirClientInput::dispatchPointerEvent(QMirClientWindow *platformWindow, const MirInputEvent *ev)
-{
-    const auto window = platformWindow->window();
-    const auto timestamp = mir_input_event_get_event_time(ev) / 1000000;
-
-    const auto pev = mir_input_event_get_pointer_event(ev);
-    const auto action = mir_pointer_event_action(pev);
-
-    const auto modifiers = qt_modifiers_from_mir(mir_pointer_event_modifiers(pev));
-    const auto localPoint = QPointF(mir_pointer_event_axis_value(pev, mir_pointer_axis_x),
-                                    mir_pointer_event_axis_value(pev, mir_pointer_axis_y));
-
-    mLastInputWindow = platformWindow;
-
-    switch (action) {
-    case mir_pointer_action_button_up:
-    case mir_pointer_action_button_down:
-    case mir_pointer_action_motion:
-    {
-        const float hDelta = mir_pointer_event_axis_value(pev, mir_pointer_axis_hscroll);
-        const float vDelta = mir_pointer_event_axis_value(pev, mir_pointer_axis_vscroll);
-
-        if (hDelta != 0 || vDelta != 0) {
-            // QWheelEvent::DefaultDeltasPerStep = 120 but doesn't exist on vivid
-            const QPoint angleDelta(120 * hDelta, 120 * vDelta);
-            QWindowSystemInterface::handleWheelEvent(window, timestamp, localPoint, window->position() + localPoint,
-                                                     QPoint(), angleDelta, modifiers, Qt::ScrollUpdate);
-        }
-        auto buttons = extract_buttons(pev);
-        QWindowSystemInterface::handleMouseEvent(window, timestamp, localPoint, window->position() + localPoint /* Should we omit global point instead? */,
-                                                 buttons, modifiers);
-        break;
-    }
-    case mir_pointer_action_enter:
-        QWindowSystemInterface::handleEnterEvent(window, localPoint, window->position() + localPoint);
-        break;
-    case mir_pointer_action_leave:
-        QWindowSystemInterface::handleLeaveEvent(window);
-        break;
-    default:
-        Q_UNREACHABLE();
-    }
-}
-
-static const char* nativeOrientationDirectionToStr(MirOrientation orientation)
-{
-    switch (orientation) {
-    case mir_orientation_normal:
-        return "Normal";
-    case mir_orientation_left:
-        return "Left";
-    case mir_orientation_inverted:
-        return "Inverted";
-    case mir_orientation_right:
-        return "Right";
-    }
-    Q_UNREACHABLE();
-}
-
-void QMirClientInput::dispatchOrientationEvent(QWindow *window, const MirOrientationEvent *event)
-{
-    MirOrientation mir_orientation = mir_orientation_event_get_direction(event);
-    qCDebug(mirclientInput, "orientation direction: %s", nativeOrientationDirectionToStr(mir_orientation));
-
-    if (!window->screen()) {
-        qCDebug(mirclient, "Window has no associated screen, dropping orientation event");
-        return;
-    }
-
-    OrientationChangeEvent::Orientation orientation;
-    switch (mir_orientation) {
-    case mir_orientation_normal:
-        orientation = OrientationChangeEvent::TopUp;
-        break;
-    case mir_orientation_left:
-        orientation = OrientationChangeEvent::LeftUp;
-        break;
-    case mir_orientation_inverted:
-        orientation = OrientationChangeEvent::TopDown;
-        break;
-    case mir_orientation_right:
-        orientation = OrientationChangeEvent::RightUp;
-        break;
-    default:
-        qCDebug(mirclient, "No such orientation %d", mir_orientation);
-        return;
-    }
-
-    // Dispatch orientation event to [Platform]Screen, as that is where Qt reads it. Screen will handle
-    // notifying Qt of the actual orientation change - done to prevent multiple Windows each creating
-    // an identical orientation change event and passing it directly to Qt.
-    // [Platform]Screen can also factor in the native orientation.
-    QCoreApplication::postEvent(static_cast<QMirClientScreen*>(window->screen()->handle()),
-                                new OrientationChangeEvent(OrientationChangeEvent::mType, orientation));
-}
-
-void QMirClientInput::handleSurfaceEvent(const QPointer<QMirClientWindow> &window, const MirSurfaceEvent *event)
-{
-    auto surfaceEventAttribute = mir_surface_event_get_attribute(event);
-
-    switch (surfaceEventAttribute) {
-    case mir_surface_attrib_focus: {
-        window->handleSurfaceFocusChanged(
-                    mir_surface_event_get_attribute_value(event) == mir_surface_focused);
-        break;
-    }
-    case mir_surface_attrib_visibility: {
-        window->handleSurfaceExposeChange(
-                    mir_surface_event_get_attribute_value(event) == mir_surface_visibility_exposed);
-        break;
-    }
-    // Remaining attributes are ones client sets for server, and server should not override them
-    case mir_surface_attrib_state: {
-        MirSurfaceState state = static_cast<MirSurfaceState>(mir_surface_event_get_attribute_value(event));
-
-        if (state == mir_surface_state_hidden) {
-            window->handleSurfaceVisibilityChanged(false);
-        } else {
-            // it's visible!
-            window->handleSurfaceVisibilityChanged(true);
-            window->handleSurfaceStateChanged(mirSurfaceStateToWindowState(state));
-        }
-        break;
-    }
-    case mir_surface_attrib_type:
-    case mir_surface_attrib_swapinterval:
-    case mir_surface_attrib_dpi:
-    case mir_surface_attrib_preferred_orientation:
-    case mir_surface_attribs:
-        break;
-    }
-}
-
-void QMirClientInput::handleSurfaceOutputEvent(const QPointer<QMirClientWindow> &window, const MirSurfaceOutputEvent *event)
-{
-    const uint32_t outputId = mir_surface_output_event_get_output_id(event);
-    const int dpi = mir_surface_output_event_get_dpi(event);
-    const MirFormFactor formFactor = mir_surface_output_event_get_form_factor(event);
-    const float scale = mir_surface_output_event_get_scale(event);
-
-    const auto screenObserver = mIntegration->screenObserver();
-    QMirClientScreen *screen = screenObserver->findScreenWithId(outputId);
-    if (!screen) {
-        qCWarning(mirclient) << "Mir notified window" << window->window() << "on an unknown screen with id" << outputId;
-        return;
-    }
-
-    screenObserver->handleScreenPropertiesChange(screen, dpi, formFactor, scale);
-    window->handleScreenPropertiesChange(formFactor, scale);
-
-    if (window->screen() != screen) {
-        QWindowSystemInterface::handleWindowScreenChanged(window->window(), screen->screen());
-    }
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientinput.h b/src/plugins/platforms/mirclient/qmirclientinput.h
deleted file mode 100644
index 263cb5e54e..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientinput.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014-2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTINPUT_H
-#define QMIRCLIENTINPUT_H
-
-// Qt
-#include <qpa/qwindowsysteminterface.h>
-
-#include <mir_toolkit/mir_client_library.h>
-
-class QMirClientClientIntegration;
-class QMirClientWindow;
-
-class QMirClientInput : public QObject
-{
-    Q_OBJECT
-
-public:
-    QMirClientInput(QMirClientClientIntegration* integration);
-    virtual ~QMirClientInput();
-
-    // QObject methods.
-    void customEvent(QEvent* event) override;
-
-    void postEvent(QMirClientWindow* window, const MirEvent *event);
-    QMirClientClientIntegration* integration() const { return mIntegration; }
-    QMirClientWindow *lastInputWindow() const {return mLastInputWindow; }
-
-protected:
-    void dispatchKeyEvent(QMirClientWindow *window, const MirInputEvent *event);
-    void dispatchPointerEvent(QMirClientWindow *window, const MirInputEvent *event);
-    void dispatchTouchEvent(QMirClientWindow *window, const MirInputEvent *event);
-    void dispatchInputEvent(QMirClientWindow *window, const MirInputEvent *event);
-
-    void dispatchOrientationEvent(QWindow* window, const MirOrientationEvent *event);
-    void handleSurfaceEvent(const QPointer<QMirClientWindow> &window, const MirSurfaceEvent *event);
-    void handleSurfaceOutputEvent(const QPointer<QMirClientWindow> &window, const MirSurfaceOutputEvent *event);
-
-private:
-    QMirClientClientIntegration* mIntegration;
-    QTouchDevice* mTouchDevice;
-    const QByteArray mEventFilterType;
-    const QEvent::Type mEventType;
-
-    QMirClientWindow *mLastInputWindow;
-};
-
-#endif // QMIRCLIENTINPUT_H
diff --git a/src/plugins/platforms/mirclient/qmirclientintegration.cpp b/src/plugins/platforms/mirclient/qmirclientintegration.cpp
deleted file mode 100644
index d2b1dbee0d..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientintegration.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014-2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-// Local
-#include "qmirclientintegration.h"
-#include "qmirclientbackingstore.h"
-#include "qmirclientclipboard.h"
-#include "qmirclientdebugextension.h"
-#include "qmirclientdesktopwindow.h"
-#include "qmirclientglcontext.h"
-#include "qmirclientinput.h"
-#include "qmirclientlogging.h"
-#include "qmirclientnativeinterface.h"
-#include "qmirclientscreen.h"
-#include "qmirclienttheme.h"
-#include "qmirclientwindow.h"
-
-// Qt
-#include <QFileInfo>
-#include <QGuiApplication>
-#include <qpa/qplatformnativeinterface.h>
-#include <qpa/qplatforminputcontextfactory_p.h>
-#include <qpa/qplatforminputcontext.h>
-#include <qpa/qwindowsysteminterface.h>
-#include <QtEglSupport/private/qeglconvenience_p.h>
-#include <QtEglSupport/private/qeglpbuffer_p.h>
-#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
-#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
-#ifndef QT_NO_ACCESSIBILITY
-#include <qpa/qplatformaccessibility.h>
-#ifndef QT_NO_ACCESSIBILITY_ATSPI_BRIDGE
-#include <QtLinuxAccessibilitySupport/private/bridge_p.h>
-#endif
-#endif
-
-#include <QOpenGLContext>
-#include <QOffscreenSurface>
-
-// platform-api
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/id.h>
-#include <ubuntu/application/options.h>
-
-static void resumedCallback(const UApplicationOptions */*options*/, void* context)
-{
-    auto integration = static_cast<QMirClientClientIntegration*>(context);
-    integration->appStateController()->setResumed();
-}
-
-static void aboutToStopCallback(UApplicationArchive */*archive*/, void* context)
-{
-    auto integration = static_cast<QMirClientClientIntegration*>(context);
-    auto inputContext = integration->inputContext();
-    if (inputContext) {
-        inputContext->hideInputPanel();
-    } else {
-        qCWarning(mirclient) << "aboutToStopCallback(): no input context";
-    }
-    integration->appStateController()->setSuspended();
-}
-
-QMirClientClientIntegration::QMirClientClientIntegration(int argc, char **argv)
-    : QPlatformIntegration()
-    , mNativeInterface(new QMirClientNativeInterface(this))
-    , mFontDb(new QGenericUnixFontDatabase)
-    , mServices(new QMirClientPlatformServices)
-    , mAppStateController(new QMirClientAppStateController)
-    , mScaleFactor(1.0)
-{
-    {
-        QStringList args = QCoreApplication::arguments();
-        setupOptions(args);
-        QByteArray sessionName = generateSessionName(args);
-        setupDescription(sessionName);
-    }
-
-    // Create new application instance
-    mInstance = u_application_instance_new_from_description_with_options(mDesc, mOptions);
-
-    if (Q_UNLIKELY(!mInstance))
-        qFatal("QMirClientClientIntegration: connection to Mir server failed. Check that a Mir server is\n"
-               "running, and the correct socket is being used and is accessible. The shell may have\n"
-               "rejected the incoming connection, so check its log file");
-
-    mMirConnection = u_application_instance_get_mir_connection(mInstance);
-
-    // Choose the default surface format suited to the Mir platform
-    QSurfaceFormat defaultFormat;
-    defaultFormat.setRedBufferSize(8);
-    defaultFormat.setGreenBufferSize(8);
-    defaultFormat.setBlueBufferSize(8);
-    QSurfaceFormat::setDefaultFormat(defaultFormat);
-
-    // Initialize EGL.
-    mEglNativeDisplay = mir_connection_get_egl_native_display(mMirConnection);
-    ASSERT((mEglDisplay = eglGetDisplay(mEglNativeDisplay)) != EGL_NO_DISPLAY);
-    ASSERT(eglInitialize(mEglDisplay, nullptr, nullptr) == EGL_TRUE);
-
-    // Has debug mode been requsted, either with "-testability" switch or QT_LOAD_TESTABILITY env var
-    bool testability = qEnvironmentVariableIsSet("QT_LOAD_TESTABILITY");
-    for (int i=1; !testability && i<argc; i++) {
-        if (strcmp(argv[i], "-testability") == 0) {
-            testability = true;
-        }
-    }
-    if (testability) {
-        mDebugExtension.reset(new QMirClientDebugExtension);
-    }
-}
-
-void QMirClientClientIntegration::initialize()
-{
-    // Init the ScreenObserver
-    mScreenObserver.reset(new QMirClientScreenObserver(mMirConnection));
-    connect(mScreenObserver.data(), &QMirClientScreenObserver::screenAdded,
-            [this](QMirClientScreen *screen) { QWindowSystemInterface::handleScreenAdded(screen); });
-    connect(mScreenObserver.data(), &QMirClientScreenObserver::screenRemoved,
-                     this, &QMirClientClientIntegration::destroyScreen);
-
-    Q_FOREACH (auto screen, mScreenObserver->screens()) {
-        QWindowSystemInterface::handleScreenAdded(screen);
-    }
-
-    // Initialize input.
-    mInput = new QMirClientInput(this);
-    mInputContext = QPlatformInputContextFactory::create();
-
-    // compute the scale factor
-    const int defaultGridUnit = 8;
-    int gridUnit = defaultGridUnit;
-    QByteArray gridUnitString = qgetenv("GRID_UNIT_PX");
-    if (!gridUnitString.isEmpty()) {
-        bool ok;
-        gridUnit = gridUnitString.toInt(&ok);
-        if (!ok) {
-            gridUnit = defaultGridUnit;
-        }
-    }
-    mScaleFactor = static_cast<qreal>(gridUnit) / defaultGridUnit;
-}
-
-QMirClientClientIntegration::~QMirClientClientIntegration()
-{
-    eglTerminate(mEglDisplay);
-    delete mInput;
-    delete mInputContext;
-    delete mServices;
-}
-
-QPlatformServices *QMirClientClientIntegration::services() const
-{
-    return mServices;
-}
-
-void QMirClientClientIntegration::setupOptions(QStringList &args)
-{
-    int argc = args.size() + 1;
-    char **argv = new char*[argc];
-    for (int i = 0; i < argc - 1; i++)
-        argv[i] = qstrdup(args.at(i).toLocal8Bit());
-    argv[argc - 1] = nullptr;
-
-    mOptions = u_application_options_new_from_cmd_line(argc - 1, argv);
-
-    for (int i = 0; i < argc; i++)
-        delete [] argv[i];
-    delete [] argv;
-}
-
-void QMirClientClientIntegration::setupDescription(QByteArray &sessionName)
-{
-    mDesc = u_application_description_new();
-
-    UApplicationId* id = u_application_id_new_from_stringn(sessionName.data(), sessionName.count());
-    u_application_description_set_application_id(mDesc, id);
-
-    UApplicationLifecycleDelegate* delegate = u_application_lifecycle_delegate_new();
-    u_application_lifecycle_delegate_set_application_resumed_cb(delegate, &resumedCallback);
-    u_application_lifecycle_delegate_set_application_about_to_stop_cb(delegate, &aboutToStopCallback);
-    u_application_lifecycle_delegate_set_context(delegate, this);
-    u_application_description_set_application_lifecycle_delegate(mDesc, delegate);
-}
-
-QByteArray QMirClientClientIntegration::generateSessionName(QStringList &args)
-{
-    // Try to come up with some meaningful session name to uniquely identify this session,
-    // helping with shell debugging
-
-    if (args.count() == 0) {
-        return QByteArray("QtUbuntu");
-    } if (args[0].contains("qmlscene")) {
-        return generateSessionNameFromQmlFile(args);
-    } else {
-        // use the executable name
-        QFileInfo fileInfo(args[0]);
-        return fileInfo.fileName().toLocal8Bit();
-    }
-}
-
-QByteArray QMirClientClientIntegration::generateSessionNameFromQmlFile(QStringList &args)
-{
-    Q_FOREACH (QString arg, args) {
-        if (arg.endsWith(".qml")) {
-            QFileInfo fileInfo(arg);
-            return fileInfo.fileName().toLocal8Bit();
-        }
-    }
-
-    // give up
-    return "qmlscene";
-}
-
-QPlatformWindow* QMirClientClientIntegration::createPlatformWindow(QWindow* window) const
-{
-    if (window->type() == Qt::Desktop) {
-        // Desktop windows should not be backed up by a mir surface as they don't draw anything (nor should).
-        return new QMirClientDesktopWindow(window);
-    } else {
-        return new QMirClientWindow(window, mInput, mNativeInterface, mAppStateController.data(),
-                                    mEglDisplay, mMirConnection, mDebugExtension.data());
-    }
-}
-
-bool QMirClientClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
-{
-    switch (cap) {
-    case ThreadedOpenGL:
-        if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_THREADED_OPENGL")) {
-            return true;
-        } else {
-            qCDebug(mirclient, "disabled threaded OpenGL");
-            return false;
-        }
-
-    case ThreadedPixmaps:
-    case OpenGL:
-    case ApplicationState:
-    case MultipleWindows:
-    case NonFullScreenWindows:
-#if QT_VERSION > QT_VERSION_CHECK(5, 5, 0)
-    case SwitchableWidgetComposition:
-#endif
-    case RasterGLSurface: // needed for QQuickWidget
-        return true;
-    default:
-        return QPlatformIntegration::hasCapability(cap);
-    }
-}
-
-QAbstractEventDispatcher *QMirClientClientIntegration::createEventDispatcher() const
-{
-    return createUnixEventDispatcher();
-}
-
-QPlatformBackingStore* QMirClientClientIntegration::createPlatformBackingStore(QWindow* window) const
-{
-    return new QMirClientBackingStore(window);
-}
-
-QPlatformOpenGLContext* QMirClientClientIntegration::createPlatformOpenGLContext(
-        QOpenGLContext* context) const
-{
-    QSurfaceFormat format(context->format());
-
-    auto platformContext = new QMirClientOpenGLContext(format, context->shareHandle(), mEglDisplay);
-    if (!platformContext->isValid()) {
-        // Older Intel Atom-based devices only support OpenGL 1.4 compatibility profile but by default
-        // QML asks for at least OpenGL 2.0. The XCB GLX backend ignores this request and returns a
-        // 1.4 context, but the XCB EGL backend tries to honor it, and fails. The 1.4 context appears to
-        // have sufficient capabilities on MESA (i915) to render correctly however. So reduce the default
-        // requested OpenGL version to 1.0 to ensure EGL will give us a working context (lp:1549455).
-        static const bool isMesa = QString(eglQueryString(mEglDisplay, EGL_VENDOR)).contains(QStringLiteral("Mesa"));
-        if (isMesa) {
-            qCDebug(mirclientGraphics, "Attempting to choose OpenGL 1.4 context which may suit Mesa");
-            format.setMajorVersion(1);
-            format.setMinorVersion(4);
-            delete platformContext;
-            platformContext = new QMirClientOpenGLContext(format, context->shareHandle(), mEglDisplay);
-        }
-    }
-    return platformContext;
-}
-
-QStringList QMirClientClientIntegration::themeNames() const
-{
-    return QStringList(QMirClientTheme::name);
-}
-
-QPlatformTheme* QMirClientClientIntegration::createPlatformTheme(const QString& name) const
-{
-    Q_UNUSED(name);
-    return new QMirClientTheme;
-}
-
-QVariant QMirClientClientIntegration::styleHint(StyleHint hint) const
-{
-    switch (hint) {
-        case QPlatformIntegration::StartDragDistance: {
-            // default is 10 pixels (see QPlatformTheme::defaultThemeHint)
-            return 10.0 * mScaleFactor;
-        }
-        case QPlatformIntegration::PasswordMaskDelay: {
-            // return time in milliseconds - 1 second
-            return QVariant(1000);
-        }
-        default:
-            break;
-    }
-    return QPlatformIntegration::styleHint(hint);
-}
-
-QPlatformClipboard* QMirClientClientIntegration::clipboard() const
-{
-    static QPlatformClipboard *clipboard = nullptr;
-    if (!clipboard) {
-        clipboard = new QMirClientClipboard;
-    }
-    return clipboard;
-}
-
-QPlatformNativeInterface* QMirClientClientIntegration::nativeInterface() const
-{
-    return mNativeInterface;
-}
-
-QPlatformOffscreenSurface *QMirClientClientIntegration::createPlatformOffscreenSurface(
-        QOffscreenSurface *surface) const
-{
-    return new QEGLPbuffer(mEglDisplay, surface->requestedFormat(), surface);
-}
-
-void QMirClientClientIntegration::destroyScreen(QMirClientScreen *screen)
-{
-    // FIXME: on deleting a screen while a Window is on it, Qt will automatically
-    // move the window to the primaryScreen(). This will trigger a screenChanged
-    // signal, causing things like QQuickScreenAttached to re-fetch screen properties
-    // like DPI and physical size. However this is crashing, as Qt is calling virtual
-    // functions on QPlatformScreen, for reasons unclear. As workaround, move window
-    // to primaryScreen() before deleting the screen. Might be QTBUG-38650
-
-    QScreen *primaryScreen = QGuiApplication::primaryScreen();
-    if (screen != primaryScreen->handle()) {
-        uint32_t movedWindowCount = 0;
-        Q_FOREACH (QWindow *w, QGuiApplication::topLevelWindows()) {
-            if (w->screen()->handle() == screen) {
-                QWindowSystemInterface::handleWindowScreenChanged(w, primaryScreen);
-                ++movedWindowCount;
-            }
-        }
-        if (movedWindowCount > 0) {
-            QWindowSystemInterface::flushWindowSystemEvents();
-        }
-    }
-
-    qCDebug(mirclient) << "Removing Screen with id" << screen->mirOutputId() << "and geometry" << screen->geometry();
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-    delete screen;
-#else
-    QWindowSystemInterface::handleScreenRemoved(screen);
-#endif
-}
-
-#ifndef QT_NO_ACCESSIBILITY
-QPlatformAccessibility *QMirClientClientIntegration::accessibility() const
-{
-#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
-    if (!mAccessibility) {
-        Q_ASSERT_X(QCoreApplication::eventDispatcher(), "QMirClientIntegration",
-            "Initializing accessibility without event-dispatcher!");
-        mAccessibility.reset(new QSpiAccessibleBridge());
-    }
-#endif
-    return mAccessibility.data();
-}
-#endif
diff --git a/src/plugins/platforms/mirclient/qmirclientintegration.h b/src/plugins/platforms/mirclient/qmirclientintegration.h
deleted file mode 100644
index 035117f4da..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientintegration.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTINTEGRATION_H
-#define QMIRCLIENTINTEGRATION_H
-
-#include <qpa/qplatformintegration.h>
-#include <QSharedPointer>
-
-#include "qmirclientappstatecontroller.h"
-#include "qmirclientplatformservices.h"
-#include "qmirclientscreenobserver.h"
-
-// platform-api
-#include <ubuntu/application/description.h>
-#include <ubuntu/application/instance.h>
-
-#include <EGL/egl.h>
-
-class QMirClientDebugExtension;
-class QMirClientInput;
-class QMirClientNativeInterface;
-class QMirClientScreen;
-class MirConnection;
-
-class QMirClientClientIntegration : public QObject, public QPlatformIntegration
-{
-    Q_OBJECT
-
-public:
-    QMirClientClientIntegration(int argc, char **argv);
-    virtual ~QMirClientClientIntegration();
-
-    // QPlatformIntegration methods.
-    bool hasCapability(QPlatformIntegration::Capability cap) const override;
-    QAbstractEventDispatcher *createEventDispatcher() const override;
-    QPlatformNativeInterface* nativeInterface() const override;
-    QPlatformBackingStore* createPlatformBackingStore(QWindow* window) const override;
-    QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context) const override;
-    QPlatformFontDatabase* fontDatabase() const override { return mFontDb; }
-    QStringList themeNames() const override;
-    QPlatformTheme* createPlatformTheme(const QString& name) const override;
-    QVariant styleHint(StyleHint hint) const override;
-    QPlatformServices *services() const override;
-    QPlatformWindow* createPlatformWindow(QWindow* window) const override;
-    QPlatformInputContext* inputContext() const override { return mInputContext; }
-    QPlatformClipboard* clipboard() const override;
-    void initialize() override;
-    QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
-    QPlatformAccessibility *accessibility() const override;
-
-    // New methods.
-    MirConnection *mirConnection() const { return mMirConnection; }
-    EGLDisplay eglDisplay() const { return mEglDisplay; }
-    EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
-    QMirClientAppStateController *appStateController() const { return mAppStateController.data(); }
-    QMirClientScreenObserver *screenObserver() const { return mScreenObserver.data(); }
-    QMirClientDebugExtension *debugExtension() const { return mDebugExtension.data(); }
-
-private Q_SLOTS:
-    void destroyScreen(QMirClientScreen *screen);
-
-private:
-    void setupOptions(QStringList &args);
-    void setupDescription(QByteArray &sessionName);
-    static QByteArray generateSessionName(QStringList &args);
-    static QByteArray generateSessionNameFromQmlFile(QStringList &args);
-
-    QMirClientNativeInterface* mNativeInterface;
-    QPlatformFontDatabase* mFontDb;
-
-    QMirClientPlatformServices* mServices;
-
-    QMirClientInput* mInput;
-    QPlatformInputContext* mInputContext;
-    mutable QScopedPointer<QPlatformAccessibility> mAccessibility;
-    QScopedPointer<QMirClientDebugExtension> mDebugExtension;
-    QScopedPointer<QMirClientScreenObserver> mScreenObserver;
-    QScopedPointer<QMirClientAppStateController> mAppStateController;
-    qreal mScaleFactor;
-
-    MirConnection *mMirConnection;
-
-    // Platform API stuff
-    UApplicationOptions* mOptions;
-    UApplicationDescription* mDesc;
-    UApplicationInstance* mInstance;
-
-    // EGL related
-    EGLDisplay mEglDisplay{EGL_NO_DISPLAY};
-    EGLNativeDisplayType mEglNativeDisplay;
-};
-
-#endif // QMIRCLIENTINTEGRATION_H
diff --git a/src/plugins/platforms/mirclient/qmirclientlogging.h b/src/plugins/platforms/mirclient/qmirclientlogging.h
deleted file mode 100644
index 4921864ced..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientlogging.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTLOGGING_H
-#define QMIRCLIENTLOGGING_H
-
-#include <QLoggingCategory>
-
-#define ASSERT(cond) ((!(cond)) ? qt_assert(#cond,__FILE__,__LINE__) : qt_noop())
-
-Q_DECLARE_LOGGING_CATEGORY(mirclient)
-Q_DECLARE_LOGGING_CATEGORY(mirclientBufferSwap)
-Q_DECLARE_LOGGING_CATEGORY(mirclientInput)
-Q_DECLARE_LOGGING_CATEGORY(mirclientGraphics)
-Q_DECLARE_LOGGING_CATEGORY(mirclientCursor)
-Q_DECLARE_LOGGING_CATEGORY(mirclientDebug)
-
-#endif  // QMIRCLIENTLOGGING_H
diff --git a/src/plugins/platforms/mirclient/qmirclientnativeinterface.cpp b/src/plugins/platforms/mirclient/qmirclientnativeinterface.cpp
deleted file mode 100644
index b85e6fedfa..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientnativeinterface.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-// Local
-#include "qmirclientnativeinterface.h"
-#include "qmirclientscreen.h"
-#include "qmirclientglcontext.h"
-#include "qmirclientwindow.h"
-
-// Qt
-#include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/qscreen.h>
-#include <QtCore/QMap>
-
-class UbuntuResourceMap : public QMap<QByteArray, QMirClientNativeInterface::ResourceType>
-{
-public:
-    UbuntuResourceMap()
-        : QMap<QByteArray, QMirClientNativeInterface::ResourceType>() {
-        insert("egldisplay", QMirClientNativeInterface::EglDisplay);
-        insert("eglcontext", QMirClientNativeInterface::EglContext);
-        insert("nativeorientation", QMirClientNativeInterface::NativeOrientation);
-        insert("display", QMirClientNativeInterface::Display);
-        insert("mirconnection", QMirClientNativeInterface::MirConnection);
-        insert("mirsurface", QMirClientNativeInterface::MirSurface);
-        insert("scale", QMirClientNativeInterface::Scale);
-        insert("formfactor", QMirClientNativeInterface::FormFactor);
-    }
-};
-
-Q_GLOBAL_STATIC(UbuntuResourceMap, ubuntuResourceMap)
-
-QMirClientNativeInterface::QMirClientNativeInterface(const QMirClientClientIntegration *integration)
-    : mIntegration(integration)
-    , mGenericEventFilterType(QByteArrayLiteral("Event"))
-    , mNativeOrientation(nullptr)
-{
-}
-
-QMirClientNativeInterface::~QMirClientNativeInterface()
-{
-    delete mNativeOrientation;
-    mNativeOrientation = nullptr;
-}
-
-void* QMirClientNativeInterface::nativeResourceForIntegration(const QByteArray &resourceString)
-{
-    const QByteArray lowerCaseResource = resourceString.toLower();
-
-    if (!ubuntuResourceMap()->contains(lowerCaseResource)) {
-        return nullptr;
-    }
-
-    const ResourceType resourceType = ubuntuResourceMap()->value(lowerCaseResource);
-
-    if (resourceType == QMirClientNativeInterface::MirConnection) {
-        return mIntegration->mirConnection();
-    } else {
-        return nullptr;
-    }
-}
-
-void* QMirClientNativeInterface::nativeResourceForContext(
-    const QByteArray& resourceString, QOpenGLContext* context)
-{
-    if (!context)
-        return nullptr;
-
-    const QByteArray kLowerCaseResource = resourceString.toLower();
-
-    if (!ubuntuResourceMap()->contains(kLowerCaseResource))
-        return nullptr;
-
-    const ResourceType kResourceType = ubuntuResourceMap()->value(kLowerCaseResource);
-
-    if (kResourceType == QMirClientNativeInterface::EglContext)
-        return static_cast<QMirClientOpenGLContext*>(context->handle())->eglContext();
-    else
-        return nullptr;
-}
-
-void* QMirClientNativeInterface::nativeResourceForWindow(const QByteArray& resourceString, QWindow* window)
-{
-    const QByteArray kLowerCaseResource = resourceString.toLower();
-    if (!ubuntuResourceMap()->contains(kLowerCaseResource))
-        return NULL;
-    const ResourceType kResourceType = ubuntuResourceMap()->value(kLowerCaseResource);
-
-    switch (kResourceType) {
-    case EglDisplay:
-        return mIntegration->eglDisplay();
-    case NativeOrientation:
-        // Return the device's native screen orientation.
-        if (window) {
-            QMirClientScreen *ubuntuScreen = static_cast<QMirClientScreen*>(window->screen()->handle());
-            mNativeOrientation = new Qt::ScreenOrientation(ubuntuScreen->nativeOrientation());
-        } else {
-            QPlatformScreen *platformScreen = QGuiApplication::primaryScreen()->handle();
-            mNativeOrientation = new Qt::ScreenOrientation(platformScreen->nativeOrientation());
-        }
-        return mNativeOrientation;
-    case MirSurface:
-        if (window) {
-            auto ubuntuWindow = static_cast<QMirClientWindow*>(window->handle());
-            if (ubuntuWindow) {
-                return ubuntuWindow->mirSurface();
-            } else {
-                return nullptr;
-            }
-        } else {
-            return nullptr;
-        }
-    default:
-        return nullptr;
-    }
-}
-
-void* QMirClientNativeInterface::nativeResourceForScreen(const QByteArray& resourceString, QScreen* screen)
-{
-    const QByteArray kLowerCaseResource = resourceString.toLower();
-    if (!ubuntuResourceMap()->contains(kLowerCaseResource))
-        return NULL;
-    const ResourceType kResourceType = ubuntuResourceMap()->value(kLowerCaseResource);
-    if (!screen)
-        screen = QGuiApplication::primaryScreen();
-    auto ubuntuScreen = static_cast<QMirClientScreen*>(screen->handle());
-    if (kResourceType == QMirClientNativeInterface::Display) {
-        return mIntegration->eglNativeDisplay();
-    // Changes to the following properties are emitted via the QMirClientNativeInterface::screenPropertyChanged
-    // signal fired by QMirClientScreen. Connect to this signal for these properties updates.
-    // WARNING: code highly thread unsafe!
-    } else if (kResourceType == QMirClientNativeInterface::Scale) {
-        // In application code, read with:
-        //    float scale = *reinterpret_cast<float*>(nativeResourceForScreen("scale", screen()));
-        return &ubuntuScreen->mScale;
-    } else if (kResourceType == QMirClientNativeInterface::FormFactor) {
-        return &ubuntuScreen->mFormFactor;
-    } else
-        return NULL;
-}
-
-// Changes to these properties are emitted via the QMirClientNativeInterface::windowPropertyChanged
-// signal fired by QMirClientWindow. Connect to this signal for these properties updates.
-QVariantMap QMirClientNativeInterface::windowProperties(QPlatformWindow *window) const
-{
-    QVariantMap propertyMap;
-    auto w = static_cast<QMirClientWindow*>(window);
-    if (w) {
-        propertyMap.insert("scale", w->scale());
-        propertyMap.insert("formFactor", w->formFactor());
-    }
-    return propertyMap;
-}
-
-QVariant QMirClientNativeInterface::windowProperty(QPlatformWindow *window, const QString &name) const
-{
-    auto w = static_cast<QMirClientWindow*>(window);
-    if (!w) {
-        return QVariant();
-    }
-
-    if (name == QStringLiteral("scale")) {
-        return w->scale();
-    } else if (name == QStringLiteral("formFactor")) {
-        return w->formFactor();
-    } else {
-        return QVariant();
-    }
-}
-
-QVariant QMirClientNativeInterface::windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const
-{
-    QVariant returnVal = windowProperty(window, name);
-    if (!returnVal.isValid()) {
-        return defaultValue;
-    } else {
-        return returnVal;
-    }
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientnativeinterface.h b/src/plugins/platforms/mirclient/qmirclientnativeinterface.h
deleted file mode 100644
index eb601de301..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientnativeinterface.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTNATIVEINTERFACE_H
-#define QMIRCLIENTNATIVEINTERFACE_H
-
-#include <qpa/qplatformnativeinterface.h>
-
-#include "qmirclientintegration.h"
-
-class QPlatformScreen;
-
-class QMirClientNativeInterface : public QPlatformNativeInterface {
-    Q_OBJECT
-public:
-    enum ResourceType { EglDisplay, EglContext, NativeOrientation, Display, MirConnection, MirSurface, Scale, FormFactor };
-
-    QMirClientNativeInterface(const QMirClientClientIntegration *integration);
-    ~QMirClientNativeInterface();
-
-    // QPlatformNativeInterface methods.
-    void* nativeResourceForIntegration(const QByteArray &resource) override;
-    void* nativeResourceForContext(const QByteArray& resourceString,
-                                   QOpenGLContext* context) override;
-    void* nativeResourceForWindow(const QByteArray& resourceString,
-                                  QWindow* window) override;
-    void* nativeResourceForScreen(const QByteArray& resourceString,
-                                  QScreen* screen) override;
-
-    QVariantMap windowProperties(QPlatformWindow *window) const override;
-    QVariant windowProperty(QPlatformWindow *window, const QString &name) const override;
-    QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const override;
-
-    // New methods.
-    const QByteArray& genericEventFilterType() const { return mGenericEventFilterType; }
-
-Q_SIGNALS: // New signals
-    void screenPropertyChanged(QPlatformScreen *screen, const QString &propertyName);
-
-private:
-    const QMirClientClientIntegration *mIntegration;
-    const QByteArray mGenericEventFilterType;
-    Qt::ScreenOrientation* mNativeOrientation;
-};
-
-#endif // QMIRCLIENTNATIVEINTERFACE_H
diff --git a/src/plugins/platforms/mirclient/qmirclientorientationchangeevent_p.h b/src/plugins/platforms/mirclient/qmirclientorientationchangeevent_p.h
deleted file mode 100644
index 5abd3262dc..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientorientationchangeevent_p.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTORIENTATIONCHANGEEVENT_P_H
-#define QMIRCLIENTORIENTATIONCHANGEEVENT_P_H
-
-#include <QEvent>
-#include "qmirclientlogging.h"
-
-class OrientationChangeEvent : public QEvent {
-public:
-    enum Orientation { TopUp, LeftUp, TopDown, RightUp };
-
-    OrientationChangeEvent(QEvent::Type type, Orientation orientation)
-        : QEvent(type)
-        , mOrientation(orientation)
-    {
-    }
-
-    static const QEvent::Type mType;
-    Orientation mOrientation;
-};
-
-#endif // QMIRCLIENTORIENTATIONCHANGEEVENT_P_H
diff --git a/src/plugins/platforms/mirclient/qmirclientplatformservices.cpp b/src/plugins/platforms/mirclient/qmirclientplatformservices.cpp
deleted file mode 100644
index 1ccd57fc28..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientplatformservices.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientplatformservices.h"
-
-#include <QUrl>
-
-#include <ubuntu/application/url_dispatcher/service.h>
-#include <ubuntu/application/url_dispatcher/session.h>
-
-bool QMirClientPlatformServices::openUrl(const QUrl &url)
-{
-    return callDispatcher(url);
-}
-
-bool QMirClientPlatformServices::openDocument(const QUrl &url)
-{
-    return callDispatcher(url);
-}
-
-bool QMirClientPlatformServices::callDispatcher(const QUrl &url)
-{
-    UAUrlDispatcherSession* session = ua_url_dispatcher_session();
-    if (!session)
-        return false;
-
-    ua_url_dispatcher_session_open(session, url.toEncoded().constData(), NULL, NULL);
-
-    free(session);
-
-    // We are returning true here because the other option
-    // is spawning a nested event loop and wait for the
-    // callback. But there is no guarantee on how fast
-    // the callback is going to be so we prefer to avoid the
-    // nested event loop. Long term plan is improve Qt API
-    // to support an async openUrl
-    return true;
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientplatformservices.h b/src/plugins/platforms/mirclient/qmirclientplatformservices.h
deleted file mode 100644
index a1cd5758ca..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientplatformservices.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTPLATFORMSERVICES_H
-#define QMIRCLIENTPLATFORMSERVICES_H
-
-#include <qpa/qplatformservices.h>
-#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
-#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
-
-class QMirClientPlatformServices : public QPlatformServices {
-public:
-    bool openUrl(const QUrl &url) override;
-    bool openDocument(const QUrl &url) override;
-
-private:
-    bool callDispatcher(const QUrl &url);
-};
-
-#endif // QMIRCLIENTPLATFORMSERVICES_H
diff --git a/src/plugins/platforms/mirclient/qmirclientplugin.cpp b/src/plugins/platforms/mirclient/qmirclientplugin.cpp
deleted file mode 100644
index fc44edfe40..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientplugin.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientplugin.h"
-#include "qmirclientintegration.h"
-#include "qmirclientlogging.h"
-
-Q_LOGGING_CATEGORY(mirclient, "qt.qpa.mirclient", QtWarningMsg)
-
-QPlatformIntegration *QMirClientIntegrationPlugin::create(const QString &system,
-                                                          const QStringList &/*paramList*/,
-                                                          int &argc, char **argv)
-{
-    if (system.toLower() == QLatin1String("mirclient")) {
-        return new QMirClientClientIntegration(argc, argv);
-    } else {
-        return 0;
-    }
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientscreen.cpp b/src/plugins/platforms/mirclient/qmirclientscreen.cpp
deleted file mode 100644
index cc8db830aa..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientscreen.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014-2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-// local
-#include "qmirclientscreen.h"
-#include "qmirclientlogging.h"
-#include "qmirclientorientationchangeevent_p.h"
-#include "qmirclientnativeinterface.h"
-
-#include <mir_toolkit/mir_client_library.h>
-
-// Qt
-#include <QGuiApplication>
-#include <QtCore/qmath.h>
-#include <QScreen>
-#include <QThread>
-#include <qpa/qwindowsysteminterface.h>
-#include <QtEglSupport/private/qeglconvenience_p.h>
-
-#include <memory>
-
-static const int overrideDevicePixelRatio = qgetenv("QT_DEVICE_PIXEL_RATIO").toInt();
-
-static const char *orientationToStr(Qt::ScreenOrientation orientation) {
-    switch (orientation) {
-        case Qt::PrimaryOrientation:
-            return "primary";
-        case Qt::PortraitOrientation:
-            return "portrait";
-        case Qt::LandscapeOrientation:
-            return "landscape";
-        case Qt::InvertedPortraitOrientation:
-            return "inverted portrait";
-        case Qt::InvertedLandscapeOrientation:
-            return "inverted landscape";
-    }
-    Q_UNREACHABLE();
-}
-
-const QEvent::Type OrientationChangeEvent::mType =
-        static_cast<QEvent::Type>(QEvent::registerEventType());
-
-
-QMirClientScreen::QMirClientScreen(const MirOutput *output, MirConnection *connection)
-    : mDevicePixelRatio(1.0)
-    , mFormat(QImage::Format_RGB32)
-    , mDepth(32)
-    , mDpi{0}
-    , mFormFactor{mir_form_factor_unknown}
-    , mScale{1.0}
-    , mOutputId(0)
-    , mCursor(connection)
-{
-    setMirOutput(output);
-}
-
-QMirClientScreen::~QMirClientScreen()
-{
-}
-
-void QMirClientScreen::customEvent(QEvent* event) {
-    Q_ASSERT(QThread::currentThread() == thread());
-
-    OrientationChangeEvent* oReadingEvent = static_cast<OrientationChangeEvent*>(event);
-    switch (oReadingEvent->mOrientation) {
-        case OrientationChangeEvent::LeftUp: {
-            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
-                        Qt::InvertedPortraitOrientation : Qt::LandscapeOrientation;
-            break;
-        }
-        case OrientationChangeEvent::TopUp: {
-            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
-                        Qt::LandscapeOrientation : Qt::PortraitOrientation;
-            break;
-        }
-        case OrientationChangeEvent::RightUp: {
-            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
-                        Qt::PortraitOrientation : Qt::InvertedLandscapeOrientation;
-            break;
-        }
-        case OrientationChangeEvent::TopDown: {
-            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
-                        Qt::InvertedLandscapeOrientation : Qt::InvertedPortraitOrientation;
-            break;
-        }
-    }
-
-    // Raise the event signal so that client apps know the orientation changed
-    qCDebug(mirclient, "QMirClientScreen::customEvent - handling orientation change to %s", orientationToStr(mCurrentOrientation));
-    QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
-}
-
-void QMirClientScreen::handleWindowSurfaceResize(int windowWidth, int windowHeight)
-{
-    if ((windowWidth > windowHeight && mGeometry.width() < mGeometry.height())
-     || (windowWidth < windowHeight && mGeometry.width() > mGeometry.height())) {
-
-        // The window aspect ratio differ's from the screen one. This means that
-        // unity8 has rotated the window in its scene.
-        // As there's no way to express window rotation in Qt's API, we have
-        // Flip QScreen's dimensions so that orientation properties match
-        // (primaryOrientation particularly).
-        // FIXME: This assumes a phone scenario. Won't work, or make sense,
-        //        on the desktop
-
-        QRect currGeometry = mGeometry;
-        mGeometry.setWidth(currGeometry.height());
-        mGeometry.setHeight(currGeometry.width());
-
-        qCDebug(mirclient, "QMirClientScreen::handleWindowSurfaceResize - new screen geometry (w=%d, h=%d)",
-            mGeometry.width(), mGeometry.height());
-        QWindowSystemInterface::handleScreenGeometryChange(screen(),
-                                                           mGeometry /* newGeometry */,
-                                                           mGeometry /* newAvailableGeometry */);
-
-        if (mGeometry.width() < mGeometry.height()) {
-            mCurrentOrientation = Qt::PortraitOrientation;
-        } else {
-            mCurrentOrientation = Qt::LandscapeOrientation;
-        }
-        qCDebug(mirclient, "QMirClientScreen::handleWindowSurfaceResize - new orientation %s",orientationToStr(mCurrentOrientation));
-        QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
-    }
-}
-
-void QMirClientScreen::setMirOutput(const MirOutput *output)
-{
-    // Physical screen size (in mm)
-    mPhysicalSize.setWidth(mir_output_get_physical_width_mm(output));
-    mPhysicalSize.setHeight(mir_output_get_physical_height_mm(output));
-
-    // Pixel Format
-//    mFormat = qImageFormatFromMirPixelFormat(mir_output_get_current_pixel_format(output)); // GERRY: TODO
-
-    // Pixel depth
-    mDepth = 8 * MIR_BYTES_PER_PIXEL(mir_output_get_current_pixel_format(output));
-
-    // Mode = Resolution & refresh rate
-    const MirOutputMode *mode = mir_output_get_current_mode(output);
-    mNativeGeometry.setX(mir_output_get_position_x(output));
-    mNativeGeometry.setY(mir_output_get_position_y(output));
-    mNativeGeometry.setWidth(mir_output_mode_get_width(mode));
-    mNativeGeometry.setHeight(mir_output_mode_get_height(mode));
-
-    mRefreshRate = mir_output_mode_get_refresh_rate(mode);
-
-    // UI scale & DPR
-    mScale = mir_output_get_scale_factor(output);
-    if (overrideDevicePixelRatio > 0) {
-        mDevicePixelRatio = overrideDevicePixelRatio;
-    } else {
-        mDevicePixelRatio = 1.0; // FIXME - need to determine suitable DPR for the specified scale
-    }
-
-    mFormFactor = mir_output_get_form_factor(output);
-
-    mOutputId = mir_output_get_id(output);
-
-    mGeometry.setX(mNativeGeometry.x());
-    mGeometry.setY(mNativeGeometry.y());
-    mGeometry.setWidth(mNativeGeometry.width());
-    mGeometry.setHeight(mNativeGeometry.height());
-
-    // Set the default orientation based on the initial screen dimensions.
-    mNativeOrientation = (mGeometry.width() >= mGeometry.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
-
-    // If it's a landscape device (i.e. some tablets), start in landscape, otherwise portrait
-    mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
-}
-
-void QMirClientScreen::updateMirOutput(const MirOutput *output)
-{
-    auto oldRefreshRate = mRefreshRate;
-    auto oldScale = mScale;
-    auto oldFormFactor = mFormFactor;
-    auto oldGeometry = mGeometry;
-
-    setMirOutput(output);
-
-    // Emit change signals in particular order
-    if (oldGeometry != mGeometry) {
-        QWindowSystemInterface::handleScreenGeometryChange(screen(),
-                                                           mGeometry /* newGeometry */,
-                                                           mGeometry /* newAvailableGeometry */);
-    }
-
-    if (!qFuzzyCompare(mRefreshRate, oldRefreshRate)) {
-        QWindowSystemInterface::handleScreenRefreshRateChange(screen(), mRefreshRate);
-    }
-
-    auto nativeInterface = static_cast<QMirClientNativeInterface *>(qGuiApp->platformNativeInterface());
-    if (!qFuzzyCompare(mScale, oldScale)) {
-        nativeInterface->screenPropertyChanged(this, QStringLiteral("scale"));
-    }
-    if (mFormFactor != oldFormFactor) {
-        nativeInterface->screenPropertyChanged(this, QStringLiteral("formFactor"));
-    }
-}
-
-void QMirClientScreen::setAdditionalMirDisplayProperties(float scale, MirFormFactor formFactor, int dpi)
-{
-    if (mDpi != dpi) {
-        mDpi = dpi;
-        QWindowSystemInterface::handleScreenLogicalDotsPerInchChange(screen(), dpi, dpi);
-    }
-
-    auto nativeInterface = static_cast<QMirClientNativeInterface *>(qGuiApp->platformNativeInterface());
-    if (!qFuzzyCompare(mScale, scale)) {
-        mScale = scale;
-        nativeInterface->screenPropertyChanged(this, QStringLiteral("scale"));
-    }
-    if (mFormFactor != formFactor) {
-        mFormFactor = formFactor;
-        nativeInterface->screenPropertyChanged(this, QStringLiteral("formFactor"));
-    }
-}
-
-QDpi QMirClientScreen::logicalDpi() const
-{
-    if (mDpi > 0) {
-        return QDpi(mDpi, mDpi);
-    } else {
-        return QPlatformScreen::logicalDpi();
-    }
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientscreen.h b/src/plugins/platforms/mirclient/qmirclientscreen.h
deleted file mode 100644
index b31cba1964..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientscreen.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014-2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTSCREEN_H
-#define QMIRCLIENTSCREEN_H
-
-#include <qpa/qplatformscreen.h>
-#include <QSurfaceFormat>
-
-#include <mir_toolkit/common.h> // just for MirFormFactor enum
-
-#include "qmirclientcursor.h"
-
-struct MirConnection;
-struct MirOutput;
-
-class QMirClientScreen : public QObject, public QPlatformScreen
-{
-    Q_OBJECT
-public:
-    QMirClientScreen(const MirOutput *output, MirConnection *connection);
-    virtual ~QMirClientScreen();
-
-    // QPlatformScreen methods.
-    QImage::Format format() const override { return mFormat; }
-    int depth() const override { return mDepth; }
-    QRect geometry() const override { return mGeometry; }
-    QRect availableGeometry() const override { return mGeometry; }
-    QSizeF physicalSize() const override { return mPhysicalSize; }
-    qreal devicePixelRatio() const override { return mDevicePixelRatio; }
-    QDpi logicalDpi() const override;
-    Qt::ScreenOrientation nativeOrientation() const override { return mNativeOrientation; }
-    Qt::ScreenOrientation orientation() const override { return mNativeOrientation; }
-    QPlatformCursor *cursor() const override { return const_cast<QMirClientCursor*>(&mCursor); }
-
-    // Additional Screen properties from Mir
-    int mirOutputId() const { return mOutputId; }
-    MirFormFactor formFactor() const { return mFormFactor; }
-    float scale() const { return mScale; }
-
-    // Internally used methods
-    void updateMirOutput(const MirOutput *output);
-    void setAdditionalMirDisplayProperties(float scale, MirFormFactor formFactor, int dpi);
-    void handleWindowSurfaceResize(int width, int height);
-
-    // QObject methods.
-    void customEvent(QEvent* event) override;
-
-private:
-    void setMirOutput(const MirOutput *output);
-
-    QRect mGeometry, mNativeGeometry;
-    QSizeF mPhysicalSize;
-    qreal mDevicePixelRatio;
-    Qt::ScreenOrientation mNativeOrientation;
-    Qt::ScreenOrientation mCurrentOrientation;
-    QImage::Format mFormat;
-    int mDepth;
-    int mDpi;
-    qreal mRefreshRate;
-    MirFormFactor mFormFactor;
-    float mScale;
-    int mOutputId;
-    QMirClientCursor mCursor;
-
-    friend class QMirClientNativeInterface;
-};
-
-#endif // QMIRCLIENTSCREEN_H
diff --git a/src/plugins/platforms/mirclient/qmirclientscreenobserver.cpp b/src/plugins/platforms/mirclient/qmirclientscreenobserver.cpp
deleted file mode 100644
index 792aeca351..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientscreenobserver.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientscreenobserver.h"
-#include "qmirclientscreen.h"
-#include "qmirclientwindow.h"
-#include "qmirclientlogging.h"
-
-// Qt
-#include <QMetaObject>
-#include <QPointer>
-
-// Mir
-#include <mirclient/mir_toolkit/mir_connection.h>
-#include <mirclient/mir_toolkit/mir_display_configuration.h>
-
-#include <memory>
-
-namespace {
-    static void displayConfigurationChangedCallback(MirConnection */*connection*/, void* context)
-    {
-        ASSERT(context != NULL);
-        QMirClientScreenObserver *observer = static_cast<QMirClientScreenObserver *>(context);
-        QMetaObject::invokeMethod(observer, "update");
-    }
-
-    const char *mirFormFactorToStr(MirFormFactor formFactor)
-    {
-        switch (formFactor) {
-        case mir_form_factor_unknown: return "unknown";
-        case mir_form_factor_phone: return "phone";
-        case mir_form_factor_tablet: return "tablet";
-        case mir_form_factor_monitor: return "monitor";
-        case mir_form_factor_tv: return "tv";
-        case mir_form_factor_projector: return "projector";
-        }
-        Q_UNREACHABLE();
-    }
-} // anonymous namespace
-
-QMirClientScreenObserver::QMirClientScreenObserver(MirConnection *mirConnection)
-    : mMirConnection(mirConnection)
-{
-    mir_connection_set_display_config_change_callback(mirConnection, ::displayConfigurationChangedCallback, this);
-    update();
-}
-
-void QMirClientScreenObserver::update()
-{
-    // Wrap MirDisplayConfiguration to always delete when out of scope
-    auto configDeleter = [](MirDisplayConfig *config) { mir_display_config_release(config); };
-    using configUp = std::unique_ptr<MirDisplayConfig, decltype(configDeleter)>;
-    configUp displayConfig(mir_connection_create_display_configuration(mMirConnection), configDeleter);
-
-    // Mir only tells us something changed, it is up to us to figure out what.
-    QList<QMirClientScreen*> newScreenList;
-    QList<QMirClientScreen*> oldScreenList = mScreenList;
-    mScreenList.clear();
-
-    for (int i = 0; i < mir_display_config_get_num_outputs(displayConfig.get()); i++) {
-        const MirOutput *output = mir_display_config_get_output(displayConfig.get(), i);
-        if (mir_output_is_enabled(output)) {
-            QMirClientScreen *screen = findScreenWithId(oldScreenList, mir_output_get_id(output));
-            if (screen) { // we've already set up this display before
-                screen->updateMirOutput(output);
-                oldScreenList.removeAll(screen);
-            } else {
-                // new display, so create QMirClientScreen for it
-                screen = new QMirClientScreen(output, mMirConnection);
-                newScreenList.append(screen);
-                qCDebug(mirclient) << "Added Screen with id" << mir_output_get_id(output)
-                                         << "and geometry" << screen->geometry();
-            }
-            mScreenList.append(screen);
-        }
-    }
-
-    // Announce old & unused Screens, should be deleted by the slot
-    Q_FOREACH (const auto screen, oldScreenList) {
-        Q_EMIT screenRemoved(screen);
-    }
-
-    /*
-     * Mir's MirDisplayOutput does not include formFactor or scale for some reason, but Qt
-     * will want that information on creating the QScreen. Only way we get that info is when
-     * Mir positions a Window on that Screen. See "handleScreenPropertiesChange" method
-     */
-
-    // Announce new Screens
-    Q_FOREACH (const auto screen, newScreenList) {
-        Q_EMIT screenAdded(screen);
-    }
-
-    qCDebug(mirclient) << "=======================================";
-    for (auto screen: mScreenList) {
-        qCDebug(mirclient) << screen << "- id:" << screen->mirOutputId()
-                                 << "geometry:" << screen->geometry()
-                                 << "form factor:" << mirFormFactorToStr(screen->formFactor())
-                                 << "scale:" << screen->scale();
-    }
-    qCDebug(mirclient) << "=======================================";
-}
-
-QMirClientScreen *QMirClientScreenObserver::findScreenWithId(int id)
-{
-    return findScreenWithId(mScreenList, id);
-}
-
-QMirClientScreen *QMirClientScreenObserver::findScreenWithId(const QList<QMirClientScreen *> &list, int id)
-{
-    Q_FOREACH (const auto screen, list) {
-        if (screen->mirOutputId() == id) {
-            return screen;
-        }
-    }
-    return nullptr;
-}
-
-void QMirClientScreenObserver::handleScreenPropertiesChange(QMirClientScreen *screen, int dpi,
-                                                        MirFormFactor formFactor, float scale)
-{
-    screen->setAdditionalMirDisplayProperties(scale, formFactor, dpi);
-}
-
diff --git a/src/plugins/platforms/mirclient/qmirclientscreenobserver.h b/src/plugins/platforms/mirclient/qmirclientscreenobserver.h
deleted file mode 100644
index ad927319c1..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientscreenobserver.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTSCREENOBSERVER_H
-#define QMIRCLIENTSCREENOBSERVER_H
-
-#include <QObject>
-
-#include <mir_toolkit/mir_connection.h>
-
-class QMirClientScreen;
-
-class QMirClientScreenObserver : public QObject
-{
-    Q_OBJECT
-
-public:
-    QMirClientScreenObserver(MirConnection *connection);
-
-    QList<QMirClientScreen*> screens() const { return mScreenList; }
-    QMirClientScreen *findScreenWithId(int id);
-
-    void handleScreenPropertiesChange(QMirClientScreen *screen, int dpi,
-                                      MirFormFactor formFactor, float scale);
-
-Q_SIGNALS:
-    void screenAdded(QMirClientScreen *screen);
-    void screenRemoved(QMirClientScreen *screen);
-
-private Q_SLOTS:
-    void update();
-
-private:
-    QMirClientScreen *findScreenWithId(const QList<QMirClientScreen *> &list, int id);
-    void removeScreen(QMirClientScreen *screen);
-
-    MirConnection *mMirConnection;
-    QList<QMirClientScreen*> mScreenList;
-};
-
-#endif // QMIRCLIENTSCREENOBSERVER_H
diff --git a/src/plugins/platforms/mirclient/qmirclienttheme.h b/src/plugins/platforms/mirclient/qmirclienttheme.h
deleted file mode 100644
index 4bab1d0ee0..0000000000
--- a/src/plugins/platforms/mirclient/qmirclienttheme.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTTHEME_H
-#define QMIRCLIENTTHEME_H
-
-#include <QtThemeSupport/private/qgenericunixthemes_p.h>
-
-class QMirClientTheme : public QGenericUnixTheme
-{
-public:
-    static const char* name;
-    QMirClientTheme();
-    virtual ~QMirClientTheme();
-
-    // From QPlatformTheme
-    QVariant themeHint(ThemeHint hint) const override;
-};
-
-#endif // QMIRCLIENTTHEME_H
diff --git a/src/plugins/platforms/mirclient/qmirclientwindow.cpp b/src/plugins/platforms/mirclient/qmirclientwindow.cpp
deleted file mode 100644
index decd21516e..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientwindow.cpp
+++ /dev/null
@@ -1,968 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014-2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-// Local
-#include "qmirclientwindow.h"
-#include "qmirclientdebugextension.h"
-#include "qmirclientnativeinterface.h"
-#include "qmirclientinput.h"
-#include "qmirclientintegration.h"
-#include "qmirclientscreen.h"
-#include "qmirclientlogging.h"
-
-#include <mir_toolkit/mir_client_library.h>
-#include <mir_toolkit/version.h>
-
-// Qt
-#include <qpa/qwindowsysteminterface.h>
-#include <QMutexLocker>
-#include <QSize>
-#include <QtMath>
-#include <QtEglSupport/private/qeglconvenience_p.h>
-
-// Platform API
-#include <ubuntu/application/instance.h>
-
-#include <EGL/egl.h>
-
-Q_LOGGING_CATEGORY(mirclientBufferSwap, "qt.qpa.mirclient.bufferSwap", QtWarningMsg)
-
-namespace
-{
-const Qt::WindowType LowChromeWindowHint = (Qt::WindowType)0x00800000;
-
-// FIXME: this used to be defined by platform-api, but it's been removed in v3. Change ubuntu-keyboard to use
-// a different enum for window roles.
-enum UAUiWindowRole {
-    U_MAIN_ROLE = 1,
-    U_DASH_ROLE,
-    U_INDICATOR_ROLE,
-    U_NOTIFICATIONS_ROLE,
-    U_GREETER_ROLE,
-    U_LAUNCHER_ROLE,
-    U_ON_SCREEN_KEYBOARD_ROLE,
-    U_SHUTDOWN_DIALOG_ROLE,
-};
-
-struct MirSpecDeleter
-{
-    void operator()(MirSurfaceSpec *spec) { mir_surface_spec_release(spec); }
-};
-
-using Spec = std::unique_ptr<MirSurfaceSpec, MirSpecDeleter>;
-
-EGLNativeWindowType nativeWindowFor(MirSurface *surf)
-{
-    auto stream = mir_surface_get_buffer_stream(surf);
-    return reinterpret_cast<EGLNativeWindowType>(mir_buffer_stream_get_egl_native_window(stream));
-}
-
-const char *qtWindowStateToStr(Qt::WindowState state)
-{
-    switch (state) {
-    case Qt::WindowNoState:
-        return "NoState";
-    case Qt::WindowFullScreen:
-        return "FullScreen";
-    case Qt::WindowMaximized:
-        return "Maximized";
-    case Qt::WindowMinimized:
-        return "Minimized";
-    case Qt::WindowActive:
-        return "Active";
-    }
-    Q_UNREACHABLE();
-}
-
-const char *mirSurfaceStateToStr(MirSurfaceState surfaceState)
-{
-    switch (surfaceState) {
-    case mir_surface_state_unknown: return "unknown";
-    case mir_surface_state_restored: return "restored";
-    case mir_surface_state_minimized: return "minimized";
-    case mir_surface_state_maximized: return "vertmaximized";
-    case mir_surface_state_vertmaximized: return "vertmaximized";
-    case mir_surface_state_fullscreen: return "fullscreen";
-    case mir_surface_state_horizmaximized: return "horizmaximized";
-    case mir_surface_state_hidden: return "hidden";
-    case mir_surface_states: Q_UNREACHABLE();
-    }
-    Q_UNREACHABLE();
-}
-
-const char *mirPixelFormatToStr(MirPixelFormat pixelFormat)
-{
-    switch (pixelFormat) {
-    case mir_pixel_format_invalid:   return "invalid";
-    case mir_pixel_format_abgr_8888: return "ABGR8888";
-    case mir_pixel_format_xbgr_8888: return "XBGR8888";
-    case mir_pixel_format_argb_8888: return "ARGB8888";
-    case mir_pixel_format_xrgb_8888: return "XRGB8888";
-    case mir_pixel_format_bgr_888:   return "BGR888";
-    case mir_pixel_format_rgb_888:   return "RGB888";
-    case mir_pixel_format_rgb_565:   return "RGB565";
-    case mir_pixel_format_rgba_5551: return "RGBA5551";
-    case mir_pixel_format_rgba_4444: return "RGBA4444";
-    case mir_pixel_formats:          Q_UNREACHABLE();
-    }
-    Q_UNREACHABLE();
-}
-
-const char *mirSurfaceTypeToStr(MirSurfaceType type)
-{
-    switch (type) {
-    case mir_surface_type_normal:       return "Normal";        /**< AKA "regular"                   */
-    case mir_surface_type_utility:      return "Utility";       /**< AKA "floating regular"          */
-    case mir_surface_type_dialog:       return "Dialog";
-    case mir_surface_type_gloss:        return "Gloss";
-    case mir_surface_type_freestyle:    return "Freestyle";
-    case mir_surface_type_menu:         return "Menu";
-    case mir_surface_type_inputmethod:  return "Input Method";  /**< AKA "OSK" or handwriting etc.   */
-    case mir_surface_type_satellite:    return "Satellite";     /**< AKA "toolbox"/"toolbar"         */
-    case mir_surface_type_tip:          return "Tip";           /**< AKA "tooltip"                   */
-    case mir_surface_types:             Q_UNREACHABLE();
-    }
-    return "";
-}
-
-MirSurfaceState qtWindowStateToMirSurfaceState(Qt::WindowState state)
-{
-    switch (state) {
-    case Qt::WindowNoState:
-    case Qt::WindowActive:
-        return mir_surface_state_restored;
-    case Qt::WindowFullScreen:
-        return mir_surface_state_fullscreen;
-    case Qt::WindowMaximized:
-        return mir_surface_state_maximized;
-    case Qt::WindowMinimized:
-        return mir_surface_state_minimized;
-    }
-    return mir_surface_state_unknown; // should never be reached
-}
-
-MirSurfaceType qtWindowTypeToMirSurfaceType(Qt::WindowType type)
-{
-    switch (type & Qt::WindowType_Mask) {
-    case Qt::Dialog:
-        return mir_surface_type_dialog;
-    case Qt::Sheet:
-    case Qt::Drawer:
-        return mir_surface_type_utility;
-    case Qt::Popup:
-    case Qt::Tool:
-        return mir_surface_type_menu;
-    case Qt::ToolTip:
-        return mir_surface_type_tip;
-    case Qt::SplashScreen:
-        return mir_surface_type_freestyle;
-    case Qt::Window:
-    default:
-        return mir_surface_type_normal;
-    }
-}
-
-WId makeId()
-{
-    static int id = 1;
-    return id++;
-}
-
-UAUiWindowRole roleFor(QWindow *window)
-{
-    QVariant roleVariant = window->property("role");
-    if (!roleVariant.isValid())
-        return U_MAIN_ROLE;
-
-    uint role = roleVariant.toUInt();
-    if (role < U_MAIN_ROLE || role > U_SHUTDOWN_DIALOG_ROLE)
-        return U_MAIN_ROLE;
-
-    return static_cast<UAUiWindowRole>(role);
-}
-
-QMirClientWindow *transientParentFor(QWindow *window)
-{
-    QWindow *parent = window->transientParent();
-    return parent ? static_cast<QMirClientWindow *>(parent->handle()) : nullptr;
-}
-
-bool requiresParent(const MirSurfaceType type)
-{
-    switch (type) {
-    case mir_surface_type_dialog: //FIXME - not quite what the specification dictates, but is what Mir's api dictates
-    case mir_surface_type_utility:
-    case mir_surface_type_gloss:
-    case mir_surface_type_menu:
-    case mir_surface_type_satellite:
-    case mir_surface_type_tip:
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool requiresParent(const Qt::WindowType type)
-{
-    return requiresParent(qtWindowTypeToMirSurfaceType(type));
-}
-
-bool isMovable(const Qt::WindowType type)
-{
-    auto mirType = qtWindowTypeToMirSurfaceType(type);
-    switch (mirType) {
-    case mir_surface_type_menu:
-    case mir_surface_type_tip:
-        return true;
-    default:
-        return false;
-    }
-}
-
-Spec makeSurfaceSpec(QWindow *window, MirPixelFormat pixelFormat, QMirClientWindow *parentWindowHandle,
-                     MirConnection *connection)
-{
-    const auto geometry = window->geometry();
-    const int width = geometry.width() > 0 ? geometry.width() : 1;
-    const int height = geometry.height() > 0 ? geometry.height() : 1;
-    auto type = qtWindowTypeToMirSurfaceType(window->type());
-
-    if (U_ON_SCREEN_KEYBOARD_ROLE == roleFor(window)) {
-        type = mir_surface_type_inputmethod;
-    }
-
-    MirRectangle location{geometry.x(), geometry.y(), 0, 0};
-    MirSurface *parent = nullptr;
-    if (parentWindowHandle) {
-        parent = parentWindowHandle->mirSurface();
-        // Qt uses absolute positioning, but Mir positions surfaces relative to parent.
-        location.top  -= parentWindowHandle->geometry().top();
-        location.left -= parentWindowHandle->geometry().left();
-    }
-
-    Spec spec;
-
-    switch (type) {
-    case mir_surface_type_menu:
-        spec = Spec{mir_connection_create_spec_for_menu(connection, width, height, pixelFormat, parent,
-                    &location, mir_edge_attachment_any)};
-        break;
-    case mir_surface_type_dialog:
-        spec = Spec{mir_connection_create_spec_for_modal_dialog(connection, width, height, pixelFormat, parent)};
-        break;
-    case mir_surface_type_utility:
-        spec = Spec{mir_connection_create_spec_for_dialog(connection, width, height, pixelFormat)};
-        break;
-    case mir_surface_type_tip:
-#if MIR_CLIENT_VERSION < MIR_VERSION_NUMBER(3, 4, 0)
-        spec = Spec{mir_connection_create_spec_for_tooltip(connection, width, height, pixelFormat, parent,
-                    &location)};
-#else
-        spec = Spec{mir_connection_create_spec_for_tip(connection, width, height, pixelFormat, parent,
-                    &location, mir_edge_attachment_any)};
-#endif
-        break;
-    case mir_surface_type_inputmethod:
-        spec = Spec{mir_connection_create_spec_for_input_method(connection, width, height, pixelFormat)};
-        break;
-    default:
-        spec = Spec{mir_connection_create_spec_for_normal_surface(connection, width, height, pixelFormat)};
-        break;
-    }
-
-    qCDebug(mirclient, "makeSurfaceSpec(window=%p): %s spec (type=0x%x, position=(%d, %d)px, size=(%dx%d)px)",
-            window, mirSurfaceTypeToStr(type), window->type(), location.left, location.top, width, height);
-
-     return std::move(spec);
-}
-
-void setSizingConstraints(MirSurfaceSpec *spec, const QSize& minSize, const QSize& maxSize, const QSize& increment)
-{
-    mir_surface_spec_set_min_width(spec, minSize.width());
-    mir_surface_spec_set_min_height(spec, minSize.height());
-    if (maxSize.width() >= minSize.width()) {
-        mir_surface_spec_set_max_width(spec, maxSize.width());
-    }
-    if (maxSize.height() >= minSize.height()) {
-        mir_surface_spec_set_max_height(spec, maxSize.height());
-    }
-    if (increment.width() > 0) {
-        mir_surface_spec_set_width_increment(spec, increment.width());
-    }
-    if (increment.height() > 0) {
-        mir_surface_spec_set_height_increment(spec, increment.height());
-    }
-}
-
-MirSurface *createMirSurface(QWindow *window, int mirOutputId, QMirClientWindow *parentWindowHandle,
-                             MirPixelFormat pixelFormat, MirConnection *connection,
-                             mir_surface_event_callback inputCallback, void *inputContext)
-{
-    auto spec = makeSurfaceSpec(window, pixelFormat, parentWindowHandle, connection);
-
-    // Install event handler as early as possible
-    mir_surface_spec_set_event_handler(spec.get(), inputCallback, inputContext);
-
-    const auto title = window->title().toUtf8();
-    mir_surface_spec_set_name(spec.get(), title.constData());
-
-    setSizingConstraints(spec.get(), window->minimumSize(), window->maximumSize(), window->sizeIncrement());
-
-    if (window->windowState() == Qt::WindowFullScreen) {
-        mir_surface_spec_set_fullscreen_on_output(spec.get(), mirOutputId);
-    }
-
-    if (window->flags() & LowChromeWindowHint) {
-        mir_surface_spec_set_shell_chrome(spec.get(), mir_shell_chrome_low);
-    }
-
-    if (!window->isVisible()) {
-        mir_surface_spec_set_state(spec.get(), mir_surface_state_hidden);
-    }
-
-    auto surface = mir_surface_create_sync(spec.get());
-    Q_ASSERT(mir_surface_is_valid(surface));
-    return surface;
-}
-
-QMirClientWindow *getParentIfNecessary(QWindow *window, QMirClientInput *input)
-{
-    QMirClientWindow *parentWindowHandle = nullptr;
-    if (requiresParent(window->type())) {
-        parentWindowHandle = transientParentFor(window);
-        if (parentWindowHandle == nullptr) {
-            // NOTE: Mir requires this surface have a parent. Try using the last surface to receive input as that will
-            // most likely be the one that caused this surface to be created
-            parentWindowHandle = input->lastInputWindow();
-        }
-    }
-    return parentWindowHandle;
-}
-
-MirPixelFormat disableAlphaBufferIfPossible(MirPixelFormat pixelFormat)
-{
-    switch (pixelFormat) {
-    case mir_pixel_format_abgr_8888:
-        return mir_pixel_format_xbgr_8888;
-    case mir_pixel_format_argb_8888:
-        return mir_pixel_format_xrgb_8888;
-    default: // can do nothing, leave it alone
-        return pixelFormat;
-    }
-}
-} //namespace
-
-
-
-class UbuntuSurface
-{
-public:
-    UbuntuSurface(QMirClientWindow *platformWindow, EGLDisplay display, QMirClientInput *input, MirConnection *connection);
-    ~UbuntuSurface();
-
-    UbuntuSurface(const UbuntuSurface &) = delete;
-    UbuntuSurface& operator=(const UbuntuSurface &) = delete;
-
-    void updateGeometry(const QRect &newGeometry);
-    void updateTitle(const QString& title);
-    void setSizingConstraints(const QSize& minSize, const QSize& maxSize, const QSize& increment);
-
-    void onSwapBuffersDone();
-    void handleSurfaceResized(int width, int height);
-    int needsRepaint() const;
-
-    MirSurfaceState state() const { return mir_surface_get_state(mMirSurface); }
-    void setState(MirSurfaceState state);
-
-    MirSurfaceType type() const { return mir_surface_get_type(mMirSurface); }
-
-    void setShellChrome(MirShellChrome shellChrome);
-
-    EGLSurface eglSurface() const { return mEglSurface; }
-    MirSurface *mirSurface() const { return mMirSurface; }
-
-    void setSurfaceParent(MirSurface*);
-    bool hasParent() const { return mParented; }
-
-    QSurfaceFormat format() const { return mFormat; }
-
-    bool mNeedsExposeCatchup;
-
-    QString persistentSurfaceId();
-
-private:
-    static void surfaceEventCallback(MirSurface* surface, const MirEvent *event, void* context);
-    void postEvent(const MirEvent *event);
-
-    QWindow * const mWindow;
-    QMirClientWindow * const mPlatformWindow;
-    QMirClientInput * const mInput;
-    MirConnection * const mConnection;
-    QMirClientWindow * mParentWindowHandle{nullptr};
-
-    MirSurface* mMirSurface;
-    const EGLDisplay mEglDisplay;
-    EGLSurface mEglSurface;
-
-    bool mNeedsRepaint;
-    bool mParented;
-    QSize mBufferSize;
-    QSurfaceFormat mFormat;
-    MirPixelFormat mPixelFormat;
-
-    QMutex mTargetSizeMutex;
-    QSize mTargetSize;
-    MirShellChrome mShellChrome;
-    QString mPersistentIdStr;
-};
-
-UbuntuSurface::UbuntuSurface(QMirClientWindow *platformWindow, EGLDisplay display, QMirClientInput *input, MirConnection *connection)
-    : mWindow(platformWindow->window())
-    , mPlatformWindow(platformWindow)
-    , mInput(input)
-    , mConnection(connection)
-    , mEglDisplay(display)
-    , mNeedsRepaint(false)
-    , mParented(mWindow->transientParent() || mWindow->parent())
-    , mFormat(mWindow->requestedFormat())
-    , mShellChrome(mWindow->flags() & LowChromeWindowHint ? mir_shell_chrome_low : mir_shell_chrome_normal)
-{
-    // Have Qt choose most suitable EGLConfig for the requested surface format, and update format to reflect it
-    EGLConfig config = q_configFromGLFormat(display, mFormat, true);
-    if (config == 0) {
-        // Older Intel Atom-based devices only support OpenGL 1.4 compatibility profile but by default
-        // QML asks for at least OpenGL 2.0. The XCB GLX backend ignores this request and returns a
-        // 1.4 context, but the XCB EGL backend tries to honor it, and fails. The 1.4 context appears to
-        // have sufficient capabilities on MESA (i915) to render correctly however. So reduce the default
-        // requested OpenGL version to 1.0 to ensure EGL will give us a working context (lp:1549455).
-        static const bool isMesa = QString(eglQueryString(display, EGL_VENDOR)).contains(QStringLiteral("Mesa"));
-        if (isMesa) {
-            qCDebug(mirclientGraphics, "Attempting to choose OpenGL 1.4 context which may suit Mesa");
-            mFormat.setMajorVersion(1);
-            mFormat.setMinorVersion(4);
-            config = q_configFromGLFormat(display, mFormat, true);
-        }
-    }
-    if (config == 0) {
-        qCritical() << "Qt failed to choose a suitable EGLConfig to suit the surface format" << mFormat;
-    }
-
-    mFormat = q_glFormatFromConfig(display, config, mFormat);
-
-    // Have Mir decide the pixel format most suited to the chosen EGLConfig. This is the only way
-    // Mir will know what EGLConfig has been chosen - it cannot deduce it from the buffers.
-    mPixelFormat = mir_connection_get_egl_pixel_format(connection, display, config);
-    // But the chosen EGLConfig might have an alpha buffer enabled, even if not requested by the client.
-    // If that's the case, try to edit the chosen pixel format in order to disable the alpha buffer.
-    // This is an optimization for the compositor, as it can avoid blending this surface.
-    if (mWindow->requestedFormat().alphaBufferSize() < 0) {
-        mPixelFormat = disableAlphaBufferIfPossible(mPixelFormat);
-    }
-
-    const auto outputId = static_cast<QMirClientScreen *>(mWindow->screen()->handle())->mirOutputId();
-
-    mParentWindowHandle = getParentIfNecessary(mWindow, input);
-
-    mMirSurface = createMirSurface(mWindow, outputId, mParentWindowHandle, mPixelFormat, connection, surfaceEventCallback, this);
-    mEglSurface = eglCreateWindowSurface(mEglDisplay, config, nativeWindowFor(mMirSurface), nullptr);
-
-    mNeedsExposeCatchup = mir_surface_get_visibility(mMirSurface) == mir_surface_visibility_occluded;
-
-    // Window manager can give us a final size different from what we asked for
-    // so let's check what we ended up getting
-    MirSurfaceParameters parameters;
-    mir_surface_get_parameters(mMirSurface, &parameters);
-
-    auto geom = mWindow->geometry();
-    geom.setWidth(parameters.width);
-    geom.setHeight(parameters.height);
-
-    // Assume that the buffer size matches the surface size at creation time
-    mBufferSize = geom.size();
-    QWindowSystemInterface::handleGeometryChange(mWindow, geom);
-
-    qCDebug(mirclient) << "Created surface with geometry:" << geom << "title:" << mWindow->title()
-                       << "role:" << roleFor(mWindow);
-    qCDebug(mirclientGraphics)
-                       << "Requested format:" << mWindow->requestedFormat()
-                       << "\nActual format:" << mFormat
-                       << "with associated Mir pixel format:" << mirPixelFormatToStr(mPixelFormat);
-}
-
-UbuntuSurface::~UbuntuSurface()
-{
-    if (mEglSurface != EGL_NO_SURFACE)
-        eglDestroySurface(mEglDisplay, mEglSurface);
-    if (mMirSurface) {
-        mir_surface_release_sync(mMirSurface);
-    }
-}
-
-void UbuntuSurface::updateGeometry(const QRect &newGeometry)
-{
-    qCDebug(mirclient,"updateGeometry(window=%p, width=%d, height=%d)", mWindow,
-            newGeometry.width(), newGeometry.height());
-
-    Spec spec;
-    if (isMovable(mWindow->type())) {
-        spec = Spec{makeSurfaceSpec(mWindow, mPixelFormat, mParentWindowHandle, mConnection)};
-    } else {
-        spec = Spec{mir_connection_create_spec_for_changes(mConnection)};
-        mir_surface_spec_set_width(spec.get(), newGeometry.width());
-        mir_surface_spec_set_height(spec.get(), newGeometry.height());
-    }
-    mir_surface_apply_spec(mMirSurface, spec.get());
-}
-
-void UbuntuSurface::updateTitle(const QString& newTitle)
-{
-    const auto title = newTitle.toUtf8();
-    Spec spec{mir_connection_create_spec_for_changes(mConnection)};
-    mir_surface_spec_set_name(spec.get(), title.constData());
-    mir_surface_apply_spec(mMirSurface, spec.get());
-}
-
-void UbuntuSurface::setSizingConstraints(const QSize& minSize, const QSize& maxSize, const QSize& increment)
-{
-    Spec spec{mir_connection_create_spec_for_changes(mConnection)};
-    ::setSizingConstraints(spec.get(), minSize, maxSize, increment);
-    mir_surface_apply_spec(mMirSurface, spec.get());
-}
-
-void UbuntuSurface::handleSurfaceResized(int width, int height)
-{
-    QMutexLocker lock(&mTargetSizeMutex);
-
-    // mir's resize event is mainly a signal that we need to redraw our content. We use the
-    // width/height as identifiers to figure out if this is the latest surface resize event
-    // that has posted, discarding any old ones. This avoids issuing too many redraw events.
-    // see TODO in postEvent as the ideal way we should handle this.
-    // The actual buffer size may or may have not changed at this point, so let the rendering
-    // thread drive the window geometry updates.
-    mNeedsRepaint = mTargetSize.width() == width && mTargetSize.height() == height;
-}
-
-int UbuntuSurface::needsRepaint() const
-{
-    if (mNeedsRepaint) {
-        if (mTargetSize != mBufferSize) {
-            //If the buffer hasn't changed yet, we need at least two redraws,
-            //once to get the new buffer size and propagate the geometry changes
-            //and the second to redraw the content at the new size
-            return 2;
-        } else {
-            // The buffer size has already been updated so we only need one redraw
-            // to render at the new size
-            return 1;
-        }
-    }
-    return 0;
-}
-
-void UbuntuSurface::setState(MirSurfaceState state)
-{
-    mir_wait_for(mir_surface_set_state(mMirSurface, state));
-}
-
-void UbuntuSurface::setShellChrome(MirShellChrome chrome)
-{
-    if (chrome != mShellChrome) {
-        auto spec = Spec{mir_connection_create_spec_for_changes(mConnection)};
-        mir_surface_spec_set_shell_chrome(spec.get(), chrome);
-        mir_surface_apply_spec(mMirSurface, spec.get());
-
-        mShellChrome = chrome;
-    }
-}
-
-void UbuntuSurface::onSwapBuffersDone()
-{
-    static int sFrameNumber = 0;
-    ++sFrameNumber;
-
-    EGLint eglSurfaceWidth = -1;
-    EGLint eglSurfaceHeight = -1;
-    eglQuerySurface(mEglDisplay, mEglSurface, EGL_WIDTH, &eglSurfaceWidth);
-    eglQuerySurface(mEglDisplay, mEglSurface, EGL_HEIGHT, &eglSurfaceHeight);
-
-    const bool validSize = eglSurfaceWidth > 0 && eglSurfaceHeight > 0;
-
-    if (validSize && (mBufferSize.width() != eglSurfaceWidth || mBufferSize.height() != eglSurfaceHeight)) {
-
-        qCDebug(mirclientBufferSwap, "onSwapBuffersDone(window=%p) [%d] - size changed (%d, %d) => (%d, %d)",
-               mWindow, sFrameNumber, mBufferSize.width(), mBufferSize.height(), eglSurfaceWidth, eglSurfaceHeight);
-
-        mBufferSize.rwidth() = eglSurfaceWidth;
-        mBufferSize.rheight() = eglSurfaceHeight;
-
-        QRect newGeometry = mPlatformWindow->geometry();
-        newGeometry.setSize(mBufferSize);
-
-        QWindowSystemInterface::handleGeometryChange(mWindow, newGeometry);
-    } else {
-        qCDebug(mirclientBufferSwap, "onSwapBuffersDone(window=%p) [%d] - buffer size (%d,%d)",
-               mWindow, sFrameNumber, mBufferSize.width(), mBufferSize.height());
-    }
-}
-
-void UbuntuSurface::surfaceEventCallback(MirSurface *surface, const MirEvent *event, void* context)
-{
-    Q_UNUSED(surface);
-    Q_ASSERT(context != nullptr);
-
-    auto s = static_cast<UbuntuSurface *>(context);
-    s->postEvent(event);
-}
-
-void UbuntuSurface::postEvent(const MirEvent *event)
-{
-    if (mir_event_type_resize == mir_event_get_type(event)) {
-        // TODO: The current event queue just accumulates all resize events;
-        // It would be nicer if we could update just one event if that event has not been dispatched.
-        // As a workaround, we use the width/height as an identifier of this latest event
-        // so the event handler (handleSurfaceResized) can discard/ignore old ones.
-        const auto resizeEvent = mir_event_get_resize_event(event);
-        const auto width =  mir_resize_event_get_width(resizeEvent);
-        const auto height =  mir_resize_event_get_height(resizeEvent);
-        qCDebug(mirclient, "resizeEvent(window=%p, width=%d, height=%d)", mWindow, width, height);
-
-        QMutexLocker lock(&mTargetSizeMutex);
-        mTargetSize.rwidth() = width;
-        mTargetSize.rheight() = height;
-    }
-
-    mInput->postEvent(mPlatformWindow, event);
-}
-
-void UbuntuSurface::setSurfaceParent(MirSurface* parent)
-{
-    qCDebug(mirclient, "setSurfaceParent(window=%p)", mWindow);
-
-    mParented = true;
-    Spec spec{mir_connection_create_spec_for_changes(mConnection)};
-    mir_surface_spec_set_parent(spec.get(), parent);
-    mir_surface_apply_spec(mMirSurface, spec.get());
-}
-
-QString UbuntuSurface::persistentSurfaceId()
-{
-    if (mPersistentIdStr.isEmpty()) {
-        MirPersistentId* mirPermaId = mir_surface_request_persistent_id_sync(mMirSurface);
-        mPersistentIdStr = mir_persistent_id_as_string(mirPermaId);
-        mir_persistent_id_release(mirPermaId);
-    }
-    return mPersistentIdStr;
-}
-
-QMirClientWindow::QMirClientWindow(QWindow *w, QMirClientInput *input, QMirClientNativeInterface *native,
-                                   QMirClientAppStateController *appState, EGLDisplay eglDisplay,
-                                   MirConnection *mirConnection, QMirClientDebugExtension *debugExt)
-    : QObject(nullptr)
-    , QPlatformWindow(w)
-    , mId(makeId())
-    , mWindowState(w->windowState())
-    , mWindowFlags(w->flags())
-    , mWindowVisible(false)
-    , mAppStateController(appState)
-    , mDebugExtention(debugExt)
-    , mNativeInterface(native)
-    , mSurface(new UbuntuSurface{this, eglDisplay, input, mirConnection})
-    , mScale(1.0)
-    , mFormFactor(mir_form_factor_unknown)
-{
-    mWindowExposed = mSurface->mNeedsExposeCatchup == false;
-
-    qCDebug(mirclient, "QMirClientWindow(window=%p, screen=%p, input=%p, surf=%p) with title '%s', role: '%d'",
-            w, w->screen()->handle(), input, mSurface.get(), qPrintable(window()->title()), roleFor(window()));
-}
-
-QMirClientWindow::~QMirClientWindow()
-{
-    qCDebug(mirclient, "~QMirClientWindow(window=%p)", this);
-}
-
-void QMirClientWindow::handleSurfaceResized(int width, int height)
-{
-    QMutexLocker lock(&mMutex);
-    qCDebug(mirclient, "handleSurfaceResize(window=%p, size=(%dx%d)px", window(), width, height);
-
-    mSurface->handleSurfaceResized(width, height);
-
-    // This resize event could have occurred just after the last buffer swap for this window.
-    // This means the client may still be holding a buffer with the older size. The first redraw call
-    // will then render at the old size. After swapping the client now will get a new buffer with the
-    // updated size but it still needs re-rendering so another redraw may be needed.
-    // A mir API to drop the currently held buffer would help here, so that we wouldn't have to redraw twice
-    auto const numRepaints = mSurface->needsRepaint();
-    lock.unlock();
-    qCDebug(mirclient, "handleSurfaceResize(window=%p) redraw %d times", window(), numRepaints);
-    for (int i = 0; i < numRepaints; i++) {
-        qCDebug(mirclient, "handleSurfaceResize(window=%p) repainting size=(%dx%d)dp", window(), geometry().size().width(), geometry().size().height());
-        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
-    }
-}
-
-void QMirClientWindow::handleSurfaceExposeChange(bool exposed)
-{
-    QMutexLocker lock(&mMutex);
-    qCDebug(mirclient, "handleSurfaceExposeChange(window=%p, exposed=%s)", window(), exposed ? "true" : "false");
-
-    mSurface->mNeedsExposeCatchup = false;
-    if (mWindowExposed == exposed) return;
-    mWindowExposed = exposed;
-
-    lock.unlock();
-    QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
-}
-
-void QMirClientWindow::handleSurfaceFocusChanged(bool focused)
-{
-    qCDebug(mirclient, "handleSurfaceFocusChanged(window=%p, focused=%d)", window(), focused);
-    if (focused) {
-        mAppStateController->setWindowFocused(true);
-        QWindowSystemInterface::handleWindowActivated(window(), Qt::ActiveWindowFocusReason);
-    } else {
-        mAppStateController->setWindowFocused(false);
-    }
-}
-
-void QMirClientWindow::handleSurfaceVisibilityChanged(bool visible)
-{
-    qCDebug(mirclient, "handleSurfaceVisibilityChanged(window=%p, visible=%d)", window(), visible);
-
-    if (mWindowVisible == visible) return;
-    mWindowVisible = visible;
-
-    QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
-}
-
-void QMirClientWindow::handleSurfaceStateChanged(Qt::WindowState state)
-{
-    qCDebug(mirclient, "handleSurfaceStateChanged(window=%p, %s)", window(), qtWindowStateToStr(state));
-
-    if (mWindowState == state) return;
-    mWindowState = state;
-
-    QWindowSystemInterface::handleWindowStateChanged(window(), state);
-}
-
-void QMirClientWindow::setWindowState(Qt::WindowStates states)
-{
-    Qt::WindowState state = Qt::WindowNoState;
-    if (states & Qt::WindowMinimized)
-        state = Qt::WindowMinimized;
-    else if (states & Qt::WindowFullScreen)
-        state = Qt::WindowFullScreen;
-    else if (states & Qt::WindowMaximized)
-        state = Qt::WindowMaximized;
-
-    QMutexLocker lock(&mMutex);
-    qCDebug(mirclient, "setWindowState(window=%p, %s)", this, qtWindowStateToStr(state));
-
-    if (mWindowState == state) return;
-    mWindowState = state;
-
-    lock.unlock();
-    updateSurfaceState();
-}
-
-void QMirClientWindow::setWindowFlags(Qt::WindowFlags flags)
-{
-    QMutexLocker lock(&mMutex);
-    qCDebug(mirclient, "setWindowFlags(window=%p, 0x%x)", this, (int)flags);
-
-    if (mWindowFlags == flags) return;
-    mWindowFlags = flags;
-
-    mSurface->setShellChrome(mWindowFlags & LowChromeWindowHint ? mir_shell_chrome_low : mir_shell_chrome_normal);
-}
-
-QRect QMirClientWindow::geometry() const
-{
-    if (mDebugExtention) {
-        auto geom = QPlatformWindow::geometry();
-        geom.moveTopLeft(mDebugExtention->mapSurfacePointToScreen(mSurface->mirSurface(), QPoint(0,0)));
-        return geom;
-    } else {
-        return QPlatformWindow::geometry();
-    }
-}
-
-void QMirClientWindow::setGeometry(const QRect& rect)
-{
-    QMutexLocker lock(&mMutex);
-
-    if (window()->windowState() == Qt::WindowFullScreen || window()->windowState() == Qt::WindowMaximized) {
-        qCDebug(mirclient, "setGeometry(window=%p) - not resizing, window is maximized or fullscreen", window());
-        return;
-    }
-
-    qCDebug(mirclient, "setGeometry (window=%p, position=(%d, %d)dp, size=(%dx%d)dp)",
-            window(), rect.x(), rect.y(), rect.width(), rect.height());
-    // Immediately update internal geometry so Qt believes position updated
-    QRect newPosition(geometry());
-    newPosition.moveTo(rect.topLeft());
-    QPlatformWindow::setGeometry(newPosition);
-
-    mSurface->updateGeometry(rect);
-    // Note: don't call handleGeometryChange here, wait to see what Mir replies with.
-}
-
-void QMirClientWindow::setVisible(bool visible)
-{
-    QMutexLocker lock(&mMutex);
-    qCDebug(mirclient, "setVisible (window=%p, visible=%s)", window(), visible ? "true" : "false");
-
-    if (mWindowVisible == visible) return;
-    mWindowVisible = visible;
-
-    if (visible) {
-        if (!mSurface->hasParent() && window()->type() == Qt::Dialog) {
-            // The dialog may have been parented after creation time
-            // so morph it into a modal dialog
-            auto parent = transientParentFor(window());
-            if (parent) {
-                mSurface->setSurfaceParent(parent->mirSurface());
-            }
-        }
-    }
-
-    lock.unlock();
-    updateSurfaceState();
-    QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
-}
-
-void QMirClientWindow::setWindowTitle(const QString& title)
-{
-    QMutexLocker lock(&mMutex);
-    qCDebug(mirclient, "setWindowTitle(window=%p) title=%s)", window(), title.toUtf8().constData());
-    mSurface->updateTitle(title);
-}
-
-void QMirClientWindow::propagateSizeHints()
-{
-    QMutexLocker lock(&mMutex);
-    const auto win = window();
-    qCDebug(mirclient, "propagateSizeHints(window=%p) min(%d,%d), max(%d,%d) increment(%d, %d)",
-            win, win->minimumSize().width(), win->minimumSize().height(),
-            win->maximumSize().width(), win->maximumSize().height(),
-            win->sizeIncrement().width(), win->sizeIncrement().height());
-    mSurface->setSizingConstraints(win->minimumSize(), win->maximumSize(), win->sizeIncrement());
-}
-
-bool QMirClientWindow::isExposed() const
-{
-    // mNeedsExposeCatchup because we need to render a frame to get the expose surface event from mir.
-    return mWindowVisible && (mWindowExposed || (mSurface && mSurface->mNeedsExposeCatchup));
-}
-
-QSurfaceFormat QMirClientWindow::format() const
-{
-    return mSurface->format();
-}
-
-QPoint QMirClientWindow::mapToGlobal(const QPoint &pos) const
-{
-    if (mDebugExtention) {
-        return mDebugExtention->mapSurfacePointToScreen(mSurface->mirSurface(), pos);
-    } else {
-        return pos;
-    }
-}
-
-void* QMirClientWindow::eglSurface() const
-{
-    return mSurface->eglSurface();
-}
-
-MirSurface *QMirClientWindow::mirSurface() const
-{
-    return mSurface->mirSurface();
-}
-
-WId QMirClientWindow::winId() const
-{
-    return mId;
-}
-
-void QMirClientWindow::onSwapBuffersDone()
-{
-    QMutexLocker lock(&mMutex);
-    mSurface->onSwapBuffersDone();
-
-    if (mSurface->mNeedsExposeCatchup) {
-        mSurface->mNeedsExposeCatchup = false;
-        mWindowExposed = false;
-
-        lock.unlock();
-        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
-    }
-}
-
-void QMirClientWindow::handleScreenPropertiesChange(MirFormFactor formFactor, float scale)
-{
-    // Update the scale & form factor native-interface properties for the windows affected
-    // as there is no convenient way to emit signals for those custom properties on a QScreen
-    if (formFactor != mFormFactor) {
-        mFormFactor = formFactor;
-        Q_EMIT mNativeInterface->windowPropertyChanged(this, QStringLiteral("formFactor"));
-    }
-
-    if (!qFuzzyCompare(scale, mScale)) {
-        mScale = scale;
-        Q_EMIT mNativeInterface->windowPropertyChanged(this, QStringLiteral("scale"));
-    }
-}
-
-void QMirClientWindow::updateSurfaceState()
-{
-    QMutexLocker lock(&mMutex);
-    MirSurfaceState newState = mWindowVisible ? qtWindowStateToMirSurfaceState(mWindowState) :
-                                                mir_surface_state_hidden;
-    qCDebug(mirclient, "updateSurfaceState (window=%p, surfaceState=%s)", window(), mirSurfaceStateToStr(newState));
-    if (newState != mSurface->state()) {
-        mSurface->setState(newState);
-    }
-}
-
-QString QMirClientWindow::persistentSurfaceId()
-{
-    return mSurface->persistentSurfaceId();
-}
diff --git a/src/plugins/platforms/mirclient/qmirclientwindow.h b/src/plugins/platforms/mirclient/qmirclientwindow.h
deleted file mode 100644
index 6c5695d62f..0000000000
--- a/src/plugins/platforms/mirclient/qmirclientwindow.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014-2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTWINDOW_H
-#define QMIRCLIENTWINDOW_H
-
-#include <qpa/qplatformwindow.h>
-#include <QSharedPointer>
-#include <QMutex>
-
-#include <mir_toolkit/common.h> // needed only for MirFormFactor enum
-
-#include <memory>
-
-#include <EGL/egl.h>
-
-class QMirClientAppStateController;
-class QMirClientDebugExtension;
-class QMirClientNativeInterface;
-class QMirClientInput;
-class QMirClientScreen;
-class UbuntuSurface;
-struct MirSurface;
-class MirConnection;
-
-class QMirClientWindow : public QObject, public QPlatformWindow
-{
-    Q_OBJECT
-public:
-    QMirClientWindow(QWindow *w, QMirClientInput *input, QMirClientNativeInterface* native,
-                     QMirClientAppStateController *appState, EGLDisplay eglDisplay,
-                     MirConnection *mirConnection, QMirClientDebugExtension *debugExt);
-    virtual ~QMirClientWindow();
-
-    // QPlatformWindow methods.
-    WId winId() const override;
-    QRect geometry() const override;
-    void setGeometry(const QRect&) override;
-    void setWindowState(Qt::WindowStates state) override;
-    void setWindowFlags(Qt::WindowFlags flags) override;
-    void setVisible(bool visible) override;
-    void setWindowTitle(const QString &title) override;
-    void propagateSizeHints() override;
-    bool isExposed() const override;
-
-    QPoint mapToGlobal(const QPoint &pos) const override;
-    QSurfaceFormat format() const override;
-
-    // Additional Window properties exposed by NativeInterface
-    MirFormFactor formFactor() const { return mFormFactor; }
-    float scale() const { return mScale; }
-
-    // New methods.
-    void *eglSurface() const;
-    MirSurface *mirSurface() const;
-    void handleSurfaceResized(int width, int height);
-    void handleSurfaceExposeChange(bool exposed);
-    void handleSurfaceFocusChanged(bool focused);
-    void handleSurfaceVisibilityChanged(bool visible);
-    void handleSurfaceStateChanged(Qt::WindowState state);
-    void onSwapBuffersDone();
-    void handleScreenPropertiesChange(MirFormFactor formFactor, float scale);
-    QString persistentSurfaceId();
-
-private:
-    void updateSurfaceState();
-    mutable QMutex mMutex;
-    const WId mId;
-    Qt::WindowState mWindowState;
-    Qt::WindowFlags mWindowFlags;
-    bool mWindowVisible;
-    bool mWindowExposed;
-    QMirClientAppStateController *mAppStateController;
-    QMirClientDebugExtension *mDebugExtention;
-    QMirClientNativeInterface *mNativeInterface;
-    std::unique_ptr<UbuntuSurface> mSurface;
-    float mScale;
-    MirFormFactor mFormFactor;
-};
-
-#endif // QMIRCLIENTWINDOW_H
diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.cpp b/src/plugins/platforms/offscreen/qoffscreencommon.cpp
index f0eb69718a..eae25012c1 100644
--- a/src/plugins/platforms/offscreen/qoffscreencommon.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreencommon.cpp
@@ -77,7 +77,8 @@ public:
         if (containing != previous)
             QWindowSystemInterface::handleEnterLeaveEvent(containing, previous, local, pos);
 
-        QWindowSystemInterface::handleMouseEvent(containing, local, pos, QGuiApplication::mouseButtons(), QGuiApplication::keyboardModifiers());
+        QWindowSystemInterface::handleMouseEvent(containing, local, pos, QGuiApplication::mouseButtons(), Qt::NoButton,
+                                                 QEvent::MouseMove, QGuiApplication::keyboardModifiers(), Qt::MouseEventSynthesizedByQt);
 
         QOffscreenScreen::windowContainingCursor = containing ? containing->handle() : 0;
     }
diff --git a/src/plugins/platforms/openwfd/qopenwfdscreen.h b/src/plugins/platforms/openwfd/qopenwfdscreen.h
index dede0025a9..dec51d306b 100644
--- a/src/plugins/platforms/openwfd/qopenwfdscreen.h
+++ b/src/plugins/platforms/openwfd/qopenwfdscreen.h
@@ -48,7 +48,6 @@
 #include <WF/wfd.h>
 
 #include <QtCore/QVarLengthArray>
-#include <QtCore/QLinkedList>
 
 #define BUFFER_NUM 4
 
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index acc55adf6f..c4f2b30965 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -48,6 +48,4 @@ haiku {
 
 wasm: SUBDIRS += wasm
 
-qtConfig(mirclient): SUBDIRS += mirclient
-
 qtConfig(integrityfb): SUBDIRS += integrity
diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro
index 96bfa1dd19..bfd56e8d13 100644
--- a/src/plugins/platforms/qnx/qnx.pro
+++ b/src/plugins/platforms/qnx/qnx.pro
@@ -33,6 +33,7 @@ QT += \
 
 SOURCES =   main.cpp \
             qqnxbuffer.cpp \
+            qqnxforeignwindow.cpp \
             qqnxintegration.cpp \
             qqnxscreen.cpp \
             qqnxwindow.cpp \
@@ -50,6 +51,7 @@ SOURCES =   main.cpp \
 
 HEADERS =   main.h \
             qqnxbuffer.h \
+            qqnxforeignwindow.h \
             qqnxkeytranslator.h \
             qqnxintegration.h \
             qqnxscreen.h \
diff --git a/src/plugins/platforms/mirclient/qmirclienttheme.cpp b/src/plugins/platforms/qnx/qqnxforeignwindow.cpp
index dcfef7ca67..94608215dc 100644
--- a/src/plugins/platforms/mirclient/qmirclienttheme.cpp
+++ b/src/plugins/platforms/qnx/qqnxforeignwindow.cpp
@@ -1,6 +1,6 @@
-/****************************************************************************
+/***************************************************************************
 **
-** Copyright (C) 2016 Canonical, Ltd.
+** Copyright (C) 2018 QNX Software Systems. All rights reserved.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -37,31 +37,29 @@
 **
 ****************************************************************************/
 
+#include "qqnxforeignwindow.h"
+#include "qqnxintegration.h"
 
-#include "qmirclienttheme.h"
+QT_BEGIN_NAMESPACE
 
-#include <QtCore/QVariant>
-
-const char *QMirClientTheme::name = "ubuntu";
-
-QMirClientTheme::QMirClientTheme()
+QQnxForeignWindow::QQnxForeignWindow(QWindow *window,
+                                     screen_context_t context,
+                                     screen_window_t screenWindow)
+    : QQnxWindow(window, context, screenWindow)
 {
+    initWindow();
 }
 
-QMirClientTheme::~QMirClientTheme()
+bool QQnxForeignWindow::isForeignWindow() const
 {
+    return true;
 }
 
-QVariant QMirClientTheme::themeHint(ThemeHint hint) const
+int QQnxForeignWindow::pixelFormat() const
 {
-    if (hint == QPlatformTheme::SystemIconThemeName) {
-        QByteArray iconTheme = qgetenv("QTUBUNTU_ICON_THEME");
-        if (iconTheme.isEmpty()) {
-            return QVariant(QStringLiteral("ubuntu-mobile"));
-        } else {
-            return QVariant(QString(iconTheme));
-        }
-    } else {
-        return QGenericUnixTheme::themeHint(hint);
-    }
+    int result = SCREEN_FORMAT_RGBA8888;
+    screen_get_window_property_iv(nativeHandle(), SCREEN_PROPERTY_FORMAT, &result);
+    return result;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/mirclient/qmirclientappstatecontroller.h b/src/plugins/platforms/qnx/qqnxforeignwindow.h
index b3aa0022d9..22dde643e4 100644
--- a/src/plugins/platforms/mirclient/qmirclientappstatecontroller.h
+++ b/src/plugins/platforms/qnx/qqnxforeignwindow.h
@@ -1,6 +1,6 @@
-/****************************************************************************
+/***************************************************************************
 **
-** Copyright (C) 2016 Canonical, Ltd.
+** Copyright (C) 2018 QNX Software Systems. All rights reserved.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -37,26 +37,25 @@
 **
 ****************************************************************************/
 
+#ifndef QQNXFOREIGNWINDOW_H
+#define QQNXFOREIGNWINDOW_H
 
-#ifndef QMIRCLIENTAPPSTATECONTROLLER_H
-#define QMIRCLIENTAPPSTATECONTROLLER_H
+#include "qqnxwindow.h"
 
-#include <QTimer>
+QT_BEGIN_NAMESPACE
 
-class QMirClientAppStateController
+class QQnxForeignWindow : public QQnxWindow
 {
 public:
-    QMirClientAppStateController();
+    QQnxForeignWindow(QWindow *window,
+                      screen_context_t context,
+                      screen_window_t screenWindow);
 
-    void setSuspended();
-    void setResumed();
-
-    void setWindowFocused(bool focused);
-
-private:
-    bool m_suspended;
-    bool m_lastActive;
-    QTimer m_inactiveTimer;
+    bool isForeignWindow() const override;
+    int pixelFormat() const override;
+    void resetBuffers() override {}
 };
 
-#endif // QMIRCLIENTAPPSTATECONTROLLER_H
+QT_END_NAMESPACE
+
+#endif // QQNXFOREIGNWINDOW_H
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index a45dcabeb7..f479e94988 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -51,6 +51,7 @@
 #include "qqnxabstractvirtualkeyboard.h"
 #include "qqnxservices.h"
 
+#include "qqnxforeignwindow.h"
 #include "qqnxrasterwindow.h"
 #if !defined(QT_NO_OPENGL)
 #include "qqnxeglwindow.h"
@@ -147,6 +148,7 @@ static inline int getContextCapabilities(const QStringList &paramList)
 
 QQnxIntegration::QQnxIntegration(const QStringList &paramList)
     : QPlatformIntegration()
+    , m_screenContextId(256, 0)
     , m_screenEventThread(0)
     , m_navigatorEventHandler(new QQnxNavigatorEventHandler())
     , m_virtualKeyboard(0)
@@ -178,6 +180,11 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
         qFatal("%s - Screen: Failed to create screen context - Error: %s (%i)",
                Q_FUNC_INFO, strerror(errno), errno);
     }
+    screen_get_context_property_cv(m_screenContext,
+                                   SCREEN_PROPERTY_ID,
+                                   m_screenContextId.size(),
+                                   m_screenContextId.data());
+    m_screenContextId.resize(strlen(m_screenContextId.constData()));
 
 #if QT_CONFIG(qqnx_pps)
     // Create/start navigator event notifier
@@ -310,6 +317,7 @@ bool QQnxIntegration::hasCapability(QPlatformIntegration::Capability cap) const
     qIntegrationDebug();
     switch (cap) {
     case MultipleWindows:
+    case ForeignWindows:
     case ThreadedPixmaps:
         return true;
 #if !defined(QT_NO_OPENGL)
@@ -323,6 +331,18 @@ bool QQnxIntegration::hasCapability(QPlatformIntegration::Capability cap) const
     }
 }
 
+QPlatformWindow *QQnxIntegration::createForeignWindow(QWindow *window, WId nativeHandle) const
+{
+    screen_window_t screenWindow = reinterpret_cast<screen_window_t>(nativeHandle);
+    if (this->window(screenWindow)) {
+        qWarning() << "QWindow already created for foreign window"
+                   << screenWindow;
+        return nullptr;
+    }
+
+    return new QQnxForeignWindow(window, m_screenContext, screenWindow);
+}
+
 QPlatformWindow *QQnxIntegration::createPlatformWindow(QWindow *window) const
 {
     qIntegrationDebug();
@@ -478,7 +498,7 @@ QPlatformServices * QQnxIntegration::services() const
     return m_services;
 }
 
-QWindow *QQnxIntegration::window(screen_window_t qnxWindow)
+QWindow *QQnxIntegration::window(screen_window_t qnxWindow) const
 {
     qIntegrationDebug();
     QMutexLocker locker(&m_windowMapperMutex);
@@ -587,12 +607,11 @@ QList<screen_display_t *> QQnxIntegration::sortDisplays(screen_display_t *availa
 
         // Move all displays with matching ID from the intermediate list
         // to the beginning of the ordered list
-        QMutableListIterator<screen_display_t *> iter(allDisplays);
-        while (iter.hasNext()) {
-            screen_display_t *display = iter.next();
+        for (auto it = allDisplays.begin(), end = allDisplays.end(); it != end; ++it) {
+            screen_display_t *display = *it;
             if (getIdOfDisplay(*display) == requestedValue) {
                 orderedDisplays.append(display);
-                iter.remove();
+                allDisplays.erase(it);
                 break;
             }
         }
@@ -706,6 +725,11 @@ screen_context_t QQnxIntegration::screenContext()
     return m_screenContext;
 }
 
+QByteArray QQnxIntegration::screenContextId()
+{
+    return m_screenContextId;
+}
+
 QQnxNavigatorEventHandler *QQnxIntegration::navigatorEventHandler()
 {
     return m_navigatorEventHandler;
diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h
index 366556dc4b..0bf37880d1 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.h
+++ b/src/plugins/platforms/qnx/qqnxintegration.h
@@ -92,6 +92,7 @@ public:
 
     bool hasCapability(QPlatformIntegration::Capability cap) const override;
 
+    QPlatformWindow *createForeignWindow(QWindow *window, WId nativeHandle) const override;
     QPlatformWindow *createPlatformWindow(QWindow *window) const override;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
 
@@ -123,7 +124,7 @@ public:
 
     QPlatformServices *services() const override;
 
-    QWindow *window(screen_window_t qnxWindow);
+    QWindow *window(screen_window_t qnxWindow) const;
 
     QQnxScreen *screenForNative(screen_display_t qnxScreen) const;
 
@@ -132,6 +133,7 @@ public:
     QQnxScreen *primaryDisplay() const;
     Options options() const;
     screen_context_t screenContext();
+    QByteArray screenContextId();
 
     QQnxNavigatorEventHandler *navigatorEventHandler();
 
@@ -145,6 +147,7 @@ private:
                                           int displayCount);
 
     screen_context_t m_screenContext;
+    QByteArray m_screenContextId;
     QQnxScreenEventThread *m_screenEventThread;
     QQnxNavigatorEventHandler *m_navigatorEventHandler;
     QQnxAbstractVirtualKeyboard *m_virtualKeyboard;
@@ -168,7 +171,7 @@ private:
     QSimpleDrag *m_drag;
 #endif
     QQnxWindowMapper m_windowMapper;
-    QMutex m_windowMapperMutex;
+    mutable QMutex m_windowMapperMutex;
 
     Options m_options;
 
diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
index f29e11489b..a9b5860187 100644
--- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
@@ -45,6 +45,7 @@
 #include "qqnxkeytranslator.h"
 #include "qqnxscreen.h"
 #include "qqnxscreeneventfilter.h"
+#include "qqnxscreentraits.h"
 
 #include <QDebug>
 #include <QGuiApplication>
@@ -89,6 +90,51 @@ static QString capKeyString(int cap, int modifiers, int key)
     return QString();
 }
 
+template <typename T>
+static void finishCloseEvent(screen_event_t event)
+{
+    T t;
+    screen_get_event_property_pv(event,
+            screen_traits<T>::propertyName,
+            reinterpret_cast<void**>(&t));
+    screen_traits<T>::destroy(t);
+}
+
+static void finishCloseEvent(screen_event_t event)
+{
+    // Let libscreen know that we're finished with anything that may have been acquired.
+    int objectType = SCREEN_OBJECT_TYPE_CONTEXT;
+    screen_get_event_property_iv(event, SCREEN_PROPERTY_OBJECT_TYPE, &objectType);
+    switch (objectType) {
+    case SCREEN_OBJECT_TYPE_CONTEXT:
+        finishCloseEvent<screen_context_t>(event);
+        break;
+    case SCREEN_OBJECT_TYPE_DEVICE:
+        finishCloseEvent<screen_device_t>(event);
+        break;
+    case SCREEN_OBJECT_TYPE_DISPLAY:
+        // no screen_destroy_display
+        break;
+    case SCREEN_OBJECT_TYPE_GROUP:
+        finishCloseEvent<screen_group_t>(event);
+        break;
+    case SCREEN_OBJECT_TYPE_PIXMAP:
+        finishCloseEvent<screen_pixmap_t>(event);
+        break;
+    case SCREEN_OBJECT_TYPE_SESSION:
+        finishCloseEvent<screen_session_t>(event);
+        break;
+#if _SCREEN_VERSION >= _SCREEN_MAKE_VERSION(2, 0, 0)
+    case SCREEN_OBJECT_TYPE_STREAM:
+        finishCloseEvent<screen_stream_t>(event);
+        break;
+#endif
+    case SCREEN_OBJECT_TYPE_WINDOW:
+        finishCloseEvent<screen_window_t>(event);
+        break;
+    }
+}
+
 QT_BEGIN_NAMESPACE
 
 QQnxScreenEventHandler::QQnxScreenEventHandler(QQnxIntegration *integration)
@@ -242,11 +288,18 @@ void QQnxScreenEventHandler::processEvents()
             break;
 
         ++count;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        qintptr result = 0;
+#else
         long result = 0;
+#endif
         QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance();
         bool handled = dispatcher && dispatcher->filterNativeEvent(QByteArrayLiteral("screen_event_t"), event, &result);
         if (!handled)
             handleEvent(event);
+
+        if (type == SCREEN_EVENT_CLOSE)
+            finishCloseEvent(event);
     }
 
     m_eventThread->armEventsPending(count);
@@ -583,7 +636,7 @@ void QQnxScreenEventHandler::handleDisplayEvent(screen_event_t event)
         // We never remove the primary display, the qpa plugin doesn't support that and it crashes.
         // To support it, this would be needed:
         // - Adjust all qnx qpa code which uses screens
-        // - Make QWidgetBackingStore not dereference a null paint device
+        // - Make QWidgetRepaintManager not dereference a null paint device
         // - Create platform resources ( QQnxWindow ) for all QWindow because they would be deleted
         //   when you delete the screen
 
diff --git a/src/plugins/platforms/qnx/qqnxscreentraits.h b/src/plugins/platforms/qnx/qqnxscreentraits.h
new file mode 100644
index 0000000000..ebd74141f2
--- /dev/null
+++ b/src/plugins/platforms/qnx/qqnxscreentraits.h
@@ -0,0 +1,127 @@
+/***************************************************************************
+**
+** Copyright (C) 2018 QNX Software Systems. All rights reserved.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQNXSCREENTRAITS_H
+#define QQNXSCREENTRAITS_H
+
+#include <screen/screen.h>
+
+QT_BEGIN_NAMESPACE
+
+template <typename T>
+class screen_traits
+{
+};
+
+template <>
+class screen_traits<screen_context_t>
+{
+public:
+    typedef screen_context_t screen_type;
+    static const int propertyName = SCREEN_PROPERTY_CONTEXT;
+    static int destroy(screen_context_t context) { return screen_destroy_context(context); }
+};
+
+template <>
+class screen_traits<screen_device_t>
+{
+public:
+    typedef screen_device_t screen_type;
+    static const int propertyName = SCREEN_PROPERTY_DEVICE;
+    static int destroy(screen_device_t device) { return screen_destroy_device(device); }
+};
+
+template <>
+class screen_traits<screen_display_t>
+{
+public:
+    typedef screen_display_t screen_type;
+    static const int propertyName = SCREEN_PROPERTY_DISPLAY;
+};
+
+template <>
+class screen_traits<screen_group_t>
+{
+public:
+    typedef screen_group_t screen_type;
+    static const int propertyName = SCREEN_PROPERTY_GROUP;
+    static int destroy(screen_group_t group) { return screen_destroy_group(group); }
+};
+
+template <>
+class screen_traits<screen_pixmap_t>
+{
+public:
+    typedef screen_pixmap_t screen_type;
+    static const int propertyName = SCREEN_PROPERTY_PIXMAP;
+    static int destroy(screen_pixmap_t pixmap) { return screen_destroy_pixmap(pixmap); }
+};
+
+template <>
+class screen_traits<screen_session_t>
+{
+public:
+    typedef screen_session_t screen_type;
+    static const int propertyName = SCREEN_PROPERTY_SESSION;
+    static int destroy(screen_session_t session) { return screen_destroy_session(session); }
+};
+
+#if _SCREEN_VERSION >= _SCREEN_MAKE_VERSION(2, 0, 0)
+template <>
+class screen_traits<screen_stream_t>
+{
+public:
+    typedef screen_stream_t screen_type;
+    static const int propertyName = SCREEN_PROPERTY_STREAM;
+    static int destroy(screen_stream_t stream) { return screen_destroy_stream(stream); }
+};
+#endif
+
+template <>
+class screen_traits<screen_window_t>
+{
+public:
+    typedef screen_window_t screen_type;
+    static const int propertyName = SCREEN_PROPERTY_WINDOW;
+    static int destroy(screen_window_t window) { return screen_destroy_window(window); }
+};
+
+QT_END_NAMESPACE
+
+#endif // QQNXSCREENTRAITS_H
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index 7644e28b44..1d3d609017 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -155,6 +155,7 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
       m_parentWindow(0),
       m_visible(false),
       m_exposed(true),
+      m_foreign(false),
       m_windowState(Qt::WindowNoState),
       m_mmRendererWindow(0),
       m_firstActivateHandled(false)
@@ -254,6 +255,39 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW
     }
 }
 
+QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, screen_window_t screenWindow)
+    : QPlatformWindow(window)
+    , m_screenContext(context)
+    , m_window(screenWindow)
+    , m_screen(0)
+    , m_parentWindow(0)
+    , m_visible(false)
+    , m_exposed(true)
+    , m_foreign(true)
+    , m_windowState(Qt::WindowNoState)
+    , m_mmRendererWindow(0)
+    , m_parentGroupName(256, 0)
+    , m_isTopLevel(false)
+{
+    qWindowDebug() << "window =" << window << ", size =" << window->size();
+
+    collectWindowGroup();
+
+    screen_get_window_property_cv(m_window,
+                                  SCREEN_PROPERTY_PARENT,
+                                  m_parentGroupName.size(),
+                                  m_parentGroupName.data());
+    m_parentGroupName.resize(strlen(m_parentGroupName.constData()));
+
+    // If a window group has been provided join it now. If it's an empty string that's OK too,
+    // it'll cause us not to join a group (the app will presumably join at some future time).
+    QVariant parentGroup = window->property("qnxInitialWindowGroup");
+    if (!parentGroup.isValid())
+        parentGroup = window->property("_q_platform_qnxParentGroup");
+    if (parentGroup.isValid() && parentGroup.canConvert<QByteArray>())
+        joinWindowGroup(parentGroup.toByteArray());
+}
+
 QQnxWindow::~QQnxWindow()
 {
     qWindowDebug() << "window =" << window();
@@ -270,7 +304,11 @@ QQnxWindow::~QQnxWindow()
         m_screen->updateHierarchy();
 
     // Cleanup QNX window and its buffers
-    screen_destroy_window(m_window);
+    // Foreign windows are cleaned up externally after the CLOSE event has been handled.
+    if (m_foreign)
+        removeContextPermission();
+    else
+        screen_destroy_window(m_window);
 }
 
 void QQnxWindow::setGeometry(const QRect &rect)
@@ -793,14 +831,24 @@ void QQnxWindow::initWindow()
     setGeometryHelper(shouldMakeFullScreen() ? screen()->geometry() : window()->geometry());
 }
 
-void QQnxWindow::createWindowGroup()
+void QQnxWindow::collectWindowGroup()
 {
-    // Generate a random window group name
-    m_windowGroupName = QUuid::createUuid().toByteArray();
+    QByteArray groupName(256, 0);
+    Q_SCREEN_CHECKERROR(screen_get_window_property_cv(m_window,
+                                                      SCREEN_PROPERTY_GROUP,
+                                                      groupName.size(),
+                                                      groupName.data()),
+                        "Failed to retrieve window group");
+    groupName.resize(strlen(groupName.constData()));
+    m_windowGroupName = groupName;
+}
 
-    // Create window group so child windows can be parented by container window
-    Q_SCREEN_CHECKERROR(screen_create_window_group(m_window, m_windowGroupName.constData()),
+void QQnxWindow::createWindowGroup()
+{
+    Q_SCREEN_CHECKERROR(screen_create_window_group(m_window, nullptr),
                         "Failed to create window group");
+
+    collectWindowGroup();
 }
 
 void QQnxWindow::joinWindowGroup(const QByteArray &groupName)
@@ -809,6 +857,17 @@ void QQnxWindow::joinWindowGroup(const QByteArray &groupName)
 
     qWindowDebug() << "group:" << groupName;
 
+    // screen has this annoying habit of generating a CLOSE/CREATE when the owner context of
+    // the parent group moves a foreign window to another group that it also owns.  The
+    // CLOSE/CREATE changes the identity of the foreign window.  Usually, this is undesirable.
+    // To prevent this CLOSE/CREATE when changing the parent group, we temporarily add a
+    // context permission for the Qt context.  screen won't send a CLOSE/CREATE when the
+    // context has some permission other than the PARENT permission.  If there isn't a new
+    // group (the window has no parent), this context permission is left in place.
+
+    if (m_foreign && !m_parentGroupName.isEmpty())\
+        addContextPermission();
+
     if (!groupName.isEmpty()) {
         if (groupName != m_parentGroupName) {
             screen_join_window_group(m_window, groupName);
@@ -827,6 +886,9 @@ void QQnxWindow::joinWindowGroup(const QByteArray &groupName)
         m_parentGroupName = "";
     }
 
+    if (m_foreign && !groupName.isEmpty())
+        removeContextPermission();
+
     if (changed)
         screen_flush_context(m_screenContext, 0);
 }
@@ -899,4 +961,26 @@ bool QQnxWindow::focusable() const
     return (window()->flags() & Qt::WindowDoesNotAcceptFocus) != Qt::WindowDoesNotAcceptFocus;
 }
 
+void QQnxWindow::addContextPermission()
+{
+    QByteArray grantString("context:");
+    grantString.append(QQnxIntegration::instance()->screenContextId());
+    grantString.append(":rw-");
+    screen_set_window_property_cv(m_window,
+            SCREEN_PROPERTY_PERMISSIONS,
+            grantString.length(),
+            grantString.data());
+}
+
+void QQnxWindow::removeContextPermission()
+{
+    QByteArray revokeString("context:");
+    revokeString.append(QQnxIntegration::instance()->screenContextId());
+    revokeString.append(":---");
+    screen_set_window_property_cv(m_window,
+            SCREEN_PROPERTY_PERMISSIONS,
+            revokeString.length(),
+            revokeString.data());
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h
index 20c38cb4b7..9040619c41 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.h
+++ b/src/plugins/platforms/qnx/qqnxwindow.h
@@ -64,7 +64,8 @@ class QQnxWindow : public QPlatformWindow
 {
 friend class QQnxScreen;
 public:
-    QQnxWindow(QWindow *window, screen_context_t context, bool needRootWindow);
+    explicit QQnxWindow(QWindow *window, screen_context_t context, bool needRootWindow);
+    explicit QQnxWindow(QWindow *window, screen_context_t context, screen_window_t screenWindow);
     virtual ~QQnxWindow();
 
     void setGeometry(const QRect &rect) override;
@@ -124,6 +125,7 @@ protected:
     screen_context_t m_screenContext;
 
 private:
+    void collectWindowGroup();
     void createWindowGroup();
     void setGeometryHelper(const QRect &rect);
     void removeFromParent();
@@ -135,6 +137,9 @@ private:
     bool showWithoutActivating() const;
     bool focusable() const;
 
+    void addContextPermission();
+    void removeContextPermission();
+
     screen_window_t m_window;
     QSize m_bufferSize;
 
@@ -144,6 +149,7 @@ private:
     QScopedPointer<QQnxAbstractCover> m_cover;
     bool m_visible;
     bool m_exposed;
+    bool m_foreign;
     QRect m_unmaximizedGeometry;
     Qt::WindowStates m_windowState;
     QString m_mmRendererWindowName;
diff --git a/src/plugins/platforms/vnc/qvnc_p.h b/src/plugins/platforms/vnc/qvnc_p.h
index 338fae9f87..f7f2f74ddb 100644
--- a/src/plugins/platforms/vnc/qvnc_p.h
+++ b/src/plugins/platforms/vnc/qvnc_p.h
@@ -139,7 +139,7 @@ public:
 class QRfbServerInit
 {
 public:
-    QRfbServerInit() { name = 0; }
+    QRfbServerInit() { name = nullptr; }
     ~QRfbServerInit() { delete[] name; }
 
     int size() const { return QRfbPixelFormat::size() + 8 + strlen(name); }
diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp
index 9dfe873927..3a373a5e4b 100644
--- a/src/plugins/platforms/vnc/qvncclient.cpp
+++ b/src/plugins/platforms/vnc/qvncclient.cpp
@@ -587,9 +587,18 @@ void QVncClient::frameBufferUpdateRequest()
 void QVncClient::pointerEvent()
 {
     QRfbPointerEvent ev;
+    static int buttonState = Qt::NoButton;
     if (ev.read(m_clientSocket)) {
-        const QPoint pos = m_server->screen()->geometry().topLeft() + QPoint(ev.x, ev.y);
-        QWindowSystemInterface::handleMouseEvent(0, pos, pos, ev.buttons, QGuiApplication::keyboardModifiers());
+        const QPointF pos = m_server->screen()->geometry().topLeft() + QPoint(ev.x, ev.y);
+        int buttonStateChange = buttonState ^ int(ev.buttons);
+        QEvent::Type type = QEvent::MouseMove;
+        if (int(ev.buttons) > buttonState)
+            type = QEvent::MouseButtonPress;
+        else if (int(ev.buttons) < buttonState)
+            type = QEvent::MouseButtonRelease;
+        QWindowSystemInterface::handleMouseEvent(nullptr, pos, pos, ev.buttons, Qt::MouseButton(buttonStateChange),
+                                                 type, QGuiApplication::keyboardModifiers());
+        buttonState = int(ev.buttons);
         m_handleMsg = false;
     }
 }
diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
index e69aa90d41..db658d4ecc 100644
--- a/src/plugins/platforms/vnc/qvncscreen.h
+++ b/src/plugins/platforms/vnc/qvncscreen.h
@@ -82,12 +82,12 @@ public:
 
     qreal dpiX = 96;
     qreal dpiY = 96;
-    QVncDirtyMap *dirty = 0;
+    QVncDirtyMap *dirty = nullptr;
     QRegion dirtyRegion;
     int refreshRate = 30;
-    QVncServer *vncServer = 0;
+    QVncServer *vncServer = nullptr;
 #if QT_CONFIG(cursor)
-    QVncClientCursor *clientCursor = 0;
+    QVncClientCursor *clientCursor = nullptr;
 #endif
 };
 
diff --git a/src/plugins/platforms/wasm/qtlogo.svg b/src/plugins/platforms/wasm/qtlogo.svg
index cb8989bb79..ad7c7776bf 100644
--- a/src/plugins/platforms/wasm/qtlogo.svg
+++ b/src/plugins/platforms/wasm/qtlogo.svg
@@ -5,15 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="462pt"
    height="339pt"
    viewBox="0 0 462 339"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="TheQtCompany_logo_2.svg">
+   version="1.1">
   <metadata
      id="metadata20">
     <rdf:RDF>
@@ -26,28 +21,6 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs
-     id="defs18" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1536"
-     inkscape:window-height="801"
-     id="namedview16"
-     showgrid="false"
-     inkscape:zoom="1.1138643"
-     inkscape:cx="270.58047"
-     inkscape:cy="174.65092"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
   <path
      fill="#41cd52"
      d=" M 63.50 0.00 L 462.00 0.00 L 462.00 274.79 C 440.60 296.26 419.13 317.66 397.61 339.00 L 0.00 339.00 L 0.00 63.39 C 21.08 42.18 42.34 21.13 63.50 0.00 Z"
diff --git a/src/plugins/platforms/wasm/qwasmbackingstore.cpp b/src/plugins/platforms/wasm/qwasmbackingstore.cpp
index e8eda2605f..7e8a382512 100644
--- a/src/plugins/platforms/wasm/qwasmbackingstore.cpp
+++ b/src/plugins/platforms/wasm/qwasmbackingstore.cpp
@@ -81,6 +81,11 @@ void QWasmBackingStore::updateTexture()
     if (m_dirty.isNull())
         return;
 
+    if (m_recreateTexture && m_texture->isCreated()) {
+        m_recreateTexture = false;
+        m_texture->destroy();
+    }
+
     if (!m_texture->isCreated()) {
         m_texture->setMinificationFilter(QOpenGLTexture::Nearest);
         m_texture->setMagnificationFilter(QOpenGLTexture::Nearest);
@@ -146,9 +151,7 @@ void QWasmBackingStore::resize(const QSize &size, const QRegion &staticContents)
 
     m_image = QImage(size * window()->devicePixelRatio(), QImage::Format_RGB32);
     m_image.setDevicePixelRatio(window()->devicePixelRatio());
-
-    if (m_texture->isCreated())
-        m_texture->destroy();
+    m_recreateTexture = true;
 }
 
 QImage QWasmBackingStore::toImage() const
diff --git a/src/plugins/platforms/wasm/qwasmbackingstore.h b/src/plugins/platforms/wasm/qwasmbackingstore.h
index 4bca83c457..b93c96b483 100644
--- a/src/plugins/platforms/wasm/qwasmbackingstore.h
+++ b/src/plugins/platforms/wasm/qwasmbackingstore.h
@@ -64,6 +64,7 @@ private:
     QImage m_image;
     QScopedPointer<QOpenGLTexture> m_texture;
     QRegion m_dirty;
+    bool m_recreateTexture = false;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index 6d211667be..a810880c43 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -681,7 +681,7 @@ void QWasmCompositor::frame()
 
     QWasmWindow *someWindow = nullptr;
 
-    foreach (QWasmWindow *window, m_windowStack) {
+    for (QWasmWindow *window : qAsConst(m_windowStack)) {
         if (window->window()->surfaceClass() == QSurface::Window
                 && qt_window_private(static_cast<QWindow *>(window->window()))->receivedExpose) {
             someWindow = window;
@@ -715,7 +715,7 @@ void QWasmCompositor::frame()
     m_blitter->bind();
     m_blitter->setRedBlueSwizzle(true);
 
-    foreach (QWasmWindow *window, m_windowStack) {
+    for (QWasmWindow *window : qAsConst(m_windowStack)) {
         QWasmCompositedWindow &compositedWindow = m_compositedWindows[window];
 
         if (!compositedWindow.visible)
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index 43e82435cf..ad94ba9c77 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -780,6 +780,60 @@ quint64 QWasmEventTranslator::getTimestamp()
     return QDeadlineTimer::current().deadlineNSecs() / 1000;
 }
 
+struct KeyMapping { Qt::Key from, to; };
+
+constexpr KeyMapping tildeKeyTable[] = { // ~
+    { Qt::Key_A, Qt::Key_Atilde },
+    { Qt::Key_N, Qt::Key_Ntilde },
+    { Qt::Key_O, Qt::Key_Otilde },
+};
+constexpr KeyMapping graveKeyTable[] = { // `
+    { Qt::Key_A, Qt::Key_Agrave },
+    { Qt::Key_E, Qt::Key_Egrave },
+    { Qt::Key_I, Qt::Key_Igrave },
+    { Qt::Key_O, Qt::Key_Ograve },
+    { Qt::Key_U, Qt::Key_Ugrave },
+};
+constexpr KeyMapping acuteKeyTable[] = { // '
+    { Qt::Key_A, Qt::Key_Aacute },
+    { Qt::Key_E, Qt::Key_Eacute },
+    { Qt::Key_I, Qt::Key_Iacute },
+    { Qt::Key_O, Qt::Key_Oacute },
+    { Qt::Key_U, Qt::Key_Uacute },
+    { Qt::Key_Y, Qt::Key_Yacute },
+};
+constexpr KeyMapping diaeresisKeyTable[] = { // umlaut ¨
+    { Qt::Key_A, Qt::Key_Adiaeresis },
+    { Qt::Key_E, Qt::Key_Ediaeresis },
+    { Qt::Key_I, Qt::Key_Idiaeresis },
+    { Qt::Key_O, Qt::Key_Odiaeresis },
+    { Qt::Key_U, Qt::Key_Udiaeresis },
+    { Qt::Key_Y, Qt::Key_ydiaeresis },
+};
+constexpr KeyMapping circumflexKeyTable[] = { // ^
+    { Qt::Key_A, Qt::Key_Acircumflex },
+    { Qt::Key_E, Qt::Key_Ecircumflex },
+    { Qt::Key_I, Qt::Key_Icircumflex },
+    { Qt::Key_O, Qt::Key_Ocircumflex },
+    { Qt::Key_U, Qt::Key_Ucircumflex },
+};
+
+static Qt::Key find_impl(const KeyMapping *first, const KeyMapping *last, Qt::Key key) noexcept
+{
+    while (first != last) {
+        if (first->from == key)
+            return first->to;
+        ++first;
+    }
+    return Qt::Key_unknown;
+}
+
+template <size_t N>
+static Qt::Key find(const KeyMapping (&map)[N], Qt::Key key) noexcept
+{
+    return find_impl(map, map + N, key);
+}
+
 Qt::Key QWasmEventTranslator::translateDeadKey(Qt::Key deadKey, Qt::Key accentBaseKey)
 {
     Qt::Key wasmKey = Qt::Key_unknown;
@@ -789,25 +843,25 @@ Qt::Key QWasmEventTranslator::translateDeadKey(Qt::Key deadKey, Qt::Key accentBa
 #else
     case Qt::Key_O: // ´ Key_Dead_Grave
 #endif
-        wasmKey = graveKeyTable.value(accentBaseKey);
+        wasmKey = find(graveKeyTable, accentBaseKey);
         break;
     case Qt::Key_E: // ´ Key_Dead_Acute
-        wasmKey = acuteKeyTable.value(accentBaseKey);
+        wasmKey = find(acuteKeyTable, accentBaseKey);
         break;
     case Qt::Key_AsciiTilde:
     case Qt::Key_N:// Key_Dead_Tilde
-        wasmKey = tildeKeyTable.value(accentBaseKey);
+        wasmKey = find(tildeKeyTable, accentBaseKey);
         break;
 #ifndef Q_OS_MACOS
     case Qt::Key_QuoteLeft:
 #endif
     case Qt::Key_U:// ¨ Key_Dead_Diaeresis
-        wasmKey = diaeresisKeyTable.value(accentBaseKey);
+        wasmKey = find(diaeresisKeyTable, accentBaseKey);
         break;
     case Qt::Key_I:// macOS Key_Dead_Circumflex
     case Qt::Key_6:// linux
     case Qt::Key_Apostrophe:// linux
-        wasmKey = circumflexKeyTable.value(accentBaseKey);
+        wasmKey = find(circumflexKeyTable, accentBaseKey);
         break;
     default:
         break;
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.h b/src/plugins/platforms/wasm/qwasmeventtranslator.h
index 1655b7226a..568ae00732 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.h
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.h
@@ -77,42 +77,6 @@ private:
 
     Qt::Key translateDeadKey(Qt::Key deadKey, Qt::Key accentBaseKey);
 
-    QHash<Qt::Key , Qt::Key> tildeKeyTable { // ~
-        { Qt::Key_A, Qt::Key_Atilde},
-        { Qt::Key_N, Qt::Key_Ntilde},
-        { Qt::Key_O, Qt::Key_Otilde}
-     };
-    QHash<Qt::Key , Qt::Key> graveKeyTable { // `
-        { Qt::Key_A, Qt::Key_Agrave},
-        { Qt::Key_E, Qt::Key_Egrave},
-        { Qt::Key_I, Qt::Key_Igrave},
-        { Qt::Key_O, Qt::Key_Ograve},
-        { Qt::Key_U, Qt::Key_Ugrave}
-     };
-    QHash<Qt::Key , Qt::Key> acuteKeyTable { // '
-        { Qt::Key_A, Qt::Key_Aacute},
-        { Qt::Key_E, Qt::Key_Eacute},
-        { Qt::Key_I, Qt::Key_Iacute},
-        { Qt::Key_O, Qt::Key_Oacute},
-        { Qt::Key_U, Qt::Key_Uacute},
-        { Qt::Key_Y, Qt::Key_Yacute}
-     };
-    QHash<Qt::Key , Qt::Key> diaeresisKeyTable { // umlaut ¨
-        { Qt::Key_A, Qt::Key_Adiaeresis},
-        { Qt::Key_E, Qt::Key_Ediaeresis},
-        { Qt::Key_I, Qt::Key_Idiaeresis},
-        { Qt::Key_O, Qt::Key_Odiaeresis},
-        { Qt::Key_U, Qt::Key_Udiaeresis},
-        { Qt::Key_Y, Qt::Key_ydiaeresis}
-     };
-    QHash<Qt::Key , Qt::Key> circumflexKeyTable { // ^
-        { Qt::Key_A, Qt::Key_Acircumflex},
-        { Qt::Key_E, Qt::Key_Ecircumflex},
-        { Qt::Key_I, Qt::Key_Icircumflex},
-        { Qt::Key_O, Qt::Key_Ocircumflex},
-        { Qt::Key_U, Qt::Key_Ucircumflex}
-     };
-
     QMap <int, QPointF> pressedTouchIds;
 
 private:
diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
index dc6bb5847e..53e875ead6 100644
--- a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
+++ b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
@@ -38,10 +38,13 @@ void QWasmFontDatabase::populateFontDatabase()
     // Load font file from resources. Currently
     // all fonts needs to be bundled with the nexe
     // as Qt resources.
-    QStringList fontFileNames = QStringList() << QStringLiteral(":/fonts/DejaVuSansMono.ttf")
-                                              << QStringLiteral(":/fonts/Vera.ttf")
-                                              << QStringLiteral(":/fonts/DejaVuSans.ttf");
-    foreach (const QString &fontFileName, fontFileNames) {
+
+    const QString fontFileNames[] = {
+        QStringLiteral(":/fonts/DejaVuSansMono.ttf"),
+        QStringLiteral(":/fonts/Vera.ttf"),
+        QStringLiteral(":/fonts/DejaVuSans.ttf"),
+    };
+    for (const QString &fontFileName : fontFileNames) {
         QFile theFont(fontFileName);
         if (!theFont.open(QIODevice::ReadOnly))
             break;
diff --git a/src/plugins/platforms/wasm/wasm.pro b/src/plugins/platforms/wasm/wasm.pro
index c28df8f893..f8c8175525 100644
--- a/src/plugins/platforms/wasm/wasm.pro
+++ b/src/plugins/platforms/wasm/wasm.pro
@@ -7,6 +7,8 @@ QT += \
 # Avoid X11 header collision, use generic EGL native types
 DEFINES += QT_EGL_NO_X11
 
+DEFINES += QT_NO_FOREACH
+
 SOURCES = \
     main.cpp \
     qwasmintegration.cpp \
diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp
index cc17d8798f..9a7fce9cd5 100644
--- a/src/plugins/platforms/windows/qwin10helpers.cpp
+++ b/src/plugins/platforms/windows/qwin10helpers.cpp
@@ -137,7 +137,7 @@ bool qt_windowsIsTabletMode(HWND hwnd)
     const wchar_t uiViewSettingsId[] = L"Windows.UI.ViewManagement.UIViewSettings";
     HSTRING_HEADER uiViewSettingsIdRefHeader;
     HSTRING uiViewSettingsIdHs = nullptr;
-    const UINT32 uiViewSettingsIdLen = UINT32(sizeof(uiViewSettingsId) / sizeof(uiViewSettingsId[0]) - 1);
+    const auto uiViewSettingsIdLen = UINT32(sizeof(uiViewSettingsId) / sizeof(uiViewSettingsId[0]) - 1);
     if (FAILED(baseComDll.windowsCreateStringReference(uiViewSettingsId, uiViewSettingsIdLen, &uiViewSettingsIdRefHeader, &uiViewSettingsIdHs)))
         return false;
 
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
index 68807fabdd..bd7bdc55d1 100644
--- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp
+++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
@@ -158,7 +158,7 @@ void QWindowsBackingStore::resize(const QSize &size, const QRegion &region)
             format = qt_maybeAlphaVersionWithSameDepth(format);
 
         QWindowsNativeImage *oldwni = m_image.data();
-        QWindowsNativeImage *newwni = new QWindowsNativeImage(size.width(), size.height(), format);
+        auto *newwni = new QWindowsNativeImage(size.width(), size.height(), format);
 
         if (oldwni && !region.isEmpty()) {
             const QImage &oldimg(oldwni->image());
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.h b/src/plugins/platforms/windows/qwindowsbackingstore.h
index 088ab3b257..b96c8f0e61 100644
--- a/src/plugins/platforms/windows/qwindowsbackingstore.h
+++ b/src/plugins/platforms/windows/qwindowsbackingstore.h
@@ -52,7 +52,7 @@ class QWindowsNativeImage;
 
 class QWindowsBackingStore : public QPlatformBackingStore
 {
-    Q_DISABLE_COPY(QWindowsBackingStore)
+    Q_DISABLE_COPY_MOVE(QWindowsBackingStore)
 public:
     QWindowsBackingStore(QWindow *window);
     ~QWindowsBackingStore() override;
diff --git a/src/plugins/platforms/windows/qwindowsclipboard.cpp b/src/plugins/platforms/windows/qwindowsclipboard.cpp
index b87e43f3f7..4e6d3306e1 100644
--- a/src/plugins/platforms/windows/qwindowsclipboard.cpp
+++ b/src/plugins/platforms/windows/qwindowsclipboard.cpp
@@ -115,12 +115,21 @@ static QDebug operator<<(QDebug d, const QMimeData *mimeData)
 
 IDataObject *QWindowsClipboardRetrievalMimeData::retrieveDataObject() const
 {
+    enum : int { attempts = 3 };
     IDataObject * pDataObj = nullptr;
-    if (OleGetClipboard(&pDataObj) == S_OK) {
-        if (QWindowsContext::verbose > 1)
-            qCDebug(lcQpaMime) << __FUNCTION__ << pDataObj;
-        return pDataObj;
+    // QTBUG-53979, retry in case the other application has clipboard locked
+    for (int i = 1; i <= attempts; ++i) {
+        if (SUCCEEDED(OleGetClipboard(&pDataObj))) {
+            if (QWindowsContext::verbose > 1)
+                qCDebug(lcQpaMime) << __FUNCTION__ << pDataObj;
+            return pDataObj;
+        }
+        qCWarning(lcQpaMime, i == attempts
+                  ? "Unable to obtain clipboard."
+                  : "Retrying to obtain clipboard.");
+        QThread::msleep(50);
     }
+
     return nullptr;
 }
 
diff --git a/src/plugins/platforms/windows/qwindowsclipboard.h b/src/plugins/platforms/windows/qwindowsclipboard.h
index 469d638b89..24a6bc908d 100644
--- a/src/plugins/platforms/windows/qwindowsclipboard.h
+++ b/src/plugins/platforms/windows/qwindowsclipboard.h
@@ -58,7 +58,7 @@ protected:
 
 class QWindowsClipboard : public QPlatformClipboard
 {
-    Q_DISABLE_COPY(QWindowsClipboard)
+    Q_DISABLE_COPY_MOVE(QWindowsClipboard)
 public:
     QWindowsClipboard();
     ~QWindowsClipboard() override;
@@ -87,8 +87,8 @@ private:
 
     QWindowsClipboardRetrievalMimeData m_retrievalData;
     QWindowsOleDataObject *m_data = nullptr;
-    HWND m_clipboardViewer = 0;
-    HWND m_nextClipboardViewer = 0;
+    HWND m_clipboardViewer = nullptr;
+    HWND m_nextClipboardViewer = nullptr;
     bool m_formatListenerRegistered = false;
 };
 
diff --git a/src/plugins/platforms/windows/qwindowscombase.h b/src/plugins/platforms/windows/qwindowscombase.h
index 6b25d665dc..45cba9c68b 100644
--- a/src/plugins/platforms/windows/qwindowscombase.h
+++ b/src/plugins/platforms/windows/qwindowscombase.h
@@ -80,7 +80,7 @@ bool qWindowsComQueryUnknownInterfaceMulti(Derived *d, REFIID id, LPVOID *iface)
 // Helper base class to provide IUnknown methods for COM classes (single inheritance)
 template <class ComInterface> class QWindowsComBase : public ComInterface
 {
-    Q_DISABLE_COPY(QWindowsComBase)
+    Q_DISABLE_COPY_MOVE(QWindowsComBase)
 public:
     explicit QWindowsComBase(ULONG initialRefCount = 1) : m_ref(initialRefCount) {}
     virtual ~QWindowsComBase() = default;
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 38b9823d6b..f7d04b667d 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -79,6 +79,7 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/quuid.h>
 #include <QtCore/private/qsystemlibrary_p.h>
+#include <QtCore/private/qwinregistry_p.h>
 
 #include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
 
@@ -134,8 +135,8 @@ static inline bool useRTL_Extensions()
 #if QT_CONFIG(sessionmanager)
 static inline QWindowsSessionManager *platformSessionManager()
 {
-    QGuiApplicationPrivate *guiPrivate = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(qApp));
-    QSessionManagerPrivate *managerPrivate = static_cast<QSessionManagerPrivate*>(QObjectPrivate::get(guiPrivate->session_manager));
+    auto *guiPrivate = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(qApp));
+    auto *managerPrivate = static_cast<QSessionManagerPrivate*>(QObjectPrivate::get(guiPrivate->session_manager));
     return static_cast<QWindowsSessionManager *>(managerPrivate->platformSessionManager);
 }
 
@@ -548,7 +549,7 @@ QString QWindowsContext::registerWindowClass(QString cname,
     // add a UUID.
     static int classExists = -1;
 
-    const HINSTANCE appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
+    const auto appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
     if (classExists == -1) {
         WNDCLASS wcinfo;
         classExists = GetClassInfo(appInstance, reinterpret_cast<LPCWSTR>(cname.utf16()), &wcinfo);
@@ -594,14 +595,14 @@ QString QWindowsContext::registerWindowClass(QString cname,
 
     d->m_registeredWindowClassNames.insert(cname);
     qCDebug(lcQpaWindows).nospace() << __FUNCTION__ << ' ' << cname
-        << " style=0x" << hex << style << dec
+        << " style=0x" << Qt::hex << style << Qt::dec
         << " brush=" << brush << " icon=" << icon << " atom=" << atom;
     return cname;
 }
 
 void QWindowsContext::unregisterWindowClasses()
 {
-    const HINSTANCE appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
+    const auto appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
 
     for (const QString &name : qAsConst(d->m_registeredWindowClassNames)) {
         if (!UnregisterClass(reinterpret_cast<LPCWSTR>(name.utf16()), appInstance) && QWindowsContext::verbose)
@@ -716,7 +717,7 @@ static inline bool findPlatformWindowHelper(const POINT &screenPoint, unsigned c
                                             HWND *hwnd, QWindowsWindow **result)
 {
     POINT point = screenPoint;
-    ScreenToClient(*hwnd, &point);
+    screenToClient(*hwnd, &point);
     // Returns parent if inside & none matched.
     const HWND child = ChildWindowFromPointEx(*hwnd, point, cwexFlags);
     if (!child || child == *hwnd)
@@ -1053,7 +1054,7 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
         // For non-client-area messages, these are screen coordinates (as expected
         // in the MSG structure), otherwise they are client coordinates.
         if (!(et & QtWindows::NonClientEventFlag)) {
-            ClientToScreen(msg.hwnd, &msg.pt);
+            clientToScreen(msg.hwnd, &msg.pt);
         }
     } else {
         GetCursorPos(&msg.pt);
@@ -1144,13 +1145,11 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
         case QtWindows::QuerySizeHints:
             d->m_creationContext->applyToMinMaxInfo(reinterpret_cast<MINMAXINFO *>(lParam));
             return true;
-        case QtWindows::ResizeEvent: {
-            const QSize size(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) - d->m_creationContext->menuHeight);
-            d->m_creationContext->obtainedGeometry.setSize(size);
-        }
+        case QtWindows::ResizeEvent:
+            d->m_creationContext->obtainedSize = QSize(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
             return true;
         case QtWindows::MoveEvent:
-            d->m_creationContext->obtainedGeometry.moveTo(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+            d->m_creationContext->obtainedPos = QPoint(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
             return true;
         case QtWindows::NonClientCreate:
             if (shouldHaveNonClientDpiScaling(d->m_creationContext->window))
@@ -1363,7 +1362,7 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
         sessionManager->blocksInteraction();
         sessionManager->clearCancellation();
 
-        QGuiApplicationPrivate *qGuiAppPriv = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(qApp));
+        auto *qGuiAppPriv = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(qApp));
         qGuiAppPriv->commitData();
 
         if (lParam & ENDSESSION_LOGOFF)
@@ -1381,7 +1380,7 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
 
         // we receive the message for each toplevel window included internal hidden ones,
         // but the aboutToQuit signal should be emitted only once.
-        QGuiApplicationPrivate *qGuiAppPriv = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(qApp));
+        auto *qGuiAppPriv = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(qApp));
         if (endsession && !qGuiAppPriv->aboutToQuitEmitted) {
             qGuiAppPriv->aboutToQuitEmitted = true;
             int index = QGuiApplication::staticMetaObject.indexOfSignal("aboutToQuit()");
@@ -1520,28 +1519,13 @@ QTouchDevice *QWindowsContext::touchDevice() const
         d->m_pointerHandler.touchDevice() : d->m_mouseHandler.touchDevice();
 }
 
-static DWORD readDwordRegistrySetting(const wchar_t *regKey, const wchar_t *subKey, DWORD defaultValue)
-{
-    DWORD result = defaultValue;
-    HKEY handle;
-    if (RegOpenKeyEx(HKEY_CURRENT_USER, regKey, 0, KEY_READ, &handle) == ERROR_SUCCESS) {
-        DWORD type;
-        if (RegQueryValueEx(handle, subKey, nullptr, &type, nullptr, nullptr) == ERROR_SUCCESS
-            && type == REG_DWORD) {
-            DWORD value;
-            DWORD size = sizeof(result);
-            if (RegQueryValueEx(handle, subKey, nullptr, nullptr, reinterpret_cast<unsigned char *>(&value), &size) == ERROR_SUCCESS)
-                result = value;
-        }
-        RegCloseKey(handle);
-    }
-    return result;
-}
-
 DWORD QWindowsContext::readAdvancedExplorerSettings(const wchar_t *subKey, DWORD defaultValue)
 {
-    return readDwordRegistrySetting(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced",
-                                    subKey, defaultValue);
+    const auto value =
+        QWinRegistryKey(HKEY_CURRENT_USER,
+                        LR"(Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced)")
+                       .dwordValue(subKey);
+    return value.second ? value.first : defaultValue;
 }
 
 static inline bool isEmptyRect(const RECT &rect)
@@ -1594,7 +1578,7 @@ extern "C" LRESULT QT_WIN_CALLBACK qWindowsWndProc(HWND hwnd, UINT message, WPAR
     if (QWindowsContext::verbose > 1 && lcQpaEvents().isDebugEnabled()) {
         if (const char *eventName = QWindowsGuiEventDispatcher::windowsMessageName(message)) {
             qCDebug(lcQpaEvents).nospace() << "EVENT: hwd=" << hwnd << ' ' << eventName
-                << " msg=0x" << hex << message << " et=0x" << et << dec << " wp="
+                << " msg=0x" << Qt::hex << message << " et=0x" << et << Qt::dec << " wp="
                 << int(wParam) << " at " << GET_X_LPARAM(lParam) << ','
                 << GET_Y_LPARAM(lParam) << " handled=" << handled;
         }
@@ -1630,7 +1614,11 @@ static inline QByteArray nativeEventType() { return QByteArrayLiteral("windows_g
 bool QWindowsContext::filterNativeEvent(MSG *msg, LRESULT *result)
 {
     QAbstractEventDispatcher *dispatcher = QAbstractEventDispatcher::instance();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    qintptr filterResult = 0;
+#else
     long filterResult = 0;
+#endif
     if (dispatcher && dispatcher->filterNativeEvent(nativeEventType(), msg, &filterResult)) {
         *result = LRESULT(filterResult);
         return true;
@@ -1641,7 +1629,11 @@ bool QWindowsContext::filterNativeEvent(MSG *msg, LRESULT *result)
 // Send to QWindowSystemInterface
 bool QWindowsContext::filterNativeEvent(QWindow *window, MSG *msg, LRESULT *result)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    qintptr filterResult = 0;
+#else
     long filterResult = 0;
+#endif
     if (QWindowSystemInterface::handleNativeEvent(window, nativeEventType(), msg, &filterResult)) {
         *result = LRESULT(filterResult);
         return true;
diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index 4908f14629..d94ae3f73b 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -155,7 +155,7 @@ struct QWindowsShcoreDLL {
 
 class QWindowsContext
 {
-    Q_DISABLE_COPY(QWindowsContext)
+    Q_DISABLE_COPY_MOVE(QWindowsContext)
 public:
 
     enum SystemInfoFlags
@@ -180,11 +180,11 @@ public:
 
     QString registerWindowClass(const QWindow *w);
     QString registerWindowClass(QString cname, WNDPROC proc,
-                                unsigned style = 0, HBRUSH brush = 0,
+                                unsigned style = 0, HBRUSH brush = nullptr,
                                 bool icon = false);
     HWND createDummyWindow(const QString &classNameIn,
                            const wchar_t *windowName,
-                           WNDPROC wndProc = 0, DWORD style = WS_OVERLAPPED);
+                           WNDPROC wndProc = nullptr, DWORD style = WS_OVERLAPPED);
 
     HDC displayContext() const;
     int screenDepth() const;
diff --git a/src/plugins/platforms/windows/qwindowscursor.cpp b/src/plugins/platforms/windows/qwindowscursor.cpp
index 20a8117304..17e8cffb76 100644
--- a/src/plugins/platforms/windows/qwindowscursor.cpp
+++ b/src/plugins/platforms/windows/qwindowscursor.cpp
@@ -752,7 +752,7 @@ QPixmap QWindowsCursor::dragDefaultCursor(Qt::DropAction action) const
             && GetObject(iconInfo.hbmColor, sizeof(BITMAP), &bmColor)
             && bmColor.bmWidth == bmColor.bmWidthBytes / 4) {
             const int colorBitsLength = bmColor.bmHeight * bmColor.bmWidthBytes;
-            uchar *colorBits = new uchar[colorBitsLength];
+            auto *colorBits = new uchar[colorBitsLength];
             GetBitmapBits(iconInfo.hbmColor, colorBitsLength, colorBits);
             const QImage colorImage(colorBits, bmColor.bmWidth, bmColor.bmHeight,
                                     bmColor.bmWidthBytes, QImage::Format_ARGB32);
diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h
index 8495b51a5a..b896f4c7a9 100644
--- a/src/plugins/platforms/windows/qwindowscursor.h
+++ b/src/plugins/platforms/windows/qwindowscursor.h
@@ -61,14 +61,14 @@ inline bool operator==(const QWindowsPixmapCursorCacheKey &k1, const QWindowsPix
     return k1.bitmapCacheKey == k2.bitmapCacheKey && k1.maskCacheKey == k2.maskCacheKey;
 }
 
-inline uint qHash(const QWindowsPixmapCursorCacheKey &k, uint seed) Q_DECL_NOTHROW
+inline uint qHash(const QWindowsPixmapCursorCacheKey &k, uint seed) noexcept
 {
     return (uint(k.bitmapCacheKey) + uint(k.maskCacheKey)) ^ seed;
 }
 
 class CursorHandle
 {
-    Q_DISABLE_COPY(CursorHandle)
+    Q_DISABLE_COPY_MOVE(CursorHandle)
 public:
     explicit CursorHandle(HCURSOR hcursor = nullptr) : m_hcursor(hcursor) {}
     ~CursorHandle()
@@ -84,7 +84,7 @@ private:
     const HCURSOR m_hcursor;
 };
 
-typedef QSharedPointer<CursorHandle> CursorHandlePtr;
+using CursorHandlePtr = QSharedPointer<CursorHandle>;
 
 class QWindowsCursor : public QPlatformCursor
 {
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 9de3268fc8..b7ab952a1d 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -271,7 +271,7 @@ QWindowsNativeDialogBase *QWindowsDialogHelperBase<BaseClass>::ensureNativeDialo
 class QWindowsDialogThread : public QThread
 {
 public:
-    typedef QSharedPointer<QWindowsNativeDialogBase> QWindowsNativeDialogBasePtr;
+    using QWindowsNativeDialogBasePtr = QSharedPointer<QWindowsNativeDialogBase>;
 
     explicit QWindowsDialogThread(const QWindowsNativeDialogBasePtr &d, HWND owner)
         : m_dialog(d), m_owner(owner) {}
@@ -356,7 +356,7 @@ struct FindDialogContext
 
 static BOOL QT_WIN_CALLBACK findDialogEnumWindowsProc(HWND hwnd, LPARAM lParam)
 {
-    FindDialogContext *context = reinterpret_cast<FindDialogContext *>(lParam);
+    auto *context = reinterpret_cast<FindDialogContext *>(lParam);
     DWORD winPid = 0;
     GetWindowThreadProcessId(hwnd, &winPid);
     if (winPid != context->processId)
@@ -507,7 +507,7 @@ class QWindowsNativeFileDialogBase;
 
 class QWindowsNativeFileDialogEventHandler : public QWindowsComBase<IFileDialogEvents>
 {
-    Q_DISABLE_COPY(QWindowsNativeFileDialogEventHandler)
+    Q_DISABLE_COPY_MOVE(QWindowsNativeFileDialogEventHandler)
 public:
     static IFileDialogEvents *create(QWindowsNativeFileDialogBase *nativeFileDialog);
 
@@ -531,7 +531,7 @@ private:
 IFileDialogEvents *QWindowsNativeFileDialogEventHandler::create(QWindowsNativeFileDialogBase *nativeFileDialog)
 {
     IFileDialogEvents *result;
-    QWindowsNativeFileDialogEventHandler *eventHandler = new QWindowsNativeFileDialogEventHandler(nativeFileDialog);
+    auto *eventHandler = new QWindowsNativeFileDialogEventHandler(nativeFileDialog);
     if (FAILED(eventHandler->QueryInterface(IID_IFileDialogEvents, reinterpret_cast<void **>(&result)))) {
         qErrnoWarning("Unable to obtain IFileDialogEvents");
         return nullptr;
@@ -551,7 +551,7 @@ IFileDialogEvents *QWindowsNativeFileDialogEventHandler::create(QWindowsNativeFi
 class QWindowsShellItem
 {
 public:
-    typedef std::vector<IShellItem *> IShellItems;
+    using IShellItems = std::vector<IShellItem *>;
 
     explicit QWindowsShellItem(IShellItem *item);
 
@@ -736,7 +736,7 @@ QString QWindowsShellItem::libraryItemDefaultSaveFolder(IShellItem *item)
 #ifndef QT_NO_DEBUG_STREAM
 void QWindowsShellItem::format(QDebug &d) const
 {
-    d << "attributes=0x" << hex << attributes() << dec;
+    d << "attributes=0x" << Qt::hex << attributes() << Qt::dec;
     if (isFileSystem())
         d << " [filesys]";
     if (isDir())
@@ -972,7 +972,7 @@ void QWindowsNativeFileDialogBase::doExec(HWND owner)
     // gets a WM_CLOSE or the parent window is destroyed.
     const HRESULT hr = m_fileDialog->Show(owner);
     QWindowsDialogs::eatMouseMove();
-    qCDebug(lcQpaDialogs) << '<' << __FUNCTION__ << " returns " << hex << hr;
+    qCDebug(lcQpaDialogs) << '<' << __FUNCTION__ << " returns " << Qt::hex << hr;
     // Emit accepted() only if there is a result as otherwise UI hangs occur.
     // For example, typing in invalid URLs results in empty result lists.
     if (hr == S_OK && !m_data.selectedFiles().isEmpty()) {
@@ -1013,7 +1013,7 @@ void QWindowsNativeFileDialogBase::setMode(QFileDialogOptions::FileMode mode,
     }
     qCDebug(lcQpaDialogs) << __FUNCTION__ << "mode=" << mode
         << "acceptMode=" << acceptMode << "options=" << options
-        << "results in" << showbase << hex << flags;
+        << "results in" << Qt::showbase << Qt::hex << flags;
 
     if (FAILED(m_fileDialog->SetOptions(flags)))
         qErrnoWarning("%s: SetOptions() failed", __FUNCTION__);
@@ -1112,7 +1112,7 @@ void QWindowsNativeFileDialogBase::setDefaultSuffixSys(const QString &s)
     // If this parameter is non-empty, it will be appended by the dialog for the 'Any files'
     // filter ('*'). If this parameter is non-empty and the current filter has a suffix,
     // the dialog will append the filter's suffix.
-    wchar_t *wSuffix = const_cast<wchar_t *>(reinterpret_cast<const wchar_t *>(s.utf16()));
+    auto *wSuffix = const_cast<wchar_t *>(reinterpret_cast<const wchar_t *>(s.utf16()));
     m_fileDialog->SetDefaultExtension(wSuffix);
 }
 
@@ -1125,7 +1125,7 @@ static inline IFileDialog2 *getFileDialog2(IFileDialog *fileDialog)
 
 void QWindowsNativeFileDialogBase::setLabelText(QFileDialogOptions::DialogLabel l, const QString &text)
 {
-    wchar_t *wText = const_cast<wchar_t *>(reinterpret_cast<const wchar_t *>(text.utf16()));
+    auto *wText = const_cast<wchar_t *>(reinterpret_cast<const wchar_t *>(text.utf16()));
     switch (l) {
     case QFileDialogOptions::FileName:
         m_fileDialog->SetFileNameLabel(wText);
@@ -1688,7 +1688,7 @@ class QWindowsXpNativeFileDialog : public QWindowsNativeDialogBase
 {
     Q_OBJECT
 public:
-    typedef QSharedPointer<QFileDialogOptions> OptionsPtr;
+    using OptionsPtr = QSharedPointer<QFileDialogOptions>;
 
     static QWindowsXpNativeFileDialog *create(const OptionsPtr &options, const QWindowsFileDialogSharedData &data);
 
@@ -1770,7 +1770,7 @@ void QWindowsXpNativeFileDialog::doExec(HWND owner)
 
 static int QT_WIN_CALLBACK xpFileDialogGetExistingDirCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData)
 {
-    QWindowsXpNativeFileDialog *dialog = reinterpret_cast<QWindowsXpNativeFileDialog *>(lpData);
+    auto *dialog = reinterpret_cast<QWindowsXpNativeFileDialog *>(lpData);
     return dialog->existingDirCallback(hwnd, uMsg, lParam);
 }
 
@@ -1779,7 +1779,7 @@ static int QT_WIN_CALLBACK xpFileDialogGetExistingDirCallbackProc(HWND hwnd, UIN
 #if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3)
 typedef ITEMIDLIST *qt_LpItemIdList;
 #else
-typedef PIDLIST_ABSOLUTE qt_LpItemIdList;
+using qt_LpItemIdList = PIDLIST_ABSOLUTE;
 #endif
 
 int QWindowsXpNativeFileDialog::existingDirCallback(HWND hwnd, UINT uMsg, LPARAM lParam)
@@ -1843,7 +1843,7 @@ void QWindowsXpNativeFileDialog::populateOpenFileName(OPENFILENAME *ofn, HWND ow
     const QList<FilterSpec> specs =
         filterSpecs(m_options->nameFilters(), m_options->options() & QFileDialogOptions::HideNameFilterDetails, &totalStringLength);
     const int size = specs.size();
-    wchar_t *ptr = new wchar_t[totalStringLength + 2 * size + 1];
+    auto *ptr = new wchar_t[totalStringLength + 2 * size + 1];
     ofn->lpstrFilter = ptr;
     for (const FilterSpec &spec : specs) {
         ptr += spec.description.toWCharArray(ptr);
@@ -2007,7 +2007,7 @@ QString QWindowsXpFileDialogHelper::selectedNameFilter() const
     \ingroup qt-lighthouse-win
 */
 
-typedef QSharedPointer<QColor> SharedPointerColor;
+using SharedPointerColor = QSharedPointer<QColor>;
 
 #ifdef USE_NATIVE_COLOR_DIALOG
 class QWindowsNativeColorDialog : public QWindowsNativeDialogBase
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
index 6099ea9ac6..8686749011 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
@@ -64,9 +64,9 @@ namespace QWindowsDialogs
 template <class BaseClass>
 class QWindowsDialogHelperBase : public BaseClass
 {
-    Q_DISABLE_COPY(QWindowsDialogHelperBase)
+    Q_DISABLE_COPY_MOVE(QWindowsDialogHelperBase)
 public:
-    typedef QSharedPointer<QWindowsNativeDialogBase> QWindowsNativeDialogBasePtr;
+    using QWindowsNativeDialogBasePtr = QSharedPointer<QWindowsNativeDialogBase>;
     ~QWindowsDialogHelperBase() { cleanupThread(); }
 
     void exec() override;
@@ -75,7 +75,7 @@ public:
               QWindow *parent) override;
     void hide() override;
 
-    virtual bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const { return true; }
+    virtual bool supportsNonModalDialog(const QWindow * /* parent */ = nullptr) const { return true; }
 
 protected:
     QWindowsDialogHelperBase() = default;
@@ -91,7 +91,7 @@ private:
     void cleanupThread();
 
     QWindowsNativeDialogBasePtr m_nativeDialog;
-    HWND m_ownerWindow = 0;
+    HWND m_ownerWindow = nullptr;
     int m_timerId = 0;
     QThread *m_thread = nullptr;
 };
diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp
index 322865b0f3..3e4c93d47a 100644
--- a/src/plugins/platforms/windows/qwindowsdrag.cpp
+++ b/src/plugins/platforms/windows/qwindowsdrag.cpp
@@ -428,7 +428,7 @@ QWindowsOleDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
     if (QWindowsContext::verbose > 1 || result != S_OK) {
         qCDebug(lcQpaMime) << __FUNCTION__ << "fEscapePressed=" << fEscapePressed
             << "grfKeyState=" << grfKeyState << "buttons" << m_currentButtons
-            << "returns 0x" << hex << int(result) << dec;
+            << "returns 0x" << Qt::hex << int(result) << Qt::dec;
     }
     return ResultFromScode(result);
 }
@@ -627,7 +627,7 @@ QWindowsOleDropTarget::Drop(LPDATAOBJECT pDataObj, DWORD grfKeyState,
                 m_chosenEffect = DROPEFFECT_COPY;
             HGLOBAL hData = GlobalAlloc(0, sizeof(DWORD));
             if (hData) {
-                DWORD *moveEffect = reinterpret_cast<DWORD *>(GlobalLock(hData));
+                auto *moveEffect = reinterpret_cast<DWORD *>(GlobalLock(hData));
                 *moveEffect = DROPEFFECT_MOVE;
                 GlobalUnlock(hData);
                 STGMEDIUM medium;
@@ -704,13 +704,13 @@ Qt::DropAction QWindowsDrag::drag(QDrag *drag)
 
     DWORD resultEffect;
     QWindowsDrag::m_canceled = false;
-    QWindowsOleDropSource *windowDropSource = new QWindowsOleDropSource(this);
+    auto *windowDropSource = new QWindowsOleDropSource(this);
     windowDropSource->createCursors();
-    QWindowsDropDataObject *dropDataObject = new QWindowsDropDataObject(dropData);
+    auto *dropDataObject = new QWindowsDropDataObject(dropData);
     const Qt::DropActions possibleActions = drag->supportedActions();
     const DWORD allowedEffects = translateToWinDragEffects(possibleActions);
     qCDebug(lcQpaMime) << '>' << __FUNCTION__ << "possible Actions=0x"
-        << hex << int(possibleActions) << "effects=0x" << allowedEffects << dec;
+        << Qt::hex << int(possibleActions) << "effects=0x" << allowedEffects << Qt::dec;
     // Indicate message handlers we are in DoDragDrop() event loop.
     QWindowsDrag::m_dragging = true;
     const HRESULT r = DoDragDrop(dropDataObject, windowDropSource, allowedEffects, &resultEffect);
@@ -734,9 +734,9 @@ Qt::DropAction QWindowsDrag::drag(QDrag *drag)
     dropDataObject->releaseQt();
     dropDataObject->Release();        // Will delete obj if refcount becomes 0
     windowDropSource->Release();        // Will delete src if refcount becomes 0
-    qCDebug(lcQpaMime) << '<' << __FUNCTION__ << hex << "allowedEffects=0x" << allowedEffects
+    qCDebug(lcQpaMime) << '<' << __FUNCTION__ << Qt::hex << "allowedEffects=0x" << allowedEffects
         << "reportedPerformedEffect=0x" << reportedPerformedEffect
-        <<  " resultEffect=0x" << resultEffect << "hr=0x" << int(r) << dec << "dropAction=" << dragResult;
+        <<  " resultEffect=0x" << resultEffect << "hr=0x" << int(r) << Qt::dec << "dropAction=" << dragResult;
     return dragResult;
 }
 
diff --git a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp
index 063e81150e..e9f3dc5189 100644
--- a/src/plugins/platforms/windows/qwindowseglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp
@@ -469,10 +469,10 @@ bool QWindowsEGLContext::makeCurrent(QPlatformSurface *surface)
 
     QWindowsEGLStaticContext::libEGL.eglBindAPI(m_api);
 
-    QWindowsWindow *window = static_cast<QWindowsWindow *>(surface);
+    auto *window = static_cast<QWindowsWindow *>(surface);
     window->aboutToMakeCurrent();
     int err = 0;
-    EGLSurface eglSurface = static_cast<EGLSurface>(window->surface(m_eglConfig, &err));
+    auto eglSurface = static_cast<EGLSurface>(window->surface(m_eglConfig, &err));
     if (eglSurface == EGL_NO_SURFACE) {
         if (err == EGL_CONTEXT_LOST) {
             m_eglContext = EGL_NO_CONTEXT;
@@ -531,9 +531,9 @@ void QWindowsEGLContext::doneCurrent()
 void QWindowsEGLContext::swapBuffers(QPlatformSurface *surface)
 {
     QWindowsEGLStaticContext::libEGL.eglBindAPI(m_api);
-    QWindowsWindow *window = static_cast<QWindowsWindow *>(surface);
+    auto *window = static_cast<QWindowsWindow *>(surface);
     int err = 0;
-    EGLSurface eglSurface = static_cast<EGLSurface>(window->surface(m_eglConfig, &err));
+    auto eglSurface = static_cast<EGLSurface>(window->surface(m_eglConfig, &err));
     if (eglSurface == EGL_NO_SURFACE) {
         if (err == EGL_CONTEXT_LOST) {
             m_eglContext = EGL_NO_CONTEXT;
diff --git a/src/plugins/platforms/windows/qwindowseglcontext.h b/src/plugins/platforms/windows/qwindowseglcontext.h
index 8a1e1ddae8..d96e266159 100644
--- a/src/plugins/platforms/windows/qwindowseglcontext.h
+++ b/src/plugins/platforms/windows/qwindowseglcontext.h
@@ -109,7 +109,7 @@ private:
 
 class QWindowsEGLStaticContext : public QWindowsStaticOpenGLContext
 {
-    Q_DISABLE_COPY(QWindowsEGLStaticContext)
+    Q_DISABLE_COPY_MOVE(QWindowsEGLStaticContext)
 
 public:
     static QWindowsEGLStaticContext *create(QWindowsOpenGLTester::Renderers preferredType);
diff --git a/src/plugins/platforms/windows/qwindowsgdinativeinterface.cpp b/src/plugins/platforms/windows/qwindowsgdinativeinterface.cpp
index 08e11c5e39..f2418b0e60 100644
--- a/src/plugins/platforms/windows/qwindowsgdinativeinterface.cpp
+++ b/src/plugins/platforms/windows/qwindowsgdinativeinterface.cpp
@@ -50,7 +50,7 @@ void *QWindowsGdiNativeInterface::nativeResourceForBackingStore(const QByteArray
         qWarning("%s: '%s' requested for null backingstore or backingstore without handle.", __FUNCTION__, resource.constData());
         return nullptr;
     }
-    QWindowsBackingStore *wbs = static_cast<QWindowsBackingStore *>(bs->handle());
+    auto *wbs = static_cast<QWindowsBackingStore *>(bs->handle());
     if (resource == "getDC")
         return wbs->getDC();
     qWarning("%s: Invalid key '%s' requested.", __FUNCTION__, resource.constData());
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
index 50f528e7fc..8bf88300e9 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp
@@ -243,7 +243,7 @@ QDebug operator<<(QDebug d, const PIXELFORMATDESCRIPTOR &pd)
     QDebugStateSaver saver(d);
     d.nospace();
     d << "PIXELFORMATDESCRIPTOR "
-        << "dwFlags=" << hex << showbase << pd.dwFlags << dec << noshowbase;
+        << "dwFlags=" << Qt::hex << Qt::showbase << pd.dwFlags << Qt::dec << Qt::noshowbase;
     if (pd.dwFlags & PFD_DRAW_TO_WINDOW) d << " PFD_DRAW_TO_WINDOW";
     if (pd.dwFlags & PFD_DRAW_TO_BITMAP) d << " PFD_DRAW_TO_BITMAP";
     if (pd.dwFlags & PFD_SUPPORT_GDI) d << " PFD_SUPPORT_GDI";
@@ -631,10 +631,10 @@ static int choosePixelFormat(HDC hdc,
         nsp << __FUNCTION__;
         if (sampleBuffersRequested)
             nsp << " samples=" << iAttributes[samplesValuePosition];
-        nsp << " Attributes: " << hex << showbase;
+        nsp << " Attributes: " << Qt::hex << Qt::showbase;
         for (int ii = 0; ii < i; ++ii)
             nsp << iAttributes[ii] << ',';
-        nsp << noshowbase << dec << "\n    obtained px #" << pixelFormat
+        nsp << Qt::noshowbase << Qt::dec << "\n    obtained px #" << pixelFormat
             << " of " << numFormats << "\n    " << *obtainedPfd;
         qCDebug(lcQpaGl) << message;
     } // Debug
@@ -784,7 +784,7 @@ static HGLRC createContext(const QOpenGLStaticContext &staticContext,
     if (!result) {
         QString message;
         QDebug(&message).nospace() << __FUNCTION__ << ": wglCreateContextAttribsARB() failed (GL error code: 0x"
-            << hex << staticContext.opengl32.glGetError() << dec << ") for format: " << format << ", shared context: " << shared;
+            << Qt::hex << staticContext.opengl32.glGetError() << Qt::dec << ") for format: " << format << ", shared context: " << shared;
         qErrnoWarning("%s", qPrintable(message));
     }
     return result;
@@ -912,7 +912,7 @@ void QWindowsOpenGLContextFormat::apply(QSurfaceFormat *format) const
 
 class QOpenGLTemporaryContext
 {
-    Q_DISABLE_COPY(QOpenGLTemporaryContext)
+    Q_DISABLE_COPY_MOVE(QOpenGLTemporaryContext)
 public:
     QOpenGLTemporaryContext();
     ~QOpenGLTemporaryContext();
@@ -1028,7 +1028,7 @@ QOpenGLStaticContext *QOpenGLStaticContext::create(bool softwareRendering)
     QScopedPointer<QOpenGLTemporaryContext> temporaryContext;
     if (!QOpenGLStaticContext::opengl32.wglGetCurrentContext())
         temporaryContext.reset(new QOpenGLTemporaryContext);
-    QOpenGLStaticContext *result = new QOpenGLStaticContext;
+    auto *result = new QOpenGLStaticContext;
     qCDebug(lcQpaGl) << __FUNCTION__ << *result;
     return result;
 }
@@ -1070,7 +1070,7 @@ QWindowsGLContext::QWindowsGLContext(QOpenGLStaticContext *staticContext,
             qWarning("QWindowsGLContext: Requires a QWGLNativeContext");
             return;
         }
-        QWGLNativeContext handle = nativeHandle.value<QWGLNativeContext>();
+        auto handle = nativeHandle.value<QWGLNativeContext>();
         HGLRC wglcontext = handle.context();
         HWND wnd = handle.window();
         if (!wglcontext || !wnd) {
@@ -1308,7 +1308,7 @@ bool QWindowsGLContext::makeCurrent(QPlatformSurface *surface)
     Q_ASSERT(surface->surface()->supportsOpenGL());
 
     // Do we already have a DC entry for that window?
-    QWindowsWindow *window = static_cast<QWindowsWindow *>(surface);
+    auto *window = static_cast<QWindowsWindow *>(surface);
     window->aboutToMakeCurrent();
     const HWND hwnd = window->handle();
     if (const QOpenGLContextData *contextData = findByHWND(m_windowContexts, hwnd)) {
@@ -1377,7 +1377,7 @@ QFunctionPointer QWindowsGLContext::getProcAddress(const char *procName)
     // Even though we use QFunctionPointer, it does not mean the function can be called.
     // It will need to be cast to the proper function type with the correct calling
     // convention. QFunctionPointer is nothing more than a glorified void* here.
-    QFunctionPointer procAddress = reinterpret_cast<QFunctionPointer>(QOpenGLStaticContext::opengl32.wglGetProcAddress(procName));
+    auto procAddress = reinterpret_cast<QFunctionPointer>(QOpenGLStaticContext::opengl32.wglGetProcAddress(procName));
 
     // We support AllGLFunctionsQueryable, which means this function must be able to
     // return a function pointer even for functions that are in GL.h and exported
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h
index 00e4d323a6..8b0c33f7d5 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.h
+++ b/src/plugins/platforms/windows/qwindowsglcontext.h
@@ -75,9 +75,9 @@ struct QOpenGLContextData
     QOpenGLContextData(HGLRC r, HWND h, HDC d) : renderingContext(r), hwnd(h), hdc(d) {}
     QOpenGLContextData() {}
 
-    HGLRC renderingContext = 0;
-    HWND hwnd = 0;
-    HDC hdc = 0;
+    HGLRC renderingContext = nullptr;
+    HWND hwnd = nullptr;
+    HDC hdc = nullptr;
 };
 
 class QOpenGLStaticContext;
@@ -89,7 +89,7 @@ struct QWindowsOpenGLContextFormat
 
     QSurfaceFormat::OpenGLContextProfile profile = QSurfaceFormat::NoProfile;
     int version = 0; //! majorVersion<<8 + minorVersion
-    QSurfaceFormat::FormatOptions options = 0;
+    QSurfaceFormat::FormatOptions options = nullptr;
 };
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -134,7 +134,7 @@ private:
 
 class QOpenGLStaticContext : public QWindowsStaticOpenGLContext
 {
-    Q_DISABLE_COPY(QOpenGLStaticContext)
+    Q_DISABLE_COPY_MOVE(QOpenGLStaticContext)
     QOpenGLStaticContext();
 public:
     enum Extensions
@@ -223,7 +223,7 @@ private:
     typedef GLenum (APIENTRY *GlGetGraphicsResetStatusArbType)();
 
     inline void releaseDCs();
-    bool updateObtainedParams(HDC hdc, int *obtainedSwapInterval = 0);
+    bool updateObtainedParams(HDC hdc, int *obtainedSwapInterval = nullptr);
 
     QOpenGLStaticContext *m_staticContext;
     QOpenGLContext *m_context;
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
index 8054f9fe83..d5258ca6a3 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
@@ -664,9 +664,9 @@ void QWindowsInputContext::handleInputLanguageChanged(WPARAM wparam, LPARAM lpar
     m_locale = qt_localeFromLCID(m_languageId);
     emitLocaleChanged();
 
-    qCDebug(lcQpaInputMethods) << __FUNCTION__ << hex << showbase
+    qCDebug(lcQpaInputMethods) << __FUNCTION__ << Qt::hex << Qt::showbase
         << oldLanguageId  << "->" << newLanguageId << "Character set:"
-        << DWORD(wparam) << dec << noshowbase << m_locale;
+        << DWORD(wparam) << Qt::dec << Qt::noshowbase << m_locale;
 }
 
 /*!
@@ -724,7 +724,7 @@ int QWindowsInputContext::reconvertString(RECONVERTSTRING *reconv)
     reconv->dwCompStrOffset = DWORD(startPos) * sizeof(ushort); // byte count.
     reconv->dwTargetStrLen = reconv->dwCompStrLen;
     reconv->dwTargetStrOffset = reconv->dwCompStrOffset;
-    ushort *pastReconv = reinterpret_cast<ushort *>(reconv + 1);
+    auto *pastReconv = reinterpret_cast<ushort *>(reconv + 1);
     std::copy(surroundingText.utf16(), surroundingText.utf16() + surroundingText.size(),
               QT_MAKE_UNCHECKED_ARRAY_ITERATOR(pastReconv));
     return memSize;
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h
index a47585c29e..857706bcb9 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.h
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.h
@@ -53,12 +53,12 @@ class QWindowsWindow;
 
 class QWindowsInputContext : public QPlatformInputContext
 {
-    Q_DISABLE_COPY(QWindowsInputContext)
+    Q_DISABLE_COPY_MOVE(QWindowsInputContext)
     Q_OBJECT
 
     struct CompositionContext
     {
-        HWND hwnd = 0;
+        HWND hwnd = nullptr;
         QString composition;
         int position = 0;
         bool isComposing = false;
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 5c1fa00088..eccf1c4928 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -133,7 +133,7 @@ QT_BEGIN_NAMESPACE
 
 struct QWindowsIntegrationPrivate
 {
-    Q_DISABLE_COPY(QWindowsIntegrationPrivate)
+    Q_DISABLE_COPY_MOVE(QWindowsIntegrationPrivate)
     explicit QWindowsIntegrationPrivate(const QStringList &paramList);
     ~QWindowsIntegrationPrivate();
 
@@ -217,6 +217,8 @@ static inline unsigned parseOptions(const QStringList &paramList,
             options |= QWindowsIntegration::NoNativeMenus;
         } else if (param == QLatin1String("nowmpointer")) {
             options |= QWindowsIntegration::DontUseWMPointer;
+        } else if (param == QLatin1String("reverse")) {
+            options |= QWindowsIntegration::RtlEnabled;
         } else {
             qWarning() << "Unknown option" << param;
         }
@@ -322,9 +324,9 @@ bool QWindowsIntegration::hasCapability(QPlatformIntegration::Capability cap) co
 QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) const
 {
     if (window->type() == Qt::Desktop) {
-        QWindowsDesktopWindow *result = new QWindowsDesktopWindow(window);
+        auto *result = new QWindowsDesktopWindow(window);
         qCDebug(lcQpaWindows) << "Desktop window:" << window
-            << showbase << hex << result->winId() << noshowbase << dec << result->geometry();
+            << Qt::showbase << Qt::hex << result->winId() << Qt::noshowbase << Qt::dec << result->geometry();
         return result;
     }
 
@@ -369,15 +371,15 @@ QPlatformWindow *QWindowsIntegration::createForeignWindow(QWindow *window, WId n
        qWarning("Windows QPA: Invalid foreign window ID %p.", hwnd);
        return nullptr;
     }
-    QWindowsForeignWindow *result = new QWindowsForeignWindow(window, hwnd);
+    auto *result = new QWindowsForeignWindow(window, hwnd);
     const QRect obtainedGeometry = result->geometry();
     QScreen *screen = nullptr;
     if (const QPlatformScreen *pScreen = result->screenForGeometry(obtainedGeometry))
         screen = pScreen->screen();
     if (screen && screen != window->screen())
         window->setScreen(screen);
-    qCDebug(lcQpaWindows) << "Foreign window:" << window << showbase << hex
-        << result->winId() << noshowbase << dec << obtainedGeometry << screen;
+    qCDebug(lcQpaWindows) << "Foreign window:" << window << Qt::showbase << Qt::hex
+        << result->winId() << Qt::noshowbase << Qt::dec << obtainedGeometry << screen;
     return result;
 }
 
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h
index e28b2c2fb3..b49d21022b 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.h
+++ b/src/plugins/platforms/windows/qwindowsintegration.h
@@ -54,7 +54,7 @@ class QWindowsStaticOpenGLContext;
 
 class QWindowsIntegration : public QPlatformIntegration
 {
-    Q_DISABLE_COPY(QWindowsIntegration)
+    Q_DISABLE_COPY_MOVE(QWindowsIntegration)
 public:
     enum Options { // Options to be passed on command line.
         FontDatabaseFreeType = 0x1,
@@ -69,7 +69,8 @@ public:
         AlwaysUseNativeMenus = 0x100,
         NoNativeMenus = 0x200,
         DontUseWMPointer = 0x400,
-        DetectAltGrModifier = 0x800
+        DetectAltGrModifier = 0x800,
+        RtlEnabled = 0x1000
     };
 
     explicit QWindowsIntegration(const QStringList &paramList);
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
index da630005d6..4f0f846749 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
@@ -100,7 +100,7 @@ QWindowsKeyMapper::QWindowsKeyMapper()
     : m_useRTLExtensions(false), m_keyGrabber(nullptr)
 {
     memset(keyLayout, 0, sizeof(keyLayout));
-    QGuiApplication *app = static_cast<QGuiApplication *>(QGuiApplication::instance());
+    auto *app = static_cast<QGuiApplication *>(QGuiApplication::instance());
     QObject::connect(app, &QGuiApplication::applicationStateChanged,
                      app, clearKeyRecorderOnApplicationInActive);
     changeKeyboard();
@@ -554,7 +554,7 @@ QDebug operator<<(QDebug d, const KeyboardLayoutItem &k)
             if (const quint32 qtKey = k.qtKey[i]) {
                 d << '[' << i << ' ';
                 QtDebugUtils::formatQFlags(d, ModsTbl[i]);
-                d << ' ' << hex << showbase << qtKey << dec << noshowbase << ' ';
+                d << ' ' << Qt::hex << Qt::showbase << qtKey << Qt::dec << Qt::noshowbase << ' ';
                 QtDebugUtils::formatQEnum(d, Qt::Key(qtKey));
                 if (qtKey >= 32 && qtKey < 128)
                     d << " '" << char(qtKey)  << '\'';
@@ -776,7 +776,7 @@ void QWindowsKeyMapper::updatePossibleKeyCodes(unsigned char *kbdBuffer, quint32
         ::ToAscii(vk_key, scancode, kbdBuffer, reinterpret_cast<LPWORD>(&buffer), 0);
     }
     qCDebug(lcQpaEvents) << __FUNCTION__ << "for virtual key="
-        << hex << showbase << vk_key << dec << noshowbase << keyLayout[vk_key];
+        << Qt::hex << Qt::showbase << vk_key << Qt::dec << Qt::noshowbase << keyLayout[vk_key];
 }
 
 static inline QString messageKeyText(const MSG &msg)
@@ -950,7 +950,7 @@ bool QWindowsKeyMapper::translateKeyEventInternal(QWindow *window, MSG msg,
     const UINT msgType = msg.message;
 
     const quint32 scancode = (msg.lParam >> 16) & scancodeBitmask;
-    quint32 vk_key = quint32(msg.wParam);
+    auto vk_key = quint32(msg.wParam);
     quint32 nModifiers = 0;
 
     QWindow *receiver = m_keyGrabber ? m_keyGrabber : window;
@@ -1182,7 +1182,7 @@ bool QWindowsKeyMapper::translateKeyEventInternal(QWindow *window, MSG msg,
         // results, if we map this virtual key-code directly (for eg '?' US layouts). So try
         // to find the correct key using the current message parameters & keyboard state.
         if (uch.isNull() && msgType == WM_IME_KEYDOWN) {
-            const QWindowsInputContext *windowsInputContext =
+            const auto *windowsInputContext =
                 qobject_cast<const QWindowsInputContext *>(QWindowsIntegration::instance()->inputContext());
             if (!(windowsInputContext && windowsInputContext->isComposing()))
                 vk_key = ImmGetVirtualKey(reinterpret_cast<HWND>(window->winId()));
@@ -1400,7 +1400,7 @@ QList<int> QWindowsKeyMapper::possibleKeys(const QKeyEvent *e) const
         }
     }
     qCDebug(lcQpaEvents) << __FUNCTION__  << e << "nativeVirtualKey="
-        << showbase << hex << e->nativeVirtualKey() << dec << noshowbase
+        << Qt::showbase << Qt::hex << e->nativeVirtualKey() << Qt::dec << Qt::noshowbase
         << e->modifiers() << kbItem << "\n  returns" << formatKeys(result);
     return result;
 }
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.h b/src/plugins/platforms/windows/qwindowskeymapper.h
index a454f0f973..b1ada1d373 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.h
+++ b/src/plugins/platforms/windows/qwindowskeymapper.h
@@ -71,7 +71,7 @@ struct KeyboardLayoutItem {
 
 class QWindowsKeyMapper
 {
-    Q_DISABLE_COPY(QWindowsKeyMapper)
+    Q_DISABLE_COPY_MOVE(QWindowsKeyMapper)
 public:
     explicit QWindowsKeyMapper();
     ~QWindowsKeyMapper();
diff --git a/src/plugins/platforms/windows/qwindowsmenu.cpp b/src/plugins/platforms/windows/qwindowsmenu.cpp
index 5a92a7cf90..d20edd685e 100644
--- a/src/plugins/platforms/windows/qwindowsmenu.cpp
+++ b/src/plugins/platforms/windows/qwindowsmenu.cpp
@@ -518,7 +518,7 @@ QWindowsMenu::~QWindowsMenu()
 void QWindowsMenu::insertMenuItem(QPlatformMenuItem *menuItemIn, QPlatformMenuItem *before)
 {
     qCDebug(lcQpaMenus) << __FUNCTION__ << '(' << menuItemIn << ", before=" << before << ')' << this;
-    QWindowsMenuItem *menuItem = static_cast<QWindowsMenuItem *>(menuItemIn);
+    auto *menuItem = static_cast<QWindowsMenuItem *>(menuItemIn);
     const int index = insertBefore(&m_menuItems, menuItemIn, before);
     const bool append = index == m_menuItems.size() - 1;
     menuItem->insertIntoMenu(this, append, index);
@@ -689,7 +689,7 @@ void QWindowsPopupMenu::showPopup(const QWindow *parentWindow, const QRect &targ
                                   const QPlatformMenuItem *item)
 {
     qCDebug(lcQpaMenus) << __FUNCTION__ << '>' << this << parentWindow << targetRect << item;
-    const QWindowsBaseWindow *window = static_cast<const QWindowsBaseWindow *>(parentWindow->handle());
+    const auto *window = static_cast<const QWindowsBaseWindow *>(parentWindow->handle());
     const QPoint globalPos = window->mapToGlobal(targetRect.topLeft());
     trackPopupMenu(window->handle(), globalPos.x(), globalPos.y());
 }
@@ -756,7 +756,7 @@ QWindowsMenuBar::~QWindowsMenuBar()
 void QWindowsMenuBar::insertMenu(QPlatformMenu *menuIn, QPlatformMenu *before)
 {
     qCDebug(lcQpaMenus) << __FUNCTION__ << menuIn << "before=" << before;
-    QWindowsMenu *menu = static_cast<QWindowsMenu *>(menuIn);
+    auto *menu = static_cast<QWindowsMenu *>(menuIn);
     const int index = insertBefore(&m_menus, menuIn, before);
     menu->insertIntoMenuBar(this, index == m_menus.size() - 1, index);
 }
@@ -784,7 +784,7 @@ void QWindowsMenuBar::handleReparent(QWindow *newParentWindow)
     if (QPlatformWindow *platWin = newParentWindow->handle())
         install(static_cast<QWindowsWindow *>(platWin));
     else // Store for later creation, see menuBarOf()
-        newParentWindow->setProperty(menuBarPropertyName, qVariantFromValue<QObject *>(this));
+        newParentWindow->setProperty(menuBarPropertyName, QVariant::fromValue<QObject *>(this));
 }
 
 QWindowsMenuBar *QWindowsMenuBar::menuBarOf(const QWindow *notYetCreatedWindow)
@@ -896,8 +896,8 @@ void QWindowsMenuItem::formatDebug(QDebug &d) const
         d << ", parentMenu=" << static_cast<const void *>(m_parentMenu);
     if (m_subMenu)
         d << ", subMenu=" << static_cast<const void *>(m_subMenu);
-    d << ", tag=" << showbase << hex
-      << tag() << noshowbase << dec << ", id=" << m_id;
+    d << ", tag=" << Qt::showbase << Qt::hex
+      << tag() << Qt::noshowbase << Qt::dec << ", id=" << m_id;
 #if QT_CONFIG(shortcut)
     if (!m_shortcut.isEmpty())
         d << ", shortcut=" << m_shortcut;
@@ -933,7 +933,7 @@ void QWindowsMenu::formatDebug(QDebug &d) const
     if (m_parentMenu != nullptr)
         d << " [on menu]";
     if (tag())
-        d << ", tag=" << showbase << hex << tag() << noshowbase << dec;
+        d << ", tag=" << Qt::showbase << Qt::hex << tag() << Qt::noshowbase << Qt::dec;
     if (m_visible)
         d << " [visible]";
     if (m_enabled)
diff --git a/src/plugins/platforms/windows/qwindowsmenu.h b/src/plugins/platforms/windows/qwindowsmenu.h
index 6de1553f35..aa36846ec0 100644
--- a/src/plugins/platforms/windows/qwindowsmenu.h
+++ b/src/plugins/platforms/windows/qwindowsmenu.h
@@ -120,7 +120,7 @@ class QWindowsMenu : public QPlatformMenu
 {
     Q_OBJECT
 public:
-    typedef QVector<QWindowsMenuItem *> MenuItems;
+    using MenuItems = QVector<QWindowsMenuItem *>;
 
     QWindowsMenu();
     ~QWindowsMenu();
@@ -196,7 +196,7 @@ class QWindowsMenuBar : public QPlatformMenuBar
 {
     Q_OBJECT
 public:
-    typedef QVector<QWindowsMenu *> Menus;
+    using Menus = QVector<QWindowsMenu *>;
 
     QWindowsMenuBar();
     ~QWindowsMenuBar() override;
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index 030d8d1e0f..b9d8b191f5 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -178,7 +178,7 @@ static bool qt_write_dibv5(QDataStream &s, QImage image)
     if (image.format() != QImage::Format_ARGB32)
         image = image.convertToFormat(QImage::Format_ARGB32);
 
-    uchar *buf = new uchar[bpl_bmp];
+    auto *buf = new uchar[bpl_bmp];
 
     memset(buf, 0, size_t(bpl_bmp));
     for (int y=image.height()-1; y>=0; y--) {
@@ -264,7 +264,7 @@ static bool qt_read_dibv5(QDataStream &s, QImage &image)
     const int  bpl = image.bytesPerLine();
     uchar *data = image.bits();
 
-    uchar *buf24 = new uchar[bpl];
+    auto *buf24 = new uchar[bpl];
     const int bpl24 = ((w * nbits + 31) / 32) * 4;
 
     while (--h >= 0) {
@@ -286,7 +286,7 @@ static bool qt_read_dibv5(QDataStream &s, QImage &image)
 
     if (bi.bV5Height < 0) {
         // Flip the image
-        uchar *buf = new uchar[bpl];
+        auto *buf = new uchar[bpl];
         h = -bi.bV5Height;
         for (int y = 0; y < h/2; ++y) {
             memcpy(buf, data + y * bpl, size_t(bpl));
@@ -772,16 +772,16 @@ bool QWindowsMimeURI::convertFromMime(const FORMATETC &formatetc, const QMimeDat
             }
 
             QByteArray result(size, '\0');
-            DROPFILES* d = reinterpret_cast<DROPFILES *>(result.data());
+            auto* d = reinterpret_cast<DROPFILES *>(result.data());
             d->pFiles = sizeof(DROPFILES);
             GetCursorPos(&d->pt); // try
             d->fNC = true;
             char *files = (reinterpret_cast<char*>(d)) + d->pFiles;
 
             d->fWide = true;
-            wchar_t *f = reinterpret_cast<wchar_t *>(files);
+            auto *f = reinterpret_cast<wchar_t *>(files);
             for (int i=0; i<fileNames.size(); i++) {
-                const size_t l = size_t(fileNames.at(i).length());
+                const auto l = size_t(fileNames.at(i).length());
                 memcpy(f, fileNames.at(i).utf16(), l * sizeof(ushort));
                 f += l;
                 *f++ = 0;
@@ -852,9 +852,9 @@ QVariant QWindowsMimeURI::convertToMime(const QString &mimeType, LPDATAOBJECT pD
             if (data.isEmpty())
                 return QVariant();
 
-            const DROPFILES *hdrop = reinterpret_cast<const DROPFILES *>(data.constData());
+            const auto *hdrop = reinterpret_cast<const DROPFILES *>(data.constData());
             if (hdrop->fWide) {
-                const wchar_t *filesw = reinterpret_cast<const wchar_t *>(data.constData() + hdrop->pFiles);
+                const auto *filesw = reinterpret_cast<const wchar_t *>(data.constData() + hdrop->pFiles);
                 int i = 0;
                 while (filesw[i]) {
                     QString fileurl = QString::fromWCharArray(filesw + i);
@@ -1055,7 +1055,7 @@ QVector<FORMATETC> QWindowsMimeImage::formatsForMime(const QString &mimeType, co
     QVector<FORMATETC> formatetcs;
     if (mimeData->hasImage() && mimeType == QLatin1String("application/x-qt-image")) {
         //add DIBV5 if image has alpha channel. Do not add CF_PNG here as it will confuse MS Office (QTBUG47656).
-        QImage image = qvariant_cast<QImage>(mimeData->imageData());
+        auto image = qvariant_cast<QImage>(mimeData->imageData());
         if (!image.isNull() && image.hasAlphaChannel())
             formatetcs += setCf(CF_DIBV5);
         formatetcs += setCf(CF_DIB);
@@ -1097,7 +1097,7 @@ bool QWindowsMimeImage::convertFromMime(const FORMATETC &formatetc, const QMimeD
 {
     int cf = getCf(formatetc);
     if ((cf == CF_DIB || cf == CF_DIBV5 || cf == int(CF_PNG)) && mimeData->hasImage()) {
-        QImage img = qvariant_cast<QImage>(mimeData->imageData());
+        auto img = qvariant_cast<QImage>(mimeData->imageData());
         if (img.isNull())
             return false;
         QByteArray ba;
diff --git a/src/plugins/platforms/windows/qwindowsmime.h b/src/plugins/platforms/windows/qwindowsmime.h
index 6bbbae1a0e..1c389e8800 100644
--- a/src/plugins/platforms/windows/qwindowsmime.h
+++ b/src/plugins/platforms/windows/qwindowsmime.h
@@ -53,7 +53,7 @@ class QMimeData;
 
 class QWindowsMime
 {
-    Q_DISABLE_COPY(QWindowsMime)
+    Q_DISABLE_COPY_MOVE(QWindowsMime)
 public:
     QWindowsMime();
     virtual ~QWindowsMime();
@@ -73,7 +73,7 @@ public:
 
 class QWindowsMimeConverter
 {
-    Q_DISABLE_COPY(QWindowsMimeConverter)
+    Q_DISABLE_COPY_MOVE(QWindowsMimeConverter)
 public:
     QWindowsMimeConverter();
     ~QWindowsMimeConverter();
@@ -85,7 +85,7 @@ public:
 
     // Convenience.
     QVariant convertToMime(const QStringList &mimeTypes, IDataObject *pDataObj, QVariant::Type preferredType,
-                           QString *format = 0) const;
+                           QString *format = nullptr) const;
 
     void registerMime(QWindowsMime *mime);
     void unregisterMime(QWindowsMime *mime) { m_mimes.removeOne(mime); }
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp
index e33591c33d..6df5e6aa27 100644
--- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp
+++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp
@@ -106,7 +106,7 @@ static inline void compressMouseMove(MSG *msg)
                 // Extract the x,y coordinates from the lParam as we do in the WndProc
                 msg->pt.x = GET_X_LPARAM(mouseMsg.lParam);
                 msg->pt.y = GET_Y_LPARAM(mouseMsg.lParam);
-                ClientToScreen(msg->hwnd, &(msg->pt));
+                clientToScreen(msg->hwnd, &(msg->pt));
                 // Remove the mouse move message
                 PeekMessage(&mouseMsg, msg->hwnd, WM_MOUSEMOVE,
                             WM_MOUSEMOVE, PM_REMOVE);
@@ -124,10 +124,10 @@ static inline QTouchDevice *createTouchDevice()
         return nullptr;
     const int tabletPc = GetSystemMetrics(SM_TABLETPC);
     const int maxTouchPoints = GetSystemMetrics(SM_MAXIMUMTOUCHES);
-    qCDebug(lcQpaEvents) << "Digitizers:" << hex << showbase << (digitizers & ~NID_READY)
-        << "Ready:" << (digitizers & NID_READY) << dec << noshowbase
+    qCDebug(lcQpaEvents) << "Digitizers:" << Qt::hex << Qt::showbase << (digitizers & ~NID_READY)
+        << "Ready:" << (digitizers & NID_READY) << Qt::dec << Qt::noshowbase
         << "Tablet PC:" << tabletPc << "Max touch points:" << maxTouchPoints;
-    QTouchDevice *result = new QTouchDevice;
+    auto *result = new QTouchDevice;
     result->setType(digitizers & NID_INTEGRATED_TOUCH
                     ? QTouchDevice::TouchScreen : QTouchDevice::TouchPad);
     QTouchDevice::Capabilities capabilities = QTouchDevice::Position | QTouchDevice::Area | QTouchDevice::NormalizedPosition;
@@ -268,7 +268,13 @@ bool QWindowsMouseHandler::translateMouseEvent(QWindow *window, HWND hwnd,
     if (et == QtWindows::MouseWheelEvent)
         return translateMouseWheelEvent(window, hwnd, msg, result);
 
-    const QPoint winEventPosition(GET_X_LPARAM(msg.lParam), GET_Y_LPARAM(msg.lParam));
+    QPoint winEventPosition(GET_X_LPARAM(msg.lParam), GET_Y_LPARAM(msg.lParam));
+    if ((et & QtWindows::NonClientEventFlag) == 0 && QWindowsBaseWindow::isRtlLayout(hwnd))  {
+        RECT clientArea;
+        GetClientRect(hwnd, &clientArea);
+        winEventPosition.setX(clientArea.right - winEventPosition.x());
+    }
+
     QPoint clientPosition;
     QPoint globalPosition;
     if (et & QtWindows::NonClientEventFlag) {
@@ -300,7 +306,7 @@ bool QWindowsMouseHandler::translateMouseEvent(QWindow *window, HWND hwnd,
     // However, when tablet support is active, extraInfo is a packet serial number. This is not a problem
     // since we do not want to ignore mouse events coming from a tablet.
     // See https://msdn.microsoft.com/en-us/library/windows/desktop/ms703320.aspx
-    const quint64 extraInfo = quint64(GetMessageExtraInfo());
+    const auto extraInfo = quint64(GetMessageExtraInfo());
     if ((extraInfo & signatureMask) == miWpSignature) {
         if (extraInfo & 0x80) { // Bit 7 indicates touch event, else tablet pen.
             source = Qt::MouseEventSynthesizedBySystem;
@@ -364,7 +370,7 @@ bool QWindowsMouseHandler::translateMouseEvent(QWindow *window, HWND hwnd,
         return true;
     }
 
-    QWindowsWindow *platformWindow = static_cast<QWindowsWindow *>(window->handle());
+    auto *platformWindow = static_cast<QWindowsWindow *>(window->handle());
 
     // If the window was recently resized via mouse doubleclick on the frame or title bar,
     // we don't get WM_LBUTTONDOWN or WM_LBUTTONDBLCLK for the second click,
@@ -603,8 +609,8 @@ bool QWindowsMouseHandler::translateTouchEvent(QWindow *window, HWND,
                                                QtWindows::WindowsEventType,
                                                MSG msg, LRESULT *)
 {
-    typedef QWindowSystemInterface::TouchPoint QTouchPoint;
-    typedef QList<QWindowSystemInterface::TouchPoint> QTouchPointList;
+    using QTouchPoint = QWindowSystemInterface::TouchPoint;
+    using QTouchPointList = QList<QWindowSystemInterface::TouchPoint>;
 
     if (!QWindowsContext::instance()->initTouch()) {
         qWarning("Unable to initialize touch handling.");
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.h b/src/plugins/platforms/windows/qwindowsmousehandler.h
index 5fe4b09c1e..1d3d1f4761 100644
--- a/src/plugins/platforms/windows/qwindowsmousehandler.h
+++ b/src/plugins/platforms/windows/qwindowsmousehandler.h
@@ -54,7 +54,7 @@ class QTouchDevice;
 
 class QWindowsMouseHandler
 {
-    Q_DISABLE_COPY(QWindowsMouseHandler)
+    Q_DISABLE_COPY_MOVE(QWindowsMouseHandler)
 public:
     QWindowsMouseHandler();
 
@@ -79,7 +79,7 @@ public:
 
     static Qt::MouseButtons queryMouseButtons();
     QWindow *windowUnderMouse() const { return m_windowUnderMouse.data(); }
-    void clearWindowUnderMouse() { m_windowUnderMouse = 0; }
+    void clearWindowUnderMouse() { m_windowUnderMouse = nullptr; }
     void clearEvents();
 
 private:
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
index 9003e94c56..d1d181d66e 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
@@ -40,6 +40,7 @@
 #include "qwindowsnativeinterface.h"
 #include "qwindowsclipboard.h"
 #include "qwindowswindow.h"
+#include "qwindowsscreen.h"
 #include "qwindowscontext.h"
 #include "qwindowscursor.h"
 #include "qwindowsopenglcontext.h"
@@ -97,7 +98,7 @@ void *QWindowsNativeInterface::nativeResourceForWindow(const QByteArray &resourc
         qWarning("%s: '%s' requested for null window or window without handle.", __FUNCTION__, resource.constData());
         return nullptr;
     }
-    QWindowsWindow *bw = static_cast<QWindowsWindow *>(window->handle());
+    auto *bw = static_cast<QWindowsWindow *>(window->handle());
     int type = resourceType(resource);
     if (type == HandleType)
         return bw->handle();
@@ -124,6 +125,21 @@ void *QWindowsNativeInterface::nativeResourceForWindow(const QByteArray &resourc
     return nullptr;
 }
 
+void *QWindowsNativeInterface::nativeResourceForScreen(const QByteArray &resource, QScreen *screen)
+{
+    if (!screen || !screen->handle()) {
+        qWarning("%s: '%s' requested for null screen or screen without handle.", __FUNCTION__, resource.constData());
+        return nullptr;
+    }
+    auto *bs = static_cast<QWindowsScreen *>(screen->handle());
+    int type = resourceType(resource);
+    if (type == HandleType)
+        return bs->handle();
+
+    qWarning("%s: Invalid key '%s' requested.", __FUNCTION__, resource.constData());
+    return nullptr;
+}
+
 #ifndef QT_NO_CURSOR
 void *QWindowsNativeInterface::nativeResourceForCursor(const QByteArray &resource, const QCursor &cursor)
 {
@@ -141,9 +157,9 @@ static const char customMarginPropertyC[] = "WindowsCustomMargins";
 
 QVariant QWindowsNativeInterface::windowProperty(QPlatformWindow *window, const QString &name) const
 {
-    QWindowsWindow *platformWindow = static_cast<QWindowsWindow *>(window);
+    auto *platformWindow = static_cast<QWindowsWindow *>(window);
     if (name == QLatin1String(customMarginPropertyC))
-        return qVariantFromValue(platformWindow->customMargins());
+        return QVariant::fromValue(platformWindow->customMargins());
     return QVariant();
 }
 
@@ -155,7 +171,7 @@ QVariant QWindowsNativeInterface::windowProperty(QPlatformWindow *window, const
 
 void QWindowsNativeInterface::setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value)
 {
-    QWindowsWindow *platformWindow = static_cast<QWindowsWindow *>(window);
+    auto *platformWindow = static_cast<QWindowsWindow *>(window);
     if (name == QLatin1String(customMarginPropertyC))
         platformWindow->setCustomMargins(qvariant_cast<QMargins>(value));
 }
@@ -190,7 +206,7 @@ void *QWindowsNativeInterface::nativeResourceForContext(const QByteArray &resour
         return nullptr;
     }
 
-    QWindowsOpenGLContext *glcontext = static_cast<QWindowsOpenGLContext *>(context->handle());
+    auto *glcontext = static_cast<QWindowsOpenGLContext *>(context->handle());
     switch (resourceType(resource)) {
     case RenderingContextType: // Fall through.
     case EglContextType:
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.h b/src/plugins/platforms/windows/qwindowsnativeinterface.h
index e6f8aae8fb..ce395dc5a4 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.h
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.h
@@ -74,6 +74,7 @@ public:
     void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) override;
 #endif
     void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) override;
+    void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen) override;
 #ifndef QT_NO_CURSOR
     void *nativeResourceForCursor(const QByteArray &resource, const QCursor &cursor) override;
 #endif
diff --git a/src/plugins/platforms/windows/qwindowsole.cpp b/src/plugins/platforms/windows/qwindowsole.cpp
index e9c3f2cbf6..f3450e2806 100644
--- a/src/plugins/platforms/windows/qwindowsole.cpp
+++ b/src/plugins/platforms/windows/qwindowsole.cpp
@@ -110,7 +110,7 @@ QWindowsOleDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium)
     }
 
     if (QWindowsContext::verbose > 1 && lcQpaMime().isDebugEnabled())
-        qCDebug(lcQpaMime) <<__FUNCTION__ << *pformatetc << "returns" << hex << showbase << quint64(hr);
+        qCDebug(lcQpaMime) <<__FUNCTION__ << *pformatetc << "returns" << Qt::hex << Qt::showbase << quint64(hr);
 
     return hr;
 }
@@ -135,7 +135,7 @@ QWindowsOleDataObject::QueryGetData(LPFORMATETC pformatetc)
              ResultFromScode(S_OK) : ResultFromScode(S_FALSE);
     }
     if (QWindowsContext::verbose > 1)
-        qCDebug(lcQpaMime) <<  __FUNCTION__ << " returns 0x" << hex << int(hr);
+        qCDebug(lcQpaMime) <<  __FUNCTION__ << " returns 0x" << Qt::hex << int(hr);
     return hr;
 }
 
@@ -155,7 +155,7 @@ QWindowsOleDataObject::SetData(LPFORMATETC pFormatetc, STGMEDIUM *pMedium, BOOL
     HRESULT hr = ResultFromScode(E_NOTIMPL);
 
     if (pFormatetc->cfFormat == CF_PERFORMEDDROPEFFECT && pMedium->tymed == TYMED_HGLOBAL) {
-        DWORD * val = (DWORD*)GlobalLock(pMedium->hGlobal);
+        auto * val = (DWORD*)GlobalLock(pMedium->hGlobal);
         performedEffect = *val;
         GlobalUnlock(pMedium->hGlobal);
         if (fRelease)
@@ -163,7 +163,7 @@ QWindowsOleDataObject::SetData(LPFORMATETC pFormatetc, STGMEDIUM *pMedium, BOOL
         hr = ResultFromScode(S_OK);
     }
     if (QWindowsContext::verbose > 1)
-        qCDebug(lcQpaMime) <<  __FUNCTION__ << " returns 0x" << hex << int(hr);
+        qCDebug(lcQpaMime) <<  __FUNCTION__ << " returns 0x" << Qt::hex << int(hr);
     return hr;
 }
 
@@ -193,7 +193,7 @@ QWindowsOleDataObject::EnumFormatEtc(DWORD dwDirection, LPENUMFORMATETC FAR* ppe
         fmtetcs.append(formatetc);
     }
 
-    QWindowsOleEnumFmtEtc *enumFmtEtc = new QWindowsOleEnumFmtEtc(fmtetcs);
+    auto *enumFmtEtc = new QWindowsOleEnumFmtEtc(fmtetcs);
     *ppenumFormatEtc = enumFmtEtc;
     if (enumFmtEtc->isNull()) {
         delete enumFmtEtc;
@@ -237,7 +237,7 @@ QWindowsOleEnumFmtEtc::QWindowsOleEnumFmtEtc(const QVector<FORMATETC> &fmtetcs)
         qCDebug(lcQpaMime) << __FUNCTION__ << fmtetcs;
     m_lpfmtetcs.reserve(fmtetcs.count());
     for (int idx = 0; idx < fmtetcs.count(); ++idx) {
-        LPFORMATETC destetc = new FORMATETC();
+        auto destetc = new FORMATETC();
         if (copyFormatEtc(destetc, &(fmtetcs.at(idx)))) {
             m_lpfmtetcs.append(destetc);
         } else {
@@ -255,7 +255,7 @@ QWindowsOleEnumFmtEtc::QWindowsOleEnumFmtEtc(const QVector<LPFORMATETC> &lpfmtet
     m_lpfmtetcs.reserve(lpfmtetcs.count());
     for (int idx = 0; idx < lpfmtetcs.count(); ++idx) {
         LPFORMATETC srcetc = lpfmtetcs.at(idx);
-        LPFORMATETC destetc = new FORMATETC();
+        auto destetc = new FORMATETC();
         if (copyFormatEtc(destetc, srcetc)) {
             m_lpfmtetcs.append(destetc);
         } else {
@@ -357,7 +357,7 @@ QWindowsOleEnumFmtEtc::Clone(LPENUMFORMATETC FAR* newEnum)
     if (newEnum == nullptr)
         return ResultFromScode(E_INVALIDARG);
 
-    QWindowsOleEnumFmtEtc *result = new QWindowsOleEnumFmtEtc(m_lpfmtetcs);
+    auto *result = new QWindowsOleEnumFmtEtc(m_lpfmtetcs);
     result->m_nIndex = m_nIndex;
 
     if (result->isNull()) {
diff --git a/src/plugins/platforms/windows/qwindowsopenglcontext.h b/src/plugins/platforms/windows/qwindowsopenglcontext.h
index cc6d93d35e..1416a7e575 100644
--- a/src/plugins/platforms/windows/qwindowsopenglcontext.h
+++ b/src/plugins/platforms/windows/qwindowsopenglcontext.h
@@ -51,7 +51,7 @@ class QWindowsOpenGLContext;
 
 class QWindowsStaticOpenGLContext
 {
-    Q_DISABLE_COPY(QWindowsStaticOpenGLContext)
+    Q_DISABLE_COPY_MOVE(QWindowsStaticOpenGLContext)
 public:
     static QWindowsStaticOpenGLContext *create();
     virtual ~QWindowsStaticOpenGLContext() = default;
@@ -63,7 +63,7 @@ public:
 
     // If the windowing system interface needs explicitly created window surfaces (like EGL),
     // reimplement these.
-    virtual void *createWindowSurface(void * /*nativeWindow*/, void * /*nativeConfig*/, int * /*err*/) { return 0; }
+    virtual void *createWindowSurface(void * /*nativeWindow*/, void * /*nativeConfig*/, int * /*err*/) { return nullptr; }
     virtual void destroyWindowSurface(void * /*nativeSurface*/) { }
 
 protected:
@@ -75,14 +75,14 @@ private:
 
 class QWindowsOpenGLContext : public QPlatformOpenGLContext
 {
-    Q_DISABLE_COPY(QWindowsOpenGLContext)
+    Q_DISABLE_COPY_MOVE(QWindowsOpenGLContext)
 public:
     // Returns the native context handle (e.g. HGLRC for WGL, EGLContext for EGL).
     virtual void *nativeContext() const = 0;
 
     // These should be implemented only for some winsys interfaces, for example EGL.
     // For others, like WGL, they are not relevant.
-    virtual void *nativeDisplay() const { return 0; }
+    virtual void *nativeDisplay() const { return nullptr; }
     virtual void *nativeConfig() const { return 0; }
 
 protected:
diff --git a/src/plugins/platforms/windows/qwindowsopengltester.cpp b/src/plugins/platforms/windows/qwindowsopengltester.cpp
index 840a3a11c4..afc1991e2c 100644
--- a/src/plugins/platforms/windows/qwindowsopengltester.cpp
+++ b/src/plugins/platforms/windows/qwindowsopengltester.cpp
@@ -83,7 +83,7 @@ static GpuDescription adapterIdentifierToGpuDescription(const D3DADAPTER_IDENTIF
 class QDirect3D9Handle
 {
 public:
-    Q_DISABLE_COPY(QDirect3D9Handle)
+    Q_DISABLE_COPY_MOVE(QDirect3D9Handle)
 
     QDirect3D9Handle();
     ~QDirect3D9Handle();
@@ -188,9 +188,9 @@ QDebug operator<<(QDebug d, const GpuDescription &gd)
 {
     QDebugStateSaver s(d);
     d.nospace();
-    d << hex << showbase << "GpuDescription(vendorId=" << gd.vendorId
+    d << Qt::hex << Qt::showbase << "GpuDescription(vendorId=" << gd.vendorId
       << ", deviceId=" << gd.deviceId << ", subSysId=" << gd.subSysId
-      << dec << noshowbase << ", revision=" << gd.revision
+      << Qt::dec << Qt::noshowbase << ", revision=" << gd.revision
       << ", driver: " << gd.driverName
       << ", version=" << gd.driverVersion << ", " << gd.description
       << gd.gpuSuitableScreen << ')';
@@ -207,11 +207,11 @@ QString GpuDescription::toString() const
         << "\n       Driver Name         : " << driverName
         << "\n    Driver Version         : " << driverVersion.toString()
         << "\n         Vendor ID         : 0x" << qSetPadChar(QLatin1Char('0'))
-        << uppercasedigits << hex << qSetFieldWidth(4) << vendorId
+        << Qt::uppercasedigits << Qt::hex << qSetFieldWidth(4) << vendorId
         << "\n         Device ID         : 0x" << qSetFieldWidth(4) << deviceId
         << "\n         SubSys ID         : 0x" << qSetFieldWidth(8) << subSysId
         << "\n       Revision ID         : 0x" << qSetFieldWidth(4) << revision
-        << dec;
+        << Qt::dec;
     if (!gpuSuitableScreen.isEmpty())
         str << "\nGL windows forced to screen: " << gpuSuitableScreen;
     return result;
@@ -457,7 +457,7 @@ bool QWindowsOpenGLTester::testDesktopGL()
 
         // Check the version. If we got 1.x then it's all hopeless and we can stop right here.
         typedef const GLubyte * (APIENTRY * GetString_t)(GLenum name);
-        GetString_t GetString = reinterpret_cast<GetString_t>(
+        auto GetString = reinterpret_cast<GetString_t>(
             reinterpret_cast<QFunctionPointer>(::GetProcAddress(lib, "glGetString")));
         if (GetString) {
             if (const char *versionStr = reinterpret_cast<const char *>(GetString(GL_VERSION))) {
diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
index 71a09304c5..cffd8427a2 100644
--- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp
+++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
@@ -317,10 +317,10 @@ static QTouchDevice *createTouchDevice()
         return nullptr;
     const int tabletPc = GetSystemMetrics(SM_TABLETPC);
     const int maxTouchPoints = GetSystemMetrics(SM_MAXIMUMTOUCHES);
-    qCDebug(lcQpaEvents) << "Digitizers:" << hex << showbase << (digitizers & ~NID_READY)
-        << "Ready:" << (digitizers & NID_READY) << dec << noshowbase
+    qCDebug(lcQpaEvents) << "Digitizers:" << Qt::hex << Qt::showbase << (digitizers & ~NID_READY)
+        << "Ready:" << (digitizers & NID_READY) << Qt::dec << Qt::noshowbase
         << "Tablet PC:" << tabletPc << "Max touch points:" << maxTouchPoints;
-    QTouchDevice *result = new QTouchDevice;
+    auto *result = new QTouchDevice;
     result->setType(digitizers & NID_INTEGRATED_TOUCH
                     ? QTouchDevice::TouchScreen : QTouchDevice::TouchPad);
     QTouchDevice::Capabilities capabilities = QTouchDevice::Position | QTouchDevice::Area | QTouchDevice::NormalizedPosition;
@@ -350,7 +350,7 @@ void QWindowsPointerHandler::handleCaptureRelease(QWindow *window,
                                                   QEvent::Type eventType,
                                                   Qt::MouseButtons mouseButtons)
 {
-    QWindowsWindow *platformWindow = static_cast<QWindowsWindow *>(window->handle());
+    auto *platformWindow = static_cast<QWindowsWindow *>(window->handle());
 
     // Qt expects the platform plugin to capture the mouse on any button press until release.
     if (!platformWindow->hasMouseCapture() && eventType == QEvent::MouseButtonPress) {
@@ -386,7 +386,7 @@ void QWindowsPointerHandler::handleEnterLeave(QWindow *window,
                                               QWindow *currentWindowUnderPointer,
                                               QPoint globalPos)
 {
-    QWindowsWindow *platformWindow = static_cast<QWindowsWindow *>(window->handle());
+    auto *platformWindow = static_cast<QWindowsWindow *>(window->handle());
     const bool hasCapture = platformWindow->hasMouseCapture();
 
     // No enter or leave events are sent as long as there is an autocapturing window.
@@ -470,26 +470,26 @@ bool QWindowsPointerHandler::translateTouchEvent(QWindow *window, HWND hwnd,
     if (!screen)
         return false;
 
-    POINTER_TOUCH_INFO *touchInfo = static_cast<POINTER_TOUCH_INFO *>(vTouchInfo);
+    auto *touchInfo = static_cast<POINTER_TOUCH_INFO *>(vTouchInfo);
 
     const QRect screenGeometry = screen->geometry();
 
     QList<QWindowSystemInterface::TouchPoint> touchPoints;
 
     if (QWindowsContext::verbose > 1)
-        qCDebug(lcQpaEvents).noquote().nospace() << showbase
+        qCDebug(lcQpaEvents).noquote().nospace() << Qt::showbase
                 << __FUNCTION__
-                << " message=" << hex << msg.message
-                << " count=" << dec << count;
+                << " message=" << Qt::hex << msg.message
+                << " count=" << Qt::dec << count;
 
-    Qt::TouchPointStates allStates = 0;
+    Qt::TouchPointStates allStates = nullptr;
 
     for (quint32 i = 0; i < count; ++i) {
         if (QWindowsContext::verbose > 1)
-            qCDebug(lcQpaEvents).noquote().nospace() << showbase
+            qCDebug(lcQpaEvents).noquote().nospace() << Qt::showbase
                     << "    TouchPoint id=" << touchInfo[i].pointerInfo.pointerId
                     << " frame=" << touchInfo[i].pointerInfo.frameId
-                    << " flags=" << hex << touchInfo[i].pointerInfo.pointerFlags;
+                    << " flags=" << Qt::hex << touchInfo[i].pointerInfo.pointerFlags;
 
         QWindowSystemInterface::TouchPoint touchPoint;
         const quint32 pointerId = touchInfo[i].pointerInfo.pointerId;
@@ -550,13 +550,13 @@ bool QWindowsPointerHandler::translatePenEvent(QWindow *window, HWND hwnd, QtWin
     if (et & QtWindows::NonClientEventFlag)
         return false; // Let DefWindowProc() handle Non Client messages.
 
-    POINTER_PEN_INFO *penInfo = static_cast<POINTER_PEN_INFO *>(vPenInfo);
+    auto *penInfo = static_cast<POINTER_PEN_INFO *>(vPenInfo);
 
     RECT pRect, dRect;
     if (!QWindowsContext::user32dll.getPointerDeviceRects(penInfo->pointerInfo.sourceDevice, &pRect, &dRect))
         return false;
 
-    const qint64 sourceDevice = (qint64)penInfo->pointerInfo.sourceDevice;
+    const auto sourceDevice = (qint64)penInfo->pointerInfo.sourceDevice;
     const QPoint globalPos = QPoint(penInfo->pointerInfo.ptPixelLocation.x, penInfo->pointerInfo.ptPixelLocation.y);
     const QPoint localPos = QWindowsGeometryHint::mapFromGlobal(hwnd, globalPos);
     const QPointF hiResGlobalPos = QPointF(dRect.left + qreal(penInfo->pointerInfo.ptHimetricLocation.x - pRect.left)
@@ -571,11 +571,11 @@ bool QWindowsPointerHandler::translatePenEvent(QWindow *window, HWND hwnd, QtWin
     const int z = 0;
 
     if (QWindowsContext::verbose > 1)
-        qCDebug(lcQpaEvents).noquote().nospace() << showbase
+        qCDebug(lcQpaEvents).noquote().nospace() << Qt::showbase
             << __FUNCTION__ << " sourceDevice=" << sourceDevice
             << " globalPos=" << globalPos << " localPos=" << localPos << " hiResGlobalPos=" << hiResGlobalPos
-            << " message=" << hex << msg.message
-            << " flags=" << hex << penInfo->pointerInfo.pointerFlags;
+            << " message=" << Qt::hex << msg.message
+            << " flags=" << Qt::hex << penInfo->pointerInfo.pointerFlags;
 
     const QTabletEvent::TabletDevice device = QTabletEvent::Stylus;
     QTabletEvent::PointerType type;
@@ -696,7 +696,13 @@ bool QWindowsPointerHandler::translateMouseEvent(QWindow *window,
 {
     *result = 0;
 
-    const QPoint eventPos(GET_X_LPARAM(msg.lParam), GET_Y_LPARAM(msg.lParam));
+    QPoint eventPos(GET_X_LPARAM(msg.lParam), GET_Y_LPARAM(msg.lParam));
+    if ((et & QtWindows::NonClientEventFlag) == 0 && QWindowsBaseWindow::isRtlLayout(hwnd))  {
+        RECT clientArea;
+        GetClientRect(hwnd, &clientArea);
+        eventPos.setX(clientArea.right - eventPos.x());
+    }
+
     QPoint localPos;
     QPoint globalPos;
 
diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.h b/src/plugins/platforms/windows/qwindowspointerhandler.h
index b6b89cefed..8874db27e3 100644
--- a/src/plugins/platforms/windows/qwindowspointerhandler.h
+++ b/src/plugins/platforms/windows/qwindowspointerhandler.h
@@ -55,7 +55,7 @@ class QTouchDevice;
 
 class QWindowsPointerHandler
 {
-    Q_DISABLE_COPY(QWindowsPointerHandler)
+    Q_DISABLE_COPY_MOVE(QWindowsPointerHandler)
 public:
     QWindowsPointerHandler() = default;
     bool translatePointerEvent(QWindow *window, HWND hwnd, QtWindows::WindowsEventType et, MSG msg, LRESULT *result);
diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
index cecd06f5a4..df63adf558 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.cpp
+++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
@@ -73,7 +73,7 @@ static inline QDpi monitorDPI(HMONITOR hMonitor)
     return {0, 0};
 }
 
-typedef QList<QWindowsScreenData> WindowsScreenDataList;
+using WindowsScreenDataList = QList<QWindowsScreenData>;
 
 static bool monitorData(HMONITOR hMonitor, QWindowsScreenData *data)
 {
@@ -121,7 +121,7 @@ BOOL QT_WIN_CALLBACK monitorEnumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM
 {
     QWindowsScreenData data;
     if (monitorData(hMonitor, &data)) {
-        WindowsScreenDataList *result = reinterpret_cast<WindowsScreenDataList *>(p);
+        auto *result = reinterpret_cast<WindowsScreenDataList *>(p);
         // QWindowSystemInterface::handleScreenAdded() documentation specifies that first
         // added screen will be the primary screen, so order accordingly.
         // Note that the side effect of this policy is that there is no way to change primary
@@ -257,15 +257,6 @@ QWindow *QWindowsScreen::windowAt(const QPoint &screenPoint, unsigned flags)
     return result;
 }
 
-qreal QWindowsScreen::pixelDensity() const
-{
-    // QTBUG-49195: Use logical DPI instead of physical DPI to calculate
-    // the pixel density since it is reflects the Windows UI scaling.
-    // High DPI auto scaling should be disabled when the user chooses
-    // small fonts on a High DPI monitor, resulting in lower logical DPI.
-    return qMax(1, qRound(logicalDpi().first / 96));
-}
-
 /*!
     \brief Determine siblings in a virtual desktop system.
 
@@ -329,6 +320,11 @@ void QWindowsScreen::handleChanges(const QWindowsScreenData &newData)
     }
 }
 
+HMONITOR QWindowsScreen::handle() const
+{
+    return m_data.hMonitor;
+}
+
 QRect QWindowsScreen::virtualGeometry(const QPlatformScreen *screen) // cf QScreen::virtualGeometry()
 {
     QRect result;
@@ -556,7 +552,7 @@ bool QWindowsScreenManager::handleScreenChanges()
             if (existingIndex == 0)
                 primaryScreenChanged = true;
         } else {
-            QWindowsScreen *newScreen = new QWindowsScreen(newData);
+            auto *newScreen = new QWindowsScreen(newData);
             m_screens.push_back(newScreen);
             QWindowSystemInterface::handleScreenAdded(newScreen,
                                                              newData.flags & QWindowsScreenData::PrimaryScreen);
diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h
index 8ad012512e..2fd56f53cf 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.h
+++ b/src/plugins/platforms/windows/qwindowsscreen.h
@@ -76,7 +76,7 @@ class QWindowsScreen : public QPlatformScreen
 {
 public:
 #ifndef QT_NO_CURSOR
-    typedef QScopedPointer<QPlatformCursor> CursorPtr;
+    using CursorPtr = QScopedPointer<QPlatformCursor>;
 #endif
 
     explicit QWindowsScreen(const QWindowsScreenData &data);
@@ -87,7 +87,7 @@ public:
     QImage::Format format() const override { return m_data.format; }
     QSizeF physicalSize() const override { return m_data.physicalSizeMM; }
     QDpi logicalDpi() const override { return m_data.dpi; }
-    qreal pixelDensity() const override;
+    QDpi logicalBaseDpi() const override { return QDpi(96, 96); };
     qreal devicePixelRatio() const override { return 1.0; }
     qreal refreshRate() const override { return m_data.refreshRateHz; }
     QString name() const override { return m_data.name; }
@@ -104,6 +104,8 @@ public:
 
     inline void handleChanges(const QWindowsScreenData &newData);
 
+    HMONITOR handle() const;
+
 #ifndef QT_NO_CURSOR
     QPlatformCursor *cursor() const override { return m_cursor.data(); }
     const CursorPtr &cursorPtr() const { return m_cursor; }
@@ -125,7 +127,7 @@ private:
 class QWindowsScreenManager
 {
 public:
-    typedef QList<QWindowsScreen *> WindowsScreenList;
+    using WindowsScreenList = QList<QWindowsScreen *>;
 
     QWindowsScreenManager();
 
diff --git a/src/plugins/platforms/windows/qwindowsservices.cpp b/src/plugins/platforms/windows/qwindowsservices.cpp
index 9504513a5e..83b052bb49 100644
--- a/src/plugins/platforms/windows/qwindowsservices.cpp
+++ b/src/plugins/platforms/windows/qwindowsservices.cpp
@@ -45,6 +45,8 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qdir.h>
 
+#include <QtCore/private/qwinregistry_p.h>
+
 #include <shlobj.h>
 #include <intshcut.h>
 
@@ -57,7 +59,7 @@ static inline bool shellExecute(const QUrl &url)
     const QString nativeFilePath = url.isLocalFile() && !url.hasFragment() && !url.hasQuery()
         ? QDir::toNativeSeparators(url.toLocalFile())
         : url.toString(QUrl::FullyEncoded);
-    const quintptr result =
+    const auto result =
         reinterpret_cast<quintptr>(ShellExecute(nullptr, nullptr,
                                                 reinterpret_cast<const wchar_t *>(nativeFilePath.utf16()),
                                                 nullptr, nullptr, SW_SHOWNORMAL));
@@ -78,35 +80,24 @@ static inline QString mailCommand()
 
     const wchar_t mailUserKey[] = L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\mailto\\UserChoice";
 
-    wchar_t command[MAX_PATH] = {0};
     // Check if user has set preference, otherwise use default.
-    HKEY handle;
-    QString keyName;
-    if (!RegOpenKeyEx(HKEY_CURRENT_USER, mailUserKey, 0, KEY_READ, &handle)) {
-        DWORD bufferSize = BufferSize;
-        if (!RegQueryValueEx(handle, L"Progid", nullptr, nullptr, reinterpret_cast<unsigned char*>(command), &bufferSize))
-            keyName = QString::fromWCharArray(command);
-        RegCloseKey(handle);
-    }
+    QString keyName = QWinRegistryKey(HKEY_CURRENT_USER, mailUserKey)
+                      .stringValue( L"Progid");
     const QLatin1String mailto = keyName.isEmpty() ? QLatin1String("mailto") : QLatin1String();
     keyName += mailto + QLatin1String("\\Shell\\Open\\Command");
     if (debug)
         qDebug() << __FUNCTION__ << "keyName=" << keyName;
-    command[0] = 0;
-    if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, reinterpret_cast<const wchar_t*>(keyName.utf16()), 0, KEY_READ, &handle)) {
-        DWORD bufferSize = BufferSize;
-        RegQueryValueEx(handle, L"", nullptr, nullptr, reinterpret_cast<unsigned char*>(command), &bufferSize);
-        RegCloseKey(handle);
-    }
+    const QString command = QWinRegistryKey(HKEY_CLASSES_ROOT, keyName).stringValue(L"");
     // QTBUG-57816: As of Windows 10, if there is no mail client installed, an entry like
     // "rundll32.exe .. url.dll,MailToProtocolHandler %l" is returned. Launching it
     // silently fails or brings up a broken dialog after a long time, so exclude it and
     // fall back to ShellExecute() which brings up the URL assocation dialog.
-    if (!command[0] || wcsstr(command, L",MailToProtocolHandler") != nullptr)
+    if (command.isEmpty() || command.contains(QLatin1String(",MailToProtocolHandler")))
         return QString();
     wchar_t expandedCommand[MAX_PATH] = {0};
-    return ExpandEnvironmentStrings(command, expandedCommand, MAX_PATH) ?
-           QString::fromWCharArray(expandedCommand) : QString::fromWCharArray(command);
+    return ExpandEnvironmentStrings(reinterpret_cast<const wchar_t *>(command.utf16()),
+                                    expandedCommand, MAX_PATH)
+        ? QString::fromWCharArray(expandedCommand) : command;
 }
 
 static inline bool launchMail(const QUrl &url)
diff --git a/src/plugins/platforms/windows/qwindowssessionmanager.h b/src/plugins/platforms/windows/qwindowssessionmanager.h
index 4c4256f2b0..0769ed1fce 100644
--- a/src/plugins/platforms/windows/qwindowssessionmanager.h
+++ b/src/plugins/platforms/windows/qwindowssessionmanager.h
@@ -79,7 +79,7 @@ private:
     bool m_blockUserInput = false;
     bool m_canceled = false;
 
-    Q_DISABLE_COPY(QWindowsSessionManager)
+    Q_DISABLE_COPY_MOVE(QWindowsSessionManager)
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp b/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
index c0f4e4d014..f2dba4d06b 100644
--- a/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
+++ b/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
@@ -117,7 +117,7 @@ struct QWindowsHwndSystemTrayIconEntry
     QWindowsSystemTrayIcon *trayIcon;
 };
 
-typedef QVector<QWindowsHwndSystemTrayIconEntry> HwndTrayIconEntries;
+using HwndTrayIconEntries = QVector<QWindowsHwndSystemTrayIconEntry>;
 
 Q_GLOBAL_STATIC(HwndTrayIconEntries, hwndTrayIconEntries)
 
diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp
index 44b94d044d..cd5a78abb6 100644
--- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp
+++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp
@@ -146,13 +146,13 @@ QDebug operator<<(QDebug d, const LOGCONTEXT &lc)
     QDebugStateSaver saver(d);
     d.nospace();
     d << "LOGCONTEXT(\"" << QString::fromWCharArray(lc.lcName) << "\", options=0x"
-        << hex << lc.lcOptions << dec;
+        << Qt::hex << lc.lcOptions << Qt::dec;
     formatOptions(d, lc.lcOptions);
-    d << ", status=0x" << hex << lc.lcStatus << ", device=0x" << lc.lcDevice
-        << dec << ", PktRate=" << lc.lcPktRate
+    d << ", status=0x" << Qt::hex << lc.lcStatus << ", device=0x" << lc.lcDevice
+        << Qt::dec << ", PktRate=" << lc.lcPktRate
         << ", PktData=" << lc.lcPktData << ", PktMode=" << lc.lcPktMode
-        << ", MoveMask=0x" << hex << lc.lcMoveMask << ", BtnDnMask=0x" << lc.lcBtnDnMask
-        << ", BtnUpMask=0x" << lc.lcBtnUpMask << dec << ", SysMode=" << lc.lcSysMode
+        << ", MoveMask=0x" << Qt::hex << lc.lcMoveMask << ", BtnDnMask=0x" << lc.lcBtnDnMask
+        << ", BtnUpMask=0x" << lc.lcBtnUpMask << Qt::dec << ", SysMode=" << lc.lcSysMode
         << ", InOrg=(" << lc.lcInOrgX << ", " << lc.lcInOrgY << ", " << lc.lcInOrgZ
         <<  "), InExt=(" << lc.lcInExtX << ", " << lc.lcInExtY << ", " << lc.lcInExtZ
         << ") OutOrg=(" << lc.lcOutOrgX << ", " << lc.lcOutOrgY << ", "
@@ -305,7 +305,7 @@ QString QWindowsTabletSupport::description() const
         << '.' << (specificationVersion & 0xFF) << " implementation: v"
         << (implementationVersion >> 8) << '.' << (implementationVersion & 0xFF)
         << ' ' << devices << " device(s), " << cursors << " cursor(s), "
-        << extensions << " extensions" << ", options: 0x" << hex << opts << dec;
+        << extensions << " extensions" << ", options: 0x" << Qt::hex << opts << Qt::dec;
     formatOptions(str, opts);
     if (m_tiltSupport)
         str << " tilt";
diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.h b/src/plugins/platforms/windows/qwindowstabletsupport.h
index 8f97982308..6bcf3357a5 100644
--- a/src/plugins/platforms/windows/qwindowstabletsupport.h
+++ b/src/plugins/platforms/windows/qwindowstabletsupport.h
@@ -110,7 +110,7 @@ QDebug operator<<(QDebug d, const QWindowsTabletDeviceData &t);
 
 class QWindowsTabletSupport
 {
-    Q_DISABLE_COPY(QWindowsTabletSupport)
+    Q_DISABLE_COPY_MOVE(QWindowsTabletSupport)
 
     explicit QWindowsTabletSupport(HWND window, HCTX context);
 
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
index a6b9781252..437c9562ab 100644
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
@@ -162,25 +162,19 @@ public:
         m_init = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 
         QMutexLocker readyLocker(&m_readyMutex);
-        while (!m_cancelled.load()) {
-            if (!m_params && !m_cancelled.load()
+        while (!m_cancelled.loadRelaxed()) {
+            if (!m_params && !m_cancelled.loadRelaxed()
                 && !m_readyCondition.wait(&m_readyMutex, 1000))
                 continue;
 
             if (m_params) {
                 const QString fileName = m_params->fileName;
                 SHFILEINFO info;
-#ifndef Q_OS_WINCE
-                const UINT oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
-#endif
                 const bool result = SHGetFileInfo(reinterpret_cast<const wchar_t *>(fileName.utf16()),
                                                   m_params->attributes, &info, sizeof(SHFILEINFO),
                                                   m_params->flags);
-#ifndef Q_OS_WINCE
-                SetErrorMode(oldErrorMode);
-#endif
                 m_doneMutex.lock();
-                if (!m_cancelled.load()) {
+                if (!m_cancelled.loadRelaxed()) {
                     *m_params->result = result;
                     memcpy(m_params->info, &info, sizeof(SHFILEINFO));
                 }
@@ -210,7 +204,7 @@ public:
     void cancel()
     {
         QMutexLocker doneLocker(&m_doneMutex);
-        m_cancelled.store(1);
+        m_cancelled.storeRelaxed(1);
         m_readyCondition.wakeAll();
     }
 
@@ -589,7 +583,7 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon);
 static QPixmap loadIconFromShell32(int resourceId, QSizeF size)
 {
     if (const HMODULE hmod = QSystemLibrary::load(L"shell32")) {
-        HICON iconHandle =
+        auto iconHandle =
             static_cast<HICON>(LoadImage(hmod, MAKEINTRESOURCE(resourceId),
                                          IMAGE_ICON, int(size.width()), int(size.height()), 0));
         if (iconHandle) {
diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h
index 28c69e4ec1..07120230ce 100644
--- a/src/plugins/platforms/windows/qwindowstheme.h
+++ b/src/plugins/platforms/windows/qwindowstheme.h
@@ -51,7 +51,7 @@ class QWindow;
 
 class QWindowsTheme : public QPlatformTheme
 {
-    Q_DISABLE_COPY(QWindowsTheme)
+    Q_DISABLE_COPY_MOVE(QWindowsTheme)
 public:
     QWindowsTheme();
     ~QWindowsTheme() override;
@@ -71,7 +71,7 @@ public:
 
     QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override;
 
-    QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions = 0) const override;
+    QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions = nullptr) const override;
 
     void windowsThemeChanged(QWindow *window);
     void displayChanged() { refreshIconPixmapSizes(); }
diff --git a/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h b/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
index 731e4b5432..ffe2e62069 100644
--- a/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
+++ b/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 */
 class QWindowsThreadPoolRunner
 {
-    Q_DISABLE_COPY(QWindowsThreadPoolRunner)
+    Q_DISABLE_COPY_MOVE(QWindowsThreadPoolRunner)
 
 #if QT_CONFIG(thread)
     template <class RunnableFunction> // nested class implementing QRunnable to execute a function.
diff --git a/src/plugins/platforms/windows/qwindowsvulkaninstance.cpp b/src/plugins/platforms/windows/qwindowsvulkaninstance.cpp
index 7a01483abd..812ea8193a 100644
--- a/src/plugins/platforms/windows/qwindowsvulkaninstance.cpp
+++ b/src/plugins/platforms/windows/qwindowsvulkaninstance.cpp
@@ -81,7 +81,7 @@ bool QWindowsVulkanInstance::supportsPresent(VkPhysicalDevice physicalDevice,
 
 VkSurfaceKHR QWindowsVulkanInstance::createSurface(HWND win)
 {
-    VkSurfaceKHR surface = 0;
+    VkSurfaceKHR surface = VK_NULL_HANDLE;
 
     if (!m_createSurface) {
         m_createSurface = reinterpret_cast<PFN_vkCreateWin32SurfaceKHR>(
diff --git a/src/plugins/platforms/windows/qwindowsvulkaninstance.h b/src/plugins/platforms/windows/qwindowsvulkaninstance.h
index 3292137c39..cc7ef476d4 100644
--- a/src/plugins/platforms/windows/qwindowsvulkaninstance.h
+++ b/src/plugins/platforms/windows/qwindowsvulkaninstance.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 class QWindowsVulkanInstance : public QBasicPlatformVulkanInstance
 {
-    Q_DISABLE_COPY(QWindowsVulkanInstance)
+    Q_DISABLE_COPY_MOVE(QWindowsVulkanInstance)
 public:
     QWindowsVulkanInstance(QVulkanInstance *instance);
 
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 1d8b252029..a4f4099aa6 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -86,7 +86,7 @@
 
 QT_BEGIN_NAMESPACE
 
-typedef QSharedPointer<QWindowCreationContext> QWindowCreationContextPtr;
+using QWindowCreationContextPtr = QSharedPointer<QWindowCreationContext>;
 
 enum {
     defaultWindowWidth = 160,
@@ -134,6 +134,10 @@ static QByteArray debugWinExStyle(DWORD exStyle)
         rc += " WS_EX_LAYERED";
     if (exStyle & WS_EX_DLGMODALFRAME)
         rc += " WS_EX_DLGMODALFRAME";
+    if (exStyle & WS_EX_LAYOUTRTL)
+        rc += " WS_EX_LAYOUTRTL";
+    if (exStyle & WS_EX_NOINHERITLAYOUT)
+        rc += " WS_EX_NOINHERITLAYOUT";
     return rc;
 }
 
@@ -239,7 +243,7 @@ QDebug operator<<(QDebug d, const WINDOWPLACEMENT &wp)
     QDebugStateSaver saver(d);
     d.nospace();
     d.noquote();
-    d <<  "WINDOWPLACEMENT(flags=0x" << hex << wp.flags << dec << ", showCmd="
+    d <<  "WINDOWPLACEMENT(flags=0x" << Qt::hex << wp.flags << Qt::dec << ", showCmd="
         << wp.showCmd << ", ptMinPosition=" << wp.ptMinPosition << ", ptMaxPosition=" << wp.ptMaxPosition
         << ", rcNormalPosition=" << wp.rcNormalPosition;
     return d;
@@ -249,7 +253,7 @@ QDebug operator<<(QDebug d, const GUID &guid)
 {
     QDebugStateSaver saver(d);
     d.nospace();
-    d << '{' << hex << uppercasedigits << qSetPadChar(QLatin1Char('0'))
+    d << '{' << Qt::hex << Qt::uppercasedigits << qSetPadChar(QLatin1Char('0'))
       << qSetFieldWidth(8) << guid.Data1
       << qSetFieldWidth(0) << '-' << qSetFieldWidth(4)
       << guid.Data2 << qSetFieldWidth(0) << '-' << qSetFieldWidth(4)
@@ -307,7 +311,7 @@ static inline QRect frameGeometry(HWND hwnd, bool topLevel)
         const int width = rect.right - rect.left;
         const int height = rect.bottom - rect.top;
         POINT leftTop = { rect.left, rect.top };
-        ScreenToClient(parent, &leftTop);
+        screenToClient(parent, &leftTop);
         rect.left = leftTop.x;
         rect.top = leftTop.y;
         rect.right = leftTop.x + width;
@@ -490,7 +494,7 @@ static QMargins invisibleMargins(QPoint screenPoint)
 
 struct WindowCreationData
 {
-    typedef QWindowsWindowData WindowData;
+    using WindowData = QWindowsWindowData;
     enum Flags { ForceChild = 0x1, ForceTopLevel = 0x2 };
 
     void fromWindow(const QWindow *w, const Qt::WindowFlags flags, unsigned creationFlags = 0);
@@ -667,6 +671,17 @@ void WindowCreationData::fromWindow(const QWindow *w, const Qt::WindowFlags flag
     if ((flags & Qt::MSWindowsFixedSizeDialogHint))
         dialog = true;
 
+    // This causes the title bar to drawn RTL and the close button
+    // to be left. Note that this causes:
+    // - All DCs created on the Window to have RTL layout (see SetLayout)
+    // - ClientToScreen() and ScreenToClient() to work in reverse as well.
+    // - Mouse event coordinates to be mirrored.
+    // - Positioning of child Windows.
+    if (QGuiApplication::layoutDirection() == Qt::RightToLeft
+        && (QWindowsIntegration::instance()->options() & QWindowsIntegration::RtlEnabled) != 0) {
+        exStyle |= WS_EX_LAYOUTRTL | WS_EX_NOINHERITLAYOUT;
+    }
+
     // Parent: Use transient parent for top levels.
     if (popup) {
         flags |= Qt::WindowStaysOnTopHint; // a popup stays on top, no parent.
@@ -749,8 +764,8 @@ QWindowsWindowData
     if (title.isEmpty() && (result.flags & Qt::WindowTitleHint))
         title = topLevel ? qAppName() : w->objectName();
 
-    const wchar_t *titleUtf16 = reinterpret_cast<const wchar_t *>(title.utf16());
-    const wchar_t *classNameUtf16 = reinterpret_cast<const wchar_t *>(windowClassName.utf16());
+    const auto *titleUtf16 = reinterpret_cast<const wchar_t *>(title.utf16());
+    const auto *classNameUtf16 = reinterpret_cast<const wchar_t *>(windowClassName.utf16());
 
     // Capture events before CreateWindowEx() returns. The context is cleared in
     // the QWindowsWindow constructor.
@@ -772,6 +787,16 @@ QWindowsWindowData
 
     QPoint pos = calcPosition(w, context, invMargins);
 
+    // Mirror the position when creating on a parent in RTL mode, ditto for the obtained geometry.
+    int mirrorParentWidth = 0;
+    if (!w->isTopLevel() && QWindowsBaseWindow::isRtlLayout(parentHandle)) {
+        RECT rect;
+        GetClientRect(parentHandle, &rect);
+        mirrorParentWidth = rect.right;
+    }
+    if (mirrorParentWidth != 0 && pos.x() != CW_USEDEFAULT && context->frameWidth != CW_USEDEFAULT)
+        pos.setX(mirrorParentWidth - context->frameWidth - pos.x());
+
     result.hwnd = CreateWindowEx(exStyle, classNameUtf16, titleUtf16,
                                  style,
                                  pos.x(), pos.y(),
@@ -779,14 +804,21 @@ QWindowsWindowData
                                  parentHandle, nullptr, appinst, nullptr);
     qCDebug(lcQpaWindows).nospace()
         << "CreateWindowEx: returns " << w << ' ' << result.hwnd << " obtained geometry: "
-        << context->obtainedGeometry << ' ' << context->margins;
+        << context->obtainedPos << context->obtainedSize << ' ' << context->margins;
 
     if (!result.hwnd) {
         qErrnoWarning("%s: CreateWindowEx failed", __FUNCTION__);
         return result;
     }
 
-    result.geometry = context->obtainedGeometry;
+    if (mirrorParentWidth != 0) {
+        context->obtainedPos.setX(mirrorParentWidth - context->obtainedSize.width()
+                                  -  context->obtainedPos.x());
+    }
+
+    QRect obtainedGeometry(context->obtainedPos, context->obtainedSize);
+
+    result.geometry = obtainedGeometry;
     result.fullFrameMargins = context->margins;
     result.embedded = embedded;
     result.hasFrame = hasFrame;
@@ -905,7 +937,7 @@ QMargins QWindowsGeometryHint::frame(DWORD style, DWORD exStyle, qreal dpi)
     const QMargins result(qAbs(rect.left), qAbs(rect.top),
                           qAbs(rect.right), qAbs(rect.bottom));
     qCDebug(lcQpaWindows).nospace() << __FUNCTION__ << " style="
-        << showbase << hex << style << " exStyle=" << exStyle << dec << noshowbase
+        << Qt::showbase << Qt::hex << style << " exStyle=" << exStyle << Qt::dec << Qt::noshowbase
         << " dpi=" << dpi
         << ' ' << rect << ' ' << result;
     return result;
@@ -950,7 +982,7 @@ bool QWindowsGeometryHint::handleCalculateSize(const QMargins &customMargins, co
     if (!msg.wParam || customMargins.isNull())
         return false;
     *result = DefWindowProc(msg.hwnd, msg.message, msg.wParam, msg.lParam);
-    NCCALCSIZE_PARAMS *ncp = reinterpret_cast<NCCALCSIZE_PARAMS *>(msg.lParam);
+    auto *ncp = reinterpret_cast<NCCALCSIZE_PARAMS *>(msg.lParam);
     const RECT oldClientArea = ncp->rgrc[0];
     ncp->rgrc[0].left += customMargins.left();
     ncp->rgrc[0].top += customMargins.top();
@@ -1033,6 +1065,11 @@ bool QWindowsGeometryHint::positionIncludesFrame(const QWindow *w)
     \ingroup qt-lighthouse-win
 */
 
+bool QWindowsBaseWindow::isRtlLayout(HWND hwnd)
+{
+    return (GetWindowLongPtrW(hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL) != 0;
+}
+
 QWindowsBaseWindow *QWindowsBaseWindow::baseWindowOf(const QWindow *w)
 {
     if (w) {
@@ -1195,7 +1232,9 @@ QWindowCreationContext::QWindowCreationContext(const QWindow *w,
                                                DWORD style, DWORD exStyle) :
     window(w),
     requestedGeometryIn(geometryIn),
-    requestedGeometry(geometry), obtainedGeometry(geometry),
+    requestedGeometry(geometry),
+    obtainedPos(geometryIn.topLeft()),
+    obtainedSize(geometryIn.size()),
     margins(QWindowsGeometryHint::frame(w, geometry, style, exStyle)),
     customMargins(cm)
 {
@@ -1266,7 +1305,7 @@ QWindowsWindow::QWindowsWindow(QWindow *aWindow, const QWindowsWindowData &data)
     m_cursor(new CursorHandle),
     m_format(aWindow->requestedFormat())
 #if QT_CONFIG(vulkan)
-  , m_vkSurface(0)
+  , m_vkSurface(VK_NULL_HANDLE)
 #endif
 {
     QWindowsContext::instance()->addWindow(m_data.hwnd, this);
@@ -1323,11 +1362,12 @@ void QWindowsWindow::initialize()
     // will send the message) and screen change signals of QWindow.
     if (w->type() != Qt::Desktop) {
         const Qt::WindowState state = w->windowState();
+        const QRect obtainedGeometry(creationContext->obtainedPos, creationContext->obtainedSize);
         if (state != Qt::WindowMaximized && state != Qt::WindowFullScreen
-            && creationContext->requestedGeometryIn != creationContext->obtainedGeometry) {
-            QWindowSystemInterface::handleGeometryChange<QWindowSystemInterface::SynchronousDelivery>(w, creationContext->obtainedGeometry);
+            && creationContext->requestedGeometryIn != obtainedGeometry) {
+            QWindowSystemInterface::handleGeometryChange<QWindowSystemInterface::SynchronousDelivery>(w, obtainedGeometry);
         }
-        QPlatformScreen *obtainedScreen = screenForGeometry(creationContext->obtainedGeometry);
+        QPlatformScreen *obtainedScreen = screenForGeometry(obtainedGeometry);
         if (obtainedScreen && screen() != obtainedScreen)
             QWindowSystemInterface::handleWindowScreenChanged<QWindowSystemInterface::SynchronousDelivery>(w, obtainedScreen->screen());
     }
@@ -1366,14 +1406,14 @@ void QWindowsWindow::destroyWindow()
             QVulkanInstance *inst = window()->vulkanInstance();
             if (inst)
                 static_cast<QWindowsVulkanInstance *>(inst->handle())->destroySurface(m_vkSurface);
-            m_vkSurface = 0;
+            m_vkSurface = VK_NULL_HANDLE;
         }
 #endif
 #ifndef QT_NO_OPENGL
         if (m_surface) {
             if (QWindowsStaticOpenGLContext *staticOpenGLContext = QWindowsIntegration::staticOpenGLContext())
                 staticOpenGLContext->destroyWindowSurface(m_surface);
-            m_surface = 0;
+            m_surface = nullptr;
         }
 #endif
         DestroyWindow(m_data.hwnd);
@@ -1462,7 +1502,7 @@ QWindow *QWindowsWindow::topLevelOf(QWindow *w)
         w = parent;
 
     if (const QPlatformWindow *handle = w->handle()) {
-        const QWindowsWindow *ww = static_cast<const QWindowsWindow *>(handle);
+        const auto *ww = static_cast<const QWindowsWindow *>(handle);
         if (ww->isEmbedded()) {
             HWND parentHWND = GetAncestor(ww->handle(), GA_PARENT);
             const HWND desktopHwnd = GetDesktopWindow();
@@ -1536,7 +1576,7 @@ bool QWindowsWindow::isActive() const
 
 bool QWindowsWindow::isAncestorOf(const QPlatformWindow *child) const
 {
-    const QWindowsWindow *childWindow = static_cast<const QWindowsWindow *>(child);
+    const auto *childWindow = static_cast<const QWindowsWindow *>(child);
     return IsChild(m_data.hwnd, childWindow->handle());
 }
 
@@ -1685,7 +1725,7 @@ void QWindowsWindow::setParent_sys(const QPlatformWindow *parent)
     HWND oldParentHWND = parentHwnd();
     HWND newParentHWND = nullptr;
     if (parent) {
-        const QWindowsWindow *parentW = static_cast<const QWindowsWindow *>(parent);
+        const auto *parentW = static_cast<const QWindowsWindow *>(parent);
         newParentHWND = parentW->handle();
 
     }
@@ -1946,7 +1986,16 @@ void QWindowsBaseWindow::setGeometry_sys(const QRect &rect) const
         windowPlacement.showCmd = windowPlacement.showCmd == SW_SHOWMINIMIZED ? SW_SHOWMINIMIZED : SW_HIDE;
         result = SetWindowPlacement(hwnd, &windowPlacement);
     } else {
-        result = MoveWindow(hwnd, frameGeometry.x(), frameGeometry.y(),
+        int x = frameGeometry.x();
+        if (!window()->isTopLevel()) {
+            const HWND parentHandle = GetParent(hwnd);
+            if (isRtlLayout(parentHandle)) {
+                RECT rect;
+                GetClientRect(parentHandle, &rect);
+                x = rect.right - frameGeometry.width() - x;
+            }
+        }
+        result = MoveWindow(hwnd, x, frameGeometry.y(),
                             frameGeometry.width(), frameGeometry.height(), true);
     }
     qCDebug(lcQpaWindows) << '<' << __FUNCTION__ << window()
@@ -1962,8 +2011,11 @@ void QWindowsBaseWindow::setGeometry_sys(const QRect &rect) const
 
 HDC QWindowsWindow::getDC()
 {
-    if (!m_hdc)
+    if (!m_hdc) {
         m_hdc = GetDC(handle());
+        if (QGuiApplication::layoutDirection() == Qt::RightToLeft)
+            SetLayout(m_hdc, 0); // Clear RTL layout
+    }
     return m_hdc;
 }
 
@@ -2318,7 +2370,7 @@ void QWindowsWindow::propagateSizeHints()
 
 bool QWindowsWindow::handleGeometryChangingMessage(MSG *message, const QWindow *qWindow, const QMargins &margins)
 {
-    WINDOWPOS *windowPos = reinterpret_cast<WINDOWPOS *>(message->lParam);
+    auto *windowPos = reinterpret_cast<WINDOWPOS *>(message->lParam);
     if ((windowPos->flags & SWP_NOZORDER) == 0) {
         if (QWindowsWindow *platformWindow = QWindowsWindow::windowsWindowOf(qWindow)) {
             QWindow *parentWindow = qWindow->parent();
@@ -2900,14 +2952,14 @@ void QWindowsWindow::invalidateSurface()
         QVulkanInstance *inst = window()->vulkanInstance();
         if (inst)
             static_cast<QWindowsVulkanInstance *>(inst->handle())->destroySurface(m_vkSurface);
-        m_vkSurface = 0;
+        m_vkSurface = VK_NULL_HANDLE;
     }
 #endif
 #ifndef QT_NO_OPENGL
     if (m_surface) {
         if (QWindowsStaticOpenGLContext *staticOpenGLContext = QWindowsIntegration::staticOpenGLContext())
             staticOpenGLContext->destroyWindowSurface(m_surface);
-        m_surface = 0;
+        m_surface = nullptr;
     }
 #endif // QT_NO_OPENGL
 }
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index 958564aa86..7efbcf900c 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -89,7 +89,8 @@ struct QWindowCreationContext
     const QWindow *window;
     QRect requestedGeometryIn; // QWindow scaled
     QRect requestedGeometry; // after QPlatformWindow::initialGeometry()
-    QRect obtainedGeometry;
+    QPoint obtainedPos;
+    QSize obtainedSize;
     QMargins margins;
     QMargins customMargins;  // User-defined, additional frame for WM_NCCALCSIZE
     int frameX = CW_USEDEFAULT; // Passed on to CreateWindowEx(), including frame.
@@ -105,7 +106,7 @@ struct QWindowsWindowData
     QRect geometry;
     QMargins fullFrameMargins; // Do not use directly for windows, see FrameDirty.
     QMargins customMargins;    // User-defined, additional frame for NCCALCSIZE
-    HWND hwnd = 0;
+    HWND hwnd = nullptr;
     bool embedded = false;
     bool hasFrame = false;
 
@@ -116,7 +117,7 @@ struct QWindowsWindowData
 
 class QWindowsBaseWindow : public QPlatformWindow
 {
-    Q_DISABLE_COPY(QWindowsBaseWindow)
+    Q_DISABLE_COPY_MOVE(QWindowsBaseWindow)
 public:
     explicit QWindowsBaseWindow(QWindow *window) : QPlatformWindow(window) {}
 
@@ -134,6 +135,7 @@ public:
 
     unsigned style() const   { return GetWindowLongPtr(handle(), GWL_STYLE); }
     unsigned exStyle() const { return GetWindowLongPtr(handle(), GWL_EXSTYLE); }
+    static bool isRtlLayout(HWND hwnd);
 
     static QWindowsBaseWindow *baseWindowOf(const QWindow *w);
     static HWND handleOf(const QWindow *w);
@@ -355,7 +357,7 @@ private:
     inline void setParent_sys(const QPlatformWindow *parent);
     inline void updateTransientParent() const;
     void destroyWindow();
-    inline bool isDropSiteEnabled() const { return m_dropTarget != 0; }
+    inline bool isDropSiteEnabled() const { return m_dropTarget != nullptr; }
     void setDropSiteEnabled(bool enabled);
     void updateDropSite(bool topLevel);
     void handleGeometryChange();
@@ -366,7 +368,7 @@ private:
     mutable QWindowsWindowData m_data;
     QPointer<QWindowsMenuBar> m_menuBar;
     mutable unsigned m_flags = WithinCreate;
-    HDC m_hdc = 0;
+    HDC m_hdc = nullptr;
     Qt::WindowStates m_windowState = Qt::WindowNoState;
     qreal m_opacity = 1;
 #ifndef QT_NO_CURSOR
@@ -376,15 +378,15 @@ private:
     unsigned m_savedStyle = 0;
     QRect m_savedFrameGeometry;
     const QSurfaceFormat m_format;
-    HICON m_iconSmall = 0;
-    HICON m_iconBig = 0;
+    HICON m_iconSmall = nullptr;
+    HICON m_iconBig = nullptr;
     void *m_surface = nullptr;
 
     static bool m_screenForGLInitialized;
 
 #if QT_CONFIG(vulkan)
     // note: intentionally not using void * in order to avoid breaking x86
-    VkSurfaceKHR m_vkSurface = 0;
+    VkSurfaceKHR m_vkSurface = VK_NULL_HANDLE;
 #endif
     static bool m_borderInFullScreenDefault;
 };
@@ -399,18 +401,38 @@ QDebug operator<<(QDebug d, const WINDOWPOS &);
 QDebug operator<<(QDebug d, const GUID &guid);
 #endif // !QT_NO_DEBUG_STREAM
 
+static inline void clientToScreen(HWND hwnd, POINT *wP)
+{
+    if (QWindowsBaseWindow::isRtlLayout(hwnd)) {
+        RECT clientArea;
+        GetClientRect(hwnd, &clientArea);
+        wP->x = clientArea.right - wP->x;
+    }
+    ClientToScreen(hwnd, wP);
+}
+
+static inline void screenToClient(HWND hwnd, POINT *wP)
+{
+    ScreenToClient(hwnd, wP);
+    if (QWindowsBaseWindow::isRtlLayout(hwnd)) {
+        RECT clientArea;
+        GetClientRect(hwnd, &clientArea);
+        wP->x = clientArea.right - wP->x;
+    }
+}
+
 // ---------- QWindowsGeometryHint inline functions.
 QPoint QWindowsGeometryHint::mapToGlobal(HWND hwnd, const QPoint &qp)
 {
     POINT p = { qp.x(), qp.y() };
-    ClientToScreen(hwnd, &p);
+    clientToScreen(hwnd, &p);
     return QPoint(p.x, p.y);
 }
 
 QPoint QWindowsGeometryHint::mapFromGlobal(const HWND hwnd, const QPoint &qp)
 {
     POINT p = { qp.x(), qp.y() };
-    ScreenToClient(hwnd, &p);
+    screenToClient(hwnd, &p);
     return QPoint(p.x, p.y);
 }
 
@@ -449,11 +471,11 @@ inline void QWindowsWindow::destroyIcon()
 {
     if (m_iconBig) {
         DestroyIcon(m_iconBig);
-        m_iconBig = 0;
+        m_iconBig = nullptr;
     }
     if (m_iconSmall) {
         DestroyIcon(m_iconSmall);
-        m_iconSmall = 0;
+        m_iconSmall = nullptr;
     }
 }
 
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h
index 9caa7d6898..a20df28e3f 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h
@@ -57,7 +57,7 @@ class QAccessibleInterface;
 class QWindowsUiaBaseProvider : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QWindowsUiaBaseProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaBaseProvider)
 public:
     explicit QWindowsUiaBaseProvider(QAccessible::Id id);
     virtual ~QWindowsUiaBaseProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiagriditemprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiagriditemprovider.h
index 3d17056d38..3244122038 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiagriditemprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiagriditemprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaGridItemProvider : public QWindowsUiaBaseProvider,
                                     public QWindowsComBase<IGridItemProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaGridItemProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaGridItemProvider)
 public:
     explicit QWindowsUiaGridItemProvider(QAccessible::Id id);
     virtual ~QWindowsUiaGridItemProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h
index b96fc1a93c..0e5f81108e 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaGridProvider : public QWindowsUiaBaseProvider,
                                 public QWindowsComBase<IGridProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaGridProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaGridProvider)
 public:
     explicit QWindowsUiaGridProvider(QAccessible::Id id);
     virtual ~QWindowsUiaGridProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
index 5fb509c5f3..7d646894a1 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaInvokeProvider : public QWindowsUiaBaseProvider,
                                   public QWindowsComBase<IInvokeProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaInvokeProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaInvokeProvider)
 public:
     explicit QWindowsUiaInvokeProvider(QAccessible::Id id);
     virtual ~QWindowsUiaInvokeProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
index 5a05adbf81..b2b401dd40 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
@@ -82,7 +82,7 @@ QWindowsUiaMainProvider *QWindowsUiaMainProvider::providerForAccessible(QAccessi
 
     QAccessible::Id id = QAccessible::uniqueId(accessible);
     QWindowsUiaProviderCache *providerCache = QWindowsUiaProviderCache::instance();
-    QWindowsUiaMainProvider *provider = qobject_cast<QWindowsUiaMainProvider *>(providerCache->providerForId(id));
+    auto *provider = qobject_cast<QWindowsUiaMainProvider *>(providerCache->providerForId(id));
 
     if (provider) {
         provider->AddRef();
@@ -153,7 +153,7 @@ void QWindowsUiaMainProvider::notifyValueChange(QAccessibleValueChangeEvent *eve
                 int count = listacc->childCount();
                 for (int i = 0; i < count; ++i) {
                     QAccessibleInterface *item = listacc->child(i);
-                    if (item && item->text(QAccessible::Name) == event->value()) {
+                    if (item && item->isValid() && item->text(QAccessible::Name) == event->value()) {
                         if (!item->state().selected) {
                             if (QAccessibleActionInterface *actionInterface = item->actionInterface())
                                 actionInterface->doAction(QAccessibleActionInterface::toggleAction());
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
index df0d60f9c9..cdc239ed99 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
@@ -60,7 +60,7 @@ class QWindowsUiaMainProvider :
     public IRawElementProviderFragmentRoot
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QWindowsUiaMainProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaMainProvider)
 public:
     static QWindowsUiaMainProvider *providerForAccessible(QAccessibleInterface *accessible);
     explicit QWindowsUiaMainProvider(QAccessibleInterface *a, int initialRefCount = 1);
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h
index c5e0a03ee5..fc82d3a2cc 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaRangeValueProvider : public QWindowsUiaBaseProvider,
                                       public QWindowsComBase<IRangeValueProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaRangeValueProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaRangeValueProvider)
 public:
     explicit QWindowsUiaRangeValueProvider(QAccessible::Id id);
     virtual ~QWindowsUiaRangeValueProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h
index 1f2605188b..4b59c4e40f 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaSelectionItemProvider : public QWindowsUiaBaseProvider,
                                          public QWindowsComBase<ISelectionItemProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaSelectionItemProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaSelectionItemProvider)
 public:
     explicit QWindowsUiaSelectionItemProvider(QAccessible::Id id);
     virtual ~QWindowsUiaSelectionItemProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.h
index 0376d25804..ee1044ec7a 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaSelectionProvider : public QWindowsUiaBaseProvider,
                                      public QWindowsComBase<ISelectionProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaSelectionProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaSelectionProvider)
 public:
     explicit QWindowsUiaSelectionProvider(QAccessible::Id id);
     virtual ~QWindowsUiaSelectionProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatableitemprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatableitemprovider.h
index bf4b52ee0b..9804c35f8e 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatableitemprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatableitemprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaTableItemProvider : public QWindowsUiaBaseProvider,
                                      public QWindowsComBase<ITableItemProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaTableItemProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaTableItemProvider)
 public:
     explicit QWindowsUiaTableItemProvider(QAccessible::Id id);
     virtual ~QWindowsUiaTableItemProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h
index 94c8ab93a7..a8b16035ec 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaTableProvider : public QWindowsUiaBaseProvider,
                                  public QWindowsComBase<ITableProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaTableProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaTableProvider)
 public:
     explicit QWindowsUiaTableProvider(QAccessible::Id id);
     virtual ~QWindowsUiaTableProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.cpp
index 9d1e72fb78..50ecfc7ecd 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.cpp
@@ -100,7 +100,7 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaTextProvider::GetSelection(SAFEARRAY **pRet
             for (LONG i = 0; i < selCount; ++i) {
                 int startOffset = 0, endOffset = 0;
                 textInterface->selection((int)i, &startOffset, &endOffset);
-                QWindowsUiaTextRangeProvider *textRangeProvider = new QWindowsUiaTextRangeProvider(id(), startOffset, endOffset);
+                auto *textRangeProvider = new QWindowsUiaTextRangeProvider(id(), startOffset, endOffset);
                 SafeArrayPutElement(*pRetVal, &i, static_cast<IUnknown *>(textRangeProvider));
                 textRangeProvider->Release();
             }
@@ -110,7 +110,7 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaTextProvider::GetSelection(SAFEARRAY **pRet
         if ((*pRetVal = SafeArrayCreateVector(VT_UNKNOWN, 0, 1))) {
             LONG i = 0;
             int cursorPosition = textInterface->cursorPosition();
-            QWindowsUiaTextRangeProvider *textRangeProvider = new QWindowsUiaTextRangeProvider(id(), cursorPosition, cursorPosition);
+            auto *textRangeProvider = new QWindowsUiaTextRangeProvider(id(), cursorPosition, cursorPosition);
             SafeArrayPutElement(*pRetVal, &i, static_cast<IUnknown *>(textRangeProvider));
             textRangeProvider->Release();
         }
@@ -138,7 +138,7 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaTextProvider::GetVisibleRanges(SAFEARRAY **
     // Considering the entire text as visible.
     if ((*pRetVal = SafeArrayCreateVector(VT_UNKNOWN, 0, 1))) {
         LONG i = 0;
-        QWindowsUiaTextRangeProvider *textRangeProvider = new QWindowsUiaTextRangeProvider(id(), 0, textInterface->characterCount());
+        auto *textRangeProvider = new QWindowsUiaTextRangeProvider(id(), 0, textInterface->characterCount());
         SafeArrayPutElement(*pRetVal, &i, static_cast<IUnknown *>(textRangeProvider));
         textRangeProvider->Release();
     }
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h
index a9be70fa16..ffab48b0e8 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaTextProvider : public QWindowsUiaBaseProvider,
                                 public QWindowsComBase<ITextProvider2>
 {
-    Q_DISABLE_COPY(QWindowsUiaTextProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaTextProvider)
 public:
     explicit QWindowsUiaTextProvider(QAccessible::Id id);
     ~QWindowsUiaTextProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.cpp
index 1be186f6b3..d8b8f7281d 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.cpp
@@ -48,6 +48,7 @@
 #include <QtGui/qaccessible.h>
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qvarlengtharray.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -92,7 +93,7 @@ HRESULT QWindowsUiaTextRangeProvider::Compare(ITextRangeProvider *range, BOOL *p
     if (!range || !pRetVal)
         return E_INVALIDARG;
 
-    QWindowsUiaTextRangeProvider *targetProvider = static_cast<QWindowsUiaTextRangeProvider *>(range);
+    auto *targetProvider = static_cast<QWindowsUiaTextRangeProvider *>(range);
     *pRetVal = ((targetProvider->m_startOffset == m_startOffset) && (targetProvider->m_endOffset == m_endOffset));
     return S_OK;
 }
@@ -110,7 +111,7 @@ HRESULT QWindowsUiaTextRangeProvider::CompareEndpoints(TextPatternRangeEndpoint
     if (!targetRange || !pRetVal)
         return E_INVALIDARG;
 
-    QWindowsUiaTextRangeProvider *targetProvider = static_cast<QWindowsUiaTextRangeProvider *>(targetRange);
+    auto *targetProvider = static_cast<QWindowsUiaTextRangeProvider *>(targetRange);
 
     int point = (endpoint == TextPatternRangeEndpoint_Start) ? m_startOffset : m_endOffset;
     int targetPoint = (targetEndpoint == TextPatternRangeEndpoint_Start) ?
@@ -227,7 +228,7 @@ HRESULT QWindowsUiaTextRangeProvider::GetBoundingRectangles(SAFEARRAY **pRetVal)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
     int len = textInterface->characterCount();
-    QList<QRect> rectList;
+    QVarLengthArray<QRect> rectList;
 
     if ((m_startOffset >= 0) && (m_endOffset <= len) && (m_startOffset < m_endOffset)) {
         int start, end;
@@ -373,7 +374,7 @@ HRESULT QWindowsUiaTextRangeProvider::MoveEndpointByRange(TextPatternRangeEndpoi
     qCDebug(lcQpaUiAutomation) << __FUNCTION__
         << "endpoint=" << endpoint << "targetRange=" << targetRange << "targetEndpoint=" << targetEndpoint << "this: " << this;
 
-    QWindowsUiaTextRangeProvider *targetProvider = static_cast<QWindowsUiaTextRangeProvider *>(targetRange);
+    auto *targetProvider = static_cast<QWindowsUiaTextRangeProvider *>(targetRange);
 
     int targetPoint = (targetEndpoint == TextPatternRangeEndpoint_Start) ?
                 targetProvider->m_startOffset : targetProvider->m_endOffset;
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h
index 39b9069fc0..3b4ec63ceb 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaTextRangeProvider : public QWindowsUiaBaseProvider,
                                      public QWindowsComBase<ITextRangeProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaTextRangeProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaTextRangeProvider)
 public:
     explicit QWindowsUiaTextRangeProvider(QAccessible::Id id, int startOffset, int endOffset);
     virtual ~QWindowsUiaTextRangeProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatoggleprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatoggleprovider.h
index 2bed6f7e36..892b635b41 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatoggleprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatoggleprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaToggleProvider : public QWindowsUiaBaseProvider,
                                   public QWindowsComBase<IToggleProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaToggleProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaToggleProvider)
 public:
     explicit QWindowsUiaToggleProvider(QAccessible::Id id);
     virtual ~QWindowsUiaToggleProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h
index 334a17e51d..3edfe7a08b 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaValueProvider : public QWindowsUiaBaseProvider,
                                  public QWindowsComBase<IValueProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaValueProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaValueProvider)
 public:
     explicit QWindowsUiaValueProvider(QAccessible::Id id);
     virtual ~QWindowsUiaValueProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/uiautomation.pri b/src/plugins/platforms/windows/uiautomation/uiautomation.pri
index 5d4fa5755b..ee9332e7ea 100644
--- a/src/plugins/platforms/windows/uiautomation/uiautomation.pri
+++ b/src/plugins/platforms/windows/uiautomation/uiautomation.pri
@@ -41,5 +41,4 @@ HEADERS += \
     $$PWD/qwindowsuiawindowprovider.h \
     $$PWD/qwindowsuiautils.h
 
-mingw: LIBS *= -luuid
-
+mingw: QMAKE_USE *= uuid
diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
index 7004d7e854..95ba961df1 100644
--- a/src/plugins/platforms/windows/windows.pri
+++ b/src/plugins/platforms/windows/windows.pri
@@ -1,15 +1,21 @@
 # Note: OpenGL32 must precede Gdi32 as it overwrites some functions.
-LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+LIBS += -lwinspool -limm32 -loleaut32
 
 QT_FOR_CONFIG += gui
 
 qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32
 
-mingw: LIBS *= -luuid
+mingw: QMAKE_USE *= uuid
 # For the dialog helpers:
-LIBS += -lshlwapi -lshell32 -ladvapi32 -lwtsapi32
-
-QMAKE_USE_PRIVATE += d3d9/nolink
+LIBS += -lshlwapi -lwtsapi32
+
+QMAKE_USE_PRIVATE += \
+    advapi32 \
+    d3d9/nolink \
+    ole32 \
+    shell32 \
+    user32 \
+    winmm
 
 DEFINES *= QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
 
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index 174bc7b609..50a3bb41a9 100644
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
@@ -8,7 +8,8 @@ QT += \
 qtConfig(accessibility): QT += accessibility_support-private
 qtConfig(vulkan): QT += vulkan_support-private
 
-LIBS += -lgdi32 -ldwmapi
+LIBS += -ldwmapi
+QMAKE_USE_PRIVATE += gdi32
 
 include(windows.pri)
 
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp
index 342e142a74..86ab7651c6 100644
--- a/src/plugins/platforms/winrt/qwinrtscreen.cpp
+++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp
@@ -1091,7 +1091,7 @@ HRESULT QWinRTScreen::onPointerEntered(ICoreWindow *, IPointerEventArgs *args)
 
         d->currentTargetWindow = topWindow();
         if (d->mouseGrabWindow)
-            d->currentTargetWindow = d->mouseGrabWindow.load()->window();
+            d->currentTargetWindow = d->mouseGrabWindow.loadRelaxed()->window();
 
         qCDebug(lcQpaEvents) << __FUNCTION__ << "handleEnterEvent" << d->currentTargetWindow << pos;
         QWindowSystemInterface::handleEnterEvent(d->currentTargetWindow, pos, pos);
@@ -1115,7 +1115,7 @@ HRESULT QWinRTScreen::onPointerExited(ICoreWindow *, IPointerEventArgs *args)
     d->touchPoints.remove(id);
 
     if (d->mouseGrabWindow)
-        d->currentTargetWindow = d->mouseGrabWindow.load()->window();
+        d->currentTargetWindow = d->mouseGrabWindow.loadRelaxed()->window();
 
     qCDebug(lcQpaEvents) << __FUNCTION__ << "handleLeaveEvent" << d->currentTargetWindow;
     QWindowSystemInterface::handleLeaveEvent(d->currentTargetWindow);
@@ -1146,7 +1146,7 @@ HRESULT QWinRTScreen::onPointerUpdated(ICoreWindow *, IPointerEventArgs *args)
     d->currentTargetWindow = windowUnderPointer;
 
     if (d->mouseGrabWindow)
-        d->currentTargetWindow = d->mouseGrabWindow.load()->window();
+        d->currentTargetWindow = d->mouseGrabWindow.loadRelaxed()->window();
 
     if (d->currentTargetWindow) {
         const QPointF globalPosDelta = pos - posPoint;
@@ -1348,7 +1348,7 @@ void QWinRTScreen::emulateMouseMove(const QPointF &point, MousePositionTransitio
     d->currentTargetWindow = windowUnderPointer;
 
     if (d->mouseGrabWindow)
-        d->currentTargetWindow = d->mouseGrabWindow.load()->window();
+        d->currentTargetWindow = d->mouseGrabWindow.loadRelaxed()->window();
 
     if (d->currentTargetWindow) {
         const QPointF globalPosDelta = pos - posPoint;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiagriditemprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiagriditemprovider.cpp
index 524000b618..355dbf7d20 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiagriditemprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiagriditemprovider.cpp
@@ -51,6 +51,8 @@
 #include <QtCore/QString>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QWinRTUiAutomation;
@@ -105,19 +107,17 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaGridItemProvider::get_ContainingGrid(IIRawEle
     *value = nullptr;
 
     auto accid = id();
-    auto elementId = QSharedPointer<QAccessible::Id>(new QAccessible::Id(0));
-    auto ptrElementId = new QSharedPointer<QAccessible::Id>(elementId);
+    auto elementId = std::make_shared<QAccessible::Id>(0);
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrElementId]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, elementId]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             if (QAccessibleTableCellInterface *tableCellInterface = accessible->tableCellInterface()) {
                 if (QAccessibleInterface *table = tableCellInterface->table()) {
-                    **ptrElementId = idForAccessible(table);
-                    QWinRTUiaMetadataCache::instance()->load(**ptrElementId);
+                    *elementId = idForAccessible(table);
+                    QWinRTUiaMetadataCache::instance()->load(*elementId);
                 }
             }
         }
-        delete ptrElementId;
         return S_OK;
     }))) {
         return E_FAIL;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiagridprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiagridprovider.cpp
index e469991de2..3bd90f6850 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiagridprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiagridprovider.cpp
@@ -51,6 +51,8 @@
 #include <QtCore/QString>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QWinRTUiAutomation;
@@ -104,21 +106,19 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaGridProvider::GetItem(INT32 row, INT32 column
     *returnValue = nullptr;
 
     auto accid = id();
-    auto elementId = QSharedPointer<QAccessible::Id>(new QAccessible::Id(0));
-    auto ptrElementId = new QSharedPointer<QAccessible::Id>(elementId);
+    auto elementId = std::make_shared<QAccessible::Id>(0);
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, row, column, ptrElementId]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, row, column, elementId]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             if (QAccessibleTableInterface *tableInterface = accessible->tableInterface()) {
                 if ((row >= 0) && (row < tableInterface->rowCount()) && (column >= 0) && (column < tableInterface->columnCount())) {
                     if (QAccessibleInterface *cell = tableInterface->cellAt(row, column)) {
-                        **ptrElementId = idForAccessible(cell);
-                        QWinRTUiaMetadataCache::instance()->load(**ptrElementId);
+                        *elementId = idForAccessible(cell);
+                        QWinRTUiaMetadataCache::instance()->load(*elementId);
                     }
                 }
             }
         }
-        delete ptrElementId;
         return S_OK;
     }))) {
         return E_FAIL;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiamainprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiamainprovider.cpp
index 6f3ad6dcd2..0b1db306bd 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiamainprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiamainprovider.cpp
@@ -64,6 +64,8 @@
 #include <QtCore/qfunctions_winrt.h>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 using namespace QWinRTUiAutomation;
 using namespace Microsoft::WRL;
 using namespace Microsoft::WRL::Wrappers;
@@ -179,7 +181,7 @@ HRESULT QWinRTUiaMainProvider::rawProviderForAccessibleId(QAccessible::Id elemen
 }
 
 // Returns an array of IIRawElementProviderSimple instances for a list of accessible interface ids.
-HRESULT QWinRTUiaMainProvider::rawProviderArrayForAccessibleIdList(const QList<QAccessible::Id> &elementIds,
+HRESULT QWinRTUiaMainProvider::rawProviderArrayForAccessibleIdList(const QVarLengthArray<QAccessible::Id> &elementIds,
                                                                    UINT32 *returnValueSize,
                                                                    IIRawElementProviderSimple ***returnValue)
 {
@@ -190,7 +192,7 @@ HRESULT QWinRTUiaMainProvider::rawProviderArrayForAccessibleIdList(const QList<Q
 
     QList<IIRawElementProviderSimple *> rawProviderList;
 
-    for (auto elementId : qAsConst(elementIds)) {
+    for (auto elementId : elementIds) {
         IIRawElementProviderSimple *rawProvider;
         if (SUCCEEDED(rawProviderForAccessibleId(elementId, &rawProvider)))
             rawProviderList.append(rawProvider);
@@ -515,10 +517,9 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaMainProvider::GetChildrenCore(IVector<Automat
     *returnValue = nullptr;
 
     auto accid = id();
-    auto children = QSharedPointer<QList<QAccessible::Id>>(new QList<QAccessible::Id>);
-    auto ptrChildren = new QSharedPointer<QList<QAccessible::Id>>(children);
+    auto children = std::make_shared<QVarLengthArray<QAccessible::Id>>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrChildren]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, children]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             int childCount = accessible->childCount();
             for (int i = 0; i < childCount; ++i) {
@@ -526,11 +527,10 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaMainProvider::GetChildrenCore(IVector<Automat
                     QAccessible::Id childId = idForAccessible(childAcc);
                     QWinRTUiaMetadataCache::instance()->load(childId);
                     if (!childAcc->state().invisible)
-                        (*ptrChildren)->append(childId);
+                        children->append(childId);
                 }
             }
         }
-        delete ptrChildren;
         return S_OK;
     }))) {
         return E_FAIL;
@@ -538,7 +538,7 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaMainProvider::GetChildrenCore(IVector<Automat
 
     ComPtr<IVector<AutomationPeer *>> peerVector = Make<QWinRTUiaPeerVector>();
 
-    for (auto childId : qAsConst(*children)) {
+    for (auto childId : *children) {
         if (ComPtr<QWinRTUiaMainProvider> provider = providerForAccessibleId(childId)) {
             IAutomationPeer *peer;
             if (SUCCEEDED(provider.CopyTo(&peer)))
@@ -750,10 +750,9 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaMainProvider::GetPeerFromPointCore(ABI::Windo
     // Scale coordinates from High DPI screens?
 
     auto accid = id();
-    auto elementId = QSharedPointer<QAccessible::Id>(new QAccessible::Id(0));
-    auto ptrElementId = new QSharedPointer<QAccessible::Id>(elementId);
+    auto elementId = std::make_shared<QAccessible::Id>(0);
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrElementId, point]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, elementId, point]() {
         // Controls can be embedded within grouping elements. By default returns the innermost control.
         QAccessibleInterface *target = accessibleForId(accid);
         while (QAccessibleInterface *tmpacc = target->childAt(point.X, point.Y)) {
@@ -761,9 +760,8 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaMainProvider::GetPeerFromPointCore(ABI::Windo
             // For accessibility tools it may be better to return the text element instead of its subcomponents.
             if (target->textInterface()) break;
         }
-        **ptrElementId = idForAccessible(target);
-        QWinRTUiaMetadataCache::instance()->load(**ptrElementId);
-        delete ptrElementId;
+        *elementId = idForAccessible(target);
+        QWinRTUiaMetadataCache::instance()->load(*elementId);
         return S_OK;
     }))) {
         return E_FAIL;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiamainprovider.h b/src/plugins/platforms/winrt/uiautomation/qwinrtuiamainprovider.h
index 384a166cf7..23a6e56ae7 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiamainprovider.h
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiamainprovider.h
@@ -69,7 +69,7 @@ public:
     virtual ~QWinRTUiaMainProvider();
     static QWinRTUiaMainProvider *providerForAccessibleId(QAccessible::Id id);
     static HRESULT rawProviderForAccessibleId(QAccessible::Id elementId, ABI::Windows::UI::Xaml::Automation::Provider::IIRawElementProviderSimple **returnValue);
-    static HRESULT rawProviderArrayForAccessibleIdList(const QList<QAccessible::Id> &elementIds, UINT32 *returnValueSize, ABI::Windows::UI::Xaml::Automation::Provider::IIRawElementProviderSimple ***returnValue);
+    static HRESULT rawProviderArrayForAccessibleIdList(const QVarLengthArray<QAccessible::Id> &elementIds, UINT32 *returnValueSize, ABI::Windows::UI::Xaml::Automation::Provider::IIRawElementProviderSimple ***returnValue);
     static void notifyFocusChange(QAccessibleEvent *event);
     static void notifyVisibilityChange(QAccessibleEvent *event);
     static void notifyStateChange(QAccessibleStateChangeEvent *event);
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiaselectionitemprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiaselectionitemprovider.cpp
index 9bc88272ba..2cb5aa685c 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiaselectionitemprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiaselectionitemprovider.cpp
@@ -51,6 +51,8 @@
 #include <QtCore/QString>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QWinRTUiAutomation;
@@ -94,21 +96,19 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaSelectionItemProvider::get_SelectionContainer
     *value = nullptr;
 
     auto accid = id();
-    auto elementId = QSharedPointer<QAccessible::Id>(new QAccessible::Id(0));
-    auto ptrElementId = new QSharedPointer<QAccessible::Id>(elementId);
+    auto elementId = std::make_shared<QAccessible::Id>(0);
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrElementId]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, elementId]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             // Radio buttons do not require a container.
             if (accessible->role() == QAccessible::ListItem) {
                 if (QAccessibleInterface *parent = accessible->parent()) {
                     if (parent->role() == QAccessible::List) {
-                        **ptrElementId = idForAccessible(parent);
+                        *elementId = idForAccessible(parent);
                     }
                 }
             }
         }
-        delete ptrElementId;
         return S_OK;
     }))) {
         return E_FAIL;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiaselectionprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiaselectionprovider.cpp
index 9e61a8df61..4d825351c8 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiaselectionprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiaselectionprovider.cpp
@@ -51,6 +51,8 @@
 #include <QtCore/QString>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QWinRTUiAutomation;
@@ -89,10 +91,9 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaSelectionProvider::get_IsSelectionRequired(bo
     *value = false;
 
     auto accid = id();
-    auto selectionRequired = QSharedPointer<bool>(new bool(false));
-    auto ptrSelectionRequired = new QSharedPointer<bool>(selectionRequired);
+    auto selectionRequired = std::make_shared<bool>(false);
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrSelectionRequired]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, selectionRequired]() {
         // Initially returns false if none are selected. After the first selection, it may be required.
         bool anySelected = false;
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
@@ -105,9 +106,8 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaSelectionProvider::get_IsSelectionRequired(bo
                      }
                 }
             }
-            **ptrSelectionRequired = anySelected && !accessible->state().multiSelectable && !accessible->state().extSelectable;
+            *selectionRequired = anySelected && !accessible->state().multiSelectable && !accessible->state().extSelectable;
         }
-        delete ptrSelectionRequired;
         return S_OK;
     }))) {
         return E_FAIL;
@@ -128,10 +128,9 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaSelectionProvider::GetSelection(UINT32 *retur
     *returnValue = nullptr;
 
     auto accid = id();
-    auto elementIds = QSharedPointer<QList<QAccessible::Id>>(new QList<QAccessible::Id>);
-    auto ptrElementIds = new QSharedPointer<QList<QAccessible::Id>>(elementIds);
+    auto elementIds = std::make_shared<QVarLengthArray<QAccessible::Id>>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrElementIds]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, elementIds]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             int childCount = accessible->childCount();
             for (int i = 0; i < childCount; ++i) {
@@ -139,12 +138,11 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaSelectionProvider::GetSelection(UINT32 *retur
                      if (childAcc->state().selected) {
                          QAccessible::Id childId = idForAccessible(childAcc);
                          QWinRTUiaMetadataCache::instance()->load(childId);
-                         (*ptrElementIds)->append(childId);
+                         elementIds->append(childId);
                      }
                 }
             }
         }
-        delete ptrElementIds;
         return S_OK;
     }))) {
         return E_FAIL;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiatableitemprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiatableitemprovider.cpp
index 1af74a8b72..7cd953de87 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiatableitemprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiatableitemprovider.cpp
@@ -51,6 +51,8 @@
 #include <QtCore/QString>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QWinRTUiAutomation;
@@ -79,21 +81,19 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTableItemProvider::GetColumnHeaderItems(UINT3
     *returnValue = nullptr;
 
     auto accid = id();
-    auto elementIds = QSharedPointer<QList<QAccessible::Id>>(new QList<QAccessible::Id>);
-    auto ptrElementIds = new QSharedPointer<QList<QAccessible::Id>>(elementIds);
+    auto elementIds = std::make_shared<QVarLengthArray<QAccessible::Id>>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrElementIds]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, elementIds]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             if (QAccessibleTableCellInterface *tableCellInterface = accessible->tableCellInterface()) {
                 QList<QAccessibleInterface *> headers = tableCellInterface->columnHeaderCells();
                 for (auto header : qAsConst(headers)) {
                     QAccessible::Id headerId = idForAccessible(header);
                     QWinRTUiaMetadataCache::instance()->load(headerId);
-                    (*ptrElementIds)->append(headerId);
+                    elementIds->append(headerId);
                 }
             }
         }
-        delete ptrElementIds;
         return S_OK;
     }))) {
         return E_FAIL;
@@ -113,21 +113,19 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTableItemProvider::GetRowHeaderItems(UINT32 *
     *returnValue = nullptr;
 
     auto accid = id();
-    auto elementIds = QSharedPointer<QList<QAccessible::Id>>(new QList<QAccessible::Id>);
-    auto ptrElementIds = new QSharedPointer<QList<QAccessible::Id>>(elementIds);
+    auto elementIds = std::make_shared<QVarLengthArray<QAccessible::Id>>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrElementIds]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, elementIds]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             if (QAccessibleTableCellInterface *tableCellInterface = accessible->tableCellInterface()) {
                 QList<QAccessibleInterface *> headers = tableCellInterface->rowHeaderCells();
                 for (auto header : qAsConst(headers)) {
                     QAccessible::Id headerId = idForAccessible(header);
                     QWinRTUiaMetadataCache::instance()->load(headerId);
-                    (*ptrElementIds)->append(headerId);
+                    elementIds->append(headerId);
                 }
             }
         }
-        delete ptrElementIds;
         return S_OK;
     }))) {
         return E_FAIL;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiatableprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiatableprovider.cpp
index e71ade3c1f..d763b320b1 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiatableprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiatableprovider.cpp
@@ -51,6 +51,8 @@
 #include <QtCore/QString>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QWinRTUiAutomation;
@@ -91,10 +93,9 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTableProvider::GetColumnHeaders(UINT32 *retur
     *returnValue = nullptr;
 
     auto accid = id();
-    auto elementIds = QSharedPointer<QList<QAccessible::Id>>(new QList<QAccessible::Id>);
-    auto ptrElementIds = new QSharedPointer<QList<QAccessible::Id>>(elementIds);
+    auto elementIds = std::make_shared<QVarLengthArray<QAccessible::Id>>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrElementIds]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, elementIds]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             if (QAccessibleTableInterface *tableInterface = accessible->tableInterface()) {
                 for (int i = 0; i < tableInterface->columnCount(); ++i) {
@@ -105,14 +106,13 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTableProvider::GetColumnHeaders(UINT32 *retur
                             for (auto header : qAsConst(headers)) {
                                 QAccessible::Id headerId = idForAccessible(header);
                                 QWinRTUiaMetadataCache::instance()->load(headerId);
-                                (*ptrElementIds)->append(headerId);
+                                elementIds->append(headerId);
                             }
                         }
                     }
                 }
             }
         }
-        delete ptrElementIds;
         return S_OK;
     }))) {
         return E_FAIL;
@@ -132,10 +132,9 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTableProvider::GetRowHeaders(UINT32 *returnVa
     *returnValue = nullptr;
 
     auto accid = id();
-    auto elementIds = QSharedPointer<QList<QAccessible::Id>>(new QList<QAccessible::Id>);
-    auto ptrElementIds = new QSharedPointer<QList<QAccessible::Id>>(elementIds);
+    auto elementIds = std::make_shared<QVarLengthArray<QAccessible::Id>>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrElementIds]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, elementIds]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             if (QAccessibleTableInterface *tableInterface = accessible->tableInterface()) {
                 for (int i = 0; i < tableInterface->rowCount(); ++i) {
@@ -146,14 +145,13 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTableProvider::GetRowHeaders(UINT32 *returnVa
                             for (auto header : qAsConst(headers)) {
                                 QAccessible::Id headerId = idForAccessible(header);
                                 QWinRTUiaMetadataCache::instance()->load(headerId);
-                                (*ptrElementIds)->append(headerId);
+                                elementIds->append(headerId);
                             }
                         }
                     }
                 }
             }
         }
-        delete ptrElementIds;
         return S_OK;
     }))) {
         return E_FAIL;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiatextprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiatextprovider.cpp
index aa120377df..cd7420f360 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiatextprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiatextprovider.cpp
@@ -51,6 +51,8 @@
 #include <QtCore/QString>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QWinRTUiAutomation;
@@ -104,26 +106,26 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTextProvider::GetSelection(UINT32 *returnValu
     *returnValueSize = 0;
     *returnValue = nullptr;
 
+    struct Selection { int startOffset, endOffset; };
+
     auto accid = id();
-    auto selections = QSharedPointer<QList<QPair<int,int>>>(new QList<QPair<int,int>>);
-    auto ptrSelections = new QSharedPointer<QList<QPair<int,int>>>(selections);
+    auto selections = std::make_shared<QVarLengthArray<Selection>>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, ptrSelections]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, selections]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             if (QAccessibleTextInterface *textInterface = accessible->textInterface()) {
                 for (int i = 0; i < textInterface->selectionCount(); ++i) {
-                    QPair<int,int> sel;
-                    textInterface->selection(i, &sel.first, &sel.second);
-                    (*ptrSelections)->append(sel);
+                    int startOffset, endOffset;
+                    textInterface->selection(i, &startOffset, &endOffset);
+                    selections->append({startOffset, endOffset});
                 }
-                if ((*ptrSelections)->size() == 0) {
+                if (selections->size() == 0) {
                     // If there is no selection, we return an array with a single degenerate (empty) text range at the cursor position.
-                    QPair<int,int> sel(textInterface->cursorPosition(), textInterface->cursorPosition());
-                    (*ptrSelections)->append(sel);
+                    auto cur = textInterface->cursorPosition();
+                    selections->append({cur, cur});
                 }
             }
         }
-        delete ptrSelections;
         return S_OK;
     }))) {
         return E_FAIL;
@@ -137,9 +139,11 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTextProvider::GetSelection(UINT32 *returnValu
     if (!providerArray)
         return E_OUTOFMEMORY;
 
-    for (int i = 0; i < selCount; ++i) {
-        ComPtr<QWinRTUiaTextRangeProvider> textRangeProvider = Make<QWinRTUiaTextRangeProvider>(id(), (*selections)[i].first, (*selections)[i].second);
-        textRangeProvider.CopyTo(&providerArray[i]);
+    auto dst = providerArray;
+    for (auto sel : *selections) {
+        ComPtr<QWinRTUiaTextRangeProvider> textRangeProvider
+                = Make<QWinRTUiaTextRangeProvider>(id(), sel.startOffset, sel.endOffset);
+        textRangeProvider.CopyTo(dst++);
     }
     *returnValueSize = selCount;
     *returnValue = providerArray;
@@ -184,14 +188,12 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTextProvider::RangeFromPoint(ABI::Windows::Fo
 
     const QPoint pt(screenLocation.X, screenLocation.Y);
     auto accid = id();
-    auto offset = QSharedPointer<int>(new int);
-    auto ptrOffset = new QSharedPointer<int>(offset);
+    auto offset = std::make_shared<int>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, pt, ptrOffset]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, pt, offset]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid))
             if (QAccessibleTextInterface *textInterface = accessible->textInterface())
-                **ptrOffset = qBound(0, textInterface->offsetAtPoint(pt), textInterface->characterCount() - 1);
-        delete ptrOffset;
+                *offset = qBound(0, textInterface->offsetAtPoint(pt), textInterface->characterCount() - 1);
         return S_OK;
     }))) {
         return E_FAIL;
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiatextrangeprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiatextrangeprovider.cpp
index fc3778d652..ca15feaff9 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiatextrangeprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiatextrangeprovider.cpp
@@ -51,6 +51,8 @@
 #include <QtCore/QString>
 #include <QtCore/private/qeventdispatcher_winrt_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 using namespace QWinRTUiAutomation;
@@ -212,10 +214,9 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTextRangeProvider::GetBoundingRectangles(UINT
     auto accid = id();
     auto startOffset = m_startOffset;
     auto endOffset = m_endOffset;
-    auto rects = QSharedPointer<QList<QRect>>(new QList<QRect>);
-    auto ptrRects = new QSharedPointer<QList<QRect>>(rects);
+    auto rects = std::make_shared<QVarLengthArray<QRect>>();
 
-    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, startOffset, endOffset, ptrRects]() {
+    if (!SUCCEEDED(QEventDispatcherWinRT::runOnMainThread([accid, startOffset, endOffset, rects]() {
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
             if (QAccessibleTextInterface *textInterface = accessible->textInterface()) {
                 int len = textInterface->characterCount();
@@ -233,7 +234,7 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTextRangeProvider::GetBoundingRectangles(UINT
                                                  qMin(startRect.y(), endRect.y()),
                                                  qMax(startRect.x() + startRect.width(), endRect.x() + endRect.width()) - qMin(startRect.x(), endRect.x()),
                                                  qMax(startRect.y() + startRect.height(), endRect.y() + endRect.height()) - qMin(startRect.y(), endRect.y()));
-                            (*ptrRects)->append(lineRect);
+                            rects->append(lineRect);
                         }
                         if (end >= len) break;
                         textInterface->textAfterOffset(end + 1, QAccessible::LineBoundary, &start, &end);
@@ -241,7 +242,6 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTextRangeProvider::GetBoundingRectangles(UINT
                 }
             }
         }
-        delete ptrRects;
         return S_OK;
     }))) {
         return E_FAIL;
@@ -251,11 +251,12 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaTextRangeProvider::GetBoundingRectangles(UINT
     if (!doubleArray)
         return E_OUTOFMEMORY;
 
-    for (int i = 0; i < rects->size(); ++i) {
-        doubleArray[i*4] = (*rects)[i].left();
-        doubleArray[i*4+1] = (*rects)[i].top();
-        doubleArray[i*4+2] = (*rects)[i].width();
-        doubleArray[i*4+3] = (*rects)[i].height();
+    DOUBLE *dst = doubleArray;
+    for (auto rect : *rects) {
+        *dst++ = rect.left();
+        *dst++ = rect.top();
+        *dst++ = rect.width();
+        *dst++ = rect.height();
     }
     *returnValue = doubleArray;
     *returnValueSize = 4 * rects->size();
diff --git a/src/plugins/platforms/winrt/uiautomation/qwinrtuiavalueprovider.cpp b/src/plugins/platforms/winrt/uiautomation/qwinrtuiavalueprovider.cpp
index 21389b74d2..255d8ee49e 100644
--- a/src/plugins/platforms/winrt/uiautomation/qwinrtuiavalueprovider.cpp
+++ b/src/plugins/platforms/winrt/uiautomation/qwinrtuiavalueprovider.cpp
@@ -96,24 +96,22 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaValueProvider::SetValue(HSTRING value)
     qCDebug(lcQpaUiAutomation) << __FUNCTION__;
 
     auto accid = id();
-    auto tmpValue = QSharedPointer<QString>(new QString);
-    auto ptrValue = new QSharedPointer<QString>(tmpValue);
 
-    *tmpValue = hStrToQStr(value);
+    QString tmpValue = hStrToQStr(value);
 
-    QEventDispatcherWinRT::runOnMainThread([accid, ptrValue]() {
+    QEventDispatcherWinRT::runOnMainThread([accid, tmpValue]() {
 
         if (QAccessibleInterface *accessible = accessibleForId(accid)) {
 
             // First sets the value as a text.
-            accessible->setText(QAccessible::Value, **ptrValue);
+            accessible->setText(QAccessible::Value, tmpValue);
 
             // Then, if the control supports the value interface (range value)
             // and the supplied text can be converted to a number, and that number
             // lies within the min/max limits, sets it as the control's current (numeric) value.
             if (QAccessibleValueInterface *valueInterface = accessible->valueInterface()) {
                 bool ok = false;
-                double numval = (*ptrValue)->toDouble(&ok);
+                double numval = tmpValue.toDouble(&ok);
                 if (ok) {
                     double minimum = valueInterface->minimumValue().toDouble();
                     double maximum = valueInterface->maximumValue().toDouble();
@@ -124,7 +122,6 @@ HRESULT STDMETHODCALLTYPE QWinRTUiaValueProvider::SetValue(HSTRING value)
             }
         }
         QWinRTUiaMetadataCache::instance()->load(accid);
-        delete ptrValue;
         return S_OK;
     }, 0);
 
diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro
index 43132a1a76..43dc8f074c 100644
--- a/src/plugins/platforms/winrt/winrt.pro
+++ b/src/plugins/platforms/winrt/winrt.pro
@@ -8,8 +8,7 @@ QT += \
 
 DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__
 
-LIBS += -lws2_32
-QMAKE_USE_PRIVATE += d3d11
+QMAKE_USE_PRIVATE += d3d11 ws2_32
 
 SOURCES = \
     main.cpp  \
diff --git a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationplugin.h b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationplugin.h
index d5a0af97b0..b18248570f 100644
--- a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationplugin.h
+++ b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationplugin.h
@@ -54,7 +54,7 @@ class Q_XCB_EXPORT QXcbGlIntegrationPlugin : public QObject
 {
     Q_OBJECT
 public:
-        explicit QXcbGlIntegrationPlugin(QObject *parent = 0)
+        explicit QXcbGlIntegrationPlugin(QObject *parent = nullptr)
             : QObject(parent)
         { }
 
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
index b751aaf8a3..34895caaa2 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
@@ -164,7 +164,11 @@ bool QXcbGlxIntegration::handleXcbEvent(xcb_generic_event_t *event, uint respons
                 XUnlockDisplay(xdisplay);
                 locked = false;
                 auto eventType = m_connection->nativeInterface()->nativeEventType();
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                qintptr result = 0;
+#  else
                 long result = 0;
+#  endif
                 handled = dispatcher->filterNativeEvent(eventType, &ev, &result);
             }
 #endif
diff --git a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
index 8d958aae94..82b6d60bcd 100644
--- a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
@@ -455,7 +455,7 @@ static const uchar base_dither_matrix[DITHER_SIZE][DITHER_SIZE] = {
 static QPixmap qt_patternForAlpha(uchar alpha, int screen)
 {
     QPixmap pm;
-    QString key = QLatin1Literal("$qt-alpha-brush$")
+    QString key = QLatin1String("$qt-alpha-brush$")
                   % HexString<uchar>(alpha)
                   % HexString<int>(screen);
 
diff --git a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp
index b1ce39f363..f86bedbdcd 100644
--- a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp
@@ -2017,7 +2017,7 @@ QImage QX11PlatformPixmap::toImage(const QXImageWrapper &xiWrapper, const QRect
         }
     } else if (xi->bits_per_pixel == d) {        // compatible depth
         char *xidata = xi->data;                // copy each scanline
-        int bpl = qMin(image.bytesPerLine(),xi->bytes_per_line);
+        int bpl = qMin(int(image.bytesPerLine()),xi->bytes_per_line);
         for (int y=0; y<xi->height; y++) {
             memcpy(image.scanLine(y), xidata, bpl);
             xidata += xi->bytes_per_line;
diff --git a/src/plugins/platforms/xcb/nativepainting/qt_x11_p.h b/src/plugins/platforms/xcb/nativepainting/qt_x11_p.h
index a13a8f0483..1f7e7cf49b 100644
--- a/src/plugins/platforms/xcb/nativepainting/qt_x11_p.h
+++ b/src/plugins/platforms/xcb/nativepainting/qt_x11_p.h
@@ -190,7 +190,7 @@ struct QX11InfoData {
 };
 
 template <class T>
-Q_DECL_RELAXED_CONSTEXPR inline int lowest_bit(T v) Q_DECL_NOTHROW
+Q_DECL_RELAXED_CONSTEXPR inline int lowest_bit(T v) noexcept
 {
     int result = qCountTrailingZeroBits(v);
     return ((result >> 3) == sizeof(T)) ? -1 : result;
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index f98b2dfe3a..cac6345b66 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -440,7 +440,11 @@ const char *xcb_protocol_request_codes[] =
 
 void QXcbConnection::handleXcbError(xcb_generic_error_t *error)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    qintptr result = 0;
+#else
     long result = 0;
+#endif
     QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance();
     if (dispatcher && dispatcher->filterNativeEvent(m_nativeInterface->nativeEventType(), error, &result))
         return;
@@ -537,7 +541,11 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event)
     if (Q_UNLIKELY(lcQpaEvents().isDebugEnabled()))
         printXcbEvent(lcQpaEvents(), "Event", event);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    qintptr result = 0; // Used only by MS Windows
+#else
     long result = 0; // Used only by MS Windows
+#endif
     if (QAbstractEventDispatcher *dispatcher = QAbstractEventDispatcher::instance()) {
         if (dispatcher->filterNativeEvent(m_nativeInterface->nativeEventType(), event, &result))
             return;
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index bbfa252881..7cf25d41a6 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -108,7 +108,7 @@ public:
     virtual void handleXIMouseEvent(xcb_ge_event_t *, Qt::MouseEventSource = Qt::MouseEventNotSynthesized) {}
     virtual void handleXIEnterLeave(xcb_ge_event_t *) {}
 #endif
-    virtual QXcbWindow *toWindow() { return 0; }
+    virtual QXcbWindow *toWindow() { return nullptr; }
 };
 
 typedef QHash<xcb_window_t, QXcbWindowEventListener *> WindowMapper;
@@ -366,7 +366,7 @@ private:
 
     WindowMapper m_mapper;
 
-    Qt::MouseButtons m_buttonState = 0;
+    Qt::MouseButtons m_buttonState = nullptr;
     Qt::MouseButton m_button = Qt::NoButton;
 
     QXcbWindow *m_focusWindow = nullptr;
diff --git a/src/plugins/platforms/xcb/qxcbconnection_basic.h b/src/plugins/platforms/xcb/qxcbconnection_basic.h
index b979129cba..1bd4310562 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_basic.h
+++ b/src/plugins/platforms/xcb/qxcbconnection_basic.h
@@ -163,7 +163,7 @@ private:
 #define Q_XCB_REPLY_CONNECTION_ARG(connection, ...) connection
 
 struct QStdFreeDeleter {
-    void operator()(void *p) const Q_DECL_NOTHROW { return std::free(p); }
+    void operator()(void *p) const noexcept { return std::free(p); }
 };
 
 #define Q_XCB_REPLY(call, ...) \
diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index bc09fe2f91..4639185416 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -997,8 +997,8 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
                 QPoint global(fixed1616ToReal(xiDeviceEvent->root_x), fixed1616ToReal(xiDeviceEvent->root_y));
                 Qt::KeyboardModifiers modifiers = keyboard()->translateModifiers(xiDeviceEvent->mods.effective);
                 if (modifiers & Qt::AltModifier) {
-                    std::swap(angleDelta.rx(), angleDelta.ry());
-                    std::swap(rawDelta.rx(), rawDelta.ry());
+                    angleDelta = angleDelta.transposed();
+                    rawDelta = rawDelta.transposed();
                 }
                 qCDebug(lcQpaXInputEvents) << "scroll wheel @ window pos" << local << "delta px" << rawDelta << "angle" << angleDelta;
                 QWindowSystemInterface::handleWheelEvent(platformWindow->window(), xiDeviceEvent->time, local, global, rawDelta, angleDelta, modifiers);
@@ -1024,7 +1024,7 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
                 QPoint global(fixed1616ToReal(xiDeviceEvent->root_x), fixed1616ToReal(xiDeviceEvent->root_y));
                 Qt::KeyboardModifiers modifiers = keyboard()->translateModifiers(xiDeviceEvent->mods.effective);
                 if (modifiers & Qt::AltModifier)
-                    std::swap(angleDelta.rx(), angleDelta.ry());
+                    angleDelta = angleDelta.transposed();
                 qCDebug(lcQpaXInputEvents) << "scroll wheel (button" << xiDeviceEvent->detail << ") @ window pos" << local << "delta angle" << angleDelta;
                 QWindowSystemInterface::handleWheelEvent(platformWindow->window(), xiDeviceEvent->time, local, global, QPoint(), angleDelta, modifiers);
             }
diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h
index 5bc806381c..0b238823f0 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.h
+++ b/src/plugins/platforms/xcb/qxcbcursor.h
@@ -65,7 +65,7 @@ inline bool operator==(const QXcbCursorCacheKey &k1, const QXcbCursorCacheKey &k
     return k1.shape == k2.shape && k1.bitmapCacheKey == k2.bitmapCacheKey && k1.maskCacheKey == k2.maskCacheKey;
 }
 
-inline uint qHash(const QXcbCursorCacheKey &k, uint seed) Q_DECL_NOTHROW
+inline uint qHash(const QXcbCursorCacheKey &k, uint seed) noexcept
 {
     return (uint(k.shape) + uint(k.bitmapCacheKey) + uint(k.maskCacheKey)) ^ seed;
 }
@@ -83,7 +83,7 @@ public:
     QPoint pos() const override;
     void setPos(const QPoint &pos) override;
 
-    static void queryPointer(QXcbConnection *c, QXcbVirtualDesktop **virtualDesktop, QPoint *pos, int *keybMask = 0);
+    static void queryPointer(QXcbConnection *c, QXcbVirtualDesktop **virtualDesktop, QPoint *pos, int *keybMask = nullptr);
 
 #ifndef QT_NO_CURSOR
     xcb_cursor_t xcbCursor(const QCursor &c) const
diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h
index c19008c04b..1388e68acc 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.h
+++ b/src/plugins/platforms/xcb/qxcbdrag.h
@@ -86,7 +86,7 @@ public:
     void handlePosition(QPlatformWindow *w, const xcb_client_message_event_t *event);
     void handleLeave(QPlatformWindow *w, const xcb_client_message_event_t *event);
     void handleDrop(QPlatformWindow *, const xcb_client_message_event_t *event,
-                    Qt::MouseButtons b = 0, Qt::KeyboardModifiers mods = 0);
+                    Qt::MouseButtons b = nullptr, Qt::KeyboardModifiers mods = nullptr);
 
     void handleStatus(const xcb_client_message_event_t *event);
     void handleSelectionRequest(const xcb_selection_request_event_t *event);
@@ -109,7 +109,7 @@ private:
     void init();
 
     void handle_xdnd_position(QPlatformWindow *w, const xcb_client_message_event_t *event,
-                              Qt::MouseButtons b = 0, Qt::KeyboardModifiers mods = 0);
+                              Qt::MouseButtons b = nullptr, Qt::KeyboardModifiers mods = nullptr);
     void handle_xdnd_status(const xcb_client_message_event_t *event);
     void send_leave();
 
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
index 899081e752..81b889a80f 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
@@ -636,13 +636,13 @@ static void dumpNativeWindowsRecursion(const QXcbConnection *connection, xcb_win
     const QChar oldPadChar =str.padChar();
     str.setFieldWidth(8);
     str.setPadChar(QLatin1Char('0'));
-    str << hex << window;
+    str << Qt::hex << window;
     str.setFieldWidth(oldFieldWidth);
     str.setPadChar(oldPadChar);
-    str << dec << " \""
+    str << Qt::dec << " \""
         << QXcbWindow::windowTitle(connection, window) << "\" "
-        << geom.width() << 'x' << geom.height() << forcesign << geom.x() << geom.y()
-        << noforcesign << '\n';
+        << geom.width() << 'x' << geom.height() << Qt::forcesign << geom.x() << geom.y()
+        << Qt::noforcesign << '\n';
 
     auto reply = Q_XCB_REPLY(xcb_query_tree, conn, window);
     if (reply) {
diff --git a/src/plugins/platforms/xcb/qxcbobject.h b/src/plugins/platforms/xcb/qxcbobject.h
index 1b98d9346b..931bed9ec1 100644
--- a/src/plugins/platforms/xcb/qxcbobject.h
+++ b/src/plugins/platforms/xcb/qxcbobject.h
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 class QXcbObject
 {
 public:
-    QXcbObject(QXcbConnection *connection = 0) : m_connection(connection) {}
+    QXcbObject(QXcbConnection *connection = nullptr) : m_connection(connection) {}
 
     void setConnection(QXcbConnection *connection) { m_connection = connection; }
     QXcbConnection *connection() const { return m_connection; }
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
index 0cf0942dab..8da299d491 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -660,10 +660,6 @@ QImage::Format QXcbScreen::format() const
 
 int QXcbScreen::forcedDpi() const
 {
-    static const int overrideDpi = qEnvironmentVariableIntValue("QT_FONT_DPI");
-    if (overrideDpi)
-        return overrideDpi;
-
     const int forcedDpi = m_virtualDesktop->forcedDpi();
     if (forcedDpi > 0)
         return forcedDpi;
@@ -679,11 +675,6 @@ QDpi QXcbScreen::logicalDpi() const
     return m_virtualDesktop->dpi();
 }
 
-qreal QXcbScreen::pixelDensity() const
-{
-    return m_pixelDensity;
-}
-
 QPlatformCursor *QXcbScreen::cursor() const
 {
     return m_cursor;
@@ -747,14 +738,6 @@ void QXcbScreen::updateGeometry(const QRect &geometry, uint8_t rotation)
     if (m_sizeMillimeters.isEmpty())
         m_sizeMillimeters = sizeInMillimeters(geometry.size(), m_virtualDesktop->dpi());
 
-    qreal dpi = forcedDpi();
-    if (dpi <= 0)
-        dpi = geometry.width() / physicalSize().width() * qreal(25.4);
-
-    // Use 128 as a reference DPI on small screens. This favors "small UI" over "large UI".
-    qreal referenceDpi = physicalSize().width() <= 320 ? 128 : 96;
-
-    m_pixelDensity = qMax(1, qRound(dpi/referenceDpi));
     m_geometry = geometry;
     m_availableGeometry = geometry & m_virtualDesktop->workArea();
     QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry);
@@ -925,7 +908,7 @@ QByteArray QXcbScreen::getEdid() const
 static inline void formatRect(QDebug &debug, const QRect r)
 {
     debug << r.width() << 'x' << r.height()
-        << forcesign << r.x() << r.y() << noforcesign;
+        << Qt::forcesign << r.x() << r.y() << Qt::noforcesign;
 }
 
 static inline void formatSizeF(QDebug &debug, const QSizeF s)
@@ -939,7 +922,7 @@ QDebug operator<<(QDebug debug, const QXcbScreen *screen)
     debug.nospace();
     debug << "QXcbScreen(" << (const void *)screen;
     if (screen) {
-        debug << fixed << qSetRealNumberPrecision(1);
+        debug << Qt::fixed << qSetRealNumberPrecision(1);
         debug << ", name=" << screen->name();
         debug << ", geometry=";
         formatRect(debug, screen->geometry());
@@ -957,7 +940,7 @@ QDebug operator<<(QDebug debug, const QXcbScreen *screen)
         debug << "), orientation=" << screen->orientation();
         debug << ", depth=" << screen->depth();
         debug << ", refreshRate=" << screen->refreshRate();
-        debug << ", root=" << hex << screen->root();
+        debug << ", root=" << Qt::hex << screen->root();
         debug << ", windowManagerName=" << screen->windowManagerName();
     }
     debug << ')';
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h
index 914ce6307d..79698b4ef3 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.h
+++ b/src/plugins/platforms/xcb/qxcbscreen.h
@@ -161,7 +161,7 @@ public:
     QImage::Format format() const override;
     QSizeF physicalSize() const override { return m_sizeMillimeters; }
     QDpi logicalDpi() const override;
-    qreal pixelDensity() const override;
+    QDpi logicalBaseDpi() const override { return QDpi(96, 96); };
     QPlatformCursor *cursor() const override;
     qreal refreshRate() const override { return m_refreshRate; }
     Qt::ScreenOrientation orientation() const override { return m_orientation; }
@@ -227,7 +227,6 @@ private:
     Qt::ScreenOrientation m_orientation = Qt::PrimaryOrientation;
     QXcbCursor *m_cursor;
     qreal m_refreshRate = 60.0;
-    int m_pixelDensity = 1;
     QEdidParser m_edid;
 };
 
diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
index 2303ccf806..f880d4d722 100644
--- a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
+++ b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
@@ -42,6 +42,8 @@
 
 #ifndef QT_NO_SESSIONMANAGER
 
+#include <qpa/qwindowsysteminterface.h>
+
 #include <qguiapplication.h>
 #include <qdatetime.h>
 #include <qfileinfo.h>
@@ -289,8 +291,7 @@ static void sm_dieCallback(SmcConn smcConn, SmPointer /* clientData */)
     if (smcConn != smcConnection)
         return;
     resetSmState();
-    QEvent quitEvent(QEvent::Quit);
-    QGuiApplication::sendEvent(qApp, &quitEvent);
+    QWindowSystemInterface::handleApplicationTermination<QWindowSystemInterface::SynchronousDelivery>();
 }
 
 static void sm_shutdownCancelledCallback(SmcConn smcConn, SmPointer clientData)
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 610eca06a5..97da420798 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -1657,7 +1657,11 @@ bool QXcbWindow::requestSystemTrayWindowDock()
 bool QXcbWindow::handleNativeEvent(xcb_generic_event_t *event)
 {
     auto eventType = connection()->nativeInterface()->nativeEventType();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    qintptr result = 0; // Used only by MS Windows
+#else
     long result = 0; // Used only by MS Windows
+#endif
     return QWindowSystemInterface::handleNativeEvent(window(), eventType, event, &result);
 }
 
@@ -1904,7 +1908,7 @@ void QXcbWindow::handleButtonPressEvent(int event_x, int event_y, int root_x, in
             else if (detail == 7)
                 angleDelta.setX(-120);
             if (modifiers & Qt::AltModifier)
-                std::swap(angleDelta.rx(), angleDelta.ry());
+                angleDelta = angleDelta.transposed();
             QWindowSystemInterface::handleWheelEvent(window(), timestamp, local, global, QPoint(), angleDelta, modifiers);
 #if QT_CONFIG(xcb_xinput)
         }
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index 8258cc2dfa..5de5974ca7 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -166,7 +166,7 @@ public:
     bool needsSync() const;
 
     void postSyncWindowRequest();
-    void clearSyncWindowRequest() { m_pendingSyncRequest = 0; }
+    void clearSyncWindowRequest() { m_pendingSyncRequest = nullptr; }
 
     QXcbScreen *xcbScreen() const;
 
diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h
index 3497c6a6f1..5cfc4df0d0 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h
@@ -72,7 +72,7 @@ public:
 
     QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override;
     QIcon fileIcon(const QFileInfo &fileInfo,
-                   QPlatformTheme::IconOptions iconOptions = 0) const override;
+                   QPlatformTheme::IconOptions iconOptions = nullptr) const override;
 
     QIconEngine *createIconEngine(const QString &iconName) const override;
 
diff --git a/src/plugins/printsupport/windows/windows.pro b/src/plugins/printsupport/windows/windows.pro
index 06694fb7fe..6ca601b2a4 100644
--- a/src/plugins/printsupport/windows/windows.pro
+++ b/src/plugins/printsupport/windows/windows.pro
@@ -18,7 +18,8 @@ HEADERS += \
 
 OTHER_FILES += windows.json
 
-LIBS += -lwinspool -lcomdlg32 -lgdi32 -luser32
+LIBS += -lwinspool -lcomdlg32
+QMAKE_USE_PRIVATE += user32 gdi32
 
 PLUGIN_TYPE = printsupport
 PLUGIN_CLASS_NAME = QWindowsPrinterSupportPlugin
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
index ead08dbce8..0f39f6aa0d 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
@@ -40,6 +40,7 @@
 #include "qsql_ibase_p.h"
 #include <qcoreapplication.h>
 #include <qdatetime.h>
+#include <qdeadlinetimer.h>
 #include <qvariant.h>
 #include <qsqlerror.h>
 #include <qsqlfield.h>
@@ -1570,10 +1571,9 @@ void QIBaseDriver::close()
             d->eventBuffers.clear();
 
 #if defined(FB_API_VER)
-            // Workaround for Firebird crash
-            QTime timer;
-            timer.start();
-            while (timer.elapsed() < 500)
+            // TODO check whether this workaround for Firebird crash is still needed
+            QDeadlineTimer timer(500);
+            while (!timer.hasExpired())
                 QCoreApplication::processEvents();
 #endif
         }
diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc_p.h b/src/plugins/sqldrivers/odbc/qsql_odbc_p.h
index ea0aa6fc8b..ccd0206f38 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc_p.h
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc_p.h
@@ -89,8 +89,8 @@ class Q_EXPORT_SQLDRIVER_ODBC QODBCDriver : public QSqlDriver
     friend class QODBCResultPrivate;
 
 public:
-    explicit QODBCDriver(QObject *parent=0);
-    QODBCDriver(SQLHANDLE env, SQLHANDLE con, QObject * parent=0);
+    explicit QODBCDriver(QObject *parent=nullptr);
+    QODBCDriver(SQLHANDLE env, SQLHANDLE con, QObject * parent=nullptr);
     virtual ~QODBCDriver();
     bool hasFeature(DriverFeature f) const override;
     void close() override;
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
index c1be91cb22..760685f64b 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
@@ -428,12 +428,14 @@ static QVariant::Type qDecodePSQLType(int t)
 
 void QPSQLResultPrivate::deallocatePreparedStmt()
 {
-    const QString stmt = QStringLiteral("DEALLOCATE ") + preparedStmtId;
-    PGresult *result = drv_d_func()->exec(stmt);
+    if (drv_d_func()) {
+        const QString stmt = QStringLiteral("DEALLOCATE ") + preparedStmtId;
+        PGresult *result = drv_d_func()->exec(stmt);
 
-    if (PQresultStatus(result) != PGRES_COMMAND_OK)
-        qWarning("Unable to free statement: %s", PQerrorMessage(drv_d_func()->connection));
-    PQclear(result);
+        if (PQresultStatus(result) != PGRES_COMMAND_OK)
+            qWarning("Unable to free statement: %s", PQerrorMessage(drv_d_func()->connection));
+        PQclear(result);
+    }
     preparedStmtId.clear();
 }
 
@@ -810,8 +812,8 @@ QSqlRecord QPSQLResult::record() const
         return info;
 
     int count = PQnfields(d->result);
+    QSqlField f;
     for (int i = 0; i < count; ++i) {
-        QSqlField f;
         if (d->drv_d_func()->isUtf8)
             f.setName(QString::fromUtf8(PQfname(d->result, i)));
         else
@@ -831,6 +833,8 @@ QSqlRecord QPSQLResult::record() const
                 }
             }
             f.setTableName(tableName);
+        } else {
+            f.setTableName(QString());
         }
         int ptype = PQftype(d->result, i);
         f.setType(qDecodePSQLType(ptype));
@@ -1074,8 +1078,10 @@ static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin)
         return QPSQLDriver::Version10;
     case 11:
         return QPSQLDriver::Version11;
+    case 12:
+        return QPSQLDriver::Version12;
     default:
-        if (vMaj > 11)
+        if (vMaj > 12)
             return QPSQLDriver::UnknownLaterVersion;
         break;
     }
@@ -1435,26 +1441,29 @@ QSqlRecord QPSQLDriver::record(const QString &tablename) const
     schema = stripDelimiters(schema, QSqlDriver::TableName);
     tbl = stripDelimiters(tbl, QSqlDriver::TableName);
 
-    QString stmt = QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
-                                  "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
-                                  "pg_attrdef.adsrc "
-                                  "FROM pg_class, pg_attribute "
-                                  "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = "
-                                  "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) "
-                                  "WHERE %1 "
-                                  "AND pg_class.relname = '%2' "
-                                  "AND pg_attribute.attnum > 0 "
-                                  "AND pg_attribute.attrelid = pg_class.oid "
-                                  "AND pg_attribute.attisdropped = false "
-                                  "ORDER BY pg_attribute.attnum");
-    if (schema.isEmpty())
-        stmt = stmt.arg(QStringLiteral("pg_table_is_visible(pg_class.oid)"));
-    else
-        stmt = stmt.arg(QStringLiteral("pg_class.relnamespace = (SELECT oid FROM "
-                                            "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema));
+    const QString adsrc = protocol() < Version8
+        ? QStringLiteral("pg_attrdef.adsrc")
+        : QStringLiteral("pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid)");
+    const QString nspname = schema.isEmpty()
+        ? QStringLiteral("pg_table_is_visible(pg_class.oid)")
+        : QStringLiteral("pg_class.relnamespace = (SELECT oid FROM "
+                         "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema);
+    const QString stmt =
+        QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
+                       "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
+                       "%1 "
+                       "FROM pg_class, pg_attribute "
+                       "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = "
+                       "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) "
+                       "WHERE %2 "
+                       "AND pg_class.relname = '%3' "
+                       "AND pg_attribute.attnum > 0 "
+                       "AND pg_attribute.attrelid = pg_class.oid "
+                       "AND pg_attribute.attisdropped = false "
+                       "ORDER BY pg_attribute.attnum").arg(adsrc, nspname, tbl);
 
     QSqlQuery query(createResult());
-    query.exec(stmt.arg(tbl));
+    query.exec(stmt);
     while (query.next()) {
         int len = query.value(3).toInt();
         int precision = query.value(4).toInt();
@@ -1506,7 +1515,7 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const
                 // this is safe since postgresql stores only the UTC value and not the timezone offset (only used
                 // while parsing), so we have correct behavior in both case of with timezone and without tz
                 r = QStringLiteral("TIMESTAMP WITH TIME ZONE ") + QLatin1Char('\'') +
-                        QLocale::c().toString(field.value().toDateTime().toUTC(), QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz")) +
+                        QLocale::c().toString(field.value().toDateTime().toUTC(), u"yyyy-MM-ddThh:mm:ss.zzz") +
                         QLatin1Char('Z') + QLatin1Char('\'');
             } else {
                 r = nullStr();
@@ -1518,7 +1527,7 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const
         case QVariant::Time:
 #if QT_CONFIG(datestring)
             if (field.value().toTime().isValid()) {
-                r = QLatin1Char('\'') + field.value().toTime().toString(QLatin1String("hh:mm:ss.zzz")) + QLatin1Char('\'');
+                r = QLatin1Char('\'') + field.value().toTime().toString(u"hh:mm:ss.zzz") + QLatin1Char('\'');
             } else
 #endif
             {
diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h
index 99e0b5f60f..9ac1fb50d7 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql_p.h
+++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h
@@ -93,6 +93,7 @@ public:
         Version9_6 = 22,
         Version10 = 23,
         Version11 = 24,
+        Version12 = 25,
         UnknownLaterVersion = 100000
     };
 
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
index f1a003ddcd..001bd673fc 100644
--- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
+++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
@@ -531,7 +531,7 @@ bool QSQLiteResult::exec()
                 }
                 case QVariant::Time: {
                     const QTime time = value.toTime();
-                    const QString str = time.toString(QStringViewLiteral("hh:mm:ss.zzz"));
+                    const QString str = time.toString(u"hh:mm:ss.zzz");
                     res = sqlite3_bind_text16(d->stmt, i + 1, str.utf16(),
                                               str.size() * sizeof(ushort), SQLITE_TRANSIENT);
                     break;
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h b/src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h
index 61be4c937f..c7952bca9a 100644
--- a/src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h
+++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h
@@ -72,8 +72,8 @@ class Q_EXPORT_SQLDRIVER_SQLITE QSQLiteDriver : public QSqlDriver
     Q_OBJECT
     friend class QSQLiteResultPrivate;
 public:
-    explicit QSQLiteDriver(QObject *parent = 0);
-    explicit QSQLiteDriver(sqlite3 *connection, QObject *parent = 0);
+    explicit QSQLiteDriver(QObject *parent = nullptr);
+    explicit QSQLiteDriver(sqlite3 *connection, QObject *parent = nullptr);
     ~QSQLiteDriver();
     bool hasFeature(DriverFeature f) const override;
     bool open(const QString & db,
diff --git a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp
index 390f05c7aa..b7bcd044ab 100644
--- a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp
+++ b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp
@@ -43,7 +43,6 @@
 #include <qvariant.h>
 #include <qdatetime.h>
 #include <qfile.h>
-#include <qregexp.h>
 #include <qsqlerror.h>
 #include <qsqlfield.h>
 #include <qsqlindex.h>
diff --git a/src/plugins/sqldrivers/sqlite2/smain.cpp b/src/plugins/sqldrivers/sqlite2/smain.cpp
index 3a5734f8c9..7d971d6e5a 100644
--- a/src/plugins/sqldrivers/sqlite2/smain.cpp
+++ b/src/plugins/sqldrivers/sqlite2/smain.cpp
@@ -43,6 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
+// ### Qt6: remove, obsolete since 5.14
 class QSQLite2DriverPlugin : public QSqlDriverPlugin
 {
     Q_OBJECT
diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp
index 4aa1444608..18efb22ea4 100644
--- a/src/plugins/sqldrivers/tds/main.cpp
+++ b/src/plugins/sqldrivers/tds/main.cpp
@@ -50,6 +50,7 @@
 QT_BEGIN_NAMESPACE
 
 
+// ### Qt6: remove, obsolete since 4.7
 class QTDSDriverPlugin : public QSqlDriverPlugin
 {
     Q_OBJECT
diff --git a/src/plugins/sqldrivers/tds/qsql_tds.cpp b/src/plugins/sqldrivers/tds/qsql_tds.cpp
index ad95b097ef..9c8d242028 100644
--- a/src/plugins/sqldrivers/tds/qsql_tds.cpp
+++ b/src/plugins/sqldrivers/tds/qsql_tds.cpp
@@ -813,7 +813,7 @@ QString QTDSDriver::formatValue(const QSqlField &field,
         r = QLatin1String("NULL");
     else if (field.type() == QVariant::DateTime) {
         if (field.value().toDateTime().isValid()){
-            r = field.value().toDateTime().toString(QLatin1String("yyyyMMdd hh:mm:ss"));
+            r = field.value().toDateTime().toString(u"yyyyMMdd hh:mm:ss");
             r.prepend(QLatin1String("'"));
             r.append(QLatin1String("'"));
         } else
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index 62f089b654..63dc49fd18 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -50,92 +50,30 @@
 #define QMAC_QAQUASTYLE_SIZE_CONSTRAIN
 //#define DEBUG_SIZE_CONSTRAINT
 
-#include <private/qcore_mac_p.h>
-#if QT_CONFIG(tabbar)
-#include <private/qtabbar_p.h>
-#endif
-#include <private/qpainter_p.h>
-#include <qapplication.h>
-#include <qbitmap.h>
-#if QT_CONFIG(combobox)
-#include <private/qcombobox_p.h>
-#include <qcombobox.h>
-#endif
-#if QT_CONFIG(dialogbuttonbox)
-#include <qdialogbuttonbox.h>
-#endif
-#if QT_CONFIG(dockwidget)
-#include <qdockwidget.h>
-#endif
-#include <qevent.h>
-#include <qfocusframe.h>
-#include <qformlayout.h>
-#include <qgroupbox.h>
-#include <qhash.h>
-#include <qheaderview.h>
-#if QT_CONFIG(lineedit)
-#include <qlineedit.h>
-#endif
-#if QT_CONFIG(mainwindow)
-#include <qmainwindow.h>
-#endif
+#include <QtCore/qoperatingsystemversion.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qvarlengtharray.h>
+
+#include <QtCore/private/qcore_mac_p.h>
+
+#include <QtGui/private/qcoregraphics_p.h>
+#include <QtGui/qpa/qplatformfontdatabase.h>
+#include <QtGui/qpa/qplatformtheme.h>
+
+#include <QtWidgets/private/qstyleanimation_p.h>
+
 #if QT_CONFIG(mdiarea)
-#include <qmdisubwindow.h>
-#endif
-#if QT_CONFIG(menubar)
-#include <qmenubar.h>
-#endif
-#include <qpaintdevice.h>
-#include <qpainter.h>
-#include <qpixmapcache.h>
-#include <qpointer.h>
-#if QT_CONFIG(progressbar)
-#include <qprogressbar.h>
-#endif
-#if QT_CONFIG(pushbutton)
-#include <qpushbutton.h>
-#endif
-#include <qradiobutton.h>
-#if QT_CONFIG(rubberband)
-#include <qrubberband.h>
+#include <QtWidgets/qmdisubwindow.h>
 #endif
 #if QT_CONFIG(scrollbar)
-#include <qscrollbar.h>
-#endif
-#if QT_CONFIG(sizegrip)
-#include <qsizegrip.h>
-#endif
-#include <qstyleoption.h>
-#include <qtoolbar.h>
-#if QT_CONFIG(toolbutton)
-#include <qtoolbutton.h>
+#include <QtWidgets/qscrollbar.h>
 #endif
-#if QT_CONFIG(treeview)
-#include <qtreeview.h>
-#endif
-#if QT_CONFIG(tableview)
-#include <qtableview.h>
+#if QT_CONFIG(tabbar)
+#include <QtWidgets/private/qtabbar_p.h>
 #endif
-#include <qoperatingsystemversion.h>
 #if QT_CONFIG(wizard)
-#include <qwizard.h>
-#endif
-#include <qdebug.h>
-#if QT_CONFIG(datetimeedit)
-#include <qdatetimeedit.h>
+#include <QtWidgets/qwizard.h>
 #endif
-#include <qmath.h>
-#include <QtWidgets/qgraphicsproxywidget.h>
-#if QT_CONFIG(graphicsview)
-#include <QtWidgets/qgraphicsview.h>
-#endif
-#include <QtCore/qvariant.h>
-#include <QtCore/qvarlengtharray.h>
-#include <private/qstylehelper_p.h>
-#include <private/qstyleanimation_p.h>
-#include <qpa/qplatformfontdatabase.h>
-#include <qpa/qplatformtheme.h>
-#include <QtGui/private/qcoregraphics_p.h>
 
 #include <cmath>
 
@@ -297,6 +235,7 @@ static QLinearGradient titlebarGradientInactive()
     return qt_mac_applicationIsInDarkMode() ? darkGradient : lightGradient;
 }
 
+#if QT_CONFIG(tabwidget)
 static void clipTabBarFrame(const QStyleOption *option, const QMacStyle *style, CGContextRef ctx)
 {
     Q_ASSERT(option);
@@ -316,6 +255,7 @@ static void clipTabBarFrame(const QStyleOption *option, const QMacStyle *style,
             CGContextClipToRects(ctx, &cgRects[0], size_t(cgRects.size()));
     }
 }
+#endif
 
 static const QColor titlebarSeparatorLineActive(111, 111, 111);
 static const QColor titlebarSeparatorLineInactive(131, 131, 131);
@@ -340,6 +280,7 @@ static const qreal titleBarButtonSpacing = 8;
 // hovered: tab is hovered
 bool isDarkMode() { return qt_mac_applicationIsInDarkMode(); }
 
+#if QT_CONFIG(tabbar)
 static const QColor lightTabBarTabBackgroundActive(190, 190, 190);
 static const QColor darkTabBarTabBackgroundActive(38, 38, 38);
 static const QColor tabBarTabBackgroundActive() { return isDarkMode() ? darkTabBarTabBackgroundActive : lightTabBarTabBackgroundActive; }
@@ -385,6 +326,21 @@ static const QColor tabBarCloseButtonCrossSelected(115, 115, 115);
 
 static const int closeButtonSize = 14;
 static const qreal closeButtonCornerRadius = 2.0;
+#endif // QT_CONFIG(tabbar)
+
+#ifndef QT_NO_ACCESSIBILITY // This ifdef to avoid "unused function" warning.
+QBrush brushForToolButton(bool isOnKeyWindow)
+{
+    // When a toolbutton in a toolbar is in the 'ON' state, we draw a
+    // partially transparent background. The colors must be different
+    // for 'Aqua' and 'DarkAqua' appearances though.
+    if (isDarkMode())
+        return isOnKeyWindow ? QColor(73, 73, 73, 100) : QColor(56, 56, 56, 100);
+
+    return isOnKeyWindow ? QColor(0, 0, 0, 28) : QColor(0, 0, 0, 21);
+}
+#endif // QT_NO_ACCESSIBILITY
+
 
 static const int headerSectionArrowHeight = 6;
 static const int headerSectionSeparatorInset = 2;
@@ -560,6 +516,7 @@ static bool isInMacUnifiedToolbarArea(QWindow *window, int windowY)
 }
 
 
+#if QT_CONFIG(tabbar)
 static void drawTabCloseButton(QPainter *p, bool hover, bool selected, bool pressed, bool documentMode)
 {
     p->setRenderHints(QPainter::Antialiasing);
@@ -597,7 +554,6 @@ static void drawTabCloseButton(QPainter *p, bool hover, bool selected, bool pres
     p->drawLine(margin, height - margin, width - margin, margin);
 }
 
-#if QT_CONFIG(tabbar)
 QRect rotateTabPainter(QPainter *p, QTabBar::Shape shape, QRect tabRect)
 {
     const auto tabDirection = QMacStylePrivate::tabDirection(shape);
@@ -613,10 +569,10 @@ QRect rotateTabPainter(QPainter *p, QTabBar::Shape shape, QRect tabRect)
             newRot = -90;
         }
         tabRect.setRect(0, 0, tabRect.height(), tabRect.width());
-        QMatrix m;
-        m.translate(newX, newY);
-        m.rotate(newRot);
-        p->setMatrix(m, true);
+        QTransform transform;
+        transform.translate(newX, newY);
+        transform.rotate(newRot);
+        p->setTransform(transform, true);
     }
     return tabRect;
 }
@@ -919,8 +875,10 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
         else if (qobject_cast<const QLineEdit *>(widg))
             ct = QStyle::CT_LineEdit;
 #endif
+#if QT_CONFIG(itemviews)
         else if (qobject_cast<const QHeaderView *>(widg))
             ct = QStyle::CT_HeaderSection;
+#endif
 #if QT_CONFIG(menubar)
         else if (qobject_cast<const QMenuBar *>(widg))
             ct = QStyle::CT_MenuBar;
@@ -2221,10 +2179,12 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
     int ret = 0;
 
     switch (metric) {
+#if QT_CONFIG(tabbar)
     case PM_TabCloseIndicatorWidth:
     case PM_TabCloseIndicatorHeight:
         ret = closeButtonSize;
         break;
+#endif
     case PM_ToolBarIconSize:
         ret = proxy()->pixelMetric(PM_LargeIconSize);
         break;
@@ -2348,11 +2308,11 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
         }
         break;
     case PM_SmallIconSize:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16., opt));
         break;
 
     case PM_LargeIconSize:
-        ret = int(QStyleHelper::dpiScaled(32.));
+        ret = int(QStyleHelper::dpiScaled(32., opt));
         break;
 
     case PM_IconViewIconSize:
@@ -2381,10 +2341,12 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
             ret = 16;
             break;
         case QStyleHelper::SizeDefault:
+#if QT_CONFIG(tabbar)
             const QStyleOptionTab *tb = qstyleoption_cast<const QStyleOptionTab *>(opt);
             if (tb && tb->documentMode)
                 ret = 30;
             else
+#endif
                 ret = QCommonStyle::pixelMetric(metric, opt, widget);
             break;
         }
@@ -2895,9 +2857,11 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
             ret = [NSScroller preferredScrollerStyle] == NSScrollerStyleOverlay;
         }
         break;
+#if QT_CONFIG(itemviews)
     case SH_ItemView_ScrollMode:
         ret = QAbstractItemView::ScrollPerPixel;
         break;
+#endif
     case SH_TitleBar_ShowToolTipsOnButtons:
         // min/max/close buttons on windows don't show tool tips
         ret = false;
@@ -3001,24 +2965,24 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
         }
 #endif
 
-        QMatrix matrix;
-        matrix.translate(opt->rect.center().x() + xOffset, opt->rect.center().y() + 2);
+        QTransform transform;
+        transform.translate(opt->rect.center().x() + xOffset, opt->rect.center().y() + 2);
         QPainterPath path;
         switch(pe) {
         default:
         case PE_IndicatorArrowDown:
             break;
         case PE_IndicatorArrowUp:
-            matrix.rotate(180);
+            transform.rotate(180);
             break;
         case PE_IndicatorArrowLeft:
-            matrix.rotate(90);
+            transform.rotate(90);
             break;
         case PE_IndicatorArrowRight:
-            matrix.rotate(-90);
+            transform.rotate(-90);
             break;
         }
-        p->setMatrix(matrix);
+        p->setTransform(transform);
 
         path.moveTo(-halfSize, -halfSize * 0.5);
         path.lineTo(0.0, halfSize * 0.5);
@@ -3039,7 +3003,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
                 p->restore();
                 return;
             }
-
+#if QT_CONFIG(tabwidget)
             QRegion region(tbb->rect);
             region -= tbb->tabBarRect;
             p->save();
@@ -3063,6 +3027,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
             }
             proxy()->drawPrimitive(PE_FrameTabWidget, &twf, p, w);
             p->restore();
+#endif
         }
         break;
 #endif
@@ -3109,8 +3074,10 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
             needTranslation = true;
         }
         d->drawNSViewInRect(box, adjustedRect, p, ^(CGContextRef ctx, const CGRect &rect) {
+#if QT_CONFIG(tabwidget)
             if (QTabWidget *tabWidget = qobject_cast<QTabWidget *>(opt->styleObject))
                 clipTabBarFrame(opt, this, ctx);
+#endif
             CGContextTranslateCTM(ctx, 0, rect.origin.y + rect.size.height);
             CGContextScaleCTM(ctx, 1, -1);
             if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave
@@ -3404,6 +3371,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
         } break;
     case PE_FrameStatusBarItem:
         break;
+#if QT_CONFIG(tabbar)
     case PE_IndicatorTabClose: {
         // Make close button visible only on the hovered tab.
         QTabBar *tabBar = qobject_cast<QTabBar*>(w->parentWidget());
@@ -3428,6 +3396,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
             }
         }
         } break;
+#endif // QT_CONFIG(tabbar)
     case PE_PanelStatusBar: {
         // Fill the status bar with the titlebar gradient.
         QLinearGradient linearGrad;
@@ -3507,6 +3476,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
 {
     Q_D(const QMacStyle);
     const AppearanceSync sync;
+    const QMacAutoReleasePool pool;
     QMacCGContext cg(p);
     QWindow *window = w && w->window() ? w->window()->windowHandle() : nullptr;
     d->resolveCurrentNSView(window);
@@ -4371,7 +4341,6 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
         break;
     case CE_ProgressBarContents:
         if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) {
-            QMacAutoReleasePool pool;
             const bool isIndeterminate = (pb->minimum == 0 && pb->maximum == 0);
             const bool vertical = pb->orientation == Qt::Vertical;
             const bool inverted = pb->invertedAppearance;
@@ -4598,6 +4567,7 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt,
     const int controlSize = getControlSize(opt, widget);
 
     switch (sr) {
+#if QT_CONFIG(itemviews)
     case SE_ItemViewItemText:
         if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             int fw = proxy()->pixelMetric(PM_FocusFrameHMargin, opt, widget);
@@ -4607,6 +4577,7 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt,
                 rect.adjust(-fw, 0, 0, 0);
         }
         break;
+#endif
     case SE_ToolBoxTabContents:
         rect = QCommonStyle::subElementRect(sr, opt, widget);
         break;
@@ -5317,9 +5288,20 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
             }
 
             d->drawNSViewInRect(slider, opt->rect, p, ^(CGContextRef ctx, const CGRect &rect) {
-                if (isHorizontal && sl->upsideDown) {
-                    CGContextTranslateCTM(ctx, rect.size.width, 0);
-                    CGContextScaleCTM(ctx, -1, 1);
+
+                // Since the GC is flipped, upsideDown means *not* inverted when vertical.
+                const bool verticalFlip = !isHorizontal && !sl->upsideDown; // FIXME: && !isSierraOrLater
+
+                if (isHorizontal) {
+                    if (sl->upsideDown) {
+                        CGContextTranslateCTM(ctx, rect.size.width, rect.origin.y);
+                        CGContextScaleCTM(ctx, -1, 1);
+                    } else {
+                        CGContextTranslateCTM(ctx, 0, rect.origin.y);
+                    }
+                } else if (verticalFlip) {
+                    CGContextTranslateCTM(ctx, rect.origin.x, rect.size.height);
+                    CGContextScaleCTM(ctx, 1, -1);
                 }
 
                 if (hasDoubleTicks) {
@@ -5330,9 +5312,6 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
                         CGContextTranslateCTM(ctx, 1, 0);
                 }
 
-                // Since the GC is flipped, upsideDown means *not* inverted when vertical.
-                const bool verticalFlip = !isHorizontal && !sl->upsideDown; // FIXME: && !isSierraOrLater
-
 #if 0
                 // FIXME: Sadly, this part doesn't work. It seems to somehow polute the
                 // NSSlider's internal state and, when we need to use the "else" part,
@@ -5396,9 +5375,6 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
                         // This ain't HIG kosher: force round knob look.
                         if (hasDoubleTicks)
                             slider.numberOfTickMarks = 0;
-                        // Draw the knob in the symmetrical position instead of flipping.
-                        if (verticalFlip)
-                            slider.intValue = slider.maxValue - slider.intValue + slider.minValue;
                         [cell drawKnob];
                     }
                 }
@@ -5641,8 +5617,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
                     if (view)
                         isKey = [view.window isKeyWindow];
 
-                    QBrush brush(isKey ? QColor(0, 0, 0, 28)
-                                       : QColor(0, 0, 0, 21));
+                    QBrush brush(brushForToolButton(isKey));
                     QPainterPath path;
                     path.addRoundedRect(QRectF(tb->rect.x(), tb->rect.y(), tb->rect.width(), tb->rect.height() + 4), 4, 4);
                     p->setRenderHint(QPainter::Antialiasing);
@@ -6436,12 +6411,14 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
                 sz = sz.expandedTo(QSize(sz.width(), minimumSize));
         }
         break;
+#if QT_CONFIG(itemviews)
     case CT_ItemViewItem:
         if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             sz = QCommonStyle::sizeFromContents(ct, vopt, csz, widget);
             sz.setHeight(sz.height() + 2);
         }
         break;
+#endif
 
     default:
         sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget);
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
index 6b3f525adc..d6af18f01f 100644
--- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h
+++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
@@ -41,98 +41,105 @@
 #ifndef QMACSTYLE_MAC_P_P_H
 #define QMACSTYLE_MAC_P_P_H
 
-#include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include <QtWidgets/private/qcommonstyle_p.h>
 #include "qmacstyle_mac_p.h"
-#include <private/qapplication_p.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qmath.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qpointer.h>
+#include <QtCore/qtextstream.h>
+#include <QtCore/qvector.h>
+
+#include <QtGui/private/qpainter_p.h>
+
+#include <QtGui/qbitmap.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qpaintdevice.h>
+#include <QtGui/qpainter.h>
+#include <QtGui/qpixmapcache.h>
+
+#include <QtWidgets/private/qapplication_p.h>
+#include <QtWidgets/private/qcommonstyle_p.h>
+#include <QtWidgets/private/qstylehelper_p.h>
+
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qfocusframe.h>
+#include <QtWidgets/qformlayout.h>
+#include <QtWidgets/qlayout.h>
+#include <QtWidgets/qstyleoption.h>
+#include <QtWidgets/qtextedit.h>
+
+#if QT_CONFIG(checkbox)
+#include <QtWidgets/qcheckbox.h>
+#endif
 #if QT_CONFIG(combobox)
-#include <private/qcombobox_p.h>
+#include <QtWidgets/private/qcombobox_p.h>
+#include <QtWidgets/qcombobox.h>
 #endif
-#include <private/qpainter_p.h>
-#include <private/qstylehelper_p.h>
-#include <qapplication.h>
-#include <qbitmap.h>
-#if QT_CONFIG(checkbox)
-#include <qcheckbox.h>
+#if QT_CONFIG(datetimeedit)
+#include <QtWidgets/qdatetimeedit.h>
 #endif
-#include <qcombobox.h>
 #if QT_CONFIG(dialogbuttonbox)
-#include <qdialogbuttonbox.h>
+#include <QtWidgets/qdialogbuttonbox.h>
 #endif
 #if QT_CONFIG(dockwidget)
-#include <qdockwidget.h>
+#include <QtWidgets/qdockwidget.h>
+#endif
+#if QT_CONFIG(graphicsview)
+#include <QtWidgets/qgraphicsproxywidget.h>
+#include <QtWidgets/qgraphicsview.h>
 #endif
-#include <qevent.h>
-#include <qfocusframe.h>
-#include <qformlayout.h>
 #if QT_CONFIG(groupbox)
-#include <qgroupbox.h>
+#include <QtWidgets/qgroupbox.h>
+#endif
+#if QT_CONFIG(itemviews)
+#include <QtWidgets/qheaderview.h>
 #endif
-#include <qhash.h>
-#include <qheaderview.h>
-#include <qlayout.h>
 #if QT_CONFIG(lineedit)
-#include <qlineedit.h>
+#include <QtWidgets/qlineedit.h>
 #endif
 #if QT_CONFIG(listview)
-#include <qlistview.h>
+#include <QtWidgets/qlistview.h>
 #endif
 #if QT_CONFIG(mainwindow)
-#include <qmainwindow.h>
+#include <QtWidgets/qmainwindow.h>
 #endif
-#include <qmap.h>
 #if QT_CONFIG(menubar)
-#include <qmenubar.h>
+#include <QtWidgets/qmenubar.h>
 #endif
-#include <qpaintdevice.h>
-#include <qpainter.h>
-#include <qpixmapcache.h>
-#include <qpointer.h>
 #if QT_CONFIG(progressbar)
-#include <qprogressbar.h>
+#include <QtWidgets/qprogressbar.h>
 #endif
 #if QT_CONFIG(pushbutton)
-#include <qpushbutton.h>
+#include <QtWidgets/qpushbutton.h>
 #endif
-#include <qradiobutton.h>
+#include <QtWidgets/qradiobutton.h>
 #if QT_CONFIG(rubberband)
-#include <qrubberband.h>
+#include <QtWidgets/qrubberband.h>
 #endif
 #if QT_CONFIG(sizegrip)
-#include <qsizegrip.h>
+#include <QtWidgets/qsizegrip.h>
 #endif
 #if QT_CONFIG(spinbox)
-#include <qspinbox.h>
+#include <QtWidgets/qspinbox.h>
 #endif
 #if QT_CONFIG(splitter)
-#include <qsplitter.h>
+#include <QtWidgets/qsplitter.h>
+#endif
+#if QT_CONFIG(tableview)
+#include <QtWidgets/qtableview.h>
 #endif
-#include <qstyleoption.h>
-#include <qtextedit.h>
-#include <qtextstream.h>
 #if QT_CONFIG(toolbar)
-#include <qtoolbar.h>
+#include <QtWidgets/qtoolbar.h>
 #endif
 #if QT_CONFIG(toolbutton)
-#include <qtoolbutton.h>
+#include <QtWidgets/qtoolbutton.h>
 #endif
 #if QT_CONFIG(treeview)
-#include <qtreeview.h>
-#endif
-#if QT_CONFIG(tableview)
-#include <qtableview.h>
+#include <QtWidgets/qtreeview.h>
 #endif
-#include <qdebug.h>
-#if QT_CONFIG(datetimeedit)
-#include <qdatetimeedit.h>
-#endif
-#include <qmath.h>
-#include <qpair.h>
-#include <qvector.h>
-#include <QtWidgets/qgraphicsproxywidget.h>
-#include <QtWidgets/qgraphicsview.h>
-
-
 
 //
 //  W A R N I N G
diff --git a/src/plugins/styles/windowsvista/main.cpp b/src/plugins/styles/windowsvista/main.cpp
index d5048e45b7..5e7bcf5e6e 100644
--- a/src/plugins/styles/windowsvista/main.cpp
+++ b/src/plugins/styles/windowsvista/main.cpp
@@ -48,7 +48,7 @@ class QWindowsVistaStylePlugin : public QStylePlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "windowsvistastyle.json")
 public:
-    QStyle *create(const QString &key);
+    QStyle *create(const QString &key) override;
 };
 
 QStyle *QWindowsVistaStylePlugin::create(const QString &key)
@@ -56,7 +56,7 @@ QStyle *QWindowsVistaStylePlugin::create(const QString &key)
     if (key.compare(QLatin1String("windowsvista"), Qt::CaseInsensitive) == 0)
         return new QWindowsVistaStyle();
 
-    return 0;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
index 8a3ae17b1d..e213d65946 100644
--- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
@@ -44,7 +44,6 @@
 #include <qwindow.h>
 #include <private/qstyleanimation_p.h>
 #include <private/qstylehelper_p.h>
-#include <private/qapplication_p.h>
 #include <qpa/qplatformnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
@@ -84,16 +83,14 @@ static const int windowsRightBorder      = 15; // right border on windows
 */
 bool QWindowsVistaStylePrivate::useVista()
 {
-    return (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA
-            && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
-           && QWindowsVistaStylePrivate::useXP();
+    return QWindowsVistaStylePrivate::useXP();
 }
 
 /* \internal
     Checks and returns the style object
 */
 inline QObject *styleObject(const QStyleOption *option) {
-    return option ? option->styleObject : 0;
+    return option ? option->styleObject : nullptr;
 }
 
 /* \internal
@@ -118,7 +115,7 @@ static inline QImage createAnimationBuffer(const QStyleOption *option, const QWi
     Used by animations to clone a styleoption and shift its offset
 */
 QStyleOption *clonedAnimationStyleOption(const QStyleOption*option) {
-    QStyleOption *styleOption = 0;
+    QStyleOption *styleOption = nullptr;
     if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider*>(option))
         styleOption = new QStyleOptionSlider(*slider);
     else if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox*>(option))
@@ -299,7 +296,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
                 int oldState = styleObject->property("_q_stylestate").toInt();
                 oldRect = styleObject->property("_q_stylerect").toRect();
                 newRect = option->rect;
-                styleObject->setProperty("_q_stylestate", (int)option->state);
+                styleObject->setProperty("_q_stylestate", int(option->state));
                 styleObject->setProperty("_q_stylerect", option->rect);
 
                 bool doTransition = oldState &&
@@ -317,7 +314,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
 
                 if (doTransition) {
                     QStyleOption *styleOption = clonedAnimationStyleOption(option);
-                    styleOption->state = (QStyle::State)oldState;
+                    styleOption->state = QStyle::State(oldState);
 
                     QWindowsVistaAnimation *anim = qobject_cast<QWindowsVistaAnimation *>(d->animation(styleObject));
                     QWindowsVistaTransition *t = new QWindowsVistaTransition(styleObject);
@@ -342,7 +339,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
 
                     // The end state of the transition is simply the result we would have painted
                     // if the style was not animated.
-                    styleOption->styleObject = 0;
+                    styleOption->styleObject = nullptr;
                     styleOption->state = option->state;
                     proxy()->drawPrimitive(element, styleOption, &endPainter, widget);
 
@@ -357,7 +354,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
 
                     //translate state flags to UXTHEME states :
                     if (element == PE_FrameLineEdit) {
-                        theme = OpenThemeData(0, L"Edit");
+                        theme = OpenThemeData(nullptr, L"Edit");
                         partId = EP_EDITBORDER_NOSCROLL;
 
                         if (oldState & State_MouseOver)
@@ -375,7 +372,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
                             toState = ETS_NORMAL;
 
                     } else {
-                        theme = OpenThemeData(0, L"Button");
+                        theme = OpenThemeData(nullptr, L"Button");
                         if (element == PE_IndicatorRadioButton)
                             partId = BP_RADIOBUTTON;
                         else if (element == PE_IndicatorCheckBox)
@@ -391,7 +388,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
                     if (theme
                         && SUCCEEDED(GetThemeTransitionDuration(theme, partId, fromState, toState,
                                                                 TMT_TRANSITIONDURATIONS, &duration))) {
-                        t->setDuration(duration);
+                        t->setDuration(int(duration));
                     }
                     t->setStartTime(QTime::currentTime());
 
@@ -536,7 +533,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
                 else if (state & State_MouseOver)
                     stateId = EBS_HOT;
 
-                XPThemeData theme(0, painter, QWindowsXPStylePrivate::EditTheme,
+                XPThemeData theme(nullptr, painter, QWindowsXPStylePrivate::EditTheme,
                                   partId, stateId, rect);
                 if (!theme.isValid()) {
                     QWindowsStyle::drawPrimitive(element, option, painter, widget);
@@ -583,27 +580,26 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
                 p->drawRect(option->rect.adjusted(0, 0, -1, -1));
                 p->setPen(oldPen);
                 return;
-            } else {
-                int stateId = ETS_NORMAL;
-                if (!(state & State_Enabled))
-                    stateId = ETS_DISABLED;
-                else if (state & State_ReadOnly)
-                    stateId = ETS_READONLY;
-                else if (state & State_MouseOver)
-                    stateId = ETS_HOT;
-                else if (state & State_HasFocus)
-                    stateId = ETS_SELECTED;
-                XPThemeData theme(widget, painter,
-                                  QWindowsXPStylePrivate::EditTheme,
-                                  EP_EDITBORDER_NOSCROLL, stateId, option->rect);
-                theme.noContent = true;
-                painter->save();
-                QRegion clipRegion = option->rect;
-                clipRegion -= option->rect.adjusted(2, 2, -2, -2);
-                painter->setClipRegion(clipRegion);
-                d->drawBackground(theme);
-                painter->restore();
             }
+            int stateId = ETS_NORMAL;
+            if (!(state & State_Enabled))
+                stateId = ETS_DISABLED;
+            else if (state & State_ReadOnly)
+                stateId = ETS_READONLY;
+            else if (state & State_MouseOver)
+                stateId = ETS_HOT;
+            else if (state & State_HasFocus)
+                stateId = ETS_SELECTED;
+            XPThemeData theme(widget, painter,
+                              QWindowsXPStylePrivate::EditTheme,
+                              EP_EDITBORDER_NOSCROLL, stateId, option->rect);
+            theme.noContent = true;
+            painter->save();
+            QRegion clipRegion = option->rect;
+            clipRegion -= option->rect.adjusted(2, 2, -2, -2);
+            painter->setClipRegion(clipRegion);
+            d->drawBackground(theme);
+            painter->restore();
         }
         break;
 
@@ -726,7 +722,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
                                 d->drawBackground(theme);
                             } else {
                                 QWindowsXPStyle::drawPrimitive(PE_PanelItemViewItem, option, painter, widget);
-                                break;;
+                                break;
                             }
                             QPixmapCache::insert(key, pixmap);
                         }
@@ -772,7 +768,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
     case PE_Widget:
         {
 #if QT_CONFIG(dialogbuttonbox)
-            const QDialogButtonBox *buttonBox = 0;
+            const QDialogButtonBox *buttonBox = nullptr;
 
             if (qobject_cast<const QMessageBox *> (widget))
                 buttonBox = widget->findChild<const QDialogButtonBox *>(QLatin1String("qt_msgbox_buttonbox"));
@@ -846,7 +842,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
             int oldState = styleObject->property("_q_stylestate").toInt();
             oldRect = styleObject->property("_q_stylerect").toRect();
             newRect = option->rect;
-            styleObject->setProperty("_q_stylestate", (int)option->state);
+            styleObject->setProperty("_q_stylestate", int(option->state));
             styleObject->setProperty("_q_stylerect", option->rect);
 
             bool wasDefault = false;
@@ -872,7 +868,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
                 QWindowsVistaTransition *t = new QWindowsVistaTransition(styleObject);
                 QWindowsVistaAnimation *anim = qobject_cast<QWindowsVistaAnimation *>(d->animation(styleObject));
                 QStyleOption *styleOption = clonedAnimationStyleOption(option);
-                styleOption->state = (QStyle::State)oldState;
+                styleOption->state = QStyle::State(oldState);
 
                 QImage startImage = createAnimationBuffer(option, widget);
                 QPainter startPainter(&startImage);
@@ -894,12 +890,12 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
 
 
                 DWORD duration = 0;
-                const HTHEME theme = OpenThemeData(0, L"Button");
+                const HTHEME theme = OpenThemeData(nullptr, L"Button");
 
                 int fromState = buttonStateId(oldState, BP_PUSHBUTTON);
                 int toState = buttonStateId(option->state, BP_PUSHBUTTON);
                 if (GetThemeTransitionDuration(theme, BP_PUSHBUTTON, fromState, toState, TMT_TRANSITIONDURATIONS, &duration) == S_OK)
-                    t->setDuration(duration);
+                    t->setDuration(int(duration));
                 else
                     t->setDuration(0);
                 t->setStartTime(QTime::currentTime());
@@ -985,16 +981,16 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
 
             if (btn->features & QStyleOptionButton::HasMenu) {
                 int mbiw = 0, mbih = 0;
-                XPThemeData theme(widget, 0, QWindowsXPStylePrivate::ToolBarTheme,
+                XPThemeData theme(widget, nullptr, QWindowsXPStylePrivate::ToolBarTheme,
                                   TP_DROPDOWNBUTTON);
                 if (theme.isValid()) {
-                    const QSizeF size = theme.size() * QStyleHelper::dpiScaled(1);
+                    const QSizeF size = theme.size() * QStyleHelper::dpiScaled(1, option);
                     if (!size.isEmpty()) {
                         mbiw = qRound(size.width());
                         mbih = qRound(size.height());
                     }
                 }
-                QRect ir = subElementRect(SE_PushButtonContents, option, 0);
+                QRect ir = subElementRect(SE_PushButtonContents, option, nullptr);
                 QStyleOptionButton newBtn = *btn;
                 newBtn.rect = QStyle::visualRect(option->direction, option->rect,
                                                 QRect(ir.right() - mbiw - 2,
@@ -1139,7 +1135,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
             QPalette::ColorRole textRole = disabled ? QPalette::Text : QPalette::ButtonText;
             QPixmap pix = mbi->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, option, widget), QIcon::Normal);
 
-            uint alignment = Qt::AlignCenter | Qt::TextShowMnemonic | Qt::TextDontClip | Qt::TextSingleLine;
+            int alignment = Qt::AlignCenter | Qt::TextShowMnemonic | Qt::TextDontClip | Qt::TextSingleLine;
             if (!proxy()->styleHint(SH_UnderlineShortcut, mbi, widget))
                 alignment |= Qt::TextHideMnemonic;
 
@@ -1179,7 +1175,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
             int checkcol = qRound(qreal(25) * factor);
             const int gutterWidth = qRound(qreal(3) * factor);
             {
-                XPThemeData theme(widget, 0, QWindowsXPStylePrivate::MenuTheme,
+                XPThemeData theme(widget, nullptr, QWindowsXPStylePrivate::MenuTheme,
                                   MENU_POPUPCHECKBACKGROUND, MBI_HOT);
                 XPThemeData themeSize = theme;
                 themeSize.partId = MENU_POPUPCHECK;
@@ -1396,7 +1392,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
             int mw = proxy()->pixelMetric(QStyle::PM_DockWidgetTitleMargin, dwOpt, widget);
             int fw = proxy()->pixelMetric(PM_DockWidgetFrameWidth, dwOpt, widget);
             const QDockWidget *dw = qobject_cast<const QDockWidget *>(widget);
-            bool isFloating = dw != 0 && dw->isFloating();
+            bool isFloating = dw && dw->isFloating();
 
             QRect r = option->rect.adjusted(0, 2, -1, -3);
             QRect titleRect = r;
@@ -1413,7 +1409,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
 
             if (isFloating) {
                 titleRect.adjust(0, -fw, 0, 0);
-                if (widget != 0 && widget->windowIcon().cacheKey() != QApplication::windowIcon().cacheKey())
+                if (widget && widget->windowIcon().cacheKey() != QApplication::windowIcon().cacheKey())
                     titleRect.adjust(titleRect.height() + mw, 0, 0, 0);
             } else {
                 titleRect.adjust(mw, 0, 0, 0);
@@ -1519,8 +1515,8 @@ void QWindowsVistaStyle::drawComplexControl(ComplexControl control, const QStyle
             int oldActiveControls = styleObject->property("_q_stylecontrols").toInt();
 
             QRect oldRect = styleObject->property("_q_stylerect").toRect();
-            styleObject->setProperty("_q_stylestate", (int)option->state);
-            styleObject->setProperty("_q_stylecontrols", (int)option->activeSubControls);
+            styleObject->setProperty("_q_stylestate", int(option->state));
+            styleObject->setProperty("_q_stylecontrols", int(option->activeSubControls));
             styleObject->setProperty("_q_stylerect", option->rect);
 
             bool doTransition = ((state & State_Sunken)     != (oldState & State_Sunken)    ||
@@ -1564,8 +1560,8 @@ void QWindowsVistaStyle::drawComplexControl(ComplexControl control, const QStyle
 
                 // Draw transition source
                 if (!anim) {
-                    styleOption->state = (QStyle::State)oldState;
-                    styleOption->activeSubControls = (QStyle::SubControl)oldActiveControls;
+                    styleOption->state = QStyle::State(oldState);
+                    styleOption->activeSubControls = QStyle::SubControl(oldActiveControls);
                     proxy()->drawComplexControl(control, styleOption, &startPainter, widget);
                 } else {
                     anim->paint(&startPainter, option);
@@ -1816,7 +1812,7 @@ void QWindowsVistaStyle::drawComplexControl(ComplexControl control, const QStyle
                 // That however breaks with QtQuickControls where this results in transparent
                 // spinbox background, so if there's no "widget" passed (QtQuickControls case),
                 // let ftheme.noContent be false, which fixes the spinbox rendering in QQC
-                ftheme.noContent = (widget != NULL);
+                ftheme.noContent = (widget != nullptr);
                 d->drawBackground(ftheme);
             }
             if (sub & SC_SpinBoxUp) {
@@ -1873,7 +1869,7 @@ QSize QWindowsVistaStyle::sizeFromContents(ContentsType type, const QStyleOption
         sz = QWindowsXPStyle::sizeFromContents(type, option, size, widget);
         int minimumHeight;
         {
-            XPThemeData theme(widget, 0,
+            XPThemeData theme(widget, nullptr,
                               QWindowsXPStylePrivate::MenuTheme,
                               MENU_POPUPCHECKBACKGROUND, MBI_HOT);
             XPThemeData themeSize = theme;
@@ -1941,7 +1937,7 @@ QRect QWindowsVistaStyle::subElementRect(SubElement element, const QStyleOption
     case SE_PushButtonContents:
         if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) {
             MARGINS borderSize;
-            const HTHEME theme = OpenThemeData(widget ? QWindowsVistaStylePrivate::winId(widget) : 0, L"Button");
+            const HTHEME theme = OpenThemeData(widget ? QWindowsVistaStylePrivate::winId(widget) : nullptr, L"Button");
             if (theme) {
                 int stateId = PBS_NORMAL;
                 if (!(option->state & State_Enabled))
@@ -1956,7 +1952,7 @@ QRect QWindowsVistaStyle::subElementRect(SubElement element, const QStyleOption
                 int border = proxy()->pixelMetric(PM_DefaultFrameWidth, btn, widget);
                 rect = option->rect.adjusted(border, border, -border, -border);
 
-                if (SUCCEEDED(GetThemeMargins(theme, NULL, BP_PUSHBUTTON, stateId, TMT_CONTENTMARGINS, NULL, &borderSize))) {
+                if (SUCCEEDED(GetThemeMargins(theme, nullptr, BP_PUSHBUTTON, stateId, TMT_CONTENTMARGINS, nullptr, &borderSize))) {
                     rect.adjust(borderSize.cxLeftWidth, borderSize.cyTopHeight,
                                 -borderSize.cxRightWidth, -borderSize.cyBottomHeight);
                     rect = visualRect(option->direction, option->rect, rect);
@@ -1974,7 +1970,7 @@ QRect QWindowsVistaStyle::subElementRect(SubElement element, const QStyleOption
             int y = option->rect.y();
             int margin = proxy()->pixelMetric(QStyle::PM_HeaderMargin, option, widget);
 
-            XPThemeData theme(widget, 0,
+            XPThemeData theme(widget, nullptr,
                               QWindowsXPStylePrivate::HeaderTheme,
                               HP_HEADERSORTARROW, HSAS_SORTEDDOWN, option->rect);
 
@@ -2047,7 +2043,7 @@ static bool buttonVisible(const QStyle::SubControl sc, const QStyleOptionTitleBa
 
     bool isMinimized = tb->titleBarState & Qt::WindowMinimized;
     bool isMaximized = tb->titleBarState & Qt::WindowMaximized;
-    const uint flags = tb->titleBarFlags;
+    const auto flags = tb->titleBarFlags;
     bool retVal = false;
     switch (sc) {
     case QStyle::SC_TitleBarContextHelpButton:
@@ -2105,7 +2101,7 @@ int QWindowsVistaStyle::styleHint(StyleHint hint, const QStyleOption *option, co
         if (option) {
             if (QStyleHintReturnMask *mask = qstyleoption_cast<QStyleHintReturnMask*>(returnData)) {
                 ret = true;
-                XPThemeData themeData(widget, 0,
+                XPThemeData themeData(widget, nullptr,
                                       QWindowsXPStylePrivate::ToolTipTheme,
                                       TTP_STANDARD, TTSS_NORMAL, option->rect);
                 mask->region = d->region(themeData);
@@ -2114,7 +2110,7 @@ int QWindowsVistaStyle::styleHint(StyleHint hint, const QStyleOption *option, co
         break;
      case SH_Table_GridLineColor:
         if (option)
-            ret = option->palette.color(QPalette::Base).darker(118).rgb();
+            ret = int(option->palette.color(QPalette::Base).darker(118).rgb());
         else
             ret = -1;
         break;
@@ -2146,7 +2142,7 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt
             const int x = cb->rect.x(), y = cb->rect.y(), wi = cb->rect.width(), he = cb->rect.height();
             const int margin = cb->frame ? 3 : 0;
             const int bmarg = cb->frame ? 2 : 0;
-            const int arrowWidth = qRound(QStyleHelper::dpiScaled(16));
+            const int arrowWidth = qRound(QStyleHelper::dpiScaled(16, option));
             const int arrowButtonWidth = bmarg + arrowWidth;
             const int xpos = x + wi - arrowButtonWidth;
 
@@ -2180,7 +2176,7 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt
             const int height = tb->rect.height();
             const int width = tb->rect.width();
             const int buttonWidth =
-                qRound(qreal(GetSystemMetrics(SM_CXSIZE)) * factor - QStyleHelper::dpiScaled(4));
+                qRound(qreal(GetSystemMetrics(SM_CXSIZE)) * factor - QStyleHelper::dpiScaled(4, option));
 
             const int frameWidth = proxy()->pixelMetric(PM_MdiSubWindowFrameWidth, option, widget);
             const bool sysmenuHint  = (tb->titleBarFlags & Qt::WindowSystemMenuHint) != 0;
@@ -2281,7 +2277,7 @@ int QWindowsVistaStyle::pixelMetric(PixelMetric metric, const QStyleOption *opti
 
     int ret = QWindowsVistaStylePrivate::fixedPixelMetric(metric);
     if (ret != QWindowsStylePrivate::InvalidMetric)
-        return int(QStyleHelper::dpiScaled(ret));
+        return int(QStyleHelper::dpiScaled(ret, option));
 
     return QWindowsXPStyle::pixelMetric(metric, option, widget);
 }
@@ -2325,7 +2321,7 @@ void QWindowsVistaStyle::polish(QWidget *widget)
         //we do not have to care about unpolishing
         widget->setContentsMargins(3, 0, 4, 0);
         COLORREF bgRef;
-        HTHEME theme = OpenThemeData(widget ? QWindowsVistaStylePrivate::winId(widget) : 0, L"TOOLTIP");
+        HTHEME theme = OpenThemeData(widget ? QWindowsVistaStylePrivate::winId(widget) : nullptr, L"TOOLTIP");
         if (theme && SUCCEEDED(GetThemeColor(theme, TTP_STANDARD, TTSS_NORMAL, TMT_TEXTCOLOR, &bgRef))) {
             QColor textColor = QColor::fromRgb(bgRef);
             QPalette pal;
@@ -2465,7 +2461,7 @@ QIcon QWindowsVistaStyle::standardIcon(StandardPixmap standardIcon,
     switch(standardIcon) {
     case SP_CommandLink:
         {
-            XPThemeData theme(0, 0,
+            XPThemeData theme(nullptr, nullptr,
                               QWindowsXPStylePrivate::ButtonTheme,
                               BP_COMMANDLINKGLYPH, CMDLGS_NORMAL);
             if (theme.isValid()) {
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h b/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
index d66b17e9f8..8fef9f9927 100644
--- a/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
+++ b/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
@@ -162,7 +162,7 @@ class QWindowsVistaAnimation : public QBlendStyleAnimation
 public:
     QWindowsVistaAnimation(Type type, QObject *target) : QBlendStyleAnimation(type, target) { }
 
-    virtual bool isUpdateNeeded() const;
+    bool isUpdateNeeded() const override;
     void paint(QPainter *painter, const QStyleOption *option);
 };
 
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index 90026e5bf0..bf80138b32 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -117,7 +117,7 @@ static inline QBackingStore *backingStoreForWidget(const QWidget *widget)
     if (const QWidget *topLevel = widget->nativeParentWidget())
         if (QBackingStore *topLevelBackingStore = topLevel->backingStore())
             return topLevelBackingStore;
-    return 0;
+    return nullptr;
 }
 
 static inline HDC hdcForWidgetBackingStore(const QWidget *widget)
@@ -127,7 +127,7 @@ static inline HDC hdcForWidgetBackingStore(const QWidget *widget)
         if (nativeInterface)
             return static_cast<HDC>(nativeInterface->nativeResourceForBackingStore(QByteArrayLiteral("getDC"), backingStore));
     }
-    return 0;
+    return nullptr;
 }
 
 // Theme data helper ------------------------------------------------------------------------------
@@ -148,7 +148,7 @@ bool XPThemeData::isValid()
 HTHEME XPThemeData::handle()
 {
     if (!QWindowsXPStylePrivate::useXP())
-        return 0;
+        return nullptr;
 
     if (!htheme)
         htheme = QWindowsXPStylePrivate::createTheme(theme, QWindowsXPStylePrivate::winId(widget));
@@ -175,10 +175,10 @@ RECT XPThemeData::toRECT(const QRect &qr)
 HRGN XPThemeData::mask(QWidget *widget)
 {
     if (!IsThemeBackgroundPartiallyTransparent(handle(), partId, stateId))
-        return 0;
+        return nullptr;
 
     HRGN hrgn;
-    HDC dc = 0;
+    HDC dc = nullptr;
     if (widget)
         dc = hdcForWidgetBackingStore(widget);
     RECT nativeRect = toRECT(rect);
@@ -188,7 +188,7 @@ HRGN XPThemeData::mask(QWidget *widget)
 
 // QWindowsXPStylePrivate -------------------------------------------------------------------------
 // Static initializations
-HWND QWindowsXPStylePrivate::m_vistaTreeViewHelper = 0;
+HWND QWindowsXPStylePrivate::m_vistaTreeViewHelper = nullptr;
 HTHEME QWindowsXPStylePrivate::m_themes[NThemes];
 bool QWindowsXPStylePrivate::use_xp = false;
 QBasicAtomicInt QWindowsXPStylePrivate::ref = Q_BASIC_ATOMIC_INITIALIZER(-1); // -1 based refcounting
@@ -227,7 +227,7 @@ bool QWindowsXPStylePrivate::useXP(bool update)
 {
     if (!update)
         return use_xp;
-    return use_xp = IsThemeActive() && (IsAppThemed() || !QApplication::instance());
+    return use_xp = IsThemeActive() && (IsAppThemed() || !QCoreApplication::instance());
 }
 
 /* \internal
@@ -241,7 +241,7 @@ void QWindowsXPStylePrivate::init(bool force)
         ref.ref();
 
     useXP(true);
-    std::fill(m_themes, m_themes + NThemes, HTHEME(0));
+    std::fill(m_themes, m_themes + NThemes, nullptr);
 }
 
 /* \internal
@@ -253,12 +253,12 @@ void QWindowsXPStylePrivate::cleanup(bool force)
         if (bufferDC && nullBitmap)
             SelectObject(bufferDC, nullBitmap);
         DeleteObject(bufferBitmap);
-        bufferBitmap = 0;
+        bufferBitmap = nullptr;
     }
 
     if(bufferDC)
         DeleteDC(bufferDC);
-    bufferDC = 0;
+    bufferDC = nullptr;
 
     if (ref.deref() && !force)
         return;
@@ -282,7 +282,7 @@ void QWindowsXPStylePrivate::cleanup(bool force)
 static inline HWND createTreeViewHelperWindow()
 {
     if (QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface()) {
-        void *hwnd = 0;
+        void *hwnd = nullptr;
         void *wndProc = reinterpret_cast<void *>(DefWindowProc);
         if (QMetaObject::invokeMethod(ni, "createMessageWindow", Qt::DirectConnection,
                                   Q_RETURN_ARG(void*, hwnd),
@@ -292,7 +292,7 @@ static inline HWND createTreeViewHelperWindow()
             return reinterpret_cast<HWND>(hwnd);
         }
     }
-    return 0;
+    return nullptr;
 }
 
 bool QWindowsXPStylePrivate::initVistaTreeViewTheming()
@@ -305,7 +305,7 @@ bool QWindowsXPStylePrivate::initVistaTreeViewTheming()
         qWarning("Unable to create the treeview helper window.");
         return false;
     }
-    if (FAILED(SetWindowTheme(m_vistaTreeViewHelper, L"explorer", NULL))) {
+    if (FAILED(SetWindowTheme(m_vistaTreeViewHelper, L"explorer", nullptr))) {
         qErrnoWarning("SetWindowTheme() failed.");
         cleanupVistaTreeViewTheming();
         return false;
@@ -317,7 +317,7 @@ void QWindowsXPStylePrivate::cleanupVistaTreeViewTheming()
 {
     if (m_vistaTreeViewHelper) {
         DestroyWindow(m_vistaTreeViewHelper);
-        m_vistaTreeViewHelper = 0;
+        m_vistaTreeViewHelper = nullptr;
     }
 }
 
@@ -328,11 +328,12 @@ void QWindowsXPStylePrivate::cleanupVistaTreeViewTheming()
 */
 void QWindowsXPStylePrivate::cleanupHandleMap()
 {
-    for (int i = 0; i < NThemes; ++i)
-        if (m_themes[i]) {
-            CloseThemeData(m_themes[i]);
-            m_themes[i] = 0;
+    for (auto &theme : m_themes) {
+        if (theme) {
+            CloseThemeData(theme);
+            theme = nullptr;
         }
+    }
     QWindowsXPStylePrivate::cleanupVistaTreeViewTheming();
 }
 
@@ -340,7 +341,7 @@ HTHEME QWindowsXPStylePrivate::createTheme(int theme, HWND hwnd)
 {
     if (Q_UNLIKELY(theme < 0 || theme >= NThemes || !hwnd)) {
         qWarning("Invalid parameters #%d, %p", theme, hwnd);
-        return 0;
+        return nullptr;
     }
     if (!m_themes[theme]) {
         const wchar_t *name = themeNames[theme];
@@ -427,16 +428,16 @@ HBITMAP QWindowsXPStylePrivate::buffer(int w, int h)
         if (bufferDC && nullBitmap)
             SelectObject(bufferDC, nullBitmap);
         DeleteObject(bufferBitmap);
-        bufferBitmap = 0;
+        bufferBitmap = nullptr;
     }
 
     w = qMax(bufferW, w);
     h = qMax(bufferH, h);
 
     if (!bufferDC) {
-        HDC displayDC = GetDC(0);
+        HDC displayDC = GetDC(nullptr);
         bufferDC = CreateCompatibleDC(displayDC);
-        ReleaseDC(0, displayDC);
+        ReleaseDC(nullptr, displayDC);
     }
 
     // Define the header
@@ -450,22 +451,22 @@ HBITMAP QWindowsXPStylePrivate::buffer(int w, int h)
     bmi.bmiHeader.biCompression = BI_RGB;
 
     // Create the pixmap
-    bufferPixels = 0;
-    bufferBitmap = CreateDIBSection(bufferDC, &bmi, DIB_RGB_COLORS, (void **) &bufferPixels, 0, 0);
+    bufferPixels = nullptr;
+    bufferBitmap = CreateDIBSection(bufferDC, &bmi, DIB_RGB_COLORS, reinterpret_cast<void **>(&bufferPixels), nullptr, 0);
     GdiFlush();
-    nullBitmap = (HBITMAP)SelectObject(bufferDC, bufferBitmap);
+    nullBitmap = static_cast<HBITMAP>(SelectObject(bufferDC, bufferBitmap));
 
     if (Q_UNLIKELY(!bufferBitmap)) {
         qErrnoWarning("QWindowsXPStylePrivate::buffer(%dx%d), CreateDIBSection() failed.", w, h);
         bufferW = 0;
         bufferH = 0;
-        return 0;
+        return nullptr;
     }
     if (Q_UNLIKELY(!bufferPixels)) {
         qErrnoWarning("QWindowsXPStylePrivate::buffer(%dx%d), CreateDIBSection() did not allocate pixel data.", w, h);
         bufferW = 0;
         bufferH = 0;
-        return 0;
+        return nullptr;
     }
     bufferW = w;
     bufferH = h;
@@ -493,7 +494,7 @@ bool QWindowsXPStylePrivate::isTransparent(XPThemeData &themeData)
 */
 QRegion QWindowsXPStylePrivate::region(XPThemeData &themeData)
 {
-    HRGN hRgn = 0;
+    HRGN hRgn = nullptr;
     const qreal factor = QWindowsStylePrivate::nativeMetricScaleFactor(themeData.widget);
     RECT rect = themeData.toRECT(QRect(themeData.rect.topLeft() / factor, themeData.rect.size() / factor));
     if (!SUCCEEDED(GetThemeBackgroundRegion(themeData.handle(), bufferHDC(), themeData.partId,
@@ -502,12 +503,12 @@ QRegion QWindowsXPStylePrivate::region(XPThemeData &themeData)
     }
 
     HRGN dest = CreateRectRgn(0, 0, 0, 0);
-    const bool success = CombineRgn(dest, hRgn, 0, RGN_COPY) != ERROR;
+    const bool success = CombineRgn(dest, hRgn, nullptr, RGN_COPY) != ERROR;
 
     QRegion region;
 
     if (success) {
-        int numBytes = GetRegionData(dest, 0, 0);
+        const auto numBytes = GetRegionData(dest, 0, nullptr);
         if (numBytes == 0)
             return QRegion();
 
@@ -551,7 +552,7 @@ bool QWindowsXPStylePrivate::hasAlphaChannel(const QRect &rect)
 
     int firstAlpha = -1;
     for (int y = startY; y < h/2; ++y) {
-        DWORD *buffer = (DWORD*)bufferPixels + (y * bufferW);
+        auto buffer = reinterpret_cast<const DWORD *>(bufferPixels) + (y * bufferW);
         for (int x = startX; x < w; ++x, ++buffer) {
             int alpha = (*buffer) >> 24;
             if (firstAlpha == -1)
@@ -580,7 +581,7 @@ bool QWindowsXPStylePrivate::fixAlphaChannel(const QRect &rect)
     bool hasFixedAlphaValue = false;
 
     for (int y = startY; y < h; ++y) {
-        DWORD *buffer = (DWORD*)bufferPixels + (y * bufferW);
+        auto buffer = reinterpret_cast<DWORD *>(bufferPixels) + (y * bufferW);
         for (int x = startX; x < w; ++x, ++buffer) {
             uint pixel = *buffer;
             int alpha = qAlpha(pixel);
@@ -612,7 +613,7 @@ bool QWindowsXPStylePrivate::swapAlphaChannel(const QRect &rect, bool allPixels)
 
     // Flip the alphas, so that 255-alpha pixels are 0, and 0-alpha are 255.
     for (int y = startY; y < h; ++y) {
-        DWORD *buffer = (DWORD*)bufferPixels + (y * bufferW);
+        auto buffer = reinterpret_cast<DWORD *>(bufferPixels) + (y * bufferW);
         for (int x = startX; x < w; ++x, ++buffer) {
             if (allPixels) {
                 *buffer |= 0xFF000000;
@@ -668,7 +669,7 @@ bool QWindowsXPStylePrivate::drawBackground(XPThemeData &themeData)
         return true;
 
     QPainter *painter = themeData.painter;
-    Q_ASSERT_X(painter != 0, "QWindowsXPStylePrivate::drawBackground()", "Trying to draw a theme part without a painter");
+    Q_ASSERT_X(painter != nullptr, "QWindowsXPStylePrivate::drawBackground()", "Trying to draw a theme part without a painter");
     if (!painter || !painter->isActive())
         return false;
 
@@ -706,7 +707,7 @@ bool QWindowsXPStylePrivate::drawBackground(XPThemeData &themeData)
         }
     }
 
-    const HDC dc = canDrawDirectly ? hdcForWidgetBackingStore(themeData.widget) : HDC(0);
+    const HDC dc = canDrawDirectly ? hdcForWidgetBackingStore(themeData.widget) : nullptr;
     const bool result = dc
         ? drawBackgroundDirectly(dc, themeData, aditionalDevicePixelRatio)
         : drawBackgroundThruNativeBuffer(themeData, aditionalDevicePixelRatio);
@@ -740,7 +741,7 @@ bool QWindowsXPStylePrivate::drawBackgroundDirectly(HDC dc, XPThemeData &themeDa
 {
     QPainter *painter = themeData.painter;
 
-    const auto deviceTransform = painter->deviceTransform();
+    const auto &deviceTransform = painter->deviceTransform();
     const QPointF redirectionDelta(deviceTransform.dx(), deviceTransform.dy());
     const QRect area = scaleRect(QRectF(themeData.rect), additionalDevicePixelRatio).translated(redirectionDelta).toRect();
 
@@ -771,7 +772,7 @@ bool QWindowsXPStylePrivate::drawBackgroundDirectly(HDC dc, XPThemeData &themeDa
                           | (themeData.mirrorHorizontally ? DTBG_MIRRORDC : 0);
 
     const HRESULT result = DrawThemeBackgroundEx(themeData.handle(), dc, themeData.partId, themeData.stateId, &(drawRECT), &drawOptions);
-    SelectClipRgn(dc, 0);
+    SelectClipRgn(dc, nullptr);
     DeleteObject(hrgn);
     return SUCCEEDED(result);
 }
@@ -1099,9 +1100,7 @@ QWindowsXPStyle::QWindowsXPStyle()
 /*!
     Destroys the style.
 */
-QWindowsXPStyle::~QWindowsXPStyle()
-{
-}
+QWindowsXPStyle::~QWindowsXPStyle() = default;
 
 /*! \reimp */
 void QWindowsXPStyle::unpolish(QApplication *app)
@@ -1157,7 +1156,7 @@ void QWindowsXPStyle::polish(QWidget *widget)
     if (!d->hasInitColors) {
         // Get text color for group box labels
         COLORREF cref;
-        XPThemeData theme(widget, 0, QWindowsXPStylePrivate::ButtonTheme, 0, 0);
+        XPThemeData theme(widget, nullptr, QWindowsXPStylePrivate::ButtonTheme, 0, 0);
         GetThemeColor(theme.handle(), BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, &cref);
         d->groupBoxTextColor = qRgb(GetRValue(cref), GetGValue(cref), GetBValue(cref));
         GetThemeColor(theme.handle(), BP_GROUPBOX, GBS_DISABLED, TMT_TEXTCOLOR, &cref);
@@ -1270,7 +1269,7 @@ QRect QWindowsXPStyle::subElementRect(SubElement sr, const QStyleOption *option,
         if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) {
             MARGINS borderSize;
             if (widget) {
-                XPThemeData buttontheme(widget, 0, QWindowsXPStylePrivate::ButtonTheme);
+                XPThemeData buttontheme(widget, nullptr, QWindowsXPStylePrivate::ButtonTheme);
                 HTHEME theme = buttontheme.handle();
                 if (theme) {
                     int stateId;
@@ -1288,7 +1287,7 @@ QRect QWindowsXPStyle::subElementRect(SubElement sr, const QStyleOption *option,
                     int border = proxy()->pixelMetric(PM_DefaultFrameWidth, btn, widget);
                     rect = option->rect.adjusted(border, border, -border, -border);
 
-                    if (SUCCEEDED(GetThemeMargins(theme, NULL, BP_PUSHBUTTON, stateId, TMT_CONTENTMARGINS, NULL, &borderSize))) {
+                    if (SUCCEEDED(GetThemeMargins(theme, nullptr, BP_PUSHBUTTON, stateId, TMT_CONTENTMARGINS, nullptr, &borderSize))) {
                         rect.adjust(borderSize.cxLeftWidth, borderSize.cyTopHeight,
                                     -borderSize.cxRightWidth, -borderSize.cyBottomHeight);
                         rect = visualRect(option->direction, option->rect, rect);
@@ -1468,7 +1467,7 @@ case PE_Frame:
             return;
         themeNumber = QWindowsXPStylePrivate::ListViewTheme;
         partId = LVP_LISTGROUP;
-        XPThemeData theme(widget, 0, themeNumber, partId, 0);
+        XPThemeData theme(widget, nullptr, themeNumber, partId);
 
         if (!(flags & State_Enabled))
             stateId = ETS_DISABLED;
@@ -1486,16 +1485,19 @@ case PE_Frame:
 
                 // Inner white border
                 p->setPen(QPen(option->palette.base().color(), 0));
-                p->drawRect(QRectF(option->rect).adjusted(QStyleHelper::dpiScaled(0.5), QStyleHelper::dpiScaled(0.5),
-                                                          QStyleHelper::dpiScaled(-1), QStyleHelper::dpiScaled(-1)));
+                const qreal dpi = QStyleHelper::dpi(option);
+                const auto topLevelAdjustment = QStyleHelper::dpiScaled(0.5, dpi);
+                const auto bottomRightAdjustment = QStyleHelper::dpiScaled(-1, dpi);
+                p->drawRect(QRectF(option->rect).adjusted(topLevelAdjustment, topLevelAdjustment,
+                                                          bottomRightAdjustment, bottomRightAdjustment));
                 // Outer dark border
                 p->setPen(QPen(bordercolor, 0));
-                p->drawRect(QRectF(option->rect).adjusted(0, 0, QStyleHelper::dpiScaled(-0.5), QStyleHelper::dpiScaled(-0.5)));
+                p->drawRect(QRectF(option->rect).adjusted(0, 0, -topLevelAdjustment, -topLevelAdjustment));
                 p->setPen(oldPen);
                 return;
-            } else if (fillType == BT_NONE) {
-                return;
             }
+            if (fillType == BT_NONE)
+                return;
         }
         break;
     }
@@ -1511,7 +1513,8 @@ case PE_Frame:
             p->drawRect(option->rect.adjusted(0, 0, -1, -1));
             p->setPen(oldPen);
             return;
-        } else if (qstyleoption_cast<const QStyleOptionFrame *>(option)) {
+        }
+        if (qstyleoption_cast<const QStyleOptionFrame *>(option)) {
             themeNumber = QWindowsXPStylePrivate::EditTheme;
             partId = EP_EDITTEXT;
             noContent = true;
@@ -1535,7 +1538,7 @@ case PE_Frame:
             if (QWindowsXPStylePrivate::isLineEditBaseColorSet(option, widget)) {
                 p->fillRect(panel->rect, panel->palette.brush(QPalette::Base));
             } else {
-                XPThemeData theme(0, p, themeNumber, partId, stateId, rect);
+                XPThemeData theme(nullptr, p, themeNumber, partId, stateId, rect);
                 if (!theme.isValid()) {
                     QWindowsStyle::drawPrimitive(pe, option, p, widget);
                     return;
@@ -1584,9 +1587,9 @@ case PE_Frame:
                 wchar_t themeFileName[maxlength];
                 wchar_t themeColor[maxlength];
                 // Due to a a scaling issue with the XP Silver theme, tab gradients are not used with it
-                if (GetCurrentThemeName(themeFileName, maxlength, themeColor, maxlength, NULL, 0) == S_OK) {
-                    wchar_t *offset = 0;
-                    if ((offset = wcsrchr(themeFileName, QChar(QLatin1Char('\\')).unicode())) != NULL) {
+                if (GetCurrentThemeName(themeFileName, maxlength, themeColor, maxlength, nullptr, 0) == S_OK) {
+                    wchar_t *offset = nullptr;
+                    if ((offset = wcsrchr(themeFileName, QChar(QLatin1Char('\\')).unicode())) != nullptr) {
                         offset++;
                         if (!lstrcmp(offset, L"Luna.msstyles") && !lstrcmp(offset, L"Metallic")) {
                             useGradient = false;
@@ -1817,7 +1820,7 @@ case PE_Frame:
                 bef_v -= delta;
                 aft_h += delta;
                 aft_v += delta;
-                XPThemeData theme(0, p, QWindowsXPStylePrivate::XpTreeViewTheme);
+                XPThemeData theme(nullptr, p, QWindowsXPStylePrivate::XpTreeViewTheme);
                 theme.rect = QRect(bef_h, bef_v, decoration_size, decoration_size);
                 theme.partId = TVP_GLYPH;
                 theme.stateId = flags & QStyle::State_Open ? GLPS_OPENED : GLPS_CLOSED;
@@ -1909,7 +1912,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op
         {
             themeNumber = QWindowsXPStylePrivate::StatusTheme;
             partId = SP_GRIPPER;
-            XPThemeData theme(0, p, themeNumber, partId, 0);
+            XPThemeData theme(nullptr, p, themeNumber, partId);
             QSize size = (theme.size() * QWindowsStylePrivate::nativeMetricScaleFactor(widget)).toSize();
             size.rheight()--;
             if (const QStyleOptionSizeGrip *sg = qstyleoption_cast<const QStyleOptionSizeGrip *>(option)) {
@@ -1977,7 +1980,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op
 
             if (btn->features & QStyleOptionButton::HasMenu) {
                 int mbiw = 0, mbih = 0;
-                XPThemeData theme(widget, 0,
+                XPThemeData theme(widget, nullptr,
                                   QWindowsXPStylePrivate::ToolBarTheme,
                                   TP_SPLITBUTTONDROPDOWN);
                 if (theme.isValid()) {
@@ -2306,7 +2309,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op
 
             if (isFloating) {
                 titleRect.adjust(0, -fw, 0, 0);
-                if (widget != 0 && widget->windowIcon().cacheKey() != QApplication::windowIcon().cacheKey())
+                if (widget != nullptr && widget->windowIcon().cacheKey() != QApplication::windowIcon().cacheKey())
                     titleRect.adjust(titleRect.height() + mw, 0, 0, 0);
             } else {
                 titleRect.adjust(mw, 0, 0, 0);
@@ -2772,7 +2775,7 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo
                         break;
                     v = nextInterval;
                 }
-                if (lines.size() > 0) {
+                if (!lines.isEmpty()) {
                     p->save();
                     p->translate(slrect.topLeft());
                     p->drawLines(lines.constData(), lines.size());
@@ -2920,7 +2923,7 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo
                         p->save();
                         p->setClipRect(menuarea);
                         tool.rect = option->rect;
-                        proxy()->drawPrimitive(PE_PanelButtonBevel, &tool, p, 0);
+                        proxy()->drawPrimitive(PE_PanelButtonBevel, &tool, p, nullptr);
                         p->restore();
                     }
                     // Draw arrow
@@ -3220,7 +3223,7 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo
     }
 }
 
-static inline Qt::Orientation progressBarOrientation(const QStyleOption *option = 0)
+static inline Qt::Orientation progressBarOrientation(const QStyleOption *option = nullptr)
 {
     if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(option))
         return pb->orientation;
@@ -3231,27 +3234,27 @@ int QWindowsXPStylePrivate::pixelMetricFromSystemDp(QStyle::PixelMetric pm, cons
 {
     switch (pm) {
     case QStyle::PM_IndicatorWidth:
-        return XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::ButtonTheme, BP_CHECKBOX, CBS_UNCHECKEDNORMAL).width();
+        return XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::ButtonTheme, BP_CHECKBOX, CBS_UNCHECKEDNORMAL).width();
     case QStyle::PM_IndicatorHeight:
-        return XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::ButtonTheme, BP_CHECKBOX, CBS_UNCHECKEDNORMAL).height();
+        return XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::ButtonTheme, BP_CHECKBOX, CBS_UNCHECKEDNORMAL).height();
     case QStyle::PM_ExclusiveIndicatorWidth:
-        return XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::ButtonTheme, BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL).width();
+        return XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::ButtonTheme, BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL).width();
     case QStyle::PM_ExclusiveIndicatorHeight:
-        return XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::ButtonTheme, BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL).height();
+        return XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::ButtonTheme, BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL).height();
     case QStyle::PM_ProgressBarChunkWidth:
         return progressBarOrientation(option) == Qt::Horizontal
-            ? XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::ProgressTheme, PP_CHUNK).width()
-            : XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::ProgressTheme, PP_CHUNKVERT).height();
+            ? XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::ProgressTheme, PP_CHUNK).width()
+            : XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::ProgressTheme, PP_CHUNKVERT).height();
     case QStyle::PM_SliderThickness:
-        return XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::TrackBarTheme, TKP_THUMB).height();
+        return XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::TrackBarTheme, TKP_THUMB).height();
     case QStyle::PM_TitleBarHeight:
         return widget && (widget->windowType() == Qt::Tool)
             ? GetSystemMetrics(SM_CYSMCAPTION) + GetSystemMetrics(SM_CXSIZEFRAME)
             : GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CXSIZEFRAME);
     case QStyle::PM_MdiSubWindowFrameWidth:
-        return XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::WindowTheme, WP_FRAMELEFT, FS_ACTIVE).width();
+        return XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::WindowTheme, WP_FRAMELEFT, FS_ACTIVE).width();
     case QStyle::PM_DockWidgetFrameWidth:
-        return XPThemeData::themeSize(widget, 0, QWindowsXPStylePrivate::WindowTheme, WP_SMALLFRAMERIGHT, FS_ACTIVE).width();
+        return XPThemeData::themeSize(widget, nullptr, QWindowsXPStylePrivate::WindowTheme, WP_SMALLFRAMERIGHT, FS_ACTIVE).width();
     default:
         break;
     }
@@ -3311,7 +3314,8 @@ int QWindowsXPStyle::pixelMetric(PixelMetric pm, const QStyleOption *option, con
         break;
 
     case PM_SplitterWidth:
-        res = qMax(int(QStyleHelper::dpiScaled(5.)), QApplication::globalStrut().width());
+        res = qMax(int(QStyleHelper::dpiScaled(5., option)),
+                   QApplication::globalStrut().width());
         break;
 
     case PM_MdiSubWindowMinimizedWidth:
@@ -3320,13 +3324,13 @@ int QWindowsXPStyle::pixelMetric(PixelMetric pm, const QStyleOption *option, con
 
 #if QT_CONFIG(toolbar)
     case PM_ToolBarHandleExtent:
-        res = int(QStyleHelper::dpiScaled(8.));
+        res = int(QStyleHelper::dpiScaled(8., option));
         break;
 
 #endif // QT_CONFIG(toolbar)
     case PM_DockWidgetSeparatorExtent:
     case PM_DockWidgetTitleMargin:
-        res = int(QStyleHelper::dpiScaled(4.));
+        res = int(QStyleHelper::dpiScaled(4., option));
         break;
 
     case PM_ButtonShiftHorizontal:
@@ -3411,7 +3415,7 @@ QRect QWindowsXPStyle::subControlRect(ComplexControl cc, const QStyleOptionCompl
             const bool isToolTitle = false;
             const int height = tb->rect.height();
             const int width = tb->rect.width();
-            const int buttonMargin = int(QStyleHelper::dpiScaled(4));
+            const int buttonMargin = int(QStyleHelper::dpiScaled(4, option));
             const qreal factor = QWindowsStylePrivate::nativeMetricScaleFactor(widget);
             int buttonHeight = qRound(qreal(GetSystemMetrics(SM_CYSIZE)) * factor)
                 - buttonMargin;
@@ -3522,21 +3526,28 @@ QRect QWindowsXPStyle::subControlRect(ComplexControl cc, const QStyleOptionCompl
     case CC_ComboBox:
         if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
             const int x = cmb->rect.x(), y = cmb->rect.y(), wi = cmb->rect.width(), he = cmb->rect.height();
-            const int xpos = x + wi - qRound(QStyleHelper::dpiScaled(1 + 16));
+            const int xpos = x + wi - qRound(QStyleHelper::dpiScaled(1 + 16, option));
 
             switch (subControl) {
             case SC_ComboBoxFrame:
                 rect = cmb->rect;
                 break;
 
-            case SC_ComboBoxArrow:
-                rect = QRect(xpos, y + qRound(QStyleHelper::dpiScaled(1)),
-                             qRound(QStyleHelper::dpiScaled(16)), he - qRound(QStyleHelper::dpiScaled(2)));
+            case SC_ComboBoxArrow: {
+                const qreal dpi = QStyleHelper::dpi(option);
+                rect = QRect(xpos, y + qRound(QStyleHelper::dpiScaled(1, dpi)),
+                             qRound(QStyleHelper::dpiScaled(16, dpi)),
+                             he - qRound(QStyleHelper::dpiScaled(2, dpi)));
+            }
                 break;
 
-            case SC_ComboBoxEditField:
-                rect = QRect(x + qRound(QStyleHelper::dpiScaled(2)), y + qRound(QStyleHelper::dpiScaled(2)),
-                             wi - qRound(QStyleHelper::dpiScaled(3 + 16)), he - qRound(QStyleHelper::dpiScaled(4)));
+            case SC_ComboBoxEditField: {
+                const qreal dpi = QStyleHelper::dpi(option);
+                const int frame = qRound(QStyleHelper::dpiScaled(2, dpi));
+                rect = QRect(x + frame, y + frame,
+                             wi - qRound(QStyleHelper::dpiScaled(3 + 16, dpi)),
+                             he - qRound(QStyleHelper::dpiScaled(4, dpi)));
+            }
                 break;
 
             case SC_ComboBoxListBoxPopup:
@@ -3609,7 +3620,7 @@ QSize QWindowsXPStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt
     case CT_LineEdit:
     case CT_ComboBox:
         {
-            XPThemeData buttontheme(widget, 0, QWindowsXPStylePrivate::ButtonTheme, BP_PUSHBUTTON, PBS_NORMAL);
+            XPThemeData buttontheme(widget, nullptr, QWindowsXPStylePrivate::ButtonTheme, BP_PUSHBUTTON, PBS_NORMAL);
             if (buttontheme.isValid()) {
                 const qreal factor = QWindowsXPStylePrivate::nativeMetricScaleFactor(widget);
                 const QMarginsF borderSize = buttontheme.margins() * factor;
@@ -3730,11 +3741,11 @@ int QWindowsXPStyle::styleHint(StyleHint hint, const QStyleOption *option, const
                 titleBarRect.setHeight(tbHeight);
                 XPThemeData themeData;
                 if (titlebar->titleBarState & Qt::WindowMinimized) {
-                    themeData = XPThemeData(widget, 0,
+                    themeData = XPThemeData(widget, nullptr,
                                             QWindowsXPStylePrivate::WindowTheme,
                                             WP_MINCAPTION, CS_ACTIVE, titleBarRect);
                 } else
-                    themeData = XPThemeData(widget, 0,
+                    themeData = XPThemeData(widget, nullptr,
                                             QWindowsXPStylePrivate::WindowTheme,
                                             WP_CAPTION, CS_ACTIVE, titleBarRect);
                 mask->region = d->region(themeData) +
@@ -3763,10 +3774,8 @@ int QWindowsXPStyle::styleHint(StyleHint hint, const QStyleOption *option, const
 /*! \reimp */
 QPalette QWindowsXPStyle::standardPalette() const
 {
-    if (QWindowsXPStylePrivate::useXP() && QApplicationPrivate::sys_pal)
-        return *QApplicationPrivate::sys_pal;
-    else
-        return QWindowsStyle::standardPalette();
+    return QWindowsXPStylePrivate::useXP() && QApplicationPrivate::sys_pal
+        ? *QApplicationPrivate::sys_pal : QWindowsStyle::standardPalette();
 }
 
 /*!
@@ -3784,7 +3793,7 @@ QPixmap QWindowsXPStyle::standardPixmap(StandardPixmap standardPixmap, const QSt
         if (qstyleoption_cast<const QStyleOptionDockWidget *>(option))
         {
             if (widget && widget->isWindow()) {
-                XPThemeData theme(widget, 0, QWindowsXPStylePrivate::WindowTheme, WP_SMALLCLOSEBUTTON, CBS_NORMAL);
+                XPThemeData theme(widget, nullptr, QWindowsXPStylePrivate::WindowTheme, WP_SMALLCLOSEBUTTON, CBS_NORMAL);
                 if (theme.isValid()) {
                     const QSize size = (theme.size() * QWindowsStylePrivate::nativeMetricScaleFactor(widget)).toSize();
                     return QIcon(QWindowsStyle::standardPixmap(standardPixmap, option, widget)).pixmap(size);
@@ -3815,9 +3824,9 @@ QIcon QWindowsXPStyle::standardIcon(StandardPixmap standardIcon,
         if (qstyleoption_cast<const QStyleOptionDockWidget *>(option))
         {
             if (d->dockFloat.isNull()) {
-                XPThemeData themeSize(0, 0, QWindowsXPStylePrivate::WindowTheme,
+                XPThemeData themeSize(nullptr, nullptr, QWindowsXPStylePrivate::WindowTheme,
                                       WP_SMALLCLOSEBUTTON, CBS_NORMAL);
-                XPThemeData theme(0, 0, QWindowsXPStylePrivate::WindowTheme,
+                XPThemeData theme(nullptr, nullptr, QWindowsXPStylePrivate::WindowTheme,
                                   WP_MAXBUTTON, MAXBS_NORMAL);
                 if (theme.isValid()) {
                     const QSize size = (themeSize.size() * QWindowsStylePrivate::nativeMetricScaleFactor(widget)).toSize();
@@ -3851,7 +3860,7 @@ QIcon QWindowsXPStyle::standardIcon(StandardPixmap standardIcon,
         if (qstyleoption_cast<const QStyleOptionDockWidget *>(option))
         {
             if (d->dockClose.isNull()) {
-                XPThemeData theme(0, 0, QWindowsXPStylePrivate::WindowTheme,
+                XPThemeData theme(nullptr, nullptr, QWindowsXPStylePrivate::WindowTheme,
                                   WP_SMALLCLOSEBUTTON, CBS_NORMAL);
                 if (theme.isValid()) {
                     const QSize size = (theme.size() * QWindowsStylePrivate::nativeMetricScaleFactor(widget)).toSize();
@@ -3885,9 +3894,9 @@ QIcon QWindowsXPStyle::standardIcon(StandardPixmap standardIcon,
         if (qstyleoption_cast<const QStyleOptionDockWidget *>(option))
         {
             if (d->dockFloat.isNull()) {
-                XPThemeData themeSize(0, 0, QWindowsXPStylePrivate::WindowTheme,
+                XPThemeData themeSize(nullptr, nullptr, QWindowsXPStylePrivate::WindowTheme,
                                       WP_SMALLCLOSEBUTTON, CBS_NORMAL);
-                XPThemeData theme(0, 0, QWindowsXPStylePrivate::WindowTheme,
+                XPThemeData theme(nullptr, nullptr, QWindowsXPStylePrivate::WindowTheme,
                                   WP_RESTOREBUTTON, RBS_NORMAL);
                 if (theme.isValid()) {
                     const QSize size = (themeSize.size() * QWindowsStylePrivate::nativeMetricScaleFactor(widget)).toSize();
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle_p_p.h b/src/plugins/styles/windowsvista/qwindowsxpstyle_p_p.h
index 60f9d7e9b7..ad7754e3d4 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle_p_p.h
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle_p_p.h
@@ -100,11 +100,11 @@ class QDebug;
 class XPThemeData
 {
 public:
-    explicit XPThemeData(const QWidget *w = 0, QPainter *p = 0, int themeIn = -1,
+    explicit XPThemeData(const QWidget *w = nullptr, QPainter *p = nullptr, int themeIn = -1,
                          int part = 0, int state = 0, const QRect &r = QRect())
-        : widget(w), painter(p), theme(themeIn), htheme(0), partId(part), stateId(state),
+        : widget(w), painter(p), theme(themeIn), partId(part), stateId(state),
           mirrorHorizontally(false), mirrorVertically(false), noBorder(false),
-          noContent(false), rotate(0), rect(r)
+          noContent(false), rect(r)
     {}
 
     HRGN mask(QWidget *widget);
@@ -117,17 +117,17 @@ public:
     QMarginsF margins(const QRect &rect, int propId = TMT_CONTENTMARGINS);
     QMarginsF margins(int propId = TMT_CONTENTMARGINS);
 
-    static QSizeF themeSize(const QWidget *w = 0, QPainter *p = 0, int themeIn = -1, int part = 0, int state = 0);
-    static QMarginsF themeMargins(const QRect &rect, const QWidget *w = 0, QPainter *p = 0, int themeIn = -1,
+    static QSizeF themeSize(const QWidget *w = nullptr, QPainter *p = nullptr, int themeIn = -1, int part = 0, int state = 0);
+    static QMarginsF themeMargins(const QRect &rect, const QWidget *w = nullptr, QPainter *p = nullptr, int themeIn = -1,
                                   int part = 0, int state = 0, int propId = TMT_CONTENTMARGINS);
-    static QMarginsF themeMargins(const QWidget *w = 0, QPainter *p = 0, int themeIn = -1,
+    static QMarginsF themeMargins(const QWidget *w = nullptr, QPainter *p = nullptr, int themeIn = -1,
                                   int part = 0, int state = 0, int propId = TMT_CONTENTMARGINS);
 
     const QWidget *widget;
     QPainter *painter;
 
     int theme;
-    HTHEME htheme;
+    HTHEME htheme = nullptr;
     int partId;
     int stateId;
 
@@ -135,18 +135,18 @@ public:
     uint mirrorVertically : 1;
     uint noBorder : 1;
     uint noContent : 1;
-    uint rotate;
+    uint rotate = 0;
     QRect rect;
 };
 
 struct ThemeMapKey {
-    int theme;
-    int partId;
-    int stateId;
-    bool noBorder;
-    bool noContent;
+    int theme = 0;
+    int partId = -1;
+    int stateId = -1;
+    bool noBorder = false;
+    bool noContent = false;
 
-    ThemeMapKey() : partId(-1), stateId(-1) {}
+    ThemeMapKey() = default;
     ThemeMapKey(const XPThemeData &data)
         : theme(data.theme), partId(data.partId), stateId(data.stateId),
         noBorder(data.noBorder), noContent(data.noContent) {}
@@ -171,7 +171,7 @@ enum AlphaChannelType {
 };
 
 struct ThemeMapData {
-    AlphaChannelType alphaType; // Which type of alpha on part & state
+    AlphaChannelType alphaType = UnknownAlpha; // Which type of alpha on part & state
 
     bool dataValid         : 1; // Only used to detect if hash value is ok
     bool partIsTransparent : 1;
@@ -217,15 +217,13 @@ public:
     };
 
     QWindowsXPStylePrivate()
-        : QWindowsStylePrivate(), hasInitColors(false), bufferDC(0), bufferBitmap(0), nullBitmap(0),
-          bufferPixels(0), bufferW(0), bufferH(0)
     { init(); }
 
     ~QWindowsXPStylePrivate()
     { cleanup(); }
 
-    static int pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0);
-    static int fixedPixelMetric(QStyle::PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0);
+    static int pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *option = nullptr, const QWidget *widget = nullptr);
+    static int fixedPixelMetric(QStyle::PixelMetric pm, const QStyleOption *option = nullptr, const QWidget *widget = nullptr);
 
     static HWND winId(const QWidget *widget);
 
@@ -251,10 +249,10 @@ public:
     bool fixAlphaChannel(const QRect &rect);
     bool swapAlphaChannel(const QRect &rect, bool allPixels = false);
 
-    QRgb groupBoxTextColor;
-    QRgb groupBoxTextColorDisabled;
-    QRgb sliderTickColor;
-    bool hasInitColors;
+    QRgb groupBoxTextColor = 0;
+    QRgb groupBoxTextColorDisabled = 0;
+    QRgb sliderTickColor = 0;
+    bool hasInitColors = false;
 
     static HTHEME createTheme(int theme, HWND hwnd);
     static QString themeName(int theme);
@@ -277,11 +275,12 @@ private:
     static bool use_xp;
 
     QHash<ThemeMapKey, ThemeMapData> alphaCache;
-    HDC bufferDC;
-    HBITMAP bufferBitmap;
-    HBITMAP nullBitmap;
-    uchar *bufferPixels;
-    int bufferW, bufferH;
+    HDC bufferDC = nullptr;
+    HBITMAP bufferBitmap = nullptr;
+    HBITMAP nullBitmap = nullptr;
+    uchar *bufferPixels = nullptr;
+    int bufferW = 0;
+    int bufferH = 0;
 
     static HWND m_vistaTreeViewHelper;
     static HTHEME m_themes[NThemes];
@@ -292,7 +291,7 @@ inline QSizeF XPThemeData::size()
     QSizeF result(0, 0);
     if (isValid()) {
         SIZE size;
-        if (SUCCEEDED(GetThemePartSize(handle(), 0, partId, stateId, 0, TS_TRUE, &size)))
+        if (SUCCEEDED(GetThemePartSize(handle(), nullptr, partId, stateId, nullptr, TS_TRUE, &size)))
             result = QSize(size.cx, size.cy);
     }
     return result;
@@ -304,7 +303,7 @@ inline QMarginsF XPThemeData::margins(const QRect &qRect, int propId)
     if (isValid()) {
         MARGINS margins;
         RECT rect = XPThemeData::toRECT(qRect);
-        if (SUCCEEDED(GetThemeMargins(handle(), 0, partId, stateId, propId, &rect, &margins)))
+        if (SUCCEEDED(GetThemeMargins(handle(), nullptr, partId, stateId, propId, &rect, &margins)))
             result = QMargins(margins.cxLeftWidth, margins.cyTopHeight, margins.cxRightWidth, margins.cyBottomHeight);
     }
     return result;
@@ -315,7 +314,7 @@ inline QMarginsF XPThemeData::margins(int propId)
     QMarginsF result(0, 0, 0 ,0);
     if (isValid()) {
         MARGINS margins;
-        if (SUCCEEDED(GetThemeMargins(handle(), 0, partId, stateId, propId, NULL, &margins)))
+        if (SUCCEEDED(GetThemeMargins(handle(), nullptr, partId, stateId, propId, nullptr, &margins)))
             result = QMargins(margins.cxLeftWidth, margins.cyTopHeight, margins.cxRightWidth, margins.cyBottomHeight);
     }
     return result;
diff --git a/src/plugins/styles/windowsvista/windowsvista.pro b/src/plugins/styles/windowsvista/windowsvista.pro
index f82bcfc91b..c08db7f533 100644
--- a/src/plugins/styles/windowsvista/windowsvista.pro
+++ b/src/plugins/styles/windowsvista/windowsvista.pro
@@ -10,7 +10,7 @@ SOURCES += qwindowsvistastyle.cpp
 HEADERS += qwindowsxpstyle_p.h qwindowsxpstyle_p_p.h
 SOURCES += qwindowsxpstyle.cpp
 
-LIBS_PRIVATE += -lgdi32 -luser32
+QMAKE_USE_PRIVATE += user32 gdi32
 
 # DEFINES/LIBS needed for qwizard_win.cpp and the styles
 include(../../../widgets/kernel/win.pri)
diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h
index 3cc89890fc..372716adfc 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.h
+++ b/src/printsupport/dialogs/qabstractprintdialog.h
@@ -73,7 +73,9 @@ public:
         PrintPageRange          = 0x0004,
         PrintShowPageSize       = 0x0008,
         PrintCollateCopies      = 0x0010,
-        DontUseSheet            = 0x0020,
+#if QT_DEPRECATED_SINCE(5, 14)
+        DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x0020,
+#endif
         PrintCurrentPage        = 0x0040
     };
     Q_ENUM(PrintDialogOption)
@@ -84,8 +86,6 @@ public:
     explicit QAbstractPrintDialog(QPrinter *printer, QWidget *parent = nullptr);
     ~QAbstractPrintDialog();
 
-    int exec() override = 0;
-
     // obsolete
     void addEnabledOption(PrintDialogOption option);
     void setEnabledOptions(PrintDialogOptions options);
diff --git a/src/printsupport/dialogs/qpagesetupdialog.cpp b/src/printsupport/dialogs/qpagesetupdialog.cpp
index dc0457d20d..ce2a0416c8 100644
--- a/src/printsupport/dialogs/qpagesetupdialog.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog.cpp
@@ -114,10 +114,8 @@ void QPageSetupDialogPrivate::setPrinter(QPrinter *newPrinter)
         printer = new QPrinter;
         ownsPrinter = true;
     }
-#if 1 // Used to be excluded in Qt4 for Q_WS_X11
     if (printer->outputFormat() != QPrinter::NativeFormat)
         qWarning("QPageSetupDialog: Cannot be used on non-native printers");
-#endif
 }
 
 /*!
diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
index d9b4a84aa9..1d8af9dbf0 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
@@ -361,13 +361,21 @@ void QPageSetupWidget::initPageSizes()
         QPlatformPrinterSupport *ps = QPlatformPrinterSupportPlugin::get();
         if (ps) {
             QPrintDevice printDevice = ps->createPrintDevice(m_printerName);
+            const QPageSize defaultSize = printDevice.defaultPageSize();
             const auto pageSizes = printDevice.supportedPageSizes();
             for (const QPageSize &pageSize : pageSizes)
                 m_ui.pageSizeCombo->addItem(pageSize.name(), QVariant::fromValue(pageSize));
-            if (m_ui.pageSizeCombo->count() > 0 && printDevice.supportsCustomPageSizes()) {
-                m_ui.pageSizeCombo->addItem(tr("Custom"));
-                m_realCustomPageSizeIndex = m_ui.pageSizeCombo->count() - 1;
+            if (m_ui.pageSizeCombo->count() > 0) {
+                if (printDevice.supportsCustomPageSizes()) {
+                    m_ui.pageSizeCombo->addItem(tr("Custom"));
+                    m_realCustomPageSizeIndex = m_ui.pageSizeCombo->count() - 1;
+                }
                 m_blockSignals = false;
+
+                // If the defaultSize is index 0, setCurrentIndex won't emit the currentIndexChanged
+                // signal; workaround the issue by initially setting the currentIndex to -1
+                m_ui.pageSizeCombo->setCurrentIndex(-1);
+                m_ui.pageSizeCombo->setCurrentIndex(m_ui.pageSizeCombo->findData(QVariant::fromValue(defaultSize)));
                 return;
             }
         }
@@ -403,12 +411,6 @@ void QPageSetupWidget::setPrinter(QPrinter *printer, QPrintDevice *printDevice,
     // Initialize the layout to the current QPrinter layout
     m_pageLayout = m_printer->pageLayout();
 
-    if (printDevice) {
-        const QPageSize pageSize = printDevice->defaultPageSize();
-        const QMarginsF printable = printDevice->printableMargins(pageSize, m_pageLayout.orientation(), m_printer->resolution());
-        m_pageLayout.setPageSize(pageSize, qt_convertMargins(printable, QPageLayout::Point, m_pageLayout.units()));
-    }
-
     // Assume if margins are Points then is by default, so set to locale default units
     if (m_pageLayout.units() == QPageLayout::Point) {
         if (QLocale().measurementSystem() == QLocale::MetricSystem)
@@ -735,8 +737,12 @@ int QPageSetupDialog::exec()
     Q_D(QPageSetupDialog);
 
     int ret = QDialog::exec();
-    if (ret == Accepted)
+    if (ret == Accepted) {
         static_cast <QUnixPageSetupDialogPrivate*>(d)->widget->setupPrinter();
+        static_cast <QUnixPageSetupDialogPrivate*>(d)->widget->updateSavedValues();
+    } else {
+        static_cast <QUnixPageSetupDialogPrivate*>(d)->widget->revertToSavedValues();
+    }
     return ret;
 }
 
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index d2937e7547..c7328d9732 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -398,12 +398,12 @@ static const char *ppdOriginallySelectedChoiceProperty = "_q_ppd_originally_sele
 // Used to store the warning label pointer for each QComboBox that represents an advanced option
 static const char *warningLabelProperty = "_q_warning_label";
 
-static bool isBlacklistedGroup(const ppd_group_t *group) Q_DECL_NOTHROW
+static bool isBlacklistedGroup(const ppd_group_t *group) noexcept
 {
     return qstrcmp(group->name, "InstallableOptions") == 0;
 };
 
-static bool isBlacklistedOption(const char *keyword) Q_DECL_NOTHROW
+static bool isBlacklistedOption(const char *keyword) noexcept
 {
     // We already let the user set these options elsewhere
     const char *cupsOptionBlacklist[] = {
@@ -739,7 +739,7 @@ void QPrintDialogPrivate::selectPrinter(const QPrinter::OutputFormat outputForma
 }
 
 #if QT_CONFIG(cups)
-static std::vector<std::pair<int, int>> pageRangesFromString(const QString &pagesString) Q_DECL_NOTHROW
+static std::vector<std::pair<int, int>> pageRangesFromString(const QString &pagesString) noexcept
 {
     std::vector<std::pair<int, int>> result;
     const QStringList items = pagesString.split(',');
@@ -793,7 +793,7 @@ static std::vector<std::pair<int, int>> pageRangesFromString(const QString &page
     return result;
 }
 
-static QString stringFromPageRanges(const std::vector<std::pair<int, int>> &pageRanges) Q_DECL_NOTHROW
+static QString stringFromPageRanges(const std::vector<std::pair<int, int>> &pageRanges) noexcept
 {
     QString result;
 
@@ -810,7 +810,7 @@ static QString stringFromPageRanges(const std::vector<std::pair<int, int>> &page
     return result;
 }
 
-static bool isValidPagesString(const QString &pagesString) Q_DECL_NOTHROW
+static bool isValidPagesString(const QString &pagesString) noexcept
 {
     if (pagesString.isEmpty())
         return false;
@@ -1087,7 +1087,7 @@ void QPrintDialog::setVisible(bool visible)
 
 int QPrintDialog::exec()
 {
-    return QDialog::exec();
+    return QAbstractPrintDialog::exec();
 }
 
 void QPrintDialog::accept()
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp
index e6b665f82c..39575d5f57 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.cpp
+++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -152,8 +152,8 @@ class QPrintPreviewDialogPrivate : public QDialogPrivate
     Q_DECLARE_PUBLIC(QPrintPreviewDialog)
 public:
     QPrintPreviewDialogPrivate()
-        : printDialog(nullptr), ownPrinter(false),
-          initialized(false) {}
+        : printDialog(nullptr), pageSetupDialog(nullptr),
+          ownPrinter(false), initialized(false)  {}
 
     // private slots
     void _q_fit(QAction *action);
@@ -178,6 +178,7 @@ public:
     void updateZoomFactor();
 
     QPrintDialog *printDialog;
+    QPageSetupDialog *pageSetupDialog;
     QPrintPreviewWidget *preview;
     QPrinter *printer;
     bool ownPrinter;
@@ -494,7 +495,7 @@ void QPrintPreviewDialogPrivate::updatePageNumLabel()
 
 void QPrintPreviewDialogPrivate::updateZoomFactor()
 {
-    zoomFactor->lineEdit()->setText(QString().sprintf("%.1f%%", preview->zoomFactor()*100));
+    zoomFactor->lineEdit()->setText(QString::asprintf("%.1f%%", preview->zoomFactor()*100));
 }
 
 void QPrintPreviewDialogPrivate::_q_fit(QAction* action)
@@ -602,8 +603,10 @@ void QPrintPreviewDialogPrivate::_q_pageSetup()
 {
     Q_Q(QPrintPreviewDialog);
 
-    QPageSetupDialog pageSetup(printer, q);
-    if (pageSetup.exec() == QDialog::Accepted) {
+    if (!pageSetupDialog)
+        pageSetupDialog = new QPageSetupDialog(printer, q);
+
+    if (pageSetupDialog->exec() == QDialog::Accepted) {
         // update possible orientation changes
         if (preview->orientation() == QPrinter::Portrait) {
             portraitAction->setChecked(true);
@@ -713,6 +716,7 @@ QPrintPreviewDialog::~QPrintPreviewDialog()
     if (d->ownPrinter)
         delete d->printer;
     delete d->printDialog;
+    delete d->pageSetupDialog;
 }
 
 /*!
diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri
index ea7b4b9780..2ceaf152eb 100644
--- a/src/printsupport/kernel/kernel.pri
+++ b/src/printsupport/kernel/kernel.pri
@@ -33,7 +33,10 @@ win32 {
                 $$PWD/qprintengine_win_p.h
         SOURCES += \
                 $$PWD/qprintengine_win.cpp
-        !winrt: LIBS_PRIVATE += -lwinspool -lcomdlg32 -lgdi32 -luser32
+        !winrt {
+            LIBS_PRIVATE += -lwinspool -lcomdlg32
+            QMAKE_USE_PRIVATE += user32 gdi32
+        }
 }
 
 unix:!darwin:qtConfig(cups) {
diff --git a/src/printsupport/kernel/qcups.cpp b/src/printsupport/kernel/qcups.cpp
index 8505e8356c..2fc4621960 100644
--- a/src/printsupport/kernel/qcups.cpp
+++ b/src/printsupport/kernel/qcups.cpp
@@ -44,12 +44,12 @@
 
 QT_BEGIN_NAMESPACE
 
-static QStringList cupsOptionsList(QPrinter *printer) Q_DECL_NOTHROW
+static QStringList cupsOptionsList(QPrinter *printer) noexcept
 {
     return printer->printEngine()->property(PPK_CupsOptions).toStringList();
 }
 
-void setCupsOptions(QPrinter *printer, const QStringList &cupsOptions) Q_DECL_NOTHROW
+void setCupsOptions(QPrinter *printer, const QStringList &cupsOptions) noexcept
 {
     printer->printEngine()->setProperty(PPK_CupsOptions, QVariant(cupsOptions));
 }
@@ -106,7 +106,7 @@ static inline QString jobHoldToString(const QCUPSSupport::JobHoldUntil jobHold,
             if (holdUntilTime < localDateTime.time())
                 localDateTime = localDateTime.addDays(1);
             localDateTime.setTime(holdUntilTime);
-            return localDateTime.toUTC().time().toString(QStringViewLiteral("HH:mm"));
+            return localDateTime.toUTC().time().toString(u"HH:mm");
         }
         // else fall through:
         Q_FALLTHROUGH();
diff --git a/src/printsupport/kernel/qprintdevice_p.h b/src/printsupport/kernel/qprintdevice_p.h
index a2b18f08cf..9e76c37617 100644
--- a/src/printsupport/kernel/qprintdevice_p.h
+++ b/src/printsupport/kernel/qprintdevice_p.h
@@ -76,9 +76,7 @@ public:
     ~QPrintDevice();
 
     QPrintDevice &operator=(const QPrintDevice &other);
- #ifdef Q_COMPILER_RVALUE_REFS
     QPrintDevice &operator=(QPrintDevice &&other) { swap(other); return *this; }
-#endif
 
     void swap(QPrintDevice &other) { d.swap(other.d); }
 
diff --git a/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp b/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
index a27feb1505..bba0487452 100644
--- a/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
+++ b/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
@@ -213,7 +213,7 @@ void QSqlQuery_snippets()
     while (i.hasNext()) {
         i.next();
         cout << i.key().toUtf8().data() << ": "
-             << i.value().toString().toUtf8().data() << endl;
+             << i.value().toString().toUtf8().data() << Qt::endl;
     }
 //! [14]
     }
@@ -223,7 +223,7 @@ void QSqlQuery_snippets()
 //! [15]
     QList<QVariant> list = query.boundValues().values();
     for (int i = 0; i < list.size(); ++i)
-        cout << i << ": " << list.at(i).toString().toUtf8().data() << endl;
+        cout << i << ": " << list.at(i).toString().toUtf8().data() << Qt::endl;
 //! [15]
     }
 }
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index cccce48bb3..c6ac4d17ff 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -54,9 +54,9 @@
          \li Open Database Connectivity (ODBC) - Microsoft SQL Server and other
             ODBC-compliant databases
     \row \li \l{#QPSQL}{QPSQL} \li PostgreSQL (versions 7.3 and above)
-    \row \li \l{#QSQLITE2}{QSQLITE2} \li SQLite version 2
+    \row \li \l{#QSQLITE2}{QSQLITE2} \li SQLite version 2 \note obsolete since Qt 5.14
     \row \li \l{#QSQLITE}{QSQLITE} \li SQLite version 3
-    \row \li \l{#QTDS}{QTDS} \li Sybase Adaptive Server \note obsolete from Qt 4.7
+    \row \li \l{#QTDS}{QTDS} \li Sybase Adaptive Server \note obsolete since Qt 4.7
     \endtable
 
     SQLite is the in-process database system with the best test coverage
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index f61c72285a..01726d79ef 100644
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -184,7 +184,7 @@ QSqlDatabasePrivate *QSqlDatabasePrivate::shared_null()
 
 void QSqlDatabasePrivate::invalidateDb(const QSqlDatabase &db, const QString &name, bool doWarn)
 {
-    if (db.d->ref.load() != 1 && doWarn) {
+    if (db.d->ref.loadRelaxed() != 1 && doWarn) {
         qWarning("QSqlDatabasePrivate::removeDatabase: connection '%s' is still in use, "
                  "all queries will cease to work.", name.toLocal8Bit().constData());
         db.d->disable();
diff --git a/src/sql/kernel/qsqlerror.cpp b/src/sql/kernel/qsqlerror.cpp
index 41ea497ad7..7a1a91948c 100644
--- a/src/sql/kernel/qsqlerror.cpp
+++ b/src/sql/kernel/qsqlerror.cpp
@@ -365,7 +365,7 @@ QString QSqlError::nativeErrorCode() const
 QString QSqlError::text() const
 {
     QString result = d->databaseError;
-    if (!d->databaseError.endsWith(QLatin1String("\n")))
+    if (!d->databaseError.isEmpty() && !d->driverError.isEmpty() && !d->databaseError.endsWith(QLatin1String("\n")))
         result += QLatin1Char(' ');
     result += d->driverError;
     return result;
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index 6dac47a7fe..7dfb6eb9ec 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -66,15 +66,15 @@ public:
               ErrorType type = NoError,
               const QString &errorCode = QString());
     QSqlError(const QSqlError& other);
-    QSqlError(QSqlError &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; }
+    QSqlError(QSqlError &&other) noexcept : d(other.d) { other.d = nullptr; }
     QSqlError& operator=(const QSqlError& other);
-    QSqlError &operator=(QSqlError &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+    QSqlError &operator=(QSqlError &&other) noexcept { swap(other); return *this; }
 
     bool operator==(const QSqlError& other) const;
     bool operator!=(const QSqlError& other) const;
     ~QSqlError();
 
-    void swap(QSqlError &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QSqlError &other) noexcept { qSwap(d, other.d); }
 
     QString driverText() const;
     QString databaseText() const;
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index daadcb8a0e..e7c444f5b9 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -374,7 +374,7 @@ bool QSqlQuery::exec(const QString& query)
     QElapsedTimer t;
     t.start();
 #endif
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         bool fo = isForwardOnly();
         *this = QSqlQuery(driver()->createResult());
         d->sqlResult->setNumericalPrecisionPolicy(d->sqlResult->numericalPrecisionPolicy());
@@ -960,7 +960,7 @@ void QSqlQuery::clear()
 */
 bool QSqlQuery::prepare(const QString& query)
 {
-    if (d->ref.load() != 1) {
+    if (d->ref.loadRelaxed() != 1) {
         bool fo = isForwardOnly();
         *this = QSqlQuery(driver()->createResult());
         setForwardOnly(fo);
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp
index ecbe3eacdb..c4dc5d1adb 100644
--- a/src/sql/kernel/qsqlrecord.cpp
+++ b/src/sql/kernel/qsqlrecord.cpp
@@ -535,7 +535,7 @@ QDebug operator<<(QDebug dbg, const QSqlRecord &r)
     dbg << "QSqlRecord(" << count << ')';
     for (int i = 0; i < count; ++i) {
         dbg.nospace();
-        dbg << '\n' << qSetFieldWidth(2) << right << i << left << qSetFieldWidth(0) << ':';
+        dbg << '\n' << qSetFieldWidth(2) << Qt::right << i << Qt::left << qSetFieldWidth(0) << ':';
         dbg.space();
         dbg << r.field(i) << r.value(i).toString();
     }
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index 589088238b..cc91c6d0ed 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -41,7 +41,6 @@
 
 #include "qvariant.h"
 #include "qhash.h"
-#include "qregexp.h"
 #include "qsqlerror.h"
 #include "qsqlfield.h"
 #include "qsqlrecord.h"
diff --git a/src/sql/models/qsqlquerymodel_p.h b/src/sql/models/qsqlquerymodel_p.h
index d5ca2f89cb..64e9aeb3db 100644
--- a/src/sql/models/qsqlquerymodel_p.h
+++ b/src/sql/models/qsqlquerymodel_p.h
@@ -75,7 +75,7 @@ public:
     void initColOffsets(int size);
     int columnInQuery(int modelColumn) const;
 
-    mutable QSqlQuery query = { QSqlQuery(0) };
+    mutable QSqlQuery query = { QSqlQuery(nullptr) };
     mutable QSqlError error;
     QModelIndex bottom;
     QSqlRecord rec;
diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h
index 555755009c..1929bd320a 100644
--- a/src/sql/models/qsqlrelationaltablemodel.h
+++ b/src/sql/models/qsqlrelationaltablemodel.h
@@ -58,7 +58,7 @@ public:
                const QString &displayCol)
         : tName(aTableName), iColumn(indexCol), dColumn(displayCol) {}
 
-    void swap(QSqlRelation &other) Q_DECL_NOTHROW
+    void swap(QSqlRelation &other) noexcept
     {
         qSwap(tName, other.tName);
         qSwap(iColumn, other.iColumn);
@@ -71,7 +71,7 @@ public:
     { return iColumn; }
     inline QString displayColumn() const
     { return dColumn; }
-    bool isValid() const Q_DECL_NOTHROW
+    bool isValid() const noexcept
     { return !(tName.isEmpty() || iColumn.isEmpty() || dColumn.isEmpty()); }
 private:
     QString tName, iColumn, dColumn;
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 98d6ddf882..4bc9a8c2f8 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -611,7 +611,7 @@ bool QSqlTableModel::setData(const QModelIndex &index, const QVariant &value, in
 /*!
     \reimp
  */
-bool QStringListModel::clearItemData(const QModelIndex &index)
+bool QSqlTableModel::clearItemData(const QModelIndex &index)
 {
     return setData(index, QVariant(), Qt::EditRole);
 }
diff --git a/src/sql/models/qsqltablemodel_p.h b/src/sql/models/qsqltablemodel_p.h
index bb568ab444..9ac34e7259 100644
--- a/src/sql/models/qsqltablemodel_p.h
+++ b/src/sql/models/qsqltablemodel_p.h
@@ -93,7 +93,7 @@ public:
     QSqlTableModel::EditStrategy strategy;
     bool busyInsertingRows;
 
-    QSqlQuery editQuery = { QSqlQuery(0) };
+    QSqlQuery editQuery = { QSqlQuery(nullptr) };
     QSqlIndex primaryIndex;
     QString tableName;
     QString filter;
diff --git a/src/src.pro b/src/src.pro
index ce3db6d783..8ff3ec4c1f 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,10 +23,6 @@ src_tools_rcc.subdir = tools/rcc
 src_tools_rcc.target = sub-rcc
 src_tools_rcc.depends = src_tools_bootstrap
 
-src_tools_qfloat16_tables.subdir = tools/qfloat16-tables
-src_tools_qfloat16_tables.target = sub-qfloat16-tables
-src_tools_qfloat16_tables.depends = src_tools_bootstrap
-
 src_tools_qlalr.subdir = tools/qlalr
 src_tools_qlalr.target = sub-qlalr
 force_bootstrap: src_tools_qlalr.depends = src_tools_bootstrap
@@ -59,6 +55,10 @@ src_tools_androiddeployqt.subdir = tools/androiddeployqt
 src_tools_androiddeployqt.target = sub-androiddeployqt
 src_tools_androiddeployqt.depends = src_corelib
 
+src_tools_androidtestrunner.subdir = tools/androidtestrunner
+src_tools_androidtestrunner.target = sub-androidtestrunner
+src_tools_androidtestrunner.depends = src_corelib
+
 src_tools_qvkgen.subdir = tools/qvkgen
 src_tools_qvkgen.target = sub-qvkgen
 force_bootstrap: src_tools_qvkgen.depends = src_tools_bootstrap
@@ -70,7 +70,7 @@ src_winmain.depends = sub-corelib  # just for the module .pri file
 
 src_corelib.subdir = $$PWD/corelib
 src_corelib.target = sub-corelib
-src_corelib.depends = src_tools_moc src_tools_rcc src_tools_tracegen src_tools_qfloat16_tables
+src_corelib.depends = src_tools_moc src_tools_rcc src_tools_tracegen
 
 src_xml.subdir = $$PWD/xml
 src_xml.target = sub-xml
@@ -157,12 +157,12 @@ src_android.subdir = $$PWD/android
         src_3rdparty_freetype.depends += src_corelib
     }
 }
-SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_tracegen src_tools_qfloat16_tables
+SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_tracegen
 qtConfig(regularexpression):pcre2 {
     SUBDIRS += src_3rdparty_pcre2
     src_corelib.depends += src_3rdparty_pcre2
 }
-TOOLS = src_tools_moc src_tools_rcc src_tools_tracegen src_tools_qlalr src_tools_qfloat16_tables
+TOOLS = src_tools_moc src_tools_rcc src_tools_tracegen src_tools_qlalr
 SUBDIRS += src_corelib src_tools_qlalr
 win32:SUBDIRS += src_winmain
 qtConfig(network) {
@@ -186,8 +186,10 @@ qtConfig(dbus) {
 }
 
 android {
-    SUBDIRS += src_tools_androiddeployqt
-    TOOLS += src_tools_androiddeployqt
+    SUBDIRS += src_tools_androiddeployqt \
+               src_tools_androidtestrunner
+    TOOLS += src_tools_androiddeployqt \
+             src_tools_androidtestrunner
 }
 
 qtConfig(concurrent): SUBDIRS += src_concurrent
@@ -209,9 +211,11 @@ qtConfig(gui) {
         SUBDIRS += src_3rdparty_freetype
         src_platformsupport.depends += src_3rdparty_freetype
     }
-    SUBDIRS += src_tools_qvkgen
-    src_gui.depends += src_tools_qvkgen
-    TOOLS += src_tools_qvkgen
+    qtConfig(vkgen) {
+        SUBDIRS += src_tools_qvkgen
+        src_gui.depends += src_tools_qvkgen
+        TOOLS += src_tools_qvkgen
+    }
     SUBDIRS += src_gui src_platformsupport src_platformheaders
     qtConfig(opengl): SUBDIRS += src_openglextensions
     src_plugins.depends += src_gui src_platformsupport src_platformheaders
diff --git a/src/testlib/configure.json b/src/testlib/configure.json
index df6132cdc2..726f614ee5 100644
--- a/src/testlib/configure.json
+++ b/src/testlib/configure.json
@@ -16,6 +16,12 @@
             "purpose": "Provides a utility to test item models.",
             "condition": "features.itemmodel",
             "output": [ "publicFeature" ]
+        },
+        "valgrind": {
+            "label": "Valgrind",
+            "purpose": "Profiling support with callgrind.",
+            "condition": "(config.linux || config.darwin) && features.process && features.regularexpression",
+            "output": [ "publicFeature" ]
         }
     },
 
diff --git a/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp b/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp
index a4513a55a9..37aba2715b 100644
--- a/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp
+++ b/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp
@@ -98,3 +98,51 @@ QVERIFY(spy.wait(1000));
 QSignalSpy spy(myPushButton, &QPushButton::clicked);
 //! [6]
 
+//! [7]
+QObject object;
+auto mo = object.metaObject();
+auto signalIndex = mo->indexOfSignal("objectNameChanged(QString)");
+auto signal = mo->method(signalIndex);
+
+QSignalSpy spy(&object, signal);
+object.setObjectName("A new object name");
+QCOMPARE(spy.count(), 1);
+//! [7]
+
+//! [8]
+void tst_QWindow::writeMinMaxDimensionalProps_data()
+    QTest::addColumn<int>("propertyIndex");
+
+    // Collect all relevant properties
+    static const auto mo = QWindow::staticMetaObject;
+    for (int i = mo.propertyOffset(); i < mo.propertyCount(); ++i) {
+        auto property = mo.property(i);
+
+        // ...that have type int
+        if (property.type() == QVariant::Int) {
+            static const QRegularExpression re("^minimum|maximum");
+            const auto name = property.name();
+
+            // ...and start with "minimum" or "maximum"
+            if (re.match(name).hasMatch()) {
+                QTest::addRow("%s", name) << i;
+            }
+        }
+    }
+}
+
+void tst_QWindow::writeMinMaxDimensionalProps()
+{
+    QFETCH(int, propertyIndex);
+
+    auto property = QWindow::staticMetaObject.property(propertyIndex);
+    QVERIFY(property.isWritable());
+    QVERIFY(property.hasNotifySignal());
+
+    QWindow window;
+    QSignalSpy spy(&window, property.notifySignal());
+
+    QVERIFY(property.write(&window, 42));
+    QCOMPARE(spy.count(), 1);
+}
+//! [8]
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc
index ee7767b5a5..bb379fe029 100644
--- a/src/testlib/doc/src/qttestlib-manual.qdoc
+++ b/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -109,6 +109,11 @@
     Example:
     \snippet code/doc_src_qtestlib.cpp 0
 
+    Finally, if the test class has a static public \c{void initMain()} method,
+    it is called by the QTEST_MAIN macros before the QApplication object
+    is instantiated. For example, this allows for setting application
+    attributes like Qt::AA_DisableHighDpiScaling. This was added in 5.14.
+
     For more examples, refer to the \l{Qt Test Tutorial}.
 
     \if !defined(qtforpython)
diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index 2b54cd410b..ff05dd88c7 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -87,7 +87,7 @@ QAbstractTestLogger::~QAbstractTestLogger()
     if (stream != stdout) {
         fclose(stream);
     }
-    stream = 0;
+    stream = nullptr;
 }
 
 void QAbstractTestLogger::filterUnprintable(char *str) const
diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h
index a64e7ea96f..e5a1404c16 100644
--- a/src/testlib/qabstracttestlogger_p.h
+++ b/src/testlib/qabstracttestlogger_p.h
@@ -97,14 +97,14 @@ public:
     virtual void enterTestData(QTestData *) {}
 
     virtual void addIncident(IncidentTypes type, const char *description,
-                             const char *file = 0, int line = 0) = 0;
+                             const char *file = nullptr, int line = 0) = 0;
     virtual void addBenchmarkResult(const QBenchmarkResult &result) = 0;
 
     virtual void addMessage(QtMsgType, const QMessageLogContext &,
                             const QString &);
 
     virtual void addMessage(MessageTypes type, const QString &message,
-                            const char *file = 0, int line = 0) = 0;
+                            const char *file = nullptr, int line = 0) = 0;
 
     void outputString(const char *msg);
 
@@ -117,8 +117,7 @@ struct QTestCharBuffer
 {
     enum { InitialSize = 512 };
 
-    inline QTestCharBuffer()
-            : _size(InitialSize), buf(staticBuf)
+    inline QTestCharBuffer() : buf(staticBuf)
     {
         staticBuf[0] = '\0';
     }
@@ -151,7 +150,7 @@ struct QTestCharBuffer
 
     inline bool reset(int newSize)
     {
-        char *newBuf = 0;
+        char *newBuf = nullptr;
         if (buf == staticBuf) {
             // if we point to our internal buffer, we need to malloc first
             newBuf = reinterpret_cast<char *>(malloc(newSize));
@@ -170,7 +169,7 @@ struct QTestCharBuffer
     }
 
 private:
-    int _size;
+    int _size = InitialSize;
     char* buf;
     char staticBuf[InitialSize];
 };
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index d49d07bb70..aafdc64831 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -51,14 +51,6 @@ QT_BEGIN_NAMESPACE
 QBenchmarkGlobalData *QBenchmarkGlobalData::current;
 
 QBenchmarkGlobalData::QBenchmarkGlobalData()
-    : measurer(0)
-    , walltimeMinimum(-1)
-    , iterationCount(-1)
-    , medianIterationCount(-1)
-    , createChart(false)
-    , verboseOutput(false)
-    , minimumTotal(-1)
-    , mode_(WallTime)
 {
     setMode(mode_);
 }
@@ -66,23 +58,23 @@ QBenchmarkGlobalData::QBenchmarkGlobalData()
 QBenchmarkGlobalData::~QBenchmarkGlobalData()
 {
     delete measurer;
-    QBenchmarkGlobalData::current = 0;
+    if (QBenchmarkGlobalData::current == this)
+        QBenchmarkGlobalData::current = nullptr;
 }
 
 void QBenchmarkGlobalData::setMode(Mode mode)
 {
     mode_ = mode;
 
-    if (measurer)
-        delete measurer;
+    delete measurer;
     measurer = createMeasurer();
 }
 
 QBenchmarkMeasurerBase * QBenchmarkGlobalData::createMeasurer()
 {
-    QBenchmarkMeasurerBase *measurer = 0;
+    QBenchmarkMeasurerBase *measurer = nullptr;
     if (0) {
-#ifdef QTESTLIB_USE_VALGRIND
+#if QT_CONFIG(valgrind)
     } else if (mode_ == CallgrindChildProcess || mode_ == CallgrindParentProcess) {
         measurer = new QBenchmarkCallgrindMeasurer;
 #endif
@@ -105,24 +97,18 @@ QBenchmarkMeasurerBase * QBenchmarkGlobalData::createMeasurer()
 
 int QBenchmarkGlobalData::adjustMedianIterationCount()
 {
-    if (medianIterationCount != -1) {
-        return medianIterationCount;
-    } else {
-        return measurer->adjustMedianCount(1);
-    }
+    return medianIterationCount != -1
+        ? medianIterationCount : measurer->adjustMedianCount(1);
 }
 
 
 QBenchmarkTestMethodData *QBenchmarkTestMethodData::current;
 
-QBenchmarkTestMethodData::QBenchmarkTestMethodData()
-:resultAccepted(false), runOnce(false), iterationCount(-1)
-{
-}
+QBenchmarkTestMethodData::QBenchmarkTestMethodData() = default;
 
 QBenchmarkTestMethodData::~QBenchmarkTestMethodData()
 {
-    QBenchmarkTestMethodData::current = 0;
+    QBenchmarkTestMethodData::current = nullptr;
 }
 
 void QBenchmarkTestMethodData::beginDataRun()
diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h
index 3fa9c5f534..93b5becb2b 100644
--- a/src/testlib/qbenchmark_p.h
+++ b/src/testlib/qbenchmark_p.h
@@ -55,12 +55,6 @@
 
 #include <QtCore/qglobal.h>
 
-#if (defined(Q_OS_LINUX) || defined Q_OS_MACOS) && QT_CONFIG(process)
-#define QTESTLIB_USE_VALGRIND
-#else
-#undef QTESTLIB_USE_VALGRIND
-#endif
-
 #if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_ANDROID)
 #define QTESTLIB_USE_PERF_EVENTS
 #else
@@ -70,7 +64,7 @@
 #include <QtTest/private/qbenchmarkmeasurement_p.h>
 #include <QtCore/QMap>
 #include <QtTest/qttestglobal.h>
-#ifdef QTESTLIB_USE_VALGRIND
+#if QT_CONFIG(valgrind)
 #include <QtTest/private/qbenchmarkvalgrind_p.h>
 #endif
 #ifdef QTESTLIB_USE_PERF_EVENTS
@@ -87,7 +81,7 @@ struct QBenchmarkContext
     QString slotName;
     QString tag; // from _data() function
 
-    int checkpointIndex;
+    int checkpointIndex = -1;
 
     QString toString() const
     {
@@ -95,7 +89,7 @@ struct QBenchmarkContext
                .arg(slotName, tag, QString::number(checkpointIndex));
     }
 
-    QBenchmarkContext() : checkpointIndex(-1) {}
+    QBenchmarkContext()  = default;
 };
 Q_DECLARE_TYPEINFO(QBenchmarkContext, Q_MOVABLE_TYPE);
 
@@ -103,19 +97,13 @@ class QBenchmarkResult
 {
 public:
     QBenchmarkContext context;
-    qreal value;
-    int iterations;
-    QTest::QBenchmarkMetric metric;
-    bool setByMacro;
-    bool valid;
-
-    QBenchmarkResult()
-    : value(-1)
-    , iterations(-1)
-    , metric(QTest::FramesPerSecond)
-    , setByMacro(true)
-    , valid(false)
-    { }
+    qreal value = -1;
+    int iterations = -1;
+    QTest::QBenchmarkMetric metric = QTest::FramesPerSecond;
+    bool setByMacro = true;
+    bool valid = false;
+
+    QBenchmarkResult() = default;
 
     QBenchmarkResult(
         const QBenchmarkContext &context, const qreal value, const int iterations,
@@ -153,17 +141,17 @@ public:
     QBenchmarkMeasurerBase *createMeasurer();
     int adjustMedianIterationCount();
 
-    QBenchmarkMeasurerBase *measurer;
+    QBenchmarkMeasurerBase *measurer = nullptr;
     QBenchmarkContext context;
-    int walltimeMinimum;
-    int iterationCount;
-    int medianIterationCount;
-    bool createChart;
-    bool verboseOutput;
+    int walltimeMinimum = -1;
+    int iterationCount = -1;
+    int medianIterationCount = -1;
+    bool createChart = false;
+    bool verboseOutput = false;
     QString callgrindOutFileBase;
-    int minimumTotal;
+    int minimumTotal = -1;
 private:
-    Mode mode_;
+    Mode mode_ = WallTime;
 };
 
 /*
@@ -190,9 +178,9 @@ public:
     void setResult(qreal value, QTest::QBenchmarkMetric metric, bool setByMacro = true);
 
     QBenchmarkResult result;
-    bool resultAccepted;
-    bool runOnce;
-    int iterationCount;
+    bool resultAccepted = false;
+    bool runOnce = false;
+    int iterationCount = -1;
 };
 
 // low-level API:
diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp
index f696f8b1eb..bcae9325cd 100644
--- a/src/testlib/qbenchmarkevent.cpp
+++ b/src/testlib/qbenchmarkevent.cpp
@@ -44,14 +44,9 @@
 
 QT_BEGIN_NAMESPACE
 
-QBenchmarkEvent::QBenchmarkEvent()
-    : eventCounter(0)
-{
-}
+QBenchmarkEvent::QBenchmarkEvent() = default;
 
-QBenchmarkEvent::~QBenchmarkEvent()
-{
-}
+QBenchmarkEvent::~QBenchmarkEvent() = default;
 
 void QBenchmarkEvent::start()
 {
@@ -96,7 +91,11 @@ QTest::QBenchmarkMetric QBenchmarkEvent::metricType()
 }
 
 // This could be done in a much better way, this is just the beginning.
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QBenchmarkEvent::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QBenchmarkEvent::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
+#endif
 {
     Q_UNUSED(eventType);
     Q_UNUSED(message);
diff --git a/src/testlib/qbenchmarkevent_p.h b/src/testlib/qbenchmarkevent_p.h
index af42a17141..9fe3daa33b 100644
--- a/src/testlib/qbenchmarkevent_p.h
+++ b/src/testlib/qbenchmarkevent_p.h
@@ -71,8 +71,12 @@ public:
     int adjustMedianCount(int suggestion) override;
     bool repeatCount() override { return 1; }
     QTest::QBenchmarkMetric metricType() override;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
-    qint64 eventCounter;
+#endif
+    qint64 eventCounter = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h
index 8dbfd4b618..1e2b82c25d 100644
--- a/src/testlib/qbenchmarkmeasurement_p.h
+++ b/src/testlib/qbenchmarkmeasurement_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QBenchmarkMeasurerBase
 {
 public:
-    virtual ~QBenchmarkMeasurerBase() {}
+    virtual ~QBenchmarkMeasurerBase() = default;
     virtual void init() {}
     virtual void start() = 0;
     virtual qint64 checkpoint() = 0;
@@ -66,7 +66,7 @@ public:
     virtual bool isMeasurementAccepted(qint64 measurement) = 0;
     virtual int adjustIterationCount(int suggestion) = 0;
     virtual int adjustMedianCount(int suggestion) = 0;
-    virtual bool repeatCount() { return 1; }
+    virtual bool repeatCount() { return true; }
     virtual bool needsWarmupIteration() { return false; }
     virtual QTest::QBenchmarkMetric metricType() = 0;
 };
diff --git a/src/testlib/qbenchmarkperfevents.cpp b/src/testlib/qbenchmarkperfevents.cpp
index 91f0792338..e8c6969d4a 100644
--- a/src/testlib/qbenchmarkperfevents.cpp
+++ b/src/testlib/qbenchmarkperfevents.cpp
@@ -147,7 +147,7 @@ bool QBenchmarkPerfEventsMeasurer::isAvailable()
 {
     // this generates an EFAULT because attr == NULL if perf_event_open is available
     // if the kernel is too old, it generates ENOSYS
-    return perf_event_open(0, 0, 0, 0, 0) == -1 && errno != ENOSYS;
+    return perf_event_open(nullptr, 0, 0, 0, 0) == -1 && errno != ENOSYS;
 }
 
 /* Event list structure
@@ -500,10 +500,7 @@ void QBenchmarkPerfEventsMeasurer::listCounters()
            "Attributes can be combined, for example: -perfcounter branch-mispredicts:kh\n");
 }
 
-QBenchmarkPerfEventsMeasurer::QBenchmarkPerfEventsMeasurer()
-    : fd(-1)
-{
-}
+QBenchmarkPerfEventsMeasurer::QBenchmarkPerfEventsMeasurer() = default;
 
 QBenchmarkPerfEventsMeasurer::~QBenchmarkPerfEventsMeasurer()
 {
diff --git a/src/testlib/qbenchmarkperfevents_p.h b/src/testlib/qbenchmarkperfevents_p.h
index 86ba556549..3f27161ef5 100644
--- a/src/testlib/qbenchmarkperfevents_p.h
+++ b/src/testlib/qbenchmarkperfevents_p.h
@@ -60,23 +60,23 @@ class QBenchmarkPerfEventsMeasurer : public QBenchmarkMeasurerBase
 public:
     QBenchmarkPerfEventsMeasurer();
     ~QBenchmarkPerfEventsMeasurer();
-    virtual void init() override;
-    virtual void start() override;
-    virtual qint64 checkpoint() override;
-    virtual qint64 stop() override;
-    virtual bool isMeasurementAccepted(qint64 measurement) override;
-    virtual int adjustIterationCount(int suggestion) override;
-    virtual int adjustMedianCount(int suggestion) override;
-    virtual bool repeatCount() override { return 1; }
-    virtual bool needsWarmupIteration() override { return true; }
-    virtual QTest::QBenchmarkMetric metricType() override;
+    void init() override;
+    void start() override;
+    qint64 checkpoint() override;
+    qint64 stop() override;
+    bool isMeasurementAccepted(qint64 measurement) override;
+    int adjustIterationCount(int suggestion) override;
+    int adjustMedianCount(int suggestion) override;
+    bool repeatCount() override { return true; }
+    bool needsWarmupIteration() override { return true; }
+    QTest::QBenchmarkMetric metricType() override;
 
     static bool isAvailable();
     static QTest::QBenchmarkMetric metricForEvent(quint32 type, quint64 event_id);
     static void setCounter(const char *name);
     static void listCounters();
 private:
-    int fd;
+    int fd = -1;
 
     qint64 readValue();
 };
diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp
index 7d24eb8293..44888c4d30 100644
--- a/src/testlib/qbenchmarkvalgrind.cpp
+++ b/src/testlib/qbenchmarkvalgrind.cpp
@@ -39,8 +39,6 @@
 
 #include <QtTest/private/qbenchmark_p.h>
 
-#ifdef QTESTLIB_USE_VALGRIND
-
 #include <QtTest/private/qbenchmarkvalgrind_p.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qcoreapplication.h>
@@ -170,7 +168,7 @@ QString QBenchmarkValgrindUtils::outFileBase(qint64 pid)
 // Returns \c true upon success, otherwise false.
 bool QBenchmarkValgrindUtils::runCallgrindSubProcess(const QStringList &origAppArgs, int &exitCode)
 {
-    const QString execFile(origAppArgs.at(0));
+    const QString &execFile = origAppArgs.at(0);
     QStringList args;
     args << QLatin1String("--tool=callgrind") << QLatin1String("--instr-atstart=yes")
          << QLatin1String("--quiet")
@@ -179,7 +177,7 @@ bool QBenchmarkValgrindUtils::runCallgrindSubProcess(const QStringList &origAppA
     // pass on original arguments that make sense (e.g. avoid wasting time producing output
     // that will be ignored anyway) ...
     for (int i = 1; i < origAppArgs.size(); ++i) {
-        const QString arg(origAppArgs.at(i));
+        const QString &arg = origAppArgs.at(i);
         if (arg == QLatin1String("-callgrind"))
             continue;
         args << arg; // ok to pass on
@@ -243,5 +241,3 @@ QTest::QBenchmarkMetric QBenchmarkCallgrindMeasurer::metricType()
 }
 
 QT_END_NAMESPACE
-
-#endif // QTESTLIB_USE_VALGRIND
diff --git a/src/testlib/qbenchmarkvalgrind_p.h b/src/testlib/qbenchmarkvalgrind_p.h
index 69219b9a65..0619be9f22 100644
--- a/src/testlib/qbenchmarkvalgrind_p.h
+++ b/src/testlib/qbenchmarkvalgrind_p.h
@@ -58,6 +58,8 @@
 
 class QStringList;
 
+QT_REQUIRE_CONFIG(valgrind);
+
 QT_BEGIN_NAMESPACE
 
 class QBenchmarkValgrindUtils
diff --git a/src/testlib/qcsvbenchmarklogger.cpp b/src/testlib/qcsvbenchmarklogger.cpp
index ee7270b634..f410ec6e3d 100644
--- a/src/testlib/qcsvbenchmarklogger.cpp
+++ b/src/testlib/qcsvbenchmarklogger.cpp
@@ -46,9 +46,7 @@ QCsvBenchmarkLogger::QCsvBenchmarkLogger(const char *filename)
 {
 }
 
-QCsvBenchmarkLogger::~QCsvBenchmarkLogger()
-{
-}
+QCsvBenchmarkLogger::~QCsvBenchmarkLogger() = default;
 
 void QCsvBenchmarkLogger::startLogging()
 {
diff --git a/src/testlib/qcsvbenchmarklogger_p.h b/src/testlib/qcsvbenchmarklogger_p.h
index 5840aee0f5..83e465c859 100644
--- a/src/testlib/qcsvbenchmarklogger_p.h
+++ b/src/testlib/qcsvbenchmarklogger_p.h
@@ -68,11 +68,11 @@ public:
     void leaveTestFunction() override;
 
     void addIncident(IncidentTypes type, const char *description,
-                     const char *file = 0, int line = 0) override;
+                     const char *file = nullptr, int line = 0) override;
     void addBenchmarkResult(const QBenchmarkResult &result) override;
 
     void addMessage(MessageTypes type, const QString &message,
-                            const char *file = 0, int line = 0) override;
+                            const char *file = nullptr, int line = 0) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index ed53dcdde8..c2e0bebaa0 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -316,9 +316,7 @@ QPlainTestLogger::QPlainTestLogger(const char *filename)
 {
 }
 
-QPlainTestLogger::~QPlainTestLogger()
-{
-}
+QPlainTestLogger::~QPlainTestLogger() = default;
 
 void QPlainTestLogger::startLogging()
 {
diff --git a/src/testlib/qplaintestlogger_p.h b/src/testlib/qplaintestlogger_p.h
index 55755830b2..80ef4864c1 100644
--- a/src/testlib/qplaintestlogger_p.h
+++ b/src/testlib/qplaintestlogger_p.h
@@ -68,17 +68,17 @@ public:
     void leaveTestFunction() override;
 
     void addIncident(IncidentTypes type, const char *description,
-                     const char *file = 0, int line = 0) override;
+                     const char *file = nullptr, int line = 0) override;
     void addBenchmarkResult(const QBenchmarkResult &result) override;
 
     void addMessage(QtMsgType, const QMessageLogContext &,
                     const QString &) override;
 
     void addMessage(MessageTypes type, const QString &message,
-                    const char *file = 0, int line = 0) override;
+                    const char *file = nullptr, int line = 0) override;
 
 private:
-    void printMessage(const char *type, const char *msg, const char *file = 0, int line = 0);
+    void printMessage(const char *type, const char *msg, const char *file = nullptr, int line = 0);
     void outputMessage(const char *str);
     void printBenchmarkResult(const QBenchmarkResult &result);
 };
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp
index 8305c5d424..70f4d5e63d 100644
--- a/src/testlib/qsignaldumper.cpp
+++ b/src/testlib/qsignaldumper.cpp
@@ -56,7 +56,7 @@ namespace QTest
 
 inline static void qPrintMessage(const QByteArray &ba)
 {
-    QTestLog::info(ba.constData(), 0, 0);
+    QTestLog::info(ba.constData(), nullptr, 0);
 }
 
 Q_GLOBAL_STATIC(QList<QByteArray>, ignoreClasses)
@@ -87,7 +87,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv
     str += objname.toLocal8Bit();
     if (!objname.isEmpty())
         str += ' ';
-    str += QByteArray::number(quintptr(caller), 16);
+    str += QByteArray::number(quintptr(caller), 16).rightJustified(8, '0');
 
     str += ") ";
     str += member.name();
@@ -105,7 +105,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv
                 str += '@';
 
             quintptr addr = quintptr(*reinterpret_cast<void **>(argv[i + 1]));
-            str.append(QByteArray::number(addr, 16));
+            str.append(QByteArray::number(addr, 16).rightJustified(8, '0'));
         } else if (typeId != QMetaType::UnknownType) {
             Q_ASSERT(typeId != QMetaType::Void); // void parameter => metaobject is corrupt
             str.append(arg)
@@ -144,7 +144,7 @@ static void qSignalDumperCallbackSlot(QObject *caller, int method_index, void **
     str += objname.toLocal8Bit();
     if (!objname.isEmpty())
         str += ' ';
-    str += QByteArray::number(quintptr(caller), 16);
+    str += QByteArray::number(quintptr(caller), 16).rightJustified(8, '0');
 
     str += ") ";
     str += member.methodSignature();
@@ -169,14 +169,13 @@ static void qSignalDumperCallbackEndSignal(QObject *caller, int /*signal_index*/
 void QSignalDumper::startDump()
 {
     static QSignalSpyCallbackSet set = { QTest::qSignalDumperCallback,
-        QTest::qSignalDumperCallbackSlot, QTest::qSignalDumperCallbackEndSignal, 0 };
-    qt_register_signal_spy_callbacks(set);
+        QTest::qSignalDumperCallbackSlot, QTest::qSignalDumperCallbackEndSignal, nullptr };
+    qt_register_signal_spy_callbacks(&set);
 }
 
 void QSignalDumper::endDump()
 {
-    static QSignalSpyCallbackSet nset = { 0, 0, 0 ,0 };
-    qt_register_signal_spy_callbacks(nset);
+    qt_register_signal_spy_callbacks(nullptr);
 }
 
 void QSignalDumper::ignoreClass(const QByteArray &klass)
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index 218a26ec5c..dc0c58044f 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -59,11 +59,8 @@ public:
     explicit QSignalSpy(const QObject *obj, const char *aSignal)
         : m_waiting(false)
     {
-        static const int memberOffset = QObject::staticMetaObject.methodCount();
-        if (!obj) {
-            qWarning("QSignalSpy: Cannot spy on a null object");
+        if (!isObjectValid(obj))
             return;
-        }
 
         if (!aSignal) {
             qWarning("QSignalSpy: Null signal name is not valid");
@@ -83,11 +80,9 @@ public:
             return;
         }
 
-        if (!QMetaObject::connect(obj, sigIndex, this, memberOffset,
-                    Qt::DirectConnection, nullptr)) {
-            qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
+        if (!connectToSignal(obj, sigIndex))
             return;
-        }
+
         sig = ba;
         initArgs(mo->method(sigIndex), obj);
     }
@@ -100,11 +95,8 @@ public:
     QSignalSpy(const typename QtPrivate::FunctionPointer<Func>::Object *obj, Func signal0)
         : m_waiting(false)
     {
-        static const int memberOffset = QObject::staticMetaObject.methodCount();
-        if (!obj) {
-            qWarning("QSignalSpy: Cannot spy on a null object");
+        if (!isObjectValid(obj))
             return;
-        }
 
         if (!signal0) {
             qWarning("QSignalSpy: Null signal name is not valid");
@@ -114,23 +106,28 @@ public:
         const QMetaObject * const mo = obj->metaObject();
         const QMetaMethod signalMetaMethod = QMetaMethod::fromSignal(signal0);
         const int sigIndex = signalMetaMethod.methodIndex();
-        if (!signalMetaMethod.isValid() ||
-            signalMetaMethod.methodType() != QMetaMethod::Signal) {
-            qWarning("QSignalSpy: Not a valid signal: '%s'",
-                     signalMetaMethod.methodSignature().constData());
+
+        if (!isSignalMetaMethodValid(signalMetaMethod))
             return;
-        }
 
-        if (!QMetaObject::connect(obj, sigIndex, this, memberOffset,
-                    Qt::DirectConnection, 0)) {
-            qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
+        if (!connectToSignal(obj, sigIndex))
             return;
-        }
+
         sig = signalMetaMethod.methodSignature();
         initArgs(mo->method(sigIndex), obj);
     }
 #endif // Q_CLANG_QDOC
 
+    QSignalSpy(const QObject *obj, const QMetaMethod &signal)
+        : m_waiting(false)
+    {
+        if (isObjectValid(obj) && isSignalMetaMethodValid(signal) &&
+            connectToSignal(obj, signal.methodIndex())) {
+            sig = signal.methodSignature();
+            initArgs(signal, obj);
+        }
+    }
+
     inline bool isValid() const { return !sig.isEmpty(); }
     inline QByteArray signal() const { return sig; }
 
@@ -160,6 +157,38 @@ public:
     }
 
 private:
+    bool connectToSignal(const QObject *sender, int sigIndex)
+    {
+        static const int memberOffset = QObject::staticMetaObject.methodCount();
+        const bool connected = QMetaObject::connect(
+            sender, sigIndex, this, memberOffset, Qt::DirectConnection, nullptr);
+
+        if (!connected)
+            qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
+
+        return connected;
+    }
+
+    static bool isSignalMetaMethodValid(const QMetaMethod &signal)
+    {
+        const bool valid = signal.isValid() && signal.methodType() == QMetaMethod::Signal;
+
+        if (!valid)
+            qWarning("QSignalSpy: Not a valid signal: '%s'", signal.methodSignature().constData());
+
+        return valid;
+    }
+
+    static bool isObjectValid(const QObject *object)
+    {
+        const bool valid = !!object;
+
+        if (!valid)
+            qWarning("QSignalSpy: Cannot spy on a null object");
+
+        return valid;
+    }
+
     void initArgs(const QMetaMethod &member, const QObject *obj)
     {
         args.reserve(member.parameterCount());
diff --git a/src/testlib/qsignalspy.qdoc b/src/testlib/qsignalspy.qdoc
index 39639d0a09..d532ad478d 100644
--- a/src/testlib/qsignalspy.qdoc
+++ b/src/testlib/qsignalspy.qdoc
@@ -98,6 +98,28 @@
     \snippet code/doc_src_qsignalspy.cpp 6
 */
 
+/*! \fn QSignalSpy(const QObject *obj, const QMetaMethod &signal)
+    \since 5.14
+
+    Constructs a new QSignalSpy that listens for emissions of the \a signal
+    from the QObject \a object. If QSignalSpy is not able to listen for a
+    valid signal (for example, because \a object is \nullptr or \a signal does
+    not denote a valid signal of \a object), an explanatory warning message
+    will be output using qWarning() and subsequent calls to \c isValid() will
+    return false.
+
+    This constructor is convenient to use when Qt's meta-object system is
+    heavily used in a test.
+
+    Basic usage example:
+    \snippet code/doc_src_qsignalspy.cpp 7
+
+    Imagine we need to check whether all properties of the QWindow class
+    that represent minimum and maximum dimensions are properly writable.
+    The following example demonstrates one of the approaches:
+    \snippet code/doc_src_qsignalspy.cpp 8
+*/
+
 /*! \fn QSignalSpy::isValid() const
 
     Returns \c true if the signal spy listens to a valid signal, otherwise false.
diff --git a/src/testlib/qtaptestlogger.cpp b/src/testlib/qtaptestlogger.cpp
index 540b36e273..5b5a3c4875 100644
--- a/src/testlib/qtaptestlogger.cpp
+++ b/src/testlib/qtaptestlogger.cpp
@@ -55,9 +55,7 @@ QTapTestLogger::QTapTestLogger(const char *filename)
 {
 }
 
-QTapTestLogger::~QTapTestLogger()
-{
-}
+QTapTestLogger::~QTapTestLogger() = default;
 
 void QTapTestLogger::startLogging()
 {
@@ -154,10 +152,10 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description,
             // This is fragile, but unfortunately testlib doesn't plumb
             // the expected and actual values to the loggers (yet).
             static QRegularExpression verifyRegex(
-                QLatin1Literal("^'(?<actualexpression>.*)' returned (?<actual>\\w+).+\\((?<message>.*)\\)$"));
+                QLatin1String("^'(?<actualexpression>.*)' returned (?<actual>\\w+).+\\((?<message>.*)\\)$"));
 
             static QRegularExpression comparRegex(
-                QLatin1Literal("^(?<message>.*)\n"
+                QLatin1String("^(?<message>.*)\n"
                     "\\s*Actual\\s+\\((?<actualexpression>.*)\\)\\s*: (?<actual>.*)\n"
                     "\\s*Expected\\s+\\((?<expectedexpresssion>.*)\\)\\s*: (?<expected>.*)$"));
 
@@ -168,22 +166,22 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description,
 
             if (match.hasMatch()) {
                 bool isVerify = match.regularExpression() == verifyRegex;
-                QString message = match.captured(QLatin1Literal("message"));
+                QString message = match.captured(QLatin1String("message"));
                 QString expected;
                 QString actual;
 
                 if (isVerify) {
-                    QString expression = QLatin1Literal(" (")
-                        % match.captured(QLatin1Literal("actualexpression")) % QLatin1Char(')') ;
-                    actual = match.captured(QLatin1Literal("actual")).toLower() % expression;
-                    expected = (actual.startsWith(QLatin1Literal("true")) ? QLatin1Literal("false") : QLatin1Literal("true")) % expression;
+                    QString expression = QLatin1String(" (")
+                        % match.captured(QLatin1String("actualexpression")) % QLatin1Char(')') ;
+                    actual = match.captured(QLatin1String("actual")).toLower() % expression;
+                    expected = (actual.startsWith(QLatin1String("true")) ? QLatin1String("false") : QLatin1String("true")) % expression;
                     if (message.isEmpty())
-                        message = QLatin1Literal("Verification failed");
+                        message = QLatin1String("Verification failed");
                 } else {
-                    expected = match.captured(QLatin1Literal("expected"))
-                        % QLatin1Literal(" (") % match.captured(QLatin1Literal("expectedexpresssion")) % QLatin1Char(')');
-                    actual = match.captured(QLatin1Literal("actual"))
-                        % QLatin1Literal(" (") % match.captured(QLatin1Literal("actualexpression")) % QLatin1Char(')');
+                    expected = match.captured(QLatin1String("expected"))
+                        % QLatin1String(" (") % match.captured(QLatin1String("expectedexpresssion")) % QLatin1Char(')');
+                    actual = match.captured(QLatin1String("actual"))
+                        % QLatin1String(" (") % match.captured(QLatin1String("actualexpression")) % QLatin1Char(')');
                 }
 
                 QTestCharBuffer diagnosticsYamlish;
diff --git a/src/testlib/qtaptestlogger_p.h b/src/testlib/qtaptestlogger_p.h
index b51343e4fe..967c724b51 100644
--- a/src/testlib/qtaptestlogger_p.h
+++ b/src/testlib/qtaptestlogger_p.h
@@ -70,9 +70,9 @@ public:
     void enterTestData(QTestData *data) override;
 
     void addIncident(IncidentTypes type, const char *description,
-                 const char *file = 0, int line = 0) override;
+                 const char *file = nullptr, int line = 0) override;
     void addMessage(MessageTypes type, const QString &message,
-                const char *file = 0, int line = 0) override;
+                const char *file = nullptr, int line = 0) override;
 
     void addBenchmarkResult(const QBenchmarkResult &) override {};
 private:
diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp
index 577c8e70cd..8a77143454 100644
--- a/src/testlib/qteamcitylogger.cpp
+++ b/src/testlib/qteamcitylogger.cpp
@@ -103,9 +103,7 @@ QTeamCityLogger::QTeamCityLogger(const char *filename)
 {
 }
 
-QTeamCityLogger::~QTeamCityLogger()
-{
-}
+QTeamCityLogger::~QTeamCityLogger() = default;
 
 void QTeamCityLogger::startLogging()
 {
@@ -224,9 +222,7 @@ QString QTeamCityLogger::tcEscapedString(const QString &str) const
 {
     QString formattedString;
 
-    for (int i = 0; i < str.length(); i++) {
-        QChar ch = str.at(i);
-
+    for (QChar ch : str) {
         switch (ch.toLatin1()) {
         case '\n':
             formattedString.append(QLatin1String("|n"));
@@ -251,7 +247,7 @@ QString QTeamCityLogger::tcEscapedString(const QString &str) const
         }
     }
 
-    return qMove(formattedString).simplified();
+    return std::move(formattedString).simplified();
 }
 
 QString QTeamCityLogger::escapedTestFuncName() const
diff --git a/src/testlib/qteamcitylogger_p.h b/src/testlib/qteamcitylogger_p.h
index 80f2454724..dd7c0cdcf0 100644
--- a/src/testlib/qteamcitylogger_p.h
+++ b/src/testlib/qteamcitylogger_p.h
@@ -70,11 +70,11 @@ public:
     void leaveTestFunction() override;
 
     void addIncident(IncidentTypes type, const char *description,
-                     const char *file = 0, int line = 0) override;
+                     const char *file = nullptr, int line = 0) override;
     void addBenchmarkResult(const QBenchmarkResult &result) override;
 
     void addMessage(MessageTypes type, const QString &message,
-                    const char *file = 0, int line = 0) override;
+                    const char *file = nullptr, int line = 0) override;
 
 private:
     QString currTestFuncName;
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index ebd94939ce..27fe08e8f4 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -46,12 +46,15 @@
 #include <QtTest/qtestdata.h>
 #include <QtTest/qbenchmark.h>
 
+#include <QtCore/qbitarray.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qcborcommon.h>
 #include <QtCore/qdatetime.h>
+#if QT_CONFIG(itemmodel)
 #include <QtCore/qabstractitemmodel.h>
+#endif
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qurl.h>
@@ -89,25 +92,35 @@ template<> inline char *toString(const QByteArray &ba)
     return QTest::toPrettyCString(ba.constData(), ba.length());
 }
 
+template<> inline char *toString(const QBitArray &ba)
+{
+    qsizetype size = ba.size();
+    char *str = static_cast<char *>(malloc(size + 1));
+    for (qsizetype i = 0; i < size; ++i)
+        str[i] = "01"[ba.testBit(i)];
+    str[size] = '\0';
+    return str;
+}
+
 #if QT_CONFIG(datestring)
 template<> inline char *toString(const QTime &time)
 {
     return time.isValid()
-        ? qstrdup(qPrintable(time.toString(QStringViewLiteral("hh:mm:ss.zzz"))))
+        ? qstrdup(qPrintable(time.toString(u"hh:mm:ss.zzz")))
         : qstrdup("Invalid QTime");
 }
 
 template<> inline char *toString(const QDate &date)
 {
     return date.isValid()
-        ? qstrdup(qPrintable(date.toString(QStringViewLiteral("yyyy/MM/dd"))))
+        ? qstrdup(qPrintable(date.toString(u"yyyy/MM/dd")))
         : qstrdup("Invalid QDate");
 }
 
 template<> inline char *toString(const QDateTime &dateTime)
 {
     return dateTime.isValid()
-        ? qstrdup(qPrintable(dateTime.toString(QStringViewLiteral("yyyy/MM/dd hh:mm:ss.zzz[t]"))))
+        ? qstrdup(qPrintable(dateTime.toString(u"yyyy/MM/dd hh:mm:ss.zzz[t]")))
         : qstrdup("Invalid QDateTime");
 }
 #endif // datestring
@@ -129,12 +142,14 @@ template<> inline char *toString(const QChar &c)
     return qstrdup(qPrintable(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16))));
 }
 
+#if QT_CONFIG(itemmodel)
 template<> inline char *toString(const QModelIndex &idx)
 {
     char msg[128];
     qsnprintf(msg, sizeof(msg), "QModelIndex(%d,%d,%p,%p)", idx.row(), idx.column(), idx.internalPointer(), idx.model());
     return qstrdup(msg);
 }
+#endif
 
 template<> inline char *toString(const QPoint &p)
 {
@@ -364,8 +379,36 @@ inline bool qCompare(quint32 const &t1, quint64 const &t2, const char *actual,
 {
     return qCompare(static_cast<quint64>(t1), t2, actual, expected, file, line);
 }
+namespace Internal {
 
+template <typename T>
+class HasInitMain // SFINAE test for the presence of initMain()
+{
+private:
+    using YesType = char[1];
+    using NoType = char[2];
+
+    template <typename C> static YesType& test( decltype(&C::initMain) ) ;
+    template <typename C> static NoType& test(...);
+
+public:
+    enum { value = sizeof(test<T>(nullptr)) == sizeof(YesType) };
+};
+
+template<typename T>
+typename std::enable_if<HasInitMain<T>::value, void>::type callInitMain()
+{
+    T::initMain();
+}
+
+template<typename T>
+typename std::enable_if<!HasInitMain<T>::value, void>::type callInitMain()
+{
 }
+
+} // namespace Internal
+
+} // namespace QTest
 QT_END_NAMESPACE
 
 #ifdef QT_TESTCASE_BUILDDIR
@@ -424,52 +467,53 @@ int main(int argc, char *argv[]) \
 #  define QTEST_DISABLE_KEYPAD_NAVIGATION
 #endif
 
-#define QTEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
+#define QTEST_MAIN_IMPL(TestObject) \
     TESTLIB_SELFCOVERAGE_START(#TestObject) \
+    QT_PREPEND_NAMESPACE(QTest::Internal::callInitMain)<TestObject>(); \
     QApplication app(argc, argv); \
     app.setAttribute(Qt::AA_Use96Dpi, true); \
     QTEST_DISABLE_KEYPAD_NAVIGATION \
     TestObject tc; \
     QTEST_SET_MAIN_SOURCE_PATH \
-    return QTest::qExec(&tc, argc, argv); \
-}
+    return QTest::qExec(&tc, argc, argv);
 
 #elif defined(QT_GUI_LIB)
 
 #include <QtTest/qtest_gui.h>
 
-#define QTEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
+#define QTEST_MAIN_IMPL(TestObject) \
     TESTLIB_SELFCOVERAGE_START(#TestObject) \
+    QT_PREPEND_NAMESPACE(QTest::Internal::callInitMain)<TestObject>(); \
     QGuiApplication app(argc, argv); \
     app.setAttribute(Qt::AA_Use96Dpi, true); \
     TestObject tc; \
     QTEST_SET_MAIN_SOURCE_PATH \
-    return QTest::qExec(&tc, argc, argv); \
-}
+    return QTest::qExec(&tc, argc, argv);
 
 #else
 
-#define QTEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
+#define QTEST_MAIN_IMPL(TestObject) \
     TESTLIB_SELFCOVERAGE_START(#TestObject) \
+    QT_PREPEND_NAMESPACE(QTest::Internal::callInitMain)<TestObject>(); \
     QCoreApplication app(argc, argv); \
     app.setAttribute(Qt::AA_Use96Dpi, true); \
     TestObject tc; \
     QTEST_SET_MAIN_SOURCE_PATH \
-    return QTest::qExec(&tc, argc, argv); \
-}
+    return QTest::qExec(&tc, argc, argv);
 
 #endif // QT_GUI_LIB
 
+#define QTEST_MAIN(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+    QTEST_MAIN_IMPL(TestObject) \
+}
+
 #define QTEST_GUILESS_MAIN(TestObject) \
 int main(int argc, char *argv[]) \
 { \
     TESTLIB_SELFCOVERAGE_START(#TestObject) \
+    QT_PREPEND_NAMESPACE(QTest::Internal::callInitMain)<TestObject>(); \
     QCoreApplication app(argc, argv); \
     app.setAttribute(Qt::AA_Use96Dpi, true); \
     TestObject tc; \
diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h
index e5101e6955..d1efde54b1 100644
--- a/src/testlib/qtest_gui.h
+++ b/src/testlib/qtest_gui.h
@@ -162,6 +162,14 @@ inline bool qCompare(QImage const &t1, QImage const &t2,
     }
     if (t1Null && t2Null)
         return compare_helper(true, nullptr, nullptr, nullptr, actual, expected, file, line);
+    if (!qFuzzyCompare(t1.devicePixelRatioF(), t2.devicePixelRatioF())) {
+        qsnprintf(msg, 1024, "Compared QImages differ in device pixel ratio.\n"
+                  "   Actual   (%s): %g\n"
+                  "   Expected (%s): %g",
+                  actual, t1.devicePixelRatioF(),
+                  expected, t2.devicePixelRatioF());
+        return compare_helper(false, msg, nullptr, nullptr, actual, expected, file, line);
+    }
     if (t1.width() != t2.width() || t1.height() != t2.height()) {
         qsnprintf(msg, 1024, "Compared QImages differ in size.\n"
                   "   Actual   (%s): %dx%d\n"
@@ -196,6 +204,14 @@ inline bool qCompare(QPixmap const &t1, QPixmap const &t2, const char *actual, c
     }
     if (t1Null && t2Null)
         return compare_helper(true, nullptr, nullptr, nullptr, actual, expected, file, line);
+    if (!qFuzzyCompare(t1.devicePixelRatioF(), t2.devicePixelRatioF())) {
+        qsnprintf(msg, 1024, "Compared QPixmaps differ in device pixel ratio.\n"
+                  "   Actual   (%s): %g\n"
+                  "   Expected (%s): %g",
+                  actual, t1.devicePixelRatioF(),
+                  expected, t2.devicePixelRatioF());
+        return compare_helper(false, msg, nullptr, nullptr, actual, expected, file, line);
+    }
     if (t1.width() != t2.width() || t1.height() != t2.height()) {
         qsnprintf(msg, 1024, "Compared QPixmaps differ in size.\n"
                   "   Actual   (%s): %dx%d\n"
diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index d14dcec031..bd77ee77a1 100644
--- a/src/testlib/qtestaccessible.h
+++ b/src/testlib/qtestaccessible.h
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 class QObject;
 
 // Use pointers since we subclass QAccessibleEvent
-typedef QList<QAccessibleEvent*> EventList;
+using EventList = QList<QAccessibleEvent*>;
 
 bool operator==(const QAccessibleEvent &l, const QAccessibleEvent &r)
 {
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index 6642699758..9b7c2495d4 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -169,12 +169,14 @@ static QSet<QByteArray> keywords()
 #endif
             ;
 
+#if QT_CONFIG(properties)
             QCoreApplication *app = QCoreApplication::instance();
             if (app) {
                 const QVariant platformName = app->property("platformName");
                 if (platformName.isValid())
                     set << platformName.toByteArray();
             }
+#endif
 
             return set;
 }
@@ -208,11 +210,10 @@ static bool checkCondition(const QByteArray &condition)
     static const QSet<QByteArray> matchedConditions = activeConditions();
     QList<QByteArray> conds = condition.split(' ');
 
-    for (int i = 0; i < conds.size(); ++i) {
-        QByteArray c = conds.at(i);
+    for (QByteArray c : conds) {
         bool result = c.startsWith('!');
         if (result)
-            c = c.mid(1);
+            c.remove(0, 1);
 
         result ^= matchedConditions.contains(c);
         if (!result)
@@ -222,7 +223,7 @@ static bool checkCondition(const QByteArray &condition)
 }
 
 static bool ignoreAll = false;
-static std::set<QByteArray> *ignoredTests = 0;
+static std::set<QByteArray> *ignoredTests = nullptr;
 
 namespace QTestPrivate {
 
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 05a3dbbbcb..908155e8b5 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -289,7 +289,7 @@ namespace QTest
 {
 class WatchDog;
 
-static QObject *currentTestObject = 0;
+static QObject *currentTestObject = nullptr;
 static QString mainSourcePath;
 
 #if defined(Q_OS_MACOS)
@@ -301,7 +301,7 @@ class TestMethods {
 public:
     Q_DISABLE_COPY_MOVE(TestMethods)
 
-    typedef std::vector<QMetaMethod> MetaMethods;
+    using MetaMethods = std::vector<QMetaMethod>;
 
     explicit TestMethods(const QObject *o, const MetaMethods &m = MetaMethods());
 
@@ -423,7 +423,7 @@ Q_TESTLIB_EXPORT bool printAvailableFunctions = false;
 Q_TESTLIB_EXPORT QStringList testFunctions;
 Q_TESTLIB_EXPORT QStringList testTags;
 
-static void qPrintTestSlots(FILE *stream, const char *filter = 0)
+static void qPrintTestSlots(FILE *stream, const char *filter = nullptr)
 {
     for (int i = 0; i < QTest::currentTestObject->metaObject()->methodCount(); ++i) {
         QMetaMethod sl = QTest::currentTestObject->metaObject()->method(i);
@@ -516,7 +516,7 @@ static int qToInt(const char *str)
 Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool qml)
 {
     int logFormat = -1; // Not set
-    const char *logFilename = 0;
+    const char *logFilename = nullptr;
 
     QTest::testFunctions.clear();
     QTest::testTags.clear();
@@ -574,7 +574,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool
          " -nocrashhandler     : Disables the crash handler. Useful for debugging crashes.\n"
          "\n"
          " Benchmarking options:\n"
-#ifdef QTESTLIB_USE_VALGRIND
+#if QT_CONFIG(valgrind)
          " -callgrind          : Use callgrind to time benchmarks\n"
 #endif
 #ifdef QTESTLIB_USE_PERF_EVENTS
@@ -717,7 +717,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool
             }
         } else if (strcmp(argv[i], "-nocrashhandler") == 0) {
             QTest::noCrashHandler = true;
-#ifdef QTESTLIB_USE_VALGRIND
+#if QT_CONFIG(valgrind)
         } else if (strcmp(argv[i], "-callgrind") == 0) {
             if (QBenchmarkValgrindUtils::haveValgrind())
                 if (QFileInfo(QDir::currentPath()).isWritable()) {
@@ -897,7 +897,7 @@ struct QTestDataSetter
     }
     ~QTestDataSetter()
     {
-        QTestResult::setCurrentTestData(0);
+        QTestResult::setCurrentTestData(nullptr);
     }
 };
 
@@ -974,11 +974,11 @@ void TestMethods::invokeTestOnData(int index) const
                 if (i == -1) {
                     QTestLog::info(qPrintable(
                         QString::fromLatin1("warmup stage result      : %1")
-                            .arg(QBenchmarkTestMethodData::current->result.value)), 0, 0);
+                            .arg(QBenchmarkTestMethodData::current->result.value)), nullptr, 0);
                 } else {
                     QTestLog::info(qPrintable(
                         QString::fromLatin1("accumulation stage result: %1")
-                            .arg(QBenchmarkTestMethodData::current->result.value)), 0, 0);
+                            .arg(QBenchmarkTestMethodData::current->result.value)), nullptr, 0);
                 }
             }
         }
@@ -1012,14 +1012,14 @@ public:
     WatchDog()
     {
         QMutexLocker locker(&mutex);
-        timeout.store(-1);
+        timeout.storeRelaxed(-1);
         start();
         waitCondition.wait(&mutex);
     }
     ~WatchDog() {
         {
             QMutexLocker locker(&mutex);
-            timeout.store(0);
+            timeout.storeRelaxed(0);
             waitCondition.wakeAll();
         }
         wait();
@@ -1027,21 +1027,21 @@ public:
 
     void beginTest() {
         QMutexLocker locker(&mutex);
-        timeout.store(defaultTimeout());
+        timeout.storeRelaxed(defaultTimeout());
         waitCondition.wakeAll();
     }
 
     void testFinished() {
         QMutexLocker locker(&mutex);
-        timeout.store(-1);
+        timeout.storeRelaxed(-1);
         waitCondition.wakeAll();
     }
 
     void run() override {
         QMutexLocker locker(&mutex);
         waitCondition.wakeAll();
-        while (1) {
-            int t = timeout.load();
+        while (true) {
+            int t = timeout.loadRelaxed();
             if (!t)
                 break;
             if (Q_UNLIKELY(!waitCondition.wait(&mutex, t))) {
@@ -1095,7 +1095,7 @@ bool TestMethods::invokeTest(int index, const char *data, WatchDog *watchDog) co
     const int globalDataCount = gTable->dataCount();
     int curGlobalDataIndex = 0;
 
-    /* For each test function that has a *_data() table/function, do: */
+    /* For each entry in the global data table, do: */
     do {
         if (!gTable->isEmpty())
             QTestResult::setCurrentGlobalTestData(gTable->testData(curGlobalDataIndex));
@@ -1103,50 +1103,49 @@ bool TestMethods::invokeTest(int index, const char *data, WatchDog *watchDog) co
         if (curGlobalDataIndex == 0) {
             qsnprintf(member, 512, "%s_data()", name.constData());
             invokeMethod(QTest::currentTestObject, member);
+            if (QTestResult::skipCurrentTest())
+                break;
         }
 
         bool foundFunction = false;
-        if (!QTestResult::skipCurrentTest()) {
-            int curDataIndex = 0;
-            const int dataCount = table.dataCount();
-
-            // Data tag requested but none available?
-            if (data && !dataCount) {
-                // Let empty data tag through.
-                if (!*data)
-                    data = 0;
-                else {
-                    fprintf(stderr, "Unknown testdata for function %s(): '%s'\n", name.constData(), data);
-                    fprintf(stderr, "Function has no testdata.\n");
-                    return false;
-                }
+        int curDataIndex = 0;
+        const int dataCount = table.dataCount();
+
+        // Data tag requested but none available?
+        if (data && !dataCount) {
+            // Let empty data tag through.
+            if (!*data)
+                data = nullptr;
+            else {
+                fprintf(stderr, "Unknown testdata for function %s(): '%s'\n", name.constData(), data);
+                fprintf(stderr, "Function has no testdata.\n");
+                return false;
             }
+        }
 
-            /* For each entry in the data table, do: */
-            do {
-                QTestResult::setSkipCurrentTest(false);
-                QTestResult::setBlacklistCurrentTest(false);
-                if (!data || !qstrcmp(data, table.testData(curDataIndex)->dataTag())) {
-                    foundFunction = true;
+        /* For each entry in this test's data table, do: */
+        do {
+            QTestResult::setSkipCurrentTest(false);
+            QTestResult::setBlacklistCurrentTest(false);
+            if (!data || !qstrcmp(data, table.testData(curDataIndex)->dataTag())) {
+                foundFunction = true;
 
-                    QTestPrivate::checkBlackLists(name.constData(), dataCount ? table.testData(curDataIndex)->dataTag() : 0);
+                QTestPrivate::checkBlackLists(name.constData(), dataCount ? table.testData(curDataIndex)->dataTag() : nullptr);
 
-                    QTestDataSetter s(curDataIndex >= dataCount ? static_cast<QTestData *>(0)
-                                                      : table.testData(curDataIndex));
+                QTestDataSetter s(curDataIndex >= dataCount ? nullptr : table.testData(curDataIndex));
 
-                    QTestPrivate::qtestMouseButtons = Qt::NoButton;
-                    if (watchDog)
-                        watchDog->beginTest();
-                    invokeTestOnData(index);
-                    if (watchDog)
-                        watchDog->testFinished();
+                QTestPrivate::qtestMouseButtons = Qt::NoButton;
+                if (watchDog)
+                    watchDog->beginTest();
+                invokeTestOnData(index);
+                if (watchDog)
+                    watchDog->testFinished();
 
-                    if (data)
-                        break;
-                }
-                ++curDataIndex;
-            } while (curDataIndex < dataCount);
-        }
+                if (data)
+                    break;
+            }
+            ++curDataIndex;
+        } while (curDataIndex < dataCount);
 
         if (data && !foundFunction) {
             fprintf(stderr, "Unknown testdata for function %s: '%s()'\n", name.constData(), data);
@@ -1156,14 +1155,14 @@ bool TestMethods::invokeTest(int index, const char *data, WatchDog *watchDog) co
             return false;
         }
 
-        QTestResult::setCurrentGlobalTestData(0);
+        QTestResult::setCurrentGlobalTestData(nullptr);
         ++curGlobalDataIndex;
     } while (curGlobalDataIndex < globalDataCount);
 
     QTestResult::finishedCurrentTestFunction();
     QTestResult::setSkipCurrentTest(false);
     QTestResult::setBlacklistCurrentTest(false);
-    QTestResult::setCurrentTestData(0);
+    QTestResult::setCurrentTestData(nullptr);
 
     return true;
 }
@@ -1241,7 +1240,7 @@ char *toHexRepresentation(const char *ba, int length)
      * */
     const int maxLen = 50;
     const int len = qMin(maxLen, length);
-    char *result = 0;
+    char *result = nullptr;
 
     if (length > maxLen) {
         const int size = len * 3 + 4;
@@ -1274,10 +1273,8 @@ char *toHexRepresentation(const char *ba, int length)
         ++o;
         if (i == len)
             break;
-        else {
-            result[o] = ' ';
-            ++o;
-        }
+        result[o] = ' ';
+        ++o;
     }
 
     return result;
@@ -1459,7 +1456,7 @@ void TestMethods::invokeTests(QObject *testObject) const
 
     QScopedPointer<WatchDog> watchDog;
     if (!debuggerPresent()
-#ifdef QTESTLIB_USE_VALGRIND
+#if QT_CONFIG(valgrind)
         && QBenchmarkGlobalData::current->mode() != QBenchmarkGlobalData::CallgrindChildProcess
 #endif
        ) {
@@ -1497,7 +1494,7 @@ void TestMethods::invokeTests(QObject *testObject) const
         QTestResult::finishedCurrentTestDataCleanup();
     }
     QTestResult::finishedCurrentTestFunction();
-    QTestResult::setCurrentTestFunction(0);
+    QTestResult::setCurrentTestFunction(nullptr);
 }
 
 #if defined(Q_OS_UNIX)
@@ -1567,7 +1564,7 @@ FatalSignalHandler::FatalSignalHandler()
     stack.ss_flags = 0;
     stack.ss_size = sizeof alternate_stack;
     stack.ss_sp = alternate_stack;
-    sigaltstack(&stack, 0);
+    sigaltstack(&stack, nullptr);
     act.sa_flags |= SA_ONSTACK;
 #endif
 
@@ -1586,7 +1583,7 @@ FatalSignalHandler::FatalSignalHandler()
             oldact.sa_flags & SA_SIGINFO ||
 #endif
             oldact.sa_handler != SIG_DFL) {
-            sigaction(fatalSignals[i], &oldact, 0);
+            sigaction(fatalSignals[i], &oldact, nullptr);
         } else
         {
             sigaddset(&handledSignals, fatalSignals[i]);
@@ -1611,7 +1608,7 @@ FatalSignalHandler::~FatalSignalHandler()
 
         // If someone overwrote it in the mean time, put it back
         if (oldact.sa_handler != FatalSignalHandler::signal)
-            sigaction(i, &oldact, 0);
+            sigaction(i, &oldact, nullptr);
     }
 }
 
@@ -1866,7 +1863,7 @@ int QTest::qRun()
 {
     QTEST_ASSERT(currentTestObject);
 
-#ifdef QTESTLIB_USE_VALGRIND
+#if QT_CONFIG(valgrind)
     int callgrindChildExitCode = 0;
 #endif
 
@@ -1886,7 +1883,7 @@ int QTest::qRun()
     } // !noCrashHandler
 #endif // Q_OS_WIN
 
-#ifdef QTESTLIB_USE_VALGRIND
+#if QT_CONFIG(valgrind)
     if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) {
         if (Q_UNLIKELY(!qApp))
             qFatal("QtTest: -callgrind option is not available with QTEST_APPLESS_MAIN");
@@ -1927,7 +1924,7 @@ int QTest::qRun()
          QTestResult::addFailure("Caught unhandled exception", __FILE__, __LINE__);
          if (QTestResult::currentTestFunction()) {
              QTestResult::finishedCurrentTestFunction();
-             QTestResult::setCurrentTestFunction(0);
+             QTestResult::setCurrentTestFunction(nullptr);
          }
 
         QTestLog::stopLogging();
@@ -1936,7 +1933,7 @@ int QTest::qRun()
              IOPMAssertionRelease(powerID);
          }
 #endif
-         currentTestObject = 0;
+         currentTestObject = nullptr;
 
          // Rethrow exception to make debugging easier.
          throw;
@@ -1944,7 +1941,7 @@ int QTest::qRun()
      }
 #endif
 
-#ifdef QTESTLIB_USE_VALGRIND
+#if QT_CONFIG(valgrind)
     if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess)
         return callgrindChildExitCode;
 #endif
@@ -1957,13 +1954,13 @@ int QTest::qRun()
  */
 void QTest::qCleanup()
 {
-    currentTestObject = 0;
+    currentTestObject = nullptr;
 
     QTestTable::clearGlobalTestTable();
     QTestLog::stopLogging();
 
     delete QBenchmarkGlobalData::current;
-    QBenchmarkGlobalData::current = 0;
+    QBenchmarkGlobalData::current = nullptr;
 
     QSignalDumper::endDump();
 
@@ -2148,7 +2145,7 @@ QSharedPointer<QTemporaryDir> QTest::qExtractTestData(const QString &dirName)
           }
       }
 
-      result = qMove(tempDir);
+      result = std::move(tempDir);
 
       return result;
 }
@@ -2206,7 +2203,7 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
     }
 
     //  3. relative to test source.
-    if (found.isEmpty()) {
+    if (found.isEmpty() && qstrncmp(file, ":/", 2) != 0) {
         // srcdir is the directory containing the calling source file.
         QFileInfo srcdir = QFileInfo(QFile::decodeName(file)).path();
 
@@ -2519,13 +2516,28 @@ bool QTest::compare_helper(bool success, const char *failureMsg,
     return QTestResult::compare(success, failureMsg, val1, val2, actual, expected, file, line);
 }
 
+template <typename T>
+static bool floatingCompare(const T &t1, const T &t2)
+{
+    switch (qFpClassify(t1))
+    {
+    case FP_INFINITE:
+        return (t1 < 0) == (t2 < 0) && qFpClassify(t2) == FP_INFINITE;
+    case FP_NAN:
+        return qFpClassify(t2) == FP_NAN;
+    default:
+        return qFuzzyCompare(t1, t2);
+    }
+}
+
 /*! \fn bool QTest::qCompare(const qfloat16 &t1, const qfloat16 &t2, const char *actual, const char *expected, const char *file, int line)
     \internal
  */
 bool QTest::qCompare(qfloat16 const &t1, qfloat16 const &t2, const char *actual, const char *expected,
                      const char *file, int line)
 {
-    return compare_helper(qFuzzyCompare(t1, t2), "Compared qfloat16s are not the same (fuzzy compare)",
+    return compare_helper(floatingCompare(t1, t2),
+                          "Compared qfloat16s are not the same (fuzzy compare)",
                           toString(t1), toString(t2), actual, expected, file, line);
 }
 
@@ -2535,17 +2547,9 @@ bool QTest::qCompare(qfloat16 const &t1, qfloat16 const &t2, const char *actual,
 bool QTest::qCompare(float const &t1, float const &t2, const char *actual, const char *expected,
                     const char *file, int line)
 {
-    bool equal = false;
-    int cl1 = std::fpclassify(t1);
-    int cl2 = std::fpclassify(t2);
-    if (cl1 == FP_INFINITE)
-        equal = ((t1 < 0) == (t2 < 0)) && cl2 == FP_INFINITE;
-    else if (cl1 == FP_NAN)
-        equal = (cl2 == FP_NAN);
-    else
-        equal = qFuzzyCompare(t1, t2);
-    return compare_helper(equal, "Compared floats are not the same (fuzzy compare)",
-                          toString(t1), toString(t2), actual, expected, file, line);
+    return QTestResult::compare(floatingCompare(t1, t2),
+                                "Compared floats are not the same (fuzzy compare)",
+                                t1, t2, actual, expected, file, line);
 }
 
 /*! \fn bool QTest::qCompare(const double &t1, const double &t2, const char *actual, const char *expected, const char *file, int line)
@@ -2554,19 +2558,86 @@ bool QTest::qCompare(float const &t1, float const &t2, const char *actual, const
 bool QTest::qCompare(double const &t1, double const &t2, const char *actual, const char *expected,
                     const char *file, int line)
 {
-    bool equal = false;
-    int cl1 = std::fpclassify(t1);
-    int cl2 = std::fpclassify(t2);
-    if (cl1 == FP_INFINITE)
-        equal = ((t1 < 0) == (t2 < 0)) && cl2 == FP_INFINITE;
-    else if (cl1 == FP_NAN)
-        equal = (cl2 == FP_NAN);
-    else
-        equal = qFuzzyCompare(t1, t2);
-    return compare_helper(equal, "Compared doubles are not the same (fuzzy compare)",
-                          toString(t1), toString(t2), actual, expected, file, line);
+    return QTestResult::compare(floatingCompare(t1, t2),
+                                "Compared doubles are not the same (fuzzy compare)",
+                                t1, t2, actual, expected, file, line);
+}
+
+/*! \fn bool QTest::qCompare(int t1, int t2, const char *actual, const char *expected, const char *file, int line)
+    \internal
+    \since 5.14
+ */
+bool QTest::qCompare(int t1, int t2, const char *actual, const char *expected,
+                    const char *file, int line)
+{
+    return QTestResult::compare(t1 == t2,
+                                "Compared values are not the same",
+                                t1, t2, actual, expected, file, line);
+}
+
+/*! \fn bool QTest::qCompare(unsigned t1, unsigned t2, const char *actual, const char *expected, const char *file, int line)
+    \internal
+    \since 5.14
+ */
+bool QTest::qCompare(unsigned t1, unsigned t2, const char *actual, const char *expected,
+                    const char *file, int line)
+{
+    return QTestResult::compare(t1 == t2,
+                                "Compared values are not the same",
+                                t1, t2, actual, expected, file, line);
+}
+
+/*! \fn bool QTest::qCompare(QStringView t1, QStringView t2, const char *actual, const char *expected, const char *file, int line)
+    \internal
+    \since 5.14
+ */
+bool QTest::qCompare(QStringView t1, QStringView t2, const char *actual, const char *expected,
+                     const char *file, int line)
+{
+    return QTestResult::compare(t1 == t2,
+                                "Compared values are not the same",
+                                t1, t2, actual, expected, file, line);
+}
+
+/*! \fn bool QTest::qCompare(QStringView t1, const QLatin1String &t2, const char *actual, const char *expected, const char *file, int line)
+    \internal
+    \since 5.14
+ */
+bool QTest::qCompare(QStringView t1, const QLatin1String &t2, const char *actual, const char *expected,
+                     const char *file, int line)
+{
+    return QTestResult::compare(t1 == t2,
+                                "Compared values are not the same",
+                                t1, t2, actual, expected, file, line);
+}
+
+/*! \fn bool QTest::qCompare(const QLatin1String &t1, QStringView t2, const char *actual, const char *expected, const char *file, int line)
+    \internal
+    \since 5.14
+ */
+bool QTest::qCompare(const QLatin1String &t1, QStringView t2, const char *actual, const char *expected,
+                     const char *file, int line)
+{
+    return QTestResult::compare(t1 == t2,
+                                "Compared values are not the same",
+                                t1, t2, actual, expected, file, line);
 }
 
+/*! \fn bool QTest::qCompare(const QString &t1, const QString &t2, const char *actual, const char *expected, const char *file, int line)
+    \internal
+    \since 5.14
+ */
+
+/*! \fn bool QTest::qCompare(const QString &t1, const QLatin1String &t2, const char *actual, const char *expected, const char *file, int line)
+    \internal
+    \since 5.14
+ */
+
+/*! \fn bool QTest::qCompare(const QLatin1String &t1, const QString &t2, const char *actual, const char *expected, const char *file, int line)
+    \internal
+    \since 5.14
+ */
+
 /*! \fn bool QTest::qCompare(const double &t1, const float &t2, const char *actual, const char *expected, const char *file, int line)
     \internal
  */
@@ -2633,7 +2704,7 @@ static void massageExponent(char *text)
 template <> Q_TESTLIB_EXPORT char *QTest::toString<TYPE>(const TYPE &t) \
 { \
     char *msg = new char[128]; \
-    switch (std::fpclassify(t)) { \
+    switch (qFpClassify(t)) { \
     case FP_INFINITE: \
         qstrncpy(msg, (t < 0 ? "-inf" : "inf"), 128); \
         break; \
@@ -2641,22 +2712,16 @@ template <> Q_TESTLIB_EXPORT char *QTest::toString<TYPE>(const TYPE &t) \
         qstrncpy(msg, "nan", 128); \
         break; \
     default: \
-        qsnprintf(msg, 128, #FORMAT, t); \
+        qsnprintf(msg, 128, #FORMAT, double(t));    \
         massageExponent(msg); \
         break; \
     } \
     return msg; \
 }
 
+TO_STRING_FLOAT(qfloat16, %.3g)
 TO_STRING_FLOAT(float, %g)
-TO_STRING_FLOAT(double, %.12lg)
-
-template <> Q_TESTLIB_EXPORT char *QTest::toString<qfloat16>(const qfloat16 &t)
-{
-    char *msg = new char[16];
-    qsnprintf(msg, 16, "%.3g", static_cast<float>(t));
-    return msg;
-}
+TO_STRING_FLOAT(double, %.12g)
 
 template <> Q_TESTLIB_EXPORT char *QTest::toString<char>(const char &t)
 {
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index 19a7975750..e1518708e8 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -189,16 +189,8 @@ do {\
     return;\
 } while (false)
 
-#ifdef Q_COMPILER_VARIADIC_MACROS
-
 #define QSKIP(statement, ...) QSKIP_INTERNAL(statement)
 
-#else
-
-#define QSKIP(statement) QSKIP_INTERNAL(statement)
-
-#endif
-
 #define QEXPECT_FAIL(dataIndex, comment, mode)\
 do {\
     if (!QTest::qExpectFail(dataIndex, static_cast<const char *>(comment), QTest::mode, __FILE__, __LINE__))\
@@ -344,7 +336,7 @@ namespace QTest
     template <typename T>
     inline void addColumn(const char *name, T * = nullptr)
     {
-        typedef std::is_same<T, const char*> QIsSameTConstChar;
+        using QIsSameTConstChar = std::is_same<T, const char*>;
         Q_STATIC_ASSERT_X(!QIsSameTConstChar::value, "const char* is not allowed as a test data format.");
         addColumnInternal(qMetaTypeId<T>(), name);
     }
@@ -371,6 +363,40 @@ namespace QTest
     Q_TESTLIB_EXPORT bool qCompare(double const &t1, double const &t2,
                     const char *actual, const char *expected, const char *file, int line);
 
+    Q_TESTLIB_EXPORT bool qCompare(int t1, int t2, const char *actual, const char *expected,
+                                   const char *file, int line);
+
+    Q_TESTLIB_EXPORT bool qCompare(unsigned t1, unsigned t2, const char *actual, const char *expected,
+                                   const char *file, int line);
+
+    Q_TESTLIB_EXPORT bool qCompare(QStringView t1, QStringView t2,
+                                   const char *actual, const char *expected,
+                                   const char *file, int line);
+    Q_TESTLIB_EXPORT bool qCompare(QStringView t1, const QLatin1String &t2,
+                                   const char *actual, const char *expected,
+                                   const char *file, int line);
+    Q_TESTLIB_EXPORT bool qCompare(const QLatin1String &t1, QStringView t2,
+                                   const char *actual, const char *expected,
+                                   const char *file, int line);
+    inline bool qCompare(const QString &t1, const QString &t2,
+                         const char *actual, const char *expected,
+                         const char *file, int line)
+    {
+        return qCompare(QStringView(t1), QStringView(t2), actual, expected, file, line);
+    }
+    inline bool qCompare(const QString &t1, const QLatin1String &t2,
+                         const char *actual, const char *expected,
+                         const char *file, int line)
+    {
+        return qCompare(QStringView(t1), t2, actual, expected, file, line);
+    }
+    inline bool qCompare(const QLatin1String &t1, const QString &t2,
+                         const char *actual, const char *expected,
+                         const char *file, int line)
+    {
+        return qCompare(t1, QStringView(t2), actual, expected, file, line);
+    }
+
     inline bool compare_ptr_helper(const volatile void *t1, const volatile void *t2, const char *actual,
                                    const char *expected, const char *file, int line)
     {
diff --git a/src/testlib/qtestcoreelement_p.h b/src/testlib/qtestcoreelement_p.h
index e79efdd87f..a101ab5ea3 100644
--- a/src/testlib/qtestcoreelement_p.h
+++ b/src/testlib/qtestcoreelement_p.h
@@ -74,13 +74,13 @@ class QTestCoreElement: public QTestCoreList<ElementType>
         QTest::LogElementType elementType() const;
 
     private:
-        QTestElementAttribute *listOfAttributes;
+        QTestElementAttribute *listOfAttributes = nullptr;
         QTest::LogElementType type;
 };
 
 template<class ElementType>
 QTestCoreElement<ElementType>::QTestCoreElement(int t)
-    :listOfAttributes(0), type(QTest::LogElementType(t))
+    : type(QTest::LogElementType(t))
 {
 }
 
@@ -114,7 +114,7 @@ const char *QTestCoreElement<ElementType>::attributeValue(QTest::AttributeIndex
     if (attrb)
         return attrb->value();
 
-    return 0;
+    return nullptr;
 }
 
 template <class ElementType>
@@ -124,7 +124,7 @@ const char *QTestCoreElement<ElementType>::attributeName(QTest::AttributeIndex i
     if (attrb)
         return attrb->name();
 
-    return 0;
+    return nullptr;
 }
 
 template <class ElementType>
@@ -145,7 +145,7 @@ const char *QTestCoreElement<ElementType>::elementName() const
     if (type != QTest::LET_Undefined)
         return xmlElementNames[type];
 
-    return 0;
+    return nullptr;
 }
 
 template <class ElementType>
@@ -165,7 +165,7 @@ const QTestElementAttribute *QTestCoreElement<ElementType>::attribute(QTest::Att
         iterator = iterator->nextElement();
     }
 
-    return 0;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qtestcorelist_p.h b/src/testlib/qtestcorelist_p.h
index 4d080f6758..daeb293644 100644
--- a/src/testlib/qtestcorelist_p.h
+++ b/src/testlib/qtestcorelist_p.h
@@ -73,8 +73,8 @@ class QTestCoreList
 
 template <class T>
 QTestCoreList<T>::QTestCoreList()
-    : next(0)
-    , prev(0)
+    : next(nullptr)
+    , prev(nullptr)
 {
 }
 
@@ -82,12 +82,12 @@ template <class T>
 QTestCoreList<T>::~QTestCoreList()
 {
     if (prev) {
-        prev->next = 0;
+        prev->next = nullptr;
     }
     delete prev;
 
     if (next) {
-        next->prev = 0;
+        next->prev = nullptr;
     }
     delete next;
 }
diff --git a/src/testlib/qtestdata.cpp b/src/testlib/qtestdata.cpp
index a8ee130a7d..3a1c6d7e7b 100644
--- a/src/testlib/qtestdata.cpp
+++ b/src/testlib/qtestdata.cpp
@@ -51,12 +51,10 @@ QT_BEGIN_NAMESPACE
 class QTestDataPrivate
 {
 public:
-    QTestDataPrivate() : tag(0), parent(0), data(0), dataCount(0) {}
-
-    char *tag;
-    QTestTable *parent;
-    void **data;
-    int dataCount;
+    char *tag = nullptr;
+    QTestTable *parent = nullptr;
+    void **data = nullptr;
+    int dataCount = 0;
 };
 
 QTestData::QTestData(const char *tag, QTestTable *parent)
diff --git a/src/testlib/qtestelement.cpp b/src/testlib/qtestelement.cpp
index 622e5344f3..b468295917 100644
--- a/src/testlib/qtestelement.cpp
+++ b/src/testlib/qtestelement.cpp
@@ -43,8 +43,6 @@ QT_BEGIN_NAMESPACE
 
 QTestElement::QTestElement(int type)
     : QTestCoreElement<QTestElement>(type)
-    , listOfChildren(0)
-    , parent(0)
 {
 }
 
diff --git a/src/testlib/qtestelement_p.h b/src/testlib/qtestelement_p.h
index dacbe6c106..a6b2791a42 100644
--- a/src/testlib/qtestelement_p.h
+++ b/src/testlib/qtestelement_p.h
@@ -69,8 +69,8 @@ class QTestElement: public QTestCoreElement<QTestElement>
         void setParent(const QTestElement *p);
 
     private:
-        QTestElement *listOfChildren;
-        const QTestElement * parent;
+        QTestElement *listOfChildren = nullptr;
+        const QTestElement * parent = nullptr;
 
 };
 
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 9d752bf26a..e194ee50f7 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -104,11 +104,7 @@ QT_BEGIN_NAMESPACE
   \value LET_SystemError
 */
 
-QTestElementAttribute::QTestElementAttribute()
-    :attributeValue(0),
-    attributeIndex(QTest::AI_Undefined)
-{
-}
+QTestElementAttribute::QTestElementAttribute() = default;
 
 QTestElementAttribute::~QTestElementAttribute()
 {
@@ -145,7 +141,7 @@ const char *QTestElementAttribute::name() const
     if (attributeIndex != QTest::AI_Undefined)
         return AttributeNames[attributeIndex];
 
-    return 0;
+    return nullptr;
 }
 
 QTest::AttributeIndex QTestElementAttribute::index() const
@@ -168,7 +164,7 @@ bool QTestElementAttribute::setPair(QTest::AttributeIndex index, const char *val
     attributeIndex = index;
     attributeValue = qstrdup(value);
 
-    return attributeValue != 0;
+    return attributeValue != nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h
index cb4dbb5f16..f3815b72d1 100644
--- a/src/testlib/qtestelementattribute_p.h
+++ b/src/testlib/qtestelementattribute_p.h
@@ -106,8 +106,8 @@ class QTestElementAttribute: public QTestCoreList<QTestElementAttribute>
         bool setPair(QTest::AttributeIndex attributeIndex, const char *value);
 
     private:
-        char *attributeValue;
-        QTest::AttributeIndex attributeIndex;
+        char *attributeValue = nullptr;
+        QTest::AttributeIndex attributeIndex = QTest::AI_Undefined;
 };
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h
index a77b47cd7f..b194e24c3a 100644
--- a/src/testlib/qtesteventloop.h
+++ b/src/testlib/qtesteventloop.h
@@ -56,8 +56,7 @@ class Q_TESTLIB_EXPORT QTestEventLoop : public QObject
     Q_OBJECT
 
 public:
-    inline QTestEventLoop(QObject *aParent = nullptr)
-        : QObject(aParent), inLoop(false), _timeout(false), timerId(-1), loop(nullptr) {}
+    using QObject::QObject;
 
     inline void enterLoopMSecs(int ms);
     inline void enterLoop(int secs) { enterLoopMSecs(secs * 1000); }
@@ -84,10 +83,10 @@ protected:
 
 private:
     Q_DECL_UNUSED_MEMBER bool inLoop; // ### Qt 6: remove
-    bool _timeout;
-    int timerId;
+    bool _timeout = false;
+    int timerId = -1;
 
-    QEventLoop *loop;
+    QEventLoop *loop = nullptr;
 };
 
 inline void QTestEventLoop::enterLoopMSecs(int ms)
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index faef3912c4..f3ebf343c5 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -111,7 +111,7 @@ namespace QTest {
     struct IgnoreResultList
     {
         inline IgnoreResultList(QtMsgType tp, const QVariant &patternIn)
-            : type(tp), pattern(patternIn), next(0) {}
+            : type(tp), pattern(patternIn) {}
 
         static inline void clearList(IgnoreResultList *&list)
         {
@@ -163,10 +163,10 @@ namespace QTest {
 
         QtMsgType type;
         QVariant pattern;
-        IgnoreResultList *next;
+        IgnoreResultList *next = nullptr;
     };
 
-    static IgnoreResultList *ignoreResultList = 0;
+    static IgnoreResultList *ignoreResultList = nullptr;
 
     static QVector<QAbstractTestLogger*> loggers;
     static bool loggerUsingStdout = false;
@@ -181,7 +181,7 @@ namespace QTest {
     {
         if (!ignoreResultList)
             return false;
-        IgnoreResultList *last = 0;
+        IgnoreResultList *last = nullptr;
         IgnoreResultList *list = ignoreResultList;
         while (list) {
             if (list->matches(type, message)) {
@@ -191,7 +191,7 @@ namespace QTest {
                 else if (list->next)
                     ignoreResultList = list->next;
                 else
-                    ignoreResultList = 0;
+                    ignoreResultList = nullptr;
 
                 delete list;
                 return true;
@@ -219,7 +219,7 @@ namespace QTest {
         }
 
         if (type != QtFatalMsg) {
-            if (counter.load() <= 0)
+            if (counter.loadRelaxed() <= 0)
                 return;
 
             if (!counter.deref()) {
@@ -438,11 +438,11 @@ void QTestLog::stopLogging()
 void QTestLog::addLogger(LogMode mode, const char *filename)
 {
     if (filename && strcmp(filename, "-") == 0)
-        filename = 0;
+        filename = nullptr;
     if (!filename)
         QTest::loggerUsingStdout = true;
 
-    QAbstractTestLogger *logger = 0;
+    QAbstractTestLogger *logger = nullptr;
     switch (mode) {
     case QTestLog::Plain:
         logger = new QPlainTestLogger(filename);
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
index e63e89a78e..fff36f290d 100644
--- a/src/testlib/qtestlog_p.h
+++ b/src/testlib/qtestlog_p.h
@@ -66,6 +66,10 @@ class QTestData;
 class Q_TESTLIB_EXPORT QTestLog
 {
 public:
+    QTestLog() = delete;
+    ~QTestLog() = delete;
+    Q_DISABLE_COPY_MOVE(QTestLog)
+
     enum LogMode {
         Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP
 #if defined(QT_USE_APPLE_UNIFIED_LOGGING)
@@ -135,9 +139,6 @@ public:
     static qreal msecsFunctionTime() { return QTestLog::nsecsFunctionTime() / 1000000.; }
 
 private:
-    QTestLog();
-    ~QTestLog();
-
     static bool printAvailableTags;
 };
 
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index a7a4807e06..88028aac6e 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -39,42 +39,45 @@
 
 #include <QtTest/private/qtestresult_p.h>
 #include <QtCore/qglobal.h>
+#include <QtCore/qstringview.h>
 
 #include <QtTest/private/qtestlog_p.h>
+#include <QtTest/qtest.h> // toString() specializations for QStringView
 #include <QtTest/qtestdata.h>
+#include <QtTest/qtestcase.h>
 #include <QtTest/qtestassert.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-static const char *currentAppName = 0;
+static const char *currentAppName = nullptr;
 
 QT_BEGIN_NAMESPACE
 
 namespace QTest
 {
-    static QTestData *currentTestData = 0;
-    static QTestData *currentGlobalTestData = 0;
-    static const char *currentTestFunc = 0;
-    static const char *currentTestObjectName = 0;
+    static QTestData *currentTestData = nullptr;
+    static QTestData *currentGlobalTestData = nullptr;
+    static const char *currentTestFunc = nullptr;
+    static const char *currentTestObjectName = nullptr;
     static bool failed = false;
     static bool skipCurrentTest = false;
     static bool blacklistCurrentTest = false;
 
-    static const char *expectFailComment = 0;
+    static const char *expectFailComment = nullptr;
     static int expectFailMode = 0;
 }
 
 void QTestResult::reset()
 {
-    QTest::currentTestData = 0;
-    QTest::currentGlobalTestData = 0;
-    QTest::currentTestFunc = 0;
-    QTest::currentTestObjectName = 0;
+    QTest::currentTestData = nullptr;
+    QTest::currentGlobalTestData = nullptr;
+    QTest::currentTestFunc = nullptr;
+    QTest::currentTestObjectName = nullptr;
     QTest::failed = false;
 
-    QTest::expectFailComment = 0;
+    QTest::expectFailComment = nullptr;
     QTest::expectFailMode = 0;
     QTest::blacklistCurrentTest = false;
 
@@ -126,18 +129,18 @@ static void clearExpectFail()
 {
     QTest::expectFailMode = 0;
     delete [] const_cast<char *>(QTest::expectFailComment);
-    QTest::expectFailComment = 0;
+    QTest::expectFailComment = nullptr;
 }
 
 void QTestResult::finishedCurrentTestData()
 {
     if (QTest::expectFailMode)
-        addFailure("QEXPECT_FAIL was called without any subsequent verification statements", 0, 0);
+        addFailure("QEXPECT_FAIL was called without any subsequent verification statements", nullptr, 0);
     clearExpectFail();
 
     if (!QTest::failed && QTestLog::unhandledIgnoreMessages()) {
         QTestLog::printUnhandledIgnoreMessages();
-        addFailure("Not all expected messages were received", 0, 0);
+        addFailure("Not all expected messages were received", nullptr, 0);
     }
     QTestLog::clearIgnoreMessages();
 }
@@ -157,7 +160,7 @@ void QTestResult::finishedCurrentTestDataCleanup()
 
 void QTestResult::finishedCurrentTestFunction()
 {
-    QTest::currentTestFunc = 0;
+    QTest::currentTestFunc = nullptr;
     QTest::failed = false;
 
     QTestLog::leaveTestFunction();
@@ -170,14 +173,12 @@ const char *QTestResult::currentTestFunction()
 
 const char *QTestResult::currentDataTag()
 {
-    return QTest::currentTestData ? QTest::currentTestData->dataTag()
-                                   : static_cast<const char *>(0);
+    return QTest::currentTestData ? QTest::currentTestData->dataTag() : nullptr;
 }
 
 const char *QTestResult::currentGlobalDataTag()
 {
-    return QTest::currentGlobalTestData ? QTest::currentGlobalTestData->dataTag()
-                                         : static_cast<const char *>(0);
+    return QTest::currentGlobalTestData ? QTest::currentGlobalTestData->dataTag() : nullptr;
 }
 
 static bool isExpectFailData(const char *dataIndex)
@@ -265,17 +266,54 @@ bool QTestResult::verify(bool statement, const char *statementStr,
     return checkStatement(statement, msg, file, line);
 }
 
-bool QTestResult::compare(bool success, const char *failureMsg,
-                          char *val1, char *val2,
-                          const char *actual, const char *expected,
-                          const char *file, int line)
+// Format failures using the toString() template
+template <class Actual, class Expected>
+void formatFailMessage(char *msg, size_t maxMsgLen,
+                       const char *failureMsg,
+                       const Actual &val1, const Expected &val2,
+                       const char *actual, const char *expected)
 {
-    QTEST_ASSERT(expected);
-    QTEST_ASSERT(actual);
+    auto val1S = QTest::toString(val1);
+    auto val2S = QTest::toString(val2);
+
+    size_t len1 = mbstowcs(nullptr, actual, maxMsgLen);    // Last parameter is not ignored on QNX
+    size_t len2 = mbstowcs(nullptr, expected, maxMsgLen);  // (result is never larger than this).
+    qsnprintf(msg, maxMsgLen, "%s\n   Actual   (%s)%*s %s\n   Expected (%s)%*s %s",
+              failureMsg,
+              actual, qMax(len1, len2) - len1 + 1, ":", val1S ? val1S : "<null>",
+              expected, qMax(len1, len2) - len2 + 1, ":", val2S ? val2S : "<null>");
+
+    delete [] val1S;
+    delete [] val2S;
+}
+
+// Overload to format failures for "const char *" - no need to strdup().
+void formatFailMessage(char *msg, size_t maxMsgLen,
+                       const char *failureMsg,
+                       const char *val1, const char *val2,
+                       const char *actual, const char *expected)
+{
+    size_t len1 = mbstowcs(nullptr, actual, maxMsgLen);    // Last parameter is not ignored on QNX
+    size_t len2 = mbstowcs(nullptr, expected, maxMsgLen);  // (result is never larger than this).
+    qsnprintf(msg, maxMsgLen, "%s\n   Actual   (%s)%*s %s\n   Expected (%s)%*s %s",
+              failureMsg,
+              actual, qMax(len1, len2) - len1 + 1, ":", val1 ? val1 : "<null>",
+              expected, qMax(len1, len2) - len2 + 1, ":", val2 ? val2 : "<null>");
+}
 
+template <class Actual, class Expected>
+static bool compareHelper(bool success, const char *failureMsg,
+                          const Actual &val1, const Expected &val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line,
+                          bool hasValues = true)
+{
     const size_t maxMsgLen = 1024;
     char msg[maxMsgLen] = {'\0'};
 
+    QTEST_ASSERT(expected);
+    QTEST_ASSERT(actual);
+
     if (QTestLog::verboseLevel() >= 2) {
         qsnprintf(msg, maxMsgLen, "QCOMPARE(%s, %s)", actual, expected);
         QTestLog::info(msg, file, line);
@@ -289,20 +327,92 @@ bool QTestResult::compare(bool success, const char *failureMsg,
             qsnprintf(msg, maxMsgLen,
                       "QCOMPARE(%s, %s) returned TRUE unexpectedly.", actual, expected);
         }
-    } else if (val1 || val2) {
-        size_t len1 = mbstowcs(NULL, actual, maxMsgLen);    // Last parameter is not ignored on QNX
-        size_t len2 = mbstowcs(NULL, expected, maxMsgLen);  // (result is never larger than this).
-        qsnprintf(msg, maxMsgLen, "%s\n   Actual   (%s)%*s %s\n   Expected (%s)%*s %s",
-                  failureMsg,
-                  actual, qMax(len1, len2) - len1 + 1, ":", val1 ? val1 : "<null>",
-                  expected, qMax(len1, len2) - len2 + 1, ":", val2 ? val2 : "<null>");
-    } else
+        return checkStatement(success, msg, file, line);
+    }
+
+
+    if (!hasValues) {
         qsnprintf(msg, maxMsgLen, "%s", failureMsg);
+        return checkStatement(success, msg, file, line);
+    }
+
+    formatFailMessage(msg, maxMsgLen, failureMsg, val1, val2, actual, expected);
+
+    return checkStatement(success, msg, file, line);
+}
+
+bool QTestResult::compare(bool success, const char *failureMsg,
+                          char *val1, char *val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line)
+{
+    const bool result = compareHelper(success, failureMsg,
+                                      val1 != nullptr ? val1 : "<null>",
+                                      val2 != nullptr ? val2 : "<null>",
+                                      actual, expected, file, line,
+                                      val1 != nullptr && val2 != nullptr);
 
+    // Our caller got these from QTest::toString()
     delete [] val1;
     delete [] val2;
 
-    return checkStatement(success, msg, file, line);
+    return result;
+}
+
+bool QTestResult::compare(bool success, const char *failureMsg,
+                          double val1, double val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line)
+{
+    return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line);
+}
+
+bool QTestResult::compare(bool success, const char *failureMsg,
+                          float val1, float val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line)
+{
+    return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line);
+}
+
+bool QTestResult::compare(bool success, const char *failureMsg,
+                          int val1, int val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line)
+{
+    return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line);
+}
+
+bool QTestResult::compare(bool success, const char *failureMsg,
+                          unsigned val1, unsigned val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line)
+{
+    return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line);
+}
+
+bool QTestResult::compare(bool success, const char *failureMsg,
+                          QStringView val1, QStringView val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line)
+{
+    return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line);
+}
+
+bool QTestResult::compare(bool success, const char *failureMsg,
+                          QStringView val1, const QLatin1String &val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line)
+{
+    return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line);
+}
+
+bool QTestResult::compare(bool success, const char *failureMsg,
+                          const QLatin1String & val1, QStringView val2,
+                          const char *actual, const char *expected,
+                          const char *file, int line)
+{
+    return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line);
 }
 
 void QTestResult::addFailure(const char *message, const char *file, int line)
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h
index 4df75b2805..38a3024a0f 100644
--- a/src/testlib/qtestresult_p.h
+++ b/src/testlib/qtestresult_p.h
@@ -55,6 +55,9 @@
 
 QT_BEGIN_NAMESPACE
 
+class QLatin1String;
+class QStringView;
+
 class QTestResultPrivate;
 class QTestData;
 
@@ -79,7 +82,34 @@ public:
                         char *val1, char *val2,
                         const char *actual, const char *expected,
                         const char *file, int line);
-
+    static bool compare(bool success, const char *failureMsg,
+                        double val1, double val2,
+                        const char *actual, const char *expected,
+                        const char *file, int line);
+    static bool compare(bool success, const char *failureMsg,
+                        float val1, float val2,
+                        const char *actual, const char *expected,
+                        const char *file, int line);
+    static bool compare(bool success, const char *failureMsg,
+                        int val1, int val2,
+                        const char *actual, const char *expected,
+                        const char *file, int line);
+    static bool compare(bool success, const char *failureMsg,
+                        unsigned val1, unsigned val2,
+                        const char *actual, const char *expected,
+                        const char *file, int line);
+    static bool compare(bool success, const char *failureMsg,
+                        QStringView val1, QStringView val2,
+                        const char *actual, const char *expected,
+                        const char *file, int line);
+    static bool compare(bool success, const char *failureMsg,
+                        const QLatin1String &val1, QStringView val2,
+                        const char *actual, const char *expected,
+                        const char *file, int line);
+    static bool compare(bool success, const char *failureMsg,
+                        QStringView val1, const QLatin1String &val2,
+                        const char *actual, const char *expected,
+                        const char *file, int line);
     static void setCurrentGlobalTestData(QTestData *data);
     static void setCurrentTestData(QTestData *data);
     static void setCurrentTestFunction(const char *func);
diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp
index 8d42668a5b..85dff17017 100644
--- a/src/testlib/qtesttable.cpp
+++ b/src/testlib/qtesttable.cpp
@@ -58,17 +58,17 @@ public:
     }
 
     struct Element {
-        Element() : name(nullptr), type(0) {}
+        Element() = default;
         Element(const char *n, int t) : name(n), type(t) {}
 
-        const char *name;
-        int type;
+        const char *name = nullptr;
+        int type = 0;
     };
 
-    typedef std::vector<Element> ElementList;
+    using ElementList = std::vector<Element>;
     ElementList elementList;
 
-    typedef std::vector<QTestData *> DataList;
+    using DataList = std::vector<QTestData *>;
     DataList dataList;
 
     void addColumn(int elemType, const char *elemName) { elementList.push_back(Element(elemName, elemType)); }
@@ -78,8 +78,8 @@ public:
     static QTestTable *gTable;
 };
 
-QTestTable *QTestTablePrivate::currentTestTable = 0;
-QTestTable *QTestTablePrivate::gTable = 0;
+QTestTable *QTestTablePrivate::currentTestTable = nullptr;
+QTestTable *QTestTablePrivate::gTable = nullptr;
 
 void QTestTable::addColumn(int type, const char *name)
 {
@@ -119,7 +119,7 @@ QTestTable::QTestTable()
 
 QTestTable::~QTestTable()
 {
-    QTestTablePrivate::currentTestTable = 0;
+    QTestTablePrivate::currentTestTable = nullptr;
     delete d;
 }
 
@@ -152,14 +152,12 @@ private:
 
 int QTestTable::indexOf(const char *elementName) const
 {
-    typedef QTestTablePrivate::ElementList::const_iterator It;
-
     QTEST_ASSERT(elementName);
 
     const QTestTablePrivate::ElementList &elementList = d->elementList;
 
-    const It it = std::find_if(elementList.begin(), elementList.end(),
-                               NamePredicate(elementName));
+    const auto it = std::find_if(elementList.begin(), elementList.end(),
+                                 NamePredicate(elementName));
     return it != elementList.end() ?
         int(it - elementList.begin()) : -1;
 }
@@ -174,7 +172,7 @@ QTestTable *QTestTable::globalTestTable()
 void QTestTable::clearGlobalTestTable()
 {
     delete QTestTablePrivate::gTable;
-    QTestTablePrivate::gTable = 0;
+    QTestTablePrivate::gTable = nullptr;
 }
 
 QTestTable *QTestTable::currentTestTable()
diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp
index fe9a6e21cc..bdbdfa9610 100644
--- a/src/testlib/qtestxunitstreamer.cpp
+++ b/src/testlib/qtestxunitstreamer.cpp
@@ -54,8 +54,7 @@ QTestXunitStreamer::QTestXunitStreamer(QXunitTestLogger *logger)
     QTEST_ASSERT(testLogger);
 }
 
-QTestXunitStreamer::~QTestXunitStreamer()
-{}
+QTestXunitStreamer::~QTestXunitStreamer() = default;
 
 void QTestXunitStreamer::indentForElement(const QTestElement* element, char* buf, int size)
 {
@@ -129,7 +128,7 @@ void QTestXunitStreamer::formatAttributes(const QTestElement* element, const QTe
         return;
     }
 
-    char const* key = 0;
+    char const* key = nullptr;
     if (attrindex == QTest::AI_Description)
         key = "message";
     else if (attrindex != QTest::AI_File && attrindex != QTest::AI_Line)
diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp
index c47042c3a0..763cea327b 100644
--- a/src/testlib/qxmltestlogger.cpp
+++ b/src/testlib/qxmltestlogger.cpp
@@ -107,9 +107,7 @@ QXmlTestLogger::QXmlTestLogger(XmlMode mode, const char *filename)
 {
 }
 
-QXmlTestLogger::~QXmlTestLogger()
-{
-}
+QXmlTestLogger::~QXmlTestLogger() = default;
 
 void QXmlTestLogger::startLogging()
 {
@@ -182,23 +180,20 @@ inline static bool isEmpty(const char *str)
 static const char *incidentFormatString(bool noDescription, bool noTag)
 {
     if (noDescription) {
-        if (noTag)
-            return "<Incident type=\"%s\" file=\"%s\" line=\"%d\" />\n";
-        else
-            return "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n"
+        return noTag
+            ?   "<Incident type=\"%s\" file=\"%s\" line=\"%d\" />\n"
+            :   "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n"
                 "    <DataTag><![CDATA[%s%s%s%s]]></DataTag>\n"
                 "</Incident>\n";
-    } else {
-        if (noTag)
-            return "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n"
-                "    <Description><![CDATA[%s%s%s%s]]></Description>\n"
-                "</Incident>\n";
-        else
-            return "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n"
-                "    <DataTag><![CDATA[%s%s%s]]></DataTag>\n"
-                "    <Description><![CDATA[%s]]></Description>\n"
-                "</Incident>\n";
     }
+    return noTag
+        ? "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n"
+          "    <Description><![CDATA[%s%s%s%s]]></Description>\n"
+          "</Incident>\n"
+        : "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n"
+          "    <DataTag><![CDATA[%s%s%s]]></DataTag>\n"
+          "    <Description><![CDATA[%s]]></Description>\n"
+          "</Incident>\n";
 }
 
 static const char *benchmarkResultFormatString()
diff --git a/src/testlib/qxmltestlogger_p.h b/src/testlib/qxmltestlogger_p.h
index b85742f939..04ed57d587 100644
--- a/src/testlib/qxmltestlogger_p.h
+++ b/src/testlib/qxmltestlogger_p.h
@@ -71,11 +71,11 @@ public:
     void leaveTestFunction() override;
 
     void addIncident(IncidentTypes type, const char *description,
-                     const char *file = 0, int line = 0) override;
+                     const char *file = nullptr, int line = 0) override;
     void addBenchmarkResult(const QBenchmarkResult &result) override;
 
     void addMessage(MessageTypes type, const QString &message,
-                    const char *file = 0, int line = 0) override;
+                    const char *file = nullptr, int line = 0) override;
 
     static int xmlCdata(QTestCharBuffer *dest, char const* src);
     static int xmlQuote(QTestCharBuffer *dest, char const* src);
diff --git a/src/testlib/qxunittestlogger.cpp b/src/testlib/qxunittestlogger.cpp
index 336edb5994..b3cac9cb82 100644
--- a/src/testlib/qxunittestlogger.cpp
+++ b/src/testlib/qxunittestlogger.cpp
@@ -59,13 +59,6 @@ QT_BEGIN_NAMESPACE
 
 QXunitTestLogger::QXunitTestLogger(const char *filename)
     : QAbstractTestLogger(filename)
-    , listOfTestcases(0)
-    , currentLogElement(0)
-    , errorLogElement(0)
-    , logFormatter(0)
-    , testCounter(0)
-    , failureCounter(0)
-    , errorCounter(0)
 {
 }
 
@@ -155,7 +148,7 @@ void QXunitTestLogger::leaveTestFunction()
 void QXunitTestLogger::addIncident(IncidentTypes type, const char *description,
                                    const char *file, int line)
 {
-    const char *typeBuf = 0;
+    const char *typeBuf = nullptr;
     char buf[100];
 
     switch (type) {
@@ -299,7 +292,7 @@ void QXunitTestLogger::addTag(QTestElement* element)
 void QXunitTestLogger::addMessage(MessageTypes type, const QString &message, const char *file, int line)
 {
     QTestElement *errorElement = new QTestElement(QTest::LET_Error);
-    const char *typeBuf = 0;
+    const char *typeBuf = nullptr;
 
     switch (type) {
     case QAbstractTestLogger::Warn:
diff --git a/src/testlib/qxunittestlogger_p.h b/src/testlib/qxunittestlogger_p.h
index 8fb01fbe61..518ba098f4 100644
--- a/src/testlib/qxunittestlogger_p.h
+++ b/src/testlib/qxunittestlogger_p.h
@@ -71,22 +71,22 @@ class QXunitTestLogger : public QAbstractTestLogger
         void leaveTestFunction() override;
 
         void addIncident(IncidentTypes type, const char *description,
-                     const char *file = 0, int line = 0) override;
+                     const char *file = nullptr, int line = 0) override;
         void addBenchmarkResult(const QBenchmarkResult &result) override;
         void addTag(QTestElement* element);
 
         void addMessage(MessageTypes type, const QString &message,
-                    const char *file = 0, int line = 0) override;
+                    const char *file = nullptr, int line = 0) override;
 
     private:
-        QTestElement *listOfTestcases;
-        QTestElement *currentLogElement;
-        QTestElement *errorLogElement;
-        QTestXunitStreamer *logFormatter;
+        QTestElement *listOfTestcases = nullptr;
+        QTestElement *currentLogElement = nullptr;
+        QTestElement *errorLogElement = nullptr;
+        QTestXunitStreamer *logFormatter = nullptr;
 
-        int testCounter;
-        int failureCounter;
-        int errorCounter;
+        int testCounter = 0;
+        int failureCounter = 0;
+        int errorCounter = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index f52a913a08..530bc6b425 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -17,7 +17,6 @@ HEADERS = \
     qbenchmark_p.h \
     qbenchmarkmeasurement_p.h \
     qbenchmarktimemeasurers_p.h \
-    qbenchmarkvalgrind_p.h \
     qbenchmarkevent_p.h \
     qbenchmarkperfevents_p.h \
     qbenchmarkmetric.h \
@@ -70,7 +69,6 @@ SOURCES = \
     qabstracttestlogger.cpp \
     qbenchmark.cpp \
     qbenchmarkmeasurement.cpp \
-    qbenchmarkvalgrind.cpp \
     qbenchmarkevent.cpp \
     qbenchmarkperfevents.cpp \
     qbenchmarkmetric.cpp \
@@ -92,6 +90,13 @@ qtConfig(itemmodeltester) {
         qabstractitemmodeltester.cpp
 }
 
+qtConfig(valgrind) {
+    HEADERS += \
+        qbenchmarkvalgrind_p.h
+    SOURCES += \
+        qbenchmarkvalgrind.cpp
+}
+
 DEFINES *= QT_NO_CAST_TO_ASCII \
     QT_NO_CAST_FROM_ASCII \
     QT_NO_FOREACH \
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 01c392f8f9..7101a2bf3c 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -52,6 +52,21 @@
 #define QT_POPEN_READ "r"
 #endif
 
+class ActionTimer
+{
+    qint64 started;
+public:
+    ActionTimer() = default;
+    void start()
+    {
+        started = QDateTime::currentMSecsSinceEpoch();
+    }
+    int elapsed()
+    {
+        return int(QDateTime::currentMSecsSinceEpoch() - started);
+    }
+};
+
 static const bool mustReadOutputAnyway = true; // pclose seems to return the wrong error code unless we read the output
 
 void deleteRecursively(const QString &dirName)
@@ -76,7 +91,7 @@ FILE *openProcess(const QString &command)
 #if defined(Q_OS_WIN32)
     QString processedCommand = QLatin1Char('\"') + command + QLatin1Char('\"');
 #else
-    QString processedCommand = command;
+    const QString& processedCommand = command;
 #endif
 
     return popen(processedCommand.toLocal8Bit().constData(), QT_POPEN_READ);
@@ -84,7 +99,7 @@ FILE *openProcess(const QString &command)
 
 struct QtDependency
 {
-    QtDependency(QString rpath, QString apath) : relativePath(rpath), absolutePath(apath) {}
+    QtDependency(const QString &rpath, const QString &apath) : relativePath(rpath), absolutePath(apath) {}
 
     bool operator==(const QtDependency &other) const
     {
@@ -101,19 +116,16 @@ struct Options
         : helpRequested(false)
         , verbose(false)
         , timing(false)
-        , generateAssetsFileList(true)
         , build(true)
-        , gradle(false)
         , auxMode(false)
         , deploymentMechanism(Bundled)
         , releasePackage(false)
-        , digestAlg(QLatin1String("SHA1"))
-        , sigAlg(QLatin1String("SHA1withRSA"))
+        , digestAlg(QLatin1String("SHA-256"))
+        , sigAlg(QLatin1String("SHA256withRSA"))
         , internalSf(false)
         , sectionsOnly(false)
         , protectedAuthenticationPath(false)
         , jarSigner(false)
-        , gdbServer(Auto)
         , installApk(false)
         , uninstallApk(false)
     {}
@@ -133,18 +145,14 @@ struct Options
     bool helpRequested;
     bool verbose;
     bool timing;
-    bool generateAssetsFileList;
     bool build;
-    bool gradle;
     bool auxMode;
-    bool stripLibraries = true;
-    QTime timer;
+    ActionTimer timer;
 
     // External tools
     QString sdkPath;
     QString sdkBuildToolsVersion;
     QString ndkPath;
-    QString antTool;
     QString jdkPath;
 
     // Build paths
@@ -163,22 +171,24 @@ struct Options
 
     // lib c++ path
     QString stdCppPath;
-    QString stdCppName = QStringLiteral("gnustl_shared");
+    QString stdCppName = QStringLiteral("c++_shared");
 
     // Build information
     QString androidPlatform;
-    QString architecture;
-    QString toolchainVersion;
+    QHash<QString, QString> architectures;
+    QString currentArchitecture;
     QString toolchainPrefix;
-    QString toolPrefix;
-    bool useLLVM = false;
     QString ndkHost;
+    bool buildAAB = false;
+
 
     // Package information
     DeploymentMechanism deploymentMechanism;
     QString packageName;
     QStringList extraLibs;
+    QHash<QString, QStringList> archExtraLibs;
     QStringList extraPlugins;
+    QHash<QString, QStringList> archExtraPlugins;
 
     // Signing information
     bool releasePackage;
@@ -197,26 +207,38 @@ struct Options
     bool sectionsOnly;
     bool protectedAuthenticationPath;
     bool jarSigner;
-
-    // Gdbserver
-    TriState gdbServer;
+    QString apkPath;
 
     // Installation information
     bool installApk;
     bool uninstallApk;
     QString installLocation;
 
-    // Collected information
+    // Per architecture collected information
+    void clear(const QString &arch)
+    {
+        currentArchitecture = arch;
+    }
     typedef QPair<QString, QString> BundledFile;
-    QList<BundledFile> bundledFiles;
-    QList<QtDependency> qtDependencies;
-    QStringList localLibs;
+    QHash<QString, QList<BundledFile>> bundledFiles;
+    QHash<QString, QList<QtDependency>> qtDependencies;
+    QHash<QString, QStringList> localLibs;
+    bool usesOpenGL = false;
+
+    // Per package collected information
     QStringList localJars;
     QStringList initClasses;
     QStringList permissions;
     QStringList features;
 };
 
+static const QHash<QByteArray, QByteArray> elfArchitecures = {
+    {"aarch64", "arm64-v8a"},
+    {"arm", "armeabi-v7a"},
+    {"i386", "x86"},
+    {"x86_64", "x86_64"}
+};
+
 // Copy-pasted from qmake/library/ioutil.cpp
 inline static bool hasSpecialChars(const QString &arg, const uchar (&iqm)[16])
 {
@@ -237,7 +259,7 @@ static QString shellQuoteUnix(const QString &arg)
     }; // 0-32 \'"$`<>|;&(){}*?#!~[]
 
     if (!arg.length())
-        return QString::fromLatin1("\"\"");
+        return QLatin1String("\"\"");
 
     QString ret(arg);
     if (hasSpecialChars(ret, iqm)) {
@@ -260,7 +282,7 @@ static QString shellQuoteWin(const QString &arg)
     };
 
     if (!arg.length())
-        return QString::fromLatin1("\"\"");
+        return QLatin1String("\"\"");
 
     QString ret(arg);
     if (hasSpecialChars(ret, iqm)) {
@@ -288,6 +310,59 @@ static QString shellQuote(const QString &arg)
         return shellQuoteUnix(arg);
 }
 
+QString architecureFromName(const QString &name)
+{
+    QRegExp architecture(QStringLiteral(".*_(armeabi-v7a|arm64-v8a|x86|x86_64).so"));
+    if (!architecture.exactMatch(name))
+        return {};
+    return architecture.capturedTexts().last();
+}
+
+QString fileArchitecture(const Options &options, const QString &path)
+{
+    auto arch = architecureFromName(path);
+    if (!arch.isEmpty())
+        return arch;
+
+    QString readElf = QLatin1String("%1/toolchains/%2/prebuilt/%3/bin/llvm-readobj").arg(options.ndkPath,
+                                                                                          options.toolchainPrefix,
+                                                                                          options.ndkHost);
+#if defined(Q_OS_WIN32)
+    readElf += QLatin1String(".exe");
+#endif
+
+    if (!QFile::exists(readElf)) {
+        fprintf(stderr, "Command does not exist: %s\n", qPrintable(readElf));
+        return {};
+    }
+
+    readElf = QLatin1String("%1 -needed-libs %2").arg(shellQuote(readElf), shellQuote(path));
+
+    FILE *readElfCommand = openProcess(readElf);
+    if (!readElfCommand) {
+        fprintf(stderr, "Cannot execute command %s\n", qPrintable(readElf));
+        return {};
+    }
+
+    char buffer[512];
+    while (fgets(buffer, sizeof(buffer), readElfCommand) != nullptr) {
+        QByteArray line = QByteArray::fromRawData(buffer, qstrlen(buffer));
+        QString library;
+        line = line.trimmed();
+        if (line.startsWith("Arch: ")) {
+            auto it = elfArchitecures.find(line.mid(6));
+            pclose(readElfCommand);
+            return it != elfArchitecures.constEnd() ? QString::fromLatin1(it.value()) : QString{};
+        }
+    }
+    pclose(readElfCommand);
+    return {};
+}
+
+bool checkArchitecture(const Options &options, const QString &fileName)
+{
+    return fileArchitecture(options, fileName) == options.currentArchitecture;
+}
 
 void deleteMissingFiles(const Options &options, const QDir &srcDir, const QDir &dstDir)
 {
@@ -337,7 +412,10 @@ Options parseOptions()
                 options.helpRequested = true;
             else
                 options.inputFileName = arguments.at(++i);
-        } else if (argument.compare(QLatin1String("--no-build"), Qt::CaseInsensitive) == 0) {
+        } else if (argument.compare(QLatin1String("--aab"), Qt::CaseInsensitive) == 0) {
+            options.buildAAB = true;
+            options.build = true;
+        } else if (options.buildAAB && argument.compare(QLatin1String("--no-build"), Qt::CaseInsensitive) == 0) {
             options.build = false;
         } else if (argument.compare(QLatin1String("--install"), Qt::CaseInsensitive) == 0) {
             options.installApk = true;
@@ -354,13 +432,6 @@ Options parseOptions()
             options.helpRequested = true;
         } else if (argument.compare(QLatin1String("--verbose"), Qt::CaseInsensitive) == 0) {
             options.verbose = true;
-        } else if (argument.compare(QLatin1String("--gradle"), Qt::CaseInsensitive) == 0) {
-            options.gradle = true;
-        } else if (argument.compare(QLatin1String("--ant"), Qt::CaseInsensitive) == 0) {
-            if (i + 1 == arguments.size())
-                options.helpRequested = true;
-            else
-                options.antTool = arguments.at(++i);
         } else if (argument.compare(QLatin1String("--deployment"), Qt::CaseInsensitive) == 0) {
             if (i + 1 == arguments.size()) {
                 options.helpRequested = true;
@@ -382,15 +453,16 @@ Options parseOptions()
                 options.installLocation = arguments.at(++i);
         } else if (argument.compare(QLatin1String("--release"), Qt::CaseInsensitive) == 0) {
             options.releasePackage = true;
-        } else if (argument.compare(QLatin1String("--gdbserver"), Qt::CaseInsensitive) == 0) {
-            options.gdbServer = Options::True;
-        } else if (argument.compare(QLatin1String("--no-gdbserver"), Qt::CaseInsensitive) == 0) {
-            options.gdbServer = Options::False;
         } else if (argument.compare(QLatin1String("--jdk"), Qt::CaseInsensitive) == 0) {
             if (i + 1 == arguments.size())
                 options.helpRequested = true;
             else
                 options.jdkPath = arguments.at(++i);
+        } else if (argument.compare(QLatin1String("--apk"), Qt::CaseInsensitive) == 0) {
+            if (i + 1 == arguments.size())
+                options.helpRequested = true;
+            else
+                options.apkPath = arguments.at(++i);
         } else if (argument.compare(QLatin1String("--sign"), Qt::CaseInsensitive) == 0) {
             if (i + 2 >= arguments.size()) {
                 options.helpRequested = true;
@@ -447,17 +519,13 @@ Options parseOptions()
             options.protectedAuthenticationPath = true;
         } else if (argument.compare(QLatin1String("--jarsigner"), Qt::CaseInsensitive) == 0) {
             options.jarSigner = true;
-        } else if (argument.compare(QLatin1String("--no-generated-assets-cache"), Qt::CaseInsensitive) == 0) {
-            options.generateAssetsFileList = false;
         } else if (argument.compare(QLatin1String("--aux-mode"), Qt::CaseInsensitive) == 0) {
             options.auxMode = true;
-        } else if (argument.compare(QLatin1String("--no-strip"), Qt::CaseInsensitive) == 0) {
-            options.stripLibraries = false;
         }
     }
 
     if (options.inputFileName.isEmpty())
-        options.inputFileName = QString::fromLatin1("android-lib%1.so-deployment-settings.json").arg(QDir::current().dirName());
+        options.inputFileName = QLatin1String("android-lib%1.so-deployment-settings.json").arg(QDir::current().dirName());
 
     options.timing = qEnvironmentVariableIsSet("ANDROIDDEPLOYQT_TIMING_OUTPUT");
 
@@ -486,6 +554,7 @@ void printHelp()
                     "    --deployment <mechanism>: Supported deployment mechanisms:\n"
                     "       bundled (default): Include Qt files in stand-alone package.\n"
                     "       ministro: Use the Ministro service to manage Qt files.\n"
+                    "    --aab: Build an Android App Bundle.\n"
                     "    --no-build: Do not build the package, it is useful to just install\n"
                     "       a package previously built.\n"
                     "    --install: Installs apk to device/emulator. By default this step is\n"
@@ -500,9 +569,6 @@ void printHelp()
                     "    --android-platform <platform>: Builds against the given android\n"
                     "       platform. By default, the highest available version will be\n"
                     "       used.\n"
-                    "    --gradle. Use gradle instead of ant to create and install the apk.\n"
-                    "    --ant <path/to/ant>: If unspecified, ant from the PATH will be\n"
-                    "       used.\n"
                     "    --release: Builds a package ready for release. By default, the\n"
                     "       package will be signed with a debug key.\n"
                     "    --sign <url/to/keystore> <alias>: Signs the package with the\n"
@@ -525,10 +591,6 @@ void printHelp()
                     "         --protected: Keystore has protected authentication path.\n"
                     "         --jarsigner: Force jarsigner usage, otherwise apksigner will be\n"
                     "           used if available.\n"
-                    "    --gdbserver: Adds the gdbserver to the package. By default the gdbserver\n"
-                    "       is bundled for debug pacakges.\n"
-                    "    --no-gdbserver: Prevents the gdbserver from being added to the package\n"
-                    "       By default the gdbserver is bundled for debug pacakges.\n"
                     "    --jdk <path/to/jdk>: Used to find the jarsigner tool when used\n"
                     "       in combination with the --release argument. By default,\n"
                     "       an attempt is made to detect the tool using the JAVA_HOME and\n"
@@ -541,7 +603,7 @@ void printHelp()
                     "    --aux-mode: Operate in auxiliary mode. This will only copy the\n"
                     "       dependencies into the build directory and update the XML templates.\n"
                     "       The project will not be built or installed.\n"
-                    "    --no-strip: Do not strip debug symbols from libraries.\n"
+                    "    --apk <path/where/to/copy/the/apk>: Path where to copy the built apk.\n"
                     "    --help: Displays this information.\n\n",
                     qPrintable(QCoreApplication::arguments().at(0))
             );
@@ -571,9 +633,10 @@ bool alwaysOverwritableFile(const QString &fileName)
             || fileName.endsWith(QLatin1String("/src/org/qtproject/qt5/android/bindings/QtActivity.java")));
 }
 
+
 bool copyFileIfNewer(const QString &sourceFileName,
                      const QString &destinationFileName,
-                     bool verbose,
+                     const Options &options,
                      bool forceOverwrite = false)
 {
     if (QFile::exists(destinationFileName)) {
@@ -583,7 +646,7 @@ bool copyFileIfNewer(const QString &sourceFileName,
         if (!forceOverwrite
                 && sourceFileInfo.lastModified() <= destinationFileInfo.lastModified()
                 && !alwaysOverwritableFile(destinationFileName)) {
-            if (verbose)
+            if (options.verbose)
                 fprintf(stdout, "  -- Skipping file %s. Same or newer file already in place.\n", qPrintable(sourceFileName));
             return true;
         } else {
@@ -602,11 +665,10 @@ bool copyFileIfNewer(const QString &sourceFileName,
     if (!QFile::exists(destinationFileName) && !QFile::copy(sourceFileName, destinationFileName)) {
         fprintf(stderr, "Failed to copy %s to %s.\n", qPrintable(sourceFileName), qPrintable(destinationFileName));
         return false;
-    } else if (verbose) {
+    } else if (options.verbose) {
         fprintf(stdout, "  -- Copied %s\n", qPrintable(destinationFileName));
         fflush(stdout);
     }
-
     return true;
 }
 
@@ -699,7 +761,7 @@ QString packageNameFromAndroidManifest(const QString &androidManifestPath)
                             reader.attributes().value(QLatin1String("package")).toString());
         }
     }
-    return QString();
+    return {};
 }
 
 bool readInputFile(Options *options)
@@ -741,13 +803,13 @@ bool readInputFile(Options *options)
 
     {
 
-        const QJsonValue value = jsonObject.value(QStringLiteral("sdkBuildToolsRevision"));
+        const QJsonValue value = jsonObject.value(QLatin1String("sdkBuildToolsRevision"));
         if (!value.isUndefined())
             options->sdkBuildToolsVersion = value.toString();
     }
 
     {
-        const QJsonValue qtInstallDirectory = jsonObject.value(QStringLiteral("qt"));
+        const QJsonValue qtInstallDirectory = jsonObject.value(QLatin1String("qt"));
         if (qtInstallDirectory.isUndefined()) {
             fprintf(stderr, "No Qt directory in json file %s\n", qPrintable(options->inputFileName));
             return false;
@@ -764,13 +826,13 @@ bool readInputFile(Options *options)
     }
 
     {
-        const QJsonValue androidSourcesDirectory = jsonObject.value(QStringLiteral("android-package-source-directory"));
+        const QJsonValue androidSourcesDirectory = jsonObject.value(QLatin1String("android-package-source-directory"));
         if (!androidSourcesDirectory.isUndefined())
             options->androidSourceDirectory = androidSourcesDirectory.toString();
     }
 
     {
-        const QJsonValue androidVersionName = jsonObject.value(QStringLiteral("android-version-name"));
+        const QJsonValue androidVersionName = jsonObject.value(QLatin1String("android-version-name"));
         if (!androidVersionName.isUndefined())
             options->versionName = androidVersionName.toString();
         else
@@ -778,7 +840,7 @@ bool readInputFile(Options *options)
     }
 
     {
-        const QJsonValue androidVersionCode = jsonObject.value(QStringLiteral("android-version-code"));
+        const QJsonValue androidVersionCode = jsonObject.value(QLatin1String("android-version-code"));
         if (!androidVersionCode.isUndefined())
             options->versionCode = androidVersionCode.toString();
         else
@@ -786,55 +848,24 @@ bool readInputFile(Options *options)
     }
 
     {
-        const QJsonValue applicationBinary = jsonObject.value(QStringLiteral("application-binary"));
-        if (applicationBinary.isUndefined()) {
-            fprintf(stderr, "No application binary defined in json file.\n");
-            return false;
-        }
-        options->applicationBinary = applicationBinary.toString();
-
-        if (!QFile::exists(options->applicationBinary)) {
-            fprintf(stderr, "Cannot find application binary %s.\n", qPrintable(options->applicationBinary));
+        const QJsonObject targetArchitectures = jsonObject.value(QLatin1String("architectures")).toObject();
+        if (targetArchitectures.isEmpty()) {
+            fprintf(stderr, "No target architecture defined in json file.\n");
             return false;
         }
-    }
-
-    {
-        const QJsonValue deploymentDependencies = jsonObject.value(QStringLiteral("deployment-dependencies"));
-        if (!deploymentDependencies.isUndefined()) {
-            QString deploymentDependenciesString = deploymentDependencies.toString();
-            const auto dependencies = deploymentDependenciesString.splitRef(QLatin1Char(','));
-            for (const QStringRef &dependency : dependencies) {
-                QString path = options->qtInstallDirectory + QLatin1Char('/') + dependency;
-                if (QFileInfo(path).isDir()) {
-                    QDirIterator iterator(path, QDirIterator::Subdirectories);
-                    while (iterator.hasNext()) {
-                        iterator.next();
-                        if (iterator.fileInfo().isFile()) {
-                            QString subPath = iterator.filePath();
-                            options->qtDependencies.append(QtDependency(subPath.mid(options->qtInstallDirectory.length() + 1),
-                                                                        subPath));
-                        }
-                    }
-                } else {
-                    options->qtDependencies.append(QtDependency(dependency.toString(), path));
-                }
+        for (auto it = targetArchitectures.constBegin(); it != targetArchitectures.constEnd(); ++it) {
+            if (it.value().isUndefined()) {
+                fprintf(stderr, "Invalid architecure.\n");
+                return false;
             }
+            if (it.value().isNull())
+                continue;
+            options->architectures.insert(it.key(), it.value().toString());
         }
     }
 
-
-    {
-        const QJsonValue targetArchitecture = jsonObject.value(QStringLiteral("target-architecture"));
-        if (targetArchitecture.isUndefined()) {
-            fprintf(stderr, "No target architecture defined in json file.\n");
-            return false;
-        }
-        options->architecture = targetArchitecture.toString();
-    }
-
     {
-        const QJsonValue ndk = jsonObject.value(QStringLiteral("ndk"));
+        const QJsonValue ndk = jsonObject.value(QLatin1String("ndk"));
         if (ndk.isUndefined()) {
             fprintf(stderr, "No NDK path defined in json file.\n");
             return false;
@@ -843,12 +874,7 @@ bool readInputFile(Options *options)
     }
 
     {
-        const QJsonValue value = jsonObject.value(QStringLiteral("useLLVM"));
-        options->useLLVM = value.toBool(false);
-    }
-
-    {
-        const QJsonValue toolchainPrefix = jsonObject.value(QStringLiteral("toolchain-prefix"));
+        const QJsonValue toolchainPrefix = jsonObject.value(QLatin1String("toolchain-prefix"));
         if (toolchainPrefix.isUndefined()) {
             fprintf(stderr, "No toolchain prefix defined in json file.\n");
             return false;
@@ -857,26 +883,7 @@ bool readInputFile(Options *options)
     }
 
     {
-        const QJsonValue toolPrefix = jsonObject.value(QStringLiteral("tool-prefix"));
-        if (toolPrefix.isUndefined()) {
-            fprintf(stderr, "Warning: No tool prefix defined in json file.\n");
-            options->toolPrefix = options->toolchainPrefix;
-        } else {
-            options->toolPrefix = toolPrefix.toString();
-        }
-    }
-
-    if (!options->useLLVM) {
-        const QJsonValue toolchainVersion = jsonObject.value(QStringLiteral("toolchain-version"));
-        if (toolchainVersion.isUndefined()) {
-            fprintf(stderr, "No toolchain version defined in json file.\n");
-            return false;
-        }
-        options->toolchainVersion = toolchainVersion.toString();
-    }
-
-    {
-        const QJsonValue ndkHost = jsonObject.value(QStringLiteral("ndk-host"));
+        const QJsonValue ndkHost = jsonObject.value(QLatin1String("ndk-host"));
         if (ndkHost.isUndefined()) {
             fprintf(stderr, "No NDK host defined in json file.\n");
             return false;
@@ -884,52 +891,100 @@ bool readInputFile(Options *options)
         options->ndkHost = ndkHost.toString();
     }
 
-    options->packageName = packageNameFromAndroidManifest(options->androidSourceDirectory + QLatin1String("/AndroidManifest.xml"));
-    if (options->packageName.isEmpty())
-        options->packageName = cleanPackageName(QString::fromLatin1("org.qtproject.example.%1").arg(QFileInfo(options->applicationBinary).baseName().mid(sizeof("lib") - 1)));
-
     {
-        const QJsonValue extraLibs = jsonObject.value(QStringLiteral("android-extra-libs"));
+        const QJsonValue extraLibs = jsonObject.value(QLatin1String("android-extra-libs"));
         if (!extraLibs.isUndefined())
             options->extraLibs = extraLibs.toString().split(QLatin1Char(','), QString::SkipEmptyParts);
     }
 
     {
-        const QJsonValue extraPlugins = jsonObject.value(QStringLiteral("android-extra-plugins"));
+        const QJsonValue extraPlugins = jsonObject.value(QLatin1String("android-extra-plugins"));
         if (!extraPlugins.isUndefined())
             options->extraPlugins = extraPlugins.toString().split(QLatin1Char(','));
     }
 
     {
-        const QJsonValue stdcppPath = jsonObject.value(QStringLiteral("stdcpp-path"));
+        const QJsonValue stdcppPath = jsonObject.value(QLatin1String("stdcpp-path"));
         if (stdcppPath.isUndefined()) {
             fprintf(stderr, "No stdcpp-path defined in json file.\n");
             return false;
         }
         options->stdCppPath = stdcppPath.toString();
-        auto name = QFileInfo(options->stdCppPath).baseName();
-        if (!name.startsWith(QLatin1String("lib"))) {
-            fprintf(stderr, "Invalid STD C++ library name.\n");
-            return false;
-        }
-        options->stdCppName = name.mid(3);
     }
 
     {
-        const QJsonValue qmlRootPath = jsonObject.value(QStringLiteral("qml-root-path"));
+        const QJsonValue qmlRootPath = jsonObject.value(QLatin1String("qml-root-path"));
         if (!qmlRootPath.isUndefined())
             options->rootPath = qmlRootPath.toString();
     }
 
     {
-        const QJsonValue qmlImportPaths = jsonObject.value(QStringLiteral("qml-import-paths"));
+        const QJsonValue qmlImportPaths = jsonObject.value(QLatin1String("qml-import-paths"));
         if (!qmlImportPaths.isUndefined())
             options->qmlImportPaths = qmlImportPaths.toString().split(QLatin1Char(','));
     }
+
+    {
+        const QJsonValue applicationBinary = jsonObject.value(QLatin1String("application-binary"));
+        if (applicationBinary.isUndefined()) {
+            fprintf(stderr, "No application binary defined in json file.\n");
+            return false;
+        }
+        options->applicationBinary = applicationBinary.toString();
+        if (options->build) {
+            for (auto it = options->architectures.constBegin(); it != options->architectures.constEnd(); ++it) {
+                if (!QFile::exists(QLatin1String("%1/libs/%2/lib%3_%2.so").arg(options->outputDirectory, it.key(), options->applicationBinary))) {
+                    fprintf(stderr, "Cannot find application binary %s.\n", qPrintable(options->applicationBinary));
+                    return false;
+                }
+            }
+        }
+    }
+
+    {
+        const QJsonValue deploymentDependencies = jsonObject.value(QLatin1String("deployment-dependencies"));
+        if (!deploymentDependencies.isUndefined()) {
+            QString deploymentDependenciesString = deploymentDependencies.toString();
+            const auto dependencies = deploymentDependenciesString.splitRef(QLatin1Char(','));
+            for (const QStringRef &dependency : dependencies) {
+                QString path = options->qtInstallDirectory + QLatin1Char('/') + dependency;
+                if (QFileInfo(path).isDir()) {
+                    QDirIterator iterator(path, QDirIterator::Subdirectories);
+                    while (iterator.hasNext()) {
+                        iterator.next();
+                        if (iterator.fileInfo().isFile()) {
+                            QString subPath = iterator.filePath();
+                            auto arch = fileArchitecture(*options, subPath);
+                            if (!arch.isEmpty()) {
+                                options->qtDependencies[arch].append(QtDependency(subPath.mid(options->qtInstallDirectory.length() + 1),
+                                                                                  subPath));
+                            } else if (options->verbose) {
+                                fprintf(stderr, "Skipping \"%s\", unknown architecture\n", qPrintable(subPath));
+                                fflush(stderr);
+                            }
+                        }
+                    }
+                } else {
+                    auto arch = fileArchitecture(*options, path);
+                    if (!arch.isEmpty()) {
+                        options->qtDependencies[arch].append(QtDependency(dependency.toString(), path));
+                    } else if (options->verbose) {
+                        fprintf(stderr, "Skipping \"%s\", unknown architecture\n", qPrintable(path));
+                        fflush(stderr);
+                    }
+                }
+            }
+        }
+    }
+
+    options->packageName = packageNameFromAndroidManifest(options->androidSourceDirectory + QLatin1String("/AndroidManifest.xml"));
+    if (options->packageName.isEmpty())
+        options->packageName = cleanPackageName(QLatin1String("org.qtproject.example.%1").arg(options->applicationBinary));
+
     return true;
 }
 
-bool copyFiles(const QDir &sourceDirectory, const QDir &destinationDirectory, bool verbose, bool forceOverwrite = false)
+bool copyFiles(const QDir &sourceDirectory, const QDir &destinationDirectory, const Options &options, bool forceOverwrite = false)
 {
     const QFileInfoList entries = sourceDirectory.entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
     for (const QFileInfo &entry : entries) {
@@ -940,11 +995,11 @@ bool copyFiles(const QDir &sourceDirectory, const QDir &destinationDirectory, bo
                 return false;
             }
 
-            if (!copyFiles(dir, QDir(destinationDirectory.path() + QLatin1String("/") + dir.dirName()), verbose, forceOverwrite))
+            if (!copyFiles(dir, QDir(destinationDirectory.path() + QLatin1Char('/') + dir.dirName()), options, forceOverwrite))
                 return false;
         } else {
             QString destination = destinationDirectory.absoluteFilePath(entry.fileName());
-            if (!copyFileIfNewer(entry.absoluteFilePath(), destination, verbose, forceOverwrite))
+            if (!copyFileIfNewer(entry.absoluteFilePath(), destination, options, forceOverwrite))
                 return false;
         }
     }
@@ -984,7 +1039,7 @@ bool copyAndroidTemplate(const Options &options, const QString &androidTemplate,
         return false;
     }
 
-    return copyFiles(sourceDirectory, QDir(outDir), options.verbose);
+    return copyFiles(sourceDirectory, QDir(outDir), options);
 }
 
 bool copyGradleTemplate(const Options &options)
@@ -1001,7 +1056,7 @@ bool copyGradleTemplate(const Options &options)
         return false;
     }
 
-    return copyFiles(sourceDirectory, QDir(outDir), options.verbose);
+    return copyFiles(sourceDirectory, QDir(outDir), options);
 }
 
 bool copyAndroidTemplate(const Options &options)
@@ -1009,16 +1064,13 @@ bool copyAndroidTemplate(const Options &options)
     if (options.verbose)
         fprintf(stdout, "Copying Android package template.\n");
 
-    if (options.gradle && !copyGradleTemplate(options))
+    if (!copyGradleTemplate(options))
         return false;
 
     if (!copyAndroidTemplate(options, QLatin1String("/src/android/templates")))
         return false;
 
-    if (options.gradle)
-        return true;
-
-    return copyAndroidTemplate(options, QLatin1String("/src/android/java"));
+    return true;
 }
 
 bool copyAndroidSources(const Options &options)
@@ -1035,38 +1087,42 @@ bool copyAndroidSources(const Options &options)
         return false;
     }
 
-    return copyFiles(sourceDirectory, QDir(options.outputDirectory), options.verbose, true);
+    return copyFiles(sourceDirectory, QDir(options.outputDirectory), options, true);
 }
 
-bool copyAndroidExtraLibs(const Options &options)
+bool copyAndroidExtraLibs(Options *options)
 {
-    if (options.extraLibs.isEmpty())
+    if (options->extraLibs.isEmpty())
         return true;
 
-    if (options.verbose)
-        fprintf(stdout, "Copying %d external libraries to package.\n", options.extraLibs.size());
+    if (options->verbose)
+        fprintf(stdout, "Copying %d external libraries to package.\n", options->extraLibs.size());
 
-    for (const QString &extraLib : options.extraLibs) {
+    for (const QString &extraLib : options->extraLibs) {
         QFileInfo extraLibInfo(extraLib);
         if (!extraLibInfo.exists()) {
             fprintf(stderr, "External library %s does not exist!\n", qPrintable(extraLib));
             return false;
         }
-
+        if (!checkArchitecture(*options, extraLibInfo.filePath())) {
+            if (options->verbose)
+                fprintf(stdout, "Skipping \"%s\", architecture mismatch.\n", qPrintable(extraLib));
+            continue;
+        }
         if (!extraLibInfo.fileName().startsWith(QLatin1String("lib")) || extraLibInfo.suffix() != QLatin1String("so")) {
             fprintf(stderr, "The file name of external library %s must begin with \"lib\" and end with the suffix \".so\".\n",
                     qPrintable(extraLib));
             return false;
         }
-
-        QString destinationFile(options.outputDirectory
+        QString destinationFile(options->outputDirectory
                                 + QLatin1String("/libs/")
-                                + options.architecture
+                                + options->currentArchitecture
                                 + QLatin1Char('/')
                                 + extraLibInfo.fileName());
 
-        if (!copyFileIfNewer(extraLib, destinationFile, options.verbose))
+        if (!copyFileIfNewer(extraLib, destinationFile, *options))
             return false;
+        options->archExtraLibs[options->currentArchitecture] += extraLib;
     }
 
     return true;
@@ -1087,15 +1143,15 @@ QStringList allFilesInside(const QDir& current, const QDir& rootDir)
     return result;
 }
 
-bool copyAndroidExtraResources(const Options &options)
+bool copyAndroidExtraResources(Options *options)
 {
-    if (options.extraPlugins.isEmpty())
+    if (options->extraPlugins.isEmpty())
         return true;
 
-    if (options.verbose)
-        fprintf(stdout, "Copying %d external resources to package.\n", options.extraPlugins.size());
+    if (options->verbose)
+        fprintf(stdout, "Copying %d external resources to package.\n", options->extraPlugins.size());
 
-    for (const QString &extraResource : options.extraPlugins) {
+    for (const QString &extraResource : options->extraPlugins) {
         QFileInfo extraResourceInfo(extraResource);
         if (!extraResourceInfo.exists() || !extraResourceInfo.isDir()) {
             fprintf(stderr, "External resource %s does not exist or not a correct directory!\n", qPrintable(extraResource));
@@ -1103,8 +1159,8 @@ bool copyAndroidExtraResources(const Options &options)
         }
 
         QDir resourceDir(extraResource);
-        QString assetsDir = options.outputDirectory + QStringLiteral("/assets/") + resourceDir.dirName() + QLatin1Char('/');
-        QString libsDir = options.outputDirectory + QStringLiteral("/libs/") + options.architecture + QLatin1Char('/');
+        QString assetsDir = options->outputDirectory + QLatin1String("/assets/") + resourceDir.dirName() + QLatin1Char('/');
+        QString libsDir = options->outputDirectory + QLatin1String("/libs/") + options->currentArchitecture + QLatin1Char('/');
 
         const QStringList files = allFilesInside(resourceDir, resourceDir);
         for (const QString &resourceFile : files) {
@@ -1113,10 +1169,12 @@ bool copyAndroidExtraResources(const Options &options)
             if (!resourceFile.endsWith(QLatin1String(".so"))) {
                 destinationFile = assetsDir + resourceFile;
             } else {
-                destinationFile = libsDir + QStringLiteral("/lib") + QString(resourceDir.dirName() + QLatin1Char('/') + resourceFile).replace(QLatin1Char('/'), QLatin1Char('_'));
+                if (!checkArchitecture(*options, originFile))
+                    continue;
+                destinationFile = libsDir + resourceFile;
+                options->archExtraPlugins[options->currentArchitecture] += resourceFile;
             }
-
-            if (!copyFileIfNewer(originFile, destinationFile, options.verbose))
+            if (!copyFileIfNewer(originFile, destinationFile, *options))
                 return false;
         }
     }
@@ -1168,75 +1226,88 @@ bool updateFile(const QString &fileName, const QHash<QString, QString> &replacem
 
 }
 
-bool updateLibsXml(const Options &options)
+bool updateLibsXml(Options *options)
 {
-    if (options.verbose)
+    if (options->verbose)
         fprintf(stdout, "  -- res/values/libs.xml\n");
 
-    QString fileName = options.outputDirectory + QLatin1String("/res/values/libs.xml");
+    QString fileName = options->outputDirectory + QLatin1String("/res/values/libs.xml");
     if (!QFile::exists(fileName)) {
         fprintf(stderr, "Cannot find %s in prepared packaged. This file is required.\n", qPrintable(fileName));
         return false;
     }
 
-    QString libsPath = QLatin1String("libs/") + options.architecture + QLatin1Char('/');
-
-    QString qtLibs = QLatin1String("<item>") + options.stdCppName + QLatin1String("</item>\n");
-    QString bundledInLibs;
-    QString bundledInAssets;
-    for (const Options::BundledFile &bundledFile : options.bundledFiles) {
-        if (bundledFile.second.startsWith(QLatin1String("lib/"))) {
-            QString s = bundledFile.second.mid(sizeof("lib/lib") - 1);
-            s.chop(sizeof(".so") - 1);
-            qtLibs += QString::fromLatin1("<item>%1</item>\n").arg(s);
-        } else if (bundledFile.first.startsWith(libsPath)) {
-            QString s = bundledFile.first.mid(libsPath.length());
-            bundledInLibs += QString::fromLatin1("<item>%1:%2</item>\n")
-                    .arg(s).arg(bundledFile.second);
-        } else if (bundledFile.first.startsWith(QLatin1String("assets/"))) {
-            QString s = bundledFile.first.mid(sizeof("assets/") - 1);
-            bundledInAssets += QString::fromLatin1("<item>%1:%2</item>\n")
-                    .arg(s).arg(bundledFile.second);
-        }
-    }
-
-    if (!options.extraPlugins.isEmpty()) {
-        for (const QString &extraRes : options.extraPlugins) {
-            QDir resourceDir(extraRes);
-            const QStringList files = allFilesInside(resourceDir, resourceDir);
-            for (const QString &file : files) {
-                QString destinationPath = resourceDir.dirName() + QLatin1Char('/') + file;
-                if (!file.endsWith(QLatin1String(".so"))) {
-                    bundledInAssets += QStringLiteral("<item>%1:%1</item>\n")
-                        .arg(destinationPath);
-                } else {
-                    bundledInLibs += QStringLiteral("<item>lib%1:%2</item>\n")
-                        .arg(QString(destinationPath).replace(QLatin1Char('/'), QLatin1Char('_')))
-                        .arg(destinationPath);
-                }
+    QString qtLibs;
+    QString allLocalLibs;
+    QString extraLibs;
+
+    for (auto it = options->architectures.constBegin(); it != options->architectures.constEnd(); ++it) {
+        QString libsPath = QLatin1String("libs/") + it.key() + QLatin1Char('/');
+
+        qtLibs += QLatin1String("        <item>%1;%2</item>\n").arg(it.key(), options->stdCppName);
+        for (const Options::BundledFile &bundledFile : options->bundledFiles[it.key()]) {
+            if (bundledFile.second.startsWith(QLatin1String("lib/"))) {
+                QString s = bundledFile.second.mid(sizeof("lib/lib") - 1);
+                s.chop(sizeof(".so") - 1);
+                qtLibs += QLatin1String("        <item>%1;%2</item>\n").arg(it.key(), s);
             }
         }
-    }
 
-    QHash<QString, QString> replacements;
-    replacements[QLatin1String("<!-- %%INSERT_QT_LIBS%% -->")] = qtLibs;
+        if (!options->archExtraLibs[it.key()].isEmpty()) {
+            for (const QString &extraLib : options->archExtraLibs[it.key()]) {
+                QFileInfo extraLibInfo(extraLib);
+                QString name = extraLibInfo.fileName().mid(sizeof("lib") - 1);
+                name.chop(sizeof(".so") - 1);
+                extraLibs += QLatin1String("    <item>%1;%2").arg(it.key(), name);
+            }
+        }
 
-    if (options.deploymentMechanism == Options::Bundled) {
-        replacements[QLatin1String("<!-- %%INSERT_BUNDLED_IN_LIB%% -->")] = bundledInLibs;
-        replacements[QLatin1String("<!-- %%INSERT_BUNDLED_IN_ASSETS%% -->")] = bundledInAssets;
-    }
+        QStringList localLibs;
+        localLibs = options->localLibs[it.key()];
+        // If .pro file overrides dependency detection, we need to see which platform plugin they picked
+        if (localLibs.isEmpty()) {
+            QString plugin;
+            for (const QtDependency &qtDependency : options->qtDependencies[it.key()]) {
+                if (qtDependency.relativePath.endsWith(QLatin1String("libqtforandroid.so"))
+                        || qtDependency.relativePath.endsWith(QLatin1String("libqtforandroidGL.so"))) {
+                    if (!plugin.isEmpty() && plugin != qtDependency.relativePath) {
+                        fprintf(stderr, "Both platform plugins libqtforandroid.so and libqtforandroidGL.so included in package. Please include only one.\n");
+                        return false;
+                    }
 
-    QString extraLibs;
-    if (!options.extraLibs.isEmpty()) {
-        for (const QString extraLib : options.extraLibs) {
-            QFileInfo extraLibInfo(extraLib);
-            QString name = extraLibInfo.fileName().mid(sizeof("lib") - 1);
-            name.chop(sizeof(".so") - 1);
+                    plugin = qtDependency.relativePath;
+                }
+                if (qtDependency.relativePath.contains(QLatin1String("libQt5OpenGL"))
+                        || qtDependency.relativePath.contains(QLatin1String("libQt5Quick"))) {
+                    options->usesOpenGL |= true;
+                    break;
+                }
+            }
 
-            extraLibs += QLatin1String("<item>") + name + QLatin1String("</item>\n");
+            if (plugin.isEmpty()) {
+                fflush(stdout);
+                fprintf(stderr, "No platform plugin, neither libqtforandroid.so or libqtforandroidGL.so, included in package. Please include one.\n");
+                fflush(stderr);
+                return false;
+            }
+
+            localLibs.append(plugin);
+            if (options->verbose)
+                fprintf(stdout, "  -- Using platform plugin %s\n", qPrintable(plugin));
         }
+
+        // remove all paths
+        for (auto &lib : localLibs) {
+            if (lib.endsWith(QLatin1String(".so")))
+                lib = lib.mid(lib.lastIndexOf(QLatin1Char('/')) + 1);
+        }
+        allLocalLibs += QLatin1String("        <item>%1;%2</item>\n").arg(it.key(), localLibs.join(QLatin1Char(':')));
     }
-    replacements[QLatin1String("<!-- %%INSERT_EXTRA_LIBS%% -->")] = extraLibs;
+
+    QHash<QString, QString> replacements;
+    replacements[QStringLiteral("<!-- %%INSERT_QT_LIBS%% -->")] += qtLibs.trimmed();
+    replacements[QStringLiteral("<!-- %%INSERT_LOCAL_LIBS%% -->")] = allLocalLibs.trimmed();
+    replacements[QStringLiteral("<!-- %%INSERT_EXTRA_LIBS%% -->")] = extraLibs.trimmed();
 
     if (!updateFile(fileName, replacements))
         return false;
@@ -1250,7 +1321,7 @@ bool updateStringsXml(const Options &options)
         fprintf(stdout, "  -- res/values/strings.xml\n");
 
     QHash<QString, QString> replacements;
-    replacements[QStringLiteral("<!-- %%INSERT_APP_NAME%% -->")] = QFileInfo(options.applicationBinary).baseName().mid(sizeof("lib") - 1);
+    replacements[QStringLiteral("<!-- %%INSERT_APP_NAME%% -->")] = options.applicationBinary;
 
     QString fileName = options.outputDirectory + QLatin1String("/res/values/strings.xml");
     if (!QFile::exists(fileName)) {
@@ -1262,7 +1333,7 @@ bool updateStringsXml(const Options &options)
             return false;
         }
         file.write(QByteArray("<?xml version='1.0' encoding='utf-8'?><resources><string name=\"app_name\" translatable=\"false\">")
-                   .append(QFileInfo(options.applicationBinary).baseName().mid(sizeof("lib") - 1).toLatin1())
+                   .append(options.applicationBinary.toLatin1())
                    .append("</string></resources>\n"));
         return true;
     }
@@ -1270,36 +1341,6 @@ bool updateStringsXml(const Options &options)
     if (!updateFile(fileName, replacements))
         return false;
 
-    if (options.gradle)
-        return true;
-
-    // ant can't (easily) build multiple res folders,
-    // so we need to replace the "<!-- %%INSERT_STRINGS -->" placeholder
-    // from the main res folder
-    QFile stringsXml(fileName);
-    if (!stringsXml.open(QIODevice::ReadOnly)) {
-        fprintf(stderr, "Cannot open %s for reading.\n", qPrintable(fileName));
-        return false;
-    }
-
-    QXmlStreamReader reader(&stringsXml);
-    while (!reader.atEnd()) {
-        reader.readNext();
-        if (reader.isStartElement() &&
-            reader.name() == QLatin1String("string") &&
-            reader.attributes().hasAttribute(QLatin1String("name")) &&
-            reader.attributes().value(QLatin1String("name")) == QLatin1String("app_name")) {
-            return true;
-        }
-    }
-
-    replacements.clear();
-    replacements[QStringLiteral("<!-- %%INSERT_STRINGS -->")] = QString::fromLatin1("<string name=\"app_name\">%1</string>\n")
-                                                        .arg(QFileInfo(options.applicationBinary).baseName().mid(sizeof("lib") - 1));
-
-    if (!updateFile(fileName, replacements))
-        return false;
-
     return true;
 }
 
@@ -1308,71 +1349,34 @@ bool updateAndroidManifest(Options &options)
     if (options.verbose)
         fprintf(stdout, "  -- AndroidManifest.xml \n");
 
-    QStringList localLibs = options.localLibs;
-
-    // If .pro file overrides dependency detection, we need to see which platform plugin they picked
-    if (localLibs.isEmpty()) {
-        QString plugin;
-        for (const QtDependency &qtDependency : qAsConst(options.qtDependencies)) {
-            if (qtDependency.relativePath.endsWith(QLatin1String("libqtforandroid.so"))
-                    || qtDependency.relativePath.endsWith(QLatin1String("libqtforandroidGL.so"))) {
-                if (!plugin.isEmpty() && plugin != qtDependency.relativePath) {
-                    fprintf(stderr, "Both platform plugins libqtforandroid.so and libqtforandroidGL.so included in package. Please include only one.\n");
-                    return false;
-                }
-
-                plugin = qtDependency.relativePath;
-            }
-        }
-
-        if (plugin.isEmpty()) {
-            fprintf(stderr, "No platform plugin, neither libqtforandroid.so or libqtforandroidGL.so, included in package. Please include one.\n");
-            return false;
-        }
-
-        localLibs.append(plugin);
-        if (options.verbose)
-            fprintf(stdout, "  -- Using platform plugin %s\n", qPrintable(plugin));
-    }
-
-    bool usesGL = false;
-    for (const QtDependency &qtDependency : qAsConst(options.qtDependencies)) {
-        if (qtDependency.relativePath.endsWith(QLatin1String("libQt5OpenGL.so"))
-                || qtDependency.relativePath.endsWith(QLatin1String("libQt5Quick.so"))) {
-            usesGL = true;
-            break;
-        }
-    }
-
     options.localJars.removeDuplicates();
     options.initClasses.removeDuplicates();
 
     QHash<QString, QString> replacements;
-    replacements[QLatin1String("-- %%INSERT_APP_NAME%% --")] = QFileInfo(options.applicationBinary).baseName().mid(sizeof("lib") - 1);
-    replacements[QLatin1String("-- %%INSERT_APP_LIB_NAME%% --")] = QFileInfo(options.applicationBinary).baseName().mid(sizeof("lib") - 1);
-    replacements[QLatin1String("-- %%INSERT_LOCAL_LIBS%% --")] = localLibs.join(QLatin1Char(':'));
-    replacements[QLatin1String("-- %%INSERT_LOCAL_JARS%% --")] = options.localJars.join(QLatin1Char(':'));
-    replacements[QLatin1String("-- %%INSERT_INIT_CLASSES%% --")] = options.initClasses.join(QLatin1Char(':'));
-    replacements[QLatin1String("-- %%INSERT_VERSION_NAME%% --")] = options.versionName;
-    replacements[QLatin1String("-- %%INSERT_VERSION_CODE%% --")] = options.versionCode;
-    replacements[QLatin1String("package=\"org.qtproject.example\"")] = QString::fromLatin1("package=\"%1\"").arg(options.packageName);
-    replacements[QLatin1String("-- %%BUNDLE_LOCAL_QT_LIBS%% --")]
-            = (options.deploymentMechanism == Options::Bundled) ? QString::fromLatin1("1") : QString::fromLatin1("0");
-    replacements[QLatin1String("-- %%USE_LOCAL_QT_LIBS%% --")]
-            = (options.deploymentMechanism != Options::Ministro) ? QString::fromLatin1("1") : QString::fromLatin1("0");
+    replacements[QStringLiteral("-- %%INSERT_APP_NAME%% --")] = options.applicationBinary;
+    replacements[QStringLiteral("-- %%INSERT_APP_LIB_NAME%% --")] = options.applicationBinary;
+    replacements[QStringLiteral("-- %%INSERT_LOCAL_JARS%% --")] = options.localJars.join(QLatin1Char(':'));
+    replacements[QStringLiteral("-- %%INSERT_INIT_CLASSES%% --")] = options.initClasses.join(QLatin1Char(':'));
+    replacements[QStringLiteral("-- %%INSERT_VERSION_NAME%% --")] = options.versionName;
+    replacements[QStringLiteral("-- %%INSERT_VERSION_CODE%% --")] = options.versionCode;
+    replacements[QStringLiteral("package=\"org.qtproject.example\"")] = QLatin1String("package=\"%1\"").arg(options.packageName);
+    replacements[QStringLiteral("-- %%BUNDLE_LOCAL_QT_LIBS%% --")]
+            = (options.deploymentMechanism == Options::Bundled) ? QLatin1String("1") : QLatin1String("0");
+    replacements[QStringLiteral("-- %%USE_LOCAL_QT_LIBS%% --")]
+            = (options.deploymentMechanism != Options::Ministro) ? QLatin1String("1") : QLatin1String("0");
 
     QString permissions;
     for (const QString &permission : qAsConst(options.permissions))
-        permissions += QString::fromLatin1("    <uses-permission android:name=\"%1\" />\n").arg(permission);
-    replacements[QLatin1String("<!-- %%INSERT_PERMISSIONS -->")] = permissions;
+        permissions += QLatin1String("    <uses-permission android:name=\"%1\" />\n").arg(permission);
+    replacements[QStringLiteral("<!-- %%INSERT_PERMISSIONS -->")] = permissions.trimmed();
 
     QString features;
     for (const QString &feature : qAsConst(options.features))
-        features += QStringLiteral("    <uses-feature android:name=\"%1\" android:required=\"false\" />\n").arg(feature);
-    if (usesGL)
-        features += QStringLiteral("    <uses-feature android:glEsVersion=\"0x00020000\" android:required=\"true\" />");
+        features += QLatin1String("    <uses-feature android:name=\"%1\" android:required=\"false\" />\n").arg(feature);
+    if (options.usesOpenGL)
+        features += QLatin1String("    <uses-feature android:glEsVersion=\"0x00020000\" android:required=\"true\" />");
 
-    replacements[QLatin1String("<!-- %%INSERT_FEATURES -->")] = features;
+    replacements[QStringLiteral("<!-- %%INSERT_FEATURES -->")] = features.trimmed();
 
     QString androidManifestPath = options.outputDirectory + QLatin1String("/AndroidManifest.xml");
     if (!updateFile(androidManifestPath, replacements))
@@ -1433,7 +1437,7 @@ bool updateAndroidFiles(Options &options)
     if (options.verbose)
         fprintf(stdout, "Updating Android package files with project settings.\n");
 
-    if (!updateLibsXml(options))
+    if (!updateLibsXml(&options))
         return false;
 
     if (!updateAndroidManifest(options))
@@ -1490,7 +1494,7 @@ bool readAndroidDependencyXml(Options *options,
                               QSet<QString> *usedDependencies,
                               QSet<QString> *remainingDependencies)
 {
-    QString androidDependencyName = absoluteFilePath(options, QString::fromLatin1("/lib/%1-android-dependencies.xml").arg(moduleName));
+    QString androidDependencyName = absoluteFilePath(options, QLatin1String("/lib/%1-android-dependencies.xml").arg(moduleName));
 
     QFile androidDependencyFile(androidDependencyName);
     if (androidDependencyFile.exists()) {
@@ -1529,7 +1533,7 @@ bool readAndroidDependencyXml(Options *options,
                         if (options->verbose)
                             fprintf(stdout, "Appending dependency from xml: %s\n", qPrintable(fileName.relativePath));
 
-                        options->qtDependencies.append(fileName);
+                        options->qtDependencies[options->currentArchitecture].append(fileName);
                     }
                 } else if (reader.name() == QLatin1String("jar")) {
                     int bundling = reader.attributes().value(QLatin1String("bundling")).toInt();
@@ -1537,7 +1541,7 @@ bool readAndroidDependencyXml(Options *options,
                     if (bundling == (options->deploymentMechanism == Options::Bundled)) {
                         QtDependency dependency(fileName, absoluteFilePath(options, fileName));
                         if (!usedDependencies->contains(dependency.absolutePath)) {
-                            options->qtDependencies.append(dependency);
+                            options->qtDependencies[options->currentArchitecture].append(dependency);
                             usedDependencies->insert(dependency.absolutePath);
                         }
                     }
@@ -1553,15 +1557,15 @@ bool readAndroidDependencyXml(Options *options,
                     if (reader.attributes().hasAttribute(QLatin1String("replaces"))) {
                         QString replaces = reader.attributes().value(QLatin1String("replaces")).toString();
                         for (int i=0; i<options->localLibs.size(); ++i) {
-                            if (options->localLibs.at(i) == replaces) {
-                                options->localLibs[i] = fileName;
+                            if (options->localLibs[options->currentArchitecture].at(i) == replaces) {
+                                options->localLibs[options->currentArchitecture][i] = fileName;
                                 break;
                             }
                         }
                     } else if (!fileName.isEmpty()) {
-                        options->localLibs.append(fileName);
+                        options->localLibs[options->currentArchitecture].append(fileName);
                     }
-                    if (fileName.endsWith(QLatin1String(".so"))) {
+                    if (fileName.endsWith(QLatin1String(".so")) && checkArchitecture(*options, fileName)) {
                         remainingDependencies->insert(fileName);
                     }
                 } else if (reader.name() == QLatin1String("permission")) {
@@ -1581,24 +1585,17 @@ bool readAndroidDependencyXml(Options *options,
     } else if (options->verbose) {
         fprintf(stdout, "No android dependencies for %s\n", qPrintable(moduleName));
     }
+    options->permissions.removeDuplicates();
+    options->features.removeDuplicates();
 
     return true;
 }
 
 QStringList getQtLibsFromElf(const Options &options, const QString &fileName)
 {
-    QString readElf = options.ndkPath
-            + QLatin1String("/toolchains/")
-            + options.toolchainPrefix;
-
-    if (!options.useLLVM)
-        readElf += QLatin1Char('-') + options.toolchainVersion;
-
-    readElf += QLatin1String("/prebuilt/")
-            + options.ndkHost
-            + QLatin1String("/bin/")
-            + options.toolPrefix +
-            (options.useLLVM ? QLatin1String("-readobj") : QLatin1String("-readelf"));
+    QString readElf = QLatin1String("%1/toolchains/%2/prebuilt/%3/bin/llvm-readobj").arg(options.ndkPath,
+                                                                                          options.toolchainPrefix,
+                                                                                          options.ndkHost);
 #if defined(Q_OS_WIN32)
     readElf += QLatin1String(".exe");
 #endif
@@ -1608,14 +1605,11 @@ QStringList getQtLibsFromElf(const Options &options, const QString &fileName)
         return QStringList();
     }
 
-    if (options.useLLVM)
-        readElf = QString::fromLatin1("%1 -needed-libs %2").arg(shellQuote(readElf), shellQuote(fileName));
-    else
-        readElf = QString::fromLatin1("%1 -d -W %2").arg(shellQuote(readElf), shellQuote(fileName));
+    readElf = QLatin1String("%1 -needed-libs %2").arg(shellQuote(readElf), shellQuote(fileName));
 
     FILE *readElfCommand = openProcess(readElf);
     if (!readElfCommand) {
-        fprintf(stderr, "Cannot execute command %s", qPrintable(readElf));
+        fprintf(stderr, "Cannot execute command %s\n", qPrintable(readElf));
         return QStringList();
     }
 
@@ -1623,22 +1617,25 @@ QStringList getQtLibsFromElf(const Options &options, const QString &fileName)
 
     bool readLibs = false;
     char buffer[512];
-    while (fgets(buffer, sizeof(buffer), readElfCommand) != 0) {
+    while (fgets(buffer, sizeof(buffer), readElfCommand) != nullptr) {
         QByteArray line = QByteArray::fromRawData(buffer, qstrlen(buffer));
         QString library;
-        if (options.useLLVM) {
-            line = line.trimmed();
-            if (!readLibs) {
-                readLibs = line.startsWith("NeededLibraries");
-                continue;
+        line = line.trimmed();
+        if (!readLibs) {
+            if (line.startsWith("Arch: ")) {
+                auto it = elfArchitecures.find(line.mid(6));
+                if (it == elfArchitecures.constEnd() || *it != options.currentArchitecture.toLatin1()) {
+                    if (options.verbose)
+                        fprintf(stdout, "Skipping \"%s\", architecture mismatch\n", qPrintable(fileName));
+                    return {};
+                }
             }
-            if (!line.startsWith("lib"))
-                continue;
-            library = QString::fromLatin1(line);
-        } else if (line.contains("(NEEDED)") && line.contains("Shared library:")) {
-            const int pos = line.lastIndexOf('[') + 1;
-            library = QString::fromLatin1(line.mid(pos, line.length() - pos - 2));
+            readLibs = line.startsWith("NeededLibraries");
+            continue;
         }
+        if (!line.startsWith("lib"))
+            continue;
+        library = QString::fromLatin1(line);
         QString libraryName = QLatin1String("lib/") + library;
         if (QFile::exists(absoluteFilePath(&options, libraryName)))
             ret += libraryName;
@@ -1677,7 +1674,7 @@ bool readDependenciesFromElf(Options *options,
             return false;
         }
 
-        options->qtDependencies.append(QtDependency(dependency, absoluteDependencyPath));
+        options->qtDependencies[options->currentArchitecture].append(QtDependency(dependency, absoluteDependencyPath));
         if (options->verbose)
             fprintf(stdout, "Appending dependency: %s\n", qPrintable(dependency));
         dependenciesToCheck.append(dependency);
@@ -1726,9 +1723,8 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
     for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths))
         importPaths += shellQuote(qmlImportPath);
 
-    qmlImportScanner += QString::fromLatin1(" -rootPath %1 -importPath %2")
-            .arg(shellQuote(rootPath))
-            .arg(importPaths.join(QLatin1Char(' ')));
+    qmlImportScanner += QLatin1String(" -rootPath %1 -importPath %2")
+            .arg(shellQuote(rootPath), importPaths.join(QLatin1Char(' ')));
 
     if (options->verbose) {
         fprintf(stdout, "Running qmlimportscanner with the following command: %s\n",
@@ -1822,9 +1818,9 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
 
                 // Put all imports in default import path in assets
                 fileName.relativePath.prepend(QLatin1String("qml/"));
-                options->qtDependencies.append(fileName);
+                options->qtDependencies[options->currentArchitecture].append(fileName);
 
-                if (fileName.absolutePath.endsWith(QLatin1String(".so"))) {
+                if (fileName.absolutePath.endsWith(QLatin1String(".so")) && checkArchitecture(*options, fileName.absolutePath)) {
                     QSet<QString> remainingDependencies;
                     if (!readDependenciesFromElf(options, fileName.absolutePath, usedDependencies, &remainingDependencies))
                         return false;
@@ -1837,13 +1833,77 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
     return true;
 }
 
+bool runCommand(const Options &options, const QString &command)
+{
+    if (options.verbose)
+        fprintf(stdout, "Running command '%s'\n", qPrintable(command));
+
+    FILE *runCommand = openProcess(command);
+    if (runCommand == nullptr) {
+        fprintf(stderr, "Cannot run command '%s'\n", qPrintable(command));
+        return false;
+    }
+    char buffer[4096];
+    while (fgets(buffer, sizeof(buffer), runCommand) != nullptr) {
+        if (options.verbose)
+            fprintf(stdout, "%s", buffer);
+    }
+    pclose(runCommand);
+    fflush(stdout);
+    fflush(stderr);
+    return true;
+}
+
+bool createRcc(const Options &options)
+{
+    auto assetsDir = QLatin1String("%1/assets").arg(options.outputDirectory);
+    if (!QDir{QLatin1String("%1/android_rcc_bundle").arg(assetsDir)}.exists()) {
+        fprintf(stdout, "Skipping createRCC\n");
+        return true;
+    }
+
+    if (options.verbose)
+        fprintf(stdout, "Create rcc bundle.\n");
+
+    QString rcc = options.qtInstallDirectory + QLatin1String("/bin/rcc");
+#if defined(Q_OS_WIN32)
+    rcc += QLatin1String(".exe");
+#endif
+
+    if (!QFile::exists(rcc)) {
+        fprintf(stderr, "rcc not found: %s\n", qPrintable(rcc));
+        return false;
+    }
+    auto currentDir = QDir::currentPath();
+    if (!QDir::setCurrent(QLatin1String("%1/android_rcc_bundle").arg(assetsDir))) {
+        fprintf(stderr, "Cannot set current dir to: %s\n", qPrintable(QLatin1String("%1/android_rcc_bundle").arg(assetsDir)));
+        return false;
+    }
+
+    bool res = runCommand(options, QLatin1String("%1 --project -o %2").arg(rcc, shellQuote(QLatin1String("%1/android_rcc_bundle.qrc").arg(assetsDir))));
+    if (!res)
+        return false;
+
+    QFile::rename(QLatin1String("%1/android_rcc_bundle.qrc").arg(assetsDir), QLatin1String("%1/android_rcc_bundle/android_rcc_bundle.qrc").arg(assetsDir));
+
+    res = runCommand(options, QLatin1String("%1 %2 --binary -o %3 android_rcc_bundle.qrc").arg(rcc, shellQuote(QLatin1String("--root=/android_rcc_bundle/")),
+                                                                                               shellQuote(QLatin1String("%1/android_rcc_bundle.rcc").arg(assetsDir))));
+    if (!QDir::setCurrent(currentDir)) {
+        fprintf(stderr, "Cannot set current dir to: %s\n", qPrintable(currentDir));
+        return false;
+    }
+    QFile::remove(QLatin1String("%1/android_rcc_bundle.qrc").arg(assetsDir));
+    QDir{QLatin1String("%1/android_rcc_bundle").arg(assetsDir)}.removeRecursively();
+    return res;
+}
+
 bool readDependencies(Options *options)
 {
     if (options->verbose)
         fprintf(stdout, "Detecting dependencies of application.\n");
 
     // Override set in .pro file
-    if (!options->qtDependencies.isEmpty()) {
+    if (!options->qtDependencies[options->currentArchitecture].isEmpty()) {
         if (options->verbose)
             fprintf(stdout, "\tDependencies explicitly overridden in .pro file. No detection needed.\n");
         return true;
@@ -1853,11 +1913,7 @@ bool readDependencies(Options *options)
     QSet<QString> remainingDependencies;
 
     // Add dependencies of application binary first
-    if (!readDependenciesFromElf(options, options->applicationBinary, &usedDependencies, &remainingDependencies))
-        return false;
-
-    // Jam in the dependencies of the platform plugin, since the application will crash without it
-    if (!readDependenciesFromElf(options, options->qtInstallDirectory + QLatin1String("/plugins/platforms/android/libqtforandroid.so"), &usedDependencies, &remainingDependencies))
+    if (!readDependenciesFromElf(options, QLatin1String("%1/libs/%2/lib%3_%2.so").arg(options->outputDirectory, options->currentArchitecture, options->applicationBinary), &usedDependencies, &remainingDependencies))
         return false;
 
     while (!remainingDependencies.isEmpty()) {
@@ -1877,14 +1933,14 @@ bool readDependencies(Options *options)
         }
     }
 
-    QStringList::iterator it = options->localLibs.begin();
-    while (it != options->localLibs.end()) {
+    QStringList::iterator it = options->localLibs[options->currentArchitecture].begin();
+    while (it != options->localLibs[options->currentArchitecture].end()) {
         QStringList unmetDependencies;
         if (!goodToCopy(options, absoluteFilePath(options, *it), &unmetDependencies)) {
             fprintf(stdout, "Skipping %s due to unmet dependencies: %s\n",
                     qPrintable(*it),
                     qPrintable(unmetDependencies.join(QLatin1Char(','))));
-            it = options->localLibs.erase(it);
+            it = options->localLibs[options->currentArchitecture].erase(it);
         } else {
             ++it;
         }
@@ -1896,94 +1952,33 @@ bool readDependencies(Options *options)
     return true;
 }
 
-bool stripFile(const Options &options, const QString &fileName)
+bool containsApplicationBinary(Options *options)
 {
-    QString strip = options.ndkPath
-            + QLatin1String("/toolchains/")
-            + options.toolchainPrefix;
-
-    if (!options.useLLVM)
-        strip += QLatin1Char('-') + options.toolchainVersion;
-
-    strip += QLatin1String("/prebuilt/")
-            + options.ndkHost
-            + QLatin1String("/bin/")
-            + options.toolPrefix
-            + QLatin1String("-strip");
-#if defined(Q_OS_WIN32)
-    strip += QLatin1String(".exe");
-#endif
-
-    if (!QFile::exists(strip)) {
-        fprintf(stderr, "Command does not exist: %s\n", qPrintable(strip));
-        return false;
-    }
-
-    if (options.useLLVM)
-        strip = QString::fromLatin1("%1 -strip-all %2").arg(shellQuote(strip), shellQuote(fileName));
-    else
-        strip = QString::fromLatin1("%1 %2").arg(shellQuote(strip), shellQuote(fileName));
-
-    FILE *stripCommand = openProcess(strip);
-    if (stripCommand == 0) {
-        fprintf(stderr, "Cannot execute command %s", qPrintable(strip));
-        return false;
-    }
-
-    pclose(stripCommand);
-
-    return true;
-}
-
-bool stripLibraries(const Options &options)
-{
-    if (!options.stripLibraries)
+    if (!options->build)
         return true;
-    if (options.verbose)
-        fprintf(stdout, "Stripping libraries to minimize size.\n");
 
-
-    QString libraryPath = options.outputDirectory
-            + QLatin1String("/libs/")
-            + options.architecture;
-    const QStringList libraries = QDir(libraryPath).entryList(QDir::Files);
-    for (const QString &library : libraries) {
-        if (library.endsWith(QLatin1String(".so"))) {
-            if (!stripFile(options, libraryPath + QLatin1Char('/') + library))
-                return false;
-        }
-    }
-
-
-    return true;
-}
-
-bool containsApplicationBinary(const Options &options)
-{
-    if (options.verbose)
+    if (options->verbose)
         fprintf(stdout, "Checking if application binary is in package.\n");
 
-    QFileInfo applicationBinary(options.applicationBinary);
-    QString destinationFileName = options.outputDirectory
-            + QLatin1String("/libs/")
-            + options.architecture
-            + QLatin1Char('/')
-            + applicationBinary.fileName();
+    QFileInfo applicationBinary(options->applicationBinary);
+    QString applicationFileName = QLatin1String("lib%1_%2.so").arg(options->applicationBinary,
+                                                                    options->currentArchitecture);
 
-    if (!QFile::exists(destinationFileName)) {
+    QString applicationPath = QLatin1String("%1/libs/%2/%3").arg(options->outputDirectory,
+                                                                               options->currentArchitecture,
+                                                                               applicationFileName);
+    if (!QFile::exists(applicationPath)) {
 #if defined(Q_OS_WIN32)
         QLatin1String makeTool("mingw32-make"); // Only Mingw host builds supported on Windows currently
 #else
         QLatin1String makeTool("make");
 #endif
-
         fprintf(stderr, "Application binary is not in output directory: %s. Please run '%s install INSTALL_ROOT=%s' first.\n",
-                qPrintable(destinationFileName),
+                qPrintable(applicationFileName),
                 qPrintable(makeTool),
-                qPrintable(options.outputDirectory));
+                qPrintable(options->outputDirectory));
         return false;
     }
-
     return true;
 }
 
@@ -2002,7 +1997,7 @@ FILE *runAdb(const Options &options, const QString &arguments)
     if (!options.installLocation.isEmpty())
         installOption = QLatin1String(" -s ") + shellQuote(options.installLocation);
 
-    adb = QString::fromLatin1("%1%2 %3").arg(shellQuote(adb)).arg(installOption).arg(arguments);
+    adb = QLatin1String("%1%2 %3").arg(shellQuote(adb), installOption, arguments);
 
     if (options.verbose)
         fprintf(stdout, "Running command \"%s\"\n", adb.toLocal8Bit().constData());
@@ -2021,10 +2016,13 @@ bool goodToCopy(const Options *options, const QString &file, QStringList *unmetD
     if (!file.endsWith(QLatin1String(".so")))
         return true;
 
+    if (!checkArchitecture(*options, file))
+        return false;
+
     bool ret = true;
     const auto libs = getQtLibsFromElf(*options, file);
     for (const QString &lib : libs) {
-        if (!options->qtDependencies.contains(QtDependency(lib, absoluteFilePath(options, lib)))) {
+        if (!options->qtDependencies[options->currentArchitecture].contains(QtDependency(lib, absoluteFilePath(options, lib)))) {
             ret = false;
             unmetDependencies->append(lib);
         }
@@ -2049,12 +2047,12 @@ bool copyQtFiles(Options *options)
     if (!options->build)
         return true;
 
+
     QString libsDirectory = QLatin1String("libs/");
 
     // Copy other Qt dependencies
-    QString libDestinationDirectory = libsDirectory + options->architecture + QLatin1Char('/');
-    QString assetsDestinationDirectory = QLatin1String("assets/--Added-by-androiddeployqt--/");
-    for (const QtDependency &qtDependency : qAsConst(options->qtDependencies)) {
+    auto assetsDestinationDirectory = QLatin1String("assets/android_rcc_bundle/");
+    for (const QtDependency &qtDependency : qAsConst(options->qtDependencies[options->currentArchitecture])) {
         QString sourceFileName = qtDependency.absolutePath;
         QString destinationFileName;
 
@@ -2063,12 +2061,9 @@ bool copyQtFiles(Options *options)
             if (qtDependency.relativePath.startsWith(QLatin1String("lib/"))) {
                 garbledFileName = qtDependency.relativePath.mid(sizeof("lib/") - 1);
             } else {
-                garbledFileName = QLatin1String("lib")
-                                + QString(qtDependency.relativePath).replace(QLatin1Char('/'), QLatin1Char('_'));
-
+                garbledFileName = qtDependency.relativePath.mid(qtDependency.relativePath.lastIndexOf(QLatin1Char('/')) + 1);
             }
-            destinationFileName = libDestinationDirectory + garbledFileName;
-
+            destinationFileName = libsDirectory + options->currentArchitecture + QLatin1Char('/') + garbledFileName;
         } else if (qtDependency.relativePath.startsWith(QLatin1String("jar/"))) {
             destinationFileName = libsDirectory + qtDependency.relativePath.mid(sizeof("jar/") - 1);
         } else {
@@ -2082,20 +2077,34 @@ bool copyQtFiles(Options *options)
 
         QStringList unmetDependencies;
         if (!goodToCopy(options, sourceFileName, &unmetDependencies)) {
-            fprintf(stdout, "  -- Skipping %s. It has unmet dependencies: %s.\n",
-                    qPrintable(sourceFileName),
-                    qPrintable(unmetDependencies.join(QLatin1Char(','))));
+            if (unmetDependencies.isEmpty()) {
+                if (options->verbose) {
+                    fprintf(stdout, "  -- Skipping %s, architecture mismatch.\n",
+                            qPrintable(sourceFileName));
+                }
+            } else {
+                if (unmetDependencies.isEmpty()) {
+                    if (options->verbose) {
+                        fprintf(stdout, "  -- Skipping %s, architecture mismatch.\n",
+                                qPrintable(sourceFileName));
+                    }
+                } else {
+                    fprintf(stdout, "  -- Skipping %s. It has unmet dependencies: %s.\n",
+                            qPrintable(sourceFileName),
+                            qPrintable(unmetDependencies.join(QLatin1Char(','))));
+                }
+            }
             continue;
         }
 
         if (options->deploymentMechanism == Options::Bundled
                 && !copyFileIfNewer(sourceFileName,
                                     options->outputDirectory + QLatin1Char('/') + destinationFileName,
-                                    options->verbose)) {
+                                    *options)) {
             return false;
         }
 
-        options->bundledFiles += qMakePair(destinationFileName, qtDependency.relativePath);
+        options->bundledFiles[options->currentArchitecture] += qMakePair(destinationFileName, qtDependency.relativePath);
     }
 
     return true;
@@ -2144,7 +2153,7 @@ bool createAndroidProject(const Options &options)
         return false;
     }
 
-    QString androidTool = QString::fromLatin1("%1 update project --path %2 --target %3 --name QtApp")
+    QString androidTool = QLatin1String("%1 update project --path %2 --target %3 --name QtApp")
                             .arg(shellQuote(androidToolExecutable))
                             .arg(shellQuote(options.outputDirectory))
                             .arg(shellQuote(options.androidPlatform));
@@ -2166,7 +2175,7 @@ bool createAndroidProject(const Options &options)
         if (options.verbose)
             fprintf(stdout, "Updating subproject %s\n", qPrintable(libraryProject));
 
-        androidTool = QString::fromLatin1("%1 update lib-project --path %2 --target %3")
+        androidTool = QLatin1String("%1 update lib-project --path %2 --target %3")
                 .arg(shellQuote(androidToolExecutable))
                 .arg(shellQuote(libraryProject))
                 .arg(shellQuote(options.androidPlatform));
@@ -2205,64 +2214,6 @@ QString findInPath(const QString &fileName)
     return QString();
 }
 
-bool buildAntProject(const Options &options)
-{
-    if (options.verbose)
-        fprintf(stdout, "Building Android package using ant.\n");
-
-    QString antTool = options.antTool;
-    if (antTool.isEmpty()) {
-#if defined(Q_OS_WIN32)
-        antTool = findInPath(QLatin1String("ant.bat"));
-#else
-        antTool = findInPath(QLatin1String("ant"));
-#endif
-    }
-
-    if (antTool.isEmpty()) {
-        fprintf(stderr, "Cannot find ant in PATH. Please use --ant option to pass in the correct path.\n");
-        return false;
-    }
-
-    if (options.verbose)
-        fprintf(stdout, "Using ant: %s\n", qPrintable(antTool));
-
-    QString oldPath = QDir::currentPath();
-    if (!QDir::setCurrent(options.outputDirectory)) {
-        fprintf(stderr, "Cannot current path to %s\n", qPrintable(options.outputDirectory));
-        return false;
-    }
-
-    QString ant = QString::fromLatin1("%1 %2").arg(shellQuote(antTool)).arg(options.releasePackage ? QLatin1String(" release") : QLatin1String(" debug"));
-
-    FILE *antCommand = openProcess(ant);
-    if (antCommand == 0) {
-        fprintf(stderr, "Cannot run ant command: %s\n.", qPrintable(ant));
-        return false;
-    }
-
-    char buffer[512];
-    while (fgets(buffer, sizeof(buffer), antCommand) != 0) {
-        fprintf(stdout, "%s", buffer);
-        fflush(stdout);
-    }
-
-    int errorCode = pclose(antCommand);
-    if (errorCode != 0) {
-        fprintf(stderr, "Building the android package failed!\n");
-        if (!options.verbose)
-            fprintf(stderr, "  -- For more information, run this command with --verbose.\n");
-        return false;
-    }
-
-    if (!QDir::setCurrent(oldPath)) {
-        fprintf(stderr, "Cannot change back to old path: %s\n", qPrintable(oldPath));
-        return false;
-    }
-
-    return true;
-}
-
 typedef QMap<QByteArray, QByteArray> GradleProperties;
 
 static GradleProperties readGradleProperties(const QString &path)
@@ -2320,7 +2271,7 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti
     return true;
 }
 
-bool buildGradleProject(const Options &options)
+bool buildAndroidProject(const Options &options)
 {
     GradleProperties localProperties;
     localProperties["sdk.dir"] = options.sdkPath.toLocal8Bit();
@@ -2356,7 +2307,10 @@ bool buildGradleProject(const Options &options)
         return false;
     }
 
-    QString commandLine = QString::fromLatin1("%1 --no-daemon %2").arg(shellQuote(gradlePath)).arg(options.releasePackage ? QLatin1String(" assembleRelease") : QLatin1String(" assembleDebug"));
+    QString commandLine = QLatin1String("%1 --no-daemon %2").arg(shellQuote(gradlePath), options.releasePackage ? QLatin1String(" assembleRelease") : QLatin1String(" assembleDebug"));
+    if (options.buildAAB)
+        commandLine += QLatin1String(" bundle");
+
     if (options.verbose)
         commandLine += QLatin1String(" --info");
 
@@ -2388,12 +2342,6 @@ bool buildGradleProject(const Options &options)
     return true;
 }
 
-bool buildAndroidProject(const Options &options)
-{
-    return options.gradle ? buildGradleProject(options)
-                          : buildAntProject(options);
-}
-
 bool uninstallApk(const Options &options)
 {
     if (options.verbose)
@@ -2423,32 +2371,38 @@ bool uninstallApk(const Options &options)
 }
 
 enum PackageType {
+    AAB,
     UnsignedAPK,
     SignedAPK
 };
 
-QString apkPath(const Options &options, PackageType pt)
+QString packagePath(const Options &options, PackageType pt)
 {
     QString path(options.outputDirectory);
-    if (options.gradle) {
-        path += QLatin1String("/build/outputs/apk/");
-        QString buildType(options.releasePackage ? QLatin1String("release/") : QLatin1String("debug/"));
-        if (QDir(path + buildType).exists())
-            path += buildType;
-        path += QDir(options.outputDirectory).dirName() + QLatin1Char('-');
-    } else {
-        path += QLatin1String("/bin/QtApp-");
-    }
+    path += QLatin1String("/build/outputs/%1/").arg(pt >= UnsignedAPK ? QStringLiteral("apk") : QStringLiteral("bundle"));
+    QString buildType(options.releasePackage ? QLatin1String("release/") : QLatin1String("debug/"));
+    if (QDir(path + buildType).exists())
+        path += buildType;
+    path += QDir(options.outputDirectory).dirName() + QLatin1Char('-');
     if (options.releasePackage) {
         path += QLatin1String("release-");
-        if (pt == UnsignedAPK)
-            path += QLatin1String("un");
-        path += QLatin1String("signed.apk");
+        if (pt >= UnsignedAPK) {
+            if (pt == UnsignedAPK)
+                path += QLatin1String("un");
+            path += QLatin1String("signed.apk");
+        } else {
+            path.chop(1);
+            path += QLatin1String(".aab");
+        }
     } else {
         path += QLatin1String("debug");
-        if (pt == SignedAPK)
-            path += QLatin1String("-signed");
-        path += QLatin1String(".apk");
+        if (pt >= UnsignedAPK) {
+            if (pt == SignedAPK)
+                path += QLatin1String("-signed");
+            path += QLatin1String(".apk");
+        } else {
+            path += QLatin1String(".aab");
+        }
     }
     return shellQuote(path);
 }
@@ -2465,7 +2419,7 @@ bool installApk(const Options &options)
 
     FILE *adbCommand = runAdb(options,
                               QLatin1String(" install -r ")
-                              + apkPath(options, options.keyStore.isEmpty() ? UnsignedAPK
+                              + packagePath(options, options.keyStore.isEmpty() ? UnsignedAPK
                                                                             : SignedAPK));
     if (adbCommand == 0)
         return false;
@@ -2488,26 +2442,31 @@ bool installApk(const Options &options)
     return true;
 }
 
+bool copyPackage(const Options &options)
+{
+    fflush(stdout);
+    auto from = packagePath(options, options.keyStore.isEmpty() ? UnsignedAPK : SignedAPK);
+    QFile::remove(options.apkPath);
+    return QFile::copy(from, options.apkPath);
+}
+
 bool copyStdCpp(Options *options)
 {
     if (options->verbose)
         fprintf(stdout, "Copying STL library\n");
 
-    if (!QFile::exists(options->stdCppPath)) {
-        fprintf(stderr, "STL library does not exist at %s\n", qPrintable(options->stdCppPath));
-        return false;
-    }
-
-    const QString destinationDirectory = options->outputDirectory
-            + QLatin1String("/libs/") + options->architecture;
-
-    if (!copyFileIfNewer(options->stdCppPath, destinationDirectory + QLatin1String("/lib")
-                                   + options->stdCppName + QLatin1String(".so"),
-                         options->verbose)) {
+    QString stdCppPath = QLatin1String("%1/%2/lib%3.so").arg(options->stdCppPath, options->architectures[options->currentArchitecture], options->stdCppName);
+    if (!QFile::exists(stdCppPath)) {
+        fprintf(stderr, "STL library does not exist at %s\n", qPrintable(stdCppPath));
+        fflush(stdout);
+        fflush(stderr);
         return false;
     }
 
-    return true;
+    const QString destinationFile = QLatin1String("%1/libs/%2/lib%3.so").arg(options->outputDirectory,
+                                                                              options->currentArchitecture,
+                                                                              options->stdCppName);
+    return copyFileIfNewer(stdCppPath, destinationFile, *options);
 }
 
 bool jarSignerSignPackage(const Options &options)
@@ -2521,9 +2480,9 @@ bool jarSignerSignPackage(const Options &options)
         jdkPath = QString::fromLocal8Bit(qgetenv("JAVA_HOME"));
 
 #if defined(Q_OS_WIN32)
-    QString jarSignerTool = QString::fromLatin1("jarsigner.exe");
+    QString jarSignerTool = QLatin1String("jarsigner.exe");
 #else
-    QString jarSignerTool = QString::fromLatin1("jarsigner");
+    QString jarSignerTool = QLatin1String("jarsigner");
 #endif
 
     if (jdkPath.isEmpty() || !QFile::exists(jdkPath + QLatin1String("/bin/") + jarSignerTool))
@@ -2536,29 +2495,29 @@ bool jarSignerSignPackage(const Options &options)
         return false;
     }
 
-    jarSignerTool = QString::fromLatin1("%1 -sigalg %2 -digestalg %3 -keystore %4")
-            .arg(shellQuote(jarSignerTool)).arg(shellQuote(options.sigAlg)).arg(shellQuote(options.digestAlg)).arg(shellQuote(options.keyStore));
+    jarSignerTool = QLatin1String("%1 -sigalg %2 -digestalg %3 -keystore %4")
+            .arg(shellQuote(jarSignerTool), shellQuote(options.sigAlg), shellQuote(options.digestAlg), shellQuote(options.keyStore));
 
     if (!options.keyStorePassword.isEmpty())
-        jarSignerTool += QString::fromLatin1(" -storepass %1").arg(shellQuote(options.keyStorePassword));
+        jarSignerTool += QLatin1String(" -storepass %1").arg(shellQuote(options.keyStorePassword));
 
     if (!options.storeType.isEmpty())
-        jarSignerTool += QString::fromLatin1(" -storetype %1").arg(shellQuote(options.storeType));
+        jarSignerTool += QLatin1String(" -storetype %1").arg(shellQuote(options.storeType));
 
     if (!options.keyPass.isEmpty())
-        jarSignerTool += QString::fromLatin1(" -keypass %1").arg(shellQuote(options.keyPass));
+        jarSignerTool += QLatin1String(" -keypass %1").arg(shellQuote(options.keyPass));
 
     if (!options.sigFile.isEmpty())
-        jarSignerTool += QString::fromLatin1(" -sigfile %1").arg(shellQuote(options.sigFile));
+        jarSignerTool += QLatin1String(" -sigfile %1").arg(shellQuote(options.sigFile));
 
     if (!options.signedJar.isEmpty())
-        jarSignerTool += QString::fromLatin1(" -signedjar %1").arg(shellQuote(options.signedJar));
+        jarSignerTool += QLatin1String(" -signedjar %1").arg(shellQuote(options.signedJar));
 
     if (!options.tsaUrl.isEmpty())
-        jarSignerTool += QString::fromLatin1(" -tsa %1").arg(shellQuote(options.tsaUrl));
+        jarSignerTool += QLatin1String(" -tsa %1").arg(shellQuote(options.tsaUrl));
 
     if (!options.tsaCert.isEmpty())
-        jarSignerTool += QString::fromLatin1(" -tsacert %1").arg(shellQuote(options.tsaCert));
+        jarSignerTool += QLatin1String(" -tsacert %1").arg(shellQuote(options.tsaCert));
 
     if (options.internalSf)
         jarSignerTool += QLatin1String(" -internalsf");
@@ -2569,29 +2528,39 @@ bool jarSignerSignPackage(const Options &options)
     if (options.protectedAuthenticationPath)
         jarSignerTool += QLatin1String(" -protected");
 
-    jarSignerTool += QString::fromLatin1(" %1 %2")
-            .arg(apkPath(options, UnsignedAPK))
-            .arg(shellQuote(options.keyStoreAlias));
+    auto signPackage = [&](const QString &file) {
+        fprintf(stdout, "Signing file %s\n", qPrintable(file));
+        fflush(stdout);
+        auto command = jarSignerTool + QLatin1String(" %1 %2")
+                .arg(file)
+                .arg(shellQuote(options.keyStoreAlias));
 
-    FILE *jarSignerCommand = openProcess(jarSignerTool);
-    if (jarSignerCommand == 0) {
-        fprintf(stderr, "Couldn't run jarsigner.\n");
-        return false;
-    }
+        FILE *jarSignerCommand = openProcess(command);
+        if (jarSignerCommand == 0) {
+            fprintf(stderr, "Couldn't run jarsigner.\n");
+            return false;
+        }
 
-    if (options.verbose) {
-        char buffer[512];
-        while (fgets(buffer, sizeof(buffer), jarSignerCommand) != 0)
-            fprintf(stdout, "%s", buffer);
-    }
+        if (options.verbose) {
+            char buffer[512];
+            while (fgets(buffer, sizeof(buffer), jarSignerCommand) != 0)
+                fprintf(stdout, "%s", buffer);
+        }
 
-    int errorCode = pclose(jarSignerCommand);
-    if (errorCode != 0) {
-        fprintf(stderr, "jarsigner command failed.\n");
-        if (!options.verbose)
-            fprintf(stderr, "  -- Run with --verbose for more information.\n");
+        int errorCode = pclose(jarSignerCommand);
+        if (errorCode != 0) {
+            fprintf(stderr, "jarsigner command failed.\n");
+            if (!options.verbose)
+                fprintf(stderr, "  -- Run with --verbose for more information.\n");
+            return false;
+        }
+        return true;
+    };
+
+    if (!signPackage(packagePath(options, UnsignedAPK)))
+        return false;
+    if (options.buildAAB && !signPackage(packagePath(options, AAB)))
         return false;
-    }
 
     QString zipAlignTool = options.sdkPath + QLatin1String("/tools/zipalign");
 #if defined(Q_OS_WIN32)
@@ -2609,11 +2578,11 @@ bool jarSignerSignPackage(const Options &options)
         }
     }
 
-    zipAlignTool = QString::fromLatin1("%1%2 -f 4 %3 %4")
-            .arg(shellQuote(zipAlignTool))
-            .arg(options.verbose ? QString::fromLatin1(" -v") : QString())
-            .arg(apkPath(options, UnsignedAPK))
-            .arg(apkPath(options, SignedAPK));
+    zipAlignTool = QLatin1String("%1%2 -f 4 %3 %4")
+            .arg(shellQuote(zipAlignTool),
+                 options.verbose ? QLatin1String(" -v") : QLatin1String(),
+                 packagePath(options, UnsignedAPK),
+                 packagePath(options, SignedAPK));
 
     FILE *zipAlignCommand = openProcess(zipAlignTool);
     if (zipAlignCommand == 0) {
@@ -2625,7 +2594,7 @@ bool jarSignerSignPackage(const Options &options)
     while (fgets(buffer, sizeof(buffer), zipAlignCommand) != 0)
         fprintf(stdout, "%s", buffer);
 
-    errorCode = pclose(zipAlignCommand);
+    int errorCode = pclose(zipAlignCommand);
     if (errorCode != 0) {
         fprintf(stderr, "zipalign command failed.\n");
         if (!options.verbose)
@@ -2633,7 +2602,7 @@ bool jarSignerSignPackage(const Options &options)
         return false;
     }
 
-    return QFile::remove(apkPath(options, UnsignedAPK));
+    return QFile::remove(packagePath(options, UnsignedAPK));
 }
 
 bool signPackage(const Options &options)
@@ -2664,11 +2633,11 @@ bool signPackage(const Options &options)
         }
     }
 
-    zipAlignTool = QString::fromLatin1("%1%2 -f 4 %3 %4")
-            .arg(shellQuote(zipAlignTool))
-            .arg(options.verbose ? QString::fromLatin1(" -v") : QString())
-            .arg(apkPath(options, UnsignedAPK))
-            .arg(apkPath(options, SignedAPK));
+    zipAlignTool = QLatin1String("%1%2 -f 4 %3 %4")
+            .arg(shellQuote(zipAlignTool),
+                 options.verbose ? QLatin1String(" -v") : QLatin1String(),
+                 packagePath(options, UnsignedAPK),
+                 packagePath(options, SignedAPK));
 
     FILE *zipAlignCommand = openProcess(zipAlignTool);
     if (zipAlignCommand == 0) {
@@ -2688,23 +2657,23 @@ bool signPackage(const Options &options)
         return false;
     }
 
-    QString apkSignerCommandLine = QString::fromLatin1("%1 sign --ks %2")
-            .arg(shellQuote(apksignerTool)).arg(shellQuote(options.keyStore));
+    QString apkSignerCommandLine = QLatin1String("%1 sign --ks %2")
+            .arg(shellQuote(apksignerTool), shellQuote(options.keyStore));
 
     if (!options.keyStorePassword.isEmpty())
-        apkSignerCommandLine += QString::fromLatin1(" --ks-pass pass:%1").arg(shellQuote(options.keyStorePassword));
+        apkSignerCommandLine += QLatin1String(" --ks-pass pass:%1").arg(shellQuote(options.keyStorePassword));
 
     if (!options.keyStoreAlias.isEmpty())
-        apkSignerCommandLine += QString::fromLatin1(" --ks-key-alias %1").arg(shellQuote(options.keyStoreAlias));
+        apkSignerCommandLine += QLatin1String(" --ks-key-alias %1").arg(shellQuote(options.keyStoreAlias));
 
     if (!options.keyPass.isEmpty())
-        apkSignerCommandLine += QString::fromLatin1(" --key-pass pass:%1").arg(shellQuote(options.keyPass));
+        apkSignerCommandLine += QLatin1String(" --key-pass pass:%1").arg(shellQuote(options.keyPass));
 
     if (options.verbose)
         apkSignerCommandLine += QLatin1String(" --verbose");
 
-    apkSignerCommandLine += QString::fromLatin1(" %1")
-            .arg(apkPath(options, SignedAPK));
+    apkSignerCommandLine += QLatin1String(" %1")
+            .arg(packagePath(options, SignedAPK));
 
     auto apkSignerRunner = [&] {
         FILE *apkSignerCommand = openProcess(apkSignerCommandLine);
@@ -2731,111 +2700,11 @@ bool signPackage(const Options &options)
     if (!apkSignerRunner())
         return false;
 
-    apkSignerCommandLine = QString::fromLatin1("%1 verify --verbose %2")
-        .arg(shellQuote(apksignerTool)).arg(apkPath(options, SignedAPK));
+    apkSignerCommandLine = QLatin1String("%1 verify --verbose %2")
+        .arg(shellQuote(apksignerTool), packagePath(options, SignedAPK));
 
     // Verify the package and remove the unsigned apk
-    return apkSignerRunner() && QFile::remove(apkPath(options, UnsignedAPK));
-}
-
-bool copyGdbServer(const Options &options)
-{
-    if (options.verbose)
-        fprintf(stdout, "Copying gdbserver into package.\n");
-
-    QString architectureSubDirectory;
-    if (options.architecture == QLatin1String("arm64-v8a"))
-        architectureSubDirectory = QLatin1String("android-arm64");
-    else if (options.architecture.startsWith(QLatin1String("arm")))
-        architectureSubDirectory = QLatin1String("android-arm");
-    else
-        architectureSubDirectory = QLatin1String("android-") + options.architecture;
-
-    QString gdbServerBinary = options.ndkPath
-            + QLatin1String("/prebuilt/")
-            + architectureSubDirectory
-            + QLatin1String("/gdbserver/gdbserver");
-    if (!QFile::exists(gdbServerBinary)) {
-        fprintf(stderr, "Cannot find gdbserver at %s.\n", qPrintable(gdbServerBinary));
-        return false;
-    }
-
-    QString gdbServerTarget = options.outputDirectory + QLatin1String("/libs/") + options.architecture;
-
-    if (!copyFileIfNewer(gdbServerBinary,
-                         gdbServerTarget + QLatin1String("/gdbserver"),
-                         options.verbose)
-        || !copyFileIfNewer(gdbServerBinary,
-                            gdbServerTarget + QLatin1String("/libgdbserver.so"),
-                            options.verbose)) {
-        return false;
-    }
-
-    QString addedByAndroidDeployQtPath = options.outputDirectory + QLatin1String("/assets/--Added-by-androiddeployqt--/");
-    if (!QDir().mkpath(addedByAndroidDeployQtPath)) {
-        fprintf(stderr, "Failed to create directory '%s'", qPrintable(addedByAndroidDeployQtPath));
-        return false;
-    }
-    QFile f(addedByAndroidDeployQtPath + QLatin1String("debugger.command"));
-    if (!f.open(QIODevice::WriteOnly)) {
-        fprintf(stderr, "Failed to create directory '%s'", qPrintable(addedByAndroidDeployQtPath));
-        return false;
-    }
-    f.write("lib/libgdbserver.so --multi +");
-    f.close();
-
-    return true;
-}
-
-bool generateAssetsFileList(const Options &options)
-{
-    if (options.verbose)
-        fprintf(stdout, "Pregenerating entry list for assets file engine.\n");
-
-    QString assetsPath = options.outputDirectory + QLatin1String("/assets/");
-    QString addedByAndroidDeployQtPath = assetsPath + QLatin1String("--Added-by-androiddeployqt--/");
-    if (!QDir().mkpath(addedByAndroidDeployQtPath)) {
-        fprintf(stderr, "Failed to create directory '%s'", qPrintable(addedByAndroidDeployQtPath));
-        return false;
-    }
-
-    QFile file(addedByAndroidDeployQtPath + QLatin1String("/qt_cache_pregenerated_file_list"));
-    if (file.open(QIODevice::WriteOnly)) {
-        QDirIterator dirIterator(assetsPath,
-                                 QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot,
-                                 QDirIterator::Subdirectories);
-
-        QHash<QString, QStringList> directoryContents;
-        while (dirIterator.hasNext()) {
-            const QString name = dirIterator.next().mid(assetsPath.length());
-
-            int slashIndex = name.lastIndexOf(QLatin1Char('/'));
-            QString pathName = slashIndex >= 0 ? name.left(slashIndex) : QString::fromLatin1("/");
-            QString fileName = slashIndex >= 0 ? name.mid(pathName.length() + 1) : name;
-
-            if (!fileName.isEmpty() && dirIterator.fileInfo().isDir() && !fileName.endsWith(QLatin1Char('/')))
-                fileName += QLatin1Char('/');
-
-            if (fileName.isEmpty() && !directoryContents.contains(pathName))
-                directoryContents[pathName] = QStringList();
-            else if (!fileName.isEmpty())
-                directoryContents[pathName].append(fileName);
-        }
-
-        QDataStream stream(&file);
-        stream.setVersion(QDataStream::Qt_5_3);
-        for (auto it = directoryContents.cbegin(), end = directoryContents.cend(); it != end; ++it) {
-            const QStringList &entryList = it.value();
-            stream << it.key() << entryList.size();
-            for (const QString &entry : entryList)
-                stream << entry;
-        }
-    } else {
-        fprintf(stderr, "Pregenerating entry list for assets file engine failed!\n");
-        return false;
-    }
-
-    return true;
+    return apkSignerRunner() && QFile::remove(packagePath(options, UnsignedAPK));
 }
 
 enum ErrorCode
@@ -2848,8 +2717,6 @@ enum ErrorCode
     CannotCopyGnuStl = 5,
     CannotCopyQtFiles = 6,
     CannotFindApplicationBinary = 7,
-    CannotCopyGdbServer = 8,
-    CannotStripLibraries = 9,
     CannotCopyAndroidExtraLibs = 10,
     CannotCopyAndroidSources = 11,
     CannotUpdateAndroidFiles = 12,
@@ -2857,8 +2724,9 @@ enum ErrorCode
     CannotBuildAndroidProject = 14,
     CannotSignPackage = 15,
     CannotInstallApk = 16,
-    CannotGenerateAssetsFileList = 18,
-    CannotCopyAndroidExtraResources = 19
+    CannotCopyAndroidExtraResources = 19,
+    CannotCopyApk = 20,
+    CannotCreateRcc = 21
 };
 
 int main(int argc, char *argv[])
@@ -2896,27 +2764,8 @@ int main(int argc, char *argv[])
                 : "No"
             );
 
-    if (options.auxMode) {
-        if (!readDependencies(&options))
-            return CannotReadDependencies;
-        if (!copyQtFiles(&options))
-            return CannotCopyQtFiles;
-        if (!copyAndroidExtraResources(options))
-            return CannotCopyAndroidExtraResources;
-        if (!copyAndroidExtraLibs(options))
-            return CannotCopyAndroidExtraLibs;
-        if (!stripLibraries(options))
-            return CannotStripLibraries;
-        if (!updateAndroidFiles(options))
-            return CannotUpdateAndroidFiles;
-        if (options.generateAssetsFileList && !generateAssetsFileList(options))
-            return CannotGenerateAssetsFileList;
-        return 0;
-    }
-
-    if (options.build) {
-        if (options.gradle)
-            cleanAndroidFiles(options);
+    if (options.build && !options.auxMode) {
+        cleanAndroidFiles(options);
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %d ms: Cleaned Android file\n", options.timer.elapsed());
 
@@ -2927,72 +2776,76 @@ int main(int argc, char *argv[])
             fprintf(stdout, "[TIMING] %d ms: Copied Android template\n", options.timer.elapsed());
     }
 
-    if (!readDependencies(&options))
-        return CannotReadDependencies;
-
-    if (Q_UNLIKELY(options.timing))
-        fprintf(stdout, "[TIMING] %d ms: Read dependencies\n", options.timer.elapsed());
+    for (auto it = options.architectures.constBegin(); it != options.architectures.constEnd(); ++it) {
+        options.clear(it.key());
 
-    if (options.deploymentMechanism != Options::Ministro && !copyStdCpp(&options))
-        return CannotCopyGnuStl;
+        if (!readDependencies(&options))
+            return CannotReadDependencies;
 
-    if (Q_UNLIKELY(options.timing))
-        fprintf(stdout, "[TIMING] %d ms: Copied GNU STL\n", options.timer.elapsed());
+        if (Q_UNLIKELY(options.timing))
+            fprintf(stdout, "[TIMING] %d ms: Read dependencies\n", options.timer.elapsed());
 
-    if (!copyQtFiles(&options))
-        return CannotCopyQtFiles;
+        if (!copyQtFiles(&options))
+            return CannotCopyQtFiles;
 
-    if (options.build) {
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %d ms: Copied Qt files\n", options.timer.elapsed());
 
-        if (!containsApplicationBinary(options))
-            return CannotFindApplicationBinary;
+        if (!copyAndroidExtraLibs(&options))
+            return CannotCopyAndroidExtraLibs;
 
         if (Q_UNLIKELY(options.timing))
-            fprintf(stdout, "[TIMING] %d ms: Checked for application binary\n", options.timer.elapsed());
+            fprintf(stdout, "[TIMING] %d ms: Copied extra libs\n", options.timer.elapsed());
 
-        bool needToCopyGdbServer = options.gdbServer == Options::True
-                || (options.gdbServer == Options::Auto && !options.releasePackage);
-        if (needToCopyGdbServer && !copyGdbServer(options))
-            return CannotCopyGdbServer;
+        if (!copyAndroidExtraResources(&options))
+            return CannotCopyAndroidExtraResources;
 
         if (Q_UNLIKELY(options.timing))
-            fprintf(stdout, "[TIMING] %d ms: Copied GDB server\n", options.timer.elapsed());
+            fprintf(stdout, "[TIMING] %d ms: Copied extra resources\n", options.timer.elapsed());
 
-        if (!copyAndroidExtraLibs(options))
-            return CannotCopyAndroidExtraLibs;
+        if (!options.auxMode) {
+            if (options.deploymentMechanism != Options::Ministro && !copyStdCpp(&options))
+                return CannotCopyGnuStl;
+
+            if (Q_UNLIKELY(options.timing))
+                fprintf(stdout, "[TIMING] %d ms: Copied GNU STL\n", options.timer.elapsed());
+        }
+
+        if (!containsApplicationBinary(&options))
+            return CannotFindApplicationBinary;
 
         if (Q_UNLIKELY(options.timing))
-            fprintf(stdout, "[TIMING] %d ms: Copied extra libs\n", options.timer.elapsed());
+            fprintf(stdout, "[TIMING] %d ms: Checked for application binary\n", options.timer.elapsed());
 
-        if (!copyAndroidExtraResources(options))
-            return CannotCopyAndroidExtraResources;
+        if (options.deploymentMechanism != Options::Ministro) {
+            if (Q_UNLIKELY(options.timing))
+                fprintf(stdout, "[TIMING] %d ms: Bundled Qt libs\n", options.timer.elapsed());
+        }
+    }
 
+    if (!createRcc(options))
+        return CannotCreateRcc;
+
+    if (options.auxMode) {
+        if (!updateAndroidFiles(options))
+            return CannotUpdateAndroidFiles;
+        return 0;
+    }
+
+
+    if (options.build) {
         if (!copyAndroidSources(options))
             return CannotCopyAndroidSources;
 
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %d ms: Copied android sources\n", options.timer.elapsed());
 
-        if (!stripLibraries(options))
-            return CannotStripLibraries;
-
-        if (Q_UNLIKELY(options.timing))
-            fprintf(stdout, "[TIMING] %d ms: Stripped libraries\n", options.timer.elapsed());
-
         if (!updateAndroidFiles(options))
             return CannotUpdateAndroidFiles;
 
-        if (options.generateAssetsFileList && !generateAssetsFileList(options))
-            return CannotGenerateAssetsFileList;
-
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %d ms: Updated files\n", options.timer.elapsed());
 
-        if (!options.gradle && !createAndroidProject(options))
-            return CannotCreateAndroidProject;
-
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %d ms: Created project\n", options.timer.elapsed());
 
@@ -3005,6 +2858,9 @@ int main(int argc, char *argv[])
         if (!options.keyStore.isEmpty() && !signPackage(options))
             return CannotSignPackage;
 
+        if (!options.apkPath.isEmpty() && !copyPackage(options))
+            return CannotCopyApk;
+
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %d ms: Signed package\n", options.timer.elapsed());
     }
@@ -3020,7 +2876,7 @@ int main(int argc, char *argv[])
     if (options.installApk)
         fprintf(stdout, "  -- It can now be run from the selected device/emulator.\n");
 
-    fprintf(stdout, "  -- File: %s\n", qPrintable(apkPath(options, options.keyStore.isEmpty() ? UnsignedAPK
+    fprintf(stdout, "  -- File: %s\n", qPrintable(packagePath(options, options.keyStore.isEmpty() ? UnsignedAPK
                                                                                               : SignedAPK)));
     fflush(stdout);
     return 0;
diff --git a/src/tools/androidtestrunner/androidtestrunner.pro b/src/tools/androidtestrunner/androidtestrunner.pro
new file mode 100644
index 0000000000..641d3e0003
--- /dev/null
+++ b/src/tools/androidtestrunner/androidtestrunner.pro
@@ -0,0 +1,13 @@
+option(host_build)
+CONFIG += console
+
+SOURCES += \
+    main.cpp
+
+# Required for declarations of popen/pclose on Windows
+windows: QMAKE_CXXFLAGS += -U__STRICT_ANSI__
+
+DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
+DEFINES += QT_NO_FOREACH
+
+load(qt_app)
diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp
new file mode 100644
index 0000000000..f61d407d4a
--- /dev/null
+++ b/src/tools/androidtestrunner/main.cpp
@@ -0,0 +1,490 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 BogDan Vatra <bogdan@kde.org>
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QHash>
+#include <QRegExp>
+#include <QSystemSemaphore>
+#include <QXmlStreamReader>
+
+#include <algorithm>
+#include <chrono>
+#include <functional>
+#include <thread>
+
+#ifdef Q_CC_MSVC
+#define popen _popen
+#define QT_POPEN_READ "rb"
+#define pclose _pclose
+#else
+#define QT_POPEN_READ "r"
+#endif
+
+struct Options
+{
+    bool helpRequested = false;
+    bool verbose = false;
+    std::chrono::seconds timeout{300}; // 5minutes
+    QString androidDeployQtCommand;
+    QString buildPath;
+    QString adbCommand{QStringLiteral("adb")};
+    QString makeCommand;
+    QString package;
+    QString activity;
+    QStringList testArgsList;
+    QHash<QString, QString> outFiles;
+    QString testArgs;
+    QString apkPath;
+    QHash<QString, std::function<bool(const QByteArray &)>> checkFiles = {
+    {QStringLiteral("txt"), [](const QByteArray &data) -> bool {
+        return data.indexOf("\nFAIL!  : ") < 0;
+    }},
+    {QStringLiteral("csv"), [](const QByteArray &/*data*/) -> bool {
+        // It seems csv is broken
+        return true;
+    }},
+    {QStringLiteral("xml"), [](const QByteArray &data) -> bool {
+        QXmlStreamReader reader{data};
+        while (!reader.atEnd()) {
+            reader.readNext();
+            if (reader.isStartElement() && reader.name() == QStringLiteral("Incident") &&
+                    reader.attributes().value(QStringLiteral("type")).toString() == QStringLiteral("fail")) {
+                return false;
+            }
+        }
+        return true;
+    }},
+    {QStringLiteral("lightxml"), [](const QByteArray &data) -> bool {
+        return data.indexOf("\n<Incident type=\"fail\" ") < 0;
+    }},
+    {QStringLiteral("xunitxml"), [](const QByteArray &data) -> bool {
+        QXmlStreamReader reader{data};
+        while (!reader.atEnd()) {
+            reader.readNext();
+            if (reader.isStartElement() && reader.name() == QStringLiteral("testcase") &&
+                    reader.attributes().value(QStringLiteral("result")).toString() == QStringLiteral("fail")) {
+                return false;
+            }
+        }
+        return true;
+    }},
+    {QStringLiteral("teamcity"), [](const QByteArray &data) -> bool {
+        return data.indexOf("' message='Failure! |[Loc: ") < 0;
+    }},
+    {QStringLiteral("tap"), [](const QByteArray &data) -> bool {
+        return data.indexOf("\nnot ok ") < 0;
+    }},
+    };
+};
+
+static Options g_options;
+
+static bool execCommand(const QString &command, QByteArray *output = nullptr, bool verbose = false)
+{
+    if (verbose)
+        fprintf(stdout, "Execute %s\n", command.toUtf8().constData());
+    FILE *process = popen(command.toUtf8().constData(), QT_POPEN_READ);
+
+    if (!process) {
+        fprintf(stderr, "Cannot execute command %s", qPrintable(command));
+        return false;
+    }
+    char buffer[512];
+    while (fgets(buffer, sizeof(buffer), process)) {
+        if (output)
+            output->append(buffer);
+        if (verbose)
+            fprintf(stdout, "%s", buffer);
+    }
+    return pclose(process) == 0;
+}
+
+// Copy-pasted from qmake/library/ioutil.cpp
+inline static bool hasSpecialChars(const QString &arg, const uchar (&iqm)[16])
+{
+    for (int x = arg.length() - 1; x >= 0; --x) {
+        ushort c = arg.unicode()[x].unicode();
+        if ((c < sizeof(iqm) * 8) && (iqm[c / 8] & (1 << (c & 7))))
+            return true;
+    }
+    return false;
+}
+
+static QString shellQuoteUnix(const QString &arg)
+{
+    // Chars that should be quoted (TM). This includes:
+    static const uchar iqm[] = {
+        0xff, 0xff, 0xff, 0xff, 0xdf, 0x07, 0x00, 0xd8,
+        0x00, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x78
+    }; // 0-32 \'"$`<>|;&(){}*?#!~[]
+
+    if (!arg.length())
+        return QStringLiteral("\"\"");
+
+    QString ret(arg);
+    if (hasSpecialChars(ret, iqm)) {
+        ret.replace(QLatin1Char('\''), QStringLiteral("'\\''"));
+        ret.prepend(QLatin1Char('\''));
+        ret.append(QLatin1Char('\''));
+    }
+    return ret;
+}
+
+static QString shellQuoteWin(const QString &arg)
+{
+    // Chars that should be quoted (TM). This includes:
+    // - control chars & space
+    // - the shell meta chars "&()<>^|
+    // - the potential separators ,;=
+    static const uchar iqm[] = {
+        0xff, 0xff, 0xff, 0xff, 0x45, 0x13, 0x00, 0x78,
+        0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10
+    };
+
+    if (!arg.length())
+        return QStringLiteral("\"\"");
+
+    QString ret(arg);
+    if (hasSpecialChars(ret, iqm)) {
+        // Quotes are escaped and their preceding backslashes are doubled.
+        // It's impossible to escape anything inside a quoted string on cmd
+        // level, so the outer quoting must be "suspended".
+        ret.replace(QRegExp(QStringLiteral("(\\\\*)\"")), QStringLiteral("\"\\1\\1\\^\"\""));
+        // The argument must not end with a \ since this would be interpreted
+        // as escaping the quote -- rather put the \ behind the quote: e.g.
+        // rather use "foo"\ than "foo\"
+        int i = ret.length();
+        while (i > 0 && ret.at(i - 1) == QLatin1Char('\\'))
+            --i;
+        ret.insert(i, QLatin1Char('"'));
+        ret.prepend(QLatin1Char('"'));
+    }
+    return ret;
+}
+
+static QString shellQuote(const QString &arg)
+{
+    if (QDir::separator() == QLatin1Char('\\'))
+        return shellQuoteWin(arg);
+    else
+        return shellQuoteUnix(arg);
+}
+
+static bool parseOptions()
+{
+    QStringList arguments = QCoreApplication::arguments();
+    int i = 1;
+    for (; i < arguments.size(); ++i) {
+        const QString &argument = arguments.at(i);
+        if (argument.compare(QStringLiteral("--androiddeployqt"), Qt::CaseInsensitive) == 0) {
+            if (i + 1 == arguments.size())
+                g_options.helpRequested = true;
+            else
+                g_options.androidDeployQtCommand = arguments.at(++i).trimmed();
+        } else if (argument.compare(QStringLiteral("--adb"), Qt::CaseInsensitive) == 0) {
+            if (i + 1 == arguments.size())
+                g_options.helpRequested = true;
+            else
+                g_options.adbCommand = arguments.at(++i);
+        } else if (argument.compare(QStringLiteral("--path"), Qt::CaseInsensitive) == 0) {
+            if (i + 1 == arguments.size())
+                g_options.helpRequested = true;
+            else
+                g_options.buildPath = arguments.at(++i);
+        } else if (argument.compare(QStringLiteral("--make"), Qt::CaseInsensitive) == 0) {
+            if (i + 1 == arguments.size())
+                g_options.helpRequested = true;
+            else
+                g_options.makeCommand = arguments.at(++i);
+        } else if (argument.compare(QStringLiteral("--apk"), Qt::CaseInsensitive) == 0) {
+            if (i + 1 == arguments.size())
+                g_options.helpRequested = true;
+            else
+                g_options.apkPath = arguments.at(++i);
+        } else if (argument.compare(QStringLiteral("--activity"), Qt::CaseInsensitive) == 0) {
+            if (i + 1 == arguments.size())
+                g_options.helpRequested = true;
+            else
+                g_options.activity = arguments.at(++i);
+        } else if (argument.compare(QStringLiteral("--timeout"), Qt::CaseInsensitive) == 0) {
+            if (i + 1 == arguments.size())
+                g_options.helpRequested = true;
+            else
+                g_options.timeout = std::chrono::seconds{arguments.at(++i).toInt()};
+        } else if (argument.compare(QStringLiteral("--help"), Qt::CaseInsensitive) == 0) {
+            g_options.helpRequested = true;
+        } else if (argument.compare(QStringLiteral("--verbose"), Qt::CaseInsensitive) == 0) {
+            g_options.verbose = true;
+        } else if (argument.compare(QStringLiteral("--"), Qt::CaseInsensitive) == 0) {
+            ++i;
+            break;
+        } else {
+            g_options.testArgsList << arguments.at(i);
+        }
+    }
+    for (;i < arguments.size(); ++i)
+        g_options.testArgsList << arguments.at(i);
+
+    if (g_options.helpRequested || g_options.androidDeployQtCommand.isEmpty() || g_options.buildPath.isEmpty())
+        return false;
+
+    QString serial = qEnvironmentVariable("ANDROID_DEVICE_SERIAL");
+    if (!serial.isEmpty())
+        g_options.adbCommand += QStringLiteral(" -s %1").arg(serial);
+    return true;
+}
+
+static void printHelp()
+{//                 "012345678901234567890123456789012345678901234567890123456789012345678901"
+    fprintf(stderr, "Syntax: %s <options> -- [TESTARGS] \n"
+                    "\n"
+                    "  Creates an Android package in a temp directory <destination> and\n"
+                    "  runs it on the default emulator/device or on the one specified by\n"
+                    "  \"ANDROID_DEVICE_SERIAL\" environment variable.\n\n"
+                    "  Mandatory arguments:\n"
+                    "    --androiddeployqt <androiddeployqt cmd>: The androiddeployqt:\n"
+                    "       path including its additional arguments.\n"
+                    "    --path <path>: The path where androiddeployqt will build the .apk.\n"
+                    "  Optional arguments:\n"
+                    "    --adb <adb cmd>: The Android ADB command. If missing the one from\n"
+                    "       $PATH will be used.\n"
+                    "    --activity <acitvity>: The Activity to run. If missing the first\n"
+                    "       activity from AndroidManifest.qml file will be used.\n"
+                    "    --timout <seconds>: Timeout to run the test.\n"
+                    "       Default is 5 minutes.\n"
+                    "    --make <make cmd>: make command, needed to install the qt library.\n"
+                    "       If make is missing make sure the --path is set.\n"
+                    "    --apk <apk path>: If the apk is specified and if exists, we'll skip\n"
+                    "       the package building.\n"
+                    "    -- arguments that will be passed to the test application.\n"
+                    "    --verbose: Prints out information during processing.\n"
+                    "    --help: Displays this information.\n\n",
+                    qPrintable(QCoreApplication::arguments().at(0))
+            );
+}
+
+static QString packageNameFromAndroidManifest(const QString &androidManifestPath)
+{
+    QFile androidManifestXml(androidManifestPath);
+    if (androidManifestXml.open(QIODevice::ReadOnly)) {
+        QXmlStreamReader reader(&androidManifestXml);
+        while (!reader.atEnd()) {
+            reader.readNext();
+            if (reader.isStartElement() && reader.name() == QStringLiteral("manifest"))
+                return reader.attributes().value(QStringLiteral("package")).toString();
+        }
+    }
+    return {};
+}
+
+static QString activityFromAndroidManifest(const QString &androidManifestPath)
+{
+    QFile androidManifestXml(androidManifestPath);
+    if (androidManifestXml.open(QIODevice::ReadOnly)) {
+        QXmlStreamReader reader(&androidManifestXml);
+        while (!reader.atEnd()) {
+            reader.readNext();
+            if (reader.isStartElement() && reader.name() == QStringLiteral("activity"))
+                return reader.attributes().value(QStringLiteral("android:name")).toString();
+        }
+    }
+    return {};
+}
+
+static void setOutputFile(QString file, QString format)
+{
+    if (file.isEmpty())
+        file = QStringLiteral("-");
+    if (format.isEmpty())
+        format = QStringLiteral("txt");
+
+    g_options.outFiles[format] = file;
+}
+
+static bool parseTestArgs()
+{
+    QRegExp newLoggingFormat{QStringLiteral("(.*),(txt|csv|xunitxml|xml|lightxml|teamcity|tap)")};
+    QRegExp oldFormats{QStringLiteral("-(txt|csv|xunitxml|xml|lightxml|teamcity|tap)")};
+
+    QString file;
+    QString logType;
+    QString unhandledArgs;
+    for (int i = 0; i < g_options.testArgsList.size(); ++i) {
+        const QString &arg = g_options.testArgsList[i].trimmed();
+        if (arg == QStringLiteral("-o")) {
+            if (i >= g_options.testArgsList.size() - 1)
+                return false; // missing file argument
+
+            const auto &filePath = g_options.testArgsList[++i];
+            if (!newLoggingFormat.exactMatch(filePath)) {
+                file = filePath;
+            } else {
+                const auto capturedTexts = newLoggingFormat.capturedTexts();
+                setOutputFile(capturedTexts.at(1), capturedTexts.at(2));
+            }
+        } else if (oldFormats.exactMatch(arg)) {
+            logType = oldFormats.capturedTexts().at(1);
+        } else {
+            unhandledArgs += QStringLiteral(" %1").arg(arg);
+        }
+    }
+    if (g_options.outFiles.isEmpty() || !file.isEmpty() || !logType.isEmpty())
+        setOutputFile(file, logType);
+
+    for (const auto &format : g_options.outFiles.keys())
+        g_options.testArgs += QStringLiteral(" -o output.%1,%1").arg(format);
+
+    g_options.testArgs += unhandledArgs;
+    g_options.testArgs = QStringLiteral("shell am start -e applicationArguments \\\"%1\\\" -n %2/%3").arg(shellQuote(g_options.testArgs.trimmed()),
+                                                                                                      g_options.package,
+                                                                                                      g_options.activity);
+    return true;
+}
+
+static bool isRunning() {
+    QByteArray output;
+    if (!execCommand(QStringLiteral("%1 shell \"ps | grep ' %2'\"").arg(g_options.adbCommand,
+                                                                        shellQuote(g_options.package)), &output)) {
+
+        return false;
+    }
+    return output.indexOf(" " + g_options.package.toUtf8()) > -1;
+}
+
+static bool waitToFinish()
+{
+    using clock = std::chrono::system_clock;
+    auto start = clock::now();
+    // wait to start
+    while (!isRunning()) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        if ((clock::now() - start) > std::chrono::seconds{10})
+            return false;
+    }
+
+    // Wait to finish
+    while (isRunning()) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(250));
+        if ((clock::now() - start) > g_options.timeout)
+            return false;
+    }
+    return true;
+}
+
+
+static bool pullFiles()
+{
+    bool ret = true;
+    for (auto it = g_options.outFiles.constBegin(); it != g_options.outFiles.end(); ++it) {
+        QByteArray output;
+        if (!execCommand(QStringLiteral("%1 shell run-as %2 cat files/output.%3")
+                         .arg(g_options.adbCommand, g_options.package, it.key()), &output)) {
+            return false;
+        }
+        auto checkerIt = g_options.checkFiles.find(it.key());
+        ret = ret && checkerIt != g_options.checkFiles.end() && checkerIt.value()(output);
+        if (it.value() == QStringLiteral("-")){
+            fprintf(stdout, "%s", output.constData());
+            fflush(stdout);
+        } else {
+            QFile out{it.value()};
+            if (!out.open(QIODevice::WriteOnly))
+                return false;
+            out.write(output);
+        }
+    }
+    return ret;
+}
+
+struct RunnerLocker
+{
+    RunnerLocker()
+    {
+        runner.acquire();
+    }
+    ~RunnerLocker()
+    {
+        runner.release();
+    }
+    QSystemSemaphore runner{QStringLiteral("androidtestrunner"), 1, QSystemSemaphore::Open};
+};
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+    if (!parseOptions()) {
+        printHelp();
+        return 1;
+    }
+
+    RunnerLocker lock; // do not install or run packages while another test is running
+    if (!g_options.apkPath.isEmpty() && QFile::exists(g_options.apkPath)) {
+        if (!execCommand(QStringLiteral("%1 install -r %2")
+                         .arg(g_options.adbCommand, g_options.apkPath), nullptr, g_options.verbose)) {
+            return 1;
+        }
+    } else {
+        if (!g_options.makeCommand.isEmpty()) {
+            // we need to run make INSTALL_ROOT=path install to install the application file(s) first
+            if (!execCommand(QStringLiteral("%1 INSTALL_ROOT=%2 install")
+                             .arg(g_options.makeCommand, QDir::toNativeSeparators(g_options.buildPath)), nullptr, g_options.verbose)) {
+                return 1;
+            }
+        }
+
+        // Run androiddeployqt
+        static auto verbose = g_options.verbose ? QStringLiteral("--verbose") : QStringLiteral();
+        if (!execCommand(QStringLiteral("%1 %3 --reinstall --output %2 --apk %4").arg(g_options.androidDeployQtCommand,
+                                                                                      g_options.buildPath,
+                                                                                      verbose,
+                                                                                      g_options.apkPath), nullptr, true)) {
+            return 1;
+        }
+    }
+
+    QString manifest = g_options.buildPath + QStringLiteral("/AndroidManifest.xml");
+    g_options.package = packageNameFromAndroidManifest(manifest);
+    if (g_options.activity.isEmpty())
+        g_options.activity = activityFromAndroidManifest(manifest);
+
+    // parseTestArgs depends on g_options.package
+    if (!parseTestArgs())
+        return 1;
+
+    // start the tests
+    bool res = execCommand(QStringLiteral("%1 %2").arg(g_options.adbCommand, g_options.testArgs),
+                           nullptr, g_options.verbose) && waitToFinish();
+    if (res)
+        res &= pullFiles();
+    res &= execCommand(QStringLiteral("%1 uninstall %2").arg(g_options.adbCommand, g_options.package),
+                       nullptr, g_options.verbose);
+    fflush(stdout);
+    return res ? 0 : 1;
+}
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 83e44ff9a4..9863ff5e69 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -19,8 +19,6 @@ DEFINES += \
     QT_NO_FOREACH \
     QT_NO_CAST_FROM_ASCII
 
-DEFINES -= QT_EVAL
-
 SOURCES += \
            ../../corelib/codecs/qlatincodec.cpp \
            ../../corelib/codecs/qtextcodec.cpp \
@@ -44,6 +42,7 @@ SOURCES += \
            ../../corelib/io/qfsfileengine.cpp \
            ../../corelib/io/qfsfileengine_iterator.cpp \
            ../../corelib/io/qiodevice.cpp \
+           ../../corelib/io/qipaddress.cpp \
            ../../corelib/io/qfiledevice.cpp \
            ../../corelib/io/qresource.cpp \
            ../../corelib/io/qtemporarydir.cpp \
@@ -52,11 +51,17 @@ SOURCES += \
            ../../corelib/io/qstandardpaths.cpp \
            ../../corelib/io/qloggingcategory.cpp \
            ../../corelib/io/qloggingregistry.cpp \
+           ../../corelib/io/qurl.cpp \
+           ../../corelib/io/qurlidna.cpp \
+           ../../corelib/io/qurlquery.cpp \
+           ../../corelib/io/qurlrecode.cpp \
            ../../corelib/kernel/qcoreapplication.cpp \
            ../../corelib/kernel/qcoreglobaldata.cpp \
            ../../corelib/kernel/qmetatype.cpp \
            ../../corelib/kernel/qvariant.cpp \
            ../../corelib/kernel/qsystemerror.cpp \
+           ../../corelib/kernel/qsharedmemory.cpp \
+           ../../corelib/kernel/qsystemsemaphore.cpp \
            ../../corelib/plugin/quuid.cpp \
            ../../corelib/serialization/qdatastream.cpp \
            ../../corelib/serialization/qjson.cpp \
@@ -69,36 +74,46 @@ SOURCES += \
            ../../corelib/serialization/qtextstream.cpp \
            ../../corelib/serialization/qxmlutils.cpp \
            ../../corelib/serialization/qxmlstream.cpp \
-           ../../corelib/tools/qbitarray.cpp \
-           ../../corelib/tools/qbytearray.cpp \
+           ../../corelib/text/qbytearray.cpp \
+           ../../corelib/text/qbytearraylist.cpp \
+           ../../corelib/text/qbytearraymatcher.cpp \
+           ../../corelib/text/qlocale.cpp \
+           ../../corelib/text/qlocale_tools.cpp \
+           ../../corelib/text/qregexp.cpp \
+           ../../corelib/text/qstring.cpp \
+           ../../corelib/text/qstringbuilder.cpp \
+           ../../corelib/text/qstring_compat.cpp \
+           ../../corelib/text/qstringlist.cpp \
+           ../../corelib/text/qstringview.cpp \
+           ../../corelib/text/qvsnprintf.cpp \
+           ../../corelib/time/qcalendar.cpp \
+           ../../corelib/time/qdatetime.cpp \
+           ../../corelib/time/qgregoriancalendar.cpp \
+           ../../corelib/time/qromancalendar.cpp \
            ../../corelib/tools/qarraydata.cpp \
-           ../../corelib/tools/qbytearraymatcher.cpp \
+           ../../corelib/tools/qbitarray.cpp \
            ../../corelib/tools/qcommandlineparser.cpp \
            ../../corelib/tools/qcommandlineoption.cpp \
            ../../corelib/tools/qcryptographichash.cpp \
-           ../../corelib/tools/qdatetime.cpp \
            ../../corelib/tools/qhash.cpp \
            ../../corelib/tools/qlist.cpp \
-           ../../corelib/tools/qlinkedlist.cpp \
-           ../../corelib/tools/qlocale.cpp \
-           ../../corelib/tools/qlocale_tools.cpp \
            ../../corelib/tools/qmap.cpp \
-           ../../corelib/tools/qregexp.cpp \
            ../../corelib/tools/qringbuffer.cpp \
            ../../corelib/tools/qpoint.cpp \
            ../../corelib/tools/qrect.cpp \
            ../../corelib/tools/qsize.cpp \
            ../../corelib/tools/qline.cpp \
-           ../../corelib/tools/qstring.cpp \
-           ../../corelib/tools/qstringbuilder.cpp \
-           ../../corelib/tools/qstring_compat.cpp \
-           ../../corelib/tools/qstringlist.cpp \
            ../../corelib/tools/qversionnumber.cpp \
-           ../../corelib/tools/qvsnprintf.cpp \
            ../../xml/dom/qdom.cpp \
            ../../xml/sax/qxml.cpp
 
 unix:SOURCES += ../../corelib/kernel/qcore_unix.cpp \
+                ../../corelib/kernel/qsharedmemory_posix.cpp \
+                ../../corelib/kernel/qsharedmemory_systemv.cpp \
+                ../../corelib/kernel/qsharedmemory_unix.cpp \
+                ../../corelib/kernel/qsystemsemaphore_posix.cpp \
+                ../../corelib/kernel/qsystemsemaphore_systemv.cpp \
+                ../../corelib/kernel/qsystemsemaphore_unix.cpp \
                 ../../corelib/io/qfilesystemengine_unix.cpp \
                 ../../corelib/io/qfilesystemiterator_unix.cpp \
                 ../../corelib/io/qfsfileengine_unix.cpp
@@ -108,12 +123,16 @@ win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \
                  ../../corelib/io/qfilesystemiterator_win.cpp \
                  ../../corelib/io/qfsfileengine_win.cpp \
                  ../../corelib/kernel/qcoreapplication_win.cpp \
+                 ../../corelib/kernel/qsharedmemory_win.cpp \
+                 ../../corelib/kernel/qsystemsemaphore_win.cpp \
                  ../../corelib/plugin/qsystemlibrary.cpp \
+                 ../../corelib/kernel/qwinregistry.cpp \
 
 mac {
     SOURCES += \
         ../../corelib/kernel/qcoreapplication_mac.cpp \
         ../../corelib/kernel/qcore_mac.cpp
+
     OBJECTIVE_SOURCES += \
         ../../corelib/global/qoperatingsystemversion_darwin.mm \
         ../../corelib/kernel/qcore_mac_objc.mm \
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 0640e1b603..6a74e739e6 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -518,10 +518,15 @@ void Generator::generateCode()
         }
     }
 
+//
+// Generate meta object link to parent meta objects
+//
+
     if (!extraList.isEmpty()) {
-        fprintf(out, "static const QMetaObject * const qt_meta_extradata_%s[] = {\n    ", qualifiedClassNameIdentifier.constData());
+        fprintf(out, "static const QMetaObject::SuperData qt_meta_extradata_%s[] = {\n",
+                qualifiedClassNameIdentifier.constData());
         for (int i = 0; i < extraList.count(); ++i) {
-            fprintf(out, "    &%s::staticMetaObject,\n", extraList.at(i).constData());
+            fprintf(out, "    QMetaObject::SuperData::link<%s::staticMetaObject>(),\n", extraList.at(i).constData());
         }
         fprintf(out, "    nullptr\n};\n\n");
     }
@@ -537,7 +542,7 @@ void Generator::generateCode()
     if (isQObject)
         fprintf(out, "    nullptr,\n");
     else if (cdef->superclassList.size() && (!cdef->hasQGadget || knownGadgets.contains(purestSuperClass)))
-        fprintf(out, "    &%s::staticMetaObject,\n", purestSuperClass.constData());
+        fprintf(out, "    QMetaObject::SuperData::link<%s::staticMetaObject>(),\n", purestSuperClass.constData());
     else
         fprintf(out, "    nullptr,\n");
     fprintf(out, "    qt_meta_stringdata_%s.data,\n"
@@ -1652,6 +1657,12 @@ void Generator::generatePluginMetaData()
         jsonObjectToCbor(&map, o);
     }
 
+    if (!cdef->pluginData.uri.isEmpty()) {
+        dev.nextItem("\"URI\"");
+        cbor_encode_int(&map, int(QtPluginMetaDataKeys::URI));
+        cbor_encode_text_string(&map, cdef->pluginData.uri.constData(), cdef->pluginData.uri.size());
+    }
+
     // Add -M args from the command line:
     for (auto it = cdef->pluginData.metaArgs.cbegin(), end = cdef->pluginData.metaArgs.cend(); it != end; ++it) {
         const QJsonArray &a = it.value();
diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h
index 134166580b..eae0353199 100644
--- a/src/tools/moc/generator.h
+++ b/src/tools/moc/generator.h
@@ -39,7 +39,7 @@ class Generator
     ClassDef *cdef;
     QVector<uint> meta_data;
 public:
-    Generator(ClassDef *classDef, const QVector<QByteArray> &metaTypes, const QHash<QByteArray, QByteArray> &knownQObjectClasses, const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile = 0);
+    Generator(ClassDef *classDef, const QVector<QByteArray> &metaTypes, const QHash<QByteArray, QByteArray> &knownQObjectClasses, const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile = nullptr);
     void generateCode();
 private:
     bool registerableMetaType(const QByteArray &propertyType);
diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp
index 07c59d155f..7da8d94efc 100644
--- a/src/tools/moc/keywords.cpp
+++ b/src/tools/moc/keywords.cpp
@@ -30,12 +30,12 @@
 // DO NOT EDIT.
 
 static const short keyword_trans[][128] = {
-    {0,0,0,0,0,0,0,0,0,561,558,0,0,0,0,0,
+    {0,0,0,0,0,0,0,0,0,568,565,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     561,252,559,562,8,38,239,560,25,26,236,234,30,235,27,237,
+     568,252,566,569,8,38,239,567,25,26,236,234,30,235,27,237,
      22,22,22,22,22,22,22,22,22,22,34,41,23,39,24,43,
      0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-     8,21,8,8,8,8,8,8,8,8,8,31,564,32,238,8,
+     8,21,8,8,8,8,8,8,8,8,8,31,571,32,238,8,
      0,1,2,3,4,5,6,7,8,9,8,8,10,11,12,13,
      14,8,15,16,17,18,19,20,8,8,8,36,245,37,248,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -116,7 +116,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,290,222,0,0,490,0,0,0,
+     0,0,0,0,0,0,0,0,290,222,0,0,497,0,0,0,
      0,0,0,0,55,0,0,330,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -155,7 +155,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,514,0,0,0,0,0,0,0,0,0,0,357,
+     0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,357,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -177,7 +177,7 @@ static const short keyword_trans[][128] = {
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,42,0,0,0,28,0,
-     567,567,567,567,567,567,567,567,567,567,0,0,0,0,0,0,
+     574,574,574,574,574,574,574,574,574,574,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -336,7 +336,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,566,0,0,0,0,565,
+     0,0,0,0,0,0,0,0,0,0,573,0,0,0,0,572,
      0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -372,29 +372,29 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,487,0,0,0,300,0,0,0,0,0,0,0,0,0,0,
+     0,494,0,0,0,300,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,468,417,401,409,373,0,477,0,0,0,0,364,358,
-     379,0,550,465,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,475,424,408,416,380,0,484,0,0,0,0,364,358,
+     386,0,557,472,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,387,0,0,0,
-     0,0,380,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,394,0,0,0,
+     0,0,387,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,504,0,0,0,0,0,381,
+     0,0,0,0,0,0,0,0,0,511,0,0,0,0,0,388,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -403,7 +403,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,405,0,0,0,0,0,0,0,0,0,0,0,406,
+     0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,413,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -411,14 +411,14 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,413,0,0,0,0,0,0,0,0,0,0,0,414,
+     0,0,0,420,0,0,0,0,0,0,0,0,0,0,0,421,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,447,425,0,0,430,0,0,0,439,0,0,
+     0,0,0,0,0,454,432,0,0,437,0,0,0,446,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -426,7 +426,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,533,0,466,0,0,0,494,0,0,500,0,0,0,
+     0,0,0,540,0,473,0,0,0,501,0,0,507,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -435,7 +435,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,479,0,526,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,486,0,533,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -443,7 +443,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     542,0,0,510,0,0,0,0,0,0,0,0,0,0,0,0,
+     549,0,0,517,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
 };
@@ -828,197 +828,204 @@ static const struct
     {CHARACTER, 0, 65, 370, CHARACTER},
     {CHARACTER, 0, 67, 371, CHARACTER},
     {CHARACTER, 0, 69, 372, CHARACTER},
-    {Q_NAMESPACE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 65, 374, CHARACTER},
-    {CHARACTER, 0, 68, 375, CHARACTER},
-    {CHARACTER, 0, 71, 376, CHARACTER},
-    {CHARACTER, 0, 69, 377, CHARACTER},
-    {CHARACTER, 0, 84, 378, CHARACTER},
+    {Q_NAMESPACE_TOKEN, 0, 95, 373, CHARACTER},
+    {CHARACTER, 0, 69, 374, CHARACTER},
+    {CHARACTER, 0, 88, 375, CHARACTER},
+    {CHARACTER, 0, 80, 376, CHARACTER},
+    {CHARACTER, 0, 79, 377, CHARACTER},
+    {CHARACTER, 0, 82, 378, CHARACTER},
+    {CHARACTER, 0, 84, 379, CHARACTER},
+    {Q_NAMESPACE_EXPORT_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 65, 381, CHARACTER},
+    {CHARACTER, 0, 68, 382, CHARACTER},
+    {CHARACTER, 0, 71, 383, CHARACTER},
+    {CHARACTER, 0, 69, 384, CHARACTER},
+    {CHARACTER, 0, 84, 385, CHARACTER},
     {Q_GADGET_TOKEN, 0, 0, 0, CHARACTER},
     {CHARACTER, 44, 0, 0, CHARACTER},
     {CHARACTER, 45, 0, 0, CHARACTER},
-    {CHARACTER, 0, 80, 382, CHARACTER},
-    {CHARACTER, 0, 69, 383, CHARACTER},
-    {CHARACTER, 0, 82, 384, CHARACTER},
-    {CHARACTER, 0, 84, 385, CHARACTER},
-    {CHARACTER, 0, 89, 386, CHARACTER},
+    {CHARACTER, 0, 80, 389, CHARACTER},
+    {CHARACTER, 0, 69, 390, CHARACTER},
+    {CHARACTER, 0, 82, 391, CHARACTER},
+    {CHARACTER, 0, 84, 392, CHARACTER},
+    {CHARACTER, 0, 89, 393, CHARACTER},
     {Q_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 85, 388, CHARACTER},
-    {CHARACTER, 0, 71, 389, CHARACTER},
-    {CHARACTER, 0, 73, 390, CHARACTER},
-    {CHARACTER, 0, 78, 391, CHARACTER},
-    {CHARACTER, 0, 95, 392, CHARACTER},
-    {CHARACTER, 0, 77, 393, CHARACTER},
-    {CHARACTER, 0, 69, 394, CHARACTER},
-    {CHARACTER, 0, 84, 395, CHARACTER},
-    {CHARACTER, 0, 65, 396, CHARACTER},
-    {CHARACTER, 0, 68, 397, CHARACTER},
-    {CHARACTER, 0, 65, 398, CHARACTER},
-    {CHARACTER, 0, 84, 399, CHARACTER},
-    {CHARACTER, 0, 65, 400, CHARACTER},
+    {CHARACTER, 0, 85, 395, CHARACTER},
+    {CHARACTER, 0, 71, 396, CHARACTER},
+    {CHARACTER, 0, 73, 397, CHARACTER},
+    {CHARACTER, 0, 78, 398, CHARACTER},
+    {CHARACTER, 0, 95, 399, CHARACTER},
+    {CHARACTER, 0, 77, 400, CHARACTER},
+    {CHARACTER, 0, 69, 401, CHARACTER},
+    {CHARACTER, 0, 84, 402, CHARACTER},
+    {CHARACTER, 0, 65, 403, CHARACTER},
+    {CHARACTER, 0, 68, 404, CHARACTER},
+    {CHARACTER, 0, 65, 405, CHARACTER},
+    {CHARACTER, 0, 84, 406, CHARACTER},
+    {CHARACTER, 0, 65, 407, CHARACTER},
     {Q_PLUGIN_METADATA_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 402, CHARACTER},
-    {CHARACTER, 0, 85, 403, CHARACTER},
-    {CHARACTER, 0, 77, 404, CHARACTER},
+    {CHARACTER, 0, 78, 409, CHARACTER},
+    {CHARACTER, 0, 85, 410, CHARACTER},
+    {CHARACTER, 0, 77, 411, CHARACTER},
     {Q_ENUM_TOKEN, 46, 0, 0, CHARACTER},
     {Q_ENUMS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 407, CHARACTER},
-    {CHARACTER, 0, 83, 408, CHARACTER},
+    {CHARACTER, 0, 78, 414, CHARACTER},
+    {CHARACTER, 0, 83, 415, CHARACTER},
     {Q_ENUM_NS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 76, 410, CHARACTER},
-    {CHARACTER, 0, 65, 411, CHARACTER},
-    {CHARACTER, 0, 71, 412, CHARACTER},
+    {CHARACTER, 0, 76, 417, CHARACTER},
+    {CHARACTER, 0, 65, 418, CHARACTER},
+    {CHARACTER, 0, 71, 419, CHARACTER},
     {Q_FLAG_TOKEN, 47, 0, 0, CHARACTER},
     {Q_FLAGS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 415, CHARACTER},
-    {CHARACTER, 0, 83, 416, CHARACTER},
+    {CHARACTER, 0, 78, 422, CHARACTER},
+    {CHARACTER, 0, 83, 423, CHARACTER},
     {Q_FLAG_NS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 69, 418, CHARACTER},
-    {CHARACTER, 0, 67, 419, CHARACTER},
-    {CHARACTER, 0, 76, 420, CHARACTER},
-    {CHARACTER, 0, 65, 421, CHARACTER},
-    {CHARACTER, 0, 82, 422, CHARACTER},
-    {CHARACTER, 0, 69, 423, CHARACTER},
-    {CHARACTER, 0, 95, 424, CHARACTER},
+    {CHARACTER, 0, 69, 425, CHARACTER},
+    {CHARACTER, 0, 67, 426, CHARACTER},
+    {CHARACTER, 0, 76, 427, CHARACTER},
+    {CHARACTER, 0, 65, 428, CHARACTER},
+    {CHARACTER, 0, 82, 429, CHARACTER},
+    {CHARACTER, 0, 69, 430, CHARACTER},
+    {CHARACTER, 0, 95, 431, CHARACTER},
     {CHARACTER, 48, 0, 0, CHARACTER},
-    {CHARACTER, 0, 76, 426, CHARACTER},
-    {CHARACTER, 0, 65, 427, CHARACTER},
-    {CHARACTER, 0, 71, 428, CHARACTER},
-    {CHARACTER, 0, 83, 429, CHARACTER},
+    {CHARACTER, 0, 76, 433, CHARACTER},
+    {CHARACTER, 0, 65, 434, CHARACTER},
+    {CHARACTER, 0, 71, 435, CHARACTER},
+    {CHARACTER, 0, 83, 436, CHARACTER},
     {Q_DECLARE_FLAGS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 431, CHARACTER},
-    {CHARACTER, 0, 84, 432, CHARACTER},
-    {CHARACTER, 0, 69, 433, CHARACTER},
-    {CHARACTER, 0, 82, 434, CHARACTER},
-    {CHARACTER, 0, 70, 435, CHARACTER},
-    {CHARACTER, 0, 65, 436, CHARACTER},
-    {CHARACTER, 0, 67, 437, CHARACTER},
-    {CHARACTER, 0, 69, 438, CHARACTER},
-    {Q_DECLARE_INTERFACE_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 78, 438, CHARACTER},
+    {CHARACTER, 0, 84, 439, CHARACTER},
     {CHARACTER, 0, 69, 440, CHARACTER},
-    {CHARACTER, 0, 84, 441, CHARACTER},
-    {CHARACTER, 0, 65, 442, CHARACTER},
-    {CHARACTER, 0, 84, 443, CHARACTER},
-    {CHARACTER, 0, 89, 444, CHARACTER},
-    {CHARACTER, 0, 80, 445, CHARACTER},
-    {CHARACTER, 0, 69, 446, CHARACTER},
+    {CHARACTER, 0, 82, 441, CHARACTER},
+    {CHARACTER, 0, 70, 442, CHARACTER},
+    {CHARACTER, 0, 65, 443, CHARACTER},
+    {CHARACTER, 0, 67, 444, CHARACTER},
+    {CHARACTER, 0, 69, 445, CHARACTER},
+    {Q_DECLARE_INTERFACE_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 69, 447, CHARACTER},
+    {CHARACTER, 0, 84, 448, CHARACTER},
+    {CHARACTER, 0, 65, 449, CHARACTER},
+    {CHARACTER, 0, 84, 450, CHARACTER},
+    {CHARACTER, 0, 89, 451, CHARACTER},
+    {CHARACTER, 0, 80, 452, CHARACTER},
+    {CHARACTER, 0, 69, 453, CHARACTER},
     {Q_DECLARE_METATYPE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 88, 448, CHARACTER},
-    {CHARACTER, 0, 84, 449, CHARACTER},
-    {CHARACTER, 0, 69, 450, CHARACTER},
-    {CHARACTER, 0, 78, 451, CHARACTER},
-    {CHARACTER, 0, 83, 452, CHARACTER},
-    {CHARACTER, 0, 73, 453, CHARACTER},
-    {CHARACTER, 0, 79, 454, CHARACTER},
-    {CHARACTER, 0, 78, 455, CHARACTER},
-    {CHARACTER, 0, 95, 456, CHARACTER},
-    {CHARACTER, 0, 73, 457, CHARACTER},
+    {CHARACTER, 0, 88, 455, CHARACTER},
+    {CHARACTER, 0, 84, 456, CHARACTER},
+    {CHARACTER, 0, 69, 457, CHARACTER},
     {CHARACTER, 0, 78, 458, CHARACTER},
-    {CHARACTER, 0, 84, 459, CHARACTER},
-    {CHARACTER, 0, 69, 460, CHARACTER},
-    {CHARACTER, 0, 82, 461, CHARACTER},
-    {CHARACTER, 0, 70, 462, CHARACTER},
-    {CHARACTER, 0, 65, 463, CHARACTER},
-    {CHARACTER, 0, 67, 464, CHARACTER},
-    {CHARACTER, 0, 69, 438, CHARACTER},
-    {CHARACTER, 49, 0, 0, CHARACTER},
-    {CHARACTER, 0, 84, 467, CHARACTER},
-    {CHARACTER, 0, 83, 413, CHARACTER},
-    {CHARACTER, 0, 76, 469, CHARACTER},
+    {CHARACTER, 0, 83, 459, CHARACTER},
+    {CHARACTER, 0, 73, 460, CHARACTER},
+    {CHARACTER, 0, 79, 461, CHARACTER},
+    {CHARACTER, 0, 78, 462, CHARACTER},
+    {CHARACTER, 0, 95, 463, CHARACTER},
+    {CHARACTER, 0, 73, 464, CHARACTER},
+    {CHARACTER, 0, 78, 465, CHARACTER},
+    {CHARACTER, 0, 84, 466, CHARACTER},
+    {CHARACTER, 0, 69, 467, CHARACTER},
+    {CHARACTER, 0, 82, 468, CHARACTER},
+    {CHARACTER, 0, 70, 469, CHARACTER},
     {CHARACTER, 0, 65, 470, CHARACTER},
-    {CHARACTER, 0, 83, 471, CHARACTER},
-    {CHARACTER, 0, 83, 472, CHARACTER},
-    {CHARACTER, 0, 73, 473, CHARACTER},
-    {CHARACTER, 0, 78, 474, CHARACTER},
-    {CHARACTER, 0, 70, 475, CHARACTER},
-    {CHARACTER, 0, 79, 476, CHARACTER},
+    {CHARACTER, 0, 67, 471, CHARACTER},
+    {CHARACTER, 0, 69, 445, CHARACTER},
+    {CHARACTER, 49, 0, 0, CHARACTER},
+    {CHARACTER, 0, 84, 474, CHARACTER},
+    {CHARACTER, 0, 83, 420, CHARACTER},
+    {CHARACTER, 0, 76, 476, CHARACTER},
+    {CHARACTER, 0, 65, 477, CHARACTER},
+    {CHARACTER, 0, 83, 478, CHARACTER},
+    {CHARACTER, 0, 83, 479, CHARACTER},
+    {CHARACTER, 0, 73, 480, CHARACTER},
+    {CHARACTER, 0, 78, 481, CHARACTER},
+    {CHARACTER, 0, 70, 482, CHARACTER},
+    {CHARACTER, 0, 79, 483, CHARACTER},
     {Q_CLASSINFO_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 478, CHARACTER},
+    {CHARACTER, 0, 78, 485, CHARACTER},
     {CHARACTER, 50, 0, 0, CHARACTER},
-    {CHARACTER, 0, 69, 480, CHARACTER},
-    {CHARACTER, 0, 82, 481, CHARACTER},
-    {CHARACTER, 0, 70, 482, CHARACTER},
-    {CHARACTER, 0, 65, 483, CHARACTER},
-    {CHARACTER, 0, 67, 484, CHARACTER},
-    {CHARACTER, 0, 69, 485, CHARACTER},
-    {CHARACTER, 0, 83, 486, CHARACTER},
+    {CHARACTER, 0, 69, 487, CHARACTER},
+    {CHARACTER, 0, 82, 488, CHARACTER},
+    {CHARACTER, 0, 70, 489, CHARACTER},
+    {CHARACTER, 0, 65, 490, CHARACTER},
+    {CHARACTER, 0, 67, 491, CHARACTER},
+    {CHARACTER, 0, 69, 492, CHARACTER},
+    {CHARACTER, 0, 83, 493, CHARACTER},
     {Q_INTERFACES_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 108, 488, CHARACTER},
-    {CHARACTER, 0, 115, 489, CHARACTER},
+    {CHARACTER, 0, 108, 495, CHARACTER},
+    {CHARACTER, 0, 115, 496, CHARACTER},
     {SIGNALS, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 111, 491, CHARACTER},
-    {CHARACTER, 0, 116, 492, CHARACTER},
-    {CHARACTER, 0, 115, 493, CHARACTER},
+    {CHARACTER, 0, 111, 498, CHARACTER},
+    {CHARACTER, 0, 116, 499, CHARACTER},
+    {CHARACTER, 0, 115, 500, CHARACTER},
     {SLOTS, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 71, 495, CHARACTER},
-    {CHARACTER, 0, 78, 496, CHARACTER},
-    {CHARACTER, 0, 65, 497, CHARACTER},
-    {CHARACTER, 0, 76, 498, CHARACTER},
-    {Q_SIGNAL_TOKEN, 0, 83, 499, CHARACTER},
+    {CHARACTER, 0, 71, 502, CHARACTER},
+    {CHARACTER, 0, 78, 503, CHARACTER},
+    {CHARACTER, 0, 65, 504, CHARACTER},
+    {CHARACTER, 0, 76, 505, CHARACTER},
+    {Q_SIGNAL_TOKEN, 0, 83, 506, CHARACTER},
     {Q_SIGNALS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 79, 501, CHARACTER},
-    {CHARACTER, 0, 84, 502, CHARACTER},
-    {Q_SLOT_TOKEN, 0, 83, 503, CHARACTER},
+    {CHARACTER, 0, 79, 508, CHARACTER},
+    {CHARACTER, 0, 84, 509, CHARACTER},
+    {Q_SLOT_TOKEN, 0, 83, 510, CHARACTER},
     {Q_SLOTS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 86, 505, CHARACTER},
-    {CHARACTER, 0, 65, 506, CHARACTER},
-    {CHARACTER, 0, 84, 507, CHARACTER},
-    {CHARACTER, 0, 69, 508, CHARACTER},
-    {CHARACTER, 0, 95, 509, CHARACTER},
+    {CHARACTER, 0, 86, 512, CHARACTER},
+    {CHARACTER, 0, 65, 513, CHARACTER},
+    {CHARACTER, 0, 84, 514, CHARACTER},
+    {CHARACTER, 0, 69, 515, CHARACTER},
+    {CHARACTER, 0, 95, 516, CHARACTER},
     {CHARACTER, 51, 0, 0, CHARACTER},
-    {CHARACTER, 0, 76, 511, CHARACTER},
-    {CHARACTER, 0, 79, 512, CHARACTER},
-    {CHARACTER, 0, 84, 513, CHARACTER},
+    {CHARACTER, 0, 76, 518, CHARACTER},
+    {CHARACTER, 0, 79, 519, CHARACTER},
+    {CHARACTER, 0, 84, 520, CHARACTER},
     {Q_PRIVATE_SLOT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 95, 515, CHARACTER},
-    {CHARACTER, 0, 77, 516, CHARACTER},
-    {CHARACTER, 0, 79, 517, CHARACTER},
-    {CHARACTER, 0, 67, 518, CHARACTER},
-    {CHARACTER, 0, 95, 519, CHARACTER},
-    {CHARACTER, 0, 67, 520, CHARACTER},
-    {CHARACTER, 0, 79, 521, CHARACTER},
-    {CHARACTER, 0, 77, 522, CHARACTER},
-    {CHARACTER, 0, 80, 523, CHARACTER},
-    {CHARACTER, 0, 65, 524, CHARACTER},
-    {CHARACTER, 0, 84, 525, CHARACTER},
+    {CHARACTER, 0, 95, 522, CHARACTER},
+    {CHARACTER, 0, 77, 523, CHARACTER},
+    {CHARACTER, 0, 79, 524, CHARACTER},
+    {CHARACTER, 0, 67, 525, CHARACTER},
+    {CHARACTER, 0, 95, 526, CHARACTER},
+    {CHARACTER, 0, 67, 527, CHARACTER},
+    {CHARACTER, 0, 79, 528, CHARACTER},
+    {CHARACTER, 0, 77, 529, CHARACTER},
+    {CHARACTER, 0, 80, 530, CHARACTER},
+    {CHARACTER, 0, 65, 531, CHARACTER},
+    {CHARACTER, 0, 84, 532, CHARACTER},
     {Q_MOC_COMPAT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 79, 527, CHARACTER},
-    {CHARACTER, 0, 75, 528, CHARACTER},
-    {CHARACTER, 0, 65, 529, CHARACTER},
-    {CHARACTER, 0, 66, 530, CHARACTER},
-    {CHARACTER, 0, 76, 531, CHARACTER},
-    {CHARACTER, 0, 69, 532, CHARACTER},
+    {CHARACTER, 0, 79, 534, CHARACTER},
+    {CHARACTER, 0, 75, 535, CHARACTER},
+    {CHARACTER, 0, 65, 536, CHARACTER},
+    {CHARACTER, 0, 66, 537, CHARACTER},
+    {CHARACTER, 0, 76, 538, CHARACTER},
+    {CHARACTER, 0, 69, 539, CHARACTER},
     {Q_INVOKABLE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 82, 534, CHARACTER},
-    {CHARACTER, 0, 73, 535, CHARACTER},
-    {CHARACTER, 0, 80, 536, CHARACTER},
-    {CHARACTER, 0, 84, 537, CHARACTER},
-    {CHARACTER, 0, 65, 538, CHARACTER},
-    {CHARACTER, 0, 66, 539, CHARACTER},
-    {CHARACTER, 0, 76, 540, CHARACTER},
-    {CHARACTER, 0, 69, 541, CHARACTER},
+    {CHARACTER, 0, 82, 541, CHARACTER},
+    {CHARACTER, 0, 73, 542, CHARACTER},
+    {CHARACTER, 0, 80, 543, CHARACTER},
+    {CHARACTER, 0, 84, 544, CHARACTER},
+    {CHARACTER, 0, 65, 545, CHARACTER},
+    {CHARACTER, 0, 66, 546, CHARACTER},
+    {CHARACTER, 0, 76, 547, CHARACTER},
+    {CHARACTER, 0, 69, 548, CHARACTER},
     {Q_SCRIPTABLE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 82, 543, CHARACTER},
-    {CHARACTER, 0, 79, 544, CHARACTER},
-    {CHARACTER, 0, 80, 545, CHARACTER},
-    {CHARACTER, 0, 69, 546, CHARACTER},
-    {CHARACTER, 0, 82, 547, CHARACTER},
-    {CHARACTER, 0, 84, 548, CHARACTER},
-    {CHARACTER, 0, 89, 549, CHARACTER},
+    {CHARACTER, 0, 82, 550, CHARACTER},
+    {CHARACTER, 0, 79, 551, CHARACTER},
+    {CHARACTER, 0, 80, 552, CHARACTER},
+    {CHARACTER, 0, 69, 553, CHARACTER},
+    {CHARACTER, 0, 82, 554, CHARACTER},
+    {CHARACTER, 0, 84, 555, CHARACTER},
+    {CHARACTER, 0, 89, 556, CHARACTER},
     {Q_PRIVATE_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 69, 551, CHARACTER},
-    {CHARACTER, 0, 86, 552, CHARACTER},
-    {CHARACTER, 0, 73, 553, CHARACTER},
-    {CHARACTER, 0, 83, 554, CHARACTER},
-    {CHARACTER, 0, 73, 555, CHARACTER},
-    {CHARACTER, 0, 79, 556, CHARACTER},
-    {CHARACTER, 0, 78, 557, CHARACTER},
+    {CHARACTER, 0, 69, 558, CHARACTER},
+    {CHARACTER, 0, 86, 559, CHARACTER},
+    {CHARACTER, 0, 73, 560, CHARACTER},
+    {CHARACTER, 0, 83, 561, CHARACTER},
+    {CHARACTER, 0, 73, 562, CHARACTER},
+    {CHARACTER, 0, 79, 563, CHARACTER},
+    {CHARACTER, 0, 78, 564, CHARACTER},
     {Q_REVISION_TOKEN, 0, 0, 0, CHARACTER},
     {NEWLINE, 0, 0, 0, NOTOKEN},
     {QUOTE, 0, 0, 0, NOTOKEN},
     {SINGLEQUOTE, 0, 0, 0, NOTOKEN},
     {WHITESPACE, 0, 0, 0, NOTOKEN},
-    {HASH, 0, 35, 563, HASH},
+    {HASH, 0, 35, 570, HASH},
     {PP_HASHHASH, 0, 0, 0, NOTOKEN},
     {BACKSLASH, 0, 0, 0, NOTOKEN},
     {CPP_COMMENT, 0, 0, 0, NOTOKEN},
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 5d777ece2e..50946443be 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -159,6 +159,7 @@ Type Moc::parseType()
     bool isVoid = false;
     type.firstToken = lookup();
     for (;;) {
+        skipCxxAttributes();
         switch (next()) {
             case SIGNED:
             case UNSIGNED:
@@ -188,8 +189,11 @@ Type Moc::parseType()
         }
         break;
     }
+
+    skipCxxAttributes();
     test(ENUM) || test(CLASS) || test(STRUCT);
     for(;;) {
+        skipCxxAttributes();
         switch (next()) {
         case IDENTIFIER:
             // void mySlot(unsigned myArg)
@@ -281,6 +285,7 @@ bool Moc::parseEnum(EnumDef *def)
             break;
         next(IDENTIFIER);
         def->values += lexem();
+        skipCxxAttributes();
     } while (test(EQ) ? until(COMMA) : test(COMMA));
     next(RBRACE);
     if (isTypdefEnum) {
@@ -356,6 +361,15 @@ bool Moc::testFunctionAttribute(Token tok, FunctionDef *def)
     return false;
 }
 
+bool Moc::skipCxxAttributes()
+{
+    auto rewind = index;
+    if (test(LBRACK) && test(LBRACK) && until(RBRACK) && test(RBRACK))
+        return true;
+    index = rewind;
+    return false;
+}
+
 bool Moc::testFunctionRevision(FunctionDef *def)
 {
     if (test(Q_REVISION_TOKEN)) {
@@ -381,7 +395,7 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro)
     //skip modifiers and attributes
     while (test(INLINE) || (test(STATIC) && (def->isStatic = true) == true) ||
         (test(VIRTUAL) && (def->isVirtual = true) == true) //mark as virtual
-        || testFunctionAttribute(def) || testFunctionRevision(def)) {}
+        || skipCxxAttributes() || testFunctionAttribute(def) || testFunctionRevision(def)) {}
     bool templateFunction = (lookup() == TEMPLATE);
     def->type = parseType();
     if (def->type.name.isEmpty()) {
@@ -454,10 +468,11 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro)
             until(RBRACE);
         else if ((def->isAbstract = test(EQ)))
             until(SEMIC);
+        else if (skipCxxAttributes())
+            until(SEMIC);
         else
             error();
     }
-
     if (scopedFunctionName) {
         const QByteArray msg = "Function declaration " + def->name
                 + " contains extra qualification. Ignoring as signal or slot.";
@@ -475,7 +490,7 @@ bool Moc::parseMaybeFunction(const ClassDef *cdef, FunctionDef *def)
     //skip modifiers and attributes
     while (test(EXPLICIT) || test(INLINE) || (test(STATIC) && (def->isStatic = true) == true) ||
         (test(VIRTUAL) && (def->isVirtual = true) == true) //mark as virtual
-        || testFunctionAttribute(def) || testFunctionRevision(def)) {}
+        || skipCxxAttributes() || testFunctionAttribute(def) || testFunctionRevision(def)) {}
     bool tilde = test(TILDE);
     def->type = parseType();
     if (def->type.name.isEmpty())
@@ -565,6 +580,7 @@ void Moc::parse()
                     } else if (!test(SEMIC)) {
                         NamespaceDef def;
                         def.classname = nsName;
+                        def.doGenerate = currentFilenames.size() <= 1;
 
                         next(LBRACE);
                         def.begin = index - 1;
@@ -572,25 +588,22 @@ void Moc::parse()
                         def.end = index;
                         index = def.begin + 1;
 
-                        const bool parseNamespace = currentFilenames.size() <= 1;
-                        if (parseNamespace) {
-                            for (int i = namespaceList.size() - 1; i >= 0; --i) {
-                                if (inNamespace(&namespaceList.at(i))) {
-                                    def.qualified.prepend(namespaceList.at(i).classname + "::");
-                                }
-                            }
-                            for (const QByteArray &ns : nested) {
-                                NamespaceDef parentNs;
-                                parentNs.classname = ns;
-                                parentNs.qualified = def.qualified;
-                                def.qualified += ns + "::";
-                                parentNs.begin = def.begin;
-                                parentNs.end = def.end;
-                                namespaceList += parentNs;
+                        for (int i = namespaceList.size() - 1; i >= 0; --i) {
+                            if (inNamespace(&namespaceList.at(i))) {
+                                def.qualified.prepend(namespaceList.at(i).classname + "::");
                             }
                         }
+                        for (const QByteArray &ns : nested) {
+                            NamespaceDef parentNs;
+                            parentNs.classname = ns;
+                            parentNs.qualified = def.qualified;
+                            def.qualified += ns + "::";
+                            parentNs.begin = def.begin;
+                            parentNs.end = def.end;
+                            namespaceList += parentNs;
+                        }
 
-                        while (parseNamespace && inNamespace(&def) && hasNext()) {
+                        while (inNamespace(&def) && hasNext()) {
                             switch (next()) {
                             case NAMESPACE:
                                 if (test(IDENTIFIER)) {
@@ -607,6 +620,13 @@ void Moc::parse()
                             case Q_NAMESPACE_TOKEN:
                                 def.hasQNamespace = true;
                                 break;
+                            case Q_NAMESPACE_EXPORT_TOKEN:
+                                next(LPAREN);
+                                while (test(IDENTIFIER))
+                                    {}
+                                next(RPAREN);
+                                def.hasQNamespace = true;
+                                break;
                             case Q_ENUMS_TOKEN:
                             case Q_ENUM_NS_TOKEN:
                                 parseEnumOrFlag(&def, false);
@@ -915,7 +935,8 @@ void Moc::parse()
         } else {
             knownGadgets.insert(def.classname, def.qualified);
             knownGadgets.insert(def.qualified, def.qualified);
-            classList += def;
+            if (n.doGenerate)
+                classList += def;
         }
     }
 }
@@ -1180,6 +1201,15 @@ void Moc::createPropertyDef(PropertyDef &propDef)
 
     propDef.type = type;
 
+    auto checkIsFunction = [&](const QByteArray &def, const char *name) {
+        if (def.endsWith(')')) {
+            QByteArray msg = "Providing a function for ";
+            msg += name;
+            msg += " in a property declaration is deprecated and will not be supported in Qt 6 anymore.";
+            warning(msg.constData());
+        }
+    };
+
     next();
     propDef.name = lexem();
     while (test(IDENTIFIER)) {
@@ -1229,11 +1259,13 @@ void Moc::createPropertyDef(PropertyDef &propDef)
                 error(2);
             break;
         case 'S':
-            if (l == "SCRIPTABLE")
+            if (l == "SCRIPTABLE") {
                 propDef.scriptable = v + v2;
-            else if (l == "STORED")
+                checkIsFunction(propDef.scriptable, "SCRIPTABLE");
+            } else if (l == "STORED") {
                 propDef.stored = v + v2;
-            else
+                checkIsFunction(propDef.stored, "STORED");
+            } else
                 error(2);
             break;
         case 'W': if (l != "WRITE") error(2);
@@ -1241,15 +1273,18 @@ void Moc::createPropertyDef(PropertyDef &propDef)
             break;
         case 'D': if (l != "DESIGNABLE") error(2);
             propDef.designable = v + v2;
+            checkIsFunction(propDef.designable, "DESIGNABLE");
             break;
         case 'E': if (l != "EDITABLE") error(2);
             propDef.editable = v + v2;
+            checkIsFunction(propDef.editable, "EDITABLE");
             break;
         case 'N': if (l != "NOTIFY") error(2);
             propDef.notify = v;
             break;
         case 'U': if (l != "USER") error(2);
             propDef.user = v + v2;
+            checkIsFunction(propDef.user, "USER");
             break;
         default:
             error(2);
@@ -1297,6 +1332,9 @@ void Moc::parsePluginData(ClassDef *def)
         if (l == "IID") {
             next(STRING_LITERAL);
             def->pluginData.iid = unquotedLexem();
+        } else if (l == "URI") {
+            next(STRING_LITERAL);
+            def->pluginData.uri = unquotedLexem();
         } else if (l == "FILE") {
             next(STRING_LITERAL);
             QByteArray metaDataFile = unquotedLexem();
@@ -1337,6 +1375,7 @@ void Moc::parsePluginData(ClassDef *def)
                     + " does not contain a valid JSON object. Declaration will be ignored";
             warning(msg.constData());
             def->pluginData.iid = QByteArray();
+            def->pluginData.uri = QByteArray();
             return;
         }
     }
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index d6482f4e44..bb1c9501fe 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -167,6 +167,7 @@ struct ClassDef : BaseDef {
 
     struct PluginData {
         QByteArray iid;
+        QByteArray uri;
         QMap<QString, QJsonArray> metaArgs;
         QJsonDocument metaData;
     } pluginData;
@@ -188,6 +189,7 @@ Q_DECLARE_TYPEINFO(ClassDef::Interface, Q_MOVABLE_TYPE);
 
 struct NamespaceDef : BaseDef {
     bool hasQNamespace = false;
+    bool doGenerate = false;
 };
 Q_DECLARE_TYPEINFO(NamespaceDef, Q_MOVABLE_TYPE);
 
@@ -256,6 +258,8 @@ public:
     bool testFunctionAttribute(Token tok, FunctionDef *def);
     bool testFunctionRevision(FunctionDef *def);
 
+    bool skipCxxAttributes();
+
     void checkSuperClasses(ClassDef *def);
     void checkProperties(ClassDef* cdef);
 };
diff --git a/src/tools/moc/parser.h b/src/tools/moc/parser.h
index bedcbbf7e2..63f4cf0d9a 100644
--- a/src/tools/moc/parser.h
+++ b/src/tools/moc/parser.h
@@ -69,9 +69,9 @@ public:
     inline const Symbol &symbol() { return symbols.at(index-1);}
 
     Q_NORETURN void error(int rollback);
-    Q_NORETURN void error(const char *msg = 0);
-    void warning(const char * = 0);
-    void note(const char * = 0);
+    Q_NORETURN void error(const char *msg = nullptr);
+    void warning(const char * = nullptr);
+    void note(const char * = nullptr);
 
 };
 
diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h
index db9d319b78..0cc163f9e4 100644
--- a/src/tools/moc/token.h
+++ b/src/tools/moc/token.h
@@ -155,6 +155,7 @@ QT_BEGIN_NAMESPACE
     F(Q_OBJECT_TOKEN) \
     F(Q_GADGET_TOKEN) \
     F(Q_NAMESPACE_TOKEN) \
+    F(Q_NAMESPACE_EXPORT_TOKEN) \
     F(Q_PROPERTY_TOKEN) \
     F(Q_PLUGIN_METADATA_TOKEN) \
     F(Q_ENUMS_TOKEN) \
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp
index df850c1bdc..9248e9e2e7 100644
--- a/src/tools/moc/util/generate_keywords.cpp
+++ b/src/tools/moc/util/generate_keywords.cpp
@@ -214,6 +214,7 @@ static const Keyword keywords[] = {
     { "return", "RETURN" },
     { "Q_OBJECT", "Q_OBJECT_TOKEN" },
     { "Q_NAMESPACE", "Q_NAMESPACE_TOKEN" },
+    { "Q_NAMESPACE_EXPORT", "Q_NAMESPACE_EXPORT_TOKEN" },
     { "Q_GADGET", "Q_GADGET_TOKEN" },
     { "Q_PROPERTY", "Q_PROPERTY_TOKEN" },
     { "Q_PLUGIN_METADATA", "Q_PLUGIN_METADATA_TOKEN" },
diff --git a/src/tools/moc/util/generate_keywords.pro b/src/tools/moc/util/generate_keywords.pro
index 2bbc3ced61..e29738c18a 100644
--- a/src/tools/moc/util/generate_keywords.pro
+++ b/src/tools/moc/util/generate_keywords.pro
@@ -1,4 +1,5 @@
 CONFIG -= moc
 CONFIG += cmdline
+QT = core
 
 SOURCES += generate_keywords.cpp
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
index 7c6f0bdeef..522c55593f 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -32,7 +32,6 @@
 #include <qfile.h>
 #include <qlist.h>
 #include <qbuffer.h>
-#include <qregexp.h>
 #include <qvector.h>
 #include <qdebug.h>
 
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
index ea410cd257..ce4232f3e8 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -161,22 +161,22 @@ static QString moc(const QString &name)
 
 static QTextStream &writeHeader(QTextStream &ts, bool changesWillBeLost)
 {
-    ts << "/*" << endl
-       << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << endl
-       << " * Command line was: " << commandLine << endl
-       << " *" << endl
-       << " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << endl
-       << " *" << endl
-       << " * This is an auto-generated file." << endl;
+    ts << "/*" << Qt::endl
+       << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << Qt::endl
+       << " * Command line was: " << commandLine << Qt::endl
+       << " *" << Qt::endl
+       << " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << Qt::endl
+       << " *" << Qt::endl
+       << " * This is an auto-generated file." << Qt::endl;
 
     if (changesWillBeLost)
-        ts << " * Do not edit! All changes made to it will be lost." << endl;
+        ts << " * Do not edit! All changes made to it will be lost." << Qt::endl;
     else
-        ts << " * This file may have been hand-edited. Look for HAND-EDIT comments" << endl
-           << " * before re-generating it." << endl;
+        ts << " * This file may have been hand-edited. Look for HAND-EDIT comments" << Qt::endl
+           << " * before re-generating it." << Qt::endl;
 
-    ts << " */" << endl
-       << endl;
+    ts << " */" << Qt::endl
+       << Qt::endl;
 
     return ts;
 }
@@ -466,66 +466,66 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
     }
     includeGuard = QString(QLatin1String("%1"))
                    .arg(includeGuard);
-    hs << "#ifndef " << includeGuard << endl
-       << "#define " << includeGuard << endl
-       << endl;
+    hs << "#ifndef " << includeGuard << Qt::endl
+       << "#define " << includeGuard << Qt::endl
+       << Qt::endl;
 
     // include our stuff:
-    hs << "#include <QtCore/QObject>" << endl
+    hs << "#include <QtCore/QObject>" << Qt::endl
        << includeList
-       << "#include <QtDBus/QtDBus>" << endl;
+       << "#include <QtDBus/QtDBus>" << Qt::endl;
 
     for (const QString &include : qAsConst(includes)) {
-        hs << "#include \"" << include << "\"" << endl;
+        hs << "#include \"" << include << "\"" << Qt::endl;
         if (headerName.isEmpty())
-            cs << "#include \"" << include << "\"" << endl;
+            cs << "#include \"" << include << "\"" << Qt::endl;
     }
 
-    hs << endl;
+    hs << Qt::endl;
 
     if (cppName != headerName) {
         if (!headerName.isEmpty() && headerName != QLatin1String("-"))
-            cs << "#include \"" << headerName << "\"" << endl << endl;
+            cs << "#include \"" << headerName << "\"" << Qt::endl << Qt::endl;
     }
 
     for (const QDBusIntrospection::Interface *interface : interfaces) {
         QString className = classNameForInterface(interface->name, Proxy);
 
         // comment:
-        hs << "/*" << endl
-           << " * Proxy class for interface " << interface->name << endl
-           << " */" << endl;
-        cs << "/*" << endl
-           << " * Implementation of interface class " << className << endl
-           << " */" << endl
-           << endl;
+        hs << "/*" << Qt::endl
+           << " * Proxy class for interface " << interface->name << Qt::endl
+           << " */" << Qt::endl;
+        cs << "/*" << Qt::endl
+           << " * Implementation of interface class " << className << Qt::endl
+           << " */" << Qt::endl
+           << Qt::endl;
 
         // class header:
-        hs << "class " << className << ": public QDBusAbstractInterface" << endl
-           << "{" << endl
-           << "    Q_OBJECT" << endl;
+        hs << "class " << className << ": public QDBusAbstractInterface" << Qt::endl
+           << "{" << Qt::endl
+           << "    Q_OBJECT" << Qt::endl;
 
         // the interface name
-        hs << "public:" << endl
-           << "    static inline const char *staticInterfaceName()" << endl
-           << "    { return \"" << interface->name << "\"; }" << endl
-           << endl;
+        hs << "public:" << Qt::endl
+           << "    static inline const char *staticInterfaceName()" << Qt::endl
+           << "    { return \"" << interface->name << "\"; }" << Qt::endl
+           << Qt::endl;
 
         // constructors/destructors:
-        hs << "public:" << endl
-           << "    " << className << "(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);" << endl
-           << endl
-           << "    ~" << className << "();" << endl
-           << endl;
-        cs << className << "::" << className << "(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)" << endl
-           << "    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)" << endl
-           << "{" << endl
-           << "}" << endl
-           << endl
-           << className << "::~" << className << "()" << endl
-           << "{" << endl
-           << "}" << endl
-           << endl;
+        hs << "public:" << Qt::endl
+           << "    " << className << "(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);" << Qt::endl
+           << Qt::endl
+           << "    ~" << className << "();" << Qt::endl
+           << Qt::endl;
+        cs << className << "::" << className << "(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)" << Qt::endl
+           << "    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)" << Qt::endl
+           << "{" << Qt::endl
+           << "}" << Qt::endl
+           << Qt::endl
+           << className << "::~" << className << "()" << Qt::endl
+           << "{" << Qt::endl
+           << "}" << Qt::endl
+           << Qt::endl;
 
         // properties:
         for (const QDBusIntrospection::Property &property : interface->properties) {
@@ -545,27 +545,27 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
                 // it's writeable
                 hs << " WRITE " << setter;
 
-            hs << ")" << endl;
+            hs << ")" << Qt::endl;
 
             // getter:
             if (property.access != QDBusIntrospection::Property::Write) {
-                hs << "    inline " << type << " " << getter << "() const" << endl
+                hs << "    inline " << type << " " << getter << "() const" << Qt::endl
                     << "    { return qvariant_cast< " << type << " >(property(\""
-                    << property.name << "\")); }" << endl;
+                    << property.name << "\")); }" << Qt::endl;
             }
 
             // setter:
             if (property.access != QDBusIntrospection::Property::Read) {
-                hs << "    inline void " << setter << "(" << constRefArg(type) << "value)" << endl
+                hs << "    inline void " << setter << "(" << constRefArg(type) << "value)" << Qt::endl
                    << "    { setProperty(\"" << property.name
-                   << "\", QVariant::fromValue(value)); }" << endl;
+                   << "\", QVariant::fromValue(value)); }" << Qt::endl;
             }
 
-            hs << endl;
+            hs << Qt::endl;
         }
 
         // methods:
-        hs << "public Q_SLOTS: // METHODS" << endl;
+        hs << "public Q_SLOTS: // METHODS" << Qt::endl;
         for (const QDBusIntrospection::Method &method : interface->methods) {
             bool isDeprecated = method.annotations.value(QLatin1String("org.freedesktop.DBus.Deprecated")) == QLatin1String("true");
             bool isNoReply =
@@ -595,26 +595,26 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
             QStringList argNames = makeArgNames(method.inputArgs);
             writeArgList(hs, argNames, method.annotations, method.inputArgs);
 
-            hs << ")" << endl
-               << "    {" << endl
-               << "        QList<QVariant> argumentList;" << endl;
+            hs << ")" << Qt::endl
+               << "    {" << Qt::endl
+               << "        QList<QVariant> argumentList;" << Qt::endl;
 
             if (!method.inputArgs.isEmpty()) {
                 hs << "        argumentList";
                 for (int argPos = 0; argPos < method.inputArgs.count(); ++argPos)
                     hs << " << QVariant::fromValue(" << argNames.at(argPos) << ')';
-                hs << ";" << endl;
+                hs << ";" << Qt::endl;
             }
 
             if (isNoReply)
                 hs << "        callWithArgumentList(QDBus::NoBlock, "
-                   <<  "QStringLiteral(\"" << method.name << "\"), argumentList);" << endl;
+                   <<  "QStringLiteral(\"" << method.name << "\"), argumentList);" << Qt::endl;
             else
                 hs << "        return asyncCallWithArgumentList(QStringLiteral(\""
-                   << method.name << "\"), argumentList);" << endl;
+                   << method.name << "\"), argumentList);" << Qt::endl;
 
             // close the function:
-            hs << "    }" << endl;
+            hs << "    }" << Qt::endl;
 
             if (method.outputArgs.count() > 1) {
                 // generate the old-form QDBusReply methods with multiple incoming parameters
@@ -627,39 +627,39 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
                 QStringList argNames = makeArgNames(method.inputArgs, method.outputArgs);
                 writeArgList(hs, argNames, method.annotations, method.inputArgs, method.outputArgs);
 
-                hs << ")" << endl
-                   << "    {" << endl
-                   << "        QList<QVariant> argumentList;" << endl;
+                hs << ")" << Qt::endl
+                   << "    {" << Qt::endl
+                   << "        QList<QVariant> argumentList;" << Qt::endl;
 
                 int argPos = 0;
                 if (!method.inputArgs.isEmpty()) {
                     hs << "        argumentList";
                     for (argPos = 0; argPos < method.inputArgs.count(); ++argPos)
                         hs << " << QVariant::fromValue(" << argNames.at(argPos) << ')';
-                    hs << ";" << endl;
+                    hs << ";" << Qt::endl;
                 }
 
                 hs << "        QDBusMessage reply = callWithArgumentList(QDBus::Block, "
-                   <<  "QStringLiteral(\"" << method.name << "\"), argumentList);" << endl;
+                   <<  "QStringLiteral(\"" << method.name << "\"), argumentList);" << Qt::endl;
 
                 argPos++;
                 hs << "        if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == "
-                   << method.outputArgs.count() << ") {" << endl;
+                   << method.outputArgs.count() << ") {" << Qt::endl;
 
                 // yes, starting from 1
                 for (int i = 1; i < method.outputArgs.count(); ++i)
                     hs << "            " << argNames.at(argPos++) << " = qdbus_cast<"
                        << templateArg(qtTypeName(method.outputArgs.at(i).type, method.annotations, i, "Out"))
-                       << ">(reply.arguments().at(" << i << "));" << endl;
-                hs << "        }" << endl
-                   << "        return reply;" << endl
-                   << "    }" << endl;
+                       << ">(reply.arguments().at(" << i << "));" << Qt::endl;
+                hs << "        }" << Qt::endl
+                   << "        return reply;" << Qt::endl
+                   << "    }" << Qt::endl;
             }
 
-            hs << endl;
+            hs << Qt::endl;
         }
 
-        hs << "Q_SIGNALS: // SIGNALS" << endl;
+        hs << "Q_SIGNALS: // SIGNALS" << Qt::endl;
         for (const QDBusIntrospection::Signal &signal : interface->signals_) {
             hs << "    ";
             if (signal.annotations.value(QLatin1String("org.freedesktop.DBus.Deprecated")) ==
@@ -671,12 +671,12 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
             QStringList argNames = makeArgNames(signal.outputArgs);
             writeSignalArgList(hs, argNames, signal.annotations, signal.outputArgs);
 
-            hs << ");" << endl; // finished for header
+            hs << ");" << Qt::endl; // finished for header
         }
 
         // close the class:
-        hs << "};" << endl
-           << endl;
+        hs << "};" << Qt::endl
+           << Qt::endl;
     }
 
     if (!skipNamespaces) {
@@ -698,17 +698,17 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
             // i parts matched
             // close last.arguments().count() - i namespaces:
             for (int j = i; j < last.count(); ++j)
-                hs << QString((last.count() - j - 1 + i) * 2, QLatin1Char(' ')) << "}" << endl;
+                hs << QString((last.count() - j - 1 + i) * 2, QLatin1Char(' ')) << "}" << Qt::endl;
 
             // open current.arguments().count() - i namespaces
             for (int j = i; j < current.count(); ++j)
-                hs << QString(j * 2, QLatin1Char(' ')) << "namespace " << current.at(j) << " {" << endl;
+                hs << QString(j * 2, QLatin1Char(' ')) << "namespace " << current.at(j) << " {" << Qt::endl;
 
             // add this class:
             if (!name.isEmpty()) {
                 hs << QString(current.count() * 2, QLatin1Char(' '))
                    << "typedef ::" << classNameForInterface(it->constData()->name, Proxy)
-                   << " " << name << ";" << endl;
+                   << " " << name << ";" << Qt::endl;
             }
 
             if (it == interfaces.constEnd())
@@ -719,12 +719,12 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
     }
 
     // close the include guard
-    hs << "#endif" << endl;
+    hs << "#endif" << Qt::endl;
 
     QString mocName = moc(filename);
     if (includeMocs && !mocName.isEmpty())
-        cs << endl
-           << "#include \"" << mocName << "\"" << endl;
+        cs << Qt::endl
+           << "#include \"" << mocName << "\"" << Qt::endl;
 
     cs.flush();
     hs.flush();
@@ -772,36 +772,36 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
     }
     includeGuard = QString(QLatin1String("%1"))
                    .arg(includeGuard);
-    hs << "#ifndef " << includeGuard << endl
-       << "#define " << includeGuard << endl
-       << endl;
+    hs << "#ifndef " << includeGuard << Qt::endl
+       << "#define " << includeGuard << Qt::endl
+       << Qt::endl;
 
     // include our stuff:
-    hs << "#include <QtCore/QObject>" << endl;
+    hs << "#include <QtCore/QObject>" << Qt::endl;
     if (cppName == headerName)
-        hs << "#include <QtCore/QMetaObject>" << endl
-           << "#include <QtCore/QVariant>" << endl;
-    hs << "#include <QtDBus/QtDBus>" << endl;
+        hs << "#include <QtCore/QMetaObject>" << Qt::endl
+           << "#include <QtCore/QVariant>" << Qt::endl;
+    hs << "#include <QtDBus/QtDBus>" << Qt::endl;
 
     for (const QString &include : qAsConst(includes)) {
-        hs << "#include \"" << include << "\"" << endl;
+        hs << "#include \"" << include << "\"" << Qt::endl;
         if (headerName.isEmpty())
-            cs << "#include \"" << include << "\"" << endl;
+            cs << "#include \"" << include << "\"" << Qt::endl;
     }
 
     if (cppName != headerName) {
         if (!headerName.isEmpty() && headerName != QLatin1String("-"))
-            cs << "#include \"" << headerName << "\"" << endl;
+            cs << "#include \"" << headerName << "\"" << Qt::endl;
 
-        cs << "#include <QtCore/QMetaObject>" << endl
+        cs << "#include <QtCore/QMetaObject>" << Qt::endl
            << includeList
-           << endl;
+           << Qt::endl;
         hs << forwardDeclarations;
     } else {
         hs << includeList;
     }
 
-    hs << endl;
+    hs << Qt::endl;
 
     QString parent = parentClassName;
     if (parentClassName.isEmpty())
@@ -811,47 +811,47 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
         QString className = classNameForInterface(interface->name, Adaptor);
 
         // comment:
-        hs << "/*" << endl
-           << " * Adaptor class for interface " << interface->name << endl
-           << " */" << endl;
-        cs << "/*" << endl
-           << " * Implementation of adaptor class " << className << endl
-           << " */" << endl
-           << endl;
+        hs << "/*" << Qt::endl
+           << " * Adaptor class for interface " << interface->name << Qt::endl
+           << " */" << Qt::endl;
+        cs << "/*" << Qt::endl
+           << " * Implementation of adaptor class " << className << Qt::endl
+           << " */" << Qt::endl
+           << Qt::endl;
 
         // class header:
-        hs << "class " << className << ": public QDBusAbstractAdaptor" << endl
-           << "{" << endl
-           << "    Q_OBJECT" << endl
-           << "    Q_CLASSINFO(\"D-Bus Interface\", \"" << interface->name << "\")" << endl
-           << "    Q_CLASSINFO(\"D-Bus Introspection\", \"\"" << endl
+        hs << "class " << className << ": public QDBusAbstractAdaptor" << Qt::endl
+           << "{" << Qt::endl
+           << "    Q_OBJECT" << Qt::endl
+           << "    Q_CLASSINFO(\"D-Bus Interface\", \"" << interface->name << "\")" << Qt::endl
+           << "    Q_CLASSINFO(\"D-Bus Introspection\", \"\"" << Qt::endl
            << stringify(interface->introspection)
-           << "        \"\")" << endl
-           << "public:" << endl
-           << "    " << className << "(" << parent << " *parent);" << endl
-           << "    virtual ~" << className << "();" << endl
-           << endl;
+           << "        \"\")" << Qt::endl
+           << "public:" << Qt::endl
+           << "    " << className << "(" << parent << " *parent);" << Qt::endl
+           << "    virtual ~" << className << "();" << Qt::endl
+           << Qt::endl;
 
         if (!parentClassName.isEmpty())
-            hs << "    inline " << parent << " *parent() const" << endl
-               << "    { return static_cast<" << parent << " *>(QObject::parent()); }" << endl
-               << endl;
+            hs << "    inline " << parent << " *parent() const" << Qt::endl
+               << "    { return static_cast<" << parent << " *>(QObject::parent()); }" << Qt::endl
+               << Qt::endl;
 
         // constructor/destructor
-        cs << className << "::" << className << "(" << parent << " *parent)" << endl
-           << "    : QDBusAbstractAdaptor(parent)" << endl
-           << "{" << endl
-           << "    // constructor" << endl
-           << "    setAutoRelaySignals(true);" << endl
-           << "}" << endl
-           << endl
-           << className << "::~" << className << "()" << endl
-           << "{" << endl
-           << "    // destructor" << endl
-           << "}" << endl
-           << endl;
-
-        hs << "public: // PROPERTIES" << endl;
+        cs << className << "::" << className << "(" << parent << " *parent)" << Qt::endl
+           << "    : QDBusAbstractAdaptor(parent)" << Qt::endl
+           << "{" << Qt::endl
+           << "    // constructor" << Qt::endl
+           << "    setAutoRelaySignals(true);" << Qt::endl
+           << "}" << Qt::endl
+           << Qt::endl
+           << className << "::~" << className << "()" << Qt::endl
+           << "{" << Qt::endl
+           << "    // destructor" << Qt::endl
+           << "}" << Qt::endl
+           << Qt::endl;
+
+        hs << "public: // PROPERTIES" << Qt::endl;
         for (const QDBusIntrospection::Property &property : interface->properties) {
             QByteArray type = qtTypeName(property.type, property.annotations);
             QString constRefType = constRefArg(type);
@@ -863,38 +863,38 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
                 hs << " READ " << getter;
             if (property.access != QDBusIntrospection::Property::Read)
                 hs << " WRITE " << setter;
-            hs << ")" << endl;
+            hs << ")" << Qt::endl;
 
             // getter:
             if (property.access != QDBusIntrospection::Property::Write) {
-                hs << "    " << type << " " << getter << "() const;" << endl;
+                hs << "    " << type << " " << getter << "() const;" << Qt::endl;
                 cs << type << " "
-                   << className << "::" << getter << "() const" << endl
-                   << "{" << endl
-                   << "    // get the value of property " << property.name << endl
-                   << "    return qvariant_cast< " << type <<" >(parent()->property(\"" << property.name << "\"));" << endl
-                   << "}" << endl
-                   << endl;
+                   << className << "::" << getter << "() const" << Qt::endl
+                   << "{" << Qt::endl
+                   << "    // get the value of property " << property.name << Qt::endl
+                   << "    return qvariant_cast< " << type <<" >(parent()->property(\"" << property.name << "\"));" << Qt::endl
+                   << "}" << Qt::endl
+                   << Qt::endl;
             }
 
             // setter
             if (property.access != QDBusIntrospection::Property::Read) {
-                hs << "    void " << setter << "(" << constRefType << "value);" << endl;
-                cs << "void " << className << "::" << setter << "(" << constRefType << "value)" << endl
-                   << "{" << endl
-                   << "    // set the value of property " << property.name << endl
+                hs << "    void " << setter << "(" << constRefType << "value);" << Qt::endl;
+                cs << "void " << className << "::" << setter << "(" << constRefType << "value)" << Qt::endl
+                   << "{" << Qt::endl
+                   << "    // set the value of property " << property.name << Qt::endl
                    << "    parent()->setProperty(\"" << property.name << "\", QVariant::fromValue(value";
                 if (constRefType.contains(QLatin1String("QDBusVariant")))
                     cs << ".variant()";
-                cs << "));" << endl
-                   << "}" << endl
-                   << endl;
+                cs << "));" << Qt::endl
+                   << "}" << Qt::endl
+                   << Qt::endl;
             }
 
-            hs << endl;
+            hs << Qt::endl;
         }
 
-        hs << "public Q_SLOTS: // METHODS" << endl;
+        hs << "public Q_SLOTS: // METHODS" << Qt::endl;
         for (const QDBusIntrospection::Method &method : interface->methods) {
             bool isNoReply =
                 method.annotations.value(QLatin1String(ANNOTATION_NO_WAIT)) == QLatin1String("true");
@@ -930,10 +930,10 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
             writeArgList(hs, argNames, method.annotations, method.inputArgs, method.outputArgs);
             writeArgList(cs, argNames, method.annotations, method.inputArgs, method.outputArgs);
 
-            hs << ");" << endl; // finished for header
-            cs << ")" << endl
-               << "{" << endl
-               << "    // handle method call " << interface->name << "." << methodName(method) << endl;
+            hs << ");" << Qt::endl; // finished for header
+            cs << ")" << Qt::endl
+               << "{" << Qt::endl
+               << "    // handle method call " << interface->name << "." << methodName(method) << Qt::endl;
 
             // make the call
             bool usingInvokeMethod = false;
@@ -945,7 +945,7 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
                 // we are using QMetaObject::invokeMethod
                 if (!returnType.isEmpty())
                     cs << "    " << returnType << " " << argNames.at(method.inputArgs.count())
-                       << ";" << endl;
+                       << ";" << Qt::endl;
 
                 static const char invoke[] = "    QMetaObject::invokeMethod(parent(), \"";
                 cs << invoke << name << "\"";
@@ -966,10 +966,10 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
                        << argNames.at(i)
                        << ")";
 
-                cs << ");" << endl;
+                cs << ");" << Qt::endl;
 
                 if (!returnType.isEmpty())
-                    cs << "    return " << argNames.at(method.inputArgs.count()) << ";" << endl;
+                    cs << "    return " << argNames.at(method.inputArgs.count()) << ";" << Qt::endl;
             } else {
                 if (parentClassName.isEmpty())
                     cs << "    //";
@@ -997,13 +997,13 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
                     first = false;
                 }
 
-                cs << ");" << endl;
+                cs << ");" << Qt::endl;
             }
-            cs << "}" << endl
-               << endl;
+            cs << "}" << Qt::endl
+               << Qt::endl;
         }
 
-        hs << "Q_SIGNALS: // SIGNALS" << endl;
+        hs << "Q_SIGNALS: // SIGNALS" << Qt::endl;
         for (const QDBusIntrospection::Signal &signal : interface->signals_) {
             hs << "    ";
             if (signal.annotations.value(QLatin1String("org.freedesktop.DBus.Deprecated")) ==
@@ -1015,21 +1015,21 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
             QStringList argNames = makeArgNames(signal.outputArgs);
             writeSignalArgList(hs, argNames, signal.annotations, signal.outputArgs);
 
-            hs << ");" << endl; // finished for header
+            hs << ");" << Qt::endl; // finished for header
         }
 
         // close the class:
-        hs << "};" << endl
-           << endl;
+        hs << "};" << Qt::endl
+           << Qt::endl;
     }
 
     // close the include guard
-    hs << "#endif" << endl;
+    hs << "#endif" << Qt::endl;
 
     QString mocName = moc(filename);
     if (includeMocs && !mocName.isEmpty())
-        cs << endl
-           << "#include \"" << mocName << "\"" << endl;
+        cs << Qt::endl
+           << "#include \"" << mocName << "\"" << Qt::endl;
 
     cs.flush();
     hs.flush();
diff --git a/src/tools/qfloat16-tables/gen_qfloat16_tables.cpp b/src/tools/qfloat16-tables/gen_qfloat16_tables.cpp
deleted file mode 100644
index 17fc978039..0000000000
--- a/src/tools/qfloat16-tables/gen_qfloat16_tables.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 by Southwest Research Institute (R)
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qfile.h>
-#include <qdebug.h>
-
-quint32 convertmantissa(qint32 i)
-{
-    quint32 m = i << 13; // Zero pad mantissa bits
-    quint32 e = 0; // Zero exponent
-
-    while (!(m & 0x00800000)) {   // While not normalized
-        e -= 0x00800000;     // Decrement exponent (1<<23)
-        m <<= 1;             // Shift mantissa
-    }
-    m &= ~0x00800000;          // Clear leading 1 bit
-    e += 0x38800000;           // Adjust bias ((127-14)<<23)
-    return m | e;            // Return combined number
-}
-
-// we first build these tables up and then print them out as a separate step in order
-// to more closely map the implementation given in the paper.
-quint32 basetable[512];
-quint32 shifttable[512];
-
-#define PRINTHEX(a) "0x" + QByteArray::number(a,16).toUpper() + "U,\n"
-
-qint32 main(qint32 argc, char **argv)
-{
-    if (argc < 2) {
-        qWarning() << "Must provide output filename as argument.";
-        return -1;
-    }
-
-    QFile fid(QFile::decodeName(argv[1]));
-    if (!fid.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qWarning() << "Abort: Failed to open/create file" << fid.fileName();
-        return -1;
-    }
-    quint32 i;
-
-    fid.write("/* This file was generated by gen_qfloat16_tables.cpp */\n\n");
-    fid.write("#include <QtCore/qfloat16.h>\n\n");
-
-    fid.write("QT_BEGIN_NAMESPACE\n\n");
-    fid.write("#if !defined(__F16C__) && !defined(__ARM_FP16_FORMAT_IEEE)\n\n");
-
-    fid.write("const quint32 qfloat16::mantissatable[2048] = {\n");
-    fid.write("0,\n");
-    for (i = 1; i < 1024; i++)
-        fid.write(PRINTHEX(convertmantissa(i)));
-    for (i = 1024; i < 2048; i++)
-        fid.write(PRINTHEX(0x38000000U + ((i - 1024) << 13)));
-    fid.write("};\n\n");
-
-    fid.write("const quint32 qfloat16::exponenttable[64] = {\n");
-    fid.write("0,\n");
-    for (i = 1; i < 31; i++)
-        fid.write(PRINTHEX(i << 23));
-    fid.write("0x47800000U,\n");  // 31
-    fid.write("0x80000000U,\n");  // 32
-    for (i = 33; i < 63; i++)
-        fid.write(PRINTHEX(0x80000000U + ((i - 32) << 23)));
-    fid.write("0xC7800000U,\n");  // 63
-    fid.write("};\n\n");
-
-    fid.write("const quint32 qfloat16::offsettable[64] = {\n");
-    fid.write("0,\n");
-    for (i = 1; i < 32; i++)
-        fid.write("1024U,\n");
-    fid.write("0,\n");
-    for (i = 33; i < 64; i++)
-        fid.write("1024U,\n");
-    fid.write("};\n\n");
-
-    qint32 e;
-    for (i = 0; i < 256; ++i) {
-        e = i - 127;
-        if (e < -24) {   // Very small numbers map to zero
-            basetable[i | 0x000] = 0x0000;
-            basetable[i | 0x100] = 0x8000;
-            shifttable[i | 0x000] = 24;
-            shifttable[i | 0x100] = 24;
-
-        } else if (e < -14) {             // Small numbers map to denorms
-            basetable[i | 0x000] = (0x0400 >> (-e - 14));
-            basetable[i | 0x100] = (0x0400 >> (-e - 14)) | 0x8000;
-            shifttable[i | 0x000] = -e - 1;
-            shifttable[i | 0x100] = -e - 1;
-
-        } else if (e <= 15) {            // Normal numbers just lose precision
-            basetable[i | 0x000] = ((e + 15) << 10);
-            basetable[i | 0x100] = ((e + 15) << 10) | 0x8000;
-            shifttable[i | 0x000] = 13;
-            shifttable[i | 0x100] = 13;
-
-        } else if (e < 128) {            // Large numbers map to Infinity
-            basetable[i | 0x000] = 0x7C00;
-            basetable[i | 0x100] = 0xFC00;
-            shifttable[i | 0x000] = 24;
-            shifttable[i | 0x100] = 24;
-
-        } else {                     // Infinity and NaN's stay Infinity and NaN's
-            basetable[i | 0x000] = 0x7C00;
-            basetable[i | 0x100] = 0xFC00;
-            shifttable[i | 0x000] = 13;
-            shifttable[i | 0x100] = 13;
-        }
-    }
-
-    fid.write("const quint32 qfloat16::basetable[512] = {\n");
-    for (i = 0; i < 512; i++)
-        fid.write(PRINTHEX(basetable[i]));
-
-    fid.write("};\n\n");
-
-    fid.write("const quint32 qfloat16::shifttable[512] = {\n");
-    for (i = 0; i < 512; i++)
-        fid.write(PRINTHEX(shifttable[i]));
-
-    fid.write("};\n\n");
-
-    fid.write("#endif // !__F16C__ && !__ARM_FP16_FORMAT_IEEE\n\n");
-    fid.write("QT_END_NAMESPACE\n");
-    fid.close();
-    return 0;
-}
diff --git a/src/tools/qfloat16-tables/qfloat16-tables.pro b/src/tools/qfloat16-tables/qfloat16-tables.pro
deleted file mode 100644
index a7d10ac197..0000000000
--- a/src/tools/qfloat16-tables/qfloat16-tables.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-option(host_build)
-
-CONFIG += force_bootstrap
-SOURCES += gen_qfloat16_tables.cpp
-
-load(qt_tool)
-
-lib.CONFIG = dummy_install
-INSTALLS = lib
diff --git a/src/tools/qlalr/cppgenerator.cpp b/src/tools/qlalr/cppgenerator.cpp
index 508db696b1..95f70dc988 100644
--- a/src/tools/qlalr/cppgenerator.cpp
+++ b/src/tools/qlalr/cppgenerator.cpp
@@ -36,6 +36,8 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qmap.h>
 
+#include <iterator>
+
 namespace {
 
 void generateSeparator(int i, QTextStream &out)
@@ -43,7 +45,7 @@ void generateSeparator(int i, QTextStream &out)
     if (!(i % 10)) {
         if (i)
             out << ",";
-        out << endl << "    ";
+        out << Qt::endl << "    ";
     } else {
         out << ", ";
     }
@@ -126,9 +128,9 @@ QString CppGenerator::endIncludeGuard(const QString &fileName)
 void CppGenerator::operator () ()
 {
   // action table...
-  state_count = aut.states.size ();
-  terminal_count = grammar.terminals.size ();
-  non_terminal_count = grammar.non_terminals.size ();
+  state_count = static_cast<int>(aut.states.size());
+  terminal_count = static_cast<int>(grammar.terminals.size());
+  non_terminal_count = static_cast<int>(grammar.non_terminals.size());
 
 #define ACTION(i, j) table [(i) * terminal_count + (j)]
 #define GOTO(i, j) pgoto [(i) * non_terminal_count + (j)]
@@ -156,7 +158,7 @@ void CppGenerator::operator () ()
 
           if (grammar.isNonTerminal (a.key ()))
             {
-              Q_ASSERT (symbol >= terminal_count && symbol < grammar.names.size ());
+              Q_ASSERT(symbol >= terminal_count && symbol < static_cast<int>(grammar.names.size()));
               GOTO (q, symbol - terminal_count) = r;
             }
 
@@ -187,14 +189,14 @@ void CppGenerator::operator () ()
                 {
                   if (verbose)
                     qout() << "*** Warning. Found a reduce/reduce conflict in state " << q << " on token ``" << s << "'' between rule "
-                         << r << " and " << -u << endl;
+                         << r << " and " << -u << Qt::endl;
 
                   ++reduce_reduce_conflict_count;
 
                   u = qMax (u, -r);
 
                   if (verbose)
-                    qout() << "\tresolved using rule " << -u << endl;
+                    qout() << "\tresolved using rule " << -u << Qt::endl;
                 }
 
               else if (u > 0)
@@ -227,7 +229,7 @@ void CppGenerator::operator () ()
                       ++shift_reduce_conflict_count;
 
                       if (verbose)
-                        qout() << "*** Warning. Found a shift/reduce conflict in state " << q << " on token ``" << s << "'' with rule " << r << endl;
+                        qout() << "*** Warning. Found a shift/reduce conflict in state " << q << " on token ``" << s << "'' with rule " << r << Qt::endl;
                     }
                 }
             }
@@ -238,14 +240,14 @@ void CppGenerator::operator () ()
     {
       if (shift_reduce_conflict_count != grammar.expected_shift_reduce
           || reduce_reduce_conflict_count != grammar.expected_reduce_reduce)
-        qerr() << "*** Conflicts: " << shift_reduce_conflict_count << " shift/reduce, " << reduce_reduce_conflict_count << " reduce/reduce" << endl;
+        qerr() << "*** Conflicts: " << shift_reduce_conflict_count << " shift/reduce, " << reduce_reduce_conflict_count << " reduce/reduce" << Qt::endl;
 
       if (verbose)
-        qout() << endl << "*** Conflicts: " << shift_reduce_conflict_count << " shift/reduce, " << reduce_reduce_conflict_count << " reduce/reduce" << endl
-             << endl;
+        qout() << Qt::endl << "*** Conflicts: " << shift_reduce_conflict_count << " shift/reduce, " << reduce_reduce_conflict_count << " reduce/reduce" << Qt::endl
+             << Qt::endl;
     }
 
-  QBitArray used_rules (grammar.rules.count ());
+  QBitArray used_rules{static_cast<int>(grammar.rules.size())};
 
   int q = 0;
   for (StatePointer state = aut.states.begin (); state != aut.states.end (); ++state, ++q)
@@ -259,14 +261,13 @@ void CppGenerator::operator () ()
         }
     }
 
-  for (int i = 0; i < used_rules.count (); ++i)
+  auto rule = grammar.rules.begin();
+  for (int i = 0; i < used_rules.count (); ++i, ++rule)
     {
       if (! used_rules.testBit (i))
         {
-          RulePointer rule = grammar.rules.begin () + i;
-
           if (rule != grammar.goal)
-            qerr() << "*** Warning: Rule ``" << *rule << "'' is useless!" << endl;
+            qerr() << "*** Warning: Rule ``" << *rule << "'' is useless!" << Qt::endl;
         }
     }
 
@@ -280,7 +281,7 @@ void CppGenerator::operator () ()
           if (u >= 0)
             continue;
 
-          RulePointer rule = grammar.rules.begin () + (- u - 1);
+          RulePointer rule = std::next(grammar.rules.begin(), - u - 1);
 
           if (state->defaultReduce == rule)
             u = 0;
@@ -348,26 +349,26 @@ void CppGenerator::operator () ()
         {
           out << copyrightHeader()
               << privateCopyrightHeader()
-              << endl;
+              << Qt::endl;
         }
 
       out << "// This file was generated by qlalr - DO NOT EDIT!\n";
 
-      out << startIncludeGuard(grammar.merged_output) << endl;
+      out << startIncludeGuard(grammar.merged_output) << Qt::endl;
 
       if (copyright) {
-          out << "#if defined(ERROR)" << endl
-              << "#  undef ERROR" << endl
-              << "#endif" << endl << endl;
+          out << "#if defined(ERROR)" << Qt::endl
+              << "#  undef ERROR" << Qt::endl
+              << "#endif" << Qt::endl << Qt::endl;
       }
 
       generateDecl (out);
       generateImpl (out);
       out << p.decls();
       out << p.impls();
-      out << endl;
+      out << Qt::endl;
 
-      out << endIncludeGuard(grammar.merged_output) << endl;
+      out << endIncludeGuard(grammar.merged_output) << Qt::endl;
 
       return;
     }
@@ -388,24 +389,24 @@ void CppGenerator::operator () ()
       {
         out << copyrightHeader()
             << privateCopyrightHeader()
-            << endl;
+            << Qt::endl;
       }
 
     out << "// This file was generated by qlalr - DO NOT EDIT!\n";
 
-    out << "#ifndef " << prot << endl
-        << "#define " << prot << endl
-        << endl;
+    out << "#ifndef " << prot << Qt::endl
+        << "#define " << prot << Qt::endl
+        << Qt::endl;
 
     if (copyright) {
-        out << "#include <QtCore/qglobal.h>" << endl << endl;
-        out << "QT_BEGIN_NAMESPACE" << endl << endl;
+        out << "#include <QtCore/qglobal.h>" << Qt::endl << Qt::endl;
+        out << "QT_BEGIN_NAMESPACE" << Qt::endl << Qt::endl;
     }
     generateDecl (out);
     if (copyright)
-        out << "QT_END_NAMESPACE" << endl;
+        out << "QT_END_NAMESPACE" << Qt::endl;
 
-    out << "#endif // " << prot << endl << endl;
+    out << "#endif // " << prot << Qt::endl << Qt::endl;
   } // end decls
 
   { // bits...
@@ -419,12 +420,12 @@ void CppGenerator::operator () ()
 
     out << "// This file was generated by qlalr - DO NOT EDIT!\n";
 
-    out << "#include \"" << declFileName << "\"" << endl << endl;
+    out << "#include \"" << declFileName << "\"" << Qt::endl << Qt::endl;
     if (copyright)
-        out << "QT_BEGIN_NAMESPACE" << endl << endl;
+        out << "QT_BEGIN_NAMESPACE" << Qt::endl << Qt::endl;
     generateImpl(out);
     if (copyright)
-        out << "QT_END_NAMESPACE" << endl;
+        out << "QT_END_NAMESPACE" << Qt::endl;
 
   } // end bits
 
@@ -455,10 +456,10 @@ QString CppGenerator::debugInfoProt() const
 
 void CppGenerator::generateDecl (QTextStream &out)
 {
-  out << "class " << grammar.table_name << endl
-      << "{" << endl
-      << "public:" << endl
-      << "    enum VariousConstants {" << endl;
+  out << "class " << grammar.table_name << Qt::endl
+      << "{" << Qt::endl
+      << "public:" << Qt::endl
+      << "    enum VariousConstants {" << Qt::endl;
 
   for (const Name &t : qAsConst(grammar.terminals))
     {
@@ -474,62 +475,62 @@ void CppGenerator::generateDecl (QTextStream &out)
       else
         name.prepend (grammar.token_prefix);
 
-      out << "        " << name << " = " << value << "," << endl;
+      out << "        " << name << " = " << value << "," << Qt::endl;
     }
 
-  out << endl
-      << "        ACCEPT_STATE = " << accept_state << "," << endl
-      << "        RULE_COUNT = " << grammar.rules.size () << "," << endl
-      << "        STATE_COUNT = " << state_count << "," << endl
-      << "        TERMINAL_COUNT = " << terminal_count << "," << endl
-      << "        NON_TERMINAL_COUNT = " << non_terminal_count << "," << endl
-      << endl
-      << "        GOTO_INDEX_OFFSET = " << compressed_action.index.size () << "," << endl
-      << "        GOTO_INFO_OFFSET = " << compressed_action.info.size () << "," << endl
-      << "        GOTO_CHECK_OFFSET = " << compressed_action.check.size () << endl
-      << "    };" << endl
-      << endl
-      << "    static const char *const     spell[];" << endl
-      << "    static const short             lhs[];" << endl
-      << "    static const short             rhs[];" << endl;
+  out << Qt::endl
+      << "        ACCEPT_STATE = " << accept_state << "," << Qt::endl
+      << "        RULE_COUNT = " << grammar.rules.size () << "," << Qt::endl
+      << "        STATE_COUNT = " << state_count << "," << Qt::endl
+      << "        TERMINAL_COUNT = " << terminal_count << "," << Qt::endl
+      << "        NON_TERMINAL_COUNT = " << non_terminal_count << "," << Qt::endl
+      << Qt::endl
+      << "        GOTO_INDEX_OFFSET = " << compressed_action.index.size () << "," << Qt::endl
+      << "        GOTO_INFO_OFFSET = " << compressed_action.info.size () << "," << Qt::endl
+      << "        GOTO_CHECK_OFFSET = " << compressed_action.check.size () << Qt::endl
+      << "    };" << Qt::endl
+      << Qt::endl
+      << "    static const char *const     spell[];" << Qt::endl
+      << "    static const short             lhs[];" << Qt::endl
+      << "    static const short             rhs[];" << Qt::endl;
 
   if (debug_info)
     {
       QString prot = debugInfoProt();
 
-      out << endl << "#ifndef " << prot << endl
-          << "    static const int     rule_index[];" << endl
-          << "    static const int      rule_info[];" << endl
-          << "#endif // " << prot << endl << endl;
+      out << Qt::endl << "#ifndef " << prot << Qt::endl
+          << "    static const int     rule_index[];" << Qt::endl
+          << "    static const int      rule_info[];" << Qt::endl
+          << "#endif // " << prot << Qt::endl << Qt::endl;
     }
 
-  out << "    static const short    goto_default[];" << endl
-      << "    static const short  action_default[];" << endl
-      << "    static const short    action_index[];" << endl
-      << "    static const short     action_info[];" << endl
-      << "    static const short    action_check[];" << endl
-      << endl
-      << "    static inline int nt_action (int state, int nt)" << endl
-      << "    {" << endl
-      << "        const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;" << endl
-      << "        if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)" << endl
-      << "            return goto_default [nt];" << endl
-      << endl
-      << "        return action_info [GOTO_INFO_OFFSET + yyn];" << endl
-      << "    }" << endl
-      << endl
-      << "    static inline int t_action (int state, int token)" << endl
-      << "    {" << endl
-      << "        const int yyn = action_index [state] + token;" << endl
-      << endl
-      << "        if (yyn < 0 || action_check [yyn] != token)" << endl
-      << "            return - action_default [state];" << endl
-      << endl
-      << "        return action_info [yyn];" << endl
-      << "    }" << endl
-      << "};" << endl
-      << endl
-      << endl;
+  out << "    static const short    goto_default[];" << Qt::endl
+      << "    static const short  action_default[];" << Qt::endl
+      << "    static const short    action_index[];" << Qt::endl
+      << "    static const short     action_info[];" << Qt::endl
+      << "    static const short    action_check[];" << Qt::endl
+      << Qt::endl
+      << "    static inline int nt_action (int state, int nt)" << Qt::endl
+      << "    {" << Qt::endl
+      << "        const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;" << Qt::endl
+      << "        if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)" << Qt::endl
+      << "            return goto_default [nt];" << Qt::endl
+      << Qt::endl
+      << "        return action_info [GOTO_INFO_OFFSET + yyn];" << Qt::endl
+      << "    }" << Qt::endl
+      << Qt::endl
+      << "    static inline int t_action (int state, int token)" << Qt::endl
+      << "    {" << Qt::endl
+      << "        const int yyn = action_index [state] + token;" << Qt::endl
+      << Qt::endl
+      << "        if (yyn < 0 || action_check [yyn] != token)" << Qt::endl
+      << "            return - action_default [state];" << Qt::endl
+      << Qt::endl
+      << "        return action_info [yyn];" << Qt::endl
+      << "    }" << Qt::endl
+      << "};" << Qt::endl
+      << Qt::endl
+      << Qt::endl;
 }
 
 void CppGenerator::generateImpl (QTextStream &out)
@@ -568,16 +569,16 @@ void CppGenerator::generateImpl (QTextStream &out)
             {
               first_nt = false;
               QString prot = debugInfoProt();
-              out << endl << "#ifndef " << prot << endl;
+              out << Qt::endl << "#ifndef " << prot << Qt::endl;
             }
           out << "\"" << *t << "\"";
         }
     }
 
   if (debug_info)
-    out << endl << "#endif // " << debugInfoProt() << endl;
+    out << Qt::endl << "#endif // " << debugInfoProt() << Qt::endl;
 
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::lhs [] = {";
   idx = 0;
@@ -587,7 +588,7 @@ void CppGenerator::generateImpl (QTextStream &out)
 
       out << aut.id (rule->lhs);
     }
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::rhs [] = {";
   idx = 0;
@@ -597,13 +598,13 @@ void CppGenerator::generateImpl (QTextStream &out)
 
       out << rule->rhs.size ();
     }
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   if (debug_info)
     {
       QString prot = debugInfoProt();
 
-      out << endl << "#ifndef " << prot << endl;
+      out << Qt::endl << "#ifndef " << prot << Qt::endl;
       out << "const int " << grammar.table_name << "::rule_info [] = {";
       idx = 0;
       for (auto rule = grammar.rules.cbegin (); rule != grammar.rules.cend (); ++rule, ++idx)
@@ -615,11 +616,11 @@ void CppGenerator::generateImpl (QTextStream &out)
           for (const Name &n : rule->rhs)
             out << ", " << name_ids.value (n);
         }
-      out << endl << "};" << endl << endl;
+      out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
       out << "const int " << grammar.table_name << "::rule_index [] = {";
       idx = 0;
-      int offset = 0;
+      size_t offset = 0;
       for (RulePointer rule = grammar.rules.begin (); rule != grammar.rules.end (); ++rule, ++idx)
         {
           generateSeparator(idx, out);
@@ -627,8 +628,8 @@ void CppGenerator::generateImpl (QTextStream &out)
           out << offset;
           offset += rule->rhs.size () + 1;
         }
-      out << endl << "};" << endl
-          << "#endif // " << prot << endl << endl;
+      out << Qt::endl << "};" << Qt::endl
+          << "#endif // " << prot << Qt::endl << Qt::endl;
     }
 
   out << "const short " << grammar.table_name << "::action_default [] = {";
@@ -642,27 +643,27 @@ void CppGenerator::generateImpl (QTextStream &out)
       else
         out << "0";
     }
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::goto_default [] = {";
   generateList(defgoto, out);
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::action_index [] = {";
   generateList(compressed_action.index, out);
-  out << "," << endl;
+  out << "," << Qt::endl;
   generateList(compressed_goto.index, out);
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::action_info [] = {";
   generateList(compressed_action.info, out);
-  out << "," << endl;
+  out << "," << Qt::endl;
   generateList(compressed_goto.info, out);
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 
   out << "const short " << grammar.table_name << "::action_check [] = {";
   generateList(compressed_action.check, out);
-  out << "," << endl;
+  out << "," << Qt::endl;
   generateList(compressed_goto.check, out);
-  out << endl << "};" << endl << endl;
+  out << Qt::endl << "};" << Qt::endl << Qt::endl;
 }
diff --git a/src/tools/qlalr/dotgraph.cpp b/src/tools/qlalr/dotgraph.cpp
index 1fa0a1ac77..1d479af2b2 100644
--- a/src/tools/qlalr/dotgraph.cpp
+++ b/src/tools/qlalr/dotgraph.cpp
@@ -41,9 +41,9 @@ void DotGraph::operator () (Automaton *aut)
 {
   Grammar *g = aut->_M_grammar;
 
-  out << "digraph {" << endl << endl;
+  out << "digraph {" << Qt::endl << Qt::endl;
 
-  out << "subgraph Includes {" << endl;
+  out << "subgraph Includes {" << Qt::endl;
   for (Automaton::IncludesGraph::iterator incl = Automaton::IncludesGraph::begin_nodes ();
        incl != Automaton::IncludesGraph::end_nodes (); ++incl)
     {
@@ -53,14 +53,14 @@ void DotGraph::operator () (Automaton *aut)
           out << "\t->\t";
           out << "\"(" << aut->id ((*edge)->data.state) << ", " << (*edge)->data.nt << ")\"\t";
           out << "[label=\"" << incl->data.state->follows [incl->data.nt] << "\"]";
-          out << endl;
+          out << Qt::endl;
         }
     }
-  out << "}" << endl << endl;
+  out << "}" << Qt::endl << Qt::endl;
 
 
-  out << "subgraph LRA {" << endl;
-  //out << "node [shape=record];" << endl << endl;
+  out << "subgraph LRA {" << Qt::endl;
+  //out << "node [shape=record];" << Qt::endl << Qt::endl;
 
   for (StatePointer q = aut->states.begin (); q != aut->states.end (); ++q)
     {
@@ -74,16 +74,16 @@ void DotGraph::operator () (Automaton *aut)
       for (ItemPointer item = q->kernel.begin (); item != q->kernel.end (); ++item)
         out << "| <" << index++ << "> " << *item;
 
-      out << "}\"]" << endl;
+      out << "}\"]" << Qt::endl;
 
       for (Bundle::iterator a = q->bundle.begin (); a != q->bundle.end (); ++a)
         {
           const char *clr = g->isTerminal (a.key ()) ? "blue" : "red";
-          out << "\t" << state << "\t->\t" << aut->id (*a) << "\t[color=\"" << clr << "\",label=\"" << a.key () << "\"]" << endl;
+          out << "\t" << state << "\t->\t" << aut->id (*a) << "\t[color=\"" << clr << "\",label=\"" << a.key () << "\"]" << Qt::endl;
         }
-      out << endl;
+      out << Qt::endl;
     }
 
-  out << "}" << endl;
-  out << endl << endl << "}" << endl;
+  out << "}" << Qt::endl;
+  out << Qt::endl << Qt::endl << "}" << Qt::endl;
 }
diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
index 541523d49c..c7269bed5f 100644
--- a/src/tools/qlalr/lalr.cpp
+++ b/src/tools/qlalr/lalr.cpp
@@ -51,7 +51,9 @@ QTextStream &qout()
     static QTextStream result(stdout, QIODevice::WriteOnly);
     return result;
 }
+QT_END_NAMESPACE
 
+namespace std {
 bool operator < (Name a, Name b)
 {
     return *a < *b;
@@ -66,7 +68,7 @@ bool operator < (StatePointer a, StatePointer b)
 {
   return &*a < &*b;
 }
-QT_END_NAMESPACE
+}
 
 bool Read::operator < (const Read &other) const
 {
@@ -319,7 +321,7 @@ void Automaton::buildNullables ()
     }
 
 #ifndef QLALR_NO_DEBUG_NULLABLES
-  qerr() << "nullables = {" << nullables << endl;
+  qerr() << "nullables = {" << nullables << Qt::endl;
 #endif
 }
 
@@ -335,7 +337,7 @@ QPair<StatePointer, bool> Automaton::internState (const State &state)
 
 struct _Bucket
 {
-  QLinkedList<ItemPointer> items;
+  std::list<ItemPointer> items;
 
   void insert (ItemPointer item)
   { items.push_back (item); }
@@ -344,8 +346,8 @@ struct _Bucket
   {
     State st (aut->_M_grammar);
 
-    for (QLinkedList<ItemPointer>::iterator item = items.begin (); item != items.end (); ++item)
-      st.insert ((*item)->next ());
+    for (auto &item : items)
+      st.insert(item->next());
 
     return st;
   }
@@ -462,7 +464,7 @@ void Automaton::buildLookbackSets ()
               lookbacks.insert (item, Lookback (p, A));
 
 #ifndef QLALR_NO_DEBUG_LOOKBACKS
-              qerr() << "*** (" << id (q) << ", " << *rule << ") lookback (" << id (p) << ", " << *A << ")" << endl;
+              qerr() << "*** (" << id (q) << ", " << *rule << ") lookback (" << id (p) << ", " << *A << ")" << Qt::endl;
 #endif
             }
         }
@@ -493,7 +495,7 @@ void Automaton::buildDirectReads ()
 
 #ifndef QLALR_NO_DEBUG_DIRECT_READS
       for (QMap<Name, NameSet>::iterator dr = q->reads.begin (); dr != q->reads.end (); ++dr)
-        qerr() << "*** DR(" << id (q) << ", " << dr.key () << ") = " << dr.value () << endl;
+        qerr() << "*** DR(" << id (q) << ", " << dr.key () << ") = " << dr.value () << Qt::endl;
 #endif
     }
 }
@@ -526,7 +528,7 @@ void Automaton::buildReadsDigraph ()
               dump (qerr(), source);
               qerr() << " reads ";
               dump (qerr(), target);
-              qerr() << endl;
+              qerr() << Qt::endl;
 #endif
             }
         }
@@ -561,7 +563,7 @@ void Automaton::visitReadNode (ReadNode node)
   _M_reads_stack.push (node);
 
 #ifndef QLALR_NO_DEBUG_INCLUDES
-  // qerr() << "*** Debug. visit node (" << id (node->data.state) << ", " << node->data.nt << ")  N = " << N << endl;
+  // qerr() << "*** Debug. visit node (" << id (node->data.state) << ", " << node->data.nt << ")  N = " << N << Qt::endl;
 #endif
 
   for (ReadsGraph::edge_iterator edge = node->begin (); edge != node->end (); ++edge)
@@ -641,7 +643,7 @@ void Automaton::buildIncludesDigraph ()
                       source->insertEdge (target);
 
 #ifndef QLALR_NO_DEBUG_INCLUDES
-                      qerr() << "*** (" << id (p) << ", " << *A << ") includes (" << id (pp) << ", " << *name << ")" << endl;
+                      qerr() << "*** (" << id (p) << ", " << *A << ") includes (" << id (pp) << ", " << *name << ")" << Qt::endl;
 #endif // QLALR_NO_DEBUG_INCLUDES
 
                       continue;
@@ -663,7 +665,7 @@ void Automaton::buildIncludesDigraph ()
                   source->insertEdge (target);
 
 #ifndef QLALR_NO_DEBUG_INCLUDES
-                  qerr() << "*** (" << id (p) << ", " << *A << ") includes (" << id (pp) << ", " << *name << ")" << endl;
+                  qerr() << "*** (" << id (p) << ", " << *A << ") includes (" << id (pp) << ", " << *name << ")" << Qt::endl;
 #endif // QLALR_NO_DEBUG_INCLUDES
                 }
             }
@@ -680,7 +682,7 @@ void Automaton::visitIncludeNode (IncludeNode node)
   _M_includes_stack.push (node);
 
 #ifndef QLALR_NO_DEBUG_INCLUDES
-  // qerr() << "*** Debug. visit node (" << id (node->data.state) << ", " << node->data.nt << ")  N = " << N << endl;
+  // qerr() << "*** Debug. visit node (" << id (node->data.state) << ", " << node->data.nt << ")  N = " << N << Qt::endl;
 #endif
 
   for (IncludesGraph::edge_iterator edge = node->begin (); edge != node->end (); ++edge)
@@ -696,7 +698,7 @@ void Automaton::visitIncludeNode (IncludeNode node)
       dump (qerr(), node);
       qerr() << " += follows";
       dump (qerr(), r);
-      qerr() << endl;
+      qerr() << Qt::endl;
 #endif
 
       NameSet &dst = node->data.state->follows [node->data.nt];
@@ -732,7 +734,7 @@ void Automaton::buildLookaheads ()
 #ifndef QLALR_NO_DEBUG_LOOKAHEADS
               qerr() << "(" << id (p) << ", " << *item->rule << ") lookbacks ";
               dump (qerr(), lookback);
-              qerr() << " with follows (" << id (q) << ", " << lookback.nt << ") = " << q->follows [lookback.nt] << endl;
+              qerr() << " with follows (" << id (q) << ", " << lookback.nt << ") = " << q->follows [lookback.nt] << Qt::endl;
 #endif
 
               lookaheads [item].insert (q->follows [lookback.nt].begin (), q->follows [lookback.nt].end ());
@@ -760,7 +762,7 @@ void Automaton::buildDefaultReduceActions ()
           if (item->dot != item->end_rhs ())
             continue;
 
-          int la = lookaheads.value (item).size ();
+          int la = static_cast<int>(lookaheads.value(item).size());
           if (def == state->closure.end () || la > size)
             {
               def = item;
diff --git a/src/tools/qlalr/lalr.g b/src/tools/qlalr/lalr.g
index 05d30c21fd..a849800dd5 100644
--- a/src/tools/qlalr/lalr.g
+++ b/src/tools/qlalr/lalr.g
@@ -261,7 +261,7 @@ int Recognizer::nextToken()
       if (ch == QLatin1Char ('"'))
         inp ();
       else
-        qerr() << _M_input_file << ":" << _M_line << ": Warning. Expected `\"'" << endl;
+        qerr() << _M_input_file << ":" << _M_line << ": Warning. Expected `\"'" << Qt::endl;
 
       _M_current_value = text;
       return (token = STRING_LITERAL);
@@ -314,7 +314,7 @@ int Recognizer::nextToken()
         return (token = PREC);
       else
         {
-          qerr() << _M_input_file << ":" << _M_line << ": Unknown keyword `" << text << "'" << endl;
+          qerr() << _M_input_file << ":" << _M_line << ": Unknown keyword `" << text << "'" << Qt::endl;
           exit (EXIT_FAILURE);
           return (token = ERROR);
         }
@@ -659,7 +659,7 @@ case $rule_number: {
 
   if (_M_grammar->terminals.find (_M_current_rule->lhs) != _M_grammar->terminals.end ())
     {
-      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << Qt::endl;
       return false;
     }
 
@@ -683,7 +683,7 @@ case $rule_number: {
 
   if (_M_grammar->terminals.find (_M_current_rule->lhs) != _M_grammar->terminals.end ())
     {
-      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << Qt::endl;
       return false;
     }
 
@@ -712,7 +712,7 @@ case $rule_number: {
   Name tok = _M_grammar->intern (sym(2));
   if (! _M_grammar->isTerminal (tok))
     {
-      qerr() << _M_input_file << ":" << _M_line << ": `" << *tok << " is not a terminal symbol" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": `" << *tok << " is not a terminal symbol" << Qt::endl;
       _M_current_rule->prec = _M_grammar->names.end ();
     }
   else
@@ -758,7 +758,7 @@ case $rule_number: {
         }
     }
 
-  qerr() << _M_input_file << ":" << _M_line << ": Syntax error" << endl;
+  qerr() << _M_input_file << ":" << _M_line << ": Syntax error" << Qt::endl;
   return false;
 }
 
diff --git a/src/tools/qlalr/lalr.h b/src/tools/qlalr/lalr.h
index 8eadee400d..473ea89769 100644
--- a/src/tools/qlalr/lalr.h
+++ b/src/tools/qlalr/lalr.h
@@ -39,6 +39,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <set>
 
 class Rule;
 class State;
@@ -48,121 +49,24 @@ class State;
 class Arrow;
 class Automaton;
 
-template <typename _Tp >
-class OrderedSet : protected QMap<_Tp, bool>
-{
-  typedef QMap<_Tp, bool> _Base;
-
-public:
-  class const_iterator
-  {
-    typename _Base::const_iterator _M_iterator;
-
-  public:
-    const_iterator () {}
-
-    const_iterator (const typename _Base::iterator &it):
-      _M_iterator (typename _Base::const_iterator(it)) {}
-    const_iterator (const typename _Base::const_iterator &it):
-      _M_iterator (it) {}
-
-    const _Tp &operator * () const
-    { return _M_iterator.key (); }
-
-    const _Tp *operator -> () const
-    { return &_M_iterator.key (); }
-
-    const_iterator &operator ++ ()
-    { ++_M_iterator; return *this; }
-
-    const_iterator operator ++ (int) const
-    {
-      const_iterator me (*this);
-      ++_M_iterator;
-      return me;
-    }
-
-    bool operator == (const const_iterator &other) const
-    { return _M_iterator == other._M_iterator; }
-
-    bool operator != (const const_iterator &other) const
-    { return _M_iterator != other._M_iterator; }
-  };
-
-  typedef const_iterator iterator;
-
-public:
-  OrderedSet () {}
-
-  const_iterator begin () const
-  { return const_iterator (_Base::begin ()); }
-
-  const_iterator end () const
-  { return const_iterator (_Base::end ()); }
-
-  bool isEmpty () const
-  { return _Base::isEmpty (); }
-
-  int size () const
-  { return _Base::size (); }
-
-  const_iterator find (const _Tp &elt) const
-  { return const_iterator (_Base::find (elt)); }
-
-  QPair<const_iterator, bool> insert (const _Tp &elt)
-  {
-    int elts = _Base::size ();
-    const_iterator it (_Base::insert (typename _Base::key_type (elt), true));
-    return qMakePair (it, elts != _Base::size ());
-  }
-
-  QPair<const_iterator, bool> insert (const_iterator, const _Tp &elt)
-  {
-    int elts = _Base::size ();
-    const_iterator it (_Base::insert (typename _Base::key_type (elt), true));
-    return qMakePair (it, elts != _Base::size ());
-  }
-
-  const _Tp &operator [] (const _Tp &elt)
-  { return *insert (elt)->first; }
-
-  template <typename _InputIterator>
-  void insert (_InputIterator first, _InputIterator last)
-  {
-    for (; first != last; ++first)
-      insert (*first);
-  }
-};
 
 // names
-typedef QLinkedList<QString>::iterator Name;
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(QLinkedList<QString>::iterator, Q_PRIMITIVE_TYPE);
-QT_END_NAMESPACE
-typedef QLinkedList<Name> NameList;
-typedef OrderedSet<Name> NameSet;
+typedef std::list<QString>::iterator Name;
+typedef std::list<Name> NameList;
+typedef std::set<Name> NameSet;
 
 // items
-typedef QLinkedList<Item> ItemList;
+typedef std::list<Item> ItemList;
 typedef ItemList::iterator ItemPointer;
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(ItemList::iterator, Q_PRIMITIVE_TYPE);
-QT_END_NAMESPACE
 
 // rules
-typedef QLinkedList<Rule> debug_infot;
+typedef std::list<Rule> debug_infot;
 typedef debug_infot::iterator RulePointer;
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(debug_infot::iterator, Q_PRIMITIVE_TYPE);
-QT_END_NAMESPACE
 typedef QMultiMap<Name, RulePointer> RuleMap;
 
 // states
-typedef QLinkedList<State> StateList;
+typedef std::list<State> StateList;
 typedef StateList::iterator StatePointer;
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(StateList::iterator, Q_PRIMITIVE_TYPE);
-QT_END_NAMESPACE
 
 // arrows
 typedef QMap<Name, StatePointer> Bundle;
@@ -257,9 +161,9 @@ template <typename _Tp>
 class Node
 {
 public:
-  typedef OrderedSet<Node<_Tp> > Repository;
+  typedef std::set<Node<_Tp> > Repository;
   typedef typename Repository::iterator iterator;
-  typedef typename QLinkedList<iterator>::iterator edge_iterator;
+  typedef typename std::list<iterator>::iterator edge_iterator;
 
 public:
   static iterator get (_Tp data);
@@ -297,7 +201,7 @@ public: // attributes
   mutable bool root;
   mutable int dfn;
   mutable _Tp data;
-  mutable QLinkedList<iterator> outs;
+  mutable std::list<iterator> outs;
 
 protected:
   inline Node () {}
@@ -319,7 +223,7 @@ typename Node<_Tp>::iterator Node<_Tp>::get (_Tp data)
 }
 
 template <typename _Tp>
-QPair<typename QLinkedList<typename Node<_Tp>::iterator>::iterator, bool> Node<_Tp>::insertEdge (typename Node<_Tp>::iterator other) const
+QPair<typename std::list<typename Node<_Tp>::iterator>::iterator, bool> Node<_Tp>::insertEdge(typename Node<_Tp>::iterator other) const
 {
   edge_iterator it = std::find (outs.begin (), outs.end (), other);
 
@@ -356,7 +260,7 @@ public:
   QString decl_file_name;
   QString impl_file_name;
   QString token_prefix;
-  QLinkedList<QString> names;
+  std::list<QString> names;
   Name start;
   NameSet terminals;
   NameSet non_terminals;
@@ -406,9 +310,6 @@ public:
   StatePointer state;
   Name nt;
 };
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(OrderedSet<Node<Read> >::const_iterator, Q_PRIMITIVE_TYPE);
-QT_END_NAMESPACE
 
 class Include
 {
@@ -430,9 +331,6 @@ public:
   StatePointer state;
   Name nt;
 };
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(OrderedSet<Node<Include> >::const_iterator, Q_PRIMITIVE_TYPE);
-QT_END_NAMESPACE
 
 class Automaton
 {
@@ -491,11 +389,11 @@ private:
   int _M_includes_dfn;
 };
 
-QT_BEGIN_NAMESPACE
+namespace std {
 bool operator < (Name a, Name b);
 bool operator < (StatePointer a, StatePointer b);
 bool operator < (ItemPointer a, ItemPointer b);
-QT_END_NAMESPACE
+}
 
 QTextStream &operator << (QTextStream &out, const Name &n);
 QTextStream &operator << (QTextStream &out, const Rule &r);
diff --git a/src/tools/qlalr/main.cpp b/src/tools/qlalr/main.cpp
index 5971eb201d..6a57c7aa7a 100644
--- a/src/tools/qlalr/main.cpp
+++ b/src/tools/qlalr/main.cpp
@@ -44,15 +44,15 @@
 
 static void help_me ()
 {
-  qerr() << "Usage: qlalr [options] [input file name]" << endl
-       << endl
-       << "  --help, -h\t\tdisplay this help and exit" << endl
-       << "  --verbose, -v\t\tverbose output" << endl
-       << "  --no-debug\t\tno debug information" << endl
-       << "  --no-lines\t\tno #line directives" << endl
-       << "  --dot\t\t\tgenerate a graph" << endl
-       << "  --qt\t\tadd the Qt copyright header and Qt-specific types and macros" << endl
-       << endl;
+  qerr() << "Usage: qlalr [options] [input file name]" << Qt::endl
+       << Qt::endl
+       << "  --help, -h\t\tdisplay this help and exit" << Qt::endl
+       << "  --verbose, -v\t\tverbose output" << Qt::endl
+       << "  --no-debug\t\tno debug information" << Qt::endl
+       << "  --no-lines\t\tno #line directives" << Qt::endl
+       << "  --dot\t\t\tgenerate a graph" << Qt::endl
+       << "  --qt\t\tadd the Qt copyright header and Qt-specific types and macros" << Qt::endl
+       << Qt::endl;
   exit (0);
 }
 
@@ -91,7 +91,7 @@ int main (int argc, char *argv[])
         file_name = arg;
 
       else
-        qerr() << "*** Warning. Ignore argument `" << arg << "'" << endl;
+        qerr() << "*** Warning. Ignore argument `" << arg << "'" << Qt::endl;
     }
 
   if (file_name.isEmpty ())
@@ -106,15 +106,15 @@ int main (int argc, char *argv[])
   if (! p.parse (file_name))
     exit (EXIT_FAILURE);
 
-  if (grammar.rules.isEmpty ())
+  if (grammar.rules.empty())
     {
-      qerr() << "*** Fatal. No rules!" << endl;
+      qerr() << "*** Fatal. No rules!" << Qt::endl;
       exit (EXIT_FAILURE);
     }
 
   else if (grammar.start == grammar.names.end ())
     {
-      qerr() << "*** Fatal. No start symbol!" << endl;
+      qerr() << "*** Fatal. No start symbol!" << Qt::endl;
       exit (EXIT_FAILURE);
     }
 
diff --git a/src/tools/qlalr/parsetable.cpp b/src/tools/qlalr/parsetable.cpp
index c88ac1291e..9e71acebb4 100644
--- a/src/tools/qlalr/parsetable.cpp
+++ b/src/tools/qlalr/parsetable.cpp
@@ -43,13 +43,13 @@ void ParseTable::operator () (Automaton *aut)
 
   int rindex = 1;
   for (RulePointer rule = g->rules.begin (); rule != g->rules.end (); ++rule)
-    out << rindex++ << ")\t" << *rule << endl;
-  out << endl << endl;
+    out << rindex++ << ")\t" << *rule << Qt::endl;
+  out << Qt::endl << Qt::endl;
 
   int index = 0;
   for (StatePointer state = aut->states.begin (); state != aut->states.end (); ++state)
     {
-      out << "state " << index++ << endl << endl;
+      out << "state " << index++ << Qt::endl << Qt::endl;
 
       for (ItemPointer item = state->kernel.begin (); item != state->kernel.end (); ++item)
         {
@@ -58,7 +58,7 @@ void ParseTable::operator () (Automaton *aut)
           if (item->dot == item->end_rhs ())
             out << " " << aut->lookaheads [item];
 
-          out << endl;
+          out << Qt::endl;
         }
 
       bool first = true;
@@ -68,11 +68,11 @@ void ParseTable::operator () (Automaton *aut)
             continue;
 
           if (first)
-            out << endl;
+            out << Qt::endl;
 
           first = false;
 
-          out << "    " << *arrow.key () << " shift, and go to state " << std::distance (aut->states.begin (), *arrow) << endl;
+          out << "    " << *arrow.key () << " shift, and go to state " << std::distance (aut->states.begin (), *arrow) << Qt::endl;
         }
 
       first = true;
@@ -82,13 +82,13 @@ void ParseTable::operator () (Automaton *aut)
             continue;
 
           if (first)
-            out << endl;
+            out << Qt::endl;
 
           first = false;
 
           const auto lookaheads = aut->lookaheads.value(item);
           for (const Name &la : lookaheads)
-            out << "    " << *la << " reduce using rule " << aut->id (item->rule) << " (" << *item->rule->lhs << ")" << endl;
+            out << "    " << *la << " reduce using rule " << aut->id (item->rule) << " (" << *item->rule->lhs << ")" << Qt::endl;
         }
 
       first = true;
@@ -98,19 +98,19 @@ void ParseTable::operator () (Automaton *aut)
             continue;
 
           if (first)
-            out << endl;
+            out << Qt::endl;
 
           first = false;
 
-          out << "    " << *arrow.key () << " go to state " << std::distance (aut->states.begin (), *arrow) << endl;
+          out << "    " << *arrow.key () << " go to state " << std::distance (aut->states.begin (), *arrow) << Qt::endl;
         }
 
       if (state->defaultReduce != g->rules.end ())
         {
-          out << endl
-              << "    $default reduce using rule " << aut->id (state->defaultReduce) << " (" << *state->defaultReduce->lhs << ")" << endl;
+          out << Qt::endl
+              << "    $default reduce using rule " << aut->id (state->defaultReduce) << " (" << *state->defaultReduce->lhs << ")" << Qt::endl;
         }
 
-      out << endl;
+      out << Qt::endl;
     }
 }
diff --git a/src/tools/qlalr/recognizer.cpp b/src/tools/qlalr/recognizer.cpp
index ab797c85d0..3da54c0c6a 100644
--- a/src/tools/qlalr/recognizer.cpp
+++ b/src/tools/qlalr/recognizer.cpp
@@ -97,7 +97,7 @@ int Recognizer::nextToken()
       if (ch == QLatin1Char ('"'))
         inp ();
       else
-        qerr() << _M_input_file << ":" << _M_line << ": Warning. Expected `\"'" << endl;
+        qerr() << _M_input_file << ":" << _M_line << ": Warning. Expected `\"'" << Qt::endl;
 
       _M_current_value = text;
       return (token = STRING_LITERAL);
@@ -150,7 +150,7 @@ int Recognizer::nextToken()
         return (token = PREC);
       else
         {
-          qerr() << _M_input_file << ":" << _M_line << ": Unknown keyword `" << text << "'" << endl;
+          qerr() << _M_input_file << ":" << _M_line << ": Unknown keyword `" << text << "'" << Qt::endl;
           exit (EXIT_FAILURE);
           return (token = ERROR);
         }
@@ -405,7 +405,7 @@ case 34: {
 
   if (_M_grammar->terminals.find (_M_current_rule->lhs) != _M_grammar->terminals.end ())
     {
-      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << Qt::endl;
       return false;
     }
 
@@ -420,7 +420,7 @@ case 38: {
 
   if (_M_grammar->terminals.find (_M_current_rule->lhs) != _M_grammar->terminals.end ())
     {
-      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": Invalid non terminal `" << *_M_current_rule->lhs << "'" << Qt::endl;
       return false;
     }
 
@@ -443,7 +443,7 @@ case 40: {
   Name tok = _M_grammar->intern (sym(2));
   if (! _M_grammar->isTerminal (tok))
     {
-      qerr() << _M_input_file << ":" << _M_line << ": `" << *tok << " is not a terminal symbol" << endl;
+      qerr() << _M_input_file << ":" << _M_line << ": `" << *tok << " is not a terminal symbol" << Qt::endl;
       _M_current_rule->prec = _M_grammar->names.end ();
     }
   else
@@ -474,7 +474,7 @@ case 43: {
         }
     }
 
-  qerr() << _M_input_file << ":" << _M_line << ": Syntax error" << endl;
+  qerr() << _M_input_file << ":" << _M_line << ": Syntax error" << Qt::endl;
   return false;
 }
 
diff --git a/src/tools/qvkgen/qvkgen.cpp b/src/tools/qvkgen/qvkgen.cpp
index 059f9413cb..4db3f26161 100644
--- a/src/tools/qvkgen/qvkgen.cpp
+++ b/src/tools/qvkgen/qvkgen.cpp
@@ -192,22 +192,20 @@ QString VkSpecParser::parseName()
 
 QString funcSig(const VkSpecParser::Command &c, const char *className = nullptr)
 {
-    QString s;
-    s.sprintf("%s %s%s%s", qPrintable(c.cmd.type),
-              (className ? className : ""), (className ? "::" : ""),
-              qPrintable(c.cmd.name));
+    QString s(QString::asprintf("%s %s%s%s", qPrintable(c.cmd.type),
+                                (className ? className : ""), (className ? "::" : ""),
+                                qPrintable(c.cmd.name)));
     if (!c.args.isEmpty()) {
         s += QLatin1Char('(');
         bool first = true;
         for (const VkSpecParser::TypedName &a : c.args) {
-            QString argStr;
-            argStr.sprintf("%s%s%s%s", qPrintable(a.type), (a.type.endsWith(QLatin1Char('*')) ? "" : " "),
-                           qPrintable(a.name), qPrintable(a.typeSuffix));
             if (!first)
                 s += QStringLiteral(", ");
             else
                 first = false;
-            s += argStr;
+            s += QString::asprintf("%s%s%s%s", qPrintable(a.type),
+                                   (a.type.endsWith(QLatin1Char('*')) ? "" : " "),
+                                   qPrintable(a.name), qPrintable(a.typeSuffix));
         }
         s += QLatin1Char(')');
     }
@@ -216,13 +214,12 @@ QString funcSig(const VkSpecParser::Command &c, const char *className = nullptr)
 
 QString funcCall(const VkSpecParser::Command &c, int idx)
 {
-    QString s;
     // template:
     //     [return] reinterpret_cast<PFN_vkEnumeratePhysicalDevices>(d_ptr->m_funcs[0])(instance, pPhysicalDeviceCount, pPhysicalDevices);
-    s.sprintf("%sreinterpret_cast<PFN_%s>(d_ptr->m_funcs[%d])",
-              (c.cmd.type == QStringLiteral("void") ? "" : "return "),
-              qPrintable(c.cmd.name),
-              idx);
+    QString s = QString::asprintf("%sreinterpret_cast<PFN_%s>(d_ptr->m_funcs[%d])",
+                                  (c.cmd.type == QStringLiteral("void") ? "" : "return "),
+                                  qPrintable(c.cmd.name),
+                                  idx);
     if (!c.args.isEmpty()) {
         s += QLatin1Char('(');
         bool first = true;
@@ -338,10 +335,9 @@ bool genVulkanFunctionsH(const QVector<VkSpecParser::Command> &commands, const Q
         *dst += QStringLiteral(";\n");
     }
 
-    QString str;
-    str.sprintf(s, preamble.get(licHeaderFn).constData(), instCmdStr.toUtf8().constData(), devCmdStr.toUtf8().constData());
-
-    f.write(str.toUtf8());
+    f.write(QString::asprintf(s, preamble.get(licHeaderFn).constData(),
+                              instCmdStr.toUtf8().constData(),
+                              devCmdStr.toUtf8().constData()).toUtf8());
 
     return true;
 }
@@ -400,10 +396,7 @@ bool genVulkanFunctionsPH(const QVector<VkSpecParser::Command> &commands, const
                                             [](const VkSpecParser::Command &c) { return c.deviceLevel; });
     const int instLevelCount = commands.count() - devLevelCount;
 
-    QString str;
-    str.sprintf(s, preamble.get(licHeaderFn).constData(), instLevelCount, devLevelCount);
-
-    f.write(str.toUtf8());
+    f.write(QString::asprintf(s, preamble.get(licHeaderFn).constData(), instLevelCount, devLevelCount).toUtf8());
 
     return true;
 }
@@ -478,10 +471,12 @@ bool genVulkanFunctionsPC(const QVector<VkSpecParser::Command> &commands, const
     if (instCmdNamesStr.count() > 2)
         instCmdNamesStr = instCmdNamesStr.left(instCmdNamesStr.count() - 2);
 
-    QString str;
-    str.sprintf(s, preamble.get(licHeaderFn).constData(),
-                instCmdWrapperStr.toUtf8().constData(), instCmdNamesStr.toUtf8().constData(), instIdx,
-                devCmdWrapperStr.toUtf8().constData(), devCmdNamesStr.toUtf8().constData(), commands.count() - instIdx);
+    const QString str =
+            QString::asprintf(s, preamble.get(licHeaderFn).constData(),
+                              instCmdWrapperStr.toUtf8().constData(),
+                              instCmdNamesStr.toUtf8().constData(), instIdx,
+                              devCmdWrapperStr.toUtf8().constData(),
+                              devCmdNamesStr.toUtf8().constData(), commands.count() - instIdx);
 
     f.write(str.toUtf8());
 
diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp
index 6e8c13be15..ac87e48e39 100644
--- a/src/tools/rcc/main.cpp
+++ b/src/tools/rcc/main.cpp
@@ -99,6 +99,37 @@ int createProject(const QString &outFileName)
     return 0;
 }
 
+// Escapes a path for use in a Depfile (Makefile syntax)
+QString makefileEscape(const QString &filepath)
+{
+    // Always use forward slashes
+    QString result = QDir::cleanPath(filepath);
+    // Spaces are escaped with a backslash
+    result.replace(QLatin1Char(' '), QLatin1String("\\ "));
+    // Pipes are escaped with a backslash
+    result.replace(QLatin1Char('|'), QLatin1String("\\|"));
+    // Dollars are escaped with a dollar
+    result.replace(QLatin1Char('$'), QLatin1String("$$"));
+
+    return result;
+}
+
+void writeDepFile(QIODevice &iodev, const QStringList &depsList, const QString &targetName)
+{
+    QTextStream out(&iodev);
+    out << qPrintable(makefileEscape(targetName));
+    out << QLatin1Char(':');
+
+    // Write depfile
+    for (int i = 0; i < depsList.size(); ++i) {
+        out << QLatin1Char(' ');
+
+        out << qPrintable(makefileEscape(depsList.at(i)));
+    }
+
+    out << QLatin1Char('\n');
+}
+
 int runRcc(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
@@ -155,6 +186,11 @@ int runRcc(int argc, char *argv[])
     QCommandLineOption binaryOption(QStringLiteral("binary"), QStringLiteral("Output a binary file for use as a dynamic resource."));
     parser.addOption(binaryOption);
 
+    QCommandLineOption generatorOption(QStringList{QStringLiteral("g"), QStringLiteral("generator")});
+    generatorOption.setDescription(QStringLiteral("Select generator."));
+    generatorOption.setValueName(QStringLiteral("cpp|python|python2"));
+    parser.addOption(generatorOption);
+
     QCommandLineOption passOption(QStringLiteral("pass"), QStringLiteral("Pass number for big resources"), QStringLiteral("number"));
     parser.addOption(passOption);
 
@@ -171,6 +207,10 @@ int runRcc(int argc, char *argv[])
                                  QStringLiteral("Only output a mapping of resource paths to file system paths defined in the .qrc file, do not generate code."));
     parser.addOption(mapOption);
 
+    QCommandLineOption depFileOption(QStringList{QStringLiteral("d"), QStringLiteral("depfile")},
+                                     QStringLiteral("Write a depfile with the .qrc dependencies to <file>."), QStringLiteral("file"));
+    parser.addOption(depFileOption);
+
     QCommandLineOption projectOption(QStringLiteral("project"), QStringLiteral("Output a resource file containing all files from the current directory."));
     parser.addOption(projectOption);
 
@@ -220,6 +260,18 @@ int runRcc(int argc, char *argv[])
         library.setCompressThreshold(parser.value(thresholdOption).toInt());
     if (parser.isSet(binaryOption))
         library.setFormat(RCCResourceLibrary::Binary);
+    if (parser.isSet(generatorOption)) {
+        auto value = parser.value(generatorOption);
+        if (value == QLatin1String("cpp"))
+            library.setFormat(RCCResourceLibrary::C_Code);
+        else if (value == QLatin1String("python"))
+            library.setFormat(RCCResourceLibrary::Python3_Code);
+        else if (value == QLatin1String("python2"))
+            library.setFormat(RCCResourceLibrary::Python2_Code);
+        else
+            errorMsg = QLatin1String("Invalid generator: ") + value;
+    }
+
     if (parser.isSet(passOption)) {
         if (parser.value(passOption) == QLatin1String("1"))
             library.setFormat(RCCResourceLibrary::Pass1);
@@ -249,6 +301,7 @@ int runRcc(int argc, char *argv[])
 
     QString outFilename = parser.value(outputOption);
     QString tempFilename = parser.value(tempOption);
+    QString depFilename = parser.value(depFileOption);
 
     if (projectRequested) {
         return createProject(outFilename);
@@ -280,6 +333,8 @@ int runRcc(int argc, char *argv[])
     switch (library.format()) {
         case RCCResourceLibrary::C_Code:
         case RCCResourceLibrary::Pass1:
+        case RCCResourceLibrary::Python3_Code:
+        case RCCResourceLibrary::Python2_Code:
             mode = QIODevice::WriteOnly | QIODevice::Text;
             break;
         case RCCResourceLibrary::Pass2:
@@ -333,6 +388,28 @@ int runRcc(int argc, char *argv[])
         return 0;
     }
 
+    // Write depfile
+    if (!depFilename.isEmpty()) {
+        QFile depout;
+        depout.setFileName(depFilename);
+
+        if (outFilename.isEmpty() || outFilename == QLatin1String("-")) {
+            const QString msg = QString::fromUtf8("Unable to write depfile when outputting to stdout!\n");
+            errorDevice.write(msg.toUtf8());
+            return 1;
+        }
+
+        if (!depout.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            const QString msg = QString::fromUtf8("Unable to open depfile %1 for writing: %2\n")
+                    .arg(depout.fileName(), depout.errorString());
+            errorDevice.write(msg.toUtf8());
+            return 1;
+        }
+
+        writeDepFile(depout, library.dataFiles(), outFilename);
+        depout.close();
+    }
+
     QFile temp;
     if (!tempFilename.isEmpty()) {
         temp.setFileName(tempFilename);
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 011a7db810..9acbce25ff 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -37,6 +37,7 @@
 #include <qfile.h>
 #include <qiodevice.h>
 #include <qlocale.h>
+#include <qregexp.h>
 #include <qstack.h>
 #include <qxmlstream.h>
 
@@ -66,11 +67,8 @@ enum {
 #  define CONSTANT_COMPRESSALGO_DEFAULT     RCCResourceLibrary::CompressionAlgorithm::None
 #endif
 
-#define writeString(s) write(s, sizeof(s))
-
 void RCCResourceLibrary::write(const char *str, int len)
 {
-    --len; // trailing \0 on string literals...
     int n = m_out.size();
     m_out.resize(n + len);
     memcpy(m_out.data() + n, str, len);
@@ -176,6 +174,8 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
 {
     const bool text = lib.m_format == RCCResourceLibrary::C_Code;
     const bool pass1 = lib.m_format == RCCResourceLibrary::Pass1;
+    const bool python = lib.m_format == RCCResourceLibrary::Python3_Code
+        || lib.m_format == RCCResourceLibrary::Python2_Code;
     //some info
     if (text || pass1) {
         if (m_language != QLocale::C) {
@@ -222,6 +222,8 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
     }
     if (text || pass1)
         lib.writeChar('\n');
+    else if (python)
+        lib.writeString("\\\n");
 
     if (lib.formatVersion() >= 2) {
         // last modified time stamp
@@ -236,6 +238,8 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
         lib.writeNumber8(lastmod);
         if (text || pass1)
             lib.writeChar('\n');
+        else if (python)
+            lib.writeString("\\\n");
     }
 }
 
@@ -246,6 +250,8 @@ qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset,
     const bool pass1 = lib.m_format == RCCResourceLibrary::Pass1;
     const bool pass2 = lib.m_format == RCCResourceLibrary::Pass2;
     const bool binary = lib.m_format == RCCResourceLibrary::Binary;
+    const bool python = lib.m_format == RCCResourceLibrary::Python3_Code
+        || lib.m_format == RCCResourceLibrary::Python2_Code;
 
     //capture the offset
     m_dataOffset = offset;
@@ -343,20 +349,24 @@ qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset,
     }
 
     // write the length
-
-    if (text || binary || pass2)
+    if (text || binary || pass2 || python)
         lib.writeNumber4(data.size());
     if (text || pass1)
         lib.writeString("\n  ");
+    else if (python)
+        lib.writeString("\\\n");
     offset += 4;
 
     // write the payload
     const char *p = data.constData();
-    if (text) {
+    if (text || python) {
         for (int i = data.size(), j = 0; --i >= 0; --j) {
             lib.writeHex(*p++);
             if (j == 0) {
-                lib.writeString("\n  ");
+                if (text)
+                    lib.writeString("\n  ");
+                else
+                    lib.writeString("\\\n");
                 j = 16;
             }
         }
@@ -368,6 +378,9 @@ qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset,
     // done
     if (text || pass1)
         lib.writeString("\n  ");
+    else if (python)
+        lib.writeString("\\\n");
+
     return offset;
 }
 
@@ -375,6 +388,8 @@ qint64 RCCFileInfo::writeDataName(RCCResourceLibrary &lib, qint64 offset)
 {
     const bool text = lib.m_format == RCCResourceLibrary::C_Code;
     const bool pass1 = lib.m_format == RCCResourceLibrary::Pass1;
+    const bool python = lib.m_format == RCCResourceLibrary::Python3_Code
+        || lib.m_format == RCCResourceLibrary::Python2_Code;
 
     // capture the offset
     m_nameOffset = offset;
@@ -390,12 +405,16 @@ qint64 RCCFileInfo::writeDataName(RCCResourceLibrary &lib, qint64 offset)
     lib.writeNumber2(m_name.length());
     if (text || pass1)
         lib.writeString("\n  ");
+    else if (python)
+        lib.writeString("\\\n");
     offset += 2;
 
     // write the hash
     lib.writeNumber4(qt_hash(m_name));
     if (text || pass1)
         lib.writeString("\n  ");
+    else if (python)
+        lib.writeString("\\\n");
     offset += 4;
 
     // write the m_name
@@ -404,12 +423,17 @@ qint64 RCCFileInfo::writeDataName(RCCResourceLibrary &lib, qint64 offset)
         lib.writeNumber2(unicode[i].unicode());
         if ((text || pass1) && i % 16 == 0)
             lib.writeString("\n  ");
+        else if (python && i % 16 == 0)
+            lib.writeString("\\\n");
     }
     offset += m_name.length()*2;
 
     // done
     if (text || pass1)
         lib.writeString("\n  ");
+    else if (python)
+        lib.writeString("\\\n");
+
     return offset;
 }
 
@@ -956,21 +980,40 @@ void RCCResourceLibrary::writeDecimal(int value)
     Q_ASSERT(m_format != RCCResourceLibrary::Binary);
     char buf[std::numeric_limits<int>::digits10 + 2];
     int n = snprintf(buf, sizeof(buf), "%d", value);
-    write(buf, n + 1);  // write() takes a size including terminating NUL
+    write(buf, n);
+}
+
+static const char hexDigits[] = "0123456789abcdef";
+
+inline void RCCResourceLibrary::write2HexDigits(quint8 number)
+{
+    writeChar(hexDigits[number >> 4]);
+    writeChar(hexDigits[number & 0xf]);
 }
 
 void RCCResourceLibrary::writeHex(quint8 tmp)
 {
-    const char digits[] = "0123456789abcdef";
-    writeChar('0');
-    writeChar('x');
-    if (tmp < 16) {
-        writeChar(digits[tmp]);
-    } else {
-        writeChar(digits[tmp >> 4]);
-        writeChar(digits[tmp & 0xf]);
+    switch (m_format) {
+    case RCCResourceLibrary::Python3_Code:
+    case RCCResourceLibrary::Python2_Code:
+        if (tmp >= 32 && tmp < 127 && tmp != '"' && tmp != '\\') {
+            writeChar(char(tmp));
+        } else {
+            writeChar('\\');
+            writeChar('x');
+            write2HexDigits(tmp);
+        }
+        break;
+    default:
+        writeChar('0');
+        writeChar('x');
+        if (tmp < 16)
+            writeChar(hexDigits[tmp]);
+        else
+            write2HexDigits(tmp);
+        writeChar(',');
+        break;
     }
-    writeChar(',');
 }
 
 void RCCResourceLibrary::writeNumber2(quint16 number)
@@ -1038,7 +1081,9 @@ void RCCResourceLibrary::writeNumber8(quint64 number)
 
 bool RCCResourceLibrary::writeHeader()
 {
-    if (m_format == C_Code || m_format == Pass1) {
+    switch (m_format) {
+    case C_Code:
+    case Pass1:
         writeString("/****************************************************************************\n");
         writeString("** Resource object code\n");
         writeString("**\n");
@@ -1047,7 +1092,20 @@ bool RCCResourceLibrary::writeHeader()
         writeString("\n**\n");
         writeString("** WARNING! All changes made in this file will be lost!\n");
         writeString( "*****************************************************************************/\n\n");
-    } else if (m_format == Binary) {
+        break;
+    case Python3_Code:
+    case Python2_Code:
+        writeString("# Resource object code (Python ");
+        writeChar(m_format == Python3_Code ? '3' : '2');
+        writeString(")\n");
+        writeString("# Created by: object code\n");
+        writeString("# Created by: The Resource Compiler for Qt version ");
+        writeByteArray(QT_VERSION_STR);
+        writeString("\n");
+        writeString("# WARNING! All changes made in this file will be lost!\n\n");
+        writeString("from PySide2 import QtCore\n\n");
+        break;
+    case Binary:
         writeString("qres");
         writeNumber4(0);
         writeNumber4(0);
@@ -1055,6 +1113,9 @@ bool RCCResourceLibrary::writeHeader()
         writeNumber4(0);
         if (m_formatVersion >= 3)
             writeNumber4(m_overallFlags);
+        break;
+    default:
+        break;
     }
     return true;
 }
@@ -1062,10 +1123,21 @@ bool RCCResourceLibrary::writeHeader()
 bool RCCResourceLibrary::writeDataBlobs()
 {
     Q_ASSERT(m_errorDevice);
-    if (m_format == C_Code) {
+    switch (m_format) {
+    case C_Code:
         writeString("static const unsigned char qt_resource_data[] = {\n");
-    } else if (m_format == Binary) {
+        break;
+    case Python3_Code:
+        writeString("qt_resource_data = b\"\\\n");
+        break;
+    case Python2_Code:
+        writeString("qt_resource_data = \"\\\n");
+        break;
+    case Binary:
         m_dataOffset = m_out.size();
+        break;
+    default:
+        break;
     }
 
     if (!m_root)
@@ -1091,24 +1163,46 @@ bool RCCResourceLibrary::writeDataBlobs()
             }
         }
     }
-    if (m_format == C_Code)
+    switch (m_format) {
+    case C_Code:
         writeString("\n};\n\n");
-    else if (m_format == Pass1) {
+        break;
+    case Python3_Code:
+    case Python2_Code:
+        writeString("\"\n\n");
+        break;
+    case Pass1:
         if (offset < 8)
             offset = 8;
         writeString("\nstatic const unsigned char qt_resource_data[");
         writeByteArray(QByteArray::number(offset));
         writeString("] = { 'Q', 'R', 'C', '_', 'D', 'A', 'T', 'A' };\n\n");
+        break;
+    default:
+        break;
     }
     return true;
 }
 
 bool RCCResourceLibrary::writeDataNames()
 {
-    if (m_format == C_Code || m_format == Pass1)
+    switch (m_format) {
+    case C_Code:
+    case Pass1:
         writeString("static const unsigned char qt_resource_name[] = {\n");
-    else if (m_format == Binary)
+        break;
+    case Python3_Code:
+        writeString("qt_resource_name = b\"\\\n");
+        break;
+    case Python2_Code:
+        writeString("qt_resource_name = \"\\\n");
+        break;
+    case Binary:
         m_namesOffset = m_out.size();
+        break;
+    default:
+        break;
+    }
 
     QHash<QString, int> names;
     QStack<RCCFileInfo*> pending;
@@ -1133,8 +1227,18 @@ bool RCCResourceLibrary::writeDataNames()
             }
         }
     }
-    if (m_format == C_Code || m_format == Pass1)
+    switch (m_format) {
+    case C_Code:
+    case Pass1:
         writeString("\n};\n\n");
+        break;
+    case Python3_Code:
+    case Python2_Code:
+        writeString("\"\n\n");
+        break;
+    default:
+        break;
+    }
     return true;
 }
 
@@ -1149,10 +1253,24 @@ struct qt_rcc_compare_hash
 
 bool RCCResourceLibrary::writeDataStructure()
 {
-    if (m_format == C_Code || m_format == Pass1)
+    switch (m_format) {
+    case C_Code:
+    case Pass1:
         writeString("static const unsigned char qt_resource_struct[] = {\n");
-    else if (m_format == Binary)
+        break;
+    case Python3_Code:
+        writeString("qt_resource_struct = b\"\\\n");
+        break;
+    case Python2_Code:
+        writeString("qt_resource_struct = \"\\\n");
+        break;
+    case Binary:
         m_treeOffset = m_out.size();
+        break;
+    default:
+        break;
+    }
+
     QStack<RCCFileInfo*> pending;
 
     if (!m_root)
@@ -1196,8 +1314,18 @@ bool RCCResourceLibrary::writeDataStructure()
                 pending.push(child);
         }
     }
-    if (m_format == C_Code || m_format == Pass1)
+    switch (m_format) {
+    case C_Code:
+    case Pass1:
         writeString("\n};\n\n");
+        break;
+    case Python3_Code:
+    case Python2_Code:
+        writeString("\"\n\n");
+        break;
+    default:
+        break;
+    }
 
     return true;
 }
@@ -1387,6 +1515,16 @@ bool RCCResourceLibrary::writeInitializer()
             p[i++] = (m_overallFlags >>  8) & 0xff;
             p[i++] = (m_overallFlags >>  0) & 0xff;
         }
+    } else if (m_format == Python3_Code || m_format == Python2_Code) {
+        writeString("def qInitResources():\n");
+        writeString("    QtCore.qRegisterResourceData(0x");
+        write2HexDigits(m_formatVersion);
+        writeString(", qt_resource_struct, qt_resource_name, qt_resource_data)\n\n");
+        writeString("def qCleanupResources():\n");
+        writeString("    QtCore.qUnregisterResourceData(0x");
+        write2HexDigits(m_formatVersion);
+        writeString(", qt_resource_struct, qt_resource_name, qt_resource_data)\n\n");
+        writeString("qInitResources()\n");
     }
     return true;
 }
diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h
index ad1c5cd166..190c37a1f6 100644
--- a/src/tools/rcc/rcc.h
+++ b/src/tools/rcc/rcc.h
@@ -58,7 +58,7 @@ public:
 
     bool readFiles(bool listMode, QIODevice &errorDevice);
 
-    enum Format { Binary, C_Code, Pass1, Pass2 };
+    enum Format { Binary, C_Code, Pass1, Pass2, Python3_Code, Python2_Code };
     void setFormat(Format f) { m_format = f; }
     Format format() const { return m_format; }
 
@@ -136,12 +136,14 @@ private:
     void writeAddNamespaceFunction(const QByteArray &name);
     void writeDecimal(int value);
     void writeHex(quint8 number);
+    void write2HexDigits(quint8 number);
     void writeNumber2(quint16 number);
     void writeNumber4(quint32 number);
     void writeNumber8(quint64 number);
     void writeChar(char c) { m_out.append(c); }
     void writeByteArray(const QByteArray &);
     void write(const char *, int len);
+    void writeString(const char *s) { write(s, static_cast<int>(strlen(s))); }
 
 #if QT_CONFIG(zstd)
     ZSTD_CCtx *m_zstdCCtx;
diff --git a/src/tools/tracegen/etw.cpp b/src/tools/tracegen/etw.cpp
index e839137915..acd81bd5c1 100644
--- a/src/tools/tracegen/etw.cpp
+++ b/src/tools/tracegen/etw.cpp
@@ -45,7 +45,6 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
-#include <qregexp.h>
 #include <quuid.h>
 
 static inline QString providerVar(const QString &providerName)
diff --git a/src/tools/tracegen/lttng.cpp b/src/tools/tracegen/lttng.cpp
index f0fbca9e16..1aef1b3d17 100644
--- a/src/tools/tracegen/lttng.cpp
+++ b/src/tools/tracegen/lttng.cpp
@@ -46,7 +46,6 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
-#include <qregexp.h>
 #include <qdebug.h>
 
 static void writeCtfMacro(QTextStream &stream, const Tracepoint::Field &field)
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 0ba49627c0..71e02ae9c9 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -69,7 +69,7 @@ static inline QString moduleHeader(const QString &module, const QString &header)
 namespace CPP {
 
 WriteIncludes::WriteIncludes(Uic *uic)
-    : m_uic(uic), m_output(uic->output()), m_laidOut(false)
+    : m_uic(uic), m_output(uic->output())
 {
     // When possible (no namespace) use the "QtModule/QClass" convention
     // and create a re-mapping of the old header "qclass.h" to it. Do not do this
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index e9247f4cc4..9b9ac283fe 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -40,6 +40,7 @@
 QT_BEGIN_NAMESPACE
 
 class QTextStream;
+class CustomWidgetsInfo;
 class Driver;
 class Uic;
 
@@ -74,11 +75,14 @@ struct WriteIncludes : public TreeWalker
     void acceptIncludes(DomIncludes *node) override;
     void acceptInclude(DomInclude *node) override;
 
+protected:
+     QTextStream &output() const { return m_output; }
+
 private:
     void add(const QString &className, bool determineHeader = true, const QString &header = QString(), bool global = false);
 
 private:
-    typedef std::set<QString> OrderedSet;
+    using OrderedSet = std::set<QString>;
     void insertIncludeForClass(const QString &className, QString header = QString(), bool global = false);
     void insertInclude(const QString &header, bool global);
     void writeHeaders(const OrderedSet &headers, bool global);
@@ -93,11 +97,11 @@ private:
 
     QSet<QString> m_knownClasses;
 
-    typedef QMap<QString, QString> StringMap;
+    using StringMap = QMap<QString, QString>;
     StringMap m_classToHeader;
     StringMap m_oldHeaderToNewHeader;
 
-    bool m_laidOut;
+    bool m_laidOut = false;
 };
 
 } // namespace CPP
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 2fb3e502c5..717bff4a51 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -71,7 +71,7 @@ namespace {
     // Write a statement to create a spacer item.
     void writeSpacerItem(const DomSpacer *node, QTextStream &output) {
         const QHash<QString, DomProperty *> properties = propertyMap(node->elementProperty());
-                output << "new QSpacerItem(";
+                output << language::operatorNew << "QSpacerItem(";
 
         int w = 0;
         int h = 0;
@@ -102,11 +102,9 @@ namespace {
             if (orientation == QLatin1String("Qt::Vertical") || orientation == QLatin1String("Vertical"))
                 isVspacer = true;
         }
-
-        if (isVspacer)
-            output << "QSizePolicy::Minimum, " << sizeType << ')';
-        else
-            output << sizeType << ", QSizePolicy::Minimum)";
+        const QString horizType = isVspacer ? QLatin1String("QSizePolicy::Minimum") : sizeType;
+        const QString vertType = isVspacer ? sizeType : QLatin1String("QSizePolicy::Minimum");
+        output << language::enumValue(horizType) << ", " << language::enumValue(vertType) << ')';
     }
 
 
@@ -120,7 +118,8 @@ namespace {
     // Write object->setFoo(x);
     template <class Value>
         void writeSetter(const QString &indent, const QString &varName,const QString &setter, Value v, QTextStream &str) {
-            str << indent << varName << "->" << setter << '(' << v << ");\n";
+            str << indent << varName << language::derefPointer
+                << setter << '(' << v << ')' << language::eol;
         }
 
     static inline bool iconHasStatePixmaps(const DomResourceIcon *i) {
@@ -456,22 +455,20 @@ WriteInitialization::WriteInitialization(Uic *uic) :
       m_driver(uic->driver()), m_output(uic->output()), m_option(uic->option()),
       m_indent(m_option.indent + m_option.indent),
       m_dindent(m_indent + m_option.indent),
-      m_stdsetdef(true),
-      m_layoutMarginType(TopLevelMargin),
-      m_mainFormUsedInRetranslateUi(false),
       m_delayedOut(&m_delayedInitialization, QIODevice::WriteOnly),
       m_refreshOut(&m_refreshInitialization, QIODevice::WriteOnly),
-      m_actionOut(&m_delayedActionInitialization, QIODevice::WriteOnly),
-      m_layoutWidget(false),
-      m_firstThemeIcon(true)
+      m_actionOut(&m_delayedActionInitialization, QIODevice::WriteOnly)
 {
 }
 
 void WriteInitialization::acceptUI(DomUI *node)
 {
-    m_actionGroupChain.push(0);
-    m_widgetChain.push(0);
-    m_layoutChain.push(0);
+    m_actionGroupChain.push(nullptr);
+    m_widgetChain.push(nullptr);
+    m_layoutChain.push(nullptr);
+
+    if (node->hasAttributeConnectslotsbyname())
+        m_connectSlotsByName = node->attributeConnectslotsbyname();
 
     acceptLayoutDefault(node->elementLayoutDefault());
     acceptLayoutFunction(node->elementLayoutFunction());
@@ -491,22 +488,21 @@ void WriteInitialization::acceptUI(DomUI *node)
 
     const QString varName = m_driver->findOrInsertWidget(node->elementWidget());
     m_mainFormVarName = varName;
-    m_registeredWidgets.insert(varName, node->elementWidget()); // register the main widget
 
     const QString widgetClassName = node->elementWidget()->attributeClass();
 
-    m_output << m_option.indent << "void " << "setupUi(" << widgetClassName << " *" << varName << ")\n"
-           << m_option.indent << "{\n";
+    const QString parameterType = widgetClassName + QLatin1String(" *");
+    m_output << m_option.indent
+             << language::startFunctionDefinition1("setupUi", parameterType, varName, m_option.indent);
 
     const QStringList connections = m_uic->databaseInfo()->connections();
-    for (int i=0; i<connections.size(); ++i) {
-        QString connection = connections.at(i);
-
+    for (const auto &connection : connections) {
         if (connection == QLatin1String("(default)"))
             continue;
 
         const QString varConn = connection + QLatin1String("Connection");
-        m_output << m_indent << varConn << " = QSqlDatabase::database(" << fixString(connection, m_dindent) << ");\n";
+        m_output << m_indent << varConn << " = QSqlDatabase::database("
+            << language::charliteral(connection, m_dindent) << ");\n";
     }
 
     acceptWidget(node->elementWidget());
@@ -514,20 +510,16 @@ void WriteInitialization::acceptUI(DomUI *node)
     if (!m_buddies.empty())
         m_output << language::openQtConfig(shortcutConfigKey());
     for (const Buddy &b : qAsConst(m_buddies)) {
-        if (!m_registeredWidgets.contains(b.objName)) {
+        const QString buddyVarName = m_driver->widgetVariableName(b.buddyAttributeName);
+        if (buddyVarName.isEmpty()) {
             fprintf(stderr, "%s: Warning: Buddy assignment: '%s' is not a valid widget.\n",
                     qPrintable(m_option.messagePrefix()),
-                    b.objName.toLatin1().data());
-            continue;
-        }
-        if (!m_registeredWidgets.contains(b.buddy)) {
-            fprintf(stderr, "%s: Warning: Buddy assignment: '%s' is not a valid widget.\n",
-                    qPrintable(m_option.messagePrefix()),
-                    b.buddy.toLatin1().data());
+                    qPrintable(b.buddyAttributeName));
             continue;
         }
 
-        m_output << m_indent << b.objName << "->setBuddy(" << b.buddy << ");\n";
+        m_output << m_indent << b.labelVarName << language::derefPointer
+            << "setBuddy(" << buddyVarName << ')' << language::eol;
     }
     if (!m_buddies.empty())
         m_output << language::closeQtConfig(shortcutConfigKey());
@@ -538,7 +530,8 @@ void WriteInitialization::acceptUI(DomUI *node)
     if (!m_delayedActionInitialization.isEmpty())
         m_output << "\n" << m_delayedActionInitialization;
 
-    m_output << "\n" << m_indent << "retranslateUi(" << varName << ");\n";
+    m_output << "\n" << m_indent << language::self
+        << "retranslateUi(" << varName << ')' << language::eol;
 
     if (node->elementConnections())
         acceptConnections(node->elementConnections());
@@ -546,22 +539,25 @@ void WriteInitialization::acceptUI(DomUI *node)
     if (!m_delayedInitialization.isEmpty())
         m_output << "\n" << m_delayedInitialization << "\n";
 
-    if (m_option.autoConnection)
-        m_output << "\n" << m_indent << "QMetaObject::connectSlotsByName(" << varName << ");\n";
+    if (m_option.autoConnection && m_connectSlotsByName) {
+        m_output << "\n" << m_indent << "QMetaObject" << language::qualifier
+            << "connectSlotsByName(" << varName << ')' << language::eol;
+    }
 
-    m_output << m_option.indent << "} // setupUi\n\n";
+    m_output << m_option.indent << language::endFunctionDefinition("setupUi");
 
-    if (!m_mainFormUsedInRetranslateUi) {
+    if (!m_mainFormUsedInRetranslateUi && language::language() == Language::Cpp) {
+        // Mark varName as unused to avoid compiler warnings.
         m_refreshInitialization += m_indent;
-        m_refreshInitialization += QLatin1String("Q_UNUSED(");
+        m_refreshInitialization += QLatin1String("(void)");
         m_refreshInitialization += varName ;
-        m_refreshInitialization += QLatin1String(");\n");
+        m_refreshInitialization += QLatin1String(";\n");
     }
 
-    m_output << m_option.indent << "void " << "retranslateUi(" << widgetClassName << " *" << varName << ")\n"
-           << m_option.indent << "{\n"
+    m_output << m_option.indent
+           << language::startFunctionDefinition1("retranslateUi", parameterType, varName, m_option.indent)
            << m_refreshInitialization
-           << m_option.indent << "} // retranslateUi\n\n";
+           << m_option.indent << language::endFunctionDefinition("retranslateUi");
 
     m_layoutChain.pop();
     m_widgetChain.pop();
@@ -584,9 +580,11 @@ void WriteInitialization::addWizardPage(const QString &pageVarName, const DomWid
         }
     }
     if (id.isEmpty()) {
-        m_output << m_indent << parentWidget << "->addPage(" << pageVarName << ");\n";
+        m_output << m_indent << parentWidget << language::derefPointer
+            << "addPage(" << pageVarName << ')' << language::eol;
     } else {
-        m_output << m_indent << parentWidget << "->setPage(" << id << ", " << pageVarName << ");\n";
+        m_output << m_indent << parentWidget << language::derefPointer
+            << "setPage(" << id << ", " << pageVarName << ')' << language::eol;
     }
 }
 
@@ -595,7 +593,6 @@ void WriteInitialization::acceptWidget(DomWidget *node)
     m_layoutMarginType = m_widgetChain.count() == 1 ? TopLevelMargin : ChildMargin;
     const QString className = node->attributeClass();
     const QString varName = m_driver->findOrInsertWidget(node);
-    m_registeredWidgets.insert(varName, node); // register the current widget
 
     QString parentWidget, parentClass;
     if (m_widgetChain.top()) {
@@ -611,8 +608,9 @@ void WriteInitialization::acceptWidget(DomWidget *node)
     const auto *cwi = m_uic->customWidgetsInfo();
 
     if (m_widgetChain.size() != 1) {
-        m_output << m_indent << varName << " = new " << cwi->realClassName(className)
-            << '(' << parentWidget << ");\n";
+        m_output << m_indent << varName << " = " << language::operatorNew
+            << language::fixClassName(cwi->realClassName(className))
+            << '(' << parentWidget << ')' << language::eol;
     }
 
     parentWidget = savedParentWidget;
@@ -664,26 +662,33 @@ void WriteInitialization::acceptWidget(DomWidget *node)
 
     if (cwi->extends(parentClass, QLatin1String("QMainWindow"))) {
         if (cwi->extends(className, QLatin1String("QMenuBar"))) {
-            m_output << m_indent << parentWidget << "->setMenuBar(" << varName <<");\n";
+            m_output << m_indent << parentWidget << language::derefPointer
+                << "setMenuBar(" << varName << ')' << language::eol;
         } else if (cwi->extends(className, QLatin1String("QToolBar"))) {
-            m_output << m_indent << parentWidget << "->addToolBar("
-                     << toolBarAreaStringFromDOMAttributes(attributes) << varName << ");\n";
+            m_output << m_indent << parentWidget << language::derefPointer << "addToolBar("
+                << language::enumValue(toolBarAreaStringFromDOMAttributes(attributes)) << varName
+                << ')' << language::eol;
 
             if (const DomProperty *pbreak = attributes.value(QLatin1String("toolBarBreak"))) {
                 if (pbreak->elementBool() == QLatin1String("true")) {
-                    m_output << m_indent << parentWidget << "->insertToolBarBreak(" <<  varName << ");\n";
+                    m_output << m_indent << parentWidget << language::derefPointer
+                        << "insertToolBarBreak(" <<  varName << ')' << language::eol;
                 }
             }
 
         } else if (cwi->extends(className, QLatin1String("QDockWidget"))) {
-            m_output << m_indent << parentWidget << "->addDockWidget(";
-            if (DomProperty *pstyle = attributes.value(QLatin1String("dockWidgetArea")))
-                m_output << "Qt::" << language::dockWidgetArea(pstyle->elementNumber()) << ", ";
+            m_output << m_indent << parentWidget << language::derefPointer << "addDockWidget(";
+            if (DomProperty *pstyle = attributes.value(QLatin1String("dockWidgetArea"))) {
+                m_output << "Qt" << language::qualifier
+                    << language::dockWidgetArea(pstyle->elementNumber()) << ", ";
+            }
             m_output << varName << ");\n";
         } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStatusBar"))) {
-            m_output << m_indent << parentWidget << "->setStatusBar(" << varName << ");\n";
+            m_output << m_indent << parentWidget << language::derefPointer
+                << "setStatusBar(" << varName << ')' << language::eol;
         } else {
-                m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n";
+                m_output << m_indent << parentWidget << language::derefPointer
+                    << "setCentralWidget(" << varName << ')' << language::eol;
         }
     }
 
@@ -692,56 +697,61 @@ void WriteInitialization::acceptWidget(DomWidget *node)
     if (addPageMethod.isEmpty())
         addPageMethod = cwi->simpleContainerAddPageMethod(parentClass);
     if (!addPageMethod.isEmpty()) {
-        m_output << m_indent << parentWidget << "->" << addPageMethod << '(' << varName << ");\n";
+        m_output << m_indent << parentWidget << language::derefPointer
+            << addPageMethod << '(' << varName << ')' << language::eol;
     } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QWizard"))) {
         addWizardPage(varName, node, parentWidget);
     } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QToolBox"))) {
         const DomProperty *plabel = attributes.value(QLatin1String("label"));
-        DomString *plabelString = plabel ? plabel->elementString() : 0;
+        DomString *plabelString = plabel ? plabel->elementString() : nullptr;
         QString icon;
         if (const DomProperty *picon = attributes.value(QLatin1String("icon")))
             icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition
+        m_output << m_indent << parentWidget << language::derefPointer << "addItem("
+            << varName << icon << ", " << noTrCall(plabelString, pageDefaultString)
+            << ')' << language::eol;
 
-        m_output << m_indent << parentWidget << "->addItem(" << varName << icon
-            << ", " << noTrCall(plabelString, pageDefaultString) << ");\n";
-
-        autoTrOutput(plabelString, pageDefaultString) << m_indent << parentWidget << "->setItemText("
-                   << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(plabelString, pageDefaultString) << ");\n";
+        autoTrOutput(plabelString, pageDefaultString) << m_indent << parentWidget
+            << language::derefPointer << "setItemText(" << parentWidget
+            << language::derefPointer << "indexOf("  << varName << "), "
+            << autoTrCall(plabelString, pageDefaultString) << ')' << language::eol;
 
         if (DomProperty *ptoolTip = attributes.value(QLatin1String("toolTip"))) {
             autoTrOutput(ptoolTip->elementString())
                 << language::openQtConfig(toolTipConfigKey())
-                << m_indent << parentWidget << "->setItemToolTip(" << parentWidget
-                << "->indexOf(" << varName << "), "
-                << autoTrCall(ptoolTip->elementString()) << ");\n"
+                << m_indent << parentWidget << language::derefPointer << "setItemToolTip(" << parentWidget
+                << language::derefPointer << "indexOf(" << varName << "), "
+                << autoTrCall(ptoolTip->elementString()) << ')' << language::eol
                 << language::closeQtConfig(toolTipConfigKey());
         }
     } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QTabWidget"))) {
         const DomProperty *ptitle = attributes.value(QLatin1String("title"));
-        DomString *ptitleString = ptitle ? ptitle->elementString() : 0;
+        DomString *ptitleString = ptitle ? ptitle->elementString() : nullptr;
         QString icon;
         if (const DomProperty *picon = attributes.value(QLatin1String("icon")))
             icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition
-        m_output << m_indent << parentWidget << "->addTab(" << varName << icon
-            << ", " << "QString());\n";
+        m_output << m_indent << parentWidget << language::derefPointer << "addTab("
+            << varName << icon << ", " << "QString())" << language::eol;
 
-        autoTrOutput(ptitleString, pageDefaultString) << m_indent << parentWidget << "->setTabText("
-                   << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(ptitleString, pageDefaultString) << ");\n";
+        autoTrOutput(ptitleString, pageDefaultString) << m_indent << parentWidget
+            << language::derefPointer << "setTabText(" << parentWidget
+            << language::derefPointer << "indexOf(" << varName << "), "
+            << autoTrCall(ptitleString, pageDefaultString) << ')' << language::eol;
 
         if (const DomProperty *ptoolTip = attributes.value(QLatin1String("toolTip"))) {
             autoTrOutput(ptoolTip->elementString())
                 << language::openQtConfig(toolTipConfigKey())
-                << m_indent << parentWidget << "->setTabToolTip(" << parentWidget
-                << "->indexOf(" << varName << "), "
-                << autoTrCall(ptoolTip->elementString()) << ");\n"
+                << m_indent << parentWidget << language::derefPointer << "setTabToolTip("
+                << parentWidget << language::derefPointer << "indexOf(" << varName
+                << "), " << autoTrCall(ptoolTip->elementString()) << ')' << language::eol
                 << language::closeQtConfig(toolTipConfigKey());
         }
         if (const DomProperty *pwhatsThis = attributes.value(QLatin1String("whatsThis"))) {
             autoTrOutput(pwhatsThis->elementString())
                 << language::openQtConfig(whatsThisConfigKey())
-                << m_indent << parentWidget << "->setTabWhatsThis(" << parentWidget
-                << "->indexOf(" << varName << "), "
-                << autoTrCall(pwhatsThis->elementString()) << ");\n"
+                << m_indent << parentWidget << language::derefPointer << "setTabWhatsThis("
+                << parentWidget << language::derefPointer << "indexOf(" << varName
+                << "), " << autoTrCall(pwhatsThis->elementString()) << ')' << language::eol
                 << language::closeQtConfig(whatsThisConfigKey());
         }
     }
@@ -776,8 +786,9 @@ void WriteInitialization::acceptWidget(DomWidget *node)
                 headerProperties << fakeProperty;
             }
         }
-        writeProperties(varName + QLatin1String("->header()"), QLatin1String("QHeaderView"),
-                        headerProperties, WritePropertyIgnoreObjectName);
+        writeProperties(varName + language::derefPointer + QLatin1String("header()"),
+                        QLatin1String("QHeaderView"), headerProperties,
+                        WritePropertyIgnoreObjectName);
 
     } else if (cwi->extendsOneOf(className, tables)) {
         static const QLatin1String headerPrefixes[] = {
@@ -795,8 +806,9 @@ void WriteInitialization::acceptWidget(DomWidget *node)
                     headerProperties << fakeProperty;
                 }
             }
-            writeProperties(varName + QLatin1String("->") + headerPrefix + QLatin1String("()"),
-                            QLatin1String("QHeaderView"),
+            const QString headerVar = varName + language::derefPointer
+                + headerPrefix + QLatin1String("()");
+            writeProperties(headerVar, QLatin1String("QHeaderView"),
                             headerProperties, WritePropertyIgnoreObjectName);
         }
     }
@@ -806,15 +818,15 @@ void WriteInitialization::acceptWidget(DomWidget *node)
 
     const QStringList zOrder = node->elementZOrder();
     for (const QString &name : zOrder) {
-        if (!m_registeredWidgets.contains(name)) {
+        const QString varName = m_driver->widgetVariableName(name);
+        if (varName.isEmpty()) {
             fprintf(stderr, "%s: Warning: Z-order assignment: '%s' is not a valid widget.\n",
                     qPrintable(m_option.messagePrefix()),
                     name.toLatin1().data());
-            continue;
+        } else {
+            m_output << m_indent << varName << language::derefPointer << "raise()"
+                << language::eol;
         }
-
-        if (!name.isEmpty())
-            m_output << m_indent << name << "->raise();\n";
     }
 }
 
@@ -829,7 +841,7 @@ void WriteInitialization::addButtonGroup(const DomWidget *buttonNode, const QStr
     const DomButtonGroup *group = m_driver->findButtonGroup(attributeName);
     // Legacy feature: Create missing groups on the fly as the UIC button group feature
     // was present before the actual Designer support (4.5)
-    const bool createGroupOnTheFly = group == 0;
+    const bool createGroupOnTheFly = group == nullptr;
     if (createGroupOnTheFly) {
         DomButtonGroup *newGroup = new DomButtonGroup;
         newGroup->setAttributeName(attributeName);
@@ -845,11 +857,13 @@ void WriteInitialization::addButtonGroup(const DomWidget *buttonNode, const QStr
         m_output << m_indent;
         if (createGroupOnTheFly)
             m_output << className << " *";
-        m_output << groupName << " = new " << className << '(' << m_mainFormVarName << ");\n";
+        m_output << groupName << " = " << language::operatorNew
+            << className << '(' << m_mainFormVarName << ')' << language::eol;
         m_buttonGroups.insert(groupName);
         writeProperties(groupName, className, group->elementProperty());
     }
-    m_output << m_indent << groupName << "->addButton(" << varName << ");\n";
+    m_output << m_indent << groupName << language::derefPointer << "addButton("
+        << varName << ')' << language::eol;
 }
 
 void WriteInitialization::acceptLayout(DomLayout *node)
@@ -862,7 +876,7 @@ void WriteInitialization::acceptLayout(DomLayout *node)
 
     bool isGroupBox = false;
 
-    m_output << m_indent << varName << " = new " << className << '(';
+    m_output << m_indent << varName << " = " << language::operatorNew << className << '(';
 
     if (!m_layoutChain.top() && !isGroupBox)
         m_output << m_driver->findOrInsertWidget(m_widgetChain.top());
@@ -883,8 +897,7 @@ void WriteInitialization::acceptLayout(DomLayout *node)
     if (m_layoutWidget) {
         bool left, top, right, bottom;
         left = top = right = bottom = false;
-        for (int i = 0; i < propList.size(); ++i) {
-            const DomProperty *p = propList.at(i);
+        for (const DomProperty *p : propList) {
             const QString propertyName = p->attributeName();
             if (propertyName == QLatin1String("leftMargin") && p->kind() == DomProperty::Number)
                 left = true;
@@ -954,9 +967,12 @@ void WriteInitialization::writePropertyList(const QString &varName,
         return;
     const QStringList list = value.split(QLatin1Char(','));
     const int count =  list.count();
-    for (int i = 0; i < count; i++)
-        if (list.at(i) != defaultValue)
-            m_output << m_indent << varName << "->" << setFunction << '(' << i << ", " << list.at(i) << ");\n";
+    for (int i = 0; i < count; i++) {
+        if (list.at(i) != defaultValue) {
+            m_output << m_indent << varName << language::derefPointer << setFunction
+                << '(' << i << ", " << list.at(i) << ')' << language::eol;
+        }
+    }
 }
 
 void WriteInitialization::acceptSpacer(DomSpacer *node)
@@ -1003,7 +1019,7 @@ void WriteInitialization::acceptLayoutItem(DomLayoutItem *node)
     const QString layoutName = m_driver->findOrInsertLayout(layout);
     const QString itemName = m_driver->findOrInsertLayoutItem(node);
 
-    m_output << "\n" << m_indent << layoutName << "->"
+    m_output << "\n" << m_indent << layoutName << language::derefPointer << ""
         << layoutAddMethod(node->kind(), layout->attributeClass()) << '(';
 
     if (layout->attributeClass() == QLatin1String("QGridLayout")) {
@@ -1014,16 +1030,16 @@ void WriteInitialization::acceptLayoutItem(DomLayoutItem *node)
         const int colSpan = node->hasAttributeColSpan() ? node->attributeColSpan() : 1;
         m_output << itemName << ", " << row << ", " << col << ", " << rowSpan << ", " << colSpan;
         if (!node->attributeAlignment().isEmpty())
-            m_output << ", " << node->attributeAlignment();
+            m_output << ", " << language::enumValue(node->attributeAlignment());
     } else if (layout->attributeClass() == QLatin1String("QFormLayout")) {
         const int row = node->attributeRow();
         const int colSpan = node->hasAttributeColSpan() ? node->attributeColSpan() : 1;
         const QString role = formLayoutRole(node->attributeColumn(), colSpan);
-        m_output << row << ", " << role << ", " << itemName;
+        m_output << row << ", " << language::enumValue(role) << ", " << itemName;
     } else {
         m_output << itemName;
         if (layout->attributeClass().contains(QLatin1String("Box")) && !node->attributeAlignment().isEmpty())
-            m_output << ", 0, " << node->attributeAlignment();
+            m_output << ", 0, " << language::enumValue(node->attributeAlignment());
     }
     m_output << ");\n\n";
 }
@@ -1036,7 +1052,8 @@ void WriteInitialization::acceptActionGroup(DomActionGroup *node)
     if (m_actionGroupChain.top())
         varName = m_driver->findOrInsertActionGroup(m_actionGroupChain.top());
 
-    m_output << m_indent << actionName << " = new QActionGroup(" << varName << ");\n";
+    m_output << m_indent << actionName << " = " << language::operatorNew
+        << "QActionGroup(" << varName << ");\n";
     writeProperties(actionName, QLatin1String("QActionGroup"), node->elementProperty());
 
     m_actionGroupChain.push(node);
@@ -1050,13 +1067,13 @@ void WriteInitialization::acceptAction(DomAction *node)
         return;
 
     const QString actionName = m_driver->findOrInsertAction(node);
-    m_registeredActions.insert(actionName, node);
     QString varName = m_driver->findOrInsertWidget(m_widgetChain.top());
 
     if (m_actionGroupChain.top())
         varName = m_driver->findOrInsertActionGroup(m_actionGroupChain.top());
 
-    m_output << m_indent << actionName << " = new QAction(" << varName << ");\n";
+    m_output << m_indent << actionName << " = " << language::operatorNew
+        << "QAction(" << varName << ')' << language::eol;
     writeProperties(actionName, QLatin1String("QAction"), node->elementProperty());
 }
 
@@ -1069,28 +1086,32 @@ void WriteInitialization::acceptActionRef(DomActionRef *node)
     }
 
     const QString varName = m_driver->findOrInsertWidget(m_widgetChain.top());
-    const bool isSeparator = actionName == QLatin1String("separator");
-    bool isMenu = false;
 
-    if (const DomWidget *w = m_driver->widgetByName(actionName)) {
-        isMenu = m_uic->isMenu(w->attributeClass());
-    } else if (!(m_driver->actionByName(actionName) || isSeparator)) {
-        fprintf(stderr, "%s: Warning: action `%s' not declared\n",
-                qPrintable(m_option.messagePrefix()),
-                actionName.toLatin1().data());
+    if (m_widgetChain.top() && actionName == QLatin1String("separator")) {
+        // separator is always reserved!
+        m_actionOut << m_indent << varName << language::derefPointer
+            << "addSeparator()" << language::eol;
         return;
     }
 
-    if (m_widgetChain.top() && isSeparator) {
-        // separator is always reserved!
-        m_actionOut << m_indent << varName << "->addSeparator();\n";
+    const DomWidget *domWidget = m_driver->widgetByName(actionName);
+    if (domWidget && m_uic->isMenu(domWidget->attributeClass())) {
+        m_actionOut << m_indent << varName << language::derefPointer
+            << "addAction(" << m_driver->findOrInsertWidget(domWidget)
+            << language::derefPointer << "menuAction())" << language::eol;
         return;
     }
 
-    if (isMenu)
-        actionName += QLatin1String("->menuAction()");
+    const DomAction *domAction = m_driver->actionByName(actionName);
+    if (!domAction) {
+        fprintf(stderr, "%s: Warning: action `%s' not declared\n",
+                qPrintable(m_option.messagePrefix()), qPrintable(actionName));
+        return;
+    }
 
-    m_actionOut << m_indent << varName << "->addAction(" << actionName << ");\n";
+    m_actionOut << m_indent << varName << language::derefPointer
+        << "addAction(" << m_driver->findOrInsertAction(domAction)
+        << ')' << language::eol;
 }
 
 QString WriteInitialization::writeStringListProperty(const DomStringList *list) const
@@ -1107,7 +1128,7 @@ QString WriteInitialization::writeStringListProperty(const DomStringList *list)
             str << '\n' << m_indent << "    << " << trCall(values.at(i), comment);
     } else {
         for (int i = 0; i < values.size(); ++i)
-            str << " << QString::fromUtf8(" << fixString(values.at(i), m_dindent) << ')';
+            str << " << " << language::qstring(values.at(i), m_dindent);
     }
     return propertyValue;
 }
@@ -1139,19 +1160,32 @@ void WriteInitialization::writeProperties(const QString &varName,
     if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QAxWidget"))) {
         DomPropertyMap properties = propertyMap(lst);
         if (DomProperty *p = properties.value(QLatin1String("control"))) {
-            m_output << m_indent << varName << "->setControl(QString::fromUtf8("
-                     << fixString(toString(p->elementString()), m_dindent) << "));\n";
+            m_output << m_indent << varName << language::derefPointer << "setControl("
+                << language::qstring(toString(p->elementString()), m_dindent)
+                << ')' << language::eol;
         }
     }
 
     QString indent;
     if (!m_widgetChain.top()) {
         indent = m_option.indent;
-        m_output << m_indent << "if (" << varName << "->objectName().isEmpty())\n";
+        switch (language::language()) {
+         case Language::Cpp:
+            m_output << m_indent << "if (" << varName << "->objectName().isEmpty())\n";
+            break;
+        case Language::Python:
+           m_output << m_indent << "if " << varName << ".objectName():\n";
+           break;
+        }
+    }
+    if (!(flags & WritePropertyIgnoreObjectName)) {
+        QString objectName = varName;
+        if (!language::self.isEmpty() && objectName.startsWith(language::self))
+            objectName.remove(0, language::self.size());
+        m_output << m_indent << indent
+            << varName << language::derefPointer << "setObjectName("
+            << language::qstring(objectName, m_dindent) << ')' << language::eol;
     }
-    if (!(flags & WritePropertyIgnoreObjectName))
-        m_output << m_indent << indent << varName
-                 << "->setObjectName(QString::fromUtf8(" << fixString(varName, m_dindent) << "));\n";
 
     int leftMargin, topMargin, rightMargin, bottomMargin;
     leftMargin = topMargin = rightMargin = bottomMargin = -1;
@@ -1167,13 +1201,14 @@ void WriteInitialization::writeProperties(const QString &varName,
         // special case for the property `geometry': Do not use position
         if (isTopLevel && propertyName == QLatin1String("geometry") && p->elementRect()) {
             const DomRect *r = p->elementRect();
-            m_output << m_indent << varName << "->resize(" << r->elementWidth() << ", " << r->elementHeight() << ");\n";
+            m_output << m_indent << varName << language::derefPointer << "resize("
+                << r->elementWidth() << ", " << r->elementHeight() << ')' << language::eol;
             continue;
         }
         if (propertyName == QLatin1String("currentRow") // QListWidget::currentRow
                 && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QListWidget"))) {
-            m_delayedOut << m_indent << varName << "->setCurrentRow("
-                       << p->elementNumber() << ");\n";
+            m_delayedOut << m_indent << varName << language::derefPointer
+                << "setCurrentRow(" << p->elementNumber() << ')' << language::eol;
             continue;
         }
         static const QStringList currentIndexWidgets = {
@@ -1182,14 +1217,15 @@ void WriteInitialization::writeProperties(const QString &varName,
         };
         if (propertyName == QLatin1String("currentIndex") // set currentIndex later
             && (m_uic->customWidgetsInfo()->extendsOneOf(className, currentIndexWidgets))) {
-            m_delayedOut << m_indent << varName << "->setCurrentIndex("
-                       << p->elementNumber() << ");\n";
+            m_delayedOut << m_indent << varName << language::derefPointer
+                << "setCurrentIndex(" << p->elementNumber() << ')' << language::eol;
             continue;
         }
         if (propertyName == QLatin1String("tabSpacing")
             && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox"))) {
-            m_delayedOut << m_indent << varName << "->layout()->setSpacing("
-                       << p->elementNumber() << ");\n";
+            m_delayedOut << m_indent << varName << language::derefPointer
+                << "layout()" << language::derefPointer << "setSpacing("
+                << p->elementNumber() << ')' << language::eol;
             continue;
         }
         if (propertyName == QLatin1String("control") // ActiveQt support
@@ -1216,10 +1252,15 @@ void WriteInitialization::writeProperties(const QString &varName,
             if (p->elementEnum() == QLatin1String("Qt::Vertical"))
                 shape = QLatin1String("QFrame::VLine");
 
-            m_output << m_indent << varName << "->setFrameShape(" << shape << ");\n";
+            m_output << m_indent << varName << language::derefPointer << "setFrameShape("
+                << language::enumValue(shape) << ')' << language::eol;
             // QFrame Default is 'Plain'. Make the line 'Sunken' unless otherwise specified
-            if (!frameShadowEncountered)
-                m_output << m_indent << varName << "->setFrameShadow(QFrame::Sunken);\n";
+            if (!frameShadowEncountered) {
+                m_output << m_indent << varName << language::derefPointer
+                    << "setFrameShadow("
+                    << language::enumValue(QLatin1String("QFrame::Sunken"))
+                    << ')' << language::eol;
+            }
             continue;
         } else if ((flags & WritePropertyIgnoreMargin)  && propertyName == QLatin1String("margin")) {
             continue;
@@ -1251,25 +1292,28 @@ void WriteInitialization::writeProperties(const QString &varName,
 
         QString setFunction;
 
-        if (stdset) {
-            setFunction = QLatin1String("->set")
-                        + propertyName.at(0).toUpper()
-                        + propertyName.midRef(1)
-                        + QLatin1Char('(');
-        } else {
-            setFunction += QLatin1String("->setProperty(\"")
-                         + propertyName
-                         + QLatin1String("\", QVariant");
-            if (p->kind() == DomProperty::Enum)
-                setFunction += QLatin1String("::fromValue");
-            setFunction += QLatin1Char('(');
-        }
+        {
+            QTextStream str(&setFunction);
+            if (stdset) {
+                str << language::derefPointer <<"set" << propertyName.at(0).toUpper()
+                    << propertyName.midRef(1) << '(';
+            } else {
+                str << language::derefPointer << QLatin1String("setProperty(\"")
+                    << propertyName << "\", ";
+                if (language::language() == Language::Cpp) {
+                    str << "QVariant";
+                    if (p->kind() == DomProperty::Enum)
+                        str << "::fromValue";
+                    str << '(';
+                }
+            }
+        } // QTextStream
 
         QString varNewName = varName;
 
         switch (p->kind()) {
         case DomProperty::Bool: {
-            propertyValue = p->elementBool();
+            propertyValue = language::boolValue(p->elementBool() == language::cppTrue);
             break;
         }
         case DomProperty::Color:
@@ -1280,13 +1324,12 @@ void WriteInitialization::writeProperties(const QString &varName,
                 Buddy buddy = { varName, p->elementCstring() };
                 m_buddies.append(std::move(buddy));
             } else {
-                if (stdset)
-                    propertyValue = fixString(p->elementCstring(), m_dindent);
-                else {
-                    propertyValue = QLatin1String("QByteArray(")
-                                  + fixString(p->elementCstring(), m_dindent)
-                                  + QLatin1Char(')');
-                }
+                QTextStream str(&propertyValue);
+                if (!stdset)
+                    str << "QByteArray(";
+                str << language::charliteral(p->elementCstring(), m_dindent);
+                if (!stdset)
+                    str << ')';
             }
             break;
         case DomProperty::Cursor:
@@ -1295,17 +1338,19 @@ void WriteInitialization::writeProperties(const QString &varName,
             break;
         case DomProperty::CursorShape:
             if (p->hasAttributeStdset() && !p->attributeStdset())
-                varNewName += QLatin1String("->viewport()");
-            propertyValue = QString::fromLatin1("QCursor(Qt::%1)")
-                            .arg(p->elementCursorShape());
+                varNewName += language::derefPointer + QLatin1String("viewport()");
+            propertyValue = QLatin1String("QCursor(Qt") + language::qualifier
+                + p->elementCursorShape() + QLatin1Char(')');
             break;
         case DomProperty::Enum:
             propertyValue = p->elementEnum();
-            if (!propertyValue.contains(QLatin1String("::")))
-                propertyValue = className + QLatin1String("::") + propertyValue;
+            if (propertyValue.contains(language::cppQualifier))
+                propertyValue = language::enumValue(propertyValue);
+            else
+                propertyValue.prepend(className + language::qualifier);
             break;
         case DomProperty::Set:
-            propertyValue = p->elementSet();
+            propertyValue = language::enumValue(p->elementSet());
             break;
         case DomProperty::Font:
             propertyValue = writeFontProperties(p->elementFont());
@@ -1319,8 +1364,8 @@ void WriteInitialization::writeProperties(const QString &varName,
         case DomProperty::Palette: {
             const DomPalette *pal = p->elementPalette();
             const QString paletteName = m_driver->unique(QLatin1String("palette"));
-            m_output << m_indent << "QPalette " << paletteName << ";\n";
-
+            m_output << m_indent << language::stackVariable("QPalette", paletteName)
+                << language::eol;
             writeColorGroup(pal->elementActive(), QLatin1String("QPalette::Active"), paletteName);
             writeColorGroup(pal->elementInactive(), QLatin1String("QPalette::Inactive"), paletteName);
             writeColorGroup(pal->elementDisabled(), QLatin1String("QPalette::Disabled"), paletteName);
@@ -1356,15 +1401,16 @@ void WriteInitialization::writeProperties(const QString &varName,
         }
         case DomProperty::Locale: {
              const DomLocale *locale = p->elementLocale();
-             propertyValue = QString::fromLatin1("QLocale(QLocale::%1, QLocale::%2)")
-                             .arg(locale->attributeLanguage(), locale->attributeCountry());
+             QTextStream(&propertyValue) << "QLocale(QLocale" << language::qualifier
+                 << locale->attributeLanguage() << ", QLocale" << language::qualifier
+                 << locale->attributeCountry() << ')';
             break;
         }
         case DomProperty::SizePolicy: {
             const QString spName = writeSizePolicy( p->elementSizePolicy());
-            m_output << m_indent << spName << QString::fromLatin1(
-                ".setHeightForWidth(%1->sizePolicy().hasHeightForWidth());\n")
-                .arg(varName);
+            m_output << m_indent << spName << ".setHeightForWidth("
+                << varName << language::derefPointer << "sizePolicy().hasHeightForWidth())"
+                << language::eol;
 
             propertyValue = spName;
             break;
@@ -1455,8 +1501,8 @@ void WriteInitialization::writeProperties(const QString &varName,
 
         case DomProperty::Url: {
             const DomUrl* u = p->elementUrl();
-            propertyValue = QString::fromLatin1("QUrl(QString::fromUtf8(%1))")
-                            .arg(fixString(u->elementString()->text(), m_dindent));
+            QTextStream(&propertyValue) << "QUrl("
+                << language::qstring(u->elementString()->text(), m_dindent) << ")";
             break;
         }
         case DomProperty::Brush:
@@ -1474,9 +1520,9 @@ void WriteInitialization::writeProperties(const QString &varName,
             if (!configKey.isEmpty())
                 o << language::openQtConfig(configKey);
             o << m_indent << varNewName << setFunction << propertyValue;
-            if (!stdset)
+            if (!stdset && language::language() == Language::Cpp)
                 o << ')';
-            o << ");\n";
+            o << ')' << language::eol;
             if (!configKey.isEmpty())
                o << language::closeQtConfig(configKey);
 
@@ -1488,7 +1534,7 @@ void WriteInitialization::writeProperties(const QString &varName,
         }
     }
     if (leftMargin != -1 || topMargin != -1 || rightMargin != -1 || bottomMargin != -1) {
-        m_output << m_indent << varName << "->setContentsMargins("
+        m_output << m_indent << varName << language::derefPointer << "setContentsMargins("
             << leftMargin << ", " << topMargin << ", "
             << rightMargin << ", " << bottomMargin << ");\n";
     }
@@ -1509,20 +1555,15 @@ QString  WriteInitialization::writeSizePolicy(const DomSizePolicy *sp)
     const QString spName = m_driver->unique(QLatin1String("sizePolicy"));
     m_sizePolicyNameMap.insert(sizePolicyHandle, spName);
 
-    m_output << m_indent << "QSizePolicy " << spName;
-    do {
-        if (sp->hasElementHSizeType() && sp->hasElementVSizeType()) {
-            m_output << "(QSizePolicy::" << language::sizePolicy(sp->elementHSizeType())
-                << ", QSizePolicy::" << language::sizePolicy(sp->elementVSizeType()) << ");\n";
-            break;
-        }
-        if (sp->hasAttributeHSizeType() && sp->hasAttributeVSizeType()) {
-                m_output << "(QSizePolicy::" << sp->attributeHSizeType() << ", QSizePolicy::"
-                << sp->attributeVSizeType() << ");\n";
-            break;
-        }
-        m_output << ";\n";
-    } while (false);
+    m_output << m_indent << language::stackVariableWithInitParameters("QSizePolicy", spName);
+    if (sp->hasElementHSizeType() && sp->hasElementVSizeType()) {
+        m_output << "QSizePolicy" << language::qualifier << language::sizePolicy(sp->elementHSizeType())
+            << ", QSizePolicy" << language::qualifier << language::sizePolicy(sp->elementVSizeType());
+    } else if (sp->hasAttributeHSizeType() && sp->hasAttributeVSizeType()) {
+        m_output << "QSizePolicy" << language::qualifier << sp->attributeHSizeType()
+            << ", QSizePolicy" << language::qualifier << sp->attributeVSizeType();
+    }
+    m_output << ')' << language::eol;
 
     m_output << m_indent << spName << ".setHorizontalStretch("
         << sp->elementHorStretch() << ");\n";
@@ -1546,10 +1587,11 @@ QString WriteInitialization::writeFontProperties(const DomFont *f)
     const QString fontName = m_driver->unique(QLatin1String("font"));
     m_fontPropertiesNameMap.insert(FontHandle(f), fontName);
 
-    m_output << m_indent << "QFont " << fontName << ";\n";
+    m_output << m_indent << language::stackVariable("QFont", fontName)
+        << language::eol;
     if (f->hasElementFamily() && !f->elementFamily().isEmpty()) {
-        m_output << m_indent << fontName << ".setFamily(QString::fromUtf8("
-                 << fixString(f->elementFamily(), m_dindent) << "));\n";
+        m_output << m_indent << fontName << ".setFamily("
+            << language::qstring(f->elementFamily(), m_dindent) << ");\n";
     }
     if (f->hasElementPointSize() && f->elementPointSize() > 0) {
          m_output << m_indent << fontName << ".setPointSize(" << f->elementPointSize()
@@ -1558,39 +1600,51 @@ QString WriteInitialization::writeFontProperties(const DomFont *f)
 
     if (f->hasElementBold()) {
         m_output << m_indent << fontName << ".setBold("
-            << (f->elementBold() ? "true" : "false") << ");\n";
+            << language::boolValue(f->elementBold()) << ')' << language::eol;
     }
     if (f->hasElementItalic()) {
         m_output << m_indent << fontName << ".setItalic("
-            <<  (f->elementItalic() ? "true" : "false") << ");\n";
+            << language::boolValue(f->elementItalic()) << ')' << language::eol;
     }
     if (f->hasElementUnderline()) {
         m_output << m_indent << fontName << ".setUnderline("
-            << (f->elementUnderline() ? "true" : "false") << ");\n";
+            << language::boolValue(f->elementUnderline()) << ')' << language::eol;
     }
     if (f->hasElementWeight() && f->elementWeight() > 0) {
         m_output << m_indent << fontName << ".setWeight("
-            << f->elementWeight() << ");" << endl;
+            << f->elementWeight() << ");" << Qt::endl;
     }
     if (f->hasElementStrikeOut()) {
          m_output << m_indent << fontName << ".setStrikeOut("
-            << (f->elementStrikeOut() ? "true" : "false") << ");\n";
+            << language::boolValue(f->elementStrikeOut()) << ')' << language::eol;
     }
     if (f->hasElementKerning()) {
         m_output << m_indent << fontName << ".setKerning("
-            << (f->elementKerning() ? "true" : "false") << ");\n";
+            << language::boolValue(f->elementKerning()) << ')' << language::eol;
     }
     if (f->hasElementAntialiasing()) {
-        m_output << m_indent << fontName << ".setStyleStrategy("
-            << (f->elementAntialiasing() ? "QFont::PreferDefault" : "QFont::NoAntialias") << ");\n";
+        m_output << m_indent << fontName << ".setStyleStrategy(QFont"
+            << language::qualifier
+            << (f->elementAntialiasing() ? "PreferDefault" : "NoAntialias")
+            << ')' << language::eol;
     }
     if (f->hasElementStyleStrategy()) {
-         m_output << m_indent << fontName << ".setStyleStrategy(QFont::"
-            << f->elementStyleStrategy() << ");\n";
+         m_output << m_indent << fontName << ".setStyleStrategy(QFont"
+            << language::qualifier << f->elementStyleStrategy() << ')' << language::eol;
     }
     return  fontName;
 }
 
+static void writeIconAddFile(QTextStream &output, const QString &indent,
+                             const QString &iconName, const QString &fileName,
+                             const char *mode, const char *state)
+{
+    output << indent << iconName << ".addFile("
+        << language::qstring(fileName, indent) << ", QSize(), QIcon"
+        << language::qualifier << mode << ", QIcon" << language::qualifier
+        << state << ')' << language::eol;
+}
+
 // Post 4.4 write resource icon
 static void writeResourceIcon(QTextStream &output,
                               const QString &iconName,
@@ -1598,91 +1652,92 @@ static void writeResourceIcon(QTextStream &output,
                               const DomResourceIcon *i)
 {
     if (i->hasElementNormalOff()) {
-        output << indent << iconName << ".addFile(QString::fromUtf8("
-               << fixString(i->elementNormalOff()->text(), indent)
-               << "), QSize(), QIcon::Normal, QIcon::Off);\n";
+        writeIconAddFile(output, indent, iconName, i->elementNormalOff()->text(),
+                         "Normal", "Off");
     }
     if (i->hasElementNormalOn()) {
-        output << indent << iconName << ".addFile(QString::fromUtf8("
-               << fixString(i->elementNormalOn()->text(), indent)
-               << "), QSize(), QIcon::Normal, QIcon::On);\n";
+        writeIconAddFile(output, indent, iconName, i->elementNormalOn()->text(),
+                         "Normal", "On");
     }
     if (i->hasElementDisabledOff()) {
-        output << indent << iconName << ".addFile(QString::fromUtf8("
-               << fixString(i->elementDisabledOff()->text(), indent)
-               << "), QSize(), QIcon::Disabled, QIcon::Off);\n";
+        writeIconAddFile(output, indent, iconName, i->elementDisabledOff()->text(),
+                         "Disabled", "Off");
     }
     if (i->hasElementDisabledOn()) {
-        output << indent << iconName << ".addFile(QString::fromUtf8("
-               << fixString(i->elementDisabledOn()->text(), indent)
-               << "), QSize(), QIcon::Disabled, QIcon::On);\n";
+        writeIconAddFile(output, indent, iconName, i->elementDisabledOn()->text(),
+                         "Disabled", "On");
     }
     if (i->hasElementActiveOff()) {
-        output << indent << iconName << ".addFile(QString::fromUtf8("
-               << fixString(i->elementActiveOff()->text(), indent)
-               << "), QSize(), QIcon::Active, QIcon::Off);\n";
+        writeIconAddFile(output, indent, iconName, i->elementActiveOff()->text(),
+                         "Active", "Off");
     }
     if (i->hasElementActiveOn()) {
-        output << indent << iconName << ".addFile(QString::fromUtf8("
-               << fixString(i->elementActiveOn()->text(), indent)
-               << "), QSize(), QIcon::Active, QIcon::On);\n";
+        writeIconAddFile(output, indent, iconName, i->elementActiveOn()->text(),
+                         "Active", "On");
     }
     if (i->hasElementSelectedOff()) {
-        output << indent << iconName << ".addFile(QString::fromUtf8("
-               << fixString(i->elementSelectedOff()->text(), indent)
-               << "), QSize(), QIcon::Selected, QIcon::Off);\n";
+        writeIconAddFile(output, indent, iconName, i->elementSelectedOff()->text(),
+                         "Selected", "Off");
     }
     if (i->hasElementSelectedOn()) {
-        output << indent << iconName << ".addFile(QString::fromUtf8("
-               << fixString(i->elementSelectedOn()->text(), indent)
-               << "), QSize(), QIcon::Selected, QIcon::On);\n";
+        writeIconAddFile(output, indent, iconName, i->elementSelectedOn()->text(),
+                         "Selected", "On");
     }
 }
 
+static void writeIconAddPixmap(QTextStream &output, const QString &indent,
+                               const QString &iconName, const QString &call,
+                               const char *mode, const char *state)
+{
+    output << indent << iconName << ".addPixmap(" << call << ", QIcon"
+        << language::qualifier << mode << ", QIcon" << language::qualifier
+        << state << ')' << language::eol;
+}
+
 void WriteInitialization::writePixmapFunctionIcon(QTextStream &output,
                                                   const QString &iconName,
                                                   const QString &indent,
                                                   const DomResourceIcon *i) const
 {
     if (i->hasElementNormalOff()) {
-        output << indent << iconName << ".addPixmap("
-               << pixCall(QLatin1String("QPixmap"), i->elementNormalOff()->text())
-               << ", QIcon::Normal, QIcon::Off);\n";
+        writeIconAddPixmap(output, indent,  iconName,
+                           pixCall(QLatin1String("QPixmap"), i->elementNormalOff()->text()),
+                           "Normal", "Off");
     }
     if (i->hasElementNormalOn()) {
-        output << indent << iconName << ".addPixmap("
-               << pixCall(QLatin1String("QPixmap"), i->elementNormalOn()->text())
-               << ", QIcon::Normal, QIcon::On);\n";
+        writeIconAddPixmap(output, indent,  iconName,
+                           pixCall(QLatin1String("QPixmap"), i->elementNormalOn()->text()),
+                           "Normal", "On");
     }
     if (i->hasElementDisabledOff()) {
-        output << indent << iconName << ".addPixmap("
-               << pixCall(QLatin1String("QPixmap"), i->elementDisabledOff()->text())
-               << ", QIcon::Disabled, QIcon::Off);\n";
+        writeIconAddPixmap(output, indent,  iconName,
+                           pixCall(QLatin1String("QPixmap"), i->elementDisabledOff()->text()),
+                           "Disabled", "Off");
     }
     if (i->hasElementDisabledOn()) {
-        output << indent << iconName << ".addPixmap("
-               << pixCall(QLatin1String("QPixmap"), i->elementDisabledOn()->text())
-               << ", QIcon::Disabled, QIcon::On);\n";
+        writeIconAddPixmap(output, indent,  iconName,
+                           pixCall(QLatin1String("QPixmap"), i->elementDisabledOn()->text()),
+                           "Disabled", "On");
     }
     if (i->hasElementActiveOff()) {
-        output << indent << iconName << ".addPixmap("
-               << pixCall(QLatin1String("QPixmap"), i->elementActiveOff()->text())
-               << ", QIcon::Active, QIcon::Off);\n";
+        writeIconAddPixmap(output, indent,  iconName,
+                           pixCall(QLatin1String("QPixmap"), i->elementActiveOff()->text()),
+                           "Active", "Off");
     }
     if (i->hasElementActiveOn()) {
-        output << indent << iconName << ".addPixmap("
-               << pixCall(QLatin1String("QPixmap"), i->elementActiveOn()->text())
-               << ", QIcon::Active, QIcon::On);\n";
+        writeIconAddPixmap(output, indent,  iconName,
+                           pixCall(QLatin1String("QPixmap"), i->elementActiveOn()->text()),
+                           "Active", "On");
     }
     if (i->hasElementSelectedOff()) {
-        output << indent << iconName << ".addPixmap("
-               << pixCall(QLatin1String("QPixmap"), i->elementSelectedOff()->text())
-               << ", QIcon::Selected, QIcon::Off);\n";
+        writeIconAddPixmap(output, indent,  iconName,
+                           pixCall(QLatin1String("QPixmap"), i->elementSelectedOff()->text()),
+                           "Selected", "Off");
     }
     if (i->hasElementSelectedOn()) {
-        output << indent << iconName << ".addPixmap("
-               << pixCall(QLatin1String("QPixmap"), i->elementSelectedOn()->text())
-               << ", QIcon::Selected, QIcon::On);\n";
+        writeIconAddPixmap(output, indent,  iconName,
+                           pixCall(QLatin1String("QPixmap"), i->elementSelectedOn()->text()),
+                           "Selected", "On");
     }
 }
 
@@ -1691,57 +1746,76 @@ QString WriteInitialization::writeIconProperties(const DomResourceIcon *i)
     // check cache
     const IconHandle iconHandle(i);
     const IconPropertiesNameMap::const_iterator it = m_iconPropertiesNameMap.constFind(iconHandle);
-    if (it != m_iconPropertiesNameMap.constEnd()) {
+    if (it != m_iconPropertiesNameMap.constEnd())
         return it.value();
-    }
 
     // insert with new name
     const QString iconName = m_driver->unique(QLatin1String("icon"));
     m_iconPropertiesNameMap.insert(IconHandle(i), iconName);
-    if (isIconFormat44(i)) {
-        if (i->attributeTheme().isEmpty()) {
-            // No theme: Write resource icon as is
-            m_output << m_indent << "QIcon " << iconName << ";\n";
-            if (m_uic->pixmapFunction().isEmpty())
-                writeResourceIcon(m_output, iconName, m_indent, i);
-            else
-                writePixmapFunctionIcon(m_output, iconName, m_indent, i);
-        } else {
-            // Theme: Generate code to check the theme and default to resource
-            const QString themeIconName = fixString(i->attributeTheme(), QString());
-            if (iconHasStatePixmaps(i)) {
-                // Theme + default state pixmaps:
-                // Generate code to check the theme and default to state pixmaps
-                m_output << m_indent << "QIcon " << iconName << ";\n";
-                const char themeNameStringVariableC[] = "iconThemeName";
-                // Store theme name in a variable
-                m_output << m_indent;
-                if (m_firstThemeIcon) { // Declare variable string
-                    m_output << "QString ";
-                    m_firstThemeIcon = false;
-                }
-                m_output << themeNameStringVariableC << " = QString::fromUtf8("
-                         << themeIconName << ");\n";
-                m_output << m_indent << "if (QIcon::hasThemeIcon("
-                         << themeNameStringVariableC
-                         << ")) {\n"
-                         << m_dindent << iconName << " = QIcon::fromTheme(" << themeNameStringVariableC << ");\n"
-                         << m_indent << "} else {\n";
-                if (m_uic->pixmapFunction().isEmpty())
-                    writeResourceIcon(m_output, iconName, m_dindent, i);
-                else
-                    writePixmapFunctionIcon(m_output, iconName, m_dindent, i);
-                m_output << m_indent << "}\n";
-            } else {
-                // Theme, but no state pixmaps: Construct from theme directly.
-                m_output << m_indent << "QIcon " << iconName
-                         << "(QIcon::fromTheme(QString::fromUtf8("
-                         << themeIconName << ")));\n";
-            } // Theme, but not state
-        }     // >= 4.4
-    } else {  // pre-4.4 legacy
-        m_output <<  m_indent << "const QIcon " << iconName << " = " << pixCall(QLatin1String("QIcon"), i->text())<< ";\n";
+
+    const bool isCpp = language::language() == Language::Cpp;
+
+    if (Q_UNLIKELY(!isIconFormat44(i))) { // pre-4.4 legacy
+        m_output <<  m_indent;
+        if (isCpp)
+            m_output << "const QIcon ";
+        m_output << iconName << " = " << pixCall(QLatin1String("QIcon"), i->text())
+            << language::eol;
+        return iconName;
+    }
+
+    // 4.4 onwards
+    if (i->attributeTheme().isEmpty()) {
+        // No theme: Write resource icon as is
+        m_output << m_indent << language::stackVariable("QIcon", iconName)
+            << language::eol;
+        if (m_uic->pixmapFunction().isEmpty())
+            writeResourceIcon(m_output, iconName, m_indent, i);
+        else
+            writePixmapFunctionIcon(m_output, iconName, m_indent, i);
+        return iconName;
     }
+
+    // Theme: Generate code to check the theme and default to resource
+    if (iconHasStatePixmaps(i)) {
+        // Theme + default state pixmaps:
+        // Generate code to check the theme and default to state pixmaps
+        m_output << m_indent << language::stackVariable("QIcon", iconName) << ";\n";
+        const char themeNameStringVariableC[] = "iconThemeName";
+        // Store theme name in a variable
+        m_output << m_indent;
+        if (m_firstThemeIcon) { // Declare variable string
+            if (isCpp)
+                m_output << "QString ";
+            m_firstThemeIcon = false;
+        }
+        m_output << themeNameStringVariableC << " = "
+            << language::qstring(i->attributeTheme()) << language::eol;
+        m_output << m_indent << "if ";
+        if (isCpp)
+            m_output << '(';
+        m_output << "QIcon" << language::qualifier << "hasThemeIcon("
+            << themeNameStringVariableC << ')' << (isCpp ? ") {" : ":") << '\n'
+            << m_dindent << iconName << " = QIcon" << language::qualifier << "fromTheme("
+            << themeNameStringVariableC << ')' << language::eol
+            << m_indent << (isCpp ? "} else {" : "else:") << '\n';
+        if (m_uic->pixmapFunction().isEmpty())
+            writeResourceIcon(m_output, iconName, m_dindent, i);
+        else
+            writePixmapFunctionIcon(m_output, iconName, m_dindent, i);
+        m_output << m_indent;
+        if (isCpp)
+            m_output << '}';
+        m_output  << '\n';
+        return iconName;
+    }
+
+    // Theme, but no state pixmaps: Construct from theme directly.
+    m_output << m_indent
+        << language::stackVariableWithInitParameters("QIcon", iconName)
+        << "QIcon" << language::qualifier << "fromTheme("
+        << language::qstring(i->attributeTheme()) << "))"
+        << language::eol;
     return iconName;
 }
 
@@ -1777,7 +1851,7 @@ void WriteInitialization::writeColorGroup(DomColorGroup *colorGroup, const QStri
         const DomColor *color = colors.at(i);
 
         m_output << m_indent << paletteName << ".setColor(" << group
-            << ", QPalette::" << language::paletteColorRole(i)
+            << ", QPalette" << language::qualifier << language::paletteColorRole(i)
             << ", " << domColor2QString(color)
             << ");\n";
     }
@@ -1794,8 +1868,9 @@ void WriteInitialization::writeColorGroup(DomColorGroup *colorGroup, const QStri
                     << versionAdded.majorVersion() << ", " << versionAdded.minorVersion()
                     << ", " << versionAdded.microVersion() << ")\n";
             }
-            m_output << m_indent << paletteName << ".setBrush(" << group
-                << ", " << "QPalette::" << roleName
+            m_output << m_indent << paletteName << ".setBrush("
+                << language::enumValue(group) << ", "
+                << "QPalette" << language::qualifier << roleName
                 << ", " << brushName << ");\n";
             if (!versionAdded.isNull())
                 m_output << "#endif\n";
@@ -1842,31 +1917,36 @@ void WriteInitialization::writeBrush(const DomBrush *brush, const QString &brush
         const QString gradientType = gradient->attributeType();
         const QString gradientName = m_driver->unique(QLatin1String("gradient"));
         if (gradientType == QLatin1String("LinearGradient")) {
-            m_output << m_indent << "QLinearGradient " << gradientName
-                << '(' << gradient->attributeStartX()
+            m_output << m_indent
+                << language::stackVariableWithInitParameters("QLinearGradient", gradientName)
+                << gradient->attributeStartX()
                 << ", " << gradient->attributeStartY()
                 << ", " << gradient->attributeEndX()
-                << ", " << gradient->attributeEndY() << ");\n";
+                << ", " << gradient->attributeEndY() << ')' << language::eol;
         } else if (gradientType == QLatin1String("RadialGradient")) {
-            m_output << m_indent << "QRadialGradient " << gradientName
-                << '(' << gradient->attributeCentralX()
+            m_output << m_indent
+                << language::stackVariableWithInitParameters("QRadialGradient", gradientName)
+                << gradient->attributeCentralX()
                 << ", " << gradient->attributeCentralY()
                 << ", " << gradient->attributeRadius()
                 << ", " << gradient->attributeFocalX()
-                << ", " << gradient->attributeFocalY() << ");\n";
+                << ", " << gradient->attributeFocalY() << ')' << language::eol;
         } else if (gradientType == QLatin1String("ConicalGradient")) {
-            m_output << m_indent << "QConicalGradient " << gradientName
-                << '(' << gradient->attributeCentralX()
+            m_output << m_indent
+                << language::stackVariableWithInitParameters("QConicalGradient", gradientName)
+                << gradient->attributeCentralX()
                 << ", " << gradient->attributeCentralY()
-                << ", " << gradient->attributeAngle() << ");\n";
+                << ", " << gradient->attributeAngle() << ')' << language::eol;
         }
 
-        m_output << m_indent << gradientName << ".setSpread(QGradient::"
-            << gradient->attributeSpread() << ");\n";
+        m_output << m_indent << gradientName << ".setSpread(QGradient"
+            << language::qualifier << gradient->attributeSpread()
+            << ')' << language::eol;
 
         if (gradient->hasAttributeCoordinateMode()) {
-            m_output << m_indent << gradientName << ".setCoordinateMode(QGradient::"
-                << gradient->attributeCoordinateMode() << ");\n";
+            m_output << m_indent << gradientName << ".setCoordinateMode(QGradient"
+                << language::qualifier << gradient->attributeCoordinateMode()
+                << ')' << language::eol;
         }
 
        const auto &stops = gradient->elementGradientStop();
@@ -1874,23 +1954,26 @@ void WriteInitialization::writeBrush(const DomBrush *brush, const QString &brush
             const DomColor *color = stop->elementColor();
             m_output << m_indent << gradientName << ".setColorAt("
                 << stop->attributePosition() << ", "
-                << domColor2QString(color) << ");\n";
+                << domColor2QString(color) << ')' << language::eol;
         }
-        m_output << m_indent << "QBrush " << brushName << '('
-            << gradientName << ");\n";
+        m_output << m_indent
+            << language::stackVariableWithInitParameters("QBrush", brushName)
+            << gradientName << ')' << language::eol;
     } else if (style == QLatin1String("TexturePattern")) {
         const DomProperty *property = brush->elementTexture();
         const QString iconValue = iconCall(property);
 
-        m_output << m_indent << "QBrush " << brushName << " = QBrush("
-            << iconValue << ");\n";
+        m_output << m_indent
+            << language::stackVariableWithInitParameters("QBrush", brushName)
+            << iconValue << ')' << language::eol;
     } else {
         const DomColor *color = brush->elementColor();
-        m_output << m_indent << "QBrush " << brushName << '('
-            << domColor2QString(color) << ");\n";
+        m_output << m_indent
+            << language::stackVariableWithInitParameters("QBrush", brushName)
+            << domColor2QString(color) << ')' << language::eol;
 
         m_output << m_indent << brushName << ".setStyle("
-            << "Qt::" << style << ");\n";
+            << language::qtQualifier << style << ')' << language::eol;
     }
 }
 
@@ -1910,12 +1993,11 @@ void WriteInitialization::acceptTabStops(DomTabStops *tabStops)
 
     const QStringList l = tabStops->elementTabStop();
     for (int i=0; i<l.size(); ++i) {
-        const QString &name = l.at(i);
+        const QString name = m_driver->widgetVariableName(l.at(i));
 
-        if (!m_registeredWidgets.contains(name)) {
+        if (name.isEmpty()) {
             fprintf(stderr, "%s: Warning: Tab-stop assignment: '%s' is not a valid widget.\n",
-                    qPrintable(m_option.messagePrefix()),
-                    name.toLatin1().data());
+                    qPrintable(m_option.messagePrefix()), qPrintable(l.at(i)));
             continue;
         }
 
@@ -1926,7 +2008,8 @@ void WriteInitialization::acceptTabStops(DomTabStops *tabStops)
         if (name.isEmpty() || lastName.isEmpty())
             continue;
 
-        m_output << m_indent << "QWidget::setTabOrder(" << lastName << ", " << name << ");\n";
+        m_output << m_indent << "QWidget" << language::qualifier << "setTabOrder("
+            << lastName << ", " << name << ')' << language::eol;
 
         lastName = name;
     }
@@ -1968,15 +2051,14 @@ QString WriteInitialization::pixCall(const QString &t, const QString &text) cons
         return type;
     }
 
+    QTextStream str(&type);
+    str << '(';
     QString pixFunc = m_uic->pixmapFunction();
     if (pixFunc.isEmpty())
-        pixFunc = QLatin1String("QString::fromUtf8");
-
-    type += QLatin1Char('(')
-          + pixFunc
-          + QLatin1Char('(')
-          + fixString(text, m_dindent)
-          + QLatin1String("))");
+        str << language::qstring(text, m_dindent);
+    else
+        str << pixFunc << '(' << language::charliteral(text, m_dindent) << ')';
+    str << ')';
     return type;
 }
 
@@ -1999,13 +2081,15 @@ void WriteInitialization::initializeComboBox(DomWidget *w)
         if (icon)
             iconValue = iconCall(icon);
 
-        m_output << m_indent << varName << "->addItem(";
+        m_output << m_indent << varName << language::derefPointer << "addItem(";
         if (icon)
             m_output << iconValue << ", ";
 
         if (needsTranslation(text->elementString())) {
             m_output << "QString());\n";
-            m_refreshOut << m_indent << varName << "->setItemText(" << i << ", " << trCall(text->elementString()) << ");\n";
+            m_refreshOut << m_indent << varName << language::derefPointer
+                << "setItemText(" << i << ", " << trCall(text->elementString())
+                << ')' << language::eol;
         } else {
             m_output << noTrCall(text->elementString()) << ");\n";
         }
@@ -2020,9 +2104,13 @@ QString WriteInitialization::disableSorting(DomWidget *w, const QString &varName
     if (!w->elementItem().isEmpty()) {
         tempName = m_driver->unique(QLatin1String("__sortingEnabled"));
         m_refreshOut << "\n";
-        m_refreshOut << m_indent << "const bool " << tempName
-            << " = " << varName << "->isSortingEnabled();\n";
-        m_refreshOut << m_indent << varName << "->setSortingEnabled(false);\n";
+        m_refreshOut << m_indent;
+        if (language::language() == Language::Cpp)
+            m_refreshOut << "const bool ";
+        m_refreshOut << tempName << " = " << varName << language::derefPointer
+            << "isSortingEnabled()" << language::eol
+            << m_indent << varName << language::derefPointer
+            << "setSortingEnabled(" << language::boolValue(false) << ')' << language::eol;
     }
     return tempName;
 }
@@ -2030,7 +2118,8 @@ QString WriteInitialization::disableSorting(DomWidget *w, const QString &varName
 void WriteInitialization::enableSorting(DomWidget *w, const QString &varName, const QString &tempName)
 {
     if (!w->elementItem().isEmpty()) {
-        m_refreshOut << m_indent << varName << "->setSortingEnabled(" << tempName << ");\n\n";
+        m_refreshOut << m_indent << varName << language::derefPointer
+            << "setSortingEnabled(" << tempName << ')' << language::eol << '\n';
     }
 }
 
@@ -2055,7 +2144,7 @@ void WriteInitialization::addInitializer(Item *item,
     if (!value.isEmpty()) {
         QString setter;
         QTextStream str(&setter);
-        str << "->set" << name.at(0).toUpper() << name.midRef(1) << '(';
+        str << language::derefPointer << "set" << name.at(0).toUpper() << name.midRef(1) << '(';
         if (column >= 0)
             str << column << ", ";
         str << value << ");";
@@ -2105,10 +2194,11 @@ void WriteInitialization::addQtFlagsInitializer(Item *item,
         const DomPropertyMap &properties, const QString &name, int column) const
 {
     if (const DomProperty *p = properties.value(name)) {
+        const QString orOperator = QLatin1Char('|') + language::qtQualifier;
         QString v = p->elementSet();
         if (!v.isEmpty()) {
-            v.replace(QLatin1Char('|'), QLatin1String("|Qt::"));
-            addInitializer(item, name, column, QLatin1String("Qt::") + v);
+            v.replace(QLatin1Char('|'), orOperator);
+            addInitializer(item, name, column, language::qtQualifier + v);
         }
     }
 }
@@ -2123,7 +2213,7 @@ void WriteInitialization::addQtEnumInitializer(Item *item,
     if (const DomProperty *p = properties.value(name)) {
         QString v = p->elementEnum();
         if (!v.isEmpty())
-            addInitializer(item, name, column, QLatin1String("Qt::") + v);
+            addInitializer(item, name, column, language::qtQualifier + v);
     }
 }
 
@@ -2172,7 +2262,9 @@ void WriteInitialization::initializeListWidget(DomWidget *w)
         addCommonInitializers(&item, properties);
 
         item.writeSetupUi(varName);
-        item.writeRetranslateUi(varName + QLatin1String("->item(") + QString::number(i) + QLatin1Char(')'));
+        QString parentPath;
+        QTextStream(&parentPath) << varName << language::derefPointer << "item(" << i << ')';
+        item.writeRetranslateUi(parentPath);
     }
     enableSorting(w, varName, tempName);
 }
@@ -2193,14 +2285,19 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
 
         if (const DomProperty *p = properties.value(QLatin1String("text"))) {
             DomString *str = p->elementString();
-            if (str && str->text().isEmpty())
-                m_output << m_indent << varName << "->headerItem()->setText(" << i << ", QString());\n";
+            if (str && str->text().isEmpty()) {
+                m_output << m_indent << varName << language::derefPointer
+                    << "headerItem()" << language::derefPointer << "setText("
+                    << i << ", QString())" << language::eol;
+            }
         }
     }
     const QString itemName = item.writeSetupUi(QString(), Item::DontConstruct);
-    item.writeRetranslateUi(varName + QLatin1String("->headerItem()"));
-    if (!itemName.isNull())
-        m_output << m_indent << varName << "->setHeaderItem(" << itemName << ");\n";
+    item.writeRetranslateUi(varName + language::derefPointer + QLatin1String("headerItem()"));
+    if (!itemName.isNull()) {
+        m_output << m_indent << varName << language::derefPointer
+            << "setHeaderItem(" << itemName << ')' << language::eol;
+    }
 
     if (w->elementItem().empty())
         return;
@@ -2211,7 +2308,9 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
     for (int i = 0; i < items.count(); i++) {
         Item *itm = items[i];
         itm->writeSetupUi(varName);
-        itm->writeRetranslateUi(varName + QLatin1String("->topLevelItem(") + QString::number(i) + QLatin1Char(')'));
+        QString parentPath;
+        QTextStream(&parentPath) << varName << language::derefPointer << "topLevelItem(" << i << ')';
+        itm->writeRetranslateUi(parentPath);
         delete itm;
     }
 
@@ -2273,8 +2372,10 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
     const auto &columns = w->elementColumn();
 
     if (!columns.empty()) {
-        m_output << m_indent << "if (" << varName << "->columnCount() < " << columns.size() << ")\n"
-            << m_dindent << varName << "->setColumnCount(" << columns.size() << ");\n";
+        m_output << m_indent << "if (" << varName << language::derefPointer << "columnCount() < "
+            << columns.size() << ")\n"
+            << m_dindent << varName << language::derefPointer << "setColumnCount("
+            << columns.size() << ')' << language::eol;
     }
 
     for (int i = 0; i < columns.size(); ++i) {
@@ -2286,8 +2387,12 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
             addCommonInitializers(&item, properties);
 
             QString itemName = item.writeSetupUi(QString(), Item::ConstructItemAndVariable);
-            item.writeRetranslateUi(varName + QLatin1String("->horizontalHeaderItem(") + QString::number(i) + QLatin1Char(')'));
-            m_output << m_indent << varName << "->setHorizontalHeaderItem(" << i << ", " << itemName << ");\n";
+            QString parentPath;
+            QTextStream(&parentPath) << varName << language::derefPointer
+                << "horizontalHeaderItem(" << i << ')';
+            item.writeRetranslateUi(parentPath);
+            m_output << m_indent << varName << language::derefPointer << "setHorizontalHeaderItem("
+                << i << ", " << itemName << ')' << language::eol;
         }
     }
 
@@ -2295,8 +2400,9 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
     const auto &rows = w->elementRow();
 
     if (!rows.isEmpty()) {
-        m_output << m_indent << "if (" << varName << "->rowCount() < " << rows.size() << ")\n"
-            << m_dindent << varName << "->setRowCount(" << rows.size() << ");\n";
+        m_output << m_indent << "if (" << varName << language::derefPointer << "rowCount() < " << rows.size() << ")\n"
+            << m_dindent << varName << language::derefPointer << "setRowCount("
+            << rows.size() << ')' << language::eol;
     }
 
     for (int i = 0; i < rows.size(); ++i) {
@@ -2308,8 +2414,11 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
             addCommonInitializers(&item, properties);
 
             QString itemName = item.writeSetupUi(QString(), Item::ConstructItemAndVariable);
-            item.writeRetranslateUi(varName + QLatin1String("->verticalHeaderItem(") + QString::number(i) + QLatin1Char(')'));
-            m_output << m_indent << varName << "->setVerticalHeaderItem(" << i << ", " << itemName << ");\n";
+            QString parentPath;
+            QTextStream(&parentPath) << varName << language::derefPointer << "verticalHeaderItem(" << i << ')';
+            item.writeRetranslateUi(parentPath);
+            m_output << m_indent << varName << language::derefPointer << "setVerticalHeaderItem("
+                << i << ", " << itemName << ')' << language::eol;
         }
     }
 
@@ -2329,8 +2438,12 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
             addCommonInitializers(&item, properties);
 
             QString itemName = item.writeSetupUi(QString(), Item::ConstructItemAndVariable);
-            item.writeRetranslateUi(varName + QLatin1String("->item(") + QString::number(r) + QLatin1String(", ") + QString::number(c) + QLatin1Char(')'));
-            m_output << m_indent << varName << "->setItem(" << r << ", " << c << ", " << itemName << ");\n";
+            QString parentPath;
+            QTextStream(&parentPath) << varName << language::derefPointer << "item(" << r
+                << ", " << c << ')';
+            item.writeRetranslateUi(parentPath);
+            m_output << m_indent << varName << language::derefPointer << "setItem("
+                << r << ", " << c << ", " << itemName << ')' << language::eol;
         }
     }
     enableSorting(w, varName, tempName);
@@ -2338,32 +2451,37 @@ void WriteInitialization::initializeTableWidget(DomWidget *w)
 
 QString WriteInitialization::trCall(const QString &str, const QString &commentHint, const QString &id) const
 {
-    if (str.isEmpty())
-        return QLatin1String("QString()");
+    if (str.isEmpty()) {
+        return language::language() == Language::Cpp
+            ? QLatin1String("QString()") : QLatin1String("\"\"");
+    }
 
     QString result;
-    const QString comment = commentHint.isEmpty() ? QString(QLatin1String("nullptr")) : fixString(commentHint, m_dindent);
+    QTextStream ts(&result);
 
     const bool idBasedTranslations = m_driver->useIdBasedTranslations();
     if (m_option.translateFunction.isEmpty()) {
         if (idBasedTranslations || m_option.idBased) {
-            result += QLatin1String("qtTrId(");
+            ts << "qtTrId(";
         } else {
-            result += QLatin1String("QCoreApplication::translate(\"")
-                    + m_generatedClass
-                    + QLatin1String("\", ");
+            ts << "QCoreApplication" << language::qualifier << "translate("
+                << '"' << m_generatedClass << "\", ";
         }
     } else {
-        result += m_option.translateFunction + QLatin1Char('(');
+        ts << m_option.translateFunction << '(';
     }
 
-    result += fixString(idBasedTranslations ? id : str, m_dindent);
+    ts << language::charliteral(idBasedTranslations ? id : str, m_dindent);
 
     if (!idBasedTranslations && !m_option.idBased) {
-        result += QLatin1String(", ") + comment;
+        ts << ", ";
+        if (commentHint.isEmpty())
+            ts << language::nullPtr;
+        else
+            ts << language::charliteral(commentHint, m_dindent);
     }
 
-    result += QLatin1Char(')');
+    ts << ')';
     return result;
 }
 
@@ -2374,7 +2492,8 @@ void WriteInitialization::initializeMenu(DomWidget *w, const QString &/*parentWi
 
     const DomAction *action = m_driver->actionByName(menuAction);
     if (action && action->hasAttributeMenu()) {
-        m_output << m_indent << menuAction << " = " << menuName << "->menuAction();\n";
+        m_output << m_indent << menuAction << " = " << menuName
+            << language::derefPointer << "menuAction()" << language::eol;
     }
 }
 
@@ -2398,9 +2517,9 @@ QString WriteInitialization::noTrCall(DomString *str, const QString &defaultStri
         return QString();
     if (str)
         value = str->text();
-    QString ret = QLatin1String("QString::fromUtf8(");
-    ret += fixString(value, m_dindent);
-    ret += QLatin1Char(')');
+    QString ret;
+    QTextStream ts(&ret);
+    ts << language::qstring(value, m_dindent);
     return ret;
 }
 
@@ -2428,36 +2547,42 @@ QTextStream &WriteInitialization::autoTrOutput(const DomString *str, const QStri
     return m_output;
 }
 
-QString WriteInitialization::findDeclaration(const QString &name)
+WriteInitialization::Declaration WriteInitialization::findDeclaration(const QString &name)
 {
-    const QString normalized = Driver::normalizedName(name);
-
-    if (const DomWidget *widget = m_driver->widgetByName(normalized))
-        return m_driver->findOrInsertWidget(widget);
-    if (const DomAction *action = m_driver->actionByName(normalized))
-        return m_driver->findOrInsertAction(action);
-    if (const DomButtonGroup *group = m_driver->findButtonGroup(normalized))
-        return m_driver->findOrInsertButtonGroup(group);
-    return QString();
+    if (const DomWidget *widget = m_driver->widgetByName(name))
+        return {m_driver->findOrInsertWidget(widget), widget->attributeClass()};
+    if (const DomAction *action = m_driver->actionByName(name))
+        return {m_driver->findOrInsertAction(action), QStringLiteral("QAction")};
+    if (const DomButtonGroup *group = m_driver->findButtonGroup(name))
+         return {m_driver->findOrInsertButtonGroup(group), QStringLiteral("QButtonGroup")};
+    return {};
 }
 
 void WriteInitialization::acceptConnection(DomConnection *connection)
 {
-    const QString sender = findDeclaration(connection->elementSender());
-    const QString receiver = findDeclaration(connection->elementReceiver());
+    const QString senderName = connection->elementSender();
+    const QString receiverName = connection->elementReceiver();
+
+    const auto senderDecl = findDeclaration(senderName);
+    const auto receiverDecl = findDeclaration(receiverName);
 
-    if (sender.isEmpty() || receiver.isEmpty())
+    if (senderDecl.name.isEmpty() || receiverDecl.name.isEmpty()) {
+        QString message;
+        QTextStream(&message) << m_option.messagePrefix()
+            << ": Warning: Invalid signal/slot connection: \""
+            << senderName << "\" -> \"" << receiverName << "\".";
+        fprintf(stderr, "%s\n", qPrintable(message));
         return;
+    }
+
+    language::SignalSlot theSignal{senderDecl.name, connection->elementSignal(),
+                                   senderDecl.className};
+    language::SignalSlot theSlot{receiverDecl.name, connection->elementSlot(),
+                                 receiverDecl.className};
 
-    m_output << m_indent << "QObject::connect("
-        << sender
-        << ", "
-        << "SIGNAL("<<connection->elementSignal()<<')'
-        << ", "
-        << receiver
-        << ", "
-        << "SLOT("<<connection->elementSlot()<<')'
-        << ");\n";
+    m_output << m_indent;
+    language::formatConnection(m_output, theSignal, theSlot);
+    m_output << ";\n";
 }
 
 static void generateMultiDirectiveBegin(QTextStream &outputStream, const QSet<QString> &directives)
@@ -2470,14 +2595,14 @@ static void generateMultiDirectiveBegin(QTextStream &outputStream, const QSet<QS
         return;
     }
 
-    auto list = directives.toList();
+    auto list = directives.values();
     // sort (always generate in the same order):
     std::sort(list.begin(), list.end());
 
     outputStream << "#if " << language::qtConfig(list.constFirst());
     for (int i = 1, size = list.size(); i < size; ++i)
         outputStream << " || " << language::qtConfig(list.at(i));
-    outputStream << endl;
+    outputStream << Qt::endl;
 }
 
 static void generateMultiDirectiveEnd(QTextStream &outputStream, const QSet<QString> &directives)
@@ -2485,12 +2610,11 @@ static void generateMultiDirectiveEnd(QTextStream &outputStream, const QSet<QStr
     if (directives.isEmpty())
         return;
 
-    outputStream << "#endif" << endl;
+    outputStream << "#endif" << Qt::endl;
 }
 
 WriteInitialization::Item::Item(const QString &itemClassName, const QString &indent, QTextStream &setupUiStream, QTextStream &retranslateUiStream, Driver *driver)
     :
-    m_parent(0),
     m_itemClassName(itemClassName),
     m_indent(indent),
     m_setupUiStream(setupUiStream),
@@ -2513,7 +2637,8 @@ QString WriteInitialization::Item::writeSetupUi(const QString &parent, Item::Emp
     bool generateMultiDirective = false;
     if (emptyItemPolicy == Item::ConstructItemOnly && m_children.isEmpty()) {
         if (m_setupUiData.policy == ItemData::DontGenerate) {
-            m_setupUiStream << m_indent << "new " << m_itemClassName << '(' << parent << ");\n";
+            m_setupUiStream << m_indent << language::operatorNew << m_itemClassName
+                << '(' << parent << ')' << language::eol;
             return QString();
         }
         if (m_setupUiData.policy == ItemData::GenerateWithMultiDirective)
@@ -2524,11 +2649,17 @@ QString WriteInitialization::Item::writeSetupUi(const QString &parent, Item::Emp
         generateMultiDirectiveBegin(m_setupUiStream, m_setupUiData.directives);
 
     const QString uniqueName = m_driver->unique(QLatin1String("__") + m_itemClassName.toLower());
-    m_setupUiStream << m_indent << m_itemClassName << " *" << uniqueName << " = new " << m_itemClassName << '(' << parent << ");\n";
+    m_setupUiStream << m_indent;
+    if (language::language() == Language::Cpp)
+        m_setupUiStream << m_itemClassName << " *";
+    m_setupUiStream << uniqueName
+        << " = " << language::operatorNew << m_itemClassName << '(' << parent
+        << ')' << language::eol;
 
     if (generateMultiDirective) {
         m_setupUiStream << "#else\n";
-        m_setupUiStream << m_indent << "new " << m_itemClassName << '(' << parent << ");\n";
+        m_setupUiStream << m_indent << language::operatorNew << m_itemClassName
+            << '(' << parent << ')' << language::eol;
         generateMultiDirectiveEnd(m_setupUiStream, m_setupUiData.directives);
     }
 
@@ -2536,7 +2667,7 @@ QString WriteInitialization::Item::writeSetupUi(const QString &parent, Item::Emp
     while (it != m_setupUiData.setters.constEnd()) {
         if (!it.key().isEmpty())
             m_setupUiStream << language::openQtConfig(it.key());
-        m_setupUiStream << m_indent << uniqueName << it.value() << endl;
+        m_setupUiStream << m_indent << uniqueName << it.value() << Qt::endl;
         if (!it.key().isEmpty())
             m_setupUiStream << language::closeQtConfig(it.key());
         ++it;
@@ -2555,7 +2686,10 @@ void WriteInitialization::Item::writeRetranslateUi(const QString &parentPath)
         generateMultiDirectiveBegin(m_retranslateUiStream, m_retranslateUiData.directives);
 
     const QString uniqueName = m_driver->unique(QLatin1String("___") + m_itemClassName.toLower());
-    m_retranslateUiStream << m_indent << m_itemClassName << " *" << uniqueName << " = " << parentPath << ";\n";
+    m_retranslateUiStream << m_indent;
+    if (language::language() == Language::Cpp)
+        m_retranslateUiStream << m_itemClassName << " *";
+    m_retranslateUiStream << uniqueName << " = " << parentPath << language::eol;
 
     if (m_retranslateUiData.policy == ItemData::GenerateWithMultiDirective)
         generateMultiDirectiveEnd(m_retranslateUiStream, m_retranslateUiData.directives);
@@ -2571,14 +2705,17 @@ void WriteInitialization::Item::writeRetranslateUi(const QString &parentPath)
                 m_retranslateUiStream << language::openQtConfig(newDirective);
             oldDirective = newDirective;
         }
-        m_retranslateUiStream << m_indent << uniqueName << it.value() << endl;
+        m_retranslateUiStream << m_indent << uniqueName << it.value() << Qt::endl;
         ++it;
     }
     if (!oldDirective.isEmpty())
         m_retranslateUiStream << language::closeQtConfig(oldDirective);
 
-    for (int i = 0; i < m_children.size(); i++)
-        m_children[i]->writeRetranslateUi(uniqueName + QLatin1String("->child(") + QString::number(i) + QLatin1Char(')'));
+    for (int i = 0; i < m_children.size(); i++) {
+        QString method;
+        QTextStream(&method) << uniqueName << language::derefPointer << "child(" << i << ')';
+        m_children[i]->writeRetranslateUi(method);
+    }
 }
 
 void WriteInitialization::Item::addSetter(const QString &setter, const QString &directive, bool translatable)
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index c408c44b40..6f8e352f6a 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -85,8 +85,8 @@ namespace CPP {
 
 struct WriteInitialization : public TreeWalker
 {
-    typedef QList<DomProperty*> DomPropertyList;
-    typedef QHash<QString, DomProperty*> DomPropertyMap;
+    using DomPropertyList = QList<DomProperty*>;
+    using DomPropertyMap = QHash<QString, DomProperty*>;
 
     WriteInitialization(Uic *uic);
 
@@ -161,7 +161,7 @@ private:
 // special initialization
 //
     class Item {
-        Q_DISABLE_COPY(Item)
+        Q_DISABLE_COPY_MOVE(Item)
     public:
         Item(const QString &itemClassName, const QString &indent, QTextStream &setupUiStream, QTextStream &retranslateUiStream, Driver *driver);
         ~Item();
@@ -188,7 +188,7 @@ private:
         ItemData m_setupUiData;
         ItemData m_retranslateUiData;
         QList<Item *> m_children;
-        Item *m_parent;
+        Item *m_parent = nullptr;
 
         const QString m_itemClassName;
         const QString m_indent;
@@ -220,7 +220,13 @@ private:
     QString disableSorting(DomWidget *w, const QString &varName);
     void enableSorting(DomWidget *w, const QString &varName, const QString &tempName);
 
-    QString findDeclaration(const QString &name);
+    struct Declaration
+    {
+        QString name;
+        QString className;
+    };
+
+    Declaration findDeclaration(const QString &name);
 
 private:
     QString writeFontProperties(const DomFont *f);
@@ -238,12 +244,12 @@ private:
     const Option &m_option;
     QString m_indent;
     QString m_dindent;
-    bool m_stdsetdef;
+    bool m_stdsetdef = true;
 
     struct Buddy
     {
-        QString objName;
-        QString buddy;
+        QString labelVarName;
+        QString buddyAttributeName;
     };
     friend class QTypeInfo<Buddy>;
 
@@ -253,15 +259,13 @@ private:
     QVector<Buddy> m_buddies;
 
     QSet<QString> m_buttonGroups;
-    QHash<QString, DomWidget*> m_registeredWidgets;
-    QHash<QString, DomAction*> m_registeredActions;
-    typedef QHash<uint, QString> ColorBrushHash;
+    using ColorBrushHash = QHash<uint, QString>;
     ColorBrushHash m_colorBrushHash;
     // Map from font properties to  font variable name for reuse
     // Map from size policy to  variable for reuse
-    typedef QMap<FontHandle, QString> FontPropertiesNameMap;
-    typedef QMap<IconHandle, QString> IconPropertiesNameMap;
-    typedef QMap<SizePolicyHandle, QString> SizePolicyNameMap;
+    using FontPropertiesNameMap = QMap<FontHandle, QString>;
+    using IconPropertiesNameMap = QMap<IconHandle, QString>;
+    using SizePolicyNameMap = QMap<SizePolicyHandle, QString>;
     FontPropertiesNameMap m_fontPropertiesNameMap;
     IconPropertiesNameMap m_iconPropertiesNameMap;
     SizePolicyNameMap     m_sizePolicyNameMap;
@@ -290,11 +294,11 @@ private:
 
     // layout defaults
     LayoutDefaultHandler m_LayoutDefaultHandler;
-    int m_layoutMarginType;
+    int m_layoutMarginType = TopLevelMargin;
 
     QString m_generatedClass;
     QString m_mainFormVarName;
-    bool m_mainFormUsedInRetranslateUi;
+    bool m_mainFormUsedInRetranslateUi = false;
 
     QString m_delayedInitialization;
     QTextStream m_delayedOut;
@@ -305,8 +309,9 @@ private:
     QString m_delayedActionInitialization;
     QTextStream m_actionOut;
 
-    bool m_layoutWidget;
-    bool m_firstThemeIcon;
+    bool m_layoutWidget = false;
+    bool m_firstThemeIcon = true;
+    bool m_connectSlotsByName = true;
 };
 
 } // namespace CPP
diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp
index d6a409152b..c838feaf73 100644
--- a/src/tools/uic/customwidgetsinfo.cpp
+++ b/src/tools/uic/customwidgetsinfo.cpp
@@ -95,7 +95,7 @@ bool CustomWidgetsInfo::extendsOneOf(const QString &classNameIn,
 
 bool CustomWidgetsInfo::isCustomWidgetContainer(const QString &className) const
 {
-    if (const DomCustomWidget *dcw = m_customWidgets.value(className, 0))
+    if (const DomCustomWidget *dcw = m_customWidgets.value(className, nullptr))
         if (dcw->hasElementContainer())
             return dcw->elementContainer() != 0;
     return false;
@@ -111,7 +111,7 @@ QString CustomWidgetsInfo::realClassName(const QString &className) const
 
 QString CustomWidgetsInfo::customWidgetAddPageMethod(const QString &name) const
 {
-    if (DomCustomWidget *dcw = m_customWidgets.value(name, 0))
+    if (DomCustomWidget *dcw = m_customWidgets.value(name, nullptr))
         return dcw->elementAddPageMethod();
     return QString();
 }
diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h
index 8a10999027..a1b24ab042 100644
--- a/src/tools/uic/customwidgetsinfo.h
+++ b/src/tools/uic/customwidgetsinfo.h
@@ -62,7 +62,7 @@ public:
     bool isCustomWidgetContainer(const QString &className) const;
 
 private:
-    typedef QMap<QString, DomCustomWidget*> NameCustomWidgetMap;
+    using NameCustomWidgetMap = QMap<QString, DomCustomWidget*>;
     NameCustomWidgetMap m_customWidgets;
 };
 
diff --git a/src/tools/uic/databaseinfo.cpp b/src/tools/uic/databaseinfo.cpp
index fa5d5f5df0..9b0d1614ab 100644
--- a/src/tools/uic/databaseinfo.cpp
+++ b/src/tools/uic/databaseinfo.cpp
@@ -33,9 +33,7 @@
 
 QT_BEGIN_NAMESPACE
 
-DatabaseInfo::DatabaseInfo()
-{
-}
+DatabaseInfo::DatabaseInfo() = default;
 
 void DatabaseInfo::acceptUI(DomUI *node)
 {
@@ -59,10 +57,9 @@ void DatabaseInfo::acceptWidget(DomWidget *node)
     DomProperty *db = properties.value(QLatin1String("database"));
     if (db && db->elementStringList()) {
         QStringList info = db->elementStringList()->elementString();
-
-        QString connection = info.size() > 0 ? info.at(0) : QString();
-        if (connection.isEmpty())
+        if (info.isEmpty() || info.constFirst().isEmpty())
             return;
+        const QString &connection = info.constFirst();
         m_connections.append(connection);
 
         QString table = info.size() > 1 ? info.at(1) : QString();
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index 03fa1e17cf..8b9b4806e6 100644
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -30,6 +30,8 @@
 #include "uic.h"
 #include "ui4.h"
 
+#include <language.h>
+
 #include <qfileinfo.h>
 #include <qdebug.h>
 
@@ -51,18 +53,43 @@ static inline QString actionClass()      { return QStringLiteral("QAction"); }
 static inline QString buttonGroupClass() { return QStringLiteral("QButtonGroup"); }
 
 template <class DomClass>
+Driver::DomObjectHashConstIt<DomClass>
+    Driver::findByAttributeNameIt(const DomObjectHash<DomClass> &domHash,
+                                  const QString &name) const
+{
+    const auto end = domHash.cend();
+    for (auto it = domHash.cbegin(); it != end; ++it) {
+        if (it.key()->attributeName() == name)
+            return it;
+    }
+    return end;
+}
+
+template <class DomClass>
+const DomClass *Driver::findByAttributeName(const DomObjectHash<DomClass> &domHash,
+                                            const QString &name) const
+{
+    auto it = findByAttributeNameIt(domHash, name);
+    return it != domHash.cend() ? it.key() : nullptr;
+}
+
+template <class DomClass>
 QString Driver::findOrInsert(DomObjectHash<DomClass> *domHash, const DomClass *dom,
-                             const QString &className)
+                             const QString &className, bool isMember)
 {
     auto it = domHash->find(dom);
-    if (it == domHash->end())
-        it = domHash->insert(dom, this->unique(dom->attributeName(), className));
+    if (it == domHash->end()) {
+        const QString name = this->unique(dom->attributeName(), className);
+        it = domHash->insert(dom, isMember ? language::self + name : name);
+    }
     return it.value();
 }
 
 QString Driver::findOrInsertWidget(const DomWidget *ui_widget)
 {
-    return findOrInsert(&m_widgets, ui_widget, ui_widget->attributeClass());
+    // Top level is passed into setupUI(), everything else is a member variable
+    const bool isMember = !m_widgets.isEmpty();
+    return findOrInsert(&m_widgets, ui_widget, ui_widget->attributeClass(), isMember);
 }
 
 QString Driver::findOrInsertSpacer(const DomSpacer *ui_spacer)
@@ -111,11 +138,7 @@ QString Driver::findOrInsertButtonGroup(const DomButtonGroup *ui_group)
 // Find a group by its non-uniqified name
 const DomButtonGroup *Driver::findButtonGroup(const QString &attributeName) const
 {
-    for (auto it = m_buttonGroups.cbegin(), end = m_buttonGroups.cend(); it != end; ++it) {
-        if (it.key()->attributeName() == attributeName)
-            return it.key();
-    }
-    return nullptr;
+    return findByAttributeName(m_buttonGroups, attributeName);
 }
 
 
@@ -233,7 +256,7 @@ bool Driver::uic(const QString &fileName, DomUI *ui, QTextStream *out)
 
     QTextStream *oldOutput = m_output;
 
-    m_output = out != 0 ? out : &m_stdout;
+    m_output = out != nullptr ? out : &m_stdout;
 
     Uic tool(this);
     const bool result = tool.write(ui);
@@ -286,19 +309,25 @@ bool Driver::uic(const QString &fileName, QTextStream *out)
     return rtn;
 }
 
-const DomWidget *Driver::widgetByName(const QString &name) const
+const DomWidget *Driver::widgetByName(const QString &attributeName) const
+{
+    return findByAttributeName(m_widgets, attributeName);
+}
+
+QString Driver::widgetVariableName(const QString &attributeName) const
 {
-    return m_widgets.key(name);
+    auto it = findByAttributeNameIt(m_widgets, attributeName);
+    return it != m_widgets.cend() ? it.value() : QString();
 }
 
-const DomActionGroup *Driver::actionGroupByName(const QString &name) const
+const DomActionGroup *Driver::actionGroupByName(const QString &attributeName) const
 {
-    return m_actionGroups.key(name);
+    return findByAttributeName(m_actionGroups, attributeName);
 }
 
-const DomAction *Driver::actionByName(const QString &name) const
+const DomAction *Driver::actionByName(const QString &attributeName) const
 {
-    return m_actions.key(name);
+    return findByAttributeName(m_actions, attributeName);
 }
 
 QT_END_NAMESPACE
diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h
index 1303d0bf8a..45ec23b4aa 100644
--- a/src/tools/uic/driver.h
+++ b/src/tools/uic/driver.h
@@ -56,8 +56,8 @@ public:
 
     // tools
     bool printDependencies(const QString &fileName);
-    bool uic(const QString &fileName, QTextStream *output = 0);
-    bool uic(const QString &fileName, DomUI *ui, QTextStream *output = 0);
+    bool uic(const QString &fileName, QTextStream *output = nullptr);
+    bool uic(const QString &fileName, DomUI *ui, QTextStream *output = nullptr);
 
     // configuration
     inline QTextStream &output() const { return *m_output; }
@@ -84,18 +84,28 @@ public:
     // Find a group by its non-uniqified name
     const DomButtonGroup *findButtonGroup(const QString &attributeName) const;
 
-    const DomWidget *widgetByName(const QString &name) const;
-    const DomActionGroup *actionGroupByName(const QString &name) const;
-    const DomAction *actionByName(const QString &name) const;
+    const DomWidget *widgetByName(const QString &attributeName) const;
+    QString widgetVariableName(const QString &attributeName) const;
+    const DomActionGroup *actionGroupByName(const QString &attributeName) const;
+    const DomAction *actionByName(const QString &attributeName) const;
 
     bool useIdBasedTranslations() const { return m_idBasedTranslations; }
     void setUseIdBasedTranslations(bool u) { m_idBasedTranslations = u; }
 
 private:
     template <class DomClass> using DomObjectHash = QHash<const DomClass *, QString>;
+    template <class DomClass> using DomObjectHashConstIt =
+        typename DomObjectHash<DomClass>::ConstIterator;
 
     template <class DomClass>
-    QString findOrInsert(DomObjectHash<DomClass> *domHash, const DomClass *dom, const QString &className);
+    DomObjectHashConstIt<DomClass> findByAttributeNameIt(const DomObjectHash<DomClass> &domHash,
+                                                         const QString &name) const;
+    template <class DomClass>
+    const DomClass *findByAttributeName(const DomObjectHash<DomClass> &domHash,
+                                        const QString &name) const;
+    template <class DomClass>
+    QString findOrInsert(DomObjectHash<DomClass> *domHash, const DomClass *dom, const QString &className,
+                         bool isMember = true);
 
     Option m_option;
     QTextStream m_stdout;
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index 0516b854ff..9cf22d502d 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -29,6 +29,7 @@
 #include "uic.h"
 #include "option.h"
 #include "driver.h"
+#include <language.h>
 
 #include <qfile.h>
 #include <qdir.h>
@@ -67,6 +68,10 @@ int runUic(int argc, char *argv[])
     outputOption.setValueName(QStringLiteral("file"));
     parser.addOption(outputOption);
 
+    QCommandLineOption noAutoConnectionOption(QStringList() << QStringLiteral("a") << QStringLiteral("no-autoconnection"));
+    noAutoConnectionOption.setDescription(QStringLiteral("Do not generate a call to QObject::connectSlotsByName()."));
+    parser.addOption(noAutoConnectionOption);
+
     QCommandLineOption noProtOption(QStringList() << QStringLiteral("p") << QStringLiteral("no-protection"));
     noProtOption.setDescription(QStringLiteral("Disable header protection."));
     parser.addOption(noProtOption);
@@ -96,7 +101,7 @@ int runUic(int argc, char *argv[])
 
     QCommandLineOption generatorOption(QStringList() << QStringLiteral("g") << QStringLiteral("generator"));
     generatorOption.setDescription(QStringLiteral("Select generator."));
-    generatorOption.setValueName(QStringLiteral("java|cpp"));
+    generatorOption.setValueName(QStringLiteral("python|cpp"));
     parser.addOption(generatorOption);
 
     QCommandLineOption idBasedOption(QStringLiteral("idbased"));
@@ -109,6 +114,7 @@ int runUic(int argc, char *argv[])
 
     driver.option().dependencies = parser.isSet(dependenciesOption);
     driver.option().outputFile = parser.value(outputOption);
+    driver.option().autoConnection = !parser.isSet(noAutoConnectionOption);
     driver.option().headerProtection = !parser.isSet(noProtOption);
     driver.option().implicitIncludes = !parser.isSet(noImplicitIncludesOption);
     driver.option().idBased = parser.isSet(idBasedOption);
@@ -116,6 +122,13 @@ int runUic(int argc, char *argv[])
     driver.option().translateFunction = parser.value(translateOption);
     driver.option().includeFile = parser.value(includeOption);
 
+    Language language = Language::Cpp;
+    if (parser.isSet(generatorOption)) {
+        if (parser.value(generatorOption).compare(QLatin1String("python")) == 0)
+            language = Language::Python;
+    }
+    language::setLanguage(language);
+
     if (parser.isSet(noStringLiteralOption))
         fprintf(stderr, "The -s, --no-stringliteral option is deprecated and it won't take any effect.\n");
 
@@ -129,7 +142,7 @@ int runUic(int argc, char *argv[])
         return !driver.printDependencies(inputFile);
     }
 
-    QTextStream *out = 0;
+    QTextStream *out = nullptr;
     QFile f;
     if (!driver.option().outputFile.isEmpty()) {
         f.setFileName(driver.option().outputFile);
diff --git a/src/tools/uic/python/python.pri b/src/tools/uic/python/python.pri
new file mode 100644
index 0000000000..4dd31160a1
--- /dev/null
+++ b/src/tools/uic/python/python.pri
@@ -0,0 +1,8 @@
+INCLUDEPATH += $$PWD
+
+# Input
+HEADERS += $$PWD/pythonwritedeclaration.h \
+           $$PWD/pythonwriteimports.h
+
+SOURCES += $$PWD/pythonwritedeclaration.cpp \
+           $$PWD/pythonwriteimports.cpp
diff --git a/src/tools/uic/python/pythonwritedeclaration.cpp b/src/tools/uic/python/pythonwritedeclaration.cpp
new file mode 100644
index 0000000000..5122b18e23
--- /dev/null
+++ b/src/tools/uic/python/pythonwritedeclaration.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pythonwritedeclaration.h"
+#include <cppwriteinitialization.h>
+#include <language.h>
+#include <driver.h>
+#include <ui4.h>
+#include <uic.h>
+
+#include <QtCore/qtextstream.h>
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Python {
+
+WriteDeclaration::WriteDeclaration(Uic *uic)  :
+    m_uic(uic),
+    m_driver(uic->driver()),
+    m_output(uic->output()),
+    m_option(uic->option())
+{
+}
+
+void WriteDeclaration::acceptUI(DomUI *node)
+{
+    // remove any left-over C++ namespaces
+    const QString qualifiedClassName = QLatin1String("Ui_") + node->elementClass()
+        + m_option.postfix;
+    m_output << "class " << language::fixClassName(qualifiedClassName) << "(object):\n";
+
+    TreeWalker::acceptWidget(node->elementWidget());
+    if (const DomButtonGroups *domButtonGroups = node->elementButtonGroups())
+        acceptButtonGroups(domButtonGroups);
+    CPP::WriteInitialization(m_uic).acceptUI(node);
+}
+
+// Register button groups to prevent the on-the-fly creation legacy
+// feature from triggering
+void WriteDeclaration::acceptButtonGroup(const DomButtonGroup *buttonGroup)
+{
+    m_driver->findOrInsertButtonGroup(buttonGroup);
+}
+
+} // namespace Python
+
+QT_END_NAMESPACE
diff --git a/src/tools/uic/python/pythonwritedeclaration.h b/src/tools/uic/python/pythonwritedeclaration.h
new file mode 100644
index 0000000000..a8d50b6fbf
--- /dev/null
+++ b/src/tools/uic/python/pythonwritedeclaration.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PYTHONWRITEDECLARATION_H
+#define PYTHONWRITEDECLARATION_H
+
+#include <treewalker.h>
+
+QT_BEGIN_NAMESPACE
+
+class QTextStream;
+class Driver;
+class Uic;
+
+struct Option;
+
+namespace Python {
+
+struct WriteDeclaration : public TreeWalker
+{
+    WriteDeclaration(Uic *uic);
+
+    void acceptUI(DomUI *node) override;
+    void acceptButtonGroup(const DomButtonGroup *buttonGroup) override;
+
+private:
+    Uic *m_uic;
+    Driver *m_driver;
+    QTextStream &m_output;
+    const Option &m_option;
+};
+
+} // namespace Python
+
+QT_END_NAMESPACE
+
+#endif // PYTHONWRITEDECLARATION_H
diff --git a/src/tools/uic/python/pythonwriteimports.cpp b/src/tools/uic/python/pythonwriteimports.cpp
new file mode 100644
index 0000000000..303615f77b
--- /dev/null
+++ b/src/tools/uic/python/pythonwriteimports.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "pythonwriteimports.h"
+
+#include <customwidgetsinfo.h>
+#include <uic.h>
+
+#include <ui4.h>
+
+#include <QtCore/qtextstream.h>
+
+QT_BEGIN_NAMESPACE
+
+static const char *standardImports =
+R"I(from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint,
+    QRect, QSize, QUrl, Qt)
+from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QFont,
+    QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap,
+    QRadialGradient)
+from PySide2.QtWidgets import *
+)I";
+
+namespace Python {
+
+WriteImports::WriteImports(Uic *uic) : m_uic(uic)
+{
+}
+
+void WriteImports::acceptUI(DomUI *node)
+{
+    auto &output = m_uic->output();
+    output << standardImports << '\n';
+    if (auto customWidgets = node->elementCustomWidgets()) {
+        TreeWalker::acceptCustomWidgets(customWidgets);
+        output << '\n';
+    }
+}
+
+QString WriteImports::qtModuleOf(const DomCustomWidget *node) const
+{
+    if (m_uic->customWidgetsInfo()->extends(node->elementClass(), QLatin1String("QAxWidget")))
+        return QStringLiteral("QtAxContainer");
+    if (const auto headerElement = node->elementHeader()) {
+        const auto &header = headerElement->text();
+        if (header.startsWith(QLatin1String("Qt"))) {
+            const int slash = header.indexOf(QLatin1Char('/'));
+            if (slash != -1)
+                return header.left(slash);
+        }
+    }
+    return QString();
+}
+
+void WriteImports::acceptCustomWidget(DomCustomWidget *node)
+{
+    const auto &className = node->elementClass();
+    if (className.contains(QLatin1String("::")))
+        return; // Exclude namespaced names (just to make tests pass).
+    const QString &qtModule = qtModuleOf(node);
+    auto &output = m_uic->output();
+    if (!qtModule.isEmpty())
+        output << "from PySide2." << qtModule << ' ';
+    output << "import " << className << '\n';
+}
+
+} // namespace Python
+
+QT_END_NAMESPACE
diff --git a/src/tools/uic/python/pythonwriteimports.h b/src/tools/uic/python/pythonwriteimports.h
new file mode 100644
index 0000000000..427cbb48b1
--- /dev/null
+++ b/src/tools/uic/python/pythonwriteimports.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PYTHONWRITEIMPORTS_H
+#define PYTHONWRITEIMPORTS_H
+
+#include <treewalker.h>
+
+QT_BEGIN_NAMESPACE
+
+class Uic;
+
+namespace Python {
+
+struct WriteImports : public TreeWalker
+{
+public:
+    explicit WriteImports(Uic *uic);
+
+    void acceptUI(DomUI *node) override;
+    void acceptCustomWidget(DomCustomWidget *node) override;
+
+private:
+    QString qtModuleOf(const DomCustomWidget *node) const;
+
+    Uic *const m_uic;
+};
+
+} // namespace Python
+
+QT_END_NAMESPACE
+
+#endif // PYTHONWRITEIMPORTS_H
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 8e1afa0878..8cebe65a00 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -249,7 +249,7 @@ QT_CLASS_LIB(QLatin1String, QtCore, qstring.h)
 QT_CLASS_LIB(QCharRef, QtCore, qstring.h)
 QT_CLASS_LIB(QConstString, QtCore, qstring.h)
 QT_CLASS_LIB(QStringRef, QtCore, qstring.h)
-QT_CLASS_LIB(QLatin1Literal, QtCore, qstringbuilder.h)
+QT_CLASS_LIB(QLatin1Literal, QtCore, qstring.h)
 QT_CLASS_LIB(QAbstractConcatenable, QtCore, qstringbuilder.h)
 QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
 QT_CLASS_LIB(QStringBuilder, QtCore, qstringbuilder.h)
diff --git a/src/tools/uic/shared/language.cpp b/src/tools/uic/shared/language.cpp
index 730e1562bc..235a8ed2fc 100644
--- a/src/tools/uic/shared/language.cpp
+++ b/src/tools/uic/shared/language.cpp
@@ -32,6 +32,50 @@
 
 namespace language {
 
+static Encoding encoding = Encoding::Utf8;
+static Language _language = Language::Cpp;
+
+Language language() { return _language; }
+
+void setLanguage(Language l)
+{
+    _language = l;
+    switch (_language) {
+    case Language::Cpp:
+        derefPointer = QLatin1String("->");
+        nullPtr = QLatin1String("nullptr");
+        operatorNew = QLatin1String("new ");
+        qtQualifier = QLatin1String("Qt::");
+        qualifier = QLatin1String("::");
+        self = QLatin1String("");  // for testing: change to "this->";
+        eol = QLatin1String(";\n");
+        encoding = Encoding::Utf8;
+        break;
+    case Language::Python:
+        derefPointer = QLatin1String(".");
+        nullPtr = QLatin1String("None");
+        operatorNew = QLatin1String("");
+        qtQualifier = QLatin1String("Qt.");
+        qualifier = QLatin1String(".");
+        self = QLatin1String("self.");
+        eol = QLatin1String("\n");
+        encoding = Encoding::Unicode;
+        break;
+    }
+}
+
+QString derefPointer;
+QString nullPtr;
+QString operatorNew;
+QString qtQualifier;
+QString qualifier;
+QString self;
+QString eol;
+
+QString cppQualifier = QLatin1String("::");
+QString cppTrue = QLatin1String("true");
+QString cppFalse = QLatin1String("false");
+
 QTextStream &operator<<(QTextStream &str, const qtConfig &c)
 {
     str << "QT_CONFIG(" << c.parameter() << ')';
@@ -69,6 +113,13 @@ const char *lookupEnum(const EnumLookup(&array)[N], int value, int defaultIndex
     return defaultValue;
 }
 
+QString fixClassName(QString className)
+{
+    if (language() == Language::Python)
+        className.replace(cppQualifier, QLatin1String("_"));
+    return className;
+}
+
 const char *toolbarArea(int v)
 {
     static const EnumLookup toolBarAreas[] =
@@ -141,4 +192,235 @@ const char *paletteColorRole(int v)
     return lookupEnum(colorRoles, v);
 }
 
+// Helpers for formatting a character sequences
+
+// Format a special character like '\x0a'
+static int formatEscapedNumber(QTextStream &str, ushort value, int base, int width,
+                               char prefix = 0)
+{
+    int length = 1 + width;
+    str << '\\';
+    if (prefix) {
+        str << prefix;
+        ++length;
+    }
+    const auto oldPadChar = str.padChar();
+    const auto oldFieldWidth = str.fieldWidth();
+    const auto oldFieldAlignment = str.fieldAlignment();
+    const auto oldIntegerBase = str.integerBase();
+    str.setPadChar(QLatin1Char('0'));
+    str.setFieldWidth(width);
+    str.setFieldAlignment(QTextStream::AlignRight);
+    str.setIntegerBase(base);
+    str << value;
+    str.setIntegerBase(oldIntegerBase);
+    str.setFieldAlignment(oldFieldAlignment);
+    str.setFieldWidth(oldFieldWidth);
+    str.setPadChar(oldPadChar);
+    return length;
+}
+
+static int formatSpecialCharacter(QTextStream &str, ushort value)
+{
+    int length = 0;
+    switch (value) {
+    case '\\':
+        str << "\\\\";
+        length += 2;
+        break;
+    case '\"':
+        str << "\\\"";
+        length += 2;
+        break;
+    case '\n':
+        str << "\\n\"\n\"";
+        length += 5;
+        break;
+    default:
+        break;
+    }
+    return length;
+}
+
+// Format a sequence of characters for C++ with special characters numerically
+// escaped (non-raw string literals), wrappped at maxSegmentSize. FormattingTraits
+// are used to transform characters into (unsigned) codes, which can be used
+// for either normal escapes or Unicode code points as used in Unicode literals.
+
+enum : int { maxSegmentSize = 1024 };
+
+template <Encoding e>
+struct FormattingTraits
+{
+};
+
+template <>
+struct FormattingTraits<Encoding::Utf8>
+{
+    static ushort code(char c) { return uchar(c); }
+};
+
+template <>
+struct FormattingTraits<Encoding::Unicode>
+{
+    static ushort code(QChar c) { return c.unicode(); }
+};
+
+template <Encoding e, class Iterator>
+static void formatStringSequence(QTextStream &str, Iterator it, Iterator end,
+                                 const QString &indent,
+                                 int escapeIntegerBase, int escapeWidth,
+                                 char escapePrefix = 0)
+{
+    str << '"';
+    int length = 0;
+    while (it != end) {
+        const auto code = FormattingTraits<e>::code(*it);
+        if (code >= 0x80) {
+            length += formatEscapedNumber(str, code, escapeIntegerBase, escapeWidth, escapePrefix);
+        } else if (const int l = formatSpecialCharacter(str, code)) {
+            length += l;
+        } else if (code != '\r') {
+            str << *it;
+            ++length;
+        }
+        ++it;
+        if (it != end && length > maxSegmentSize) {
+            str << "\"\n" << indent << indent << '"';
+            length = 0;
+        }
+    }
+    str << '"';
+}
+
+void _formatString(QTextStream &str, const QString &value, const QString &indent,
+                   bool qString)
+{
+    switch (encoding) {
+    // Special characters as 3 digit octal escapes (u8"\303\234mlaut")
+    case Encoding::Utf8: {
+        if (qString && _language == Language::Cpp)
+            str << "QString::fromUtf8(";
+        const QByteArray utf8 = value.toUtf8();
+        formatStringSequence<Encoding::Utf8>(str, utf8.cbegin(), utf8.cend(), indent,
+                                             8, 3);
+        if (qString && _language == Language::Cpp)
+            str << ')';
+    }
+        break;
+    // Special characters as 4 digit hex Unicode points (u8"\u00dcmlaut")
+    case Encoding::Unicode:
+        str << 'u'; // Python Unicode literal (would be UTF-16 in C++)
+        formatStringSequence<Encoding::Unicode>(str, value.cbegin(), value.cend(), indent,
+                                                16, 4, 'u');
+        break;
+    }
+}
+
+QTextStream &operator<<(QTextStream &str, const repeat &r)
+{
+    for (int i = 0; i < r.m_count; ++i)
+        str << r.m_char;
+    return str;
+}
+
+startFunctionDefinition1::startFunctionDefinition1(const char *name, const QString &parameterType,
+                                                   const QString &parameterName,
+                                                   const QString &indent,
+                                                   const char *returnType) :
+    m_name(name), m_parameterType(parameterType), m_parameterName(parameterName),
+    m_indent(indent), m_return(returnType)
+{
+}
+
+QTextStream &operator<<(QTextStream &str, const startFunctionDefinition1 &f)
+{
+    switch (language()) {
+    case Language::Cpp:
+        str << (f.m_return ? f.m_return : "void") << ' ' << f.m_name << '('
+            << f.m_parameterType;
+        if (f.m_parameterType.cend()->isLetter())
+            str << ' ';
+        str << f.m_parameterName << ')' << '\n' << f.m_indent << "{\n";
+        break;
+    case Language::Python:
+        str << "def " << f.m_name << "(self, " << f.m_parameterName << "):\n";
+        break;
+    }
+    return str;
+}
+
+endFunctionDefinition::endFunctionDefinition(const char *name) : m_name(name)
+{
+}
+
+QTextStream &operator<<(QTextStream &str, const endFunctionDefinition &f)
+{
+    switch (language()) {
+    case Language::Cpp:
+        str << "} // " << f.m_name << "\n\n";
+        break;
+    case Language::Python:
+        str << "# " << f.m_name << "\n\n";
+        break;
+    }
+    return str;
+}
+
+void _formatStackVariable(QTextStream &str, const char *className, QStringView varName,
+                          bool withInitParameters)
+{
+    switch (language()) {
+    case Language::Cpp:
+        str << className << ' ' << varName;
+        if (withInitParameters)
+            str << '(';
+        break;
+    case Language::Python:
+        str << varName << " = " << className << '(';
+        if (!withInitParameters)
+            str << ')';
+        break;
+    }
+}
+
+void formatConnection(QTextStream &str, const SignalSlot &sender, const SignalSlot &receiver)
+{
+    switch (language()) {
+    case Language::Cpp:
+        str << "QObject::connect(" << sender.name << ", SIGNAL("<< sender.signature
+            << "), " << receiver.name << ", SLOT("<< receiver.signature << "))";
+        break;
+    case Language::Python:
+        str << sender.name << '.'
+            << sender.signature.leftRef(sender.signature.indexOf(QLatin1Char('(')))
+            << ".connect(" << receiver.name << '.'
+            << receiver.signature.leftRef(receiver.signature.indexOf(QLatin1Char('(')))
+            << ')';
+        break;
+    }
+}
+
+QString boolValue(bool v)
+{
+    switch (language()) {
+    case Language::Cpp:
+        return v ? cppTrue : cppFalse;
+    case Language::Python:
+        return v ? QStringLiteral("True") : QStringLiteral("False");
+    }
+    Q_UNREACHABLE();
+}
+
+static inline QString dot() { return QStringLiteral("."); }
+
+QString enumValue(const QString &value)
+{
+    if (language() == Language::Cpp || !value.contains(cppQualifier))
+        return value;
+    QString fixed = value;
+    fixed.replace(cppQualifier, dot());
+    return fixed;
+}
+
 } // namespace language
diff --git a/src/tools/uic/shared/language.h b/src/tools/uic/shared/language.h
index e7201b6529..fc8af9715b 100644
--- a/src/tools/uic/shared/language.h
+++ b/src/tools/uic/shared/language.h
@@ -29,12 +29,31 @@
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
+#include <QtCore/qstring.h>
 #include <QtCore/qstringview.h>
+#include <QtCore/qstring.h>
 
 QT_FORWARD_DECLARE_CLASS(QTextStream)
 
+enum class Language { Cpp, Python };
+
 namespace language {
 
+Language language();
+void setLanguage(Language);
+
+extern QString derefPointer;
+extern QString nullPtr;
+extern QString operatorNew;
+extern QString qtQualifier;
+extern QString qualifier;
+extern QString self;
+extern QString eol;
+
+extern QString cppQualifier;
+extern QString cppTrue;
+extern QString cppFalse;
+
 // Base class for streamable objects with one QStringView parameter
 class StringViewStreamable
 {
@@ -71,11 +90,119 @@ public:
 
 QTextStream &operator<<(QTextStream &, const closeQtConfig &c);
 
+QString fixClassName(QString className);
+
 const char *toolbarArea(int v);
 const char *sizePolicy(int v);
 const char *dockWidgetArea(int v);
 const char *paletteColorRole(int v);
 
+enum class Encoding { Utf8, Unicode };
+
+void _formatString(QTextStream &str, const QString &value, const QString &indent,
+                   bool qString);
+
+template <bool AsQString>
+class _string
+{
+public:
+    explicit _string(const QString &value, const QString &indent = QString())
+        : m_value(value), m_indent(indent) {}
+
+    void format(QTextStream &str) const
+    { _formatString(str, m_value, m_indent, AsQString); }
+
+private:
+    const QString &m_value;
+    const QString &m_indent;
+};
+
+template <bool AsQString>
+inline QTextStream &operator<<(QTextStream &str, const language::_string<AsQString> &s)
+{
+    s.format(str);
+    return str;
+}
+
+using charliteral = _string<false>;
+using qstring = _string<true>;
+
+class repeat {
+public:
+    explicit repeat(int count, char c) : m_count(count), m_char(c) {}
+
+    friend QTextStream &operator<<(QTextStream &str, const repeat &r);
+
+private:
+    const int m_count;
+    const char m_char;
+};
+
+class startFunctionDefinition1 {
+public:
+    explicit startFunctionDefinition1(const char *name, const QString &parameterType,
+                                      const QString &parameterName,
+                                      const QString &indent,
+                                      const char *returnType = nullptr);
+
+    friend QTextStream &operator<<(QTextStream &str, const startFunctionDefinition1 &f);
+private:
+    const char *m_name;
+    const QString &m_parameterType;
+    const QString &m_parameterName;
+    const QString &m_indent;
+    const char *m_return;
+};
+
+class endFunctionDefinition {
+public:
+    explicit endFunctionDefinition(const char *name);
+
+    friend QTextStream &operator<<(QTextStream &str, const endFunctionDefinition &f);
+private:
+    const char *m_name;
+};
+
+void _formatStackVariable(QTextStream &str, const char *className, QStringView varName, bool withInitParameters);
+
+template <bool withInitParameters>
+class _stackVariable {
+public:
+    explicit _stackVariable(const char *className, QStringView varName) :
+        m_className(className), m_varName(varName) {}
+
+    void format(QTextStream &str) const
+    { _formatStackVariable(str, m_className, m_varName, withInitParameters); }
+
+private:
+    const char *m_className;
+    QStringView m_varName;
+    QStringView m_parameters;
+};
+
+template <bool withInitParameters>
+inline QTextStream &operator<<(QTextStream &str, const _stackVariable<withInitParameters> &s)
+{
+    s.format(str);
+    return str;
+}
+
+using stackVariable = _stackVariable<false>;
+using stackVariableWithInitParameters = _stackVariable<true>;
+
+struct SignalSlot
+{
+    QString name;
+    QString signature;
+    QString className;
+};
+
+void formatConnection(QTextStream &str, const SignalSlot &sender, const SignalSlot &receiver);
+
+QString boolValue(bool v);
+
+QString enumValue(const QString &value);
+
 } // namespace language
 
 #endif // LANGUAGE_H
diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h
index 7e8eda57d9..3777229517 100644
--- a/src/tools/uic/treewalker.h
+++ b/src/tools/uic/treewalker.h
@@ -77,6 +77,9 @@ class DomButtonGroup;
 
 struct TreeWalker
 {
+    Q_DISABLE_COPY_MOVE(TreeWalker)
+
+    TreeWalker() = default;
     inline virtual ~TreeWalker() = default;
 
     virtual void acceptUI(DomUI *ui);
@@ -101,7 +104,7 @@ struct TreeWalker
     virtual void acceptTime(DomTime *time);
     virtual void acceptDateTime(DomDateTime *dateTime);
     virtual void acceptProperty(DomProperty *property);
-    typedef QVector<DomWidget *> DomWidgets;
+    using DomWidgets = QVector<DomWidget *>;
     virtual void acceptIncludes(DomIncludes *includes);
     virtual void acceptInclude(DomInclude *incl);
     virtual void acceptAction(DomAction *action);
diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp
index 984ef36274..334ced276d 100644
--- a/src/tools/uic/ui4.cpp
+++ b/src/tools/uic/ui4.cpp
@@ -76,6 +76,10 @@ void DomUI::read(QXmlStreamReader &reader)
             setAttributeIdbasedtr(attribute.value() == QLatin1String("true"));
             continue;
         }
+        if (name == QLatin1String("connectslotsbyname")) {
+            setAttributeConnectslotsbyname(attribute.value() == QLatin1String("true"));
+            continue;
+        }
         if (name == QLatin1String("stdsetdef")) {
             setAttributeStdsetdef(attribute.value().toInt());
             continue;
@@ -209,6 +213,9 @@ void DomUI::write(QXmlStreamWriter &writer, const QString &tagName) const
     if (hasAttributeIdbasedtr())
         writer.writeAttribute(QStringLiteral("idbasedtr"), (attributeIdbasedtr() ? QLatin1String("true") : QLatin1String("false")));
 
+    if (hasAttributeConnectslotsbyname())
+        writer.writeAttribute(QStringLiteral("connectslotsbyname"), (attributeConnectslotsbyname() ? QLatin1String("true") : QLatin1String("false")));
+
     if (hasAttributeStdsetdef())
         writer.writeAttribute(QStringLiteral("stdsetdef"), QString::number(attributeStdsetdef()));
 
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index 1710147342..08a3abf490 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -169,6 +169,11 @@ public:
     inline void setAttributeIdbasedtr(bool a) { m_attr_idbasedtr = a; m_has_attr_idbasedtr = true; }
     inline void clearAttributeIdbasedtr() { m_has_attr_idbasedtr = false; }
 
+    inline bool hasAttributeConnectslotsbyname() const { return m_has_attr_connectslotsbyname; }
+    inline bool attributeConnectslotsbyname() const { return m_attr_connectslotsbyname; }
+    inline void setAttributeConnectslotsbyname(bool a) { m_attr_connectslotsbyname = a; m_has_attr_connectslotsbyname = true; }
+    inline void clearAttributeConnectslotsbyname() { m_has_attr_connectslotsbyname = false; }
+
     inline bool hasAttributeStdsetdef() const { return m_has_attr_stdsetdef; }
     inline int attributeStdsetdef() const { return m_attr_stdsetdef; }
     inline void setAttributeStdsetdef(int a) { m_attr_stdsetdef = a; m_has_attr_stdsetdef = true; }
@@ -285,6 +290,9 @@ private:
     bool m_attr_idbasedtr = false;
     bool m_has_attr_idbasedtr = false;
 
+    bool m_attr_connectslotsbyname = false;
+    bool m_has_attr_connectslotsbyname = false;
+
     int m_attr_stdsetdef = 0;
     bool m_has_attr_stdsetdef = false;
 
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 225dc6aeb2..207356f28d 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -35,6 +35,10 @@
 
 #include "cppwriteincludes.h"
 #include "cppwritedeclaration.h"
+#include <pythonwritedeclaration.h>
+#include <pythonwriteimports.h>
+
+#include <language.h>
 
 #include <qxmlstream.h>
 #include <qfileinfo.h>
@@ -65,7 +69,7 @@ bool Uic::printDependencies()
             return false;
     }
 
-    DomUI *ui = 0;
+    DomUI *ui = nullptr;
     {
         QXmlStreamReader reader;
         reader.setDevice(&f);
@@ -103,7 +107,7 @@ bool Uic::printDependencies()
     return true;
 }
 
-void Uic::writeCopyrightHeader(DomUI *ui)
+void Uic::writeCopyrightHeaderCpp(const DomUI *ui) const
 {
     QString comment = ui->elementComment();
     if (!comment.isEmpty())
@@ -118,6 +122,48 @@ void Uic::writeCopyrightHeader(DomUI *ui)
     out << "********************************************************************************/\n\n";
 }
 
+// Format existing UI file comments for Python with some smartness : Replace all
+// leading C++ comment characters by '#' or prepend '#' if needed.
+
+static inline bool isCppCommentChar(QChar c)
+{
+    return  c == QLatin1Char('/') || c == QLatin1Char('*');
+}
+
+static int leadingCppCommentCharCount(const QStringRef &s)
+{
+    int i = 0;
+    for (const int size = s.size(); i < size && isCppCommentChar(s.at(i)); ++i) {
+    }
+    return i;
+}
+
+void Uic::writeCopyrightHeaderPython(const DomUI *ui) const
+{
+    QString comment = ui->elementComment();
+    if (!comment.isEmpty()) {
+        const auto lines = comment.splitRef(QLatin1Char('\n'));
+        for (const auto &line : lines) {
+            if (const int leadingCommentChars = leadingCppCommentCharCount(line)) {
+                 out << language::repeat(leadingCommentChars, '#')
+                     << line.right(line.size() - leadingCommentChars);
+            } else {
+                if (!line.startsWith(QLatin1Char('#')))
+                    out << "# ";
+                out << line;
+            }
+            out << '\n';
+        }
+        out << '\n';
+    }
+
+    out << language::repeat(80, '#') << "\n## Form generated from reading UI file '"
+        << QFileInfo(opt.inputFile).fileName()
+        << "'\n##\n## Created by: Qt User Interface Compiler version " << QT_VERSION_STR
+        << "\n##\n## WARNING! All changes made in this file will be lost when recompiling UI file!\n"
+        << language::repeat(80, '#') << "\n\n";
+}
+
 // Check the version with a stream reader at the <ui> element.
 
 static double versionFromUiAttribute(QXmlStreamReader &reader)
@@ -132,7 +178,7 @@ static double versionFromUiAttribute(QXmlStreamReader &reader)
 
 DomUI *Uic::parseUiFile(QXmlStreamReader &reader)
 {
-    DomUI *ui = 0;
+    DomUI *ui = nullptr;
 
     const QString uiElement = QLatin1String("ui");
     while (!reader.atEnd()) {
@@ -143,7 +189,7 @@ DomUI *Uic::parseUiFile(QXmlStreamReader &reader)
                 if (version < 4.0) {
                     const QString msg = QString::fromLatin1("uic: File generated with too old version of Qt Designer (%1)").arg(version);
                     fprintf(stderr, "%s\n", qPrintable(msg));
-                    return 0;
+                    return nullptr;
                 }
 
                 ui = new DomUI();
@@ -155,7 +201,7 @@ DomUI *Uic::parseUiFile(QXmlStreamReader &reader)
     }
     if (reader.hasError()) {
         delete ui;
-        ui = 0;
+        ui = nullptr;
         fprintf(stderr, "%s\n", qPrintable(QString::fromLatin1("uic: Error in line %1, column %2 : %3")
                                     .arg(reader.lineNumber()).arg(reader.columnNumber())
                                     .arg(reader.errorString())));
@@ -195,15 +241,26 @@ bool Uic::write(QIODevice *in)
 
 bool Uic::write(DomUI *ui)
 {
-    using namespace CPP;
-
     if (!ui || !ui->elementWidget())
         return false;
 
-    if (opt.copyrightHeader)
-        writeCopyrightHeader(ui);
+    const auto lang = language::language();
+
+    if (lang == Language::Python)
+       out << "# -*- coding: utf-8 -*-\n\n";
 
-    if (opt.headerProtection) {
+    if (opt.copyrightHeader) {
+        switch (language::language()) {
+        case Language::Cpp:
+            writeCopyrightHeaderCpp(ui);
+            break;
+        case Language::Python:
+            writeCopyrightHeaderPython(ui);
+            break;
+        }
+    }
+
+    if (opt.headerProtection && lang == Language::Cpp) {
         writeHeaderProtectionStart();
         out << "\n";
     }
@@ -218,13 +275,25 @@ bool Uic::write(DomUI *ui)
 
     info.acceptUI(ui);
     cWidgetsInfo.acceptUI(ui);
-    WriteIncludes writeIncludes(this);
-    writeIncludes.acceptUI(ui);
 
-    Validator(this).acceptUI(ui);
-    WriteDeclaration(this).acceptUI(ui);
+    switch (language::language()) {
+    case Language::Cpp: {
+        CPP::WriteIncludes writeIncludes(this);
+        writeIncludes.acceptUI(ui);
+        Validator(this).acceptUI(ui);
+        CPP::WriteDeclaration(this).acceptUI(ui);
+    }
+        break;
+    case Language::Python: {
+        Python::WriteImports writeImports(this);
+        writeImports.acceptUI(ui);
+        Validator(this).acceptUI(ui);
+        Python::WriteDeclaration(this).acceptUI(ui);
+    }
+        break;
+    }
 
-    if (opt.headerProtection)
+    if (opt.headerProtection && lang == Language::Cpp)
         writeHeaderProtectionEnd();
 
     return true;
diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h
index af5f42c6db..f3dfd49149 100644
--- a/src/tools/uic/uic.h
+++ b/src/tools/uic/uic.h
@@ -91,7 +91,8 @@ public:
 
 private:
     // copyright header
-    void writeCopyrightHeader(DomUI *ui);
+    void writeCopyrightHeaderCpp(const DomUI *ui) const;
+    void writeCopyrightHeaderPython(const DomUI *ui) const;
     DomUI *parseUiFile(QXmlStreamReader &reader);
 
     // header protection
diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro
index 4469ce50e5..1bf8ef8ad3 100644
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
@@ -7,6 +7,7 @@ DEFINES += QT_UIC QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
 include(uic.pri)
 include(shared/shared.pri)
 include(cpp/cpp.pri)
+include(python/python.pri)
 
 HEADERS += uic.h
 
diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h
index 3f32a532ca..34c4ab23d4 100644
--- a/src/tools/uic/utils.h
+++ b/src/tools/uic/utils.h
@@ -42,55 +42,6 @@ inline bool toBool(const QString &str)
 inline QString toString(const DomString *str)
 { return str ? str->text() : QString(); }
 
-inline QString fixString(const QString &str, const QString &indent)
-{
-    QString cursegment;
-    QStringList result;
-    const QByteArray utf8 = str.toUtf8();
-    const int utf8Length = utf8.length();
-
-    for (int i = 0; i < utf8Length; ++i) {
-        const uchar cbyte = utf8.at(i);
-        if (cbyte >= 0x80) {
-            cursegment += QLatin1Char('\\');
-            cursegment += QString::number(cbyte, 8);
-        } else {
-            switch(cbyte) {
-            case '\\':
-                cursegment += QLatin1String("\\\\"); break;
-            case '\"':
-                cursegment += QLatin1String("\\\""); break;
-            case '\r':
-                break;
-            case '\n':
-                cursegment += QLatin1String("\\n\"\n\""); break;
-            default:
-                cursegment += QLatin1Char(cbyte);
-            }
-        }
-
-        if (cursegment.length() > 1024) {
-            result << cursegment;
-            cursegment.clear();
-        }
-    }
-
-    if (!cursegment.isEmpty())
-        result << cursegment;
-
-
-    QString joinstr = QLatin1String("\"\n");
-    joinstr += indent;
-    joinstr += indent;
-    joinstr += QLatin1Char('"');
-
-    QString rc(QLatin1Char('"'));
-    rc += result.join(joinstr);
-    rc += QLatin1Char('"');
-
-    return rc;
-}
-
 inline QHash<QString, DomProperty *> propertyMap(const QList<DomProperty *> &properties)
 {
     QHash<QString, DomProperty *> map;
diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp
index 507584eb02..7f87288520 100644
--- a/src/widgets/accessible/qaccessiblemenu.cpp
+++ b/src/widgets/accessible/qaccessiblemenu.cpp
@@ -47,6 +47,7 @@
 #endif
 #include <QtWidgets/QAction>
 #include <qstyle.h>
+#include <private/qwidget_p.h>
 
 #ifndef QT_NO_ACCESSIBILITY
 
@@ -241,15 +242,9 @@ QObject *QAccessibleMenuItem::object() const
 /*! \reimp */
 QWindow *QAccessibleMenuItem::window() const
 {
-    QWindow *result = nullptr;
-    if (!m_owner.isNull()) {
-        result = m_owner->windowHandle();
-        if (!result) {
-            if (const QWidget *nativeParent = m_owner->nativeParentWidget())
-                result = nativeParent->windowHandle();
-        }
-    }
-    return result;
+    return m_owner.isNull()
+        ? nullptr
+        : qt_widget_private(m_owner.data())->windowHandle(QWidgetPrivate::WindowHandleMode::Closest);
 }
 
 QRect QAccessibleMenuItem::rect() const
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index c96d213e7b..27e6b09dc7 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -273,22 +273,6 @@ QRect QAccessibleWidget::rect() const
     return QRect(wpos.x(), wpos.y(), w->width(), w->height());
 }
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <private/qobject_p.h>
-QT_END_INCLUDE_NAMESPACE
-
-class QACConnectionObject : public QObject
-{
-    Q_DECLARE_PRIVATE(QObject)
-public:
-    inline bool isSender(const QObject *receiver, const char *signal) const
-    { return d_func()->isSender(receiver, signal); }
-    inline QObjectList receiverList(const char *signal) const
-    { return d_func()->receiverList(signal); }
-    inline QObjectList senderList() const
-    { return d_func()->senderList(); }
-};
-
 /*!
     Registers \a signal as a controlling signal.
 
@@ -347,9 +331,9 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel
 
     if (match & QAccessible::Controlled) {
         QObjectList allReceivers;
-        QACConnectionObject *connectionObject = (QACConnectionObject*)object();
+        QObject *connectionObject = object();
         for (int sig = 0; sig < d->primarySignals.count(); ++sig) {
-            const QObjectList receivers = connectionObject->receiverList(d->primarySignals.at(sig).toLatin1());
+            const QObjectList receivers = connectionObject->d_func()->receiverList(d->primarySignals.at(sig).toLatin1());
             allReceivers += receivers;
         }
 
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index 0d87cc486d..52c953ed3a 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -101,9 +101,9 @@ QString qt_accHotKey(const QString &text);
 
 QList<QWidget*> childWidgets(const QWidget *widget)
 {
-    if (widget == 0)
-        return QList<QWidget*>();
     QList<QWidget*> widgets;
+    if (!widget)
+        return widgets;
     for (QObject *o : widget->children()) {
         QWidget *w = qobject_cast<QWidget *>(o);
         if (!w)
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index 716c833fc9..ca74ee4b12 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -779,8 +779,7 @@ int QAccessibleLineEdit::cursorPosition() const
 QRect QAccessibleLineEdit::characterRect(int offset) const
 {
     int x = lineEdit()->d_func()->control->cursorToX(offset);
-    int y;
-    lineEdit()->getTextMargins(0, &y, 0, 0);
+    int y = lineEdit()->textMargins().top();
     QFontMetrics fm(lineEdit()->font());
     const QString ch = text(offset, offset + 1);
     if (ch.isEmpty())
diff --git a/src/widgets/configure.json b/src/widgets/configure.json
index cc9019dfdd..0a68f082a2 100644
--- a/src/widgets/configure.json
+++ b/src/widgets/configure.json
@@ -378,6 +378,7 @@
             "label": "QScroller",
             "purpose": "Enables kinetic scrolling for any scrolling widget or graphics item.",
             "section": "Widgets",
+            "condition": "features.easingcurve",
             "output": [ "publicFeature" ]
         },
         "graphicsview": {
@@ -626,12 +627,6 @@
             "condition": "features.listview",
             "output": [ "publicFeature", "feature" ]
         },
-        "paint_debug": {
-            "label": "Painting Debug Utilities",
-            "purpose": "Enabled debugging painting with the environment variables QT_FLUSH_UPDATE and QT_FLUSH_PAINT.",
-            "section": "Painting",
-            "output": [ "publicFeature", "feature" ]
-        },
         "completer": {
             "label": "QCompleter",
             "purpose": "Provides completions based on an item model.",
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 1cb6cb8a2d..fc00290536 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -57,6 +57,11 @@
 #include "qpainter.h"
 #include "qpixmap.h"
 #include "qpushbutton.h"
+#if QT_CONFIG(regularexpression)
+#include <qregularexpression.h>
+#else
+#include <qregexp.h>
+#endif
 #if QT_CONFIG(settings)
 #include "qsettings.h"
 #endif
@@ -1616,7 +1621,7 @@ void QColorDialogPrivate::_q_pickScreenColor()
     q->grabMouse();
 #endif
 
-#ifdef Q_OS_WIN32 // excludes WinCE and WinRT
+#ifdef Q_OS_WIN32 // excludes WinRT
     // On Windows mouse tracking doesn't work over other processes's windows
     updateTimer->start(30);
 
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index caab6c16ba..3cdd9a5f04 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -270,12 +270,11 @@ void QDialogPrivate::deletePlatformHelper()
 
     The most common way to display a modal dialog is to call its
     exec() function. When the user closes the dialog, exec() will
-    provide a useful \l{#return}{return value}. Typically,
-    to get the dialog to close and return the appropriate value, we
-    connect a default button, e.g. \uicontrol OK, to the accept() slot and a
-    \uicontrol Cancel button to the reject() slot.
-    Alternatively you can call the done() slot with \c Accepted or
-    \c Rejected.
+    provide a useful \l{#return}{return value}. To close the dialog
+    and return the appropriate value, you must connect a default button,
+    e.g. an \uicontrol OK button to the accept() slot and a
+    \uicontrol Cancel button to the reject() slot. Alternatively, you
+    can call the done() slot with \c Accepted or \c Rejected.
 
     An alternative is to call setModal(true) or setWindowModality(),
     then show(). Unlike exec(), show() returns control to the caller
@@ -283,7 +282,7 @@ void QDialogPrivate::deletePlatformHelper()
     progress dialogs, where the user must have the ability to interact
     with the dialog, e.g.  to cancel a long running operation. If you
     use show() and setModal(true) together to perform a long operation,
-    you must call QApplication::processEvents() periodically during
+    you must call QCoreApplication::processEvents() periodically during
     processing to enable the user to interact with the dialog. (See
     QProgressDialog.)
 
@@ -692,7 +691,7 @@ void QDialog::contextMenuEvent(QContextMenuEvent *e)
         if (p.data()->exec(e->globalPos()) == wt) {
             QHelpEvent e(QEvent::WhatsThis, w->rect().center(),
                          w->mapToGlobal(w->rect().center()));
-            QApplication::sendEvent(w, &e);
+            QCoreApplication::sendEvent(w, &e);
         }
         delete p.data();
     }
@@ -827,7 +826,7 @@ QT_WARNING_POP
 #endif
         if (fw && !fw->hasFocus()) {
             QFocusEvent e(QEvent::FocusIn, Qt::TabFocusReason);
-            QApplication::sendEvent(fw, &e);
+            QCoreApplication::sendEvent(fw, &e);
         }
 
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h
index 92634f6793..74f775a0bd 100644
--- a/src/widgets/dialogs/qdialog_p.h
+++ b/src/widgets/dialogs/qdialog_p.h
@@ -75,15 +75,15 @@ public:
     QDialogPrivate()
         :
 #if QT_CONFIG(pushbutton)
-          mainDef(0),
+          mainDef(nullptr),
 #endif
-          orientation(Qt::Horizontal),extension(0), doShowExtension(false),
+          orientation(Qt::Horizontal),extension(nullptr), doShowExtension(false),
 #if QT_CONFIG(sizegrip)
-          resizer(0),
+          resizer(nullptr),
           sizeGripEnabled(false),
 #endif
-          rescode(0), resetModalityTo(-1), wasModalitySet(true), eventLoop(0),
-          nativeDialogInUse(false), m_platformHelper(0), m_platformHelperCreated(false)
+          rescode(0), resetModalityTo(-1), wasModalitySet(true), eventLoop(nullptr),
+          nativeDialogInUse(false), m_platformHelper(nullptr), m_platformHelperCreated(false)
         {}
     ~QDialogPrivate();
 
@@ -140,14 +140,14 @@ class QAutoPointer {
     struct internal { void func() {} };
     typedef void (internal::*RestrictedBool)();
 public:
-    explicit QAutoPointer(T *t) Q_DECL_NOTHROW : o(t) {}
+    explicit QAutoPointer(T *t) noexcept : o(t) {}
     ~QAutoPointer() { delete o; }
 
-    T *operator->() const Q_DECL_NOTHROW { return get(); }
-    T *get() const Q_DECL_NOTHROW { return o; }
+    T *operator->() const noexcept { return get(); }
+    T *get() const noexcept { return o; }
     T &operator*() const { return *get(); }
-    operator RestrictedBool() const Q_DECL_NOTHROW { return o ? &internal::func : nullptr; }
-    bool operator!() const Q_DECL_NOTHROW { return !o; }
+    operator RestrictedBool() const noexcept { return o ? &internal::func : nullptr; }
+    bool operator!() const noexcept { return !o; }
 private:
     Q_DISABLE_COPY(QAutoPointer);
 };
diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp
index fd68f19680..f0ec2c0102 100644
--- a/src/widgets/dialogs/qerrormessage.cpp
+++ b/src/widgets/dialogs/qerrormessage.cpp
@@ -295,7 +295,7 @@ QErrorMessage * QErrorMessage::qtHandler()
     if (!qtMessageHandler) {
         qtMessageHandler = new QErrorMessage(0);
         qAddPostRoutine(deleteStaticcQErrorMessage); // clean up
-        qtMessageHandler->setWindowTitle(QApplication::applicationName());
+        qtMessageHandler->setWindowTitle(QCoreApplication::applicationName());
         qInstallMessageHandler(jump);
     }
     return qtMessageHandler;
@@ -322,8 +322,8 @@ bool QErrorMessagePrivate::nextPending()
 #else
             errors->setPlainText(message);
 #endif
-            currentMessage = qMove(message);
-            currentType = qMove(type);
+            currentMessage = std::move(message);
+            currentType = std::move(type);
             return true;
         }
     }
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 2c2d209226..a1b9003c1c 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -44,6 +44,7 @@
 #include "qfiledialog.h"
 
 #include "qfiledialog_p.h"
+#include <private/qapplication_p.h>
 #include <private/qguiapplication_p.h>
 #include <qfontmetrics.h>
 #include <qaction.h>
@@ -77,6 +78,8 @@
 #include <private/qwasmlocalfileaccess_p.h>
 #endif
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QUrl, lastVisitedDir)
@@ -2445,6 +2448,51 @@ void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::funct
 }
 
 /*!
+    This is a convenience static function that saves \a fileContent to a file, using
+    a file name and location chosen by the user. \a fileNameHint can be provided to
+    suggest a file name to the user.
+
+    This function is used to save files to the local file system on Qt for WebAssembly, where
+    the web sandbox places restrictions on how such access may happen. Its implementation will
+    make the browser display a native file dialog, where the user makes the file selection.
+
+    It can also be used on other platforms, where it will fall back to using QFileDialog.
+
+    The function is asynchronous and returns immediately.
+
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 16
+    \since 5.14
+*/
+void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint)
+{
+#ifdef Q_OS_WASM
+    QWasmLocalFileAccess::saveFile(fileContent.constData(), fileContent.size(), fileNameHint.toStdString());
+#else
+    QFileDialog *dialog = new QFileDialog();
+    dialog->setAcceptMode(QFileDialog::AcceptSave);
+    dialog->setFileMode(QFileDialog::AnyFile);
+    dialog->selectFile(fileNameHint);
+
+    auto fileSelected = [=](const QString &fileName) {
+        if (!fileName.isNull()) {
+            QFile selectedFile(fileName);
+            if (selectedFile.open(QIODevice::WriteOnly))
+                selectedFile.write(fileContent);
+        }
+    };
+
+    auto dialogClosed = [=](int code) {
+        Q_UNUSED(code);
+        delete dialog;
+    };
+
+    connect(dialog, &QFileDialog::fileSelected, fileSelected);
+    connect(dialog, &QFileDialog::finished, dialogClosed);
+    dialog->show();
+#endif
+}
+
+/*!
     This is a convenience static function that will return a file name selected
     by the user. The file does not have to exist.
 
@@ -3372,6 +3420,18 @@ void QFileDialogPrivate::_q_goHome()
     q->setDirectory(QDir::homePath());
 }
 
+
+void QFileDialogPrivate::saveHistorySelection()
+{
+    if (qFileDialogUi.isNull() || currentHistoryLocation < 0 || currentHistoryLocation >= currentHistory.size())
+        return;
+    auto &item = currentHistory[currentHistoryLocation];
+    item.selection.clear();
+    const auto selectedIndexes = qFileDialogUi->listView->selectionModel()->selectedRows();
+    for (const auto &index : selectedIndexes)
+        item.selection.append(QPersistentModelIndex(index));
+}
+
 /*!
     \internal
 
@@ -3385,17 +3445,49 @@ void QFileDialogPrivate::_q_pathChanged(const QString &newPath)
     qFileDialogUi->sidebar->selectUrl(QUrl::fromLocalFile(newPath));
     q->setHistory(qFileDialogUi->lookInCombo->history());
 
-    if (currentHistoryLocation < 0 || currentHistory.value(currentHistoryLocation) != QDir::toNativeSeparators(newPath)) {
+    const QString newNativePath = QDir::toNativeSeparators(newPath);
+
+    // equal paths indicate this was invoked by _q_navigateBack/Forward()
+    if (currentHistoryLocation < 0 || currentHistory.value(currentHistoryLocation).path != newNativePath) {
+        if (currentHistoryLocation >= 0)
+            saveHistorySelection();
         while (currentHistoryLocation >= 0 && currentHistoryLocation + 1 < currentHistory.count()) {
             currentHistory.removeLast();
         }
-        currentHistory.append(QDir::toNativeSeparators(newPath));
+        currentHistory.append({newNativePath, PersistentModelIndexList()});
         ++currentHistoryLocation;
     }
     qFileDialogUi->forwardButton->setEnabled(currentHistory.size() - currentHistoryLocation > 1);
     qFileDialogUi->backButton->setEnabled(currentHistoryLocation > 0);
 }
 
+void QFileDialogPrivate::navigate(HistoryItem &historyItem)
+{
+    Q_Q(QFileDialog);
+    q->setDirectory(historyItem.path);
+    // Restore selection unless something has changed in the file system
+    if (qFileDialogUi.isNull() || historyItem.selection.isEmpty())
+        return;
+    if (std::any_of(historyItem.selection.cbegin(), historyItem.selection.cend(),
+                    [](const QPersistentModelIndex &i) { return !i.isValid(); })) {
+        historyItem.selection.clear();
+        return;
+    }
+
+    QAbstractItemView *view = q->viewMode() == QFileDialog::List
+        ? static_cast<QAbstractItemView *>(qFileDialogUi->listView)
+        : static_cast<QAbstractItemView *>(qFileDialogUi->treeView);
+    auto selectionModel = view->selectionModel();
+    const QItemSelectionModel::SelectionFlags flags = QItemSelectionModel::Select
+        | QItemSelectionModel::Rows;
+    selectionModel->select(historyItem.selection.constFirst(),
+                           flags | QItemSelectionModel::Clear | QItemSelectionModel::Current);
+    for (int i = 1, size = historyItem.selection.size(); i < size; ++i)
+        selectionModel->select(historyItem.selection.at(i), flags);
+
+    view->scrollTo(historyItem.selection.constFirst());
+}
+
 /*!
     \internal
 
@@ -3403,11 +3495,9 @@ void QFileDialogPrivate::_q_pathChanged(const QString &newPath)
 */
 void QFileDialogPrivate::_q_navigateBackward()
 {
-    Q_Q(QFileDialog);
     if (!currentHistory.isEmpty() && currentHistoryLocation > 0) {
-        --currentHistoryLocation;
-        QString previousHistory = currentHistory.at(currentHistoryLocation);
-        q->setDirectory(previousHistory);
+        saveHistorySelection();
+        navigate(currentHistory[--currentHistoryLocation]);
     }
 }
 
@@ -3418,11 +3508,9 @@ void QFileDialogPrivate::_q_navigateBackward()
 */
 void QFileDialogPrivate::_q_navigateForward()
 {
-    Q_Q(QFileDialog);
     if (!currentHistory.isEmpty() && currentHistoryLocation < currentHistory.size() - 1) {
-        ++currentHistoryLocation;
-        QString nextHistory = currentHistory.at(currentHistoryLocation);
-        q->setDirectory(nextHistory);
+        saveHistorySelection();
+        navigate(currentHistory[++currentHistoryLocation]);
     }
 }
 
@@ -3633,12 +3721,13 @@ void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text)
             if (oldFiles.removeAll(idx) == 0)
                 newFiles.append(idx);
         }
-        for (int i = 0; i < newFiles.count(); ++i)
-            select(newFiles.at(i));
-        if (lineEdit()->hasFocus())
-            for (int i = 0; i < oldFiles.count(); ++i)
-                qFileDialogUi->listView->selectionModel()->select(oldFiles.at(i),
-                    QItemSelectionModel::Toggle | QItemSelectionModel::Rows);
+        for (const auto &newFile : qAsConst(newFiles))
+            select(newFile);
+        if (lineEdit()->hasFocus()) {
+            auto *sm = qFileDialogUi->listView->selectionModel();
+            for (const auto &oldFile : qAsConst(oldFiles))
+                sm->select(oldFile, QItemSelectionModel::Toggle | QItemSelectionModel::Rows);
+        }
     }
 }
 
@@ -3992,7 +4081,7 @@ bool QFileDialogPrivate::itemViewKeyboardEvent(QKeyEvent *event) {
         return true;
     case Qt::Key_Back:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled())
+        if (QApplicationPrivate::keypadNavigationEnabled())
             return false;
 #endif
     case Qt::Key_Left:
diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 95e03618ac..790f52f2e7 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -92,7 +92,9 @@ public:
         ShowDirsOnly                = 0x00000001,
         DontResolveSymlinks         = 0x00000002,
         DontConfirmOverwrite        = 0x00000004,
-        DontUseSheet                = 0x00000008,
+#if QT_DEPRECATED_SINCE(5, 14)
+        DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x00000008,
+#endif
         DontUseNativeDialog         = 0x00000010,
         ReadOnly                    = 0x00000020,
         HideNameFilterDetails       = 0x00000040,
@@ -282,6 +284,7 @@ public:
 
     static void getOpenFileContent(const QString &nameFilter,
                                    const std::function<void(const QString &, const QByteArray &)> &fileContentsReady);
+    static void saveFileContent(const QByteArray &fileContent, const QString &fileNameHint = QString());
 
 protected:
     QFileDialog(const QFileDialogArgs &args);
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index 463c77aa23..dcf147348f 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -98,7 +98,7 @@ class QPlatformDialogHelper;
 
 struct QFileDialogArgs
 {
-    QFileDialogArgs() : parent(0), mode(QFileDialog::AnyFile) {}
+    QFileDialogArgs() : parent(nullptr), mode(QFileDialog::AnyFile) {}
 
     QWidget *parent;
     QString caption;
@@ -116,6 +116,14 @@ class Q_WIDGETS_EXPORT QFileDialogPrivate : public QDialogPrivate
     Q_DECLARE_PUBLIC(QFileDialog)
 
 public:
+    using PersistentModelIndexList = QVector<QPersistentModelIndex>;
+
+    struct HistoryItem
+    {
+        QString path;
+        PersistentModelIndexList selection;
+    };
+
     QFileDialogPrivate();
 
     QPlatformFileDialogHelper *platformFileDialogHelper() const
@@ -193,9 +201,11 @@ public:
     void retranslateWindowTitle();
     void retranslateStrings();
     void emitFilesSelected(const QStringList &files);
+    void saveHistorySelection();
 
     void _q_goHome();
     void _q_pathChanged(const QString &);
+    void navigate(HistoryItem &);
     void _q_navigateBackward();
     void _q_navigateForward();
     void _q_navigateToParent();
@@ -237,7 +247,7 @@ public:
 
     QString setWindowTitle;
 
-    QStringList currentHistory;
+    QList<HistoryItem> currentHistory;
     int currentHistoryLocation;
 
     QAction *renameAction;
@@ -292,7 +302,7 @@ private:
 class QFileDialogLineEdit : public QLineEdit
 {
 public:
-    QFileDialogLineEdit(QWidget *parent = 0) : QLineEdit(parent), d_ptr(0){}
+    QFileDialogLineEdit(QWidget *parent = nullptr) : QLineEdit(parent), d_ptr(nullptr){}
     void setFileDialogPrivate(QFileDialogPrivate *d_pointer) {d_ptr = d_pointer; }
     void keyPressEvent(QKeyEvent *e) override;
     bool hideOnEsc;
@@ -303,7 +313,7 @@ private:
 class QFileDialogComboBox : public QComboBox
 {
 public:
-    QFileDialogComboBox(QWidget *parent = 0) : QComboBox(parent), urlModel(0) {}
+    QFileDialogComboBox(QWidget *parent = nullptr) : QComboBox(parent), urlModel(nullptr) {}
     void setFileDialogPrivate(QFileDialogPrivate *d_pointer);
     void showPopup() override;
     void setHistory(const QStringList &paths);
@@ -319,7 +329,7 @@ private:
 class QFileDialogListView : public QListView
 {
 public:
-    QFileDialogListView(QWidget *parent = 0);
+    QFileDialogListView(QWidget *parent = nullptr);
     void setFileDialogPrivate(QFileDialogPrivate *d_pointer);
     QSize sizeHint() const override;
 protected:
diff --git a/src/widgets/dialogs/qfileinfogatherer.cpp b/src/widgets/dialogs/qfileinfogatherer.cpp
index 1e03ad8b06..0beca82f28 100644
--- a/src/widgets/dialogs/qfileinfogatherer.cpp
+++ b/src/widgets/dialogs/qfileinfogatherer.cpp
@@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE
 static QBasicAtomicInt fetchedRoot = Q_BASIC_ATOMIC_INITIALIZER(false);
 Q_AUTOTEST_EXPORT void qt_test_resetFetchedRoot()
 {
-    fetchedRoot.store(false);
+    fetchedRoot.storeRelaxed(false);
 }
 
 Q_AUTOTEST_EXPORT bool qt_test_isFetchedRoot()
 {
-    return fetchedRoot.load();
+    return fetchedRoot.loadRelaxed();
 }
 #endif
 
@@ -79,30 +79,9 @@ static QString translateDriveName(const QFileInfo &drive)
     Creates thread
 */
 QFileInfoGatherer::QFileInfoGatherer(QObject *parent)
-    : QThread(parent), abort(false),
-#if QT_CONFIG(filesystemwatcher)
-      watcher(0),
-#endif
-#ifdef Q_OS_WIN
-      m_resolveSymlinks(true),
-#endif
-      m_iconProvider(&defaultProvider)
+    : QThread(parent)
+    , m_iconProvider(&defaultProvider)
 {
-#if QT_CONFIG(filesystemwatcher)
-    watcher = new QFileSystemWatcher(this);
-    connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(list(QString)));
-    connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(updateFile(QString)));
-
-#  if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-    const QVariant listener = watcher->property("_q_driveListener");
-    if (listener.canConvert<QObject *>()) {
-        if (QObject *driveListener = listener.value<QObject *>()) {
-            connect(driveListener, SIGNAL(driveAdded()), this, SLOT(driveAdded()));
-            connect(driveListener, SIGNAL(driveRemoved()), this, SLOT(driveRemoved()));
-        }
-    }
-#  endif // Q_OS_WIN && !Q_OS_WINRT
-#endif
     start(LowPriority);
 }
 
@@ -111,7 +90,7 @@ QFileInfoGatherer::QFileInfoGatherer(QObject *parent)
 */
 QFileInfoGatherer::~QFileInfoGatherer()
 {
-    abort.store(true);
+    abort.storeRelaxed(true);
     QMutexLocker locker(&mutex);
     condition.wakeAll();
     locker.unlock();
@@ -183,8 +162,8 @@ void QFileInfoGatherer::fetchExtendedInformation(const QString &path, const QStr
     if (files.isEmpty()
         && !path.isEmpty()
         && !path.startsWith(QLatin1String("//")) /*don't watch UNC path*/) {
-        if (!watcher->directories().contains(path))
-            watcher->addPath(path);
+        if (!watchedDirectories().contains(path))
+            watchPaths(QStringList(path));
     }
 #endif
 }
@@ -201,6 +180,91 @@ void QFileInfoGatherer::updateFile(const QString &filePath)
     fetchExtendedInformation(dir, QStringList(fileName));
 }
 
+QStringList QFileInfoGatherer::watchedFiles() const
+{
+#if QT_CONFIG(filesystemwatcher)
+    if (m_watcher)
+        return m_watcher->files();
+#endif
+    return {};
+}
+
+QStringList QFileInfoGatherer::watchedDirectories() const
+{
+#if QT_CONFIG(filesystemwatcher)
+    if (m_watcher)
+        return m_watcher->directories();
+#endif
+    return {};
+}
+
+void QFileInfoGatherer::createWatcher()
+{
+#if QT_CONFIG(filesystemwatcher)
+    m_watcher = new QFileSystemWatcher(this);
+    connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &QFileInfoGatherer::list);
+    connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &QFileInfoGatherer::updateFile);
+#  if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+    const QVariant listener = m_watcher->property("_q_driveListener");
+    if (listener.canConvert<QObject *>()) {
+        if (QObject *driveListener = listener.value<QObject *>()) {
+            connect(driveListener, SIGNAL(driveAdded()), this, SLOT(driveAdded()));
+            connect(driveListener, SIGNAL(driveRemoved()), this, SLOT(driveRemoved()));
+        }
+    }
+#  endif // Q_OS_WIN && !Q_OS_WINRT
+#endif
+}
+
+void QFileInfoGatherer::watchPaths(const QStringList &paths)
+{
+#if QT_CONFIG(filesystemwatcher)
+    if (m_watching) {
+        if (m_watcher == nullptr)
+            createWatcher();
+        m_watcher->addPaths(paths);
+    }
+#else
+    Q_UNUSED(paths);
+#endif
+}
+
+void QFileInfoGatherer::unwatchPaths(const QStringList &paths)
+{
+#if QT_CONFIG(filesystemwatcher)
+    if (m_watcher)
+        m_watcher->removePaths(paths);
+#else
+    Q_UNUSED(paths);
+#endif
+}
+
+bool QFileInfoGatherer::isWatching() const
+{
+    bool result = false;
+#if QT_CONFIG(filesystemwatcher)
+    QMutexLocker locker(&mutex);
+    result = m_watching;
+#endif
+    return result;
+}
+
+void QFileInfoGatherer::setWatching(bool v)
+{
+#if QT_CONFIG(filesystemwatcher)
+    QMutexLocker locker(&mutex);
+    if (v != m_watching) {
+        if (!v) {
+            delete m_watcher;
+            m_watcher = nullptr;
+        }
+        m_watching = v;
+    }
+#else
+    Q_UNUSED(v);
+#endif
+}
+
 /*
     List all files in \a directoryPath
 
@@ -210,8 +274,8 @@ void QFileInfoGatherer::clear()
 {
 #if QT_CONFIG(filesystemwatcher)
     QMutexLocker locker(&mutex);
-    watcher->removePaths(watcher->files());
-    watcher->removePaths(watcher->directories());
+    unwatchPaths(watchedFiles());
+    unwatchPaths(watchedDirectories());
 #endif
 }
 
@@ -224,7 +288,7 @@ void QFileInfoGatherer::removePath(const QString &path)
 {
 #if QT_CONFIG(filesystemwatcher)
     QMutexLocker locker(&mutex);
-    watcher->removePath(path);
+    unwatchPaths(QStringList(path));
 #else
     Q_UNUSED(path);
 #endif
@@ -247,9 +311,9 @@ void QFileInfoGatherer::run()
 {
     forever {
         QMutexLocker locker(&mutex);
-        while (!abort.load() && path.isEmpty())
+        while (!abort.loadRelaxed() && path.isEmpty())
             condition.wait(&mutex);
-        if (abort.load())
+        if (abort.loadRelaxed())
             return;
         const QString thisPath = qAsConst(path).front();
         path.pop_front();
@@ -271,12 +335,13 @@ QExtendedInformation QFileInfoGatherer::getInfo(const QFileInfo &fileInfo) const
     static const bool watchFiles = qEnvironmentVariableIsSet("QT_FILESYSTEMMODEL_WATCH_FILES");
     if (watchFiles) {
         if (!fileInfo.exists() && !fileInfo.isSymLink()) {
-            watcher->removePath(fileInfo.absoluteFilePath());
+            const_cast<QFileInfoGatherer *>(this)->
+                unwatchPaths(QStringList(fileInfo.absoluteFilePath()));
         } else {
             const QString path = fileInfo.absoluteFilePath();
             if (!path.isEmpty() && fileInfo.exists() && fileInfo.isFile() && fileInfo.isReadable()
-                && !watcher->files().contains(path)) {
-                watcher->addPath(path);
+                && !watchedFiles().contains(path)) {
+                const_cast<QFileInfoGatherer *>(this)->watchPaths(QStringList(path));
             }
         }
     }
@@ -303,7 +368,7 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
     // List drives
     if (path.isEmpty()) {
 #ifdef QT_BUILD_INTERNAL
-        fetchedRoot.store(true);
+        fetchedRoot.storeRelaxed(true);
 #endif
         QFileInfoList infoList;
         if (files.isEmpty()) {
@@ -332,7 +397,7 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
     QStringList allFiles;
     if (files.isEmpty()) {
         QDirIterator dirIt(path, QDir::AllEntries | QDir::System | QDir::Hidden);
-        while (!abort.load() && dirIt.hasNext()) {
+        while (!abort.loadRelaxed() && dirIt.hasNext()) {
             dirIt.next();
             fileInfo = dirIt.fileInfo();
             allFiles.append(fileInfo.fileName());
@@ -343,7 +408,7 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
         emit newListOfFiles(path, allFiles);
 
     QStringList::const_iterator filesIt = filesToCheck.constBegin();
-    while (!abort.load() && filesIt != filesToCheck.constEnd()) {
+    while (!abort.loadRelaxed() && filesIt != filesToCheck.constEnd()) {
         fileInfo.setFile(path + QDir::separator() + *filesIt);
         ++filesIt;
         fetch(fileInfo, base, firstTime, updatedFiles, path);
diff --git a/src/widgets/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h
index 134a14b7ce..3d30a98d04 100644
--- a/src/widgets/dialogs/qfileinfogatherer_p.h
+++ b/src/widgets/dialogs/qfileinfogatherer_p.h
@@ -166,15 +166,16 @@ Q_SIGNALS:
     void directoryLoaded(const QString &path);
 
 public:
-    explicit QFileInfoGatherer(QObject *parent = 0);
+    explicit QFileInfoGatherer(QObject *parent = nullptr);
     ~QFileInfoGatherer();
 
-#if QT_CONFIG(filesystemwatcher) && defined(Q_OS_WIN)
-    QStringList watchedFiles() const            { return watcher->files(); }
-    QStringList watchedDirectories() const      { return watcher->directories(); }
-    void watchPaths(const QStringList &paths)   { watcher->addPaths(paths); }
-    void unwatchPaths(const QStringList &paths) { watcher->removePaths(paths); }
-#endif // filesystemwatcher && Q_OS_WIN
+    QStringList watchedFiles() const;
+    QStringList watchedDirectories() const;
+    void watchPaths(const QStringList &paths);
+    void unwatchPaths(const QStringList &paths);
+
+    bool isWatching() const;
+    void setWatching(bool v);
 
     // only callable from this->thread():
     void clear();
@@ -201,6 +202,8 @@ private:
     void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime, QVector<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
 
 private:
+    void createWatcher();
+
     mutable QMutex mutex;
     // begin protected by mutex
     QWaitCondition condition;
@@ -210,13 +213,16 @@ private:
     QAtomicInt abort;
 
 #if QT_CONFIG(filesystemwatcher)
-    QFileSystemWatcher *watcher;
-#endif
-#ifdef Q_OS_WIN
-    bool m_resolveSymlinks; // not accessed by run()
+    QFileSystemWatcher *m_watcher = nullptr;
 #endif
     QFileIconProvider *m_iconProvider; // not accessed by run()
     QFileIconProvider defaultProvider;
+#ifdef Q_OS_WIN
+    bool m_resolveSymlinks = true; // not accessed by run()
+#endif
+#if QT_CONFIG(filesystemwatcher)
+    bool m_watching = true;
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index e486037e08..a04189513a 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -57,6 +57,9 @@
 #ifdef Q_OS_WIN
 #  include <QtCore/QVarLengthArray>
 #  include <qt_windows.h>
+#  ifndef Q_OS_WINRT
+#      include <shlobj.h>
+#  endif
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -227,11 +230,9 @@ bool QFileSystemModel::remove(const QModelIndex &aindex)
 /*!
   Constructs a file system model with the given \a parent.
 */
-QFileSystemModel::QFileSystemModel(QObject *parent)
-    : QAbstractItemModel(*new QFileSystemModelPrivate, parent)
+QFileSystemModel::QFileSystemModel(QObject *parent) :
+    QFileSystemModel(*new QFileSystemModelPrivate, parent)
 {
-    Q_D(QFileSystemModel);
-    d->init();
 }
 
 /*!
@@ -247,9 +248,7 @@ QFileSystemModel::QFileSystemModel(QFileSystemModelPrivate &dd, QObject *parent)
 /*!
   Destroys this file system model.
 */
-QFileSystemModel::~QFileSystemModel()
-{
-}
+QFileSystemModel::~QFileSystemModel() = default;
 
 /*!
     \reimp
@@ -841,8 +840,8 @@ QString QFileSystemModelPrivate::displayName(const QModelIndex &index) const
 {
 #if defined(Q_OS_WIN)
     QFileSystemNode *dirNode = node(index);
-    if (!dirNode->volumeName.isNull())
-        return dirNode->volumeName + QLatin1String(" (") + name(index) + QLatin1Char(')');
+    if (!dirNode->volumeName.isEmpty())
+        return dirNode->volumeName;
 #endif
     return name(index);
 }
@@ -1268,6 +1267,107 @@ Qt::DropActions QFileSystemModel::supportedDropActions() const
 }
 
 /*!
+    \enum QFileSystemModel::Option
+    \since 5.14
+
+    \value DontWatchForChanges Do not add file watchers to the paths.
+    This reduces overhead when using the model for simple tasks
+    like line edit completion.
+
+    \value DontResolveSymlinks Don't resolve symlinks in the file
+    system model. By default, symlinks are resolved.
+
+    \value DontUseCustomDirectoryIcons Always use the default directory icon.
+    Some platforms allow the user to set a different icon. Custom icon lookup
+    causes a big performance impact over network or removable drives.
+    This sets the QFileIconProvider::DontUseCustomDirectoryIcons
+    option in the icon provider accordingly.
+
+    \sa resolveSymlinks
+*/
+
+/*!
+    \since 5.14
+    Sets the given \a option to be enabled if \a on is true; otherwise,
+    clears the given \a option.
+
+    Options should be set before changing properties.
+
+    \sa options, testOption()
+*/
+void QFileSystemModel::setOption(Option option, bool on)
+{
+    QFileSystemModel::Options previousOptions = options();
+    setOptions(previousOptions.setFlag(option, on));
+}
+
+/*!
+    \since 5.14
+
+    Returns \c true if the given \a option is enabled; otherwise, returns
+    false.
+
+    \sa options, setOption()
+*/
+bool QFileSystemModel::testOption(Option option) const
+{
+    return options().testFlag(option);
+}
+
+/*!
+    \property QFileSystemModel::options
+    \brief the various options that affect the model
+    \since 5.14
+
+    By default, all options are disabled.
+
+    Options should be set before changing properties.
+
+    \sa setOption(), testOption()
+*/
+void QFileSystemModel::setOptions(Options options)
+{
+    const Options changed = (options ^ QFileSystemModel::options());
+
+    if (changed.testFlag(DontResolveSymlinks))
+        setResolveSymlinks(!options.testFlag(DontResolveSymlinks));
+
+#if QT_CONFIG(filesystemwatcher)
+    Q_D(QFileSystemModel);
+    if (changed.testFlag(DontWatchForChanges))
+        d->fileInfoGatherer.setWatching(!options.testFlag(DontWatchForChanges));
+#endif
+
+    if (changed.testFlag(DontUseCustomDirectoryIcons)) {
+        if (auto provider = iconProvider()) {
+            QFileIconProvider::Options providerOptions = provider->options();
+            providerOptions.setFlag(QFileIconProvider::DontUseCustomDirectoryIcons,
+                                    options.testFlag(QFileSystemModel::DontUseCustomDirectoryIcons));
+            provider->setOptions(providerOptions);
+        } else {
+            qWarning("Setting QFileSystemModel::DontUseCustomDirectoryIcons has no effect when no provider is used");
+        }
+    }
+}
+
+QFileSystemModel::Options QFileSystemModel::options() const
+{
+    QFileSystemModel::Options result;
+    result.setFlag(DontResolveSymlinks, !resolveSymlinks());
+#if QT_CONFIG(filesystemwatcher)
+    Q_D(const QFileSystemModel);
+    result.setFlag(DontWatchForChanges, !d->fileInfoGatherer.isWatching());
+#else
+    result.setFlag(DontWatchForChanges);
+#endif
+    if (auto provider = iconProvider()) {
+        result.setFlag(DontUseCustomDirectoryIcons,
+                       provider->options().testFlag(QFileIconProvider::DontUseCustomDirectoryIcons));
+    }
+    return result;
+}
+
+/*!
     Returns the path of the item stored in the model under the
     \a index given.
 */
@@ -1390,7 +1490,7 @@ QModelIndex QFileSystemModel::setRootPath(const QString &newPath)
     if (d->rootDir.path() == longNewPath)
         return d->index(rootPath());
 
-    bool showDrives = (longNewPath.isEmpty() || longNewPath == d->myComputer());
+    bool showDrives = (longNewPath.isEmpty() || longNewPath == QFileSystemModelPrivate::myComputer());
     if (!showDrives && !newPathDir.exists())
         return d->index(rootPath());
 
@@ -1513,6 +1613,8 @@ QDir::Filters QFileSystemModel::filter() const
     This is only relevant on Windows.
 
     By default, this property is \c true.
+
+    \sa QFileSystemModel::Options
 */
 void QFileSystemModel::setResolveSymlinks(bool enable)
 {
@@ -1674,6 +1776,27 @@ void QFileSystemModelPrivate::_q_directoryChanged(const QString &directory, cons
         removeNode(parentNode, toRemove[i]);
 }
 
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+static QString volumeName(const QString &path)
+{
+    IShellItem *item = nullptr;
+    const QString native = QDir::toNativeSeparators(path);
+    HRESULT hr = SHCreateItemFromParsingName(reinterpret_cast<const wchar_t *>(native.utf16()),
+                                             nullptr, IID_IShellItem,
+                                             reinterpret_cast<void **>(&item));
+    if (FAILED(hr))
+        return QString();
+    LPWSTR name = nullptr;
+    hr = item->GetDisplayName(SIGDN_NORMALDISPLAY, &name);
+    if (FAILED(hr))
+        return QString();
+    QString result = QString::fromWCharArray(name);
+    CoTaskMemFree(name);
+    item->Release();
+    return result;
+}
+#endif // Q_OS_WIN && !Q_OS_WINRT
+
 /*!
     \internal
 
@@ -1692,15 +1815,8 @@ QFileSystemModelPrivate::QFileSystemNode* QFileSystemModelPrivate::addNode(QFile
 #endif
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
     //The parentNode is "" so we are listing the drives
-    if (parentNode->fileName.isEmpty()) {
-        wchar_t name[MAX_PATH + 1];
-        //GetVolumeInformation requires to add trailing backslash
-        const QString nodeName = fileName + QLatin1String("\\");
-        BOOL success = ::GetVolumeInformation((wchar_t *)(nodeName.utf16()),
-                name, MAX_PATH + 1, NULL, 0, NULL, NULL, 0);
-        if (success && name[0])
-            node->volumeName = QString::fromWCharArray(name);
-    }
+    if (parentNode->fileName.isEmpty())
+        node->volumeName = volumeName(fileName);
 #endif
     Q_ASSERT(!parentNode->children.contains(fileName));
     parentNode->children.insert(fileName, node);
@@ -1847,8 +1963,7 @@ void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path, const QV
     std::sort(rowsToUpdate.begin(), rowsToUpdate.end());
     QString min;
     QString max;
-    for (int i = 0; i < rowsToUpdate.count(); ++i) {
-        QString value = rowsToUpdate.at(i);
+    for (const QString &value : qAsConst(rowsToUpdate)) {
         //##TODO is there a way to bundle signals with QString as the content of the list?
         /*if (min.isEmpty()) {
             min = value;
@@ -1946,6 +2061,9 @@ QStringList QFileSystemModelPrivate::unwatchPathsAt(const QModelIndex &index)
 void QFileSystemModelPrivate::init()
 {
     Q_Q(QFileSystemModel);
+
+    delayedSortTimer.setSingleShot(true);
+
     qRegisterMetaType<QVector<QPair<QString,QFileInfo> > >();
 #if QT_CONFIG(filesystemwatcher)
     q->connect(&fileInfoGatherer, SIGNAL(newListOfFiles(QString,QStringList)),
diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h
index c2c8b8818e..b0f289dfcd 100644
--- a/src/widgets/dialogs/qfilesystemmodel.h
+++ b/src/widgets/dialogs/qfilesystemmodel.h
@@ -61,6 +61,7 @@ class Q_WIDGETS_EXPORT QFileSystemModel : public QAbstractItemModel
     Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks)
     Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
     Q_PROPERTY(bool nameFilterDisables READ nameFilterDisables WRITE setNameFilterDisables)
+    Q_PROPERTY(Options options READ options WRITE setOptions)
 
 Q_SIGNALS:
     void rootPathChanged(const QString &newPath);
@@ -75,6 +76,15 @@ public:
         FilePermissions = Qt::UserRole + 3
     };
 
+    enum Option
+    {
+        DontWatchForChanges         = 0x00000001,
+        DontResolveSymlinks         = 0x00000002,
+        DontUseCustomDirectoryIcons = 0x00000004
+    };
+    Q_ENUM(Option)
+    Q_DECLARE_FLAGS(Options, Option)
+
     explicit QFileSystemModel(QObject *parent = nullptr);
     ~QFileSystemModel();
 
@@ -129,6 +139,11 @@ public:
     void setNameFilters(const QStringList &filters);
     QStringList nameFilters() const;
 
+    void setOption(Option option, bool on = true);
+    bool testOption(Option option) const;
+    void setOptions(Options options);
+    Options options() const;
+
     QString filePath(const QModelIndex &index) const;
     bool isDir(const QModelIndex &index) const;
     qint64 size(const QModelIndex &index) const;
@@ -165,6 +180,8 @@ inline QString QFileSystemModel::fileName(const QModelIndex &aindex) const
 inline QIcon QFileSystemModel::fileIcon(const QModelIndex &aindex) const
 { return qvariant_cast<QIcon>(aindex.data(Qt::DecorationRole)); }
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QFileSystemModel::Options)
+
 QT_END_NAMESPACE
 
 #endif // QFILESYSTEMMODEL_H
diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h
index 9c432e1ae6..844e417e2d 100644
--- a/src/widgets/dialogs/qfilesystemmodel_p.h
+++ b/src/widgets/dialogs/qfilesystemmodel_p.h
@@ -99,13 +99,13 @@ public:
     class QFileSystemNode
     {
     public:
-        explicit QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = 0)
-            : fileName(filename), populatedChildren(false), isVisible(false), dirtyChildrenIndex(-1), parent(p), info(0) {}
+        Q_DISABLE_COPY_MOVE(QFileSystemNode)
+
+        explicit QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = nullptr)
+            : fileName(filename), parent(p) {}
         ~QFileSystemNode() {
             qDeleteAll(children);
             delete info;
-            info = 0;
-            parent = 0;
         }
 
         QString fileName;
@@ -116,7 +116,7 @@ public:
         inline qint64 size() const { if (info && !info->isDir()) return info->size(); return 0; }
         inline QString type() const { if (info) return info->displayType; return QLatin1String(""); }
         inline QDateTime lastModified() const { if (info) return info->lastModified(); return QDateTime(); }
-        inline QFile::Permissions permissions() const { if (info) return info->permissions(); return 0; }
+        inline QFile::Permissions permissions() const { if (info) return info->permissions(); return nullptr; }
         inline bool isReadable() const { return ((permissions() & QFile::ReadUser) != 0); }
         inline bool isWritable() const { return ((permissions() & QFile::WriteUser) != 0); }
         inline bool isExecutable() const { return ((permissions() & QFile::ExeUser) != 0); }
@@ -162,7 +162,7 @@ public:
             return info && (*info == fileInfo);
         }
 
-        inline bool hasInformation() const { return info != 0; }
+        inline bool hasInformation() const { return info != nullptr; }
 
         void populate(const QExtendedInformation &fileInfo) {
             if (!info)
@@ -204,31 +204,16 @@ public:
             }
         }
 
-        bool populatedChildren;
-        bool isVisible;
         QHash<QFileSystemModelNodePathKey, QFileSystemNode *> children;
         QList<QString> visibleChildren;
-        int dirtyChildrenIndex;
+        QExtendedInformation *info = nullptr;
         QFileSystemNode *parent;
-
-
-        QExtendedInformation *info;
-
+        int dirtyChildrenIndex = -1;
+        bool populatedChildren = false;
+        bool isVisible = false;
     };
 
-    QFileSystemModelPrivate() :
-            forceSort(true),
-            sortColumn(0),
-            sortOrder(Qt::AscendingOrder),
-            readOnly(true),
-            setRootPath(false),
-            filters(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs),
-            nameFilterDisables(true), // false on windows, true on mac and unix
-            disableRecursiveSort(false)
-    {
-        delayedSortTimer.setSingleShot(true);
-    }
-
+    QFileSystemModelPrivate() = default;
     void init();
     /*
       \internal
@@ -303,18 +288,7 @@ public:
     QFileInfoGatherer fileInfoGatherer;
 #endif // filesystemwatcher
     QTimer delayedSortTimer;
-    bool forceSort;
-    int sortColumn;
-    Qt::SortOrder sortOrder;
-    bool readOnly;
-    bool setRootPath;
-    QDir::Filters filters;
     QHash<const QFileSystemNode*, bool> bypassFilters;
-    bool nameFilterDisables;
-    //This flag is an optimization for the QFileDialog
-    //It enable a sort which is not recursive, it means
-    //we sort only what we see.
-    bool disableRecursiveSort;
 #if QT_CONFIG(regularexpression)
     QStringList nameFilters;
 #endif
@@ -322,7 +296,6 @@ public:
 
     QFileSystemNode root;
 
-    QBasicTimer fetchingTimer;
     struct Fetching {
         QString dir;
         QString file;
@@ -330,6 +303,18 @@ public:
     };
     QVector<Fetching> toFetch;
 
+    QBasicTimer fetchingTimer;
+
+    QDir::Filters filters = QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs;
+    int sortColumn = 0;
+    Qt::SortOrder sortOrder = Qt::AscendingOrder;
+    bool forceSort = true;
+    bool readOnly = true;
+    bool setRootPath = false;
+    bool nameFilterDisables = true; // false on windows, true on mac and unix
+    // This flag is an optimization for QFileDialog. It enables a sort which is
+    // not recursive, meaning we sort only what we see.
+    bool disableRecursiveSort = false;
 };
 Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_MOVABLE_TYPE);
 
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index d53d57db86..7e3592e034 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -432,7 +432,7 @@ bool QFontDialog::eventFilter(QObject *o , QEvent *e)
          k->key() == Qt::Key_PageDown)) {
 
             int ci = d->sizeList->currentItem();
-            (void)QApplication::sendEvent(d->sizeList, k);
+            QCoreApplication::sendEvent(d->sizeList, k);
 
             if (ci != d->sizeList->currentItem()
                     && style()->styleHint(QStyle::SH_FontDialog_SelectAssociatedText, 0, this))
@@ -680,7 +680,7 @@ void QFontDialogPrivate::updateSampleFont(const QFont &newFont)
 void QFontDialogPrivate::_q_writingSystemHighlighted(int index)
 {
     writingSystem = QFontDatabase::WritingSystem(index);
-    sampleEdit->setText(fdb.writingSystemSample(writingSystem));
+    sampleEdit->setText(QFontDatabase::writingSystemSample(writingSystem));
     updateFamilies();
 }
 
diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h
index 3b829d4a52..f5110a7622 100644
--- a/src/widgets/dialogs/qfscompleter_p.h
+++ b/src/widgets/dialogs/qfscompleter_p.h
@@ -64,8 +64,8 @@ QT_BEGIN_NAMESPACE
   */
 class Q_WIDGETS_EXPORT QFSCompleter :  public QCompleter {
 public:
-    explicit QFSCompleter(QFileSystemModel *model, QObject *parent = 0)
-        : QCompleter(model, parent), proxyModel(0), sourceModel(model)
+    explicit QFSCompleter(QFileSystemModel *model, QObject *parent = nullptr)
+        : QCompleter(model, parent), proxyModel(nullptr), sourceModel(model)
     {
 #if defined(Q_OS_WIN)
         setCaseSensitivity(Qt::CaseInsensitive);
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index f143e3b527..8dad212692 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -1508,7 +1508,7 @@ void QMessageBox::keyPressEvent(QKeyEvent *e)
             if (d->detailsText)
                 textToCopy += d->detailsText->text() + QLatin1Char('\n') + separator;
 #endif
-            QApplication::clipboard()->setText(textToCopy);
+            QGuiApplication::clipboard()->setText(textToCopy);
             return;
         }
 #endif // Q_OS_WIN
@@ -2662,14 +2662,9 @@ QPixmap QMessageBoxPrivate::standardIcon(QMessageBox::Icon icon, QMessageBox *mb
         break;
     }
     if (!tmpIcon.isNull()) {
-        QWindow *window = nullptr;
-        if (mb) {
-            window = mb->windowHandle();
-            if (!window) {
-                if (const QWidget *nativeParent = mb->nativeParentWidget())
-                    window = nativeParent->windowHandle();
-            }
-        }
+        QWindow *window = mb
+            ? qt_widget_private(mb)->windowHandle(QWidgetPrivate::WindowHandleMode::Closest)
+            : nullptr;
         return tmpIcon.pixmap(window, QSize(iconSize, iconSize));
     }
     return QPixmap();
diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp
index 078dd6463b..e1a6bce5b1 100644
--- a/src/widgets/dialogs/qprogressdialog.cpp
+++ b/src/widgets/dialogs/qprogressdialog.cpp
@@ -643,7 +643,7 @@ int QProgressDialog::value() const
 
   \warning If the progress dialog is modal
     (see QProgressDialog::QProgressDialog()),
-    setValue() calls QApplication::processEvents(), so take care that
+    setValue() calls QCoreApplication::processEvents(), so take care that
     this does not cause undesirable re-entrancy in your code. For example,
     don't use a QProgressDialog inside a paintEvent()!
 
@@ -659,7 +659,7 @@ void QProgressDialog::setValue(int progress)
 
     if (d->shown_once) {
         if (isModal())
-            QApplication::processEvents();
+            QCoreApplication::processEvents();
     } else {
         if ((!d->setValue_called && progress == 0 /* for compat with Qt < 5.4 */) || progress == minimum()) {
             d->starttime.start();
diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h
index 4a82f88878..6056f19452 100644
--- a/src/widgets/dialogs/qsidebar_p.h
+++ b/src/widgets/dialogs/qsidebar_p.h
@@ -67,7 +67,7 @@ class QFileSystemModel;
 class QSideBarDelegate : public QStyledItemDelegate
 {
  public:
-     QSideBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) {}
+     QSideBarDelegate(QWidget *parent = nullptr) : QStyledItemDelegate(parent) {}
      void initStyleOption(QStyleOptionViewItem *option,
                           const QModelIndex &index) const override;
 };
@@ -82,7 +82,7 @@ public:
         EnabledRole = Qt::UserRole + 2
     };
 
-    QUrlModel(QObject *parent = 0);
+    QUrlModel(QObject *parent = nullptr);
 
     QStringList mimeTypes() const override;
     QMimeData *mimeData(const QModelIndexList &indexes) const override;
@@ -127,7 +127,7 @@ Q_SIGNALS:
     void goToUrl(const QUrl &url);
 
 public:
-    QSidebar(QWidget *parent = 0);
+    QSidebar(QWidget *parent = nullptr);
     void setModelAndUrls(QFileSystemModel *model, const QList<QUrl> &newUrls);
     ~QSidebar();
 
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index 5ba48aeff3..0295241a74 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -1299,7 +1299,7 @@ void QWizardPrivate::updateMinMaxSizes(const QWizardLayoutInfo &info)
     int extraHeight = 0;
 #if QT_CONFIG(style_windowsvista)
     if (isVistaThemeEnabled())
-        extraHeight = vistaHelper->titleBarSize() + vistaHelper->topOffset();
+        extraHeight = vistaHelper->titleBarSize() + vistaHelper->topOffset(q);
 #endif
     QSize minimumSize = mainLayout->totalMinimumSize() + QSize(0, extraHeight);
     QSize maximumSize = mainLayout->totalMaximumSize();
@@ -1565,23 +1565,25 @@ bool QWizardPrivate::handleAeroStyleChange()
     bool vistaMargins = false;
 
     if (isVistaThemeEnabled()) {
+        const int topOffset = vistaHelper->topOffset(q);
+        const int topPadding = vistaHelper->topPadding(q);
         if (isVistaThemeEnabled(QVistaHelper::VistaAero)) {
             if (isWindow) {
                 vistaHelper->setDWMTitleBar(QVistaHelper::ExtendedTitleBar);
                 q->installEventFilter(vistaHelper);
             }
             q->setMouseTracking(true);
-            antiFlickerWidget->move(0, vistaHelper->titleBarSize() + vistaHelper->topOffset());
+            antiFlickerWidget->move(0, vistaHelper->titleBarSize() + topOffset);
             vistaHelper->backButton()->move(
-                0, vistaHelper->topOffset() // ### should ideally work without the '+ 1'
-                - qMin(vistaHelper->topOffset(), vistaHelper->topPadding() + 1));
+                0, topOffset // ### should ideally work without the '+ 1'
+                - qMin(topOffset, topPadding + 1));
             vistaMargins = true;
             vistaHelper->backButton()->show();
         } else {
             if (isWindow)
                 vistaHelper->setDWMTitleBar(QVistaHelper::NormalTitleBar);
             q->setMouseTracking(true);
-            antiFlickerWidget->move(0, vistaHelper->topOffset());
+            antiFlickerWidget->move(0, topOffset);
             vistaHelper->backButton()->move(0, -1); // ### should ideally work with (0, 0)
         }
         if (isWindow)
@@ -2545,7 +2547,7 @@ void QWizard::setWizardStyle(WizardStyle style)
             //Send a resizeevent since the antiflicker widget probably needs a new size
             //because of the backbutton in the window title
             QResizeEvent ev(geometry().size(), geometry().size());
-            QApplication::sendEvent(this, &ev);
+            QCoreApplication::sendEvent(this, &ev);
         }
 #endif
         d->updateLayout();
@@ -3182,7 +3184,7 @@ void QWizard::resizeEvent(QResizeEvent *event)
     int heightOffset = 0;
 #if QT_CONFIG(style_windowsvista)
     if (d->isVistaThemeEnabled()) {
-        heightOffset = d->vistaHelper->topOffset();
+        heightOffset = d->vistaHelper->topOffset(this);
         if (d->isVistaThemeEnabled(QVistaHelper::VistaAero))
             heightOffset += d->vistaHelper->titleBarSize();
     }
@@ -3214,7 +3216,7 @@ void QWizard::paintEvent(QPaintEvent * event)
         if (d->isVistaThemeEnabled(QVistaHelper::VistaBasic)) {
             QPainter painter(this);
             QColor color = d->vistaHelper->basicWindowFrameColor();
-            painter.fillRect(0, 0, width(), QVistaHelper::topOffset(), color);
+            painter.fillRect(0, 0, width(), QVistaHelper::topOffset(this), color);
         }
         d->vistaHelper->paintEvent(event);
     }
@@ -3227,7 +3229,11 @@ void QWizard::paintEvent(QPaintEvent * event)
 /*!
     \reimp
 */
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWizard::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#  else
 bool QWizard::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#  endif
 {
 #if QT_CONFIG(style_windowsvista)
     Q_D(QWizard);
diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
index 0dd837b197..ef71efa0cb 100644
--- a/src/widgets/dialogs/qwizard.h
+++ b/src/widgets/dialogs/qwizard.h
@@ -188,7 +188,11 @@ protected:
     void resizeEvent(QResizeEvent *event) override;
     void paintEvent(QPaintEvent *event) override;
 #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
+#  else
     bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+#  endif
 #endif
     void done(int result) override;
     virtual void initializePage(int id);
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
index aa9ad7f290..47ac41a791 100644
--- a/src/widgets/dialogs/qwizard_win.cpp
+++ b/src/widgets/dialogs/qwizard_win.cpp
@@ -87,7 +87,7 @@ QVistaBackButton::QVistaBackButton(QWidget *widget)
 QSize QVistaBackButton::sizeHint() const
 {
     ensurePolished();
-    int size = int(QStyleHelper::dpiScaled(32));
+    int size = int(QStyleHelper::dpiScaled(32, this));
     int width = size, height = size;
     return QSize(width, height);
 }
@@ -156,7 +156,7 @@ QVistaHelper::QVistaHelper(QWizard *wizard)
     backButton_ = new QVistaBackButton(wizard);
     backButton_->hide();
 
-    iconSpacing = QStyleHelper::dpiScaled(7);
+    iconSpacing = QStyleHelper::dpiScaled(7, wizard);
 }
 
 QVistaHelper::~QVistaHelper()
@@ -172,7 +172,7 @@ void QVistaHelper::updateCustomMargins(bool vistaMargins)
         const QMargins customMarginsDp = vistaMargins
             ? QMargins(0, -titleBarSizeDp(), 0, 0)
             : QMargins();
-        const QVariant customMarginsV = qVariantFromValue(customMarginsDp);
+        const QVariant customMarginsV = QVariant::fromValue(customMarginsDp);
         // The dynamic property takes effect when creating the platform window.
         window->setProperty("_q_windowsCustomMargins", customMarginsV);
         // If a platform window exists, change via native interface.
@@ -229,7 +229,7 @@ bool QVistaHelper::setDWMTitleBar(TitleBarChangeType type)
         if (type == NormalTitleBar)
             mar.cyTopHeight = 0;
         else
-            mar.cyTopHeight = (titleBarSize() + topOffset()) * QVistaHelper::m_devicePixelRatio;
+            mar.cyTopHeight = (titleBarSize() + topOffset(wizard)) * QVistaHelper::m_devicePixelRatio;
         if (const HWND wizardHandle = wizardHWND())
             if (SUCCEEDED(DwmExtendFrameIntoClientArea(wizardHandle, &mar)))
                 value = true;
@@ -275,7 +275,7 @@ void QVistaHelper::drawTitleBar(QPainter *painter)
 
     if (vistaState() == VistaAero && isWindow)
         drawBlackRect(QRect(0, 0, wizard->width(),
-                            titleBarSize() + topOffset()), hdc);
+                            titleBarSize() + topOffset(wizard)), hdc);
     // The button is positioned in QWizardPrivate::handleAeroStyleChange(),
     // all calculation is relative to it.
     const int btnTop = backButton_->mapToParent(QPoint()).y();
@@ -293,9 +293,9 @@ void QVistaHelper::drawTitleBar(QPainter *painter)
     int glowOffset = 0;
 
     if (vistaState() == VistaAero) {
-        textHeight += 2 * glowSize();
-        textWidth += 2 * glowSize();
-        glowOffset = glowSize();
+        glowOffset = glowSize(wizard);
+        textHeight += 2 * glowOffset;
+        textWidth += 2 * glowOffset;
     }
 
     const int titleLeft = (wizard->layoutDirection() == Qt::LeftToRight
@@ -314,10 +314,10 @@ void QVistaHelper::drawTitleBar(QPainter *painter)
 
     const QIcon windowIcon = wizard->windowIcon();
     if (!windowIcon.isNull()) {
-        const int size = QVistaHelper::iconSize();
+        const int size = QVistaHelper::iconSize(wizard);
         const int iconLeft = (wizard->layoutDirection() == Qt::LeftToRight
-                              ? leftMargin()
-                              : wizard->width() - leftMargin() - size);
+                              ? leftMargin(wizard)
+                              : wizard->width() - leftMargin(wizard) - size);
 
         const QPoint pos(origin.x() + iconLeft, origin.y() + verticalCenter - size / 2);
         const QPoint posDp = pos * QVistaHelper::m_devicePixelRatio;
@@ -339,7 +339,11 @@ void QVistaHelper::setTitleBarIconAndCaptionVisible(bool visible)
         SetWindowThemeAttribute(handle, WTA_NONCLIENT, &opt, sizeof(WTA_OPTIONS));
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QVistaHelper::winEvent(MSG* msg, qintptr *result)
+#else
 bool QVistaHelper::winEvent(MSG* msg, long* result)
+#endif
 {
     switch (msg->message) {
     case WM_NCHITTEST: {
@@ -401,7 +405,11 @@ void QVistaHelper::mouseEvent(QEvent *event)
     }
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QVistaHelper::handleWinEvent(MSG *message, qintptr *result)
+#else
 bool QVistaHelper::handleWinEvent(MSG *message, long *result)
+#endif
 {
     if (message->message == WM_THEMECHANGED || message->message == WM_DWMCOMPOSITIONCHANGED)
         cachedVistaState = Dirty;
@@ -419,7 +427,7 @@ void QVistaHelper::resizeEvent(QResizeEvent * event)
 {
     Q_UNUSED(event);
     rtTop = QRect (0, 0, wizard->width(), frameSize());
-    int height = captionSize() + topOffset();
+    int height = captionSize() + topOffset(wizard);
     if (vistaState() == VistaBasic)
         height -= titleBarSize();
     rtTitle = QRect (0, frameSize(), wizard->width(), height);
@@ -509,7 +517,11 @@ bool QVistaHelper::eventFilter(QObject *obj, QEvent *event)
 
     if (event->type() == QEvent::MouseMove) {
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        qintptr result;
+#else
         long result;
+#endif
         MSG msg;
         msg.message = WM_NCHITTEST;
         msg.wParam  = 0;
@@ -523,7 +535,11 @@ bool QVistaHelper::eventFilter(QObject *obj, QEvent *event)
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
 
         if (mouseEvent->button() == Qt::LeftButton) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            qintptr result;
+#else
             long result;
+#endif
             MSG msg;
             msg.message = WM_NCHITTEST;
             msg.wParam  = 0;
@@ -538,7 +554,11 @@ bool QVistaHelper::eventFilter(QObject *obj, QEvent *event)
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
 
         if (mouseEvent->button() == Qt::LeftButton) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            qintptr result;
+#else
             long result;
+#endif
             MSG msg;
             msg.message = WM_NCHITTEST;
             msg.wParam  = 0;
@@ -617,7 +637,7 @@ bool QVistaHelper::drawTitleText(QPainter *painter, const QString &text, const Q
         RECT rctext ={0,0, rectDp.width(), rectDp.height()};
 
         dto.dwFlags = DTT_COMPOSITED|DTT_GLOWSIZE;
-        dto.iGlowSize = glowSize();
+        dto.iGlowSize = glowSize(wizard);
 
         DrawThemeTextEx(hTheme, dcMem, 0, 0, reinterpret_cast<LPCWSTR>(text.utf16()), -1, uFormat, &rctext, &dto );
         BitBlt(hdc, rectDp.left(), rectDp.top(), rectDp.width(), rectDp.height(), dcMem, 0, 0, SRCCOPY);
@@ -694,27 +714,27 @@ int QVistaHelper::captionSizeDp()
 
 int QVistaHelper::titleOffset()
 {
-    int iconOffset = wizard ->windowIcon().isNull() ? 0 : iconSize() + iconSpacing;
-    return leftMargin() + iconOffset;
+    int iconOffset = wizard ->windowIcon().isNull() ? 0 : iconSize(wizard) + iconSpacing;
+    return leftMargin(wizard) + iconOffset;
 }
 
-int QVistaHelper::iconSize()
+int QVistaHelper::iconSize(const QPaintDevice *device)
 {
-    return QStyleHelper::dpiScaled(16); // Standard Aero
+    return QStyleHelper::dpiScaled(16, device); // Standard Aero
 }
 
-int QVistaHelper::glowSize()
+int QVistaHelper::glowSize(const QPaintDevice *device)
 {
-    return QStyleHelper::dpiScaled(10);
+    return QStyleHelper::dpiScaled(10, device);
 }
 
-int QVistaHelper::topOffset()
+int QVistaHelper::topOffset(const QPaintDevice *device)
 {
     if (vistaState() != VistaAero)
         return titleBarSize() + 3;
     static const int aeroOffset =
         QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8 ?
-        QStyleHelper::dpiScaled(4) : QStyleHelper::dpiScaled(13);
+        QStyleHelper::dpiScaled(4, device) : QStyleHelper::dpiScaled(13, device);
     return aeroOffset + titleBarSize();
 }
 
diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h
index 02c5e52c2c..2469496b61 100644
--- a/src/widgets/dialogs/qwizard_win_p.h
+++ b/src/widgets/dialogs/qwizard_win_p.h
@@ -93,7 +93,11 @@ public:
     bool setDWMTitleBar(TitleBarChangeType type);
     void setTitleBarIconAndCaptionVisible(bool visible);
     void mouseEvent(QEvent *event);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool handleWinEvent(MSG *message, qintptr *result);
+#else
     bool handleWinEvent(MSG *message, long *result);
+#endif
     void resizeEvent(QResizeEvent *event);
     void paintEvent(QPaintEvent *event);
     QVistaBackButton *backButton() const { return backButton_; }
@@ -104,10 +108,10 @@ public:
     static VistaState vistaState();
     static int titleBarSize() { return QVistaHelper::titleBarSizeDp() / QVistaHelper::m_devicePixelRatio; }
     static int titleBarSizeDp() { return QVistaHelper::frameSizeDp() + QVistaHelper::captionSizeDp(); }
-    static int topPadding() { // padding under text
-        return int(QStyleHelper::dpiScaled(4));
+    static int topPadding(const QPaintDevice *device) { // padding under text
+        return int(QStyleHelper::dpiScaled(4, device));
     }
-    static int topOffset();
+    static int topOffset(const QPaintDevice *device);
 
     static HDC backingStoreDC(const QWidget *wizard, QPoint *offset);
 
@@ -121,16 +125,22 @@ private:
     static int captionSize() { return QVistaHelper::captionSizeDp() / QVistaHelper::m_devicePixelRatio; }
     static int captionSizeDp();
 
-    static int backButtonSize() { return int(QStyleHelper::dpiScaled(30)); }
-    static int iconSize();
-    static int glowSize();
-    int leftMargin() { return backButton_->isVisible() ? backButtonSize() + iconSpacing : 0; }
+    static int backButtonSize(const QPaintDevice *device)
+        { return int(QStyleHelper::dpiScaled(30, device)); }
+    static int iconSize(const QPaintDevice *device);
+    static int glowSize(const QPaintDevice *device);
+    int leftMargin(const QPaintDevice *device)
+        { return backButton_->isVisible() ? backButtonSize(device) + iconSpacing : 0; }
 
     int titleOffset();
     void drawTitleBar(QPainter *painter);
     void setMouseCursor(QPoint pos);
     void collapseTopFrameStrut();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool winEvent(MSG *message, qintptr *result);
+#else
     bool winEvent(MSG *message, long *result);
+#endif
     void mouseMoveEvent(QMouseEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
diff --git a/src/widgets/doc/snippets/code/doc_src_styles.cpp b/src/widgets/doc/snippets/code/doc_src_styles.cpp
index a70ed6b11d..3536be6e7b 100644
--- a/src/widgets/doc/snippets/code/doc_src_styles.cpp
+++ b/src/widgets/doc/snippets/code/doc_src_styles.cpp
@@ -81,11 +81,6 @@
         state |= QStyle::State_MouseOver;
     if (widget->window()->isActiveWindow())
         state |= QStyle::State_Active;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    extern bool qt_mac_can_clickThrough(const QWidget *w); //qwidget_mac.cpp
-    if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
-        state &= ~QStyle::State_Enabled;
-#endif
 #ifdef QT_KEYPAD_NAVIGATION
     if (widget->hasEditFocus())
         state |= QStyle::State_HasEditFocus;
diff --git a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
index 39aca459db..7ccd827a04 100644
--- a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
@@ -155,3 +155,8 @@ auto fileOpenCompleted = [](const QString &fileName, const QByteArray &fileConte
 }
 QFileDialog::getOpenFileContent("Images (*.png *.xpm *.jpg)",  fileContentReady);
 //! [15]
+
+//! [16]
+QByteArray imageData; // obtained from e.g. QImage::save()
+QFileDialog::saveFile("myimage.png", imageData);
+//! [16]
diff --git a/src/widgets/doc/snippets/macmainwindow.mm b/src/widgets/doc/snippets/macmainwindow.mm
deleted file mode 100644
index c63796a3f2..0000000000
--- a/src/widgets/doc/snippets/macmainwindow.mm
+++ /dev/null
@@ -1,290 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "macmainwindow.h"
-#import <AppKit/AppKit.h>
-#include <QtGui>
-
-
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-
-//![0]
-SearchWidget::SearchWidget(QWidget *parent)
-    : QMacCocoaViewContainer(0, parent)
-{
-    // Many Cocoa objects create temporary autorelease objects,
-    // so create a pool to catch them.
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    // Create the NSSearchField, set it on the QCocoaViewContainer.
-    NSSearchField *search = [[NSSearchField alloc] init];
-    setCocoaView(search);
-
-    // Use a Qt menu for the search field menu.
-    QMenu *qtMenu = createMenu(this);
-    NSMenu *nsMenu = qtMenu->macMenu(0);
-    [[search cell] setSearchMenuTemplate:nsMenu];
-
-    // Release our reference, since our super class takes ownership and we
-    // don't need it anymore.
-    [search release];
-
-    // Clean up our pool as we no longer need it.
-    [pool release];
-}
-//![0]
-
-SearchWidget::~SearchWidget()
-{
-}
-
-QSize SearchWidget::sizeHint() const
-{
-    return QSize(150, 40);
-}
-
-QMenu *createMenu(QWidget *parent)
-{
-    QMenu *searchMenu = new QMenu(parent);
-
-    QAction * indexAction = searchMenu->addAction("Index Search");
-    indexAction->setCheckable(true);
-    indexAction->setChecked(true);
-
-    QAction * fulltextAction = searchMenu->addAction("Full Text Search");
-    fulltextAction->setCheckable(true);
-
-    QActionGroup *searchActionGroup = new QActionGroup(parent);
-    searchActionGroup->addAction(indexAction);
-    searchActionGroup->addAction(fulltextAction);
-    searchActionGroup->setExclusive(true);
-
-    return searchMenu;
-}
-
-SearchWrapper::SearchWrapper(QWidget *parent)
-:QWidget(parent)
-{
-    s = new SearchWidget(this);
-    s->move(2,2);
-    setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-}
-
-QSize SearchWrapper::sizeHint() const
-{
-    return s->sizeHint() + QSize(6, 2);
-}
-
-Spacer::Spacer(QWidget *parent)
-:QWidget(parent)
-{
-    QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    setSizePolicy(sizePolicy);
-}
-
-QSize Spacer::sizeHint() const
-{
-    return QSize(1, 1);
-}
-
-MacSplitterHandle::MacSplitterHandle(Qt::Orientation orientation, QSplitter *parent)
-: QSplitterHandle(orientation, parent) {   }
-
-// Paint the horizontal handle as a gradient, paint
-// the vertical handle as a line.
-void MacSplitterHandle::paintEvent(QPaintEvent *)
-{
-    QPainter painter(this);
-
-    QColor topColor(145, 145, 145);
-    QColor bottomColor(142, 142, 142);
-    QColor gradientStart(252, 252, 252);
-    QColor gradientStop(223, 223, 223);
-
-    if (orientation() == Qt::Vertical) {
-        painter.setPen(topColor);
-        painter.drawLine(0, 0, width(), 0);
-        painter.setPen(bottomColor);
-        painter.drawLine(0, height() - 1, width(), height() - 1);
-
-        QLinearGradient linearGrad(QPointF(0, 0), QPointF(0, height() -3));
-        linearGrad.setColorAt(0, gradientStart);
-        linearGrad.setColorAt(1, gradientStop);
-        painter.fillRect(QRect(QPoint(0,1), size() - QSize(0, 2)), QBrush(linearGrad));
-    } else {
-        painter.setPen(topColor);
-        painter.drawLine(0, 0, 0, height());
-    }
-}
-
-QSize MacSplitterHandle::sizeHint() const
-{
-    QSize parent = QSplitterHandle::sizeHint();
-    if (orientation() == Qt::Vertical) {
-        return parent + QSize(0, 3);
-    } else {
-        return QSize(1, parent.height());
-    }
-}
-
-QSplitterHandle *MacSplitter::createHandle()
-{
-    return new MacSplitterHandle(orientation(), this);
-}
-
-MacMainWindow::MacMainWindow()
-{
-    QSettings settings;
-    restoreGeometry(settings.value("Geometry").toByteArray());
-
-    setWindowTitle("Mac Main Window");
-
-    splitter = new MacSplitter();
-
-    // Set up the left-hand side blue side bar.
-    sidebar = new QTreeView();
-    sidebar->setFrameStyle(QFrame::NoFrame);
-    sidebar->setAttribute(Qt::WA_MacShowFocusRect, false);
-    sidebar->setAutoFillBackground(true);
-
-    // Set the palette.
-    QPalette palette = sidebar->palette();
-    QColor macSidebarColor(231, 237, 246);
-    QColor macSidebarHighlightColor(168, 183, 205);
-    palette.setColor(QPalette::Base, macSidebarColor);
-    palette.setColor(QPalette::Highlight, macSidebarHighlightColor);
-    sidebar->setPalette(palette);
-
-    sidebar->setModel(createItemModel());
-    sidebar->header()->hide();
-    sidebar->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    sidebar->setTextElideMode(Qt::ElideMiddle);
-
-    splitter->addWidget(sidebar);
-
-    horizontalSplitter = new MacSplitter();
-    horizontalSplitter->setOrientation(Qt::Vertical);
-    splitter->addWidget(horizontalSplitter);
-
-    splitter->setStretchFactor(0, 0);
-    splitter->setStretchFactor(1, 1);
-
-    // Set up the top document list view.
-    documents = new QListView();
-    documents->setFrameStyle(QFrame::NoFrame);
-    documents->setAttribute(Qt::WA_MacShowFocusRect, false);
-    documents->setModel(createDocumentModel());
-    documents->setAlternatingRowColors(true);
-    documents->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
-    horizontalSplitter->addWidget(documents);
-    horizontalSplitter->setStretchFactor(0, 0);
-
-    // Set up the text view.
-    textedit = new QTextEdit();
-    textedit->setFrameStyle(QFrame::NoFrame);
-    textedit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
-    textedit->setText("<br><br><br><br><br><br><center><b>This demo shows how to create a \
-                       Qt main window application that has the same appearance as other \
-                       OS X applications such as Mail or iTunes. This includes \
-                       customizing the item views and QSplitter and wrapping native widgets \
-                       such as the search field.</b></center>");
-
-    horizontalSplitter->addWidget(textedit);
-
-    setCentralWidget(splitter);
-
-    toolBar = addToolBar(tr("Search"));
-    toolBar->addWidget(new Spacer());
-    toolBar->addWidget(new SearchWrapper());
-
-    setUnifiedTitleAndToolBarOnMac(true);
-}
-
-MacMainWindow::~MacMainWindow()
-{
-    QSettings settings;
-    settings.setValue("Geometry", saveGeometry());
-}
-
-QAbstractItemModel *MacMainWindow::createItemModel()
-{
-    QStandardItemModel *model = new QStandardItemModel();
-    QStandardItem *parentItem = model->invisibleRootItem();
-
-    QStandardItem *documentationItem = new QStandardItem("Documentation");
-    parentItem->appendRow(documentationItem);
-
-    QStandardItem *assistantItem = new QStandardItem("Qt MainWindow Manual");
-    documentationItem->appendRow(assistantItem);
-
-    QStandardItem *designerItem = new QStandardItem("Qt Designer Manual");
-    documentationItem->appendRow(designerItem);
-
-    QStandardItem *qtItem = new QStandardItem("Qt Reference Documentation");
-    qtItem->appendRow(new QStandardItem("Classes"));
-    qtItem->appendRow(new QStandardItem("Overviews"));
-    qtItem->appendRow(new QStandardItem("Tutorial & Examples"));
-    documentationItem->appendRow(qtItem);
-
-    QStandardItem *bookmarksItem = new QStandardItem("Bookmarks");
-    parentItem->appendRow(bookmarksItem);
-    bookmarksItem->appendRow(new QStandardItem("QWidget"));
-    bookmarksItem->appendRow(new QStandardItem("QObject"));
-    bookmarksItem->appendRow(new QStandardItem("QWizard"));
-
-    return model;
-}
-
-void MacMainWindow::resizeEvent(QResizeEvent *)
-{
-    if (toolBar)
-        toolBar->updateGeometry();
-}
-
-QAbstractItemModel *MacMainWindow::createDocumentModel()
-{
-    QStandardItemModel *model = new QStandardItemModel();
-    QStandardItem *parentItem = model->invisibleRootItem();
-    parentItem->appendRow(new QStandardItem("QWidget Class Reference"));
-    parentItem->appendRow(new QStandardItem("QObject Class Reference"));
-    parentItem->appendRow(new QStandardItem("QListView Class Reference"));
-
-    return model;
-}
-
-#endif
diff --git a/src/widgets/doc/snippets/timeline/main.cpp b/src/widgets/doc/snippets/timeline/main.cpp
index 74aa749254..4dfa2400d0 100644
--- a/src/widgets/doc/snippets/timeline/main.cpp
+++ b/src/widgets/doc/snippets/timeline/main.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <math.h>
 
 int main(int argv, char *args[])
@@ -68,7 +68,7 @@ int main(int argv, char *args[])
     for (int i = 0; i < 200; ++i)
         animation->setPosAt(i / 200.0, QPointF(i, i));
 
-    QGraphicsScene *scene = new QGraphicsScene();
+    QGraphicsScene *scene = new QGraphicsScene;
     scene->setSceneRect(0, 0, 250, 250);
     scene->addItem(ball);
 
diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc
index 9335ff78c9..236582ef3f 100644
--- a/src/widgets/doc/src/model-view-programming.qdoc
+++ b/src/widgets/doc/src/model-view-programming.qdoc
@@ -1912,7 +1912,7 @@
 
     \section3 Custom sorting models
 
-    QSortFilterProxyModel instances use Qt's built-in qStableSort() function to set up
+    QSortFilterProxyModel instances use std::stable_sort() function to set up
     mappings between items in the source model and those in the proxy model, allowing a
     sorted hierarchy of items to be exposed to views without modifying the structure of the
     source model. To provide custom sorting behavior, reimplement the
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 00323eace6..84233e4b62 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -549,6 +549,10 @@
     If the property references an enum declared with Q_ENUMS, you should
     reference its constants by name, i.e., not their numeric value.
 
+    \note Use the qproperty syntax with care, as it modifies the
+    widget that is being painted. Also, the qproperty syntax is evaluated only
+    once, which is when the widget is polished by the style. This means that any
+    attempt to use them in pseudo-states such as QPushButton:hover, will not work.
 */
 
 /*!
diff --git a/src/widgets/effects/qgraphicseffect_p.h b/src/widgets/effects/qgraphicseffect_p.h
index 2f3bd2f7fd..7e342a9f3c 100644
--- a/src/widgets/effects/qgraphicseffect_p.h
+++ b/src/widgets/effects/qgraphicseffect_p.h
@@ -80,11 +80,11 @@ public:
     QRectF boundingRect(Qt::CoordinateSystem coordinateSystem = Qt::LogicalCoordinates) const;
     QRect deviceRect() const;
     QPixmap pixmap(Qt::CoordinateSystem system = Qt::LogicalCoordinates,
-                   QPoint *offset = 0,
+                   QPoint *offset = nullptr,
                    QGraphicsEffect::PixmapPadMode mode = QGraphicsEffect::PadToEffectiveBoundingRect) const;
 
 protected:
-    QGraphicsEffectSource(QGraphicsEffectSourcePrivate &dd, QObject *parent = 0);
+    QGraphicsEffectSource(QGraphicsEffectSourcePrivate &dd, QObject *parent = nullptr);
 
 private:
     Q_DECLARE_PRIVATE(QGraphicsEffectSource)
@@ -125,7 +125,7 @@ public:
     virtual void draw(QPainter *p) = 0;
     virtual void update() = 0;
     virtual bool isPixmap() const = 0;
-    virtual QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset = 0,
+    virtual QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset = nullptr,
                            QGraphicsEffect::PixmapPadMode mode = QGraphicsEffect::PadToTransparentBorder) const = 0;
     virtual void effectBoundingRectChanged() = 0;
 
@@ -149,7 +149,7 @@ class Q_WIDGETS_EXPORT QGraphicsEffectPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QGraphicsEffect)
 public:
-    QGraphicsEffectPrivate() : source(0), isEnabled(1) {}
+    QGraphicsEffectPrivate() : source(nullptr), isEnabled(1) {}
     ~QGraphicsEffectPrivate();
 
     inline void setGraphicsEffectSource(QGraphicsEffectSource *newSource)
diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h
index 0f582bde60..c56acb8a24 100644
--- a/src/widgets/effects/qpixmapfilter_p.h
+++ b/src/widgets/effects/qpixmapfilter_p.h
@@ -100,7 +100,7 @@ class Q_WIDGETS_EXPORT QPixmapConvolutionFilter : public QPixmapFilter
     Q_DECLARE_PRIVATE(QPixmapConvolutionFilter)
 
 public:
-    QPixmapConvolutionFilter(QObject *parent = 0);
+    QPixmapConvolutionFilter(QObject *parent = nullptr);
     ~QPixmapConvolutionFilter();
 
     void setConvolutionKernel(const qreal *matrix, int rows, int columns);
@@ -124,7 +124,7 @@ class Q_WIDGETS_EXPORT QPixmapBlurFilter : public QPixmapFilter
     Q_DECLARE_PRIVATE(QPixmapBlurFilter)
 
 public:
-    QPixmapBlurFilter(QObject *parent = 0);
+    QPixmapBlurFilter(QObject *parent = nullptr);
     ~QPixmapBlurFilter();
 
     void setRadius(qreal radius);
@@ -148,7 +148,7 @@ class Q_WIDGETS_EXPORT QPixmapColorizeFilter : public QPixmapFilter
     Q_DECLARE_PRIVATE(QPixmapColorizeFilter)
 
 public:
-    QPixmapColorizeFilter(QObject *parent = 0);
+    QPixmapColorizeFilter(QObject *parent = nullptr);
     ~QPixmapColorizeFilter();
 
     void setColor(const QColor& color);
@@ -168,7 +168,7 @@ class Q_WIDGETS_EXPORT QPixmapDropShadowFilter : public QPixmapFilter
     Q_DECLARE_PRIVATE(QPixmapDropShadowFilter)
 
 public:
-    QPixmapDropShadowFilter(QObject *parent = 0);
+    QPixmapDropShadowFilter(QObject *parent = nullptr);
     ~QPixmapDropShadowFilter();
 
     QRectF boundingRectFor(const QRectF &rect) const override;
diff --git a/src/widgets/graphicsview/graphicsview.pri b/src/widgets/graphicsview/graphicsview.pri
index 7d10244634..d69a6f5c3f 100644
--- a/src/widgets/graphicsview/graphicsview.pri
+++ b/src/widgets/graphicsview/graphicsview.pri
@@ -4,7 +4,6 @@ qtConfig(graphicsview) {
 HEADERS += graphicsview/qgraphicsgridlayout.h \
     graphicsview/qgraphicsitem.h \
     graphicsview/qgraphicsitem_p.h \
-    graphicsview/qgraphicsitemanimation.h \
     graphicsview/qgraphicslayout.h \
     graphicsview/qgraphicslayout_p.h \
     graphicsview/qgraphicslayoutitem.h \
@@ -34,7 +33,6 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \
 
 SOURCES += graphicsview/qgraphicsgridlayout.cpp \
     graphicsview/qgraphicsitem.cpp \
-    graphicsview/qgraphicsitemanimation.cpp \
     graphicsview/qgraphicslayout.cpp \
     graphicsview/qgraphicslayout_p.cpp \
     graphicsview/qgraphicslayoutitem.cpp \
@@ -55,4 +53,9 @@ SOURCES += graphicsview/qgraphicsgridlayout.cpp \
     graphicsview/qsimplex_p.cpp \
     graphicsview/qgraphicsanchorlayout_p.cpp \
     graphicsview/qgraphicsanchorlayout.cpp
+
+    qtConfig(easingcurve) {
+        HEADERS += graphicsview/qgraphicsitemanimation.h
+        SOURCES += graphicsview/qgraphicsitemanimation.cpp
+    }
 }
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
index 008560d856..4f44373cad 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -2066,7 +2066,7 @@ QList<AnchorData *> getVariables(const QList<QSimplexConstraint *> &constraints)
         for (auto it = c->variables.cbegin(), end = c->variables.cend(); it != end; ++it)
             variableSet.insert(static_cast<AnchorData *>(it.key()));
     }
-    return variableSet.toList();
+    return variableSet.values();
 }
 
 /*!
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
index 699ca32bfe..b5f14948ac 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
@@ -89,7 +89,7 @@ struct AnchorVertex {
         : m_item(item), m_edge(edge), m_type(Normal) {}
 
     AnchorVertex()
-        : m_item(0), m_edge(Qt::AnchorPoint(0)), m_type(Normal) {}
+        : m_item(nullptr), m_edge(Qt::AnchorPoint(0)), m_type(Normal) {}
 
 #ifdef QT_DEBUG
     inline QString toString() const;
@@ -123,18 +123,18 @@ struct AnchorData : public QSimplexVariable {
     };
 
     AnchorData()
-        : QSimplexVariable(), from(0), to(0),
+        : QSimplexVariable(), from(nullptr), to(nullptr),
           minSize(0), prefSize(0), maxSize(0),
           minPrefSize(0), maxPrefSize(0),
           sizeAtMinimum(0), sizeAtPreferred(0),
-          sizeAtMaximum(0), item(0), graphicsAnchor(0),
+          sizeAtMaximum(0), item(nullptr), graphicsAnchor(nullptr),
           type(Normal), isLayoutAnchor(false),
           isCenterAnchor(false), orientation(0),
           dependency(Independent) {}
     virtual ~AnchorData();
 
     virtual void updateChildrenSizes() {}
-    void refreshSizeHints(const QLayoutStyleInfo *styleInfo = 0);
+    void refreshSizeHints(const QLayoutStyleInfo *styleInfo = nullptr);
 
 #ifdef QT_DEBUG
     void dump(int indent = 2);
@@ -402,7 +402,7 @@ public:
 
     static QGraphicsAnchorLayoutPrivate *get(QGraphicsAnchorLayout *q)
     {
-        return q ? q->d_func() : 0;
+        return q ? q->d_func() : nullptr;
     }
 
     static Qt::AnchorPoint oppositeEdge(
@@ -443,7 +443,7 @@ public:
                             Qt::AnchorPoint firstEdge,
                             QGraphicsLayoutItem *secondItem,
                             Qt::AnchorPoint secondEdge,
-                            qreal *spacing = 0);
+                            qreal *spacing = nullptr);
 
     // Helper for Anchor Manipulation methods
     void addAnchor_helper(QGraphicsLayoutItem *firstItem,
diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
index 370df9eed7..e98160e40f 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
+++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
@@ -68,7 +68,7 @@ class QGraphicsLayoutPrivate;
 class QGraphicsGridLayoutEngineItem : public QGridLayoutItem {
 public:
     QGraphicsGridLayoutEngineItem(QGraphicsLayoutItem *item, int row, int columns, int rowSpan = 1, int columnSpan = 1,
-                            Qt::Alignment alignment = 0)
+                            Qt::Alignment alignment = nullptr)
         : QGridLayoutItem(row, columns, rowSpan, columnSpan, alignment), q_layoutItem(item) {}
 
     virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override
@@ -115,7 +115,7 @@ public:
     {
         const int index = indexOf(layoutItem);
         if (index < 0)
-            return 0;
+            return nullptr;
         return static_cast<QGraphicsGridLayoutEngineItem*>(q_items.at(index));
     }
 
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 65708fa1ca..bb00db4c01 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -449,8 +449,8 @@
 
     \value ItemSendsGeometryChanges The item enables itemChange()
     notifications for ItemPositionChange, ItemPositionHasChanged,
-    ItemMatrixChange, ItemTransformChange, ItemTransformHasChanged,
-    ItemRotationChange, ItemRotationHasChanged, ItemScaleChange, ItemScaleHasChanged,
+    ItemTransformChange, ItemTransformHasChanged, ItemRotationChange,
+    ItemRotationHasChanged, ItemScaleChange, ItemScaleHasChanged,
     ItemTransformOriginPointChange, and ItemTransformOriginPointHasChanged. For
     performance reasons, these notifications are disabled by default. You must
     enable this flag to receive notifications for position and transform
@@ -7566,19 +7566,6 @@ void QGraphicsItem::setInputMethodHints(Qt::InputMethodHints hints)
 */
 void QGraphicsItem::updateMicroFocus()
 {
-#if !defined(QT_NO_IM) && 0 /* Used to be included in Qt4 for Q_WS_X11 */
-    if (QWidget *fw = QApplication::focusWidget()) {
-        if (scene()) {
-            for (int i = 0 ; i < scene()->views().count() ; ++i) {
-                if (scene()->views().at(i) == fw) {
-                    if (qApp)
-                        QGuiApplication::inputMethod()->update(Qt::ImQueryAll);
-                    break;
-                }
-            }
-        }
-    }
-#endif
 }
 
 /*!
@@ -11536,9 +11523,11 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change)
     case QGraphicsItem::ItemFlagsHaveChanged:
         str = "ItemFlagsHaveChanged";
         break;
+#if QT_DEPRECATED_SINCE(5, 14)
     case QGraphicsItem::ItemMatrixChange:
         str = "ItemMatrixChange";
         break;
+#endif
     case QGraphicsItem::ItemParentChange:
         str = "ItemParentChange";
         break;
diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h
index 7dd4441ae9..d66a4917e5 100644
--- a/src/widgets/graphicsview/qgraphicsitem.h
+++ b/src/widgets/graphicsview/qgraphicsitem.h
@@ -110,8 +110,10 @@ public:
 
     enum GraphicsItemChange {
         ItemPositionChange,
-        ItemMatrixChange,
-        ItemVisibleChange,
+#if QT_DEPRECATED_SINCE(5, 14)
+        ItemMatrixChange Q_DECL_ENUMERATOR_DEPRECATED_X("Use ItemTransformChange instead"),
+#endif
+        ItemVisibleChange = 2,
         ItemEnabledChange,
         ItemSelectedChange,
         ItemParentChange,
diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h
index 54c25bf6e1..92d85f7125 100644
--- a/src/widgets/graphicsview/qgraphicsitem_p.h
+++ b/src/widgets/graphicsview/qgraphicsitem_p.h
@@ -78,13 +78,13 @@ public:
     typedef void (*ClearFunction)(QDeclarativeListProperty<T> *);
 
     QDeclarativeListProperty()
-        : object(0), data(0), append(0), count(0), at(0), clear(0), dummy1(0), dummy2(0) {}
+        : object(nullptr), data(nullptr), append(nullptr), count(nullptr), at(nullptr), clear(nullptr), dummy1(nullptr), dummy2(nullptr) {}
     QDeclarativeListProperty(QObject *o, QList<T *> &list)
         : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
-          clear(qlist_clear), dummy1(0), dummy2(0) {}
+          clear(qlist_clear), dummy1(nullptr), dummy2(nullptr) {}
     QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0,
                     ClearFunction r = 0)
-        : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(0), dummy2(0) {}
+        : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(nullptr), dummy2(nullptr) {}
 
     bool operator==(const QDeclarativeListProperty &o) const {
         return object == o.object &&
@@ -198,8 +198,8 @@ public:
             || (ancestorFlags & AncestorIgnoresTransformations);
     }
 
-    void combineTransformToParent(QTransform *x, const QTransform *viewTransform = 0) const;
-    void combineTransformFromParent(QTransform *x, const QTransform *viewTransform = 0) const;
+    void combineTransformToParent(QTransform *x, const QTransform *viewTransform = nullptr) const;
+    void combineTransformFromParent(QTransform *x, const QTransform *viewTransform = nullptr) const;
     virtual void updateSceneTransformFromParent();
 
     static bool movableAncestorIsSelected(const QGraphicsItem *item);
@@ -232,7 +232,7 @@ public:
     void childrenBoundingRectHelper(QTransform *x, QRectF *rect, QGraphicsItem *topMostEffectItem);
     void initStyleOption(QStyleOptionGraphicsItem *option, const QTransform &worldTransform,
                          const QRegion &exposedRegion, bool allItems = false) const;
-    QRectF effectiveBoundingRect(QGraphicsItem *topMostEffectItem = 0) const;
+    QRectF effectiveBoundingRect(QGraphicsItem *topMostEffectItem = nullptr) const;
     QRectF sceneEffectiveBoundingRect() const;
 
     QRectF effectiveBoundingRect(const QRectF &rect) const;
@@ -408,8 +408,8 @@ public:
 
     void setFocusHelper(Qt::FocusReason focusReason, bool climb, bool focusFromHide);
     void clearFocusHelper(bool giveFocusToParent, bool hiddenByParentPanel);
-    void setSubFocus(QGraphicsItem *rootItem = 0, QGraphicsItem *stopItem = 0);
-    void clearSubFocus(QGraphicsItem *rootItem = 0, QGraphicsItem *stopItem = 0);
+    void setSubFocus(QGraphicsItem *rootItem = nullptr, QGraphicsItem *stopItem = nullptr);
+    void clearSubFocus(QGraphicsItem *rootItem = nullptr, QGraphicsItem *stopItem = nullptr);
     void resetFocusProxy();
     virtual void subFocusItemChange();
     virtual void focusScopeItemChange(bool isSubFocusItem);
@@ -541,7 +541,7 @@ struct QGraphicsItemPrivate::TransformData
         onlyTransform(true)
     { }
 
-    QTransform computedFullTransform(QTransform *postmultiplyTransform = 0) const
+    QTransform computedFullTransform(QTransform *postmultiplyTransform = nullptr) const
     {
         if (onlyTransform) {
             if (!postmultiplyTransform || postmultiplyTransform->isIdentity())
@@ -595,12 +595,12 @@ class QGraphicsItemEffectSourcePrivate : public QGraphicsEffectSourcePrivate
 {
 public:
     QGraphicsItemEffectSourcePrivate(QGraphicsItem *i)
-        : QGraphicsEffectSourcePrivate(), item(i), info(0)
+        : QGraphicsEffectSourcePrivate(), item(i), info(nullptr)
     {}
 
     void detach() override
     {
-        item->d_ptr->graphicsEffect = 0;
+        item->d_ptr->graphicsEffect = nullptr;
         item->prepareGeometryChange();
     }
 
@@ -608,7 +608,7 @@ public:
     { return item; }
 
     const QWidget *widget() const override
-    { return 0; }
+    { return nullptr; }
 
     void update() override {
         item->d_ptr->updateDueToGraphicsEffect = true;
@@ -628,7 +628,7 @@ public:
     }
 
     const QStyleOption *styleOption() const override
-    { return info ? info->option : 0; }
+    { return info ? info->option : nullptr; }
 
     QRect deviceRect() const override
     {
@@ -644,7 +644,7 @@ public:
     QPixmap pixmap(Qt::CoordinateSystem system,
                    QPoint *offset,
                    QGraphicsEffect::PixmapPadMode mode) const override;
-    QRectF paddedEffectRect(Qt::CoordinateSystem system, QGraphicsEffect::PixmapPadMode mode, const QRectF &sourceRect, bool *unpadded = 0) const;
+    QRectF paddedEffectRect(Qt::CoordinateSystem system, QGraphicsEffect::PixmapPadMode mode, const QRectF &sourceRect, bool *unpadded = nullptr) const;
 
     QGraphicsItem *item;
     QGraphicsItemPaintInfo *info;
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
index 78b91d5c39..ad77e2f260 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
@@ -115,7 +115,7 @@ public:
     QGraphicsItem *item;
 
     QPointF startPos;
-    QMatrix startMatrix;
+    QTransform startTransform;
 
     qreal step;
 
@@ -294,23 +294,38 @@ QList<QPair<qreal, QPointF> > QGraphicsItemAnimation::posList() const
     return list;
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
   Returns the matrix used to transform the item at the specified \a step value.
+
+  \obsolete Use transformAt() instead
 */
 QMatrix QGraphicsItemAnimation::matrixAt(qreal step) const
 {
     check_step_valid(step, "matrixAt");
+    return transformAt(step).toAffine();
+}
+#endif
+
+/*!
+  Returns the transform used for the item at the specified \a step value.
+
+  \since 5.14
+*/
+QTransform QGraphicsItemAnimation::transformAt(qreal step) const
+{
+    check_step_valid(step, "transformAt");
 
-    QMatrix matrix;
+    QTransform transform;
     if (!d->rotation.isEmpty())
-        matrix.rotate(rotationAt(step));
+        transform.rotate(rotationAt(step));
     if (!d->verticalScale.isEmpty())
-        matrix.scale(horizontalScaleAt(step), verticalScaleAt(step));
+        transform.scale(horizontalScaleAt(step), verticalScaleAt(step));
     if (!d->verticalShear.isEmpty())
-        matrix.shear(horizontalShearAt(step), verticalShearAt(step));
+        transform.shear(horizontalShearAt(step), verticalShearAt(step));
     if (!d->xTranslation.isEmpty())
-        matrix.translate(xTranslationAt(step), yTranslationAt(step));
-    return matrix;
+        transform.translate(xTranslationAt(step), yTranslationAt(step));
+    return transform;
 }
 
 /*!
@@ -542,7 +557,7 @@ void QGraphicsItemAnimation::setStep(qreal step)
             || !d->horizontalShear.isEmpty()
             || !d->xTranslation.isEmpty()
             || !d->yTranslation.isEmpty()) {
-            d->item->setMatrix(d->startMatrix * matrixAt(step));
+            d->item->setTransform(d->startTransform * transformAt(step));
         }
     }
 
@@ -562,7 +577,7 @@ void QGraphicsItemAnimation::reset()
     if (!d->item)
         return;
     d->startPos = d->item->pos();
-    d->startMatrix = d->item->matrix();
+    d->startTransform = d->item->transform();
 }
 #endif
 
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h
index f983bd8026..3051fb2e2b 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.h
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.h
@@ -51,6 +51,7 @@ class QGraphicsItem;
 class QMatrix;
 class QPointF;
 class QTimeLine;
+class QTransform;
 template <class T1, class T2> struct QPair;
 
 class QGraphicsItemAnimationPrivate;
@@ -71,7 +72,11 @@ public:
     QList<QPair<qreal, QPointF> > posList() const;
     void setPosAt(qreal step, const QPointF &pos);
 
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use transformAt() instead")
     QMatrix matrixAt(qreal step) const;
+#endif
+    QTransform transformAt(qreal step) const;
 
     qreal rotationAt(qreal step) const;
     QList<QPair<qreal, qreal> > rotationList() const;
diff --git a/src/widgets/graphicsview/qgraphicslayout.cpp b/src/widgets/graphicsview/qgraphicslayout.cpp
index ca0aef9e27..8b52b57580 100644
--- a/src/widgets/graphicsview/qgraphicslayout.cpp
+++ b/src/widgets/graphicsview/qgraphicslayout.cpp
@@ -338,7 +338,7 @@ void QGraphicsLayout::invalidate()
             }
             if (layoutItem && !layoutItem->isLayout()) {
                 // If a layout has a parent that is not a layout it must be a QGraphicsWidget.
-                QApplication::postEvent(static_cast<QGraphicsWidget *>(layoutItem), new QEvent(QEvent::LayoutRequest));
+                QCoreApplication::postEvent(static_cast<QGraphicsWidget *>(layoutItem), new QEvent(QEvent::LayoutRequest));
             }
         }
     }
diff --git a/src/widgets/graphicsview/qgraphicslayout_p.cpp b/src/widgets/graphicsview/qgraphicslayout_p.cpp
index ae1eeffa2b..59ed7acd72 100644
--- a/src/widgets/graphicsview/qgraphicslayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicslayout_p.cpp
@@ -108,7 +108,7 @@ Qt::LayoutDirection QGraphicsLayoutPrivate::visualDirection() const
         if (maybeWidget->isWidget())
             return static_cast<QGraphicsWidget*>(maybeWidget)->layoutDirection();
     }
-    return QApplication::layoutDirection();
+    return QGuiApplication::layoutDirection();
 }
 
 static bool removeLayoutItemFromLayout(QGraphicsLayout *lay, QGraphicsLayoutItem *layoutItem)
diff --git a/src/widgets/graphicsview/qgraphicslayout_p.h b/src/widgets/graphicsview/qgraphicslayout_p.h
index 302ad1e116..0d91151e22 100644
--- a/src/widgets/graphicsview/qgraphicslayout_p.h
+++ b/src/widgets/graphicsview/qgraphicslayout_p.h
@@ -91,7 +91,7 @@ public:
         m_defaultSpacing[1] = style->pixelMetric(QStyle::PM_LayoutVerticalSpacing);
     }
 
-    inline void invalidate() { m_valid = false; m_style = 0; m_widget = 0; }
+    inline void invalidate() { m_valid = false; m_style = nullptr; m_widget = nullptr; }
 
     inline QStyle *style() const { return m_style; }
     inline QWidget *widget() const { return m_widget; }
@@ -130,7 +130,7 @@ class Q_AUTOTEST_EXPORT QGraphicsLayoutPrivate : public QGraphicsLayoutItemPriva
     Q_DECLARE_PUBLIC(QGraphicsLayout)
 
 public:
-    QGraphicsLayoutPrivate() : QGraphicsLayoutItemPrivate(0, true), left(-1.0), top(-1.0), right(-1.0), bottom(-1.0),
+    QGraphicsLayoutPrivate() : QGraphicsLayoutItemPrivate(nullptr, true), left(-1.0), top(-1.0), right(-1.0), bottom(-1.0),
         activated(true) { }
 
     void reparentChildItems(QGraphicsItem *newParent);
diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h
index c3af9f4554..9807efb26e 100644
--- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h
+++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h
@@ -84,7 +84,7 @@ public:
 
     virtual void invalidate() override
     {
-        m_style = 0;
+        m_style = nullptr;
         QAbstractLayoutStyleInfo::invalidate();
     }
 
diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
index e9f092020f..7413a26261 100644
--- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
@@ -342,7 +342,7 @@ void QGraphicsProxyWidgetPrivate::sendWidgetKeyEvent(QKeyEvent *event)
     Q_ASSERT(receiver);
 
     do {
-        bool res = QApplication::sendEvent(receiver, event);
+        bool res = QCoreApplication::sendEvent(receiver, event);
         if ((res && event->isAccepted()) || (q->isWindow() && receiver == widget))
             break;
         receiver = receiver->parentWidget();
@@ -356,9 +356,9 @@ void QGraphicsProxyWidgetPrivate::removeSubFocusHelper(QWidget *widget, Qt::Focu
 {
     QFocusEvent event(QEvent::FocusOut, reason);
     QPointer<QWidget> widgetGuard = widget;
-    QApplication::sendEvent(widget, &event);
+    QCoreApplication::sendEvent(widget, &event);
     if (widgetGuard && event.isAccepted())
-        QApplication::sendEvent(widget->style(), &event);
+        QCoreApplication::sendEvent(widget->style(), &event);
 }
 
 /*!
@@ -404,7 +404,7 @@ void QGraphicsProxyWidgetPrivate::_q_removeWidgetSlot()
 {
     Q_Q(QGraphicsProxyWidget);
     if (!widget.isNull()) {
-        if (QWExtra *extra = widget->d_func()->extra)
+        if (const auto &extra = widget->d_func()->extra)
             extra->proxyWidget = 0;
     }
     widget = 0;
@@ -477,8 +477,8 @@ void QGraphicsProxyWidgetPrivate::updateProxyInputMethodAcceptanceFromWidget()
 */
 void QGraphicsProxyWidgetPrivate::embedSubWindow(QWidget *subWin)
 {
-    QWExtra *extra;
-    if (!((extra = subWin->d_func()->extra) && extra->proxyWidget)) {
+    const auto &extra = subWin->d_func()->extra;
+    if (!extra || !extra->proxyWidget) {
         QGraphicsProxyWidget *subProxy = new QGraphicsProxyWidget(q_func(), subWin->windowFlags());
         subProxy->d_func()->setWidget_helper(subWin, false);
     }
@@ -631,7 +631,7 @@ void QGraphicsProxyWidgetPrivate::setWidget_helper(QWidget *newWidget, bool auto
     if (!newWidget)
         return;
     if (!newWidget->isWindow()) {
-        QWExtra *extra = newWidget->parentWidget()->d_func()->extra;
+        const auto &extra = newWidget->parentWidget()->d_func()->extra;
         if (!extra || !extra->proxyWidget)  {
             qWarning("QGraphicsProxyWidget::setWidget: cannot embed widget %p "
                      "which is not a toplevel widget, and is not a child of an embedded widget", newWidget);
@@ -641,10 +641,10 @@ void QGraphicsProxyWidgetPrivate::setWidget_helper(QWidget *newWidget, bool auto
 
     // Register this proxy within the widget's private.
     // ### This is a bit backdoorish
-    QWExtra *extra = newWidget->d_func()->extra;
+    QWExtra *extra = newWidget->d_func()->extra.get();
     if (!extra) {
         newWidget->d_func()->createExtra();
-        extra = newWidget->d_func()->extra;
+        extra = newWidget->d_func()->extra.get();
     }
     QGraphicsProxyWidget **proxyWidget = &extra->proxyWidget;
     if (*proxyWidget) {
@@ -697,9 +697,7 @@ void QGraphicsProxyWidgetPrivate::setWidget_helper(QWidget *newWidget, bool auto
     if (!newWidget->testAttribute(Qt::WA_Resized))
         newWidget->adjustSize();
 
-    int left, top, right, bottom;
-    newWidget->getContentsMargins(&left, &top, &right, &bottom);
-    q->setContentsMargins(left, top, right, bottom);
+    q->setContentsMargins(newWidget->contentsMargins());
     q->setWindowTitle(newWidget->windowTitle());
 
     // size policies and constraints..
@@ -865,7 +863,7 @@ bool QGraphicsProxyWidget::event(QEvent *event)
     case QEvent::ShortcutOverride: {
         QWidget *focusWidget = d->widget->focusWidget();
         while (focusWidget) {
-            QApplication::sendEvent(focusWidget, event);
+            QCoreApplication::sendEvent(focusWidget, event);
             if (event->isAccepted())
                 return true;
             focusWidget = focusWidget->parentWidget();
@@ -878,7 +876,7 @@ bool QGraphicsProxyWidget::event(QEvent *event)
             if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) {  //### Add MetaModifier?
                 QWidget *focusWidget = d->widget->focusWidget();
                 while (focusWidget) {
-                    bool res = QApplication::sendEvent(focusWidget, event);
+                    const bool res = QCoreApplication::sendEvent(focusWidget, event);
                     if ((res && event->isAccepted()) || (isWindow() && focusWidget == d->widget)) {
                         event->accept();
                         break;
@@ -897,7 +895,7 @@ bool QGraphicsProxyWidget::event(QEvent *event)
             QGraphicsSceneHelpEvent *he = static_cast<QGraphicsSceneHelpEvent *>(event);
             QPoint pos = d->mapToReceiver(mapFromScene(he->scenePos()), d->lastWidgetUnderMouse).toPoint();
             QHelpEvent e(QEvent::ToolTip, pos, he->screenPos());
-            QApplication::sendEvent(d->lastWidgetUnderMouse, &e);
+            QCoreApplication::sendEvent(d->lastWidgetUnderMouse, &e);
             event->setAccepted(e.isAccepted());
             return e.isAccepted();
         }
@@ -919,7 +917,7 @@ bool QGraphicsProxyWidget::event(QEvent *event)
         if (event->spontaneous())
             qt_sendSpontaneousEvent(d->widget, event);
         else
-            QApplication::sendEvent(d->widget, event);
+            QCoreApplication::sendEvent(d->widget, event);
 
         if (event->isAccepted())
             return true;
@@ -1044,7 +1042,7 @@ void QGraphicsProxyWidget::contextMenuEvent(QGraphicsSceneContextMenuEvent *even
     // Send mouse event. ### Doesn't propagate the event.
     QContextMenuEvent contextMenuEvent(QContextMenuEvent::Reason(event->reason()),
                                        pos.toPoint(), globalPos, event->modifiers());
-    QApplication::sendEvent(receiver, &contextMenuEvent);
+    QCoreApplication::sendEvent(receiver, &contextMenuEvent);
 
     event->setAccepted(contextMenuEvent.isAccepted());
 }
@@ -1065,7 +1063,7 @@ void QGraphicsProxyWidget::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 
     QDragEnterEvent proxyDragEnter(event->pos().toPoint(), event->dropAction(), event->mimeData(), event->buttons(), event->modifiers());
     proxyDragEnter.setAccepted(event->isAccepted());
-    QApplication::sendEvent(d->widget, &proxyDragEnter);
+    QCoreApplication::sendEvent(d->widget, &proxyDragEnter);
     event->setAccepted(proxyDragEnter.isAccepted());
     if (proxyDragEnter.isAccepted())    // we discard answerRect
         event->setDropAction(proxyDragEnter.dropAction());
@@ -1082,7 +1080,7 @@ void QGraphicsProxyWidget::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
     if (!d->widget || !d->dragDropWidget)
         return;
     QDragLeaveEvent proxyDragLeave;
-    QApplication::sendEvent(d->dragDropWidget, &proxyDragLeave);
+    QCoreApplication::sendEvent(d->dragDropWidget, &proxyDragLeave);
     d->dragDropWidget = 0;
 #endif
 }
@@ -1112,7 +1110,7 @@ void QGraphicsProxyWidget::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
             // Try to enter before we leave
             QDragEnterEvent dragEnter(receiverPos, event->possibleActions(), event->mimeData(), event->buttons(), event->modifiers());
             dragEnter.setDropAction(event->proposedAction());
-            QApplication::sendEvent(receiver, &dragEnter);
+            QCoreApplication::sendEvent(receiver, &dragEnter);
             event->setAccepted(dragEnter.isAccepted());
             event->setDropAction(dragEnter.dropAction());
             if (!event->isAccepted()) {
@@ -1124,14 +1122,14 @@ void QGraphicsProxyWidget::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
 
             if (d->dragDropWidget) {
                 QDragLeaveEvent dragLeave;
-                QApplication::sendEvent(d->dragDropWidget, &dragLeave);
+                QCoreApplication::sendEvent(d->dragDropWidget, &dragLeave);
             }
             d->dragDropWidget = receiver;
         }
 
         QDragMoveEvent dragMove(receiverPos, event->possibleActions(), event->mimeData(), event->buttons(), event->modifiers());
         event->setDropAction(d->lastDropAction);
-        QApplication::sendEvent(receiver, &dragMove);
+        QCoreApplication::sendEvent(receiver, &dragMove);
         event->setAccepted(dragMove.isAccepted());
         event->setDropAction(dragMove.dropAction());
         if (event->isAccepted())
@@ -1144,7 +1142,7 @@ void QGraphicsProxyWidget::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
         if (d->dragDropWidget) {
             // Leave the last drag drop item
             QDragLeaveEvent dragLeave;
-            QApplication::sendEvent(d->dragDropWidget, &dragLeave);
+            QCoreApplication::sendEvent(d->dragDropWidget, &dragLeave);
             d->dragDropWidget = 0;
         }
         // Propagate
@@ -1165,7 +1163,7 @@ void QGraphicsProxyWidget::dropEvent(QGraphicsSceneDragDropEvent *event)
     if (d->widget && d->dragDropWidget) {
         QPoint widgetPos = d->mapToReceiver(event->pos(), d->dragDropWidget).toPoint();
         QDropEvent dropEvent(widgetPos, event->possibleActions(), event->mimeData(), event->buttons(), event->modifiers());
-        QApplication::sendEvent(d->dragDropWidget, &dropEvent);
+        QCoreApplication::sendEvent(d->dragDropWidget, &dropEvent);
         event->setAccepted(dropEvent.isAccepted());
         d->dragDropWidget = 0;
     }
@@ -1293,8 +1291,15 @@ void QGraphicsProxyWidget::wheelEvent(QGraphicsSceneWheelEvent *event)
     pos = d->mapToReceiver(pos, receiver);
 
     // Send mouse event.
-    QWheelEvent wheelEvent(pos.toPoint(), event->screenPos(), event->delta(),
-                           event->buttons(), event->modifiers(), event->orientation());
+    QPoint angleDelta;
+    if (event->orientation() == Qt::Horizontal)
+        angleDelta.setX(event->delta());
+    else
+        angleDelta.setY(event->delta());
+    // pixelDelta, inverted, scrollPhase and source from the original QWheelEvent
+    // were not preserved in the QGraphicsSceneWheelEvent unfortunately
+    QWheelEvent wheelEvent(pos, event->screenPos(), QPoint(), angleDelta,
+                    event->buttons(), event->modifiers(), Qt::NoScrollPhase, false);
     QPointer<QWidget> focusWidget = d->widget->focusWidget();
     extern bool qt_sendSpontaneousEvent(QObject *, QEvent *);
     qt_sendSpontaneousEvent(receiver, &wheelEvent);
@@ -1464,7 +1469,7 @@ void QGraphicsProxyWidget::inputMethodEvent(QInputMethodEvent *event)
     Q_D(const QGraphicsProxyWidget);
     QWidget *focusWidget = d->widget->focusWidget();
     if (focusWidget && focusWidget->testAttribute(Qt::WA_InputMethodEnabled))
-        QApplication::sendEvent(focusWidget, event);
+        QCoreApplication::sendEvent(focusWidget, event);
 }
 
 /*!
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index 03717d5d1a..a47d0d879d 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -114,7 +114,7 @@
     Another responsibility that QGraphicsScene has, is to propagate events
     from QGraphicsView. To send an event to a scene, you construct an event
     that inherits QEvent, and then send it using, for example,
-    QApplication::sendEvent(). event() is responsible for dispatching
+    QCoreApplication::sendEvent(). event() is responsible for dispatching
     the event to the individual items. Some common events are handled by
     convenience event handlers. For example, key press events are handled by
     keyPressEvent(), and mouse press events are handled by mousePressEvent().
@@ -459,7 +459,7 @@ void QGraphicsScenePrivate::_q_polishItems()
         }
         if (itemd->isWidget) {
             QEvent event(QEvent::Polish);
-            QApplication::sendEvent((QGraphicsWidget *)item, &event);
+            QCoreApplication::sendEvent((QGraphicsWidget *)item, &event);
         }
     }
 
@@ -782,7 +782,7 @@ void QGraphicsScenePrivate::setActivePanelHelper(QGraphicsItem *item, bool durin
     // Update activate state.
     activePanel = panel;
     QEvent event(QEvent::ActivationChange);
-    QApplication::sendEvent(q, &event);
+    QCoreApplication::sendEvent(q, &event);
 
     // Activate
     if (panel) {
@@ -1251,7 +1251,7 @@ bool QGraphicsScenePrivate::sendEvent(QGraphicsItem *item, QEvent *event)
         return false;
     if (QGraphicsObject *o = item->toGraphicsObject()) {
         bool spont = event->spontaneous();
-        if (spont ? qt_sendSpontaneousEvent(o, event) : QApplication::sendEvent(o, event))
+        if (spont ? qt_sendSpontaneousEvent(o, event) : QCoreApplication::sendEvent(o, event))
             return true;
         event->spont = spont;
     }
@@ -1577,7 +1577,7 @@ void QGraphicsScenePrivate::updateFont(const QFont &font)
 
     // Send the scene a FontChange event.
     QEvent event(QEvent::FontChange);
-    QApplication::sendEvent(q, &event);
+    QCoreApplication::sendEvent(q, &event);
 }
 
 /*!
@@ -1601,7 +1601,7 @@ void QGraphicsScenePrivate::setPalette_helper(const QPalette &palette)
 */
 void QGraphicsScenePrivate::resolvePalette()
 {
-    QPalette naturalPalette = QApplication::palette();
+    QPalette naturalPalette = QGuiApplication::palette();
     naturalPalette.resolve(0);
     QPalette resolvedPalette = palette.resolve(naturalPalette);
     updatePalette(resolvedPalette);
@@ -1634,7 +1634,7 @@ void QGraphicsScenePrivate::updatePalette(const QPalette &palette)
 
     // Send the scene a PaletteChange event.
     QEvent event(QEvent::PaletteChange);
-    QApplication::sendEvent(q, &event);
+    QCoreApplication::sendEvent(q, &event);
 }
 
 /*!
@@ -3555,10 +3555,10 @@ bool QGraphicsScene::eventFilter(QObject *watched, QEvent *event)
 
     switch (event->type()) {
     case QEvent::ApplicationPaletteChange:
-        QApplication::postEvent(this, new QEvent(QEvent::ApplicationPaletteChange));
+        QCoreApplication::postEvent(this, new QEvent(QEvent::ApplicationPaletteChange));
         break;
     case QEvent::ApplicationFontChange:
-        QApplication::postEvent(this, new QEvent(QEvent::ApplicationFontChange));
+        QCoreApplication::postEvent(this, new QEvent(QEvent::ApplicationFontChange));
         break;
     default:
         break;
@@ -4177,14 +4177,6 @@ void QGraphicsScene::wheelEvent(QGraphicsSceneWheelEvent *wheelEvent)
                                                                       wheelEvent->scenePos(),
                                                                       wheelEvent->widget());
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // On Mac, ignore the event if the first item under the mouse is not the last opened
-    // popup (or one of its descendant)
-    if (!d->popupWidgets.isEmpty() && !wheelCandidates.isEmpty() && wheelCandidates.first() != d->popupWidgets.back() && !d->popupWidgets.back()->isAncestorOf(wheelCandidates.first())) {
-        wheelEvent->accept();
-        return;
-    }
-#else
     // Find the first popup under the mouse (including the popup's descendants) starting from the last.
     // Remove all popups after the one found, or all or them if no popup is under the mouse.
     // Then continue with the event.
@@ -4194,7 +4186,6 @@ void QGraphicsScene::wheelEvent(QGraphicsSceneWheelEvent *wheelEvent)
             break;
         d->removePopup(*iter);
     }
-#endif
 
     bool hasSetFocus = false;
     for (QGraphicsItem *item : wheelCandidates) {
@@ -4416,11 +4407,7 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
     QGraphicsItem::CacheMode cacheMode = QGraphicsItem::CacheMode(itemd->cacheMode);
 
     // Render directly, using no cache.
-    if (cacheMode == QGraphicsItem::NoCache
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-        || !X11->use_xrender
-#endif
-        ) {
+    if (cacheMode == QGraphicsItem::NoCache) {
         _q_paintItem(static_cast<QGraphicsWidget *>(item), painter, option, widget, true, painterStateProtection);
         return;
     }
@@ -5612,7 +5599,7 @@ void QGraphicsScene::setStyle(QStyle *style)
 
     // Notify the scene.
     QEvent event(QEvent::StyleChange);
-    QApplication::sendEvent(this, &event);
+    QCoreApplication::sendEvent(this, &event);
 
     // Notify all widgets that don't have a style explicitly set.
     const auto items_ = items();
@@ -5620,7 +5607,7 @@ void QGraphicsScene::setStyle(QStyle *style)
         if (item->isWidget()) {
             QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
             if (!widget->testAttribute(Qt::WA_SetStyle))
-                QApplication::sendEvent(widget, &event);
+                QCoreApplication::sendEvent(widget, &event);
         }
     }
 }
@@ -5693,7 +5680,7 @@ QPalette QGraphicsScene::palette() const
 void QGraphicsScene::setPalette(const QPalette &palette)
 {
     Q_D(QGraphicsScene);
-    QPalette naturalPalette = QApplication::palette();
+    QPalette naturalPalette = QGuiApplication::palette();
     naturalPalette.resolve(0);
     QPalette resolvedPalette = palette.resolve(naturalPalette);
     d->setPalette_helper(resolvedPalette);
@@ -6359,7 +6346,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
                         << "delivering override to"
                         << item.data() << gestures;
                 // send gesture override
-                QGestureEvent ev(gestures.toList());
+                QGestureEvent ev(gestures.values());
                 ev.t = QEvent::GestureOverride;
                 ev.setWidget(event->widget());
                 // mark event and individual gestures as ignored
@@ -6449,7 +6436,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
         DEBUG() << "QGraphicsScenePrivate::gestureEventHandler:"
                 << "delivering to"
                 << receiver.data() << gestures;
-        QGestureEvent ev(gestures.toList());
+        QGestureEvent ev(gestures.values());
         ev.setWidget(event->widget());
         sendEvent(receiver.data(), &ev);
         QSet<QGesture *> ignoredGestures;
@@ -6480,7 +6467,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
             // look for new potential targets for gestures that were ignored
             // and should be propagated.
 
-            QSet<QGraphicsObject *> targetsSet = cachedTargetItems.toSet();
+            QSet<QGraphicsObject *> targetsSet(cachedTargetItems.constBegin(), cachedTargetItems.constEnd());
 
             if (receiver) {
                 // first if the gesture should be propagated to parents only
@@ -6512,7 +6499,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
             gestureTargetsAtHotSpots(ignoredGestures, Qt::ReceivePartialGestures,
                                      &cachedItemGestures, &targetsSet, 0, 0);
 
-            cachedTargetItems = targetsSet.toList();
+            cachedTargetItems = targetsSet.values();
             std::sort(cachedTargetItems.begin(), cachedTargetItems.end(), qt_closestItemFirst);
             DEBUG() << "QGraphicsScenePrivate::gestureEventHandler:"
                     << "new targets:" << cachedTargetItems;
@@ -6590,7 +6577,7 @@ void QGraphicsScenePrivate::cancelGesturesForChildren(QGesture *original)
         }
         Q_ASSERT(target);
 
-        const QList<QGesture *> list = gestures.toList();
+        const QList<QGesture *> list = gestures.values();
         QGestureEvent ev(list);
         sendEvent(target, &ev);
 
diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h
index 3cc00ead08..d36a871533 100644
--- a/src/widgets/graphicsview/qgraphicsscene.h
+++ b/src/widgets/graphicsview/qgraphicsscene.h
@@ -115,7 +115,7 @@ public:
         BspTreeIndex,
         NoIndex = -1
     };
-
+    Q_ENUM(ItemIndexMethod)
     enum SceneLayer {
         ItemLayer = 0x1,
         BackgroundLayer = 0x2,
diff --git a/src/widgets/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h
index 14bafe6678..9ecfca8ebf 100644
--- a/src/widgets/graphicsview/qgraphicsscene_p.h
+++ b/src/widgets/graphicsview/qgraphicsscene_p.h
@@ -241,7 +241,7 @@ public:
 
     void drawSubtreeRecursive(QGraphicsItem *item, QPainter *painter, const QTransform *const,
                               QRegion *exposedRegion, QWidget *widget, qreal parentOpacity = qreal(1.0),
-                              const QTransform *const effectTransform = 0);
+                              const QTransform *const effectTransform = nullptr);
     void draw(QGraphicsItem *, QPainter *, const QTransform *const, const QTransform *const,
               QRegion *, QWidget *, qreal, const QTransform *const, bool, bool);
 
@@ -327,9 +327,9 @@ public:
     void gestureTargetsAtHotSpots(const QSet<QGesture *> &gestures,
                            Qt::GestureFlag flag,
                            QHash<QGraphicsObject *, QSet<QGesture *> > *targets,
-                           QSet<QGraphicsObject *> *itemsSet = 0,
-                           QSet<QGesture *> *normal = 0,
-                           QSet<QGesture *> *conflicts = 0);
+                           QSet<QGraphicsObject *> *itemsSet = nullptr,
+                           QSet<QGesture *> *normal = nullptr,
+                           QSet<QGesture *> *conflicts = nullptr);
     void cancelGesturesForChildren(QGesture *original);
     void grabGesture(QGraphicsItem *, Qt::GestureType gesture);
     void ungrabGesture(QGraphicsItem *, Qt::GestureType gesture);
diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
index eb6bbbf49b..7e0e525a6b 100644
--- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
+++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
@@ -74,7 +74,7 @@ class Q_AUTOTEST_EXPORT QGraphicsSceneBspTreeIndex : public QGraphicsSceneIndex
     Q_OBJECT
     Q_PROPERTY(int bspTreeDepth READ bspTreeDepth WRITE setBspTreeDepth)
 public:
-    QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = 0);
+    QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = nullptr);
     ~QGraphicsSceneBspTreeIndex();
 
     QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const override;
diff --git a/src/widgets/graphicsview/qgraphicssceneindex_p.h b/src/widgets/graphicsview/qgraphicssceneindex_p.h
index 86637e836b..b494c52671 100644
--- a/src/widgets/graphicsview/qgraphicssceneindex_p.h
+++ b/src/widgets/graphicsview/qgraphicssceneindex_p.h
@@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QGraphicsSceneIndex : public QObject
     Q_OBJECT
 
 public:
-    QGraphicsSceneIndex(QGraphicsScene *scene = 0);
+    QGraphicsSceneIndex(QGraphicsScene *scene = nullptr);
     virtual ~QGraphicsSceneIndex();
 
     QGraphicsScene *scene() const;
diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
index 07d5d80ef1..ead52c1fb0 100644
--- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
+++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
@@ -67,7 +67,7 @@ class Q_AUTOTEST_EXPORT QGraphicsSceneLinearIndex : public QGraphicsSceneIndex
     Q_OBJECT
 
 public:
-    QGraphicsSceneLinearIndex(QGraphicsScene *scene = 0) : QGraphicsSceneIndex(scene), m_numSortedElements(0)
+    QGraphicsSceneLinearIndex(QGraphicsScene *scene = nullptr) : QGraphicsSceneIndex(scene), m_numSortedElements(0)
     { }
 
     QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const override
diff --git a/src/widgets/graphicsview/qgraphicstransform_p.h b/src/widgets/graphicsview/qgraphicstransform_p.h
index e54ee9fb3c..05e12c3e64 100644
--- a/src/widgets/graphicsview/qgraphicstransform_p.h
+++ b/src/widgets/graphicsview/qgraphicstransform_p.h
@@ -66,7 +66,7 @@ public:
     Q_DECLARE_PUBLIC(QGraphicsTransform)
 
     QGraphicsTransformPrivate()
-        : QObjectPrivate(), item(0) {}
+        : QObjectPrivate(), item(nullptr) {}
     ~QGraphicsTransformPrivate();
 
     QGraphicsItem *item;
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index 6079e41bfc..57be850829 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -667,7 +667,7 @@ void QGraphicsViewPrivate::mouseMoveEventHandler(QMouseEvent *event)
     if (event->spontaneous())
         qt_sendSpontaneousEvent(scene, &mouseEvent);
     else
-        QApplication::sendEvent(scene, &mouseEvent);
+        QCoreApplication::sendEvent(scene, &mouseEvent);
 
     // Remember whether the last event was accepted or not.
     lastMouseEvent.setAccepted(mouseEvent.isAccepted());
@@ -1716,7 +1716,7 @@ void QGraphicsView::setScene(QGraphicsScene *scene)
 
         if (isActiveWindow() && isVisible()) {
             QEvent windowDeactivate(QEvent::WindowDeactivate);
-            QApplication::sendEvent(d->scene, &windowDeactivate);
+            QCoreApplication::sendEvent(d->scene, &windowDeactivate);
         }
         if(hasFocus())
             d->scene->clearFocus();
@@ -1744,7 +1744,7 @@ void QGraphicsView::setScene(QGraphicsScene *scene)
 
         if (isActiveWindow() && isVisible()) {
             QEvent windowActivate(QEvent::WindowActivate);
-            QApplication::sendEvent(d->scene, &windowActivate);
+            QCoreApplication::sendEvent(d->scene, &windowActivate);
         }
     } else {
         d->recalculateContentSize();
@@ -2809,7 +2809,7 @@ bool QGraphicsView::event(QEvent *event)
         switch (event->type()) {
         case QEvent::ShortcutOverride:
             if (d->scene)
-                return QApplication::sendEvent(d->scene, event);
+                return QCoreApplication::sendEvent(d->scene, event);
             break;
         case QEvent::KeyPress:
             if (d->scene) {
@@ -2821,7 +2821,7 @@ bool QGraphicsView::event(QEvent *event)
                     // and the base implementation will call QGraphicsView's
                     // focusNextPrevChild() function. If the event is ignored,
                     // we fall back to standard tab focus handling.
-                    QApplication::sendEvent(d->scene, event);
+                    QCoreApplication::sendEvent(d->scene, event);
                     if (event->isAccepted())
                         return true;
                     // Ensure the event doesn't propagate just because the
@@ -2850,10 +2850,10 @@ bool QGraphicsView::viewportEvent(QEvent *event)
 
     switch (event->type()) {
     case QEvent::Enter:
-        QApplication::sendEvent(d->scene, event);
+        QCoreApplication::sendEvent(d->scene, event);
         break;
     case QEvent::WindowActivate:
-        QApplication::sendEvent(d->scene, event);
+        QCoreApplication::sendEvent(d->scene, event);
         break;
     case QEvent::WindowDeactivate:
         // ### This is a temporary fix for until we get proper mouse
@@ -2862,19 +2862,19 @@ bool QGraphicsView::viewportEvent(QEvent *event)
         // Remove all popups when the scene loses focus.
         if (!d->scene->d_func()->popupWidgets.isEmpty())
             d->scene->d_func()->removePopup(d->scene->d_func()->popupWidgets.constFirst());
-        QApplication::sendEvent(d->scene, event);
+        QCoreApplication::sendEvent(d->scene, event);
         break;
     case QEvent::Show:
         if (d->scene && isActiveWindow()) {
             QEvent windowActivate(QEvent::WindowActivate);
-            QApplication::sendEvent(d->scene, &windowActivate);
+            QCoreApplication::sendEvent(d->scene, &windowActivate);
         }
         break;
     case QEvent::Hide:
         // spontaneous event will generate a WindowDeactivate.
         if (!event->spontaneous() && d->scene && isActiveWindow()) {
             QEvent windowDeactivate(QEvent::WindowDeactivate);
-            QApplication::sendEvent(d->scene, &windowDeactivate);
+            QCoreApplication::sendEvent(d->scene, &windowDeactivate);
         }
         break;
     case QEvent::Leave: {
@@ -2892,7 +2892,7 @@ bool QGraphicsView::viewportEvent(QEvent *event)
         Q_ASSERT(event->d == 0);
         QScopedValueRollback<QEventPrivate *> rb(event->d);
         event->d = reinterpret_cast<QEventPrivate *>(viewport());
-        QApplication::sendEvent(d->scene, event);
+        QCoreApplication::sendEvent(d->scene, event);
         break;
     }
 #ifndef QT_NO_TOOLTIP
@@ -2902,7 +2902,7 @@ bool QGraphicsView::viewportEvent(QEvent *event)
         helpEvent.setWidget(viewport());
         helpEvent.setScreenPos(toolTip->globalPos());
         helpEvent.setScenePos(mapToScene(toolTip->pos()));
-        QApplication::sendEvent(d->scene, &helpEvent);
+        QCoreApplication::sendEvent(d->scene, &helpEvent);
         toolTip->setAccepted(helpEvent.isAccepted());
         return true;
     }
@@ -2940,7 +2940,7 @@ bool QGraphicsView::viewportEvent(QEvent *event)
             QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
             touchEvent->setTarget(viewport());
             QGraphicsViewPrivate::translateTouchEvent(d, touchEvent);
-            (void) QApplication::sendEvent(d->scene, touchEvent);
+            QCoreApplication::sendEvent(d->scene, touchEvent);
         } else {
             event->ignore();
         }
@@ -2957,7 +2957,7 @@ bool QGraphicsView::viewportEvent(QEvent *event)
         if (d->scene && d->sceneInteractionAllowed) {
             QGestureEvent *gestureEvent = static_cast<QGestureEvent *>(event);
             gestureEvent->setWidget(viewport());
-            (void) QApplication::sendEvent(d->scene, gestureEvent);
+            QCoreApplication::sendEvent(d->scene, gestureEvent);
         }
         return true;
     }
@@ -2992,7 +2992,7 @@ void QGraphicsView::contextMenuEvent(QContextMenuEvent *event)
     contextEvent.setModifiers(event->modifiers());
     contextEvent.setReason((QGraphicsSceneContextMenuEvent::Reason)(event->reason()));
     contextEvent.setAccepted(event->isAccepted());
-    QApplication::sendEvent(d->scene, &contextEvent);
+    QCoreApplication::sendEvent(d->scene, &contextEvent);
     event->setAccepted(contextEvent.isAccepted());
 }
 #endif // QT_NO_CONTEXTMENU
@@ -3012,7 +3012,7 @@ void QGraphicsView::dropEvent(QDropEvent *event)
     d->populateSceneDragDropEvent(&sceneEvent, event);
 
     // Send it to the scene.
-    QApplication::sendEvent(d->scene, &sceneEvent);
+    QCoreApplication::sendEvent(d->scene, &sceneEvent);
 
     // Accept the originating event if the scene accepted the scene event.
     event->setAccepted(sceneEvent.isAccepted());
@@ -3043,7 +3043,7 @@ void QGraphicsView::dragEnterEvent(QDragEnterEvent *event)
     d->storeDragDropEvent(&sceneEvent);
 
     // Send it to the scene.
-    QApplication::sendEvent(d->scene, &sceneEvent);
+    QCoreApplication::sendEvent(d->scene, &sceneEvent);
 
     // Accept the originating event if the scene accepted the scene event.
     if (sceneEvent.isAccepted()) {
@@ -3081,7 +3081,7 @@ void QGraphicsView::dragLeaveEvent(QDragLeaveEvent *event)
     d->lastDragDropEvent = 0;
 
     // Send it to the scene.
-    QApplication::sendEvent(d->scene, &sceneEvent);
+    QCoreApplication::sendEvent(d->scene, &sceneEvent);
 
     // Accept the originating event if the scene accepted the scene event.
     if (sceneEvent.isAccepted())
@@ -3105,7 +3105,7 @@ void QGraphicsView::dragMoveEvent(QDragMoveEvent *event)
     d->storeDragDropEvent(&sceneEvent);
 
     // Send it to the scene.
-    QApplication::sendEvent(d->scene, &sceneEvent);
+    QCoreApplication::sendEvent(d->scene, &sceneEvent);
 
     // Ignore the originating event if the scene ignored the scene event.
     event->setAccepted(sceneEvent.isAccepted());
@@ -3123,7 +3123,7 @@ void QGraphicsView::focusInEvent(QFocusEvent *event)
     d->updateInputMethodSensitivity();
     QAbstractScrollArea::focusInEvent(event);
     if (d->scene)
-        QApplication::sendEvent(d->scene, event);
+        QCoreApplication::sendEvent(d->scene, event);
     // Pass focus on if the scene cannot accept focus.
     if (!d->scene || !event->isAccepted())
         QAbstractScrollArea::focusInEvent(event);
@@ -3145,7 +3145,7 @@ void QGraphicsView::focusOutEvent(QFocusEvent *event)
     Q_D(QGraphicsView);
     QAbstractScrollArea::focusOutEvent(event);
     if (d->scene)
-        QApplication::sendEvent(d->scene, event);
+        QCoreApplication::sendEvent(d->scene, event);
 }
 
 /*!
@@ -3158,7 +3158,7 @@ void QGraphicsView::keyPressEvent(QKeyEvent *event)
         QAbstractScrollArea::keyPressEvent(event);
         return;
     }
-    QApplication::sendEvent(d->scene, event);
+    QCoreApplication::sendEvent(d->scene, event);
     if (!event->isAccepted())
         QAbstractScrollArea::keyPressEvent(event);
 }
@@ -3171,7 +3171,7 @@ void QGraphicsView::keyReleaseEvent(QKeyEvent *event)
     Q_D(QGraphicsView);
     if (!d->scene || !d->sceneInteractionAllowed)
         return;
-    QApplication::sendEvent(d->scene, event);
+    QCoreApplication::sendEvent(d->scene, event);
     if (!event->isAccepted())
         QAbstractScrollArea::keyReleaseEvent(event);
 }
@@ -3210,7 +3210,7 @@ void QGraphicsView::mouseDoubleClickEvent(QMouseEvent *event)
     if (event->spontaneous())
         qt_sendSpontaneousEvent(d->scene, &mouseEvent);
     else
-        QApplication::sendEvent(d->scene, &mouseEvent);
+        QCoreApplication::sendEvent(d->scene, &mouseEvent);
 
     // Update the original mouse event accepted state.
     const bool isAccepted = mouseEvent.isAccepted();
@@ -3261,7 +3261,7 @@ void QGraphicsView::mousePressEvent(QMouseEvent *event)
             if (event->spontaneous())
                 qt_sendSpontaneousEvent(d->scene, &mouseEvent);
             else
-                QApplication::sendEvent(d->scene, &mouseEvent);
+                QCoreApplication::sendEvent(d->scene, &mouseEvent);
 
             // Update the original mouse event accepted state.
             bool isAccepted = mouseEvent.isAccepted();
@@ -3397,7 +3397,7 @@ void QGraphicsView::mouseReleaseEvent(QMouseEvent *event)
     if (event->spontaneous())
         qt_sendSpontaneousEvent(d->scene, &mouseEvent);
     else
-        QApplication::sendEvent(d->scene, &mouseEvent);
+        QCoreApplication::sendEvent(d->scene, &mouseEvent);
 
     // Update the last mouse event selected state.
     d->lastMouseEvent.setAccepted(mouseEvent.isAccepted());
@@ -3426,14 +3426,15 @@ void QGraphicsView::wheelEvent(QWheelEvent *event)
 
     QGraphicsSceneWheelEvent wheelEvent(QEvent::GraphicsSceneWheel);
     wheelEvent.setWidget(viewport());
-    wheelEvent.setScenePos(mapToScene(event->pos()));
-    wheelEvent.setScreenPos(event->globalPos());
+    wheelEvent.setScenePos(mapToScene(event->position().toPoint()));
+    wheelEvent.setScreenPos(event->globalPosition().toPoint());
     wheelEvent.setButtons(event->buttons());
     wheelEvent.setModifiers(event->modifiers());
-    wheelEvent.setDelta(event->delta());
-    wheelEvent.setOrientation(event->orientation());
+    const bool horizontal = qAbs(event->angleDelta().x()) > qAbs(event->angleDelta().y());
+    wheelEvent.setDelta(horizontal ? event->angleDelta().x() : event->angleDelta().y());
+    wheelEvent.setOrientation(horizontal ? Qt::Horizontal : Qt::Vertical);
     wheelEvent.setAccepted(false);
-    QApplication::sendEvent(d->scene, &wheelEvent);
+    QCoreApplication::sendEvent(d->scene, &wheelEvent);
     event->setAccepted(wheelEvent.isAccepted());
     if (!event->isAccepted())
         QAbstractScrollArea::wheelEvent(event);
@@ -3475,11 +3476,7 @@ void QGraphicsView::paintEvent(QPaintEvent *event)
     const QTransform viewTransform = painter.worldTransform();
 
     // Draw background
-    if ((d->cacheMode & CacheBackground)
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-        && X11->use_xrender
-#endif
-        ) {
+    if (d->cacheMode & CacheBackground) {
         // Recreate the background pixmap, and flag the whole background as
         // exposed.
         if (d->mustResizeBackgroundPixmap) {
@@ -3676,11 +3673,7 @@ void QGraphicsView::scrollContentsBy(int dx, int dy)
 
     d->updateLastCenterPoint();
 
-    if ((d->cacheMode & CacheBackground)
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-        && X11->use_xrender
-#endif
-        ) {
+    if (d->cacheMode & CacheBackground) {
         // Below, QPixmap::scroll() works in device pixels, while the delta values
         // and backgroundPixmapExposed are in device independent pixels.
         const qreal dpr = d->backgroundPixmap.devicePixelRatio();
@@ -3720,7 +3713,7 @@ void QGraphicsView::inputMethodEvent(QInputMethodEvent *event)
 {
     Q_D(QGraphicsView);
     if (d->scene)
-        QApplication::sendEvent(d->scene, event);
+        QCoreApplication::sendEvent(d->scene, event);
 }
 
 /*!
diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h
index e02fba69c9..1389796c3f 100644
--- a/src/widgets/graphicsview/qgraphicsview.h
+++ b/src/widgets/graphicsview/qgraphicsview.h
@@ -107,7 +107,9 @@ public:
     Q_ENUM(ViewportUpdateMode)
 
     enum OptimizationFlag {
-        DontClipPainter = 0x1, // obsolete
+#if QT_DEPRECATED_SINCE(5, 14)
+        DontClipPainter Q_DECL_ENUMERATOR_DEPRECATED_X("This flag is unused") = 0x1, // obsolete
+#endif
         DontSavePainterState = 0x2,
         DontAdjustForAntialiasing = 0x4,
         IndirectPainting = 0x8
diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h
index 0428b9ce70..01af61d6ba 100644
--- a/src/widgets/graphicsview/qgraphicsview_p.h
+++ b/src/widgets/graphicsview/qgraphicsview_p.h
@@ -184,24 +184,10 @@ public:
 
     inline void dispatchPendingUpdateRequests()
     {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        // QWidget::update() works slightly different on the Mac without the raster engine;
-        // it's not part of our backing store so it needs special threatment.
-        if (QApplicationPrivate::graphics_system_name != QLatin1String("raster")) {
-            // At this point either HIViewSetNeedsDisplay (Carbon) or setNeedsDisplay: YES (Cocoa)
-            // is called, which means there's a pending update request. We want to dispatch it
-            // now because otherwise graphics view updates would require two
-            // round-trips in the event loop before the item is painted.
-            extern void qt_mac_dispatchPendingUpdateRequests(QWidget *);
-            qt_mac_dispatchPendingUpdateRequests(viewport->window());
-        } else
-#endif
-        {
-            if (qt_widget_private(viewport)->paintOnScreen())
-                QCoreApplication::sendPostedEvents(viewport, QEvent::UpdateRequest);
-            else
-                QCoreApplication::sendPostedEvents(viewport->window(), QEvent::UpdateRequest);
-        }
+        if (qt_widget_private(viewport)->shouldPaintOnScreen())
+            QCoreApplication::sendPostedEvents(viewport, QEvent::UpdateRequest);
+        else
+            QCoreApplication::sendPostedEvents(viewport->window(), QEvent::UpdateRequest);
     }
 
     void setUpdateClip(QGraphicsItem *);
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index ad3be5766d..cf041b9817 100644
--- a/src/widgets/graphicsview/qgraphicswidget.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget.cpp
@@ -390,7 +390,7 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
             QGraphicsSceneMoveEvent event;
             event.setOldPos(oldPos);
             event.setNewPos(pos());
-            QApplication::sendEvent(this, &event);
+            QCoreApplication::sendEvent(this, &event);
             if (wd->inSetPos) {
                 //set the new pos
                 d->geom.moveTopLeft(pos());
@@ -413,10 +413,10 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
             QGraphicsLayout *lay = wd->layout;
             if (QGraphicsLayout::instantInvalidatePropagation()) {
                 if (!lay || lay->isActivated()) {
-                    QApplication::sendEvent(this, &re);
+                    QCoreApplication::sendEvent(this, &re);
                 }
             } else {
-                QApplication::sendEvent(this, &re);
+                QCoreApplication::sendEvent(this, &re);
             }
         }
     }
@@ -427,7 +427,7 @@ relayoutChildrenAndReturn:
         if (QGraphicsLayout *lay = wd->layout) {
             if (!lay->isActivated()) {
                 QEvent layoutRequest(QEvent::LayoutRequest);
-                QApplication::sendEvent(this, &layoutRequest);
+                QCoreApplication::sendEvent(this, &layoutRequest);
             }
         }
     }
@@ -473,8 +473,9 @@ relayoutChildrenAndReturn:
 */
 
 /*!
-    Sets the widget's contents margins to \a left, \a top, \a right and \a
-    bottom.
+    \since 5.14
+
+    Sets the widget's contents margins to \a margins.
 
     Contents margins are used by the assigned layout to define the placement
     of subwidgets and layouts. Margins are particularly useful for widgets
@@ -488,23 +489,17 @@ relayoutChildrenAndReturn:
 
     \sa getContentsMargins(), setGeometry()
 */
-void QGraphicsWidget::setContentsMargins(qreal left, qreal top, qreal right, qreal bottom)
+void QGraphicsWidget::setContentsMargins(QMarginsF margins)
 {
     Q_D(QGraphicsWidget);
 
-    if (!d->margins && left == 0 && top == 0 && right == 0 && bottom == 0)
+    if (!d->margins && margins.isNull())
         return;
     d->ensureMargins();
-    if (left == d->margins[d->Left]
-        && top == d->margins[d->Top]
-        && right == d->margins[d->Right]
-        && bottom == d->margins[d->Bottom])
+    if (*d->margins == margins)
         return;
 
-    d->margins[d->Left] = left;
-    d->margins[d->Top] = top;
-    d->margins[d->Right] = right;
-    d->margins[d->Bottom] = bottom;
+    *d->margins = margins;
 
     if (QGraphicsLayout *l = d->layout)
         l->invalidate();
@@ -512,7 +507,18 @@ void QGraphicsWidget::setContentsMargins(qreal left, qreal top, qreal right, qre
         updateGeometry();
 
     QEvent e(QEvent::ContentsRectChange);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
+}
+
+/*!
+    \overload
+
+    Sets the widget's contents margins to \a left, \a top, \a right and \a
+    bottom.
+*/
+void QGraphicsWidget::setContentsMargins(qreal left, qreal top, qreal right, qreal bottom)
+{
+    setContentsMargins({left, top, right, bottom});
 }
 
 /*!
@@ -528,18 +534,19 @@ void QGraphicsWidget::getContentsMargins(qreal *left, qreal *top, qreal *right,
     if (left || top || right || bottom)
         d->ensureMargins();
     if (left)
-        *left = d->margins[d->Left];
+        *left = d->margins->left();
     if (top)
-        *top = d->margins[d->Top];
+        *top = d->margins->top();
     if (right)
-        *right = d->margins[d->Right];
+        *right = d->margins->right();
     if (bottom)
-        *bottom = d->margins[d->Bottom];
+        *bottom = d->margins->bottom();
 }
 
 /*!
-    Sets the widget's window frame margins to \a left, \a top, \a right and
-    \a bottom. The default frame margins are provided by the style, and they
+    \since 5.14
+    Sets the widget's window frame margins to \a margins.
+    The default frame margins are provided by the style, and they
     depend on the current window flags.
 
     If you would like to draw your own window decoration, you can set your
@@ -547,30 +554,33 @@ void QGraphicsWidget::getContentsMargins(qreal *left, qreal *top, qreal *right,
 
     \sa unsetWindowFrameMargins(), getWindowFrameMargins(), windowFrameRect()
 */
-void QGraphicsWidget::setWindowFrameMargins(qreal left, qreal top, qreal right, qreal bottom)
+void QGraphicsWidget::setWindowFrameMargins(QMarginsF margins)
 {
     Q_D(QGraphicsWidget);
 
-    if (!d->windowFrameMargins && left == 0 && top == 0 && right == 0 && bottom == 0)
+    if (!d->windowFrameMargins && margins.isNull())
         return;
     d->ensureWindowFrameMargins();
-    bool unchanged =
-        d->windowFrameMargins[d->Left] == left
-        && d->windowFrameMargins[d->Top] == top
-        && d->windowFrameMargins[d->Right] == right
-        && d->windowFrameMargins[d->Bottom] == bottom;
+    const bool unchanged = *d->windowFrameMargins == margins;
     if (d->setWindowFrameMargins && unchanged)
         return;
     if (!unchanged)
         prepareGeometryChange();
-    d->windowFrameMargins[d->Left] = left;
-    d->windowFrameMargins[d->Top] = top;
-    d->windowFrameMargins[d->Right] = right;
-    d->windowFrameMargins[d->Bottom] = bottom;
+    *d->windowFrameMargins = margins;
     d->setWindowFrameMargins = true;
 }
 
 /*!
+    \overload
+    Sets the widget's window frame margins to \a left, \a top, \a right and
+    \a bottom.
+*/
+void QGraphicsWidget::setWindowFrameMargins(qreal left, qreal top, qreal right, qreal bottom)
+{
+    setWindowFrameMargins({left, top, right, bottom});
+}
+
+/*!
     Gets the widget's window frame margins. The margins are stored in \a left,
     \a top, \a right and \a bottom as pointers to qreals. Each argument can
     be \e {omitted} by passing \nullptr.
@@ -583,13 +593,13 @@ void QGraphicsWidget::getWindowFrameMargins(qreal *left, qreal *top, qreal *righ
     if (left || top || right || bottom)
         d->ensureWindowFrameMargins();
     if (left)
-        *left = d->windowFrameMargins[d->Left];
+        *left = d->windowFrameMargins->left();
     if (top)
-        *top = d->windowFrameMargins[d->Top];
+        *top = d->windowFrameMargins->top();
     if (right)
-        *right = d->windowFrameMargins[d->Right];
+        *right = d->windowFrameMargins->right();
     if (bottom)
-        *bottom = d->windowFrameMargins[d->Bottom];
+        *bottom = d->windowFrameMargins->bottom();
 }
 
 /*!
@@ -624,8 +634,8 @@ QRectF QGraphicsWidget::windowFrameGeometry() const
 {
     Q_D(const QGraphicsWidget);
     return d->windowFrameMargins
-        ? geometry().adjusted(-d->windowFrameMargins[d->Left], -d->windowFrameMargins[d->Top],
-                              d->windowFrameMargins[d->Right], d->windowFrameMargins[d->Bottom])
+        ? geometry().adjusted(-d->windowFrameMargins->left(), -d->windowFrameMargins->top(),
+                              d->windowFrameMargins->right(), d->windowFrameMargins->bottom())
         : geometry();
 }
 
@@ -638,8 +648,8 @@ QRectF QGraphicsWidget::windowFrameRect() const
 {
     Q_D(const QGraphicsWidget);
     return d->windowFrameMargins
-        ? rect().adjusted(-d->windowFrameMargins[d->Left], -d->windowFrameMargins[d->Top],
-                          d->windowFrameMargins[d->Right], d->windowFrameMargins[d->Bottom])
+        ? rect().adjusted(-d->windowFrameMargins->left(), -d->windowFrameMargins->top(),
+                          d->windowFrameMargins->right(), d->windowFrameMargins->bottom())
         : rect();
 }
 
@@ -706,22 +716,6 @@ void QGraphicsWidget::initStyleOption(QStyleOption *option) const
         option->state |= QStyle::State_Window;
     /*
       ###
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    extern bool qt_mac_can_clickThrough(const QGraphicsWidget *w); //qwidget_mac.cpp
-    if (!(option->state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
-        option->state &= ~QStyle::State_Enabled;
-
-    switch (QMacStyle::widgetSizePolicy(widget)) {
-    case QMacStyle::SizeSmall:
-        option->state |= QStyle::State_Small;
-        break;
-    case QMacStyle::SizeMini:
-        option->state |= QStyle::State_Mini;
-        break;
-    default:
-        ;
-    }
-#endif
 #ifdef QT_KEYPAD_NAVIGATION
     if (widget->hasEditFocus())
         state |= QStyle::State_HasEditFocus;
@@ -751,8 +745,8 @@ QSizeF QGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c
     if (d->layout) {
         QSizeF marginSize(0,0);
         if (d->margins) {
-            marginSize = QSizeF(d->margins[d->Left] + d->margins[d->Right],
-                         d->margins[d->Top] + d->margins[d->Bottom]);
+            marginSize = QSizeF(d->margins->left() + d->margins->right(),
+                         d->margins->top() + d->margins->bottom());
         }
         sh = d->layout->effectiveSizeHint(which, constraint - marginSize);
         sh += marginSize;
@@ -953,7 +947,7 @@ void QGraphicsWidget::setStyle(QStyle *style)
 
     // Deliver StyleChange to the widget itself (doesn't propagate).
     QEvent event(QEvent::StyleChange);
-    QApplication::sendEvent(this, &event);
+    QCoreApplication::sendEvent(this, &event);
 }
 
 /*!
@@ -1018,7 +1012,7 @@ void QGraphicsWidget::setFont(const QFont &font)
 
     By default, this property contains the application's default palette.
 
-    \sa QApplication::palette(), QGraphicsScene::palette, QPalette::resolve()
+    \sa QGuiApplication::palette(), QGraphicsScene::palette, QPalette::resolve()
 */
 QPalette QGraphicsWidget::palette() const
 {
@@ -1090,7 +1084,7 @@ void QGraphicsWidget::updateGeometry()
             // This is for custom layouting
             QGraphicsWidget *parentWid = parentWidget();    //###
             if (parentWid->isVisible())
-                QApplication::postEvent(parentWid, new QEvent(QEvent::LayoutRequest));
+                QCoreApplication::postEvent(parentWid, new QEvent(QEvent::LayoutRequest));
         } else {
             /**
              * If this is the topmost widget, post a LayoutRequest event to the widget.
@@ -1098,7 +1092,7 @@ void QGraphicsWidget::updateGeometry()
              * widgets in one go. This will make a relayout flicker-free.
              */
             if (QGraphicsLayout::instantInvalidatePropagation())
-                QApplication::postEvent(static_cast<QGraphicsWidget *>(this), new QEvent(QEvent::LayoutRequest));
+                QCoreApplication::postEvent(static_cast<QGraphicsWidget *>(this), new QEvent(QEvent::LayoutRequest));
         }
         if (!QGraphicsLayout::instantInvalidatePropagation()) {
             bool wasResized = testAttribute(Qt::WA_Resized);
@@ -1135,14 +1129,14 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &
     case ItemEnabledHasChanged: {
         // Send EnabledChange after the enabled state has changed.
         QEvent event(QEvent::EnabledChange);
-        QApplication::sendEvent(this, &event);
+        QCoreApplication::sendEvent(this, &event);
         break;
     }
     case ItemVisibleChange:
         if (value.toBool()) {
             // Send Show event before the item has been shown.
             QShowEvent event;
-            QApplication::sendEvent(this, &event);
+            QCoreApplication::sendEvent(this, &event);
             bool resized = testAttribute(Qt::WA_Resized);
             if (!resized) {
                 adjustSize();
@@ -1158,7 +1152,7 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &
         if (!value.toBool()) {
             // Send Hide event after the item has been hidden.
             QHideEvent event;
-            QApplication::sendEvent(this, &event);
+            QCoreApplication::sendEvent(this, &event);
         }
         break;
     case ItemPositionHasChanged:
@@ -1167,25 +1161,25 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &
     case ItemParentChange: {
         // Deliver ParentAboutToChange.
         QEvent event(QEvent::ParentAboutToChange);
-        QApplication::sendEvent(this, &event);
+        QCoreApplication::sendEvent(this, &event);
         break;
     }
     case ItemParentHasChanged: {
         // Deliver ParentChange.
         QEvent event(QEvent::ParentChange);
-        QApplication::sendEvent(this, &event);
+        QCoreApplication::sendEvent(this, &event);
         break;
     }
     case ItemCursorHasChanged: {
         // Deliver CursorChange.
         QEvent event(QEvent::CursorChange);
-        QApplication::sendEvent(this, &event);
+        QCoreApplication::sendEvent(this, &event);
         break;
     }
     case ItemToolTipHasChanged: {
         // Deliver ToolTipChange.
         QEvent event(QEvent::ToolTipChange);
-        QApplication::sendEvent(this, &event);
+        QCoreApplication::sendEvent(this, &event);
         break;
     }
     default:
@@ -1320,7 +1314,7 @@ Qt::WindowFrameSection QGraphicsWidget::windowFrameSectionAt(const QPointF &pos)
     const qreal cornerMargin = 20;
     //### Not sure of this one, it should be the same value for all edges.
     const qreal windowFrameWidth = d->windowFrameMargins
-        ? d->windowFrameMargins[d->Left] : 0;
+        ? d->windowFrameMargins->left() : 0;
 
     Qt::WindowFrameSection s = Qt::NoSection;
     if (x <= left + cornerMargin) {
@@ -1347,7 +1341,7 @@ Qt::WindowFrameSection QGraphicsWidget::windowFrameSectionAt(const QPointF &pos)
     if (s == Qt::NoSection) {
         QRectF r1 = r;
         r1.setHeight(d->windowFrameMargins
-                     ? d->windowFrameMargins[d->Top] : 0);
+                     ? d->windowFrameMargins->top() : 0);
         if (r1.contains(pos))
             s = Qt::TitleBarArea;
     }
@@ -1920,7 +1914,7 @@ int QGraphicsWidget::grabShortcut(const QKeySequence &sequence, Qt::ShortcutCont
     if (sequence.isEmpty())
         return 0;
     // ### setAttribute(Qt::WA_GrabbedShortcut);
-    return qApp->d_func()->shortcutMap.addShortcut(this, sequence, context, qWidgetShortcutContextMatcher);
+    return QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, sequence, context, qWidgetShortcutContextMatcher);
 }
 
 /*!
@@ -1944,7 +1938,7 @@ void QGraphicsWidget::releaseShortcut(int id)
 {
     Q_ASSERT(qApp);
     if (id)
-        qApp->d_func()->shortcutMap.removeShortcut(id, this, 0);
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(id, this, 0);
 }
 
 /*!
@@ -1965,7 +1959,7 @@ void QGraphicsWidget::setShortcutEnabled(int id, bool enabled)
 {
     Q_ASSERT(qApp);
     if (id)
-        qApp->d_func()->shortcutMap.setShortcutEnabled(enabled, id, this, 0);
+        QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enabled, id, this, 0);
 }
 
 /*!
@@ -1980,7 +1974,7 @@ void QGraphicsWidget::setShortcutAutoRepeat(int id, bool enabled)
 {
     Q_ASSERT(qApp);
     if (id)
-        qApp->d_func()->shortcutMap.setShortcutAutoRepeat(enabled, id, this, 0);
+        QGuiApplicationPrivate::instance()->shortcutMap.setShortcutAutoRepeat(enabled, id, this, 0);
 }
 #endif
 
@@ -2058,7 +2052,7 @@ void QGraphicsWidget::insertAction(QAction *before, QAction *action)
     }
 
     QActionEvent e(QEvent::ActionAdded, action, before);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 }
 
 /*!
@@ -2101,7 +2095,7 @@ void QGraphicsWidget::removeAction(QAction *action)
 
     if (d->actions.removeAll(action)) {
         QActionEvent e(QEvent::ActionRemoved, action);
-        QApplication::sendEvent(this, &e);
+        QCoreApplication::sendEvent(this, &e);
     }
 }
 
@@ -2394,7 +2388,7 @@ QPainterPath QGraphicsWidget::shape() const
 bool QGraphicsWidget::close()
 {
     QCloseEvent closeEvent;
-    QApplication::sendEvent(this, &closeEvent);
+    QCoreApplication::sendEvent(this, &closeEvent);
     if (!closeEvent.isAccepted()) {
         return false;
     }
diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h
index 481fb55db3..8223b921c9 100644
--- a/src/widgets/graphicsview/qgraphicswidget.h
+++ b/src/widgets/graphicsview/qgraphicswidget.h
@@ -111,9 +111,11 @@ public:
     inline QRectF rect() const { return QRectF(QPointF(), size()); }
 
     void setContentsMargins(qreal left, qreal top, qreal right, qreal bottom);
+    void setContentsMargins(QMarginsF margins);
     void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const override;
 
     void setWindowFrameMargins(qreal left, qreal top, qreal right, qreal bottom);
+    void setWindowFrameMargins(QMarginsF margins);
     void getWindowFrameMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const;
     void unsetWindowFrameMargins();
     QRectF windowFrameGeometry() const;
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp
index 1514fca456..0156faf8e4 100644
--- a/src/widgets/graphicsview/qgraphicswidget_p.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget_p.cpp
@@ -51,6 +51,8 @@
 #include <QtWidgets/QStyleOptionTitleBar>
 #include <QtWidgets/QGraphicsSceneMouseEvent>
 
+#include <private/qmemory_p.h>
+
 QT_BEGIN_NAMESPACE
 
 void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFlags)
@@ -108,10 +110,6 @@ QGraphicsWidgetPrivate::QGraphicsWidgetPrivate()
 
 QGraphicsWidgetPrivate::~QGraphicsWidgetPrivate()
 {
-    // Remove any lazily allocated data
-    delete[] margins;
-    delete[] windowFrameMargins;
-    delete windowData;
 }
 
 /*!
@@ -122,11 +120,8 @@ QGraphicsWidgetPrivate::~QGraphicsWidgetPrivate()
 */
 void QGraphicsWidgetPrivate::ensureMargins() const
 {
-    if (!margins) {
-        margins = new qreal[4];
-        for (int i = 0; i < 4; ++i)
-            margins[i] = 0;
-    }
+    if (!margins)
+        margins = qt_make_unique<QMarginsF>();
 }
 
 /*!
@@ -137,11 +132,8 @@ void QGraphicsWidgetPrivate::ensureMargins() const
 */
 void QGraphicsWidgetPrivate::ensureWindowFrameMargins() const
 {
-    if (!windowFrameMargins) {
-        windowFrameMargins = new qreal[4];
-        for (int i = 0; i < 4; ++i)
-            windowFrameMargins[i] = 0;
-    }
+    if (!windowFrameMargins)
+        windowFrameMargins = qt_make_unique<QMarginsF>();
 }
 
 /*!
@@ -153,7 +145,7 @@ void QGraphicsWidgetPrivate::ensureWindowFrameMargins() const
 void QGraphicsWidgetPrivate::ensureWindowData()
 {
     if (!windowData)
-        windowData = new WindowData;
+        windowData = qt_make_unique<WindowData>();
 }
 
 void QGraphicsWidgetPrivate::setPalette_helper(const QPalette &palette)
@@ -196,7 +188,7 @@ void QGraphicsWidgetPrivate::updatePalette(const QPalette &palette)
 
     // Notify change.
     QEvent event(QEvent::PaletteChange);
-    QApplication::sendEvent(q, &event);
+    QCoreApplication::sendEvent(q, &event);
 }
 
 void QGraphicsWidgetPrivate::setLayoutDirection_helper(Qt::LayoutDirection direction)
@@ -218,7 +210,7 @@ void QGraphicsWidgetPrivate::setLayoutDirection_helper(Qt::LayoutDirection direc
 
     // Send the notification event to this widget item.
     QEvent e(QEvent::LayoutDirectionChange);
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 }
 
 void QGraphicsWidgetPrivate::resolveLayoutDirection()
@@ -232,9 +224,9 @@ void QGraphicsWidgetPrivate::resolveLayoutDirection()
     } else if (scene) {
         // ### shouldn't the scene have a layoutdirection really? how does
         // ### QGraphicsWidget get changes from QApplication::layoutDirection?
-        setLayoutDirection_helper(QApplication::layoutDirection());
+        setLayoutDirection_helper(QGuiApplication::layoutDirection());
     } else {
-        setLayoutDirection_helper(QApplication::layoutDirection());
+        setLayoutDirection_helper(QGuiApplication::layoutDirection());
     }
 }
 
@@ -296,7 +288,7 @@ void QGraphicsWidgetPrivate::updateFont(const QFont &font)
         return;
     // Notify change.
     QEvent event(QEvent::FontChange);
-    QApplication::sendEvent(q, &event);
+    QCoreApplication::sendEvent(q, &event);
 }
 
 QFont QGraphicsWidgetPrivate::naturalWidgetFont() const
@@ -372,8 +364,8 @@ void QGraphicsWidgetPrivate::windowFrameMouseReleaseEvent(QGraphicsSceneMouseEve
             bar.rect.setHeight(q->style()->pixelMetric(QStyle::PM_TitleBarHeight, &bar));
             QPointF pos = event->pos();
             if (windowFrameMargins) {
-                pos.rx() += windowFrameMargins[Left];
-                pos.ry() += windowFrameMargins[Top];
+                pos.rx() += windowFrameMargins->left();
+                pos.ry() += windowFrameMargins->top();
             }
             bar.subControls = QStyle::SC_TitleBarCloseButton;
             if (q->style()->subControlRect(QStyle::CC_TitleBar, &bar,
@@ -669,8 +661,8 @@ void QGraphicsWidgetPrivate::windowFrameHoverMoveEvent(QGraphicsSceneHoverEvent
     QStyleOptionTitleBar bar;
     // make sure that the coordinates (rect and pos) we send to the style are positive.
     if (windowFrameMargins) {
-        pos.rx() += windowFrameMargins[Left];
-        pos.ry() += windowFrameMargins[Top];
+        pos.rx() += windowFrameMargins->left();
+        pos.ry() += windowFrameMargins->top();
     }
     initStyleOptionTitleBar(&bar);
     bar.rect = q->windowFrameRect().toRect();
@@ -699,13 +691,6 @@ void QGraphicsWidgetPrivate::windowFrameHoverMoveEvent(QGraphicsSceneHoverEvent
         case Qt::TitleBarArea:
             windowData->buttonRect = q->style()->subControlRect(
                 QStyle::CC_TitleBar, &bar, QStyle::SC_TitleBarCloseButton, 0);
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-            // On mac we should hover if we are in the 'area' of the buttons
-            windowData->buttonRect |= q->style()->subControlRect(
-                QStyle::CC_TitleBar, &bar, QStyle::SC_TitleBarMinButton, 0);
-            windowData->buttonRect |= q->style()->subControlRect(
-                QStyle::CC_TitleBar, &bar, QStyle::SC_TitleBarMaxButton, 0);
-#endif
             if (windowData->buttonRect.contains(pos.toPoint()))
                 windowData->buttonMouseOver = true;
             event->ignore();
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h
index 505a2a24c0..e4cc2c3016 100644
--- a/src/widgets/graphicsview/qgraphicswidget_p.h
+++ b/src/widgets/graphicsview/qgraphicswidget_p.h
@@ -60,6 +60,8 @@
 #include <QtWidgets/qsizepolicy.h>
 #include <QtWidgets/qstyle.h>
 
+#include <memory>
+
 QT_REQUIRE_CONFIG(graphicsview);
 
 QT_BEGIN_NAMESPACE
@@ -78,11 +80,10 @@ public:
     qreal titleBarHeight(const QStyleOptionTitleBar &options) const;
 
     // Margins
-    enum {Left, Top, Right, Bottom};
-    mutable qreal *margins;
+    mutable std::unique_ptr<QMarginsF> margins;
     void ensureMargins() const;
 
-    void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene = 0);
+    void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene = nullptr);
     void setLayout_helper(QGraphicsLayout *l);
 
     // Layouts
@@ -189,11 +190,12 @@ public:
             , buttonMouseOver(false)
             , buttonSunken(false)
         {}
-    } *windowData;
+    };
+    std::unique_ptr<WindowData> windowData;
     void ensureWindowData();
 
     bool setWindowFrameMargins;
-    mutable qreal *windowFrameMargins;
+    mutable std::unique_ptr<QMarginsF> windowFrameMargins;
     void ensureWindowFrameMargins() const;
 
 #ifndef QT_NO_ACTION
diff --git a/src/widgets/graphicsview/qsimplex_p.cpp b/src/widgets/graphicsview/qsimplex_p.cpp
index e6ffa856f1..e18f1fa4c4 100644
--- a/src/widgets/graphicsview/qsimplex_p.cpp
+++ b/src/widgets/graphicsview/qsimplex_p.cpp
@@ -164,7 +164,7 @@ bool QSimplex::setConstraints(const QList<QSimplexConstraint *> &newConstraints)
         for (auto it = v.cbegin(), end = v.cend(); it != end; ++it)
             variablesSet.insert(it.key());
     }
-    variables = variablesSet.toList();
+    variables = variablesSet.values();
 
     // Set Variables reverse mapping
     // We also need to be able to find the index for a given variable, to do that
diff --git a/src/widgets/graphicsview/qsimplex_p.h b/src/widgets/graphicsview/qsimplex_p.h
index 369f2f5f82..a69cef6115 100644
--- a/src/widgets/graphicsview/qsimplex_p.h
+++ b/src/widgets/graphicsview/qsimplex_p.h
@@ -82,7 +82,7 @@ struct QSimplexVariable
 */
 struct QSimplexConstraint
 {
-    QSimplexConstraint() : constant(0), ratio(Equal), artificial(0) {}
+    QSimplexConstraint() : constant(0), ratio(Equal), artificial(nullptr) {}
 
     enum Ratio {
         LessOrEqual = 0,
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 7d5e014dd5..c2afed775c 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -61,6 +61,7 @@
 #include <qstyleditemdelegate.h>
 #include <private/qabstractitemview_p.h>
 #include <private/qabstractitemmodel_p.h>
+#include <private/qapplication_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qscrollbar_p.h>
 #ifndef QT_NO_ACCESSIBILITY
@@ -180,7 +181,7 @@ void QAbstractItemViewPrivate::checkMouseMove(const QPersistentModelIndex &index
             QString statustip = model->data(index, Qt::StatusTipRole).toString();
             if (parent && (shouldClearStatusTip || !statustip.isEmpty())) {
                 QStatusTipEvent tip(statustip);
-                QApplication::sendEvent(parent, &tip);
+                QCoreApplication::sendEvent(parent, &tip);
                 shouldClearStatusTip = !statustip.isEmpty();
             }
 #endif
@@ -189,7 +190,7 @@ void QAbstractItemViewPrivate::checkMouseMove(const QPersistentModelIndex &index
             if (parent && shouldClearStatusTip) {
                 QString emptyString;
                 QStatusTipEvent tip( emptyString );
-                QApplication::sendEvent(parent, &tip);
+                QCoreApplication::sendEvent(parent, &tip);
             }
 #endif
             emit q->viewportEntered();
@@ -521,7 +522,7 @@ void QAbstractItemViewPrivate::_q_scrollerStateChanged()
     the mouse was pressed on is specified by \a index. The signal is
     only emitted when the index is valid.
 
-    Use the QApplication::mouseButtons() function to get the state
+    Use the QGuiApplication::mouseButtons() function to get the state
     of the mouse buttons.
 
     \sa activated(), clicked(), doubleClicked(), entered()
@@ -1713,7 +1714,7 @@ bool QAbstractItemView::viewportEvent(QEvent *event)
         if (d->shouldClearStatusTip && d->parent) {
             QString empty;
             QStatusTipEvent tip(empty);
-            QApplication::sendEvent(d->parent, &tip);
+            QCoreApplication::sendEvent(d->parent, &tip);
             d->shouldClearStatusTip = false;
         }
     #endif
@@ -1965,6 +1966,7 @@ void QAbstractItemView::mouseDoubleClickEvent(QMouseEvent *event)
     if ((event->button() == Qt::LeftButton) && !edit(persistent, DoubleClicked, event)
         && !style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, 0, this))
         emit activated(persistent);
+    d->pressedIndex = QModelIndex();
 }
 
 #if QT_CONFIG(draganddrop)
@@ -2290,7 +2292,7 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
 #ifdef QT_KEYPAD_NAVIGATION
     switch (event->key()) {
     case Qt::Key_Select:
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             if (!hasEditFocus()) {
                 setEditFocus(true);
                 return;
@@ -2298,7 +2300,7 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
         }
         break;
     case Qt::Key_Back:
-        if (QApplication::keypadNavigationEnabled() && hasEditFocus()) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()) {
             setEditFocus(false);
         } else {
             event->ignore();
@@ -2309,7 +2311,7 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
         // Let's ignore vertical navigation events, only if there is no other widget
         // what can take the focus in vertical direction. This means widget can handle navigation events
         // even the widget don't have edit focus, and there is no other widget in requested direction.
-        if(QApplication::keypadNavigationEnabled() && !hasEditFocus()
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()
                 && QWidgetPrivate::canKeypadNavigate(Qt::Vertical)) {
             event->ignore();
             return;
@@ -2318,14 +2320,14 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
     case Qt::Key_Left:
     case Qt::Key_Right:
         // Similar logic as in up and down events
-        if(QApplication::keypadNavigationEnabled() && !hasEditFocus()
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()
                 && (QWidgetPrivate::canKeypadNavigate(Qt::Horizontal) || QWidgetPrivate::inTabWidget(this))) {
             event->ignore();
             return;
         }
         break;
     default:
-        if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
             event->ignore();
             return;
         }
@@ -2338,7 +2340,7 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
         if (d->model)
             variant = d->model->data(currentIndex(), Qt::DisplayRole);
         if (variant.type() == QVariant::String)
-            QApplication::clipboard()->setText(variant.toString());
+            QGuiApplication::clipboard()->setText(variant.toString());
         event->accept();
     }
 #endif
@@ -2413,7 +2415,8 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
     case Qt::Key_Down:
     case Qt::Key_Up:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && QWidgetPrivate::canKeypadNavigate(Qt::Vertical)) {
+        if (QApplicationPrivate::keypadNavigationEnabled()
+                && QWidgetPrivate::canKeypadNavigate(Qt::Vertical)) {
             event->accept(); // don't change focus
             break;
         }
@@ -2845,7 +2848,7 @@ void QAbstractItemView::closeEditor(QWidget *editor, QAbstractItemDelegate::EndE
         }
 
         QPointer<QWidget> ed = editor;
-        QApplication::sendPostedEvents(editor, 0);
+        QCoreApplication::sendPostedEvents(editor, 0);
         editor = ed;
 
         if (!isPersistent && editor)
@@ -3725,12 +3728,10 @@ QStyleOptionViewItem QAbstractItemView::viewOptions() const
     option.state &= ~QStyle::State_MouseOver;
     option.font = font();
 
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     // On mac the focus appearance follows window activation
     // not widget activation
     if (!hasFocus())
         option.state &= ~QStyle::State_Active;
-#endif
 
     option.state &= ~QStyle::State_HasFocus;
     if (d->iconSize.isValid()) {
@@ -3957,7 +3958,7 @@ QItemSelectionModel::SelectionFlags QAbstractItemView::selectionCommand(const QM
                 keyModifiers = (static_cast<const QInputEvent*>(event))->modifiers();
                 break;
             default:
-                keyModifiers = QApplication::keyboardModifiers();
+                keyModifiers = QGuiApplication::keyboardModifiers();
         }
     }
     switch (d->selectionMode) {
@@ -4015,7 +4016,7 @@ QItemSelectionModel::SelectionFlags QAbstractItemViewPrivate::multiSelectionComm
 QItemSelectionModel::SelectionFlags QAbstractItemViewPrivate::extendedSelectionCommand(
     const QModelIndex &index, const QEvent *event) const
 {
-    Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers();
+    Qt::KeyboardModifiers modifiers = QGuiApplication::keyboardModifiers();
     if (event) {
         switch (event->type()) {
         case QEvent::MouseMove: {
@@ -4425,7 +4426,7 @@ bool QAbstractItemViewPrivate::openEditor(const QModelIndex &index, QEvent *even
     w->setFocus();
 
     if (event)
-        QApplication::sendEvent(w->focusProxy() ? w->focusProxy() : w, event);
+        QCoreApplication::sendEvent(w->focusProxy() ? w->focusProxy() : w, event);
 
     return true;
 }
@@ -4461,15 +4462,8 @@ QPixmap QAbstractItemViewPrivate::renderToPixmap(const QModelIndexList &indexes,
     if (paintPairs.isEmpty())
         return QPixmap();
 
-    qreal scale = 1.0f;
-
-    Q_Q(const QAbstractItemView);
-    QWidget *window = q->window();
-    if (window) {
-        QWindow *windowHandle = window->windowHandle();
-        if (windowHandle)
-            scale = windowHandle->devicePixelRatio();
-    }
+    QWindow *window = windowHandle(WindowHandleMode::Closest);
+    const qreal scale = window ? window->devicePixelRatio() : qreal(1);
 
     QPixmap pixmap(r->size() * scale);
     pixmap.setDevicePixelRatio(scale);
diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h
index 7b36b1f3da..c60579255e 100644
--- a/src/widgets/itemviews/qcolumnview_p.h
+++ b/src/widgets/itemviews/qcolumnview_p.h
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
 class QColumnViewPreviewColumn : public QAbstractItemView {
 
 public:
-    explicit QColumnViewPreviewColumn(QWidget *parent) : QAbstractItemView(parent), previewWidget(0) {
+    explicit QColumnViewPreviewColumn(QWidget *parent) : QAbstractItemView(parent), previewWidget(nullptr) {
     }
 
     void setPreviewWidget(QWidget *widget) {
@@ -186,7 +186,7 @@ class QColumnViewDelegate : public QItemDelegate
 {
 
 public:
-    explicit QColumnViewDelegate(QObject *parent = 0) : QItemDelegate(parent) {}
+    explicit QColumnViewDelegate(QObject *parent = nullptr) : QItemDelegate(parent) {}
     ~QColumnViewDelegate() {}
 
     void paint(QPainter *painter,
diff --git a/src/widgets/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h
index 5eb8012204..4311edbeb4 100644
--- a/src/widgets/itemviews/qcolumnviewgrip_p.h
+++ b/src/widgets/itemviews/qcolumnviewgrip_p.h
@@ -68,12 +68,12 @@ Q_SIGNALS:
     void gripMoved(int offset);
 
 public:
-    explicit QColumnViewGrip(QWidget *parent = 0);
+    explicit QColumnViewGrip(QWidget *parent = nullptr);
     ~QColumnViewGrip();
     int moveGrip(int offset);
 
 protected:
-    QColumnViewGrip(QColumnViewGripPrivate &, QWidget *parent = 0, Qt::WindowFlags f = 0);
+    QColumnViewGrip(QColumnViewGripPrivate &, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
     void paintEvent(QPaintEvent *event) override;
     void mouseDoubleClickEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp
index b94c31fb42..13a1bbd8eb 100644
--- a/src/widgets/itemviews/qdirmodel.cpp
+++ b/src/widgets/itemviews/qdirmodel.cpp
@@ -1086,7 +1086,7 @@ QString QDirModel::filePath(const QModelIndex &index) const
     if (d->indexValid(index)) {
         QFileInfo fi = fileInfo(index);
         if (d->resolveSymlinks && fi.isSymLink())
-            fi = d->resolvedInfo(fi);
+            fi = QDirModelPrivate::resolvedInfo(fi);
         return QDir::cleanPath(fi.absoluteFilePath());
     }
     return QString(); // root path
@@ -1108,7 +1108,7 @@ QString QDirModel::fileName(const QModelIndex &index) const
     if (QFileSystemEntry::isRootPath(path))
         return path;
     if (d->resolveSymlinks && info.isSymLink())
-        info = d->resolvedInfo(info);
+        info = QDirModelPrivate::resolvedInfo(info);
     return info.fileName();
 }
 
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 1fcd5bdef2..d7bdf6aa4c 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -189,7 +189,7 @@ static const int maxSizeSection = 1048575; // since section size is in a bitfiel
     The following values are obsolete:
     \value Custom Use Fixed instead.
 
-    \sa setResizeMode(), setSectionResizeMode(), stretchLastSection, minimumSectionSize
+    \sa setSectionResizeMode(), stretchLastSection, minimumSectionSize
 */
 
 /*!
@@ -880,7 +880,7 @@ void QHeaderView::swapSections(int first, int second)
     size equal to zero is however not recommended. In that situation hideSection
     should be used instead.
 
-    \sa sectionResized(), resizeMode(), sectionSize(), hideSection()
+    \sa sectionResized(), sectionSize(), hideSection()
 */
 
 void QHeaderView::resizeSection(int logical, int size)
@@ -960,7 +960,7 @@ void QHeaderView::resizeSection(int logical, int size)
     Resizes the sections according to the given \a mode, ignoring the current
     resize mode.
 
-    \sa resizeMode(), sectionResized()
+    \sa sectionResized()
 */
 
 void QHeaderView::resizeSections(QHeaderView::ResizeMode mode)
@@ -1139,16 +1139,6 @@ void QHeaderView::setSectionsMovable(bool movable)
     d->movableSections = movable;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn void QHeaderView::setMovable(bool movable)
-
-    Use setSectionsMovable instead.
-
-    \sa setSectionsMovable()
-*/
-
 /*!
     \since 5.0
 
@@ -1167,16 +1157,6 @@ bool QHeaderView::sectionsMovable() const
     return d->movableSections;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn bool QHeaderView::isMovable() const
-
-    Use sectionsMovable instead.
-
-    \sa sectionsMovable()
-*/
-
 /*!
     \property QHeaderView::firstSectionMovable
     \brief Whether the first column can be moved by the user
@@ -1223,16 +1203,6 @@ void QHeaderView::setSectionsClickable(bool clickable)
     d->clickableSections = clickable;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn void QHeaderView::setClickable(bool clickable)
-
-    Use setSectionsClickable instead.
-
-    \sa setSectionsClickable()
-*/
-
 /*!
     \since 5.0
 
@@ -1249,16 +1219,6 @@ bool QHeaderView::sectionsClickable() const
     return d->clickableSections;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn bool QHeaderView::isClickable() const
-
-    Use sectionsClickable instead.
-
-    \sa sectionsClickable()
-*/
-
 void QHeaderView::setHighlightSections(bool highlight)
 {
     Q_D(QHeaderView);
@@ -1277,7 +1237,7 @@ bool QHeaderView::highlightSections() const
     Sets the constraints on how the header can be resized to those described
     by the given \a mode.
 
-    \sa resizeMode(), length(), sectionResized()
+    \sa length(), sectionResized()
 */
 
 void QHeaderView::setSectionResizeMode(ResizeMode mode)
@@ -1327,26 +1287,6 @@ void QHeaderView::setSectionResizeMode(int logicalIndex, ResizeMode mode)
         d->doDelayedResizeSections(); // section sizes may change as a result of the new mode
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \overload
-    \obsolete
-    \fn void QHeaderView::setResizeMode(int logicalIndex, ResizeMode mode)
-
-    Use setSectionResizeMode instead.
-
-    \sa setSectionResizeMode()
-*/
-
-/*!
-    \obsolete
-    \fn void QHeaderView::setResizeMode(ResizeMode mode)
-
-    Use setSectionResizeMode instead.
-
-    \sa setSectionResizeMode()
-*/
-
 /*!
     \since 5.0
 
@@ -1407,16 +1347,6 @@ int QHeaderView::resizeContentsPrecision() const
     return d->resizeContentsPrecision;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn QHeaderView::ResizeMode QHeaderView::resizeMode(int logicalIndex) const
-
-    Use sectionResizeMode instead.
-
-    \sa sectionResizeMode()
-*/
-
 /*!
     \since 4.1
 
@@ -1424,7 +1354,7 @@ int QHeaderView::resizeContentsPrecision() const
     views, this can be used to see if the headerview needs to resize the
     sections when the view's geometry changes.
 
-    \sa stretchLastSection, resizeMode()
+    \sa stretchLastSection
 */
 
 int QHeaderView::stretchSectionCount() const
@@ -2640,7 +2570,6 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
     if (pos < 0 && d->state != QHeaderViewPrivate::SelectSections)
         return;
     if (e->buttons() == Qt::NoButton) {
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
         // Under Cocoa, when the mouse button is released, may include an extra
         // simulated mouse moved event. The state of the buttons when this event
         // is generated is already "no button" and the code below gets executed
@@ -2648,7 +2577,6 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
         // column dragging from working. So this code is disabled under Cocoa.
         d->state = QHeaderViewPrivate::NoState;
         d->pressed = -1;
-#endif
     }
     switch (d->state) {
         case QHeaderViewPrivate::ResizeSection: {
@@ -2896,7 +2824,7 @@ bool QHeaderView::viewportEvent(QEvent *e)
     case QEvent::Wheel: {
         QAbstractScrollArea *asa = qobject_cast<QAbstractScrollArea *>(parentWidget());
         if (asa)
-            return QApplication::sendEvent(asa->viewport(), e);
+            return QCoreApplication::sendEvent(asa->viewport(), e);
         break; }
     default:
         break;
diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h
index d9fc1baec5..766adef36d 100644
--- a/src/widgets/itemviews/qheaderview_p.h
+++ b/src/widgets/itemviews/qheaderview_p.h
@@ -102,7 +102,7 @@ public:
           lastSectionLogicalIdx(-1), // Only trust when we stretch last section
           sectionIndicatorOffset(0),
 #if QT_CONFIG(label)
-          sectionIndicator(0),
+          sectionIndicator(nullptr),
 #endif
           globalResizeMode(QHeaderView::Interactive),
           sectionStartposRecalc(true),
diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
index 2d49dd4421..8ed2ee5f28 100644
--- a/src/widgets/itemviews/qitemeditorfactory.cpp
+++ b/src/widgets/itemviews/qitemeditorfactory.cpp
@@ -570,11 +570,9 @@ void QExpandingLineEdit::changeEvent(QEvent *e)
 
 void QExpandingLineEdit::updateMinimumWidth()
 {
-    int left, right;
-    getTextMargins(&left, 0, &right, 0);
-    int width = left + right + 4 /*horizontalMargin in qlineedit.cpp*/;
-    getContentsMargins(&left, 0, &right, 0);
-    width += left + right;
+    const QMargins tm = textMargins();
+    const QMargins cm = contentsMargins();
+    const int width = tm.left() + tm.right() + cm.left() + cm.right() + 4 /*horizontalMargin in qlineedit.cpp*/;
 
     QStyleOptionFrame opt;
     initStyleOption(&opt);
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index 568084640a..04cddf2926 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -54,6 +54,7 @@
 #if QT_CONFIG(rubberband)
 #include <qrubberband.h>
 #endif
+#include <private/qapplication_p.h>
 #include <private/qlistview_p.h>
 #include <private/qscrollbar_p.h>
 #include <qdebug.h>
@@ -810,24 +811,24 @@ void QListView::mouseReleaseEvent(QMouseEvent *e)
 void QListView::wheelEvent(QWheelEvent *e)
 {
     Q_D(QListView);
-    if (e->orientation() == Qt::Vertical) {
+    if (qAbs(e->angleDelta().y()) > qAbs(e->angleDelta().x())) {
         if (e->angleDelta().x() == 0
-            && ((d->flow == TopToBottom && d->wrap) || (d->flow == LeftToRight && !d->wrap))
-            && d->vbar->minimum() == 0 && d->vbar->maximum() == 0) {
+                && ((d->flow == TopToBottom && d->wrap) || (d->flow == LeftToRight && !d->wrap))
+                && d->vbar->minimum() == 0 && d->vbar->maximum() == 0) {
             QPoint pixelDelta(e->pixelDelta().y(), e->pixelDelta().x());
             QPoint angleDelta(e->angleDelta().y(), e->angleDelta().x());
-            QWheelEvent hwe(e->pos(), e->globalPos(), pixelDelta, angleDelta, e->delta(),
-                            Qt::Horizontal, e->buttons(), e->modifiers(), e->phase(), e->source(), e->inverted());
+            QWheelEvent hwe(e->position(), e->globalPosition(), pixelDelta, angleDelta,
+                            e->buttons(), e->modifiers(), e->phase(), e->inverted(), e->source());
             if (e->spontaneous())
                 qt_sendSpontaneousEvent(d->hbar, &hwe);
             else
-                QApplication::sendEvent(d->hbar, &hwe);
+                QCoreApplication::sendEvent(d->hbar, &hwe);
             e->setAccepted(hwe.isAccepted());
         } else {
-            QApplication::sendEvent(d->vbar, e);
+            QCoreApplication::sendEvent(d->vbar, e);
         }
     } else {
-        QApplication::sendEvent(d->hbar, e);
+        QCoreApplication::sendEvent(d->hbar, e);
     }
 }
 #endif // QT_CONFIG(wheelevent)
@@ -1185,7 +1186,7 @@ QModelIndex QListView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
             rect.translate(0, -rect.height());
             if (rect.bottom() <= 0) {
 #ifdef QT_KEYPAD_NAVIGATION
-                if (QApplication::keypadNavigationEnabled()) {
+                if (QApplicationPrivate::keypadNavigationEnabled()) {
                     int row = d->batchStartRow() - 1;
                     while (row >= 0 && d->isHiddenOrDisabled(row))
                         --row;
@@ -1214,7 +1215,7 @@ QModelIndex QListView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
             rect.translate(0, rect.height());
             if (rect.top() >= contents.height()) {
 #ifdef QT_KEYPAD_NAVIGATION
-                if (QApplication::keypadNavigationEnabled()) {
+                if (QApplicationPrivate::keypadNavigationEnabled()) {
                     int rowCount = d->model->rowCount(d->root);
                     int row = 0;
                     while (row < rowCount && d->isHiddenOrDisabled(row))
diff --git a/src/widgets/itemviews/qlistview_p.h b/src/widgets/itemviews/qlistview_p.h
index c6810f8fdc..86331bb862 100644
--- a/src/widgets/itemviews/qlistview_p.h
+++ b/src/widgets/itemviews/qlistview_p.h
@@ -248,7 +248,7 @@ private:
 class QIconModeViewBase : public QCommonListViewBase
 {
 public:
-    QIconModeViewBase(QListView *q, QListViewPrivate *d) : QCommonListViewBase(q, d), interSectingVector(0) {}
+    QIconModeViewBase(QListView *q, QListViewPrivate *d) : QCommonListViewBase(q, d), interSectingVector(nullptr) {}
 
     QBspTree tree;
     QVector<QListViewItem> items;
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index 37bb370e73..e7dcfac403 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -930,12 +930,14 @@ QDataStream &operator>>(QDataStream &in, QListWidgetItem &item)
     \sa Qt::AlignmentFlag
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn QColor QListWidgetItem::backgroundColor() const
     \obsolete
 
     This function is deprecated. Use background() instead.
 */
+#endif
 
 /*!
     \fn QBrush QListWidgetItem::background() const
@@ -946,6 +948,7 @@ QDataStream &operator>>(QDataStream &in, QListWidgetItem &item)
     \sa setBackground(), foreground()
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn QColor QListWidgetItem::textColor() const
     \obsolete
@@ -954,6 +957,7 @@ QDataStream &operator>>(QDataStream &in, QListWidgetItem &item)
 
     This function is deprecated. Use foreground() instead.
 */
+#endif
 
 /*!
     \fn QBrush QListWidgetItem::foreground() const
@@ -1119,12 +1123,14 @@ void QListWidgetItem::setFlags(Qt::ItemFlags aflags)
     \sa background(), setForeground()
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn void QListWidgetItem::setTextColor(const QColor &color)
     \obsolete
 
     This function is deprecated. Use setForeground() instead.
 */
+#endif
 
 /*!
     \fn void QListWidgetItem::setForeground(const QBrush &brush)
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index b05662f6bc..c50156bbce 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -51,6 +51,7 @@
 #if QT_CONFIG(abstractbutton)
 #include <qabstractbutton.h>
 #endif
+#include <private/qapplication_p.h>
 #include <private/qtableview_p.h>
 #include <private/qheaderview_p.h>
 #include <private/qscrollbar_p.h>
@@ -58,6 +59,8 @@
 #include <qaccessible.h>
 #endif
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 /** \internal
@@ -65,7 +68,7 @@ QT_BEGIN_NAMESPACE
   */
 void QSpanCollection::addSpan(QSpanCollection::Span *span)
 {
-    spans.append(span);
+    spans.push_back(span);
     Index::iterator it_y = index.lowerBound(-span->top());
     if (it_y == index.end() || it_y.key() != -span->top()) {
         //there is no spans that starts with the row in the index, so create a sublist for it.
@@ -132,7 +135,7 @@ void QSpanCollection::updateSpan(QSpanCollection::Span *span, int old_height)
     }
 
     if (span->width() == 0 && span->height() == 0) {
-        spans.removeOne(span);
+        spans.remove(span);
         delete span;
     }
 }
@@ -169,7 +172,7 @@ void QSpanCollection::clear()
 /** \internal
  * return a list to all the spans that spans over cells in the given rectangle
  */
-QList<QSpanCollection::Span *> QSpanCollection::spansInRect(int x, int y, int w, int h) const
+QSet<QSpanCollection::Span *> QSpanCollection::spansInRect(int x, int y, int w, int h) const
 {
     QSet<Span *> list;
     Index::const_iterator it_y = index.lowerBound(-y);
@@ -191,7 +194,7 @@ QList<QSpanCollection::Span *> QSpanCollection::spansInRect(int x, int y, int w,
             break;
         --it_y;
     }
-    return list.toList();
+    return list;
 }
 
 #undef DEBUG_SPAN_UPDATE
@@ -210,17 +213,16 @@ QDebug operator<<(QDebug str, const QSpanCollection::Span &span)
 void QSpanCollection::updateInsertedRows(int start, int end)
 {
 #ifdef DEBUG_SPAN_UPDATE
-    qDebug() << start << end << endl << index;
+    qDebug() << start << end << Qt::endl << index;
 #endif
-    if (spans.isEmpty())
+    if (spans.empty())
         return;
 
     int delta = end - start + 1;
 #ifdef DEBUG_SPAN_UPDATE
     qDebug("Before");
 #endif
-    for (SpanList::iterator it = spans.begin(); it != spans.end(); ++it) {
-        Span *span = *it;
+    for (Span *span : spans) {
 #ifdef DEBUG_SPAN_UPDATE
         qDebug() << span << *span;
 #endif
@@ -258,17 +260,16 @@ void QSpanCollection::updateInsertedRows(int start, int end)
 void QSpanCollection::updateInsertedColumns(int start, int end)
 {
 #ifdef DEBUG_SPAN_UPDATE
-    qDebug() << start << end << endl << index;
+    qDebug() << start << end << Qt::endl << index;
 #endif
-    if (spans.isEmpty())
+    if (spans.empty())
         return;
 
     int delta = end - start + 1;
 #ifdef DEBUG_SPAN_UPDATE
     qDebug("Before");
 #endif
-    for (SpanList::iterator it = spans.begin(); it != spans.end(); ++it) {
-        Span *span = *it;
+    for (Span *span : spans) {
 #ifdef DEBUG_SPAN_UPDATE
         qDebug() << span << *span;
 #endif
@@ -339,9 +340,9 @@ bool QSpanCollection::cleanSpanSubIndex(QSpanCollection::SubIndex &subindex, int
 void QSpanCollection::updateRemovedRows(int start, int end)
 {
 #ifdef DEBUG_SPAN_UPDATE
-    qDebug() << start << end << endl << index;
+    qDebug() << start << end << Qt::endl << index;
 #endif
-    if (spans.isEmpty())
+    if (spans.empty())
         return;
 
     SpanList spansToBeDeleted;
@@ -377,7 +378,7 @@ void QSpanCollection::updateRemovedRows(int start, int end)
         if (span->m_top == span->m_bottom && span->m_left == span->m_right)
             span->will_be_deleted = true;
         if (span->will_be_deleted) {
-            spansToBeDeleted.append(span);
+            spansToBeDeleted.push_back(span);
             it = spans.erase(it);
         } else {
             ++it;
@@ -389,7 +390,7 @@ void QSpanCollection::updateRemovedRows(int start, int end)
     foreach (QSpanCollection::Span *span, spans)
         qDebug() << span << *span;
 #endif
-    if (spans.isEmpty()) {
+    if (spans.empty()) {
         qDeleteAll(spansToBeDeleted);
         index.clear();
         return;
@@ -466,9 +467,9 @@ void QSpanCollection::updateRemovedRows(int start, int end)
 void QSpanCollection::updateRemovedColumns(int start, int end)
 {
 #ifdef DEBUG_SPAN_UPDATE
-    qDebug() << start << end << endl << index;
+    qDebug() << start << end << Qt::endl << index;
 #endif
-    if (spans.isEmpty())
+    if (spans.empty())
         return;
 
     SpanList toBeDeleted;
@@ -504,7 +505,7 @@ void QSpanCollection::updateRemovedColumns(int start, int end)
         if (span->m_top == span->m_bottom && span->m_left == span->m_right)
             span->will_be_deleted = true;
         if (span->will_be_deleted) {
-            toBeDeleted.append(span);
+            toBeDeleted.push_back(span);
             it = spans.erase(it);
         } else {
             ++it;
@@ -516,7 +517,7 @@ void QSpanCollection::updateRemovedColumns(int start, int end)
     foreach (QSpanCollection::Span *span, spans)
         qDebug() << span << *span;
 #endif
-    if (spans.isEmpty()) {
+    if (spans.empty()) {
         qDeleteAll(toBeDeleted);
         index.clear();
         return;
@@ -552,13 +553,13 @@ bool QSpanCollection::checkConsistency() const
         for (SubIndex::const_iterator it = subIndex.begin(); it != subIndex.end(); ++it) {
             int x = -it.key();
             Span *span = it.value();
-            if (!spans.contains(span) || span->left() != x
-                || y < span->top() || y > span->bottom())
+            const bool contains = std::find(spans.begin(), spans.end(), span) != spans.end();
+            if (!contains || span->left() != x || y < span->top() || y > span->bottom())
                 return false;
         }
     }
 
-    foreach (const Span *span, spans) {
+    for (const Span *span : spans) {
         if (span->width() < 1 || span->height() < 1
             || (span->width() == 1 && span->height() == 1))
             return false;
@@ -863,19 +864,17 @@ void QTableViewPrivate::drawAndClipSpans(const QRegion &area, QPainter *painter,
     bool alternateBase = false;
     QRegion region = viewport->rect();
 
-    QList<QSpanCollection::Span *> visibleSpans;
+    QSet<QSpanCollection::Span *> visibleSpans;
     bool sectionMoved = verticalHeader->sectionsMoved() || horizontalHeader->sectionsMoved();
 
     if (!sectionMoved) {
         visibleSpans = spans.spansInRect(logicalColumn(firstVisualColumn), logicalRow(firstVisualRow),
                                          lastVisualColumn - firstVisualColumn + 1, lastVisualRow - firstVisualRow + 1);
     } else {
-        QSet<QSpanCollection::Span *> set;
         for(int x = firstVisualColumn; x <= lastVisualColumn; x++)
             for(int y = firstVisualRow; y <= lastVisualRow; y++)
-                set.insert(spans.spanAt(x,y));
-        set.remove(0);
-        visibleSpans = set.toList();
+                visibleSpans.insert(spans.spanAt(x,y));
+        visibleSpans.remove(nullptr);
     }
 
     for (QSpanCollection::Span *span : qAsConst(visibleSpans)) {
@@ -1712,7 +1711,7 @@ QModelIndex QTableView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifi
     case MoveUp: {
         int originalRow = visualRow;
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && visualRow == 0)
+        if (QApplicationPrivate::keypadNavigationEnabled() && visualRow == 0)
             visualRow = d->visualRow(model()->rowCount() - 1) + 1;
             // FIXME? visualRow = bottom + 1;
 #endif
@@ -1741,7 +1740,7 @@ QModelIndex QTableView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifi
             visualRow = d->visualRow(d->rowSpanEndLogical(span.top(), span.height()));
         }
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && visualRow >= bottom)
+        if (QApplicationPrivate::keypadNavigationEnabled() && visualRow >= bottom)
             visualRow = -1;
 #endif
         int r = d->logicalRow(visualRow);
@@ -1925,7 +1924,7 @@ void QTableView::setSelection(const QRect &rect, QItemSelectionModel::SelectionF
         int right = qMax(d->visualColumn(tl.column()), d->visualColumn(br.column()));
         do {
             expanded = false;
-            foreach (QSpanCollection::Span *it, d->spans.spans) {
+            for (QSpanCollection::Span *it : d->spans.spans) {
                 const QSpanCollection::Span &span = *it;
                 int t = d->visualRow(span.top());
                 int l = d->visualColumn(span.left());
diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h
index d55462c28b..8f174351d2 100644
--- a/src/widgets/itemviews/qtableview_p.h
+++ b/src/widgets/itemviews/qtableview_p.h
@@ -53,12 +53,13 @@
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/QList>
-#include <QtCore/QLinkedList>
 #include <QtCore/QMap>
 #include <QtCore/QSet>
 #include <QtCore/QDebug>
 #include "private/qabstractitemview_p.h"
 
+#include <list>
+
 QT_REQUIRE_CONFIG(tableview);
 
 QT_BEGIN_NAMESPACE
@@ -104,7 +105,7 @@ public:
     void updateSpan(Span *span, int old_height);
     Span *spanAt(int x, int y) const;
     void clear();
-    QList<Span *> spansInRect(int x, int y, int w, int h) const;
+    QSet<Span *> spansInRect(int x, int y, int w, int h) const;
 
     void updateInsertedRows(int start, int end);
     void updateInsertedColumns(int start, int end);
@@ -115,7 +116,7 @@ public:
     bool checkConsistency() const;
 #endif
 
-    typedef QLinkedList<Span *> SpanList;
+    typedef std::list<Span *> SpanList;
     SpanList spans; //lists of all spans
 private:
     //the indexes are negative so the QMap::lowerBound do what i need.
@@ -137,7 +138,7 @@ public:
         : showGrid(true), gridStyle(Qt::SolidLine),
           rowSectionAnchor(-1), columnSectionAnchor(-1),
           columnResizeTimerID(0), rowResizeTimerID(0),
-          horizontalHeader(0), verticalHeader(0),
+          horizontalHeader(nullptr), verticalHeader(nullptr),
           sortingEnabled(false), geometryRecursionBlock(false),
           visualCursor(QPoint())
  {
@@ -210,7 +211,7 @@ public:
         return span(row, column).width();
     }
     inline bool hasSpans() const {
-        return !spans.spans.isEmpty();
+        return !spans.spans.empty();
     }
     inline int rowSpanHeight(int row, int span) const {
         return sectionSpanSize(verticalHeader, row, span);
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index 0fb9e28385..a25a582881 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -1251,6 +1251,7 @@ void QTableWidgetItem::setFlags(Qt::ItemFlags aflags)
     \sa font(), setText(), setForeground()
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn QColor QTableWidgetItem::backgroundColor() const
     \obsolete
@@ -1264,6 +1265,7 @@ void QTableWidgetItem::setFlags(Qt::ItemFlags aflags)
 
     This function is deprecated. Use setBackground() instead.
 */
+#endif
 
 /*!
     \fn QBrush QTableWidgetItem::background() const
@@ -1283,6 +1285,7 @@ void QTableWidgetItem::setFlags(Qt::ItemFlags aflags)
     \sa setForeground()
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn QColor QTableWidgetItem::textColor() const
     \obsolete
@@ -1296,6 +1299,7 @@ void QTableWidgetItem::setFlags(Qt::ItemFlags aflags)
 
     This function is deprecated. Use setForeground() instead.
 */
+#endif
 
 /*!
     \fn QBrush QTableWidgetItem::foreground() const
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index e9228edcda..413cc2a9cd 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -55,6 +55,7 @@
 #include <qaccessible.h>
 #endif
 
+#include <private/qapplication_p.h>
 #include <private/qtreeview_p.h>
 #include <private/qheaderview_p.h>
 
@@ -1942,6 +1943,7 @@ void QTreeView::mouseDoubleClickEvent(QMouseEvent *event)
         if (!style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, 0, this))
             emit activated(persistent);
 
+        d->pressedIndex = QModelIndex();
         d->executePostedLayout(); // we need to make sure viewItems is updated
         if (d->itemsExpandable
             && d->expandsOnDoubleClick
@@ -2172,35 +2174,6 @@ QModelIndex QTreeView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
         return QModelIndex();
     }
     int vi = -1;
-#if 0 /* Used to be included in Qt4 for Q_WS_MAC */ && QT_CONFIG(style_mac)
-    // Selection behavior is slightly different on the Mac.
-    if (d->selectionMode == QAbstractItemView::ExtendedSelection
-        && d->selectionModel
-        && d->selectionModel->hasSelection()) {
-
-        const bool moveUpDown = (cursorAction == MoveUp || cursorAction == MoveDown);
-        const bool moveNextPrev = (cursorAction == MoveNext || cursorAction == MovePrevious);
-        const bool contiguousSelection = moveUpDown && (modifiers & Qt::ShiftModifier);
-
-        // Use the outermost index in the selection as the current index
-        if (!contiguousSelection && (moveUpDown || moveNextPrev)) {
-
-            // Find outermost index.
-            const bool useTopIndex = (cursorAction == MoveUp || cursorAction == MovePrevious);
-            int index = useTopIndex ? INT_MAX : INT_MIN;
-            const QItemSelection selection = d->selectionModel->selection();
-            for (int i = 0; i < selection.count(); ++i) {
-                const QItemSelectionRange &range = selection.at(i);
-                int candidate = d->viewIndex(useTopIndex ? range.topLeft() : range.bottomRight());
-                if (candidate >= 0)
-                    index = useTopIndex ? qMin(index, candidate) : qMax(index, candidate);
-            }
-
-            if (index >= 0 && index < INT_MAX)
-                vi = index;
-        }
-    }
-#endif
     if (vi < 0)
         vi = qMax(0, d->viewIndex(current));
 
@@ -2214,14 +2187,14 @@ QModelIndex QTreeView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
     case MoveNext:
     case MoveDown:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (vi == d->viewItems.count()-1 && QApplication::keypadNavigationEnabled())
+        if (vi == d->viewItems.count()-1 && QApplicationPrivate::keypadNavigationEnabled())
             return d->model->index(0, current.column(), d->root);
 #endif
         return d->modelIndex(d->below(vi), current.column());
     case MovePrevious:
     case MoveUp:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (vi == 0 && QApplication::keypadNavigationEnabled())
+        if (vi == 0 && QApplicationPrivate::keypadNavigationEnabled())
             return d->modelIndex(d->viewItems.count() - 1, current.column());
 #endif
         return d->modelIndex(d->above(vi), current.column());
diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h
index e9cc1beedb..bb00f1df07 100644
--- a/src/widgets/itemviews/qtreeview.h
+++ b/src/widgets/itemviews/qtreeview.h
@@ -158,7 +158,7 @@ public Q_SLOTS:
     void collapse(const QModelIndex &index);
     void resizeColumnToContents(int column);
 #if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X ("Use QTreeeView::sortByColumn(int column, Qt::SortOrder order) instead")
+    QT_DEPRECATED_X ("Use QTreeView::sortByColumn(int column, Qt::SortOrder order) instead")
     void sortByColumn(int column);
 #endif
     void sortByColumn(int column, Qt::SortOrder order);
diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h
index 9666a9f8c2..836d8f0c2d 100644
--- a/src/widgets/itemviews/qtreeview_p.h
+++ b/src/widgets/itemviews/qtreeview_p.h
@@ -87,7 +87,7 @@ public:
 
     QTreeViewPrivate()
         : QAbstractItemViewPrivate(),
-          header(0), indent(20), lastViewedItem(0), defaultItemHeight(-1),
+          header(nullptr), indent(20), lastViewedItem(0), defaultItemHeight(-1),
           uniformRowHeights(false), rootDecoration(true),
           itemsExpandable(true), sortingEnabled(false),
           expandsOnDoubleClick(true),
@@ -157,7 +157,7 @@ public:
     bool checkViewItems() const;
 #endif
 
-    int firstVisibleItem(int *offset = 0) const;
+    int firstVisibleItem(int *offset = nullptr) const;
     int lastVisibleItem(int firstVisual = -1, int offset = -1) const;
     int columnAt(int x) const;
     bool hasVisibleChildren( const QModelIndex& parent) const;
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index be7ddd8b30..a2d6e7798d 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -1254,6 +1254,7 @@ bool QTreeWidgetItem::isFirstColumnSpanned() const
     \sa font(), setText(), setForeground()
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn QColor QTreeWidgetItem::backgroundColor(int column) const
     \obsolete
@@ -1267,6 +1268,7 @@ bool QTreeWidgetItem::isFirstColumnSpanned() const
 
     This function is deprecated. Use setBackground() instead.
 */
+#endif
 
 /*!
     \fn QBrush QTreeWidgetItem::background(int column) const
@@ -1287,6 +1289,7 @@ bool QTreeWidgetItem::isFirstColumnSpanned() const
     \sa setForeground()
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn QColor QTreeWidgetItem::textColor(int column) const
     \obsolete
@@ -1300,6 +1303,7 @@ bool QTreeWidgetItem::isFirstColumnSpanned() const
 
     This function is deprecated. Use setForeground() instead.
 */
+#endif
 
 /*!
     \fn QBrush QTreeWidgetItem::foreground(int column) const
diff --git a/src/widgets/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h
index ee4a633468..81e7e86203 100644
--- a/src/widgets/itemviews/qtreewidget_p.h
+++ b/src/widgets/itemviews/qtreewidget_p.h
@@ -78,7 +78,7 @@ class QTreeModel : public QAbstractItemModel
     friend class QTreeWidgetItemIteratorPrivate;
 
 public:
-    explicit QTreeModel(int columns = 0, QTreeWidget *parent = 0);
+    explicit QTreeModel(int columns = 0, QTreeWidget *parent = nullptr);
     ~QTreeModel();
 
     inline QTreeWidget *view() const
@@ -140,7 +140,7 @@ public:
     { return createIndex(row, col, item); }
 
 protected:
-    QTreeModel(QTreeModelPrivate &, QTreeWidget *parent = 0);
+    QTreeModel(QTreeModelPrivate &, QTreeWidget *parent = nullptr);
     void emitDataChanged(QTreeWidgetItem *item, int column, const QVector<int> &roles);
     void beginInsertItems(QTreeWidgetItem *parent, int row, int count);
     void endInsertItems();
diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index c2f6e4ce75..693af7eb80 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -12,7 +12,7 @@ HEADERS += \
 	kernel/qactiongroup.h \
 	kernel/qapplication.h \
 	kernel/qapplication_p.h \
-        kernel/qwidgetbackingstore_p.h \
+        kernel/qwidgetrepaintmanager_p.h \
 	kernel/qboxlayout.h \
 	kernel/qdesktopwidget.h \
 	kernel/qgridlayout.h \
@@ -23,7 +23,6 @@ HEADERS += \
         kernel/qshortcut.h \
 	kernel/qsizepolicy.h \
         kernel/qstackedlayout.h \
-	kernel/qtooltip.h \
         kernel/qwidget.h \
         kernel/qwidget_p.h \
 	kernel/qwidgetaction.h \
@@ -42,7 +41,7 @@ SOURCES += \
 	kernel/qaction.cpp \
 	kernel/qactiongroup.cpp \
 	kernel/qapplication.cpp \
-        kernel/qwidgetbackingstore.cpp \
+        kernel/qwidgetrepaintmanager.cpp \
         kernel/qboxlayout.cpp \
 	kernel/qgridlayout.cpp \
         kernel/qlayout.cpp \
@@ -51,7 +50,6 @@ SOURCES += \
         kernel/qshortcut.cpp \
         kernel/qsizepolicy.cpp \
         kernel/qstackedlayout.cpp \
-	kernel/qtooltip.cpp \
 	kernel/qwidget.cpp \
 	kernel/qwidgetaction.cpp \
 	kernel/qgesture.cpp \
@@ -79,6 +77,11 @@ qtConfig(formlayout) {
     SOURCES += kernel/qformlayout.cpp
 }
 
+qtConfig(tooltip) {
+    HEADERS += kernel/qtooltip.h
+    SOURCES += kernel/qtooltip.cpp
+}
+
 qtConfig(whatsthis) {
     HEADERS += kernel/qwhatsthis.h
     SOURCES += kernel/qwhatsthis.cpp
diff --git a/src/widgets/kernel/mac.pri b/src/widgets/kernel/mac.pri
index f7e7aa869a..d21e5d4a74 100644
--- a/src/widgets/kernel/mac.pri
+++ b/src/widgets/kernel/mac.pri
@@ -1,4 +1 @@
-macos {
-   LIBS_PRIVATE += -framework AppKit -lz
-   *-mwerks:INCLUDEPATH += compat
-}
+macos: LIBS_PRIVATE += -framework AppKit -lz
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp
index 1ca5514655..19ad65692b 100644
--- a/src/widgets/kernel/qaction.cpp
+++ b/src/widgets/kernel/qaction.cpp
@@ -47,15 +47,15 @@
 #include "qlist.h"
 #include "qstylehints.h"
 #include <private/qshortcutmap_p.h>
-#include <private/qapplication_p.h>
+#include <private/qguiapplication_p.h>
 #if QT_CONFIG(menu)
 #include <private/qmenu_p.h>
 #endif
 #include <private/qdebug_p.h>
 
 #define QAPP_CHECK(functionName) \
-    if (Q_UNLIKELY(!qApp)) { \
-        qWarning("QAction: Initialize QApplication before calling '" functionName "'."); \
+    if (Q_UNLIKELY(!QCoreApplication::instance())) { \
+        qWarning("QAction: Initialize Q(Gui)Application before calling '" functionName "'."); \
         return; \
     }
 
@@ -75,24 +75,18 @@ static QString qt_strippedText(QString s)
 }
 
 
-QActionPrivate::QActionPrivate() : group(0), enabled(1), forceDisabled(0),
-                                   visible(1), forceInvisible(0), checkable(0), checked(0), separator(0), fontSet(false),
-                                   iconVisibleInMenu(-1),
-                                   shortcutVisibleInContextMenu(-1),
-                                   menuRole(QAction::TextHeuristicRole),
-                                   priority(QAction::NormalPriority)
-{
-#ifndef QT_NO_SHORTCUT
-    shortcutId = 0;
-    shortcutContext = Qt::WindowShortcut;
-    autorepeat = true;
+QActionPrivate::QActionPrivate() :
+#if QT_CONFIG(shortcut)
+    autorepeat(1),
 #endif
-}
-
-QActionPrivate::~QActionPrivate()
+    enabled(1), forceDisabled(0), visible(1), forceInvisible(0), checkable(0),
+    checked(0), separator(0), fontSet(false),
+    iconVisibleInMenu(-1), shortcutVisibleInContextMenu(-1)
 {
 }
 
+QActionPrivate::~QActionPrivate() = default;
+
 bool QActionPrivate::showStatusText(QWidget *widget, const QString &str)
 {
 #if !QT_CONFIG(statustip)
@@ -101,7 +95,7 @@ bool QActionPrivate::showStatusText(QWidget *widget, const QString &str)
 #else
     if(QObject *object = widget ? widget : parent) {
         QStatusTipEvent tip(str);
-        QApplication::sendEvent(object, &tip);
+        QCoreApplication::sendEvent(object, &tip);
         return true;
     }
 #endif
@@ -114,20 +108,20 @@ void QActionPrivate::sendDataChanged()
     QActionEvent e(QEvent::ActionChanged, q);
     for (int i = 0; i < widgets.size(); ++i) {
         QWidget *w = widgets.at(i);
-        QApplication::sendEvent(w, &e);
+        QCoreApplication::sendEvent(w, &e);
     }
 #if QT_CONFIG(graphicsview)
     for (int i = 0; i < graphicsWidgets.size(); ++i) {
         QGraphicsWidget *w = graphicsWidgets.at(i);
-        QApplication::sendEvent(w, &e);
+        QCoreApplication::sendEvent(w, &e);
     }
 #endif
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 
     emit q->changed();
 }
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 void QActionPrivate::redoGrab(QShortcutMap &map)
 {
     Q_Q(QAction);
@@ -345,7 +339,7 @@ QWidget *QAction::parentWidget() const
     QObject *ret = parent();
     while (ret && !ret->isWidgetType())
         ret = ret->parent();
-    return (QWidget*)ret;
+    return static_cast<QWidget*>(ret);
 }
 
 /*!
@@ -374,7 +368,7 @@ QList<QGraphicsWidget *> QAction::associatedGraphicsWidgets() const
 }
 #endif
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 /*!
     \property QAction::shortcut
     \brief the action's primary shortcut key
@@ -391,7 +385,7 @@ void QAction::setShortcut(const QKeySequence &shortcut)
         return;
 
     d->shortcut = shortcut;
-    d->redoGrab(qApp->d_func()->shortcutMap);
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
     d->sendDataChanged();
 }
 
@@ -420,8 +414,8 @@ void QAction::setShortcuts(const QList<QKeySequence> &shortcuts)
 
     d->shortcut = primary;
     d->alternateShortcuts = listCopy;
-    d->redoGrab(qApp->d_func()->shortcutMap);
-    d->redoGrabAlternate(qApp->d_func()->shortcutMap);
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
     d->sendDataChanged();
 }
 
@@ -485,8 +479,8 @@ void QAction::setShortcutContext(Qt::ShortcutContext context)
         return;
     QAPP_CHECK("setShortcutContext");
     d->shortcutContext = context;
-    d->redoGrab(qApp->d_func()->shortcutMap);
-    d->redoGrabAlternate(qApp->d_func()->shortcutMap);
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
     d->sendDataChanged();
 }
 
@@ -513,8 +507,8 @@ void QAction::setAutoRepeat(bool on)
         return;
     QAPP_CHECK("setAutoRepeat");
     d->autorepeat = on;
-    d->redoGrab(qApp->d_func()->shortcutMap);
-    d->redoGrabAlternate(qApp->d_func()->shortcutMap);
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
     d->sendDataChanged();
 }
 
@@ -573,12 +567,12 @@ QAction::~QAction()
 #endif
     if (d->group)
         d->group->removeAction(this);
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     if (d->shortcutId && qApp) {
-        qApp->d_func()->shortcutMap.removeShortcut(d->shortcutId, this);
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(d->shortcutId, this);
         for(int i = 0; i < d->alternateShortcutIds.count(); ++i) {
             const int id = d->alternateShortcutIds.at(i);
-            qApp->d_func()->shortcutMap.removeShortcut(id, this);
+            QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(id, this);
         }
     }
 #endif
@@ -1027,8 +1021,8 @@ void QAction::setEnabled(bool b)
         return;
     QAPP_CHECK("setEnabled");
     d->enabled = b;
-#ifndef QT_NO_SHORTCUT
-    d->setShortcutEnabled(b, qApp->d_func()->shortcutMap);
+#if QT_CONFIG(shortcut)
+    d->setShortcutEnabled(b, QGuiApplicationPrivate::instance()->shortcutMap);
 #endif
     d->sendDataChanged();
 }
@@ -1061,8 +1055,8 @@ void QAction::setVisible(bool b)
     d->forceInvisible = !b;
     d->visible = b;
     d->enabled = b && !d->forceDisabled && (!d->group || d->group->isEnabled()) ;
-#ifndef QT_NO_SHORTCUT
-    d->setShortcutEnabled(d->enabled, qApp->d_func()->shortcutMap);
+#if QT_CONFIG(shortcut)
+    d->setShortcutEnabled(d->enabled, QGuiApplicationPrivate::instance()->shortcutMap);
 #endif
     d->sendDataChanged();
 }
@@ -1080,7 +1074,7 @@ bool QAction::isVisible() const
 bool
 QAction::event(QEvent *e)
 {
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     if (e->type() == QEvent::Shortcut) {
         QShortcutEvent *se = static_cast<QShortcutEvent *>(e);
         Q_ASSERT_X(se->key() == d_func()->shortcut || d_func()->alternateShortcuts.contains(se->key()),
@@ -1153,8 +1147,9 @@ void QAction::activate(ActionEvent event)
     if(event == Trigger) {
         QPointer<QObject> guard = this;
         if(d->checkable) {
-            // the checked action of an exclusive group cannot be  unchecked
-            if (d->checked && (d->group && d->group->isExclusive()
+            // the checked action of an exclusive group may not be unchecked
+            if (d->checked && (d->group
+                               && d->group->exclusionPolicy() == QActionGroup::ExclusionPolicy::Exclusive
                                && d->group->checkedAction() == this)) {
                 if (!guard.isNull())
                     emit triggered(true);
@@ -1284,7 +1279,7 @@ void QAction::setIconVisibleInMenu(bool visible)
         d->iconVisibleInMenu = visible;
         // Only send data changed if we really need to.
         if (oldValue != -1
-            || visible == !QApplication::instance()->testAttribute(Qt::AA_DontShowIconsInMenus)) {
+            || visible == !QCoreApplication::testAttribute(Qt::AA_DontShowIconsInMenus)) {
             d->sendDataChanged();
         }
     }
@@ -1294,7 +1289,7 @@ bool QAction::isIconVisibleInMenu() const
 {
     Q_D(const QAction);
     if (d->iconVisibleInMenu == -1) {
-        return !QApplication::instance()->testAttribute(Qt::AA_DontShowIconsInMenus);
+        return !QCoreApplication::testAttribute(Qt::AA_DontShowIconsInMenus);
     }
     return d->iconVisibleInMenu;
 }
@@ -1322,7 +1317,7 @@ void QAction::setShortcutVisibleInContextMenu(bool visible)
         d->shortcutVisibleInContextMenu = visible;
         // Only send data changed if we really need to.
         if (oldValue != -1
-            || visible == !QApplication::instance()->testAttribute(Qt::AA_DontShowShortcutsInContextMenus)) {
+            || visible == !QCoreApplication::testAttribute(Qt::AA_DontShowShortcutsInContextMenus)) {
             d->sendDataChanged();
         }
     }
@@ -1350,7 +1345,7 @@ Q_WIDGETS_EXPORT QDebug operator<<(QDebug d, const QAction *action)
             d << " toolTip=" << action->toolTip();
         if (action->isCheckable())
             d << " checked=" << action->isChecked();
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
         if (!action->shortcut().isEmpty())
             d << " shortcut=" << action->shortcut();
 #endif
diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h
index 84bf92d2ac..f7693f4dde 100644
--- a/src/widgets/kernel/qaction.h
+++ b/src/widgets/kernel/qaction.h
@@ -72,7 +72,7 @@ class Q_WIDGETS_EXPORT QAction : public QObject
     Q_PROPERTY(QString statusTip READ statusTip WRITE setStatusTip NOTIFY changed)
     Q_PROPERTY(QString whatsThis READ whatsThis WRITE setWhatsThis NOTIFY changed)
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY changed)
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut NOTIFY changed)
     Q_PROPERTY(Qt::ShortcutContext shortcutContext READ shortcutContext WRITE setShortcutContext NOTIFY changed)
     Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY changed)
@@ -129,7 +129,7 @@ public:
     void setSeparator(bool b);
     bool isSeparator() const;
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     void setShortcut(const QKeySequence &shortcut);
     QKeySequence shortcut() const;
 
diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h
index 19ae47c7b9..6b6ca8076f 100644
--- a/src/widgets/kernel/qaction_p.h
+++ b/src/widgets/kernel/qaction_p.h
@@ -89,15 +89,15 @@ public:
     QString tooltip;
     QString statustip;
     QString whatsthis;
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     QKeySequence shortcut;
     QList<QKeySequence> alternateShortcuts;
 #endif
     QVariant userData;
-#ifndef QT_NO_SHORTCUT
-    int shortcutId;
+#if QT_CONFIG(shortcut)
+    int shortcutId = 0;
     QVector<int> alternateShortcutIds;
-    Qt::ShortcutContext shortcutContext;
+    Qt::ShortcutContext shortcutContext = Qt::WindowShortcut;
     uint autorepeat : 1;
 #endif
     QFont font;
@@ -112,19 +112,17 @@ public:
     int iconVisibleInMenu : 2;  // Only has values -1, 0, and 1
     int shortcutVisibleInContextMenu : 2; // Only has values -1, 0, and 1
 
-    QAction::MenuRole menuRole;
-    QAction::Priority priority;
+    QAction::MenuRole menuRole = QAction::TextHeuristicRole;
+    QAction::Priority priority = QAction::NormalPriority;
 
-    QList<QWidget *> widgets;
+    QWidgetList widgets;
 #if QT_CONFIG(graphicsview)
     QList<QGraphicsWidget *> graphicsWidgets;
 #endif
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     void redoGrab(QShortcutMap &map);
     void redoGrabAlternate(QShortcutMap &map);
     void setShortcutEnabled(bool enable, QShortcutMap &map);
-
-    static QShortcutMap *globalMap;
 #endif // QT_NO_SHORTCUT
 
     void sendDataChanged();
diff --git a/src/widgets/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp
index 4786437d7e..1d9213de0c 100644
--- a/src/widgets/kernel/qactiongroup.cpp
+++ b/src/widgets/kernel/qactiongroup.cpp
@@ -42,7 +42,6 @@
 #ifndef QT_NO_ACTION
 
 #include "qaction_p.h"
-#include "qapplication.h"
 #include "qevent.h"
 #include "qlist.h"
 
@@ -52,12 +51,16 @@ class QActionGroupPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QActionGroup)
 public:
-    QActionGroupPrivate() : exclusive(1), enabled(1), visible(1)  { }
+    QActionGroupPrivate() : enabled(1),
+                            visible(1),
+                            exclusionPolicy(QActionGroup::ExclusionPolicy::Exclusive)
+    {
+    }
     QList<QAction *> actions;
     QPointer<QAction> current;
-    uint exclusive : 1;
     uint enabled : 1;
     uint visible : 1;
+    QActionGroup::ExclusionPolicy exclusionPolicy;
 
 private:
     void _q_actionTriggered();  //private slot
@@ -69,8 +72,8 @@ void QActionGroupPrivate::_q_actionChanged()
 {
     Q_Q(QActionGroup);
     QAction *action = qobject_cast<QAction*>(q->sender());
-    Q_ASSERT_X(action != 0, "QWidgetGroup::_q_actionChanged", "internal error");
-    if(exclusive) {
+    Q_ASSERT_X(action != nullptr, "QActionGroup::_q_actionChanged", "internal error");
+    if (exclusionPolicy != QActionGroup::ExclusionPolicy::None) {
         if (action->isChecked()) {
             if (action != current) {
                 if(current)
@@ -87,7 +90,7 @@ void QActionGroupPrivate::_q_actionTriggered()
 {
     Q_Q(QActionGroup);
     QAction *action = qobject_cast<QAction*>(q->sender());
-    Q_ASSERT_X(action != 0, "QWidgetGroup::_q_actionTriggered", "internal error");
+    Q_ASSERT_X(action != nullptr, "QActionGroup::_q_actionTriggered", "internal error");
     emit q->triggered(action);
 }
 
@@ -95,7 +98,7 @@ void QActionGroupPrivate::_q_actionHovered()
 {
     Q_Q(QActionGroup);
     QAction *action = qobject_cast<QAction*>(q->sender());
-    Q_ASSERT_X(action != 0, "QWidgetGroup::_q_actionHovered", "internal error");
+    Q_ASSERT_X(action != nullptr, "QActionGroup::_q_actionHovered", "internal error");
     emit q->hovered(action);
 }
 
@@ -127,12 +130,17 @@ void QActionGroupPrivate::_q_actionHovered()
     actions is chosen. Each action in an action group emits its
     triggered() signal as usual.
 
-    As stated above, an action group is \l exclusive by default; it
-    ensures that only one checkable action is active at any one time.
+    As stated above, an action group is exclusive by default; it
+    ensures that at most only one checkable action is active at any one time.
     If you want to group checkable actions without making them
-    exclusive, you can turn of exclusiveness by calling
+    exclusive, you can turn off exclusiveness by calling
     setExclusive(false).
 
+    By default the active action of an exclusive group cannot be unchecked.
+    In some cases it may be useful to allow unchecking all the actions,
+    you can allow this by calling
+    setExclusionPolicy(QActionGroup::ExclusionPolicy::ExclusiveOptional).
+
     Actions can be added to an action group using addAction(), but it
     is usually more convenient to specify a group when creating
     actions; this ensures that actions are automatically created with
@@ -146,10 +154,33 @@ void QActionGroupPrivate::_q_actionHovered()
 */
 
 /*!
+    \enum QActionGroup::ExclusionPolicy
+
+    This enum specifies the different policies that can be used to
+    control how the group performs exclusive checking on checkable actions.
+
+    \value None
+           The actions in the group can be checked independently of each other.
+
+    \value Exclusive
+           Exactly one action can be checked at any one time.
+           This is the default policy.
+
+    \value ExclusiveOptional
+           At most one action can be checked at any one time. The actions
+           can also be all unchecked.
+
+    \sa exclusionPolicy
+    \since 5.14
+*/
+
+/*!
     Constructs an action group for the \a parent object.
 
     The action group is exclusive by default. Call setExclusive(false)
-    to make the action group non-exclusive.
+    to make the action group non-exclusive. To make the group exclusive
+    but allow unchecking the active action call instead
+    setExclusionPolicy(QActionGroup::ExclusionPolicy::ExclusiveOptional)
 */
 QActionGroup::QActionGroup(QObject* parent) : QObject(*new QActionGroupPrivate, parent)
 {
@@ -258,26 +289,56 @@ QList<QAction*> QActionGroup::actions() const
 }
 
 /*!
-    \property QActionGroup::exclusive
-    \brief whether the action group does exclusive checking
+    \brief Enable or disable the group exclusion checking
 
-    If exclusive is true, only one checkable action in the action group
-    can ever be active at any time. If the user chooses another
-    checkable action in the group, the one they chose becomes active and
-    the one that was active becomes inactive.
+    This is a convenience method that calls
+    setExclusionPolicy(ExclusionPolicy::Exclusive).
 
-    \sa QAction::checkable
+    \sa QActionGroup::exclusionPolicy
 */
 void QActionGroup::setExclusive(bool b)
 {
-    Q_D(QActionGroup);
-    d->exclusive = b;
+    setExclusionPolicy(b ? QActionGroup::ExclusionPolicy::Exclusive
+                         : QActionGroup::ExclusionPolicy::None);
 }
 
+/*!
+    \brief Returs true if the group is exclusive
+
+    The group is exclusive if the ExclusionPolicy is either Exclusive
+    or ExclusionOptional.
+
+*/
 bool QActionGroup::isExclusive() const
 {
+    return exclusionPolicy() != QActionGroup::ExclusionPolicy::None;
+}
+
+/*!
+    \property QActionGroup::exclusionPolicy
+    \brief This property holds the group exclusive checking policy
+
+    If exclusionPolicy is set to Exclusive, only one checkable
+    action in the action group can ever be active at any time. If the user
+    chooses another checkable action in the group, the one they chose becomes
+    active and the one that was active becomes inactive. If exclusionPolicy is
+    set to ExclusionOptional the group is exclusive but the active checkable
+    action in the group can be unchecked leaving the group with no actions
+    checked.
+
+    \sa QAction::checkable
+    \since 5.14
+*/
+void QActionGroup::setExclusionPolicy(QActionGroup::ExclusionPolicy policy)
+{
+    Q_D(QActionGroup);
+    d->exclusionPolicy = policy;
+}
+
+QActionGroup::ExclusionPolicy QActionGroup::exclusionPolicy() const
+{
     Q_D(const QActionGroup);
-    return d->exclusive;
+    return d->exclusionPolicy;
 }
 
 /*!
@@ -301,10 +362,10 @@ void QActionGroup::setEnabled(bool b)
 {
     Q_D(QActionGroup);
     d->enabled = b;
-    for(QList<QAction*>::const_iterator it = d->actions.constBegin(); it != d->actions.constEnd(); ++it) {
-        if(!(*it)->d_func()->forceDisabled) {
-            (*it)->setEnabled(b);
-            (*it)->d_func()->forceDisabled = false;
+    for (auto action : qAsConst(d->actions)) {
+        if (!action->d_func()->forceDisabled) {
+            action->setEnabled(b);
+            action->d_func()->forceDisabled = false;
         }
     }
 }
@@ -338,10 +399,10 @@ void QActionGroup::setVisible(bool b)
 {
     Q_D(QActionGroup);
     d->visible = b;
-    for(QList<QAction*>::Iterator it = d->actions.begin(); it != d->actions.end(); ++it) {
-        if(!(*it)->d_func()->forceInvisible) {
-            (*it)->setVisible(b);
-            (*it)->d_func()->forceInvisible = false;
+    for (auto action : qAsConst(d->actions)) {
+        if (!action->d_func()->forceInvisible) {
+            action->setVisible(b);
+            action->d_func()->forceInvisible = false;
         }
     }
 }
diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h
index 61c90b911d..90f488bedb 100644
--- a/src/widgets/kernel/qactiongroup.h
+++ b/src/widgets/kernel/qactiongroup.h
@@ -55,11 +55,18 @@ class Q_WIDGETS_EXPORT QActionGroup : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QActionGroup)
 
-    Q_PROPERTY(bool exclusive READ isExclusive WRITE setExclusive)
+    Q_PROPERTY(QActionGroup::ExclusionPolicy exclusionPolicy READ exclusionPolicy WRITE setExclusionPolicy)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible)
 
 public:
+    enum class ExclusionPolicy {
+        None,
+        Exclusive,
+        ExclusiveOptional
+    };
+    Q_ENUM(ExclusionPolicy)
+
     explicit QActionGroup(QObject* parent);
     ~QActionGroup();
 
@@ -73,6 +80,7 @@ public:
     bool isExclusive() const;
     bool isEnabled() const;
     bool isVisible() const;
+    ExclusionPolicy exclusionPolicy() const;
 
 
 public Q_SLOTS:
@@ -80,6 +88,7 @@ public Q_SLOTS:
     inline void setDisabled(bool b) { setEnabled(!b); }
     void setVisible(bool);
     void setExclusive(bool);
+    void setExclusionPolicy(ExclusionPolicy policy);
 
 Q_SIGNALS:
     void triggered(QAction *);
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 486c424391..dfa1bc23b1 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -111,6 +111,9 @@
 
 #include <qtwidgets_tracepoints_p.h>
 
+#include <algorithm>
+#include <iterator>
+
 //#define ALIEN_DEBUG
 
 static void initResources()
@@ -233,9 +236,6 @@ void QApplicationPrivate::createEventDispatcher()
                 encapsulated in a QStyle object. This can be changed at runtime
                 with setStyle().
 
-            \li  It specifies how the application is to allocate colors. See
-                setColorSpec() for details.
-
             \li  It provides localization of strings that are visible to the
                 user via translate().
 
@@ -296,11 +296,6 @@ void QApplicationPrivate::createEventDispatcher()
             setStyle().
 
         \row
-        \li  Color usage
-        \li  colorSpec(),
-            setColorSpec().
-
-        \row
         \li  Text handling
         \li  installTranslator(),
             removeTranslator()
@@ -334,6 +329,7 @@ void QApplicationPrivate::createEventDispatcher()
     \sa QCoreApplication, QAbstractEventDispatcher, QEventLoop, QSettings
 */
 
+#if QT_DEPRECATED_SINCE(5, 8)
 // ### fixme: Qt 6: Remove ColorSpec and accessors.
 /*!
     \enum QApplication::ColorSpec
@@ -347,15 +343,7 @@ void QApplicationPrivate::createEventDispatcher()
 
     See setColorSpec() for full details.
 */
-
-/*!
-    \fn QApplication::setGraphicsSystem(const QString &)
-    \obsolete
-
-    This call has no effect.
-
-    Use the QPA framework instead.
-*/
+#endif
 
 /*!
     \fn QWidget *QApplication::topLevelAt(const QPoint &point)
@@ -570,10 +558,6 @@ void QApplicationPrivate::init()
     initialize();
     eventDispatcher->startingUp();
 
-#ifdef QT_EVAL
-    extern void qt_gui_eval_init(QCoreApplicationPrivate::Type);
-    qt_gui_eval_init(application_type);
-#endif
 #ifndef QT_NO_ACCESSIBILITY
     // factory for accessible interfaces for widgets shipped with Qt
     QAccessible::installFactory(&qAccessibleFactory);
@@ -626,7 +610,7 @@ void QApplicationPrivate::initialize()
     if (qt_is_gui_used)
         initializeMultitouch();
 
-    if (QApplication::desktopSettingsAware())
+    if (QGuiApplication::desktopSettingsAware())
         if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
             QApplicationPrivate::enabledAnimations = theme->themeHint(QPlatformTheme::UiEffects).toInt();
         }
@@ -1176,7 +1160,7 @@ void QApplication::setStyle(QStyle *style)
             QWidget *w = *it;
             if (w->windowType() != Qt::Desktop && !w->testAttribute(Qt::WA_SetStyle)) {
                     QEvent e(QEvent::StyleChange);
-                    QApplication::sendEvent(w, &e);
+                    QCoreApplication::sendEvent(w, &e);
                     w->update();
             }
         }
@@ -1193,7 +1177,7 @@ void QApplication::setStyle(QStyle *style)
 
     if (QApplicationPrivate::focus_widget) {
         QFocusEvent in(QEvent::FocusIn, Qt::OtherFocusReason);
-        QApplication::sendEvent(QApplicationPrivate::focus_widget->style(), &in);
+        QCoreApplication::sendEvent(QApplicationPrivate::focus_widget->style(), &in);
         QApplicationPrivate::focus_widget->update();
     }
 }
@@ -1555,7 +1539,7 @@ void QApplication::setFont(const QFont &font, const char *className)
     if (QApplicationPrivate::is_app_running && !QApplicationPrivate::is_app_closing) {
         // Send ApplicationFontChange to qApp itself, and to the widgets.
         QEvent e(QEvent::ApplicationFontChange);
-        QApplication::sendEvent(QApplication::instance(), &e);
+        QCoreApplication::sendEvent(QApplication::instance(), &e);
 
         QWidgetList wids = QApplication::allWidgets();
         for (QWidgetList::ConstIterator it = wids.constBegin(), cend = wids.constEnd(); it != cend; ++it) {
@@ -1569,7 +1553,7 @@ void QApplication::setFont(const QFont &font, const char *className)
         QList<QGraphicsScene *> &scenes = qApp->d_func()->scene_list;
         for (QList<QGraphicsScene *>::ConstIterator it = scenes.constBegin();
              it != scenes.constEnd(); ++it) {
-            QApplication::sendEvent(*it, &e);
+            QCoreApplication::sendEvent(*it, &e);
         }
 #endif // QT_CONFIG(graphicsview)
     }
@@ -1662,12 +1646,12 @@ void QApplicationPrivate::notifyWindowIconChanged()
 QWidgetList QApplication::topLevelWidgets()
 {
     QWidgetList list;
-    QWidgetList all = allWidgets();
-
-    for (QWidgetList::ConstIterator it = all.constBegin(), cend = all.constEnd(); it != cend; ++it) {
-        QWidget *w = *it;
-        if (w->isWindow() && w->windowType() != Qt::Desktop)
-            list.append(w);
+    if (QWidgetPrivate::allWidgets != nullptr) {
+        const auto isTopLevelWidget = [] (const QWidget *w) {
+            return w->isWindow() && w->windowType() != Qt::Desktop;
+        };
+        std::copy_if(QWidgetPrivate::allWidgets->cbegin(), QWidgetPrivate::allWidgets->cend(),
+                     std::back_inserter(list), isTopLevelWidget);
     }
     return list;
 }
@@ -1688,7 +1672,7 @@ QWidgetList QApplication::topLevelWidgets()
 QWidgetList QApplication::allWidgets()
 {
     if (QWidgetPrivate::allWidgets)
-        return QWidgetPrivate::allWidgets->toList();
+        return QWidgetPrivate::allWidgets->values();
     return QWidgetList();
 }
 
@@ -1743,16 +1727,16 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason)
 #endif
                 QFocusEvent out(QEvent::FocusOut, reason);
                 QPointer<QWidget> that = prev;
-                QApplication::sendEvent(prev, &out);
+                QCoreApplication::sendEvent(prev, &out);
                 if (that)
-                    QApplication::sendEvent(that->style(), &out);
+                    QCoreApplication::sendEvent(that->style(), &out);
             }
             if(focus && QApplicationPrivate::focus_widget == focus) {
                 QFocusEvent in(QEvent::FocusIn, reason);
                 QPointer<QWidget> that = focus;
-                QApplication::sendEvent(focus, &in);
+                QCoreApplication::sendEvent(focus, &in);
                 if (that)
-                    QApplication::sendEvent(that->style(), &in);
+                    QCoreApplication::sendEvent(that->style(), &in);
             }
             emit qApp->focusChanged(prev, focus_widget);
         }
@@ -1882,22 +1866,19 @@ void QApplication::aboutQt()
 bool QApplication::event(QEvent *e)
 {
     Q_D(QApplication);
-    if(e->type() == QEvent::Close) {
-        QCloseEvent *ce = static_cast<QCloseEvent*>(e);
-        ce->accept();
+    if (e->type() == QEvent::Quit) {
         closeAllWindows();
-
-        const QWidgetList list = topLevelWidgets();
-        for (auto *w : list) {
+        for (auto *w : topLevelWidgets()) {
             if (w->isVisible() && !(w->windowType() == Qt::Desktop) && !(w->windowType() == Qt::Popup) &&
                  (!(w->windowType() == Qt::Dialog) || !w->parentWidget())) {
-                ce->ignore();
-                break;
+                e->ignore();
+                return true;
             }
         }
-        if (ce->isAccepted()) {
-            return true;
-        }
+        // Explicitly call QCoreApplication instead of QGuiApplication so that
+        // we don't let QGuiApplication close any windows we skipped earlier in
+        // closeAllWindows(). FIXME: Unify all this close magic through closeAllWindows.
+        return QCoreApplication::event(e);
 #ifndef Q_OS_WIN
     } else if (e->type() == QEvent::LocaleChange) {
         // on Windows the event propagation is taken care by the
@@ -1928,7 +1909,7 @@ bool QApplication::event(QEvent *e)
                 }
                 if (showToolTip) {
                     QHelpEvent e(QEvent::ToolTip, d->toolTipPos, d->toolTipGlobalPos);
-                    QApplication::sendEvent(d->toolTipWidget, &e);
+                    QCoreApplication::sendEvent(d->toolTipWidget, &e);
                     if (e.isAccepted()) {
                         QStyle *s = d->toolTipWidget->style();
                         int sleepDelay = s->styleHint(QStyle::SH_ToolTip_FallAsleepDelay, 0, d->toolTipWidget, 0);
@@ -1957,13 +1938,6 @@ bool QApplication::event(QEvent *e)
     return QGuiApplication::event(e);
 }
 
-/*!
-   \fn void QApplication::syncX()
-    Was used to synchronize with the X server in 4.x, here for source compatibility.
-    \internal
-    \obsolete
-*/
-
 // ### FIXME: topLevelWindows does not contain QWidgets without a parent
 // until QWidgetPrivate::create is called. So we have to override the
 // QGuiApplication::notifyLayoutDirectionChange
@@ -2040,7 +2014,7 @@ void QApplication::setActiveWindow(QWidget* act)
             QGuiApplication::inputMethod()->commit();
 
         QFocusEvent focusAboutToChange(QEvent::FocusAboutToChange, Qt::ActiveWindowFocusReason);
-        QApplication::sendEvent(QApplicationPrivate::focus_widget, &focusAboutToChange);
+        QCoreApplication::sendEvent(QApplicationPrivate::focus_widget, &focusAboutToChange);
     }
 
     QApplicationPrivate::active_window = window;
@@ -2115,7 +2089,7 @@ QWidget *qt_tlw_for_window(QWindow *wnd)
         wnd = wnd->parent();
     }
     if (wnd) {
-        const auto tlws = qApp->topLevelWidgets();
+        const auto tlws = QApplication::topLevelWidgets();
         for (QWidget *tlw : tlws) {
             if (tlw->windowHandle() == wnd)
                 return tlw;
@@ -2209,12 +2183,12 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave, con
 #if 0
     if (leave) {
         QEvent e(QEvent::Leave);
-        QApplication::sendEvent(leave, & e);
+        QCoreApplication::sendEvent(leave, & e);
     }
     if (enter) {
         const QPoint windowPos = enter->window()->mapFromGlobal(globalPos);
         QEnterEvent e(enter->mapFromGlobal(globalPos), windowPos, globalPos);
-        QApplication::sendEvent(enter, & e);
+        QCoreApplication::sendEvent(enter, & e);
     }
     return;
 #endif
@@ -2275,12 +2249,12 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave, con
     for (int i = 0; i < leaveList.size(); ++i) {
         auto *w = leaveList.at(i);
         if (!QApplication::activeModalWidget() || QApplicationPrivate::tryModalHelper(w, 0)) {
-            QApplication::sendEvent(w, &leaveEvent);
+            QCoreApplication::sendEvent(w, &leaveEvent);
             if (w->testAttribute(Qt::WA_Hover) &&
                 (!QApplication::activePopupWidget() || QApplication::activePopupWidget() == w->window())) {
                 Q_ASSERT(instance());
                 QHoverEvent he(QEvent::HoverLeave, QPoint(-1, -1), w->mapFromGlobal(QApplicationPrivate::instance()->hoverGlobalPos),
-                               QApplication::keyboardModifiers());
+                               QGuiApplication::keyboardModifiers());
                 qApp->d_func()->notify_helper(w, &he);
             }
         }
@@ -2296,11 +2270,11 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave, con
             if (!QApplication::activeModalWidget() || QApplicationPrivate::tryModalHelper(w, 0)) {
                 const QPointF localPos = w->mapFromGlobal(globalPos);
                 QEnterEvent enterEvent(localPos, windowPos, globalPosF);
-                QApplication::sendEvent(w, &enterEvent);
+                QCoreApplication::sendEvent(w, &enterEvent);
                 if (w->testAttribute(Qt::WA_Hover) &&
                         (!QApplication::activePopupWidget() || QApplication::activePopupWidget() == w->window())) {
                     QHoverEvent he(QEvent::HoverEnter, localPos, QPoint(-1, -1),
-                                   QApplication::keyboardModifiers());
+                                   QGuiApplication::keyboardModifiers());
                     qApp->d_func()->notify_helper(w, &he);
                 }
             }
@@ -2648,7 +2622,7 @@ bool QApplicationPrivate::sendMouseEvent(QWidget *receiver, QMouseEvent *event,
         if (spontaneous)
             result = QApplication::sendSpontaneousEvent(receiver, event);
         else
-            result = QApplication::sendEvent(receiver, event);
+            result = QCoreApplication::sendEvent(receiver, event);
     }
 
     if (!graphicsWidget && leaveAfterRelease && event->type() == QEvent::MouseButtonRelease
@@ -2902,7 +2876,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
     }
 
 #ifndef QT_NO_DEBUG
-    d->checkReceiverThread(receiver);
+    QCoreApplicationPrivate::checkReceiverThread(receiver);
 #endif
 
     if (receiver->isWindowType()) {
@@ -3241,13 +3215,21 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                 if (spontaneous && phase == Qt::ScrollBegin)
                     QApplicationPrivate::wheel_widget = nullptr;
 
-                const QPoint &relpos = wheel->pos();
+                QPoint relpos = wheel->position().toPoint();
 
                 if (spontaneous && (phase == Qt::NoScrollPhase || phase == Qt::ScrollUpdate))
                     QApplicationPrivate::giveFocusAccordingToFocusPolicy(w, e, relpos);
 
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
                 QWheelEvent we(relpos, wheel->globalPos(), wheel->pixelDelta(), wheel->angleDelta(), wheel->delta(), wheel->orientation(), wheel->buttons(),
                                wheel->modifiers(), phase, wheel->source(), wheel->inverted());
+QT_WARNING_POP
+#else
+                QWheelEvent we(relpos, wheel->globalPosition(), wheel->pixelDelta(), wheel->angleDelta(), wheel->buttons(),
+                               wheel->modifiers(), phase, wheel->inverted(), wheel->source());
+#endif
                 we.setTimestamp(wheel->timestamp());
                 bool eventAccepted;
                 do {
@@ -3282,9 +3264,17 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                 // is set. Since it accepted the wheel event previously, we continue
                 // sending those events until we get a ScrollEnd, which signifies
                 // the end of the natural scrolling sequence.
-                const QPoint &relpos = QApplicationPrivate::wheel_widget->mapFromGlobal(wheel->globalPos());
+                const QPoint &relpos = QApplicationPrivate::wheel_widget->mapFromGlobal(wheel->globalPosition().toPoint());
+#if QT_DEPRECATED_SINCE(5, 0)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
                 QWheelEvent we(relpos, wheel->globalPos(), wheel->pixelDelta(), wheel->angleDelta(), wheel->delta(), wheel->orientation(), wheel->buttons(),
                                wheel->modifiers(), wheel->phase(), wheel->source());
+QT_WARNING_POP
+#else
+                QWheelEvent we(relpos, wheel->globalPosition(), wheel->pixelDelta(), wheel->angleDelta(), wheel->buttons(),
+                               wheel->modifiers(), wheel->phase(), wheel->inverted(), wheel->source());
+#endif
                 we.setTimestamp(wheel->timestamp());
                 we.spont = true;
                 we.ignore();
@@ -3401,7 +3391,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
 #if QT_CONFIG(graphicsview)
             // QGraphicsProxyWidget handles its own propagation,
             // and we must not change QDragManagers currentTarget.
-            QWExtra *extra = w->window()->d_func()->extra;
+            const auto &extra = w->window()->d_func()->extra;
             if (extra && extra->proxyWidget) {
                 res = d->notify_helper(w, dragEvent);
                 break;
@@ -3429,7 +3419,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
 #if QT_CONFIG(graphicsview)
             // QGraphicsProxyWidget handles its own propagation,
             // and we must not change QDragManagers currentTarget.
-            QWExtra *extra = w->window()->d_func()->extra;
+            const auto &extra = w->window()->d_func()->extra;
             bool isProxyWidget = extra && extra->proxyWidget;
             if (!isProxyWidget)
 #endif
@@ -3670,7 +3660,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
 
     // send to all application event filters
     if (threadRequiresCoreApplication()
-        && receiver->d_func()->threadData->thread == mainThread()
+        && receiver->d_func()->threadData->thread.loadAcquire() == mainThread()
         && sendThroughApplicationEventFilters(receiver, e)) {
         filtered = true;
         return filtered;
@@ -3822,7 +3812,7 @@ void QApplicationPrivate::openPopup(QWidget *popup)
     } else if (popupWidgets->count() == 1) { // this was the first popup
         if (QWidget *fw = QApplication::focusWidget()) {
             QFocusEvent e(QEvent::FocusOut, Qt::PopupFocusReason);
-            QApplication::sendEvent(fw, &e);
+            QCoreApplication::sendEvent(fw, &e);
         }
     }
 }
@@ -3834,8 +3824,6 @@ void QApplicationPrivate::openPopup(QWidget *popup)
     This feature is available in Qt for Embedded Linux only.
 
     \since 4.6
-
-    \sa keypadNavigationEnabled()
 */
 void QApplication::setNavigationMode(Qt::NavigationMode mode)
 {
@@ -3848,8 +3836,6 @@ void QApplication::setNavigationMode(Qt::NavigationMode mode)
     This feature is available in Qt for Embedded Linux only.
 
     \since 4.6
-
-    \sa keypadNavigationEnabled()
 */
 Qt::NavigationMode QApplication::navigationMode()
 {
@@ -3985,15 +3971,6 @@ int QApplication::doubleClickInterval()
 }
 
 /*!
-    \fn QApplication::keyboardInputDirection()
-    \since 4.2
-    \deprecated
-
-    Returns the current keyboard input direction. Replaced with QInputMethod::inputDirection()
-    \sa QInputMethod::inputDirection()
-*/
-
-/*!
     \property QApplication::keyboardInputInterval
     \brief the time limit in milliseconds that distinguishes a key press
     from two consecutive key presses
@@ -4130,14 +4107,6 @@ void QApplication::beep()
     \sa QCoreApplication::instance(), qGuiApp
 */
 
-/*!
-    \fn QLocale QApplication::keyboardInputLocale()
-    \since 4.2
-    \obsolete
-
-    Returns the current keyboard input locale. Replaced with QInputMethod::locale()
-*/
-
 bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event)
 {
     return QGuiApplication::sendSpontaneousEvent(receiver, event);
@@ -4387,7 +4356,7 @@ bool QApplicationPrivate::translateRawTouchEvent(QWidget *window,
 
         QTouchEvent touchEvent(eventType,
                                device,
-                               QApplication::keyboardModifiers(),
+                               QGuiApplication::keyboardModifiers(),
                                it.value().first,
                                it.value().second);
         bool containsPress = updateTouchPointsForWidget(widget, &touchEvent);
@@ -4430,7 +4399,7 @@ bool QApplicationPrivate::translateRawTouchEvent(QWidget *window,
 
 void QApplicationPrivate::translateTouchCancel(QTouchDevice *device, ulong timestamp)
 {
-    QTouchEvent touchEvent(QEvent::TouchCancel, device, QApplication::keyboardModifiers());
+    QTouchEvent touchEvent(QEvent::TouchCancel, device, QGuiApplication::keyboardModifiers());
     touchEvent.setTimestamp(timestamp);
     QHash<ActiveTouchPointsKey, ActiveTouchPointsValue>::const_iterator it
             = self->activeTouchPoints.constBegin(), ite = self->activeTouchPoints.constEnd();
@@ -4466,12 +4435,12 @@ void QApplicationPrivate::sendApplicationPaletteChange(bool toAllWidgets, const
     const QWidgetList widgets = QApplication::allWidgets();
     for (auto widget : widgets) {
         if (toAllWidgets || (!className && widget->isWindow()) || (className && widget->inherits(className)))
-            QApplication::sendEvent(widget, &event);
+            QCoreApplication::sendEvent(widget, &event);
     }
 
 #if QT_CONFIG(graphicsview)
     for (auto scene : qAsConst(scene_list))
-        QApplication::sendEvent(scene, &event);
+        QCoreApplication::sendEvent(scene, &event);
 #endif // QT_CONFIG(graphicsview)
 }
 
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index 133279f977..3167bd423f 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -112,52 +112,41 @@ public:
     virtual bool shouldQuit() override;
     bool tryCloseAllWindows() override;
 
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-#if QT_CONFIG(settings)
-    static bool x11_apply_settings();
-#endif
-    static void reset_instance_pointer();
-#endif
     static bool autoSipEnabled;
     static QString desktopStyleKey();
 
-
     void createEventDispatcher() override;
     static void dispatchEnterLeave(QWidget *enter, QWidget *leave, const QPointF &globalPosF);
 
     void notifyWindowIconChanged() override;
 
     //modality
-    bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const override;
+    bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = nullptr) const override;
     static bool isBlockedByModal(QWidget *widget);
     static bool modalState();
-    static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0);
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    static QWidget *tryModalHelper_sys(QWidget *top);
-    bool canQuit();
+    static bool tryModalHelper(QWidget *widget, QWidget **rettop = nullptr);
+
+#ifdef QT_KEYPAD_NAVIGATION
+    static bool keypadNavigationEnabled()
+    {
+        return navigationMode == Qt::NavigationModeKeypadTabOrder ||
+                navigationMode == Qt::NavigationModeKeypadDirectional;
+    }
 #endif
 
     bool notify_helper(QObject *receiver, QEvent * e);
 
-    void init(
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-                   Display *dpy = 0, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0
-#endif
-                   );
+    void init();
     void initialize();
     void process_cmdline();
 
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    static void x11_initialize_style();
-#endif
-
     static bool inPopupMode();
     bool popupActive() override { return inPopupMode(); }
     void closePopup(QWidget *popup);
     void openPopup(QWidget *popup);
     static void setFocusWidget(QWidget *focus, Qt::FocusReason reason);
     static QWidget *focusNextPrevChild_helper(QWidget *toplevel, bool next,
-                                              bool *wrappingOccurred = 0);
+                                              bool *wrappingOccurred = nullptr);
 
 #if QT_CONFIG(graphicsview)
     // Maintain a list of all scenes to ensure font and palette propagation to
@@ -205,10 +194,6 @@ public:
     static void initializeWidgetFontHash();
     static void setSystemFont(const QFont &font);
 
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    static void applyX11SpecificCommandLineArguments(QWidget *main_widget);
-#endif
-
     static QApplicationPrivate *instance() { return self; }
 
 #ifdef QT_KEYPAD_NAVIGATION
@@ -216,10 +201,6 @@ public:
     static Qt::NavigationMode navigationMode;
 #endif
 
-#if 0 /* Used to be included in Qt4 for Q_WS_MAC */ || 0 /* Used to be included in Qt4 for Q_WS_X11 */
-    void _q_alertTimeOut();
-    QHash<QWidget *, QTimer *> alertTimerHash;
-#endif
 #ifndef QT_NO_STYLE_STYLESHEET
     static QString styleSheet;
 #endif
@@ -238,7 +219,7 @@ public:
             return window;
         if (const QWidget *nativeParent = widget->nativeParentWidget())
             return nativeParent->windowHandle();
-        return 0;
+        return nullptr;
     }
 
 #ifdef Q_OS_WIN
@@ -256,14 +237,6 @@ public:
     QGestureManager *gestureManager;
     QWidget *gestureWidget;
 #endif
-#if 0 /* Used to be included in Qt4 for Q_WS_X11 */ || 0 /* Used to be included in Qt4 for Q_WS_WIN */
-    QPixmap *move_cursor;
-    QPixmap *copy_cursor;
-    QPixmap *link_cursor;
-#endif
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    QPixmap *ignore_cursor;
-#endif
 
     static bool updateTouchPointsForWidget(QWidget *widget, QTouchEvent *touchEvent);
     void initializeMultitouch();
@@ -292,14 +265,7 @@ private:
     static bool isAlien(QWidget *);
 };
 
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-  extern void qt_win_set_cursor(QWidget *, bool);
-#elif 0 // Used to be included in Qt4 for Q_WS_X11
-  extern void qt_x11_enforce_cursor(QWidget *, bool);
-  extern void qt_x11_enforce_cursor(QWidget *);
-#else
-  extern void qt_qpa_set_cursor(QWidget * w, bool force);
-#endif
+extern void qt_qpa_set_cursor(QWidget * w, bool force);
 
 QT_END_NAMESPACE
 
diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp
index a368f379ad..76d8533271 100644
--- a/src/widgets/kernel/qboxlayout.cpp
+++ b/src/widgets/kernel/qboxlayout.cpp
@@ -172,7 +172,7 @@ void QBoxLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int *b
                     rightDelta = w->geometry().right() - itm->geometry().right();
             }
             QWidget *w = q->parentWidget();
-            Qt::LayoutDirection layoutDirection = w ? w->layoutDirection() : QApplication::layoutDirection();
+            Qt::LayoutDirection layoutDirection = w ? w->layoutDirection() : QGuiApplication::layoutDirection();
             if (layoutDirection == Qt::RightToLeft)
                 qSwap(leftDelta, rightDelta);
 
diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp
index d17c7eb36c..9e90adec46 100644
--- a/src/widgets/kernel/qdesktopwidget.cpp
+++ b/src/widgets/kernel/qdesktopwidget.cpp
@@ -111,7 +111,7 @@ const QRect QDesktopWidgetPrivate::availableGeometry(const QWidget *widget)
 QDesktopScreenWidget *QDesktopWidgetPrivate::widgetForScreen(QScreen *qScreen) const
 {
     foreach (QDesktopScreenWidget *widget, screens) {
-        if (widget->screen() == qScreen)
+        if (widget->assignedScreen() == qScreen)
             return widget;
     }
     return nullptr;
@@ -211,7 +211,9 @@ QDesktopWidget::QDesktopWidget()
     setObjectName(QLatin1String("desktop"));
     d->_q_updateScreens();
     connect(qApp, SIGNAL(screenAdded(QScreen*)), this, SLOT(_q_updateScreens()));
+#if QT_DEPRECATED_SINCE(5, 11)
     connect(qApp, SIGNAL(primaryScreenChanged(QScreen*)), this, SIGNAL(primaryScreenChanged()));
+#endif
 }
 
 QDesktopWidget::~QDesktopWidget()
@@ -321,20 +323,12 @@ int QDesktopWidgetPrivate::screenNumber(const QWidget *w)
     if (screens.isEmpty()) // This should never happen
         return primaryScreen();
 
-    const QWindow *winHandle = w->windowHandle();
-    if (!winHandle) {
-        if (const QWidget *nativeParent = w->nativeParentWidget())
-            winHandle = nativeParent->windowHandle();
-    }
-
     // If there is more than one virtual desktop
     if (screens.count() != screens.constFirst()->virtualSiblings().count()) {
         // Find the root widget, get a QScreen from it and use the
         // virtual siblings for checking the window position.
-        if (winHandle) {
-            if (const QScreen *winScreen = winHandle->screen())
-                screens = winScreen->virtualSiblings();
-        }
+        if (const QScreen *winScreen = qt_widget_private(const_cast<QWidget *>(w))->associatedScreen())
+            screens = winScreen->virtualSiblings();
     }
 
     // Get the screen number from window position using screen geometry
diff --git a/src/widgets/kernel/qdesktopwidget_p.h b/src/widgets/kernel/qdesktopwidget_p.h
index 69f87337b3..63949055aa 100644
--- a/src/widgets/kernel/qdesktopwidget_p.h
+++ b/src/widgets/kernel/qdesktopwidget_p.h
@@ -68,7 +68,7 @@ public:
     int screenNumber() const;
     void setScreenGeometry(const QRect &geometry);
 
-    QScreen *screen() const { return m_screen.data(); }
+    QScreen *assignedScreen() const { return m_screen.data(); }
     QRect screenGeometry() const { return m_geometry; }
 
 private:
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index bd0ea2598a..6f7527c013 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -783,7 +783,7 @@ void QFormLayoutPrivate::setupVerticalLayoutData(int width)
             vLayouts[vidx].expansive = expanding || (vLayouts[vidx].stretch > 0);
             vLayouts[vidx].empty = false;
 
-            if (vLayouts[vidx].stretch > 0)
+            if (vLayouts[vidx].expansive)
                 addTopBottomStretch = false;
 
             if (vidx > 1)
@@ -2178,7 +2178,7 @@ void QFormLayoutPrivate::arrangeWidgets(const QVector<QLayoutStruct>& layouts, Q
     int i;
     const int rr = m_matrix.rowCount();
     QWidget *w = q->parentWidget();
-    Qt::LayoutDirection layoutDirection = w ? w->layoutDirection() : QApplication::layoutDirection();
+    Qt::LayoutDirection layoutDirection = w ? w->layoutDirection() : QGuiApplication::layoutDirection();
 
     Qt::Alignment formAlignment = fixedAlignment(q->formAlignment(), layoutDirection);
     int leftOffset = 0;
diff --git a/src/widgets/kernel/qgesture_p.h b/src/widgets/kernel/qgesture_p.h
index 636103c1e1..cbf8d60892 100644
--- a/src/widgets/kernel/qgesture_p.h
+++ b/src/widgets/kernel/qgesture_p.h
@@ -111,7 +111,7 @@ class QPinchGesturePrivate : public QGesturePrivate
 
 public:
     QPinchGesturePrivate()
-        : totalChangeFlags(0), changeFlags(0),
+        : totalChangeFlags(nullptr), changeFlags(nullptr),
           totalScaleFactor(1), lastScaleFactor(1), scaleFactor(1),
           totalRotationAngle(0), lastRotationAngle(0), rotationAngle(0),
           isNewSequence(true)
diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
index 5d2adc1e1c..d0c6b882b5 100644
--- a/src/widgets/kernel/qgesturemanager.cpp
+++ b/src/widgets/kernel/qgesturemanager.cpp
@@ -54,9 +54,6 @@
 #ifdef Q_OS_OSX
 #include "qmacgesturerecognizer_p.h"
 #endif
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ && !defined(QT_NO_NATIVE_GESTURES)
-#include "qwinnativepangesturerecognizer_win_p.h"
-#endif
 
 #include "qdebug.h"
 #include <QtCore/QLoggingCategory>
@@ -102,14 +99,7 @@ QGestureManager::QGestureManager(QObject *parent)
     registerGestureRecognizer(new QSwipeGestureRecognizer);
     registerGestureRecognizer(new QTapGestureRecognizer);
 #endif
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-  #if !defined(QT_NO_NATIVE_GESTURES)
-    if (QApplicationPrivate::HasTouchSupport)
-        registerGestureRecognizer(new QWinNativePanGestureRecognizer);
-  #endif
-#else
     registerGestureRecognizer(new QTapAndHoldGestureRecognizer);
-#endif
 }
 
 QGestureManager::~QGestureManager()
@@ -168,30 +158,26 @@ void QGestureManager::unregisterGestureRecognizer(Qt::GestureType type)
 
 void QGestureManager::cleanupCachedGestures(QObject *target, Qt::GestureType type)
 {
-    QMap<ObjectGesture, QList<QGesture *> >::Iterator iter = m_objectGestures.begin();
-    while (iter != m_objectGestures.end()) {
-        ObjectGesture objectGesture = iter.key();
-        if (objectGesture.gesture == type && target == objectGesture.object) {
-            QSet<QGesture *> gestures = iter.value().toSet();
-            for (QHash<QGestureRecognizer *, QSet<QGesture *> >::iterator
-                 it = m_obsoleteGestures.begin(), e = m_obsoleteGestures.end(); it != e; ++it) {
-                it.value() -= gestures;
-            }
-            foreach (QGesture *g, gestures) {
-                m_deletedRecognizers.remove(g);
-                m_gestureToRecognizer.remove(g);
-                m_maybeGestures.remove(g);
-                m_activeGestures.remove(g);
-                m_gestureOwners.remove(g);
-                m_gestureTargets.remove(g);
-                m_gesturesToDelete.insert(g);
-            }
+    const auto iter = m_objectGestures.find({target, type});
+    if (iter == m_objectGestures.end())
+        return;
 
-            iter = m_objectGestures.erase(iter);
-        } else {
-            ++iter;
-        }
+    const QList<QGesture *> &gestures = iter.value();
+    for (auto &e : m_obsoleteGestures) {
+        for (QGesture *g : gestures)
+            e -= g;
+    }
+    for (QGesture *g : gestures) {
+        m_deletedRecognizers.remove(g);
+        m_gestureToRecognizer.remove(g);
+        m_maybeGestures.remove(g);
+        m_activeGestures.remove(g);
+        m_gestureOwners.remove(g);
+        m_gestureTargets.remove(g);
+        m_gesturesToDelete.insert(g);
     }
+
+    m_objectGestures.erase(iter);
 }
 
 // get or create a QGesture object that will represent the state for a given object, used by the recognizer
@@ -510,14 +496,14 @@ void QGestureManager::cleanupGesturesForRemovedRecognizer(QGesture *gesture)
 // return true if accepted (consumed)
 bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
 {
-    QMap<Qt::GestureType, int> types;
+    QVarLengthArray<Qt::GestureType, 16> types;
     QMultiMap<QObject *, Qt::GestureType> contexts;
     QWidget *w = receiver;
     typedef QMap<Qt::GestureType, Qt::GestureFlags>::const_iterator ContextIterator;
     if (!w->d_func()->gestureContext.isEmpty()) {
         for(ContextIterator it = w->d_func()->gestureContext.constBegin(),
             e = w->d_func()->gestureContext.constEnd(); it != e; ++it) {
-            types.insert(it.key(), 0);
+            types.push_back(it.key());
             contexts.insert(w, it.key());
         }
     }
@@ -529,7 +515,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
              e = w->d_func()->gestureContext.constEnd(); it != e; ++it) {
             if (!(it.value() & Qt::DontStartGestureOnChildren)) {
                 if (!types.contains(it.key())) {
-                    types.insert(it.key(), 0);
+                    types.push_back(it.key());
                     contexts.insert(w, it.key());
                 }
             }
@@ -544,14 +530,14 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
 #if QT_CONFIG(graphicsview)
 bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event)
 {
-    QMap<Qt::GestureType, int> types;
+    QVarLengthArray<Qt::GestureType, 16> types;
     QMultiMap<QObject *, Qt::GestureType> contexts;
     QGraphicsObject *item = receiver;
     if (!item->QGraphicsItem::d_func()->gestureContext.isEmpty()) {
         typedef QMap<Qt::GestureType, Qt::GestureFlags>::const_iterator ContextIterator;
         for(ContextIterator it = item->QGraphicsItem::d_func()->gestureContext.constBegin(),
             e = item->QGraphicsItem::d_func()->gestureContext.constEnd(); it != e; ++it) {
-            types.insert(it.key(), 0);
+            types.push_back(it.key());
             contexts.insert(item, it.key());
         }
     }
@@ -564,7 +550,7 @@ bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event)
              e = item->QGraphicsItem::d_func()->gestureContext.constEnd(); it != e; ++it) {
             if (!(it.value() & Qt::DontStartGestureOnChildren)) {
                 if (!types.contains(it.key())) {
-                    types.insert(it.key(), 0);
+                    types.push_back(it.key());
                     contexts.insert(item, it.key());
                 }
             }
@@ -712,7 +698,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
         foreach(QGesture *g, gestures)
             event.setAccepted(g, false);
 
-        QApplication::sendEvent(receiver, &event);
+        QCoreApplication::sendEvent(receiver, &event);
         bool eventAccepted = event.isAccepted();
         const auto eventGestures = event.gestures();
         for (QGesture *gesture : eventGestures) {
@@ -739,7 +725,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
             qCDebug(lcGestureManager) << "QGestureManager::deliverEvents: sending to" << it.key()
                     << "gestures:" << it.value();
             QGestureEvent event(it.value());
-            QApplication::sendEvent(it.key(), &event);
+            QCoreApplication::sendEvent(it.key(), &event);
             bool eventAccepted = event.isAccepted();
             const auto eventGestures = event.gestures();
             for (QGesture *gesture : eventGestures) {
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index 53c4de49c6..3ce81a390b 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -1040,7 +1040,7 @@ void QLayout::update()
         if (layout->d_func()->topLevel) {
             Q_ASSERT(layout->parent()->isWidgetType());
             QWidget *mw = static_cast<QWidget*>(layout->parent());
-            QApplication::postEvent(mw, new QEvent(QEvent::LayoutRequest));
+            QCoreApplication::postEvent(mw, new QEvent(QEvent::LayoutRequest));
             break;
         }
         layout = static_cast<QLayout*>(layout->parent());
@@ -1156,6 +1156,8 @@ QLayoutItem *QLayout::replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOpt
     Q_D(QLayout);
     if (!from || !to)
         return 0;
+    if (from == to)     // Do not return a QLayoutItem for \a from, since ownership still
+        return nullptr; // belongs to the layout (since nothing was changed)
 
     int index = -1;
     QLayoutItem *item = 0;
@@ -1364,7 +1366,7 @@ QRect QLayout::alignmentRect(const QRect &r) const
         y += (r.height() - s.height()) / 2;
 
     QWidget *parent = parentWidget();
-    a = QStyle::visualAlignment(parent ? parent->layoutDirection() : QApplication::layoutDirection(), a);
+    a = QStyle::visualAlignment(parent ? parent->layoutDirection() : QGuiApplication::layoutDirection(), a);
     if (a & Qt::AlignRight)
         x += (r.width() - s.width());
     else if (!(a & Qt::AlignLeft))
diff --git a/src/widgets/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h
index 8a1b12a6be..8e1d773355 100644
--- a/src/widgets/kernel/qlayout_p.h
+++ b/src/widgets/kernel/qlayout_p.h
@@ -80,7 +80,7 @@ public:
 
     static QWidgetItem *createWidgetItem(const QLayout *layout, QWidget *widget);
     static QSpacerItem *createSpacerItem(const QLayout *layout, int w, int h, QSizePolicy::Policy hPolicy = QSizePolicy::Minimum, QSizePolicy::Policy vPolicy = QSizePolicy::Minimum);
-    virtual QLayoutItem* replaceAt(int index, QLayoutItem *newitem) { Q_UNUSED(index); Q_UNUSED(newitem); return 0; }
+    virtual QLayoutItem* replaceAt(int index, QLayoutItem *newitem) { Q_UNUSED(index); Q_UNUSED(newitem); return nullptr; }
 
     static QWidgetItemFactoryMethod widgetItemFactoryMethod;
     static QSpacerItemFactoryMethod spacerItemFactoryMethod;
diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h
index 812fa7cf3b..948c2424e6 100644
--- a/src/widgets/kernel/qlayoutengine_p.h
+++ b/src/widgets/kernel/qlayoutengine_p.h
@@ -105,9 +105,9 @@ Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i);
 Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w);
 Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint,
                                  const QSize &minSize, const QSize &maxSize,
-                                 const QSizePolicy &sizePolicy, Qt::Alignment align = 0);
-Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = 0);
-Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = 0);
+                                 const QSizePolicy &sizePolicy, Qt::Alignment align = nullptr);
+Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = nullptr);
+Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = nullptr);
 
 Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm);
 
diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 9e6d1c5eac..0aab0bb06d 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -502,6 +502,17 @@ void QWidgetItem::setGeometry(const QRect &rect)
     else if (!(align & Qt::AlignTop))
         y = y + (r.height() - s.height()) / 2;
 
+    // Make sure we don't move outside of the parent, e.g when styles demand
+    // surplus space that exceeds the available margins (f.ex macOS with QGroupBox)
+    if (x < 0) {
+        s.rwidth() += x;
+        x = 0;
+    }
+    if (y < 0) {
+        s.rheight() += y;
+        y = 0;
+    }
+
     wid->setGeometry(x, y, s.width(), s.height());
 }
 
diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
index a88054a0d0..bc5ca21b97 100644
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ b/src/widgets/kernel/qopenglwidget.cpp
@@ -1335,11 +1335,8 @@ int QOpenGLWidget::metric(QPaintDevice::PaintDeviceMetric metric) const
     if (d->inBackingStorePaint)
         return QWidget::metric(metric);
 
-    QWidget *tlw = window();
-    QWindow *window = tlw ? tlw->windowHandle() : 0;
-    QScreen *screen = tlw && tlw->windowHandle() ? tlw->windowHandle()->screen() : 0;
-    if (!screen && QGuiApplication::primaryScreen())
-        screen = QGuiApplication::primaryScreen();
+    auto window = d->windowHandle(QWidgetPrivate::WindowHandleMode::TopLevel);
+    QScreen *screen = window ? window->screen() : QGuiApplication::primaryScreen();
 
     const float dpmx = qt_defaultDpiX() * 100. / 2.54;
     const float dpmy = qt_defaultDpiY() * 100. / 2.54;
@@ -1437,7 +1434,7 @@ bool QOpenGLWidget::event(QEvent *e)
     Q_D(QOpenGLWidget);
     switch (e->type()) {
     case QEvent::WindowChangeInternal:
-        if (qGuiApp->testAttribute(Qt::AA_ShareOpenGLContexts))
+        if (QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts))
             break;
         if (d->initialized)
             d->reset();
@@ -1450,7 +1447,7 @@ bool QOpenGLWidget::event(QEvent *e)
         {
             // Special case: did grabFramebuffer() for a hidden widget that then became visible.
             // Recreate all resources since the context now needs to share with the TLW's.
-            if (!qGuiApp->testAttribute(Qt::AA_ShareOpenGLContexts))
+            if (!QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts))
                 d->reset();
         }
         if (!d->initialized && !size().isEmpty() && window()->windowHandle()) {
diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index db06dce042..eec65c8625 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -96,8 +96,7 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context)
         QWindow *qwindow = QGuiApplication::focusWindow();
         if (qwindow && qwindow->isActive()) {
             while (qwindow) {
-                QWidgetWindow *widgetWindow = qobject_cast<QWidgetWindow *>(qwindow);
-                if (widgetWindow) {
+                if (auto widgetWindow = qobject_cast<QWidgetWindow *>(qwindow)) {
                     active_window = widgetWindow->widget();
                     break;
                 }
@@ -110,27 +109,25 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context)
         return false;
 
 #ifndef QT_NO_ACTION
-    if (QAction *a = qobject_cast<QAction *>(object))
+    if (auto a = qobject_cast<QAction *>(object))
         return correctActionContext(context, a, active_window);
 #endif
 
 #if QT_CONFIG(graphicsview)
-    if (QGraphicsWidget *gw = qobject_cast<QGraphicsWidget *>(object))
+    if (auto gw = qobject_cast<QGraphicsWidget *>(object))
         return correctGraphicsWidgetContext(context, gw, active_window);
 #endif
 
-    QWidget *w = qobject_cast<QWidget *>(object);
+    auto w = qobject_cast<QWidget *>(object);
     if (!w) {
-        QShortcut *s = qobject_cast<QShortcut *>(object);
-        if (s)
+        if (auto s = qobject_cast<QShortcut *>(object))
             w = s->parentWidget();
     }
 
     if (!w) {
-        QWindow *qwindow = qobject_cast<QWindow *>(object);
+        auto qwindow = qobject_cast<QWindow *>(object);
         while (qwindow) {
-            QWidgetWindow *widget_window = qobject_cast<QWidgetWindow *>(qwindow);
-            if (widget_window) {
+            if (auto widget_window = qobject_cast<QWidgetWindow *>(qwindow)) {
                 w = widget_window->widget();
                 break;
             }
@@ -148,7 +145,7 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge
 {
     bool visible = w->isVisible();
 #if QT_CONFIG(menubar)
-    if (QMenuBar *menuBar = qobject_cast<QMenuBar *>(w)) {
+    if (auto menuBar = qobject_cast<QMenuBar *>(w)) {
         if (auto *pmb = menuBar->platformMenuBar()) {
             if (menuBar->parentWidget()) {
                 visible = true;
@@ -166,7 +163,7 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge
         return false;
 
     if (context == Qt::ApplicationShortcut)
-        return QApplicationPrivate::tryModalHelper(w, 0); // true, unless w is shadowed by a modal dialog
+        return QApplicationPrivate::tryModalHelper(w, nullptr); // true, unless w is shadowed by a modal dialog
 
     if (context == Qt::WidgetShortcut)
         return w == QApplication::focusWidget();
@@ -181,9 +178,9 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge
     // Below is Qt::WindowShortcut context
     QWidget *tlw = w->window();
 #if QT_CONFIG(graphicsview)
-    if (QWExtra *topData = static_cast<QWidgetPrivate *>(QObjectPrivate::get(tlw))->extra) {
+    if (auto topData = static_cast<QWidgetPrivate *>(QObjectPrivate::get(tlw))->extra.get()) {
         if (topData->proxyWidget) {
-            bool res = correctGraphicsWidgetContext(context, (QGraphicsWidget *)topData->proxyWidget, active_window);
+            bool res = correctGraphicsWidgetContext(context, topData->proxyWidget, active_window);
             return res;
         }
     }
@@ -233,7 +230,7 @@ static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsW
 {
     bool visible = w->isVisible();
 #if defined(Q_OS_DARWIN) && QT_CONFIG(menubar)
-    if (!qApp->testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w))
+    if (!QCoreApplication::testAttribute(Qt::AA_DontUseNativeMenuBar) && qobject_cast<QMenuBar *>(w))
         visible = true;
 #endif
 
@@ -244,9 +241,9 @@ static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsW
         // Applicationwide shortcuts are always reachable unless their owner
         // is shadowed by modality. In QGV there's no modality concept, but we
         // must still check if all views are shadowed.
-        QList<QGraphicsView *> views = w->scene()->views();
-        for (int i = 0; i < views.size(); ++i) {
-            if (QApplicationPrivate::tryModalHelper(views.at(i), 0))
+        const auto &views = w->scene()->views();
+        for (auto view : views) {
+            if (QApplicationPrivate::tryModalHelper(view, nullptr))
                 return true;
         }
         return false;
@@ -258,7 +255,7 @@ static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsW
     if (context == Qt::WidgetWithChildrenShortcut) {
         const QGraphicsItem *ti = w->scene()->focusItem();
         if (ti && ti->isWidget()) {
-            const QGraphicsWidget *tw = static_cast<const QGraphicsWidget *>(ti);
+            const auto *tw = static_cast<const QGraphicsWidget *>(ti);
             while (tw && tw != w && (tw->windowType() == Qt::Widget || tw->windowType() == Qt::Popup))
                 tw = tw->parentWidget();
             return tw == w;
@@ -269,10 +266,9 @@ static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsW
     // Below is Qt::WindowShortcut context
 
     // Find the active view (if any).
-    QList<QGraphicsView *> views = w->scene()->views();
-    QGraphicsView *activeView = 0;
-    for (int i = 0; i < views.size(); ++i) {
-        QGraphicsView *view = views.at(i);
+    const auto &views = w->scene()->views();
+    QGraphicsView *activeView = nullptr;
+    for (auto view : views) {
         if (view->window() == active_window) {
             activeView = view;
             break;
@@ -291,15 +287,14 @@ static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsW
 #ifndef QT_NO_ACTION
 static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidget *active_window)
 {
-    const QList<QWidget *> &widgets = static_cast<QActionPrivate *>(QObjectPrivate::get(a))->widgets;
+    const QWidgetList &widgets = static_cast<QActionPrivate *>(QObjectPrivate::get(a))->widgets;
 #if defined(DEBUG_QSHORTCUTMAP)
     if (widgets.isEmpty())
         qDebug() << a << "not connected to any widgets; won't trigger";
 #endif
-    for (int i = 0; i < widgets.size(); ++i) {
-        QWidget *w = widgets.at(i);
+    for (auto w : widgets) {
 #if QT_CONFIG(menu)
-        if (QMenu *menu = qobject_cast<QMenu *>(w)) {
+        if (auto menu = qobject_cast<QMenu *>(w)) {
 #ifdef Q_OS_DARWIN
             // On Mac, menu item shortcuts are processed before reaching any window.
             // That means that if a menu action shortcut has not been already processed
@@ -325,14 +320,13 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge
     }
 
 #if QT_CONFIG(graphicsview)
-    const QList<QGraphicsWidget *> &graphicsWidgets = static_cast<QActionPrivate *>(QObjectPrivate::get(a))->graphicsWidgets;
+    const auto &graphicsWidgets = static_cast<QActionPrivate *>(QObjectPrivate::get(a))->graphicsWidgets;
 #if defined(DEBUG_QSHORTCUTMAP)
     if (graphicsWidgets.isEmpty())
         qDebug() << a << "not connected to any widgets; won't trigger";
 #endif
-    for (int i = 0; i < graphicsWidgets.size(); ++i) {
-        QGraphicsWidget *w = graphicsWidgets.at(i);
-        if (correctGraphicsWidgetContext(context, w, active_window))
+    for (auto graphicsWidget : graphicsWidgets) {
+        if (correctGraphicsWidgetContext(context, graphicsWidget, active_window))
             return true;
     }
 #endif
@@ -433,12 +427,12 @@ class QShortcutPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QShortcut)
 public:
-    QShortcutPrivate() : sc_context(Qt::WindowShortcut), sc_enabled(true), sc_autorepeat(true), sc_id(0) {}
+    QShortcutPrivate() = default;
     QKeySequence sc_sequence;
-    Qt::ShortcutContext sc_context;
-    bool sc_enabled;
-    bool sc_autorepeat;
-    int sc_id;
+    Qt::ShortcutContext sc_context = Qt::WindowShortcut;
+    bool sc_enabled = true;
+    bool sc_autorepeat = true;
+    int sc_id = 0;
     QString sc_whatsthis;
     void redoGrab(QShortcutMap &map);
 };
@@ -472,7 +466,7 @@ void QShortcutPrivate::redoGrab(QShortcutMap &map)
 QShortcut::QShortcut(QWidget *parent)
     : QObject(*new QShortcutPrivate, parent)
 {
-    Q_ASSERT(parent != 0);
+    Q_ASSERT(parent != nullptr);
 }
 
 /*!
@@ -493,7 +487,7 @@ QShortcut::QShortcut(const QKeySequence &key, QWidget *parent,
     Q_D(QShortcut);
     d->sc_context = context;
     d->sc_sequence = key;
-    d->redoGrab(qApp->d_func()->shortcutMap);
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
     if (member)
         connect(this, SIGNAL(activated()), parent, member);
     if (ambiguousMember)
@@ -507,7 +501,7 @@ QShortcut::~QShortcut()
 {
     Q_D(QShortcut);
     if (qApp)
-        qApp->d_func()->shortcutMap.removeShortcut(d->sc_id, this);
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(d->sc_id, this);
 }
 
 /*!
@@ -528,7 +522,7 @@ void QShortcut::setKey(const QKeySequence &key)
         return;
     QAPP_CHECK("setKey");
     d->sc_sequence = key;
-    d->redoGrab(qApp->d_func()->shortcutMap);
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
 }
 
 QKeySequence QShortcut::key() const
@@ -559,7 +553,7 @@ void QShortcut::setEnabled(bool enable)
         return;
     QAPP_CHECK("setEnabled");
     d->sc_enabled = enable;
-    qApp->d_func()->shortcutMap.setShortcutEnabled(enable, d->sc_id, this);
+    QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enable, d->sc_id, this);
 }
 
 bool QShortcut::isEnabled() const
@@ -587,7 +581,7 @@ void QShortcut::setContext(Qt::ShortcutContext context)
         return;
     QAPP_CHECK("setContext");
     d->sc_context = context;
-    d->redoGrab(qApp->d_func()->shortcutMap);
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
 }
 
 Qt::ShortcutContext QShortcut::context() const
@@ -639,7 +633,7 @@ void QShortcut::setAutoRepeat(bool on)
         return;
     QAPP_CHECK("setAutoRepeat");
     d->sc_autorepeat = on;
-    qApp->d_func()->shortcutMap.setShortcutAutoRepeat(on, d->sc_id, this);
+    QGuiApplicationPrivate::instance()->shortcutMap.setShortcutAutoRepeat(on, d->sc_id, this);
 }
 
 bool QShortcut::autoRepeat() const
@@ -666,7 +660,7 @@ bool QShortcut::event(QEvent *e)
 {
     Q_D(QShortcut);
     if (d->sc_enabled && e->type() == QEvent::Shortcut) {
-        QShortcutEvent *se = static_cast<QShortcutEvent *>(e);
+        auto se = static_cast<QShortcutEvent *>(e);
         if (se->shortcutId() == d->sc_id && se->key() == d->sc_sequence){
 #if QT_CONFIG(whatsthis)
             if (QWhatsThis::inWhatsThisMode()) {
diff --git a/src/widgets/kernel/qsizepolicy.cpp b/src/widgets/kernel/qsizepolicy.cpp
index b5a0cd3940..54bf8fe0dc 100644
--- a/src/widgets/kernel/qsizepolicy.cpp
+++ b/src/widgets/kernel/qsizepolicy.cpp
@@ -232,7 +232,7 @@ QT_BEGIN_NAMESPACE
     Returns the control type associated with the widget for which
     this size policy applies.
 */
-QSizePolicy::ControlType QSizePolicy::controlType() const Q_DECL_NOTHROW
+QSizePolicy::ControlType QSizePolicy::controlType() const noexcept
 {
     return QSizePolicy::ControlType(1 << bits.ctype);
 }
@@ -253,7 +253,7 @@ QSizePolicy::ControlType QSizePolicy::controlType() const Q_DECL_NOTHROW
 
     \sa QStyle::layoutSpacing()
 */
-void QSizePolicy::setControlType(ControlType type) Q_DECL_NOTHROW
+void QSizePolicy::setControlType(ControlType type) noexcept
 {
     bits.ctype = toControlTypeFieldValue(type);
 }
diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h
index dba742dec5..f26923eeb0 100644
--- a/src/widgets/kernel/qsizepolicy.h
+++ b/src/widgets/kernel/qsizepolicy.h
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 class QVariant;
 class QSizePolicy;
 
-Q_DECL_CONST_FUNCTION inline uint qHash(QSizePolicy key, uint seed = 0) Q_DECL_NOTHROW;
+Q_DECL_CONST_FUNCTION inline uint qHash(QSizePolicy key, uint seed = 0) noexcept;
 
 class Q_WIDGETS_EXPORT QSizePolicy
 {
@@ -110,60 +110,60 @@ public:
     Q_DECLARE_FLAGS(ControlTypes, ControlType)
     Q_FLAG(ControlTypes)
 
-    QT_SIZEPOLICY_CONSTEXPR QSizePolicy() Q_DECL_NOTHROW : data(0) { }
+    QT_SIZEPOLICY_CONSTEXPR QSizePolicy() noexcept : data(0) { }
 
 #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_QDOC)
-    QT_SIZEPOLICY_CONSTEXPR QSizePolicy(Policy horizontal, Policy vertical, ControlType type = DefaultType) Q_DECL_NOTHROW
+    QT_SIZEPOLICY_CONSTEXPR QSizePolicy(Policy horizontal, Policy vertical, ControlType type = DefaultType) noexcept
         : bits{0, 0, quint32(horizontal), quint32(vertical),
                type == DefaultType ? 0 : toControlTypeFieldValue(type), 0, 0, 0}
     {}
 #else
-    QSizePolicy(Policy horizontal, Policy vertical, ControlType type = DefaultType) Q_DECL_NOTHROW
+    QSizePolicy(Policy horizontal, Policy vertical, ControlType type = DefaultType) noexcept
         : data(0) {
         bits.horPolicy = horizontal;
         bits.verPolicy = vertical;
         setControlType(type);
     }
 #endif // uniform-init
-    QT_SIZEPOLICY_CONSTEXPR Policy horizontalPolicy() const Q_DECL_NOTHROW { return static_cast<Policy>(bits.horPolicy); }
-    QT_SIZEPOLICY_CONSTEXPR Policy verticalPolicy() const Q_DECL_NOTHROW { return static_cast<Policy>(bits.verPolicy); }
-    ControlType controlType() const Q_DECL_NOTHROW;
+    QT_SIZEPOLICY_CONSTEXPR Policy horizontalPolicy() const noexcept { return static_cast<Policy>(bits.horPolicy); }
+    QT_SIZEPOLICY_CONSTEXPR Policy verticalPolicy() const noexcept { return static_cast<Policy>(bits.verPolicy); }
+    ControlType controlType() const noexcept;
 
-    Q_DECL_RELAXED_CONSTEXPR void setHorizontalPolicy(Policy d) Q_DECL_NOTHROW { bits.horPolicy = d; }
-    Q_DECL_RELAXED_CONSTEXPR void setVerticalPolicy(Policy d) Q_DECL_NOTHROW { bits.verPolicy = d; }
-    void setControlType(ControlType type) Q_DECL_NOTHROW;
+    Q_DECL_RELAXED_CONSTEXPR void setHorizontalPolicy(Policy d) noexcept { bits.horPolicy = d; }
+    Q_DECL_RELAXED_CONSTEXPR void setVerticalPolicy(Policy d) noexcept { bits.verPolicy = d; }
+    void setControlType(ControlType type) noexcept;
 
-    QT_SIZEPOLICY_CONSTEXPR Qt::Orientations expandingDirections() const Q_DECL_NOTHROW {
+    QT_SIZEPOLICY_CONSTEXPR Qt::Orientations expandingDirections() const noexcept {
         return ( (verticalPolicy()   & ExpandFlag) ? Qt::Vertical   : Qt::Orientations() )
              | ( (horizontalPolicy() & ExpandFlag) ? Qt::Horizontal : Qt::Orientations() ) ;
     }
 
-    Q_DECL_RELAXED_CONSTEXPR void setHeightForWidth(bool b) Q_DECL_NOTHROW { bits.hfw = b;  }
-    QT_SIZEPOLICY_CONSTEXPR bool hasHeightForWidth() const Q_DECL_NOTHROW { return bits.hfw; }
-    Q_DECL_RELAXED_CONSTEXPR void setWidthForHeight(bool b) Q_DECL_NOTHROW { bits.wfh = b;  }
-    QT_SIZEPOLICY_CONSTEXPR bool hasWidthForHeight() const Q_DECL_NOTHROW { return bits.wfh; }
+    Q_DECL_RELAXED_CONSTEXPR void setHeightForWidth(bool b) noexcept { bits.hfw = b;  }
+    QT_SIZEPOLICY_CONSTEXPR bool hasHeightForWidth() const noexcept { return bits.hfw; }
+    Q_DECL_RELAXED_CONSTEXPR void setWidthForHeight(bool b) noexcept { bits.wfh = b;  }
+    QT_SIZEPOLICY_CONSTEXPR bool hasWidthForHeight() const noexcept { return bits.wfh; }
 
-    QT_SIZEPOLICY_CONSTEXPR bool operator==(const QSizePolicy& s) const Q_DECL_NOTHROW { return data == s.data; }
-    QT_SIZEPOLICY_CONSTEXPR bool operator!=(const QSizePolicy& s) const Q_DECL_NOTHROW { return data != s.data; }
+    QT_SIZEPOLICY_CONSTEXPR bool operator==(const QSizePolicy& s) const noexcept { return data == s.data; }
+    QT_SIZEPOLICY_CONSTEXPR bool operator!=(const QSizePolicy& s) const noexcept { return data != s.data; }
 
-    friend Q_DECL_CONST_FUNCTION uint qHash(QSizePolicy key, uint seed) Q_DECL_NOTHROW { return qHash(key.data, seed); }
+    friend Q_DECL_CONST_FUNCTION uint qHash(QSizePolicy key, uint seed) noexcept { return qHash(key.data, seed); }
 
     operator QVariant() const;
 
-    QT_SIZEPOLICY_CONSTEXPR int horizontalStretch() const Q_DECL_NOTHROW { return static_cast<int>(bits.horStretch); }
-    QT_SIZEPOLICY_CONSTEXPR int verticalStretch() const Q_DECL_NOTHROW { return static_cast<int>(bits.verStretch); }
+    QT_SIZEPOLICY_CONSTEXPR int horizontalStretch() const noexcept { return static_cast<int>(bits.horStretch); }
+    QT_SIZEPOLICY_CONSTEXPR int verticalStretch() const noexcept { return static_cast<int>(bits.verStretch); }
     Q_DECL_RELAXED_CONSTEXPR void setHorizontalStretch(int stretchFactor) { bits.horStretch = static_cast<quint32>(qBound(0, stretchFactor, 255)); }
     Q_DECL_RELAXED_CONSTEXPR void setVerticalStretch(int stretchFactor) { bits.verStretch = static_cast<quint32>(qBound(0, stretchFactor, 255)); }
 
-    QT_SIZEPOLICY_CONSTEXPR bool retainSizeWhenHidden() const Q_DECL_NOTHROW { return bits.retainSizeWhenHidden; }
-    Q_DECL_RELAXED_CONSTEXPR void setRetainSizeWhenHidden(bool retainSize) Q_DECL_NOTHROW { bits.retainSizeWhenHidden = retainSize; }
+    QT_SIZEPOLICY_CONSTEXPR bool retainSizeWhenHidden() const noexcept { return bits.retainSizeWhenHidden; }
+    Q_DECL_RELAXED_CONSTEXPR void setRetainSizeWhenHidden(bool retainSize) noexcept { bits.retainSizeWhenHidden = retainSize; }
 
-    Q_DECL_RELAXED_CONSTEXPR void transpose() Q_DECL_NOTHROW { *this = transposed(); }
+    Q_DECL_RELAXED_CONSTEXPR void transpose() noexcept { *this = transposed(); }
     Q_REQUIRED_RESULT
 #ifndef Q_QDOC
     QT_SIZEPOLICY_CONSTEXPR_AND_UNIFORM_INIT
 #endif
-    QSizePolicy transposed() const Q_DECL_NOTHROW
+    QSizePolicy transposed() const noexcept
     {
         return QSizePolicy(bits.transposed());
     }
@@ -173,11 +173,11 @@ private:
     friend Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &);
     friend Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &);
 #endif
-    QT_SIZEPOLICY_CONSTEXPR QSizePolicy(int i) Q_DECL_NOTHROW : data(i) { }
+    QT_SIZEPOLICY_CONSTEXPR QSizePolicy(int i) noexcept : data(i) { }
     struct Bits;
-    QT_SIZEPOLICY_CONSTEXPR explicit QSizePolicy(Bits b) Q_DECL_NOTHROW : bits(b) { }
+    QT_SIZEPOLICY_CONSTEXPR explicit QSizePolicy(Bits b) noexcept : bits(b) { }
 
-    static Q_DECL_RELAXED_CONSTEXPR quint32 toControlTypeFieldValue(ControlType type) Q_DECL_NOTHROW
+    static Q_DECL_RELAXED_CONSTEXPR quint32 toControlTypeFieldValue(ControlType type) noexcept
     {
         /*
           The control type is a flag type, with values 0x1, 0x2, 0x4, 0x8, 0x10,
@@ -207,7 +207,7 @@ private:
         quint32 retainSizeWhenHidden : 1;
 
         QT_SIZEPOLICY_CONSTEXPR_AND_UNIFORM_INIT
-        Bits transposed() const Q_DECL_NOTHROW
+        Bits transposed() const noexcept
         {
             return {verStretch, // \ swap
                     horStretch, // /
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index f81cb471fa..97a279d65d 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -36,12 +36,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-# include <private/qcore_mac_p.h>
-#endif
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include <QtWidgets/private/qlabel_p.h>
 
 #include <qapplication.h>
 #include <qdesktopwidget.h>
@@ -61,13 +57,9 @@
 
 #ifndef QT_NO_TOOLTIP
 #include <qlabel.h>
+#include <QtWidgets/private/qlabel_p.h>
 #include <qtooltip.h>
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-# include <private/qcore_mac_p.h>
-#include <private/qt_cocoa_helpers_mac_p.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -317,20 +309,7 @@ void QTipLabel::timerEvent(QTimerEvent *e)
         || e->timerId() == expireTimer.timerId()){
         hideTimer.stop();
         expireTimer.stop();
-#if 0 /* Used to be included in Qt4 for Q_WS_MAC */ && QT_CONFIG(effects)
-        if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip)){
-            // Fade out tip on mac (makes it invisible).
-            // The tip will not be deleted until a new tip is shown.
-
-                        // DRSWAT - Cocoa
-                        macWindowFade(qt_mac_window_for(this));
-            QTipLabel::instance->fadingOut = true; // will never be false again.
-        }
-        else
-            hideTipImmediately();
-#else
         hideTipImmediately();
-#endif
     }
 }
 
@@ -420,29 +399,11 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w)
 #endif //QT_NO_STYLE_STYLESHEET
 
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // When in full screen mode, there is no Dock nor Menu so we can use
-    // the whole screen for displaying the tooltip. However when not in
-    // full screen mode we need to save space for the dock, so we use
-    // availableGeometry instead.
-    extern bool qt_mac_app_fullscreen; //qapplication_mac.mm
-    QRect screen;
-    if(qt_mac_app_fullscreen)
-        screen = QDesktopWidgetPrivate::screenGeometry(getTipScreen(pos, w));
-    else
-        screen = QDesktopWidgetPrivate::availableGeometry(getTipScreen(pos, w));
-#else
     QRect screen = QDesktopWidgetPrivate::screenGeometry(getTipScreen(pos, w));
-#endif
 
     QPoint p = pos;
-    p += QPoint(2,
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-                21
-#else
-                16
-#endif
-        );
+    p += QPoint(2, 16);
+
     if (p.x() + this->width() > screen.x() + screen.width())
         p.rx() -= 4 + this->width();
     if (p.y() + this->height() > screen.y() + screen.height())
@@ -541,7 +502,7 @@ QT_WARNING_POP
         QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label"));
 
 
-#if QT_CONFIG(effects) && !0 /* Used to be included in Qt4 for Q_WS_MAC */
+#if QT_CONFIG(effects)
         if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip))
             qFadeEffect(QTipLabel::instance);
         else if (QApplication::isEffectEnabled(Qt::UI_AnimateTooltip))
diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h
index edf1de0c1d..1b263a6629 100644
--- a/src/widgets/kernel/qtooltip.h
+++ b/src/widgets/kernel/qtooltip.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 class Q_WIDGETS_EXPORT QToolTip
 {
-    QToolTip() Q_DECL_EQ_DELETE;
+    QToolTip() = delete;
 public:
     // ### Qt 6 - merge the three showText functions below
     static void showText(const QPoint &pos, const QString &text, QWidget *w = nullptr);
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index 4a798a7490..228ca4d38a 100644
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -263,7 +263,7 @@ void QWhatsThat::mouseReleaseEvent(QMouseEvent* e)
         anchor.clear();
         if (!href.isEmpty()) {
             QWhatsThisClickedEvent e(href);
-            if (QApplication::sendEvent(widget, &e))
+            if (QCoreApplication::sendEvent(widget, &e))
                 return;
         }
     }
@@ -380,7 +380,7 @@ void QWhatsThisPrivate::notifyToplevels(QEvent *e)
 {
     const QWidgetList toplevels = QApplication::topLevelWidgets();
     for (auto *w : toplevels)
-        QApplication::sendEvent(w, e);
+        QCoreApplication::sendEvent(w, e);
 }
 
 QWhatsThisPrivate *QWhatsThisPrivate::instance = 0;
@@ -394,7 +394,7 @@ QWhatsThisPrivate::QWhatsThisPrivate()
     QPoint pos = QCursor::pos();
     if (QWidget *w = QApplication::widgetAt(pos)) {
         QHelpEvent e(QEvent::QueryWhatsThis, w->mapFromGlobal(pos), pos);
-        bool sentEvent = QApplication::sendEvent(w, &e);
+        const bool sentEvent = QCoreApplication::sendEvent(w, &e);
 #ifdef QT_NO_CURSOR
         Q_UNUSED(sentEvent);
 #else
@@ -439,7 +439,7 @@ bool QWhatsThisPrivate::eventFilter(QObject *o, QEvent *e)
         if (me->button() == Qt::RightButton || customWhatsThis)
             return false;
         QHelpEvent e(QEvent::WhatsThis, me->pos(), me->globalPos());
-        if (!QApplication::sendEvent(w, &e) || !e.isAccepted())
+        if (!QCoreApplication::sendEvent(w, &e) || !e.isAccepted())
             leaveOnMouseRelease = true;
 
     } break;
@@ -448,12 +448,12 @@ bool QWhatsThisPrivate::eventFilter(QObject *o, QEvent *e)
     {
         QMouseEvent *me = static_cast<QMouseEvent*>(e);
         QHelpEvent e(QEvent::QueryWhatsThis, me->pos(), me->globalPos());
-        bool sentEvent = QApplication::sendEvent(w, &e);
+        const bool sentEvent = QCoreApplication::sendEvent(w, &e);
 #ifdef QT_NO_CURSOR
         Q_UNUSED(sentEvent);
 #else
-        QApplication::changeOverrideCursor((!sentEvent || !e.isAccepted())?
-                                           Qt::ForbiddenCursor:Qt::WhatsThisCursor);
+        QGuiApplication::changeOverrideCursor((!sentEvent || !e.isAccepted())?
+                                              Qt::ForbiddenCursor:Qt::WhatsThisCursor);
 #endif
         Q_FALLTHROUGH();
     }
@@ -577,26 +577,12 @@ void QWhatsThisPrivate::say(QWidget * widget, const QString &text, int x, int y)
     if (text.size() == 0)
         return;
     // make a fresh widget, and set it up
-    QWhatsThat *whatsThat = new QWhatsThat(
-        text,
-#if 0 /* Used to be included in Qt4 for Q_WS_X11 */ && !defined(QT_NO_CURSOR)
-        QApplication::desktop()->screen(widget ? widget->x11Info().screen() : QCursor::x11Screen()),
-#else
-        0,
-#endif
-        widget
-       );
-
+    QWhatsThat *whatsThat = new QWhatsThat(text, 0, widget);
 
     // okay, now to find a suitable location
-
     int scr = (widget ?
                 QDesktopWidgetPrivate::screenNumber(widget) :
-#if 0 /* Used to be included in Qt4 for Q_WS_X11 */ && !defined(QT_NO_CURSOR)
-                QCursor::x11Screen()
-#else
                 QDesktopWidgetPrivate::screenNumber(QPoint(x,y))
-#endif
                );
     QRect screen = QDesktopWidgetPrivate::screenGeometry(scr);
 
diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h
index 59c0b01c9b..fa5b97d98a 100644
--- a/src/widgets/kernel/qwhatsthis.h
+++ b/src/widgets/kernel/qwhatsthis.h
@@ -54,7 +54,7 @@ class QAction;
 
 class Q_WIDGETS_EXPORT QWhatsThis
 {
-    QWhatsThis() Q_DECL_EQ_DELETE;
+    QWhatsThis() = delete;
 
 public:
     static void enterWhatsThisMode();
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 0fa5907744..74aebd1223 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -61,13 +61,6 @@
 #ifndef QT_NO_ACCESSIBILITY
 # include "qaccessible.h"
 #endif
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-# include "qt_mac_p.h"
-# include "qt_cocoa_helpers_mac_p.h"
-# include "qmainwindow.h"
-# include "qtoolbar.h"
-# include <private/qmainwindowlayout_p.h>
-#endif
 #include <qpa/qplatformwindow.h>
 #include "private/qwidgetwindow_p.h"
 #include "qpainter.h"
@@ -79,6 +72,7 @@
 #include "private/qstylesheetstyle_p.h"
 #include "private/qstyle_p.h"
 #include "qfileinfo.h"
+#include "qscopeguard.h"
 #include <QtGui/private/qhighdpiscaling_p.h>
 #include <QtGui/qinputmethod.h>
 #include <QtGui/qopenglcontext.h>
@@ -89,10 +83,7 @@
 #include <private/qgraphicseffect_p.h>
 #endif
 #include <qbackingstore.h>
-#include <private/qwidgetbackingstore_p.h>
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-# include <private/qpaintengine_mac_p.h>
-#endif
+#include <private/qwidgetrepaintmanager_p.h>
 #include <private/qpaintengine_raster_p.h>
 
 #include "qwidget_p.h"
@@ -120,15 +111,15 @@
 
 #include <QtPlatformHeaders/qxcbwindowfunctions.h>
 
+#include <private/qmemory_p.h>
+
 // widget/widget data creation count
 //#define QWIDGET_EXTRA_DEBUG
 //#define ALIEN_DEBUG
 
 QT_BEGIN_NAMESPACE
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-bool qt_mac_clearDirtyOnWidgetInsideDrawWidget = false;
-#endif
+Q_LOGGING_CATEGORY(lcWidgetPainting, "qt.widgets.painting", QtWarningMsg);
 
 static inline bool qRectIntersects(const QRect &r1, const QRect &r2)
 {
@@ -136,101 +127,11 @@ static inline bool qRectIntersects(const QRect &r1, const QRect &r2)
             qMax(r1.top(), r2.top()) <= qMin(r1.bottom(), r2.bottom()));
 }
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-#  define QT_NO_PAINT_DEBUG
-#endif
-
 extern bool qt_sendSpontaneousEvent(QObject*, QEvent*); // qapplication.cpp
 extern QDesktopWidget *qt_desktopWidget; // qapplication.cpp
 
-/*!
-    \internal
-    \class QWidgetBackingStoreTracker
-    \brief Class which allows tracking of which widgets are using a given backing store
-
-    QWidgetBackingStoreTracker is a thin wrapper around a QWidgetBackingStore pointer,
-    which maintains a list of the QWidgets which are currently using the backing
-    store.  This list is modified via the registerWidget and unregisterWidget functions.
- */
-
-QWidgetBackingStoreTracker::QWidgetBackingStoreTracker()
-    :   m_ptr(0)
-{
-
-}
-
-QWidgetBackingStoreTracker::~QWidgetBackingStoreTracker()
-{
-    delete m_ptr;
-}
-
-/*!
-    \internal
-    Destroy the contained QWidgetBackingStore, if not null, and clear the list of
-    widgets using the backing store, then create a new QWidgetBackingStore, providing
-    the QWidget.
- */
-void QWidgetBackingStoreTracker::create(QWidget *widget)
-{
-    destroy();
-    m_ptr = new QWidgetBackingStore(widget);
-}
-
-/*!
-    \internal
-    Destroy the contained QWidgetBackingStore, if not null, and clear the list of
-    widgets using the backing store.
- */
-void QWidgetBackingStoreTracker::destroy()
-{
-    delete m_ptr;
-    m_ptr = 0;
-    m_widgets.clear();
-}
-
-/*!
-    \internal
-    Add the widget to the list of widgets currently using the backing store.
-    If the widget was already in the list, this function is a no-op.
- */
-void QWidgetBackingStoreTracker::registerWidget(QWidget *w)
-{
-    Q_ASSERT(m_ptr);
-    Q_ASSERT(w->internalWinId());
-    Q_ASSERT(qt_widget_private(w)->maybeBackingStore() == m_ptr);
-    m_widgets.insert(w);
-}
-
-/*!
-    \internal
-    Remove the widget from the list of widgets currently using the backing store.
-    If the widget was in the list, and removing it causes the list to be empty,
-    the backing store is deleted.
-    If the widget was not in the list, this function is a no-op.
- */
-void QWidgetBackingStoreTracker::unregisterWidget(QWidget *w)
-{
-    if (m_widgets.remove(w) && m_widgets.isEmpty()) {
-        delete m_ptr;
-        m_ptr = 0;
-    }
-}
-
-/*!
-    \internal
-    Recursively remove widget and all of its descendents.
- */
-void QWidgetBackingStoreTracker::unregisterWidgetSubtree(QWidget *widget)
-{
-    unregisterWidget(widget);
-    foreach (QObject *child, widget->children())
-        if (QWidget *childWidget = qobject_cast<QWidget *>(child))
-            unregisterWidgetSubtree(childWidget);
-}
-
 QWidgetPrivate::QWidgetPrivate(int version)
     : QObjectPrivate(version)
-      , extra(0)
       , focus_next(0)
       , focus_prev(0)
       , focus_child(0)
@@ -284,17 +185,6 @@ QWidgetPrivate::QWidgetPrivate(int version)
 #if defined(Q_OS_WIN)
       , noPaintOnScreen(0)
 #endif
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-      , picture(0)
-#elif 0 // Used to be included in Qt4 for Q_WS_WIN
-  #ifndef QT_NO_GESTURES
-      , nativeGesturePanEnabled(0)
-  #endif
-#elif 0 // Used to be included in Qt4 for Q_WS_MAC
-      , needWindowChange(0)
-      , window_event(0)
-      , qd_hd(0)
-#endif
 {
     if (Q_UNLIKELY(!qApp)) {
         qFatal("QWidget: Must construct a QApplication before a QWidget");
@@ -313,16 +203,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
 
     isWidget = true;
     memset(high_attributes, 0, sizeof(high_attributes));
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    drawRectOriginalAdded = false;
-    originalDrawMethod = true;
-    changeMethods = false;
-    isInUnifiedToolbar = false;
-    unifiedSurface = 0;
-    toolbar_ancestor = 0;
-    flushRequested = false;
-    touchEventsEnabled = false;
-#endif
+
 #ifdef QWIDGET_EXTRA_DEBUG
     static int count = 0;
     qDebug() << "widgets" << ++count;
@@ -358,7 +239,7 @@ void QWidgetPrivate::scrollChildren(int dx, int dy)
                     w->d_func()->setWSGeometry();
                 w->d_func()->setDirtyOpaqueRegion();
                 QMoveEvent e(r.topLeft(), oldp);
-                QApplication::sendEvent(w, &e);
+                QCoreApplication::sendEvent(w, &e);
             }
         }
     }
@@ -392,7 +273,7 @@ QPointer<QWidget> QWidgetPrivate::editingWidget;
 
     This feature is only available in Qt for Embedded Linux.
 
-    \sa setEditFocus(), QApplication::keypadNavigationEnabled()
+    \sa setEditFocus(), QApplication::navigationMode()
 */
 bool QWidget::hasEditFocus() const
 {
@@ -412,7 +293,7 @@ bool QWidget::hasEditFocus() const
 
     This feature is only available in Qt for Embedded Linux.
 
-    \sa hasEditFocus(), QApplication::keypadNavigationEnabled()
+    \sa hasEditFocus(), QApplication::navigationMode()
 */
 void QWidget::setEditFocus(bool on)
 {
@@ -434,13 +315,13 @@ void QWidget::setEditFocus(bool on)
     if (!on && QWidgetPrivate::editingWidget == f) {
         QWidgetPrivate::editingWidget = 0;
         QEvent event(QEvent::LeaveEditFocus);
-        QApplication::sendEvent(f, &event);
-        QApplication::sendEvent(f->style(), &event);
+        QCoreApplication::sendEvent(f, &event);
+        QCoreApplication::sendEvent(f->style(), &event);
     } else if (on) {
         QWidgetPrivate::editingWidget = f;
         QEvent event(QEvent::EnterEditFocus);
-        QApplication::sendEvent(f, &event);
-        QApplication::sendEvent(f->style(), &event);
+        QCoreApplication::sendEvent(f, &event);
+        QCoreApplication::sendEvent(f->style(), &event);
     }
 }
 #endif
@@ -943,22 +824,6 @@ QWidgetSet *QWidgetPrivate::allWidgets = 0;         // widgets with no wid
 
 
 /*****************************************************************************
-  QWidget utility functions
- *****************************************************************************/
-
-QRegion qt_dirtyRegion(QWidget *widget)
-{
-    if (!widget)
-        return QRegion();
-
-    QWidgetBackingStore *bs = qt_widget_private(widget)->maybeBackingStore();
-    if (!bs)
-        return QRegion();
-
-    return bs->dirtyRegion(widget);
-}
-
-/*****************************************************************************
   QWidget member functions
  *****************************************************************************/
 
@@ -1083,17 +948,12 @@ void QWidgetPrivate::adjustFlags(Qt::WindowFlags &flags, QWidget *w)
         // Only enable this on non-Mac platforms. Since the old way of doing this would
         // interpret WindowSystemMenuHint as a close button and we can't change that behavior
         // we can't just add this in.
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
         if ((flags & (Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowContextHelpButtonHint))
 #  ifdef Q_OS_WIN
             && type != Qt::Dialog // QTBUG-2027, allow for menu-less dialogs.
 #  endif
            ) {
             flags |= Qt::WindowSystemMenuHint;
-#else
-        if (flags & (Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint
-                     | Qt::WindowSystemMenuHint)) {
-#endif
             flags |= Qt::WindowTitleHint;
             flags &= ~Qt::FramelessWindowHint;
         }
@@ -1123,6 +983,8 @@ void QWidgetPrivate::adjustFlags(Qt::WindowFlags &flags, QWidget *w)
 void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
 {
     Q_Q(QWidget);
+    Q_ASSERT_X(q != parentWidget, Q_FUNC_INFO, "Cannot parent a QWidget to itself");
+
     if (Q_UNLIKELY(!qobject_cast<QApplication *>(QCoreApplication::instance())))
         qFatal("QWidget: Cannot create a QWidget without QApplication");
 
@@ -1146,13 +1008,6 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
     }
 #endif
 
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    if (desktopWidget) {
-        // make sure the widget is created on the same screen as the
-        // programmer specified desktop widget
-        xinfo = desktopWidget->d_func()->xinfo;
-    }
-#endif
     if (targetScreen >= 0) {
         topData()->initialScreenIndex = targetScreen;
         if (QWindow *window = q->windowHandle())
@@ -1180,9 +1035,6 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
         mustHaveWindowHandle = 1;
         q->setAttribute(Qt::WA_NativeWindow);
     }
-//#if 0 // Used to be included in Qt4 for Q_WS_MAC
-//    q->setAttribute(Qt::WA_NativeWindow);
-//#endif
 
     q->setAttribute(Qt::WA_QuitOnClose); // might be cleared in adjustQuitOnCloseAttribute()
     adjustQuitOnCloseAttribute();
@@ -1206,9 +1058,6 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
         setOpaque(q->isWindow() && background.style() != Qt::NoBrush && background.isOpaque());
     }
     data.fnt = QFont(data.fnt, q);
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    data.fnt.x11SetScreen(xinfo.screen());
-#endif
 
     q->setAttribute(Qt::WA_PendingMoveEvent);
     q->setAttribute(Qt::WA_PendingResizeEvent);
@@ -1220,24 +1069,12 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
         q->create();
 
     QEvent e(QEvent::Create);
-    QApplication::sendEvent(q, &e);
-    QApplication::postEvent(q, new QEvent(QEvent::PolishRequest));
+    QCoreApplication::sendEvent(q, &e);
+    QCoreApplication::postEvent(q, new QEvent(QEvent::PolishRequest));
 
     extraPaintEngine = 0;
-
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // If we add a child to the unified toolbar, we have to redirect the painting.
-    if (parentWidget && parentWidget->d_func() && parentWidget->d_func()->isInUnifiedToolbar) {
-        if (parentWidget->d_func()->unifiedSurface) {
-            QWidget *toolbar = parentWidget->d_func()->toolbar_ancestor;
-            parentWidget->d_func()->unifiedSurface->recursiveRedirect(toolbar, toolbar, toolbar->d_func()->toolbar_offset);
-        }
-    }
-#endif
 }
 
-
-
 void QWidgetPrivate::createRecursively()
 {
     Q_Q(QWidget);
@@ -1249,6 +1086,35 @@ void QWidgetPrivate::createRecursively()
     }
 }
 
+QWindow *QWidgetPrivate::windowHandle(WindowHandleMode mode) const
+{
+    if (mode == WindowHandleMode::Direct || mode == WindowHandleMode::Closest) {
+        if (QTLWExtra *x = maybeTopData()) {
+            if (x->window != nullptr || mode == WindowHandleMode::Direct)
+                return x->window;
+        }
+    }
+    if (mode == WindowHandleMode::Closest) {
+        if (auto nativeParent = q_func()->nativeParentWidget()) {
+            if (auto window = nativeParent->windowHandle())
+                return window;
+        }
+    }
+    if (mode == WindowHandleMode::TopLevel || mode == WindowHandleMode::Closest) {
+        if (auto topLevel = q_func()->topLevelWidget()) {
+            if (auto window = topLevel ->windowHandle())
+                return window;
+        }
+    }
+    return nullptr;
+}
+
+QScreen *QWidgetPrivate::associatedScreen() const
+{
+    if (auto window = windowHandle(WindowHandleMode::Closest))
+        return window->screen();
+    return nullptr;
+}
 
 // ### fixme: Qt 6: Remove parameter window from QWidget::create()
 
@@ -1315,36 +1181,20 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow)
              << "Alien?" << !testAttribute(Qt::WA_NativeWindow);
 #endif
 
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ && QT_CONFIG(draganddrop)
-    // Unregister the dropsite (if already registered) before we
-    // re-create the widget with a native window.
-    if (testAttribute(Qt::WA_WState_Created) && !internalWinId() && testAttribute(Qt::WA_NativeWindow)
-            && d->extra && d->extra->dropTarget) {
-        d->registerDropSite(false);
-    }
-#endif
-
     d->updateIsOpaque();
 
     setAttribute(Qt::WA_WState_Created);                        // set created flag
     d->create();
 
-    // a real toplevel window needs a backing store
-    if (isWindow() && windowType() != Qt::Desktop) {
-        d->topData()->backingStoreTracker.destroy();
-        d->topData()->backingStoreTracker.create(this);
-    }
+    // A real toplevel window needs a paint manager
+    if (isWindow() && windowType() != Qt::Desktop)
+        d->topData()->repaintManager.reset(new QWidgetRepaintManager(this));
 
     d->setModal_sys();
 
     if (!isWindow() && parentWidget() && parentWidget()->testAttribute(Qt::WA_DropSiteRegistered))
         setAttribute(Qt::WA_DropSiteRegistered, true);
 
-#ifdef QT_EVAL
-    extern void qt_eval_init_widget(QWidget *w);
-    qt_eval_init_widget(this);
-#endif
-
     // need to force the resting of the icon after changing parents
     if (testAttribute(Qt::WA_SetWindowIcon))
         d->setWindowIcon_sys();
@@ -1587,7 +1437,7 @@ QWidget::~QWidget()
     // Remove all shortcuts grabbed by this
     // widget, unless application is closing
     if (!QApplicationPrivate::is_app_closing && testAttribute(Qt::WA_GrabbedShortcut))
-        qApp->d_func()->shortcutMap.removeShortcut(0, this, QKeySequence());
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(0, this, QKeySequence());
 #endif
 
     // delete layout while we still are a valid widget
@@ -1611,7 +1461,7 @@ QWidget::~QWidget()
         while (w->d_func()->extra && w->d_func()->extra->focus_proxy)
             w = w->d_func()->extra->focus_proxy;
         QWidget *window = w->window();
-        QWExtra *e = window ? window->d_func()->extra : 0;
+        QWExtra *e = window ? window->d_func()->extra.get() : nullptr ;
         if (!e || !e->proxyWidget || (w->parentWidget() && w->parentWidget()->d_func()->focus_child == this))
 #endif
         clearFocus();
@@ -1632,21 +1482,14 @@ QWidget::~QWidget()
                 // and if that also doesn't work, then give up
             }
         }
-    }
-
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ || 0 /* Used to be included in Qt4 for Q_WS_X11 */|| 0 /* Used to be included in Qt4 for Q_WS_MAC */
-    else if (!internalWinId() && isVisible()) {
-        qApp->d_func()->sendSyntheticEnterLeave(this);
-    }
-#endif
-    else if (isVisible()) {
+    } else if (isVisible()) {
         qApp->d_func()->sendSyntheticEnterLeave(this);
     }
 
-    if (QWidgetBackingStore *bs = d->maybeBackingStore()) {
-        bs->removeDirtyWidget(this);
+    if (QWidgetRepaintManager *repaintManager = d->maybeRepaintManager()) {
+        repaintManager->removeDirtyWidget(this);
         if (testAttribute(Qt::WA_StaticContents))
-            bs->removeStaticWidget(this);
+            repaintManager->removeStaticWidget(this);
     }
 
     delete d->needsFlush;
@@ -1683,19 +1526,10 @@ QWidget::~QWidget()
 
     d->blockSig = blocked;
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // QCocoaView holds a pointer back to this widget. Clear it now
-    // to make sure it's not followed later on. The lifetime of the
-    // QCocoaView might exceed the lifetime of this widget in cases
-    // where Cocoa itself holds references to it.
-    extern void qt_mac_clearCocoaViewQWidgetPointers(QWidget *);
-    qt_mac_clearCocoaViewQWidgetPointers(this);
-#endif
-
     if (!d->children.isEmpty())
         d->deleteChildren();
 
-    QApplication::removePostedEvents(this);
+    QCoreApplication::removePostedEvents(this);
 
     QT_TRY {
         destroy();                                        // platform-dependent cleanup
@@ -1738,9 +1572,6 @@ void QWidgetPrivate::setWinId(WId id)                // set widget identifier
     const WId oldWinId = data.winid;
 
     data.winid = id;
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    hd = id; // X11: hd == ident
-#endif
     if (mapper && id && !userDesktopWidget) {
         mapper->insert(data.winid, q);
     }
@@ -1756,8 +1587,8 @@ void QWidgetPrivate::createTLExtra()
     if (!extra)
         createExtra();
     if (!extra->topextra) {
-        QTLWExtra* x = extra->topextra = new QTLWExtra;
-        x->icon = 0;
+        extra->topextra = qt_make_unique<QTLWExtra>();
+        QTLWExtra* x = extra->topextra.get();
         x->backingStore = 0;
         x->sharedPainter = 0;
         x->incw = x->inch = 0;
@@ -1771,11 +1602,8 @@ void QWidgetPrivate::createTLExtra()
         x->inTopLevelResize = false;
         x->embedded = 0;
         x->window = 0;
-        x->shareContext = 0;
         x->initialScreenIndex = -1;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        x->wasMaximized = false;
-#endif
+
 #ifdef QWIDGET_EXTRA_DEBUG
         static int count = 0;
         qDebug() << "tlextra" << ++count;
@@ -1791,15 +1619,11 @@ void QWidgetPrivate::createTLExtra()
 void QWidgetPrivate::createExtra()
 {
     if (!extra) {                                // if not exists
-        extra = new QWExtra;
+        extra = qt_make_unique<QWExtra>();
         extra->glContext = 0;
-        extra->topextra = 0;
 #if QT_CONFIG(graphicsview)
         extra->proxyWidget = 0;
 #endif
-#ifndef QT_NO_CURSOR
-        extra->curs = 0;
-#endif
         extra->minw = 0;
         extra->minh = 0;
         extra->maxw = QWIDGETSIZE_MAX;
@@ -1833,9 +1657,6 @@ void QWidgetPrivate::createSysExtra()
 void QWidgetPrivate::deleteExtra()
 {
     if (extra) {                                // if exists
-#ifndef QT_NO_CURSOR
-        delete extra->curs;
-#endif
         deleteSysExtra();
 #ifndef QT_NO_STYLE_STYLESHEET
         // dereference the stylesheet style
@@ -1845,12 +1666,9 @@ void QWidgetPrivate::deleteExtra()
         if (extra->topextra) {
             deleteTLSysExtra();
             // extra->topextra->backingStore destroyed in QWidgetPrivate::deleteTLSysExtra()
-            delete extra->topextra->icon;
-            delete extra->topextra;
         }
-        delete extra;
         // extra->xic destroyed in QWidget::destroy()
-        extra = 0;
+        extra.reset();
     }
 }
 
@@ -1872,13 +1690,11 @@ void QWidgetPrivate::deleteTLSysExtra()
         //the qplatformbackingstore may hold a reference to the window, so the backingstore
         //needs to be deleted first.
 
-        extra->topextra->backingStoreTracker.destroy();
+        extra->topextra->repaintManager.reset(nullptr);
         deleteBackingStore(this);
 #ifndef QT_NO_OPENGL
-        qDeleteAll(extra->topextra->widgetTextures);
         extra->topextra->widgetTextures.clear();
-        delete extra->topextra->shareContext;
-        extra->topextra->shareContext = 0;
+        extra->topextra->shareContext.reset();
 #endif
 
         //the toplevel might have a context with a "qglcontext associated with it. We need to
@@ -1923,7 +1739,7 @@ QRegion QWidgetPrivate::overlappedRegion(const QRect &rect, bool breakAfterFirst
 
             const QRect siblingRect = sibling->d_func()->effectiveRectFor(sibling->data->crect);
             if (qRectIntersects(siblingRect, r)) {
-                const QWExtra *siblingExtra = sibling->d_func()->extra;
+                const auto &siblingExtra = sibling->d_func()->extra;
                 if (siblingExtra && siblingExtra->hasMask && !sibling->d_func()->graphicsEffect
                     && !siblingExtra->mask.translated(sibling->data->crect.topLeft()).intersects(r)) {
                     continue;
@@ -1942,23 +1758,59 @@ QRegion QWidgetPrivate::overlappedRegion(const QRect &rect, bool breakAfterFirst
 
 void QWidgetPrivate::syncBackingStore()
 {
-    if (paintOnScreen()) {
-        repaint_sys(dirty);
+    if (shouldPaintOnScreen()) {
+        paintOnScreen(dirty);
         dirty = QRegion();
-    } else if (QWidgetBackingStore *bs = maybeBackingStore()) {
-        bs->sync();
+    } else if (QWidgetRepaintManager *repaintManager = maybeRepaintManager()) {
+        repaintManager->sync();
     }
 }
 
 void QWidgetPrivate::syncBackingStore(const QRegion &region)
 {
-    if (paintOnScreen())
-        repaint_sys(region);
-    else if (QWidgetBackingStore *bs = maybeBackingStore()) {
-        bs->sync(q_func(), region);
+    if (shouldPaintOnScreen())
+        paintOnScreen(region);
+    else if (QWidgetRepaintManager *repaintManager = maybeRepaintManager()) {
+        repaintManager->sync(q_func(), region);
     }
 }
 
+void QWidgetPrivate::paintOnScreen(const QRegion &rgn)
+{
+    if (data.in_destructor)
+        return;
+
+    if (shouldDiscardSyncRequest())
+        return;
+
+    Q_Q(QWidget);
+    if (q->testAttribute(Qt::WA_StaticContents)) {
+        if (!extra)
+            createExtra();
+        extra->staticContentsSize = data.crect.size();
+    }
+
+    QPaintEngine *engine = q->paintEngine();
+
+    // QGLWidget does not support partial updates if:
+    // 1) The context is double buffered
+    // 2) The context is single buffered and auto-fill background is enabled.
+    const bool noPartialUpdateSupport = (engine && (engine->type() == QPaintEngine::OpenGL
+                                                || engine->type() == QPaintEngine::OpenGL2))
+                                        && (usesDoubleBufferedGLContext || q->autoFillBackground());
+    QRegion toBePainted(noPartialUpdateSupport ? q->rect() : rgn);
+
+    toBePainted &= clipRect();
+    clipToEffectiveMask(toBePainted);
+    if (toBePainted.isEmpty())
+        return; // Nothing to repaint.
+
+    drawWidget(q, toBePainted, QPoint(), QWidgetPrivate::DrawAsRoot | QWidgetPrivate::DrawPaintOnScreen, 0);
+
+    if (Q_UNLIKELY(q->paintingActive()))
+        qWarning("QWidget::repaint: It is dangerous to leave painters active on a widget outside of the PaintEvent");
+}
+
 void QWidgetPrivate::setUpdatesEnabled_helper(bool enable)
 {
     Q_Q(QWidget);
@@ -2007,7 +1859,7 @@ void QWidgetPrivate::propagatePaletteChange()
         QCoreApplication::testAttribute(Qt::AA_UseStyleSheetPropagationInWidgetStyles);
 
     QEvent pc(QEvent::PaletteChange);
-    QApplication::sendEvent(q, &pc);
+    QCoreApplication::sendEvent(q, &pc);
     for (int i = 0; i < children.size(); ++i) {
         QWidget *w = qobject_cast<QWidget*>(children.at(i));
         if (w && (!w->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles)
@@ -2183,11 +2035,6 @@ void QWidgetPrivate::subtractOpaqueSiblings(QRegion &sourceRegion, bool *hasDirt
     if (disableSubtractOpaqueSiblings || q->isWindow())
         return;
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    if (q->d_func()->isInUnifiedToolbar)
-        return;
-#endif
-
     QRect clipBoundingRect;
     bool dirtyClipBoundingRect = true;
 
@@ -2291,7 +2138,7 @@ void QWidgetPrivate::clipToEffectiveMask(QRegion &region) const
     }
 }
 
-bool QWidgetPrivate::paintOnScreen() const
+bool QWidgetPrivate::shouldPaintOnScreen() const
 {
 #if defined(QT_NO_BACKINGSTORE)
     return true;
@@ -2320,13 +2167,6 @@ void QWidgetPrivate::updateIsOpaque()
 #endif // QT_CONFIG(graphicseffect)
 
     Q_Q(QWidget);
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    if (q->testAttribute(Qt::WA_X11OpenGLOverlay)) {
-        setOpaque(false);
-        return;
-    }
-#endif
-
     if (q->testAttribute(Qt::WA_OpaquePaintEvent) || q->testAttribute(Qt::WA_PaintOnScreen)) {
         setOpaque(true);
         return;
@@ -2379,20 +2219,9 @@ static inline void fillRegion(QPainter *painter, const QRegion &rgn, const QBrus
     Q_ASSERT(painter);
 
     if (brush.style() == Qt::TexturePattern) {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        // Optimize pattern filling on mac by using HITheme directly
-        // when filling with the standard widget background.
-        // Defined in qmacstyle_mac.cpp
-        extern void qt_mac_fill_background(QPainter *painter, const QRegion &rgn, const QBrush &brush);
-        qt_mac_fill_background(painter, rgn, brush);
-#else
-        {
-            const QRect rect(rgn.boundingRect());
-            painter->setClipRegion(rgn);
-            painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft());
-        }
-#endif
-
+        const QRect rect(rgn.boundingRect());
+        painter->setClipRegion(rgn);
+        painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft());
     } else if (brush.gradient()
                && (brush.gradient()->coordinateMode() == QGradient::ObjectBoundingMode
                    || brush.gradient()->coordinateMode() == QGradient::ObjectMode)) {
@@ -2423,7 +2252,7 @@ bool QWidgetPrivate::updateBrushOrigin(QPainter *painter, const QBrush &brush) c
     return true;
 }
 
-void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int flags) const
+void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, DrawWidgetFlags flags) const
 {
     Q_Q(const QWidget);
 
@@ -2466,11 +2295,7 @@ void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int
   visible widgets.
 */
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    extern QPointer<QWidget> qt_button_down;
-#else
-    extern QWidget *qt_button_down;
-#endif
+extern QWidget *qt_button_down;
 
 void QWidgetPrivate::deactivateWidgetCleanup()
 {
@@ -2656,7 +2481,7 @@ WId QWidget::effectiveWinId() const
 
     \since 5.0
 
-    \sa winId()
+    \sa winId(), screen()
 */
 QWindow *QWidget::windowHandle() const
 {
@@ -2664,6 +2489,29 @@ QWindow *QWidget::windowHandle() const
     return d->windowHandle();
 }
 
+/*!
+    Returns the screen the widget is on.
+
+    \since 5.14
+
+    \sa windowHandle()
+*/
+QScreen *QWidget::screen() const
+{
+    Q_D(const QWidget);
+    if (auto associatedScreen = d->associatedScreen())
+        return associatedScreen;
+    if (auto topLevel = window()) {
+        if (auto topData = qt_widget_private(topLevel)->topData()) {
+            if (auto initialScreen = QGuiApplicationPrivate::screen_list.value(topData->initialScreenIndex))
+                return initialScreen;
+        }
+        if (auto screenByPos = QGuiApplication::screenAt(topLevel->geometry().center()))
+            return screenByPos;
+    }
+    return QGuiApplication::primaryScreen();
+}
+
 #ifndef QT_NO_STYLE_STYLESHEET
 
 /*!
@@ -2811,7 +2659,7 @@ void QWidgetPrivate::setStyle_helper(QStyle *newStyle, bool propagate)
 #endif
 
     QEvent e(QEvent::StyleChange);
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 
 #ifndef QT_NO_STYLE_STYLESHEET
     // dereference the old stylesheet style
@@ -3029,7 +2877,7 @@ void QWidget::overrideWindowState(Qt::WindowStates newstate)
 {
     QWindowStateChangeEvent e(Qt::WindowStates(data->window_state), true);
     data->window_state  = newstate;
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 }
 
 /*!
@@ -3066,6 +2914,8 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
 {
     Q_D(QWidget);
     Qt::WindowStates oldstate = windowState();
+    if (newstate.testFlag(Qt::WindowMinimized)) // QTBUG-46763
+       newstate.setFlag(Qt::WindowActive, false);
     if (oldstate == newstate)
         return;
     if (isWindow() && !testAttribute(Qt::WA_WState_Created))
@@ -3091,7 +2941,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
         activateWindow();
 
     QWindowStateChangeEvent e(oldstate);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 }
 
 /*!
@@ -3139,15 +2989,6 @@ bool QWidget::isFullScreen() const
 */
 void QWidget::showFullScreen()
 {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // If the unified toolbar is enabled, we have to disable it before going fullscreen.
-    QMainWindow *mainWindow = qobject_cast<QMainWindow*>(this);
-    if (mainWindow && mainWindow->unifiedTitleAndToolBarOnMac()) {
-        mainWindow->setUnifiedTitleAndToolBarOnMac(false);
-        QMainWindowLayout *mainLayout = qobject_cast<QMainWindowLayout*>(mainWindow->layout());
-        mainLayout->activateUnifiedToolbarAfterFullScreen = true;
-    }
-#endif
     ensurePolished();
 
     setWindowState((windowState() & ~(Qt::WindowMinimized | Qt::WindowMaximized))
@@ -3175,18 +3016,6 @@ void QWidget::showMaximized()
 
     setWindowState((windowState() & ~(Qt::WindowMinimized | Qt::WindowFullScreen))
                    | Qt::WindowMaximized);
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // If the unified toolbar was enabled before going fullscreen, we have to enable it back.
-    QMainWindow *mainWindow = qobject_cast<QMainWindow*>(this);
-    if (mainWindow)
-    {
-        QMainWindowLayout *mainLayout = qobject_cast<QMainWindowLayout*>(mainWindow->layout());
-        if (mainLayout->activateUnifiedToolbarAfterFullScreen) {
-            mainWindow->setUnifiedTitleAndToolBarOnMac(true);
-            mainLayout->activateUnifiedToolbarAfterFullScreen = false;
-        }
-    }
-#endif
     setVisible(true);
 }
 
@@ -3204,18 +3033,6 @@ void QWidget::showNormal()
     setWindowState(windowState() & ~(Qt::WindowMinimized
                                      | Qt::WindowMaximized
                                      | Qt::WindowFullScreen));
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // If the unified toolbar was enabled before going fullscreen, we have to enable it back.
-    QMainWindow *mainWindow = qobject_cast<QMainWindow*>(this);
-    if (mainWindow)
-    {
-        QMainWindowLayout *mainLayout = qobject_cast<QMainWindowLayout*>(mainWindow->layout());
-        if (mainLayout->activateUnifiedToolbarAfterFullScreen) {
-            mainWindow->setUnifiedTitleAndToolBarOnMac(true);
-            mainLayout->activateUnifiedToolbarAfterFullScreen = false;
-        }
-    }
-#endif
     setVisible(true);
 }
 
@@ -3317,7 +3134,7 @@ void QWidget::insertAction(QAction *before, QAction *action)
     apriv->widgets.append(this);
 
     QActionEvent e(QEvent::ActionAdded, action, before);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 }
 
 /*!
@@ -3355,7 +3172,7 @@ void QWidget::removeAction(QAction *action)
 
     if (d->actions.removeAll(action)) {
         QActionEvent e(QEvent::ActionRemoved, action);
-        QApplication::sendEvent(this, &e);
+        QCoreApplication::sendEvent(this, &e);
     }
 }
 
@@ -3431,13 +3248,6 @@ void QWidgetPrivate::setEnabled_helper(bool enable)
         if (w && !w->testAttribute(attribute))
             w->d_func()->setEnabled_helper(enable);
     }
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    if (q->testAttribute(Qt::WA_SetCursor) || q->isWindow()) {
-        // enforce the windows behavior of clearing the cursor on
-        // disabled widgets
-        qt_x11_enforce_cursor(q);
-    }
-#endif
 #ifndef QT_NO_CURSOR
     if (q->testAttribute(Qt::WA_SetCursor) || q->isWindow()) {
         // enforce the windows behavior of clearing the cursor on
@@ -3445,9 +3255,6 @@ void QWidgetPrivate::setEnabled_helper(bool enable)
         qt_qpa_set_cursor(q, false);
     }
 #endif
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    setEnabled_helper_sys(enable);
-#endif
 #ifndef QT_NO_IM
     if (q->testAttribute(Qt::WA_InputMethodEnabled) && q->hasFocus()) {
         QWidget *focusWidget = effectiveFocusWidget();
@@ -3462,7 +3269,7 @@ void QWidgetPrivate::setEnabled_helper(bool enable)
     }
 #endif //QT_NO_IM
     QEvent e(QEvent::EnabledChange);
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 }
 
 /*!
@@ -3928,7 +3735,7 @@ QSize QWidget::sizeIncrement() const
 QSize QWidget::baseSize() const
 {
     Q_D(const QWidget);
-    return (d->extra != 0 && d->extra->topextra != 0)
+    return (d->extra && d->extra->topextra)
         ? QSize(d->extra->topextra->basew, d->extra->topextra->baseh)
         : QSize(0, 0);
 }
@@ -4529,7 +4336,7 @@ void QWidget::setForegroundRole(QPalette::ColorRole role)
     the "color", "background-color", "selection-color",
     "selection-background-color" and "alternate-background-color".
 
-    \sa QApplication::palette(), QWidget::font(), {Qt Style Sheets}
+    \sa QGuiApplication::palette(), QWidget::font(), {Qt Style Sheets}
 */
 const QPalette &QWidget::palette() const
 {
@@ -4542,13 +4349,7 @@ const QPalette &QWidget::palette() const
         ) {
         data->pal.setCurrentColorGroup(QPalette::Active);
     } else {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        extern bool qt_mac_can_clickThrough(const QWidget *); //qwidget_mac.cpp
-        if (qt_mac_can_clickThrough(this))
-            data->pal.setCurrentColorGroup(QPalette::Active);
-        else
-#endif
-            data->pal.setCurrentColorGroup(QPalette::Inactive);
+        data->pal.setCurrentColorGroup(QPalette::Inactive);
     }
     return data->pal;
 }
@@ -4592,7 +4393,7 @@ QPalette QWidgetPrivate::naturalWidgetPalette(uint inheritedMask) const
             )) {
         if (QWidget *p = q->parentWidget()) {
             if (!p->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles) {
-                if (!naturalPalette.isCopyOf(QApplication::palette())) {
+                if (!naturalPalette.isCopyOf(QGuiApplication::palette())) {
                     QPalette inheritedPalette = p->palette();
                     inheritedPalette.resolve(inheritedMask);
                     naturalPalette = inheritedPalette.resolve(naturalPalette);
@@ -4811,10 +4612,7 @@ void QWidgetPrivate::updateFont(const QFont &font)
 #endif
 
     data.fnt = QFont(font, q);
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    // make sure the font set on this widget is associated with the correct screen
-    data.fnt.x11SetScreen(xinfo.screen());
-#endif
+
     // Combine new mask with natural mask and propagate to children.
 #if QT_CONFIG(graphicsview)
     if (!q->parentWidget() && extra && extra->proxyWidget) {
@@ -4858,7 +4656,7 @@ void QWidgetPrivate::updateFont(const QFont &font)
 #endif
 
     QEvent e(QEvent::FontChange);
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 }
 
 void QWidgetPrivate::setLayoutDirection_helper(Qt::LayoutDirection direction)
@@ -4876,14 +4674,14 @@ void QWidgetPrivate::setLayoutDirection_helper(Qt::LayoutDirection direction)
         }
     }
     QEvent e(QEvent::LayoutDirectionChange);
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 }
 
 void QWidgetPrivate::resolveLayoutDirection()
 {
     Q_Q(const QWidget);
     if (!q->testAttribute(Qt::WA_SetLayoutDirection))
-        setLayoutDirection_helper(q->isWindow() ? QApplication::layoutDirection() : q->parentWidget()->layoutDirection());
+        setLayoutDirection_helper(q->isWindow() ? QGuiApplication::layoutDirection() : q->parentWidget()->layoutDirection());
 }
 
 /*!
@@ -4988,22 +4786,17 @@ QCursor QWidget::cursor() const
 void QWidget::setCursor(const QCursor &cursor)
 {
     Q_D(QWidget);
-// On Mac we must set the cursor even if it is the ArrowCursor.
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     if (cursor.shape() != Qt::ArrowCursor
         || (d->extra && d->extra->curs))
-#endif
     {
         d->createExtra();
-        QCursor *newCursor = new QCursor(cursor);
-        delete d->extra->curs;
-        d->extra->curs = newCursor;
+        d->extra->curs = qt_make_unique<QCursor>(cursor);
     }
     setAttribute(Qt::WA_SetCursor);
     d->setCursor_sys(cursor);
 
     QEvent event(QEvent::CursorChange);
-    QApplication::sendEvent(this, &event);
+    QCoreApplication::sendEvent(this, &event);
 }
 
 void QWidgetPrivate::setCursor_sys(const QCursor &cursor)
@@ -5016,16 +4809,14 @@ void QWidgetPrivate::setCursor_sys(const QCursor &cursor)
 void QWidget::unsetCursor()
 {
     Q_D(QWidget);
-    if (d->extra) {
-        delete d->extra->curs;
-        d->extra->curs = 0;
-    }
+    if (d->extra)
+        d->extra->curs.reset();
     if (!isWindow())
         setAttribute(Qt::WA_SetCursor, false);
     d->unsetCursor_sys();
 
     QEvent event(QEvent::CursorChange);
-    QApplication::sendEvent(this, &event);
+    QCoreApplication::sendEvent(this, &event);
 }
 
 void QWidgetPrivate::unsetCursor_sys()
@@ -5223,7 +5014,7 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
 static void sendResizeEvents(QWidget *target)
 {
     QResizeEvent e(target->size(), QSize());
-    QApplication::sendEvent(target, &e);
+    QCoreApplication::sendEvent(target, &e);
 
     const QObjectList children = target->children();
     for (int i = 0; i < children.size(); ++i) {
@@ -5423,11 +5214,9 @@ void QWidgetPrivate::render_helper(QPainter *painter, const QPoint &targetOffset
     Q_ASSERT(!toBePainted.isEmpty());
 
     Q_Q(QWidget);
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     const QTransform originalTransform = painter->worldTransform();
     const bool useDeviceCoordinates = originalTransform.isScaling();
     if (!useDeviceCoordinates) {
-#endif
         // Render via a pixmap.
         const QRect rect = toBePainted.boundingRect();
         const QSize size = rect.size();
@@ -5450,7 +5239,6 @@ void QWidgetPrivate::render_helper(QPainter *painter, const QPoint &targetOffset
         if (restore)
             painter->setRenderHints(QPainter::SmoothPixmapTransform, false);
 
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     } else {
         // Render via a pixmap in device coordinates (to avoid pixmap scaling).
         QTransform transform = originalTransform;
@@ -5481,26 +5269,29 @@ void QWidgetPrivate::render_helper(QPainter *painter, const QPoint &targetOffset
         painter->drawPixmap(deviceRect.topLeft(), pixmap);
         painter->setTransform(originalTransform);
     }
-#endif
 }
 
-void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QPoint &offset, int flags,
-                                QPainter *sharedPainter, QWidgetBackingStore *backingStore)
+void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QPoint &offset, DrawWidgetFlags flags,
+                                QPainter *sharedPainter, QWidgetRepaintManager *repaintManager)
 {
     if (rgn.isEmpty())
         return;
 
+    Q_Q(QWidget);
+
+    qCInfo(lcWidgetPainting) << "Drawing" << rgn << "of" << q << "at" << offset
+        << "into paint device" << pdev << "with" << flags;
+
     const bool asRoot = flags & DrawAsRoot;
-    bool onScreen = paintOnScreen();
+    bool onScreen = shouldPaintOnScreen();
 
-    Q_Q(QWidget);
 #if QT_CONFIG(graphicseffect)
     if (graphicsEffect && graphicsEffect->isEnabled()) {
         QGraphicsEffectSource *source = graphicsEffect->d_func()->source;
         QWidgetEffectSourcePrivate *sourced = static_cast<QWidgetEffectSourcePrivate *>
                                                          (source->d_func());
         if (!sourced->context) {
-            QWidgetPaintContext context(pdev, rgn, offset, flags, sharedPainter, backingStore);
+            QWidgetPaintContext context(pdev, rgn, offset, flags, sharedPainter, repaintManager);
             sourced->context = &context;
             if (!sharedPainter) {
                 setSystemClip(pdev->paintEngine(), pdev->devicePixelRatioF(), rgn.translated(offset));
@@ -5524,10 +5315,8 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
             }
             sourced->context = 0;
 
-            // Native widgets need to be marked dirty on screen so painting will be done in correct context
-            // Same check as in the no effects case below.
-            if (backingStore && !onScreen && !asRoot && (q->internalWinId() || !q->nativeParentWidget()->isWindow()))
-                backingStore->markDirtyOnScreen(rgn, q, offset);
+            if (repaintManager)
+                repaintManager->markNeedsFlush(q, rgn, offset);
 
             return;
         }
@@ -5554,22 +5343,10 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
             q->setAttribute(Qt::WA_WState_InPaintEvent);
 
             //clip away the new area
-#ifndef QT_NO_PAINT_DEBUG
-            bool flushed = QWidgetBackingStore::flushPaint(q, toBePainted);
-#endif
             QPaintEngine *paintEngine = pdev->paintEngine();
             if (paintEngine) {
                 setRedirected(pdev, -offset);
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-                // (Alien support) Special case for Mac when redirecting: If the paint device
-                // is of the Widget type we need to set WA_WState_InPaintEvent since painting
-                // outside the paint event is not supported on QWidgets. The attributeis
-                // restored further down.
-                if (pdev->devType() == QInternal::Widget)
-                    static_cast<QWidget *>(pdev)->setAttribute(Qt::WA_WState_InPaintEvent);
-
-#endif
                 if (sharedPainter)
                     setSystemClip(pdev->paintEngine(), pdev->devicePixelRatioF(), toBePainted);
                 else
@@ -5582,7 +5359,7 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
                     beginBackingStorePainting();
 #endif
                     QPainter p(q);
-                    paintBackground(&p, toBePainted, (asRoot || onScreen) ? flags | DrawAsRoot : 0);
+                    paintBackground(&p, toBePainted, (asRoot || onScreen) ? (flags | DrawAsRoot) : DrawWidgetFlags());
 #ifndef QT_NO_OPENGL
                     endBackingStorePainting();
 #endif
@@ -5617,11 +5394,11 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
                 // This widget renders into a texture which is composed later. We just need to
                 // punch a hole in the backingstore, so the texture will be visible.
                 beginBackingStorePainting();
-                if (!q->testAttribute(Qt::WA_AlwaysStackOnTop) && backingStore) {
+                if (!q->testAttribute(Qt::WA_AlwaysStackOnTop) && repaintManager) {
                     QPainter p(q);
                     p.setCompositionMode(QPainter::CompositionMode_Source);
                     p.fillRect(q->rect(), Qt::transparent);
-                } else if (!backingStore) {
+                } else if (!repaintManager) {
                     // We are not drawing to a backingstore: fall back to QImage
                     QImage img = grabFramebuffer();
                     // grabFramebuffer() always sets the format to RGB32
@@ -5645,16 +5422,11 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
                 sendPaintEvent(toBePainted);
             }
 
-            // Native widgets need to be marked dirty on screen so painting will be done in correct context
-            if (backingStore && !onScreen && !asRoot && (q->internalWinId() || (q->nativeParentWidget() && !q->nativeParentWidget()->isWindow())))
-                backingStore->markDirtyOnScreen(toBePainted, q, offset);
+            if (repaintManager)
+                repaintManager->markNeedsFlush(q, toBePainted, offset);
 
             //restore
             if (paintEngine) {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-                if (pdev->devType() == QInternal::Widget)
-                    static_cast<QWidget *>(pdev)->setAttribute(Qt::WA_WState_InPaintEvent, false);
-#endif
                 restoreRedirected();
                 if (!sharedPainter)
                     paintEngine->d_func()->systemRect = QRect();
@@ -5670,11 +5442,6 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
             if (paintEngine && paintEngine->autoDestruct()) {
                 delete paintEngine;
             }
-
-#ifndef QT_NO_PAINT_DEBUG
-            if (flushed)
-                QWidgetBackingStore::unflushPaint(q, toBePainted);
-#endif
         } else if (q->isWindow()) {
             QPaintEngine *engine = pdev->paintEngine();
             if (engine) {
@@ -5693,8 +5460,8 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
     }
 
     if (recursive && !children.isEmpty()) {
-        paintSiblingsRecursive(pdev, children, children.size() - 1, rgn, offset, flags & ~DrawAsRoot
-                                , sharedPainter, backingStore);
+        paintSiblingsRecursive(pdev, children, children.size() - 1, rgn, offset, flags & ~DrawAsRoot,
+                               sharedPainter, repaintManager);
     }
 }
 
@@ -5725,7 +5492,6 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
     if (paintRegion.isEmpty())
         return;
 
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     QPainter *oldSharedPainter = inRenderWithPainter ? sharedPainter() : 0;
 
     // Use the target's shared painter if set (typically set when doing
@@ -5738,7 +5504,6 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
                 setSharedPainter(targetPainter);
         }
     }
-#endif
 
     // Use the target's redirected device if set and adjust offset and paint
     // region accordingly. This is typically the case when people call render
@@ -5765,7 +5530,7 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
     }
 
     // Set backingstore flags.
-    int flags = DrawPaintOnScreen | DrawInvisible;
+    DrawWidgetFlags flags = DrawPaintOnScreen | DrawInvisible;
     if (renderFlags & QWidget::DrawWindowBackground)
         flags |= DrawAsRoot;
 
@@ -5785,8 +5550,8 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
 }
 
 void QWidgetPrivate::paintSiblingsRecursive(QPaintDevice *pdev, const QObjectList& siblings, int index, const QRegion &rgn,
-                                            const QPoint &offset, int flags
-                                            , QPainter *sharedPainter, QWidgetBackingStore *backingStore)
+                                            const QPoint &offset, DrawWidgetFlags flags
+                                            , QPainter *sharedPainter, QWidgetRepaintManager *repaintManager)
 {
     QWidget *w = 0;
     QRect boundingRect;
@@ -5821,8 +5586,8 @@ void QWidgetPrivate::paintSiblingsRecursive(QPaintDevice *pdev, const QObjectLis
         QRegion wr(rgn);
         if (wd->isOpaque)
             wr -= hasMask ? wd->extra->mask.translated(widgetPos) : w->data->crect;
-        paintSiblingsRecursive(pdev, siblings, --index, wr, offset, flags
-                               , sharedPainter, backingStore);
+        paintSiblingsRecursive(pdev, siblings, --index, wr, offset, flags,
+                               sharedPainter, repaintManager);
     }
 
     if (w->updatesEnabled()
@@ -5835,7 +5600,7 @@ void QWidgetPrivate::paintSiblingsRecursive(QPaintDevice *pdev, const QObjectLis
         wRegion.translate(-widgetPos);
         if (hasMask)
             wRegion &= wd->extra->mask;
-        wd->drawWidget(pdev, wRegion, offset + widgetPos, flags, sharedPainter, backingStore);
+        wd->drawWidget(pdev, wRegion, offset + widgetPos, flags, sharedPainter, repaintManager);
     }
 }
 
@@ -5870,7 +5635,7 @@ void QWidgetEffectSourcePrivate::draw(QPainter *painter)
         toBePainted &= wd->extra->mask;
 
     wd->drawWidget(context->pdev, toBePainted, context->offset, context->flags,
-                   context->sharedPainter, context->backingStore);
+                   context->sharedPainter, context->repaintManager);
 }
 
 QPixmap QWidgetEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QPoint *offset,
@@ -5932,7 +5697,7 @@ QPixmap QWidgetEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QPoint *
 QGraphicsProxyWidget *QWidgetPrivate::nearestGraphicsProxyWidget(const QWidget *origin)
 {
     if (origin) {
-        QWExtra *extra = origin->d_func()->extra;
+        const auto &extra = origin->d_func()->extra;
         if (extra && extra->proxyWidget)
             return extra->proxyWidget;
         return nearestGraphicsProxyWidget(origin->parentWidget());
@@ -5977,7 +5742,7 @@ void QWidgetPrivate::setLocale_helper(const QLocale &loc, bool forceUpdate)
         }
     }
     QEvent e(QEvent::LocaleChange);
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 }
 
 void QWidget::setLocale(const QLocale &locale)
@@ -6063,13 +5828,7 @@ QString qt_setWindowTitle_helperHelper(const QString &title, const QWidget *widg
 {
     Q_ASSERT(widget);
 
-#ifdef QT_EVAL
-    extern QString qt_eval_adapt_window_title(const QString &title);
-    QString cap = qt_eval_adapt_window_title(title);
-#else
     QString cap = title;
-#endif
-
     if (cap.isEmpty())
         return cap;
 
@@ -6158,7 +5917,7 @@ void QWidget::setWindowIconText(const QString &iconText)
     d->setWindowIconText_helper(iconText);
 
     QEvent e(QEvent::IconTextChange);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 
     emit windowIconTextChanged(iconText);
 }
@@ -6182,7 +5941,7 @@ void QWidget::setWindowTitle(const QString &title)
     d->setWindowTitle_helper(title);
 
     QEvent e(QEvent::WindowTitleChange);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 
     emit windowTitleChanged(title);
 }
@@ -6220,11 +5979,11 @@ void QWidgetPrivate::setWindowIcon_helper()
     // QWidgetWindow to the top level QWidget ensures that the event reaches
     // the top level anyhow
     if (!q->windowHandle())
-        QApplication::sendEvent(q, &e);
+        QCoreApplication::sendEvent(q, &e);
     for (int i = 0; i < children.size(); ++i) {
         QWidget *w = qobject_cast<QWidget *>(children.at(i));
         if (w && !w->isWindow())
-            QApplication::sendEvent(w, &e);
+            QCoreApplication::sendEvent(w, &e);
     }
 }
 
@@ -6245,8 +6004,9 @@ void QWidget::setWindowIcon(const QIcon &icon)
     d->createTLExtra();
 
     if (!d->extra->topextra->icon)
-        d->extra->topextra->icon = new QIcon();
-    *d->extra->topextra->icon = icon;
+        d->extra->topextra->icon = qt_make_unique<QIcon>(icon);
+    else
+        *d->extra->topextra->icon = icon;
 
     d->setWindowIcon_sys();
     d->setWindowIcon_helper();
@@ -6460,7 +6220,7 @@ void QWidget::setFocusProxy(QWidget * w)
 QWidget *QWidget::focusProxy() const
 {
     Q_D(const QWidget);
-    return d->extra ? (QWidget *)d->extra->focus_proxy : nullptr;
+    return d->extra ? d->extra->focus_proxy.data() : nullptr;
 }
 
 
@@ -6483,7 +6243,7 @@ bool QWidget::hasFocus() const
         w = w->d_func()->extra->focus_proxy;
 #if QT_CONFIG(graphicsview)
     if (QWidget *window = w->window()) {
-        QWExtra *e = window->d_func()->extra;
+        const auto &e = window->d_func()->extra;
         if (e && e->proxyWidget && e->proxyWidget->hasFocus() && window->focusWidget() == w)
             return true;
     }
@@ -6535,16 +6295,12 @@ void QWidget::setFocus(Qt::FocusReason reason)
     if (!f)
         f = this;
 
-    if (QApplication::focusWidget() == f
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-        && GetFocus() == f->internalWinId()
-#endif
-       )
+    if (QApplication::focusWidget() == f)
         return;
 
 #if QT_CONFIG(graphicsview)
     QWidget *previousProxyFocus = 0;
-    if (QWExtra *topData = window()->d_func()->extra) {
+    if (const auto &topData = window()->d_func()->extra) {
         if (topData->proxyWidget && topData->proxyWidget->hasFocus()) {
             previousProxyFocus = topData->proxyWidget->widget()->focusWidget();
             if (previousProxyFocus && previousProxyFocus->focusProxy())
@@ -6557,7 +6313,7 @@ void QWidget::setFocus(Qt::FocusReason reason)
 
 #if QT_CONFIG(graphicsview)
     // Update proxy state
-    if (QWExtra *topData = window()->d_func()->extra) {
+    if (const auto &topData = window()->d_func()->extra) {
         if (topData->proxyWidget && !topData->proxyWidget->hasFocus()) {
             f->d_func()->updateFocusChild();
             topData->proxyWidget->d_func()->focusFromWidgetToProxy = 1;
@@ -6577,7 +6333,7 @@ void QWidget::setFocus(Qt::FocusReason reason)
 
             if (reason != Qt::NoFocusReason) {
                 QFocusEvent focusAboutToChange(QEvent::FocusAboutToChange, reason);
-                QApplication::sendEvent(prev, &focusAboutToChange);
+                QCoreApplication::sendEvent(prev, &focusAboutToChange);
             }
         }
 
@@ -6598,29 +6354,29 @@ void QWidget::setFocus(Qt::FocusReason reason)
         }
 #endif
 #if QT_CONFIG(graphicsview)
-        if (QWExtra *topData = window()->d_func()->extra) {
+        if (const auto &topData = window()->d_func()->extra) {
             if (topData->proxyWidget) {
                 if (previousProxyFocus && previousProxyFocus != f) {
                     // Send event to self
                     QFocusEvent event(QEvent::FocusOut, reason);
                     QPointer<QWidget> that = previousProxyFocus;
-                    QApplication::sendEvent(previousProxyFocus, &event);
+                    QCoreApplication::sendEvent(previousProxyFocus, &event);
                     if (that)
-                        QApplication::sendEvent(that->style(), &event);
+                        QCoreApplication::sendEvent(that->style(), &event);
                 }
                 if (!isHidden()) {
 #if QT_CONFIG(graphicsview)
                     // Update proxy state
-                    if (QWExtra *topData = window()->d_func()->extra)
+                    if (const auto &topData = window()->d_func()->extra)
                         if (topData->proxyWidget && topData->proxyWidget->hasFocus())
                             topData->proxyWidget->d_func()->updateProxyInputMethodAcceptanceFromWidget();
 #endif
                     // Send event to self
                     QFocusEvent event(QEvent::FocusIn, reason);
                     QPointer<QWidget> that = f;
-                    QApplication::sendEvent(f, &event);
+                    QCoreApplication::sendEvent(f, &event);
                     if (that)
-                        QApplication::sendEvent(that->style(), &event);
+                        QCoreApplication::sendEvent(that->style(), &event);
                 }
             }
         }
@@ -6727,7 +6483,7 @@ void QWidget::clearFocus()
             QGuiApplication::inputMethod()->commit();
 
         QFocusEvent focusAboutToChange(QEvent::FocusAboutToChange);
-        QApplication::sendEvent(this, &focusAboutToChange);
+        QCoreApplication::sendEvent(this, &focusAboutToChange);
     }
 
     QWidget *w = this;
@@ -6748,7 +6504,7 @@ void QWidget::clearFocus()
     }
 
 #if QT_CONFIG(graphicsview)
-    QWExtra *topData = d_func()->extra;
+    const auto &topData = d_func()->extra;
     if (topData && topData->proxyWidget)
         topData->proxyWidget->clearFocus();
 #endif
@@ -6756,17 +6512,10 @@ void QWidget::clearFocus()
     if (hasFocus()) {
         // Update proxy state
         QApplicationPrivate::setFocusWidget(0, Qt::OtherFocusReason);
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-        if (!(windowType() == Qt::Popup) && GetFocus() == internalWinId())
-            SetFocus(0);
-        else
-#endif
-        {
 #ifndef QT_NO_ACCESSIBILITY
-            QAccessibleEvent event(this, QAccessible::Focus);
-            QAccessible::updateAccessibility(&event);
+        QAccessibleEvent event(this, QAccessible::Focus);
+        QAccessible::updateAccessibility(&event);
 #endif
-        }
     }
 }
 
@@ -6914,7 +6663,7 @@ bool QWidget::isActiveWindow() const
         return true;
 
 #if QT_CONFIG(graphicsview)
-    if (QWExtra *tlwExtra = tlw->d_func()->extra) {
+    if (const auto &tlwExtra = tlw->d_func()->extra) {
         if (isVisible() && tlwExtra->proxyWidget)
             return tlwExtra->proxyWidget->isActiveWindow();
     }
@@ -7374,11 +7123,11 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
 
         if (isMove) {
             QMoveEvent e(q->pos(), oldPos);
-            QApplication::sendEvent(q, &e);
+            QCoreApplication::sendEvent(q, &e);
         }
         if (isResize) {
             QResizeEvent e(r.size(), olds);
-            QApplication::sendEvent(q, &e);
+            QCoreApplication::sendEvent(q, &e);
             if (q->windowHandle())
                 q->update();
         }
@@ -7410,18 +7159,6 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
 */
 QByteArray QWidget::saveGeometry() const
 {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // We check if the window was maximized during this invocation. If so, we need to record the
-    // starting position as 0,0.
-    Q_D(const QWidget);
-    QRect newFramePosition = frameGeometry();
-    QRect newNormalPosition = normalGeometry();
-    if(d->topData()->wasMaximized && !(windowState() & Qt::WindowMaximized)) {
-        // Change the starting position
-        newFramePosition.moveTo(0, 0);
-        newNormalPosition.moveTo(0, 0);
-    }
-#endif
     QByteArray array;
     QDataStream stream(&array, QIODevice::WriteOnly);
     stream.setVersion(QDataStream::Qt_4_0);
@@ -7436,13 +7173,8 @@ QByteArray QWidget::saveGeometry() const
     stream << magicNumber
            << majorVersion
            << minorVersion
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-           << newFramePosition
-           << newNormalPosition
-#else
            << frameGeometry()
            << normalGeometry()
-#endif
            << qint32(screenNumber)
            << quint8(windowState() & Qt::WindowMaximized)
            << quint8(windowState() & Qt::WindowFullScreen)
@@ -7562,11 +7294,6 @@ bool QWidget::restoreGeometry(const QByteArray &geometry)
     // that would make the window "lost". This happens if:
     // - The restored geometry is completely oustside the available geometry
     // - The title bar is outside the available geometry.
-    // - (Mac only) The window is higher than the available geometry. It must
-    //   be possible to bring the size grip on screen by moving the window.
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    restoredNormalGeometry.setHeight(qMin(restoredNormalGeometry.height(), availableGeometry.height() - frameHeight));
-#endif
 
     checkRestoredGeometry(availableGeometry, &restoredGeometry, frameHeight);
     checkRestoredGeometry(availableGeometry, &restoredNormalGeometry, frameHeight);
@@ -7623,7 +7350,7 @@ bool QWidget::restoreGeometry(const QByteArray &geometry)
 
   Changing the margins will trigger a resizeEvent().
 
-  \sa contentsRect(), getContentsMargins()
+  \sa contentsRect(), contentsMargins()
 */
 void QWidget::setContentsMargins(int left, int top, int right, int bottom)
 {
@@ -7653,7 +7380,7 @@ void QWidget::setContentsMargins(int left, int top, int right, int bottom)
 
   Changing the margins will trigger a resizeEvent().
 
-  \sa contentsRect(), getContentsMargins()
+  \sa contentsRect(), contentsMargins()
 */
 void QWidget::setContentsMargins(const QMargins &margins)
 {
@@ -7673,16 +7400,20 @@ void QWidgetPrivate::updateContentsRect()
     if (q->isVisible()) {
         q->update();
         QResizeEvent e(q->data->crect.size(), q->data->crect.size());
-        QApplication::sendEvent(q, &e);
+        QCoreApplication::sendEvent(q, &e);
     } else {
         q->setAttribute(Qt::WA_PendingResizeEvent, true);
     }
 
     QEvent e(QEvent::ContentsRectChange);
-    QApplication::sendEvent(q, &e);
+    QCoreApplication::sendEvent(q, &e);
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
+    \obsolete
+    Use contentsMargins().
+
   Returns the widget's contents margins for \a left, \a top, \a
   right, and \a bottom.
 
@@ -7700,6 +7431,7 @@ void QWidget::getContentsMargins(int *left, int *top, int *right, int *bottom) c
     if (bottom)
         *bottom = m.bottom();
 }
+#endif
 
 // FIXME: Move to qmargins.h for next minor Qt release
 QMargins operator|(const QMargins &m1, const QMargins &m2)
@@ -7713,7 +7445,7 @@ QMargins operator|(const QMargins &m1, const QMargins &m2)
 
   \brief The contentsMargins function returns the widget's contents margins.
 
-  \sa getContentsMargins(), setContentsMargins(), contentsRect()
+  \sa setContentsMargins(), contentsRect()
  */
 QMargins QWidget::contentsMargins() const
 {
@@ -7726,7 +7458,7 @@ QMargins QWidget::contentsMargins() const
 /*!
     Returns the area inside the widget's margins.
 
-    \sa setContentsMargins(), getContentsMargins()
+    \sa setContentsMargins(), contentsMargins()
 */
 QRect QWidget::contentsRect() const
 {
@@ -7939,7 +7671,7 @@ void QWidget::show()
     else if (defaultState == Qt::WindowMaximized)
         showMaximized();
     else
-        setVisible(true); // FIXME: Why not showNormal(), like QWindow::show()?
+        setVisible(true); // Don't call showNormal() as not to clobber Qt::Window(Max/Min)imized
 }
 
 /*! \internal
@@ -7975,13 +7707,13 @@ void QWidgetPrivate::sendPendingMoveAndResizeEvents(bool recursive, bool disable
 
     if (q->testAttribute(Qt::WA_PendingMoveEvent)) {
         QMoveEvent e(data.crect.topLeft(), data.crect.topLeft());
-        QApplication::sendEvent(q, &e);
+        QCoreApplication::sendEvent(q, &e);
         q->setAttribute(Qt::WA_PendingMoveEvent, false);
     }
 
     if (q->testAttribute(Qt::WA_PendingResizeEvent)) {
         QResizeEvent e(data.crect.size(), QSize());
-        QApplication::sendEvent(q, &e);
+        QCoreApplication::sendEvent(q, &e);
         q->setAttribute(Qt::WA_PendingResizeEvent, false);
     }
 
@@ -8081,17 +7813,9 @@ void QWidgetPrivate::show_helper()
     Q_UNUSED(isEmbedded);
 #endif
 
-    // On Windows, show the popup now so that our own focus handling
-    // stores the correct old focus widget even if it's stolen in the
-    // showevent
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ || 0 /* Used to be included in Qt4 for Q_WS_MAC */
-    if (!isEmbedded && q->windowType() == Qt::Popup)
-        qApp->d_func()->openPopup(q);
-#endif
-
     // send the show event before showing the window
     QShowEvent showEvent;
-    QApplication::sendEvent(q, &showEvent);
+    QCoreApplication::sendEvent(q, &showEvent);
 
     show_sys();
 
@@ -8114,7 +7838,7 @@ void QWidgetPrivate::show_helper()
     // is spinnning; otherwise it might not show up on particular platforms.
     // This makes QSplashScreen behave the same on all platforms.
     if (!qApp->d_func()->in_exec && q->windowType() == Qt::SplashScreen)
-        QApplication::processEvents();
+        QCoreApplication::processEvents();
 
     data.in_show = false;  // reset qws optimization
 }
@@ -8123,7 +7847,7 @@ void QWidgetPrivate::show_sys()
 {
     Q_Q(QWidget);
 
-    QWidgetWindow *window = windowHandle();
+    auto window = qobject_cast<QWidgetWindow *>(windowHandle());
 
     if (q->testAttribute(Qt::WA_DontShowOnScreen)) {
         invalidateBackingStore(q->rect());
@@ -8140,9 +7864,9 @@ void QWidgetPrivate::show_sys()
     }
 
     if (renderToTexture && !q->isWindow())
-        QApplication::postEvent(q->parentWidget(), new QUpdateLaterEvent(q->geometry()));
+        QCoreApplication::postEvent(q->parentWidget(), new QUpdateLaterEvent(q->geometry()));
     else
-        QApplication::postEvent(q, new QUpdateLaterEvent(q->rect()));
+        QCoreApplication::postEvent(q, new QUpdateLaterEvent(q->rect()));
 
     if ((!q->isWindow() && !q->testAttribute(Qt::WA_NativeWindow))
             || q->testAttribute(Qt::WA_OutsideWSRange)) {
@@ -8213,12 +7937,6 @@ void QWidgetPrivate::hide_helper()
     if (!isEmbedded && (q->windowType() == Qt::Popup))
         qApp->d_func()->closePopup(q);
 
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    if (q->isWindow() && !(q->windowType() == Qt::Popup) && q->parentWidget()
-        && !q->parentWidget()->isHidden() && q->isActiveWindow())
-        q->parentWidget()->activateWindow();        // Activate parent
-#endif
-
     q->setAttribute(Qt::WA_Mapped, false);
     hide_sys();
 
@@ -8230,7 +7948,7 @@ void QWidgetPrivate::hide_helper()
     }
 
     QHideEvent hideEvent;
-    QApplication::sendEvent(q, &hideEvent);
+    QCoreApplication::sendEvent(q, &hideEvent);
     hideChildren(false);
 
     // next bit tries to move the focus if the focus widget is now
@@ -8247,8 +7965,8 @@ void QWidgetPrivate::hide_helper()
         }
     }
 
-    if (QWidgetBackingStore *bs = maybeBackingStore())
-        bs->removeDirtyWidget(q);
+    if (QWidgetRepaintManager *repaintManager = maybeRepaintManager())
+        repaintManager->removeDirtyWidget(q);
 
 #ifndef QT_NO_ACCESSIBILITY
     if (wasVisible) {
@@ -8262,7 +7980,7 @@ void QWidgetPrivate::hide_sys()
 {
     Q_Q(QWidget);
 
-    QWidgetWindow *window = windowHandle();
+    auto window = qobject_cast<QWidgetWindow *>(windowHandle());
 
     if (q->testAttribute(Qt::WA_DontShowOnScreen)) {
         q->setAttribute(Qt::WA_Mapped, false);
@@ -8401,18 +8119,8 @@ void QWidgetPrivate::setVisible(bool visible)
         }
 
         QEvent showToParentEvent(QEvent::ShowToParent);
-        QApplication::sendEvent(q, &showToParentEvent);
+        QCoreApplication::sendEvent(q, &showToParentEvent);
     } else { // hide
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-        // reset WS_DISABLED style in a Blocked window
-        if(isWindow() && testAttribute(Qt::WA_WState_Created)
-           && QApplicationPrivate::isBlockedByModal(this))
-        {
-            LONG dwStyle = GetWindowLong(winId(), GWL_STYLE);
-            dwStyle &= ~WS_DISABLED;
-            SetWindowLong(winId(), GWL_STYLE, dwStyle);
-        }
-#endif
         if (QApplicationPrivate::hidden_focus_widget == q)
             QApplicationPrivate::hidden_focus_widget = 0;
 
@@ -8432,11 +8140,11 @@ void QWidgetPrivate::setVisible(bool visible)
             if (q->parentWidget()->d_func()->layout)
                 q->parentWidget()->d_func()->layout->invalidate();
             else if (q->parentWidget()->isVisible())
-                QApplication::postEvent(q->parentWidget(), new QEvent(QEvent::LayoutRequest));
+                QCoreApplication::postEvent(q->parentWidget(), new QEvent(QEvent::LayoutRequest));
         }
 
         QEvent hideToParentEvent(QEvent::HideToParent);
-        QApplication::sendEvent(q, &hideToParentEvent);
+        QCoreApplication::sendEvent(q, &hideToParentEvent);
     }
 }
 
@@ -8485,23 +8193,7 @@ void QWidgetPrivate::hideChildren(bool spontaneous)
         QWidget *widget = qobject_cast<QWidget*>(childList.at(i));
         if (!widget || widget->isWindow() || widget->testAttribute(Qt::WA_WState_Hidden))
             continue;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        // Before doing anything we need to make sure that we don't leave anything in a non-consistent state.
-        // When hiding a widget we need to make sure that no mouse_down events are active, because
-        // the mouse_up event will never be received by a hidden widget or one of its descendants.
-        // The solution is simple, before going through with this we check if there are any mouse_down events in
-        // progress, if so we check if it is related to this widget or not. If so, we just reset the mouse_down and
-        // then we continue.
-        // In X11 and Windows we send a mouse_release event, however we don't do that here because we were already
-        // ignoring that from before. I.e. Carbon did not send the mouse release event, so we will not send the
-        // mouse release event. There are two ways to interpret this:
-        // 1. If we don't send the mouse release event, the widget might get into an inconsistent state, i.e. it
-        // might be waiting for a release event that will never arrive.
-        // 2. If we send the mouse release event, then the widget might decide to trigger an action that is not
-        // supposed to trigger because it is not visible.
-        if(widget == qt_button_down)
-            qt_button_down = 0;
-#endif
+
         if (spontaneous)
             widget->setAttribute(Qt::WA_Mapped, false);
         else
@@ -8511,7 +8203,7 @@ void QWidgetPrivate::hideChildren(bool spontaneous)
         if (spontaneous) {
             QApplication::sendSpontaneousEvent(widget, &e);
         } else {
-            QApplication::sendEvent(widget, &e);
+            QCoreApplication::sendEvent(widget, &e);
             if (widget->internalWinId()
                 && widget->testAttribute(Qt::WA_DontCreateNativeAncestors)) {
                 // hide_sys() on an ancestor won't have any affect on this
@@ -8546,7 +8238,7 @@ bool QWidgetPrivate::close_helper(CloseMode mode)
         if (mode == CloseWithSpontaneousEvent)
             QApplication::sendSpontaneousEvent(q, &e);
         else
-            QApplication::sendEvent(q, &e);
+            QCoreApplication::sendEvent(q, &e);
         if (!that.isNull() && !e.isAccepted()) {
             data.is_closing = 0;
             return false;
@@ -8736,11 +8428,9 @@ QSize QWidgetPrivate::adjustedSize() const
             s.setWidth(qMax(s.width(), 200));
         if (exp & Qt::Vertical)
             s.setHeight(qMax(s.height(), 100));
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-        QRect screen = QDesktopWidgetPrivate::screenGeometry(q->x11Info().screen());
-#else // all others
+
         QRect screen = QDesktopWidgetPrivate::screenGeometry(q->pos());
-#endif
+
         s.setWidth(qMin(s.width(), screen.width()*2/3));
         s.setHeight(qMin(s.height(), screen.height()*2/3));
 
@@ -8865,26 +8555,6 @@ bool QWidget::isAncestorOf(const QWidget *child) const
     return false;
 }
 
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-inline void setDisabledStyle(QWidget *w, bool setStyle)
-{
-    // set/reset WS_DISABLED style.
-    if(w && w->isWindow() && w->isVisible() && w->isEnabled()) {
-        LONG dwStyle = GetWindowLong(w->winId(), GWL_STYLE);
-        LONG newStyle = dwStyle;
-        if (setStyle)
-            newStyle |= WS_DISABLED;
-        else
-            newStyle &= ~WS_DISABLED;
-        if (newStyle != dwStyle) {
-            SetWindowLong(w->winId(), GWL_STYLE, newStyle);
-            // we might need to repaint in some situations (eg. menu)
-            w->repaint();
-        }
-    }
-}
-#endif
-
 /*****************************************************************************
   QWidget event handling
  *****************************************************************************/
@@ -9061,7 +8731,7 @@ bool QWidget::event(QEvent *event)
         setAttribute(Qt::WA_WState_Polished);
         if (!QApplication::font(this).isCopyOf(QApplication::font()))
             d->resolveFont();
-        if (!QApplication::palette(this).isCopyOf(QApplication::palette()))
+        if (!QApplication::palette(this).isCopyOf(QGuiApplication::palette()))
             d->resolvePalette();
     }
         break;
@@ -9085,7 +8755,7 @@ bool QWidget::event(QEvent *event)
 #if QT_CONFIG(statustip)
         if (d->statusTip.size()) {
             QStatusTipEvent tip(d->statusTip);
-            QApplication::sendEvent(const_cast<QWidget *>(this), &tip);
+            QCoreApplication::sendEvent(const_cast<QWidget *>(this), &tip);
         }
 #endif
         enterEvent(event);
@@ -9096,7 +8766,7 @@ bool QWidget::event(QEvent *event)
         if (d->statusTip.size()) {
             QString empty;
             QStatusTipEvent tip(empty);
-            QApplication::sendEvent(const_cast<QWidget *>(this), &tip);
+            QCoreApplication::sendEvent(const_cast<QWidget *>(this), &tip);
         }
 #endif
         leaveEvent(event);
@@ -9247,7 +8917,7 @@ bool QWidget::event(QEvent *event)
         for (int i = 0; i < childList.size(); ++i) {
             QWidget *w = qobject_cast<QWidget *>(childList.at(i));
             if (w && w->isVisible() && !w->isWindow())
-                QApplication::sendEvent(w, event);
+                QCoreApplication::sendEvent(w, event);
         }
         break; }
 
@@ -9258,7 +8928,7 @@ bool QWidget::event(QEvent *event)
             for (int i = 0; i < childList.size(); ++i) {
                 QObject *o = childList.at(i);
                 if (o)
-                    QApplication::sendEvent(o, event);
+                    QCoreApplication::sendEvent(o, event);
             }
         }
         update();
@@ -9297,13 +8967,10 @@ bool QWidget::event(QEvent *event)
                     QWidget *w  = static_cast<QWidget *>(o);
                     // do not forward the event to child windows; QApplication does this for us
                     if (!w->isWindow())
-                        QApplication::sendEvent(w, event);
+                        QCoreApplication::sendEvent(w, event);
                 }
             }
         }
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-            setDisabledStyle(this, (event->type() == QEvent::WindowBlocked));
-#endif
         break;
 #ifndef QT_NO_TOOLTIP
     case QEvent::ToolTip:
@@ -9328,9 +8995,6 @@ bool QWidget::event(QEvent *event)
     case QEvent::EmbeddingControl:
         d->topData()->frameStrut.setCoords(0 ,0, 0, 0);
         data->fstrut_dirty = false;
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ || 0 /* Used to be included in Qt4 for Q_WS_X11 */
-        d->topData()->embedded = 1;
-#endif
         break;
 #ifndef QT_NO_ACTION
     case QEvent::ActionAdded:
@@ -9349,15 +9013,10 @@ bool QWidget::event(QEvent *event)
             for (int i = 0; i < childList.size(); ++i) {
                 QWidget *w = qobject_cast<QWidget *>(childList.at(i));
                 if (w && w->isVisible() && !w->isWindow())
-                    QApplication::sendEvent(w, event);
+                    QCoreApplication::sendEvent(w, event);
             }
             break;
         }
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    case QEvent::MacGLWindowChange:
-        d->needWindowChange = false;
-        break;
-#endif
     case QEvent::TouchBegin:
     case QEvent::TouchUpdate:
     case QEvent::TouchEnd:
@@ -9452,8 +9111,8 @@ void QWidget::changeEvent(QEvent * event)
         break;
 
     case QEvent::ThemeChange:
-        if (QApplication::desktopSettingsAware() && windowType() != Qt::Desktop
-            && qApp && !QApplication::closingDown()) {
+        if (QGuiApplication::desktopSettingsAware() && windowType() != Qt::Desktop
+            && qApp && !QCoreApplication::closingDown()) {
             if (testAttribute(Qt::WA_WState_Polished))
                 QApplication::style()->unpolish(this);
             if (testAttribute(Qt::WA_WState_Polished))
@@ -9469,11 +9128,6 @@ void QWidget::changeEvent(QEvent * event)
     case QEvent::MacSizeChange:
         updateGeometry();
         break;
-#elif 0 // Used to be included in Qt4 for Q_WS_MAC
-    case QEvent::ToolTipChange:
-    case QEvent::MouseTrackingChange:
-        qt_mac_update_mouseTracking(this);
-        break;
 #endif
 
     default:
@@ -9566,9 +9220,11 @@ void QWidget::mouseReleaseEvent(QMouseEvent *event)
     The default implementation calls mousePressEvent().
 
     \note The widget will also receive mouse press and mouse release
-    events in addition to the double click event. It is up to the
-    developer to ensure that the application interprets these events
-    correctly.
+    events in addition to the double click event. And if another widget
+    that overlaps this widget disappears in response to press or
+    release events, then this widget will only receive the double click
+    event. It is up to the developer to ensure that the application
+    interprets these events correctly.
 
     \sa mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent(),
     event(), QMouseEvent
@@ -10180,7 +9836,11 @@ void QWidget::hideEvent(QHideEvent *)
     \endtable
 */
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWidget::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QWidget::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#endif
 {
     Q_UNUSED(eventType);
     Q_UNUSED(message);
@@ -10395,7 +10055,7 @@ void QWidget::setSizePolicy(QSizePolicy policy)
     d->size_policy = policy;
 
 #if QT_CONFIG(graphicsview)
-    if (QWExtra *extra = d->extra) {
+    if (const auto &extra = d->extra) {
         if (extra->proxyWidget)
             extra->proxyWidget->setSizePolicy(policy);
     }
@@ -10516,7 +10176,7 @@ void QWidgetPrivate::updateGeometry_helper(bool forceUpdate)
             if (parent->d_func()->layout)
                 parent->d_func()->layout->invalidate();
             else if (parent->isVisible())
-                QApplication::postEvent(parent, new QEvent(QEvent::LayoutRequest));
+                QCoreApplication::postEvent(parent, new QEvent(QEvent::LayoutRequest));
         }
     }
 }
@@ -10670,7 +10330,7 @@ static void sendWindowChangeToTextureChildrenRecursively(QWidget *widget)
     QWidgetPrivate *d = QWidgetPrivate::get(widget);
     if (d->renderToTexture) {
         QEvent e(QEvent::WindowChangeInternal);
-        QApplication::sendEvent(widget, &e);
+        QCoreApplication::sendEvent(widget, &e);
     }
 
     for (int i = 0; i < d->children.size(); ++i) {
@@ -10690,6 +10350,22 @@ static void sendWindowChangeToTextureChildrenRecursively(QWidget *widget)
 void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
 {
     Q_D(QWidget);
+    Q_ASSERT_X(this != parent, Q_FUNC_INFO, "Cannot parent a QWidget to itself");
+#ifdef QT_DEBUG
+    const auto checkForParentChildLoops = qScopeGuard([&](){
+        int depth = 0;
+        auto p = parentWidget();
+        while (p) {
+            if (++depth == QObjectPrivate::CheckForParentChildLoopsWarnDepth) {
+                qWarning("QWidget %p (class: '%s', object name: '%s') may have a loop in its parent-child chain; "
+                         "this is undefined behavior",
+                         this, metaObject()->className(), qPrintable(objectName()));
+            }
+            p = p->parentWidget();
+        }
+    });
+#endif
+
     bool resized = testAttribute(Qt::WA_Resized);
     bool wasCreated = testAttribute(Qt::WA_WState_Created);
     QWidget *oldtlw = window();
@@ -10703,7 +10379,7 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
     bool newParent = (parent != parentWidget()) || !wasCreated || desktopWidget;
 
     if (newParent && parent && !desktopWidget) {
-        if (testAttribute(Qt::WA_NativeWindow) && !qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings))
+        if (testAttribute(Qt::WA_NativeWindow) && !QCoreApplication::testAttribute(Qt::AA_DontCreateNativeWidgetSiblings))
             parent->d_func()->enforceNativeChildren();
         else if (parent->d_func()->nativeChildrenForced() || parent->testAttribute(Qt::WA_PaintOnScreen))
             setAttribute(Qt::WA_NativeWindow);
@@ -10716,22 +10392,14 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
         }
         if (newParent) {
             QEvent e(QEvent::ParentAboutToChange);
-            QApplication::sendEvent(this, &e);
+            QCoreApplication::sendEvent(this, &e);
         }
     }
     if (newParent && isAncestorOf(focusWidget()))
         focusWidget()->clearFocus();
 
-    QTLWExtra *oldTopExtra = window()->d_func()->maybeTopData();
-    QWidgetBackingStoreTracker *oldBsTracker = oldTopExtra ? &oldTopExtra->backingStoreTracker : 0;
-
     d->setParent_sys(parent, f);
 
-    QTLWExtra *topExtra = window()->d_func()->maybeTopData();
-    QWidgetBackingStoreTracker *bsTracker = topExtra ? &topExtra->backingStoreTracker : 0;
-    if (oldBsTracker && oldBsTracker != bsTracker)
-        oldBsTracker->unregisterWidgetSubtree(this);
-
     if (desktopWidget)
         parent = 0;
 
@@ -10742,12 +10410,12 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
     }
 #endif
 
-    if (QWidgetBackingStore *oldBs = oldtlw->d_func()->maybeBackingStore()) {
+    if (QWidgetRepaintManager *oldPaintManager = oldtlw->d_func()->maybeRepaintManager()) {
         if (newParent)
-            oldBs->removeDirtyWidget(this);
+            oldPaintManager->removeDirtyWidget(this);
         // Move the widget and all its static children from
         // the old backing store to the new one.
-        oldBs->moveStaticWidgets(this);
+        oldPaintManager->moveStaticWidgets(this);
     }
 
     // ### fixme: Qt 6: Remove AA_ImmediateWidgetCreation.
@@ -10773,7 +10441,7 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
     // (f & Qt::MSWindowsOwnDC) clause (which is set on QGLWidgets on all
     // platforms).
     if (newParent
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ || defined(QT_OPENGL_ES)
+#if defined(QT_OPENGL_ES)
         || (f & Qt::MSWindowsOwnDC)
 #endif
         ) {
@@ -10789,25 +10457,16 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
         // send and post remaining QObject events
         if (parent && d->sendChildEvents) {
             QChildEvent e(QEvent::ChildAdded, this);
-            QApplication::sendEvent(parent, &e);
+            QCoreApplication::sendEvent(parent, &e);
         }
 
-//### already hidden above ---> must probably do something smart on the mac
-// #if 0 // Used to be included in Qt4 for Q_WS_MAC
-//             extern bool qt_mac_is_macdrawer(const QWidget *); //qwidget_mac.cpp
-//             if(!qt_mac_is_macdrawer(q)) //special case
-//                 q->setAttribute(Qt::WA_WState_Hidden);
-// #else
-//             q->setAttribute(Qt::WA_WState_Hidden);
-//#endif
-
         if (parent && d->sendChildEvents && d->polished) {
             QChildEvent e(QEvent::ChildPolished, this);
             QCoreApplication::sendEvent(parent, &e);
         }
 
         QEvent e(QEvent::ParentChange);
-        QApplication::sendEvent(this, &e);
+        QCoreApplication::sendEvent(this, &e);
     }
 #ifndef QT_NO_OPENGL
     //renderToTexture widgets also need to know when their top-level window changes
@@ -11101,7 +10760,7 @@ void QWidgetPrivate::repaint(T r)
 
     QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
     if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
-        tlwExtra->backingStoreTracker->markDirty(r, q, QWidgetBackingStore::UpdateNow);
+        tlwExtra->repaintManager->markDirty(r, q, QWidgetRepaintManager::UpdateNow);
 }
 
 /*!
@@ -11170,13 +10829,13 @@ void QWidgetPrivate::update(T r)
         return;
 
     if (q->testAttribute(Qt::WA_WState_InPaintEvent)) {
-        QApplication::postEvent(q, new QUpdateLaterEvent(clipped));
+        QCoreApplication::postEvent(q, new QUpdateLaterEvent(clipped));
         return;
     }
 
     QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
     if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
-        tlwExtra->backingStoreTracker->markDirty(clipped, q);
+        tlwExtra->repaintManager->markDirty(clipped, q);
 }
 
  /*!
@@ -11207,7 +10866,7 @@ void QWidgetPrivate::macUpdateSizeAttribute()
 {
     Q_Q(QWidget);
     QEvent event(QEvent::MacSizeChange);
-    QApplication::sendEvent(q, &event);
+    QCoreApplication::sendEvent(q, &event);
     for (int i = 0; i < children.size(); ++i) {
         QWidget *w = qobject_cast<QWidget *>(children.at(i));
         if (w && (!w->isWindow() || w->testAttribute(Qt::WA_WindowPropagation))
@@ -11263,7 +10922,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
         else if (!on && (isWindow() || !parentWidget() || !parentWidget()->testAttribute(Qt::WA_DropSiteRegistered)))
             setAttribute(Qt::WA_DropSiteRegistered, false);
         QEvent e(QEvent::AcceptDropsChange);
-        QApplication::sendEvent(this, &e);
+        QCoreApplication::sendEvent(this, &e);
         break;
     }
     case Qt::WA_DropSiteRegistered:  {
@@ -11282,23 +10941,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
     case Qt::WA_NoChildEventsFromChildren:
         d->receiveChildEvents = !on;
         break;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    case Qt::WA_MacOpaqueSizeGrip:
-        d->macUpdateOpaqueSizeGrip();
-        break;
-    case Qt::WA_MacShowFocusRect:
-        if (hasFocus()) {
-            clearFocus();
-            setFocus();
-        }
-        break;
-    case Qt::WA_Hover:
-        qt_mac_update_mouseTracking(this);
-        break;
-    case Qt::WA_MacAlwaysShowToolWindow:
-        d->macUpdateHideOnSuspend();
-        break;
-#endif
     case Qt::WA_MacNormalSize:
     case Qt::WA_MacSmallSize:
     case Qt::WA_MacMiniSize:
@@ -11346,11 +10988,11 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
         break;
     case Qt::WA_MouseTracking: {
         QEvent e(QEvent::MouseTrackingChange);
-        QApplication::sendEvent(this, &e);
+        QCoreApplication::sendEvent(this, &e);
         break; }
     case Qt::WA_TabletTracking: {
         QEvent e(QEvent::TabletTrackingChange);
-        QApplication::sendEvent(this, &e);
+        QCoreApplication::sendEvent(this, &e);
         break; }
     case Qt::WA_NativeWindow: {
         d->createTLExtra();
@@ -11363,7 +11005,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
             QGuiApplication::inputMethod()->commit();
             QGuiApplication::inputMethod()->update(Qt::ImEnabled);
         }
-        if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget())
+        if (!QCoreApplication::testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget())
             parentWidget()->d_func()->enforceNativeChildren();
         if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
             d->createWinId();
@@ -11376,15 +11018,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
     }
     case Qt::WA_PaintOnScreen:
         d->updateIsOpaque();
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ || 0 /* Used to be included in Qt4 for Q_WS_X11 */ || 0 /* Used to be included in Qt4 for Q_WS_MAC */
-        // Recreate the widget if it's already created as an alien widget and
-        // WA_PaintOnScreen is enabled. Paint on screen widgets must have win id.
-        // So must their children.
-        if (on) {
-            setAttribute(Qt::WA_NativeWindow);
-            d->enforceNativeChildren();
-        }
-#endif
         Q_FALLTHROUGH();
     case Qt::WA_OpaquePaintEvent:
         d->updateIsOpaque();
@@ -11396,9 +11029,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
         d->updateSystemBackground();
         break;
     case Qt::WA_TransparentForMouseEvents:
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        d->macUpdateIgnoreMouseEvents();
-#endif
         break;
     case Qt::WA_InputMethodEnabled: {
 #ifndef QT_NO_IM
@@ -11415,20 +11045,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
         d->resolveFont();
         d->resolveLocale();
         break;
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    case Qt::WA_NoX11EventCompression:
-        if (!d->extra)
-            d->createExtra();
-        d->extra->compress_events = on;
-        break;
-    case Qt::WA_X11OpenGLOverlay:
-        d->updateIsOpaque();
-        break;
-    case Qt::WA_X11DoNotAcceptFocus:
-        if (testAttribute(Qt::WA_WState_Created))
-            d->updateX11AcceptFocus();
-        break;
-#endif
     case Qt::WA_DontShowOnScreen: {
         if (on && isVisible()) {
             // Make sure we keep the current state and only hide the widget
@@ -11457,11 +11073,11 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
         break;
 
     case Qt::WA_StaticContents:
-        if (QWidgetBackingStore *bs = d->maybeBackingStore()) {
+        if (QWidgetRepaintManager *repaintManager = d->maybeRepaintManager()) {
             if (on)
-                bs->addStaticWidget(this);
+                repaintManager->addStaticWidget(this);
             else
-                bs->removeStaticWidget(this);
+                repaintManager->removeStaticWidget(this);
         }
         break;
     case Qt::WA_TranslucentBackground:
@@ -11471,10 +11087,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
 
         break;
     case Qt::WA_AcceptTouchEvents:
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ || 0 /* Used to be included in Qt4 for Q_WS_MAC */
-        if (on)
-            d->registerTouchWindow();
-#endif
         break;
     default:
         break;
@@ -11598,7 +11210,7 @@ void QWidget::setWindowModified(bool mod)
     d->setWindowModified_helper();
 
     QEvent e(QEvent::ModifiedChange);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 }
 
 void QWidgetPrivate::setWindowModified_helper()
@@ -11644,7 +11256,7 @@ void QWidget::setToolTip(const QString &s)
     d->toolTip = s;
 
     QEvent event(QEvent::ToolTipChange);
-    QApplication::sendEvent(this, &event);
+    QCoreApplication::sendEvent(this, &event);
 }
 
 QString QWidget::toolTip() const
@@ -11821,7 +11433,7 @@ int QWidget::grabShortcut(const QKeySequence &key, Qt::ShortcutContext context)
     if (key.isEmpty())
         return 0;
     setAttribute(Qt::WA_GrabbedShortcut);
-    return qApp->d_func()->shortcutMap.addShortcut(this, key, context, qWidgetShortcutContextMatcher);
+    return QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, key, context, qWidgetShortcutContextMatcher);
 }
 
 /*!
@@ -11843,7 +11455,7 @@ void QWidget::releaseShortcut(int id)
 {
     Q_ASSERT(qApp);
     if (id)
-        qApp->d_func()->shortcutMap.removeShortcut(id, this, 0);
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(id, this, 0);
 }
 
 /*!
@@ -11862,7 +11474,7 @@ void QWidget::setShortcutEnabled(int id, bool enable)
 {
     Q_ASSERT(qApp);
     if (id)
-        qApp->d_func()->shortcutMap.setShortcutEnabled(enable, id, this, 0);
+        QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enable, id, this, 0);
 }
 
 /*!
@@ -11877,7 +11489,7 @@ void QWidget::setShortcutAutoRepeat(int id, bool enable)
 {
     Q_ASSERT(qApp);
     if (id)
-        qApp->d_func()->shortcutMap.setShortcutAutoRepeat(enable, id, this, 0);
+        QGuiApplicationPrivate::instance()->shortcutMap.setShortcutAutoRepeat(enable, id, this, 0);
 }
 #endif // QT_NO_SHORTCUT
 
@@ -11932,7 +11544,7 @@ void QWidget::raise()
         QWindowContainer::parentWasRaised(this);
 
     QEvent e(QEvent::ZOrderChange);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 }
 
 void QWidgetPrivate::raise_sys()
@@ -11982,7 +11594,7 @@ void QWidget::lower()
         QWindowContainer::parentWasLowered(this);
 
     QEvent e(QEvent::ZOrderChange);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 }
 
 void QWidgetPrivate::lower_sys()
@@ -12029,7 +11641,7 @@ void QWidget::stackUnder(QWidget* w)
         d->stackUnder_sys(w);
 
     QEvent e(QEvent::ZOrderChange);
-    QApplication::sendEvent(this, &e);
+    QCoreApplication::sendEvent(this, &e);
 }
 
 void QWidgetPrivate::stackUnder_sys(QWidget*)
@@ -12090,10 +11702,8 @@ QRect QWidgetPrivate::frameStrut() const
     }
 
     if (data.fstrut_dirty
-#if 1 // Used to be excluded in Qt4 for Q_WS_WIN
         // ### Fix properly for 4.3
         && q->isVisible()
-#endif
         && q->testAttribute(Qt::WA_WState_Created))
         const_cast<QWidgetPrivate *>(this)->updateFrameStrut();
 
@@ -12266,14 +11876,14 @@ void QWidget::setBackingStore(QBackingStore *store)
     deleteBackingStore(d);
     topData->backingStore = store;
 
-    QWidgetBackingStore *bs = d->maybeBackingStore();
-    if (!bs)
+    QWidgetRepaintManager *repaintManager = d->maybeRepaintManager();
+    if (!repaintManager)
         return;
 
     if (isTopLevel()) {
-        if (bs->store != oldStore && bs->store != store)
-            delete bs->store;
-        bs->store = store;
+        if (repaintManager->backingStore() != oldStore && repaintManager->backingStore() != store)
+            delete repaintManager->backingStore();
+        repaintManager->setBackingStore(store);
     }
 }
 
@@ -12289,9 +11899,8 @@ QBackingStore *QWidget::backingStore() const
     if (extra && extra->backingStore)
         return extra->backingStore;
 
-    QWidgetBackingStore *bs = d->maybeBackingStore();
-
-    return bs ? bs->store : 0;
+    QWidgetRepaintManager *repaintManager = d->maybeRepaintManager();
+    return repaintManager ? repaintManager->backingStore() : nullptr;
 }
 
 void QWidgetPrivate::getLayoutItemMargins(int *left, int *top, int *right, int *bottom) const
@@ -12364,19 +11973,18 @@ QOpenGLContext *QWidgetPrivate::shareContext() const
 #ifdef QT_NO_OPENGL
     return 0;
 #else
-    if (Q_UNLIKELY(!extra || !extra->topextra || !extra->topextra->window))
+    if (!extra || !extra->topextra || !extra->topextra->window)
         return 0;
 
-    QWidgetPrivate *that = const_cast<QWidgetPrivate *>(this);
     if (!extra->topextra->shareContext) {
-        QOpenGLContext *ctx = new QOpenGLContext;
+        auto ctx = qt_make_unique<QOpenGLContext>();
         ctx->setShareContext(qt_gl_global_share_context());
         ctx->setFormat(extra->topextra->window->format());
         ctx->setScreen(extra->topextra->window->screen());
         ctx->create();
-        that->extra->topextra->shareContext = ctx;
+        extra->topextra->shareContext = std::move(ctx);
     }
-    return that->extra->topextra->shareContext;
+    return extra->topextra->shareContext.get();
 #endif // QT_NO_OPENGL
 }
 
@@ -13022,10 +12630,8 @@ void QWidget::setMask(const QRegion &newMask)
     d->extra->mask = newMask;
     d->extra->hasMask = !newMask.isEmpty();
 
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     if (!testAttribute(Qt::WA_WState_Created))
         return;
-#endif
 
     d->setMask_sys(newMask);
 
@@ -13201,7 +12807,7 @@ QDebug operator<<(QDebug debug, const QWidget *widget)
             if (widget->isWindow())
                 debug << ", window";
             debug << ", " << geometry.width() << 'x' << geometry.height()
-                << forcesign << geometry.x() << geometry.y() << noforcesign;
+                << Qt::forcesign << geometry.x() << geometry.y() << Qt::noforcesign;
             if (frameGeometry != geometry) {
                 const QMargins margins(geometry.x() - frameGeometry.x(),
                                        geometry.y() - frameGeometry.y(),
@@ -13211,7 +12817,7 @@ QDebug operator<<(QDebug debug, const QWidget *widget)
             }
             debug << ", devicePixelRatio=" << widget->devicePixelRatioF();
             if (const WId wid = widget->internalWinId())
-                debug << ", winId=0x" << hex << wid << dec;
+                debug << ", winId=0x" << Qt::hex << wid << Qt::dec;
         }
         debug << ')';
     } else {
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 4e5ef5a111..83a6e6d4b3 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -85,6 +85,7 @@ class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
+class QScreen;
 class QShowEvent;
 class QHideEvent;
 class QIcon;
@@ -524,7 +525,10 @@ public:
 
     void setContentsMargins(int left, int top, int right, int bottom);
     void setContentsMargins(const QMargins &margins);
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("use contentsMargins()")
     void getContentsMargins(int *left, int *top, int *right, int *bottom) const;
+#endif
     QMargins contentsMargins() const;
 
     QRect contentsRect() const;
@@ -555,7 +559,7 @@ public:
     void addAction(QAction *action);
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     void addActions(const QList<QAction*> &actions);
-    void insertActions(const QAction *before, const QList<QAction*> &actions);
+    void insertActions(QAction *before, const QList<QAction*> &actions);
 #else
     void addActions(QList<QAction*> actions);
     void insertActions(QAction *before, QList<QAction*> actions);
@@ -598,6 +602,7 @@ public:
     QBackingStore *backingStore() const;
 
     QWindow *windowHandle() const;
+    QScreen *screen() const;
 
     static QWidget *createWindowContainer(QWindow *window, QWidget *parent=nullptr, Qt::WindowFlags flags=Qt::WindowFlags());
 
@@ -648,7 +653,12 @@ protected:
 
     virtual void showEvent(QShowEvent *event);
     virtual void hideEvent(QHideEvent *event);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    virtual bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result);
+#else
     virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result);
+#endif
 
     // Misc. protected functions
     virtual void changeEvent(QEvent *);
@@ -689,7 +699,7 @@ private:
     QLayout *takeLayout();
 
     friend class QBackingStoreDevice;
-    friend class QWidgetBackingStore;
+    friend class QWidgetRepaintManager;
     friend class QApplication;
     friend class QApplicationPrivate;
     friend class QGuiApplication;
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 3dccd00b8b..698928b0b0 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -75,15 +75,20 @@
 #include <private/qgesture_p.h>
 #include <qpa/qplatformbackingstore.h>
 
+#include <vector>
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(lcWidgetPainting);
+
 // Extra QWidget data
 //  - to minimize memory usage for members that are seldom used.
 //  - top-level widgets have extra extra data to reduce cost further
 class QWidgetWindow;
 class QPaintEngine;
 class QPixmap;
-class QWidgetBackingStore;
+class QWidgetRepaintManager;
 class QGraphicsProxyWidget;
 class QWidgetItemV2;
 class QOpenGLContext;
@@ -113,60 +118,18 @@ protected:
     QRegion m_region;
 };
 
-
-
-class Q_AUTOTEST_EXPORT QWidgetBackingStoreTracker
-{
-
-public:
-    QWidgetBackingStoreTracker();
-    ~QWidgetBackingStoreTracker();
-
-    void create(QWidget *tlw);
-    void destroy();
-
-    void registerWidget(QWidget *w);
-    void unregisterWidget(QWidget *w);
-    void unregisterWidgetSubtree(QWidget *w);
-
-    inline QWidgetBackingStore* data()
-    {
-        return m_ptr;
-    }
-
-    inline QWidgetBackingStore* operator->()
-    {
-        return m_ptr;
-    }
-
-    inline QWidgetBackingStore& operator*()
-    {
-        return *m_ptr;
-    }
-
-    inline operator bool() const
-    {
-        return (0 != m_ptr);
-    }
-
-private:
-    Q_DISABLE_COPY_MOVE(QWidgetBackingStoreTracker)
-
-private:
-    QWidgetBackingStore* m_ptr;
-    QSet<QWidget *> m_widgets;
-};
-
 struct QTLWExtra {
     // *************************** Cross-platform variables *****************************
 
     // Regular pointers (keep them together to avoid gaps on 64 bits architectures).
-    QIcon *icon; // widget icon
-    QWidgetBackingStoreTracker backingStoreTracker;
+    std::unique_ptr<QIcon> icon; // widget icon
+    std::unique_ptr<QWidgetRepaintManager> repaintManager;
     QBackingStore *backingStore;
     QPainter *sharedPainter;
     QWidgetWindow *window;
-    QOpenGLContext *shareContext;
+#ifndef QT_NO_OPENGL
+    mutable std::unique_ptr<QOpenGLContext> shareContext;
+#endif
 
     // Implicit pointers (shared_null).
     QString caption; // widget caption
@@ -184,7 +147,9 @@ struct QTLWExtra {
     // ### TODO replace initialScreenIndex with QScreen *, in case the screens change at runtime
     int initialScreenIndex; // Screen number when passing a QDesktop[Screen]Widget as parent.
 
-    QVector<QPlatformTextureList *> widgetTextures;
+#ifndef QT_NO_OPENGL
+    std::vector<std::unique_ptr<QPlatformTextureList>> widgetTextures;
+#endif
 
     // *************************** Cross-platform bit fields ****************************
     uint opacity : 8;
@@ -192,41 +157,6 @@ struct QTLWExtra {
     uint sizeAdjusted : 1;
     uint inTopLevelResize : 1;
     uint embedded : 1;
-
-    // *************************** Platform specific values (bit fields first) **********
-#if 0 /* Used to be included in Qt4 for Q_WS_X11 */ // <----------------------------------------------------------- X11
-    uint spont_unmapped: 1; // window was spontaneously unmapped
-    uint dnd : 1; // DND properties installed
-    uint validWMState : 1; // is WM_STATE valid?
-    uint waitingForMapNotify : 1; // show() has been called, haven't got the MapNotify yet
-    WId parentWinId; // parent window Id (valid after reparenting)
-    WId userTimeWindow; // window id that contains user-time timestamp when WM supports a _NET_WM_USER_TIME_WINDOW atom
-    QPoint fullScreenOffset;
-#ifndef QT_NO_XSYNC
-    WId syncUpdateCounter;
-    ulong syncRequestTimestamp;
-    qint32 newCounterValueHi;
-    quint32 newCounterValueLo;
-#endif
-#elif 0 /* Used to be included in Qt4 for Q_WS_WIN */ // <--------------------------------------------------------- WIN
-    uint hotkeyRegistered: 1; // Hot key from the STARTUPINFO has been registered.
-    HICON winIconBig; // internal big Windows icon
-    HICON winIconSmall; // internal small Windows icon
-#elif 0 /* Used to be included in Qt4 for Q_WS_MAC */ // <--------------------------------------------------------- MAC
-    uint resizer : 4;
-    uint isSetGeometry : 1;
-    uint isMove : 1;
-    quint32 wattr;
-    quint32 wclass;
-    WindowGroupRef group;
-    IconRef windowIcon; // the current window icon, if set with setWindowIcon_sys.
-    quint32 savedWindowAttributesFromMaximized; // Saved attributes from when the calling updateMaximizeButton_sys()
-    // This value is just to make sure we maximize and restore to the right location, yet we allow apps to be maximized and
-    // manually resized.
-    // The name is misleading, since this is set when maximizing the window. It is a hint to saveGeometry(..) to record the
-    // starting position as 0,0 instead of the normal starting position.
-    bool wasMaximized;
-#endif
 };
 
 struct QWExtra {
@@ -234,12 +164,12 @@ struct QWExtra {
 
     // Regular pointers (keep them together to avoid gaps on 64 bits architectures).
     void *glContext; // if the widget is hijacked by QGLWindowSurface
-    QTLWExtra *topextra; // only useful for TLWs
+    std::unique_ptr<QTLWExtra> topextra; // only useful for TLWs
 #if QT_CONFIG(graphicsview)
     QGraphicsProxyWidget *proxyWidget; // if the widget is embedded
 #endif
 #ifndef QT_NO_CURSOR
-    QCursor *curs;
+    std::unique_ptr<QCursor> curs;
 #endif
     QPointer<QStyle> style;
     QPointer<QWidget> focus_proxy;
@@ -265,21 +195,6 @@ struct QWExtra {
     uint inRenderWithPainter : 1;
     uint hasMask : 1;
     uint hasWindowContainer : 1;
-
-    // *************************** Platform specific values (bit fields first) **********
-#if 0 /* Used to be included in Qt4 for Q_WS_WIN */ // <----------------------------------------------------------- WIN
-#if QT_CONFIG(draganddrop)
-    QOleDropTarget *dropTarget; // drop target
-    QList<QPointer<QWidget> > oleDropWidgets;
-#endif
-#elif 0 /* Used to be included in Qt4 for Q_WS_X11 */ // <--------------------------------------------------------- X11
-    uint compress_events : 1;
-    WId xDndProxy; // XDND forwarding to embedded windows
-#elif 0 /* Used to be included in Qt4 for Q_WS_MAC */ // <------------------------------------------------------ MAC
-    // Cocoa Mask stuff
-    QImage maskBits;
-    CGImageRef imageMask;
-#endif
 };
 
 /*!
@@ -303,10 +218,11 @@ static inline bool bypassGraphicsProxyWidget(const QWidget *p)
 class Q_WIDGETS_EXPORT QWidgetPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QWidget)
+    Q_GADGET
 
 public:
     // *************************** Cross-platform ***************************************
-    enum DrawWidgetFlags {
+    enum DrawWidgetFlag {
         DrawAsRoot = 0x01,
         DrawPaintOnScreen = 0x02,
         DrawRecursive = 0x04,
@@ -316,12 +232,15 @@ public:
         DontDrawNativeChildren = 0x40,
         DontSetCompositionMode = 0x80
     };
+    Q_DECLARE_FLAGS(DrawWidgetFlags, DrawWidgetFlag)
+    Q_FLAG(DrawWidgetFlags)
 
     enum CloseMode {
         CloseNoEvent,
         CloseWithEvent,
         CloseWithSpontaneousEvent
     };
+    Q_ENUM(CloseMode)
 
     enum Direction {
         DirectionNorth = 0x01,
@@ -329,6 +248,7 @@ public:
         DirectionSouth = 0x02,
         DirectionWest = 0x20
     };
+    Q_ENUM(Direction)
 
     // Functions.
     explicit QWidgetPrivate(int version = QObjectPrivateVersion);
@@ -342,8 +262,16 @@ public:
     QTLWExtra *maybeTopData() const;
     QPainter *sharedPainter() const;
     void setSharedPainter(QPainter *painter);
-    QWidgetBackingStore *maybeBackingStore() const;
-    QWidgetWindow *windowHandle() const;
+    QWidgetRepaintManager *maybeRepaintManager() const;
+
+    enum class WindowHandleMode {
+        Direct,
+        Closest,
+        TopLevel
+    };
+    QWindow *windowHandle(WindowHandleMode mode = WindowHandleMode::Direct) const;
+
+    QScreen *associatedScreen() const;
 
     template <typename T>
     void repaint(T t);
@@ -405,38 +333,38 @@ public:
     void setUpdatesEnabled_helper(bool );
 
     bool updateBrushOrigin(QPainter *, const QBrush &brush) const;
-    void paintBackground(QPainter *, const QRegion &, int flags = DrawAsRoot) const;
+    void paintBackground(QPainter *, const QRegion &, DrawWidgetFlags flags = DrawAsRoot) const;
     bool isAboutToShow() const;
     QRegion prepareToRender(const QRegion &region, QWidget::RenderFlags renderFlags);
     void render_helper(QPainter *painter, const QPoint &targetOffset, const QRegion &sourceRegion,
                        QWidget::RenderFlags renderFlags);
     void render(QPaintDevice *target, const QPoint &targetOffset, const QRegion &sourceRegion,
                 QWidget::RenderFlags renderFlags);
-    void drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QPoint &offset, int flags,
-                    QPainter *sharedPainter = 0, QWidgetBackingStore *backingStore = 0);
+    void drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QPoint &offset, DrawWidgetFlags flags,
+                    QPainter *sharedPainter = nullptr, QWidgetRepaintManager *repaintManager = nullptr);
     void sendPaintEvent(const QRegion &toBePainted);
 
 
     void paintSiblingsRecursive(QPaintDevice *pdev, const QObjectList& children, int index,
-                                const QRegion &rgn, const QPoint &offset, int flags,
-                                QPainter *sharedPainter, QWidgetBackingStore *backingStore);
+                                const QRegion &rgn, const QPoint &offset, DrawWidgetFlags flags,
+                                QPainter *sharedPainter, QWidgetRepaintManager *repaintManager);
 
 #if QT_CONFIG(graphicsview)
     static QGraphicsProxyWidget * nearestGraphicsProxyWidget(const QWidget *origin);
 #endif
-    void repaint_sys(const QRegion &rgn);
+    bool shouldPaintOnScreen() const;
+    void paintOnScreen(const QRegion &rgn);
 
     QRect clipRect() const;
     QRegion clipRegion() const;
     void setSystemClip(QPaintEngine *paintEngine, qreal devicePixelRatio, const QRegion &region);
     void subtractOpaqueChildren(QRegion &rgn, const QRect &clipRect) const;
-    void subtractOpaqueSiblings(QRegion &source, bool *hasDirtySiblingsAbove = 0,
+    void subtractOpaqueSiblings(QRegion &source, bool *hasDirtySiblingsAbove = nullptr,
                                 bool alsoNonOpaque = false) const;
     void clipToEffectiveMask(QRegion &region) const;
     void updateIsOpaque();
     void setOpaque(bool opaque);
     void updateIsTranslucent();
-    bool paintOnScreen() const;
 #if QT_CONFIG(graphicseffect)
     void invalidateGraphicsEffectsRecursively();
 #endif // QT_CONFIG(graphicseffect)
@@ -463,6 +391,8 @@ public:
     void syncBackingStore();
     void syncBackingStore(const QRegion &region);
 
+    bool shouldDiscardSyncRequest() const;
+
     // tells the input method about the widgets transform
     void updateWidgetTransform(QEvent *event);
 
@@ -527,7 +457,7 @@ public:
 
     void getLayoutItemMargins(int *left, int *top, int *right, int *bottom) const;
     void setLayoutItemMargins(int left, int top, int right, int bottom);
-    void setLayoutItemMargins(QStyle::SubElement element, const QStyleOption *opt = 0);
+    void setLayoutItemMargins(QStyle::SubElement element, const QStyleOption *opt = nullptr);
 
     void updateContentsRect();
     QMargins safeAreaMargins() const;
@@ -557,7 +487,7 @@ public:
         QGraphicsProxyWidget *ancestorProxy = widget->d_func()->nearestGraphicsProxyWidget(widget);
         //It's embedded if it has an ancestor
         if (ancestorProxy) {
-            if (!bypassGraphicsProxyWidget(widget) && ancestorProxy->scene() != 0) {
+            if (!bypassGraphicsProxyWidget(widget) && ancestorProxy->scene() != nullptr) {
                 // One view, let be smart and return the viewport rect then the popup is aligned
                 if (ancestorProxy->scene()->views().size() == 1) {
                     QGraphicsView *view = ancestorProxy->scene()->views().at(0);
@@ -588,7 +518,7 @@ public:
     }
 
     inline void restoreRedirected()
-    { redirectDev = 0; }
+    { redirectDev = nullptr; }
 
     inline void enforceNativeChildren()
     {
@@ -654,7 +584,7 @@ public:
 
     QOpenGLContext *shareContext() const;
 
-    virtual QObject *focusObject() { return 0; }
+    virtual QObject *focusObject() { return nullptr; }
 
 #ifndef QT_NO_OPENGL
     virtual GLuint textureId() const { return 0; }
@@ -662,7 +592,7 @@ public:
         Q_Q(QWidget);
         return q->testAttribute(Qt::WA_AlwaysStackOnTop)
             ? QPlatformTextureList::StacksOnTop
-            : QPlatformTextureList::Flags(0);
+            : QPlatformTextureList::Flags(nullptr);
     }
     virtual QImage grabFramebuffer() { return QImage(); }
     virtual void beginBackingStorePainting() { }
@@ -698,7 +628,7 @@ public:
 
     // Variables.
     // Regular pointers (keep them together to avoid gaps on 64 bit architectures).
-    QWExtra *extra;
+    std::unique_ptr<QWExtra> extra;
     QWidget *focus_next;
     QWidget *focus_prev;
     QWidget *focus_child;
@@ -792,109 +722,8 @@ public:
     // *************************** Platform specific ************************************
 #if defined(Q_OS_WIN)
     uint noPaintOnScreen : 1; // see qwidget.cpp ::paintEngine()
-#endif
-#if 0 /* Used to be included in Qt4 for Q_WS_X11 */ // <----------------------------------------------------------- X11
-    Qt::HANDLE picture;
-    static QWidget *mouseGrabber;
-    static QWidget *keyboardGrabber;
-
-    void setWindowRole();
-    void sendStartupMessage(const char *message) const;
-    void x11UpdateIsOpaque();
-    bool isBackgroundInherited() const;
-    void updateX11AcceptFocus();
-    QPoint mapToGlobal(const QPoint &pos) const;
-    QPoint mapFromGlobal(const QPoint &pos) const;
-#elif 0 /* Used to be included in Qt4 for Q_WS_WIN */ // <--------------------------------------------------------- WIN
-#ifndef QT_NO_GESTURES
-    uint nativeGesturePanEnabled : 1;
-#endif
-    bool shouldShowMaximizeButton();
-    void winUpdateIsOpaque();
-    void reparentChildren();
-#if QT_CONFIG(draganddrop)
-    QOleDropTarget *registerOleDnd(QWidget *widget);
-    void unregisterOleDnd(QWidget *widget, QOleDropTarget *target);
-#endif
-    void grabMouseWhileInWindow();
-    void registerTouchWindow();
-    void winSetupGestures();
-#elif defined(Q_OS_MAC) // <--------------------------------------------------------- MAC
+#elif defined(Q_OS_MAC)
     void macUpdateSizeAttribute();
-#elif 0 /* Used to be included in Qt4 for Q_WS_MAC */ // <--------------------------------------------------------- MAC (old stuff)
-    // This is new stuff
-    uint needWindowChange : 1;
-
-    // Each wiget keeps a list of all its child and grandchild OpenGL widgets.
-    // This list is used to update the gl context whenever a parent and a granparent
-    // moves, and also to check for intersections with gl widgets within the window
-    // when a widget moves.
-    struct GlWidgetInfo
-    {
-        GlWidgetInfo(QWidget *widget) : widget(widget), lastUpdateWidget(0) { }
-        bool operator==(const GlWidgetInfo &other) const { return (widget == other.widget); }
-        QWidget * widget;
-        QWidget * lastUpdateWidget;
-    };
-
-    // dirtyOnWidget contains the areas in the widget that needs to be repained,
-    // in the same way as dirtyOnScreen does for the window. Areas are added in
-    // dirtyWidget_sys and cleared in the paint event. In scroll_sys we then use
-    // this information repaint invalid areas when widgets are scrolled.
-    QRegion dirtyOnWidget;
-    EventHandlerRef window_event;
-    QList<GlWidgetInfo> glWidgets;
-
-    //these are here just for code compat (HIViews)
-    Qt::HANDLE qd_hd;
-
-    void macUpdateHideOnSuspend();
-    void macUpdateOpaqueSizeGrip();
-    void macUpdateIgnoreMouseEvents();
-    void macUpdateMetalAttribute();
-    void macUpdateIsOpaque();
-    void macSetNeedsDisplay(QRegion region);
-    void setEnabled_helper_sys(bool enable);
-    bool isRealWindow() const;
-    void adjustWithinMaxAndMinSize(int &w, int &h);
-    void applyMaxAndMinSizeOnWindow();
-    void update_sys(const QRect &rect);
-    void update_sys(const QRegion &rgn);
-    void setGeometry_sys_helper(int, int, int, int, bool);
-    void updateMaximizeButton_sys();
-    void createWindow_sys();
-    void recreateMacWindow();
-    void setSubWindowStacking(bool set);
-    void setWindowLevel();
-    void finishCreateWindow_sys_Cocoa(void * /*NSWindow * */ windowRef);
-    void syncCocoaMask();
-    void finishCocoaMaskSetup();
-    // Did we add the drawRectOriginal method?
-    bool drawRectOriginalAdded;
-    // Is the original drawRect method available?
-    bool originalDrawMethod;
-    // Do we need to change the methods?
-    bool changeMethods;
-
-    // Unified toolbar variables
-    bool isInUnifiedToolbar;
-    QUnifiedToolbarSurface *unifiedSurface;
-    QPoint toolbar_offset;
-    QWidget *toolbar_ancestor;
-    bool flushRequested;
-    bool touchEventsEnabled;
-    void determineWindowClass();
-    void transferChildren();
-    bool qt_mac_dnd_event(uint, DragRef);
-    void toggleDrawers(bool);
-    //mac event functions
-    static bool qt_create_root_win();
-    static void qt_clean_root_win();
-    static bool qt_mac_update_sizer(QWidget *, int up = 0);
-    static OSStatus qt_window_event(EventHandlerCallRef er, EventRef event, void *);
-    static OSStatus qt_widget_event(EventHandlerCallRef er, EventRef event, void *);
-    static bool qt_widget_rgn(QWidget *, short, RgnHandle, bool);
-    void registerTouchWindow(bool enable = true);
 #endif
     void setNetWmWindowTypes(bool skipIfMissing = false);
 
@@ -902,18 +731,20 @@ public:
     bool stealMouseGrab(bool grab);
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QWidgetPrivate::DrawWidgetFlags)
+
 struct QWidgetPaintContext
 {
-    inline QWidgetPaintContext(QPaintDevice *d, const QRegion &r, const QPoint &o, int f,
-                               QPainter *p, QWidgetBackingStore *b)
-        : pdev(d), rgn(r), offset(o), flags(f), sharedPainter(p), backingStore(b), painter(0) {}
+    inline QWidgetPaintContext(QPaintDevice *d, const QRegion &r, const QPoint &o, QWidgetPrivate::DrawWidgetFlags f,
+                               QPainter *p, QWidgetRepaintManager *rpm)
+        : pdev(d), rgn(r), offset(o), flags(f), sharedPainter(p), repaintManager(rpm), painter(nullptr) {}
 
     QPaintDevice *pdev;
     QRegion rgn;
     QPoint offset;
-    int flags;
+    QWidgetPrivate::DrawWidgetFlags flags;
     QPainter *sharedPainter;
-    QWidgetBackingStore *backingStore;
+    QWidgetRepaintManager *repaintManager;
     QPainter *painter;
 };
 
@@ -922,14 +753,14 @@ class QWidgetEffectSourcePrivate : public QGraphicsEffectSourcePrivate
 {
 public:
     QWidgetEffectSourcePrivate(QWidget *widget)
-        : QGraphicsEffectSourcePrivate(), m_widget(widget), context(0), updateDueToGraphicsEffect(false)
+        : QGraphicsEffectSourcePrivate(), m_widget(widget), context(nullptr), updateDueToGraphicsEffect(false)
     {}
 
     void detach() override
-    { m_widget->d_func()->graphicsEffect = 0; }
+    { m_widget->d_func()->graphicsEffect = nullptr; }
 
     const QGraphicsItem *graphicsItem() const override
-    { return 0; }
+    { return nullptr; }
 
     const QWidget *widget() const override
     { return m_widget; }
@@ -955,7 +786,7 @@ public:
     }
 
     const QStyleOption *styleOption() const override
-    { return 0; }
+    { return nullptr; }
 
     QRect deviceRect() const override
     { return m_widget->window()->rect(); }
@@ -974,25 +805,25 @@ public:
 
 inline QWExtra *QWidgetPrivate::extraData() const
 {
-    return extra;
+    return extra.get();
 }
 
 inline QTLWExtra *QWidgetPrivate::topData() const
 {
     const_cast<QWidgetPrivate *>(this)->createTLExtra();
-    return extra->topextra;
+    return extra->topextra.get();
 }
 
 inline QTLWExtra *QWidgetPrivate::maybeTopData() const
 {
-    return extra ? extra->topextra : 0;
+    return extra ? extra->topextra.get() : nullptr;
 }
 
 inline QPainter *QWidgetPrivate::sharedPainter() const
 {
     Q_Q(const QWidget);
     QTLWExtra *x = q->window()->d_func()->maybeTopData();
-    return x ? x->sharedPainter : 0;
+    return x ? x->sharedPainter : nullptr;
 }
 
 inline void QWidgetPrivate::setSharedPainter(QPainter *painter)
@@ -1009,18 +840,11 @@ inline bool QWidgetPrivate::pointInsideRectAndMask(const QPoint &p) const
                                      || extra->mask.contains(p));
 }
 
-inline QWidgetBackingStore *QWidgetPrivate::maybeBackingStore() const
+inline QWidgetRepaintManager *QWidgetPrivate::maybeRepaintManager() const
 {
     Q_Q(const QWidget);
     QTLWExtra *x = q->window()->d_func()->maybeTopData();
-    return x ? x->backingStoreTracker.data() : 0;
-}
-
-inline QWidgetWindow *QWidgetPrivate::windowHandle() const
-{
-    if (QTLWExtra *x = maybeTopData())
-        return x->window;
-    return nullptr;
+    return x ? x->repaintManager.get() : nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h
deleted file mode 100644
index 4d15ab138e..0000000000
--- a/src/widgets/kernel/qwidgetbackingstore_p.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWidgets module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWIDGETBACKINGSTORE_P_H
-#define QWIDGETBACKINGSTORE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include <QDebug>
-#include <QtWidgets/qwidget.h>
-#include <private/qwidget_p.h>
-#include <QtGui/qbackingstore.h>
-
-QT_BEGIN_NAMESPACE
-
-class QPlatformTextureList;
-class QPlatformTextureListWatcher;
-class QWidgetBackingStore;
-
-struct BeginPaintInfo {
-    inline BeginPaintInfo() : wasFlushed(0), nothingToPaint(0), backingStoreRecreated(0) {}
-    uint wasFlushed : 1;
-    uint nothingToPaint : 1;
-    uint backingStoreRecreated : 1;
-};
-
-#ifndef QT_NO_OPENGL
-class QPlatformTextureListWatcher : public QObject
-{
-    Q_OBJECT
-
-public:
-    QPlatformTextureListWatcher(QWidgetBackingStore *backingStore);
-    void watch(QPlatformTextureList *textureList);
-    bool isLocked() const;
-
-private slots:
-     void onLockStatusChanged(bool locked);
-
-private:
-     QHash<QPlatformTextureList *, bool> m_locked;
-     QWidgetBackingStore *m_backingStore;
-};
-#endif
-
-class Q_AUTOTEST_EXPORT QWidgetBackingStore
-{
-public:
-    enum UpdateTime {
-        UpdateNow,
-        UpdateLater
-    };
-
-    enum BufferState{
-        BufferValid,
-        BufferInvalid
-    };
-
-    QWidgetBackingStore(QWidget *t);
-    ~QWidgetBackingStore();
-
-    static void showYellowThing(QWidget *widget, const QRegion &rgn, int msec, bool);
-
-    void sync(QWidget *exposedWidget, const QRegion &exposedRegion);
-    void sync();
-    void flush(QWidget *widget = 0);
-
-    QBackingStore *backingStore() const { return store; }
-
-    inline bool isDirty() const
-    {
-        return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && dirtyRenderToTextureWidgets.isEmpty());
-    }
-
-    template <class T>
-    void markDirty(const T &r, QWidget *widget, UpdateTime updateTime = UpdateLater,
-                   BufferState bufferState = BufferValid);
-
-private:
-    QWidget *tlw;
-    QRegion dirtyOnScreen; // needsFlush
-    QRegion dirty; // needsRepaint
-    QRegion dirtyFromPreviousSync;
-    QVector<QWidget *> dirtyWidgets;
-    QVector<QWidget *> dirtyRenderToTextureWidgets;
-    QVector<QWidget *> *dirtyOnScreenWidgets;
-    QList<QWidget *> staticWidgets;
-    QBackingStore *store;
-    uint updateRequestSent : 1;
-
-    QPlatformTextureListWatcher *textureListWatcher;
-    QElapsedTimer perfTime;
-    int perfFrames;
-
-    void sendUpdateRequest(QWidget *widget, UpdateTime updateTime);
-
-    static bool flushPaint(QWidget *widget, const QRegion &rgn);
-    static void unflushPaint(QWidget *widget, const QRegion &rgn);
-    static void qt_flush(QWidget *widget, const QRegion &region, QBackingStore *backingStore,
-                         QWidget *tlw,
-                         QPlatformTextureList *widgetTextures,
-                         QWidgetBackingStore *widgetBackingStore);
-
-    void doSync();
-    bool bltRect(const QRect &rect, int dx, int dy, QWidget *widget);
-    void releaseBuffer();
-
-    void beginPaint(QRegion &toClean, QWidget *widget, QBackingStore *backingStore,
-                    BeginPaintInfo *returnInfo, bool toCleanIsInTopLevelCoordinates = true);
-    void endPaint(const QRegion &cleaned, QBackingStore *backingStore, BeginPaintInfo *beginPaintInfo);
-
-    QRegion dirtyRegion(QWidget *widget = 0) const;
-    QRegion staticContents(QWidget *widget = 0, const QRect &withinClipRect = QRect()) const;
-
-    void markDirtyOnScreen(const QRegion &dirtyOnScreen, QWidget *widget, const QPoint &topLevelOffset);
-
-    void removeDirtyWidget(QWidget *w);
-
-    void updateLists(QWidget *widget);
-
-    bool syncAllowed();
-
-    inline void addDirtyWidget(QWidget *widget, const QRegion &rgn)
-    {
-        if (widget && !widget->d_func()->inDirtyList && !widget->data->in_destructor) {
-            QWidgetPrivate *widgetPrivate = widget->d_func();
-#if QT_CONFIG(graphicseffect)
-            if (widgetPrivate->graphicsEffect)
-                widgetPrivate->dirty = widgetPrivate->effectiveRectFor(rgn.boundingRect());
-            else
-#endif // QT_CONFIG(graphicseffect)
-                widgetPrivate->dirty = rgn;
-            dirtyWidgets.append(widget);
-            widgetPrivate->inDirtyList = true;
-        }
-    }
-
-    inline void addDirtyRenderToTextureWidget(QWidget *widget)
-    {
-        if (widget && !widget->d_func()->inDirtyList && !widget->data->in_destructor) {
-            QWidgetPrivate *widgetPrivate = widget->d_func();
-            Q_ASSERT(widgetPrivate->renderToTexture);
-            dirtyRenderToTextureWidgets.append(widget);
-            widgetPrivate->inDirtyList = true;
-        }
-    }
-
-    inline void dirtyWidgetsRemoveAll(QWidget *widget)
-    {
-        int i = 0;
-        while (i < dirtyWidgets.size()) {
-            if (dirtyWidgets.at(i) == widget)
-                dirtyWidgets.remove(i);
-            else
-                ++i;
-        }
-    }
-
-    inline void addStaticWidget(QWidget *widget)
-    {
-        if (!widget)
-            return;
-
-        Q_ASSERT(widget->testAttribute(Qt::WA_StaticContents));
-        if (!staticWidgets.contains(widget))
-            staticWidgets.append(widget);
-    }
-
-    inline void removeStaticWidget(QWidget *widget)
-    { staticWidgets.removeAll(widget); }
-
-    // Move the reparented widget and all its static children from this backing store
-    // to the new backing store if reparented into another top-level / backing store.
-    inline void moveStaticWidgets(QWidget *reparented)
-    {
-        Q_ASSERT(reparented);
-        QWidgetBackingStore *newBs = reparented->d_func()->maybeBackingStore();
-        if (newBs == this)
-            return;
-
-        int i = 0;
-        while (i < staticWidgets.size()) {
-            QWidget *w = staticWidgets.at(i);
-            if (reparented == w || reparented->isAncestorOf(w)) {
-                staticWidgets.removeAt(i);
-                if (newBs)
-                    newBs->addStaticWidget(w);
-            } else {
-                ++i;
-            }
-        }
-    }
-
-    inline QRect topLevelRect() const
-    {
-        return tlw->data->crect;
-    }
-
-    inline void appendDirtyOnScreenWidget(QWidget *widget)
-    {
-        if (!widget)
-            return;
-
-        if (!dirtyOnScreenWidgets) {
-            dirtyOnScreenWidgets = new QVector<QWidget *>;
-            dirtyOnScreenWidgets->append(widget);
-        } else if (!dirtyOnScreenWidgets->contains(widget)) {
-            dirtyOnScreenWidgets->append(widget);
-        }
-    }
-
-    inline void dirtyOnScreenWidgetsRemoveAll(QWidget *widget)
-    {
-        if (!widget || !dirtyOnScreenWidgets)
-            return;
-
-        int i = 0;
-        while (i < dirtyOnScreenWidgets->size()) {
-            if (dirtyOnScreenWidgets->at(i) == widget)
-                dirtyOnScreenWidgets->remove(i);
-            else
-                ++i;
-        }
-    }
-
-    inline void resetWidget(QWidget *widget)
-    {
-        if (widget) {
-            widget->d_func()->inDirtyList = false;
-            widget->d_func()->isScrolled = false;
-            widget->d_func()->isMoved = false;
-            widget->d_func()->dirty = QRegion();
-        }
-    }
-
-    inline void updateStaticContentsSize()
-    {
-        for (int i = 0; i < staticWidgets.size(); ++i) {
-            QWidgetPrivate *wd = staticWidgets.at(i)->d_func();
-            if (!wd->extra)
-                wd->createExtra();
-            wd->extra->staticContentsSize = wd->data.crect.size();
-        }
-    }
-
-    inline bool hasStaticContents() const
-    {
-#if defined(Q_OS_WIN)
-        return !staticWidgets.isEmpty();
-#else
-        return !staticWidgets.isEmpty() && false;
-#endif
-    }
-
-    friend QRegion qt_dirtyRegion(QWidget *);
-    friend class QWidgetPrivate;
-    friend class QWidget;
-    friend class QBackingStore;
-
-    Q_DISABLE_COPY_MOVE(QWidgetBackingStore)
-};
-
-QT_END_NAMESPACE
-
-#endif // QBACKINGSTORE_P_H
diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetrepaintmanager.cpp
index c51527f8bc..c3211e275f 100644
--- a/src/widgets/kernel/qwidgetbackingstore.cpp
+++ b/src/widgets/kernel/qwidgetrepaintmanager.cpp
@@ -40,7 +40,7 @@
 
 #include "qplatformdefs.h"
 
-#include "qwidgetbackingstore_p.h"
+#include "qwidgetrepaintmanager_p.h"
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qdebug.h>
@@ -63,459 +63,138 @@
 
 #include <qpa/qplatformbackingstore.h>
 
-#if defined(Q_OS_WIN) && !defined(QT_NO_PAINT_DEBUG)
-#  include <QtCore/qt_windows.h>
-#  include <qpa/qplatformnativeinterface.h>
-#endif
+#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
-extern QRegion qt_dirtyRegion(QWidget *);
-
 #ifndef QT_NO_OPENGL
 Q_GLOBAL_STATIC(QPlatformTextureList, qt_dummy_platformTextureList)
-#endif
 
-static bool hasPlatformWindow(QWidget *widget)
-{
-    return widget && widget->windowHandle() && widget->windowHandle()->handle();
-}
-
-/**
- * Flushes the contents of the \a backingStore into the screen area of \a widget.
- * \a region is the region to be updated in \a widget coordinates.
- */
-void QWidgetBackingStore::qt_flush(QWidget *widget, const QRegion &region, QBackingStore *backingStore,
-                                   QWidget *tlw, QPlatformTextureList *widgetTextures,
-                                   QWidgetBackingStore *widgetBackingStore)
+// Watches one or more QPlatformTextureLists for changes in the lock state and
+// triggers a backingstore sync when all the registered lists turn into
+// unlocked state. This is essential when a custom composeAndFlush()
+// implementation in a platform plugin is not synchronous and keeps
+// holding on to the textures for some time even after returning from there.
+class QPlatformTextureListWatcher : public QObject
 {
-#ifdef QT_NO_OPENGL
-    Q_UNUSED(widgetTextures);
-    Q_ASSERT(!region.isEmpty());
-#else
-    Q_ASSERT(!region.isEmpty() || widgetTextures);
-#endif
-    Q_ASSERT(widget);
-    Q_ASSERT(backingStore);
-    Q_ASSERT(tlw);
-#if !defined(QT_NO_PAINT_DEBUG)
-    static int flushUpdate = qEnvironmentVariableIntValue("QT_FLUSH_UPDATE");
-    if (flushUpdate > 0)
-        QWidgetBackingStore::showYellowThing(widget, region, flushUpdate * 10, false);
-#endif
-
-    if (tlw->testAttribute(Qt::WA_DontShowOnScreen) || widget->testAttribute(Qt::WA_DontShowOnScreen))
-        return;
-
-    // Foreign Windows do not have backing store content and must not be flushed
-    if (QWindow *widgetWindow = widget->windowHandle()) {
-        if (widgetWindow->type() == Qt::ForeignWindow)
-            return;
+    Q_OBJECT
+public:
+    QPlatformTextureListWatcher(QWidgetRepaintManager *repaintManager)
+        : m_repaintManager(repaintManager) {}
+
+    void watch(QPlatformTextureList *textureList) {
+        connect(textureList, SIGNAL(locked(bool)), SLOT(onLockStatusChanged(bool)));
+        m_locked[textureList] = textureList->isLocked();
     }
 
-    static bool fpsDebug = qEnvironmentVariableIntValue("QT_DEBUG_FPS");
-    if (fpsDebug) {
-        if (!widgetBackingStore->perfFrames++)
-            widgetBackingStore->perfTime.start();
-        if (widgetBackingStore->perfTime.elapsed() > 5000) {
-            double fps = double(widgetBackingStore->perfFrames * 1000) / widgetBackingStore->perfTime.restart();
-            qDebug("FPS: %.1f\n", fps);
-            widgetBackingStore->perfFrames = 0;
+    bool isLocked() const {
+        foreach (bool v, m_locked) {
+            if (v)
+                return true;
         }
+        return false;
     }
 
-    QPoint offset;
-    if (widget != tlw)
-        offset += widget->mapTo(tlw, QPoint());
-
-    QRegion effectiveRegion = region;
-#ifndef QT_NO_OPENGL
-    const bool compositionWasActive = widget->d_func()->renderToTextureComposeActive;
-    if (!widgetTextures) {
-        widget->d_func()->renderToTextureComposeActive = false;
-        // Detect the case of falling back to the normal flush path when no
-        // render-to-texture widgets are visible anymore. We will force one
-        // last flush to go through the OpenGL-based composition to prevent
-        // artifacts. The next flush after this one will use the normal path.
-        if (compositionWasActive)
-            widgetTextures = qt_dummy_platformTextureList;
-    } else {
-        widget->d_func()->renderToTextureComposeActive = true;
-    }
-    // When changing the composition status, make sure the dirty region covers
-    // the entire widget.  Just having e.g. the shown/hidden render-to-texture
-    // widget's area marked as dirty is incorrect when changing flush paths.
-    if (compositionWasActive != widget->d_func()->renderToTextureComposeActive)
-        effectiveRegion = widget->rect();
-
-    // re-test since we may have been forced to this path via the dummy texture list above
-    if (widgetTextures) {
-        qt_window_private(tlw->windowHandle())->compositing = true;
-        widget->window()->d_func()->sendComposeStatus(widget->window(), false);
-        // A window may have alpha even when the app did not request
-        // WA_TranslucentBackground. Therefore the compositor needs to know whether the app intends
-        // to rely on translucency, in order to decide if it should clear to transparent or opaque.
-        const bool translucentBackground = widget->testAttribute(Qt::WA_TranslucentBackground);
-        backingStore->handle()->composeAndFlush(widget->windowHandle(), effectiveRegion, offset,
-                                                widgetTextures, translucentBackground);
-        widget->window()->d_func()->sendComposeStatus(widget->window(), true);
-    } else
-#endif
-        backingStore->flush(effectiveRegion, widget->windowHandle(), offset);
-}
-
-#ifndef QT_NO_PAINT_DEBUG
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-
-static void showYellowThing_win(QWidget *widget, const QRegion &region, int msec)
-{
-    // We expect to be passed a native parent.
-    QWindow *nativeWindow = widget->windowHandle();
-    if (!nativeWindow)
-        return;
-    void *hdcV = QGuiApplication::platformNativeInterface()->nativeResourceForWindow(QByteArrayLiteral("getDC"), nativeWindow);
-    if (!hdcV)
-        return;
-    const HDC hdc = reinterpret_cast<HDC>(hdcV);
-
-    static const COLORREF colors[] = {RGB(255, 255, 0), RGB(255, 200, 55), RGB(200, 255, 55), RGB(200, 200, 0)};
-
-    static size_t i = 0;
-    const HBRUSH brush = CreateSolidBrush(colors[i]);
-    i = (i + 1) % (sizeof(colors) / sizeof(colors[0]));
-
-    for (const QRect &rect : region) {
-        RECT winRect;
-        SetRect(&winRect, rect.left(), rect.top(), rect.right(), rect.bottom());
-        FillRect(hdc, &winRect, brush);
-    }
-    DeleteObject(brush);
-    QGuiApplication::platformNativeInterface()->nativeResourceForWindow(QByteArrayLiteral("releaseDC"), nativeWindow);
-    ::Sleep(msec);
-}
-#endif //  defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-
-void QWidgetBackingStore::showYellowThing(QWidget *widget, const QRegion &toBePainted, int msec, bool unclipped)
-{
-#ifdef Q_OS_WINRT
-    Q_UNUSED(msec)
+private slots:
+     void onLockStatusChanged(bool locked) {
+        QPlatformTextureList *tl = static_cast<QPlatformTextureList *>(sender());
+        m_locked[tl] = locked;
+        if (!isLocked())
+            m_repaintManager->sync();
+     }
+
+private:
+     QHash<QPlatformTextureList *, bool> m_locked;
+     QWidgetRepaintManager *m_repaintManager;
+};
 #endif
-    QRegion paintRegion = toBePainted;
-    QRect widgetRect = widget->rect();
-
-    if (!hasPlatformWindow(widget)) {
-        QWidget *nativeParent = widget->nativeParentWidget();
-        const QPoint offset = widget->mapTo(nativeParent, QPoint(0, 0));
-        paintRegion.translate(offset);
-        widgetRect.translate(offset);
-        widget = nativeParent;
-    }
-
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-    Q_UNUSED(unclipped);
-    showYellowThing_win(widget, paintRegion, msec);
-#else
-    //flags to fool painter
-    bool paintUnclipped = widget->testAttribute(Qt::WA_PaintUnclipped);
-    if (unclipped && !widget->d_func()->paintOnScreen())
-        widget->setAttribute(Qt::WA_PaintUnclipped);
-
-    const bool setFlag = !widget->testAttribute(Qt::WA_WState_InPaintEvent);
-    if (setFlag)
-        widget->setAttribute(Qt::WA_WState_InPaintEvent);
-
-    //setup the engine
-    QPaintEngine *pe = widget->paintEngine();
-    if (pe) {
-        pe->setSystemClip(paintRegion);
-        {
-            QPainter p(widget);
-            p.setClipRegion(paintRegion);
-            static int i = 0;
-            switch (i) {
-            case 0:
-                p.fillRect(widgetRect, QColor(255,255,0));
-                break;
-            case 1:
-                p.fillRect(widgetRect, QColor(255,200,55));
-                break;
-            case 2:
-                p.fillRect(widgetRect, QColor(200,255,55));
-                break;
-            case 3:
-                p.fillRect(widgetRect, QColor(200,200,0));
-                break;
-            }
-            i = (i+1) & 3;
-            p.end();
-        }
-    }
 
-    if (setFlag)
-        widget->setAttribute(Qt::WA_WState_InPaintEvent, false);
-
-    //restore
-    widget->setAttribute(Qt::WA_PaintUnclipped, paintUnclipped);
-
-    if (pe)
-        pe->setSystemClip(QRegion());
-
-#if defined(Q_OS_UNIX)
-    ::usleep(1000 * msec);
-#endif
-#endif // !Q_OS_WIN
-}
+// ---------------------------------------------------------------------------
 
-bool QWidgetBackingStore::flushPaint(QWidget *widget, const QRegion &rgn)
+QWidgetRepaintManager::QWidgetRepaintManager(QWidget *topLevel)
+    : tlw(topLevel), store(tlw->backingStore())
 {
-    if (!widget)
-        return false;
-
-    int delay = 0;
-    if (widget->testAttribute(Qt::WA_WState_InPaintEvent)) {
-        static int flushPaintEvent = qEnvironmentVariableIntValue("QT_FLUSH_PAINT_EVENT");
-        if (!flushPaintEvent)
-            return false;
-        delay = flushPaintEvent;
-    } else {
-        static int flushPaint = qEnvironmentVariableIntValue("QT_FLUSH_PAINT");
-        if (!flushPaint)
-            return false;
-        delay = flushPaint;
-    }
+    Q_ASSERT(store);
 
-    QWidgetBackingStore::showYellowThing(widget, rgn, delay * 10, true);
-    return true;
+    // Ensure all existing subsurfaces and static widgets are added to their respective lists.
+    updateLists(topLevel);
 }
 
-void QWidgetBackingStore::unflushPaint(QWidget *widget, const QRegion &rgn)
+void QWidgetRepaintManager::updateLists(QWidget *cur)
 {
-    if (widget->d_func()->paintOnScreen() || rgn.isEmpty())
-        return;
-
-    QWidget *tlw = widget->window();
-    QTLWExtra *tlwExtra = tlw->d_func()->maybeTopData();
-    if (!tlwExtra)
+    if (!cur)
         return;
 
-    qt_flush(widget, rgn, tlwExtra->backingStoreTracker->store, tlw, 0, tlw->d_func()->maybeBackingStore());
-}
-#endif // QT_NO_PAINT_DEBUG
-
-/*
-    Moves the whole rect by (dx, dy) in widget's coordinate system.
-    Doesn't generate any updates.
-*/
-bool QWidgetBackingStore::bltRect(const QRect &rect, int dx, int dy, QWidget *widget)
-{
-    const QPoint pos(widget->mapTo(tlw, rect.topLeft()));
-    const QRect tlwRect(QRect(pos, rect.size()));
-    if (dirty.intersects(tlwRect))
-        return false; // We don't want to scroll junk.
-    return store->scroll(tlwRect, dx, dy);
-}
-
-void QWidgetBackingStore::releaseBuffer()
-{
-    if (store)
-        store->resize(QSize());
-}
-
-/*!
-    Prepares the window surface to paint a\ toClean region of the \a widget and
-    updates the BeginPaintInfo struct accordingly.
-
-    The \a toClean region might be clipped by the window surface.
-*/
-void QWidgetBackingStore::beginPaint(QRegion &toClean, QWidget *widget, QBackingStore *backingStore,
-                                     BeginPaintInfo *returnInfo, bool toCleanIsInTopLevelCoordinates)
-{
-    Q_UNUSED(widget);
-    Q_UNUSED(toCleanIsInTopLevelCoordinates);
-
-    // Always flush repainted areas.
-    dirtyOnScreen += toClean;
-
-#ifdef QT_NO_PAINT_DEBUG
-    backingStore->beginPaint(toClean);
-#else
-    returnInfo->wasFlushed = QWidgetBackingStore::flushPaint(tlw, toClean);
-    // Avoid deadlock with QT_FLUSH_PAINT: the server will wait for
-    // the BackingStore lock, so if we hold that, the server will
-    // never release the Communication lock that we are waiting for in
-    // sendSynchronousCommand
-    if (!returnInfo->wasFlushed)
-        backingStore->beginPaint(toClean);
-#endif
-
-    Q_UNUSED(returnInfo);
-}
+    QList<QObject*> children = cur->children();
+    for (int i = 0; i < children.size(); ++i) {
+        QWidget *child = qobject_cast<QWidget*>(children.at(i));
+        if (!child || child->isWindow())
+            continue;
 
-void QWidgetBackingStore::endPaint(const QRegion &cleaned, QBackingStore *backingStore,
-        BeginPaintInfo *beginPaintInfo)
-{
-#ifndef QT_NO_PAINT_DEBUG
-    if (!beginPaintInfo->wasFlushed)
-        backingStore->endPaint();
-    else
-        QWidgetBackingStore::unflushPaint(tlw, cleaned);
-#else
-    Q_UNUSED(beginPaintInfo);
-    Q_UNUSED(cleaned);
-    backingStore->endPaint();
-#endif
+        updateLists(child);
+    }
 
-    flush();
+    if (cur->testAttribute(Qt::WA_StaticContents))
+        addStaticWidget(cur);
 }
 
-/*!
-    Returns the region (in top-level coordinates) that needs repaint and/or flush.
-
-    If the widget is non-zero, only the dirty region for the widget is returned
-    and the region will be in widget coordinates.
-*/
-QRegion QWidgetBackingStore::dirtyRegion(QWidget *widget) const
+QWidgetRepaintManager::~QWidgetRepaintManager()
 {
-    const bool widgetDirty = widget && widget != tlw;
-    const QRect tlwRect(topLevelRect());
-    const QRect surfaceGeometry(tlwRect.topLeft(), store->size());
-    if (surfaceGeometry != tlwRect && surfaceGeometry.size() != tlwRect.size()) {
-        if (widgetDirty) {
-            const QRect dirtyTlwRect = QRect(QPoint(), tlwRect.size());
-            const QPoint offset(widget->mapTo(tlw, QPoint()));
-            const QRect dirtyWidgetRect(dirtyTlwRect & widget->rect().translated(offset));
-            return dirtyWidgetRect.translated(-offset);
-        }
-        return QRect(QPoint(), tlwRect.size());
-    }
-
-    // Calculate the region that needs repaint.
-    QRegion r(dirty);
-    for (int i = 0; i < dirtyWidgets.size(); ++i) {
-        QWidget *w = dirtyWidgets.at(i);
-        if (widgetDirty && w != widget && !widget->isAncestorOf(w))
-            continue;
-        r += w->d_func()->dirty.translated(w->mapTo(tlw, QPoint()));
-    }
-
-    // Append the region that needs flush.
-    r += dirtyOnScreen;
-
-    if (dirtyOnScreenWidgets) { // Only in use with native child widgets.
-        for (int i = 0; i < dirtyOnScreenWidgets->size(); ++i) {
-            QWidget *w = dirtyOnScreenWidgets->at(i);
-            if (widgetDirty && w != widget && !widget->isAncestorOf(w))
-                continue;
-            QWidgetPrivate *wd = w->d_func();
-            Q_ASSERT(wd->needsFlush);
-            r += wd->needsFlush->translated(w->mapTo(tlw, QPoint()));
-        }
-    }
-
-    if (widgetDirty) {
-        // Intersect with the widget geometry and translate to its coordinates.
-        const QPoint offset(widget->mapTo(tlw, QPoint()));
-        r &= widget->rect().translated(offset);
-        r.translate(-offset);
-    }
-    return r;
+    for (int c = 0; c < dirtyWidgets.size(); ++c)
+        resetWidget(dirtyWidgets.at(c));
+    for (int c = 0; c < dirtyRenderToTextureWidgets.size(); ++c)
+        resetWidget(dirtyRenderToTextureWidgets.at(c));
 }
 
 /*!
-    Returns the static content inside the \a parent if non-zero; otherwise the static content
-    for the entire backing store is returned. The content will be clipped to \a withinClipRect
-    if non-empty.
+    \internal
+    Invalidates the \a r (in widget's coordinates) of the backing store, i.e.
+    all widgets intersecting with the region will be repainted when the backing
+    store is synced.
 */
-QRegion QWidgetBackingStore::staticContents(QWidget *parent, const QRect &withinClipRect) const
+template <class T>
+void QWidgetPrivate::invalidateBackingStore(const T &r)
 {
-    if (!parent && tlw->testAttribute(Qt::WA_StaticContents)) {
-        const QSize surfaceGeometry(store->size());
-        QRect surfaceRect(0, 0, surfaceGeometry.width(), surfaceGeometry.height());
-        if (!withinClipRect.isEmpty())
-            surfaceRect &= withinClipRect;
-        return QRegion(surfaceRect);
-    }
-
-    QRegion region;
-    if (parent && parent->d_func()->children.isEmpty())
-        return region;
-
-    const bool clipToRect = !withinClipRect.isEmpty();
-    const int count = staticWidgets.count();
-    for (int i = 0; i < count; ++i) {
-        QWidget *w = staticWidgets.at(i);
-        QWidgetPrivate *wd = w->d_func();
-        if (!wd->isOpaque || !wd->extra || wd->extra->staticContentsSize.isEmpty()
-            || !w->isVisible() || (parent && !parent->isAncestorOf(w))) {
-            continue;
-        }
-
-        QRect rect(0, 0, wd->extra->staticContentsSize.width(), wd->extra->staticContentsSize.height());
-        const QPoint offset = w->mapTo(parent ? parent : tlw, QPoint());
-        if (clipToRect)
-            rect &= withinClipRect.translated(-offset);
-        if (rect.isEmpty())
-            continue;
-
-        rect &= wd->clipRect();
-        if (rect.isEmpty())
-            continue;
+    if (r.isEmpty())
+        return;
 
-        QRegion visible(rect);
-        wd->clipToEffectiveMask(visible);
-        if (visible.isEmpty())
-            continue;
-        wd->subtractOpaqueSiblings(visible, 0, /*alsoNonOpaque=*/true);
+    if (QCoreApplication::closingDown())
+        return;
 
-        visible.translate(offset);
-        region += visible;
-    }
+    Q_Q(QWidget);
+    if (!q->isVisible() || !q->updatesEnabled())
+        return;
 
-    return region;
-}
+    QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
+    if (!tlwExtra || tlwExtra->inTopLevelResize || !tlwExtra->backingStore)
+        return;
 
-void QWidgetBackingStore::sendUpdateRequest(QWidget *widget, UpdateTime updateTime)
-{
-    if (!widget)
+    T clipped(r);
+    clipped &= clipRect();
+    if (clipped.isEmpty())
         return;
 
-#ifndef QT_NO_OPENGL
-    // Having every repaint() leading to a sync/flush is bad as it causes
-    // compositing and waiting for vsync each and every time. Change to
-    // UpdateLater, except for approx. once per frame to prevent starvation in
-    // case the control does not get back to the event loop.
-    QWidget *w = widget->window();
-    if (updateTime == UpdateNow && w && w->windowHandle() && QWindowPrivate::get(w->windowHandle())->compositing) {
-        int refresh = 60;
-        QScreen *ws = w->windowHandle()->screen();
-        if (ws)
-            refresh = ws->refreshRate();
-        QWindowPrivate *wd = QWindowPrivate::get(w->windowHandle());
-        if (wd->lastComposeTime.isValid()) {
-            const qint64 elapsed = wd->lastComposeTime.elapsed();
-            if (elapsed <= qint64(1000.0f / refresh))
-                updateTime = UpdateLater;
-       }
-    }
-#endif
+    if (!graphicsEffect && extra && extra->hasMask) {
+        QRegion masked(extra->mask);
+        masked &= clipped;
+        if (masked.isEmpty())
+            return;
 
-    switch (updateTime) {
-    case UpdateLater:
-        updateRequestSent = true;
-        QApplication::postEvent(widget, new QEvent(QEvent::UpdateRequest), Qt::LowEventPriority);
-        break;
-    case UpdateNow: {
-        QEvent event(QEvent::UpdateRequest);
-        QApplication::sendEvent(widget, &event);
-        break;
-        }
+        tlwExtra->repaintManager->markDirty(masked, q,
+            QWidgetRepaintManager::UpdateLater, QWidgetRepaintManager::BufferInvalid);
+    } else {
+        tlwExtra->repaintManager->markDirty(clipped, q,
+            QWidgetRepaintManager::UpdateLater, QWidgetRepaintManager::BufferInvalid);
     }
 }
+// Needed by tst_QWidget
+template Q_AUTOTEST_EXPORT void QWidgetPrivate::invalidateBackingStore<QRect>(const QRect &r);
 
 static inline QRect widgetRectFor(QWidget *, const QRect &r) { return r; }
 static inline QRect widgetRectFor(QWidget *widget, const QRegion &) { return widget->rect(); }
 
 /*!
+    \internal
     Marks the region of the widget as dirty (if not already marked as dirty) and
     posts an UpdateRequest event to the top-level widget (if not already posted).
 
@@ -527,8 +206,11 @@ static inline QRect widgetRectFor(QWidget *widget, const QRegion &) { return wid
     instead of the top-level widget, and bufferState is completely ignored.
 */
 template <class T>
-void QWidgetBackingStore::markDirty(const T &r, QWidget *widget, UpdateTime updateTime, BufferState bufferState)
+void QWidgetRepaintManager::markDirty(const T &r, QWidget *widget, UpdateTime updateTime, BufferState bufferState)
 {
+    qCInfo(lcWidgetPainting) << "Marking" << r << "of" << widget << "dirty"
+        << "with" << updateTime;
+
     Q_ASSERT(tlw->d_func()->extra);
     Q_ASSERT(tlw->d_func()->extra->topextra);
     Q_ASSERT(!tlw->d_func()->extra->topextra->inTopLevelResize);
@@ -544,7 +226,7 @@ void QWidgetBackingStore::markDirty(const T &r, QWidget *widget, UpdateTime upda
 
     // ---------------------------------------------------------------------------
 
-    if (widget->d_func()->paintOnScreen()) {
+    if (widget->d_func()->shouldPaintOnScreen()) {
         if (widget->d_func()->dirty.isEmpty()) {
             widget->d_func()->dirty = r;
             sendUpdateRequest(widget, updateTime);
@@ -631,70 +313,35 @@ void QWidgetBackingStore::markDirty(const T &r, QWidget *widget, UpdateTime upda
     if (updateTime == UpdateNow)
         sendUpdateRequest(tlw, updateTime);
 }
-template void QWidgetBackingStore::markDirty<QRect>(const QRect &, QWidget *, UpdateTime, BufferState);
-template void QWidgetBackingStore::markDirty<QRegion>(const QRegion &, QWidget *, UpdateTime, BufferState);
+template void QWidgetRepaintManager::markDirty<QRect>(const QRect &, QWidget *, UpdateTime, BufferState);
+template void QWidgetRepaintManager::markDirty<QRegion>(const QRegion &, QWidget *, UpdateTime, BufferState);
 
-/*!
-    Marks the \a region of the \a widget as dirty on screen. The \a region will be copied from
-    the backing store to the \a widget's native parent next time flush() is called.
-
-    Paint on screen widgets are ignored.
-*/
-void QWidgetBackingStore::markDirtyOnScreen(const QRegion &region, QWidget *widget, const QPoint &topLevelOffset)
+void QWidgetRepaintManager::addDirtyWidget(QWidget *widget, const QRegion &rgn)
 {
-    if (!widget || widget->d_func()->paintOnScreen() || region.isEmpty())
-        return;
-
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    if (!widget->testAttribute(Qt::WA_WState_InPaintEvent))
-        dirtyOnScreen += region.translated(topLevelOffset);
-    return;
-#endif
-
-    // Top-level.
-    if (widget == tlw) {
-        if (!widget->testAttribute(Qt::WA_WState_InPaintEvent))
-            dirtyOnScreen += region;
-        return;
-    }
-
-    // Alien widgets.
-    if (!hasPlatformWindow(widget) && !widget->isWindow()) {
-        QWidget *nativeParent = widget->nativeParentWidget();        // Alien widgets with the top-level as the native parent (common case).
-        if (nativeParent == tlw) {
-            if (!widget->testAttribute(Qt::WA_WState_InPaintEvent))
-                dirtyOnScreen += region.translated(topLevelOffset);
-            return;
-        }
-
-        // Alien widgets with native parent != tlw.
-        QWidgetPrivate *nativeParentPrivate = nativeParent->d_func();
-        if (!nativeParentPrivate->needsFlush)
-            nativeParentPrivate->needsFlush = new QRegion;
-        const QPoint nativeParentOffset = widget->mapTo(nativeParent, QPoint());
-        *nativeParentPrivate->needsFlush += region.translated(nativeParentOffset);
-        appendDirtyOnScreenWidget(nativeParent);
-        return;
+    if (widget && !widget->d_func()->inDirtyList && !widget->data->in_destructor) {
+        QWidgetPrivate *widgetPrivate = widget->d_func();
+#if QT_CONFIG(graphicseffect)
+        if (widgetPrivate->graphicsEffect)
+            widgetPrivate->dirty = widgetPrivate->effectiveRectFor(rgn.boundingRect());
+        else
+#endif // QT_CONFIG(graphicseffect)
+            widgetPrivate->dirty = rgn;
+        dirtyWidgets.append(widget);
+        widgetPrivate->inDirtyList = true;
     }
-
-    // Native child widgets.
-    QWidgetPrivate *widgetPrivate = widget->d_func();
-    if (!widgetPrivate->needsFlush)
-        widgetPrivate->needsFlush = new QRegion;
-    *widgetPrivate->needsFlush += region;
-    appendDirtyOnScreenWidget(widget);
 }
 
-void QWidgetBackingStore::removeDirtyWidget(QWidget *w)
+void QWidgetRepaintManager::removeDirtyWidget(QWidget *w)
 {
     if (!w)
         return;
 
-    dirtyWidgetsRemoveAll(w);
-    dirtyOnScreenWidgetsRemoveAll(w);
+    dirtyWidgets.removeAll(w);
     dirtyRenderToTextureWidgets.removeAll(w);
     resetWidget(w);
 
+    needsFlushWidgets.removeAll(w);
+
     QWidgetPrivate *wd = w->d_func();
     const int n = wd->children.count();
     for (int i = 0; i < n; ++i) {
@@ -703,46 +350,71 @@ void QWidgetBackingStore::removeDirtyWidget(QWidget *w)
     }
 }
 
-void QWidgetBackingStore::updateLists(QWidget *cur)
+void QWidgetRepaintManager::resetWidget(QWidget *widget)
 {
-    if (!cur)
-        return;
-
-    QList<QObject*> children = cur->children();
-    for (int i = 0; i < children.size(); ++i) {
-        QWidget *child = qobject_cast<QWidget*>(children.at(i));
-        if (!child || child->isWindow())
-            continue;
-
-        updateLists(child);
+    if (widget) {
+        widget->d_func()->inDirtyList = false;
+        widget->d_func()->isScrolled = false;
+        widget->d_func()->isMoved = false;
+        widget->d_func()->dirty = QRegion();
     }
+}
 
-    if (cur->testAttribute(Qt::WA_StaticContents))
-        addStaticWidget(cur);
+void QWidgetRepaintManager::addDirtyRenderToTextureWidget(QWidget *widget)
+{
+    if (widget && !widget->d_func()->inDirtyList && !widget->data->in_destructor) {
+        QWidgetPrivate *widgetPrivate = widget->d_func();
+        Q_ASSERT(widgetPrivate->renderToTexture);
+        dirtyRenderToTextureWidgets.append(widget);
+        widgetPrivate->inDirtyList = true;
+    }
 }
 
-QWidgetBackingStore::QWidgetBackingStore(QWidget *topLevel)
-    : tlw(topLevel),
-      dirtyOnScreenWidgets(0),
-      updateRequestSent(0),
-      textureListWatcher(0),
-      perfFrames(0)
+void QWidgetRepaintManager::sendUpdateRequest(QWidget *widget, UpdateTime updateTime)
 {
-    store = tlw->backingStore();
-    Q_ASSERT(store);
+    if (!widget)
+        return;
 
-    // Ensure all existing subsurfaces and static widgets are added to their respective lists.
-    updateLists(topLevel);
+    qCInfo(lcWidgetPainting) << "Sending update request to" << widget << "with" << updateTime;
+
+#ifndef QT_NO_OPENGL
+    // Having every repaint() leading to a sync/flush is bad as it causes
+    // compositing and waiting for vsync each and every time. Change to
+    // UpdateLater, except for approx. once per frame to prevent starvation in
+    // case the control does not get back to the event loop.
+    QWidget *w = widget->window();
+    if (updateTime == UpdateNow && w && w->windowHandle() && QWindowPrivate::get(w->windowHandle())->compositing) {
+        int refresh = 60;
+        QScreen *ws = w->windowHandle()->screen();
+        if (ws)
+            refresh = ws->refreshRate();
+        QWindowPrivate *wd = QWindowPrivate::get(w->windowHandle());
+        if (wd->lastComposeTime.isValid()) {
+            const qint64 elapsed = wd->lastComposeTime.elapsed();
+            if (elapsed <= qint64(1000.0f / refresh))
+                updateTime = UpdateLater;
+       }
+    }
+#endif
+
+    switch (updateTime) {
+    case UpdateLater:
+        updateRequestSent = true;
+        QCoreApplication::postEvent(widget, new QEvent(QEvent::UpdateRequest), Qt::LowEventPriority);
+        break;
+    case UpdateNow: {
+        QEvent event(QEvent::UpdateRequest);
+        QCoreApplication::sendEvent(widget, &event);
+        break;
+        }
+    }
 }
 
-QWidgetBackingStore::~QWidgetBackingStore()
-{
-    for (int c = 0; c < dirtyWidgets.size(); ++c)
-        resetWidget(dirtyWidgets.at(c));
-    for (int c = 0; c < dirtyRenderToTextureWidgets.size(); ++c)
-        resetWidget(dirtyRenderToTextureWidgets.at(c));
+// ---------------------------------------------------------------------------
 
-    delete dirtyOnScreenWidgets;
+static bool hasPlatformWindow(QWidget *widget)
+{
+    return widget && widget->windowHandle() && widget->windowHandle()->handle();
 }
 
 static QVector<QRect> getSortedRectsToScroll(const QRegion &region, int dx, int dy)
@@ -810,7 +482,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
         invalidateBackingStore((newRect & clipR).translated(-data.crect.topLeft()));
     } else {
 
-        QWidgetBackingStore *wbs = x->backingStoreTracker.data();
+        QWidgetRepaintManager *repaintManager = x->repaintManager.get();
         QRegion childExpose(newRect & clipR);
         QRegion overlappedExpose;
 
@@ -822,7 +494,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
                 const QVector<QRect> rectsToScroll
                         = getSortedRectsToScroll(QRegion(sourceRect) - overlappedExpose, dx, dy);
                 for (QRect rect : rectsToScroll) {
-                    if (wbs->bltRect(rect, dx, dy, pw)) {
+                    if (repaintManager->bltRect(rect, dx, dy, pw)) {
                         childExpose -= rect.translated(dx, dy);
                     }
                 }
@@ -842,7 +514,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
             }
             if (!childExpose.isEmpty()) {
                 childExpose.translate(-data.crect.topLeft());
-                wbs->markDirty(childExpose, q);
+                repaintManager->markDirty(childExpose, q);
                 isMoved = true;
             }
         }
@@ -853,14 +525,14 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
             parentExpose += QRegion(newRect) - extra->mask.translated(data.crect.topLeft());
 
         if (!parentExpose.isEmpty()) {
-            wbs->markDirty(parentExpose, pw);
+            repaintManager->markDirty(parentExpose, pw);
             pd->isMoved = true;
         }
 
         if (childUpdatesEnabled) {
             QRegion needsFlush(sourceRect);
             needsFlush += destRect;
-            wbs->markDirtyOnScreen(needsFlush, pw, toplevelOffset);
+            repaintManager->markNeedsFlush(pw, needsFlush, toplevelOffset);
         }
     }
 }
@@ -874,8 +546,8 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
     if (x->inTopLevelResize)
         return;
 
-    QWidgetBackingStore *wbs = x->backingStoreTracker.data();
-    if (!wbs)
+    QWidgetRepaintManager *repaintManager = x->repaintManager.get();
+    if (!repaintManager)
         return;
 
     static const bool accelEnv = qEnvironmentVariableIntValue("QT_NO_FAST_SCROLL") == 0;
@@ -906,7 +578,7 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
             const QVector<QRect> rectsToScroll
                     = getSortedRectsToScroll(QRegion(sourceRect) - overlappedExpose, dx, dy);
             for (const QRect &rect : rectsToScroll) {
-                if (wbs->bltRect(rect, dx, dy, q)) {
+                if (repaintManager->bltRect(rect, dx, dy, q)) {
                     childExpose -= rect.translated(dx, dy);
                 }
             }
@@ -933,17 +605,32 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
         if (!overlappedExpose.isEmpty())
             invalidateBackingStore(overlappedExpose);
         if (!childExpose.isEmpty()) {
-            wbs->markDirty(childExpose, q);
+            repaintManager->markDirty(childExpose, q);
             isScrolled = true;
         }
 
         // Instead of using native scroll-on-screen, we copy from
         // backingstore, giving only one screen update for each
         // scroll, and a solid appearance
-        wbs->markDirtyOnScreen(destRect, q, toplevelOffset);
+        repaintManager->markNeedsFlush(q, destRect, toplevelOffset);
     }
 }
 
+/*
+    Moves the whole rect by (dx, dy) in widget's coordinate system.
+    Doesn't generate any updates.
+*/
+bool QWidgetRepaintManager::bltRect(const QRect &rect, int dx, int dy, QWidget *widget)
+{
+    const QPoint pos(widget->mapTo(tlw, rect.topLeft()));
+    const QRect tlwRect(QRect(pos, rect.size()));
+    if (dirty.intersects(tlwRect))
+        return false; // We don't want to scroll junk.
+    return store->scroll(tlwRect, dx, dy);
+}
+
+// ---------------------------------------------------------------------------
+
 #ifndef QT_NO_OPENGL
 static void findTextureWidgetsRecursively(QWidget *tlw, QWidget *widget, QPlatformTextureList *widgetTextures, QVector<QWidget *> *nativeChildren)
 {
@@ -969,15 +656,15 @@ static void findAllTextureWidgetsRecursively(QWidget *tlw, QWidget *widget)
     // textureChildSeen does not take native child widgets into account and that's good.
     if (QWidgetPrivate::get(widget)->textureChildSeen) {
         QVector<QWidget *> nativeChildren;
-        QScopedPointer<QPlatformTextureList> tl(new QPlatformTextureList);
+        auto tl = qt_make_unique<QPlatformTextureList>();
         // Look for texture widgets (incl. widget itself) from 'widget' down,
         // but skip subtrees with a parent of a native child widget.
-        findTextureWidgetsRecursively(tlw, widget, tl.data(), &nativeChildren);
+        findTextureWidgetsRecursively(tlw, widget, tl.get(), &nativeChildren);
         // tl may be empty regardless of textureChildSeen if we have native or hidden children.
         if (!tl->isEmpty())
-            QWidgetPrivate::get(tlw)->topData()->widgetTextures.append(tl.take());
+            QWidgetPrivate::get(tlw)->topData()->widgetTextures.push_back(std::move(tl));
         // Native child widgets, if there was any, get their own separate QPlatformTextureList.
-        foreach (QWidget *ncw, nativeChildren) {
+        for (QWidget *ncw : qAsConst(nativeChildren)) {
             if (QWidgetPrivate::get(ncw)->textureChildSeen)
                 findAllTextureWidgetsRecursively(tlw, ncw);
         }
@@ -986,12 +673,12 @@ static void findAllTextureWidgetsRecursively(QWidget *tlw, QWidget *widget)
 
 static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget)
 {
-    foreach (QPlatformTextureList *tl, QWidgetPrivate::get(tlw)->topData()->widgetTextures) {
+    for (const auto &tl : QWidgetPrivate::get(tlw)->topData()->widgetTextures) {
         Q_ASSERT(!tl->isEmpty());
         for (int i = 0; i < tl->count(); ++i) {
             QWidget *w = static_cast<QWidget *>(tl->source(i));
             if ((hasPlatformWindow(w) && w == widget) || (!hasPlatformWindow(w) && w->nativeParentWidget() == widget))
-                return tl;
+                return tl.get();
         }
     }
 
@@ -1011,39 +698,6 @@ static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget)
     return 0;
 }
 
-// Watches one or more QPlatformTextureLists for changes in the lock state and
-// triggers a backingstore sync when all the registered lists turn into
-// unlocked state. This is essential when a custom composeAndFlush()
-// implementation in a platform plugin is not synchronous and keeps
-// holding on to the textures for some time even after returning from there.
-QPlatformTextureListWatcher::QPlatformTextureListWatcher(QWidgetBackingStore *backingStore)
-    : m_backingStore(backingStore)
-{
-}
-
-void QPlatformTextureListWatcher::watch(QPlatformTextureList *textureList)
-{
-    connect(textureList, SIGNAL(locked(bool)), SLOT(onLockStatusChanged(bool)));
-    m_locked[textureList] = textureList->isLocked();
-}
-
-bool QPlatformTextureListWatcher::isLocked() const
-{
-    foreach (bool v, m_locked) {
-        if (v)
-            return true;
-    }
-    return false;
-}
-
-void QPlatformTextureListWatcher::onLockStatusChanged(bool locked)
-{
-    QPlatformTextureList *tl = static_cast<QPlatformTextureList *>(sender());
-    m_locked[tl] = locked;
-    if (!isLocked())
-        m_backingStore->sync();
-}
-
 #else
 
 static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget)
@@ -1055,48 +709,19 @@ static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget)
 
 #endif // QT_NO_OPENGL
 
-static inline bool discardSyncRequest(QWidget *tlw, QTLWExtra *tlwExtra)
-{
-    if (!tlw || !tlwExtra || !tlw->testAttribute(Qt::WA_Mapped) || !tlw->isVisible())
-        return true;
-
-    return false;
-}
-
-bool QWidgetBackingStore::syncAllowed()
-{
-#ifndef QT_NO_OPENGL
-    QTLWExtra *tlwExtra = tlw->d_func()->maybeTopData();
-    if (textureListWatcher && !textureListWatcher->isLocked()) {
-        textureListWatcher->deleteLater();
-        textureListWatcher = 0;
-    } else if (!tlwExtra->widgetTextures.isEmpty()) {
-        bool skipSync = false;
-        foreach (QPlatformTextureList *tl, tlwExtra->widgetTextures) {
-            if (tl->isLocked()) {
-                if (!textureListWatcher)
-                    textureListWatcher = new QPlatformTextureListWatcher(this);
-                if (!textureListWatcher->isLocked())
-                    textureListWatcher->watch(tl);
-                skipSync = true;
-            }
-        }
-        if (skipSync)  // cannot compose due to widget textures being in use
-            return false;
-    }
-#endif
-    return true;
-}
+// ---------------------------------------------------------------------------
 
 /*!
     Synchronizes the \a exposedRegion of the \a exposedWidget with the backing store.
 
-    If there's nothing to repaint, the area is flushed and painting does not occur;
-    otherwise the area is marked as dirty on screen and will be flushed right after
-    we are done with all painting.
+    If there are dirty widgets, including but not limited to the \a exposedWidget,
+    these will be repainted first. The backingstore is then flushed to the screen,
+    regardless of whether or not there were any repaints.
 */
-void QWidgetBackingStore::sync(QWidget *exposedWidget, const QRegion &exposedRegion)
+void QWidgetRepaintManager::sync(QWidget *exposedWidget, const QRegion &exposedRegion)
 {
+    qCInfo(lcWidgetPainting) << "Syncing" << exposedRegion << "of" << exposedWidget;
+
     QTLWExtra *tlwExtra = tlw->d_func()->maybeTopData();
     if (!tlw->isVisible() || !tlwExtra || tlwExtra->inTopLevelResize)
         return;
@@ -1109,28 +734,30 @@ void QWidgetBackingStore::sync(QWidget *exposedWidget, const QRegion &exposedReg
 
     // Nothing to repaint.
     if (!isDirty() && store->size().isValid()) {
-        QPlatformTextureList *tl = widgetTexturesFor(tlw, exposedWidget);
-        qt_flush(exposedWidget, tl ? QRegion() : exposedRegion, store, tlw, tl, this);
+        QPlatformTextureList *widgetTextures = widgetTexturesFor(tlw, exposedWidget);
+        flush(exposedWidget, widgetTextures ? QRegion() : exposedRegion, widgetTextures);
         return;
     }
 
-    if (exposedWidget != tlw)
-        markDirtyOnScreen(exposedRegion, exposedWidget, exposedWidget->mapTo(tlw, QPoint()));
-    else
-        markDirtyOnScreen(exposedRegion, exposedWidget, QPoint());
+    // As requests to sync a specific widget typically comes from an expose event
+    // we can't rely solely on our own dirty tracking to decide what to flush, and
+    // need to respect the platform's request to at least flush the entire widget,
+    QPoint offset = exposedWidget != tlw ? exposedWidget->mapTo(tlw, QPoint()) : QPoint();
+    markNeedsFlush(exposedWidget, exposedRegion, offset);
 
     if (syncAllowed())
-        doSync();
+        paintAndFlush();
 }
 
 /*!
     Synchronizes the backing store, i.e. dirty areas are repainted and flushed.
 */
-void QWidgetBackingStore::sync()
+void QWidgetRepaintManager::sync()
 {
+    qCInfo(lcWidgetPainting) << "Syncing dirty widgets";
+
     updateRequestSent = false;
-    QTLWExtra *tlwExtra = tlw->d_func()->maybeTopData();
-    if (discardSyncRequest(tlw, tlwExtra)) {
+    if (qt_widget_private(tlw)->shouldDiscardSyncRequest()) {
         // If the top-level is minimized, it's not visible on the screen so we can delay the
         // update until it's shown again. In order to do that we must keep the dirty states.
         // These will be cleared when we receive the first expose after showNormal().
@@ -1146,16 +773,50 @@ void QWidgetBackingStore::sync()
     }
 
     if (syncAllowed())
-        doSync();
+        paintAndFlush();
 }
 
-void QWidgetBackingStore::doSync()
+bool QWidgetPrivate::shouldDiscardSyncRequest() const
 {
+    Q_Q(const QWidget);
+    return !maybeTopData() || !q->testAttribute(Qt::WA_Mapped) || !q->isVisible();
+}
+
+bool QWidgetRepaintManager::syncAllowed()
+{
+#ifndef QT_NO_OPENGL
+    QTLWExtra *tlwExtra = tlw->d_func()->maybeTopData();
+    if (textureListWatcher && !textureListWatcher->isLocked()) {
+        textureListWatcher->deleteLater();
+        textureListWatcher = 0;
+    } else if (!tlwExtra->widgetTextures.empty()) {
+        bool skipSync = false;
+        for (const auto &tl : tlwExtra->widgetTextures) {
+            if (tl->isLocked()) {
+                if (!textureListWatcher)
+                    textureListWatcher = new QPlatformTextureListWatcher(this);
+                if (!textureListWatcher->isLocked())
+                    textureListWatcher->watch(tl.get());
+                skipSync = true;
+            }
+        }
+        if (skipSync)  // cannot compose due to widget textures being in use
+            return false;
+    }
+#endif
+    return true;
+}
+
+void QWidgetRepaintManager::paintAndFlush()
+{
+    qCInfo(lcWidgetPainting) << "Painting and flushing dirty"
+        << "top level" << dirty << "and dirty widgets" << dirtyWidgets;
+
     const bool updatesDisabled = !tlw->updatesEnabled();
     bool repaintAllWidgets = false;
 
     const bool inTopLevelResize = tlw->d_func()->maybeTopData()->inTopLevelResize;
-    const QRect tlwRect(topLevelRect());
+    const QRect tlwRect = tlw->data->crect;
     const QRect surfaceGeometry(tlwRect.topLeft(), store->size());
     if ((inTopLevelResize || surfaceGeometry.size() != tlwRect.size()) && !updatesDisabled) {
         if (hasStaticContents() && !store->size().isEmpty() ) {
@@ -1249,10 +910,9 @@ void QWidgetBackingStore::doSync()
     // The search is cut at native widget boundaries, meaning that each native child widget
     // has its own list for the subtree below it.
     QTLWExtra *tlwExtra = tlw->d_func()->topData();
-    qDeleteAll(tlwExtra->widgetTextures);
     tlwExtra->widgetTextures.clear();
     findAllTextureWidgetsRecursively(tlw, tlw);
-    qt_window_private(tlw->windowHandle())->compositing = false; // will get updated in qt_flush()
+    qt_window_private(tlw->windowHandle())->compositing = false; // will get updated in flush()
 #endif
 
     if (toClean.isEmpty()) {
@@ -1278,10 +938,7 @@ void QWidgetBackingStore::doSync()
                 if (hasPlatformWindow(w) || (npw && npw != tlw)) {
                     if (!hasPlatformWindow(w))
                         w = npw;
-                    QWidgetPrivate *wPrivate = w->d_func();
-                    if (!wPrivate->needsFlush)
-                        wPrivate->needsFlush = new QRegion;
-                    appendDirtyOnScreenWidget(w);
+                    markNeedsFlush(w);
                 }
             }
         }
@@ -1295,7 +952,7 @@ void QWidgetBackingStore::doSync()
     }
 
 #ifndef QT_NO_OPENGL
-    foreach (QPlatformTextureList *tl, tlwExtra->widgetTextures) {
+    for (const auto &tl : tlwExtra->widgetTextures) {
         for (int i = 0; i < tl->count(); ++i) {
             QWidget *w = static_cast<QWidget *>(tl->source(i));
             if (dirtyRenderToTextureWidgets.contains(w)) {
@@ -1324,15 +981,7 @@ void QWidgetBackingStore::doSync()
     }
 #endif
 
-    BeginPaintInfo beginPaintInfo;
-    beginPaint(toClean, tlw, store, &beginPaintInfo);
-    if (beginPaintInfo.nothingToPaint) {
-        for (int i = 0; i < opaqueNonOverlappedWidgets.size(); ++i)
-            resetWidget(opaqueNonOverlappedWidgets[i]);
-        dirty = QRegion();
-        updateRequestSent = false;
-        return;
-    }
+    store->beginPaint(toClean);
 
     // Must do this before sending any paint events because
     // the size may change in the paint event.
@@ -1346,7 +995,7 @@ void QWidgetBackingStore::doSync()
         QWidget *w = opaqueNonOverlappedWidgets[i];
         QWidgetPrivate *wd = w->d_func();
 
-        int flags = QWidgetPrivate::DrawRecursive;
+        QWidgetPrivate::DrawWidgetFlags flags = QWidgetPrivate::DrawRecursive;
         // Scrolled and moved widgets must draw all children.
         if (!wd->isScrolled && !wd->isMoved)
             flags |= QWidgetPrivate::DontDrawOpaqueChildren;
@@ -1364,56 +1013,301 @@ void QWidgetBackingStore::doSync()
 
     // Paint the rest with composition.
     if (repaintAllWidgets || !dirtyCopy.isEmpty()) {
-        const int flags = QWidgetPrivate::DrawAsRoot | QWidgetPrivate::DrawRecursive;
+        QWidgetPrivate::DrawWidgetFlags flags = QWidgetPrivate::DrawAsRoot | QWidgetPrivate::DrawRecursive;
         tlw->d_func()->drawWidget(store->paintDevice(), dirtyCopy, QPoint(), flags, 0, this);
     }
 
-    endPaint(toClean, store, &beginPaintInfo);
+    store->endPaint();
+
+    flush();
+}
+
+/*!
+    Marks the \a region of the \a widget as needing a flush. The \a region will be copied from
+    the backing store to the \a widget's native parent next time flush() is called.
+
+    Paint on screen widgets are ignored.
+*/
+void QWidgetRepaintManager::markNeedsFlush(QWidget *widget, const QRegion &region, const QPoint &topLevelOffset)
+{
+    if (!widget || widget->d_func()->shouldPaintOnScreen() || region.isEmpty())
+        return;
+
+    if (widget == tlw) {
+        // Top-level (native)
+        qCInfo(lcWidgetPainting) << "Marking" << region << "of top level"
+            << widget << "as needing flush";
+        topLevelNeedsFlush += region;
+    } else if (!hasPlatformWindow(widget) && !widget->isWindow()) {
+        QWidget *nativeParent = widget->nativeParentWidget();
+        qCInfo(lcWidgetPainting) << "Marking" << region << "of"
+                << widget << "as needing flush in" << nativeParent
+                << "at offset" << topLevelOffset;
+        if (nativeParent == tlw) {
+            // Alien widgets with the top-level as the native parent (common case)
+            topLevelNeedsFlush += region.translated(topLevelOffset);
+        } else {
+            // Alien widgets with native parent != tlw
+            const QPoint nativeParentOffset = widget->mapTo(nativeParent, QPoint());
+            markNeedsFlush(nativeParent, region.translated(nativeParentOffset));
+        }
+    } else {
+        // Native child widgets
+        qCInfo(lcWidgetPainting) << "Marking" << region
+            << "of native child" << widget << "as needing flush";
+        markNeedsFlush(widget, region);
+    }
+}
+
+void QWidgetRepaintManager::markNeedsFlush(QWidget *widget, const QRegion &region)
+{
+    if (!widget)
+        return;
+
+    auto *widgetPrivate = qt_widget_private(widget);
+    if (!widgetPrivate->needsFlush)
+        widgetPrivate->needsFlush = new QRegion;
+
+    *widgetPrivate->needsFlush += region;
+
+    if (!needsFlushWidgets.contains(widget))
+        needsFlushWidgets.append(widget);
 }
 
 /*!
     Flushes the contents of the backing store into the top-level widget.
-    If the \a widget is non-zero, the content is flushed to the \a widget.
-    If the \a surface is non-zero, the content of the \a surface is flushed.
 */
-void QWidgetBackingStore::flush(QWidget *widget)
+void QWidgetRepaintManager::flush()
 {
-    const bool hasDirtyOnScreenWidgets = dirtyOnScreenWidgets && !dirtyOnScreenWidgets->isEmpty();
+    qCInfo(lcWidgetPainting) << "Flushing top level"
+        << topLevelNeedsFlush << "and children" << needsFlushWidgets;
+
+    const bool hasNeedsFlushWidgets = !needsFlushWidgets.isEmpty();
     bool flushed = false;
 
-    // Flush the region in dirtyOnScreen.
-    if (!dirtyOnScreen.isEmpty()) {
-        QWidget *target = widget ? widget : tlw;
-        qt_flush(target, dirtyOnScreen, store, tlw, widgetTexturesFor(tlw, tlw), this);
-        dirtyOnScreen = QRegion();
+    // Flush the top level widget
+    if (!topLevelNeedsFlush.isEmpty()) {
+        flush(tlw, topLevelNeedsFlush, widgetTexturesFor(tlw, tlw));
+        topLevelNeedsFlush = QRegion();
         flushed = true;
     }
 
-    // Render-to-texture widgets are not in dirtyOnScreen so flush if we have not done it above.
-    if (!flushed && !hasDirtyOnScreenWidgets) {
+    // Render-to-texture widgets are not in topLevelNeedsFlush so flush if we have not done it above.
+    if (!flushed && !hasNeedsFlushWidgets) {
 #ifndef QT_NO_OPENGL
-        if (!tlw->d_func()->topData()->widgetTextures.isEmpty()) {
-            QPlatformTextureList *tl = widgetTexturesFor(tlw, tlw);
-            if (tl) {
-                QWidget *target = widget ? widget : tlw;
-                qt_flush(target, QRegion(), store, tlw, tl, this);
-            }
+        if (!tlw->d_func()->topData()->widgetTextures.empty()) {
+            if (QPlatformTextureList *widgetTextures = widgetTexturesFor(tlw, tlw))
+                flush(tlw, QRegion(), widgetTextures);
         }
 #endif
     }
 
-    if (!hasDirtyOnScreenWidgets)
+    if (!hasNeedsFlushWidgets)
         return;
 
-    for (int i = 0; i < dirtyOnScreenWidgets->size(); ++i) {
-        QWidget *w = dirtyOnScreenWidgets->at(i);
+    for (QWidget *w : qExchange(needsFlushWidgets, {})) {
         QWidgetPrivate *wd = w->d_func();
         Q_ASSERT(wd->needsFlush);
         QPlatformTextureList *widgetTexturesForNative = wd->textureChildSeen ? widgetTexturesFor(tlw, w) : 0;
-        qt_flush(w, *wd->needsFlush, store, tlw, widgetTexturesForNative, this);
+        flush(w, *wd->needsFlush, widgetTexturesForNative);
         *wd->needsFlush = QRegion();
     }
-    dirtyOnScreenWidgets->clear();
+}
+
+/*
+    Flushes the contents of the backingstore into the screen area of \a widget.
+
+    \a region is the region to be updated in \a widget coordinates.
+ */
+void QWidgetRepaintManager::flush(QWidget *widget, const QRegion &region, QPlatformTextureList *widgetTextures)
+{
+#ifdef QT_NO_OPENGL
+    Q_UNUSED(widgetTextures);
+    Q_ASSERT(!region.isEmpty());
+#else
+    Q_ASSERT(!region.isEmpty() || widgetTextures);
+#endif
+    Q_ASSERT(widget);
+    Q_ASSERT(tlw);
+
+    if (tlw->testAttribute(Qt::WA_DontShowOnScreen) || widget->testAttribute(Qt::WA_DontShowOnScreen))
+        return;
+
+    // Foreign Windows do not have backing store content and must not be flushed
+    if (QWindow *widgetWindow = widget->windowHandle()) {
+        if (widgetWindow->type() == Qt::ForeignWindow)
+            return;
+    }
+
+    qCInfo(lcWidgetPainting) << "Flushing" << region << "of" << widget;
+
+    static bool fpsDebug = qEnvironmentVariableIntValue("QT_DEBUG_FPS");
+    if (fpsDebug) {
+        if (!perfFrames++)
+            perfTime.start();
+        if (perfTime.elapsed() > 5000) {
+            double fps = double(perfFrames * 1000) / perfTime.restart();
+            qDebug("FPS: %.1f\n", fps);
+            perfFrames = 0;
+        }
+    }
+
+    QPoint offset;
+    if (widget != tlw)
+        offset += widget->mapTo(tlw, QPoint());
+
+    QRegion effectiveRegion = region;
+#ifndef QT_NO_OPENGL
+    const bool compositionWasActive = widget->d_func()->renderToTextureComposeActive;
+    if (!widgetTextures) {
+        widget->d_func()->renderToTextureComposeActive = false;
+        // Detect the case of falling back to the normal flush path when no
+        // render-to-texture widgets are visible anymore. We will force one
+        // last flush to go through the OpenGL-based composition to prevent
+        // artifacts. The next flush after this one will use the normal path.
+        if (compositionWasActive)
+            widgetTextures = qt_dummy_platformTextureList;
+    } else {
+        widget->d_func()->renderToTextureComposeActive = true;
+    }
+    // When changing the composition status, make sure the dirty region covers
+    // the entire widget.  Just having e.g. the shown/hidden render-to-texture
+    // widget's area marked as dirty is incorrect when changing flush paths.
+    if (compositionWasActive != widget->d_func()->renderToTextureComposeActive)
+        effectiveRegion = widget->rect();
+
+    // re-test since we may have been forced to this path via the dummy texture list above
+    if (widgetTextures) {
+        qt_window_private(tlw->windowHandle())->compositing = true;
+        widget->window()->d_func()->sendComposeStatus(widget->window(), false);
+        // A window may have alpha even when the app did not request
+        // WA_TranslucentBackground. Therefore the compositor needs to know whether the app intends
+        // to rely on translucency, in order to decide if it should clear to transparent or opaque.
+        const bool translucentBackground = widget->testAttribute(Qt::WA_TranslucentBackground);
+        store->handle()->composeAndFlush(widget->windowHandle(), effectiveRegion, offset,
+                                                widgetTextures, translucentBackground);
+        widget->window()->d_func()->sendComposeStatus(widget->window(), true);
+    } else
+#endif
+        store->flush(effectiveRegion, widget->windowHandle(), offset);
+}
+
+// ---------------------------------------------------------------------------
+
+void QWidgetRepaintManager::addStaticWidget(QWidget *widget)
+{
+    if (!widget)
+        return;
+
+    Q_ASSERT(widget->testAttribute(Qt::WA_StaticContents));
+    if (!staticWidgets.contains(widget))
+        staticWidgets.append(widget);
+}
+
+// Move the reparented widget and all its static children from this backing store
+// to the new backing store if reparented into another top-level / backing store.
+void QWidgetRepaintManager::moveStaticWidgets(QWidget *reparented)
+{
+    Q_ASSERT(reparented);
+    QWidgetRepaintManager *newPaintManager = reparented->d_func()->maybeRepaintManager();
+    if (newPaintManager == this)
+        return;
+
+    int i = 0;
+    while (i < staticWidgets.size()) {
+        QWidget *w = staticWidgets.at(i);
+        if (reparented == w || reparented->isAncestorOf(w)) {
+            staticWidgets.removeAt(i);
+            if (newPaintManager)
+                newPaintManager->addStaticWidget(w);
+        } else {
+            ++i;
+        }
+    }
+}
+
+void QWidgetRepaintManager::removeStaticWidget(QWidget *widget)
+{
+    staticWidgets.removeAll(widget);
+}
+
+bool QWidgetRepaintManager::hasStaticContents() const
+{
+#if defined(Q_OS_WIN)
+    return !staticWidgets.isEmpty();
+#else
+    return !staticWidgets.isEmpty() && false;
+#endif
+}
+
+/*!
+    Returns the static content inside the \a parent if non-zero; otherwise the static content
+    for the entire backing store is returned. The content will be clipped to \a withinClipRect
+    if non-empty.
+*/
+QRegion QWidgetRepaintManager::staticContents(QWidget *parent, const QRect &withinClipRect) const
+{
+    if (!parent && tlw->testAttribute(Qt::WA_StaticContents)) {
+        const QSize surfaceGeometry(store->size());
+        QRect surfaceRect(0, 0, surfaceGeometry.width(), surfaceGeometry.height());
+        if (!withinClipRect.isEmpty())
+            surfaceRect &= withinClipRect;
+        return QRegion(surfaceRect);
+    }
+
+    QRegion region;
+    if (parent && parent->d_func()->children.isEmpty())
+        return region;
+
+    const bool clipToRect = !withinClipRect.isEmpty();
+    const int count = staticWidgets.count();
+    for (int i = 0; i < count; ++i) {
+        QWidget *w = staticWidgets.at(i);
+        QWidgetPrivate *wd = w->d_func();
+        if (!wd->isOpaque || !wd->extra || wd->extra->staticContentsSize.isEmpty()
+            || !w->isVisible() || (parent && !parent->isAncestorOf(w))) {
+            continue;
+        }
+
+        QRect rect(0, 0, wd->extra->staticContentsSize.width(), wd->extra->staticContentsSize.height());
+        const QPoint offset = w->mapTo(parent ? parent : tlw, QPoint());
+        if (clipToRect)
+            rect &= withinClipRect.translated(-offset);
+        if (rect.isEmpty())
+            continue;
+
+        rect &= wd->clipRect();
+        if (rect.isEmpty())
+            continue;
+
+        QRegion visible(rect);
+        wd->clipToEffectiveMask(visible);
+        if (visible.isEmpty())
+            continue;
+        wd->subtractOpaqueSiblings(visible, 0, /*alsoNonOpaque=*/true);
+
+        visible.translate(offset);
+        region += visible;
+    }
+
+    return region;
+}
+
+void QWidgetRepaintManager::updateStaticContentsSize()
+{
+    for (int i = 0; i < staticWidgets.size(); ++i) {
+        QWidgetPrivate *wd = staticWidgets.at(i)->d_func();
+        if (!wd->extra)
+            wd->createExtra();
+        wd->extra->staticContentsSize = wd->data.crect.size();
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+bool QWidgetRepaintManager::isDirty() const
+{
+    return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && dirtyRenderToTextureWidgets.isEmpty());
 }
 
 /*!
@@ -1437,8 +1331,8 @@ void QWidgetPrivate::invalidateBackingStore_resizeHelper(const QPoint &oldPos, c
 
     if (!staticContents || graphicsEffect) {
         QRegion staticChildren;
-        QWidgetBackingStore *bs = 0;
-        if (offset.isNull() && (bs = maybeBackingStore()))
+        QWidgetRepaintManager *bs = 0;
+        if (offset.isNull() && (bs = maybeRepaintManager()))
             staticChildren = bs->staticContents(q, oldWidgetRect);
         const bool hasStaticChildren = !staticChildren.isEmpty();
 
@@ -1508,101 +1402,6 @@ void QWidgetPrivate::invalidateBackingStore_resizeHelper(const QPoint &oldPos, c
     }
 }
 
-/*!
-    Invalidates the \a r (in widget's coordinates) of the backing store, i.e.
-    all widgets intersecting with the region will be repainted when the backing
-    store is synced.
-*/
-template <class T>
-void QWidgetPrivate::invalidateBackingStore(const T &r)
-{
-    if (r.isEmpty())
-        return;
-
-    if (QApplication::closingDown())
-        return;
-
-    Q_Q(QWidget);
-    if (!q->isVisible() || !q->updatesEnabled())
-        return;
-
-    QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
-    if (!tlwExtra || tlwExtra->inTopLevelResize || !tlwExtra->backingStore)
-        return;
-
-    T clipped(r);
-    clipped &= clipRect();
-    if (clipped.isEmpty())
-        return;
-
-    if (!graphicsEffect && extra && extra->hasMask) {
-        QRegion masked(extra->mask);
-        masked &= clipped;
-        if (masked.isEmpty())
-            return;
-
-        tlwExtra->backingStoreTracker->markDirty(masked, q,
-            QWidgetBackingStore::UpdateLater, QWidgetBackingStore::BufferInvalid);
-    } else {
-        tlwExtra->backingStoreTracker->markDirty(clipped, q,
-            QWidgetBackingStore::UpdateLater, QWidgetBackingStore::BufferInvalid);
-    }
-}
-// Needed by tst_QWidget
-template Q_AUTOTEST_EXPORT void QWidgetPrivate::invalidateBackingStore<QRect>(const QRect &r);
-
-void QWidgetPrivate::repaint_sys(const QRegion &rgn)
-{
-    if (data.in_destructor)
-        return;
-
-    Q_Q(QWidget);
-    if (discardSyncRequest(q, maybeTopData()))
-        return;
-
-    if (q->testAttribute(Qt::WA_StaticContents)) {
-        if (!extra)
-            createExtra();
-        extra->staticContentsSize = data.crect.size();
-    }
-
-    QPaintEngine *engine = q->paintEngine();
-
-    // QGLWidget does not support partial updates if:
-    // 1) The context is double buffered
-    // 2) The context is single buffered and auto-fill background is enabled.
-    const bool noPartialUpdateSupport = (engine && (engine->type() == QPaintEngine::OpenGL
-                                                || engine->type() == QPaintEngine::OpenGL2))
-                                        && (usesDoubleBufferedGLContext || q->autoFillBackground());
-    QRegion toBePainted(noPartialUpdateSupport ? q->rect() : rgn);
-
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // No difference between update() and repaint() on the Mac.
-    update_sys(toBePainted);
-    return;
-#endif
-
-    toBePainted &= clipRect();
-    clipToEffectiveMask(toBePainted);
-    if (toBePainted.isEmpty())
-        return; // Nothing to repaint.
-
-#ifndef QT_NO_PAINT_DEBUG
-    bool flushed = QWidgetBackingStore::flushPaint(q, toBePainted);
-#endif
-
-    drawWidget(q, toBePainted, QPoint(), QWidgetPrivate::DrawAsRoot | QWidgetPrivate::DrawPaintOnScreen, 0);
-
-#ifndef QT_NO_PAINT_DEBUG
-    if (flushed)
-        QWidgetBackingStore::unflushPaint(q, toBePainted);
-#endif
-
-    if (Q_UNLIKELY(q->paintingActive()))
-        qWarning("QWidget::repaint: It is dangerous to leave painters active on a widget outside of the PaintEvent");
-}
-
-
 QT_END_NAMESPACE
 
-#include "moc_qwidgetbackingstore_p.cpp"
+#include "qwidgetrepaintmanager.moc"
diff --git a/src/widgets/kernel/qwidgetrepaintmanager_p.h b/src/widgets/kernel/qwidgetrepaintmanager_p.h
new file mode 100644
index 0000000000..58687383f4
--- /dev/null
+++ b/src/widgets/kernel/qwidgetrepaintmanager_p.h
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWidgets module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWIDGETREPAINTMANAGER_P_H
+#define QWIDGETREPAINTMANAGER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include <QDebug>
+#include <QtWidgets/qwidget.h>
+#include <private/qwidget_p.h>
+#include <QtGui/qbackingstore.h>
+
+QT_BEGIN_NAMESPACE
+
+class QPlatformTextureList;
+class QPlatformTextureListWatcher;
+class QWidgetRepaintManager;
+
+class Q_AUTOTEST_EXPORT QWidgetRepaintManager
+{
+    Q_GADGET
+public:
+    enum UpdateTime {
+        UpdateNow,
+        UpdateLater
+    };
+    Q_ENUM(UpdateTime)
+
+    enum BufferState{
+        BufferValid,
+        BufferInvalid
+    };
+    Q_ENUM(BufferState)
+
+    QWidgetRepaintManager(QWidget *t);
+    ~QWidgetRepaintManager();
+
+    QBackingStore *backingStore() const { return store; }
+    void setBackingStore(QBackingStore *backingStore) { store = backingStore; }
+
+    template <class T>
+    void markDirty(const T &r, QWidget *widget, UpdateTime updateTime = UpdateLater,
+                   BufferState bufferState = BufferValid);
+
+    void removeDirtyWidget(QWidget *w);
+
+    void sync(QWidget *exposedWidget, const QRegion &exposedRegion);
+    void sync();
+
+    void markNeedsFlush(QWidget *widget, const QRegion &region, const QPoint &topLevelOffset);
+
+    void addStaticWidget(QWidget *widget);
+    void moveStaticWidgets(QWidget *reparented);
+    void removeStaticWidget(QWidget *widget);
+    QRegion staticContents(QWidget *widget = nullptr, const QRect &withinClipRect = QRect()) const;
+
+    bool bltRect(const QRect &rect, int dx, int dy, QWidget *widget);
+
+private:
+    void updateLists(QWidget *widget);
+
+    void addDirtyWidget(QWidget *widget, const QRegion &rgn);
+    void resetWidget(QWidget *widget);
+
+    void addDirtyRenderToTextureWidget(QWidget *widget);
+
+    void sendUpdateRequest(QWidget *widget, UpdateTime updateTime);
+
+    bool syncAllowed();
+    void paintAndFlush();
+
+    void markNeedsFlush(QWidget *widget, const QRegion &region = QRegion());
+
+    void flush();
+    void flush(QWidget *widget, const QRegion &region, QPlatformTextureList *widgetTextures);
+
+    bool isDirty() const;
+
+    bool hasStaticContents() const;
+    void updateStaticContentsSize();
+
+    QWidget *tlw = nullptr;
+    QBackingStore *store = nullptr;
+
+    QRegion dirty; // needsRepaint
+    QVector<QWidget *> dirtyWidgets;
+    QVector<QWidget *> dirtyRenderToTextureWidgets;
+
+    QRegion topLevelNeedsFlush;
+    QVector<QWidget *> needsFlushWidgets;
+
+    QList<QWidget *> staticWidgets;
+
+    QPlatformTextureListWatcher *textureListWatcher = nullptr;
+
+    bool updateRequestSent = false;
+
+    QElapsedTimer perfTime;
+    int perfFrames = 0;
+
+    Q_DISABLE_COPY_MOVE(QWidgetRepaintManager)
+};
+
+QT_END_NAMESPACE
+
+#endif // QWIDGETREPAINTMANAGER_P_H
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index aad505ed29..24f8c5ce43 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -46,7 +46,7 @@
 #ifndef QT_NO_ACCESSIBILITY
 #include <QtGui/qaccessible.h>
 #endif
-#include <private/qwidgetbackingstore_p.h>
+#include <private/qwidgetrepaintmanager_p.h>
 #include <qpa/qwindowsysteminterface_p.h>
 #include <qpa/qplatformtheme.h>
 #include <qpa/qplatformwindow.h>
@@ -106,6 +106,7 @@ public:
         if (QWidget *widget = q->widget())
             QWidgetPrivate::get(widget)->updateContentsRect();
     }
+    bool allowClickThrough(const QPoint &) const override;
 };
 
 QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const
@@ -154,7 +155,7 @@ QWidgetWindow::QWidgetWindow(QWidget *widget)
     // Enable QOpenGLWidget/QQuickWidget children if the platform plugin supports it,
     // and the application developer has not explicitly disabled it.
     if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::RasterGLSurface)
-        && !QApplication::testAttribute(Qt::AA_ForceRasterWidgets)) {
+        && !QCoreApplication::testAttribute(Qt::AA_ForceRasterWidgets)) {
         setSurfaceType(QSurface::RasterGLSurface);
     }
     connect(widget, &QObject::objectNameChanged, this, &QWidgetWindow::updateObjectName);
@@ -221,6 +222,11 @@ static inline bool shouldBePropagatedToWidget(QEvent *event)
     }
 }
 
+bool QWidgetWindowPrivate::allowClickThrough(const QPoint &) const
+{
+    return true;
+}
+
 bool QWidgetWindow::event(QEvent *event)
 {
     if (!m_widget)
@@ -490,8 +496,8 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
     static const QEvent::Type contextMenuTrigger =
         QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::ContextMenuOnMouseRelease).toBool() ?
         QEvent::MouseButtonRelease : QEvent::MouseButtonPress;
-    if (qApp->d_func()->inPopupMode()) {
-        QWidget *activePopupWidget = qApp->activePopupWidget();
+    if (QApplicationPrivate::inPopupMode()) {
+        QWidget *activePopupWidget = QApplication::activePopupWidget();
         QPoint mapped = event->pos();
         if (activePopupWidget != m_widget)
             mapped = activePopupWidget->mapFromGlobal(event->globalPos());
@@ -571,7 +577,7 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
             }
         }
 
-        if (qApp->activePopupWidget() != activePopupWidget
+        if (QApplication::activePopupWidget() != activePopupWidget
             && qt_replay_popup_mouse_event
             && QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::ReplayMousePressOutsidePopup).toBool()) {
             if (m_widget->windowType() != Qt::Popup)
@@ -586,10 +592,7 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
                         w->window()->raise();
                     }
 
-                    QWindow *win = w->windowHandle();
-                    if (!win)
-                        win = w->nativeParentWidget()->windowHandle();
-                    if (win) {
+                    if (auto win = qt_widget_private(w)->windowHandle(QWidgetPrivate::WindowHandleMode::Closest)) {
                         const QRect globalGeometry = win->isTopLevel()
                             ? win->geometry()
                             : QRect(win->mapToGlobal(QPoint(0, 0)), win->size());
@@ -677,7 +680,7 @@ void QWidgetWindow::handleTouchEvent(QTouchEvent *event)
     if (event->type() == QEvent::TouchCancel) {
         QApplicationPrivate::translateTouchCancel(event->device(), event->timestamp());
         event->accept();
-    } else if (qApp->d_func()->inPopupMode()) {
+    } else if (QApplicationPrivate::inPopupMode()) {
         // Ignore touch events for popups. This will cause QGuiApplication to synthesise mouse
         // events instead, which QWidgetWindow::handleMouseEvent will forward correctly:
         event->ignore();
@@ -741,7 +744,7 @@ void QWidgetWindow::updateMargins()
 static void sendScreenChangeRecursively(QWidget *widget)
 {
     QEvent e(QEvent::ScreenChangeInternal);
-    QApplication::sendEvent(widget, &e);
+    QCoreApplication::sendEvent(widget, &e);
     QWidgetPrivate *d = QWidgetPrivate::get(widget);
     for (int i = 0; i < d->children.size(); ++i) {
         QWidget *w = qobject_cast<QWidget *>(d->children.at(i));
@@ -767,8 +770,8 @@ void QWidgetWindow::repaintWindow()
 
     QTLWExtra *tlwExtra = m_widget->window()->d_func()->maybeTopData();
     if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
-        tlwExtra->backingStoreTracker->markDirty(m_widget->rect(), m_widget,
-                                                 QWidgetBackingStore::UpdateNow, QWidgetBackingStore::BufferInvalid);
+        tlwExtra->repaintManager->markDirty(m_widget->rect(), m_widget,
+                                                 QWidgetRepaintManager::UpdateNow, QWidgetRepaintManager::BufferInvalid);
 }
 
 // Store normal geometry used for saving application settings.
@@ -800,7 +803,7 @@ void QWidgetWindow::handleResizeEvent(QResizeEvent *event)
     if (updateSize()) {
         QGuiApplication::forwardEvent(m_widget, event);
 
-        if (m_widget->d_func()->paintOnScreen()) {
+        if (m_widget->d_func()->shouldPaintOnScreen()) {
             QRegion updateRegion(geometry());
             if (m_widget->testAttribute(Qt::WA_StaticContents))
                 updateRegion -= QRect(0, 0, oldSize.width(), oldSize.height());
@@ -825,14 +828,14 @@ void QWidgetWindow::handleWheelEvent(QWheelEvent *event)
         return;
 
     QWidget *rootWidget = m_widget;
-    QPoint pos = event->pos();
+    QPoint pos = event->position().toPoint();
 
     // Use proper popup window for wheel event. Some QPA sends the wheel
     // event to the root menu, so redirect it to the proper popup window.
     QWidget *activePopupWidget = QApplication::activePopupWidget();
     if (activePopupWidget && activePopupWidget != m_widget) {
         rootWidget = activePopupWidget;
-        pos = rootWidget->mapFromGlobal(event->globalPos());
+        pos = rootWidget->mapFromGlobal(event->globalPosition().toPoint());
     }
 
     // which child should have it?
@@ -843,7 +846,12 @@ void QWidgetWindow::handleWheelEvent(QWheelEvent *event)
 
     QPoint mapped = widget->mapFrom(rootWidget, pos);
 
+#if QT_DEPRECATED_SINCE(5, 0)
     QWheelEvent translated(mapped, event->globalPos(), event->pixelDelta(), event->angleDelta(), event->delta(), event->orientation(), event->buttons(), event->modifiers(), event->phase(), event->source(), event->inverted());
+#else
+    QWheelEvent translated(QPointF(mapped), event->globalPosition(), event->pixelDelta(), event->angleDelta(),
+                           event->buttons(), event->modifiers(), event->phase(), event->inverted(), event->source());
+#endif
     translated.setTimestamp(event->timestamp());
     QGuiApplication::forwardEvent(widget, &translated, event);
 }
@@ -1022,7 +1030,11 @@ void QWidgetWindow::handleWindowStateChangedEvent(QWindowStateChangeEvent *event
     }
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWidgetWindow::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QWidgetWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#endif
 {
     return m_widget->nativeEvent(eventType, message, result);
 }
@@ -1100,7 +1112,7 @@ void QWidgetWindow::handleContextMenuEvent(QContextMenuEvent *e)
         }
     }
     if (fw && fw->isEnabled()) {
-        QPoint pos = fw->inputMethodQuery(Qt::ImMicroFocus).toRect().center();
+        QPoint pos = fw->inputMethodQuery(Qt::ImCursorRectangle).toRect().center();
         QContextMenuEvent widgetEvent(QContextMenuEvent::Keyboard, pos, fw->mapToGlobal(pos),
                                       e->modifiers());
         QGuiApplication::forwardEvent(fw, &widgetEvent, e);
diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h
index 0728135467..80a345465d 100644
--- a/src/widgets/kernel/qwidgetwindow_p.h
+++ b/src/widgets/kernel/qwidgetwindow_p.h
@@ -103,7 +103,11 @@ protected:
 #endif
     void handleExposeEvent(QExposeEvent *);
     void handleWindowStateChangedEvent(QWindowStateChangeEvent *event);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
     bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+#endif
 #if QT_CONFIG(tabletevent)
     void handleTabletEvent(QTabletEvent *);
 #endif
diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp
index 4b289d2d33..fd8581edbb 100644
--- a/src/widgets/kernel/qwindowcontainer.cpp
+++ b/src/widgets/kernel/qwindowcontainer.cpp
@@ -223,7 +223,7 @@ QWindowContainer::QWindowContainer(QWindow *embeddedWindow, QWidget *parent, Qt:
     // Otherwise we may end up with BadMatch failures on X11.
     if (embeddedWindow->surfaceType() == QSurface::RasterSurface
         && QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::RasterGLSurface)
-        && !QApplication::testAttribute(Qt::AA_ForceRasterWidgets))
+        && !QCoreApplication::testAttribute(Qt::AA_ForceRasterWidgets))
         embeddedWindow->setSurfaceType(QSurface::RasterGLSurface);
 
     d->window = embeddedWindow;
diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h
index a8754232a8..c6de168c10 100644
--- a/src/widgets/kernel/qwindowcontainer_p.h
+++ b/src/widgets/kernel/qwindowcontainer_p.h
@@ -64,7 +64,7 @@ class Q_WIDGETS_EXPORT QWindowContainer : public QWidget
     Q_DECLARE_PRIVATE(QWindowContainer)
 
 public:
-    explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = 0, Qt::WindowFlags f = 0);
+    explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
     ~QWindowContainer();
     QWindow *containedWindow() const;
 
diff --git a/src/widgets/kernel/win.pri b/src/widgets/kernel/win.pri
index f6877b02db..3b3170beb1 100644
--- a/src/widgets/kernel/win.pri
+++ b/src/widgets/kernel/win.pri
@@ -2,4 +2,7 @@
 # --------------------------------------------------------------------
 
 INCLUDEPATH += ../3rdparty/wintab
-!winrt: LIBS_PRIVATE *= -lshell32 -luxtheme -ldwmapi
+!winrt {
+    LIBS_PRIVATE *= -luxtheme -ldwmapi
+    QMAKE_USE_PRIVATE += shell32
+}
diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h
index 7e1b978bba..f23c078570 100644
--- a/src/widgets/statemachine/qbasickeyeventtransition_p.h
+++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h
@@ -63,11 +63,11 @@ class Q_AUTOTEST_EXPORT QBasicKeyEventTransition : public QAbstractTransition
 {
     Q_OBJECT
 public:
-    QBasicKeyEventTransition(QState *sourceState = 0);
-    QBasicKeyEventTransition(QEvent::Type type, int key, QState *sourceState = 0);
+    QBasicKeyEventTransition(QState *sourceState = nullptr);
+    QBasicKeyEventTransition(QEvent::Type type, int key, QState *sourceState = nullptr);
     QBasicKeyEventTransition(QEvent::Type type, int key,
                              Qt::KeyboardModifiers modifierMask,
-                             QState *sourceState = 0);
+                             QState *sourceState = nullptr);
     ~QBasicKeyEventTransition();
 
     QEvent::Type eventType() const;
diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h
index 132e223535..dd619d189c 100644
--- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h
+++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h
@@ -65,9 +65,9 @@ class Q_AUTOTEST_EXPORT QBasicMouseEventTransition : public QAbstractTransition
 {
     Q_OBJECT
 public:
-    QBasicMouseEventTransition(QState *sourceState = 0);
+    QBasicMouseEventTransition(QState *sourceState = nullptr);
     QBasicMouseEventTransition(QEvent::Type type, Qt::MouseButton button,
-                               QState *sourceState = 0);
+                               QState *sourceState = nullptr);
     ~QBasicMouseEventTransition();
 
     QEvent::Type eventType() const;
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 35b630cde2..271b43fe89 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -116,10 +116,7 @@
 
 #include <limits.h>
 
-#if QT_CONFIG(itemviews)
-#   include "private/qtextengine_p.h"
-#endif
-
+#include <private/qtextengine_p.h>
 #include <private/qstylehelper_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -1256,12 +1253,12 @@ void QCommonStylePrivate::tabLayout(const QStyleOptionTab *opt, const QWidget *w
         *iconRect = QRect(tr.left() + offsetX, tr.center().y() - tabIconSize.height() / 2,
                           tabIconSize.width(), tabIconSize.height());
         if (!verticalTabs)
-            *iconRect = proxyStyle->visualRect(opt->direction, opt->rect, *iconRect);
+            *iconRect = QStyle::visualRect(opt->direction, opt->rect, *iconRect);
         tr.setLeft(tr.left() + tabIconSize.width() + 4);
     }
 
     if (!verticalTabs)
-        tr = proxyStyle->visualRect(opt->direction, opt->rect, tr);
+        tr = QStyle::visualRect(opt->direction, opt->rect, tr);
 
     *textRect = tr;
 }
@@ -4250,10 +4247,11 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex
 #if QT_CONFIG(combobox)
     case CC_ComboBox:
         if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) {
+            const qreal dpi = QStyleHelper::dpi(opt);
             const int x = cb->rect.x(), y = cb->rect.y(), wi = cb->rect.width(), he = cb->rect.height();
-            const int margin = cb->frame ? qRound(QStyleHelper::dpiScaled(3)) : 0;
-            const int bmarg = cb->frame ? qRound(QStyleHelper::dpiScaled(2)) : 0;
-            const int xpos = x + wi - bmarg - qRound(QStyleHelper::dpiScaled(16));
+            const int margin = cb->frame ? qRound(QStyleHelper::dpiScaled(3, dpi)) : 0;
+            const int bmarg = cb->frame ? qRound(QStyleHelper::dpiScaled(2, dpi)) : 0;
+            const int xpos = x + wi - bmarg - qRound(QStyleHelper::dpiScaled(16, dpi));
 
 
             switch (sc) {
@@ -4261,10 +4259,10 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex
                 ret = cb->rect;
                 break;
             case SC_ComboBoxArrow:
-                ret.setRect(xpos, y + bmarg, qRound(QStyleHelper::dpiScaled(16)), he - 2*bmarg);
+                ret.setRect(xpos, y + bmarg, qRound(QStyleHelper::dpiScaled(16, opt)), he - 2*bmarg);
                 break;
             case SC_ComboBoxEditField:
-                ret.setRect(x + margin, y + margin, wi - 2 * margin - qRound(QStyleHelper::dpiScaled(16)), he - 2 * margin);
+                ret.setRect(x + margin, y + margin, wi - 2 * margin - qRound(QStyleHelper::dpiScaled(16, dpi)), he - 2 * margin);
                 break;
             case SC_ComboBoxListBoxPopup:
                 ret = cb->rect;
@@ -4508,13 +4506,13 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         ret = 0;
         break;
     case PM_DialogButtonsSeparator:
-        ret = int(QStyleHelper::dpiScaled(5.));
+        ret = int(QStyleHelper::dpiScaled(5, opt));
         break;
     case PM_DialogButtonsButtonWidth:
-        ret = int(QStyleHelper::dpiScaled(70.));
+        ret = int(QStyleHelper::dpiScaled(70, opt));
         break;
     case PM_DialogButtonsButtonHeight:
-        ret = int(QStyleHelper::dpiScaled(30.));
+        ret = int(QStyleHelper::dpiScaled(30, opt));
         break;
     case PM_TitleBarHeight: {
         if (const QStyleOptionTitleBar *tb = qstyleoption_cast<const QStyleOptionTitleBar *>(opt)) {
@@ -4522,33 +4520,33 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
                 ret = qMax(widget ? widget->fontMetrics().height() : opt->fontMetrics.height(), 16);
 #if QT_CONFIG(dockwidget)
             } else if (qobject_cast<const QDockWidget*>(widget)) {
-                ret = qMax(widget->fontMetrics().height(), int(QStyleHelper::dpiScaled(13)));
+                ret = qMax(widget->fontMetrics().height(), int(QStyleHelper::dpiScaled(13, opt)));
 #endif
             } else {
                 ret = qMax(widget ? widget->fontMetrics().height() : opt->fontMetrics.height(), 18);
             }
         } else {
-            ret = int(QStyleHelper::dpiScaled(18.));
+            ret = int(QStyleHelper::dpiScaled(18., opt));
         }
 
         break; }
     case PM_TitleBarButtonSize:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16., opt));
         break;
     case PM_TitleBarButtonIconSize:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16., opt));
         break;
 
     case PM_ScrollBarSliderMin:
-        ret = int(QStyleHelper::dpiScaled(9.));
+        ret = int(QStyleHelper::dpiScaled(9., opt));
         break;
 
     case PM_ButtonMargin:
-        ret = int(QStyleHelper::dpiScaled(6.));
+        ret = int(QStyleHelper::dpiScaled(6., opt));
         break;
 
     case PM_DockWidgetTitleBarButtonMargin:
-        ret = int(QStyleHelper::dpiScaled(2.));
+        ret = int(QStyleHelper::dpiScaled(2., opt));
         break;
 
     case PM_ButtonDefaultIndicator:
@@ -4556,7 +4554,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
 
     case PM_MenuButtonIndicator:
-        ret = int(QStyleHelper::dpiScaled(12.));
+        ret = int(QStyleHelper::dpiScaled(12, opt));
         break;
 
     case PM_ButtonShiftHorizontal:
@@ -4571,15 +4569,15 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
     case PM_MenuPanelWidth:
     case PM_TabBarBaseOverlap:
     case PM_TabBarBaseHeight:
-        ret = proxy()->pixelMetric(PM_DefaultFrameWidth, opt, widget);
+        ret = proxy()->pixelMetric(PM_DefaultFrameWidth, opt);
         break;
 
     case PM_MdiSubWindowFrameWidth:
-        ret = int(QStyleHelper::dpiScaled(4.));
+        ret = int(QStyleHelper::dpiScaled(4, opt));
         break;
 
     case PM_MdiSubWindowMinimizedWidth:
-        ret = int(QStyleHelper::dpiScaled(196.));
+        ret = int(QStyleHelper::dpiScaled(196, opt));
         break;
 
 #if QT_CONFIG(scrollbar)
@@ -4590,7 +4588,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
                     : QApplication::globalStrut().width();
             ret = qMax(16, s);
         } else {
-            ret = int(QStyleHelper::dpiScaled(16.));
+            ret = int(QStyleHelper::dpiScaled(16, opt));
         }
         break;
 #endif
@@ -4600,7 +4598,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
 
 #if QT_CONFIG(slider)
     case PM_SliderThickness:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16, opt));
         break;
 
     case PM_SliderTickmarkOffset:
@@ -4634,11 +4632,11 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
 #endif // QT_CONFIG(slider)
 #if QT_CONFIG(dockwidget)
     case PM_DockWidgetSeparatorExtent:
-        ret = int(QStyleHelper::dpiScaled(6.));
+        ret = int(QStyleHelper::dpiScaled(6, opt));
         break;
 
     case PM_DockWidgetHandleExtent:
-        ret = int(QStyleHelper::dpiScaled(8.));
+        ret = int(QStyleHelper::dpiScaled(8, opt));
         break;
     case PM_DockWidgetTitleMargin:
         ret = 0;
@@ -4667,19 +4665,19 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
 
     case PM_ToolBarItemSpacing:
-        ret = int(QStyleHelper::dpiScaled(4.));
+        ret = int(QStyleHelper::dpiScaled(4, opt));
         break;
 
     case PM_ToolBarHandleExtent:
-        ret = int(QStyleHelper::dpiScaled(8.));
+        ret = int(QStyleHelper::dpiScaled(8, opt));
         break;
 
     case PM_ToolBarSeparatorExtent:
-        ret = int(QStyleHelper::dpiScaled(6.));
+        ret = int(QStyleHelper::dpiScaled(6, opt));
         break;
 
     case PM_ToolBarExtensionExtent:
-        ret = int(QStyleHelper::dpiScaled(12.));
+        ret = int(QStyleHelper::dpiScaled(12, opt));
         break;
 #endif // QT_CONFIG(toolbar)
 
@@ -4689,7 +4687,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
 
     case PM_TabBarTabHSpace:
-        ret = int(QStyleHelper::dpiScaled(24.));
+        ret = int(QStyleHelper::dpiScaled(24, opt));
         break;
 
     case PM_TabBarTabShiftHorizontal:
@@ -4718,27 +4716,27 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
 
     case PM_IndicatorWidth:
-        ret = int(QStyleHelper::dpiScaled(13.));
+        ret = int(QStyleHelper::dpiScaled(13, opt));
         break;
 
     case PM_IndicatorHeight:
-        ret = int(QStyleHelper::dpiScaled(13.));
+        ret = int(QStyleHelper::dpiScaled(13, opt));
         break;
 
     case PM_ExclusiveIndicatorWidth:
-        ret = int(QStyleHelper::dpiScaled(12.));
+        ret = int(QStyleHelper::dpiScaled(12, opt));
         break;
 
     case PM_ExclusiveIndicatorHeight:
-        ret = int(QStyleHelper::dpiScaled(12.));
+        ret = int(QStyleHelper::dpiScaled(12, opt));
         break;
 
     case PM_MenuTearoffHeight:
-        ret = int(QStyleHelper::dpiScaled(10.));
+        ret = int(QStyleHelper::dpiScaled(10, opt));
         break;
 
     case PM_MenuScrollerHeight:
-        ret = int(QStyleHelper::dpiScaled(10.));
+        ret = int(QStyleHelper::dpiScaled(10, opt));
         break;
 
     case PM_MenuDesktopFrameWidth:
@@ -4748,22 +4746,22 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
 
     case PM_HeaderMargin:
-        ret = int(QStyleHelper::dpiScaled(4.));
+        ret = int(QStyleHelper::dpiScaled(4, opt));
         break;
     case PM_HeaderMarkSize:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16, opt));
         break;
     case PM_HeaderGripMargin:
-        ret = int(QStyleHelper::dpiScaled(4.));
+        ret = int(QStyleHelper::dpiScaled(4, opt));
         break;
     case PM_HeaderDefaultSectionSizeHorizontal:
-        ret = int(QStyleHelper::dpiScaled(100.));
+        ret = int(QStyleHelper::dpiScaled(100, opt));
         break;
     case PM_HeaderDefaultSectionSizeVertical:
-        ret = int(QStyleHelper::dpiScaled(30.));
+        ret = int(QStyleHelper::dpiScaled(30, opt));
         break;
     case PM_TabBarScrollButtonWidth:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16, opt));
         break;
     case PM_LayoutLeftMargin:
     case PM_LayoutTopMargin:
@@ -4785,13 +4783,13 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
 
     case PM_DefaultTopLevelMargin:
-        ret = int(QStyleHelper::dpiScaled(11.));
+        ret = int(QStyleHelper::dpiScaled(11, opt));
         break;
     case PM_DefaultChildMargin:
-        ret = int(QStyleHelper::dpiScaled(9.));
+        ret = int(QStyleHelper::dpiScaled(9, opt));
         break;
     case PM_DefaultLayoutSpacing:
-        ret = int(QStyleHelper::dpiScaled(6.));
+        ret = int(QStyleHelper::dpiScaled(6, opt));
         break;
 
     case PM_ToolBarIconSize:
@@ -4799,31 +4797,31 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme())
             ret = theme->themeHint(QPlatformTheme::ToolBarIconSize).toInt();
         if (ret <= 0)
-            ret =  int(QStyleHelper::dpiScaled(24.));
+            ret =  int(QStyleHelper::dpiScaled(24, opt));
         break;
 
     case PM_TabBarIconSize:
-        ret = proxy()->pixelMetric(PM_SmallIconSize, opt, widget);
+        ret = proxy()->pixelMetric(PM_SmallIconSize, opt);
         break;
     case PM_ListViewIconSize:
 #if QT_CONFIG(filedialog)
         if (qobject_cast<const QSidebar *>(widget))
-            ret = int(QStyleHelper::dpiScaled(24.));
+            ret = int(QStyleHelper::dpiScaled(24., opt));
         else
 #endif
-            ret = proxy()->pixelMetric(PM_SmallIconSize, opt, widget);
+            ret = proxy()->pixelMetric(PM_SmallIconSize, opt);
         break;
 
     case PM_ButtonIconSize:
     case PM_SmallIconSize:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16, opt));
         break;
     case PM_IconViewIconSize:
-        ret = proxy()->pixelMetric(PM_LargeIconSize, opt, widget);
+        ret = proxy()->pixelMetric(PM_LargeIconSize, opt);
         break;
 
     case PM_LargeIconSize:
-        ret = int(QStyleHelper::dpiScaled(32.));
+        ret = int(QStyleHelper::dpiScaled(32, opt));
         break;
 
     case PM_ToolTipLabelFrameWidth:
@@ -4831,19 +4829,19 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
     case PM_CheckBoxLabelSpacing:
     case PM_RadioButtonLabelSpacing:
-        ret = int(QStyleHelper::dpiScaled(6.));
+        ret = int(QStyleHelper::dpiScaled(6, opt));
         break;
     case PM_SizeGripSize:
-        ret = int(QStyleHelper::dpiScaled(13.));
+        ret = int(QStyleHelper::dpiScaled(13, opt));
         break;
     case PM_MessageBoxIconSize:
 #ifdef Q_OS_MAC
-        if (QApplication::desktopSettingsAware()) {
+        if (QGuiApplication::desktopSettingsAware()) {
             ret = 64; // No DPI scaling, it's handled elsewhere.
         } else
 #endif
         {
-            ret = int(QStyleHelper::dpiScaled(32.));
+            ret = int(QStyleHelper::dpiScaled(32, opt));
         }
         break;
     case PM_TextCursorWidth:
@@ -4854,19 +4852,19 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
     case PM_TabCloseIndicatorWidth:
     case PM_TabCloseIndicatorHeight:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16, opt));
         break;
     case PM_ScrollView_ScrollBarSpacing:
-        ret = 2 * proxy()->pixelMetric(PM_DefaultFrameWidth, opt, widget);
+        ret = 2 * proxy()->pixelMetric(PM_DefaultFrameWidth, opt);
         break;
     case PM_ScrollView_ScrollBarOverlap:
         ret = 0;
         break;
     case PM_SubMenuOverlap:
-        ret = -proxy()->pixelMetric(QStyle::PM_MenuPanelWidth, opt, widget);
+        ret = -proxy()->pixelMetric(QStyle::PM_MenuPanelWidth, opt);
         break;
     case PM_TreeViewIndentation:
-        ret = int(QStyleHelper::dpiScaled(20.));
+        ret = int(QStyleHelper::dpiScaled(20, opt));
         break;
     default:
         ret = 0;
@@ -5463,14 +5461,14 @@ static QIcon clearTextIcon(bool rtl)
 QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *option,
                                      const QWidget *widget) const
 {
-    const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft());
+    const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QGuiApplication::isRightToLeft());
 #ifdef QT_NO_IMAGEFORMAT_PNG
     Q_UNUSED(widget);
     Q_UNUSED(sp);
 #else
     QPixmap pixmap;
 
-    if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) {
+    if (QGuiApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) {
         switch (sp) {
         case SP_DialogYesButton:
         case SP_DialogOkButton:
@@ -5832,7 +5830,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
                                  const QWidget *widget) const
 {
     QIcon icon;
-    const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft());
+    const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QGuiApplication::isRightToLeft());
 
 #ifdef Q_OS_WIN
     switch (standardIcon) {
@@ -5884,7 +5882,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
 
 #endif
 
-    if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) {
+    if (QGuiApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) {
         switch (standardIcon) {
         case SP_DirHomeIcon:
                 icon = QIcon::fromTheme(QLatin1String("user-home"));
@@ -5969,6 +5967,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
         case SP_ArrowLeft:
                 icon = QIcon::fromTheme(QLatin1String("go-previous"));
                 break;
+        case SP_DialogNoButton:
         case SP_DialogCancelButton:
                 icon = QIcon::fromTheme(QLatin1String("dialog-cancel"),
                                         QIcon::fromTheme(QLatin1String("process-stop")));
@@ -6060,13 +6059,13 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
         default:
             break;
         }
-    } // if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty())
+    } // if (QGuiApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty())
 
     if (!icon.isNull())
         return icon;
 
 #if defined(Q_OS_MAC)
-    if (QApplication::desktopSettingsAware()) {
+    if (QGuiApplication::desktopSettingsAware()) {
         switch (standardIcon) {
         case SP_DirIcon: {
             // A rather special case
@@ -6132,7 +6131,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
         default:
             break;
         }
-    } // if (QApplication::desktopSettingsAware())
+    } // if (QGuiApplication::desktopSettingsAware())
 #endif // Q_OS_MAC
 
     switch (standardIcon) {
diff --git a/src/widgets/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h
index 296f89ce5f..4860dfe4c9 100644
--- a/src/widgets/styles/qcommonstyle_p.h
+++ b/src/widgets/styles/qcommonstyle_p.h
@@ -71,7 +71,7 @@ class Q_WIDGETS_EXPORT QCommonStylePrivate : public QStylePrivate
 public:
     inline QCommonStylePrivate() :
 #if QT_CONFIG(itemviews)
-    cachedOption(0),
+    cachedOption(nullptr),
 #endif
     animationFps(30)
     { }
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index 34cc3c93db..b58dc1660a 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -88,6 +88,7 @@
 #include <private/qstylehelper_p.h>
 #include <private/qdrawhelper_p.h>
 #include <private/qapplication_p.h>
+#include <private/qwidget_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -250,8 +251,9 @@ static void qt_fusion_draw_arrow(Qt::ArrowType type, QPainter *painter, const QS
     if (rect.isEmpty())
         return;
 
-    const int arrowWidth = QStyleHelper::dpiScaled(14);
-    const int arrowHeight = QStyleHelper::dpiScaled(8);
+    const qreal dpi = QStyleHelper::dpi(option);
+    const int arrowWidth = int(QStyleHelper::dpiScaled(14, dpi));
+    const int arrowHeight = int(QStyleHelper::dpiScaled(8, dpi));
 
     const int arrowMax = qMin(arrowHeight, arrowWidth);
     const int rectMax = qMin(rect.height(), rect.width());
@@ -363,6 +365,11 @@ static void qt_fusion_draw_mdibutton(QPainter *painter, const QStyleOptionTitleB
     painter->drawPoint(tmp.right() , tmp.bottom() - 1);
 }
 
+static QWindow *qt_getWindow(const QWidget *widget)
+{
+    return widget ? QWidgetPrivate::get(widget)->windowHandle(QWidgetPrivate::WindowHandleMode::Closest) : nullptr;
+}
+
 /*
     \internal
 */
@@ -465,15 +472,24 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
 
     switch (elem) {
 
+#if QT_CONFIG(groupbox)
     // No frame drawn
     case PE_FrameGroupBox:
     {
         QPixmap pixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/fusion_groupbox.png"));
-        int topMargin = qMax(pixelMetric(PM_ExclusiveIndicatorHeight), option->fontMetrics.height()) + groupBoxTopMargin;
+        int topMargin = 0;
+        auto control = dynamic_cast<const QGroupBox *>(widget);
+        if (control && !control->isCheckable() && control->title().isEmpty()) {
+            // Shrinking the topMargin if Not checkable AND title is empty
+            topMargin = groupBoxTopMargin;
+        } else {
+            topMargin = qMax(pixelMetric(PM_ExclusiveIndicatorHeight), option->fontMetrics.height()) + groupBoxTopMargin;
+        }
         QRect frame = option->rect.adjusted(0, topMargin, 0, 0);
         qDrawBorderPixmap(painter, frame, QMargins(6, 6, 6, 6), pixmap);
         break;
     }
+#endif // QT_CONFIG(groupbox)
     case PE_IndicatorBranch: {
         if (!(option->state & State_Children))
             break;
@@ -779,12 +795,13 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
                 painter->drawRect(rect.adjusted(checkMarkPadding, checkMarkPadding, -checkMarkPadding, -checkMarkPadding));
 
             } else if (checkbox->state & State_On) {
-                qreal penWidth = QStyleHelper::dpiScaled(1.5);
+                const qreal dpi = QStyleHelper::dpi(option);
+                qreal penWidth = QStyleHelper::dpiScaled(1.5, dpi);
                 penWidth = qMax<qreal>(penWidth, 0.13 * rect.height());
                 penWidth = qMin<qreal>(penWidth, 0.20 * rect.height());
                 QPen checkPen = QPen(checkMarkColor, penWidth);
                 checkMarkColor.setAlpha(210);
-                painter->translate(dpiScaled(-0.8), dpiScaled(0.5));
+                painter->translate(dpiScaled(-0.8, dpi), dpiScaled(0.5, dpi));
                 painter->setPen(checkPen);
                 painter->setBrush(Qt::NoBrush);
 
@@ -984,7 +1001,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
             d->tabBarcloseButtonIcon = proxy()->standardIcon(SP_DialogCloseButton, option, widget);
         if ((option->state & State_Enabled) && (option->state & State_MouseOver))
             proxy()->drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
-        QPixmap pixmap = d->tabBarcloseButtonIcon.pixmap(QSize(16, 16), QIcon::Normal, QIcon::On);
+        QPixmap pixmap = d->tabBarcloseButtonIcon.pixmap(qt_getWindow(widget), QSize(16, 16), QIcon::Normal, QIcon::On);
         proxy()->drawItemPixmap(painter, option->rect, Qt::AlignCenter, pixmap);
     }
         break;
@@ -1024,7 +1041,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
             if (!cb->currentIcon.isNull()) {
                 QIcon::Mode mode = cb->state & State_Enabled ? QIcon::Normal
                                                              : QIcon::Disabled;
-                QPixmap pixmap = cb->currentIcon.pixmap(cb->iconSize, mode);
+                QPixmap pixmap = cb->currentIcon.pixmap(qt_getWindow(widget), cb->iconSize, mode);
                 QRect iconRect(editRect);
                 iconRect.setWidth(cb->iconSize.width() + 4);
                 iconRect = alignedRect(cb->direction,
@@ -1535,7 +1552,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
             QColor highlight = option->palette.highlight().color();
             if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) {
                 int w = 0;
-                const int margin = QStyleHelper::dpiScaled(5);
+                const int margin = int(QStyleHelper::dpiScaled(5, option));
                 if (!menuItem->text.isEmpty()) {
                     painter->setFont(menuItem->font);
                     proxy()->drawItemText(painter, menuItem->rect.adjusted(margin, 0, -margin, 0), Qt::AlignLeft | Qt::AlignVCenter,
@@ -1565,7 +1582,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
             bool ignoreCheckMark = false;
             const int checkColHOffset = windowsItemHMargin + windowsItemFrame - 1;
             int checkcol = qMax<int>(menuItem->rect.height() * 0.79,
-                                     qMax<int>(menuItem->maxIconWidth, dpiScaled(21))); // icon checkbox's highlight column width
+                                     qMax<int>(menuItem->maxIconWidth, dpiScaled(21, option))); // icon checkbox's highlight column width
             if (
 #if QT_CONFIG(combobox)
                 qobject_cast<const QComboBox*>(widget) ||
@@ -1575,7 +1592,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
 
             if (!ignoreCheckMark) {
                 // Check, using qreal and QRectF to avoid error accumulation
-                const qreal boxMargin = dpiScaled(3.5);
+                const qreal boxMargin = dpiScaled(3.5, option);
                 const qreal boxWidth = checkcol - 2 * boxMargin;
                 QRectF checkRectF(option->rect.left() + boxMargin + checkColHOffset, option->rect.center().y() - boxWidth/2 + 1, boxWidth, boxWidth);
                 QRect checkRect = checkRectF.toRect();
@@ -1636,9 +1653,9 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
                     iconSize = combo->iconSize();
 #endif
                 if (checked)
-                    pixmap = menuItem->icon.pixmap(iconSize, mode, QIcon::On);
+                    pixmap = menuItem->icon.pixmap(qt_getWindow(widget), iconSize, mode, QIcon::On);
                 else
-                    pixmap = menuItem->icon.pixmap(iconSize, mode);
+                    pixmap = menuItem->icon.pixmap(qt_getWindow(widget), iconSize, mode);
 
                 const int pixw = pixmap.width() / pixmap.devicePixelRatio();
                 const int pixh = pixmap.height() / pixmap.devicePixelRatio();
@@ -1772,7 +1789,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
                 if (button->state & State_On)
                     state = QIcon::On;
 
-                QPixmap pixmap = button->icon.pixmap(button->iconSize, mode, state);
+                QPixmap pixmap = button->icon.pixmap(qt_getWindow(widget), button->iconSize, mode, state);
                 int w = pixmap.width() / pixmap.devicePixelRatio();
                 int h = pixmap.height() / pixmap.devicePixelRatio();
 
@@ -3175,7 +3192,7 @@ int QFusionStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, co
     default:
         return QCommonStyle::pixelMetric(metric, option, widget);
     }
-    return QStyleHelper::dpiScaled(val);
+    return QStyleHelper::dpiScaled(val, option);
 }
 
 /*!
@@ -3227,7 +3244,7 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti
             if (menuItem->text.contains(QLatin1Char('\t')))
                 w += tabSpacing;
             else if (menuItem->menuItemType == QStyleOptionMenuItem::SubMenu)
-                w += 2 * QStyleHelper::dpiScaled(QFusionStylePrivate::menuArrowHMargin);
+                w += 2 * QStyleHelper::dpiScaled(QFusionStylePrivate::menuArrowHMargin, option);
             else if (menuItem->menuItemType == QStyleOptionMenuItem::DefaultItem) {
                 QFontMetrics fm(menuItem->font);
                 QFont fontBold = menuItem->font;
@@ -3235,9 +3252,10 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti
                 QFontMetrics fmBold(fontBold);
                 w += fmBold.horizontalAdvance(menuItem->text) - fm.horizontalAdvance(menuItem->text);
             }
-            const int checkcol = qMax<int>(maxpmw, QStyleHelper::dpiScaled(QFusionStylePrivate::menuCheckMarkWidth)); // Windows always shows a check column
+            const qreal dpi = QStyleHelper::dpi(option);
+            const int checkcol = qMax<int>(maxpmw, QStyleHelper::dpiScaled(QFusionStylePrivate::menuCheckMarkWidth, dpi)); // Windows always shows a check column
             w += checkcol;
-            w += QStyleHelper::dpiScaled(int(QFusionStylePrivate::menuRightBorder) + 10);
+            w += QStyleHelper::dpiScaled(int(QFusionStylePrivate::menuRightBorder) + 10, dpi);
             newSize.setWidth(w);
             if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) {
                 if (!menuItem->text.isEmpty()) {
@@ -3251,8 +3269,8 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti
                 }
 #endif
             }
-            newSize.setWidth(newSize.width() + QStyleHelper::dpiScaled(12));
-            newSize.setWidth(qMax<int>(newSize.width(), QStyleHelper::dpiScaled(120)));
+            newSize.setWidth(newSize.width() + int(QStyleHelper::dpiScaled(12, dpi)));
+            newSize.setWidth(qMax<int>(newSize.width(), int(QStyleHelper::dpiScaled(120, dpi))));
         }
         break;
     case CT_SizeGrip:
@@ -3400,7 +3418,7 @@ QRect QFusionStyle::subControlRect(ComplexControl control, const QStyleOptionCom
                 break;
             case SC_SliderGroove: {
                 QPoint grooveCenter = slider->rect.center();
-                const int grooveThickness = QStyleHelper::dpiScaled(7);
+                const int grooveThickness = QStyleHelper::dpiScaled(7, option);
                 if (slider->orientation == Qt::Horizontal) {
                     rect.setHeight(grooveThickness);
                     if (slider->tickPosition & QSlider::TicksAbove)
@@ -3429,7 +3447,7 @@ QRect QFusionStyle::subControlRect(ComplexControl control, const QStyleOptionCom
             int center = spinbox->rect.height() / 2;
             int fw = spinbox->frame ? 3 : 0; // Is drawn with 3 pixels width in drawComplexControl, independently from PM_SpinBoxFrameWidth
             int y = fw;
-            const int buttonWidth = QStyleHelper::dpiScaled(14);
+            const int buttonWidth = QStyleHelper::dpiScaled(14, option);
             int x, lx, rx;
             x = spinbox->rect.width() - y - buttonWidth + 2;
             lx = fw;
@@ -3513,17 +3531,19 @@ QRect QFusionStyle::subControlRect(ComplexControl control, const QStyleOptionCom
 
     case CC_ComboBox:
         switch (subControl) {
-        case SC_ComboBoxArrow:
+        case SC_ComboBoxArrow: {
+            const qreal dpi = QStyleHelper::dpi(option);
             rect = visualRect(option->direction, option->rect, rect);
-            rect.setRect(rect.right() - QStyleHelper::dpiScaled(18), rect.top() - 2,
-                         QStyleHelper::dpiScaled(19), rect.height() + 4);
+            rect.setRect(rect.right() - int(QStyleHelper::dpiScaled(18, dpi)), rect.top() - 2,
+                         int(QStyleHelper::dpiScaled(19, dpi)), rect.height() + 4);
             rect = visualRect(option->direction, option->rect, rect);
+        }
             break;
         case SC_ComboBoxEditField: {
             int frameWidth = 2;
             rect = visualRect(option->direction, option->rect, rect);
             rect.setRect(option->rect.left() + frameWidth, option->rect.top() + frameWidth,
-                         option->rect.width() - int(QStyleHelper::dpiScaled(19)) - 2 * frameWidth,
+                         option->rect.width() - int(QStyleHelper::dpiScaled(19, option)) - 2 * frameWidth,
                          option->rect.height() - 2 * frameWidth);
             if (const QStyleOptionComboBox *box = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
                 if (!box->editable) {
diff --git a/src/widgets/styles/qfusionstyle_p.h b/src/widgets/styles/qfusionstyle_p.h
index e67e792727..cbefe3e1af 100644
--- a/src/widgets/styles/qfusionstyle_p.h
+++ b/src/widgets/styles/qfusionstyle_p.h
@@ -72,28 +72,28 @@ public:
     QPalette standardPalette () const override;
     void drawPrimitive(PrimitiveElement elem,
                        const QStyleOption *option,
-                       QPainter *painter, const QWidget *widget = 0) const override;
+                       QPainter *painter, const QWidget *widget = nullptr) const override;
     void drawControl(ControlElement ce, const QStyleOption *option, QPainter *painter,
                      const QWidget *widget) const override;
-    int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override;
+    int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override;
     void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
                             QPainter *painter, const QWidget *widget) const override;
-    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override;
+    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const override;
     QSize sizeFromContents(ContentsType type, const QStyleOption *option,
                            const QSize &size, const QWidget *widget) const override;
     SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
-                                     const QPoint &pt, const QWidget *w = 0) const override;
+                                     const QPoint &pt, const QWidget *w = nullptr) const override;
     QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
                          SubControl sc, const QWidget *widget) const override;
     QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
                                 const QStyleOption *opt) const override;
-    int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0,
-                  QStyleHintReturn *returnData = 0) const override;
+    int styleHint(StyleHint hint, const QStyleOption *option = nullptr, const QWidget *widget = nullptr,
+                  QStyleHintReturn *returnData = nullptr) const override;
     QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const override;
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
-                       const QWidget *widget = 0) const override;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr,
+                       const QWidget *widget = nullptr) const override;
     QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
-                           const QWidget *widget = 0) const override;
+                           const QWidget *widget = nullptr) const override;
     void drawItemPixmap(QPainter *painter, const QRect &rect,
                         int alignment, const QPixmap &pixmap) const override;
     void drawItemText(QPainter *painter, const QRect &rect,
diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp
index 976bd2630e..05e8467528 100644
--- a/src/widgets/styles/qpixmapstyle.cpp
+++ b/src/widgets/styles/qpixmapstyle.cpp
@@ -122,9 +122,6 @@ QPixmapStyle::~QPixmapStyle()
 void QPixmapStyle::polish(QApplication *application)
 {
     QCommonStyle::polish(application);
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false);
-#endif
 }
 
 /*!
@@ -188,11 +185,6 @@ void QPixmapStyle::polish(QWidget *widget)
             frame->setContentsMargins(pix.margins.left(), desc.margins.top(),
                                       pix.margins.right(), desc.margins.bottom());
             frame->setAttribute(Qt::WA_TranslucentBackground);
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-            // FramelessWindowHint is needed on windows to make
-            // WA_TranslucentBackground work properly
-            frame->setWindowFlags(widget->windowFlags() | Qt::FramelessWindowHint);
-#endif
         }
     }
 #endif // QT_CONFIG(combobox)
diff --git a/src/widgets/styles/qpixmapstyle_p.h b/src/widgets/styles/qpixmapstyle_p.h
index 590434d95e..d32631a527 100644
--- a/src/widgets/styles/qpixmapstyle_p.h
+++ b/src/widgets/styles/qpixmapstyle_p.h
@@ -147,7 +147,7 @@ public:
     void drawControl(ControlElement element, const QStyleOption *option,
             QPainter *painter, const QWidget *widget = nullptr) const override;
     void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *option,
-                            QPainter *painter, const QWidget *widget=0) const override;
+                            QPainter *painter, const QWidget *widget=nullptr) const override;
 
     QSize sizeFromContents(ContentsType type, const QStyleOption *option,
             const QSize &contentsSize, const QWidget *widget = nullptr) const override;
diff --git a/src/widgets/styles/qproxystyle_p.h b/src/widgets/styles/qproxystyle_p.h
index 2343a03e2a..2321f0fed0 100644
--- a/src/widgets/styles/qproxystyle_p.h
+++ b/src/widgets/styles/qproxystyle_p.h
@@ -67,7 +67,7 @@ public:
     void ensureBaseStyle() const;
 private:
     QProxyStylePrivate() :
-    QCommonStylePrivate(), baseStyle(0) {}
+    QCommonStylePrivate(), baseStyle(nullptr) {}
     mutable QPointer <QStyle> baseStyle;
 };
 
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index ec5b6df6b3..6cbed34c3a 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -560,7 +560,7 @@ QRect QStyle::itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pi
         x += w - pixmapWidth;
     else if ((alignment & Qt::AlignHCenter) == Qt::AlignHCenter)
         x += w/2 - pixmapWidth/2;
-    else if ((alignment & Qt::AlignLeft) != Qt::AlignLeft && QApplication::isRightToLeft())
+    else if ((alignment & Qt::AlignLeft) != Qt::AlignLeft && QGuiApplication::isRightToLeft())
         x += w - pixmapWidth;
     result = QRect(x, y, pixmapWidth, pixmapHeight);
     return result;
@@ -624,7 +624,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
                             const QPixmap &pixmap) const
 {
     qreal scale = pixmap.devicePixelRatio();
-    QRect aligned = alignedRect(QApplication::layoutDirection(), QFlag(alignment), pixmap.size() / scale, rect);
+    QRect aligned = alignedRect(QGuiApplication::layoutDirection(), QFlag(alignment), pixmap.size() / scale, rect);
     QRect inter = aligned.intersected(rect);
 
     painter->drawPixmap(inter.x(), inter.y(), pixmap, inter.x() - aligned.x(), inter.y() - aligned.y(), inter.width() * scale, inter.height() *scale);
@@ -2101,6 +2101,20 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \value SP_MediaVolume Icon indicating a volume control.
     \value SP_MediaVolumeMuted Icon indicating a muted volume control.
     \value SP_LineEditClearButton Icon for a standard clear button in a QLineEdit. This enum value was added in Qt 5.2.
+    \value SP_DialogYesToAllButton Icon for a standard YesToAll button in a QDialogButtonBox.
+        This enum value was added in Qt 5.14.
+    \value SP_DialogNoToAllButton Icon for a standard NoToAll button in a QDialogButtonBox.
+        This enum value was added in Qt 5.14.
+    \value SP_DialogSaveAllButton Icon for a standard SaveAll button in a QDialogButtonBox.
+       This enum value was added in Qt 5.14.
+    \value SP_DialogAbortButton Icon for a standard Abort button in a QDialogButtonBox.
+       This enum value was added in Qt 5.14.
+    \value SP_DialogRetryButton Icon for a standard Retry button in a QDialogButtonBox.
+       This enum value was added in Qt 5.14.
+    \value SP_DialogIgnoreButton Icon for a standard Ignore button in a QDialogButtonBox.
+       This enum value was added in Qt 5.14.
+    \value SP_RestoreDefaultsButton Icon for a standard RestoreDefaults button in a QDialogButtonBox.
+       This enum value was added in Qt 5.14.
     \value SP_CustomBase  Base value for custom standard pixmaps;
     custom values must be greater than this value.
 
diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h
index 5ee37bd8e9..ee234457f5 100644
--- a/src/widgets/styles/qstyle.h
+++ b/src/widgets/styles/qstyle.h
@@ -832,6 +832,13 @@ public:
         SP_MediaVolume,
         SP_MediaVolumeMuted,
         SP_LineEditClearButton,
+        SP_DialogYesToAllButton,
+        SP_DialogNoToAllButton,
+        SP_DialogSaveAllButton,
+        SP_DialogAbortButton,
+        SP_DialogRetryButton,
+        SP_DialogIgnoreButton,
+        SP_RestoreDefaultsButton,
         // do not add any values below/greater than this
         SP_CustomBase = 0xf0000000
     };
diff --git a/src/widgets/styles/qstyle_p.h b/src/widgets/styles/qstyle_p.h
index 5bbde5fe17..7942cafaf7 100644
--- a/src/widgets/styles/qstyle_p.h
+++ b/src/widgets/styles/qstyle_p.h
@@ -66,7 +66,7 @@ class QStylePrivate: public QObjectPrivate
     Q_DECLARE_PUBLIC(QStyle)
 public:
     inline QStylePrivate()
-        : layoutSpacingIndex(-1), proxyStyle(0) {}
+        : layoutSpacingIndex(-1), proxyStyle(nullptr) {}
 
     static bool useFullScreenForPopup();
 
diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp
index 0b910d46df..4e61b2d1ec 100644
--- a/src/widgets/styles/qstylehelper.cpp
+++ b/src/widgets/styles/qstylehelper.cpp
@@ -40,6 +40,8 @@
 #include <qstyleoption.h>
 #include <qpainter.h>
 #include <qpixmapcache.h>
+#include <private/qhighdpiscaling_p.h>
+#include <private/qguiapplication_p.h>
 #include <private/qmath_p.h>
 #include <private/qstyle_p.h>
 #include <qmath.h>
@@ -49,6 +51,7 @@
 #include <qabstractscrollarea.h>
 #include <qwindow.h>
 
+#include <qmetaobject.h>
 #include "qstylehelper_p.h"
 #include <qstringbuilder.h>
 
@@ -79,15 +82,41 @@ QString uniqueName(const QString &key, const QStyleOption *option, const QSize &
     return tmp;
 }
 
-qreal dpiScaled(qreal value)
-{
-#ifdef Q_OS_MAC
-    // On mac the DPI is always 72 so we should not scale it
-    return value;
+#ifdef Q_OS_DARWIN
+static const qreal qstyleBaseDpi = 72;
 #else
-    static const qreal scale = qreal(qt_defaultDpiX()) / 96.0;
-    return value * scale;
+static const qreal qstyleBaseDpi = 96;
+#endif
+
+Q_WIDGETS_EXPORT qreal dpi(const QStyleOption *option)
+{
+#ifndef Q_OS_DARWIN
+    // Prioritize the application override, except for on macOS where
+    // we have historically not supported the AA_Use96Dpi flag.
+    if (QCoreApplication::testAttribute(Qt::AA_Use96Dpi))
+        return 96;
 #endif
+
+    // Expect that QStyleOption::QFontMetrics::QFont has the correct DPI set
+    if (option)
+        return option->fontMetrics.fontDpi();
+
+    return qstyleBaseDpi;
+}
+
+Q_WIDGETS_EXPORT qreal dpiScaled(qreal value, qreal dpi)
+{
+    return value * dpi / qstyleBaseDpi;
+}
+
+Q_WIDGETS_EXPORT qreal dpiScaled(qreal value, const QPaintDevice *device)
+{
+    return dpiScaled(value, device->logicalDpiX());
+}
+
+Q_WIDGETS_EXPORT qreal dpiScaled(qreal value, const QStyleOption *option)
+{
+    return dpiScaled(value, dpi(option));
 }
 
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h
index d79dfe4288..165608257a 100644
--- a/src/widgets/styles/qstylehelper_p.h
+++ b/src/widgets/styles/qstylehelper_p.h
@@ -40,6 +40,7 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qstring.h>
+#include <QtGui/qpaintdevice.h>
 #include <QtGui/qpolygon.h>
 #include <QtCore/qstringbuilder.h>
 #include <QtGui/qaccessible.h>
@@ -75,7 +76,13 @@ class QWindow;
 namespace QStyleHelper
 {
     QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size);
-    Q_WIDGETS_EXPORT qreal dpiScaled(qreal value);
+
+    Q_WIDGETS_EXPORT qreal dpi(const QStyleOption *option);
+
+    Q_WIDGETS_EXPORT qreal dpiScaled(qreal value, qreal dpi);
+    Q_WIDGETS_EXPORT qreal dpiScaled(qreal value, const QPaintDevice *device);
+    Q_WIDGETS_EXPORT qreal dpiScaled(qreal value, const QStyleOption *option);
+
 #if QT_CONFIG(dial)
     qreal angle(const QPointF &p1, const QPointF &p2);
     QPolygonF calcLines(const QStyleOptionSlider *dial);
@@ -89,11 +96,11 @@ namespace QStyleHelper
     Q_WIDGETS_EXPORT bool isInstanceOf(QObject *obj, QAccessible::Role role);
     Q_WIDGETS_EXPORT bool hasAncestor(QObject *obj, QAccessible::Role role);
 #endif
-    Q_WIDGETS_EXPORT QColor backgroundColor(const QPalette &pal, const QWidget* widget = 0);
+    Q_WIDGETS_EXPORT QColor backgroundColor(const QPalette &pal, const QWidget* widget = nullptr);
 
     enum WidgetSizePolicy { SizeLarge = 0, SizeSmall = 1, SizeMini = 2, SizeDefault = -1 };
 
-    Q_WIDGETS_EXPORT WidgetSizePolicy widgetSizePolicy(const QWidget *w, const QStyleOption *opt = 0);
+    Q_WIDGETS_EXPORT WidgetSizePolicy widgetSizePolicy(const QWidget *w, const QStyleOption *opt = nullptr);
 }
 
 
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 88031a9f1e..01cadd9a86 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -151,7 +151,7 @@ QT_BEGIN_NAMESPACE
 
 QStyleOption::QStyleOption(int version, int type)
     : version(version), type(type), state(QStyle::State_None),
-      direction(QApplication::layoutDirection()), fontMetrics(QFont()), styleObject(0)
+      direction(QGuiApplication::layoutDirection()), fontMetrics(QFont()), styleObject(0)
 {
 }
 
@@ -198,11 +198,6 @@ void QStyleOption::init(const QWidget *widget)
         state |= QStyle::State_Active;
     if (widget->isWindow())
         state |= QStyle::State_Window;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    extern bool qt_mac_can_clickThrough(const QWidget *w); //qwidget_mac.cpp
-    if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
-        state &= ~QStyle::State_Enabled;
-#endif
     switch (QStyleHelper::widgetSizePolicy(widget)) {
     case QStyleHelper::SizeSmall:
         state |= QStyle::State_Small;
@@ -1765,7 +1760,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version)
     \value Exclusive The item is an exclusive check item (like a radio button).
     \value NonExclusive The item is a non-exclusive check item (like a check box).
 
-    \sa checkType, QAction::checkable, QAction::checked, QActionGroup::exclusive
+    \sa checkType, QAction::checkable, QAction::checked, QActionGroup::exclusionPolicy
 */
 
 /*!
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 98a9f74f5b..3f57992311 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -615,7 +615,7 @@ public:
 public:
     int features;
     QBrush defaultBackground;
-    QFont font;
+    QFont font; // Be careful using this font directly. Prefer using font.resolve( )
     bool hasFont;
 
     QHash<QString, QVariant> styleHints;
@@ -851,7 +851,7 @@ QHash<QStyle::SubControl, QRect> QStyleSheetStyle::titleBarLayout(const QWidget
             info.rule = subRule;
             info.offset = offsets[where];
             info.where = where;
-            infos.append(qMove(info));
+            infos.append(std::move(info));
 
             offsets[where] += info.width;
         }
@@ -909,7 +909,7 @@ static QStyle::StandardPixmap subControlIcon(int pe)
 QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QObject *object)
 : features(0), hasFont(false), pal(0), b(0), bg(0), bd(0), ou(0), geo(0), p(0), img(0), clipset(0)
 {
-    QPalette palette = QApplication::palette(); // ###: ideally widget's palette
+    QPalette palette = QGuiApplication::palette(); // ###: ideally widget's palette
     ValueExtractor v(declarations, palette);
     features = v.extractStyleFeatures();
 
@@ -2734,7 +2734,7 @@ static void updateObjects(const QList<const QObject *>& objects)
     for (const QObject *object : objects) {
         if (auto widget = qobject_cast<QWidget*>(const_cast<QObject*>(object))) {
             widget->style()->polish(widget);
-            QApplication::sendEvent(widget, &event);
+            QCoreApplication::sendEvent(widget, &event);
             QList<const QObject *> children;
             children.reserve(widget->children().size() + 1);
             for (auto child: qAsConst(widget->children()))
@@ -3216,7 +3216,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
                 rule.drawRule(p, opt->rect);
                 toolOpt.rect = rule.contentsRect(opt->rect);
                 if (rule.hasFont)
-                    toolOpt.font = rule.font;
+                    toolOpt.font = rule.font.resolve(toolOpt.font);
                 drawControl(CE_ToolButtonLabel, &toolOpt, p, w);
             }
 
@@ -3451,7 +3451,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
     case CE_ToolButtonLabel:
         if (const QStyleOptionToolButton *btn = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) {
             if (rule.hasBox() || btn->features & QStyleOptionToolButton::Arrow) {
-                QCommonStyle::drawControl(ce, opt, p, w);
+                QWindowsStyle::drawControl(ce, opt, p, w);
             } else {
                 QStyleOptionToolButton butOpt(*btn);
                 rule.configurePalette(&butOpt.palette, QPalette::ButtonText, QPalette::Button);
@@ -3519,7 +3519,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
 
             const QFont oldFont = p->font();
             if (rule.hasFont)
-                p->setFont(rule.font);
+                p->setFont(rule.font.resolve(p->font()));
 
             if (rule.hasPosition() && rule.position()->textAlignment != 0) {
                 Qt::Alignment textAlignment = rule.position()->textAlignment;
@@ -3683,7 +3683,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
             subRule.configurePalette(&mi.palette, QPalette::HighlightedText, QPalette::Highlight);
             QFont oldFont = p->font();
             if (subRule.hasFont)
-                p->setFont(subRule.font.resolve(p->font()));
+                p->setFont(subRule.font.resolve(mi.font));
             else
                 p->setFont(mi.font);
 
@@ -3825,7 +3825,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
 
             if (subRule.hasDrawable()) {
                 subRule.drawRule(p, opt->rect);
-                QCommonStyle::drawControl(ce, &mi, p, w);
+                QCommonStyle::drawControl(ce, &mi, p, w); // deliberate bypass of the base
             } else {
                 if (rule.hasDrawable() && !(opt->state & QStyle::State_Selected)) {
                     // So that the menu bar background is not hidden by the items
@@ -4089,8 +4089,13 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
             subRule.configurePalette(&boxCopy.palette, QPalette::ButtonText, QPalette::Button);
             QFont oldFont = p->font();
             if (subRule.hasFont)
-                p->setFont(subRule.font);
+                p->setFont(subRule.font.resolve(p->font()));
             boxCopy.rect = subRule.contentsRect(opt->rect);
+            if (subRule.hasImage()) {
+                // the image is already drawn with CE_ToolBoxTabShape, adjust rect here
+                const int iconExtent = proxy()->pixelMetric(QStyle::PM_SmallIconSize, box, w);
+                boxCopy.rect.setLeft(boxCopy.rect.left() + iconExtent);
+            }
             QWindowsStyle::drawControl(ce, &boxCopy, p , w);
             if (subRule.hasFont)
                 p->setFont(oldFont);
@@ -4171,7 +4176,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
             subRule.configurePalette(&tabCopy.palette, QPalette::WindowText, QPalette::Base);
             QFont oldFont = p->font();
             if (subRule.hasFont)
-                p->setFont(subRule.font);
+                p->setFont(subRule.font.resolve(p->font()));
             if (subRule.hasBox() || !subRule.hasNativeBorder()) {
                 tabCopy.rect = ce == CE_TabBarTabShape ? subRule.borderRect(r)
                                                        : subRule.contentsRect(r);
@@ -5030,13 +5035,25 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op
                 QRenderRule subRule = renderRule(w, opt, PseudoElement_HeaderViewSection);
                 if (subRule.hasGeometry() || subRule.hasBox() || !subRule.hasNativeBorder() || subRule.hasFont) {
                     sz = subRule.adjustSize(csz);
+                    if (!sz.isValid()) {
+                        // Try to set the missing values based on the base style.
+                        const auto baseSize = baseStyle()->sizeFromContents(ct, opt, sz, w);
+                        if (sz.width() < 0)
+                            sz.setWidth(baseSize.width());
+                        if (sz.height() < 0)
+                            sz.setHeight(baseSize.height());
+                    }
                     if (!subRule.hasGeometry()) {
                         QSize nativeContentsSize;
                         bool nullIcon = hdr->icon.isNull();
                         const int margin = pixelMetric(QStyle::PM_HeaderMargin, hdr, w);
                         int iconSize = nullIcon ? 0 : pixelMetric(QStyle::PM_SmallIconSize, hdr, w);
-                        const QSize txt = subRule.hasFont ? QFontMetrics(subRule.font).size(0, hdr->text)
-                                                          : hdr->fontMetrics.size(0, hdr->text);
+                        QFontMetrics fm = hdr->fontMetrics;
+                        if (subRule.hasFont) {
+                            QFont styleFont = w ? subRule.font.resolve(w->font()) : subRule.font;
+                            fm = QFontMetrics(styleFont);
+                        }
+                        const QSize txt = fm.size(0, hdr->text);
                         nativeContentsSize.setHeight(margin + qMax(iconSize, txt.height()) + margin);
                         nativeContentsSize.setWidth((nullIcon ? 0 : margin) + iconSize
                                                     + (hdr->text.isNull() ? 0 : margin) + txt.width() + margin);
@@ -5153,13 +5170,6 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op
             sz = csz + QSize(vertical ? 0 : spaceForIcon, vertical ? spaceForIcon : 0);
             return subRule.boxSize(subRule.adjustSize(sz));
         }
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        if (baseStyle()->inherits("QMacStyle")) {
-            //adjust the size after the call to the style because the mac style ignore the size arguments anyway.
-            //this might cause the (max-){width,height} property to include the native style border while they should not.
-            return subRule.adjustSize(baseStyle()->sizeFromContents(ct, opt, csz, w));
-        }
-#endif
         sz = subRule.adjustSize(csz);
         break;
     }
@@ -6073,7 +6083,7 @@ void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const
         w->d_func()->directFontResolveMask = font.resolve();
 
         QEvent e(QEvent::FontChange);
-        QApplication::sendEvent(w, &e);
+        QCoreApplication::sendEvent(w, &e);
     }
 }
 
diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h
index 9c4b87fc32..c5266558af 100644
--- a/src/widgets/styles/qstylesheetstyle_p.h
+++ b/src/widgets/styles/qstylesheetstyle_p.h
@@ -82,40 +82,40 @@ public:
     ~QStyleSheetStyle();
 
     void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
-                            const QWidget *w = 0) const override;
+                            const QWidget *w = nullptr) const override;
     void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
-                     const QWidget *w = 0) const override;
+                     const QWidget *w = nullptr) const override;
     void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const override;
     void drawItemText(QPainter *painter, const QRect& rect, int alignment, const QPalette &pal,
               bool enabled, const QString& text, QPalette::ColorRole textRole  = QPalette::NoRole) const override;
     void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
-                       const QWidget *w = 0) const override;
+                       const QWidget *w = nullptr) const override;
     QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
                                 const QStyleOption *option) const override;
     SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
-                                     const QPoint &pt, const QWidget *w = 0) const override;
+                                     const QPoint &pt, const QWidget *w = nullptr) const override;
     QRect itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pixmap) const override;
     QRect itemTextRect(const QFontMetrics &metrics, const QRect &rect, int alignment, bool enabled,
                        const QString &text) const override;
-    int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override;
+    int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override;
     void polish(QWidget *widget) override;
     void polish(QApplication *app) override;
     void polish(QPalette &pal) override;
     QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
-                           const QSize &contentsSize, const QWidget *widget = 0) const override;
+                           const QSize &contentsSize, const QWidget *widget = nullptr) const override;
     QPalette standardPalette() const override;
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                       const QWidget *widget = 0) const override;
-    QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = 0,
-                           const QWidget *w = 0 ) const override;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = nullptr,
+                       const QWidget *widget = nullptr) const override;
+    QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = nullptr,
+                           const QWidget *w = nullptr ) const override;
     int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2,
-                          Qt::Orientation orientation, const QStyleOption *option = 0,
-                          const QWidget *widget = 0) const override;
-    int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0,
-                  QStyleHintReturn *shret = 0) const override;
-    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override;
+                          Qt::Orientation orientation, const QStyleOption *option = nullptr,
+                          const QWidget *widget = nullptr) const override;
+    int styleHint(StyleHint sh, const QStyleOption *opt = nullptr, const QWidget *w = nullptr,
+                  QStyleHintReturn *shret = nullptr) const override;
+    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const override;
     QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
-                         const QWidget *w = 0) const override;
+                         const QWidget *w = nullptr) const override;
 
     // These functions are called from QApplication/QWidget. Be careful.
     QStyle *baseStyle() const;
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index 4e450813cb..8496a2c223 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -84,6 +84,7 @@
 #include <qpa/qplatformscreen.h>
 #include <private/qguiapplication_p.h>
 #include <private/qhighdpiscaling_p.h>
+#include <private/qwidget_p.h>
 
 #include <private/qstylehelper_p.h>
 #if QT_CONFIG(animation)
@@ -119,10 +120,7 @@ enum QSliderDirection { SlUp, SlDown, SlLeft, SlRight };
     \internal
 */
 
-QWindowsStylePrivate::QWindowsStylePrivate()
-    : alt_down(false), menuBarTimer(0)
-{
-}
+QWindowsStylePrivate::QWindowsStylePrivate() = default;
 
 qreal QWindowsStylePrivate::appDevicePixelRatio()
 {
@@ -156,7 +154,7 @@ bool QWindowsStyle::eventFilter(QObject *o, QEvent *e)
             QList<QWidget *> l = widget->findChildren<QWidget *>();
             auto ignorable = [](QWidget *w) {
                 return w->isWindow() || !w->isVisible()
-                        || w->style()->styleHint(SH_UnderlineShortcut, 0, w);
+                        || w->style()->styleHint(SH_UnderlineShortcut, nullptr, w);
             };
             l.erase(std::remove_if(l.begin(), l.end(), ignorable), l.end());
             // Update states before repainting
@@ -241,14 +239,15 @@ void QWindowsStyle::polish(QApplication *app)
     QCommonStyle::polish(app);
     QWindowsStylePrivate *d = const_cast<QWindowsStylePrivate*>(d_func());
     // We only need the overhead when shortcuts are sometimes hidden
-    if (!proxy()->styleHint(SH_UnderlineShortcut, 0) && app)
+    if (!proxy()->styleHint(SH_UnderlineShortcut, nullptr) && app)
         app->installEventFilter(this);
 
-    d->activeCaptionColor = app->palette().highlight().color();
-    d->activeGradientCaptionColor = app->palette().highlight() .color();
-    d->inactiveCaptionColor = app->palette().dark().color();
-    d->inactiveGradientCaptionColor = app->palette().dark().color();
-    d->inactiveCaptionText = app->palette().window().color();
+    const auto &palette = QGuiApplication::palette();
+    d->activeGradientCaptionColor = palette.highlight().color();
+    d->activeCaptionColor = d->activeGradientCaptionColor;
+    d->inactiveGradientCaptionColor = palette.dark().color();
+    d->inactiveCaptionColor = d->inactiveGradientCaptionColor;
+    d->inactiveCaptionText = palette.window().color();
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) //fetch native title bar colors
     if(app->desktopSettingsAware()){
@@ -341,7 +340,6 @@ int QWindowsStylePrivate::fixedPixelMetric(QStyle::PixelMetric pm)
     case QStyle::PM_MenuVMargin:
     case QStyle::PM_ToolBarItemMargin:
         return 1;
-        break;
     case QStyle::PM_DockWidgetSeparatorExtent:
         return 4;
 #if QT_CONFIG(tabbar)
@@ -380,23 +378,12 @@ int QWindowsStylePrivate::fixedPixelMetric(QStyle::PixelMetric pm)
     return QWindowsStylePrivate::InvalidMetric;
 }
 
-static QWindow *windowOf(const QWidget *w)
+static QScreen *screenOf(const QWidget *w)
 {
-    QWindow *result = nullptr;
     if (w) {
-        result = w->windowHandle();
-        if (!result) {
-            if (const QWidget *np = w->nativeParentWidget())
-                result = np->windowHandle();
-        }
+        if (auto screen = qt_widget_private(const_cast<QWidget *>(w))->associatedScreen())
+            return screen;
     }
-    return result;
-}
-
-static QScreen *screenOf(const QWidget *w)
-{
-    if (const QWindow *window = windowOf(w))
-        return window->screen();
     return QGuiApplication::primaryScreen();
 }
 
@@ -405,8 +392,6 @@ static QScreen *screenOf(const QWidget *w)
 // and account for secondary screens with differing logical DPI.
 qreal QWindowsStylePrivate::nativeMetricScaleFactor(const QWidget *widget)
 {
-    if (!QHighDpiScaling::isActive())
-        return 1;
     qreal result = qreal(1) / QWindowsStylePrivate::devicePixelRatio(widget);
     if (QGuiApplicationPrivate::screen_list.size() > 1) {
         const QScreen *primaryScreen = QGuiApplication::primaryScreen();
@@ -432,7 +417,7 @@ int QWindowsStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const QW
 
     ret = QWindowsStylePrivate::fixedPixelMetric(pm);
     if (ret != QWindowsStylePrivate::InvalidMetric)
-        return int(QStyleHelper::dpiScaled(ret));
+        return int(QStyleHelper::dpiScaled(ret, opt));
 
     ret = 0;
 
@@ -478,7 +463,7 @@ int QWindowsStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const QW
         break;
 
     case PM_SplitterWidth:
-        ret = qMax(int(QStyleHelper::dpiScaled(4)), QApplication::globalStrut().width());
+        ret = qMax(int(QStyleHelper::dpiScaled(4, opt)), QApplication::globalStrut().width());
         break;
 
     default:
@@ -707,17 +692,17 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
                 x -= 2;
             if (opt->rect.height() > 4) {
                 qDrawShadePanel(p, x, 2, 3, opt->rect.height() - 4,
-                                opt->palette, false, 1, 0);
+                                opt->palette, false, 1, nullptr);
                 qDrawShadePanel(p, x + 3, 2, 3, opt->rect.height() - 4,
-                                opt->palette, false, 1, 0);
+                                opt->palette, false, 1, nullptr);
             }
         } else {
             if (opt->rect.width() > 4) {
                 int y = opt->rect.height() / 2 - 4;
                 qDrawShadePanel(p, 2, y, opt->rect.width() - 4, 3,
-                                opt->palette, false, 1, 0);
+                                opt->palette, false, 1, nullptr);
                 qDrawShadePanel(p, 2, y + 3, opt->rect.width() - 4, 3,
-                                opt->palette, false, 1, 0);
+                                opt->palette, false, 1, nullptr);
             }
         }
         p->restore();
@@ -768,7 +753,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
                 }
             } else {
                 qDrawWinButton(p, opt->rect, opt->palette,
-                               opt->state & (State_Sunken | State_On), panel ? &fill : 0);
+                               opt->state & (State_Sunken | State_On), panel ? &fill : nullptr);
             }
         } else {
             p->fillRect(opt->rect, fill);
@@ -802,8 +787,11 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
         QPen oldPen = p->pen();
         p->setPen(QPen(opt->palette.shadow().color(), 0));
         QRectF rect = opt->rect;
-        rect.adjust(QStyleHelper::dpiScaled(0.5), QStyleHelper::dpiScaled(0.5),
-                    QStyleHelper::dpiScaled(-1.5), QStyleHelper::dpiScaled(-1.5));
+        const qreal dpi = QStyleHelper::dpi(opt);
+        const qreal topLevelAdjustment = QStyleHelper::dpiScaled(0.5, dpi);
+        const qreal bottomRightAdjustment = QStyleHelper::dpiScaled(-1.5, dpi);
+        rect.adjust(topLevelAdjustment, topLevelAdjustment,
+                    bottomRightAdjustment, bottomRightAdjustment);
         p->drawRect(rect);
         p->setPen(oldPen);
         break;
@@ -986,7 +974,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
 
         if (opt->state & (State_Raised | State_On | State_Sunken)) {
             qDrawWinButton(p, opt->rect, opt->palette, opt->state & (State_Sunken | State_On),
-                           panel ? &fill : 0);
+                           panel ? &fill : nullptr);
         } else {
             if (panel)
                 p->fillRect(opt->rect, fill);
@@ -1011,7 +999,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
 #endif // QT_CONFIG(dockwidget)
 
     case PE_FrameStatusBarItem:
-        qDrawShadePanel(p, opt->rect, opt->palette, true, 1, 0);
+        qDrawShadePanel(p, opt->rect, opt->palette, true, 1, nullptr);
         break;
 
     case PE_IndicatorProgressChunk:
@@ -1049,7 +1037,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
         break;
 
     case PE_FrameTabWidget: {
-        qDrawWinButton(p, opt->rect, opt->palette, false, 0);
+        qDrawWinButton(p, opt->rect, opt->palette, false, nullptr);
         break;
     }
     default:
@@ -1591,6 +1579,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                 case QStyleOptionToolBar::Beginning:
                 case QStyleOptionToolBar::OnlyOne:
                     paintBottomBorder = false;
+                    break;
                 default:
                     break;
                 }
@@ -1606,6 +1595,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                 case QStyleOptionToolBar::OnlyOne:
                     paintRightBorder = false;
                     paintLeftBorder = false;
+                    break;
                 default:
                     break;
                 }
@@ -2310,8 +2300,9 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
             int defwidth = 0;
             if (btn->features & QStyleOptionButton::AutoDefaultButton)
                 defwidth = 2 * proxy()->pixelMetric(PM_ButtonDefaultIndicator, btn, widget);
-            int minwidth = int(QStyleHelper::dpiScaled(75.));
-            int minheight = int(QStyleHelper::dpiScaled(23.));
+            const qreal dpi = QStyleHelper::dpi(opt);
+            int minwidth = int(QStyleHelper::dpiScaled(75, dpi));
+            int minheight = int(QStyleHelper::dpiScaled(23, dpi));
 
 #ifndef QT_QWS_SMALL_PUSHBUTTON
             if (w < minwidth + defwidth && !btn->text.isEmpty())
diff --git a/src/widgets/styles/qwindowsstyle_p.h b/src/widgets/styles/qwindowsstyle_p.h
index 47816ff651..b5f0bd68a1 100644
--- a/src/widgets/styles/qwindowsstyle_p.h
+++ b/src/widgets/styles/qwindowsstyle_p.h
@@ -77,25 +77,25 @@ public:
     void polish(QPalette &) override;
 
     void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
-                       const QWidget *w = 0) const override;
+                       const QWidget *w = nullptr) const override;
     void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
-                     const QWidget *w = 0) const override;
-    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override;
+                     const QWidget *w = nullptr) const override;
+    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const override;
     void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
-                            const QWidget *w = 0) const override;
+                            const QWidget *w = nullptr) const override;
     QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
-                           const QSize &contentsSize, const QWidget *widget = 0) const override;
+                           const QSize &contentsSize, const QWidget *widget = nullptr) const override;
 
-    int pixelMetric(PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const override;
+    int pixelMetric(PixelMetric pm, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override;
 
-    int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0,
-                  QStyleHintReturn *returnData = 0) const override;
+    int styleHint(StyleHint hint, const QStyleOption *opt = nullptr, const QWidget *widget = nullptr,
+                  QStyleHintReturn *returnData = nullptr) const override;
 
     QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
-                           const QWidget *widget = 0) const override;
+                           const QWidget *widget = nullptr) const override;
 
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
-                       const QWidget *widget = 0) const override;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr,
+                       const QWidget *widget = nullptr) const override;
 
 protected:
     bool eventFilter(QObject *o, QEvent *e) override;
diff --git a/src/widgets/styles/qwindowsstyle_p_p.h b/src/widgets/styles/qwindowsstyle_p_p.h
index 67fa6a2f86..4f6ffcefc2 100644
--- a/src/widgets/styles/qwindowsstyle_p_p.h
+++ b/src/widgets/styles/qwindowsstyle_p_p.h
@@ -69,17 +69,17 @@ public:
     enum { InvalidMetric = -23576 };
 
     QWindowsStylePrivate();
-    static int pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0);
+    static int pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *option = nullptr, const QWidget *widget = nullptr);
     static int fixedPixelMetric(QStyle::PixelMetric pm);
-    static qreal devicePixelRatio(const QWidget *widget = 0)
+    static qreal devicePixelRatio(const QWidget *widget = nullptr)
         { return widget ? widget->devicePixelRatioF() : QWindowsStylePrivate::appDevicePixelRatio(); }
     static qreal nativeMetricScaleFactor(const QWidget *widget = nullptr);
 
     bool hasSeenAlt(const QWidget *widget) const;
     bool altDown() const { return alt_down; }
-    bool alt_down;
+    bool alt_down = false;
     QList<const QWidget *> seenAlt;
-    int menuBarTimer;
+    int menuBarTimer = 0;
 
     QColor inactiveCaptionText;
     QColor activeCaptionColor;
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index e41f7e7573..7b69eff30c 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -145,7 +145,9 @@
 
 #include "QtWidgets/qscrollbar.h"
 #include "QtCore/qdir.h"
+#if QT_CONFIG(stringlistmodel)
 #include "QtCore/qstringlistmodel.h"
+#endif
 #if QT_CONFIG(dirmodel)
 #include "QtWidgets/qdirmodel.h"
 #endif
@@ -159,6 +161,7 @@
 #include "QtWidgets/qapplication.h"
 #include "QtGui/qevent.h"
 #include "QtWidgets/qdesktopwidget.h"
+#include <private/qapplication_p.h>
 #include <private/qdesktopwidget_p.h>
 #if QT_CONFIG(lineedit)
 #include "QtWidgets/qlineedit.h"
@@ -1414,7 +1417,7 @@ bool QCompleter::eventFilter(QObject *o, QEvent *e)
             // widget lost focus, hide the popup
             if (d->widget && (!d->widget->hasFocus()
 #ifdef QT_KEYPAD_NAVIGATION
-                || (QApplication::keypadNavigationEnabled() && !d->widget->hasEditFocus())
+                || (QApplicationPrivate::keypadNavigationEnabled() && !d->widget->hasEditFocus())
 #endif
                 ))
                 d->popup->hide();
@@ -1432,7 +1435,7 @@ bool QCompleter::eventFilter(QObject *o, QEvent *e)
         switch (key) {
 #ifdef QT_KEYPAD_NAVIGATION
         case Qt::Key_Select:
-            if (!QApplication::keypadNavigationEnabled())
+            if (!QApplicationPrivate::keypadNavigationEnabled())
                 break;
 #endif
         case Qt::Key_Return:
@@ -1462,7 +1465,7 @@ bool QCompleter::eventFilter(QObject *o, QEvent *e)
 #ifdef QT_KEYPAD_NAVIGATION
     case QEvent::KeyRelease: {
         QKeyEvent *ke = static_cast<QKeyEvent *>(e);
-        if (QApplication::keypadNavigationEnabled() && ke->key() == Qt::Key_Back) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && ke->key() == Qt::Key_Back) {
             // Send the event to the 'widget'. This is what we did for KeyPress, so we need
             // to do the same for KeyRelease, in case the widget's KeyPress event set
             // up something (such as a timer) that is relying on also receiving the
@@ -1479,7 +1482,7 @@ bool QCompleter::eventFilter(QObject *o, QEvent *e)
 
     case QEvent::MouseButtonPress: {
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             // if we've clicked in the widget (or its descendant), let it handle the click
             QWidget *source = qobject_cast<QWidget *>(o);
             if (source) {
@@ -1504,7 +1507,7 @@ bool QCompleter::eventFilter(QObject *o, QEvent *e)
 
     case QEvent::InputMethod:
     case QEvent::ShortcutOverride:
-        QApplication::sendEvent(d->widget, e);
+        QCoreApplication::sendEvent(d->widget, e);
         break;
 
     default:
diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h
index 21dddf446e..a52e63a6e2 100644
--- a/src/widgets/util/qcompleter_p.h
+++ b/src/widgets/util/qcompleter_p.h
@@ -75,7 +75,7 @@ class QCompleterPrivate : public QObjectPrivate
 public:
     QCompleterPrivate();
     ~QCompleterPrivate() { delete popup; }
-    void init(QAbstractItemModel *model = 0);
+    void init(QAbstractItemModel *model = nullptr);
 
     QPointer<QWidget> widget;
     QCompletionModel *proxy;
diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp
index a8b2a00a80..14a30ce7cf 100644
--- a/src/widgets/util/qflickgesture.cpp
+++ b/src/widgets/util/qflickgesture.cpp
@@ -228,7 +228,7 @@ public:
             // we did send a press, so we need to fake a release now
 
             // release all pressed mouse buttons
-            /* Qt::MouseButtons mouseButtons = QApplication::mouseButtons();
+            /* Qt::MouseButtons mouseButtons = QGuiApplication::mouseButtons();
             for (int i = 0; i < 32; ++i) {
                 if (mouseButtons & (1 << i)) {
                     Qt::MouseButton b = static_cast<Qt::MouseButton>(1 << i);
@@ -237,7 +237,7 @@ public:
 
                     qFGDebug() << "QFG: sending a fake mouse release at far-far-away to " << mouseTarget;
                     QMouseEvent re(QEvent::MouseButtonRelease, QPoint(), farFarAway,
-                                   b, mouseButtons, QApplication::keyboardModifiers());
+                                   b, mouseButtons, QGuiApplication::keyboardModifiers());
                     sendMouseEvent(&re);
                 }
             }*/
@@ -246,8 +246,8 @@ public:
 
             qFGDebug() << "QFG: sending a fake mouse release at far-far-away to " << mouseTarget;
             QMouseEvent re(QEvent::MouseButtonRelease, QPoint(), farFarAway, farFarAway,
-                           mouseButton, QApplication::mouseButtons() & ~mouseButton,
-                           QApplication::keyboardModifiers(), mouseEventSource);
+                           mouseButton, QGuiApplication::mouseButtons() & ~mouseButton,
+                           QGuiApplication::keyboardModifiers(), mouseEventSource);
             sendMouseEvent(&re, RegrabMouseAfterwards);
             // don't clear the mouseTarget just yet, since we need to explicitly ungrab the mouse on release!
         }
@@ -462,21 +462,6 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state,
         }
         break;
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // the only way to distinguish between real mouse wheels and wheel
-    // events generated by the native 2 finger swipe gesture is to listen
-    // for these events (according to Apple's Cocoa Event-Handling Guide)
-
-    case QEvent::NativeGesture: {
-        QNativeGestureEvent *nge = static_cast<QNativeGestureEvent *>(event);
-        if (nge->gestureType == QNativeGestureEvent::GestureBegin)
-            d->macIgnoreWheel = true;
-        else if (nge->gestureType == QNativeGestureEvent::GestureEnd)
-            d->macIgnoreWheel = false;
-        break;
-    }
-#endif
-
     // consume all wheel events if the scroller is active
     case QEvent::Wheel:
         if (d->macIgnoreWheel || (scroller->state() != QScroller::Inactive))
diff --git a/src/widgets/util/qflickgesture_p.h b/src/widgets/util/qflickgesture_p.h
index d5ace887ae..0b47516047 100644
--- a/src/widgets/util/qflickgesture_p.h
+++ b/src/widgets/util/qflickgesture_p.h
@@ -71,7 +71,7 @@ class Q_WIDGETS_EXPORT QFlickGesture : public QGesture
     Q_DECLARE_PRIVATE(QFlickGesture)
 
 public:
-    QFlickGesture(QObject *receiver, Qt::MouseButton button, QObject *parent = 0);
+    QFlickGesture(QObject *receiver, Qt::MouseButton button, QObject *parent = nullptr);
     ~QFlickGesture();
 
     friend class QFlickGestureRecognizer;
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp
index 1e84237253..df05bbf71c 100644
--- a/src/widgets/util/qscroller.cpp
+++ b/src/widgets/util/qscroller.cpp
@@ -1031,7 +1031,8 @@ void QScrollerPrivate::setDpi(const QPointF &dpi)
 */
 void QScrollerPrivate::setDpiFromWidget(QWidget *widget)
 {
-    const QScreen *screen = QGuiApplication::screens().at(QApplication::desktop()->screenNumber(widget));
+    const QScreen *screen = widget ? widget->screen() : QGuiApplication::primaryScreen();
+    Q_ASSERT(screen);
     setDpi(QPointF(screen->physicalDotsPerInchX(), screen->physicalDotsPerInchY()));
 }
 
diff --git a/src/widgets/util/qscrollerproperties.cpp b/src/widgets/util/qscrollerproperties.cpp
index c26fba2cd3..df6b899fe4 100644
--- a/src/widgets/util/qscrollerproperties.cpp
+++ b/src/widgets/util/qscrollerproperties.cpp
@@ -40,9 +40,6 @@
 #include <QPointer>
 #include <QObject>
 #include <QtCore/qmath.h>
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-#  include <QLibrary>
-#endif
 
 #include "qscrollerproperties.h"
 #include "private/qscrollerproperties_p.h"
@@ -73,10 +70,6 @@ QScrollerPropertiesPrivate *QScrollerPropertiesPrivate::defaults()
         spp.overshootDragDistanceFactor = qreal(1);
         spp.overshootScrollDistanceFactor = qreal(0.5);
         spp.overshootScrollTime = qreal(0.7);
-#  if 0 // Used to be included in Qt4 for Q_WS_WIN
-        if (QLibrary::resolve(QLatin1String("UxTheme"), "BeginPanningFeedback"))
-            spp.overshootScrollTime = qreal(0.35);
-#  endif
         spp.hOvershootPolicy = QScrollerProperties::OvershootWhenScrollable;
         spp.vOvershootPolicy = QScrollerProperties::OvershootWhenScrollable;
         spp.frameRate = QScrollerProperties::Standard;
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index a38a50d3df..fd18888870 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -626,16 +626,6 @@ void QBalloonTip::balloon(const QPoint& pos, int msecs, bool showArrow)
     }
 
     QPainterPath path;
-#if defined(QT_NO_XSHAPE) && 0 /* Used to be included in Qt4 for Q_WS_X11 */
-    // XShape is required for setting the mask, so we just
-    // draw an ugly square when its not available
-    path.moveTo(0, 0);
-    path.lineTo(sz.width() - 1, 0);
-    path.lineTo(sz.width() - 1, sz.height() - 1);
-    path.lineTo(0, sz.height() - 1);
-    path.lineTo(0, 0);
-    move(qMax(pos.x() - sz.width(), scr.left()), pos.y());
-#else
     path.moveTo(ml + rc, mt);
     if (arrowAtTop && arrowAtLeft) {
         if (showArrow) {
@@ -685,7 +675,6 @@ void QBalloonTip::balloon(const QPoint& pos, int msecs, bool showArrow)
     painter1.setBrush(QBrush(Qt::color1));
     painter1.drawPath(path);
     setMask(bitmap);
-#endif
 
     // Draw the border
     pixmap = QPixmap(sz);
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
index 70e5f3678e..0c7bb94a91 100644
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
@@ -151,11 +151,11 @@ bool QSystemTrayIconSys::event(QEvent *e)
 {
     switch (e->type()) {
     case QEvent::ToolTip:
-        QApplication::sendEvent(q, e);
+        QCoreApplication::sendEvent(q, e);
         break;
 #if QT_CONFIG(wheelevent)
     case QEvent::Wheel:
-        return QApplication::sendEvent(q, e);
+        return QCoreApplication::sendEvent(q, e);
 #endif
     default:
         break;
diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h
index 04bc381114..05c9e0d27e 100644
--- a/src/widgets/util/qundostack_p.h
+++ b/src/widgets/util/qundostack_p.h
@@ -80,7 +80,7 @@ class QUndoStackPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QUndoStack)
 public:
-    QUndoStackPrivate() : index(0), clean_index(0), group(0), undo_limit(0) {}
+    QUndoStackPrivate() : index(0), clean_index(0), group(nullptr), undo_limit(0) {}
 
     QList<QUndoCommand*> command_list;
     QList<QUndoCommand*> macro_stack;
@@ -98,7 +98,7 @@ class QUndoAction : public QAction
 {
     Q_OBJECT
 public:
-    explicit QUndoAction(const QString &prefix, QObject *parent = 0);
+    explicit QUndoAction(const QString &prefix, QObject *parent = nullptr);
     void setTextFormat(const QString &textFormat, const QString &defaultText);
 public Q_SLOTS:
     void setPrefixedText(const QString &text);
diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri
index a3bd8897f1..363291528e 100644
--- a/src/widgets/util/util.pri
+++ b/src/widgets/util/util.pri
@@ -54,7 +54,3 @@ qtConfig(xcb) {
 } else {
     SOURCES += util/qsystemtrayicon_qpa.cpp
 }
-
-mac {
-    OBJECTIVE_SOURCES += util/qscroller_mac.mm
-}
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index e556cb8b10..6f807e1696 100644
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -32,8 +32,6 @@ qtConfig(graphicseffect) {
 
 QMAKE_LIBS += $$QMAKE_LIBS_GUI
 
-contains(DEFINES,QT_EVAL):include($$QT_SOURCE_TREE/src/corelib/eval.pri)
-
 QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtWidgets.dynlist
 
 # Code coverage with TestCocoon
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index f30a3bc7b8..d956d2ba23 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -44,6 +44,7 @@
 #endif
 #if QT_CONFIG(buttongroup)
 #include "qbuttongroup.h"
+#include "private/qapplication_p.h"
 #include "private/qbuttongroup_p.h"
 #endif
 #include "qabstractbutton_p.h"
@@ -319,7 +320,7 @@ void QAbstractButtonPrivate::moveFocus(int key)
 
     if (exclusive
 #ifdef QT_KEYPAD_NAVIGATION
-        && !QApplication::keypadNavigationEnabled()
+        && !QApplicationPrivate::keypadNavigationEnabled()
 #endif
         && candidate
         && fb->d_func()->checked
@@ -1063,7 +1064,7 @@ void QAbstractButton::keyPressEvent(QKeyEvent *e)
     case Qt::Key_Right:
     case Qt::Key_Down: {
 #ifdef QT_KEYPAD_NAVIGATION
-        if ((QApplication::keypadNavigationEnabled()
+        if ((QApplicationPrivate::keypadNavigationEnabled()
                 && (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right))
                 || (!QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional
                 || (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down))) {
@@ -1159,7 +1160,7 @@ void QAbstractButton::focusInEvent(QFocusEvent *e)
 {
     Q_D(QAbstractButton);
 #ifdef QT_KEYPAD_NAVIGATION
-    if (!QApplication::keypadNavigationEnabled())
+    if (!QApplicationPrivate::keypadNavigationEnabled())
 #endif
     d->fixFocusPolicy();
     QWidget::focusInEvent(e);
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index 5ea8330db2..d2372a7be9 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -62,10 +62,6 @@
 
 #include <private/qapplication_p.h>
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-#include <private/qt_mac_p.h>
-#include <private/qt_cocoa_helpers_mac_p.h>
-#endif
 #ifdef Q_OS_WIN
 #  include <qt_windows.h>
 #endif
@@ -169,9 +165,6 @@ QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate()
      shownOnce(false), inResize(false), sizeAdjustPolicy(QAbstractScrollArea::AdjustIgnored),
      viewport(0), cornerWidget(0), left(0), top(0), right(0), bottom(0),
      xoffset(0), yoffset(0), viewportFilter(0)
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-     , singleFingerPanEnabled(false)
-#endif
 {
 }
 
@@ -322,16 +315,6 @@ void QAbstractScrollAreaPrivate::init()
 #endif
 }
 
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-void QAbstractScrollAreaPrivate::setSingleFingerPanEnabled(bool on)
-{
-    singleFingerPanEnabled = on;
-    QWidgetPrivate *dd = static_cast<QWidgetPrivate *>(QObjectPrivate::get(viewport));
-    if (dd)
-        dd->winSetupGestures();
-}
-#endif
-
 void QAbstractScrollAreaPrivate::layoutChildren()
 {
     bool needH = false;
@@ -362,38 +345,6 @@ void QAbstractScrollAreaPrivate::layoutChildren_helper(bool *needHorizontalScrol
     const int hscrollOverlap = hbar->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarOverlap, &opt, hbar);
     const int vscrollOverlap = vbar->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarOverlap, &opt, vbar);
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    QWidget * const window = q->window();
-
-    // Use small scroll bars for tool windows, to match the native size grip.
-    bool hbarIsSmall = hbar->testAttribute(Qt::WA_MacSmallSize);
-    bool vbarIsSmall = vbar->testAttribute(Qt::WA_MacSmallSize);
-    const Qt::WindowType windowType = window->windowType();
-    if (windowType == Qt::Tool) {
-        if (!hbarIsSmall) {
-            hbar->setAttribute(Qt::WA_MacMiniSize, false);
-            hbar->setAttribute(Qt::WA_MacNormalSize, false);
-            hbar->setAttribute(Qt::WA_MacSmallSize, true);
-        }
-        if (!vbarIsSmall) {
-            vbar->setAttribute(Qt::WA_MacMiniSize, false);
-            vbar->setAttribute(Qt::WA_MacNormalSize, false);
-            vbar->setAttribute(Qt::WA_MacSmallSize, true);
-        }
-    } else {
-        if (hbarIsSmall) {
-            hbar->setAttribute(Qt::WA_MacMiniSize, false);
-            hbar->setAttribute(Qt::WA_MacNormalSize, false);
-            hbar->setAttribute(Qt::WA_MacSmallSize, false);
-        }
-        if (vbarIsSmall) {
-            vbar->setAttribute(Qt::WA_MacMiniSize, false);
-            vbar->setAttribute(Qt::WA_MacNormalSize, false);
-            vbar->setAttribute(Qt::WA_MacSmallSize, false);
-        }
-     }
-#endif
-
     const int hsbExt = hbar->sizeHint().height();
     const int vsbExt = vbar->sizeHint().width();
     const QPoint extPoint(vsbExt, hsbExt);
@@ -403,30 +354,6 @@ void QAbstractScrollAreaPrivate::layoutChildren_helper(bool *needHorizontalScrol
 
     const bool hasCornerWidget = (cornerWidget != 0);
 
-// If the scroll bars are at the very right and bottom of the window we
-// move their positions to be aligned with the size grip.
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // Check if a native sizegrip is present.
-    bool hasMacReverseSizeGrip = false;
-    bool hasMacSizeGrip = false;
-    bool nativeGripPresent = false;
-    if (q->testAttribute(Qt::WA_WState_Created))
-        nativeGripPresent = qt_mac_checkForNativeSizeGrip(q);
-
-    if (nativeGripPresent) {
-        // Look for a native size grip at the visual window bottom right and at the
-        // absolute window bottom right. In reverse mode, the native size grip does not
-        // swich side, so we need to check if it is on the "wrong side".
-        const QPoint scrollAreaBottomRight = q->mapTo(window, widgetRect.bottomRight() - QPoint(frameWidth, frameWidth));
-        const QPoint windowBottomRight = window->rect().bottomRight();
-        const QPoint visualWindowBottomRight = QStyle::visualPos(opt.direction, opt.rect, windowBottomRight);
-        const QPoint offset = windowBottomRight - scrollAreaBottomRight;
-        const QPoint visualOffset = visualWindowBottomRight - scrollAreaBottomRight;
-        hasMacSizeGrip = (visualOffset.manhattanLength() < vsbExt);
-        hasMacReverseSizeGrip = (hasMacSizeGrip == false && (offset.manhattanLength() < hsbExt));
-    }
-#endif
-
     QPoint cornerOffset((needv && vscrollOverlap == 0) ? vsbExt : 0, (needh && hscrollOverlap == 0) ? hsbExt : 0);
     QRect controlsRect;
     QRect viewportRect;
@@ -458,12 +385,6 @@ void QAbstractScrollAreaPrivate::layoutChildren_helper(bool *needHorizontalScrol
     if (hasCornerWidget && ((needv && vscrollOverlap == 0) || (needh && hscrollOverlap == 0)))
         cornerOffset =  extPoint;
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    // Also move the scroll bars if they are covered by the native Mac size grip.
-    if (hasMacSizeGrip)
-        cornerOffset =  extPoint;
-#endif
-
     // The corner point is where the scroll bar rects, the corner widget rect and the
     // viewport rect meets.
     const QPoint cornerPoint(controlsRect.bottomRight() + QPoint(1, 1) - cornerOffset);
@@ -475,13 +396,6 @@ void QAbstractScrollAreaPrivate::layoutChildren_helper(bool *needHorizontalScrol
     else
         cornerPaintingRect = QRect();
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    if (hasMacReverseSizeGrip)
-        reverseCornerPaintingRect = QRect(controlsRect.bottomRight() + QPoint(1, 1) - extPoint, extSize);
-    else
-        reverseCornerPaintingRect = QRect();
-#endif
-
     // move the scrollbars away from top/left headers
     int vHeaderRight = 0;
     int hHeaderBottom = 0;
@@ -501,10 +415,7 @@ void QAbstractScrollAreaPrivate::layoutChildren_helper(bool *needHorizontalScrol
 #endif // QT_CONFIG(itemviews)
     if (needh) {
         QRect horizontalScrollBarRect(QPoint(controlsRect.left() + vHeaderRight, cornerPoint.y()), QPoint(cornerPoint.x() - 1, controlsRect.bottom()));
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        if (hasMacReverseSizeGrip)
-            horizontalScrollBarRect.adjust(vsbExt, 0, 0, 0);
-#endif
+
         if (!hasCornerWidget && htransient)
             horizontalScrollBarRect.adjust(0, 0, cornerOffset.x(), 0);
         scrollBarContainers[Qt::Horizontal]->setGeometry(QStyle::visualRect(opt.direction, opt.rect, horizontalScrollBarRect));
@@ -617,11 +528,9 @@ void QAbstractScrollArea::setViewport(QWidget *widget)
         d->viewport->setParent(this);
         d->viewport->setFocusProxy(this);
         d->viewport->installEventFilter(d->viewportFilter.data());
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
 #ifndef QT_NO_GESTURES
         d->viewport->grabGesture(Qt::PanGesture);
 #endif
-#endif
         d->layoutChildren();
 #ifndef QT_NO_OPENGL
         QWidgetPrivate::get(d->viewport)->initializeViewportFramebuffer();
@@ -1043,13 +952,6 @@ bool QAbstractScrollArea::event(QEvent *e)
             QPainter p(this);
             style()->drawPrimitive(QStyle::PE_PanelScrollAreaCorner, &option, &p, this);
         }
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        if (d->reverseCornerPaintingRect.isValid()) {
-            option.rect = d->reverseCornerPaintingRect;
-            QPainter p(this);
-            style()->drawPrimitive(QStyle::PE_PanelScrollAreaCorner, &option, &p, this);
-        }
-#endif
         }
         QFrame::paintEvent((QPaintEvent*)e);
         break;
@@ -1086,7 +988,7 @@ bool QAbstractScrollArea::event(QEvent *e)
             QScrollBar *vBar = verticalScrollBar();
             QPointF delta = g->delta();
             if (!delta.isNull()) {
-                if (QApplication::isRightToLeft())
+                if (QGuiApplication::isRightToLeft())
                     delta.rx() *= -1;
                 int newX = hBar->value() - delta.x();
                 int newY = vBar->value() - delta.y();
@@ -1122,38 +1024,10 @@ bool QAbstractScrollArea::event(QEvent *e)
         hBar->setValue(se->contentPos().x());
         vBar->setValue(se->contentPos().y());
 
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-        typedef BOOL (*PtrBeginPanningFeedback)(HWND);
-        typedef BOOL (*PtrUpdatePanningFeedback)(HWND, LONG, LONG, BOOL);
-        typedef BOOL (*PtrEndPanningFeedback)(HWND, BOOL);
-
-        static PtrBeginPanningFeedback ptrBeginPanningFeedback = 0;
-        static PtrUpdatePanningFeedback ptrUpdatePanningFeedback = 0;
-        static PtrEndPanningFeedback ptrEndPanningFeedback = 0;
-
-        if (!ptrBeginPanningFeedback)
-            ptrBeginPanningFeedback = (PtrBeginPanningFeedback) QLibrary::resolve(QLatin1String("UxTheme"), "BeginPanningFeedback");
-        if (!ptrUpdatePanningFeedback)
-            ptrUpdatePanningFeedback = (PtrUpdatePanningFeedback) QLibrary::resolve(QLatin1String("UxTheme"), "UpdatePanningFeedback");
-        if (!ptrEndPanningFeedback)
-            ptrEndPanningFeedback = (PtrEndPanningFeedback) QLibrary::resolve(QLatin1String("UxTheme"), "EndPanningFeedback");
-
-        if (ptrBeginPanningFeedback && ptrUpdatePanningFeedback && ptrEndPanningFeedback) {
-            WId wid = window()->winId();
-
-            if (!se->overshootDistance().isNull() && d->overshoot.isNull())
-                ptrBeginPanningFeedback(wid);
-            if (!se->overshootDistance().isNull())
-                ptrUpdatePanningFeedback(wid, -se->overshootDistance().x(), -se->overshootDistance().y(), false);
-            if (se->overshootDistance().isNull() && !d->overshoot.isNull())
-                ptrEndPanningFeedback(wid, true);
-        } else
-#endif
-        {
-            QPoint delta = d->overshoot - se->overshootDistance().toPoint();
-            if (!delta.isNull())
-                viewport()->move(viewport()->pos() + delta);
-        }
+        QPoint delta = d->overshoot - se->overshootDistance().toPoint();
+        if (!delta.isNull())
+            viewport()->move(viewport()->pos() + delta);
+
         d->overshoot = se->overshootDistance().toPoint();
 
         return true;
@@ -1270,11 +1144,14 @@ void QAbstractScrollArea::paintEvent(QPaintEvent*)
     mouse press events for the viewport() widget. The event is passed
     in \a e.
 
+    The default implementation calls QWidget::mousePressEvent() for
+    default popup handling.
+
     \sa QWidget::mousePressEvent()
 */
 void QAbstractScrollArea::mousePressEvent(QMouseEvent *e)
 {
-    e->ignore();
+    QWidget::mousePressEvent(e);
 }
 
 /*!
@@ -1324,10 +1201,10 @@ void QAbstractScrollArea::mouseMoveEvent(QMouseEvent *e)
 void QAbstractScrollArea::wheelEvent(QWheelEvent *e)
 {
     Q_D(QAbstractScrollArea);
-    if (e->orientation() == Qt::Horizontal)
-        QApplication::sendEvent(d->hbar, e);
+    if (qAbs(e->angleDelta().x()) > qAbs(e->angleDelta().y()))
+        QCoreApplication::sendEvent(d->hbar, e);
     else
-        QApplication::sendEvent(d->vbar, e);
+        QCoreApplication::sendEvent(d->vbar, e);
 }
 #endif
 
@@ -1362,7 +1239,7 @@ void QAbstractScrollArea::keyPressEvent(QKeyEvent * e)
 #endif
     } else {
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
             e->ignore();
             return;
         }
@@ -1376,7 +1253,7 @@ void QAbstractScrollArea::keyPressEvent(QKeyEvent * e)
             break;
         case Qt::Key_Left:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && hasEditFocus()
+        if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
             && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->minimum())) {
             //if we aren't using the hbar or we are already at the leftmost point ignore
             e->ignore();
@@ -1389,7 +1266,7 @@ void QAbstractScrollArea::keyPressEvent(QKeyEvent * e)
             break;
         case Qt::Key_Right:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && hasEditFocus()
+        if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
             && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->maximum())) {
             //if we aren't using the hbar or we are already at the rightmost point ignore
             e->ignore();
@@ -1546,13 +1423,6 @@ void QAbstractScrollAreaPrivate::_q_vslide(int y)
 void QAbstractScrollAreaPrivate::_q_showOrHideScrollBars()
 {
     layoutChildren();
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    // Need to re-subscribe to gestures as the content changes to make sure we
-    // enable/disable panning when needed.
-    QWidgetPrivate *dd = static_cast<QWidgetPrivate *>(QObjectPrivate::get(viewport));
-    if (dd)
-        dd->winSetupGestures();
-#endif
 }
 
 QPoint QAbstractScrollAreaPrivate::contentsOffset() const
diff --git a/src/widgets/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h
index 732a2ab40d..6d78b9db6d 100644
--- a/src/widgets/widgets/qabstractscrollarea_p.h
+++ b/src/widgets/widgets/qabstractscrollarea_p.h
@@ -85,9 +85,7 @@ public:
     QWidget *viewport;
     QWidget *cornerWidget;
     QRect cornerPaintingRect;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    QRect reverseCornerPaintingRect;
-#endif
+
     int left, top, right, bottom; // viewport margin
 
     int xoffset, yoffset;
@@ -112,11 +110,6 @@ public:
     inline bool viewportEvent(QEvent *event)
     { return q_func()->viewportEvent(event); }
     QScopedPointer<QObject> viewportFilter;
-
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    bool singleFingerPanEnabled;
-    void setSingleFingerPanEnabled(bool on = true);
-#endif
 };
 
 class QAbstractScrollAreaFilter : public QObject
diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
index 2172ebc99c..dc325ab871 100644
--- a/src/widgets/widgets/qabstractslider.cpp
+++ b/src/widgets/widgets/qabstractslider.cpp
@@ -47,6 +47,8 @@
 #endif
 #include <limits.h>
 
+#include <private/qapplication_p.h>
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -719,15 +721,10 @@ bool QAbstractSliderPrivate::scrollByDelta(Qt::Orientation orientation, Qt::Keyb
             offset_accumulated = 0;
 
         offset_accumulated += stepsToScrollF;
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
+
         // Don't scroll more than one page in any case:
         stepsToScroll = qBound(-pageStep, int(offset_accumulated), pageStep);
-#else
-        // Native UI-elements on Mac can scroll hundreds of lines at a time as
-        // a result of acceleration. So keep the same behaviour in Qt, and
-        // don't restrict stepsToScroll to certain maximum (pageStep):
-        stepsToScroll = int(offset_accumulated);
-#endif
+
         offset_accumulated -= int(offset_accumulated);
         if (stepsToScroll == 0) {
             // We moved less than a line, but might still have accumulated partial scroll,
@@ -764,10 +761,11 @@ void QAbstractSlider::wheelEvent(QWheelEvent * e)
 {
     Q_D(QAbstractSlider);
     e->ignore();
-    int delta = e->delta();
+    bool vertical = bool(e->angleDelta().y());
+    int delta = vertical ? e->angleDelta().y() : e->angleDelta().x();
     if (e->inverted())
         delta = -delta;
-    if (d->scrollByDelta(e->orientation(), e->modifiers(), delta))
+    if (d->scrollByDelta(vertical ? Qt::Vertical : Qt::Horizontal, e->modifiers(), delta))
         e->accept();
 }
 
@@ -815,13 +813,13 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
     switch (ev->key()) {
 #ifdef QT_KEYPAD_NAVIGATION
         case Qt::Key_Select:
-            if (QApplication::keypadNavigationEnabled())
+            if (QApplicationPrivate::keypadNavigationEnabled())
                 setEditFocus(!hasEditFocus());
             else
                 ev->ignore();
             break;
         case Qt::Key_Back:
-            if (QApplication::keypadNavigationEnabled() && hasEditFocus()) {
+            if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()) {
                 setValue(d->origValue);
                 setEditFocus(false);
             } else
@@ -834,7 +832,7 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
             // In QApplication::KeypadNavigationDirectional, we want to change the slider
             // value if there is no left/right navigation possible and if this slider is not
             // inside a tab widget.
-            if (QApplication::keypadNavigationEnabled()
+            if (QApplicationPrivate::keypadNavigationEnabled()
                     && (!hasEditFocus() && QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
                     || d->orientation == Qt::Vertical
                     || !hasEditFocus()
@@ -842,7 +840,7 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
                 ev->ignore();
                 return;
             }
-            if (QApplication::keypadNavigationEnabled() && d->orientation == Qt::Vertical)
+            if (QApplicationPrivate::keypadNavigationEnabled() && d->orientation == Qt::Vertical)
                 action = d->invertedControls ? SliderSingleStepSub : SliderSingleStepAdd;
             else
 #endif
@@ -854,7 +852,7 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
         case Qt::Key_Right:
 #ifdef QT_KEYPAD_NAVIGATION
             // Same logic as in Qt::Key_Left
-            if (QApplication::keypadNavigationEnabled()
+            if (QApplicationPrivate::keypadNavigationEnabled()
                     && (!hasEditFocus() && QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
                     || d->orientation == Qt::Vertical
                     || !hasEditFocus()
@@ -862,7 +860,7 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
                 ev->ignore();
                 return;
             }
-            if (QApplication::keypadNavigationEnabled() && d->orientation == Qt::Vertical)
+            if (QApplicationPrivate::keypadNavigationEnabled() && d->orientation == Qt::Vertical)
                 action = d->invertedControls ? SliderSingleStepAdd : SliderSingleStepSub;
             else
 #endif
@@ -875,7 +873,7 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
 #ifdef QT_KEYPAD_NAVIGATION
             // In QApplication::KeypadNavigationDirectional, we want to change the slider
             // value if there is no up/down navigation possible.
-            if (QApplication::keypadNavigationEnabled()
+            if (QApplicationPrivate::keypadNavigationEnabled()
                     && (QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
                     || d->orientation == Qt::Horizontal
                     || !hasEditFocus() && QWidgetPrivate::canKeypadNavigate(Qt::Vertical))) {
@@ -888,7 +886,7 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
         case Qt::Key_Down:
 #ifdef QT_KEYPAD_NAVIGATION
             // Same logic as in Qt::Key_Up
-            if (QApplication::keypadNavigationEnabled()
+            if (QApplicationPrivate::keypadNavigationEnabled()
                     && (QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
                     || d->orientation == Qt::Horizontal
                     || !hasEditFocus() && QWidgetPrivate::canKeypadNavigate(Qt::Vertical))) {
diff --git a/src/widgets/widgets/qabstractslider_p.h b/src/widgets/widgets/qabstractslider_p.h
index 419ce2ba07..1b8c76c7ec 100644
--- a/src/widgets/widgets/qabstractslider_p.h
+++ b/src/widgets/widgets/qabstractslider_p.h
@@ -134,7 +134,7 @@ public:
     inline void setAdjustedSliderPosition(int position)
     {
         Q_Q(QAbstractSlider);
-        if (q->style()->styleHint(QStyle::SH_Slider_StopMouseOverSlider, 0, q)) {
+        if (q->style()->styleHint(QStyle::SH_Slider_StopMouseOverSlider, nullptr, q)) {
             if ((position > pressValue - 2 * pageStep) && (position < pressValue + 2 * pageStep)) {
                 repeatAction = QAbstractSlider::SliderNoAction;
                 q->setSliderPosition(pressValue);
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index f30ea35303..fc19e0793e 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -39,6 +39,7 @@
 
 #include <qplatformdefs.h>
 #include <private/qabstractspinbox_p.h>
+#include <private/qapplication_p.h>
 #if QT_CONFIG(datetimeparser)
 #include <private/qdatetimeparser_p.h>
 #endif
@@ -253,7 +254,7 @@ QString QAbstractSpinBox::text() const
 
     All values are displayed with the prefix and suffix (if set), \e
     except for the special value, which only shows the special value
-    text. This special text is passed in the QSpinBox::valueChanged()
+    text. This special text is passed in the QSpinBox::textChanged()
     signal that passes a QString.
 
     To turn off the special-value text display, call this function
@@ -333,7 +334,7 @@ void QAbstractSpinBox::setReadOnly(bool enable)
     d->readOnly = enable;
     d->edit->setReadOnly(enable);
     QEvent event(QEvent::ReadOnlyChange);
-    QApplication::sendEvent(this, &event);
+    QCoreApplication::sendEvent(this, &event);
     update();
 }
 
@@ -343,18 +344,18 @@ void QAbstractSpinBox::setReadOnly(bool enable)
     \since 4.3
 
     If keyboard tracking is enabled (the default), the spinbox
-    emits the valueChanged() signal while the new value is being
-    entered from the keyboard.
+    emits the valueChanged() and textChanged() signals while the
+    new value is being entered from the keyboard.
 
     E.g. when the user enters the value 600 by typing 6, 0, and 0,
     the spinbox emits 3 signals with the values 6, 60, and 600
     respectively.
 
     If keyboard tracking is disabled, the spinbox doesn't emit the
-    valueChanged() signal while typing. It emits the signal later,
-    when the return key is pressed, when keyboard focus is lost, or
-    when other spinbox functionality is used, e.g. pressing an arrow
-    key.
+    valueChanged() and textChanged() signals while typing. It emits
+    the signals later, when the return key is pressed, when keyboard
+    focus is lost, or when other spinbox functionality is used, e.g.
+    pressing an arrow key.
 */
 
 bool QAbstractSpinBox::keyboardTracking() const
@@ -574,10 +575,10 @@ QAbstractSpinBox::StepEnabled QAbstractSpinBox::stepEnabled() const
     if (d->wrapping)
         return StepEnabled(StepUpEnabled | StepDownEnabled);
     StepEnabled ret = StepNone;
-    if (d->variantCompare(d->value, d->maximum) < 0) {
+    if (QAbstractSpinBoxPrivate::variantCompare(d->value, d->maximum) < 0) {
         ret |= StepUpEnabled;
     }
-    if (d->variantCompare(d->value, d->minimum) > 0) {
+    if (QAbstractSpinBoxPrivate::variantCompare(d->value, d->minimum) > 0) {
         ret |= StepDownEnabled;
     }
     return ret;
@@ -803,7 +804,7 @@ bool QAbstractSpinBox::event(QEvent *event)
 #ifdef QT_KEYPAD_NAVIGATION
     case QEvent::EnterEditFocus:
     case QEvent::LeaveEditFocus:
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             const bool b = d->edit->event(event);
             d->edit->setSelection(d->edit->displayText().size() - d->suffix.size(),0);
             if (event->type() == QEvent::LeaveEditFocus)
@@ -1025,7 +1026,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event)
     case Qt::Key_Up:
     case Qt::Key_Down: {
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             // Reserve up/down for nav - use left/right for edit.
             if (!hasEditFocus() && (event->key() == Qt::Key_Up
                                     || event->key() == Qt::Key_Down)) {
@@ -1061,13 +1062,13 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event)
 #ifdef QT_KEYPAD_NAVIGATION
     case Qt::Key_Left:
     case Qt::Key_Right:
-        if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
             event->ignore();
             return;
         }
         break;
     case Qt::Key_Back:
-        if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
             event->ignore();
             return;
         }
@@ -1085,7 +1086,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event)
 
 #ifdef QT_KEYPAD_NAVIGATION
     case Qt::Key_Select:
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             // Toggles between left/right moving cursor and inc/dec.
             setEditFocus(!hasEditFocus());
         }
@@ -1221,7 +1222,7 @@ void QAbstractSpinBox::focusOutEvent(QFocusEvent *event)
 
 #ifdef QT_KEYPAD_NAVIGATION
     // editingFinished() is already emitted on LeaveEditFocus
-    if (!QApplication::keypadNavigationEnabled())
+    if (!QApplicationPrivate::keypadNavigationEnabled())
 #endif
     emit editingFinished();
 }
@@ -1320,6 +1321,9 @@ void QAbstractSpinBox::contextMenuEvent(QContextMenuEvent *event)
     d->reset();
 
     QAction *selAll = new QAction(tr("&Select All"), menu);
+#if QT_CONFIG(shortcut)
+    selAll->setShortcut(QKeySequence::SelectAll);
+#endif
     menu->insertAction(d->edit->d_func()->selectAllAction,
                       selAll);
     menu->removeAction(d->edit->d_func()->selectAllAction);
@@ -1722,7 +1726,7 @@ void QAbstractSpinBox::initStyleOption(QStyleOptionSpinBox *option) const
         option->activeSubControls = d->hoverControl;
     }
 
-    option->stepEnabled = style()->styleHint(QStyle::SH_SpinControls_DisableOnBounds)
+    option->stepEnabled = style()->styleHint(QStyle::SH_SpinControls_DisableOnBounds, nullptr, this)
                       ? stepEnabled()
                       : (QAbstractSpinBox::StepDownEnabled|QAbstractSpinBox::StepUpEnabled);
 
@@ -2031,8 +2035,8 @@ QVariant operator+(const QVariant &arg1, const QVariant &arg2)
 #if QT_CONFIG(datetimeparser)
     case QVariant::DateTime: {
         QDateTime a2 = arg2.toDateTime();
-        QDateTime a1 = arg1.toDateTime().addDays(QDATETIMEEDIT_DATETIME_MIN.daysTo(a2));
-        a1.setTime(a1.time().addMSecs(QTime().msecsTo(a2.time())));
+        QDateTime a1 = arg1.toDateTime().addDays(QDATETIMEEDIT_DATE_MIN.daysTo(a2.date()));
+        a1.setTime(a1.time().addMSecs(a2.time().msecsSinceStartOfDay()));
         ret = QVariant(a1);
         break;
     }
@@ -2094,11 +2098,11 @@ QVariant operator*(const QVariant &arg1, double multiplier)
 #if QT_CONFIG(datetimeparser)
     case QVariant::DateTime: {
         double days = QDATETIMEEDIT_DATE_MIN.daysTo(arg1.toDateTime().date()) * multiplier;
-        int daysInt = (int)days;
+        const qint64 daysInt = qint64(days);
         days -= daysInt;
-        long msecs = (long)((QDATETIMEEDIT_TIME_MIN.msecsTo(arg1.toDateTime().time()) * multiplier)
-                            + (days * (24 * 3600 * 1000)));
-        ret = QDateTime(QDate().addDays(int(days)), QTime().addMSecs(msecs));
+        qint64 msecs = qint64(arg1.toDateTime().time().msecsSinceStartOfDay() * multiplier
+                              + days * (24 * 3600 * 1000));
+        ret = QDATETIMEEDIT_DATE_MIN.addDays(daysInt).startOfDay().addMSecs(msecs);
         break;
     }
 #endif // datetimeparser
@@ -2128,8 +2132,8 @@ double operator/(const QVariant &arg1, const QVariant &arg2)
     case QVariant::DateTime:
         a1 = QDATETIMEEDIT_DATE_MIN.daysTo(arg1.toDate());
         a2 = QDATETIMEEDIT_DATE_MIN.daysTo(arg2.toDate());
-        a1 += (double)QDATETIMEEDIT_TIME_MIN.msecsTo(arg1.toDateTime().time()) / (long)(3600 * 24 * 1000);
-        a2 += (double)QDATETIMEEDIT_TIME_MIN.msecsTo(arg2.toDateTime().time()) / (long)(3600 * 24 * 1000);
+        a1 += arg1.toDateTime().time().msecsSinceStartOfDay() / (36e5 * 24);
+        a2 += arg2.toDateTime().time().msecsSinceStartOfDay() / (36e5 * 24);
         break;
 #endif // datetimeparser
     default: break;
diff --git a/src/widgets/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h
index fce88e43f4..ad169fde19 100644
--- a/src/widgets/widgets/qabstractspinbox_p.h
+++ b/src/widgets/widgets/qabstractspinbox_p.h
@@ -97,7 +97,7 @@ public:
     void init();
     void reset();
     void updateState(bool up, bool fromKeyboard = false);
-    QString stripped(const QString &text, int *pos = 0) const;
+    QString stripped(const QString &text, int *pos = nullptr) const;
     bool specialValue() const;
     virtual QVariant getZeroVariant() const;
     virtual void setRange(const QVariant &min, const QVariant &max);
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 47c5267c73..cc0c51b237 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -54,8 +54,10 @@
 #include <qspinbox.h>
 #include <qmenu.h>
 #include <qapplication.h>
+#include <private/qapplication_p.h>
 #include <qbasictimer.h>
 #include <qstylepainter.h>
+#include <qcalendar.h>
 
 #include <vector>
 
@@ -89,16 +91,15 @@ public:
     QCalendarDateSectionValidator() {}
     virtual ~QCalendarDateSectionValidator() {}
     virtual Section handleKey(int key) = 0;
-    virtual QDate applyToDate(const QDate &date) const = 0;
-    virtual void setDate(const QDate &date) = 0;
+    virtual QDate applyToDate(QDate date, QCalendar cal = QCalendar()) const = 0;
+    virtual void setDate(QDate date, QCalendar cal = QCalendar()) = 0;
     virtual QString text() const = 0;
-    virtual QString text(const QDate &date, int repeat) const = 0;
+    virtual QString text(QDate date, QCalendar cal, int repeat) const = 0;
 
     QLocale m_locale;
 
 protected:
     static QString highlightString(const QString &str, int pos);
-private:
 };
 
 QString QCalendarDateSectionValidator::highlightString(const QString &str, int pos)
@@ -116,10 +117,10 @@ class QCalendarDayValidator : public QCalendarDateSectionValidator
 public:
     QCalendarDayValidator();
     virtual Section handleKey(int key) override;
-    virtual QDate applyToDate(const QDate &date) const override;
-    virtual void setDate(const QDate &date) override;
+    virtual QDate applyToDate(QDate date, QCalendar cal) const override;
+    virtual void setDate(QDate date, QCalendar cal) override;
     virtual QString text() const override;
-    virtual QString text(const QDate &date, int repeat) const override;
+    virtual QString text(QDate date, QCalendar cal, int repeat) const override;
 private:
     int m_pos;
     int m_day;
@@ -180,21 +181,18 @@ QCalendarDateSectionValidator::Section QCalendarDayValidator::handleKey(int key)
     return QCalendarDateSectionValidator::ThisSection;
 }
 
-QDate QCalendarDayValidator::applyToDate(const QDate &date) const
+QDate QCalendarDayValidator::applyToDate(QDate date, QCalendar cal) const
 {
-    int day = m_day;
-    if (day < 1)
-        day = 1;
-    else if (day > 31)
-        day = 31;
-    if (day > date.daysInMonth())
-        day = date.daysInMonth();
-    return QDate(date.year(), date.month(), day);
+    auto parts = cal.partsFromDate(date);
+    if (!parts.isValid())
+        return QDate();
+    parts.day = qMin(qMax(1, m_day), cal.daysInMonth(parts.year, parts.month));
+    return cal.dateFromParts(parts);
 }
 
-void QCalendarDayValidator::setDate(const QDate &date)
+void QCalendarDayValidator::setDate(QDate date, QCalendar cal)
 {
-    m_day = m_oldDay = date.day();
+    m_day = m_oldDay = date.day(cal);
     m_pos = 0;
 }
 
@@ -203,16 +201,16 @@ QString QCalendarDayValidator::text() const
     return highlightString(formatNumber(m_day, 2), m_pos);
 }
 
-QString QCalendarDayValidator::text(const QDate &date, int repeat) const
+QString QCalendarDayValidator::text(QDate date, QCalendar cal, int repeat) const
 {
     if (repeat <= 1) {
-        return QString::number(date.day());
+        return QString::number(date.day(cal));
     } else if (repeat == 2) {
-        return formatNumber(date.day(), 2);
+        return formatNumber(date.day(cal), 2);
     } else if (repeat == 3) {
-        return m_locale.dayName(date.dayOfWeek(), QLocale::ShortFormat);
+        return m_locale.dayName(date.dayOfWeek(cal), QLocale::ShortFormat);
     } else /* repeat >= 4 */ {
-        return m_locale.dayName(date.dayOfWeek(), QLocale::LongFormat);
+        return m_locale.dayName(date.dayOfWeek(cal), QLocale::LongFormat);
     }
 }
 
@@ -224,10 +222,10 @@ class QCalendarMonthValidator : public QCalendarDateSectionValidator
 public:
     QCalendarMonthValidator();
     virtual Section handleKey(int key) override;
-    virtual QDate applyToDate(const QDate &date) const override;
-    virtual void setDate(const QDate &date) override;
+    virtual QDate applyToDate(QDate date, QCalendar cal) const override;
+    virtual void setDate(QDate date, QCalendar cal) override;
     virtual QString text() const override;
-    virtual QString text(const QDate &date, int repeat) const override;
+    virtual QString text(QDate date, QCalendar cal, int repeat) const override;
 private:
     int m_pos;
     int m_month;
@@ -288,23 +286,19 @@ QCalendarDateSectionValidator::Section QCalendarMonthValidator::handleKey(int ke
     return QCalendarDateSectionValidator::ThisSection;
 }
 
-QDate QCalendarMonthValidator::applyToDate(const QDate &date) const
+QDate QCalendarMonthValidator::applyToDate(QDate date, QCalendar cal) const
 {
-    int month = m_month;
-    if (month < 1)
-        month = 1;
-    else if (month > 12)
-        month = 12;
-    QDate newDate(date.year(), m_month, 1);
-    int day = date.day();
-    if (day > newDate.daysInMonth())
-        day = newDate.daysInMonth();
-    return QDate(date.year(), month, day);
+    auto parts = cal.partsFromDate(date);
+    if (!parts.isValid())
+        return QDate();
+    parts.month = qMin(qMax(1, m_month), cal.monthsInYear(parts.year));
+    parts.day = qMin(parts.day, cal.daysInMonth(parts.year, m_month)); // m_month or parts.month ?
+    return cal.dateFromParts(parts);
 }
 
-void QCalendarMonthValidator::setDate(const QDate &date)
+void QCalendarMonthValidator::setDate(QDate date, QCalendar cal)
 {
-    m_month = m_oldMonth = date.month();
+    m_month = m_oldMonth = date.month(cal);
     m_pos = 0;
 }
 
@@ -313,16 +307,16 @@ QString QCalendarMonthValidator::text() const
     return highlightString(formatNumber(m_month, 2), m_pos);
 }
 
-QString QCalendarMonthValidator::text(const QDate &date, int repeat) const
+QString QCalendarMonthValidator::text(QDate date, QCalendar cal, int repeat) const
 {
     if (repeat <= 1) {
-        return QString::number(date.month());
+        return QString::number(date.month(cal));
     } else if (repeat == 2) {
-        return formatNumber(date.month(), 2);
+        return formatNumber(date.month(cal), 2);
     } else if (repeat == 3) {
-        return m_locale.standaloneMonthName(date.month(), QLocale::ShortFormat);
+        return cal.standaloneMonthName(m_locale, date.month(cal), QLocale::ShortFormat);
     } else /*if (repeat >= 4)*/ {
-        return m_locale.standaloneMonthName(date.month(), QLocale::LongFormat);
+        return cal.standaloneMonthName(m_locale, date.month(cal), QLocale::LongFormat);
     }
 }
 
@@ -334,10 +328,10 @@ class QCalendarYearValidator : public QCalendarDateSectionValidator
 public:
     QCalendarYearValidator();
     virtual Section handleKey(int key) override;
-    virtual QDate applyToDate(const QDate &date) const override;
-    virtual void setDate(const QDate &date) override;
+    virtual QDate applyToDate(QDate date, QCalendar cal) const override;
+    virtual void setDate(QDate date, QCalendar cal) override;
     virtual QString text() const override;
-    virtual QString text(const QDate &date, int repeat) const override;
+    virtual QString text(QDate date, QCalendar cal, int repeat) const override;
 private:
     int pow10(int n);
     int m_pos;
@@ -348,6 +342,8 @@ private:
 QCalendarYearValidator::QCalendarYearValidator()
     : QCalendarDateSectionValidator(), m_pos(0), m_year(2000), m_oldYear(2000)
 {
+    // TODO: What to use (for non-Gregorian calendars) as default year?
+    // Maybe 1360 for Jalali, 1420 for Islamic, etc.
 }
 
 int QCalendarYearValidator::pow10(int n)
@@ -396,21 +392,20 @@ QCalendarDateSectionValidator::Section QCalendarYearValidator::handleKey(int key
     return QCalendarDateSectionValidator::ThisSection;
 }
 
-QDate QCalendarYearValidator::applyToDate(const QDate &date) const
+QDate QCalendarYearValidator::applyToDate(QDate date, QCalendar cal) const
 {
-    int year = m_year;
-    if (year < 1)
-        year = 1;
-    QDate newDate(year, date.month(), 1);
-    int day = date.day();
-    if (day > newDate.daysInMonth())
-        day = newDate.daysInMonth();
-    return QDate(year, date.month(), day);
+    auto parts = cal.partsFromDate(date);
+    if (!parts.isValid())
+        return QDate();
+    // This widget does not support negative years (some calendars may support)
+    parts.year = qMax(1, m_year);
+    parts.day = qMin(parts.day, cal.daysInMonth(parts.year, parts.month));
+    return cal.dateFromParts(parts);
 }
 
-void QCalendarYearValidator::setDate(const QDate &date)
+void QCalendarYearValidator::setDate(QDate date, QCalendar cal)
 {
-    m_year = m_oldYear = date.year();
+    m_year = m_oldYear = date.year(cal);
     m_pos = 0;
 }
 
@@ -419,11 +414,11 @@ QString QCalendarYearValidator::text() const
     return highlightString(formatNumber(m_year, 4), m_pos);
 }
 
-QString QCalendarYearValidator::text(const QDate &date, int repeat) const
+QString QCalendarYearValidator::text(QDate date, QCalendar cal, int repeat) const
 {
     if (repeat < 4)
-        return formatNumber(date.year() % 100, 2);
-    return QString::number(date.year());
+        return formatNumber(date.year(cal) % 100, 2);
+    return QString::number(date.year(cal));
 }
 
 ///////////////////////////////////
@@ -445,18 +440,18 @@ public:
     QCalendarDateValidator();
     ~QCalendarDateValidator();
 
-    void handleKeyEvent(QKeyEvent *keyEvent);
-    QString currentText() const;
+    void handleKeyEvent(QKeyEvent *keyEvent, QCalendar cal);
+    QString currentText(QCalendar cal) const;
     QDate currentDate() const { return m_currentDate; }
     void setFormat(const QString &format);
-    void setInitialDate(const QDate &date);
+    void setInitialDate(QDate date, QCalendar cal);
 
     void setLocale(const QLocale &locale);
 
 private:
     void toNextToken();
     void toPreviousToken();
-    void applyToDate();
+    void applyToDate(QCalendar cal);
 
     int countRepeat(const QString &str, int index) const;
     void clear();
@@ -506,17 +501,17 @@ int QCalendarDateValidator::countRepeat(const QString &str, int index) const
     return count;
 }
 
-void QCalendarDateValidator::setInitialDate(const QDate &date)
+void QCalendarDateValidator::setInitialDate(QDate date, QCalendar cal)
 {
-    m_yearValidator.setDate(date);
-    m_monthValidator.setDate(date);
-    m_dayValidator.setDate(date);
+    m_yearValidator.setDate(date, cal);
+    m_monthValidator.setDate(date, cal);
+    m_dayValidator.setDate(date, cal);
     m_initialDate = date;
     m_currentDate = date;
     m_lastSectionMove = QCalendarDateSectionValidator::ThisSection;
 }
 
-QString QCalendarDateValidator::currentText() const
+QString QCalendarDateValidator::currentText(QCalendar cal) const
 {
     QString str;
     const int numSeps = m_separators.size();
@@ -528,7 +523,7 @@ QString QCalendarDateValidator::currentText() const
             if (i == m_currentToken)
                 str += token.validator->text();
             else
-                str += token.validator->text(m_currentDate, token.repeat);
+                str += token.validator->text(m_currentDate, cal, token.repeat);
         }
     }
     return str;
@@ -590,11 +585,11 @@ void QCalendarDateValidator::setFormat(const QString &format)
     m_separators += separator;
 }
 
-void QCalendarDateValidator::applyToDate()
+void QCalendarDateValidator::applyToDate(QCalendar cal)
 {
-    m_currentDate = m_yearValidator.applyToDate(m_currentDate);
-    m_currentDate = m_monthValidator.applyToDate(m_currentDate);
-    m_currentDate = m_dayValidator.applyToDate(m_currentDate);
+    m_currentDate = m_yearValidator.applyToDate(m_currentDate, cal);
+    m_currentDate = m_monthValidator.applyToDate(m_currentDate, cal);
+    m_currentDate = m_dayValidator.applyToDate(m_currentDate, cal);
 }
 
 void QCalendarDateValidator::toNextToken()
@@ -613,7 +608,7 @@ void QCalendarDateValidator::toPreviousToken()
     m_currentToken %= m_tokens.size();
 }
 
-void QCalendarDateValidator::handleKeyEvent(QKeyEvent *keyEvent)
+void QCalendarDateValidator::handleKeyEvent(QKeyEvent *keyEvent,QCalendar cal)
 {
     if (m_currentToken < 0)
         return;
@@ -630,7 +625,7 @@ void QCalendarDateValidator::handleKeyEvent(QKeyEvent *keyEvent)
 
     m_lastSectionMove = m_tokens[m_currentToken].validator->handleKey(key);
 
-    applyToDate();
+    applyToDate(cal);
     if (m_lastSectionMove == QCalendarDateSectionValidator::NextSection)
         toNextToken();
     else if (m_lastSectionMove == QCalendarDateSectionValidator::PrevSection)
@@ -644,7 +639,8 @@ class QCalendarTextNavigator: public QObject
     Q_OBJECT
 public:
     QCalendarTextNavigator(QObject *parent = 0)
-        : QObject(parent), m_dateText(0), m_dateFrame(0), m_dateValidator(0), m_widget(0), m_editDelay(1500), m_date(QDate::currentDate()) { }
+        : QObject(parent), m_dateText(0), m_dateFrame(0), m_dateValidator(0),
+          m_widget(0), m_editDelay(1500), m_date(QDate::currentDate()) {}
 
     QWidget *widget() const;
     void setWidget(QWidget *widget);
@@ -652,13 +648,13 @@ public:
     int dateEditAcceptDelay() const;
     void setDateEditAcceptDelay(int delay);
 
-    void setDate(const QDate &date);
+    void setDate(QDate date);
 
     bool eventFilter(QObject *o, QEvent *e) override;
     void timerEvent(QTimerEvent *e) override;
 
 signals:
-    void dateChanged(const QDate &date);
+    void dateChanged(QDate date);
     void editingFinished();
 
 private:
@@ -675,6 +671,7 @@ private:
     int m_editDelay;
 
     QDate m_date;
+    const QCalendar m_calendar;
 };
 
 QWidget *QCalendarTextNavigator::widget() const
@@ -687,7 +684,7 @@ void QCalendarTextNavigator::setWidget(QWidget *widget)
     m_widget = widget;
 }
 
-void QCalendarTextNavigator::setDate(const QDate &date)
+void QCalendarTextNavigator::setDate(QDate date)
 {
     m_date = date;
 }
@@ -699,7 +696,7 @@ void QCalendarTextNavigator::updateDateLabel()
 
     m_acceptTimer.start(m_editDelay, this);
 
-    m_dateText->setText(m_dateValidator->currentText());
+    m_dateText->setText(m_dateValidator->currentText(m_calendar));
 
     QSize s = m_dateFrame->sizeHint();
     QRect r = m_widget->geometry(); // later, just the table section
@@ -739,7 +736,7 @@ void QCalendarTextNavigator::createDateLabel()
     m_dateValidator = new QCalendarDateValidator();
     m_dateValidator->setLocale(m_widget->locale());
     m_dateValidator->setFormat(m_widget->locale().dateFormat(QLocale::ShortFormat));
-    m_dateValidator->setInitialDate(m_date);
+    m_dateValidator->setInitialDate(m_date, m_calendar);
 
     m_dateFrame->setAutoFillBackground(true);
     m_dateFrame->setBackgroundRole(QPalette::Window);
@@ -774,7 +771,7 @@ bool QCalendarTextNavigator::eventFilter(QObject *o, QEvent *e)
 #endif
                 } else if (e->type() == QEvent::KeyPress) {
                     createDateLabel();
-                    m_dateValidator->handleKeyEvent(ke);
+                    m_dateValidator->handleKeyEvent(ke, m_calendar);
                     updateDateLabel();
                 }
                 ke->accept();
@@ -827,9 +824,9 @@ class StaticDayOfWeekAssociativeArray {
     bool contained[7];
     T data[7];
 
-    static Q_DECL_CONSTEXPR int day2idx(Qt::DayOfWeek day) Q_DECL_NOTHROW { return int(day) - 1; } // alt: day % 7
+    static Q_DECL_CONSTEXPR int day2idx(Qt::DayOfWeek day) noexcept { return int(day) - 1; } // alt: day % 7
 public:
-    Q_DECL_CONSTEXPR StaticDayOfWeekAssociativeArray() Q_DECL_NOEXCEPT_EXPR(noexcept(T()))
+    Q_DECL_CONSTEXPR StaticDayOfWeekAssociativeArray() noexcept(noexcept(T()))
 #ifdef Q_COMPILER_CONSTEXPR
         : contained{}, data{}   // arrays require uniform initialization
 #else
@@ -837,17 +834,17 @@ public:
 #endif
     {}
 
-    Q_DECL_CONSTEXPR bool contains(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return contained[day2idx(day)]; }
-    Q_DECL_CONSTEXPR const T &value(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return data[day2idx(day)]; }
+    Q_DECL_CONSTEXPR bool contains(Qt::DayOfWeek day) const noexcept { return contained[day2idx(day)]; }
+    Q_DECL_CONSTEXPR const T &value(Qt::DayOfWeek day) const noexcept { return data[day2idx(day)]; }
 
-    Q_DECL_RELAXED_CONSTEXPR T &operator[](Qt::DayOfWeek day) Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR T &operator[](Qt::DayOfWeek day) noexcept
     {
         const int idx = day2idx(day);
         contained[idx] = true;
         return data[idx];
     }
 
-    Q_DECL_RELAXED_CONSTEXPR void insert(Qt::DayOfWeek day, T v) Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR void insert(Qt::DayOfWeek day, T v) noexcept
     {
         operator[](day).swap(v);
     }
@@ -894,12 +891,15 @@ public:
     }
 
     void showMonth(int year, int month);
-    void setDate(const QDate &d);
+    void setDate(QDate d);
 
-    void setMinimumDate(const QDate &date);
-    void setMaximumDate(const QDate &date);
+    void setCalendar(QCalendar c);
+    QCalendar calendar() const;
 
-    void setRange(const QDate &min, const QDate &max);
+    void setMinimumDate(QDate date);
+    void setMaximumDate(QDate date);
+
+    void setRange(QDate min, QDate max);
 
     void setHorizontalHeaderFormat(QCalendarWidget::HorizontalHeaderFormat format);
 
@@ -913,7 +913,7 @@ public:
     Qt::DayOfWeek dayOfWeekForColumn(int section) const;
     int columnForDayOfWeek(Qt::DayOfWeek day) const;
     QDate dateForCell(int row, int column) const;
-    void cellForDate(const QDate &date, int *row, int *column) const;
+    void cellForDate(QDate date, int *row, int *column) const;
     QString dayName(Qt::DayOfWeek day) const;
 
     void setView(QCalendarView *view)
@@ -921,10 +921,11 @@ public:
 
     void internalUpdate();
     QDate referenceDate() const;
-    int columnForFirstOfMonth(const QDate &date) const;
+    int columnForFirstOfMonth(QDate date) const;
 
     int m_firstColumn;
     int m_firstRow;
+    QCalendar m_calendar;
     QDate m_date;
     QDate m_minimumDate;
     QDate m_maximumDate;
@@ -950,9 +951,9 @@ public:
     virtual void keyboardSearch(const QString & search) override { Q_UNUSED(search) }
 
 signals:
-    void showDate(const QDate &date);
-    void changeDate(const QDate &date, bool changeMonth);
-    void clicked(const QDate &date);
+    void showDate(QDate date);
+    void changeDate(QDate date, bool changeMonth);
+    void clicked(QDate date);
     void editingFinished();
 protected:
     QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override;
@@ -983,8 +984,8 @@ QCalendarModel::QCalendarModel(QObject *parent)
       m_date(QDate::currentDate()),
       m_minimumDate(QDate::fromJulianDay(1)),
       m_maximumDate(9999, 12, 31),
-      m_shownYear(m_date.year()),
-      m_shownMonth(m_date.month()),
+      m_shownYear(m_date.year(m_calendar)),
+      m_shownMonth(m_date.month(m_calendar)),
       m_firstDay(QLocale().firstDayOfWeek()),
       m_horizontalHeaderFormat(QCalendarWidget::ShortDayNames),
       m_weekNumbersShown(true),
@@ -1027,9 +1028,10 @@ will be rendered in 2nd or 3rd row, showing more dates from previous month.
 */
 QDate QCalendarModel::referenceDate() const
 {
+    // TODO: Check this
     int refDay = 1;
     while (refDay <= 31) {
-        QDate refDate(m_shownYear, m_shownMonth, refDay);
+        QDate refDate(m_shownYear, m_shownMonth, refDay, m_calendar);
         if (refDate.isValid())
             return refDate;
         refDay += 1;
@@ -1037,9 +1039,10 @@ QDate QCalendarModel::referenceDate() const
     return QDate();
 }
 
-int QCalendarModel::columnForFirstOfMonth(const QDate &date) const
+int QCalendarModel::columnForFirstOfMonth(QDate date) const
 {
-    return (columnForDayOfWeek(static_cast<Qt::DayOfWeek>(date.dayOfWeek())) - (date.day() % 7) + 8) % 7;
+    return (columnForDayOfWeek(static_cast<Qt::DayOfWeek>(m_calendar.dayOfWeek(date)))
+            - (date.day(m_calendar) % 7) + 8) % 7;
 }
 
 QDate QCalendarModel::dateForCell(int row, int column) const
@@ -1055,11 +1058,12 @@ QDate QCalendarModel::dateForCell(int row, int column) const
     if (columnForFirstOfShownMonth - m_firstColumn < MinimumDayOffset)
         row -= 1;
 
-    const int requestedDay = 7 * (row - m_firstRow) + column - columnForFirstOfShownMonth - refDate.day() + 1;
+    const int requestedDay =
+        7 * (row - m_firstRow) + column - columnForFirstOfShownMonth - refDate.day(m_calendar) + 1;
     return refDate.addDays(requestedDay);
 }
 
-void QCalendarModel::cellForDate(const QDate &date, int *row, int *column) const
+void QCalendarModel::cellForDate(QDate date, int *row, int *column) const
 {
     if (!row && !column)
         return;
@@ -1074,7 +1078,8 @@ void QCalendarModel::cellForDate(const QDate &date, int *row, int *column) const
         return;
 
     const int columnForFirstOfShownMonth = columnForFirstOfMonth(refDate);
-    const int requestedPosition = refDate.daysTo(date) - m_firstColumn + columnForFirstOfShownMonth + refDate.day() - 1;
+    const int requestedPosition = (refDate.daysTo(date) - m_firstColumn +
+                                   columnForFirstOfShownMonth + refDate.day(m_calendar) - 1);
 
     int c = requestedPosition % 7;
     int r = requestedPosition / 7;
@@ -1147,7 +1152,7 @@ QTextCharFormat QCalendarModel::formatForCell(int row, int col) const
         format.merge(m_dateFormats.value(date));
         if(date < m_minimumDate || date > m_maximumDate)
             format.setBackground(pal.brush(cg, QPalette::Window));
-        if (m_shownMonth != date.month())
+        if (m_shownMonth != date.month(m_calendar))
             format.setForeground(pal.brush(QPalette::Disabled, QPalette::Text));
     }
     return format;
@@ -1173,7 +1178,7 @@ QVariant QCalendarModel::data(const QModelIndex &index, int role) const
             return dayName(dayOfWeekForColumn(column));
         QDate date = dateForCell(row, column);
         if (date.isValid())
-            return date.day();
+            return date.day(m_calendar);
         return QString();
     }
 
@@ -1201,7 +1206,7 @@ Qt::ItemFlags QCalendarModel::flags(const QModelIndex &index) const
     return QAbstractTableModel::flags(index);
 }
 
-void QCalendarModel::setDate(const QDate &d)
+void QCalendarModel::setDate(QDate d)
 {
     m_date = d;
     if (m_date < m_minimumDate)
@@ -1210,6 +1215,20 @@ void QCalendarModel::setDate(const QDate &d)
         m_date = m_maximumDate;
 }
 
+void QCalendarModel::setCalendar(QCalendar c)
+{
+    m_calendar = c;
+    m_shownYear = m_date.year(c);
+    m_shownMonth = m_date.month(c);
+    internalUpdate();
+    m_view->internalUpdate();
+}
+
+QCalendar QCalendarModel::calendar() const
+{
+    return m_calendar;
+}
+
 void QCalendarModel::showMonth(int year, int month)
 {
     if (m_shownYear == year && m_shownMonth == month)
@@ -1221,7 +1240,7 @@ void QCalendarModel::showMonth(int year, int month)
     internalUpdate();
 }
 
-void QCalendarModel::setMinimumDate(const QDate &d)
+void QCalendarModel::setMinimumDate(QDate d)
 {
     if (!d.isValid() || d == m_minimumDate)
         return;
@@ -1234,7 +1253,7 @@ void QCalendarModel::setMinimumDate(const QDate &d)
     internalUpdate();
 }
 
-void QCalendarModel::setMaximumDate(const QDate &d)
+void QCalendarModel::setMaximumDate(QDate d)
 {
     if (!d.isValid() || d == m_maximumDate)
         return;
@@ -1247,7 +1266,7 @@ void QCalendarModel::setMaximumDate(const QDate &d)
     internalUpdate();
 }
 
-void QCalendarModel::setRange(const QDate &min, const QDate &max)
+void QCalendarModel::setRange(QDate min, QDate max)
 {
     m_minimumDate = min;
     m_maximumDate = max;
@@ -1340,6 +1359,8 @@ QModelIndex QCalendarView::moveCursor(CursorAction cursorAction, Qt::KeyboardMod
     if (!calendarModel)
         return QTableView::moveCursor(cursorAction, modifiers);
 
+    QCalendar cal = calendarModel->calendar();
+
     if (readOnly)
         return currentIndex();
 
@@ -1358,17 +1379,27 @@ QModelIndex QCalendarView::moveCursor(CursorAction cursorAction, Qt::KeyboardMod
         case QAbstractItemView::MoveRight:
             currentDate = currentDate.addDays(isRightToLeft() ? -1 : 1);
             break;
-        case QAbstractItemView::MoveHome:
-            currentDate = QDate(currentDate.year(), currentDate.month(), 1);
+        case QAbstractItemView::MoveHome: {
+            auto parts = cal.partsFromDate(currentDate);
+            if (parts.isValid()) {
+                parts.day = 1;
+                currentDate = cal.dateFromParts(parts);
+            }
+        }
             break;
-        case QAbstractItemView::MoveEnd:
-            currentDate = QDate(currentDate.year(), currentDate.month(), currentDate.daysInMonth());
+        case QAbstractItemView::MoveEnd: {
+            auto parts = cal.partsFromDate(currentDate);
+            if (parts.isValid()) {
+                parts.day = cal.daysInMonth(parts.year, parts.month);
+                currentDate = cal.dateFromParts(parts);
+            }
+        }
             break;
         case QAbstractItemView::MovePageUp:
-            currentDate = currentDate.addMonths(-1);
+            currentDate = currentDate.addMonths(-1, cal);
             break;
         case QAbstractItemView::MovePageDown:
-            currentDate = currentDate.addMonths(1);
+            currentDate = currentDate.addMonths(1, cal);
             break;
         case QAbstractItemView::MoveNext:
         case QAbstractItemView::MovePrevious:
@@ -1384,14 +1415,14 @@ void QCalendarView::keyPressEvent(QKeyEvent *event)
 {
 #ifdef QT_KEYPAD_NAVIGATION
     if (event->key() == Qt::Key_Select) {
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             if (!hasEditFocus()) {
                 setEditFocus(true);
                 return;
             }
         }
     } else if (event->key() == Qt::Key_Back) {
-        if (QApplication::keypadNavigationEnabled() && hasEditFocus()) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()) {
             if (qobject_cast<QCalendarModel *>(model())) {
                 emit changeDate(origDate, true); //changes selection back to origDate, but doesn't activate
                 setEditFocus(false);
@@ -1418,11 +1449,12 @@ void QCalendarView::keyPressEvent(QKeyEvent *event)
 #if QT_CONFIG(wheelevent)
 void QCalendarView::wheelEvent(QWheelEvent *event)
 {
-    const int numDegrees = event->delta() / 8;
+    const int numDegrees = event->angleDelta().y() / 8;
     const int numSteps = numDegrees / 15;
     const QModelIndex index = currentIndex();
-    QDate currentDate = static_cast<QCalendarModel*>(model())->dateForCell(index.row(), index.column());
-    currentDate = currentDate.addMonths(-numSteps);
+    QCalendarModel *calendarModel = static_cast<QCalendarModel*>(model());
+    QDate currentDate = calendarModel->dateForCell(index.row(), index.column());
+    currentDate = currentDate.addMonths(-numSteps, calendarModel->calendar());
     emit showDate(currentDate);
 }
 #endif
@@ -1565,7 +1597,7 @@ public:
             { }
     virtual void paint(QPainter *painter, const QStyleOptionViewItem &option,
                 const QModelIndex &index) const override;
-    void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const;
+    void paintCell(QPainter *painter, const QRect &rect, QDate date) const;
 
 private:
     QCalendarWidgetPrivate *calendarWidgetPrivate;
@@ -1584,7 +1616,6 @@ protected:
     {
         Q_UNUSED(e)
 
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
         QStyleOptionToolButton opt;
         initStyleOption(&opt);
 
@@ -1597,7 +1628,7 @@ protected:
             toolPalette.setColor(QPalette::ButtonText, toolPalette.color(QPalette::HighlightedText));
             setPalette(toolPalette);
         }
-#endif
+
         QToolButton::paintEvent(e);
     }
 };
@@ -1627,11 +1658,11 @@ public:
 
     void showMonth(int year, int month);
     void update();
-    void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const;
+    void paintCell(QPainter *painter, const QRect &rect, QDate date) const;
 
-    void _q_slotShowDate(const QDate &date);
-    void _q_slotChangeDate(const QDate &date);
-    void _q_slotChangeDate(const QDate &date, bool changeMonth);
+    void _q_slotShowDate(QDate date);
+    void _q_slotChangeDate(QDate date);
+    void _q_slotChangeDate(QDate date, bool changeMonth);
     void _q_editingFinished();
     void _q_monthChanged(QAction*);
     void _q_prevMonthClicked();
@@ -1644,7 +1675,7 @@ public:
     void updateMonthMenu();
     void updateMonthMenuNames();
     void updateNavigationBar();
-    void updateCurrentPage(const QDate &newDate);
+    void updateCurrentPage(QDate newDate);
     inline QDate getCurrentDate();
     void setNavigatorEnabled(bool enable);
 
@@ -1683,7 +1714,7 @@ void QCalendarDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
     }
 }
 
-void QCalendarDelegate::paintCell(QPainter *painter, const QRect &rect, const QDate &date) const
+void QCalendarDelegate::paintCell(QPainter *painter, const QRect &rect, QDate date) const
 {
     storedOption.rect = rect;
     int row = -1;
@@ -1756,7 +1787,7 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget)
     monthButton->setPopupMode(QToolButton::InstantPopup);
     monthMenu = new QMenu(monthButton);
     for (int i = 1; i <= 12; i++) {
-        QString monthName(q->locale().standaloneMonthName(i, QLocale::LongFormat));
+        QString monthName(m_model->m_calendar.standaloneMonthName(q->locale(), i, QLocale::LongFormat));
         QAction *act = monthMenu->addAction(monthName);
         act->setData(i);
         monthToAction[i] = act;
@@ -1772,8 +1803,8 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget)
     monthButton->setFont(font);
     yearButton->setFont(font);
     yearEdit->setFrame(false);
-    yearEdit->setMinimum(m_model->m_minimumDate.year());
-    yearEdit->setMaximum(m_model->m_maximumDate.year());
+    yearEdit->setMinimum(m_model->m_minimumDate.year(m_model->m_calendar));
+    yearEdit->setMaximum(m_model->m_maximumDate.year(m_model->m_calendar));
     yearEdit->hide();
     spaceHolder = new QSpacerItem(0,0);
 
@@ -1803,7 +1834,7 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget)
     yearEdit->setObjectName(QLatin1String("qt_calendar_yearedit"));
 
     updateMonthMenu();
-    showMonth(m_model->m_date.year(), m_model->m_date.month());
+    showMonth(m_model->m_date.year(m_model->m_calendar), m_model->m_date.month(m_model->m_calendar));
 }
 
 void QCalendarWidgetPrivate::updateButtonIcons()
@@ -1815,22 +1846,24 @@ void QCalendarWidgetPrivate::updateButtonIcons()
 
 void QCalendarWidgetPrivate::updateMonthMenu()
 {
-    int beg = 1, end = 12;
+    int maxMonths = m_model->m_calendar.monthsInYear(m_model->m_shownYear);
+    int beg = 1, end = maxMonths;
     bool prevEnabled = true;
     bool nextEnabled = true;
-    if (m_model->m_shownYear == m_model->m_minimumDate.year()) {
-        beg = m_model->m_minimumDate.month();
-        if (m_model->m_shownMonth == m_model->m_minimumDate.month())
+    QCalendar cal = m_model->calendar();
+    if (m_model->m_shownYear == m_model->m_minimumDate.year(cal)) {
+        beg = m_model->m_minimumDate.month(cal);
+        if (m_model->m_shownMonth == m_model->m_minimumDate.month(cal))
             prevEnabled = false;
     }
-    if (m_model->m_shownYear == m_model->m_maximumDate.year()) {
-        end = m_model->m_maximumDate.month();
-        if (m_model->m_shownMonth == m_model->m_maximumDate.month())
+    if (m_model->m_shownYear == m_model->m_maximumDate.year(cal)) {
+        end = m_model->m_maximumDate.month(cal);
+        if (m_model->m_shownMonth == m_model->m_maximumDate.month(cal))
             nextEnabled = false;
     }
     prevMonth->setEnabled(prevEnabled);
     nextMonth->setEnabled(nextEnabled);
-    for (int i = 1; i <= 12; i++) {
+    for (int i = 1; i <= maxMonths; i++) {
         bool monthEnabled = true;
         if (i < beg || i > end)
             monthEnabled = false;
@@ -1843,14 +1876,15 @@ void QCalendarWidgetPrivate::updateMonthMenuNames()
     Q_Q(QCalendarWidget);
 
     for (int i = 1; i <= 12; i++) {
-        QString monthName(q->locale().standaloneMonthName(i, QLocale::LongFormat));
+        QString monthName(m_model->m_calendar.standaloneMonthName(q->locale(), i, QLocale::LongFormat));
         monthToAction[i]->setText(monthName);
     }
 }
 
-void QCalendarWidgetPrivate::updateCurrentPage(const QDate &date)
+void QCalendarWidgetPrivate::updateCurrentPage(QDate date)
 {
     Q_Q(QCalendarWidget);
+    QCalendar cal = m_model->calendar();
 
     QDate newDate = date;
     QDate minDate = q->minimumDate();
@@ -1859,7 +1893,7 @@ void QCalendarWidgetPrivate::updateCurrentPage(const QDate &date)
         newDate = minDate;
     if (maxDate.isValid()&& maxDate.daysTo(newDate) > 0)
         newDate = maxDate;
-    showMonth(newDate.year(), newDate.month());
+    showMonth(newDate.year(cal), newDate.month(cal));
     int row = -1, col = -1;
     m_model->cellForDate(newDate, &row, &col);
     if (row != -1 && col != -1)
@@ -1873,7 +1907,7 @@ void QCalendarWidgetPrivate::_q_monthChanged(QAction *act)
 {
     monthButton->setText(act->text());
     QDate currentDate = getCurrentDate();
-    QDate newDate = currentDate.addMonths(act->data().toInt()-currentDate.month());
+    QDate newDate = currentDate.addMonths(act->data().toInt() - currentDate.month(m_model->m_calendar), m_model->m_calendar);
     updateCurrentPage(newDate);
 }
 
@@ -1885,27 +1919,28 @@ QDate QCalendarWidgetPrivate::getCurrentDate()
 
 void QCalendarWidgetPrivate::_q_prevMonthClicked()
 {
-    QDate currentDate = getCurrentDate().addMonths(-1);
+    QDate currentDate = getCurrentDate().addMonths(-1, m_model->m_calendar);
     updateCurrentPage(currentDate);
 }
 
 void QCalendarWidgetPrivate::_q_nextMonthClicked()
 {
-    QDate currentDate = getCurrentDate().addMonths(1);
+    QDate currentDate = getCurrentDate().addMonths(1, m_model->m_calendar);
     updateCurrentPage(currentDate);
 }
 
 void QCalendarWidgetPrivate::_q_yearEditingFinished()
 {
     Q_Q(QCalendarWidget);
-    yearButton->setText(yearEdit->text());
+    yearButton->setText(q->locale().toString(yearEdit->value()));
     yearEdit->hide();
     q->setFocusPolicy(oldFocusPolicy);
     qApp->removeEventFilter(q);
     spaceHolder->changeSize(0, 0);
     yearButton->show();
     QDate currentDate = getCurrentDate();
-    currentDate = currentDate.addYears(yearEdit->text().toInt() - currentDate.year());
+    int newYear = q->locale().toInt(yearEdit->text());
+    currentDate = currentDate.addYears(newYear - currentDate.year(m_model->m_calendar), m_model->m_calendar);
     updateCurrentPage(currentDate);
 }
 
@@ -1944,7 +1979,7 @@ void QCalendarWidgetPrivate::updateNavigationBar()
 {
     Q_Q(QCalendarWidget);
 
-    QString monthName = q->locale().standaloneMonthName(m_model->m_shownMonth, QLocale::LongFormat);
+    QString monthName = m_model->m_calendar.standaloneMonthName(q->locale(), m_model->m_shownMonth, QLocale::LongFormat);
 
     monthButton->setText(monthName);
     yearEdit->setValue(m_model->m_shownYear);
@@ -1964,29 +1999,29 @@ void QCalendarWidgetPrivate::update()
     }
 }
 
-void QCalendarWidgetPrivate::paintCell(QPainter *painter, const QRect &rect, const QDate &date) const
+void QCalendarWidgetPrivate::paintCell(QPainter *painter, const QRect &rect, QDate date) const
 {
     Q_Q(const QCalendarWidget);
     q->paintCell(painter, rect, date);
 }
 
-void QCalendarWidgetPrivate::_q_slotShowDate(const QDate &date)
+void QCalendarWidgetPrivate::_q_slotShowDate(QDate date)
 {
     updateCurrentPage(date);
 }
 
-void QCalendarWidgetPrivate::_q_slotChangeDate(const QDate &date)
+void QCalendarWidgetPrivate::_q_slotChangeDate(QDate date)
 {
     _q_slotChangeDate(date, true);
 }
 
-void QCalendarWidgetPrivate::_q_slotChangeDate(const QDate &date, bool changeMonth)
+void QCalendarWidgetPrivate::_q_slotChangeDate(QDate date, bool changeMonth)
 {
     QDate oldDate = m_model->m_date;
     m_model->setDate(date);
     QDate newDate = m_model->m_date;
     if (changeMonth)
-        showMonth(newDate.year(), newDate.month());
+        showMonth(newDate.year(m_model->m_calendar), newDate.month(m_model->m_calendar));
     if (oldDate != newDate) {
         update();
         Q_Q(QCalendarWidget);
@@ -2242,7 +2277,7 @@ QSize QCalendarWidget::minimumSizeHint() const
         QFontMetrics fm = d->monthButton->fontMetrics();
         int monthW = 0;
         for (int i = 1; i < 12; i++) {
-            QString monthName = locale().standaloneMonthName(i, QLocale::LongFormat);
+            QString monthName = d->m_model->m_calendar.standaloneMonthName(locale(), i, QLocale::LongFormat);
             monthW = qMax(monthW, fm.boundingRect(monthName).width());
         }
         const int buttonDecoMargin = d->monthButton->sizeHint().width() - fm.boundingRect(d->monthButton->text()).width();
@@ -2302,7 +2337,8 @@ void QCalendarWidget::setSelectedDate(const QDate &date)
     d->m_model->setDate(date);
     d->update();
     QDate newDate = d->m_model->m_date;
-    d->showMonth(newDate.year(), newDate.month());
+    QCalendar cal = d->m_model->m_calendar;
+    d->showMonth(newDate.year(cal), newDate.month(cal));
     emit selectionChanged();
 }
 
@@ -2348,14 +2384,15 @@ void QCalendarWidget::setCurrentPage(int year, int month)
 {
     Q_D(QCalendarWidget);
     QDate currentDate = d->getCurrentDate();
-    int day = currentDate.day();
-    int daysInMonths = QDate(year, month, 1).daysInMonth();
+    QCalendar cal = d->m_model->m_calendar;
+    int day = currentDate.day(cal);
+    int daysInMonths = cal.daysInMonth(year, month);
     if (day > daysInMonths)
         day = daysInMonths;
 
     d->showMonth(year, month);
 
-    QDate newDate(year, month, day);
+    QDate newDate(year, month, day, d->m_model->m_calendar);
     int row = -1, col = -1;
     d->m_model->cellForDate(newDate, &row, &col);
     if (row != -1 && col != -1) {
@@ -2373,9 +2410,10 @@ void QCalendarWidget::setCurrentPage(int year, int month)
 
 void QCalendarWidget::showNextMonth()
 {
+    Q_D(const QCalendarWidget);
     int year = yearShown();
     int month = monthShown();
-    if (month == 12) {
+    if (month == d->m_model->m_calendar.maximumMonthsInYear()) {
         ++year;
         month = 1;
     } else {
@@ -2393,11 +2431,13 @@ void QCalendarWidget::showNextMonth()
 
 void QCalendarWidget::showPreviousMonth()
 {
+    Q_D(const QCalendarWidget);
+
     int year = yearShown();
     int month = monthShown();
     if (month == 1) {
         --year;
-        month = 12;
+        month = d->m_model->m_calendar.maximumMonthsInYear();
     } else {
         --month;
     }
@@ -2443,8 +2483,10 @@ void QCalendarWidget::showPreviousYear()
 */
 void QCalendarWidget::showSelectedDate()
 {
+    Q_D(const QCalendarWidget);
+
     QDate currentDate = selectedDate();
-    setCurrentPage(currentDate.year(), currentDate.month());
+    setCurrentPage(currentDate.year(d->m_model->m_calendar), currentDate.month(d->m_model->m_calendar));
 }
 
 /*!
@@ -2454,8 +2496,10 @@ void QCalendarWidget::showSelectedDate()
 */
 void QCalendarWidget::showToday()
 {
+    Q_D(const QCalendarWidget);
+
     QDate currentDate = QDate::currentDate();
-    setCurrentPage(currentDate.year(), currentDate.month());
+    setCurrentPage(currentDate.year(d->m_model->m_calendar), currentDate.month(d->m_model->m_calendar));
 }
 
 /*!
@@ -2498,12 +2542,12 @@ void QCalendarWidget::setMinimumDate(const QDate &date)
 
     QDate oldDate = d->m_model->m_date;
     d->m_model->setMinimumDate(date);
-    d->yearEdit->setMinimum(d->m_model->m_minimumDate.year());
+    d->yearEdit->setMinimum(d->m_model->m_minimumDate.year(d->m_model->m_calendar));
     d->updateMonthMenu();
     QDate newDate = d->m_model->m_date;
     if (oldDate != newDate) {
         d->update();
-        d->showMonth(newDate.year(), newDate.month());
+        d->showMonth(newDate.year(d->m_model->m_calendar), newDate.month(d->m_model->m_calendar));
         d->m_navigator->setDate(newDate);
         emit selectionChanged();
     }
@@ -2549,12 +2593,12 @@ void QCalendarWidget::setMaximumDate(const QDate &date)
 
     QDate oldDate = d->m_model->m_date;
     d->m_model->setMaximumDate(date);
-    d->yearEdit->setMaximum(d->m_model->m_maximumDate.year());
+    d->yearEdit->setMaximum(d->m_model->m_maximumDate.year(d->m_model->m_calendar));
     d->updateMonthMenu();
     QDate newDate = d->m_model->m_date;
     if (oldDate != newDate) {
         d->update();
-        d->showMonth(newDate.year(), newDate.month());
+        d->showMonth(newDate.year(d->m_model->m_calendar), newDate.month(d->m_model->m_calendar));
         d->m_navigator->setDate(newDate);
         emit selectionChanged();
     }
@@ -2589,13 +2633,13 @@ void QCalendarWidget::setDateRange(const QDate &min, const QDate &max)
 
     QDate oldDate = d->m_model->m_date;
     d->m_model->setRange(min, max);
-    d->yearEdit->setMinimum(d->m_model->m_minimumDate.year());
-    d->yearEdit->setMaximum(d->m_model->m_maximumDate.year());
+    d->yearEdit->setMinimum(d->m_model->m_minimumDate.year(d->m_model->m_calendar));
+    d->yearEdit->setMaximum(d->m_model->m_maximumDate.year(d->m_model->m_calendar));
     d->updateMonthMenu();
     QDate newDate = d->m_model->m_date;
     if (oldDate != newDate) {
         d->update();
-        d->showMonth(newDate.year(), newDate.month());
+        d->showMonth(newDate.year(d->m_model->m_calendar), newDate.month(d->m_model->m_calendar));
         d->m_navigator->setDate(newDate);
         emit selectionChanged();
     }
@@ -2702,6 +2746,22 @@ bool QCalendarWidget::isGridVisible() const
     return d->m_view->showGrid();
 }
 
+QCalendar QCalendarWidget::calendar() const
+{
+    Q_D(const QCalendarWidget);
+    return d->m_model->m_calendar;
+}
+
+void QCalendarWidget::setCalendar(QCalendar c)
+{
+    Q_D(QCalendarWidget);
+    d->m_model->setCalendar(c);
+    d->updateMonthMenuNames();
+    d->yearEdit->setMinimum(d->m_model->m_minimumDate.year(d->m_model->m_calendar));
+    d->yearEdit->setMaximum(d->m_model->m_maximumDate.year(d->m_model->m_calendar));
+    d->updateNavigationBar();
+}
+
 void QCalendarWidget::setGridVisible(bool show)
 {
     Q_D(QCalendarWidget);
@@ -3042,6 +3102,9 @@ bool QCalendarWidget::event(QEvent *event)
             d->updateMonthMenuNames();
             d->updateNavigationBar();
             d->m_view->updateGeometry();
+            // TODO: fix this known bug of calendaring API:
+            // Changing locale before calendar works, but reverse order causes
+            // invalid month names (in C Locale apparently).
             break;
         case QEvent::FontChange:
         case QEvent::ApplicationFontChange:
diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h
index 44ba340289..08825a0ff3 100644
--- a/src/widgets/widgets/qcalendarwidget.h
+++ b/src/widgets/widgets/qcalendarwidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -112,6 +112,9 @@ public:
     bool isNavigationBarVisible() const;
     bool isGridVisible() const;
 
+    QCalendar calendar() const;
+    void setCalendar(QCalendar calendar);
+
     SelectionMode selectionMode() const;
     void setSelectionMode(SelectionMode mode);
 
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 483cfd8c55..9a0e969e1c 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -64,7 +64,9 @@
 #include <qheaderview.h>
 #include <qmath.h>
 #include <qmetaobject.h>
+#if QT_CONFIG(proxymodel)
 #include <qabstractproxymodel.h>
+#endif
 #include <qstylehints.h>
 #include <private/qguiapplication_p.h>
 #include <private/qhighdpiscaling_p.h>
@@ -200,6 +202,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt
 void QComboBoxPrivate::_q_completerActivated(const QModelIndex &index)
 {
     Q_Q(QComboBox);
+#if QT_CONFIG(proxymodel)
     if (index.isValid() && q->completer()) {
         QAbstractProxyModel *proxy = qobject_cast<QAbstractProxyModel *>(q->completer()->completionModel());
         if (proxy) {
@@ -221,9 +224,10 @@ void QComboBoxPrivate::_q_completerActivated(const QModelIndex &index)
             emitActivated(currentIndex);
         }
     }
+#endif
 
 #  ifdef QT_KEYPAD_NAVIGATION
-    if ( QApplication::keypadNavigationEnabled()
+    if ( QApplicationPrivate::keypadNavigationEnabled()
          && q->isEditable()
          && q->completer()
          && q->completer()->completionMode() == QCompleter::UnfilteredPopupCompletion ) {
@@ -443,13 +447,6 @@ void QComboBoxPrivateContainer::paintEvent(QPaintEvent *e)
 
 void QComboBoxPrivateContainer::leaveEvent(QEvent *)
 {
-// On Mac using the Mac style we want to clear the selection
-// when the mouse moves outside the popup.
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    QStyleOptionComboBox opt = comboStyleOption();
-    if (combo->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, combo))
-          view->clearSelection();
-#endif
 }
 
 QComboBoxPrivateContainer::QComboBoxPrivateContainer(QAbstractItemView *itemView, QComboBox *parent)
@@ -691,7 +688,7 @@ void QComboBoxPrivateContainer::changeEvent(QEvent *e)
         setFrameStyle(combo->style()->styleHint(QStyle::SH_ComboBox_PopupFrameStyle, &opt, combo));
     }
 
-    QWidget::changeEvent(e);
+    QFrame::changeEvent(e);
 }
 
 
@@ -865,6 +862,16 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     when the choice is not changed. If you need to know when the
     choice actually changes, use signal currentIndexChanged().
 
+    \obsolete Use QComboBox::textActivated() instead
+*/
+/*!
+    \fn void QComboBox::textActivated(const QString &text)
+    \since 5.14
+
+    This signal is sent when the user chooses an item in the combobox.
+    The item's \a text is passed. Note that this signal is sent even
+    when the choice is not changed. If you need to know when the
+    choice actually changes, use signal currentIndexChanged().
 */
 
 /*!
@@ -879,6 +886,15 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
 
     This signal is sent when an item in the combobox popup list is
     highlighted by the user. The item's \a text is passed.
+
+    \obsolete Use textHighlighted() instead
+*/
+/*!
+    \fn void QComboBox::textHighlighted(const QString &text)
+    \since 5.14
+
+    This signal is sent when an item in the combobox popup list is
+    highlighted by the user. The item's \a text is passed.
 */
 
 /*!
@@ -891,7 +907,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     currentIndex was reset.
 */
 
-#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn void QComboBox::currentIndexChanged(const QString &text)
     \since 4.1
@@ -900,7 +915,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     changes either through user interaction or programmatically.  The
     item's \a text is passed.
 */
-#endif
 
 /*!
     \fn void QComboBox::currentTextChanged(const QString &text)
@@ -1355,7 +1369,13 @@ void QComboBoxPrivate::emitActivated(const QModelIndex &index)
         return;
     QString text(itemText(index));
     emit q->activated(index.row());
+    emit q->textActivated(text);
+#if QT_DEPRECATED_SINCE(5, 15)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     emit q->activated(text);
+QT_WARNING_POP
+#endif
 }
 
 void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index)
@@ -1365,7 +1385,13 @@ void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index)
         return;
     QString text(itemText(index));
     emit q->highlighted(index.row());
+    emit q->textHighlighted(text);
+#if QT_DEPRECATED_SINCE(5, 15)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     emit q->highlighted(text);
+QT_WARNING_POP
+#endif
 }
 
 void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index)
@@ -1522,7 +1548,7 @@ void QComboBox::setAutoCompletion(bool enable)
     Q_D(QComboBox);
 
 #ifdef QT_KEYPAD_NAVIGATION
-    if (Q_UNLIKELY(QApplication::keypadNavigationEnabled() && !enable && isEditable()))
+    if (Q_UNLIKELY(QApplicationPrivate::keypadNavigationEnabled() && !enable && isEditable()))
         qWarning("QComboBox::setAutoCompletion: auto completion is mandatory when combo box editable");
 #endif
 
@@ -1864,13 +1890,12 @@ void QComboBox::setLineEdit(QLineEdit *edit)
     d->updateFocusPolicy();
     d->lineEdit->setFocusProxy(this);
     d->lineEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
+#if QT_DEPRECATED_SINCE(5, 13)
 #if QT_CONFIG(completer)
     setAutoCompletion(d->autoCompletion);
-#endif
 
 #ifdef QT_KEYPAD_NAVIGATION
-#if QT_CONFIG(completer)
-    if (QApplication::keypadNavigationEnabled()) {
+    if (QApplicationPrivate::keypadNavigationEnabled()) {
         // Editable combo boxes will have a completer that is set to UnfilteredPopupCompletion.
         // This means that when the user enters edit mode they are immediately presented with a
         // list of possible completions.
@@ -1882,6 +1907,7 @@ void QComboBox::setLineEdit(QLineEdit *edit)
     }
 #endif
 #endif
+#endif
 
     setAttribute(Qt::WA_InputMethodEnabled);
     d->updateLayoutDirection();
@@ -2513,21 +2539,6 @@ QSize QComboBox::sizeHint() const
 }
 
 #ifdef Q_OS_MAC
-
-namespace {
-struct IndexSetter {
-    int index;
-    QComboBox *cb;
-
-    void operator()(void)
-    {
-        cb->setCurrentIndex(index);
-        emit cb->activated(index);
-        emit cb->activated(cb->itemText(index));
-    }
-};
-}
-
 void QComboBoxPrivate::cleanupNativePopup()
 {
     if (!m_platformMenu)
@@ -2601,7 +2612,7 @@ bool QComboBoxPrivate::showNativePopup()
     // We need to fake one here to un-press the button.
     QMouseEvent mouseReleased(QEvent::MouseButtonRelease, q->pos(), Qt::LeftButton,
                               Qt::MouseButtons(Qt::LeftButton), Qt::KeyboardModifiers());
-    qApp->sendEvent(q, &mouseReleased);
+    QCoreApplication::sendEvent(q, &mouseReleased);
 #endif
 
     return true;
@@ -2641,7 +2652,7 @@ void QComboBox::showPopup()
 
 #ifdef QT_KEYPAD_NAVIGATION
 #if QT_CONFIG(completer)
-    if (QApplication::keypadNavigationEnabled() && d->completer) {
+    if (QApplicationPrivate::keypadNavigationEnabled() && d->completer) {
         // editable combo box is line edit plus completer
         setEditFocus(true);
         d->completer->complete(); // show popup
@@ -2702,15 +2713,14 @@ void QComboBox::showPopup()
         int heightMargin = container->topMargin()  + container->bottomMargin();
 
         // add the frame of the container
-        int marginTop, marginBottom;
-        container->getContentsMargins(0, &marginTop, 0, &marginBottom);
-        heightMargin += marginTop + marginBottom;
+        const QMargins cm = container->contentsMargins();
+        heightMargin += cm.top() + cm.bottom();
 
         //add the frame of the view
-        view()->getContentsMargins(0, &marginTop, 0, &marginBottom);
-        marginTop += static_cast<QAbstractScrollAreaPrivate *>(QObjectPrivate::get(view()))->top;
-        marginBottom += static_cast<QAbstractScrollAreaPrivate *>(QObjectPrivate::get(view()))->bottom;
-        heightMargin += marginTop + marginBottom;
+        const QMargins vm = view()->contentsMargins();
+        heightMargin += vm.top() + vm.bottom();
+        heightMargin += static_cast<QAbstractScrollAreaPrivate *>(QObjectPrivate::get(view()))->top;
+        heightMargin += static_cast<QAbstractScrollAreaPrivate *>(QObjectPrivate::get(view()))->bottom;
 
         listRect.setHeight(listRect.height() + heightMargin);
     }
@@ -2821,19 +2831,15 @@ void QComboBox::showPopup()
     bool startTimer = !container->isVisible();
     container->raise();
     container->create();
-    QWindow *containerWindow = container->window()->windowHandle();
-    if (containerWindow) {
-        QWindow *win = window()->windowHandle();
-        if (win) {
-            QScreen *currentScreen = win->screen();
-            if (currentScreen && !currentScreen->virtualSiblings().contains(containerWindow->screen())) {
-                containerWindow->setScreen(currentScreen);
-
-                // This seems to workaround an issue in xcb+multi GPU+multiscreen
-                // environment where the window might not always show up when screen
-                // is changed.
-                container->hide();
-            }
+    if (QWindow *containerWindow = qt_widget_private(container)->windowHandle(QWidgetPrivate::WindowHandleMode::TopLevel)) {
+        QScreen *currentScreen = d->associatedScreen();
+        if (currentScreen && !currentScreen->virtualSiblings().contains(containerWindow->screen())) {
+            containerWindow->setScreen(currentScreen);
+
+            // This seems to workaround an issue in xcb+multi GPU+multiscreen
+            // environment where the window might not always show up when screen
+            // is changed.
+            container->hide();
         }
     }
     container->show();
@@ -2851,7 +2857,7 @@ void QComboBox::showPopup()
 
     container->update();
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled())
+    if (QApplicationPrivate::keypadNavigationEnabled())
         view()->setEditFocus(true);
 #endif
     if (startTimer) {
@@ -2902,7 +2908,7 @@ void QComboBox::hidePopup()
         bool didFade = false;
         if (needFade) {
 #if defined(Q_OS_MAC)
-            QPlatformNativeInterface *platformNativeInterface = qApp->platformNativeInterface();
+            QPlatformNativeInterface *platformNativeInterface = QGuiApplication::platformNativeInterface();
             int at = platformNativeInterface->metaObject()->indexOfMethod("fadeWindow()");
             if (at != -1) {
                 QMetaMethod windowFade = platformNativeInterface->metaObject()->method(at);
@@ -2923,7 +2929,7 @@ void QComboBox::hidePopup()
             d->container->hide();
     }
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled() && isEditable() && hasFocus())
+    if (QApplicationPrivate::keypadNavigationEnabled() && isEditable() && hasFocus())
         setEditFocus(true);
 #endif
     d->_q_resetButton();
@@ -3182,7 +3188,7 @@ void QComboBoxPrivate::showPopupFromMouseEvent(QMouseEvent *e)
         }
     } else {
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && sc == QStyle::SC_ComboBoxEditField && lineEdit) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && sc == QStyle::SC_ComboBoxEditField && lineEdit) {
             lineEdit->event(e);  //so lineedit can move cursor, etc
             return;
         }
@@ -3231,7 +3237,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         Q_FALLTHROUGH();
     case Qt::Key_PageUp:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled())
+        if (QApplicationPrivate::keypadNavigationEnabled())
             e->ignore();
         else
 #endif
@@ -3246,7 +3252,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         Q_FALLTHROUGH();
     case Qt::Key_PageDown:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled())
+        if (QApplicationPrivate::keypadNavigationEnabled())
             e->ignore();
         else
 #endif
@@ -3280,7 +3286,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         break;
 #ifdef QT_KEYPAD_NAVIGATION
     case Qt::Key_Select:
-        if (QApplication::keypadNavigationEnabled()
+        if (QApplicationPrivate::keypadNavigationEnabled()
                 && (!hasEditFocus() || !d->lineEdit)) {
             showPopup();
             return;
@@ -3288,11 +3294,11 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         break;
     case Qt::Key_Left:
     case Qt::Key_Right:
-        if (QApplication::keypadNavigationEnabled() && !hasEditFocus())
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus())
             e->ignore();
         break;
     case Qt::Key_Back:
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             if (!hasEditFocus() || !d->lineEdit)
                 e->ignore();
         } else {
@@ -3370,12 +3376,13 @@ void QComboBox::wheelEvent(QWheelEvent *e)
         !d->viewContainer()->isVisible()) {
         const int rowCount = count();
         int newIndex = currentIndex();
+        int delta = e->angleDelta().y();
 
-        if (e->delta() > 0) {
+        if (delta > 0) {
             newIndex--;
             while ((newIndex >= 0) && !(d->model->flags(d->model->index(newIndex,d->modelColumn,d->root)) & Qt::ItemIsEnabled))
                 newIndex--;
-        } else if (e->delta() < 0) {
+        } else if (delta < 0) {
             newIndex++;
             while (newIndex < rowCount && !(d->model->index(newIndex, d->modelColumn, d->root).flags() & Qt::ItemIsEnabled))
                 newIndex++;
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index b2fe921bd8..286772c091 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -223,12 +223,18 @@ public Q_SLOTS:
 Q_SIGNALS:
     void editTextChanged(const QString &);
     void activated(int index);
-    void activated(const QString &);
+    void textActivated(const QString &);
     void highlighted(int index);
-    void highlighted(const QString &);
+    void textHighlighted(const QString &);
     void currentIndexChanged(int index);
     void currentIndexChanged(const QString &);
     void currentTextChanged(const QString &);
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_VERSION_X(5, 15, "Use textActivated() instead")
+    void activated(const QString &);
+    QT_DEPRECATED_VERSION_X(5, 15, "Use textHighlighted() instead")
+    void highlighted(const QString &);
+#endif
 
 protected:
     void focusInEvent(QFocusEvent *e) override;
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index 71404964da..5967776a61 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -86,7 +86,7 @@ class QComboBoxListView : public QListView
 {
     Q_OBJECT
 public:
-    QComboBoxListView(QComboBox *cmb = 0) : combo(cmb) {}
+    QComboBoxListView(QComboBox *cmb = nullptr) : combo(cmb) {}
 
 protected:
     void resizeEvent(QResizeEvent *event) override
@@ -331,7 +331,7 @@ protected:
     QSize sizeHint(const QStyleOptionViewItem &option,
                    const QModelIndex &index) const override {
         if (isSeparator(index)) {
-            int pm = mCombo->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, mCombo);
+            int pm = mCombo->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, mCombo);
             return QSize(pm, pm);
         }
         return QItemDelegate::sizeHint(option, index);
@@ -390,6 +390,16 @@ public:
 #ifdef Q_OS_MAC
     void cleanupNativePopup();
     bool showNativePopup();
+    struct IndexSetter {
+        int index;
+        QComboBox *cb;
+
+        void operator()(void)
+        {
+            cb->setCurrentIndex(index);
+            cb->d_func()->emitActivated(cb->d_func()->currentIndex);
+        }
+    };
 #endif
 
     QAbstractItemModel *model;
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index 3e6afdb586..e26993fb23 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include <private/qapplication_p.h>
 #include <private/qdatetimeedit_p.h>
 #include <qabstractspinbox.h>
 #include <qapplication.h>
@@ -153,7 +154,7 @@ QDateTimeEdit::QDateTimeEdit(QWidget *parent)
     : QAbstractSpinBox(*new QDateTimeEditPrivate, parent)
 {
     Q_D(QDateTimeEdit);
-    d->init(QDateTime(QDATETIMEEDIT_DATE_INITIAL, QDATETIMEEDIT_TIME_MIN));
+    d->init(QDATETIMEEDIT_DATE_INITIAL.startOfDay());
 }
 
 /*!
@@ -165,8 +166,7 @@ QDateTimeEdit::QDateTimeEdit(const QDateTime &datetime, QWidget *parent)
     : QAbstractSpinBox(*new QDateTimeEditPrivate, parent)
 {
     Q_D(QDateTimeEdit);
-    d->init(datetime.isValid() ? datetime : QDateTime(QDATETIMEEDIT_DATE_INITIAL,
-                                                      QDATETIMEEDIT_TIME_MIN));
+    d->init(datetime.isValid() ? datetime : QDATETIMEEDIT_DATE_INITIAL.startOfDay());
 }
 
 /*!
@@ -312,6 +312,22 @@ void QDateTimeEdit::setTime(const QTime &time)
 }
 
 
+QCalendar QDateTimeEdit::calendar() const
+{
+    Q_D(const QDateTimeEdit);
+    return d->calendar;
+}
+
+void QDateTimeEdit::setCalendar(QCalendar calendar)
+{
+    Q_D(QDateTimeEdit);
+    // Set invalid date time to prevent runtime crashes on calendar change
+    QDateTime previousValue = d->value.toDateTime();
+    setDateTime(QDateTime());
+    d->setCalendar(calendar);
+    setDateTime(previousValue);
+}
+
 /*!
   \property QDateTimeEdit::minimumDateTime
   \since 4.4
@@ -342,7 +358,7 @@ QDateTime QDateTimeEdit::minimumDateTime() const
 
 void QDateTimeEdit::clearMinimumDateTime()
 {
-    setMinimumDateTime(QDateTime(QDATETIMEEDIT_COMPAT_DATE_MIN, QDATETIMEEDIT_TIME_MIN));
+    setMinimumDateTime(QDATETIMEEDIT_COMPAT_DATE_MIN.startOfDay());
 }
 
 void QDateTimeEdit::setMinimumDateTime(const QDateTime &dt)
@@ -385,7 +401,7 @@ QDateTime QDateTimeEdit::maximumDateTime() const
 
 void QDateTimeEdit::clearMaximumDateTime()
 {
-    setMaximumDateTime(QDATETIMEEDIT_DATETIME_MAX);
+    setMaximumDateTime(QDATETIMEEDIT_DATE_MAX.endOfDay());
 }
 
 void QDateTimeEdit::setMaximumDateTime(const QDateTime &dt)
@@ -643,10 +659,10 @@ QDateTimeEdit::Section QDateTimeEdit::currentSection() const
 {
     Q_D(const QDateTimeEdit);
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled() && d->focusOnButton)
+    if (QApplicationPrivate::keypadNavigationEnabled() && d->focusOnButton)
         return NoSection;
 #endif
-    return d->convertToPublic(d->sectionType(d->currentSectionIndex));
+    return QDateTimeEditPrivate::convertToPublic(d->sectionType(d->currentSectionIndex));
 }
 
 void QDateTimeEdit::setCurrentSection(Section section)
@@ -660,7 +676,7 @@ void QDateTimeEdit::setCurrentSection(Section section)
     int index = d->currentSectionIndex + 1;
     for (int i=0; i<2; ++i) {
         while (index < size) {
-            if (d->convertToPublic(d->sectionType(index)) == section) {
+            if (QDateTimeEditPrivate::convertToPublic(d->sectionType(index)) == section) {
                 d->edit->setCursorPosition(d->sectionPos(index));
                 QDTEDEBUG << d->sectionPos(index);
                 return;
@@ -686,7 +702,7 @@ QDateTimeEdit::Section QDateTimeEdit::sectionAt(int index) const
     Q_D(const QDateTimeEdit);
     if (index < 0 || index >= d->sectionNodes.size())
         return NoSection;
-    return d->convertToPublic(d->sectionType(index));
+    return QDateTimeEditPrivate::convertToPublic(d->sectionType(index));
 }
 
 /*!
@@ -880,7 +896,7 @@ void QDateTimeEdit::setDisplayFormat(const QString &format)
         }
 
         d->formatExplicitlySet = true;
-        d->sections = d->convertSections(d->display);
+        d->sections = QDateTimeEditPrivate::convertSections(d->display);
         d->clearCache();
 
         d->currentSectionIndex = qMin(d->currentSectionIndex, d->sectionNodes.size() - 1);
@@ -1056,7 +1072,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event)
     switch (event->key()) {
 #ifdef QT_KEYPAD_NAVIGATION
     case Qt::Key_NumberSign:    //shortcut to popup calendar
-        if (QApplication::keypadNavigationEnabled() && d->calendarPopupEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && d->calendarPopupEnabled()) {
             d->initCalendarPopup();
             d->positionCalendarPopup();
             d->monthCalendar->show();
@@ -1064,7 +1080,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event)
         }
         break;
     case Qt::Key_Select:
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             if (hasEditFocus()) {
                 if (d->focusOnButton) {
                     d->initCalendarPopup();
@@ -1096,7 +1112,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event)
         return;
     default:
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && !hasEditFocus()
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()
             && !event->text().isEmpty() && event->text().at(0).isLetterOrNumber()) {
             setEditFocus(true);
 
@@ -1118,23 +1134,13 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event)
         if (event->key() == Qt::Key_Left || event->key() == Qt::Key_Right) {
             if (
 #ifdef QT_KEYPAD_NAVIGATION
-                QApplication::keypadNavigationEnabled() && !hasEditFocus()
-                || !QApplication::keypadNavigationEnabled() &&
+                QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()
+                || !QApplicationPrivate::keypadNavigationEnabled() &&
 #endif
                 !(event->modifiers() & Qt::ControlModifier)) {
                 select = false;
                 break;
             }
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-            else
-#ifdef QT_KEYPAD_NAVIGATION
-                if (!QApplication::keypadNavigationEnabled())
-#endif
-            {
-                select = (event->modifiers() & Qt::ShiftModifier);
-                break;
-            }
-#endif
         }
         Q_FALLTHROUGH();
     case Qt::Key_Backtab:
@@ -1148,7 +1154,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event)
                              && (event->key() != Qt::Key_Tab || !(event->modifiers() & Qt::ShiftModifier));
 #ifdef QT_KEYPAD_NAVIGATION
         int newSection = d->nextPrevSection(d->currentSectionIndex, forward);
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             if (d->focusOnButton) {
                 newSection = forward ? 0 : d->sectionNodes.size() - 1;
                 d->focusOnButton = false;
@@ -1291,7 +1297,7 @@ void QDateTimeEdit::stepBy(int steps)
     Q_D(QDateTimeEdit);
 #ifdef QT_KEYPAD_NAVIGATION
     // with keypad navigation and not editFocus, left right change the date/time by a fixed amount.
-    if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+    if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
         // if date based, shift by day.  else shift by 15min
         if (d->sections & DateSections_Mask) {
             setDateTime(dateTime().addDays(steps));
@@ -1354,7 +1360,7 @@ void QDateTimeEdit::stepBy(int steps)
 QString QDateTimeEdit::textFromDateTime(const QDateTime &dateTime) const
 {
     Q_D(const QDateTimeEdit);
-    return locale().toString(dateTime, d->displayFormat);
+    return locale().toString(dateTime, d->displayFormat, d->calendar);
 }
 
 
@@ -1418,7 +1424,7 @@ QDateTimeEdit::StepEnabled QDateTimeEdit::stepEnabled() const
     QAbstractSpinBox::StepEnabled ret = 0;
 
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+    if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
         if (d->wrapping)
             return StepEnabled(StepUpEnabled | StepDownEnabled);
         // 3 cases.  date, time, datetime.  each case look
@@ -1646,7 +1652,7 @@ QDateEdit::~QDateEdit()
 
 
 QDateTimeEditPrivate::QDateTimeEditPrivate()
-    : QDateTimeParser(QVariant::DateTime, QDateTimeParser::DateTimeEdit)
+    : QDateTimeParser(QVariant::DateTime, QDateTimeParser::DateTimeEdit, QCalendar())
 {
     hasHadFocus = false;
     formatExplicitlySet = false;
@@ -1660,8 +1666,8 @@ QDateTimeEditPrivate::QDateTimeEditPrivate()
     first.pos = 0;
     sections = 0;
     calendarPopup = false;
-    minimum = QDATETIMEEDIT_COMPAT_DATETIME_MIN;
-    maximum = QDATETIMEEDIT_DATETIME_MAX;
+    minimum = QDATETIMEEDIT_COMPAT_DATE_MIN.startOfDay();
+    maximum = QDATETIMEEDIT_DATE_MAX.endOfDay();
     arrowState = QStyle::State_None;
     monthCalendar = 0;
     readLocaleSettings();
@@ -1671,10 +1677,6 @@ QDateTimeEditPrivate::QDateTimeEditPrivate()
 #endif
 }
 
-QDateTimeEditPrivate::~QDateTimeEditPrivate()
-{
-}
-
 void QDateTimeEditPrivate::updateTimeSpec()
 {
     minimum = minimum.toDateTime().toTimeSpec(spec);
@@ -1685,8 +1687,8 @@ void QDateTimeEditPrivate::updateTimeSpec()
     const bool dateShown = (sections & QDateTimeEdit::DateSections_Mask);
     if (!dateShown) {
         if (minimum.toTime() >= maximum.toTime()){
-            minimum = QDateTime(value.toDate(), QDATETIMEEDIT_TIME_MIN, spec);
-            maximum = QDateTime(value.toDate(), QDATETIMEEDIT_TIME_MAX, spec);
+            minimum = value.toDate().startOfDay(spec);
+            maximum = value.toDate().endOfDay(spec);
         }
     }
 }
@@ -1703,7 +1705,7 @@ void QDateTimeEditPrivate::updateEdit()
 
     if (!specialValue()
 #ifdef QT_KEYPAD_NAVIGATION
-        && !(QApplication::keypadNavigationEnabled() && !edit->hasEditFocus())
+        && !(QApplicationPrivate::keypadNavigationEnabled() && !edit->hasEditFocus())
 #endif
             ) {
         int cursor = sectionPos(currentSectionIndex);
@@ -1732,7 +1734,7 @@ void QDateTimeEditPrivate::setSelected(int sectionIndex, bool forward)
 {
     if (specialValue()
 #ifdef QT_KEYPAD_NAVIGATION
-        || (QApplication::keypadNavigationEnabled() && !edit->hasEditFocus())
+        || (QApplicationPrivate::keypadNavigationEnabled() && !edit->hasEditFocus())
 #endif
         ) {
         edit->selectAll();
@@ -2018,8 +2020,7 @@ QDateTime QDateTimeEditPrivate::stepBy(int sectionIndex, int steps, bool test) c
         val = (wrapping ? min + val - max - 1 : max);
     }
 
-
-    const int oldDay = v.date().day();
+    const int oldDay = v.date().day(calendar);
 
     setDigit(v, sectionIndex, val);
     // if this sets year or month it will make
@@ -2038,10 +2039,10 @@ QDateTime QDateTimeEditPrivate::stepBy(int sectionIndex, int steps, bool test) c
             if (steps > 0) {
                 setDigit(v, sectionIndex, min);
                 if (!(sn.type & DaySectionMask) && sections & DateSectionMask) {
-                    const int daysInMonth = v.date().daysInMonth();
-                    if (v.date().day() < oldDay && v.date().day() < daysInMonth) {
+                    const int daysInMonth = v.date().daysInMonth(calendar);
+                    if (v.date().day(calendar) < oldDay && v.date().day(calendar) < daysInMonth) {
                         const int adds = qMin(oldDay, daysInMonth);
-                        v = v.addDays(adds - v.date().day());
+                        v = v.addDays(adds - v.date().day(calendar));
                     }
                 }
 
@@ -2053,10 +2054,10 @@ QDateTime QDateTimeEditPrivate::stepBy(int sectionIndex, int steps, bool test) c
             } else {
                 setDigit(v, sectionIndex, max);
                 if (!(sn.type & DaySectionMask) && sections & DateSectionMask) {
-                    const int daysInMonth = v.date().daysInMonth();
-                    if (v.date().day() < oldDay && v.date().day() < daysInMonth) {
+                    const int daysInMonth = v.date().daysInMonth(calendar);
+                    if (v.date().day(calendar) < oldDay && v.date().day(calendar) < daysInMonth) {
                         const int adds = qMin(oldDay, daysInMonth);
-                        v = v.addDays(adds - v.date().day());
+                        v = v.addDays(adds - v.date().day(calendar));
                     }
                 }
 
@@ -2070,7 +2071,7 @@ QDateTime QDateTimeEditPrivate::stepBy(int sectionIndex, int steps, bool test) c
             setDigit(v, sectionIndex, (steps > 0 ? localmax : localmin));
         }
     }
-    if (!test && oldDay != v.date().day() && !(sn.type & DaySectionMask)) {
+    if (!test && oldDay != v.date().day(calendar) && !(sn.type & DaySectionMask)) {
         // this should not happen when called from stepEnabled
         cachedDay = qMax<int>(oldDay, cachedDay);
     }
@@ -2402,7 +2403,7 @@ void QDateTimeEditPrivate::init(const QVariant &var)
     Q_Q(QDateTimeEdit);
     switch (var.type()) {
     case QVariant::Date:
-        value = QDateTime(var.toDate(), QDATETIMEEDIT_TIME_MIN);
+        value = var.toDate().startOfDay();
         updateTimeSpec();
         q->setDisplayFormat(defaultDateFormat);
         if (sectionNodes.isEmpty()) // ### safeguard for broken locale
@@ -2427,7 +2428,7 @@ void QDateTimeEditPrivate::init(const QVariant &var)
         break;
     }
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled())
+    if (QApplicationPrivate::keypadNavigationEnabled())
         q->setCalendarPopup(true);
 #endif
     q->setInputMethodHints(Qt::ImhPreferNumbers);
@@ -2523,7 +2524,7 @@ void QDateTimeEditPrivate::initCalendarPopup(QCalendarWidget *cw)
 {
     Q_Q(QDateTimeEdit);
     if (!monthCalendar) {
-        monthCalendar = new QCalendarPopup(q, cw);
+        monthCalendar = new QCalendarPopup(q, cw, calendar);
         monthCalendar->setObjectName(QLatin1String("qt_datetimedit_calendar"));
         QObject::connect(monthCalendar, SIGNAL(newDateSelected(QDate)), q, SLOT(setDate(QDate)));
         QObject::connect(monthCalendar, SIGNAL(hidingCalendar(QDate)), q, SLOT(setDate(QDate)));
@@ -2584,8 +2585,8 @@ void QDateTimeEditPrivate::syncCalendarWidget()
     }
 }
 
-QCalendarPopup::QCalendarPopup(QWidget * parent, QCalendarWidget *cw)
-    : QWidget(parent, Qt::Popup)
+QCalendarPopup::QCalendarPopup(QWidget *parent, QCalendarWidget *cw, QCalendar ca)
+    : QWidget(parent, Qt::Popup), calendarSystem(ca)
 {
     setAttribute(Qt::WA_WindowPropagation);
 
@@ -2601,9 +2602,10 @@ QCalendarWidget *QCalendarPopup::verifyCalendarInstance()
 {
     if (calendar.isNull()) {
         QCalendarWidget *cw = new QCalendarWidget(this);
+        cw->setCalendar(calendarSystem);
         cw->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled())
+        if (QApplicationPrivate::keypadNavigationEnabled())
             cw->setHorizontalHeaderFormat(QCalendarWidget::SingleLetterDayNames);
 #endif
         setCalendarWidget(cw);
@@ -2634,13 +2636,13 @@ void QCalendarPopup::setCalendarWidget(QCalendarWidget *cw)
 }
 
 
-void QCalendarPopup::setDate(const QDate &date)
+void QCalendarPopup::setDate(QDate date)
 {
     oldDate = date;
     verifyCalendarInstance()->setSelectedDate(date);
 }
 
-void QCalendarPopup::setDateRange(const QDate &min, const QDate &max)
+void QCalendarPopup::setDateRange(QDate min, QDate max)
 {
     QCalendarWidget *cw = verifyCalendarInstance();
     cw->setMinimumDate(min);
@@ -2684,7 +2686,7 @@ void QCalendarPopup::dateSelectionChanged()
     dateChanged = true;
     emit newDateSelected(verifyCalendarInstance()->selectedDate());
 }
-void QCalendarPopup::dateSelected(const QDate &date)
+void QCalendarPopup::dateSelected(QDate date)
 {
     dateChanged = true;
     emit activated(date);
diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h
index b6fb35fc71..03994675ae 100644
--- a/src/widgets/widgets/qdatetimeedit.h
+++ b/src/widgets/widgets/qdatetimeedit.h
@@ -42,6 +42,7 @@
 
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qdatetime.h>
+#include <QtCore/qcalendar.h>
 #include <QtCore/qvariant.h>
 #include <QtWidgets/qabstractspinbox.h>
 
@@ -102,6 +103,9 @@ public:
     QDate date() const;
     QTime time() const;
 
+    QCalendar calendar() const;
+    void setCalendar(QCalendar calendar);
+
     QDateTime minimumDateTime() const;
     void clearMinimumDateTime();
     void setMinimumDateTime(const QDateTime &dt);
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
index 1ebc98dedf..dcf8863c8b 100644
--- a/src/widgets/widgets/qdatetimeedit_p.h
+++ b/src/widgets/widgets/qdatetimeedit_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include <QtCore/qcalendar.h>
 #include "QtWidgets/qcalendarwidget.h"
 #include "QtWidgets/qspinbox.h"
 #include "QtWidgets/qtoolbutton.h"
@@ -70,7 +71,6 @@ class Q_AUTOTEST_EXPORT QDateTimeEditPrivate : public QAbstractSpinBoxPrivate, p
     Q_DECLARE_PUBLIC(QDateTimeEdit)
 public:
     QDateTimeEditPrivate();
-    ~QDateTimeEditPrivate();
 
     void init(const QVariant &var);
     void readLocaleSettings();
@@ -123,7 +123,7 @@ public:
     static QDateTimeEdit::Sections convertSections(QDateTimeParser::Sections s);
     static QDateTimeEdit::Section convertToPublic(QDateTimeParser::Section s);
 
-    void initCalendarPopup(QCalendarWidget *cw = 0);
+    void initCalendarPopup(QCalendarWidget *cw = nullptr);
     void positionCalendarPopup();
 
     QDateTimeEdit::Sections sections;
@@ -145,21 +145,22 @@ class QCalendarPopup : public QWidget
 {
     Q_OBJECT
 public:
-    explicit QCalendarPopup(QWidget *parent = 0, QCalendarWidget *cw = 0);
+    explicit QCalendarPopup(QWidget *parent = nullptr, QCalendarWidget *cw = nullptr,
+                            QCalendar ca = QCalendar());
     QDate selectedDate() { return verifyCalendarInstance()->selectedDate(); }
-    void setDate(const QDate &date);
-    void setDateRange(const QDate &min, const QDate &max);
+    void setDate(QDate date);
+    void setDateRange(QDate min, QDate max);
     void setFirstDayOfWeek(Qt::DayOfWeek dow) { verifyCalendarInstance()->setFirstDayOfWeek(dow); }
     QCalendarWidget *calendarWidget() const { return const_cast<QCalendarPopup*>(this)->verifyCalendarInstance(); }
     void setCalendarWidget(QCalendarWidget *cw);
 Q_SIGNALS:
-    void activated(const QDate &date);
-    void newDateSelected(const QDate &newDate);
-    void hidingCalendar(const QDate &oldDate);
+    void activated(QDate date);
+    void newDateSelected(QDate newDate);
+    void hidingCalendar(QDate oldDate);
     void resetButton();
 
 private Q_SLOTS:
-    void dateSelected(const QDate &date);
+    void dateSelected(QDate date);
     void dateSelectionChanged();
 
 protected:
@@ -174,6 +175,7 @@ private:
     QPointer<QCalendarWidget> calendar;
     QDate oldDate;
     bool dateChanged;
+    QCalendar calendarSystem;
 };
 
 QT_END_NAMESPACE
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index 26b86f80be..28f6cdc7bd 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -387,12 +387,25 @@ QPushButton *QDialogButtonBoxPrivate::createButton(QDialogButtonBox::StandardBut
         icon = QStyle::SP_DialogNoButton;
         break;
     case QDialogButtonBox::YesToAll:
+        icon = QStyle::SP_DialogYesToAllButton;
+        break;
     case QDialogButtonBox::NoToAll:
+        icon = QStyle::SP_DialogNoToAllButton;
+        break;
     case QDialogButtonBox::SaveAll:
+        icon = QStyle::SP_DialogSaveAllButton;
+        break;
     case QDialogButtonBox::Abort:
+        icon = QStyle::SP_DialogAbortButton;
+        break;
     case QDialogButtonBox::Retry:
+        icon = QStyle::SP_DialogRetryButton;
+        break;
     case QDialogButtonBox::Ignore:
+        icon = QStyle::SP_DialogIgnoreButton;
+        break;
     case QDialogButtonBox::RestoreDefaults:
+        icon = QStyle::SP_RestoreDefaultsButton;
         break;
     case QDialogButtonBox::NoButton:
         return 0;
diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
index 54504d124b..5900326087 100644
--- a/src/widgets/widgets/qdockarealayout.cpp
+++ b/src/widgets/widgets/qdockarealayout.cpp
@@ -138,11 +138,8 @@ bool QDockAreaLayoutItem::skip() const
 
 QSize QDockAreaLayoutItem::minimumSize() const
 {
-    if (widgetItem != 0) {
-        int left, top, right, bottom;
-        widgetItem->widget()->getContentsMargins(&left, &top, &right, &bottom);
-        return widgetItem->minimumSize() + QSize(left+right, top+bottom);
-    }
+    if (widgetItem)
+        return widgetItem->minimumSize().grownBy(widgetItem->widget()->contentsMargins());
     if (subinfo != 0)
         return subinfo->minimumSize();
     return QSize(0, 0);
@@ -150,11 +147,8 @@ QSize QDockAreaLayoutItem::minimumSize() const
 
 QSize QDockAreaLayoutItem::maximumSize() const
 {
-    if (widgetItem != 0) {
-        int left, top, right, bottom;
-        widgetItem->widget()->getContentsMargins(&left, &top, &right, &bottom);
-        return widgetItem->maximumSize()+ QSize(left+right, top+bottom);
-    }
+    if (widgetItem)
+        return widgetItem->maximumSize().grownBy(widgetItem->widget()->contentsMargins());
     if (subinfo != 0)
         return subinfo->maximumSize();
     return QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@@ -180,11 +174,8 @@ QSize QDockAreaLayoutItem::sizeHint() const
 {
     if (placeHolderItem != 0)
         return QSize(0, 0);
-    if (widgetItem != 0) {
-        int left, top, right, bottom;
-        widgetItem->widget()->getContentsMargins(&left, &top, &right, &bottom);
-        return widgetItem->sizeHint() + QSize(left+right, top+bottom);
-    }
+    if (widgetItem)
+        return widgetItem->sizeHint().grownBy(widgetItem->widget()->contentsMargins());
     if (subinfo != 0)
         return subinfo->sizeHint();
     return QSize(-1, -1);
@@ -1678,12 +1669,9 @@ int QDockAreaLayoutInfo::prev(int index) const
     return -1;
 }
 
+#if QT_CONFIG(tabbar)
 void QDockAreaLayoutInfo::tab(int index, QLayoutItem *dockWidgetItem)
 {
-#if !QT_CONFIG(tabbar)
-    Q_UNUSED(index);
-    Q_UNUSED(dockWidgetItem);
-#else
     if (tabbed) {
         item_list.append(QDockAreaLayoutItem(dockWidgetItem));
         updateTabBar();
@@ -1699,8 +1687,8 @@ void QDockAreaLayoutInfo::tab(int index, QLayoutItem *dockWidgetItem)
         new_info->updateTabBar();
         new_info->setCurrentTab(dockWidgetItem->widget());
     }
-#endif // QT_CONFIG(tabbar)
 }
+#endif // QT_CONFIG(tabbar)
 
 void QDockAreaLayoutInfo::split(int index, Qt::Orientation orientation,
                                        QLayoutItem *dockWidgetItem)
@@ -1937,11 +1925,6 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*>
                 QDockAreaLayoutItem item(new QDockWidgetItem(widget));
                 if (flags & StateFlagFloating) {
                     bool drawer = false;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC // drawer support
-                    extern bool qt_mac_is_macdrawer(const QWidget *); //qwidget_mac.cpp
-                    extern bool qt_mac_set_drawer_preferred_edge(QWidget *, Qt::DockWidgetArea); //qwidget_mac.cpp
-                    drawer = qt_mac_is_macdrawer(widget);
-#endif
 
                     if (!testing) {
                         widget->hide();
@@ -1952,13 +1935,6 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*>
                     int x, y, w, h;
                     stream >> x >> y >> w >> h;
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC // drawer support
-                    if (drawer) {
-                        mainWindow->window()->createWinId();
-                        widget->window()->createWinId();
-                        qt_mac_set_drawer_preferred_edge(widget, toDockWidgetArea(dockPos));
-                    } else
-#endif
                     if (!testing)
                         widget->setGeometry(QDockAreaLayout::constrainedRect(QRect(x, y, w, h), widget));
 
@@ -2052,9 +2028,8 @@ void QDockAreaLayoutInfo::updateSeparatorWidgets() const
         }
         j++;
 
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
         sepWidget->raise();
-#endif
+
         QRect sepRect = separatorRect(i).adjusted(-2, -2, 2, 2);
         sepWidget->setGeometry(sepRect);
         sepWidget->setMask( QRegion(separatorRect(i).translated( - sepRect.topLeft())));
@@ -3093,10 +3068,6 @@ bool QDockAreaLayout::restoreDockWidget(QDockWidget *dockWidget)
         dockWidget->d_func()->setWindowState(true, true, r);
     }
     dockWidget->setVisible(!placeHolder->hidden);
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    if (placeHolder->window) // gets rid of the X11BypassWindowManager window flag
-        dockWidget->d_func()->setWindowState(true);
-#endif
 
     item->placeHolderItem = 0;
     delete placeHolder;
@@ -3137,6 +3108,7 @@ void QDockAreaLayout::addDockWidget(QInternal::DockPosition pos, QDockWidget *do
     removePlaceHolder(dockWidget->objectName());
 }
 
+#if QT_CONFIG(tabbar)
 void QDockAreaLayout::tabifyDockWidget(QDockWidget *first, QDockWidget *second)
 {
     const QList<int> path = indexOf(first);
@@ -3149,6 +3121,7 @@ void QDockAreaLayout::tabifyDockWidget(QDockWidget *first, QDockWidget *second)
 
     removePlaceHolder(second->objectName());
 }
+#endif // QT_CONFIG(tabbar)
 
 void QDockAreaLayout::resizeDocks(const QList<QDockWidget *> &docks,
                                   const QList<int> &sizes, Qt::Orientation o)
@@ -3341,9 +3314,8 @@ void QDockAreaLayout::updateSeparatorWidgets() const
         }
         j++;
 
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
         sepWidget->raise();
-#endif
+
         QRect sepRect = separatorRect(i).adjusted(-2, -2, 2, 2);
         sepWidget->setGeometry(sepRect);
         sepWidget->setMask( QRegion(separatorRect(i).translated( - sepRect.topLeft())));
diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h
index 49bd157179..81384bd1b7 100644
--- a/src/widgets/widgets/qdockarealayout_p.h
+++ b/src/widgets/widgets/qdockarealayout_p.h
@@ -89,7 +89,7 @@ struct QDockAreaLayoutItem
 {
     enum ItemFlags { NoFlags = 0, GapItem = 1, KeepSize = 2 };
 
-    explicit QDockAreaLayoutItem(QLayoutItem *_widgetItem = 0);
+    explicit QDockAreaLayoutItem(QLayoutItem *_widgetItem = nullptr);
     explicit QDockAreaLayoutItem(QDockAreaLayoutInfo *_subinfo);
     explicit QDockAreaLayoutItem(QPlaceHolderItem *_placeHolderItem);
     QDockAreaLayoutItem(const QDockAreaLayoutItem &other);
@@ -144,7 +144,9 @@ public:
     void remove(const QList<int> &path);
     void unnest(int index);
     void split(int index, Qt::Orientation orientation, QLayoutItem *dockWidgetItem);
+#if QT_CONFIG(tabbar)
     void tab(int index, QLayoutItem *dockWidgetItem);
+#endif
     QDockAreaLayoutItem &item(const QList<int> &path);
     QDockAreaLayoutInfo *info(const QList<int> &path);
     QDockAreaLayoutInfo *info(QWidget *widget);
@@ -275,7 +277,9 @@ public:
     bool restoreDockWidget(QDockWidget *dockWidget);
     void splitDockWidget(QDockWidget *after, QDockWidget *dockWidget,
                          Qt::Orientation orientation);
+#if QT_CONFIG(tabbar)
     void tabifyDockWidget(QDockWidget *first, QDockWidget *second);
+#endif
     void resizeDocks(const QList<QDockWidget *> &docks, const QList<int> &sizes, Qt::Orientation o);
 
     void apply(bool animate);
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 4041c730b8..05ec3aface 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -267,9 +267,11 @@ QDockWidgetLayout::~QDockWidgetLayout()
 bool QDockWidgetLayout::nativeWindowDeco() const
 {
     bool floating = parentWidget()->isWindow();
+#if QT_CONFIG(tabbar)
     if (auto groupWindow =
             qobject_cast<const QDockWidgetGroupWindow *>(parentWidget()->parentWidget()))
         floating = floating || groupWindow->tabLayoutInfo();
+#endif
     return nativeWindowDeco(floating);
 }
 
@@ -379,11 +381,10 @@ QSize QDockWidgetLayout::sizeFromContent(const QSize &content, bool floating) co
     if (content.height() < 0)
         result.setHeight(-1);
 
-    int left, top, right, bottom;
-    w->getContentsMargins(&left, &top, &right, &bottom);
+    const QMargins margins = w->contentsMargins();
     //we need to subtract the contents margin (it will be added by the caller)
-    QSize min = w->minimumSize() - QSize(left + right, top + bottom);
-    QSize max = w->maximumSize() - QSize(left + right, top + bottom);
+    QSize min = w->minimumSize().shrunkBy(margins);
+    QSize max = w->maximumSize().shrunkBy(margins);
 
     /* A floating dockwidget will automatically get its minimumSize set to the layout's
        minimum size + deco. We're *not* interested in this, we only take minimumSize()
@@ -975,11 +976,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event)
             && (event->pos() - state->pressPos).manhattanLength()
                 > QApplication::startDragDistance()) {
             startDrag();
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-            grabMouseWhileInWindow();
-#else
             q->grabMouse();
-#endif
             ret = true;
         }
     }
@@ -1027,13 +1024,6 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event)
     QWidget *tl = q->topLevelWidget();
     QRect geo = tl->geometry();
     QRect titleRect = tl->frameGeometry();
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    if ((features & QDockWidget::DockWidgetVerticalTitleBar)) {
-        titleRect.setTop(geo.top());
-        titleRect.setBottom(geo.bottom());
-        titleRect.setRight(geo.left() - 1);
-    } else
-#endif
     {
         titleRect.setLeft(geo.left());
         titleRect.setRight(geo.right());
@@ -1182,6 +1172,8 @@ void QDockWidgetPrivate::setWindowState(bool floating, bool unplug, const QRect
             QMainWindowLayout *mwlayout = qt_mainwindow_layout_from_dock(q);
             if (mwlayout)
                 emit q->dockLocationChanged(mwlayout->dockWidgetArea(q));
+        } else {
+            emit q->dockLocationChanged(Qt::NoDockWidgetArea);
         }
     }
 
@@ -1533,10 +1525,10 @@ bool QDockWidget::event(QEvent *event)
         d->toggleViewAction->setChecked(true);
         QPoint parentTopLeft(0, 0);
         if (isWindow()) {
-            if (const QWindow *window = windowHandle())
-                parentTopLeft = window->screen()->availableVirtualGeometry().topLeft();
-            else
-                parentTopLeft = QGuiApplication::primaryScreen()->availableVirtualGeometry().topLeft();
+            const QScreen *screen = d->associatedScreen();
+            parentTopLeft = screen
+                ? screen->availableVirtualGeometry().topLeft()
+                : QGuiApplication::primaryScreen()->availableVirtualGeometry().topLeft();
         }
         emit visibilityChanged(geometry().right() >= parentTopLeft.x() && geometry().bottom() >= parentTopLeft.y());
 }
@@ -1554,8 +1546,10 @@ bool QDockWidget::event(QEvent *event)
             const QObjectList &siblings = win->children();
             onTop = siblings.count() > 0 && siblings.last() == (QObject*)this;
         }
+#if QT_CONFIG(tabbar)
         if (!isFloating() && layout != 0 && onTop)
             layout->raise(this);
+#endif
         break;
     }
     case QEvent::WindowActivate:
@@ -1582,17 +1576,6 @@ bool QDockWidget::event(QEvent *event)
         if (d->mouseMoveEvent(static_cast<QMouseEvent *>(event)))
             return true;
         break;
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    case QEvent::Leave:
-        if (d->state != 0 && d->state->dragging && !d->state->nca) {
-            // This is a workaround for loosing the mouse on Vista.
-            QPoint pos = QCursor::pos();
-            QMouseEvent fake(QEvent::MouseMove, mapFromGlobal(pos), pos, Qt::NoButton,
-                             QApplication::mouseButtons(), QApplication::keyboardModifiers());
-            d->mouseMoveEvent(&fake);
-        }
-        break;
-#endif
     case QEvent::MouseButtonRelease:
         if (d->mouseReleaseEvent(static_cast<QMouseEvent *>(event)))
             return true;
diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h
index e224ba7143..bc6ac86c45 100644
--- a/src/widgets/widgets/qdockwidget_p.h
+++ b/src/widgets/widgets/qdockwidget_p.h
@@ -138,7 +138,7 @@ class Q_WIDGETS_EXPORT QDockWidgetLayout : public QLayout
 {
     Q_OBJECT
 public:
-    QDockWidgetLayout(QWidget *parent = 0);
+    QDockWidgetLayout(QWidget *parent = nullptr);
     ~QDockWidgetLayout();
     void addItem(QLayoutItem *item) override;
     QLayoutItem *itemAt(int index) const override;
@@ -196,15 +196,15 @@ inline QLayoutItem *QDockWidgetItem::dockWidgetChildItem() const
 {
     if (QDockWidgetLayout *layout = dockWidgetLayout())
         return layout->itemForRole(QDockWidgetLayout::Content);
-    return 0;
+    return nullptr;
 }
 
 inline QDockWidgetLayout *QDockWidgetItem::dockWidgetLayout() const
 {
     QWidget *w = const_cast<QDockWidgetItem*>(this)->widget();
-    if (w != 0)
+    if (w != nullptr)
         return qobject_cast<QDockWidgetLayout*>(w->layout());
-    return 0;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp
index bcc8d7815d..7069ef0368 100644
--- a/src/widgets/widgets/qeffects.cpp
+++ b/src/widgets/widgets/qeffects.cpp
@@ -99,7 +99,7 @@ static QAlphaWidget* q_blend = 0;
   Constructs a QAlphaWidget.
 */
 QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED // QDesktopWidget::screen()
+QT_WARNING_DISABLE_DEPRECATED // ### Qt 6: Find a replacement for QDesktopWidget::screen()
 QAlphaWidget::QAlphaWidget(QWidget* w, Qt::WindowFlags f)
     : QWidget(QApplication::desktop()->screen(QDesktopWidgetPrivate::screenNumber(w)), f)
 {
@@ -569,8 +569,8 @@ void qScrollEffect(QWidget* w, QEffects::DirFlags orient, int time)
     if (!w)
         return;
 
-    QApplication::sendPostedEvents(w, QEvent::Move);
-    QApplication::sendPostedEvents(w, QEvent::Resize);
+    QCoreApplication::sendPostedEvents(w, QEvent::Move);
+    QCoreApplication::sendPostedEvents(w, QEvent::Resize);
     Qt::WindowFlags flags = Qt::ToolTip;
 
     // those can be popups - they would steal the focus, but are disabled
@@ -591,8 +591,8 @@ void qFadeEffect(QWidget* w, int time)
     if (!w)
         return;
 
-    QApplication::sendPostedEvents(w, QEvent::Move);
-    QApplication::sendPostedEvents(w, QEvent::Resize);
+    QCoreApplication::sendPostedEvents(w, QEvent::Move);
+    QCoreApplication::sendPostedEvents(w, QEvent::Resize);
 
     Qt::WindowFlags flags = Qt::ToolTip;
 
diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp
index 69eac1ebf7..eec794562a 100644
--- a/src/widgets/widgets/qgroupbox.cpp
+++ b/src/widgets/widgets/qgroupbox.cpp
@@ -389,9 +389,13 @@ bool QGroupBox::event(QEvent *e)
 void QGroupBox::childEvent(QChildEvent *c)
 {
     Q_D(QGroupBox);
-    if (c->type() != QEvent::ChildAdded || !c->child()->isWidgetType())
+    /*
+        Children might have been enabled after being added to the group box, in which case
+        the childEvent handler ran too early, and we need to disabled children again.
+    */
+    if (!(c->added() || c->polished()) || !c->child()->isWidgetType())
         return;
-    QWidget *w = (QWidget*)c->child();
+    QWidget *w = static_cast<QWidget*>(c->child());
     if (w->isWindow())
         return;
     if (d->checkable) {
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index a5c0c41ee0..fb67936768 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -84,7 +84,7 @@
 #include "qkeysequence.h"
 #define ACCEL_KEY(k) ((!QCoreApplication::testAttribute(Qt::AA_DontShowIconsInMenus) \
                         && QGuiApplication::styleHints()->showShortcutsInContextMenus()) \
-                      && !qApp->d_func()->shortcutMap.hasShortcutForKeySequence(k) ? \
+                      && !QGuiApplicationPrivate::instance()->shortcutMap.hasShortcutForKeySequence(k) ? \
                       QLatin1Char('\t') + QKeySequence(k).toString(QKeySequence::NativeText) : QString())
 #else
 #define ACCEL_KEY(k) QString()
@@ -315,7 +315,7 @@ QString QLineEdit::text() const
 void QLineEdit::setText(const QString& text)
 {
     Q_D(QLineEdit);
-    d->control->setText(text);
+    d->setText(text);
 }
 
 /*!
@@ -684,11 +684,12 @@ QSize QLineEdit::sizeHint() const
     ensurePolished();
     QFontMetrics fm(font());
     const int iconSize = style()->pixelMetric(QStyle::PM_SmallIconSize, 0, this);
-    int h = qMax(fm.height(), qMax(14, iconSize - 2)) + 2*d->verticalMargin
-            + d->topTextMargin + d->bottomTextMargin
+    const QMargins tm = d->effectiveTextMargins();
+    int h = qMax(fm.height(), qMax(14, iconSize - 2)) + 2 * QLineEditPrivate::verticalMargin
+            + tm.top() + tm.bottom()
             + d->topmargin + d->bottommargin;
-    int w = fm.horizontalAdvance(QLatin1Char('x')) * 17 + 2*d->horizontalMargin
-            + d->effectiveLeftTextMargin() + d->effectiveRightTextMargin()
+    int w = fm.horizontalAdvance(QLatin1Char('x')) * 17 + 2 * QLineEditPrivate::horizontalMargin
+            + tm.left() + tm.right()
             + d->leftmargin + d->rightmargin; // "some"
     QStyleOptionFrame opt;
     initStyleOption(&opt);
@@ -708,11 +709,12 @@ QSize QLineEdit::minimumSizeHint() const
     Q_D(const QLineEdit);
     ensurePolished();
     QFontMetrics fm = fontMetrics();
-    int h = fm.height() + qMax(2*d->verticalMargin, fm.leading())
-            + d->topTextMargin + d->bottomTextMargin
+    const QMargins tm = d->effectiveTextMargins();
+    int h = fm.height() + qMax(2 * QLineEditPrivate::verticalMargin, fm.leading())
+            + tm.top() + tm.bottom()
             + d->topmargin + d->bottommargin;
     int w = fm.maxWidth()
-            + d->effectiveLeftTextMargin() + d->effectiveRightTextMargin()
+            + tm.left() + tm.right()
             + d->leftmargin + d->rightmargin;
     QStyleOptionFrame opt;
     initStyleOption(&opt);
@@ -1127,17 +1129,11 @@ bool QLineEdit::hasAcceptableInput() const
     sizes \a left, \a top, \a right, and \a bottom.
     \since 4.5
 
-    See also getTextMargins().
+    See also textMargins().
 */
 void QLineEdit::setTextMargins(int left, int top, int right, int bottom)
 {
-    Q_D(QLineEdit);
-    d->leftTextMargin = left;
-    d->topTextMargin = top;
-    d->rightTextMargin = right;
-    d->bottomTextMargin = bottom;
-    updateGeometry();
-    update();
+    setTextMargins({left, top, right, bottom});
 }
 
 /*!
@@ -1148,10 +1144,17 @@ void QLineEdit::setTextMargins(int left, int top, int right, int bottom)
 */
 void QLineEdit::setTextMargins(const QMargins &margins)
 {
-    setTextMargins(margins.left(), margins.top(), margins.right(), margins.bottom());
+    Q_D(QLineEdit);
+    d->textMargins = margins;
+    updateGeometry();
+    update();
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
+    \obsolete
+    Use textMargins()
+
     Returns the widget's text margins for \a left, \a top, \a right, and \a bottom.
     \since 4.5
 
@@ -1159,16 +1162,17 @@ void QLineEdit::setTextMargins(const QMargins &margins)
 */
 void QLineEdit::getTextMargins(int *left, int *top, int *right, int *bottom) const
 {
-    Q_D(const QLineEdit);
+    QMargins m = textMargins();
     if (left)
-        *left = d->leftTextMargin;
+        *left = m.left();
     if (top)
-        *top = d->topTextMargin;
+        *top = m.top();
     if (right)
-        *right = d->rightTextMargin;
+        *right = m.right();
     if (bottom)
-        *bottom = d->bottomTextMargin;
+        *bottom = m.bottom();
 }
+#endif
 
 /*!
     \since 4.6
@@ -1179,7 +1183,7 @@ void QLineEdit::getTextMargins(int *left, int *top, int *right, int *bottom) con
 QMargins QLineEdit::textMargins() const
 {
     Q_D(const QLineEdit);
-    return QMargins(d->leftTextMargin, d->topTextMargin, d->rightTextMargin, d->bottomTextMargin);
+    return d->textMargins;
 }
 
 /*!
@@ -1481,7 +1485,7 @@ bool QLineEdit::event(QEvent * e)
         d->initMouseYThreshold();
     }
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled()) {
+    if (QApplicationPrivate::keypadNavigationEnabled()) {
         if (e->type() == QEvent::EnterEditFocus) {
             end(false);
             d->setCursorVisible(true);
@@ -1489,8 +1493,11 @@ bool QLineEdit::event(QEvent * e)
         } else if (e->type() == QEvent::LeaveEditFocus) {
             d->setCursorVisible(false);
             d->control->setCursorBlinkEnabled(false);
-            if (d->control->hasAcceptableInput() || d->control->fixup())
+            if (d->edited && (d->control->hasAcceptableInput()
+                              || d->control->fixup())) {
                 emit editingFinished();
+                d->edited = false;
+            }
         }
     }
 #endif
@@ -1510,7 +1517,7 @@ void QLineEdit::mousePressEvent(QMouseEvent* e)
     if (e->button() == Qt::RightButton)
         return;
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+    if (QApplication::QApplicationPrivate() && !hasEditFocus()) {
         setEditFocus(true);
         // Get the completion list to pop up.
         if (d->control->completer())
@@ -1603,7 +1610,7 @@ void QLineEdit::mouseReleaseEvent(QMouseEvent* e)
     }
 #endif
 #ifndef QT_NO_CLIPBOARD
-    if (QApplication::clipboard()->supportsSelection()) {
+    if (QGuiApplication::clipboard()->supportsSelection()) {
         if (e->button() == Qt::LeftButton) {
             d->control->copy(QClipboard::Selection);
         } else if (!d->control->isReadOnly() && e->button() == Qt::MidButton) {
@@ -1719,7 +1726,7 @@ void QLineEdit::keyPressEvent(QKeyEvent *event)
     bool select = false;
     switch (event->key()) {
         case Qt::Key_Select:
-            if (QApplication::keypadNavigationEnabled()) {
+            if (QApplicationPrivate::keypadNavigationEnabled()) {
                 if (hasEditFocus()) {
                     setEditFocus(false);
                     if (d->control->completer() && d->control->completer()->popup()->isVisible())
@@ -1730,13 +1737,13 @@ void QLineEdit::keyPressEvent(QKeyEvent *event)
             break;
         case Qt::Key_Back:
         case Qt::Key_No:
-            if (!QApplication::keypadNavigationEnabled() || !hasEditFocus()) {
+            if (!QApplicationPrivate::keypadNavigationEnabled() || !hasEditFocus()) {
                 event->ignore();
                 return;
             }
             break;
         default:
-            if (QApplication::keypadNavigationEnabled()) {
+            if (QApplicationPrivate::keypadNavigationEnabled()) {
                 if (!hasEditFocus() && !(event->modifiers() & Qt::ControlModifier)) {
                     if (!event->text().isEmpty() && event->text().at(0).isPrint()
                         && !isReadOnly())
@@ -1751,7 +1758,7 @@ void QLineEdit::keyPressEvent(QKeyEvent *event)
 
 
 
-    if (QApplication::keypadNavigationEnabled() && !select && !hasEditFocus()) {
+    if (QApplicationPrivate::keypadNavigationEnabled() && !select && !hasEditFocus()) {
         setEditFocus(true);
         if (event->key() == Qt::Key_Select)
             return; // Just start. No action.
@@ -1798,7 +1805,7 @@ void QLineEdit::inputMethodEvent(QInputMethodEvent *e)
     // Focus in if currently in navigation focus on the widget
     // Only focus in on preedits, to allow input methods to
     // commit text as they focus out without interfering with focus
-    if (QApplication::keypadNavigationEnabled()
+    if (QApplicationPrivate::keypadNavigationEnabled()
         && hasFocus() && !hasEditFocus()
         && !e->preeditString().isEmpty())
         setEditFocus(true);
@@ -1871,7 +1878,7 @@ void QLineEdit::focusInEvent(QFocusEvent *e)
         d->clickCausedFocus = 1;
     }
 #ifdef QT_KEYPAD_NAVIGATION
-    if (!QApplication::keypadNavigationEnabled() || (hasEditFocus() && ( e->reason() == Qt::PopupFocusReason))) {
+    if (!QApplicationPrivate::keypadNavigationEnabled() || (hasEditFocus() && ( e->reason() == Qt::PopupFocusReason))) {
 #endif
     d->control->setBlinkingCursorEnabled(true);
     QStyleOptionFrame opt;
@@ -1897,7 +1904,6 @@ void QLineEdit::focusInEvent(QFocusEvent *e)
 
 /*!\reimp
 */
-
 void QLineEdit::focusOutEvent(QFocusEvent *e)
 {
     Q_D(QLineEdit);
@@ -1916,12 +1922,14 @@ void QLineEdit::focusOutEvent(QFocusEvent *e)
     d->control->setBlinkingCursorEnabled(false);
 #ifdef QT_KEYPAD_NAVIGATION
     // editingFinished() is already emitted on LeaveEditFocus
-    if (!QApplication::keypadNavigationEnabled())
+    if (!QApplicationPrivate::keypadNavigationEnabled())
 #endif
     if (reason != Qt::PopupFocusReason
         || !(QApplication::activePopupWidget() && QApplication::activePopupWidget()->parentWidget() == this)) {
-            if (hasAcceptableInput() || d->control->fixup())
+            if (d->edited && (hasAcceptableInput() || d->control->fixup())) {
                 emit editingFinished();
+                d->edited = false;
+            }
     }
 #ifdef QT_KEYPAD_NAVIGATION
     d->control->setCancelText(QString());
@@ -1946,27 +1954,25 @@ void QLineEdit::paintEvent(QPaintEvent *)
     initStyleOption(&panel);
     style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this);
     QRect r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
-    r.setX(r.x() + d->effectiveLeftTextMargin());
-    r.setY(r.y() + d->topTextMargin);
-    r.setRight(r.right() - d->effectiveRightTextMargin());
-    r.setBottom(r.bottom() - d->bottomTextMargin);
+    r = r.marginsRemoved(d->effectiveTextMargins());
     p.setClipRect(r);
 
     QFontMetrics fm = fontMetrics();
     Qt::Alignment va = QStyle::visualAlignment(d->control->layoutDirection(), QFlag(d->alignment));
     switch (va & Qt::AlignVertical_Mask) {
      case Qt::AlignBottom:
-         d->vscroll = r.y() + r.height() - fm.height() - d->verticalMargin;
+         d->vscroll = r.y() + r.height() - fm.height() - QLineEditPrivate::verticalMargin;
          break;
      case Qt::AlignTop:
-         d->vscroll = r.y() + d->verticalMargin;
+         d->vscroll = r.y() + QLineEditPrivate::verticalMargin;
          break;
      default:
          //center
          d->vscroll = r.y() + (r.height() - fm.height() + 1) / 2;
          break;
     }
-    QRect lineRect(r.x() + d->horizontalMargin, d->vscroll, r.width() - 2*d->horizontalMargin, fm.height());
+    QRect lineRect(r.x() + QLineEditPrivate::horizontalMargin, d->vscroll,
+                   r.width() - 2 * QLineEditPrivate::horizontalMargin, fm.height());
 
     if (d->shouldShowPlaceholderText()) {
         if (!d->placeholderText.isEmpty()) {
@@ -2036,7 +2042,7 @@ void QLineEdit::paintEvent(QPaintEvent *)
     int flags = QWidgetLineControl::DrawText;
 
 #ifdef QT_KEYPAD_NAVIGATION
-    if (!QApplication::keypadNavigationEnabled() || hasEditFocus())
+    if (!QApplicationPrivate::keypadNavigationEnabled() || hasEditFocus())
 #endif
     if (d->control->hasSelectedText() || (d->cursorVisible && !d->control->inputMask().isEmpty() && !d->control->isReadOnly())){
         flags |= QWidgetLineControl::DrawSelections;
@@ -2202,7 +2208,7 @@ QMenu *QLineEdit::createStandardContextMenu()
 
     if (!isReadOnly()) {
         action = popup->addAction(QLineEdit::tr("&Paste") + ACCEL_KEY(QKeySequence::Paste));
-        action->setEnabled(!d->control->isReadOnly() && !QApplication::clipboard()->text().isEmpty());
+        action->setEnabled(!d->control->isReadOnly() && !QGuiApplication::clipboard()->text().isEmpty());
         setActionIcon(action, QStringLiteral("edit-paste"));
         connect(action, SIGNAL(triggered()), SLOT(paste()));
     }
@@ -2220,6 +2226,7 @@ QMenu *QLineEdit::createStandardContextMenu()
 
     action = popup->addAction(QLineEdit::tr("Select All") + ACCEL_KEY(QKeySequence::SelectAll));
     action->setEnabled(!d->control->text().isEmpty() && !d->control->allSelected());
+    setActionIcon(action, QStringLiteral("edit-select-all"));
     d->selectAllAction = action;
     connect(action, SIGNAL(triggered()), SLOT(selectAll()));
 
diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h
index de82927f74..1cf1f24449 100644
--- a/src/widgets/widgets/qlineedit.h
+++ b/src/widgets/widgets/qlineedit.h
@@ -172,7 +172,10 @@ public:
 
     void setTextMargins(int left, int top, int right, int bottom);
     void setTextMargins(const QMargins &margins);
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("use textMargins()")
     void getTextMargins(int *left, int *top, int *right, int *bottom) const;
+#endif
     QMargins textMargins() const;
 
 #if QT_CONFIG(action)
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index 2a5a0c34dc..d2b5f87906 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -127,6 +127,7 @@ void QLineEditPrivate::_q_handleWindowActivate()
 void QLineEditPrivate::_q_textEdited(const QString &text)
 {
     Q_Q(QLineEdit);
+    edited = true;
     emit q->textEdited(text);
 #if QT_CONFIG(completer)
     if (control->completer()
@@ -253,10 +254,7 @@ QRect QLineEditPrivate::adjustedContentsRect() const
     QStyleOptionFrame opt;
     q->initStyleOption(&opt);
     QRect r = q->style()->subElementRect(QStyle::SE_LineEditContents, &opt, q);
-    r.setX(r.x() + effectiveLeftTextMargin());
-    r.setY(r.y() + topTextMargin);
-    r.setRight(r.right() - effectiveRightTextMargin());
-    r.setBottom(r.bottom() - bottomTextMargin);
+    r = r.marginsRemoved(effectiveTextMargins());
     return r;
 }
 
@@ -272,6 +270,12 @@ void QLineEditPrivate::setCursorVisible(bool visible)
         q->update();
 }
 
+void QLineEditPrivate::setText(const QString& text)
+{
+    edited = true;
+    control->setText(text);
+}
+
 void QLineEditPrivate::updatePasswordEchoEditing(bool editing)
 {
     Q_Q(QLineEdit);
@@ -348,9 +352,7 @@ QLineEditPrivate *QLineEditIconButton::lineEditPrivate() const
 void QLineEditIconButton::paintEvent(QPaintEvent *)
 {
     QPainter painter(this);
-    QWindow *window = nullptr;
-    if (const QWidget *nativeParent = nativeParentWidget())
-        window = nativeParent->windowHandle();
+    QWindow *window = qt_widget_private(this)->windowHandle(QWidgetPrivate::WindowHandleMode::Closest);
     QIcon::Mode state = QIcon::Disabled;
     if (isEnabled())
         state = isDown() ? QIcon::Active : QIcon::Normal;
@@ -667,14 +669,12 @@ static int effectiveTextMargin(int defaultMargin, const QLineEditPrivate::SideWi
                                  return e.widget->isVisibleTo(e.widget->parentWidget()); }));
 }
 
-int QLineEditPrivate::effectiveLeftTextMargin() const
-{
-    return effectiveTextMargin(leftTextMargin, leftSideWidgetList(), sideWidgetParameters());
-}
-
-int QLineEditPrivate::effectiveRightTextMargin() const
+QMargins QLineEditPrivate::effectiveTextMargins() const
 {
-    return effectiveTextMargin(rightTextMargin, rightSideWidgetList(), sideWidgetParameters());
+    return {effectiveTextMargin(textMargins.left(), leftSideWidgetList(), sideWidgetParameters()),
+            textMargins.top(),
+            effectiveTextMargin(textMargins.right(), rightSideWidgetList(), sideWidgetParameters()),
+            textMargins.bottom()};
 }
 
 
diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h
index 12a2f1ddfd..a11fea6bbe 100644
--- a/src/widgets/widgets/qlineedit_p.h
+++ b/src/widgets/widgets/qlineedit_p.h
@@ -67,6 +67,7 @@
 #endif
 #include "QtCore/qpointer.h"
 #include "QtCore/qmimedata.h"
+#include <QtCore/qmargins.h>
 
 #include "private/qwidgetlinecontrol_p.h"
 
@@ -85,7 +86,7 @@ class Q_AUTOTEST_EXPORT QLineEditIconButton : public QToolButton
     Q_OBJECT
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity)
 public:
-    explicit QLineEditIconButton(QWidget *parent =  0);
+    explicit QLineEditIconButton(QWidget *parent =  nullptr);
 
     qreal opacity() const { return m_opacity; }
     void setOpacity(qreal value);
@@ -134,7 +135,7 @@ public:
     };
 
     struct SideWidgetEntry {
-        explicit SideWidgetEntry(QWidget *w = 0, QAction *a = 0, int _flags = 0) : widget(w), action(a), flags(_flags) {}
+        explicit SideWidgetEntry(QWidget *w = nullptr, QAction *a = nullptr, int _flags = 0) : widget(w), action(a), flags(_flags) {}
 
         QWidget *widget;
         QAction *action;
@@ -151,9 +152,9 @@ public:
 
     QLineEditPrivate()
         : control(0), frame(1), contextMenuEnabled(1), cursorVisible(0),
-        dragEnabled(0), clickCausedFocus(0), hscroll(0), vscroll(0),
+        dragEnabled(0), clickCausedFocus(0), edited(0), hscroll(0), vscroll(0),
         alignment(Qt::AlignLeading | Qt::AlignVCenter),
-        leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0),
+        textMargins{0, 0, 0, 0},
         lastTextSize(0), mouseYThreshold(0)
     {
     }
@@ -176,6 +177,7 @@ public:
     bool inSelection(int x) const;
     QRect cursorRect() const;
     void setCursorVisible(bool visible);
+    void setText(const QString& text);
 
     void updatePasswordEchoEditing(bool);
 
@@ -202,6 +204,7 @@ public:
     uint cursorVisible : 1;
     uint dragEnabled : 1;
     uint clickCausedFocus : 1;
+    uint edited : 1;
     int hscroll;
     int vscroll;
     uint alignment;
@@ -231,10 +234,7 @@ public:
     void _q_textChanged(const QString &);
     void _q_clearButtonClicked();
 
-    int leftTextMargin; // use effectiveLeftTextMargin() in case of icon.
-    int topTextMargin;
-    int rightTextMargin; // use effectiveRightTextMargin() in case of icon.
-    int bottomTextMargin;
+    QMargins textMargins; // use effectiveTextMargins() in case of icon.
 
     QString placeholderText;
 
@@ -250,8 +250,7 @@ public:
     inline const SideWidgetEntryList &rightSideWidgetList() const
         { return q_func()->layoutDirection() == Qt::LeftToRight ? trailingSideWidgets : leadingSideWidgets; }
 
-    int effectiveLeftTextMargin() const;
-    int effectiveRightTextMargin() const;
+    QMargins effectiveTextMargins() const;
 
 private:
     struct SideWidgetLocation {
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
index 0b64b2a2bb..88baf0410b 100644
--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
@@ -82,8 +82,32 @@
 
     The following is a snippet showing how to subclass QMacCocoaViewContainer
     to wrap an NSSearchField.
-    \snippet macmainwindow.mm 0
 
+    \code
+        SearchWidget::SearchWidget(QWidget *parent)
+        : QMacCocoaViewContainer(0, parent)
+        {
+            // Many Cocoa objects create temporary autorelease objects,
+            // so create a pool to catch them.
+            NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+            // Create the NSSearchField, set it on the QCocoaViewContainer.
+            NSSearchField *search = [[NSSearchField alloc] init];
+            setCocoaView(search);
+
+            // Use a Qt menu for the search field menu.
+            QMenu *qtMenu = createMenu(this);
+            NSMenu *nsMenu = qtMenu->macMenu(0);
+            [[search cell] setSearchMenuTemplate:nsMenu];
+
+            // Release our reference, since our super class takes ownership and we
+            // don't need it anymore.
+            [search release];
+
+            // Clean up our pool as we no longer need it.
+            [pool release];
+        }
+    \endcode
 */
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 9c4c46f2d6..16ed699137 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -1138,6 +1138,7 @@ void QMainWindow::splitDockWidget(QDockWidget *after, QDockWidget *dockwidget,
     d_func()->layout->splitDockWidget(after, dockwidget, orientation);
 }
 
+#if QT_CONFIG(tabbar)
 /*!
     \fn void QMainWindow::tabifyDockWidget(QDockWidget *first, QDockWidget *second)
 
@@ -1164,9 +1165,6 @@ void QMainWindow::tabifyDockWidget(QDockWidget *first, QDockWidget *second)
 QList<QDockWidget*> QMainWindow::tabifiedDockWidgets(QDockWidget *dockwidget) const
 {
     QList<QDockWidget*> ret;
-#if !QT_CONFIG(tabbar)
-    Q_UNUSED(dockwidget);
-#else
     const QDockAreaLayoutInfo *info = d_func()->layout->layoutState.dockAreaLayout.info(dockwidget);
     if (info && info->tabbed && info->tabBar) {
         for(int i = 0; i < info->item_list.count(); ++i) {
@@ -1180,9 +1178,9 @@ QList<QDockWidget*> QMainWindow::tabifiedDockWidgets(QDockWidget *dockwidget) co
             }
         }
     }
-#endif
     return ret;
 }
+#endif // QT_CONFIG(tabbar)
 
 
 /*!
diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h
index 85e3f87d77..c69451fa3e 100644
--- a/src/widgets/widgets/qmainwindow.h
+++ b/src/widgets/widgets/qmainwindow.h
@@ -171,8 +171,10 @@ public:
                        Qt::Orientation orientation);
     void splitDockWidget(QDockWidget *after, QDockWidget *dockwidget,
                          Qt::Orientation orientation);
+#if QT_CONFIG(tabbar)
     void tabifyDockWidget(QDockWidget *first, QDockWidget *second);
     QList<QDockWidget*> tabifiedDockWidgets(QDockWidget *dockwidget) const;
+#endif
     void removeDockWidget(QDockWidget *dockwidget);
     bool restoreDockWidget(QDockWidget *dockwidget);
 
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index f54835f23b..0fb3a86cf8 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -292,25 +292,31 @@ bool QDockWidgetGroupWindow::event(QEvent *e)
 
     switch (e->type()) {
     case QEvent::Close:
+#if QT_CONFIG(tabbar)
         // Forward the close to the QDockWidget just as if its close button was pressed
         if (QDockWidget *dw = activeTabbedDockWidget()) {
             e->ignore();
             dw->close();
             adjustFlags();
         }
+#endif
         return true;
     case QEvent::Move:
+#if QT_CONFIG(tabbar)
         // Let QDockWidgetPrivate::moseEvent handle the dragging
         if (QDockWidget *dw = activeTabbedDockWidget())
             static_cast<QDockWidgetPrivate *>(QObjectPrivate::get(dw))->moveEvent(static_cast<QMoveEvent*>(e));
+#endif
         return true;
     case QEvent::NonClientAreaMouseMove:
     case QEvent::NonClientAreaMouseButtonPress:
     case QEvent::NonClientAreaMouseButtonRelease:
     case QEvent::NonClientAreaMouseButtonDblClick:
+#if QT_CONFIG(tabbar)
         // Let the QDockWidgetPrivate of the currently visible dock widget handle the drag and drop
         if (QDockWidget *dw = activeTabbedDockWidget())
             static_cast<QDockWidgetPrivate *>(QObjectPrivate::get(dw))->nonClientAreaMouseEvent(static_cast<QMouseEvent*>(e));
+#endif
         return true;
     case QEvent::ChildAdded:
         if (qobject_cast<QDockWidget *>(static_cast<QChildEvent*>(e)->child()))
@@ -347,6 +353,7 @@ QDockAreaLayoutInfo *QDockWidgetGroupWindow::layoutInfo() const
     return static_cast<QDockWidgetGroupLayout *>(layout())->dockAreaLayoutInfo();
 }
 
+#if QT_CONFIG(tabbar)
 /*! \internal
     If this is a floating tab bar returns the currently the QDockWidgetGroupWindow that contains
     tab, otherwise, return nullptr;
@@ -383,7 +390,6 @@ const QDockAreaLayoutInfo *QDockWidgetGroupWindow::tabLayoutInfo() const
 QDockWidget *QDockWidgetGroupWindow::activeTabbedDockWidget() const
 {
     QDockWidget *dw = nullptr;
-#if QT_CONFIG(tabbar)
     const QDockAreaLayoutInfo *info = tabLayoutInfo();
     if (!info)
         return nullptr;
@@ -405,9 +411,9 @@ QDockWidget *QDockWidgetGroupWindow::activeTabbedDockWidget() const
             dw = qobject_cast<QDockWidget *>(item.widgetItem->widget());
         }
     }
-#endif
     return dw;
 }
+#endif // QT_CONFIG(tabbar)
 
 /*! \internal
     Destroy or hide this window if there is no more QDockWidget in it.
@@ -461,7 +467,11 @@ void QDockWidgetGroupWindow::adjustFlags()
     Qt::WindowFlags oldFlags = windowFlags();
     Qt::WindowFlags flags = oldFlags;
 
+#if QT_CONFIG(tabbar)
     QDockWidget *top = activeTabbedDockWidget();
+#else
+    QDockWidget *top = nullptr;
+#endif
     if (!top) { // nested tabs, show window decoration
         flags =
             ((oldFlags & ~Qt::FramelessWindowHint) | Qt::CustomizeWindowHint | Qt::WindowTitleHint);
@@ -507,6 +517,7 @@ void QDockWidgetGroupWindow::adjustFlags()
 
 bool QDockWidgetGroupWindow::hasNativeDecos() const
 {
+#if QT_CONFIG(tabbar)
     QDockWidget *dw = activeTabbedDockWidget();
     if (!dw) // We have a group of nested QDockWidgets (not just floating tabs)
         return true;
@@ -515,6 +526,9 @@ bool QDockWidgetGroupWindow::hasNativeDecos() const
         return false;
 
     return dw->titleBarWidget() == nullptr;
+#else
+    return true;
+#endif
 }
 
 /*
@@ -531,16 +545,18 @@ bool QDockWidgetGroupWindow::hover(QLayoutItem *widgetItem, const QPoint &mouseP
         savedState = *layoutInfo();
 
     QMainWindow::DockOptions opts = static_cast<QMainWindow *>(parentWidget())->dockOptions();
+    QDockAreaLayoutInfo newState = savedState;
     bool nestingEnabled =
         (opts & QMainWindow::AllowNestedDocks) && !(opts & QMainWindow::ForceTabbedDocks);
     QDockAreaLayoutInfo::TabMode tabMode =
+#if !QT_CONFIG(tabbar)
+        QDockAreaLayoutInfo::NoTabs;
+#else
         nestingEnabled ? QDockAreaLayoutInfo::AllowTabs : QDockAreaLayoutInfo::ForceTabs;
     if (auto group = qobject_cast<QDockWidgetGroupWindow *>(widgetItem->widget())) {
         if (!group->tabLayoutInfo())
             tabMode = QDockAreaLayoutInfo::NoTabs;
     }
-
-    QDockAreaLayoutInfo newState = savedState;
     if (newState.tabbed) {
         // insertion into a top-level tab
         newState.item_list = { QDockAreaLayoutItem(new QDockAreaLayoutInfo(newState)) };
@@ -548,6 +564,7 @@ bool QDockWidgetGroupWindow::hover(QLayoutItem *widgetItem, const QPoint &mouseP
         newState.tabbed = false;
         newState.tabBar = nullptr;
     }
+#endif
 
     auto newGapPos = newState.gapIndex(mousePos, nestingEnabled, tabMode);
     Q_ASSERT(!newGapPos.isEmpty());
@@ -1498,14 +1515,6 @@ void QMainWindowLayout::addDockWidget(Qt::DockWidgetArea area,
     invalidate();
 }
 
-void QMainWindowLayout::tabifyDockWidget(QDockWidget *first, QDockWidget *second)
-{
-    addChildWidget(second);
-    layoutState.dockAreaLayout.tabifyDockWidget(first, second);
-    emit second->dockLocationChanged(dockWidgetArea(first));
-    invalidate();
-}
-
 bool QMainWindowLayout::restoreDockWidget(QDockWidget *dockwidget)
 {
     addChildWidget(dockwidget);
@@ -1517,6 +1526,14 @@ bool QMainWindowLayout::restoreDockWidget(QDockWidget *dockwidget)
 }
 
 #if QT_CONFIG(tabbar)
+void QMainWindowLayout::tabifyDockWidget(QDockWidget *first, QDockWidget *second)
+{
+    addChildWidget(second);
+    layoutState.dockAreaLayout.tabifyDockWidget(first, second);
+    emit second->dockLocationChanged(dockWidgetArea(first));
+    invalidate();
+}
+
 bool QMainWindowLayout::documentMode() const
 {
     return _documentMode;
@@ -1535,20 +1552,15 @@ void QMainWindowLayout::setDocumentMode(bool enabled)
     for (QTabBar *bar : qAsConst(unusedTabBars))
         bar->setDocumentMode(_documentMode);
 }
-#endif // QT_CONFIG(tabbar)
 
 void QMainWindowLayout::setVerticalTabsEnabled(bool enabled)
 {
-#if !QT_CONFIG(tabbar)
-    Q_UNUSED(enabled);
-#else
     if (verticalTabsEnabled == enabled)
         return;
 
     verticalTabsEnabled = enabled;
 
     updateTabBarShapes();
-#endif // QT_CONFIG(tabbar)
 }
 
 #if QT_CONFIG(tabwidget)
@@ -1609,7 +1621,6 @@ static inline QTabBar::Shape tabBarShapeFrom(QTabWidget::TabShape shape, QTabWid
 }
 #endif // QT_CONFIG(tabwidget)
 
-#if QT_CONFIG(tabbar)
 void QMainWindowLayout::updateTabBarShapes()
 {
 #if QT_CONFIG(tabwidget)
@@ -1851,19 +1862,17 @@ void QMainWindowLayout::tabMoved(int from, int to)
 
     info->moveTab(from, to);
 }
-#endif // QT_CONFIG(tabbar)
 
 void QMainWindowLayout::raise(QDockWidget *widget)
 {
-#if QT_CONFIG(tabbar)
     QDockAreaLayoutInfo *info = dockInfo(widget);
     if (info == 0)
         return;
     if (!info->tabbed)
         return;
     info->setCurrentTab(widget);
-#endif
 }
+#endif // QT_CONFIG(tabbar)
 
 #endif // QT_CONFIG(dockwidget)
 
@@ -2329,7 +2338,7 @@ void QMainWindowLayout::setDockOptions(QMainWindow::DockOptions opts)
 
     dockOptions = opts;
 
-#if QT_CONFIG(dockwidget)
+#if QT_CONFIG(dockwidget) && QT_CONFIG(tabbar)
     setVerticalTabsEnabled(opts & QMainWindow::VerticalTabs);
 #endif
 
@@ -2413,7 +2422,7 @@ static bool unplugGroup(QMainWindowLayout *layout, QLayoutItem **item,
  */
 QLayoutItem *QMainWindowLayout::unplug(QWidget *widget, bool group)
 {
-#if QT_CONFIG(dockwidget) && QT_CONFIG(tabbar)
+#if QT_CONFIG(dockwidget) && QT_CONFIG(tabwidget)
     auto *groupWindow = qobject_cast<const QDockWidgetGroupWindow *>(widget->parentWidget());
     if (!widget->isWindow() && groupWindow) {
         if (group && groupWindow->tabLayoutInfo()) {
@@ -2525,10 +2534,10 @@ void QMainWindowLayout::updateGapIndicator()
 #endif // QT_CONFIG(rubberband)
 }
 
+#if QT_CONFIG(dockwidget) && QT_CONFIG(tabwidget)
 static QTabBar::Shape tabwidgetPositionToTabBarShape(QWidget *w)
 {
     QTabBar::Shape result = QTabBar::RoundedSouth;
-#if QT_CONFIG(tabwidget)
     if (qobject_cast<QDockWidget *>(w)) {
         switch (static_cast<QDockWidgetPrivate *>(qt_widget_private(w))->tabPosition) {
         case QTabWidget::North:
@@ -2545,9 +2554,9 @@ static QTabBar::Shape tabwidgetPositionToTabBarShape(QWidget *w)
             break;
         }
     }
-#endif // tabwidget
     return result;
 }
+#endif // QT_CONFIG(dockwidget) && QT_CONFIG(tabwidget)
 
 void QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
 {
@@ -2584,13 +2593,14 @@ void QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
             }
         }
         for (QWidget *w : candidates) {
-            QWindow *handle1 = widget->windowHandle();
-            QWindow *handle2 = w->windowHandle();
-            if (handle1 && handle2 && handle1->screen() != handle2->screen())
+            const QScreen *screen1 = qt_widget_private(widget)->associatedScreen();
+            const QScreen *screen2 = qt_widget_private(w)->associatedScreen();
+            if (screen1 && screen2 && screen1 != screen2)
                 continue;
             if (!w->geometry().contains(mousePos))
                 continue;
 
+#if QT_CONFIG(tabwidget)
             if (auto dropTo = qobject_cast<QDockWidget *>(w)) {
                 // dropping to a normal widget, we mutate it in a QDockWidgetGroupWindow with two
                 // tabs
@@ -2612,6 +2622,7 @@ void QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
                 w = floatingTabs;
                 widget->raise(); // raise, as our newly created drop target is now on top
             }
+#endif
             Q_ASSERT(qobject_cast<QDockWidgetGroupWindow *>(w));
             auto group = static_cast<QDockWidgetGroupWindow *>(w);
             if (group->hover(widgetItem, group->mapFromGlobal(mousePos))) {
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
index a375d856bb..967b713096 100644
--- a/src/widgets/widgets/qmainwindowlayout_p.h
+++ b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -122,7 +122,7 @@ template <typename Layout>
 QCursor QMainWindowLayoutSeparatorHelper<Layout>::separatorCursor(const QList<int> &path)
 {
     const QDockAreaLayoutInfo *info = layout()->dockAreaLayoutInfo()->info(path);
-    Q_ASSERT(info != 0);
+    Q_ASSERT(info != nullptr);
     if (path.size() == 1) { // is this the "top-level" separator which separates a dock area
                             // from the central widget?
         switch (path.first()) {
@@ -334,11 +334,13 @@ class QDockWidgetGroupWindow : public QWidget
 {
     Q_OBJECT
 public:
-    explicit QDockWidgetGroupWindow(QWidget* parent = 0, Qt::WindowFlags f = 0)
+    explicit QDockWidgetGroupWindow(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr)
         : QWidget(parent, f) {}
     QDockAreaLayoutInfo *layoutInfo() const;
+#if QT_CONFIG(tabbar)
     const QDockAreaLayoutInfo *tabLayoutInfo() const;
     QDockWidget *activeTabbedDockWidget() const;
+#endif
     void destroyOrHideIfEmpty();
     void adjustFlags();
     bool hasNativeDecos() const;
@@ -430,7 +432,7 @@ public:
     bool isValid() const;
 
     QLayoutItem *plug(const QList<int> &path);
-    QLayoutItem *unplug(const QList<int> &path, QMainWindowLayoutState *savedState = 0);
+    QLayoutItem *unplug(const QList<int> &path, QMainWindowLayoutState *savedState = nullptr);
 
     void saveState(QDataStream &stream) const;
     bool checkFormat(QDataStream &stream);
@@ -494,13 +496,13 @@ public:
     void splitDockWidget(QDockWidget *after,
                          QDockWidget *dockwidget,
                          Qt::Orientation orientation);
-    void tabifyDockWidget(QDockWidget *first, QDockWidget *second);
     Qt::DockWidgetArea dockWidgetArea(QWidget* widget) const;
+    bool restoreDockWidget(QDockWidget *dockwidget);
+#if QT_CONFIG(tabbar)
+    void tabifyDockWidget(QDockWidget *first, QDockWidget *second);
     void raise(QDockWidget *widget);
     void setVerticalTabsEnabled(bool enabled);
-    bool restoreDockWidget(QDockWidget *dockwidget);
 
-#if QT_CONFIG(tabbar)
     QDockAreaLayoutInfo *dockInfo(QWidget *w);
     bool _documentMode;
     bool documentMode() const;
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index 8b201dcf9d..6e3de1b1ff 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -1988,9 +1988,11 @@ QMdiSubWindow *QMdiArea::addSubWindow(QWidget *widget, Qt::WindowFlags windowFla
         Q_ASSERT(child->testAttribute(Qt::WA_DeleteOnClose));
     }
 
+    d->appendChild(child);
+
     if (childFocus)
         childFocus->setFocus();
-    d->appendChild(child);
+
     return child;
 }
 
@@ -2491,13 +2493,6 @@ bool QMdiArea::event(QEvent *event)
 {
     Q_D(QMdiArea);
     switch (event->type()) {
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    // QWidgetPrivate::hide_helper activates another sub-window when closing a
-    // modal dialog on Windows (see activateWindow() inside the ifdef).
-    case QEvent::WindowUnblocked:
-        d->activateCurrentWindow();
-        break;
-#endif
     case QEvent::WindowActivate: {
         d->isActivated = true;
         if (d->childWindows.isEmpty())
@@ -2523,7 +2518,7 @@ bool QMdiArea::event(QEvent *event)
     case QEvent::WindowIconChange:
         foreach (QMdiSubWindow *window, d->childWindows) {
             if (sanityCheck(window, "QMdiArea::WindowIconChange"))
-                QApplication::sendEvent(window, event);
+                QCoreApplication::sendEvent(window, event);
         }
         break;
     case QEvent::Hide:
@@ -2555,11 +2550,7 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event)
 
         QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
         // Ingore key events without a Ctrl modifier (except for press/release on the modifier itself).
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        if (!(keyEvent->modifiers() & Qt::MetaModifier) && keyEvent->key() != Qt::Key_Meta)
-#else
         if (!(keyEvent->modifiers() & Qt::ControlModifier) && keyEvent->key() != Qt::Key_Control)
-#endif
             return QAbstractScrollArea::eventFilter(object, event);
 
         // Find closest mdi area (in case we have a nested workspace).
@@ -2574,11 +2565,7 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event)
         // 3) Ctrl-Shift-Tab (Tab, Tab, ...) -> iterate through all windows in the opposite
         //    direction (activatePreviousSubWindow())
         switch (keyEvent->key()) {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        case Qt::Key_Meta:
-#else
         case Qt::Key_Control:
-#endif
             if (keyPress)
                 area->d_func()->startTabToPreviousTimer();
             else
diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h
index fd00118ec6..0a6368044a 100644
--- a/src/widgets/widgets/qmdiarea_p.h
+++ b/src/widgets/widgets/qmdiarea_p.h
@@ -183,7 +183,7 @@ public:
     int tabToPreviousTimerId;
 
     // Slots.
-    void _q_deactivateAllWindows(QMdiSubWindow *aboutToActivate = 0);
+    void _q_deactivateAllWindows(QMdiSubWindow *aboutToActivate = nullptr);
     void _q_processWindowStateChanged(Qt::WindowStates oldState, Qt::WindowStates newState);
     void _q_currentTabChanged(int index);
     void _q_closeTab(int index);
@@ -198,7 +198,7 @@ public:
     void activateCurrentWindow();
     void activateHighlightedWindow();
     void emitWindowActivated(QMdiSubWindow *child);
-    void resetActiveWindow(QMdiSubWindow *child = 0);
+    void resetActiveWindow(QMdiSubWindow *child = nullptr);
     void updateActiveWindow(int removedIndex, bool activeRemoved);
     void updateScrollBars();
     void internalRaise(QMdiSubWindow *child) const;
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp
index 685c5e159e..d58a1d06db 100644
--- a/src/widgets/widgets/qmdisubwindow.cpp
+++ b/src/widgets/widgets/qmdisubwindow.cpp
@@ -288,13 +288,6 @@ static inline bool isHoverControl(QStyle::SubControl control)
     return control != QStyle::SC_None && control != QStyle::SC_TitleBarLabel;
 }
 
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-static inline QRgb colorref2qrgb(COLORREF col)
-{
-    return qRgb(GetRValue(col),GetGValue(col),GetBValue(col));
-}
-#endif
-
 #ifndef QT_NO_TOOLTIP
 static void showToolTip(QHelpEvent *helpEvent, QWidget *widget, const QStyleOptionComplex &opt,
                         QStyle::ComplexControl complexControl, QStyle::SubControl subControl)
@@ -1826,7 +1819,7 @@ void QMdiSubWindowPrivate::showButtonsInMenuBar(QMenuBar *menuBar)
         // Make sure topLevelWindow->contentsRect returns correct geometry.
         // topLevelWidget->updateGeoemtry will not do the trick here since it will post the event.
         QEvent event(QEvent::LayoutRequest);
-        QApplication::sendEvent(topLevelWindow, &event);
+        QCoreApplication::sendEvent(topLevelWindow, &event);
     }
 }
 
@@ -1926,43 +1919,7 @@ QPalette QMdiSubWindowPrivate::desktopPalette() const
     QPalette newPalette = q->palette();
 
     bool colorsInitialized = false;
-#if 0 // Used to be included in Qt4 for Q_WS_WIN // ask system properties on windows
-#ifndef SPI_GETGRADIENTCAPTIONS
-#define SPI_GETGRADIENTCAPTIONS 0x1008
-#endif
-#ifndef COLOR_GRADIENTACTIVECAPTION
-#define COLOR_GRADIENTACTIVECAPTION 27
-#endif
-#ifndef COLOR_GRADIENTINACTIVECAPTION
-#define COLOR_GRADIENTINACTIVECAPTION 28
-#endif
-    if (QApplication::desktopSettingsAware()) {
-        newPalette.setColor(QPalette::Active, QPalette::Highlight,
-                            colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)));
-        newPalette.setColor(QPalette::Inactive, QPalette::Highlight,
-                            colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION)));
-        newPalette.setColor(QPalette::Active, QPalette::HighlightedText,
-                            colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)));
-        newPalette.setColor(QPalette::Inactive, QPalette::HighlightedText,
-                            colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT)));
 
-        colorsInitialized = true;
-        BOOL hasGradient = false;
-        SystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &hasGradient, 0);
-
-        if (hasGradient) {
-            newPalette.setColor(QPalette::Active, QPalette::Base,
-                                colorref2qrgb(GetSysColor(COLOR_GRADIENTACTIVECAPTION)));
-            newPalette.setColor(QPalette::Inactive, QPalette::Base,
-                                colorref2qrgb(GetSysColor(COLOR_GRADIENTINACTIVECAPTION)));
-        } else {
-            newPalette.setColor(QPalette::Active, QPalette::Base,
-                                newPalette.color(QPalette::Active, QPalette::Highlight));
-            newPalette.setColor(QPalette::Inactive, QPalette::Base,
-                                newPalette.color(QPalette::Inactive, QPalette::Highlight));
-        }
-    }
-#endif
     if (!colorsInitialized) {
         newPalette.setColor(QPalette::Active, QPalette::Highlight,
                             newPalette.color(QPalette::Active, QPalette::Highlight));
@@ -1986,7 +1943,7 @@ void QMdiSubWindowPrivate::updateActions()
     for (int i = 0; i < NumWindowStateActions; ++i)
         setVisible(WindowStateAction(i), false);
 
-#ifdef Q_OS_MACOS
+#if defined(Q_OS_MACOS) && QT_CONFIG(action)
     if (q_func()->style()->inherits("QMacStyle"))
         for (int i = 0; i < NumWindowStateActions; ++i)
             if (QAction *action = actions[i])
@@ -3050,7 +3007,7 @@ void QMdiSubWindow::closeEvent(QCloseEvent *closeEvent)
     d->setActive(false);
     if (parentWidget() && testAttribute(Qt::WA_DeleteOnClose)) {
         QChildEvent childRemoved(QEvent::ChildRemoved, this);
-        QApplication::sendEvent(parentWidget(), &childRemoved);
+        QCoreApplication::sendEvent(parentWidget(), &childRemoved);
     }
     closeEvent->accept();
 }
diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
index 719984c8d4..d3513b6708 100644
--- a/src/widgets/widgets/qmdisubwindow_p.h
+++ b/src/widgets/widgets/qmdisubwindow_p.h
@@ -78,7 +78,7 @@ template<typename T>
 class ControlElement : public T
 {
 public:
-    ControlElement(QMdiSubWindow *child) : T(child, 0)
+    ControlElement(QMdiSubWindow *child) : T(child, nullptr)
     {
         Q_ASSERT(child);
         mdiChild = child;
@@ -88,7 +88,7 @@ public:
     {
         if (classname && strcmp(classname, "ControlElement") == 0)
             return this;
-        return 0;
+        return nullptr;
     }
 
     QPointer<QMdiSubWindow> mdiChild;
@@ -102,7 +102,7 @@ public:
 
 #if QT_CONFIG(menubar)
     void showButtonsInMenuBar(QMenuBar *menuBar);
-    void removeButtonsFromMenuBar(QMenuBar *menuBar = 0);
+    void removeButtonsFromMenuBar(QMenuBar *menuBar = nullptr);
     QMenuBar *menuBar() const { return m_menuBar; }
 #endif
     void updateWindowIcon(const QIcon &windowIcon);
@@ -331,7 +331,7 @@ public:
     inline bool autoRaise() const
     {
         Q_Q(const QMdiSubWindow);
-        return q->style()->styleHint(QStyle::SH_TitleBar_AutoRaise, 0, q);
+        return q->style()->styleHint(QStyle::SH_TitleBar_AutoRaise, nullptr, q);
     }
 
     inline bool isResizeOperation() const
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index c61b68e10a..51b458f03a 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -142,9 +142,7 @@ public:
 #endif
         if (style() != p->style())
             setStyle(p->style());
-        int leftMargin, topMargin, rightMargin, bottomMargin;
-        p->getContentsMargins(&leftMargin, &topMargin, &rightMargin, &bottomMargin);
-        setContentsMargins(leftMargin, topMargin, rightMargin, bottomMargin);
+        setContentsMargins(p->contentsMargins());
         setLayoutDirection(p->layoutDirection());
         //QObject::connect(this, SIGNAL(triggered(QAction*)), this, SLOT(onTrigger(QAction*)));
         //QObject::connect(this, SIGNAL(hovered(QAction*)), this, SLOT(onHovered(QAction*)));
@@ -264,7 +262,7 @@ void QMenuPrivate::copyActionToPlatformItem(const QAction *action, QPlatformMenu
             item->setIconSize(w->style()->pixelMetric(QStyle::PM_SmallIconSize, &opt, w));
         } else {
             QStyleOption opt;
-            item->setIconSize(qApp->style()->pixelMetric(QStyle::PM_SmallIconSize, &opt, 0));
+            item->setIconSize(QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize, &opt, 0));
         }
     } else {
         item->setIcon(QIcon());
@@ -907,7 +905,7 @@ void QMenuPrivate::updateLayoutDirection()
         else if (QWidget *w = q->parentWidget())
             setLayoutDirection_helper(w->layoutDirection());
         else
-            setLayoutDirection_helper(QApplication::layoutDirection());
+            setLayoutDirection_helper(QGuiApplication::layoutDirection());
     }
 }
 
@@ -1335,7 +1333,7 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e)
             if (e->type() != QEvent::MouseButtonRelease || mouseDown == caused) {
                 QMouseEvent new_e(e->type(), cpos, caused->mapTo(caused->topLevelWidget(), cpos), e->screenPos(),
                                   e->button(), e->buttons(), e->modifiers(), e->source());
-                QApplication::sendEvent(caused, &new_e);
+                QCoreApplication::sendEvent(caused, &new_e);
                 return true;
             }
         }
@@ -1543,7 +1541,7 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action)
 
     if (d->currentAction && d->currentAction == action && !d->currentAction->isSeparator()) {
         option->state |= QStyle::State_Selected
-                     | (d->mouseDown ? QStyle::State_Sunken : QStyle::State_None);
+                     | (QMenuPrivate::mouseDown ? QStyle::State_Sunken : QStyle::State_None);
     }
 
     option->menuHasCheckableItems = d->hasCheckableItems;
@@ -2334,14 +2332,17 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     // However if the QMenu was constructed with a QDesktopScreenWidget as its parent,
     // then initialScreenIndex was set, so we should respect that for the lifetime of this menu.
     // Use d->popupScreen to remember, because initialScreenIndex will be reset after the first showing.
-    const int screenIndex = d->topData()->initialScreenIndex;
-    if (screenIndex >= 0)
-        d->popupScreen = screenIndex;
-    if (auto s = QGuiApplication::screens().value(d->popupScreen)) {
-        if (d->setScreen(s))
+    // However if eventLoop exists, then exec() already did this by calling createWinId(); so leave it alone. (QTBUG-76162)
+    if (!d->eventLoop) {
+        const int screenIndex = d->topData()->initialScreenIndex;
+        if (screenIndex >= 0)
+            d->popupScreen = screenIndex;
+        if (auto s = QGuiApplication::screens().value(d->popupScreen)) {
+            if (d->setScreen(s))
+                d->itemsDirty = true;
+        } else if (d->setScreenForPoint(p)) {
             d->itemsDirty = true;
-    } else if (d->setScreenForPoint(p)) {
-        d->itemsDirty = true;
+        }
     }
 
     const bool contextMenu = d->isContextMenu();
@@ -2362,7 +2363,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
 
     QRect screen;
 #if QT_CONFIG(graphicsview)
-    bool isEmbedded = !bypassGraphicsProxyWidget(this) && d->nearestGraphicsProxyWidget(this);
+    bool isEmbedded = !bypassGraphicsProxyWidget(this) && QMenuPrivate::nearestGraphicsProxyWidget(this);
     if (isEmbedded)
         screen = d->popupGeometry();
     else
@@ -2392,7 +2393,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     }
 
 #ifdef QT_KEYPAD_NAVIGATION
-    if (!atAction && QApplication::keypadNavigationEnabled()) {
+    if (!atAction && QApplicationPrivate::keypadNavigationEnabled()) {
         // Try to have one item activated
         if (d->defaultAction && d->defaultAction->isEnabled()) {
             atAction = d->defaultAction;
@@ -2698,8 +2699,8 @@ void QMenu::hideEvent(QHideEvent *)
     if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget))
         mb->d_func()->setCurrentAction(0);
 #endif
-    if (d->mouseDown == this)
-        d->mouseDown = 0;
+    if (QMenuPrivate::mouseDown == this)
+        QMenuPrivate::mouseDown = nullptr;
     d->hasHadMouse = false;
     if (d->activeMenu)
         d->hideMenu(d->activeMenu);
@@ -2847,8 +2848,8 @@ void QMenu::paintEvent(QPaintEvent *e)
 void QMenu::wheelEvent(QWheelEvent *e)
 {
     Q_D(QMenu);
-    if (d->scroll && rect().contains(e->pos()))
-        d->scrollMenu(e->delta() > 0 ?
+    if (d->scroll && rect().contains(e->position().toPoint()))
+        d->scrollMenu(e->angleDelta().y() > 0 ?
                       QMenuPrivate::QMenuScroller::ScrollUp : QMenuPrivate::QMenuScroller::ScrollDown);
 }
 #endif
@@ -2874,7 +2875,7 @@ void QMenu::mousePressEvent(QMouseEvent *e)
         d->hideUpToMenuBar();
         return;
     }
-    d->mouseDown = this;
+    QMenuPrivate::mouseDown = this;
 
     QAction *action = d->actionAt(e->pos());
     d->setCurrentAction(action, 20);
@@ -2889,12 +2890,12 @@ void QMenu::mouseReleaseEvent(QMouseEvent *e)
     Q_D(QMenu);
     if (d->aboutToHide || d->mouseEventTaken(e))
         return;
-    if(d->mouseDown != this) {
-        d->mouseDown = 0;
+    if (QMenuPrivate::mouseDown != this) {
+        QMenuPrivate::mouseDown = nullptr;
         return;
     }
 
-    d->mouseDown = 0;
+    QMenuPrivate::mouseDown = nullptr;
     d->setSyncAction();
     QAction *action = d->actionAt(e->pos());
 
@@ -2995,7 +2996,7 @@ QMenu::event(QEvent *e)
         d->updateActionRects();
         break; }
     case QEvent::Show:
-        d->mouseDown = 0;
+        QMenuPrivate::mouseDown = nullptr;
         d->updateActionRects();
         d->sloppyState.reset();
         if (d->currentAction)
@@ -3385,7 +3386,7 @@ void QMenu::keyPressEvent(QKeyEvent *e)
 #if QT_CONFIG(menubar)
             if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->topCausedWidget())) {
                 QAction *oldAct = mb->d_func()->currentAction;
-                QApplication::sendEvent(mb, e);
+                QCoreApplication::sendEvent(mb, e);
                 if (mb->d_func()->currentAction != oldAct)
                     key_consumed = true;
             }
@@ -3428,7 +3429,7 @@ void QMenu::mouseMoveEvent(QMouseEvent *e)
     }
 
     if (e->buttons())
-        d->mouseDown = this;
+        QMenuPrivate::mouseDown = this;
 
     if (d->activeMenu)
         d->activeMenu->d_func()->setCurrentAction(0);
@@ -3593,7 +3594,7 @@ void QMenu::internalDelayedPopup()
 
     QRect screen;
 #if QT_CONFIG(graphicsview)
-    bool isEmbedded = !bypassGraphicsProxyWidget(this) && d->nearestGraphicsProxyWidget(this);
+    bool isEmbedded = !bypassGraphicsProxyWidget(this) && QMenuPrivate::nearestGraphicsProxyWidget(this);
     if (isEmbedded)
         screen = d->popupGeometry();
     else
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h
index a72592824b..efbbc099a1 100644
--- a/src/widgets/widgets/qmenu_p.h
+++ b/src/widgets/widgets/qmenu_p.h
@@ -135,9 +135,9 @@ public:
     void initialize(QMenu *menu)
     {
         m_menu = menu;
-        m_uni_directional = menu->style()->styleHint(QStyle::SH_Menu_SubMenuUniDirection, 0, menu);
-        m_uni_dir_fail_at_count = short(menu->style()->styleHint(QStyle::SH_Menu_SubMenuUniDirectionFailCount, 0, menu));
-        m_select_other_actions = menu->style()->styleHint(QStyle::SH_Menu_SubMenuSloppySelectOtherActions, 0 , menu);
+        m_uni_directional = menu->style()->styleHint(QStyle::SH_Menu_SubMenuUniDirection, nullptr, menu);
+        m_uni_dir_fail_at_count = short(menu->style()->styleHint(QStyle::SH_Menu_SubMenuUniDirectionFailCount, nullptr, menu));
+        m_select_other_actions = menu->style()->styleHint(QStyle::SH_Menu_SubMenuSloppySelectOtherActions, nullptr , menu);
         m_timeout = short(menu->style()->styleHint(QStyle::SH_Menu_SubMenuSloppyCloseTimeout));
         m_discard_state_when_entering_parent = menu->style()->styleHint(QStyle::SH_Menu_SubMenuResetWhenReenteringParent);
         m_dont_start_time_on_leave = menu->style()->styleHint(QStyle::SH_Menu_SubMenuDontStartSloppyOnLeave);
@@ -378,7 +378,7 @@ public:
         }
         void stop()
         {
-            action = 0;
+            action = nullptr;
             timer.stop();
         }
 
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 9a60f1477d..3d31a3b73a 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -404,7 +404,7 @@ void QMenuBarPrivate::setCurrentAction(QAction *action, bool popup, bool activat
     }  else if (previousAction) {
         QString empty;
         QStatusTipEvent tip(empty);
-        QApplication::sendEvent(q, &tip);
+        QCoreApplication::sendEvent(q, &tip);
 #endif
     }
     if (fw)
@@ -701,7 +701,7 @@ void QMenuBarPrivate::init()
     q->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
     q->setAttribute(Qt::WA_CustomWhatsThis);
 
-    if (!QApplication::instance()->testAttribute(Qt::AA_DontUseNativeMenuBar))
+    if (!QCoreApplication::testAttribute(Qt::AA_DontUseNativeMenuBar))
         platformMenuBar = QGuiApplicationPrivate::platformTheme()->createPlatformMenuBar();
 
     if (platformMenuBar)
diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h
index c276a4512d..e3db16d190 100644
--- a/src/widgets/widgets/qmenubar_p.h
+++ b/src/widgets/widgets/qmenubar_p.h
@@ -65,9 +65,9 @@ class QMenuBarPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QMenuBar)
 public:
-    QMenuBarPrivate() : itemsDirty(0), currentAction(0), mouseDown(0),
+    QMenuBarPrivate() : itemsDirty(0), currentAction(nullptr), mouseDown(0),
                          closePopupMode(0), defaultPopDown(1), popupState(0), keyboardState(0), altPressed(0),
-                         doChildEffects(false), platformMenuBar(0)
+                         doChildEffects(false), platformMenuBar(nullptr)
     { }
 
     ~QMenuBarPrivate()
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index 4a875975a4..0a81931b57 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -54,6 +54,7 @@
 #endif
 #include <qstyle.h>
 #include <qtimer.h>
+#include "private/qapplication_p.h"
 #include "private/qtextdocumentlayout_p.h"
 #include "private/qabstracttextdocumentlayout_p.h"
 #include "qtextdocument.h"
@@ -824,9 +825,6 @@ void QPlainTextEditPrivate::init(const QString &txt)
     viewport->setCursor(Qt::IBeamCursor);
 #endif
     originalOffsetY = 0;
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    setSingleFingerPanEnabled(true);
-#endif
 }
 
 void QPlainTextEditPrivate::_q_textChanged()
@@ -1573,7 +1571,7 @@ bool QPlainTextEdit::event(QEvent *e)
     }
 #ifdef QT_KEYPAD_NAVIGATION
     else if (e->type() == QEvent::EnterEditFocus || e->type() == QEvent::LeaveEditFocus) {
-        if (QApplication::keypadNavigationEnabled())
+        if (QApplicationPrivate::keypadNavigationEnabled())
             d->sendControlEvent(e);
     }
 #endif
@@ -1588,7 +1586,7 @@ bool QPlainTextEdit::event(QEvent *e)
                 d->originalOffsetY = vBar->value();
             QPointF offset = g->offset();
             if (!offset.isNull()) {
-                if (QApplication::isRightToLeft())
+                if (QGuiApplication::isRightToLeft())
                     offset.rx() *= -1;
                 // QPlainTextEdit scrolls by lines only in vertical direction
                 QFontMetrics fm(document()->defaultFont());
@@ -1691,7 +1689,7 @@ void QPlainTextEdit::keyPressEvent(QKeyEvent *e)
 #ifdef QT_KEYPAD_NAVIGATION
     switch (e->key()) {
         case Qt::Key_Select:
-            if (QApplication::keypadNavigationEnabled()) {
+            if (QApplicationPrivate::keypadNavigationEnabled()) {
                 if (!(d->control->textInteractionFlags() & Qt::LinksAccessibleByKeyboard))
                     setEditFocus(!hasEditFocus());
                 else {
@@ -1709,14 +1707,14 @@ void QPlainTextEdit::keyPressEvent(QKeyEvent *e)
             break;
         case Qt::Key_Back:
         case Qt::Key_No:
-            if (!QApplication::keypadNavigationEnabled()
-                    || (QApplication::keypadNavigationEnabled() && !hasEditFocus())) {
+            if (!QApplicationPrivate::keypadNavigationEnabled()
+                    || (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus())) {
                 e->ignore();
                 return;
             }
             break;
         default:
-            if (QApplication::keypadNavigationEnabled()) {
+            if (QApplicationPrivate::keypadNavigationEnabled()) {
                 if (!hasEditFocus() && !(e->modifiers() & Qt::ControlModifier)) {
                     if (e->text()[0].isPrint()) {
                         setEditFocus(true);
@@ -1792,7 +1790,7 @@ void QPlainTextEdit::keyPressEvent(QKeyEvent *e)
         switch (e->key()) {
             case Qt::Key_Up:
             case Qt::Key_Down:
-                if (QApplication::keypadNavigationEnabled()) {
+                if (QApplicationPrivate::keypadNavigationEnabled()) {
                     // Cursor position didn't change, so we want to leave
                     // these keys to change focus.
                     e->ignore();
@@ -1801,7 +1799,7 @@ void QPlainTextEdit::keyPressEvent(QKeyEvent *e)
                 break;
             case Qt::Key_Left:
             case Qt::Key_Right:
-                if (QApplication::keypadNavigationEnabled()
+                if (QApplicationPrivate::keypadNavigationEnabled()
                         && QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional) {
                     // Same as for Key_Up and Key_Down.
                     e->ignore();
@@ -1810,7 +1808,7 @@ void QPlainTextEdit::keyPressEvent(QKeyEvent *e)
                 break;
             case Qt::Key_Back:
                 if (!e->isAutoRepeat()) {
-                    if (QApplication::keypadNavigationEnabled()) {
+                    if (QApplicationPrivate::keypadNavigationEnabled()) {
                         if (document()->isEmpty()) {
                             setEditFocus(false);
                             e->accept();
@@ -1836,7 +1834,7 @@ void QPlainTextEdit::keyReleaseEvent(QKeyEvent *e)
 {
 #ifdef QT_KEYPAD_NAVIGATION
     Q_D(QPlainTextEdit);
-    if (QApplication::keypadNavigationEnabled()) {
+    if (QApplicationPrivate::keypadNavigationEnabled()) {
         if (!e->isAutoRepeat() && e->key() == Qt::Key_Back
             && d->deleteAllTimer.isActive()) {
             d->deleteAllTimer.stop();
@@ -2080,7 +2078,7 @@ void QPlainTextEdit::mousePressEvent(QMouseEvent *e)
 {
     Q_D(QPlainTextEdit);
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled() && !hasEditFocus())
+    if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus())
         setEditFocus(true);
 #endif
     d->sendControlEvent(e);
@@ -2212,7 +2210,7 @@ void QPlainTextEdit::inputMethodEvent(QInputMethodEvent *e)
     Q_D(QPlainTextEdit);
 #ifdef QT_KEYPAD_NAVIGATION
     if (d->control->textInteractionFlags() & Qt::TextEditable
-        && QApplication::keypadNavigationEnabled()
+        && QApplicationPrivate::keypadNavigationEnabled()
         && !hasEditFocus()) {
         setEditFocus(true);
         selectAll();    // so text is replaced rather than appended to
@@ -2649,7 +2647,7 @@ void QPlainTextEdit::setReadOnly(bool ro)
     d->control->setTextInteractionFlags(flags);
     setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
     QEvent event(QEvent::ReadOnlyChange);
-    QApplication::sendEvent(this, &event);
+    QCoreApplication::sendEvent(this, &event);
 }
 
 /*!
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index b578aa0b18..f48b5706f7 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -684,38 +684,6 @@ bool QPushButton::event(QEvent *e)
     return QAbstractButton::event(e);
 }
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-/* \reimp */
-bool QPushButton::hitButton(const QPoint &pos) const
-{
-    QStyleOptionButton opt;
-    initStyleOption(&opt);
-    if (qt_mac_buttonIsRenderedFlat(this, &opt))
-        return QAbstractButton::hitButton(pos);
-
-    // Now that we know we are using the native style, let's proceed.
-    Q_D(const QPushButton);
-    QPushButtonPrivate *nonConst = const_cast<QPushButtonPrivate *>(d);
-    // In OSX buttons are round, which causes the hit method to be special.
-    // We cannot simply relay on detecting if something is inside the rect or not,
-    // we need to check if it is inside the "rounded area" or not. A point might
-    // be inside the rect but not inside the rounded area.
-    // Notice this method is only reimplemented for OSX.
-    return nonConst->hitButton(pos);
-}
-
-bool QPushButtonPrivate::hitButton(const QPoint &pos)
-{
-    Q_Q(QPushButton);
-    QRect roundedRect(q->rect().left() + QMacStylePrivate::PushButtonLeftOffset,
-                      q->rect().top() + QMacStylePrivate::PushButtonContentPadding,
-                      q->rect().width() - QMacStylePrivate::PushButtonRightOffset,
-                      q->rect().height() - QMacStylePrivate::PushButtonBottomOffset);
-    return roundedRect.contains(pos);
-}
-#endif
-
-
 QT_END_NAMESPACE
 
 #include "moc_qpushbutton.cpp"
diff --git a/src/widgets/widgets/qpushbutton_p.h b/src/widgets/widgets/qpushbutton_p.h
index a58675fe64..439b6e35d6 100644
--- a/src/widgets/widgets/qpushbutton_p.h
+++ b/src/widgets/widgets/qpushbutton_p.h
@@ -73,9 +73,6 @@ public:
 
     inline void init() { resetLayoutItemMargins(); }
     static QPushButtonPrivate* get(QPushButton *b) { return b->d_func(); }
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    bool hitButton(const QPoint &pos);
-#endif
 #if QT_CONFIG(menu)
     QPoint adjustedMenuPosition();
 #endif
diff --git a/src/widgets/widgets/qrubberband.cpp b/src/widgets/widgets/qrubberband.cpp
index ade8675db8..af730f8023 100644
--- a/src/widgets/widgets/qrubberband.cpp
+++ b/src/widgets/widgets/qrubberband.cpp
@@ -45,10 +45,6 @@
 
 #include "qstyle.h"
 #include "qstyleoption.h"
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-#  include <private/qt_mac_p.h>
-#  include <private/qt_cocoa_helpers_mac_p.h>
-#endif
 
 #include <qdebug.h>
 
@@ -140,18 +136,9 @@ QRubberBand::QRubberBand(Shape s, QWidget *p)
     Q_D(QRubberBand);
     d->shape = s;
     setAttribute(Qt::WA_TransparentForMouseEvents);
-#if 1 // Used to be excluded in Qt4 for Q_WS_WIN
     setAttribute(Qt::WA_NoSystemBackground);
-#endif
     setAttribute(Qt::WA_WState_ExplicitShowHide);
     setVisible(false);
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    if (isWindow()) {
-        createWinId();
-        extern OSWindowRef qt_mac_window_for(const QWidget *); //qwidget_mac.cpp
-        macWindowSetHasShadow(qt_mac_window_for(this), false);
-    }
-#endif
 }
 
 /*!
diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
index 9994344d79..68aa545082 100644
--- a/src/widgets/widgets/qscrollarea.cpp
+++ b/src/widgets/widgets/qscrollarea.cpp
@@ -46,6 +46,7 @@
 #include "qapplication.h"
 #include "qvariant.h"
 #include "qdebug.h"
+#include "private/qapplication_p.h"
 #include "private/qlayoutengine_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -300,7 +301,7 @@ bool QScrollArea::event(QEvent *e)
         d->updateScrollBars();
     }
 #ifdef QT_KEYPAD_NAVIGATION
-    else if (QApplication::keypadNavigationEnabled()) {
+    else if (QApplicationPrivate::keypadNavigationEnabled()) {
         if (e->type() == QEvent::Show)
             QApplication::instance()->installEventFilter(this);
         else if (e->type() == QEvent::Hide)
@@ -319,7 +320,7 @@ bool QScrollArea::eventFilter(QObject *o, QEvent *e)
     Q_D(QScrollArea);
 #ifdef QT_KEYPAD_NAVIGATION
     if (d->widget && o != d->widget && e->type() == QEvent::FocusIn
-            && QApplication::keypadNavigationEnabled()) {
+            && QApplicationPrivate::keypadNavigationEnabled()) {
         if (o->isWidgetType())
             ensureWidgetVisible(static_cast<QWidget *>(o));
     }
diff --git a/src/widgets/widgets/qscrollarea_p.h b/src/widgets/widgets/qscrollarea_p.h
index fa2e0241cf..2bdf9ed596 100644
--- a/src/widgets/widgets/qscrollarea_p.h
+++ b/src/widgets/widgets/qscrollarea_p.h
@@ -65,7 +65,7 @@ class QScrollAreaPrivate: public QAbstractScrollAreaPrivate
     Q_DECLARE_PUBLIC(QScrollArea)
 
 public:
-    QScrollAreaPrivate(): resizable(false), alignment(0){}
+    QScrollAreaPrivate(): resizable(false), alignment(nullptr){}
     void updateScrollBars();
     void updateWidgetPosition();
     QPointer<QWidget> widget;
diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp
index b4168268a0..08d771a27a 100644
--- a/src/widgets/widgets/qscrollbar.cpp
+++ b/src/widgets/widgets/qscrollbar.cpp
@@ -497,16 +497,14 @@ bool QScrollBar::event(QEvent *event)
 void QScrollBar::wheelEvent(QWheelEvent *event)
 {
     event->ignore();
-    int delta = event->delta();
     // scrollbar is a special case - in vertical mode it reaches minimum
     // value in the upper position, however QSlider's minimum value is on
-    // the bottom. So we need to invert a value, but since the scrollbar is
-    // inverted by default, we need to inverse the delta value for the
+    // the bottom. So we need to invert the value, but since the scrollbar is
+    // inverted by default, we need to invert the delta value only for the
     // horizontal orientation.
-    if (event->orientation() == Qt::Horizontal)
-        delta = -delta;
+    int delta = (orientation() == Qt::Horizontal ? -event->angleDelta().x() : event->angleDelta().y());
     Q_D(QScrollBar);
-    if (d->scrollByDelta(event->orientation(), event->modifiers(), delta))
+    if (d->scrollByDelta(orientation(), event->modifiers(), delta))
         event->accept();
 
     if (event->phase() == Qt::ScrollBegin)
diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp
index dc5a7158dd..835af9c7b8 100644
--- a/src/widgets/widgets/qsizegrip.cpp
+++ b/src/widgets/widgets/qsizegrip.cpp
@@ -50,10 +50,6 @@
 #include "qdebug.h"
 #include <QDesktopWidget>
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-#include <private/qt_mac_p.h>
-#endif
-
 #include <private/qwidget_p.h>
 #include <private/qdesktopwidget_p.h>
 #include <QtWidgets/qabstractscrollarea.h>
@@ -81,9 +77,7 @@ public:
     Qt::Corner m_corner;
     bool gotMousePress;
     QPointer<QWidget> tlw;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    void updateMacSizer(bool hide) const;
-#endif
+
     Qt::Corner corner() const;
     inline bool atBottom() const
     {
@@ -119,9 +113,7 @@ public:
         updateTopLevelWidget();
         if (tlw && showSizeGrip) {
             Qt::WindowStates sizeGripNotVisibleState = Qt::WindowFullScreen;
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
             sizeGripNotVisibleState |= Qt::WindowMaximized;
-#endif
             // Don't show the size grip if the tlw is maximized or in full screen mode.
             showSizeGrip = !(tlw->windowState() & sizeGripNotVisibleState);
         }
@@ -141,18 +133,6 @@ QSizeGripPrivate::QSizeGripPrivate()
 {
 }
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-void QSizeGripPrivate::updateMacSizer(bool hide) const
-{
-    Q_Q(const QSizeGrip);
-    if (QApplication::closingDown() || !parent)
-        return;
-    QWidget *topLevelWindow = qt_sizegrip_topLevelWidget(const_cast<QSizeGrip *>(q));
-    if(topLevelWindow && topLevelWindow->isWindow())
-        QWidgetPrivate::qt_mac_update_sizer(topLevelWindow, hide ? -1 : 1);
-}
-#endif
-
 Qt::Corner QSizeGripPrivate::corner() const
 {
     Q_Q(const QSizeGrip);
@@ -227,7 +207,7 @@ void QSizeGripPrivate::init()
     Q_Q(QSizeGrip);
     m_corner = q->isLeftToRight() ? Qt::BottomRightCorner : Qt::BottomLeftCorner;
 
-#if !defined(QT_NO_CURSOR) && !0 /* Used to be included in Qt4 for Q_WS_MAC */
+#if !defined(QT_NO_CURSOR)
     q->setCursor(m_corner == Qt::TopLeftCorner || m_corner == Qt::BottomRightCorner
                  ? Qt::SizeFDiagCursor : Qt::SizeBDiagCursor);
 #endif
@@ -440,7 +420,7 @@ void QSizeGrip::moveEvent(QMoveEvent * /*moveEvent*/)
         return;
 
     d->m_corner = d->corner();
-#if !defined(QT_NO_CURSOR) && !0 /* Used to be included in Qt4 for Q_WS_MAC */
+#if !defined(QT_NO_CURSOR)
     setCursor(d->m_corner == Qt::TopLeftCorner || d->m_corner == Qt::BottomRightCorner
               ? Qt::SizeFDiagCursor : Qt::SizeBDiagCursor);
 #endif
@@ -451,9 +431,6 @@ void QSizeGrip::moveEvent(QMoveEvent * /*moveEvent*/)
 */
 void QSizeGrip::showEvent(QShowEvent *showEvent)
 {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    d_func()->updateMacSizer(false);
-#endif
     QWidget::showEvent(showEvent);
 }
 
@@ -462,9 +439,6 @@ void QSizeGrip::showEvent(QShowEvent *showEvent)
 */
 void QSizeGrip::hideEvent(QHideEvent *hideEvent)
 {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    d_func()->updateMacSizer(true);
-#endif
     QWidget::hideEvent(hideEvent);
 }
 
@@ -486,9 +460,7 @@ bool QSizeGrip::eventFilter(QObject *o, QEvent *e)
         return QWidget::eventFilter(o, e);
     }
     Qt::WindowStates sizeGripNotVisibleState = Qt::WindowFullScreen;
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     sizeGripNotVisibleState |= Qt::WindowMaximized;
-#endif
     // Don't show the size grip if the tlw is maximized or in full screen mode.
     setVisible(!(d->tlw->windowState() & sizeGripNotVisibleState));
     setAttribute(Qt::WA_WState_ExplicitShowHide, false);
diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp
index 47d3b2fb81..161e4ba27a 100644
--- a/src/widgets/widgets/qslider.cpp
+++ b/src/widgets/widgets/qslider.cpp
@@ -46,6 +46,7 @@
 #include "qpainter.h"
 #include "qstyle.h"
 #include "qstyleoption.h"
+#include "private/qapplication_p.h"
 #include "private/qabstractslider_p.h"
 #include "qdebug.h"
 
@@ -360,7 +361,7 @@ void QSlider::mousePressEvent(QMouseEvent *ev)
         return;
     }
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled())
+    if (QApplicationPrivate::keypadNavigationEnabled())
         setEditFocus(true);
 #endif
     ev->accept();
diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
index 7d454c6359..61ea81c892 100644
--- a/src/widgets/widgets/qspinbox.cpp
+++ b/src/widgets/widgets/qspinbox.cpp
@@ -128,9 +128,10 @@ public:
     manually. The spin box supports integer values but can be extended to
     use different strings with validate(), textFromValue() and valueFromText().
 
-    Every time the value changes QSpinBox emits two valueChanged() signals,
-    one providing an int and the other a QString. The QString overload
-    provides the value with both prefix() and suffix().
+    Every time the value changes QSpinBox emits valueChanged() and
+    textChanged() signals, the former providing a int and the latter
+    a QString. The textChanged() signal provides the value with both
+    prefix() and suffix().
     The current value can be fetched with value() and set with setValue().
 
     Clicking the up/down buttons or using the keyboard accelerator's
@@ -183,12 +184,23 @@ public:
 */
 
 /*!
+    \fn void QSpinBox::textChanged(const QString &text)
+    \since 5.14
+
+    This signal is emitted whenever the spin box's text is changed.
+    The new text is passed in \a text with prefix() and suffix().
+*/
+
+#if QT_DEPRECATED_SINCE(5, 14)
+/*!
     \fn void QSpinBox::valueChanged(const QString &text)
 
     \overload
+    \obsolete Use textChanged(QString) instead
 
     The new value is passed in \a text with prefix() and suffix().
 */
+#endif
 
 /*!
     Constructs a spin box with 0 as minimum value and 99 as maximum value, a
@@ -372,7 +384,7 @@ void QSpinBox::setMinimum(int minimum)
 {
     Q_D(QSpinBox);
     const QVariant m(minimum);
-    d->setRange(m, (d->variantCompare(d->maximum, m) > 0 ? d->maximum : m));
+    d->setRange(m, (QSpinBoxPrivate::variantCompare(d->maximum, m) > 0 ? d->maximum : m));
 }
 
 /*!
@@ -400,7 +412,7 @@ void QSpinBox::setMaximum(int maximum)
 {
     Q_D(QSpinBox);
     const QVariant m(maximum);
-    d->setRange((d->variantCompare(d->minimum, m) < 0 ? d->minimum : m), m);
+    d->setRange((QSpinBoxPrivate::variantCompare(d->minimum, m) < 0 ? d->minimum : m), m);
 }
 
 /*!
@@ -594,9 +606,9 @@ void QSpinBox::fixup(QString &input) const
     values but can be extended to use different strings with
     validate(), textFromValue() and valueFromText().
 
-    Every time the value changes QDoubleSpinBox emits two
-    valueChanged() signals, one taking providing a double and the other
-    a QString. The QString overload provides the value with both
+    Every time the value changes QDoubleSpinBox emits valueChanged() and
+    textChanged() signals, the former providing a double and the latter
+    a QString. The textChanged() signal provides the value with both
     prefix() and suffix(). The current value can be fetched with
     value() and set with setValue().
 
@@ -644,12 +656,23 @@ void QSpinBox::fixup(QString &input) const
 */
 
 /*!
+    \fn void QDoubleSpinBox::textChanged(const QString &text)
+    \since 5.14
+
+    This signal is emitted whenever the spin box's text is changed.
+    The new text is passed in \a text with prefix() and suffix().
+*/
+
+#if QT_DEPRECATED_SINCE(5, 14)
+/*!
     \fn void QDoubleSpinBox::valueChanged(const QString &text);
 
     \overload
+    \obsolete Use textChanged(QString) instead
 
     The new value is passed in \a text with prefix() and suffix().
 */
+#endif
 
 /*!
     Constructs a spin box with 0.0 as minimum value and 99.99 as maximum value,
@@ -841,7 +864,7 @@ void QDoubleSpinBox::setMinimum(double minimum)
     Q_D(QDoubleSpinBox);
     d->actualMin = minimum;
     const QVariant m(d->round(minimum));
-    d->setRange(m, (d->variantCompare(d->maximum, m) > 0 ? d->maximum : m));
+    d->setRange(m, (QDoubleSpinBoxPrivate::variantCompare(d->maximum, m) > 0 ? d->maximum : m));
 }
 
 /*!
@@ -872,7 +895,7 @@ void QDoubleSpinBox::setMaximum(double maximum)
     Q_D(QDoubleSpinBox);
     d->actualMax = maximum;
     const QVariant m(d->round(maximum));
-    d->setRange((d->variantCompare(d->minimum, m) < 0 ? d->minimum : m), m);
+    d->setRange((QDoubleSpinBoxPrivate::variantCompare(d->minimum, m) < 0 ? d->minimum : m), m);
 }
 
 /*!
@@ -1072,7 +1095,13 @@ void QSpinBoxPrivate::emitSignals(EmitPolicy ep, const QVariant &old)
     if (ep != NeverEmit) {
         pendingEmit = false;
         if (ep == AlwaysEmit || value != old) {
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
             emit q->valueChanged(edit->displayText());
+QT_WARNING_POP
+#endif
+            emit q->textChanged(edit->displayText());
             emit q->valueChanged(value.toInt());
         }
     }
@@ -1223,7 +1252,13 @@ void QDoubleSpinBoxPrivate::emitSignals(EmitPolicy ep, const QVariant &old)
     if (ep != NeverEmit) {
         pendingEmit = false;
         if (ep == AlwaysEmit || value != old) {
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
             emit q->valueChanged(edit->displayText());
+QT_WARNING_POP
+#endif
+            emit q->textChanged(edit->displayText());
             emit q->valueChanged(value.toDouble());
         }
     }
diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h
index d2eac903fb..762dd4a46a 100644
--- a/src/widgets/widgets/qspinbox.h
+++ b/src/widgets/widgets/qspinbox.h
@@ -106,7 +106,11 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void valueChanged(int);
+    void textChanged(const QString &);
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use textChanged(QString) instead")
     void valueChanged(const QString &);
+#endif
 
 private:
     Q_DISABLE_COPY(QSpinBox)
@@ -168,7 +172,11 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void valueChanged(double);
+    void textChanged(const QString &);
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use textChanged(QString) instead")
     void valueChanged(const QString &);
+#endif
 
 private:
     Q_DISABLE_COPY(QDoubleSpinBox)
diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp
index bf6bf1c7c9..e39ef6d1cd 100644
--- a/src/widgets/widgets/qsplashscreen.cpp
+++ b/src/widgets/widgets/qsplashscreen.cpp
@@ -111,7 +111,7 @@ public:
    The user can hide the splash screen by clicking on it with the
    mouse. Since the splash screen is typically displayed before the
    event loop has started running, it is necessary to periodically
-   call QApplication::processEvents() to receive the mouse clicks.
+   call QCoreApplication::processEvents() to receive the mouse clicks.
 
    It is sometimes useful to update the splash screen with messages,
    for example, announcing connections established or modules loaded
@@ -170,13 +170,13 @@ void QSplashScreen::mousePressEvent(QMouseEvent *)
 
 /*!
     This overrides QWidget::repaint(). It differs from the standard repaint
-    function in that it also calls QApplication::processEvents() to ensure
+    function in that it also calls QCoreApplication::processEvents() to ensure
     the updates are displayed, even when there is no event loop present.
 */
 void QSplashScreen::repaint()
 {
     QWidget::repaint();
-    QApplication::processEvents();
+    QCoreApplication::processEvents();
 }
 
 /*!
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index de838a8f93..e7a4889996 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -771,14 +771,13 @@ void QSplitterPrivate::setGeo(QSplitterLayoutStruct *sls, int p, int s, bool all
     if (!sls->handle->isHidden()) {
         QSplitterHandle *h = sls->handle;
         QSize hs = h->sizeHint();
-        int left, top, right, bottom;
-        h->getContentsMargins(&left, &top, &right, &bottom);
+        const QMargins m = h->contentsMargins();
         if (orient==Qt::Horizontal) {
             if (q->isRightToLeft())
                 p = contents.width() - p + hs.width();
-            h->setGeometry(p-hs.width() - left, contents.y(), hs.width() + left + right, contents.height());
+            h->setGeometry(p-hs.width() - m.left(), contents.y(), hs.width() + m.left() + m.right(), contents.height());
         } else {
-            h->setGeometry(contents.x(), p-hs.height() - top, contents.width(), hs.height() + top + bottom);
+            h->setGeometry(contents.x(), p-hs.height() - m.top(), contents.width(), hs.height() + m.top() + m.bottom());
         }
     }
 }
@@ -1378,7 +1377,7 @@ bool QSplitter::event(QEvent *e)
     default:
         ;
     }
-    return QWidget::event(e);
+    return QFrame::event(e);
 }
 
 /*!
@@ -1793,7 +1792,7 @@ void QSplitter::setStretchFactor(int index, int stretch)
 
 QTextStream& operator<<(QTextStream& ts, const QSplitter& splitter)
 {
-    ts << splitter.saveState() << endl;
+    ts << splitter.saveState() << Qt::endl;
     return ts;
 }
 
diff --git a/src/widgets/widgets/qsplitter_p.h b/src/widgets/widgets/qsplitter_p.h
index f0d621004f..871406a51d 100644
--- a/src/widgets/widgets/qsplitter_p.h
+++ b/src/widgets/widgets/qsplitter_p.h
@@ -70,7 +70,7 @@ public:
     QWidget *widget;
     QSplitterHandle *handle;
 
-    QSplitterLayoutStruct() : sizer(-1), collapsed(false), collapsible(Default), widget(0), handle(0) {}
+    QSplitterLayoutStruct() : sizer(-1), collapsed(false), collapsible(Default), widget(nullptr), handle(nullptr) {}
     ~QSplitterLayoutStruct() { delete handle; }
     int getWidgetSize(Qt::Orientation orient);
     int getHandleSize(Qt::Orientation orient);
@@ -84,7 +84,7 @@ class QSplitterPrivate : public QFramePrivate
 public:
     QSplitterPrivate() :
 #if QT_CONFIG(rubberband)
-                         rubberBand(0),
+                         rubberBand(nullptr),
 #endif
                          opaque(true), firstShow(true),
                          childrenCollapsible(true), compatMode(false), handleWidth(-1), blockChildAdd(false), opaqueResizeSet(false) {}
@@ -140,7 +140,7 @@ class QSplitterHandlePrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QSplitterHandle)
 public:
-    QSplitterHandlePrivate() : s(0), orient(Qt::Horizontal), mouseOffset(0), opaq(false), hover(false), pressed(false) {}
+    QSplitterHandlePrivate() : s(nullptr), orient(Qt::Horizontal), mouseOffset(0), opaq(false), hover(false), pressed(false) {}
 
     inline int pick(const QPoint &pos) const
     { return orient == Qt::Horizontal ? pos.x() : pos.y(); }
diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
index e9044e6cad..39f0f11daf 100644
--- a/src/widgets/widgets/qstatusbar.cpp
+++ b/src/widgets/widgets/qstatusbar.cpp
@@ -90,10 +90,6 @@ public:
 
     int savedStrut;
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    QPoint dragStart;
-#endif
-
     int indexToLastNonPermanentWidget() const
     {
         int i = items.size() - 1;
@@ -747,44 +743,7 @@ bool QStatusBar::event(QEvent *e)
         }
     }
 
-// On Mac OS X Leopard it is possible to drag the window by clicking
-// on the tool bar on most applications.
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     return QWidget::event(e);
-#else
-    // Enable drag-click only if the status bar is the status bar for a
-    // QMainWindow with a unifed toolbar.
-    if (parent() == 0 || qobject_cast<QMainWindow *>(parent()) == 0 ||
-        qobject_cast<QMainWindow *>(parent())->unifiedTitleAndToolBarOnMac() == false )
-        return QWidget::event(e);
-
-    // Check for mouse events.
-    QMouseEvent *mouseEvent;
-    if (e->type() == QEvent::MouseButtonPress ||
-        e->type() == QEvent::MouseMove ||
-        e->type() == QEvent::MouseButtonRelease) {
-        mouseEvent = static_cast <QMouseEvent*>(e);
-    } else {
-        return QWidget::event(e);
-    }
-
-    // The following is a standard mouse drag handler.
-    if (e->type() == QEvent::MouseButtonPress && (mouseEvent->button() == Qt::LeftButton)) {
-        d->dragStart = mouseEvent->pos();
-    } else if (e->type() == QEvent::MouseMove){
-        if (d->dragStart == QPoint())
-            return QWidget::event(e);
-        QPoint pos = mouseEvent->pos();
-        QPoint delta = (pos - d->dragStart);
-        window()->move(window()->pos() + delta);
-    } else if (e->type() == QEvent::MouseButtonRelease && (mouseEvent->button() == Qt::LeftButton)){
-        d->dragStart = QPoint();
-    } else {
-        return QWidget::event(e);
-    }
-
-    return true;
-#endif
 }
 
 QT_END_NAMESPACE
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index b13f4da9d2..7e1794efef 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -65,13 +65,9 @@
 #endif
 
 #include "qdebug.h"
+#include "private/qapplication_p.h"
 #include "private/qtabbar_p.h"
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-#include <private/qt_mac_p.h>
-#include <private/qt_cocoa_helpers_mac_p.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 namespace {
@@ -415,7 +411,7 @@ void QTabBarPrivate::init()
     QObject::connect(rightB, SIGNAL(clicked()), q, SLOT(_q_scrollTabs()));
     rightB->hide();
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled()) {
+    if (QApplicationPrivate::keypadNavigationEnabled()) {
         leftB->setFocusPolicy(Qt::NoFocus);
         rightB->setFocusPolicy(Qt::NoFocus);
         q->setFocusPolicy(Qt::NoFocus);
@@ -843,7 +839,7 @@ void QTabBarPrivate::refresh()
     // be safe in case a subclass is also handling move with the tabs
     if (pressedIndex != -1
         && movable
-        && QApplication::mouseButtons() == Qt::NoButton) {
+        && QGuiApplication::mouseButtons() == Qt::NoButton) {
         moveTabFinished(pressedIndex);
         if (!validIndex(pressedIndex))
             pressedIndex = -1;
@@ -1975,9 +1971,7 @@ void QTabBar::mousePressEvent(QMouseEvent *event)
         d->moveTabFinished(d->pressedIndex);
 
     d->pressedIndex = d->indexAtPos(event->pos());
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    d->previousPressedIndex = d->pressedIndex;
-#endif
+
     if (d->validIndex(d->pressedIndex)) {
         QStyleOptionTabBarBase optTabBase;
         optTabBase.init(this);
@@ -2057,17 +2051,6 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event)
 
             update();
         }
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    } else if (!d->documentMode && event->buttons() == Qt::LeftButton && d->previousPressedIndex != -1) {
-        int newPressedIndex = d->indexAtPos(event->pos());
-        if (d->pressedIndex == -1 && d->previousPressedIndex == newPressedIndex) {
-            d->pressedIndex = d->previousPressedIndex;
-            update(tabRect(d->pressedIndex));
-        } else if(d->pressedIndex != newPressedIndex) {
-            d->pressedIndex = -1;
-            update(tabRect(d->previousPressedIndex));
-        }
-#endif
     }
 
     if (event->buttons() != Qt::LeftButton) {
@@ -2161,9 +2144,7 @@ void QTabBar::mouseReleaseEvent(QMouseEvent *event)
         event->ignore();
         return;
     }
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    d->previousPressedIndex = -1;
-#endif
+
     if (d->movable && d->dragInProgress && d->validIndex(d->pressedIndex)) {
         int length = d->tabList[d->pressedIndex].dragOffset;
         int width = verticalTabs(d->shape)
@@ -2210,7 +2191,9 @@ void QTabBar::wheelEvent(QWheelEvent *event)
 {
 #ifndef Q_OS_MAC
     Q_D(QTabBar);
-    int offset = event->delta() > 0 ? -1 : 1;
+    int delta = (qAbs(event->angleDelta().x()) > qAbs(event->angleDelta().y()) ?
+                     event->angleDelta().x() : event->angleDelta().y());
+    int offset = delta > 0 ? -1 : 1;
     d->setCurrentNextEnabledIndex(offset);
     QWidget::wheelEvent(event);
 #else
diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h
index 9b798e89c9..5552c43548 100644
--- a/src/widgets/widgets/qtabbar_p.h
+++ b/src/widgets/widgets/qtabbar_p.h
@@ -92,10 +92,7 @@ public:
         drawBase(true), scrollOffset(0), hoverIndex(-1), elideModeSetByUser(false), useScrollButtonsSetByUser(false), expanding(true), closeButtonOnTabs(false),
         selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false),
         dragInProgress(false), documentMode(false), autoHide(false), changeCurrentOnDrag(false),
-        switchTabCurrentIndex(-1), switchTabTimerId(0), movingTab(0)
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        , previousPressedIndex(-1)
-#endif
+        switchTabCurrentIndex(-1), switchTabTimerId(0), movingTab(nullptr)
         {}
 
     int currentIndex;
@@ -182,7 +179,7 @@ public:
 
     int indexAtPos(const QPoint &p) const;
 
-    inline bool isAnimated() const { Q_Q(const QTabBar); return q->style()->styleHint(QStyle::SH_Widget_Animation_Duration, 0, q) > 0; }
+    inline bool isAnimated() const { Q_Q(const QTabBar); return q->style()->styleHint(QStyle::SH_Widget_Animation_Duration, nullptr, q) > 0; }
     inline bool validIndex(int index) const { return index >= 0 && index < tabList.count(); }
     void setCurrentNextEnabledIndex(int offset);
 
@@ -232,9 +229,6 @@ public:
     int switchTabTimerId;
 
     QMovableTabWidget *movingTab;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    int previousPressedIndex;
-#endif
     // shared by tabwidget and qtabbar
     static void initStyleBaseOption(QStyleOptionTabBarBase *optTabBase, QTabBar *tabbar, QSize size)
     {
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index 547b8a82f9..4d7b39ae01 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -39,6 +39,7 @@
 
 #include "qtabwidget.h"
 
+#include "private/qapplication_p.h"
 #include "private/qwidget_p.h"
 #include "private/qtabbar_p.h"
 #include "qapplication.h"
@@ -241,7 +242,7 @@ void QTabWidgetPrivate::init()
     q->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding,
                                  QSizePolicy::TabWidget));
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled())
+    if (QApplicationPrivate::keypadNavigationEnabled())
         q->setFocusPolicy(Qt::NoFocus);
     else
 #endif
@@ -1108,14 +1109,14 @@ void QTabWidget::keyPressEvent(QKeyEvent *e)
     if (((e->key() == Qt::Key_Tab || e->key() == Qt::Key_Backtab) &&
           count() > 1 && e->modifiers() & Qt::ControlModifier)
 #ifdef QT_KEYPAD_NAVIGATION
-          || QApplication::keypadNavigationEnabled() && (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right) && count() > 1
+          || QApplicationPrivate::keypadNavigationEnabled() && (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right) && count() > 1
 #endif
        ) {
         int pageCount = d->tabs->count();
         int page = currentIndex();
         int dx = (e->key() == Qt::Key_Backtab || e->modifiers() & Qt::ShiftModifier) ? -1 : 1;
 #ifdef QT_KEYPAD_NAVIGATION
-        if (QApplication::keypadNavigationEnabled() && (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right))
+        if (QApplicationPrivate::keypadNavigationEnabled() && (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right))
             dx = e->key() == (isRightToLeft() ? Qt::Key_Right : Qt::Key_Left) ? -1 : 1;
 #endif
         for (int pass = 0; pass < pageCount; ++pass) {
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index bb9a4fed91..3e49390315 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -42,6 +42,7 @@
 
 #include <qstack.h>
 #include <qapplication.h>
+#include <private/qapplication_p.h>
 #include <qevent.h>
 #include <qdesktopwidget.h>
 #include <qdebug.h>
@@ -60,6 +61,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(lcBrowser, "qt.text.browser")
+
 class QTextBrowserPrivate : public QTextEditPrivate
 {
     Q_DECLARE_PUBLIC(QTextBrowser)
@@ -83,6 +86,7 @@ public:
         int hpos;
         int vpos;
         int focusIndicatorPosition, focusIndicatorAnchor;
+        QTextDocument::ResourceType type = QTextDocument::UnknownResource;
     };
 
     HistoryEntry history(int i) const
@@ -119,6 +123,8 @@ public:
     bool openExternalLinks;
     bool openLinks;
 
+    QTextDocument::ResourceType currentType;
+
 #ifndef QT_NO_CURSOR
     QCursor oldCursor;
 #endif
@@ -134,7 +140,7 @@ public:
     void _q_activateAnchor(const QString &href);
     void _q_highlightLink(const QString &href);
 
-    void setSource(const QUrl &url);
+    void setSource(const QUrl &url, QTextDocument::ResourceType type);
 
     // re-imlemented from QTextEditPrivate
     virtual QUrl resolveUrl(const QUrl &url) const override;
@@ -271,7 +277,7 @@ void QTextBrowserPrivate::_q_highlightLink(const QString &anchor)
     }
 }
 
-void QTextBrowserPrivate::setSource(const QUrl &url)
+void QTextBrowserPrivate::setSource(const QUrl &url, QTextDocument::ResourceType type)
 {
     Q_Q(QTextBrowser);
 #ifndef QT_NO_CURSOR
@@ -288,20 +294,36 @@ void QTextBrowserPrivate::setSource(const QUrl &url)
     currentUrlWithoutFragment.setFragment(QString());
     QUrl newUrlWithoutFragment = currentURL.resolved(url);
     newUrlWithoutFragment.setFragment(QString());
+    QString fileName = url.fileName();
+    if (type == QTextDocument::UnknownResource) {
+#if QT_CONFIG(textmarkdownreader)
+        if (fileName.endsWith(QLatin1String(".md")) ||
+                fileName.endsWith(QLatin1String(".mkd")) ||
+                fileName.endsWith(QLatin1String(".markdown")))
+            type = QTextDocument::MarkdownResource;
+        else
+#endif
+            type = QTextDocument::HtmlResource;
+    }
+    currentType = type;
 
     if (url.isValid()
         && (newUrlWithoutFragment != currentUrlWithoutFragment || forceLoadOnSourceChange)) {
-        QVariant data = q->loadResource(QTextDocument::HtmlResource, resolveUrl(url));
+        QVariant data = q->loadResource(type, resolveUrl(url));
         if (data.type() == QVariant::String) {
             txt = data.toString();
         } else if (data.type() == QVariant::ByteArray) {
+            if (type == QTextDocument::HtmlResource) {
 #if QT_CONFIG(textcodec)
-            QByteArray ba = data.toByteArray();
-            QTextCodec *codec = Qt::codecForHtml(ba);
-            txt = codec->toUnicode(ba);
+                QByteArray ba = data.toByteArray();
+                QTextCodec *codec = Qt::codecForHtml(ba);
+                txt = codec->toUnicode(ba);
 #else
-            txt = data.toString();
+                txt = data.toString();
 #endif
+            } else {
+                txt = QString::fromUtf8(data.toByteArray());
+            }
         }
         if (Q_UNLIKELY(txt.isEmpty()))
             qWarning("QTextBrowser: No document for %s", url.toString().toLatin1().constData());
@@ -327,9 +349,21 @@ void QTextBrowserPrivate::setSource(const QUrl &url)
         home = url;
 
     if (doSetText) {
+        // Setting the base URL helps QTextDocument::resource() to find resources with relative paths.
+        // But don't set it unless it contains the document's path, because QTextBrowserPrivate::resolveUrl()
+        // can already deal with local files on the filesystem in case the base URL was not set.
+        QUrl baseUrl = currentURL.adjusted(QUrl::RemoveFilename);
+        if (!baseUrl.path().isEmpty())
+            q->document()->setBaseUrl(baseUrl);
+        q->document()->setMetaInformation(QTextDocument::DocumentUrl, currentURL.toString());
+        qCDebug(lcBrowser) << "loading" << currentURL << "base" << q->document()->baseUrl() << "type" << type << txt.size() << "chars";
+#if QT_CONFIG(textmarkdownreader)
+        if (type == QTextDocument::MarkdownResource)
+            q->QTextEdit::setMarkdown(txt);
+        else
+#endif
 #ifndef QT_NO_TEXTHTMLPARSER
         q->QTextEdit::setHtml(txt);
-        q->document()->setMetaInformation(QTextDocument::DocumentUrl, currentURL.toString());
 #else
         q->QTextEdit::setPlainText(txt);
 #endif
@@ -551,6 +585,7 @@ QTextBrowserPrivate::HistoryEntry QTextBrowserPrivate::createHistoryEntry() cons
 {
     HistoryEntry entry;
     entry.url = q_func()->source();
+    entry.type = q_func()->sourceType();
     entry.title = q_func()->documentTitle();
     entry.hpos = hbar->value();
     entry.vpos = vbar->value();
@@ -567,7 +602,7 @@ QTextBrowserPrivate::HistoryEntry QTextBrowserPrivate::createHistoryEntry() cons
 
 void QTextBrowserPrivate::restoreHistoryEntry(const HistoryEntry &entry)
 {
-    setSource(entry.url);
+    setSource(entry.url, entry.type);
     hbar->setValue(entry.hpos);
     vbar->setValue(entry.vpos);
     if (entry.focusIndicatorAnchor != -1 && entry.focusIndicatorPosition != -1) {
@@ -709,7 +744,13 @@ QTextBrowser::~QTextBrowser()
     document is displayed as a popup rather than as new document in
     the browser window itself. Otherwise, the document is displayed
     normally in the text browser with the text set to the contents of
-    the named document with setHtml().
+    the named document with \l QTextDocument::setHtml() or
+    \l QTextDocument::setMarkdown(), depending on whether the filename ends
+    with any of the known Markdown file extensions.
+
+    If you would like to avoid automatic type detection
+    and specify the type explicitly, call setSource() rather than
+    setting this property.
 
     By default, this property contains an empty URL.
 */
@@ -723,6 +764,23 @@ QUrl QTextBrowser::source() const
 }
 
 /*!
+    \property QTextBrowser::sourceType
+    \brief the type of the displayed document
+
+    This is QTextDocument::UnknownResource if no document is displayed or if
+    the type of the source is unknown. Otherwise it holds the type that was
+    detected, or the type that was specified when setSource() was called.
+*/
+QTextDocument::ResourceType QTextBrowser::sourceType() const
+{
+    Q_D(const QTextBrowser);
+    if (d->stack.isEmpty())
+        return QTextDocument::UnknownResource;
+    else
+        return d->stack.top().type;
+}
+
+/*!
     \property QTextBrowser::searchPaths
     \brief the search paths used by the text browser to find supporting
     content
@@ -752,16 +810,46 @@ void QTextBrowser::reload()
     Q_D(QTextBrowser);
     QUrl s = d->currentURL;
     d->currentURL = QUrl();
-    setSource(s);
+    setSource(s, d->currentType);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 void QTextBrowser::setSource(const QUrl &url)
 {
+    setSource(url, QTextDocument::UnknownResource);
+}
+#endif
+
+/*!
+    Attempts to load the document at the given \a url with the specified \a type.
+
+    If \a type is \l {QTextDocument::ResourceType::UnknownResource}{UnknownResource}
+    (the default), the document type will be detected: that is, if the url ends
+    with an extension of \c{.md}, \c{.mkd} or \c{.markdown}, the document will be
+    loaded via \l QTextDocument::setMarkdown(); otherwise it will be loaded via
+    \l QTextDocument::setHtml(). This detection can be bypassed by specifying
+    the \a type explicitly.
+*/
+void QTextBrowser::setSource(const QUrl &url, QTextDocument::ResourceType type)
+{
+    doSetSource(url, type);
+}
+
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+/*!
+    Attempts to load the document at the given \a url with the specified \a type.
+
+    setSource() calls doSetSource.  In Qt 5, setSource(const QUrl &url) was virtual.
+    In Qt 6, doSetSource() is virtual instead, so that it can be overridden in subclasses.
+*/
+#endif
+void QTextBrowser::doSetSource(const QUrl &url, QTextDocument::ResourceType type)
+{
     Q_D(QTextBrowser);
 
     const QTextBrowserPrivate::HistoryEntry historyEntry = d->createHistoryEntry();
 
-    d->setSource(url);
+    d->setSource(url, type);
 
     if (!url.isValid())
         return;
@@ -775,6 +863,7 @@ void QTextBrowser::setSource(const QUrl &url)
 
     QTextBrowserPrivate::HistoryEntry entry;
     entry.url = url;
+    entry.type = d->currentType;
     entry.title = documentTitle();
     entry.hpos = 0;
     entry.vpos = 0;
@@ -928,7 +1017,7 @@ void QTextBrowser::keyPressEvent(QKeyEvent *ev)
     Q_D(QTextBrowser);
     switch (ev->key()) {
     case Qt::Key_Select:
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             if (!hasEditFocus()) {
                 setEditFocus(true);
                 return;
@@ -943,7 +1032,7 @@ void QTextBrowser::keyPressEvent(QKeyEvent *ev)
         }
         break;
     case Qt::Key_Back:
-        if (QApplication::keypadNavigationEnabled()) {
+        if (QApplicationPrivate::keypadNavigationEnabled()) {
             if (hasEditFocus()) {
                 setEditFocus(false);
                 ev->accept();
@@ -953,7 +1042,7 @@ void QTextBrowser::keyPressEvent(QKeyEvent *ev)
         QTextEdit::keyPressEvent(ev);
         return;
     default:
-        if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+        if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
             ev->ignore();
             return;
         }
@@ -1086,6 +1175,7 @@ void QTextBrowser::paintEvent(QPaintEvent *e)
     \row    \li QTextDocument::HtmlResource  \li QString or QByteArray
     \row    \li QTextDocument::ImageResource \li QImage, QPixmap or QByteArray
     \row    \li QTextDocument::StyleSheetResource \li QString or QByteArray
+    \row    \li QTextDocument::MarkdownResource \li QString or QByteArray
     \endtable
 */
 QVariant QTextBrowser::loadResource(int /*type*/, const QUrl &name)
diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h
index ea81256f50..33e5b3980c 100644
--- a/src/widgets/widgets/qtextbrowser.h
+++ b/src/widgets/widgets/qtextbrowser.h
@@ -55,6 +55,7 @@ class Q_WIDGETS_EXPORT QTextBrowser : public QTextEdit
     Q_OBJECT
 
     Q_PROPERTY(QUrl source READ source WRITE setSource)
+    Q_PROPERTY(QTextDocument::ResourceType sourceType READ sourceType)
     Q_OVERRIDE(bool modified SCRIPTABLE false)
     Q_OVERRIDE(bool readOnly DESIGNABLE false SCRIPTABLE false)
     Q_OVERRIDE(bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false)
@@ -67,6 +68,7 @@ public:
     virtual ~QTextBrowser();
 
     QUrl source() const;
+    QTextDocument::ResourceType sourceType() const;
 
     QStringList searchPaths() const;
     void setSearchPaths(const QStringList &paths);
@@ -88,7 +90,12 @@ public:
     void setOpenLinks(bool open);
 
 public Q_SLOTS:
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     virtual void setSource(const QUrl &name);
+    void setSource(const QUrl &name, QTextDocument::ResourceType type);
+#else
+    void setSource(const QUrl &name, QTextDocument::ResourceType type = QTextDocument::UnknownResource);
+#endif
     virtual void backward();
     virtual void forward();
     virtual void home();
@@ -112,6 +119,10 @@ protected:
     virtual void focusOutEvent(QFocusEvent *ev) override;
     virtual bool focusNextPrevChild(bool next) override;
     virtual void paintEvent(QPaintEvent *e) override;
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    virtual
+#endif
+    void doSetSource(const QUrl &name, QTextDocument::ResourceType type = QTextDocument::UnknownResource);
 
 private:
     Q_DISABLE_COPY(QTextBrowser)
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 2b3a46ae56..dd2ea3f18f 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -70,6 +70,7 @@
 #include <qtextformat.h>
 #include <qdatetime.h>
 #include <qapplication.h>
+#include <private/qapplication_p.h>
 #include <limits.h>
 #include <qtexttable.h>
 #include <qvariant.h>
@@ -167,6 +168,9 @@ void QTextEditPrivate::init(const QString &html)
     QObject::connect(control, SIGNAL(copyAvailable(bool)), q, SIGNAL(copyAvailable(bool)));
     QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged()));
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(_q_cursorPositionChanged()));
+#if QT_CONFIG(cursor)
+    QObject::connect(control, SIGNAL(blockMarkerHovered(QTextBlock)), q, SLOT(_q_hoveredBlockWithMarkerChanged(QTextBlock)));
+#endif
 
     QObject::connect(control, SIGNAL(textChanged()), q, SLOT(updateMicroFocus()));
 
@@ -187,6 +191,7 @@ void QTextEditPrivate::init(const QString &html)
     vbar->setSingleStep(20);
 
     viewport->setBackgroundRole(QPalette::Base);
+    q->setMouseTracking(true);
     q->setAcceptDrops(true);
     q->setFocusPolicy(Qt::StrongFocus);
     q->setAttribute(Qt::WA_KeyCompression);
@@ -195,9 +200,6 @@ void QTextEditPrivate::init(const QString &html)
 #ifndef QT_NO_CURSOR
     viewport->setCursor(Qt::IBeamCursor);
 #endif
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-    setSingleFingerPanEnabled(true);
-#endif
 }
 
 void QTextEditPrivate::_q_repaintContents(const QRectF &contentsRect)
@@ -228,6 +230,23 @@ void QTextEditPrivate::_q_cursorPositionChanged()
 #endif
 }
 
+#if QT_CONFIG(cursor)
+void QTextEditPrivate::_q_hoveredBlockWithMarkerChanged(const QTextBlock &block)
+{
+    Q_Q(QTextEdit);
+    Qt::CursorShape cursor = cursorToRestoreAfterHover;
+    if (block.isValid() && !q->isReadOnly()) {
+        QTextBlockFormat::MarkerType marker = block.blockFormat().marker();
+        if (marker != QTextBlockFormat::MarkerType::NoMarker) {
+            if (viewport->cursor().shape() != Qt::PointingHandCursor)
+                cursorToRestoreAfterHover = viewport->cursor().shape();
+            cursor = Qt::PointingHandCursor;
+        }
+    }
+    viewport->setCursor(cursor);
+}
+#endif
+
 void QTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCursor::MoveMode moveMode)
 {
     QTextCursor cursor = control->textCursor();
@@ -366,8 +385,8 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
     \section1 Introduction and Concepts
 
     QTextEdit is an advanced WYSIWYG viewer/editor supporting rich
-    text formatting using HTML-style tags. It is optimized to handle
-    large documents and to respond quickly to user input.
+    text formatting using HTML-style tags, or Markdown format. It is optimized
+    to handle large documents and to respond quickly to user input.
 
     QTextEdit works on paragraphs and characters. A paragraph is a
     formatted string which is word-wrapped to fit into the width of
@@ -381,7 +400,7 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
     QTextEdit can display images, lists and tables. If the text is
     too large to view within the text edit's viewport, scroll bars will
     appear. The text edit can load both plain text and rich text files.
-    Rich text is described using a subset of HTML 4 markup, refer to the
+    Rich text can be described using a subset of HTML 4 markup; refer to the
     \l {Supported HTML Subset} page for more information.
 
     If you just need to display a small piece of rich text use QLabel.
@@ -401,12 +420,19 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
     QTextEdit can display a large HTML subset, including tables and
     images.
 
-    The text is set or replaced using setHtml() which deletes any
+    The text can be set or replaced using \l setHtml() which deletes any
     existing text and replaces it with the text passed in the
     setHtml() call. If you call setHtml() with legacy HTML, and then
     call toHtml(), the text that is returned may have different markup,
     but will render the same. The entire text can be deleted with clear().
 
+    Text can also be set or replaced using \l setMarkdown(), and the same
+    caveats apply: if you then call \l toMarkdown(), the text that is returned
+    may be different, but the meaning is preserved as much as possible.
+    Markdown with some embedded HTML can be parsed, with the same limitations
+    that \l setHtml() has; but \l toMarkdown() only writes "pure" Markdown,
+    without any embedded HTML.
+
     Text itself can be inserted using the QTextCursor class or using the
     convenience functions insertHtml(), insertPlainText(), append() or
     paste(). QTextCursor is also able to insert complex objects like tables
@@ -1089,7 +1115,7 @@ bool QTextEdit::event(QEvent *e)
 #endif // QT_NO_CONTEXTMENU
 #ifdef QT_KEYPAD_NAVIGATION
     if (e->type() == QEvent::EnterEditFocus || e->type() == QEvent::LeaveEditFocus) {
-        if (QApplication::keypadNavigationEnabled())
+        if (QApplicationPrivate::keypadNavigationEnabled())
             d->sendControlEvent(e);
     }
 #endif
@@ -1214,6 +1240,56 @@ QString QTextEdit::toHtml() const
 }
 #endif
 
+#if QT_CONFIG(textmarkdownreader) && QT_CONFIG(textmarkdownwriter)
+/*!
+    \property QTextEdit::markdown
+
+    This property provides a Markdown interface to the text of the text edit.
+
+    \c toMarkdown() returns the text of the text edit as "pure" Markdown,
+    without any embedded HTML formatting. Some features that QTextDocument
+    supports (such as the use of specific colors and named fonts) cannot be
+    expressed in "pure" Markdown, and they will be omitted.
+
+    \c setMarkdown() changes the text of the text edit.  Any previous text is
+    removed and the undo/redo history is cleared. The input text is
+    interpreted as rich text in Markdown format.
+
+    Parsing of HTML included in the \a markdown string is handled in the same
+    way as in \l setHtml; however, Markdown formatting inside HTML blocks is
+    not supported.
+
+    Some features of the parser can be enabled or disabled via the \a features
+    argument:
+
+    \value MarkdownNoHTML
+           Any HTML tags in the Markdown text will be discarded
+    \value MarkdownDialectCommonMark
+           The parser supports only the features standardized by CommonMark
+    \value MarkdownDialectGitHub
+           The parser supports the GitHub dialect
+
+    The default is \c MarkdownDialectGitHub.
+
+    \sa plainText, html, QTextDocument::toMarkdown(), QTextDocument::setMarkdown()
+*/
+#endif
+
+#if QT_CONFIG(textmarkdownreader)
+void QTextEdit::setMarkdown(const QString &markdown)
+{
+    Q_D(const QTextEdit);
+    d->control->setMarkdown(markdown);
+}
+#endif
+
+#if QT_CONFIG(textmarkdownwriter)
+QString QTextEdit::toMarkdown(QTextDocument::MarkdownFeatures features) const
+{
+    Q_D(const QTextEdit);
+    return d->control->toMarkdown(features);
+}
+#endif
 
 /*! \reimp
 */
@@ -1224,7 +1300,7 @@ void QTextEdit::keyPressEvent(QKeyEvent *e)
 #ifdef QT_KEYPAD_NAVIGATION
     switch (e->key()) {
         case Qt::Key_Select:
-            if (QApplication::keypadNavigationEnabled()) {
+            if (QApplicationPrivate::keypadNavigationEnabled()) {
                 // code assumes linksaccessible + editable isn't meaningful
                 if (d->control->textInteractionFlags() & Qt::TextEditable) {
                     setEditFocus(!hasEditFocus());
@@ -1245,14 +1321,14 @@ void QTextEdit::keyPressEvent(QKeyEvent *e)
             break;
         case Qt::Key_Back:
         case Qt::Key_No:
-            if (!QApplication::keypadNavigationEnabled()
-                    || (QApplication::keypadNavigationEnabled() && !hasEditFocus())) {
+            if (!QApplicationPrivate::keypadNavigationEnabled()
+                    || (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus())) {
                 e->ignore();
                 return;
             }
             break;
         default:
-            if (QApplication::keypadNavigationEnabled()) {
+            if (QApplicationPrivate::keypadNavigationEnabled()) {
                 if (!hasEditFocus() && !(e->modifiers() & Qt::ControlModifier)) {
                     if (e->text()[0].isPrint())
                         setEditFocus(true);
@@ -1341,7 +1417,7 @@ void QTextEdit::keyPressEvent(QKeyEvent *e)
         switch (e->key()) {
             case Qt::Key_Up:
             case Qt::Key_Down:
-                if (QApplication::keypadNavigationEnabled()) {
+                if (QApplicationPrivate::keypadNavigationEnabled()) {
                     // Cursor position didn't change, so we want to leave
                     // these keys to change focus.
                     e->ignore();
@@ -1350,7 +1426,7 @@ void QTextEdit::keyPressEvent(QKeyEvent *e)
                 break;
             case Qt::Key_Back:
                 if (!e->isAutoRepeat()) {
-                    if (QApplication::keypadNavigationEnabled()) {
+                    if (QApplicationPrivate::keypadNavigationEnabled()) {
                         if (document()->isEmpty() || !(d->control->textInteractionFlags() & Qt::TextEditable)) {
                             setEditFocus(false);
                             e->accept();
@@ -1376,7 +1452,7 @@ void QTextEdit::keyReleaseEvent(QKeyEvent *e)
 {
 #ifdef QT_KEYPAD_NAVIGATION
     Q_D(QTextEdit);
-    if (QApplication::keypadNavigationEnabled()) {
+    if (QApplicationPrivate::keypadNavigationEnabled()) {
         if (!e->isAutoRepeat() && e->key() == Qt::Key_Back
             && d->deleteAllTimer.isActive()) {
             d->deleteAllTimer.stop();
@@ -1588,7 +1664,7 @@ void QTextEdit::mousePressEvent(QMouseEvent *e)
 {
     Q_D(QTextEdit);
 #ifdef QT_KEYPAD_NAVIGATION
-    if (QApplication::keypadNavigationEnabled() && !hasEditFocus())
+    if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus())
         setEditFocus(true);
 #endif
     d->sendControlEvent(e);
@@ -1719,7 +1795,7 @@ void QTextEdit::inputMethodEvent(QInputMethodEvent *e)
     Q_D(QTextEdit);
 #ifdef QT_KEYPAD_NAVIGATION
     if (d->control->textInteractionFlags() & Qt::TextEditable
-        && QApplication::keypadNavigationEnabled()
+        && QApplicationPrivate::keypadNavigationEnabled()
         && !hasEditFocus())
         setEditFocus(true);
 #endif
@@ -2187,7 +2263,7 @@ void QTextEdit::setReadOnly(bool ro)
     d->control->setTextInteractionFlags(flags);
     setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
     QEvent event(QEvent::ReadOnlyChange);
-    QApplication::sendEvent(this, &event);
+    QCoreApplication::sendEvent(this, &event);
 }
 
 /*!
diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h
index 3aa23aaace..5c8a3c7793 100644
--- a/src/widgets/widgets/qtextedit.h
+++ b/src/widgets/widgets/qtextedit.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -71,6 +71,9 @@ class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea
     QDOC_PROPERTY(QTextOption::WrapMode wordWrapMode READ wordWrapMode WRITE setWordWrapMode)
     Q_PROPERTY(int lineWrapColumnOrWidth READ lineWrapColumnOrWidth WRITE setLineWrapColumnOrWidth)
     Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
+#if QT_CONFIG(textmarkdownreader) && QT_CONFIG(textmarkdownwriter)
+    Q_PROPERTY(QString markdown READ toMarkdown WRITE setMarkdown NOTIFY textChanged)
+#endif
 #ifndef QT_NO_TEXTHTMLPARSER
     Q_PROPERTY(QString html READ toHtml WRITE setHtml NOTIFY textChanged USER true)
 #endif
@@ -174,6 +177,9 @@ public:
 #ifndef QT_NO_TEXTHTMLPARSER
     QString toHtml() const;
 #endif
+#if QT_CONFIG(textmarkdownwriter)
+    QString toMarkdown(QTextDocument::MarkdownFeatures features = QTextDocument::MarkdownDialectGitHub) const;
+#endif
 
     void ensureCursorVisible();
 
@@ -238,6 +244,9 @@ public Q_SLOTS:
 #ifndef QT_NO_TEXTHTMLPARSER
     void setHtml(const QString &text);
 #endif
+#if QT_CONFIG(textmarkdownreader)
+    void setMarkdown(const QString &markdown);
+#endif
     void setText(const QString &text);
 
 #ifndef QT_NO_CLIPBOARD
@@ -322,6 +331,9 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_adjustScrollbars())
     Q_PRIVATE_SLOT(d_func(), void _q_ensureVisible(const QRectF &))
     Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged())
+#if QT_CONFIG(cursor)
+    Q_PRIVATE_SLOT(d_func(), void _q_hoveredBlockWithMarkerChanged(const QTextBlock &))
+#endif
     friend class QTextEditControl;
     friend class QTextDocument;
     friend class QWidgetTextControl;
diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h
index c4ee75c78d..f7b4d15318 100644
--- a/src/widgets/widgets/qtextedit_p.h
+++ b/src/widgets/widgets/qtextedit_p.h
@@ -104,6 +104,7 @@ public:
 
     void _q_currentCharFormatChanged(const QTextCharFormat &format);
     void _q_cursorPositionChanged();
+    void _q_hoveredBlockWithMarkerChanged(const QTextBlock &block);
 
     void updateDefaultTextOption();
 
@@ -136,6 +137,8 @@ public:
 
     QString placeholderText;
 
+    Qt::CursorShape cursorToRestoreAfterHover = Qt::IBeamCursor;
+
 #ifdef QT_KEYPAD_NAVIGATION
     QBasicTimer deleteAllTimer;
 #endif
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index bcf5a40ae3..58e9c4fd87 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -53,7 +53,6 @@
 #if QT_CONFIG(rubberband)
 #include <qrubberband.h>
 #endif
-#include <qsignalmapper.h>
 #include <qstylepainter.h>
 #include <qstyleoption.h>
 #include <qtoolbutton.h>
@@ -325,13 +324,8 @@ bool QToolBarPrivate::mouseMoveEvent(QMouseEvent *event)
                 event->y() >= 0 && event->y() < q->height());
 
             startDrag(moving);
-            if (!moving && !wasDragging) {
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-                grabMouseWhileInWindow();
-#else
+            if (!moving && !wasDragging)
                 q->grabMouse();
-#endif
-            }
     }
 
     if (state->dragging) {
@@ -1172,7 +1166,7 @@ bool QToolBar::event(QEvent *event)
             // This is a workaround for loosing the mouse on Vista.
             QPoint pos = QCursor::pos();
             QMouseEvent fake(QEvent::MouseMove, mapFromGlobal(pos), pos, Qt::NoButton,
-                             QApplication::mouseButtons(), QApplication::keyboardModifiers());
+                             QGuiApplication::mouseButtons(), QGuiApplication::keyboardModifiers());
             d->mouseMoveEvent(&fake);
 #endif
         } else {
diff --git a/src/widgets/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h
index 4db75762c8..8cb5850903 100644
--- a/src/widgets/widgets/qtoolbar_p.h
+++ b/src/widgets/widgets/qtoolbar_p.h
@@ -73,7 +73,7 @@ public:
         : explicitIconSize(false), explicitToolButtonStyle(false), movable(true), floatable(true),
           allowedAreas(Qt::AllToolBarAreas), orientation(Qt::Horizontal),
           toolButtonStyle(Qt::ToolButtonIconOnly),
-          layout(0), state(0)
+          layout(nullptr), state(nullptr)
 #ifdef Q_OS_OSX
         , macWindowDragging(false)
 #endif
diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h
index 17747ef29b..5df95a3038 100644
--- a/src/widgets/widgets/qtoolbararealayout_p.h
+++ b/src/widgets/widgets/qtoolbararealayout_p.h
@@ -69,7 +69,7 @@ class QStyleOptionToolBar;
 class QToolBarAreaLayoutItem
 {
 public:
-    QToolBarAreaLayoutItem(QLayoutItem *item = 0)
+    QToolBarAreaLayoutItem(QLayoutItem *item = nullptr)
         : widgetItem(item), pos(0), size(-1), preferredSize(-1), gap(false) {}
 
     bool skip() const;
diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h
index a788d30450..b5dc121b93 100644
--- a/src/widgets/widgets/qtoolbarlayout_p.h
+++ b/src/widgets/widgets/qtoolbarlayout_p.h
@@ -79,7 +79,7 @@ class QToolBarLayout : public QLayout
     Q_OBJECT
 
 public:
-    QToolBarLayout(QWidget *parent = 0);
+    QToolBarLayout(QWidget *parent = nullptr);
     ~QToolBarLayout();
 
     void addItem(QLayoutItem *item) override;
diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp
index 1c83485bff..4d7f543a99 100644
--- a/src/widgets/widgets/qtoolbox.cpp
+++ b/src/widgets/widgets/qtoolbox.cpp
@@ -50,6 +50,8 @@
 #include <qtooltip.h>
 #include <qabstractbutton.h>
 
+#include <private/qmemory_p.h>
+
 #include "qframe_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -106,7 +108,7 @@ public:
             return widget == other.widget;
         }
     };
-    typedef QList<Page> PageList;
+    typedef std::vector<std::unique_ptr<Page>> PageList;
 
     inline QToolBoxPrivate()
         : currentPage(0)
@@ -130,26 +132,27 @@ public:
 const QToolBoxPrivate::Page *QToolBoxPrivate::page(const QObject *widget) const
 {
     if (!widget)
-        return 0;
+        return nullptr;
 
-    for (PageList::ConstIterator i = pageList.constBegin(); i != pageList.constEnd(); ++i)
-        if ((*i).widget == widget)
-            return (const Page*) &(*i);
-    return 0;
+    for (const auto &page : pageList) {
+        if (page->widget == widget)
+            return page.get();
+    }
+    return nullptr;
 }
 
 QToolBoxPrivate::Page *QToolBoxPrivate::page(int index)
 {
-    if (index >= 0 && index < pageList.size())
-        return &pageList[index];
-    return 0;
+    if (index >= 0 && index < static_cast<int>(pageList.size()))
+        return pageList[index].get();
+    return nullptr;
 }
 
 const QToolBoxPrivate::Page *QToolBoxPrivate::page(int index) const
 {
-    if (index >= 0 && index < pageList.size())
-        return &pageList.at(index);
-    return 0;
+    if (index >= 0 && index < static_cast<int>(pageList.size()))
+        return pageList[index].get();
+    return nullptr;
 }
 
 void QToolBoxPrivate::updateTabs()
@@ -157,13 +160,12 @@ void QToolBoxPrivate::updateTabs()
     QToolBoxButton *lastButton = currentPage ? currentPage->button : 0;
     bool after = false;
     int index = 0;
-    for (index = 0; index < pageList.count(); ++index) {
-        const Page &page = pageList.at(index);
-        QToolBoxButton *tB = page.button;
+    for (const auto &page : pageList) {
+        QToolBoxButton *tB = page->button;
         // update indexes, since the updates are delayed, the indexes will be correct
         // when we actually paint.
         tB->setIndex(index);
-        QWidget *tW = page.widget;
+        QWidget *tW = page->widget;
         if (after) {
             QPalette p = tB->palette();
             p.setColor(tB->backgroundRole(), tW->palette().color(tW->backgroundRole()));
@@ -174,6 +176,7 @@ void QToolBoxPrivate::updateTabs()
             tB->update();
         }
         after = tB == lastButton;
+        ++index;
     }
 }
 
@@ -345,7 +348,8 @@ int QToolBox::insertItem(int index, QWidget *widget, const QIcon &icon, const QS
     Q_D(QToolBox);
     connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(_q_widgetDestroyed(QObject*)));
 
-    QToolBoxPrivate::Page c;
+    auto newPage = qt_make_unique<QToolBoxPrivate::Page>();
+    auto &c = *newPage;
     c.widget = widget;
     c.button = new QToolBoxButton(this);
     c.button->setObjectName(QLatin1String("qt_toolbox_toolboxbutton"));
@@ -360,15 +364,15 @@ int QToolBox::insertItem(int index, QWidget *widget, const QIcon &icon, const QS
     c.setText(text);
     c.setIcon(icon);
 
-    if (index < 0 || index >= (int)d->pageList.count()) {
-        index = d->pageList.count();
-        d->pageList.append(c);
+    if (index < 0 || index >= static_cast<int>(d->pageList.size())) {
+        index = static_cast<int>(d->pageList.size());
+        d->pageList.push_back(std::move(newPage));
         d->layout->addWidget(c.button);
         d->layout->addWidget(c.sv);
         if (index == 0)
             setCurrentIndex(index);
     } else {
-        d->pageList.insert(index, c);
+        d->pageList.insert(d->pageList.cbegin() + index, std::move(newPage));
         d->relayout();
         if (d->currentPage) {
             QWidget *current = d->currentPage->widget;
@@ -391,12 +395,13 @@ void QToolBoxPrivate::_q_buttonClicked()
 {
     Q_Q(QToolBox);
     QToolBoxButton *tb = qobject_cast<QToolBoxButton*>(q->sender());
-    QWidget* item = 0;
-    for (QToolBoxPrivate::PageList::ConstIterator i = pageList.constBegin(); i != pageList.constEnd(); ++i)
-        if ((*i).button == tb) {
-            item = (*i).widget;
+    QWidget* item = nullptr;
+    for (const auto &page : pageList) {
+        if (page->button == tb) {
+            item = page->widget;
             break;
         }
+    }
 
     q->setCurrentIndex(q->indexOf(item));
 }
@@ -411,7 +416,7 @@ void QToolBoxPrivate::_q_buttonClicked()
 int QToolBox::count() const
 {
     Q_D(const QToolBox);
-    return d->pageList.count();
+    return static_cast<int>(d->pageList.size());
 }
 
 void QToolBox::setCurrentIndex(int index)
@@ -438,12 +443,18 @@ void QToolBoxPrivate::relayout()
     delete layout;
     layout = new QVBoxLayout(q);
     layout->setContentsMargins(QMargins());
-    for (QToolBoxPrivate::PageList::ConstIterator i = pageList.constBegin(); i != pageList.constEnd(); ++i) {
-        layout->addWidget((*i).button);
-        layout->addWidget((*i).sv);
+    for (const auto &page : pageList) {
+        layout->addWidget(page->button);
+        layout->addWidget(page->sv);
     }
 }
 
+auto pageEquals = [](const QToolBoxPrivate::Page *page) {
+    return [page](const std::unique_ptr<QToolBoxPrivate::Page> &ptr) {
+        return ptr.get() == page;
+    };
+};
+
 void QToolBoxPrivate::_q_widgetDestroyed(QObject *object)
 {
     Q_Q(QToolBox);
@@ -458,9 +469,9 @@ void QToolBoxPrivate::_q_widgetDestroyed(QObject *object)
     delete c->button;
 
     bool removeCurrent = c == currentPage;
-    pageList.removeAll(*c);
+    pageList.erase(std::remove_if(pageList.begin(), pageList.end(), pageEquals(c)), pageList.end());
 
-    if (!pageList.count()) {
+    if (pageList.empty()) {
         currentPage = 0;
         emit q->currentChanged(-1);
     } else if (removeCurrent) {
@@ -538,9 +549,9 @@ void QToolBox::setCurrentWidget(QWidget *widget)
 QWidget *QToolBox::widget(int index) const
 {
     Q_D(const QToolBox);
-    if (index < 0 || index >= (int) d->pageList.size())
+    if (index < 0 || index >= static_cast<int>(d->pageList.size()))
         return nullptr;
-    return d->pageList.at(index).widget;
+    return d->pageList[index]->widget;
 }
 
 /*!
@@ -552,7 +563,12 @@ int QToolBox::indexOf(QWidget *widget) const
 {
     Q_D(const QToolBox);
     const QToolBoxPrivate::Page *c = (widget ? d->page(widget) : 0);
-    return c ? d->pageList.indexOf(*c) : -1;
+    if (!c)
+        return -1;
+    const auto it = std::find_if(d->pageList.cbegin(), d->pageList.cend(), pageEquals(c));
+    if (it == d->pageList.cend())
+        return -1;
+    return static_cast<int>(it - d->pageList.cbegin());
 }
 
 /*!
@@ -571,7 +587,7 @@ void QToolBox::setItemEnabled(int index, bool enabled)
     if (!enabled && c == d->currentPage) {
         int curIndexUp = index;
         int curIndexDown = curIndexUp;
-        const int count = d->pageList.count();
+        const int count = static_cast<int>(d->pageList.size());
         while (curIndexUp > 0 || curIndexDown < count-1) {
             if (curIndexDown < count-1) {
                 if (d->page(++curIndexDown)->button->isEnabled()) {
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index cf2d885b52..9cdae4f28f 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -54,6 +54,7 @@
 #endif
 
 #include "qapplication.h"
+#include "private/qapplication_p.h"
 #if QT_CONFIG(graphicsview)
 #include "qgraphicssceneevent.h"
 #endif
@@ -77,11 +78,6 @@ int QWidgetLineControl::redoTextLayout() const
     QTextLine l = m_textLayout.createLine();
     m_textLayout.endLayout();
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    if (m_threadChecks)
-        m_textLayoutThread = QThread::currentThread();
-#endif
-
     return qRound(l.ascent());
 }
 
@@ -158,7 +154,7 @@ void QWidgetLineControl::copy(QClipboard::Mode mode) const
 {
     QString t = selectedText();
     if (!t.isEmpty() && m_echoMode == QLineEdit::Normal) {
-        QApplication::clipboard()->setText(t, mode);
+        QGuiApplication::clipboard()->setText(t, mode);
     }
 }
 
@@ -172,7 +168,7 @@ void QWidgetLineControl::copy(QClipboard::Mode mode) const
 */
 void QWidgetLineControl::paste(QClipboard::Mode clipboardMode)
 {
-    QString clip = QApplication::clipboard()->text(clipboardMode);
+    QString clip = QGuiApplication::clipboard()->text(clipboardMode);
     if (!clip.isEmpty() || hasSelectedText()) {
         separate(); //make it a separate undo/redo command
         insert(clip);
@@ -1524,9 +1520,9 @@ void QWidgetLineControl::setBlinkingCursorEnabled(bool enable)
     m_blinkEnabled = enable;
 
     if (enable)
-        connect(qApp->styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetLineControl::updateCursorBlinking);
+        connect(QGuiApplication::styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetLineControl::updateCursorBlinking);
     else
-        disconnect(qApp->styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetLineControl::updateCursorBlinking);
+        disconnect(QGuiApplication::styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetLineControl::updateCursorBlinking);
 
     updateCursorBlinking();
 }
@@ -1662,7 +1658,7 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event)
             case Qt::Key_F4:
 #ifdef QT_KEYPAD_NAVIGATION
             case Qt::Key_Select:
-                if (!QApplication::keypadNavigationEnabled())
+                if (!QApplicationPrivate::keypadNavigationEnabled())
                     break;
 #endif
                 if (!m_completer->currentCompletion().isEmpty() && hasSelectedText()
@@ -1680,7 +1676,7 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event)
     if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
         if (hasAcceptableInput() || fixup()) {
 
-            QInputMethod *inputMethod = QApplication::inputMethod();
+            QInputMethod *inputMethod = QGuiApplication::inputMethod();
             inputMethod->commit();
             QWidget *lineEdit = qobject_cast<QWidget *>(parent());
             if (!(lineEdit && lineEdit->inputMethodHints() & Qt::ImhMultiLine))
@@ -1912,7 +1908,7 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event)
                 break;
 #ifdef QT_KEYPAD_NAVIGATION
             case Qt::Key_Back:
-                if (QApplication::keypadNavigationEnabled() && !event->isAutoRepeat()
+                if (QApplicationPrivate::keypadNavigationEnabled() && !event->isAutoRepeat()
                     && !isReadOnly()) {
                     if (text().length() == 0) {
                         setText(m_cancelText);
diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h
index f4df95865d..8ebed25084 100644
--- a/src/widgets/widgets/qwidgetlinecontrol_p.h
+++ b/src/widgets/widgets/qwidgetlinecontrol_p.h
@@ -91,19 +91,15 @@ public:
         m_dragEnabled(0), m_echoMode(0), m_textDirty(0), m_selDirty(0),
         m_validInput(1), m_blinkStatus(0), m_blinkEnabled(false), m_blinkTimer(0), m_deleteAllTimer(0),
         m_ascent(0), m_maxLength(32767), m_lastCursorPos(-1),
-        m_tripleClickTimer(0), m_maskData(0), m_modifiedState(0), m_undoState(0),
+        m_tripleClickTimer(0), m_maskData(nullptr), m_modifiedState(0), m_undoState(0),
         m_selstart(0), m_selend(0), m_passwordEchoEditing(false)
         , m_passwordEchoTimer(0)
         , m_passwordMaskDelay(-1)
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        , m_threadChecks(false)
-        , m_textLayoutThread(0)
- #endif
 #if defined(QT_BUILD_INTERNAL)
         , m_passwordMaskDelayOverride(-1)
 #endif
         , m_keyboardScheme(0)
-        , m_accessibleObject(0)
+        , m_accessibleObject(nullptr)
     {
         init(txt);
     }
@@ -404,25 +400,9 @@ public:
 
     QTextLayout *textLayout() const
     {
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-        if (m_threadChecks && QThread::currentThread() != m_textLayoutThread)
-            redoTextLayout();
-#endif
         return &m_textLayout;
     }
 
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    void setThreadChecks(bool threadChecks)
-    {
-        m_threadChecks = threadChecks;
-    }
-
-    bool threadChecks() const
-    {
-        return m_threadChecks;
-    }
-#endif
-
 private:
     void init(const QString &txt);
     void removeSelectedText();
@@ -534,10 +514,6 @@ private:
     }
 
     int redoTextLayout() const;
-#if 0 // Used to be included in Qt4 for Q_WS_MAC
-    bool m_threadChecks;
-    mutable QThread *m_textLayoutThread;
-#endif
 
 public:
 #if defined(QT_BUILD_INTERNAL)
diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp
index e8d435429f..9dbba12aba 100644
--- a/src/widgets/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/widgets/qwidgetresizehandler.cpp
@@ -124,21 +124,6 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee)
         if (!widgetRect.contains(cursorPoint))
             return false;
         if (e->button() == Qt::LeftButton) {
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-            /*
-               Implicit grabs do not stop the X server from changing
-               the cursor in children, which looks *really* bad when
-               doing resizingk, so we grab the cursor. Note that we do
-               not do this on Windows since double clicks are lost due
-               to the grab (see change 198463).
-            */
-            if (e->spontaneous())
-#  if !defined(QT_NO_CURSOR)
-                widget->grabMouse(widget->cursor());
-#  else
-                widget->grabMouse();
-#  endif // QT_NO_CURSOR
-#endif
             buttonDown = false;
             emit activate();
             bool me = movingEnabled;
diff --git a/src/widgets/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h
index 89bc759cc2..df3ac7cb8a 100644
--- a/src/widgets/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/widgets/qwidgetresizehandler_p.h
@@ -73,7 +73,7 @@ public:
         Any        = Move|Resize
     };
 
-    explicit QWidgetResizeHandler(QWidget *parent, QWidget *cw = 0);
+    explicit QWidgetResizeHandler(QWidget *parent, QWidget *cw = nullptr);
     void setActive(bool b) { setActive(Any, b); }
     void setActive(Action ac, bool b);
     bool isActive() const { return isActive(Any); }
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index f86a747b0f..dce18f9100 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -55,6 +55,7 @@
 #endif
 #include <qstyle.h>
 #include <qtimer.h>
+#include "private/qapplication_p.h"
 #include "private/qtextdocumentlayout_p.h"
 #include "private/qabstracttextdocumentlayout_p.h"
 #include "qtextdocument.h"
@@ -97,7 +98,7 @@
 #include <qkeysequence.h>
 #define ACCEL_KEY(k) ((!QCoreApplication::testAttribute(Qt::AA_DontShowShortcutsInContextMenus) \
                        && QGuiApplication::styleHints()->showShortcutsInContextMenus()) \
-                      && !qApp->d_func()->shortcutMap.hasShortcutForKeySequence(k) ? \
+                      && !QGuiApplicationPrivate::instance()->shortcutMap.hasShortcutForKeySequence(k) ? \
                       QLatin1Char('\t') + QKeySequence(k).toString(QKeySequence::NativeText) : QString())
 
 #else
@@ -294,7 +295,7 @@ bool QWidgetTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e)
     bool isNavigationEvent = e->key() == Qt::Key_Up || e->key() == Qt::Key_Down;
 
 #ifdef QT_KEYPAD_NAVIGATION
-    ignoreNavigationEvents = ignoreNavigationEvents || QApplication::keypadNavigationEnabled();
+    ignoreNavigationEvents = ignoreNavigationEvents || QApplicationPrivate::keypadNavigationEnabled();
     isNavigationEvent = isNavigationEvent ||
                         (QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional
                          && (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right));
@@ -494,6 +495,11 @@ void QWidgetTextControlPrivate::setContent(Qt::TextFormat format, const QString
             formatCursor.select(QTextCursor::Document);
             formatCursor.setCharFormat(charFormatForInsertion);
             formatCursor.endEditBlock();
+#if QT_CONFIG(textmarkdownreader)
+        } else if (format == Qt::MarkdownText) {
+            doc->setMarkdown(text);
+            doc->setUndoRedoEnabled(false);
+#endif
         } else {
 #ifndef QT_NO_TEXTHTMLPARSER
             doc->setHtml(text);
@@ -643,7 +649,7 @@ void QWidgetTextControlPrivate::_q_updateCurrentCharFormatAndSelection()
 #ifndef QT_NO_CLIPBOARD
 void QWidgetTextControlPrivate::setClipboardSelection()
 {
-    QClipboard *clipboard = QApplication::clipboard();
+    QClipboard *clipboard = QGuiApplication::clipboard();
     if (!cursor.hasSelection() || !clipboard->supportsSelection())
         return;
     Q_Q(QWidgetTextControl);
@@ -714,9 +720,9 @@ void QWidgetTextControlPrivate::setCursorVisible(bool visible)
     updateCursorBlinking();
 
     if (cursorVisible)
-        connect(qApp->styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetTextControlPrivate::updateCursorBlinking);
+        connect(QGuiApplication::styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetTextControlPrivate::updateCursorBlinking);
     else
-        disconnect(qApp->styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetTextControlPrivate::updateCursorBlinking);
+        disconnect(QGuiApplication::styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetTextControlPrivate::updateCursorBlinking);
 }
 
 void QWidgetTextControlPrivate::updateCursorBlinking()
@@ -954,12 +960,12 @@ void QWidgetTextControl::copy()
     if (!d->cursor.hasSelection())
         return;
     QMimeData *data = createMimeDataFromSelection();
-    QApplication::clipboard()->setMimeData(data);
+    QGuiApplication::clipboard()->setMimeData(data);
 }
 
 void QWidgetTextControl::paste(QClipboard::Mode mode)
 {
-    const QMimeData *md = QApplication::clipboard()->mimeData(mode);
+    const QMimeData *md = QGuiApplication::clipboard()->mimeData(mode);
     if (md)
         insertFromMimeData(md);
 }
@@ -1154,7 +1160,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget
 #ifdef QT_KEYPAD_NAVIGATION
         case QEvent::EnterEditFocus:
         case QEvent::LeaveEditFocus:
-            if (QApplication::keypadNavigationEnabled())
+            if (QApplicationPrivate::keypadNavigationEnabled())
                 d->editFocusEvent(e);
             break;
 #endif
@@ -1197,6 +1203,14 @@ void QWidgetTextControl::setPlainText(const QString &text)
     d->setContent(Qt::PlainText, text);
 }
 
+#if QT_CONFIG(textmarkdownreader)
+void QWidgetTextControl::setMarkdown(const QString &text)
+{
+    Q_D(QWidgetTextControl);
+    d->setContent(Qt::MarkdownText, text);
+}
+#endif
+
 void QWidgetTextControl::setHtml(const QString &text)
 {
     Q_D(QWidgetTextControl);
@@ -1571,6 +1585,11 @@ void QWidgetTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton butto
             e->ignore();
             return;
     }
+    bool wasValid = blockWithMarkerUnderMouse.isValid();
+    blockWithMarkerUnderMouse = q->blockWithMarkerAt(pos);
+    if (wasValid != blockWithMarkerUnderMouse.isValid())
+        emit q->blockMarkerHovered(blockWithMarkerUnderMouse);
+
 
     cursorIsFocusIndicator = false;
     const QTextCursor oldSelection = cursor;
@@ -1589,6 +1608,8 @@ void QWidgetTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton butto
         selectedBlockOnTrippleClick = cursor;
 
         anchorOnMousePress = QString();
+        blockWithMarkerUnderMouse = QTextBlock();
+        emit q->blockMarkerHovered(blockWithMarkerUnderMouse);
 
         trippleClickTimer.stop();
     } else {
@@ -1728,6 +1749,11 @@ void QWidgetTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button
         }
         selectionChanged(true);
         repaintOldAndNewSelection(oldSelection);
+    } else {
+        bool wasValid = blockWithMarkerUnderMouse.isValid();
+        blockWithMarkerUnderMouse = q->blockWithMarkerAt(mousePos);
+        if (wasValid != blockWithMarkerUnderMouse.isValid())
+            emit q->blockMarkerHovered(blockWithMarkerUnderMouse);
     }
 
     sendMouseEventToInputContext(e, QEvent::MouseMove, button, mousePos, modifiers, buttons, globalPos);
@@ -1762,9 +1788,9 @@ void QWidgetTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton but
         selectionChanged(true);
     } else if (button == Qt::MidButton
                && (interactionFlags & Qt::TextEditable)
-               && QApplication::clipboard()->supportsSelection()) {
+               && QGuiApplication::clipboard()->supportsSelection()) {
         setCursorPosition(pos);
-        const QMimeData *md = QApplication::clipboard()->mimeData(QClipboard::Selection);
+        const QMimeData *md = QGuiApplication::clipboard()->mimeData(QClipboard::Selection);
         if (md)
             q->insertFromMimeData(md);
 #endif
@@ -1777,6 +1803,26 @@ void QWidgetTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton but
         emit q->microFocusChanged();
     }
 
+    // toggle any checkbox that the user clicks
+    if ((interactionFlags & Qt::TextEditable) && (button & Qt::LeftButton) &&
+            (blockWithMarkerUnderMouse.isValid()) && !cursor.hasSelection()) {
+        QTextBlock markerBlock = q->blockWithMarkerAt(pos);
+        if (markerBlock == blockWithMarkerUnderMouse) {
+            auto fmt = blockWithMarkerUnderMouse.blockFormat();
+            switch (fmt.marker()) {
+            case QTextBlockFormat::MarkerType::Unchecked :
+                fmt.setMarker(QTextBlockFormat::MarkerType::Checked);
+                break;
+            case QTextBlockFormat::MarkerType::Checked:
+                fmt.setMarker(QTextBlockFormat::MarkerType::Unchecked);
+                break;
+            default:
+                break;
+            }
+            cursor.setBlockFormat(fmt);
+        }
+    }
+
     if (interactionFlags & Qt::LinksAccessibleByMouse) {
         if (!(button & Qt::LeftButton))
             return;
@@ -2173,7 +2219,7 @@ void QWidgetTextControlPrivate::focusEvent(QFocusEvent *e)
     emit q->updateRequest(q->selectionRect());
     if (e->gotFocus()) {
 #ifdef QT_KEYPAD_NAVIGATION
-        if (!QApplication::keypadNavigationEnabled() || (hasEditFocus && (e->reason() == Qt::PopupFocusReason))) {
+        if (!QApplicationPrivate::keypadNavigationEnabled() || (hasEditFocus && (e->reason() == Qt::PopupFocusReason))) {
 #endif
         cursorOn = (interactionFlags & (Qt::TextSelectableByKeyboard | Qt::TextEditable));
         if (interactionFlags & Qt::TextEditable) {
@@ -2214,7 +2260,7 @@ void QWidgetTextControlPrivate::editFocusEvent(QEvent *e)
 {
     Q_Q(QWidgetTextControl);
 
-    if (QApplication::keypadNavigationEnabled()) {
+    if (QApplicationPrivate::keypadNavigationEnabled()) {
         if (e->type() == QEvent::EnterEditFocus && interactionFlags & Qt::TextEditable) {
             const QTextCursor oldSelection = cursor;
             const int oldCursorPos = cursor.position();
@@ -2316,6 +2362,7 @@ QMenu *QWidgetTextControl::createStandardContextMenu(const QPointF &pos, QWidget
         a = menu->addAction(tr("Select All") + ACCEL_KEY(QKeySequence::SelectAll), this, SLOT(selectAll()));
         a->setEnabled(!d->doc->isEmpty());
         a->setObjectName(QStringLiteral("select-all"));
+        setActionIcon(a, QStringLiteral("edit-select-all"));
     }
 
     if ((d->interactionFlags & Qt::TextEditable) && QGuiApplication::styleHints()->useRtlExtensions()) {
@@ -2375,6 +2422,12 @@ QString QWidgetTextControl::anchorAtCursor() const
     return d->anchorForCursor(d->cursor);
 }
 
+QTextBlock QWidgetTextControl::blockWithMarkerAt(const QPointF &pos) const
+{
+    Q_D(const QWidgetTextControl);
+    return d->doc->documentLayout()->blockWithMarkerAt(pos);
+}
+
 bool QWidgetTextControl::overwriteMode() const
 {
     Q_D(const QWidgetTextControl);
@@ -2431,7 +2484,7 @@ void QWidgetTextControl::setExtraSelections(const QList<QTextEdit::ExtraSelectio
     QHash<int, int> hash;
     for (int i = 0; i < d->extraSelections.count(); ++i) {
         const QAbstractTextDocumentLayout::Selection &esel = d->extraSelections.at(i);
-        hash.insertMulti(esel.cursor.anchor(), i);
+        hash.insert(esel.cursor.anchor(), i);
     }
 
     for (int i = 0; i < selections.count(); ++i) {
@@ -2547,7 +2600,7 @@ bool QWidgetTextControl::canPaste() const
 #ifndef QT_NO_CLIPBOARD
     Q_D(const QWidgetTextControl);
     if (d->interactionFlags & Qt::TextEditable) {
-        const QMimeData *md = QApplication::clipboard()->mimeData();
+        const QMimeData *md = QGuiApplication::clipboard()->mimeData();
         return md && canInsertFromMimeData(md);
     }
 #endif
@@ -3124,6 +3177,13 @@ QString QWidgetTextControl::toHtml() const
 }
 #endif
 
+#if QT_CONFIG(textmarkdownwriter)
+QString QWidgetTextControl::toMarkdown(QTextDocument::MarkdownFeatures features) const
+{
+    return document()->toMarkdown(features);
+}
+#endif
+
 void QWidgetTextControlPrivate::append(const QString &text, Qt::TextFormat format)
 {
     QTextCursor tmp(doc);
@@ -3222,7 +3282,7 @@ QAbstractTextDocumentLayout::PaintContext QWidgetTextControl::getPaintContext(QW
     if (!d->dndFeedbackCursor.isNull())
         ctx.cursorPosition = d->dndFeedbackCursor.position();
 #ifdef QT_KEYPAD_NAVIGATION
-    if (!QApplication::keypadNavigationEnabled() || d->hasEditFocus)
+    if (!QApplicationPrivate::keypadNavigationEnabled() || d->hasEditFocus)
 #endif
     if (d->cursor.hasSelection()) {
         QAbstractTextDocumentLayout::Selection selection;
@@ -3273,7 +3333,7 @@ void QWidgetTextControlPrivate::_q_copyLink()
 #ifndef QT_NO_CLIPBOARD
     QMimeData *md = new QMimeData;
     md->setText(linkToCopy);
-    QApplication::clipboard()->setMimeData(md);
+    QGuiApplication::clipboard()->setMimeData(md);
 #endif
 }
 
diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h
index 202ba36454..59bf5466e6 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -97,9 +97,9 @@ class Q_WIDGETS_EXPORT QWidgetTextControl : public QInputControl
     Q_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks)
     Q_PROPERTY(bool ignoreUnusedNavigationEvents READ ignoreUnusedNavigationEvents WRITE setIgnoreUnusedNavigationEvents)
 public:
-    explicit QWidgetTextControl(QObject *parent = 0);
-    explicit QWidgetTextControl(const QString &text, QObject *parent = 0);
-    explicit QWidgetTextControl(QTextDocument *doc, QObject *parent = 0);
+    explicit QWidgetTextControl(QObject *parent = nullptr);
+    explicit QWidgetTextControl(const QString &text, QObject *parent = nullptr);
+    explicit QWidgetTextControl(QTextDocument *doc, QObject *parent = nullptr);
     virtual ~QWidgetTextControl();
 
     void setDocument(QTextDocument *document);
@@ -116,18 +116,21 @@ public:
     void setCurrentCharFormat(const QTextCharFormat &format);
     QTextCharFormat currentCharFormat() const;
 
-    bool find(const QString &exp, QTextDocument::FindFlags options = 0);
+    bool find(const QString &exp, QTextDocument::FindFlags options = nullptr);
 #ifndef QT_NO_REGEXP
-    bool find(const QRegExp &exp, QTextDocument::FindFlags options = 0);
+    bool find(const QRegExp &exp, QTextDocument::FindFlags options = nullptr);
 #endif
 #if QT_CONFIG(regularexpression)
-    bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = 0);
+    bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = nullptr);
 #endif
 
     QString toPlainText() const;
 #ifndef QT_NO_TEXTHTMLPARSER
     QString toHtml() const;
 #endif
+#if QT_CONFIG(textmarkdownwriter)
+    QString toMarkdown(QTextDocument::MarkdownFeatures features = QTextDocument::MarkdownDialectGitHub) const;
+#endif
 
     virtual void ensureCursorVisible();
 
@@ -147,6 +150,8 @@ public:
 
     QString anchorAtCursor() const;
 
+    QTextBlock blockWithMarkerAt(const QPointF &pos) const;
+
     bool overwriteMode() const;
     void setOverwriteMode(bool overwrite);
 
@@ -194,6 +199,9 @@ public:
 
 public Q_SLOTS:
     void setPlainText(const QString &text);
+#if QT_CONFIG(textmarkdownreader)
+    void setMarkdown(const QString &text);
+#endif
     void setHtml(const QString &text);
 
 #ifndef QT_NO_CLIPBOARD
@@ -236,6 +244,7 @@ Q_SIGNALS:
     void microFocusChanged();
     void linkActivated(const QString &link);
     void linkHovered(const QString &);
+    void blockMarkerHovered(const QTextBlock &block);
     void modificationChanged(bool m);
 
 public:
@@ -243,11 +252,11 @@ public:
     QPalette palette() const;
     void setPalette(const QPalette &pal);
 
-    virtual void processEvent(QEvent *e, const QMatrix &matrix, QWidget *contextWidget = 0);
-    void processEvent(QEvent *e, const QPointF &coordinateOffset = QPointF(), QWidget *contextWidget = 0);
+    virtual void processEvent(QEvent *e, const QMatrix &matrix, QWidget *contextWidget = nullptr);
+    void processEvent(QEvent *e, const QPointF &coordinateOffset = QPointF(), QWidget *contextWidget = nullptr);
 
     // control methods
-    void drawContents(QPainter *painter, const QRectF &rect = QRectF(), QWidget *widget = 0);
+    void drawContents(QPainter *painter, const QRectF &rect = QRectF(), QWidget *widget = nullptr);
 
     void setFocus(bool focus, Qt::FocusReason = Qt::OtherFocusReason);
 
diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h
index 232dab180f..c77a31bedf 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -55,6 +55,7 @@
 #include "QtGui/qtextdocumentfragment.h"
 #include "QtGui/qtextcursor.h"
 #include "QtGui/qtextformat.h"
+#include "QtGui/qtextobject.h"
 #if QT_CONFIG(menu)
 #include "QtWidgets/qmenu.h"
 #endif
@@ -89,9 +90,9 @@ public:
     void createAutoBulletList();
 
     void init(Qt::TextFormat format = Qt::RichText, const QString &text = QString(),
-              QTextDocument *document = 0);
+              QTextDocument *document = nullptr);
     void setContent(Qt::TextFormat format = Qt::RichText, const QString &text = QString(),
-                    QTextDocument *document = 0);
+                    QTextDocument *document = nullptr);
     void startDrag();
 
     void paste(const QMimeData *source);
@@ -227,6 +228,7 @@ public:
 
     QString highlightedAnchor; // Anchor below cursor
     QString anchorOnMousePress;
+    QTextBlock blockWithMarkerUnderMouse;
     bool hadSelectionOnMousePress;
 
     bool ignoreUnusedNavigationEvents;
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index 9cb6ab0c59..1f54c846ec 100644
--- a/src/winmain/winmain.pro
+++ b/src/winmain/winmain.pro
@@ -23,7 +23,7 @@ winrt {
 } else {
     CONFIG -= qt
     SOURCES = qtmain_win.cpp
-    LIBS += -lshell32
+    QMAKE_USE_PRIVATE += shell32
 }
 
 load(qt_installs)
diff --git a/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp b/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp
index 2d18e0e537..f7d81f676f 100644
--- a/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp
+++ b/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp
@@ -74,7 +74,7 @@ QDomNode n = d.firstChild();
 while (!n.isNull()) {
     if (n.isElement()) {
         QDomElement e = n.toElement();
-        cout << "Element name: " << e.tagName() << endl;
+        cout << "Element name: " << e.tagName() << Qt::endl;
         break;
     }
     n = n.nextSibling();
@@ -126,10 +126,10 @@ QDomElement element4 = document.createElement("MyElement");
 QDomElement e = //...
 //...
 QDomAttr a = e.attributeNode("href");
-cout << a.value() << endl;                // prints "http://qt-project.org"
+cout << a.value() << Qt::endl;                // prints "http://qt-project.org"
 a.setValue("http://qt-project.org/doc"); // change the node's attribute
 QDomAttr a2 = e.attributeNode("href");
-cout << a2.value() << endl;               // prints "http://qt-project.org/doc"
+cout << a2.value() << Qt::endl;               // prints "http://qt-project.org/doc"
 //! [8]
 
 
@@ -201,7 +201,7 @@ QDomNode n = docElem.firstChild();
 while(!n.isNull()) {
     QDomElement e = n.toElement(); // try to convert the node to an element.
     if(!e.isNull()) {
-        cout << qPrintable(e.tagName()) << endl; // the node really is an element.
+        cout << qPrintable(e.tagName()) << Qt::endl; // the node really is an element.
     }
     n = n.nextSibling();
 }
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 0516d426e5..8d232237bf 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -136,7 +136,7 @@ public:
 class QDomNodePrivate
 {
 public:
-    QDomNodePrivate(QDomDocumentPrivate*, QDomNodePrivate* parent = 0);
+    QDomNodePrivate(QDomDocumentPrivate*, QDomNodePrivate* parent = nullptr);
     QDomNodePrivate(QDomNodePrivate* n, bool deep);
     virtual ~QDomNodePrivate();
 
@@ -159,11 +159,11 @@ public:
     virtual void normalize();
     virtual void clear();
 
-    inline QDomNodePrivate* parent() const { return hasParent ? ownerNode : 0; }
+    inline QDomNodePrivate* parent() const { return hasParent ? ownerNode : nullptr; }
     inline void setParent(QDomNodePrivate *p) { ownerNode = p; hasParent = true; }
 
     void setNoParent() {
-        ownerNode = hasParent ? (QDomNodePrivate*)ownerDocument() : 0;
+        ownerNode = hasParent ? (QDomNodePrivate*)ownerDocument() : nullptr;
         hasParent = false;
     }
 
@@ -289,7 +289,7 @@ public:
 class QDomDocumentTypePrivate : public QDomNodePrivate
 {
 public:
-    QDomDocumentTypePrivate(QDomDocumentPrivate*, QDomNodePrivate* parent = 0);
+    QDomDocumentTypePrivate(QDomDocumentPrivate*, QDomNodePrivate* parent = nullptr);
     QDomDocumentTypePrivate(QDomDocumentTypePrivate* n, bool deep);
     ~QDomDocumentTypePrivate();
     void init();
@@ -317,7 +317,7 @@ public:
 class QDomDocumentFragmentPrivate : public QDomNodePrivate
 {
 public:
-    QDomDocumentFragmentPrivate(QDomDocumentPrivate*, QDomNodePrivate* parent = 0);
+    QDomDocumentFragmentPrivate(QDomDocumentPrivate*, QDomNodePrivate* parent = nullptr);
     QDomDocumentFragmentPrivate(QDomNodePrivate* n, bool deep);
 
     // Reimplemented from QDomNodePrivate
@@ -907,7 +907,7 @@ QDomImplementationPrivate* QDomImplementationPrivate::clone()
 */
 QDomImplementation::QDomImplementation()
 {
-    impl = 0;
+    impl = nullptr;
 }
 
 /*!
@@ -1036,7 +1036,7 @@ QDomDocumentType QDomImplementation::createDocumentType(const QString& qName, co
     if (!ok)
         return QDomDocumentType();
 
-    QDomDocumentTypePrivate *dt = new QDomDocumentTypePrivate(0);
+    QDomDocumentTypePrivate *dt = new QDomDocumentTypePrivate(nullptr);
     dt->name = fixedName;
     if (systemId.isNull()) {
         dt->publicId.clear();
@@ -1070,7 +1070,7 @@ QDomDocument QDomImplementation::createDocument(const QString& nsURI, const QStr
 */
 bool QDomImplementation::isNull()
 {
-    return (impl == 0);
+    return (impl == nullptr);
 }
 
 /*!
@@ -1244,14 +1244,14 @@ void QDomNodeListPrivate::createList()
 QDomNodePrivate* QDomNodeListPrivate::item(int index)
 {
     if (!node_impl)
-        return 0;
+        return nullptr;
 
     const QDomDocumentPrivate *const doc = node_impl->ownerDocument();
     if (!doc || timestamp != doc->nodeListTime)
         createList();
 
     if (index >= list.size())
-        return 0;
+        return nullptr;
 
     return list.at(index);
 }
@@ -1305,13 +1305,13 @@ int QDomNodeListPrivate::length() const
     Creates an empty node list.
 */
 QDomNodeList::QDomNodeList()
+    : impl(nullptr)
 {
-    impl = 0;
 }
 
 QDomNodeList::QDomNodeList(QDomNodeListPrivate* p)
+    : impl(p)
 {
-    impl = p;
 }
 
 /*!
@@ -1443,10 +1443,10 @@ QDomNodePrivate::QDomNodePrivate(QDomDocumentPrivate *doc, QDomNodePrivate *par)
         setParent(par);
     else
         setOwnerDocument(doc);
-    prev = 0;
-    next = 0;
-    first = 0;
-    last = 0;
+    prev = nullptr;
+    next = nullptr;
+    first = nullptr;
+    last = nullptr;
     createdWithDom1Interface = true;
     lineNumber = -1;
     columnNumber = -1;
@@ -1455,10 +1455,10 @@ QDomNodePrivate::QDomNodePrivate(QDomDocumentPrivate *doc, QDomNodePrivate *par)
 QDomNodePrivate::QDomNodePrivate(QDomNodePrivate *n, bool deep) : ref(1)
 {
     setOwnerDocument(n->ownerDocument());
-    prev = 0;
-    next = 0;
-    first = 0;
-    last = 0;
+    prev = nullptr;
+    next = nullptr;
+    first = nullptr;
+    last = nullptr;
 
     name = n->name;
     value = n->value;
@@ -1488,8 +1488,8 @@ QDomNodePrivate::~QDomNodePrivate()
             p->setNoParent();
         p = n;
     }
-    first = 0;
-    last = 0;
+    first = nullptr;
+    last = nullptr;
 }
 
 void QDomNodePrivate::clear()
@@ -1503,8 +1503,8 @@ void QDomNodePrivate::clear()
             delete p;
         p = n;
     }
-    first = 0;
-    last = 0;
+    first = nullptr;
+    last = nullptr;
 }
 
 QDomNodePrivate* QDomNodePrivate::namedItem(const QString &n)
@@ -1515,7 +1515,7 @@ QDomNodePrivate* QDomNodePrivate::namedItem(const QString &n)
             return p;
         p = p->next;
     }
-    return 0;
+    return nullptr;
 }
 
 
@@ -1523,15 +1523,15 @@ QDomNodePrivate* QDomNodePrivate::insertBefore(QDomNodePrivate* newChild, QDomNo
 {
     // Error check
     if (!newChild)
-        return 0;
+        return nullptr;
 
     // Error check
     if (newChild == refChild)
-        return 0;
+        return nullptr;
 
     // Error check
     if (refChild && refChild->parent() != this)
-        return 0;
+        return nullptr;
 
     // "mark lists as dirty"
     QDomDocumentPrivate *const doc = ownerDocument();
@@ -1542,7 +1542,7 @@ QDomNodePrivate* QDomNodePrivate::insertBefore(QDomNodePrivate* newChild, QDomNo
     // all elements of the fragment instead of the fragment itself.
     if (newChild->isDocumentFragment()) {
         // Fragment is empty ?
-        if (newChild->first == 0)
+        if (newChild->first == nullptr)
             return newChild;
 
         // New parent
@@ -1553,7 +1553,7 @@ QDomNodePrivate* QDomNodePrivate::insertBefore(QDomNodePrivate* newChild, QDomNo
         }
 
         // Insert at the beginning ?
-        if (!refChild || refChild->prev == 0) {
+        if (!refChild || refChild->prev == nullptr) {
             if (first)
                 first->prev = newChild->last;
             newChild->last->next = first;
@@ -1572,8 +1572,8 @@ QDomNodePrivate* QDomNodePrivate::insertBefore(QDomNodePrivate* newChild, QDomNo
         // does not decrease the reference.
 
         // Remove the nodes from the fragment
-        newChild->first = 0;
-        newChild->last = 0;
+        newChild->first = nullptr;
+        newChild->last = nullptr;
         return newChild;
     }
 
@@ -1596,7 +1596,7 @@ QDomNodePrivate* QDomNodePrivate::insertBefore(QDomNodePrivate* newChild, QDomNo
         return newChild;
     }
 
-    if (refChild->prev == 0) {
+    if (refChild->prev == nullptr) {
         if (first)
             first->prev = newChild;
         newChild->next = first;
@@ -1618,15 +1618,15 @@ QDomNodePrivate* QDomNodePrivate::insertAfter(QDomNodePrivate* newChild, QDomNod
 {
     // Error check
     if (!newChild)
-        return 0;
+        return nullptr;
 
     // Error check
     if (newChild == refChild)
-        return 0;
+        return nullptr;
 
     // Error check
     if (refChild && refChild->parent() != this)
-        return 0;
+        return nullptr;
 
     // "mark lists as dirty"
     QDomDocumentPrivate *const doc = ownerDocument();
@@ -1637,7 +1637,7 @@ QDomNodePrivate* QDomNodePrivate::insertAfter(QDomNodePrivate* newChild, QDomNod
     // all elements of the fragment instead of the fragment itself.
     if (newChild->isDocumentFragment()) {
         // Fragment is empty ?
-        if (newChild->first == 0)
+        if (newChild->first == nullptr)
             return newChild;
 
         // New parent
@@ -1648,7 +1648,7 @@ QDomNodePrivate* QDomNodePrivate::insertAfter(QDomNodePrivate* newChild, QDomNod
         }
 
         // Insert at the end
-        if (!refChild || refChild->next == 0) {
+        if (!refChild || refChild->next == nullptr) {
             if (last)
                 last->next = newChild->first;
             newChild->first->prev = last;
@@ -1666,8 +1666,8 @@ QDomNodePrivate* QDomNodePrivate::insertAfter(QDomNodePrivate* newChild, QDomNod
         // does not decrease the reference.
 
         // Remove the nodes from the fragment
-        newChild->first = 0;
-        newChild->last = 0;
+        newChild->first = nullptr;
+        newChild->last = nullptr;
         return newChild;
     }
 
@@ -1692,7 +1692,7 @@ QDomNodePrivate* QDomNodePrivate::insertAfter(QDomNodePrivate* newChild, QDomNod
         return newChild;
     }
 
-    if (refChild->next == 0) {
+    if (refChild->next == nullptr) {
         if (last)
             last->next = newChild;
         newChild->prev = last;
@@ -1713,11 +1713,11 @@ QDomNodePrivate* QDomNodePrivate::insertAfter(QDomNodePrivate* newChild, QDomNod
 QDomNodePrivate* QDomNodePrivate::replaceChild(QDomNodePrivate* newChild, QDomNodePrivate* oldChild)
 {
     if (!newChild || !oldChild)
-        return 0;
+        return nullptr;
     if (oldChild->parent() != this)
-        return 0;
+        return nullptr;
     if (newChild == oldChild)
-        return 0;
+        return nullptr;
 
     // mark lists as dirty
     QDomDocumentPrivate *const doc = ownerDocument();
@@ -1728,7 +1728,7 @@ QDomNodePrivate* QDomNodePrivate::replaceChild(QDomNodePrivate* newChild, QDomNo
     // all elements of the fragment instead of the fragment itself.
     if (newChild->isDocumentFragment()) {
         // Fragment is empty ?
-        if (newChild->first == 0)
+        if (newChild->first == nullptr)
             return newChild;
 
         // New parent
@@ -1753,15 +1753,15 @@ QDomNodePrivate* QDomNodePrivate::replaceChild(QDomNodePrivate* newChild, QDomNo
             last = newChild->last;
 
         oldChild->setNoParent();
-        oldChild->next = 0;
-        oldChild->prev = 0;
+        oldChild->next = nullptr;
+        oldChild->prev = nullptr;
 
         // No need to increase the reference since QDomDocumentFragment
         // does not decrease the reference.
 
         // Remove the nodes from the fragment
-        newChild->first = 0;
-        newChild->last = 0;
+        newChild->first = nullptr;
+        newChild->last = nullptr;
 
         // We are no longer interested in the old node
         if (oldChild)
@@ -1794,8 +1794,8 @@ QDomNodePrivate* QDomNodePrivate::replaceChild(QDomNodePrivate* newChild, QDomNo
         last = newChild;
 
     oldChild->setNoParent();
-    oldChild->next = 0;
-    oldChild->prev = 0;
+    oldChild->next = nullptr;
+    oldChild->prev = nullptr;
 
     // We are no longer interested in the old node
     if (oldChild)
@@ -1808,7 +1808,7 @@ QDomNodePrivate* QDomNodePrivate::removeChild(QDomNodePrivate* oldChild)
 {
     // Error check
     if (oldChild->parent() != this)
-        return 0;
+        return nullptr;
 
     // "mark lists as dirty"
     QDomDocumentPrivate *const doc = ownerDocument();
@@ -1817,8 +1817,8 @@ QDomNodePrivate* QDomNodePrivate::removeChild(QDomNodePrivate* oldChild)
 
     // Perhaps oldChild was just created with "createElement" or that. In this case
     // its parent is QDomDocument but it is not part of the documents child list.
-    if (oldChild->next == 0 && oldChild->prev == 0 && first != oldChild)
-        return 0;
+    if (oldChild->next == nullptr && oldChild->prev == nullptr && first != oldChild)
+        return nullptr;
 
     if (oldChild->next)
         oldChild->next->prev = oldChild->prev;
@@ -1831,8 +1831,8 @@ QDomNodePrivate* QDomNodePrivate::removeChild(QDomNodePrivate* oldChild)
         first = oldChild->next;
 
     oldChild->setNoParent();
-    oldChild->next = 0;
-    oldChild->prev = 0;
+    oldChild->next = nullptr;
+    oldChild->prev = nullptr;
 
     // We are no longer interested in the old node
     oldChild->ref.deref();
@@ -1843,7 +1843,7 @@ QDomNodePrivate* QDomNodePrivate::removeChild(QDomNodePrivate* oldChild)
 QDomNodePrivate* QDomNodePrivate::appendChild(QDomNodePrivate* newChild)
 {
     // No reference manipulation needed. Done in insertAfter.
-    return insertAfter(newChild, 0);
+    return insertAfter(newChild, nullptr);
 }
 
 QDomDocumentPrivate* QDomNodePrivate::ownerDocument()
@@ -1869,7 +1869,7 @@ QDomNodePrivate* QDomNodePrivate::cloneNode(bool deep)
 static void qNormalizeNode(QDomNodePrivate* n)
 {
     QDomNodePrivate* p = n->first;
-    QDomTextPrivate* t = 0;
+    QDomTextPrivate* t = nullptr;
 
     while (p) {
         if (p->isText()) {
@@ -1884,7 +1884,7 @@ static void qNormalizeNode(QDomNodePrivate* n)
             }
         } else {
             p = p->next;
-            t = 0;
+            t = nullptr;
         }
     }
 }
@@ -2009,8 +2009,8 @@ void QDomNodePrivate::setLocation(int lineNumber, int columnNumber)
     Constructs a \l{isNull()}{null} node.
 */
 QDomNode::QDomNode()
+    : impl(nullptr)
 {
-    impl = 0;
 }
 
 /*!
@@ -2619,7 +2619,7 @@ bool QDomNode::hasChildNodes() const
 {
     if (!impl)
         return false;
-    return IMPL->first != 0;
+    return IMPL->first != nullptr;
 }
 
 /*!
@@ -2628,7 +2628,7 @@ bool QDomNode::hasChildNodes() const
 */
 bool QDomNode::isNull() const
 {
-    return (impl == 0);
+    return (impl == nullptr);
 }
 
 /*!
@@ -2641,7 +2641,7 @@ void QDomNode::clear()
 {
     if (impl && !impl->ref.deref())
         delete impl;
-    impl = 0;
+    impl = nullptr;
 }
 
 /*!
@@ -3094,13 +3094,13 @@ QDomNodePrivate* QDomNamedNodeMapPrivate::namedItemNS(const QString& nsURI, cons
                 return n;
         }
     }
-    return 0;
+    return nullptr;
 }
 
 QDomNodePrivate* QDomNamedNodeMapPrivate::setNamedItem(QDomNodePrivate* arg)
 {
     if (readonly || !arg)
-        return 0;
+        return nullptr;
 
     if (appendToParent)
         return parent->appendChild(arg);
@@ -3115,7 +3115,7 @@ QDomNodePrivate* QDomNamedNodeMapPrivate::setNamedItem(QDomNodePrivate* arg)
 QDomNodePrivate* QDomNamedNodeMapPrivate::setNamedItemNS(QDomNodePrivate* arg)
 {
     if (readonly || !arg)
-        return 0;
+        return nullptr;
 
     if (appendToParent)
         return parent->appendChild(arg);
@@ -3136,11 +3136,11 @@ QDomNodePrivate* QDomNamedNodeMapPrivate::setNamedItemNS(QDomNodePrivate* arg)
 QDomNodePrivate* QDomNamedNodeMapPrivate::removeNamedItem(const QString& name)
 {
     if (readonly)
-        return 0;
+        return nullptr;
 
     QDomNodePrivate* p = namedItem(name);
-    if (p == 0)
-        return 0;
+    if (p == nullptr)
+        return nullptr;
     if (appendToParent)
         return parent->removeChild(p);
 
@@ -3153,7 +3153,7 @@ QDomNodePrivate* QDomNamedNodeMapPrivate::removeNamedItem(const QString& name)
 QDomNodePrivate* QDomNamedNodeMapPrivate::item(int index) const
 {
     if (index >= length() || index < 0)
-        return 0;
+        return nullptr;
     return *(map.constBegin() + index);
 }
 
@@ -3164,12 +3164,12 @@ int QDomNamedNodeMapPrivate::length() const
 
 bool QDomNamedNodeMapPrivate::contains(const QString& name) const
 {
-    return map.value(name) != 0;
+    return map.contains(name);
 }
 
 bool QDomNamedNodeMapPrivate::containsNS(const QString& nsURI, const QString & localName) const
 {
-    return namedItemNS(nsURI, localName) != 0;
+    return namedItemNS(nsURI, localName) != nullptr;
 }
 
 /**************************************************************
@@ -3222,8 +3222,8 @@ bool QDomNamedNodeMapPrivate::containsNS(const QString& nsURI, const QString & l
     Constructs an empty named node map.
 */
 QDomNamedNodeMap::QDomNamedNodeMap()
+    : impl(nullptr)
 {
-    impl = 0;
 }
 
 /*!
@@ -3570,7 +3570,7 @@ QDomNodePrivate* QDomDocumentTypePrivate::removeChild(QDomNodePrivate* oldChild)
 
 QDomNodePrivate* QDomDocumentTypePrivate::appendChild(QDomNodePrivate* newChild)
 {
-    return insertAfter(newChild, 0);
+    return insertAfter(newChild, nullptr);
 }
 
 static QString quotedValue(const QString &data)
@@ -3598,7 +3598,7 @@ void QDomDocumentTypePrivate::save(QTextStream& s, int, int indent) const
     }
 
     if (entities->length()>0 || notations->length()>0) {
-        s << " [" << endl;
+        s << " [" << Qt::endl;
 
         QHash<QString, QDomNodePrivate *>::const_iterator it2 = notations->map.constBegin();
         for (; it2 != notations->map.constEnd(); ++it2)
@@ -3611,7 +3611,7 @@ void QDomDocumentTypePrivate::save(QTextStream& s, int, int indent) const
         s << ']';
     }
 
-    s << '>' << endl;
+    s << '>' << Qt::endl;
 }
 
 /**************************************************************
@@ -4115,7 +4115,7 @@ QDomAttrPrivate::QDomAttrPrivate(QDomAttrPrivate* n, bool deep)
 void QDomAttrPrivate::setNodeValue(const QString& v)
 {
     value = v;
-    QDomTextPrivate *t = new QDomTextPrivate(0, this, v);
+    QDomTextPrivate *t = new QDomTextPrivate(nullptr, this, v);
     // keep the refcount balanced: appendChild() does a ref anyway.
     t->ref.deref();
     if (first) {
@@ -4489,7 +4489,7 @@ void QDomElementPrivate::setAttributeNS(const QString& nsURI, const QString& qNa
 void QDomElementPrivate::removeAttribute(const QString& aname)
 {
     QDomNodePrivate* p = m_attr->removeNamedItem(aname);
-    if (p && p->ref.load() == 0)
+    if (p && p->ref.loadRelaxed() == 0)
         delete p;
 }
 
@@ -4517,7 +4517,7 @@ QDomAttrPrivate* QDomElementPrivate::setAttributeNode(QDomAttrPrivate* newAttr)
 
 QDomAttrPrivate* QDomElementPrivate::setAttributeNodeNS(QDomAttrPrivate* newAttr)
 {
-    QDomNodePrivate* n = 0;
+    QDomNodePrivate* n = nullptr;
     if (!newAttr->prefix.isNull())
         n = m_attr->namedItemNS(newAttr->namespaceURI, newAttr->name);
 
@@ -4627,7 +4627,7 @@ void QDomElementPrivate::save(QTextStream& s, int depth, int indent) const
 
             /* -1 disables new lines. */
             if (indent != -1)
-                s << endl;
+                s << Qt::endl;
         }
         QDomNodePrivate::save(s, depth + 1, indent); if (!last->isText())
             s << QString(indent < 1 ? 0 : depth * indent, QLatin1Char(' '));
@@ -4639,7 +4639,7 @@ void QDomElementPrivate::save(QTextStream& s, int depth, int indent) const
     if (!(next && next->isText())) {
         /* -1 disables new lines. */
         if (indent != -1)
-            s << endl;
+            s << Qt::endl;
     }
 }
 
@@ -5184,10 +5184,10 @@ QDomTextPrivate* QDomTextPrivate::splitText(int offset)
 {
     if (!parent()) {
         qWarning("QDomText::splitText  The node has no parent. So I cannot split");
-        return 0;
+        return nullptr;
     }
 
-    QDomTextPrivate* t = new QDomTextPrivate(ownerDocument(), 0, value.mid(offset));
+    QDomTextPrivate* t = new QDomTextPrivate(ownerDocument(), nullptr, value.mid(offset));
     value.truncate(offset);
 
     parent()->insertAfter(t, this);
@@ -5329,7 +5329,7 @@ void QDomCommentPrivate::save(QTextStream& s, int depth, int indent) const
     s << "-->";
 
     if (!(next && next->isText()))
-        s << endl;
+        s << Qt::endl;
 }
 
 /**************************************************************
@@ -5552,7 +5552,7 @@ void QDomNotationPrivate::save(QTextStream& s, int, int) const
     }  else {
         s << "SYSTEM " << quotedValue(m_sys);
     }
-    s << '>' << endl;
+    s << '>' << Qt::endl;
 }
 
 /**************************************************************
@@ -5733,7 +5733,7 @@ void QDomEntityPrivate::save(QTextStream& s, int, int) const
         _name = QLatin1String("% ") + _name.mid(1);
 
     if (m_sys.isNull() && m_pub.isNull()) {
-        s << "<!ENTITY " << _name << " \"" << encodeEntity(value.toUtf8()) << "\">" << endl;
+        s << "<!ENTITY " << _name << " \"" << encodeEntity(value.toUtf8()) << "\">" << Qt::endl;
     } else {
         s << "<!ENTITY " << _name << ' ';
         if (m_pub.isNull()) {
@@ -5744,7 +5744,7 @@ void QDomEntityPrivate::save(QTextStream& s, int, int) const
         if (! m_notationName.isNull()) {
             s << " NDATA " << m_notationName;
         }
-        s << '>' << endl;
+        s << '>' << Qt::endl;
     }
 }
 
@@ -6014,7 +6014,7 @@ QDomNodePrivate* QDomProcessingInstructionPrivate::cloneNode(bool deep)
 
 void QDomProcessingInstructionPrivate::save(QTextStream& s, int, int) const
 {
-    s << "<?" << name << ' ' << value << "?>" << endl;
+    s << "<?" << name << ' ' << value << "?>" << Qt::endl;
 }
 
 /**************************************************************
@@ -6144,7 +6144,7 @@ void QDomProcessingInstruction::setData(const QString& d)
  **************************************************************/
 
 QDomDocumentPrivate::QDomDocumentPrivate()
-    : QDomNodePrivate(0),
+    : QDomNodePrivate(nullptr),
       impl(new QDomImplementationPrivate),
       nodeListTime(1)
 {
@@ -6155,7 +6155,7 @@ QDomDocumentPrivate::QDomDocumentPrivate()
 }
 
 QDomDocumentPrivate::QDomDocumentPrivate(const QString& aname)
-    : QDomNodePrivate(0),
+    : QDomNodePrivate(nullptr),
       impl(new QDomImplementationPrivate),
       nodeListTime(1)
 {
@@ -6167,11 +6167,11 @@ QDomDocumentPrivate::QDomDocumentPrivate(const QString& aname)
 }
 
 QDomDocumentPrivate::QDomDocumentPrivate(QDomDocumentTypePrivate* dt)
-    : QDomNodePrivate(0),
+    : QDomNodePrivate(nullptr),
       impl(new QDomImplementationPrivate),
       nodeListTime(1)
 {
-    if (dt != 0) {
+    if (dt != nullptr) {
         type = dt;
     } else {
         type = new QDomDocumentTypePrivate(this, this);
@@ -6267,9 +6267,9 @@ QDomElementPrivate* QDomDocumentPrivate::createElement(const QString &tagName)
     bool ok;
     QString fixedName = fixedXmlName(tagName, &ok);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomElementPrivate *e = new QDomElementPrivate(this, 0, fixedName);
+    QDomElementPrivate *e = new QDomElementPrivate(this, nullptr, fixedName);
     e->ref.deref();
     return e;
 }
@@ -6279,16 +6279,16 @@ QDomElementPrivate* QDomDocumentPrivate::createElementNS(const QString &nsURI, c
     bool ok;
     QString fixedName = fixedXmlName(qName, &ok, true);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomElementPrivate *e = new QDomElementPrivate(this, 0, nsURI, fixedName);
+    QDomElementPrivate *e = new QDomElementPrivate(this, nullptr, nsURI, fixedName);
     e->ref.deref();
     return e;
 }
 
 QDomDocumentFragmentPrivate* QDomDocumentPrivate::createDocumentFragment()
 {
-    QDomDocumentFragmentPrivate *f = new QDomDocumentFragmentPrivate(this, (QDomNodePrivate*)0);
+    QDomDocumentFragmentPrivate *f = new QDomDocumentFragmentPrivate(this, (QDomNodePrivate*)nullptr);
     f->ref.deref();
     return f;
 }
@@ -6298,9 +6298,9 @@ QDomTextPrivate* QDomDocumentPrivate::createTextNode(const QString &data)
     bool ok;
     QString fixedData = fixedCharData(data, &ok);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomTextPrivate *t = new QDomTextPrivate(this, 0, fixedData);
+    QDomTextPrivate *t = new QDomTextPrivate(this, nullptr, fixedData);
     t->ref.deref();
     return t;
 }
@@ -6310,9 +6310,9 @@ QDomCommentPrivate* QDomDocumentPrivate::createComment(const QString &data)
     bool ok;
     QString fixedData = fixedComment(data, &ok);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomCommentPrivate *c = new QDomCommentPrivate(this, 0, fixedData);
+    QDomCommentPrivate *c = new QDomCommentPrivate(this, nullptr, fixedData);
     c->ref.deref();
     return c;
 }
@@ -6322,9 +6322,9 @@ QDomCDATASectionPrivate* QDomDocumentPrivate::createCDATASection(const QString &
     bool ok;
     QString fixedData = fixedCDataSection(data, &ok);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomCDATASectionPrivate *c = new QDomCDATASectionPrivate(this, 0, fixedData);
+    QDomCDATASectionPrivate *c = new QDomCDATASectionPrivate(this, nullptr, fixedData);
     c->ref.deref();
     return c;
 }
@@ -6335,13 +6335,13 @@ QDomProcessingInstructionPrivate* QDomDocumentPrivate::createProcessingInstructi
     bool ok;
     QString fixedData = fixedPIData(data, &ok);
     if (!ok)
-        return 0;
+        return nullptr;
     // [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l'))
     QString fixedTarget = fixedXmlName(target, &ok);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomProcessingInstructionPrivate *p = new QDomProcessingInstructionPrivate(this, 0, fixedTarget, fixedData);
+    QDomProcessingInstructionPrivate *p = new QDomProcessingInstructionPrivate(this, nullptr, fixedTarget, fixedData);
     p->ref.deref();
     return p;
 }
@@ -6350,9 +6350,9 @@ QDomAttrPrivate* QDomDocumentPrivate::createAttribute(const QString &aname)
     bool ok;
     QString fixedName = fixedXmlName(aname, &ok);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomAttrPrivate *a = new QDomAttrPrivate(this, 0, fixedName);
+    QDomAttrPrivate *a = new QDomAttrPrivate(this, nullptr, fixedName);
     a->ref.deref();
     return a;
 }
@@ -6362,9 +6362,9 @@ QDomAttrPrivate* QDomDocumentPrivate::createAttributeNS(const QString &nsURI, co
     bool ok;
     QString fixedName = fixedXmlName(qName, &ok, true);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomAttrPrivate *a = new QDomAttrPrivate(this, 0, nsURI, fixedName);
+    QDomAttrPrivate *a = new QDomAttrPrivate(this, nullptr, nsURI, fixedName);
     a->ref.deref();
     return a;
 }
@@ -6374,16 +6374,16 @@ QDomEntityReferencePrivate* QDomDocumentPrivate::createEntityReference(const QSt
     bool ok;
     QString fixedName = fixedXmlName(aname, &ok);
     if (!ok)
-        return 0;
+        return nullptr;
 
-    QDomEntityReferencePrivate *e = new QDomEntityReferencePrivate(this, 0, fixedName);
+    QDomEntityReferencePrivate *e = new QDomEntityReferencePrivate(this, nullptr, fixedName);
     e->ref.deref();
     return e;
 }
 
 QDomNodePrivate* QDomDocumentPrivate::importNode(QDomNodePrivate *importedNode, bool deep)
 {
-    QDomNodePrivate *node = 0;
+    QDomNodePrivate *node = nullptr;
     switch (importedNode->nodeType()) {
         case QDomNode::AttributeNode:
             node = new QDomAttrPrivate((QDomAttrPrivate*)importedNode, true);
@@ -6435,7 +6435,7 @@ void QDomDocumentPrivate::saveDocument(QTextStream& s, const int indent, QDomNod
 #if QT_CONFIG(textcodec) && QT_CONFIG(regularexpression)
         const QDomNodePrivate* n = first;
 
-        QTextCodec *codec = 0;
+        QTextCodec *codec = nullptr;
 
         if (n && n->isProcessingInstruction() && n->nodeName() == QLatin1String("xml")) {
             // we have an XML declaration
@@ -6593,7 +6593,7 @@ void QDomDocumentPrivate::saveDocument(QTextStream& s, const int indent, QDomNod
 */
 QDomDocument::QDomDocument()
 {
-    impl = 0;
+    impl = nullptr;
 }
 
 /*!
@@ -6822,7 +6822,7 @@ bool QDomDocument::setContent(QXmlInputSource *source, QXmlReader *reader, QStri
 {
     if (!impl)
         impl = new QDomDocumentPrivate();
-    return IMPL->setContent(source, reader, 0, errorMsg, errorLine, errorColumn);
+    return IMPL->setContent(source, reader, nullptr, errorMsg, errorLine, errorColumn);
 }
 
 /*!
@@ -7369,7 +7369,7 @@ QDomComment QDomNode::toComment() const
 
 QDomHandler::QDomHandler(QDomDocumentPrivate* adoc, QXmlSimpleReader* areader, bool namespaceProcessing)
     : errorLine(0), errorColumn(0), doc(adoc), node(adoc), cdata(false),
-        nsProcessing(namespaceProcessing), locator(0), reader(areader)
+        nsProcessing(namespaceProcessing), locator(nullptr), reader(areader)
 {
 }
 
@@ -7443,7 +7443,7 @@ bool QDomHandler::characters(const QString&  ch)
     if (cdata) {
         n.reset(doc->createCDATASection(ch));
     } else if (!entityName.isEmpty()) {
-        QScopedPointer<QDomEntityPrivate> e(new QDomEntityPrivate(doc, 0, entityName,
+        QScopedPointer<QDomEntityPrivate> e(new QDomEntityPrivate(doc, nullptr, entityName,
                 QString(), QString(), QString()));
         e->value = ch;
         e->ref.deref();
@@ -7528,7 +7528,7 @@ bool QDomHandler::comment(const QString& ch)
 
 bool QDomHandler::unparsedEntityDecl(const QString &name, const QString &publicId, const QString &systemId, const QString &notationName)
 {
-    QDomEntityPrivate* e = new QDomEntityPrivate(doc, 0, name,
+    QDomEntityPrivate* e = new QDomEntityPrivate(doc, nullptr, name,
             publicId, systemId, notationName);
     // keep the refcount balanced: appendChild() does a ref anyway.
     e->ref.deref();
@@ -7543,7 +7543,7 @@ bool QDomHandler::externalEntityDecl(const QString &name, const QString &publicI
 
 bool QDomHandler::notationDecl(const QString & name, const QString & publicId, const QString & systemId)
 {
-    QDomNotationPrivate* n = new QDomNotationPrivate(doc, 0, name, publicId, systemId);
+    QDomNotationPrivate* n = new QDomNotationPrivate(doc, nullptr, name, publicId, systemId);
     // keep the refcount balanced: appendChild() does a ref anyway.
     n->ref.deref();
     doc->doctype()->appendChild(n);
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index b2fff5b61f..1993073cce 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -1079,12 +1079,12 @@ void QXmlInputSource::init()
     d = new QXmlInputSourcePrivate;
 
     QT_TRY {
-        d->inputDevice = 0;
-        d->inputStream = 0;
+        d->inputDevice = nullptr;
+        d->inputStream = nullptr;
 
         setData(QString());
 #if QT_CONFIG(textcodec)
-        d->encMapper = 0;
+        d->encMapper = nullptr;
 #endif
         d->nextReturnedEndOfData = true; // first call to next() will call fetchData()
 
@@ -1161,12 +1161,12 @@ QChar QXmlInputSource::next()
             d->nextReturnedEndOfData = false;
             fetchData();
             if (d->pos >= d->length) {
-                return EndOfDocument;
+                return QChar(EndOfDocument);
             }
             return next();
         }
         d->nextReturnedEndOfData = true;
-        return EndOfData;
+        return QChar(EndOfData);
     }
 
     // QXmlInputSource has no way to signal encoding errors. The best we can do
@@ -1174,7 +1174,7 @@ QChar QXmlInputSource::next()
     // will then just call this function again to get the next char.
     QChar c = d->unicode[d->pos++];
     if (c.unicode() == EndOfData)
-        c = EndOfDocument;
+        c = QChar(EndOfDocument);
     return c;
 }
 
@@ -1313,8 +1313,8 @@ static QString extractEncodingDecl(const QString &text, bool *needMoreText)
         return QString();
 
     while (pos < endPos) {
-        ushort uc = text.at(pos).unicode();
-        if (uc == '\'' || uc == '"')
+        QChar uc = text.at(pos);
+        if (uc == u'\'' || uc == u'"')
             break;
         ++pos;
     }
@@ -1325,8 +1325,8 @@ static QString extractEncodingDecl(const QString &text, bool *needMoreText)
     QString encoding;
     ++pos;
     while (pos < endPos) {
-        ushort uc = text.at(pos).unicode();
-        if (uc == '\'' || uc == '"')
+        QChar uc = text.at(pos);
+        if (uc == u'\'' || uc == u'"')
             break;
         encoding.append(uc);
         ++pos;
@@ -1357,13 +1357,13 @@ QString QXmlInputSource::fromRawData(const QByteArray &data, bool beginning)
         return QString();
     if (beginning) {
         delete d->encMapper;
-        d->encMapper = 0;
+        d->encMapper = nullptr;
     }
 
     int mib = 106; // UTF-8
 
     // This is the initial UTF codec we will read the encoding declaration with
-    if (d->encMapper == 0) {
+    if (d->encMapper == nullptr) {
         d->encodingDeclBytes.clear();
         d->encodingDeclChars.clear();
         d->lookingForEncodingDecl = true;
@@ -2377,7 +2377,7 @@ bool QXmlDefaultHandler::unparsedEntityDecl(const QString&, const QString&,
 bool QXmlDefaultHandler::resolveEntity(const QString&, const QString&,
         QXmlInputSource*& ret)
 {
-    ret = 0;
+    ret = nullptr;
     return true;
 }
 
@@ -2520,15 +2520,15 @@ inline void QXmlSimpleReaderPrivate::refClear()
 QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
 {
     q_ptr = reader;
-    parseStack = 0;
+    parseStack = nullptr;
 
     locator.reset(new QXmlSimpleReaderLocator(reader));
-    entityRes  = 0;
-    dtdHnd     = 0;
-    contentHnd = 0;
-    errorHnd   = 0;
-    lexicalHnd = 0;
-    declHnd    = 0;
+    entityRes  = nullptr;
+    dtdHnd     = nullptr;
+    contentHnd = nullptr;
+    errorHnd   = nullptr;
+    lexicalHnd = nullptr;
+    declHnd    = nullptr;
 
     // default feature settings
     useNamespaces = true;
@@ -2932,7 +2932,7 @@ bool QXmlSimpleReader::feature(const QString& name, bool *ok) const
 {
     const QXmlSimpleReaderPrivate *d = d_func();
 
-    if (ok != 0)
+    if (ok)
         *ok = true;
     if (name == QLatin1String("http://xml.org/sax/features/namespaces")) {
         return d->useNamespaces;
@@ -2946,7 +2946,7 @@ bool QXmlSimpleReader::feature(const QString& name, bool *ok) const
         return d->reportEntities;
     } else {
         qWarning("Unknown feature %s", name.toLatin1().data());
-        if (ok != 0)
+        if (ok)
             *ok = false;
     }
     return false;
@@ -3023,9 +3023,9 @@ bool QXmlSimpleReader::hasFeature(const QString& name) const
 */
 void* QXmlSimpleReader::property(const QString&, bool *ok) const
 {
-    if (ok != 0)
+    if (ok)
         *ok = false;
-    return 0;
+    return nullptr;
 }
 
 /*! \reimp
@@ -3206,7 +3206,7 @@ bool QXmlSimpleReader::parse(const QXmlInputSource *input, bool incremental)
         d->initIncrementalParsing();
     } else {
         delete d->parseStack;
-        d->parseStack = 0;
+        d->parseStack = nullptr;
     }
     d->init(input);
 
@@ -3251,7 +3251,7 @@ bool QXmlSimpleReader::parse(const QXmlInputSource *input, bool incremental)
 bool QXmlSimpleReader::parseContinue()
 {
     Q_D(QXmlSimpleReader);
-    if (d->parseStack == 0 || d->parseStack->isEmpty())
+    if (d->parseStack == nullptr || d->parseStack->isEmpty())
         return false;
     d->initData();
     int state = d->parseStack->pop().state;
@@ -3268,7 +3268,7 @@ bool QXmlSimpleReaderPrivate::parseBeginOrContinue(int state, bool incremental)
     if (state==0) {
         if (!parseProlog()) {
             if (incremental && error.isNull()) {
-                pushParseState(0, 0);
+                pushParseState(nullptr, 0);
                 return true;
             } else {
                 clear(tags);
@@ -3280,7 +3280,7 @@ bool QXmlSimpleReaderPrivate::parseBeginOrContinue(int state, bool incremental)
     if (state==1) {
         if (!parseElement()) {
             if (incremental && error.isNull()) {
-                pushParseState(0, 1);
+                pushParseState(nullptr, 1);
                 return true;
             } else {
                 clear(tags);
@@ -3293,7 +3293,7 @@ bool QXmlSimpleReaderPrivate::parseBeginOrContinue(int state, bool incremental)
     while (!atEnd()) {
         if (!parseMisc()) {
             if (incremental && error.isNull()) {
-                pushParseState(0, 2);
+                pushParseState(nullptr, 2);
                 return true;
             } else {
                 clear(tags);
@@ -3303,7 +3303,7 @@ bool QXmlSimpleReaderPrivate::parseBeginOrContinue(int state, bool incremental)
     }
     if (!atEndOrig && incremental) {
         // we parsed something at all, so be prepared to come back later
-        pushParseState(0, 2);
+        pushParseState(nullptr, 2);
         return true;
     }
     // is stack empty?
@@ -3315,7 +3315,7 @@ bool QXmlSimpleReaderPrivate::parseBeginOrContinue(int state, bool incremental)
     // call the handler
     if (contentHnd) {
         delete parseStack;
-        parseStack = 0;
+        parseStack = nullptr;
         if (!contentHnd->endDocument()) {
             reportParseError(contentHnd->errorString());
             return false;
@@ -3350,7 +3350,7 @@ bool QXmlSimpleReaderPrivate::parseBeginOrContinue(int state, bool incremental)
         signed char state;
         signed char input;
 
-(4)        if (d->parseStack == 0 || d->parseStack->isEmpty()) {
+(4)        if (d->parseStack == nullptr || d->parseStack->isEmpty()) {
 (4a)        ...
         } else {
 (4b)        ...
@@ -3440,7 +3440,7 @@ bool QXmlSimpleReaderPrivate::parseProlog()
     signed char state;
     signed char input;
 
-    if (parseStack == 0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr|| parseStack->isEmpty()) {
         xmldecl_possible = true;
         doctype_read = false;
         state = Init;
@@ -3631,7 +3631,7 @@ bool QXmlSimpleReaderPrivate::parseElement()
     int state;
     int input;
 
-    if (parseStack == 0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr|| parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -4000,7 +4000,7 @@ bool QXmlSimpleReaderPrivate::parseContent()
     signed char state;
     signed char input;
 
-    if (parseStack == 0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         contentCharDataRead = false;
         state = Init;
     } else {
@@ -4303,7 +4303,7 @@ bool QXmlSimpleReaderPrivate::parseMisc()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -4458,7 +4458,7 @@ bool QXmlSimpleReaderPrivate::parsePI()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -4685,7 +4685,7 @@ bool QXmlSimpleReaderPrivate::parseDoctype()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         startDTDwasReported = false;
         systemId.clear();
         publicId.clear();
@@ -4896,7 +4896,7 @@ bool QXmlSimpleReaderPrivate::parseExternalID()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         systemId.clear();
         publicId.clear();
         state = Init;
@@ -5060,7 +5060,7 @@ bool QXmlSimpleReaderPrivate::parseMarkupdecl()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -5218,7 +5218,7 @@ bool QXmlSimpleReaderPrivate::parsePEReference()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -5255,7 +5255,7 @@ bool QXmlSimpleReaderPrivate::parsePEReference()
                     } else if (entityRes) {
                         QMap<QString,QXmlSimpleReaderPrivate::ExternParameterEntity>::Iterator it2;
                         it2 = externParameterEntities.find(ref());
-                        QXmlInputSource *ret = 0;
+                        QXmlInputSource *ret = nullptr;
                         if (it2 != externParameterEntities.end()) {
                             if (!entityRes->resolveEntity((*it2).publicId, (*it2).systemId, ret)) {
                                 delete ret;
@@ -5396,7 +5396,7 @@ bool QXmlSimpleReaderPrivate::parseAttlistDecl()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -5612,7 +5612,7 @@ bool QXmlSimpleReaderPrivate::parseAttType()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -5833,7 +5833,7 @@ bool QXmlSimpleReaderPrivate::parseAttValue()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -5975,7 +5975,7 @@ bool QXmlSimpleReaderPrivate::parseElementDecl()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -6184,7 +6184,7 @@ bool QXmlSimpleReaderPrivate::parseNotationDecl()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -6328,7 +6328,7 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -6557,7 +6557,7 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -6832,7 +6832,7 @@ bool QXmlSimpleReaderPrivate::parseEntityValue()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -6951,7 +6951,7 @@ bool QXmlSimpleReaderPrivate::parseComment()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -7063,7 +7063,7 @@ bool QXmlSimpleReaderPrivate::parseAttribute()
     int state;
     int input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -7162,7 +7162,7 @@ bool QXmlSimpleReaderPrivate::parseName()
     };
     int state;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -7248,7 +7248,7 @@ bool QXmlSimpleReaderPrivate::parseNmtoken()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         state = Init;
     } else {
         state = parseStack->pop().state;
@@ -7356,7 +7356,7 @@ bool QXmlSimpleReaderPrivate::parseReference()
     signed char state;
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         parseReference_charDataRead = false;
         state = Init;
     } else {
@@ -7582,7 +7582,7 @@ bool QXmlSimpleReaderPrivate::processReference()
                     if (parseReference_context == InContent) {
                         if (contentCharDataRead) {
                             if (reportWhitespaceCharData || !string().simplified().isEmpty()) {
-                                if (contentHnd != 0 && !contentHnd->characters(string())) {
+                                if (contentHnd != nullptr && !contentHnd->characters(string())) {
                                     reportParseError(contentHnd->errorString());
                                     return false;
                                 }
@@ -7610,7 +7610,7 @@ bool QXmlSimpleReaderPrivate::processReference()
                             // Included if validating
                             bool skipIt = true;
                             if (entityRes) {
-                                QXmlInputSource *ret = 0;
+                                QXmlInputSource *ret = nullptr;
                                 if (!entityRes->resolveEntity((*itExtern).publicId, (*itExtern).systemId, ret)) {
                                     delete ret;
                                     reportParseError(entityRes->errorString());
@@ -7696,7 +7696,7 @@ bool QXmlSimpleReaderPrivate::parseString()
     signed char state; // state in this function is the position in the string s
     signed char input;
 
-    if (parseStack==0 || parseStack->isEmpty()) {
+    if (parseStack == nullptr || parseStack->isEmpty()) {
         Done = parseString_s.length();
         state = 0;
     } else {
@@ -7800,7 +7800,7 @@ void QXmlSimpleReaderPrivate::next()
     c = inputSource->next();
     // If we are not incremental parsing, we just skip over EndOfData chars to give the
     // parser an uninterrupted stream of document chars.
-    if (c == QXmlInputSource::EndOfData && parseStack == 0)
+    if (c == QChar(QXmlInputSource::EndOfData) && parseStack == nullptr)
         c = inputSource->next();
     if (uc == '\n') {
         lineNr++;
@@ -7832,7 +7832,7 @@ bool QXmlSimpleReaderPrivate::eat_ws()
         }
         next();
     }
-    if (parseStack != 0) {
+    if (parseStack != nullptr) {
         unexpectedEof(&QXmlSimpleReaderPrivate::eat_ws, 0);
         return false;
     }
@@ -7877,7 +7877,7 @@ void QXmlSimpleReaderPrivate::init(const QXmlInputSource *i)
 */
 void QXmlSimpleReaderPrivate::initData()
 {
-    c = QXmlInputSource::EndOfData;
+    c = QChar(QXmlInputSource::EndOfData);
     xmlRefStack.clear();
     next();
 }
@@ -7922,10 +7922,10 @@ void QXmlSimpleReaderPrivate::reportParseError(const QString& error)
 */
 void QXmlSimpleReaderPrivate::unexpectedEof(ParseFunction where, int state)
 {
-    if (parseStack == 0) {
+    if (parseStack == nullptr) {
         reportParseError(QLatin1String(XMLERR_UNEXPECTEDEOF));
     } else {
-        if (c == QXmlInputSource::EndOfDocument) {
+        if (c == QChar(QXmlInputSource::EndOfDocument)) {
             reportParseError(QLatin1String(XMLERR_UNEXPECTEDEOF));
         } else {
             pushParseState(where, state);
@@ -7942,7 +7942,7 @@ void QXmlSimpleReaderPrivate::unexpectedEof(ParseFunction where, int state)
 */
 void QXmlSimpleReaderPrivate::parseFailed(ParseFunction where, int state)
 {
-    if (parseStack!=0 && error.isNull()) {
+    if (parseStack != nullptr && error.isNull()) {
         pushParseState(where, state);
     }
 }
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 94dc8dfb8e..9be14bd7a9 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -116,16 +116,14 @@ class Q_XML_EXPORT QXmlAttributes
 {
 public:
     QXmlAttributes();
-#ifdef Q_COMPILER_DEFAULT_MEMBERS
     QXmlAttributes(const QXmlAttributes &) = default;
-    QXmlAttributes(QXmlAttributes &&) Q_DECL_NOTHROW = default;
+    QXmlAttributes(QXmlAttributes &&) noexcept = default;
     QXmlAttributes &operator=(const QXmlAttributes &) = default;
-    QXmlAttributes &operator=(QXmlAttributes &&) Q_DECL_NOTHROW = default;
-#endif // default members
+    QXmlAttributes &operator=(QXmlAttributes &&) noexcept = default;
 
     QT6_NOT_VIRTUAL ~QXmlAttributes();
 
-    void swap(QXmlAttributes &other) Q_DECL_NOTHROW
+    void swap(QXmlAttributes &other) noexcept
     {
         qSwap(attList, other.attList);
         qSwap(d, other.d);
diff --git a/src/xml/sax/qxml_p.h b/src/xml/sax/qxml_p.h
index 98dc2aea0c..eb6135db04 100644
--- a/src/xml/sax/qxml_p.h
+++ b/src/xml/sax/qxml_p.h
@@ -229,7 +229,7 @@ private:
     // for the DTD currently being parsed.
     static const int dtdRecursionLimit = 2;
     // The maximum amount of characters an entity value may contain, after expansion.
-    static const int entityCharacterLimit = 1024;
+    static const int entityCharacterLimit = 4096;
 
     const QString &string();
     void stringClear();